diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6c5d559a8a..e8f632af23 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -6,7 +6,6 @@ Make sure that:
 -->
 
 - [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
-- [ ] There is a ticket in the bug tracker for the project in our [JIRA](https://jira.spring.io/browse/DATAMONGO).
 - [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes.
 - [ ] You submit test cases (unit or integration tests) that back your changes.
 - [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).
diff --git a/.github/dco.yml b/.github/dco.yml
new file mode 100644
index 0000000000..0c4b142e9a
--- /dev/null
+++ b/.github/dco.yml
@@ -0,0 +1,2 @@
+require:
+  members: false
diff --git a/.github/workflows/project.yml b/.github/workflows/project.yml
new file mode 100644
index 0000000000..a5f764579a
--- /dev/null
+++ b/.github/workflows/project.yml
@@ -0,0 +1,40 @@
+# GitHub Actions to automate GitHub issues for Spring Data Project Management
+
+name: Spring Data GitHub Issues
+
+on:
+  issues:
+    types: [opened, edited, reopened]
+  issue_comment:
+    types: [created]
+  pull_request_target:
+    types: [opened, edited, reopened]
+
+jobs:
+  Inbox:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request == null && !contains(join(github.event.issue.labels.*.name, ', '), 'dependency-upgrade') && !contains(github.event.issue.title, 'Release ')
+    steps:
+      - name: Create or Update Issue Card
+        uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/spring-projects/projects/25
+          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
+  Pull-Request:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'spring-projects' && (github.event.action == 'opened' || github.event.action == 'reopened') && github.event.pull_request != null
+    steps:
+      - name: Create or Update Pull Request Card
+        uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/spring-projects/projects/25
+          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
+  Feedback-Provided:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'spring-projects' && github.event_name == 'issue_comment' && github.event.action == 'created' && github.actor != 'spring-projects-issues' && github.event.pull_request == null && github.event.issue.state == 'open' && contains(toJSON(github.event.issue.labels), 'waiting-for-feedback')
+    steps:
+      - name: Update Project Card
+        uses: actions/add-to-project@v1.0.2
+        with:
+          project-url: https://github.com/orgs/spring-projects/projects/25
+          github-token: ${{ secrets.GH_ISSUES_TOKEN_SPRING_DATA }}
diff --git a/.gitignore b/.gitignore
index be372b6209..27b7a78896 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,4 +15,9 @@ src/ant/.ant-targets-upload-dist.xml
 atlassian-ide-plugin.xml
 /.gradle/
 /.idea/
-*.graphml
\ No newline at end of file
+*.graphml
+build/
+node_modules
+node
+package-lock.json
+.mvn/.develocity
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 0000000000..e0857eaa25
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extensions>
+	<extension>
+		<groupId>io.spring.develocity.conventions</groupId>
+		<artifactId>develocity-conventions-maven-extension</artifactId>
+		<version>0.0.22</version>
+	</extension>
+</extensions>
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000000..e27f6e8f5e
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1,14 @@
+--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
+--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
+--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
+--add-opens=java.base/java.util=ALL-UNNAMED
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+--add-opens=java.base/java.text=ALL-UNNAMED
+--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index 00d32aab1d..5f3193b363 100755
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.4/apache-maven-3.5.4-bin.zip
\ No newline at end of file
+#Thu Nov 07 09:47:19 CET 2024
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index a6382b7217..0000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,38 +0,0 @@
-language: java
-
-jdk:
-  - oraclejdk8
-
-before_install:
-  - mkdir -p downloads
-  - mkdir -p var/db var/log
-  - if [[ ! -d downloads/mongodb-linux-x86_64-ubuntu1604-${MONGO_VERSION} ]] ; then cd downloads && wget https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu1604-${MONGO_VERSION}.tgz && tar xzf mongodb-linux-x86_64-ubuntu1604-${MONGO_VERSION}.tgz && cd ..; fi
-  - downloads/mongodb-linux-x86_64-ubuntu1604-${MONGO_VERSION}/bin/mongod --version
-  - downloads/mongodb-linux-x86_64-ubuntu1604-${MONGO_VERSION}/bin/mongod --dbpath var/db --replSet rs0 --fork --logpath var/log/mongod.log
-  - sleep 10
-  - |-
-    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
-
-env:
-  matrix:
-    - MONGO_VERSION=4.1.10
-    - MONGO_VERSION=4.0.4
-    - MONGO_VERSION=3.6.12
-    - MONGO_VERSION=3.4.20
-  global:
-    - PROFILE=ci
-
-addons:
-  apt:
-    packages:
-      - oracle-java8-installer
-
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.m2
-    - downloads
-
-script: "mvn clean dependency:list test -P${PROFILE} -Dsort"
diff --git a/CI.adoc b/CI.adoc
index c6cb467f2b..057100a955 100644
--- a/CI.adoc
+++ b/CI.adoc
@@ -1,6 +1,6 @@
 = 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%2Fmain&subject=Moore%20(main)[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/]
 
@@ -16,7 +16,7 @@ All of these use cases are great reasons to essentially run what the CI server d
 
 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`
+1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github springci/spring-data-openjdk17-with-mongodb-5.0.3:latest /bin/bash`
 +
 This will launch the Docker image and mount your source code at `spring-data-mongodb-github`.
 +
diff --git a/CODE_OF_CONDUCT.adoc b/CODE_OF_CONDUCT.adoc
deleted file mode 100644
index 33ae7bc9f1..0000000000
--- a/CODE_OF_CONDUCT.adoc
+++ /dev/null
@@ -1,27 +0,0 @@
-= Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic addresses,
-  without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at spring-code-of-conduct@pivotal.io.
-All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
-Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
-
-This Code of Conduct is adapted from the https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].
\ No newline at end of file
diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc
index f007591467..740e8bd0bb 100644
--- a/CONTRIBUTING.adoc
+++ b/CONTRIBUTING.adoc
@@ -1,3 +1,3 @@
 = Spring Data contribution guidelines
 
-You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc[here].
+You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/main/CONTRIBUTING.adoc[here].
diff --git a/Jenkinsfile b/Jenkinsfile
index 005a15456b..ce2f272334 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,9 +1,15 @@
+def p = [:]
+node {
+	checkout scm
+	p = readProperties interpolate: true, file: 'ci/pipeline.properties'
+}
+
 pipeline {
 	agent none
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/main", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -14,127 +20,105 @@ pipeline {
 	stages {
 		stage("Docker images") {
 			parallel {
-				stage('Publish JDK 8 + MongoDB 4.0') {
+				stage('Publish JDK (Java 24) + MongoDB 8.0') {
 					when {
-						changeset "ci/openjdk8-mongodb-4.0/**"
-					}
-					agent { label 'data' }
-					options { timeout(time: 30, unit: 'MINUTES') }
+							anyOf {
+								changeset "ci/openjdk24-mongodb-8.0/**"
+								changeset "ci/pipeline.properties"
+							}
+						}
+						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') {
+							def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}", "--build-arg BASE=${p['docker.java.main.image']} --build-arg MONGODB=${p['docker.mongodb.7.0.version']} ci/openjdk24-mongodb-8.0/")
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								image.push()
 							}
 						}
 					}
 				}
-				stage('Publish JDK 8 + MongoDB 4.1') {
+				stage('Publish JDK (Java.next) + MongoDB 8.0') {
 					when {
-						changeset "ci/openjdk8-mongodb-4.1/**"
+						anyOf {
+							changeset "ci/openjdk24-mongodb-8.0/**"
+							changeset "ci/pipeline.properties"
+						}
 					}
 					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') {
+							def image = docker.build("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}", "--build-arg BASE=${p['docker.java.next.image']} --build-arg MONGODB=${p['docker.mongodb.8.0.version']} ci/openjdk24-mongodb-8.0/")
+							docker.withRegistry(p['docker.registry'], p['docker.credentials']) {
 								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.2", "ci/openjdk8-mongodb-4.2/")
-                			docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
-                				image.push()
-                			}
-                		}
-                	}
-                }
 			}
 		}
 
-		stage("test: baseline") {
+		stage("test: baseline (main)") {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'master'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			agent {
-				docker {
-					image 'springci/spring-data-openjdk8-with-mongodb-4.2:latest'
-					label 'data'
-					args '-v $HOME:/tmp/jenkins-home'
-				}
+				label 'data'
 			}
 			options { timeout(time: 30, unit: 'MINUTES') }
+			environment {
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
+			}
 			steps {
-				sh 'rm -rf ?'
-				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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
+				script {
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image("springci/spring-data-with-mongodb-8.0:${p['java.main.tag']}").inside(p['docker.java.inside.docker']) {
+							sh 'ci/start-replica.sh'
+							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+								"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B"
+						}
+					}
+				}
 			}
 		}
 
 		stage("Test other configurations") {
 			when {
-				anyOf {
-					branch 'master'
+				beforeAgent(true)
+				allOf {
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			parallel {
-				stage("test: mongodb 4.0") {
+
+				stage("test: MongoDB 8.0") {
 					agent {
-						docker {
-							image 'springci/spring-data-openjdk8-with-mongodb-4.0:latest'
-							label 'data'
-							args '-v $HOME:/tmp/jenkins-home'
-						}
+						label 'data'
 					}
 					options { timeout(time: 30, unit: 'MINUTES') }
-					steps {
-						sh 'rm -rf ?'
-						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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
-					}
-				}
-				stage("test: mongodb 4.1") {
-					agent {
-						docker {
-							image 'springci/spring-data-openjdk8-with-mongodb-4.1:latest'
-							label 'data'
-							args '-v $HOME:/tmp/jenkins-home'
-						}
+					environment {
+						ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+						DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 					}
-					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
-						sh 'rm -rf ?'
-						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 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
+						script {
+							docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+								docker.image("springci/spring-data-with-mongodb-8.0:${p['java.next.tag']}").inside(p['docker.java.inside.docker']) {
+									sh 'ci/start-replica.sh'
+									sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+										"./mvnw -s settings.xml -Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb clean dependency:list test -Dsort -U -B"
+								}
+							}
+						}
 					}
 				}
 			}
@@ -142,72 +126,45 @@ pipeline {
 
 		stage('Release to artifactory') {
 			when {
+				beforeAgent(true)
 				anyOf {
-					branch 'master'
+					branch(pattern: "main|(\\d\\.\\d\\.x)", comparator: "REGEXP")
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
 			agent {
-				docker {
-					image 'adoptopenjdk/openjdk8:latest'
-					label 'data'
-					args '-v $HOME:/tmp/jenkins-home'
-				}
+				label 'data'
 			}
 			options { timeout(time: 20, unit: 'MINUTES') }
-
 			environment {
-				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
+				ARTIFACTORY = credentials("${p['artifactory.credentials']}")
+				DEVELOCITY_ACCESS_KEY = credentials("${p['develocity.access-key']}")
 			}
-
 			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'
-			}
-		}
-
-		stage('Publish documentation') {
-			when {
-				branch 'master'
-			}
-			agent {
-				docker {
-					image 'adoptopenjdk/openjdk8:latest'
-					label 'data'
-					args '-v $HOME:/tmp/jenkins-home'
+				script {
+					docker.withRegistry(p['docker.proxy.registry'], p['docker.proxy.credentials']) {
+						docker.image(p['docker.java.main.image']).inside(p['docker.java.inside.docker']) {
+							sh 'MAVEN_OPTS="-Duser.name=' + "${p['jenkins.user.name']}" + ' -Duser.home=/tmp/jenkins-home" ' +
+									"./mvnw -s settings.xml -Pci,artifactory " +
+									"-Ddevelocity.storage.directory=/tmp/jenkins-home/.develocity-root " +
+									"-Dartifactory.server=${p['artifactory.url']} " +
+									"-Dartifactory.username=${ARTIFACTORY_USR} " +
+									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
+									"-Dartifactory.staging-repository=${p['artifactory.repository.snapshot']} " +
+									"-Dartifactory.build-name=spring-data-mongodb " +
+									"-Dartifactory.build-number=spring-data-mongodb-${BRANCH_NAME}-build-${BUILD_NUMBER} " +
+									"-Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-mongodb " +
+									"-Dmaven.test.skip=true clean deploy -U -B"
+						}
+					}
 				}
 			}
-			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',
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000000..ff77379631
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.
diff --git a/README.adoc b/README.adoc
index e2ee15c857..61b956fbfc 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,17 +1,19 @@
-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://spring.io/projects/spring-data-mongodb#quick-start] image:https://spring.io/badges/spring-data-mongodb/snapshot.svg[Spring Data MongoDB,link=https://spring.io/projects/spring-data-mongodb#quick-start]
 
-= 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]]
+= Spring Data MongoDB image:https://jenkins.spring.io/buildStatus/icon?job=spring-data-mongodb%2Fmain&subject=Build[link=https://jenkins.spring.io/view/SpringData/job/spring-data-mongodb/] image:https://img.shields.io/badge/Revved%20up%20by-Develocity-06A0CE?logo=Gradle&labelColor=02303A["Revved up by Develocity", link="https://ge.spring.io/scans?search.rootProjectNames=Spring Data MongoDB"]
 
-The primary goal of the https://projects.spring.io/spring-data[Spring Data] project is to make it easier to build Spring-powered applications that use new data access technologies such as non-relational databases, map-reduce frameworks, and cloud based data services.
+The primary goal of the https://spring.io/projects/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 `+Document+` and easily writing a repository style data access layer.
 
+[[code-of-conduct]]
 == Code of Conduct
 
-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.
+This project is governed by the https://github.com/spring-projects/.github/blob/e3cc2ff230d8f1dca06535aa6b5a4a23815861d4/CODE_OF_CONDUCT.md[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.
 
+[[getting-started]]
 == Getting Started
 
 Here is a quick teaser of an application using Spring Data Repositories in Java:
@@ -50,12 +52,7 @@ public class MyService {
 
 @Configuration
 @EnableMongoRepositories
-class ApplicationConfig extends AbstractMongoConfiguration {
-
-  @Override
-  public MongoClient mongoClient() {
-    return new MongoClient();
-  }
+class ApplicationConfig extends AbstractMongoClientConfiguration {
 
   @Override
   protected String getDatabaseName() {
@@ -64,6 +61,7 @@ class ApplicationConfig extends AbstractMongoConfiguration {
 }
 ----
 
+[[maven-configuration]]
 === Maven configuration
 
 Add the Maven dependency:
@@ -73,87 +71,161 @@ Add the Maven dependency:
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>${version}.RELEASE</version>
+  <version>${version}</version>
 </dependency>
 ----
 
-If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository and declare the appropriate dependency version.
+If you'd rather like the latest snapshots of the upcoming major version, use our Maven snapshot repository
+and declare the appropriate dependency version.
 
 [source,xml]
 ----
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-mongodb</artifactId>
-  <version>${version}.BUILD-SNAPSHOT</version>
+  <version>${version}-SNAPSHOT</version>
 </dependency>
 
 <repository>
-  <id>spring-libs-snapshot</id>
+  <id>spring-snapshot</id>
   <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-snapshot</url>
+  <url>https://repo.spring.io/snapshot</url>
 </repository>
 ----
 
+[[upgrading]]
+== Upgrading
+
+Instructions for how to upgrade from earlier versions of Spring Data are provided on the project https://github.com/spring-projects/spring-data-commons/wiki[wiki].
+Follow the links in the https://github.com/spring-projects/spring-data-commons/wiki#release-notes[release notes section] to find the version that you want to upgrade to.
+
+[[getting-help]]
 == Getting Help
 
 Having trouble with Spring Data? We’d love to help!
 
 * 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].
+https://docs.spring.io/spring-data/mongodb/reference/[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].
+* Report bugs with Spring Data MongoDB at https://github.com/spring-projects/spring-data-mongodb/issues[github.com/spring-projects/spring-data-mongodb/issues].
 
+[[reporting-issues]]
 == 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:
+Spring Data uses Github 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://github.com/spring-projects/spring-data-mongodb/issues[issue tracker] to see if someone has already reported the problem.
+* If the issue does not already exist, https://github.com/spring-projects/spring-data-mongodb/issues/new[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, the JVM version, Stacktrace, etc.
+* If you need to paste code, or include a stack trace use https://guides.github.com/features/mastering-markdown/[Markdown] code fences +++```+++.
+
+[[guides]]
+== Guides
+
+The https://spring.io/[spring.io] site contains several guides that show how to use Spring Data step-by-step:
 
-* 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.
+* 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.
+
+[[examples]]
+== Examples
 
+* https://github.com/spring-projects/spring-data-examples/[Spring Data Examples] contains example projects that explain specific features in more detail.
+
+[[building-from-source]]
 == 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.
+You do not need to build from source to use Spring Data. Binaries are available in https://repo.spring.io[repo.spring.io]
+and accessible from Maven using the Maven configuration noted <<maven-configuration,above>>.
+
+NOTE: Configuration for Gradle is similar to Maven.
+
+The best way to get started is by creating a Spring Boot project using MongoDB on https://start.spring.io[start.spring.io].
+Follow this https://start.spring.io/#type=maven-project&language=java&platformVersion=3.0.0&packaging=jar&jvmVersion=17&groupId=com.example&artifactId=demo&name=demo&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.demo&dependencies=data-mongodb[link]
+to build an imperative application and this https://start.spring.io/#type=maven-project&language=java&platformVersion=3.0.0&packaging=jar&jvmVersion=17&groupId=com.example&artifactId=demo&name=demo&description=Demo%20project%20for%20Spring%20Boot&packageName=com.example.demo&dependencies=data-mongodb-reactive[link]
+to build a reactive one.
+
+However, if you want to try out the latest and greatest, Spring Data MongoDB can be easily built with the https://github.com/takari/maven-wrapper[Maven wrapper]
+and minimally, JDK 17 (https://www.oracle.com/java/technologies/downloads/[JDK downloads]).
+
+In order to build Spring Data MongoDB, you will need to https://www.mongodb.com/try/download/community[download]
+and https://docs.mongodb.com/manual/installation/[install a MongoDB distribution].
+
+Once you have installed MongoDB, you need to start a MongoDB server. It is convenient to set an environment variable to
+your MongoDB installation directory (e.g. `MONGODB_HOME`).
+
+To run the full test suite, a https://docs.mongodb.com/manual/tutorial/deploy-replica-set/[MongoDB Replica Set]
+is required.
+
+To run the MongoDB server enter the following command from a command-line:
 
 [source,bash]
 ----
- $ ./mvnw clean install
+$ $MONGODB_HOME/bin/mongod --dbpath $MONGODB_HOME/runtime/data --ipv6 --port 27017 --replSet rs0
+...
+"msg":"Successfully connected to host"
 ----
 
-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].
+Once the MongoDB server starts up, you should see the message (`msg`), "_Successfully connected to host_".
 
-_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._
+Notice the `--dbpath` option to the `mongod` command. You can set this to anything you like, but in this case, we set
+the absolute path to a sub-directory (`runtime/data/`) under the MongoDB installation directory (in `$MONGODB_HOME`).
 
-=== Building reference documentation
+You need to initialize the MongoDB replica set only once on the first time the MongoDB server is started.
+To initialize the replica set, start a mongo client:
 
-Building the documentation builds also the project without running tests.
+[source,bash]
+----
+$ $MONGODB_HOME/bin/mongo
+MongoDB server version: 6.0.0
+...
+----
+
+Then enter the following command:
 
 [source,bash]
 ----
- $ ./mvnw clean install -Pdistribute
+mongo> rs.initiate({ _id: 'rs0', members: [ { _id: 0, host: '127.0.0.1:27017' } ] })
 ----
 
-The generated documentation is available from `target/site/reference/html/index.html`.
+Finally, on UNIX-based system (for example, Linux or Mac OS X) you may need to adjust the `ulimit`.
+In case you need to, you can adjust the `ulimit` with the following command (32768 is just a recommendation):
 
-== Guides
+[source,bash]
+----
+$ ulimit -n 32768
+----
 
-The https://spring.io/[spring.io] site contains several guides that show how to use Spring Data step-by-step:
+You can use `ulimit -a` again to verify the `ulimit` for "_open files_" was set appropriately.
 
-* 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.
+Now you are ready to build Spring Data MongoDB. Simply enter the following `mvnw` (Maven Wrapper) command:
 
-== Examples
+[source,bash]
+----
+ $ ./mvnw clean install
+----
 
-* https://github.com/spring-projects/spring-data-examples/[Spring Data Examples] contains example projects that explain specific features in more detail.
+If you want to build with the regular `mvn` command, you will need https://maven.apache.org/run-maven/index.html[Maven v3.8.0 or above].
+
+_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]
+----
+ $ ./mvnw clean install -Pantora
+----
+
+The generated documentation is available from `target/antora/site/index.html`.
 
+[[license]]
 == License
 
 Spring Data MongoDB is Open Source software released under the https://www.apache.org/licenses/LICENSE-2.0.html[Apache 2.0 license].
diff --git a/ci/README.adoc b/ci/README.adoc
index 3e65271901..f1c11d8496 100644
--- a/ci/README.adoc
+++ b/ci/README.adoc
@@ -10,7 +10,7 @@ All of these use cases are great reasons to essentially run what Concourse does
 
 IMPORTANT: To do this you must have Docker installed on your machine.
 
-1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github springci/spring-data-8-jdk-with-mongodb /bin/bash`
+1. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github springci/spring-data-openjdk17-with-mongodb-5.0.3 /bin/bash`
 +
 This will launch the Docker image and mount your source code at `spring-data-mongodb-github`.
 +
@@ -23,7 +23,7 @@ Since the container is binding to your source, you can make edits from your IDE
 If you need to test the `build.sh` script, do this:
 
 1. `mkdir /tmp/spring-data-mongodb-artifactory`
-2. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github --mount type=bind,source="/tmp/spring-data-mongodb-artifactory",target=/spring-data-mongodb-artifactory springci/spring-data-8-jdk-with-mongodb /bin/bash`
+2. `docker run -it --mount type=bind,source="$(pwd)",target=/spring-data-mongodb-github --mount type=bind,source="/tmp/spring-data-mongodb-artifactory",target=/spring-data-mongodb-artifactory springci/spring-data-openjdk17-with-mongodb-5.0.3 /bin/bash`
 +
 This will launch the Docker image and mount your source code at `spring-data-mongodb-github` and the temporary
 artifactory output directory at `spring-data-mongodb-artifactory`.
@@ -36,4 +36,4 @@ IMPORTANT: `build.sh` doesn't actually push to Artifactory so don't worry about
 It just deploys to a local folder. That way, the `artifactory-resource` later in the pipeline can pick up these artifacts
 and deliver them to artifactory.
 
-NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images.
\ No newline at end of file
+NOTE: Docker containers can eat up disk space fast! From time to time, run `docker system prune` to clean out old images.
diff --git a/ci/openjdk24-mongodb-8.0/Dockerfile b/ci/openjdk24-mongodb-8.0/Dockerfile
new file mode 100644
index 0000000000..0cb80001bf
--- /dev/null
+++ b/ci/openjdk24-mongodb-8.0/Dockerfile
@@ -0,0 +1,25 @@
+ARG BASE
+FROM ${BASE}
+# Any ARG statements before FROM are cleared.
+ARG MONGODB
+
+ENV TZ=Etc/UTC
+ENV DEBIAN_FRONTEND=noninteractive
+ENV MONGO_VERSION=${MONGODB}
+
+RUN set -eux; \
+	sed -i -e 's/archive.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/security.ubuntu.com/mirror.one.com/g' /etc/apt/sources.list && \
+	sed -i -e 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
+	sed -i -e 's/http/https/g' /etc/apt/sources.list && \
+	apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2 wget && \
+	# MongoDB 8.0 release signing key
+	wget -qO - https://www.mongodb.org/static/pgp/server-8.0.asc | apt-key add - && \
+	# Needed when MongoDB creates a 8.0 folder.
+	echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu noble/mongodb-org/8.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-8.0.list && \
+	echo ${TZ} > /etc/timezone
+
+RUN apt-get update && \
+	apt-get install -y mongodb-org=${MONGODB} mongodb-org-server=${MONGODB} mongodb-org-shell=${MONGODB} mongodb-org-mongos=${MONGODB} mongodb-org-tools=${MONGODB} && \
+	apt-get clean && \
+	rm -rf /var/lib/apt/lists/*
diff --git a/ci/openjdk8-mongodb-4.0/Dockerfile b/ci/openjdk8-mongodb-4.0/Dockerfile
deleted file mode 100644
index 18aec0387f..0000000000
--- a/ci/openjdk8-mongodb-4.0/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM adoptopenjdk/openjdk8:latest
-
-RUN apt-get update && apt-get install -y apt-transport-https apt-utils gnupg2
-
-RUN apt-key adv --keyserver hkps://keyserver.ubuntu.com:443 --recv 9DA31620334BD75D9DCB49F368818C72E52529D4
-
-RUN echo "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-4.0.list
-
-RUN apt-get update
-
-RUN apt-get install -y mongodb-org=4.0.9 mongodb-org-server=4.0.9 mongodb-org-shell=4.0.9 mongodb-org-mongos=4.0.9 mongodb-org-tools=4.0.9
-
-RUN apt-get clean \
- && rm -rf /var/lib/apt/lists/*
\ No newline at end of file
diff --git a/ci/openjdk8-mongodb-4.1/Dockerfile b/ci/openjdk8-mongodb-4.1/Dockerfile
deleted file mode 100644
index 78b1278c18..0000000000
--- a/ci/openjdk8-mongodb-4.1/Dockerfile
+++ /dev/null
@@ -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/*
\ No newline at end of file
diff --git a/ci/openjdk8-mongodb-4.2/Dockerfile b/ci/openjdk8-mongodb-4.2/Dockerfile
deleted file mode 100644
index 7b32ffb85c..0000000000
--- a/ci/openjdk8-mongodb-4.2/Dockerfile
+++ /dev/null
@@ -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 e162f504a20cdf15827f718d4b7c549a058f8b6b
-
-RUN 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
-
-RUN apt-get update
-
-RUN 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
-
-RUN apt-get clean \
- && rm -rf /var/lib/apt/lists/*
diff --git a/ci/pipeline.properties b/ci/pipeline.properties
new file mode 100644
index 0000000000..4beebb0dfe
--- /dev/null
+++ b/ci/pipeline.properties
@@ -0,0 +1,30 @@
+# Java versions
+java.main.tag=24.0.1_9-jdk-noble
+java.next.tag=24.0.1_9-jdk-noble
+
+# Docker container images - standard
+docker.java.main.image=library/eclipse-temurin:${java.main.tag}
+docker.java.next.image=library/eclipse-temurin:${java.next.tag}
+
+# Supported versions of MongoDB
+docker.mongodb.8.0.version=8.0.9
+
+# Supported versions of Redis
+docker.redis.6.version=6.2.13
+docker.redis.7.version=7.2.4
+docker.valkey.8.version=8.1.1
+
+# Docker environment settings
+docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
+docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
+
+# Credentials
+docker.registry=
+docker.credentials=hub.docker.com-springbuildmaster
+docker.proxy.registry=https://docker-hub.usw1.packages.broadcom.com
+docker.proxy.credentials=usw1_packages_broadcom_com-jenkins-token
+artifactory.credentials=02bd1690-b54f-4c9f-819d-a77cb7a9822c
+artifactory.url=https://repo.spring.io
+artifactory.repository.snapshot=libs-snapshot-local
+develocity.access-key=gradle_enterprise_secret_access_key
+jenkins.user.name=spring-builds+jenkins
diff --git a/ci/start-replica.sh b/ci/start-replica.sh
new file mode 100755
index 0000000000..9124976f39
--- /dev/null
+++ b/ci/start-replica.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+mkdir -p /tmp/mongodb/db /tmp/mongodb/log
+mongod --setParameter transactionLifetimeLimitSeconds=90 --setParameter maxTransactionLockRequestTimeoutMillis=10000 --dbpath /tmp/mongodb/db --replSet rs0 --fork --logpath /tmp/mongodb/log/mongod.log &
+sleep 10
+mongosh --eval "rs.initiate({_id: 'rs0', members:[{_id: 0, host: '127.0.0.1:27017'}]});"
+sleep 15
diff --git a/pom.xml b/pom.xml
index 4556c2de22..95fc8379d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,17 +5,17 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-mongodb-parent</artifactId>
-	<version>2.3.0.BUILD-SNAPSHOT</version>
+	<version>5.0.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>Spring Data MongoDB</name>
 	<description>MongoDB support for Spring Data</description>
-	<url>https://projects.spring.io/spring-data-mongodb</url>
+	<url>https://spring.io/projects/spring-data-mongodb</url>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>4.0.0-SNAPSHOT</version>
 	</parent>
 
 	<modules>
@@ -26,9 +26,8 @@
 	<properties>
 		<project.type>multi</project.type>
 		<dist.id>spring-data-mongodb</dist.id>
-		<springdata.commons>2.3.0.BUILD-SNAPSHOT</springdata.commons>
-		<mongo>3.11.1</mongo>
-		<mongo.reactivestreams>1.12.0</mongo.reactivestreams>
+		<springdata.commons>4.0.0-SNAPSHOT</springdata.commons>
+		<mongo>5.5.0</mongo>
 		<jmh.version>1.19</jmh.version>
 	</properties>
 
@@ -112,43 +111,66 @@
 		</developer>
 	</developers>
 
+	<scm>
+		<connection>scm:git:https://github.com/spring-projects/spring-data-mongodb.git</connection>
+		<developerConnection>scm:git:git@github.com:spring-projects/spring-data-mongodb.git</developerConnection>
+		<url>https://github.com/spring-projects/spring-data-mongodb</url>
+	</scm>
+
+	<issueManagement>
+		<system>GitHub</system>
+		<url>https://github.com/spring-projects/spring-data-mongodb/issues</url>
+	</issueManagement>
+
 	<profiles>
 		<profile>
-			<id>benchmarks</id>
-			<modules>
-				<module>spring-data-mongodb</module>
-				<module>spring-data-mongodb-distribution</module>
-				<module>spring-data-mongodb-benchmarks</module>
-			</modules>
+			<id>jmh</id>
+			<repositories>
+				<repository>
+					<id>jitpack.io</id>
+					<url>https://jitpack.io</url>
+				</repository>
+			</repositories>
 		</profile>
+		<profile>
+			<id>mongo-4.x</id>
+			<properties>
+				<mongo>4.11.1</mongo>
+				<mongodb-crypt>1.8.0</mongodb-crypt>
+			</properties>
+		</profile>
+
 	</profiles>
 
-	<dependencies>
-		<!-- MongoDB -->
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongo-java-driver</artifactId>
-			<version>${mongo}</version>
-		</dependency>
-	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<!-- MongoDB -->
+			<dependency>
+				<groupId>org.mongodb</groupId>
+				<artifactId>mongodb-driver-bom</artifactId>
+				<version>${mongo}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 
 	<repositories>
 		<repository>
-			<id>spring-libs-snapshot</id>
-			<url>https://repo.spring.io/libs-snapshot</url>
+			<id>spring-snapshot</id>
+			<url>https://repo.spring.io/snapshot</url>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>false</enabled>
+			</releases>
+		</repository>
+		<repository>
+			<id>spring-milestone</id>
+			<url>https://repo.spring.io/milestone</url>
 		</repository>
 	</repositories>
 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-plugins-release</id>
-			<url>https://repo.spring.io/plugins-release</url>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-libs-milestone</id>
-			<url>https://repo.spring.io/libs-milestone</url>
-		</pluginRepository>
-
-	</pluginRepositories>
-
 </project>
diff --git a/settings.xml b/settings.xml
new file mode 100644
index 0000000000..b3227cc110
--- /dev/null
+++ b/settings.xml
@@ -0,0 +1,29 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+	<servers>
+		<server>
+			<id>spring-plugins-release</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-snapshot</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-milestone</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-release</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+	</servers>
+
+</settings>
\ No newline at end of file
diff --git a/spring-data-mongodb-benchmarks/README.md b/spring-data-mongodb-benchmarks/README.md
deleted file mode 100644
index ca14cc11a9..0000000000
--- a/spring-data-mongodb-benchmarks/README.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Benchmarks
-
-Benchmarks are based on [JMH](https://openjdk.java.net/projects/code-tools/jmh/).
-
-# Running Benchmarks
-
-Running benchmarks is disabled by default and can be activated via the `benchmarks` profile.
-To run the benchmarks with default settings use.
-
-```bash
-mvn -P benchmarks clean test
-```
-
-A basic report will be printed to the CLI.
-
-```bash
-# Run complete. Total time: 00:00:15
-
-Benchmark                                    Mode  Cnt        Score       Error  Units
-MappingMongoConverterBenchmark.readObject   thrpt   10  1920157,631 ± 64310,809  ops/s
-MappingMongoConverterBenchmark.writeObject  thrpt   10   782732,857 ± 53804,130  ops/s
-```
-
-## Running all Benchmarks of a specific class
-
-To run all Benchmarks of a specific class, just provide its simple class name via the `benchmark` command line argument.
-
-```bash
-mvn -P benchmarks clean test -D benchmark=MappingMongoConverterBenchmark
-```
-
-## Running a single Benchmark
-
-To run a single Benchmark provide its containing class simple name followed by `#` and the method name via the `benchmark` command line argument.
-
-```bash
-mvn -P benchmarks clean test -D benchmark=MappingMongoConverterBenchmark#readObjectWith2Properties
-```
-
-# Saving Benchmark Results
-
-A detailed benchmark report is stored in JSON format in the `/target/reports/performance` directory.
-To store the report in a different location use the `benchmarkReportDir` command line argument.
-
-## MongoDB
-
-Results can be directly piped to MongoDB by providing a valid [Connection String](https://docs.mongodb.com/manual/reference/connection-string/) via the `publishTo` command line argument.
-
-```bash
-mvn -P benchmarks clean test -D publishTo=mongodb://127.0.0.1:27017
-```
-
-NOTE: If the uri does not explicitly define a database the default `spring-data-mongodb-benchmarks` is used. 
-
-## HTTP Endpoint
-
-The benchmark report can also be posted as `application/json` to an HTTP Endpoint by providing a valid URl via the `publishTo` command line argument.
-
-```bash
-mvn -P benchmarks clean test -D publishTo=http://127.0.0.1:8080/capture-benchmarks
-```
-
-# Customizing Benchmarks
-
-Following options can be set via command line.
-
-Option | Default Value
---- | ---
-warmupIterations | 10
-warmupTime | 1 (seconds)
-measurementIterations | 10
-measurementTime | 1 (seconds)
-forks | 1
-benchmarkReportDir | /target/reports/performance (always relative to project root dir)
-benchmark | .* (single benchmark via `classname#benchmark`)
-publishTo | \[not set\] (mongodb-uri or http-endpoint)
\ No newline at end of file
diff --git a/spring-data-mongodb-benchmarks/pom.xml b/spring-data-mongodb-benchmarks/pom.xml
deleted file mode 100644
index c4766040c1..0000000000
--- a/spring-data-mongodb-benchmarks/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd">
-
-	<modelVersion>4.0.0</modelVersion>
-
-	<parent>
-		<groupId>org.springframework.data</groupId>
-		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>spring-data-mongodb-benchmarks</artifactId>
-	<packaging>jar</packaging>
-
-	<name>Spring Data MongoDB - Microbenchmarks</name>
-
-	<properties>
-		<!-- Skip tests by default; run only if -DskipTests=false is specified or benchmarks profile is activated  -->
-		<skipTests>true</skipTests>
-	</properties>
-
-	<dependencies>
-
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-data-mongodb</artifactId>
-			<version>${project.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>${junit}</version>
-			<scope>compile</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.openjdk.jmh</groupId>
-			<artifactId>jmh-core</artifactId>
-			<version>${jmh.version}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.openjdk.jmh</groupId>
-			<artifactId>jmh-generator-annprocess</artifactId>
-			<version>${jmh.version}</version>
-			<scope>provided</scope>
-		</dependency>
-
-	</dependencies>
-
-	<profiles>
-
-		<profile>
-			<id>benchmarks</id>
-			<properties>
-				<skipTests>false</skipTests>
-			</properties>
-		</profile>
-	</profiles>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>pl.project13.maven</groupId>
-				<artifactId>git-commit-id-plugin</artifactId>
-				<version>2.2.2</version>
-				<executions>
-					<execution>
-						<goals>
-							<goal>revision</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>default-jar</id>
-						<phase>never</phase>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<useSystemClassLoader>false</useSystemClassLoader>
-					<testSourceDirectory>${project.build.sourceDirectory}</testSourceDirectory>
-					<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
-					<excludes>
-						<exclude>**/AbstractMicrobenchmark.java</exclude>
-						<exclude>**/*$*.class</exclude>
-						<exclude>**/generated/*.class</exclude>
-					</excludes>
-					<includes>
-						<include>**/*Benchmark*</include>
-					</includes>
-					<systemPropertyVariables>
-						<benchmarkReportDir>${project.build.directory}/reports/performance</benchmarkReportDir>
-						<project.version>${project.version}</project.version>
-						<git.dirty>${git.dirty}</git.dirty>
-						<git.commit.id>${git.commit.id}</git.commit.id>
-						<git.branch>${git.branch}</git.branch>
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/spring-data-mongodb-benchmarks/src/main/resources/logback.xml b/spring-data-mongodb-benchmarks/src/main/resources/logback.xml
deleted file mode 100644
index bccb2dc4fa..0000000000
--- a/spring-data-mongodb-benchmarks/src/main/resources/logback.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration>
-
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-		<encoder>
-			<pattern>%d %5p %40.40c:%4L - %m%n</pattern>
-		</encoder>
-	</appender>
-
-	<root level="error">
-		<appender-ref ref="console" />
-	</root>
-
-</configuration>
\ No newline at end of file
diff --git a/spring-data-mongodb-distribution/package.json b/spring-data-mongodb-distribution/package.json
new file mode 100644
index 0000000000..4689506b3f
--- /dev/null
+++ b/spring-data-mongodb-distribution/package.json
@@ -0,0 +1,10 @@
+{
+    "dependencies": {
+        "antora": "3.2.0-alpha.6",
+        "@antora/atlas-extension": "1.0.0-alpha.2",
+        "@antora/collector-extension": "1.0.0-alpha.7",
+        "@asciidoctor/tabs": "1.0.0-beta.6",
+        "@springio/antora-extensions": "1.13.0",
+        "@springio/asciidoctor-extensions": "1.0.0-alpha.11"
+    }
+}
diff --git a/spring-data-mongodb-distribution/pom.xml b/spring-data-mongodb-distribution/pom.xml
index ed39c63e76..fc88571622 100644
--- a/spring-data-mongodb-distribution/pom.xml
+++ b/spring-data-mongodb-distribution/pom.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -14,30 +15,59 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<properties>
 		<project.root>${basedir}/..</project.root>
-		<dist.key>SDMONGO</dist.key>
+		<antora.playbook>${project.basedir}/../src/main/antora/antora-playbook.yml</antora.playbook>
 	</properties>
 
 	<build>
+		<resources>
+			<resource>
+				<directory>${project.basedir}/../src/main/antora/resources/antora-resources</directory>
+				<filtering>true</filtering>
+			</resource>
+		</resources>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
+				<version>3.4.0</version>
+				<executions>
+					<execution>
+						<id>timestamp-property</id>
+						<goals>
+							<goal>timestamp-property</goal>
+						</goals>
+						<phase>validate</phase>
+						<configuration>
+							<name>current.year</name>
+							<pattern>yyyy</pattern>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>resources</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
 			</plugin>
 			<plugin>
-				<groupId>org.asciidoctor</groupId>
-				<artifactId>asciidoctor-maven-plugin</artifactId>
-				<configuration>
-					<attributes>
-						<mongo-reactivestreams>${mongo.reactivestreams}</mongo-reactivestreams>
-						<reactor>${reactor}</reactor>
-					</attributes>
-				</configuration>
+				<groupId>org.antora</groupId>
+				<artifactId>antora-maven-plugin</artifactId>
 			</plugin>
 		</plugins>
 
diff --git a/spring-data-mongodb/pom.xml b/spring-data-mongodb/pom.xml
index 25cf02b5d5..6f34da5660 100644
--- a/spring-data-mongodb/pom.xml
+++ b/spring-data-mongodb/pom.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
 
@@ -11,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.data</groupId>
 		<artifactId>spring-data-mongodb-parent</artifactId>
-		<version>2.3.0.BUILD-SNAPSHOT</version>
+		<version>5.0.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -25,6 +27,30 @@
 
 	<dependencies>
 
+		<!-- MongoDB Driver -->
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-core</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-sync</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-driver-reactivestreams</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.mongodb</groupId>
+			<artifactId>mongodb-crypt</artifactId>
+			<optional>true</optional>
+		</dependency>
+
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -41,12 +67,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
@@ -65,6 +85,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>
@@ -81,31 +107,13 @@
 			<optional>true</optional>
 		</dependency>
 
-		<!-- reactive -->
 		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-reactivestreams</artifactId>
-			<version>${mongo.reactivestreams}</version>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<version>3.0.2</version>
 			<optional>true</optional>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mongodb</groupId>
-			<artifactId>mongodb-driver-async</artifactId>
-			<version>${mongo}</version>
-			<optional>true</optional>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mongodb</groupId>
-					<artifactId>mongodb-driver-core</artifactId>
-				</exclusion>
-				<exclusion>
-					<groupId>org.mongodb</groupId>
-					<artifactId>bson</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<dependency>
 			<groupId>io.projectreactor</groupId>
 			<artifactId>reactor-core</artifactId>
@@ -119,35 +127,28 @@
 		</dependency>
 
 		<dependency>
-			<groupId>io.reactivex</groupId>
-			<artifactId>rxjava</artifactId>
-			<version>${rxjava}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>io.reactivex</groupId>
-			<artifactId>rxjava-reactive-streams</artifactId>
-			<version>${rxjava-reactive-streams}</version>
-			<optional>true</optional>
+			<groupId>org.awaitility</groupId>
+			<artifactId>awaitility</artifactId>
+			<version>${awaitility}</version>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>io.reactivex.rxjava2</groupId>
+			<groupId>io.reactivex.rxjava3</groupId>
 			<artifactId>rxjava</artifactId>
-			<version>${rxjava2}</version>
+			<version>${rxjava3}</version>
 			<optional>true</optional>
 		</dependency>
 
-		<!-- CDI -->
-		<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
 		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jcdi_2.0_spec</artifactId>
-			<version>1.0.1</version>
+			<groupId>net.javacrumbs.json-unit</groupId>
+			<artifactId>json-unit-assertj</artifactId>
+			<version>4.1.0</version>
 			<scope>test</scope>
 		</dependency>
 
+		<!-- CDI -->
+		<!-- Dependency order required to build against CDI 1.0 and test with CDI 2.0 -->
 		<dependency>
 			<groupId>javax.interceptor</groupId>
 			<artifactId>javax.interceptor-api</artifactId>
@@ -156,17 +157,17 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
 			<version>${cdi}</version>
 			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax-annotation-api}</version>
+			<groupId>jakarta.annotation</groupId>
+			<artifactId>jakarta.annotation-api</artifactId>
+			<version>${jakarta-annotation-api}</version>
 			<scope>test</scope>
 		</dependency>
 
@@ -179,8 +180,8 @@
 
 		<!-- JSR 303 Validation -->
 		<dependency>
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
 			<version>${validation}</version>
 			<optional>true</optional>
 		</dependency>
@@ -193,37 +194,44 @@
 		</dependency>
 
 		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-validator</artifactId>
-			<version>5.2.4.Final</version>
-			<scope>test</scope>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-observation</artifactId>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-tracing</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>joda-time</groupId>
-			<artifactId>joda-time</artifactId>
-			<version>${jodatime}</version>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>7.0.1.Final</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.threeten</groupId>
-			<artifactId>threetenbp</artifactId>
-			<version>${threetenbp}</version>
+			<groupId>jakarta.el</groupId>
+			<artifactId>jakarta.el-api</artifactId>
+			<version>4.0.0</version>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
+			<groupId>org.glassfish</groupId>
+			<artifactId>jakarta.el</artifactId>
+			<version>4.0.2</version>
+			<scope>provided</scope>
 			<optional>true</optional>
 		</dependency>
 
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jul-to-slf4j</artifactId>
-			<version>${slf4j}</version>
-			<scope>test</scope>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<dependency>
@@ -254,9 +262,42 @@
 		</dependency>
 
 		<dependency>
-			<groupId>javax.transaction</groupId>
-			<artifactId>jta</artifactId>
-			<version>1.1</version>
+			<groupId>org.junit-pioneer</groupId>
+			<artifactId>junit-pioneer</artifactId>
+			<version>0.5.3</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.junit.platform</groupId>
+			<artifactId>junit-platform-launcher</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>junit-jupiter</artifactId>
+			<version>${testcontainers}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>mongodb</artifactId>
+			<version>${testcontainers}</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>jakarta.transaction</groupId>
+			<artifactId>jakarta.transaction-api</artifactId>
+			<version>2.0.0</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core-test</artifactId>
 			<scope>test</scope>
 		</dependency>
 
@@ -287,17 +328,130 @@
 
 		<dependency>
 			<groupId>io.mockk</groupId>
-			<artifactId>mockk</artifactId>
+			<artifactId>mockk-jvm</artifactId>
 			<version>${mockk}</version>
 			<scope>test</scope>
 		</dependency>
 
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-test</artifactId>
+			<scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>com.github.tomakehurst</groupId>
+					<artifactId>wiremock-jre8-standalone</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-tracing-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.micrometer</groupId>
+			<artifactId>micrometer-tracing-integration-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<!-- jMolecules -->
+		<dependency>
+			<groupId>org.jmolecules</groupId>
+			<artifactId>jmolecules-ddd</artifactId>
+			<version>${jmolecules}</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
-	<build>
+	<profiles>
+		<profile>
+			<id>nullaway</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<configuration>
+							<annotationProcessorPaths>
+								<path>
+									<groupId>com.querydsl</groupId>
+									<artifactId>querydsl-apt</artifactId>
+									<version>${querydsl}</version>
+								</path>
+								<path>
+									<groupId>org.openjdk.jmh</groupId>
+									<artifactId>jmh-generator-annprocess</artifactId>
+									<version>${jmh}</version>
+								</path>
+								<path>
+									<groupId>com.google.errorprone</groupId>
+									<artifactId>error_prone_core</artifactId>
+									<version>${errorprone}</version>
+								</path>
+								<path>
+									<groupId>com.uber.nullaway</groupId>
+									<artifactId>nullaway</artifactId>
+									<version>${nullaway}</version>
+								</path>
+							</annotationProcessorPaths>
+						</configuration>
+						<executions>
+							<execution>
+								<id>default-compile</id>
+								<phase>none</phase>
+							</execution>
+							<execution>
+								<id>default-testCompile</id>
+								<phase>none</phase>
+							</execution>
+							<execution>
+								<id>java-compile</id>
+								<phase>compile</phase>
+								<goals>
+									<goal>compile</goal>
+								</goals>
+								<configuration>
+									<compilerArgs>
+										<arg>-XDcompilePolicy=simple</arg>
+										<arg>--should-stop=ifError=FLOW</arg>
+										<arg>-Xplugin:ErrorProne -XepDisableAllChecks -Xep:NullAway:ERROR -XepOpt:NullAway:OnlyNullMarked=true -XepOpt:NullAway:TreatGeneratedAsUnannotated=true -XepOpt:NullAway:CustomContractAnnotations=org.springframework.lang.Contract</arg>
+									</compilerArgs>
+								</configuration>
+							</execution>
+							<execution>
+								<id>java-test-compile</id>
+								<phase>test-compile</phase>
+								<goals>
+									<goal>testCompile</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 
+	<build>
 		<plugins>
 
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>org.openjdk.jmh</groupId>
+							<artifactId>jmh-generator-annprocess</artifactId>
+							<version>${jmh}</version>
+						</path>
+					</annotationProcessorPaths>
+				</configuration>
+			</plugin>
+
 			<plugin>
 				<groupId>com.mysema.maven</groupId>
 				<artifactId>apt-maven-plugin</artifactId>
@@ -316,8 +470,11 @@
 							<goal>test-process</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>target/generated-test-sources</outputDirectory>
-							<processor>org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor</processor>
+							<outputDirectory>target/generated-test-sources
+							</outputDirectory>
+							<processor>
+								org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor
+							</processor>
 						</configuration>
 					</execution>
 				</executions>
@@ -337,15 +494,13 @@
 						<exclude>**/ReactivePerformanceTests.java</exclude>
 					</excludes>
 					<systemPropertyVariables>
-						<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
+						<mongo.client>${mongo}</mongo.client>
+						<mongo.server>${env.MONGO_VERSION}</mongo.server>
+						<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>
 
diff --git a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/ProjectionsBenchmark.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/ProjectionsBenchmark.java
similarity index 95%
rename from spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/ProjectionsBenchmark.java
rename to spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/ProjectionsBenchmark.java
index 4af306a4db..3b0c72cc0b 100644
--- a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/ProjectionsBenchmark.java
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/ProjectionsBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,6 +19,7 @@
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.TearDown;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
@@ -27,8 +28,8 @@
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
 
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 
 /**
@@ -56,7 +57,7 @@ public class ProjectionsBenchmark extends AbstractMicrobenchmark {
 	@Setup
 	public void setUp() {
 
-		client = new MongoClient(new ServerAddress());
+		client = MongoClients.create();
 		template = new MongoTemplate(client, DB_NAME);
 
 		source = new Person();
@@ -83,7 +84,7 @@ public void setUp() {
 	@TearDown
 	public void tearDown() {
 
-		client.dropDatabase(DB_NAME);
+		client.getDatabase(DB_NAME).drop();
 		client.close();
 	}
 
diff --git a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/DbRefMappingBenchmark.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/convert/DbRefMappingBenchmark.java
similarity index 78%
rename from spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/DbRefMappingBenchmark.java
rename to spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/convert/DbRefMappingBenchmark.java
index d647ac6950..53f64f2a50 100644
--- a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/DbRefMappingBenchmark.java
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/convert/DbRefMappingBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,8 +18,6 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,14 +27,15 @@
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
+
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
 
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 
 /**
  * @author Christoph Strobl
@@ -55,7 +54,7 @@ public class DbRefMappingBenchmark extends AbstractMicrobenchmark {
 	@Setup
 	public void setUp() throws Exception {
 
-		client = new MongoClient(new ServerAddress());
+		client = MongoClients.create();
 		template = new MongoTemplate(client, DB_NAME);
 
 		List<RefObject> refObjects = new ArrayList<>();
@@ -80,7 +79,7 @@ public void setUp() throws Exception {
 	@TearDown
 	public void tearDown() {
 
-		client.dropDatabase(DB_NAME);
+		client.getDatabase(DB_NAME).drop();
 		client.close();
 	}
 
@@ -94,18 +93,56 @@ public ObjectWithDBRef readMultipleDbRefs() {
 		return template.findOne(queryObjectWithDBRefList, ObjectWithDBRef.class);
 	}
 
-	@Data
 	static class ObjectWithDBRef {
 
 		private @Id ObjectId id;
 		private @DBRef RefObject ref;
 		private @DBRef List<RefObject> refList;
+
+		public ObjectId getId() {
+			return id;
+		}
+
+		public void setId(ObjectId id) {
+			this.id = id;
+		}
+
+		public RefObject getRef() {
+			return ref;
+		}
+
+		public void setRef(RefObject ref) {
+			this.ref = ref;
+		}
+
+		public List<RefObject> getRefList() {
+			return refList;
+		}
+
+		public void setRefList(List<RefObject> refList) {
+			this.refList = refList;
+		}
 	}
 
-	@Data
 	static class RefObject {
 
 		private @Id String id;
 		private String someValue;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getSomeValue() {
+			return someValue;
+		}
+
+		public void setSomeValue(String someValue) {
+			this.someValue = someValue;
+		}
 	}
 }
diff --git a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java
similarity index 74%
rename from spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java
rename to spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java
index 3b9efee29a..00d2e7034a 100644
--- a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterBenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,11 +15,6 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
@@ -29,25 +24,29 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
+import org.junit.platform.commons.annotation.Testable;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
 import org.openjdk.jmh.annotations.TearDown;
+
 import org.springframework.data.annotation.Id;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
+import org.springframework.util.ObjectUtils;
 
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 
 /**
  * @author Christoph Strobl
  */
 @State(Scope.Benchmark)
+@Testable
 public class MappingMongoConverterBenchmark extends AbstractMicrobenchmark {
 
 	private static final String DB_NAME = "mapping-mongo-converter-benchmark";
@@ -64,13 +63,13 @@ public class MappingMongoConverterBenchmark extends AbstractMicrobenchmark {
 	@Setup
 	public void setUp() throws Exception {
 
-		client = new MongoClient(new ServerAddress());
+		client = MongoClients.create();
 
 		this.mappingContext = new MongoMappingContext();
 		this.mappingContext.setInitialEntitySet(Collections.singleton(Customer.class));
 		this.mappingContext.afterPropertiesSet();
 
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(new SimpleMongoDbFactory(client, DB_NAME));
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(new SimpleMongoClientDatabaseFactory(client, DB_NAME));
 
 		this.converter = new MappingMongoConverter(dbRefResolver, mappingContext);
 		this.converter.setCustomConversions(new MongoCustomConversions(Collections.emptyList()));
@@ -116,7 +115,7 @@ public void setUp() throws Exception {
 	@TearDown
 	public void tearDown() {
 
-		client.dropDatabase(DB_NAME);
+		client.getDatabase(DB_NAME).drop();
 		client.close();
 	}
 
@@ -151,22 +150,36 @@ public Object writeObjectWithListAndMapsOfComplexType() {
 		return sink;
 	}
 
-	@Getter
-	@RequiredArgsConstructor
 	static class Customer {
 
 		private @Id ObjectId id;
 		private final String firstname, lastname;
 		private final Address address;
+
+		public Customer(String firstname, String lastname, Address address) {
+			this.firstname = firstname;
+			this.lastname = lastname;
+			this.address = address;
+		}
 	}
 
-	@Getter
-	@AllArgsConstructor
 	static class Address {
 		private String zipCode, city;
+
+		public Address(String zipCode, String city) {
+			this.zipCode = zipCode;
+			this.city = city;
+		}
+
+		public String getZipCode() {
+			return zipCode;
+		}
+
+		public String getCity() {
+			return city;
+		}
 	}
 
-	@Data
 	static class SlightlyMoreComplexObject {
 
 		@Id String id;
@@ -177,5 +190,59 @@ static class SlightlyMoreComplexObject {
 		Customer customer;
 		List<Address> addressList;
 		Map<String, Customer> customerMap;
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (!(o instanceof SlightlyMoreComplexObject)) {
+				return false;
+			}
+			SlightlyMoreComplexObject that = (SlightlyMoreComplexObject) o;
+			if (intOne != that.intOne) {
+				return false;
+			}
+			if (intTwo != that.intTwo) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(id, that.id)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(stringOne, that.stringOne)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(stringTwo, that.stringTwo)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(renamedField, that.renamedField)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(location, that.location)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(customer, that.customer)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(addressList, that.addressList)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(customerMap, that.customerMap);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(id);
+			result = 31 * result + intOne;
+			result = 31 * result + intTwo;
+			result = 31 * result + ObjectUtils.nullSafeHashCode(stringOne);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(stringTwo);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(renamedField);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(location);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(customer);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(addressList);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(customerMap);
+			return result;
+		}
 	}
 }
diff --git a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java
similarity index 97%
rename from spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java
rename to spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java
index 72119225e8..615500904d 100644
--- a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/AbstractMicrobenchmark.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import java.util.Collection;
 import java.util.Date;
 
-import org.junit.Test;
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Scope;
@@ -33,6 +32,7 @@
 import org.openjdk.jmh.runner.options.ChainedOptionsBuilder;
 import org.openjdk.jmh.runner.options.OptionsBuilder;
 import org.openjdk.jmh.runner.options.TimeValue;
+
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ResourceUtils;
@@ -41,8 +41,8 @@
 /**
  * @author Christoph Strobl
  */
-@Warmup(iterations = AbstractMicrobenchmark.WARMUP_ITERATIONS)
-@Measurement(iterations = AbstractMicrobenchmark.MEASUREMENT_ITERATIONS)
+@Warmup(iterations = AbstractMicrobenchmark.WARMUP_ITERATIONS, time = 2)
+@Measurement(iterations = AbstractMicrobenchmark.MEASUREMENT_ITERATIONS, time = 2)
 @Fork(AbstractMicrobenchmark.FORKS)
 @State(Scope.Thread)
 public class AbstractMicrobenchmark {
@@ -62,7 +62,6 @@ public class AbstractMicrobenchmark {
 	 * @throws Exception
 	 * @see #options(String)
 	 */
-	@Test
 	public void run() throws Exception {
 
 		String includes = includes();
@@ -322,7 +321,7 @@ private void publishResults(Collection<RunResult> results) {
 		try {
 			ResultsWriter.forUri(uri).write(results);
 		} catch (Exception e) {
-			System.err.println(String.format("Cannot save benchmark results to '%s'. Error was %s.", uri, e));
+			System.err.println(String.format("Cannot save benchmark results to '%s'; Error was %s", uri, e));
 		}
 	}
 }
diff --git a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java
similarity index 91%
rename from spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java
rename to spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java
index 2f271527a5..af56908755 100644
--- a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/HttpResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.microbenchmark;
 
-import lombok.SneakyThrows;
 
+import java.io.IOException;
 import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -43,13 +43,20 @@ class HttpResultsWriter implements ResultsWriter {
 	}
 
 	@Override
-	@SneakyThrows
 	public void write(Collection<RunResult> results) {
 
 		if (CollectionUtils.isEmpty(results)) {
 			return;
 		}
 
+		try {
+			doWrite(results);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	private void doWrite(Collection<RunResult> results) throws IOException {
 		StandardEnvironment env = new StandardEnvironment();
 
 		String projectVersion = env.getProperty("project.version", "unknown");
diff --git a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java
similarity index 86%
rename from spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java
rename to spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java
index bcd9de082e..2114d2a06a 100644
--- a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/MongoResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,15 +21,16 @@
 
 import org.bson.Document;
 import org.openjdk.jmh.results.RunResult;
+
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
-import com.mongodb.util.JSON;
 
 /**
  * MongoDB specific {@link ResultsWriter} implementation.
@@ -56,13 +57,14 @@ public void write(Collection<RunResult> results) {
 		String gitDirty = env.getProperty("git.dirty", "no");
 		String gitCommitId = env.getProperty("git.commit.id", "unknown");
 
-		MongoClientURI uri = new MongoClientURI(this.uri);
-		MongoClient client = new MongoClient(uri);
+		ConnectionString connectionString = new ConnectionString(this.uri);
+		MongoClient client = MongoClients.create(this.uri);
 
-		String dbName = StringUtils.hasText(uri.getDatabase()) ? uri.getDatabase() : "spring-data-mongodb-benchmarks";
+		String dbName = StringUtils.hasText(connectionString.getDatabase()) ? connectionString.getDatabase()
+				: "spring-data-mongodb-benchmarks";
 		MongoDatabase db = client.getDatabase(dbName);
 
-		for (BasicDBObject dbo : (List<BasicDBObject>) JSON.parse(ResultsWriter.jsonifyResults(results))) {
+		for (Document dbo : (List<Document>) Document.parse(ResultsWriter.jsonifyResults(results))) {
 
 			String collectionName = extractClass(dbo.get("benchmark").toString());
 
diff --git a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java
similarity index 89%
rename from spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java
rename to spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java
index 59eb58e342..95da1750bc 100644
--- a/spring-data-mongodb-benchmarks/src/main/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/microbenchmark/ResultsWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.microbenchmark;
 
-import lombok.SneakyThrows;
-
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import java.nio.charset.StandardCharsets;
@@ -54,13 +52,12 @@ static ResultsWriter forUri(String uri) {
 	 *
 	 * @param results
 	 * @return json string representation of results.
-	 * @see org.openjdk.jmh.results.format.JSONResultFormat
 	 */
-	@SneakyThrows
 	static String jsonifyResults(Collection<RunResult> results) {
 
 		ByteArrayOutputStream baos = new ByteArrayOutputStream();
-		ResultFormatFactory.getInstance(ResultFormatType.JSON, new PrintStream(baos, true, "UTF-8")).writeOut(results);
+		ResultFormatFactory.getInstance(ResultFormatType.JSON, new PrintStream(baos, true, StandardCharsets.UTF_8))
+				.writeOut(results);
 
 		return new String(baos.toByteArray(), StandardCharsets.UTF_8);
 	}
diff --git a/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/AotRepositoryBenchmark.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/AotRepositoryBenchmark.java
new file mode 100644
index 0000000000..ba9da66da4
--- /dev/null
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/AotRepositoryBenchmark.java
@@ -0,0 +1,153 @@
+/*
+ * Copyright 2025 the original author 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.repository;
+
+import org.junit.platform.commons.annotation.Testable;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+
+import org.springframework.aot.test.generate.TestGenerationContext;
+import org.springframework.core.test.tools.TestCompiler;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
+import org.springframework.data.mongodb.repository.aot.MongoRepositoryContributor;
+import org.springframework.data.mongodb.repository.aot.TestMongoAotRepositoryContext;
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
+import org.springframework.data.mongodb.repository.support.QuerydslMongoPredicateExecutor;
+import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
+import org.springframework.data.repository.core.support.RepositoryFragment;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+/**
+ * Benchmark for AOT repositories.
+ *
+ * @author Mark Paluch
+ */
+@Testable
+public class AotRepositoryBenchmark extends AbstractMicrobenchmark {
+
+	@State(Scope.Benchmark)
+	public static class BenchmarkParameters {
+
+		public static Class<?> aot;
+		public static TestMongoAotRepositoryContext repositoryContext = new TestMongoAotRepositoryContext(
+				SmallerPersonRepository.class,
+				RepositoryComposition.of(RepositoryFragment.structural(SimpleMongoRepository.class),
+						RepositoryFragment.structural(QuerydslMongoPredicateExecutor.class)));
+
+		MongoClient mongoClient;
+		MongoTemplate mongoTemplate;
+		RepositoryComposition.RepositoryFragments fragments;
+		SmallerPersonRepository repositoryProxy;
+
+		@Setup(Level.Trial)
+		public void doSetup() {
+
+			mongoClient = MongoClients.create();
+			mongoTemplate = new MongoTemplate(mongoClient, "jmh");
+
+			if (this.aot == null) {
+
+				TestGenerationContext generationContext = new TestGenerationContext(PersonRepository.class);
+
+				new MongoRepositoryContributor(repositoryContext).contribute(generationContext);
+
+				TestCompiler.forSystem().withCompilerOptions("-parameters").with(generationContext).compile(compiled -> {
+
+					try {
+						this.aot = compiled.getClassLoader().loadClass(SmallerPersonRepository.class.getName() + "Impl__Aot");
+					} catch (Exception e) {
+						throw new RuntimeException(e);
+					}
+				});
+			}
+
+			try {
+				RepositoryFactoryBeanSupport.FragmentCreationContext creationContext = getCreationContext(repositoryContext);
+				fragments = RepositoryComposition.RepositoryFragments
+						.just(aot.getConstructor(MongoOperations.class, RepositoryFactoryBeanSupport.FragmentCreationContext.class)
+								.newInstance(mongoTemplate, creationContext));
+
+				this.repositoryProxy = createRepository(fragments);
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		private RepositoryFactoryBeanSupport.FragmentCreationContext getCreationContext(
+				TestMongoAotRepositoryContext repositoryContext) {
+
+			RepositoryFactoryBeanSupport.FragmentCreationContext creationContext = new RepositoryFactoryBeanSupport.FragmentCreationContext() {
+				@Override
+				public RepositoryMetadata getRepositoryMetadata() {
+					return repositoryContext.getRepositoryInformation();
+				}
+
+				@Override
+				public ValueExpressionDelegate getValueExpressionDelegate() {
+					return ValueExpressionDelegate.create();
+				}
+
+				@Override
+				public ProjectionFactory getProjectionFactory() {
+					return new SpelAwareProxyProjectionFactory();
+				}
+			};
+
+			return creationContext;
+		}
+
+		@TearDown(Level.Trial)
+		public void doTearDown() {
+			mongoClient.close();
+		}
+
+		public SmallerPersonRepository createRepository(RepositoryComposition.RepositoryFragments fragments) {
+			MongoRepositoryFactory repositoryFactory = new MongoRepositoryFactory(mongoTemplate);
+			return repositoryFactory.getRepository(SmallerPersonRepository.class, fragments);
+		}
+
+	}
+
+	@Benchmark
+	public SmallerPersonRepository repositoryBootstrap(BenchmarkParameters parameters) {
+		return parameters.createRepository(parameters.fragments);
+	}
+
+	@Benchmark
+	public Object findDerived(BenchmarkParameters parameters) {
+		return parameters.repositoryProxy.findByFirstname("foo");
+	}
+
+	@Benchmark
+	public Object findAnnotated(BenchmarkParameters parameters) {
+		return parameters.repositoryProxy.findByThePersonsFirstname("foo");
+	}
+
+}
diff --git a/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/SmallerPersonRepository.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/SmallerPersonRepository.java
new file mode 100644
index 0000000000..bc3868e052
--- /dev/null
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/SmallerPersonRepository.java
@@ -0,0 +1,477 @@
+/*
+ * Copyright 2010-2025 the original author 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.repository;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.Person.Sex;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+import org.springframework.data.repository.query.Param;
+
+/**
+ * Sample repository managing {@link Person} entities.
+ *
+ * @author Oliver Gierke
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ * @author Fırat KÜÇÜK
+ * @author Mark Paluch
+ */
+public interface SmallerPersonRepository extends MongoRepository<Person, String>, QuerydslPredicateExecutor<Person> {
+
+	/**
+	 * Returns all {@link Person}s with the given lastname.
+	 *
+	 * @param lastname
+	 * @return
+	 */
+	List<Person> findByLastname(String lastname);
+
+	List<Person> findByLastnameStartsWith(String prefix);
+
+	List<Person> findByLastnameEndsWith(String postfix);
+
+	/**
+	 * Returns all {@link Person}s with the given lastname ordered by their firstname.
+	 *
+	 * @param lastname
+	 * @return
+	 */
+	List<Person> findByLastnameOrderByFirstnameAsc(String lastname);
+
+	/**
+	 * Returns the {@link Person}s with the given firstname. Uses {@link Query} annotation to define the query to be
+	 * executed.
+	 *
+	 * @param firstname
+	 * @return
+	 */
+	@Query(value = "{ 'lastname' : ?0 }", fields = "{ 'firstname': 1, 'lastname': 1}")
+	List<Person> findByThePersonsLastname(String lastname);
+
+	/**
+	 * Returns the {@link Person}s with the given firstname. Uses {@link Query} annotation to define the query to be
+	 * executed.
+	 *
+	 * @param firstname
+	 * @return
+	 */
+	@Query(value = "{ 'firstname' : ?0 }", fields = "{ 'firstname': 1, 'lastname': 1}")
+	List<Person> findByThePersonsFirstname(String firstname);
+
+	// DATAMONGO-871
+	@Query(value = "{ 'firstname' : ?0 }")
+	Person[] findByThePersonsFirstnameAsArray(String firstname);
+
+	/**
+	 * Returns all {@link Person}s with a firstname matching the given one (*-wildcard supported).
+	 *
+	 * @param firstname
+	 * @return
+	 */
+	List<Person> findByFirstnameLike(@Nullable String firstname);
+
+	List<Person> findByFirstnameNotContains(String firstname);
+
+	/**
+	 * Returns all {@link Person}s with a firstname not matching the given one (*-wildcard supported).
+	 *
+	 * @param firstname
+	 * @return
+	 */
+	List<Person> findByFirstnameNotLike(String firstname);
+
+	List<Person> findByFirstnameLikeOrderByLastnameAsc(String firstname, Sort sort);
+
+	List<Person> findBySkillsContains(List<String> skills);
+
+	List<Person> findBySkillsNotContains(List<String> skills);
+
+	@Query("{'age' : { '$lt' : ?0 } }")
+	List<Person> findByAgeLessThan(int age, Sort sort);
+
+	/**
+	 * Returns a scroll of {@link Person}s with a lastname matching the given one (*-wildcards supported).
+	 *
+	 * @param lastname
+	 * @param scrollPosition
+	 * @return
+	 */
+	Window<Person> findTop2ByLastnameLikeOrderByLastnameAscFirstnameAsc(String lastname, ScrollPosition scrollPosition);
+
+	Window<Person> findByLastnameLikeOrderByLastnameAscFirstnameAsc(String lastname, ScrollPosition scrollPosition,
+			Limit limit);
+
+	/**
+	 * Returns a scroll of {@link Person}s applying projections with a lastname matching the given one (*-wildcards
+	 * supported).
+	 *
+	 * @param lastname
+	 * @param pageable
+	 * @return
+	 */
+	Window<PersonSummaryDto> findCursorProjectionByLastnameLike(String lastname, Pageable pageable);
+
+	/**
+	 * Returns a page of {@link Person}s with a lastname matching the given one (*-wildcards supported).
+	 *
+	 * @param lastname
+	 * @param pageable
+	 * @return
+	 */
+	Page<Person> findByLastnameLike(String lastname, Pageable pageable);
+
+	List<Person> findByLastnameLike(String lastname, Sort sort, Limit limit);
+
+	@Query("{ 'lastname' : { '$regex' : '?0', '$options' : 'i'}}")
+	Page<Person> findByLastnameLikeWithPageable(String lastname, Pageable pageable);
+
+	List<Person> findByFirstname(String firstname);
+
+	List<Person> findByLastnameIgnoreCaseIn(String... lastname);
+
+	/**
+	 * Returns all {@link Person}s with a firstname contained in the given varargs.
+	 *
+	 * @param firstnames
+	 * @return
+	 */
+	List<Person> findByFirstnameIn(String... firstnames);
+
+	/**
+	 * Returns all {@link Person}s with a firstname not contained in the given collection.
+	 *
+	 * @param firstnames
+	 * @return
+	 */
+	List<Person> findByFirstnameNotIn(Collection<String> firstnames);
+
+	List<Person> findByFirstnameAndLastname(String firstname, String lastname);
+
+	/**
+	 * Returns all {@link Person}s with an age between the two given values.
+	 *
+	 * @param from
+	 * @param to
+	 * @return
+	 */
+	List<Person> findByAgeBetween(int from, int to);
+
+	/**
+	 * Returns the {@link Person} with the given {@link Address} as shipping address.
+	 *
+	 * @param address
+	 * @return
+	 */
+	Person findByShippingAddresses(Address address);
+
+	/**
+	 * Returns all {@link Person}s with the given {@link Address}.
+	 *
+	 * @param address
+	 * @return
+	 */
+	List<Person> findByAddress(Address address);
+
+	List<Person> findByAddressZipCode(String zipCode);
+
+	List<Person> findByLastnameLikeAndAgeBetween(String lastname, int from, int to);
+
+	List<Person> findByAgeOrLastnameLikeAndFirstnameLike(int age, String lastname, String firstname);
+
+	// TODO: List<Person> findByLocationNear(Point point);
+
+	// TODO: List<Person> findByLocationWithin(Circle circle);
+
+	// TODO: List<Person> findByLocationWithin(Box box);
+
+	// TODO: List<Person> findByLocationWithin(Polygon polygon);
+
+	List<Person> findBySex(Sex sex);
+
+	List<Person> findBySex(Sex sex, Pageable pageable);
+
+	// TODO: List<Person> findByNamedQuery(String firstname);
+
+	List<Person> findByCreator(User user);
+
+	// DATAMONGO-425
+	List<Person> findByCreatedAtLessThan(Date date);
+
+	// DATAMONGO-425
+	List<Person> findByCreatedAtGreaterThan(Date date);
+
+	// DATAMONGO-425
+	@Query("{ 'createdAt' : { '$lt' : ?0 }}")
+	List<Person> findByCreatedAtLessThanManually(Date date);
+
+	// DATAMONGO-427
+	List<Person> findByCreatedAtBefore(Date date);
+
+	// DATAMONGO-427
+	List<Person> findByCreatedAtAfter(Date date);
+
+	// DATAMONGO-472
+	List<Person> findByLastnameNot(String lastname);
+
+	// DATAMONGO-600
+	List<Person> findByCredentials(Credentials credentials);
+
+	// DATAMONGO-636
+	long countByLastname(String lastname);
+
+	// DATAMONGO-636
+	int countByFirstname(String firstname);
+
+	// DATAMONGO-636
+	@Query(value = "{ 'lastname' : ?0 }", count = true)
+	long someCountQuery(String lastname);
+
+	// DATAMONGO-1454
+	boolean existsByFirstname(String firstname);
+
+	// DATAMONGO-1454
+	@ExistsQuery(value = "{ 'lastname' : ?0 }")
+	boolean someExistQuery(String lastname);
+
+	// DATAMONGO-770
+	List<Person> findByFirstnameIgnoreCase(@Nullable String firstName);
+
+	// DATAMONGO-770
+	List<Person> findByFirstnameNotIgnoreCase(String firstName);
+
+	// DATAMONGO-770
+	List<Person> findByFirstnameStartingWithIgnoreCase(String firstName);
+
+	// DATAMONGO-770
+	List<Person> findByFirstnameEndingWithIgnoreCase(String firstName);
+
+	// DATAMONGO-770
+	List<Person> findByFirstnameContainingIgnoreCase(String firstName);
+
+	// DATAMONGO-870
+	Slice<Person> findByAgeGreaterThan(int age, Pageable pageable);
+
+	// DATAMONGO-821
+	@Query("{ creator : { $exists : true } }")
+	Page<Person> findByHavingCreator(Pageable page);
+
+	// DATAMONGO-566
+	List<Person> deleteByLastname(String lastname);
+
+	// DATAMONGO-566
+	Long deletePersonByLastname(String lastname);
+
+	// DATAMONGO-1997
+	Optional<Person> deleteOptionalByLastname(String lastname);
+
+	// DATAMONGO-566
+	@Query(value = "{ 'lastname' : ?0 }", delete = true)
+	List<Person> removeByLastnameUsingAnnotatedQuery(String lastname);
+
+	// DATAMONGO-566
+	@Query(value = "{ 'lastname' : ?0 }", delete = true)
+	Long removePersonByLastnameUsingAnnotatedQuery(String lastname);
+
+	// DATAMONGO-893
+	Page<Person> findByAddressIn(List<Address> address, Pageable page);
+
+	// DATAMONGO-745
+	@Query("{firstname:{$in:?0}, lastname:?1}")
+	Page<Person> findByCustomQueryFirstnamesAndLastname(List<String> firstnames, String lastname, Pageable page);
+
+	// DATAMONGO-745
+	@Query("{lastname:?0, 'address.street':{$in:?1}}")
+	Page<Person> findByCustomQueryLastnameAndAddressStreetInList(String lastname, List<String> streetNames,
+			Pageable page);
+
+	// DATAMONGO-950
+	List<Person> findTop3ByLastnameStartingWith(String lastname);
+
+	// DATAMONGO-950
+	Page<Person> findTop3ByLastnameStartingWith(String lastname, Pageable pageRequest);
+
+	// DATAMONGO-1865
+	Person findFirstBy(); // limits to 1 result if more, just return the first one
+
+	// DATAMONGO-1865
+	Person findPersonByLastnameLike(String firstname); // single person, error if more than one
+
+	// DATAMONGO-1865
+	Optional<Person> findOptionalPersonByLastnameLike(String firstname); // optional still, error when more than one
+
+	// DATAMONGO-1030
+	PersonSummaryDto findSummaryByLastname(String lastname);
+
+	PersonSummaryWithOptional findSummaryWithOptionalByLastname(String lastname);
+
+	@Query("{ ?0 : ?1 }")
+	List<Person> findByKeyValue(String key, String value);
+
+	// DATAMONGO-1165
+	@Query("{ firstname : { $in : ?0 }}")
+	Stream<Person> findByCustomQueryWithStreamingCursorByFirstnames(List<String> firstnames);
+
+	// DATAMONGO-990
+	@Query("{ firstname : ?#{[0]}}")
+	List<Person> findWithSpelByFirstnameForSpELExpressionWithParameterIndexOnly(String firstname);
+
+	// DATAMONGO-990
+	@Query("{ firstname : ?#{[0]}, email: ?#{principal.email} }")
+	List<Person> findWithSpelByFirstnameAndCurrentUserWithCustomQuery(String firstname);
+
+	// DATAMONGO-990
+	@Query("{ firstname : :#{#firstname}}")
+	List<Person> findWithSpelByFirstnameForSpELExpressionWithParameterVariableOnly(@Param("firstname") String firstname);
+
+	// DATAMONGO-1911
+	@Query("{ uniqueId: ?0}")
+	Person findByUniqueId(UUID uniqueId);
+
+	/**
+	 * Returns the count of {@link Person} with the given firstname. Uses {@link CountQuery} annotation to define the
+	 * query to be executed.
+	 *
+	 * @param firstname
+	 * @return
+	 */
+	@CountQuery("{ 'firstname' : ?0 }") // DATAMONGO-1539
+	long countByThePersonsFirstname(String firstname);
+
+	/**
+	 * Deletes {@link Person} entities with the given firstname. Uses {@link DeleteQuery} annotation to define the query
+	 * to be executed.
+	 *
+	 * @param firstname
+	 */
+	@DeleteQuery("{ 'firstname' : ?0 }") // DATAMONGO-1539
+	void deleteByThePersonsFirstname(String firstname);
+
+	// DATAMONGO-1752
+	Iterable<PersonExcerpt> findOpenProjectionBy();
+
+	// DATAMONGO-1752
+	Iterable<PersonSummary> findClosedProjectionBy();
+
+	@Query(sort = "{ age : -1 }")
+	List<Person> findByAgeGreaterThan(int age);
+
+	@Query(sort = "{ age : -1 }")
+	List<Person> findByAgeGreaterThan(int age, Sort sort);
+
+	// TODO: List<Person> findByFirstnameRegex(Pattern pattern);
+
+	@Query(value = "{ 'id' : ?0 }", fields = "{ 'fans': { '$slice': [ ?1, ?2 ] } }")
+	Person findWithSliceInProjection(String id, int skip, int limit);
+
+	@Query(value = "{ 'id' : ?0 }", fields = "{ 'firstname': { '$toUpper': '$firstname' } }")
+	Person findWithAggregationInProjection(String id);
+
+	@Query(value = "{ 'shippingAddresses' : { '$elemMatch' : { 'city' : { '$eq' : 'lnz' } } } }",
+			fields = "{ 'shippingAddresses.$': ?0 }")
+	Person findWithArrayPositionInProjection(int position);
+
+	@Query(value = "{ 'fans' : { '$elemMatch' : { '$ref' : 'user' } } }", fields = "{ 'fans.$': ?0 }")
+	Person findWithArrayPositionInProjectionWithDbRef(int position);
+
+	@Aggregation("{ '$project': { '_id' : '$lastname' } }")
+	List<String> findAllLastnames();
+
+	@Aggregation("{ '$project': { '_id' : '$lastname' } }")
+	Stream<String> findAllLastnamesAsStream();
+
+	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
+	Stream<PersonAggregate> groupStreamByLastnameAnd(String property);
+
+	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
+	List<PersonAggregate> groupByLastnameAnd(String property);
+
+	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
+	Slice<PersonAggregate> groupByLastnameAndAsSlice(String property, Pageable pageable);
+
+	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
+	List<PersonAggregate> groupByLastnameAnd(String property, Sort sort);
+
+	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
+	List<PersonAggregate> groupByLastnameAnd(String property, Pageable page);
+
+	@Aggregation(pipeline = "{ '$group' : { '_id' : null, 'total' : { $sum: '$age' } } }")
+	int sumAge();
+
+	@Aggregation(pipeline = "{ '$group' : { '_id' : null, 'total' : { $sum: '$age' } } }")
+	AggregationResults<org.bson.Document> sumAgeAndReturnAggregationResultWrapper();
+
+	@Aggregation(pipeline = "{ '$group' : { '_id' : null, 'total' : { $sum: '$age' } } }")
+	AggregationResults<SumAge> sumAgeAndReturnAggregationResultWrapperWithConcreteType();
+
+	@Aggregation({ "{ '$match' :  { 'lastname' :  'Matthews'} }",
+			"{ '$project': { _id : 0, firstname : 1, lastname : 1 } }" })
+	Iterable<PersonSummary> findAggregatedClosedInterfaceProjectionBy();
+
+	@Query(value = "{_id:?0}")
+	Optional<org.bson.Document> findDocumentById(String id);
+
+	@Query(value = "{ 'firstname' : ?0, 'lastname' : ?1, 'email' : ?2 , 'age' : ?3, 'sex' : ?4, "
+			+ "'createdAt' : ?5, 'skills' : ?6, 'address.street' : ?7, 'address.zipCode' : ?8, " //
+			+ "'address.city' : ?9, 'uniqueId' : ?10, 'credentials.username' : ?11, 'credentials.password' : ?12 }")
+	Person findPersonByManyArguments(String firstname, String lastname, String email, Integer age, Sex sex,
+			Date createdAt, List<String> skills, String street, String zipCode, //
+			String city, UUID uniqueId, String username, String password);
+
+	List<Person> findByUnwrappedUserUsername(String username);
+
+	List<Person> findByUnwrappedUser(User user);
+
+	int findAndUpdateViaMethodArgAllByLastname(String lastname, UpdateDefinition update);
+
+	@Update("{ '$inc' : { 'visits' : ?1 } }")
+	int findAndIncrementVisitsByLastname(String lastname, int increment);
+
+	@Query("{ 'lastname' : ?0 }")
+	@Update("{ '$inc' : { 'visits' : ?1 } }")
+	int updateAllByLastname(String lastname, int increment);
+
+	@Update(pipeline = { "{ '$set' : { 'visits' : { '$add' : [ '$visits', ?1 ] } } }" })
+	void findAndIncrementVisitsViaPipelineByLastname(String lastname, int increment);
+
+	@Update("{ '$inc' : { 'visits' : ?#{[1]} } }")
+	int findAndIncrementVisitsUsingSpELByLastname(String lastname, int increment);
+
+	@Update("{ '$push' : { 'shippingAddresses' : ?1 } }")
+	int findAndPushShippingAddressByEmail(String email, Address address);
+
+	@Query("{ 'age' : null }")
+	Person findByQueryWithNullEqualityCheck();
+
+	List<Person> findBySpiritAnimal(User user);
+
+}
diff --git a/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/SmallerRepositoryBenchmark.java b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/SmallerRepositoryBenchmark.java
new file mode 100644
index 0000000000..f461a22d31
--- /dev/null
+++ b/spring-data-mongodb/src/jmh/java/org/springframework/data/mongodb/repository/SmallerRepositoryBenchmark.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2025 the original author 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.repository;
+
+import org.junit.platform.commons.annotation.Testable;
+import org.openjdk.jmh.annotations.Benchmark;
+import org.openjdk.jmh.annotations.Level;
+import org.openjdk.jmh.annotations.Scope;
+import org.openjdk.jmh.annotations.Setup;
+import org.openjdk.jmh.annotations.State;
+import org.openjdk.jmh.annotations.TearDown;
+
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.microbenchmark.AbstractMicrobenchmark;
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+/**
+ * Benchmark for AOT repositories.
+ *
+ * @author Mark Paluch
+ */
+@Testable
+public class SmallerRepositoryBenchmark extends AbstractMicrobenchmark {
+
+	@State(Scope.Benchmark)
+	public static class BenchmarkParameters {
+
+		MongoClient mongoClient;
+		MongoTemplate mongoTemplate;
+		SmallerPersonRepository repositoryProxy;
+
+		@Setup(Level.Trial)
+		public void doSetup() {
+
+			mongoClient = MongoClients.create();
+			mongoTemplate = new MongoTemplate(mongoClient, "jmh");
+			repositoryProxy = createRepository();
+		}
+
+		@TearDown(Level.Trial)
+		public void doTearDown() {
+			mongoClient.close();
+		}
+
+		public SmallerPersonRepository createRepository() {
+			MongoRepositoryFactory repositoryFactory = new MongoRepositoryFactory(mongoTemplate);
+			return repositoryFactory.getRepository(SmallerPersonRepository.class);
+		}
+
+	}
+
+	@Benchmark
+	public SmallerPersonRepository repositoryBootstrap(BenchmarkParameters parameters) {
+		return parameters.createRepository();
+	}
+
+	@Benchmark
+	public Object findDerived(BenchmarkParameters parameters) {
+		return parameters.repositoryProxy.findByFirstname("foo");
+	}
+
+	@Benchmark
+	public Object findAnnotated(BenchmarkParameters parameters) {
+		return parameters.repositoryProxy.findByThePersonsFirstname("foo");
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BindableMongoExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BindableMongoExpression.java
new file mode 100644
index 0000000000..3ae41aad35
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BindableMongoExpression.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2021-2025 the original author 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 java.util.Arrays;
+
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
+import org.springframework.data.util.Lazy;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * A {@link MongoExpression} using the {@link ParameterBindingDocumentCodec} for parsing a raw ({@literal json})
+ * expression. The expression will be wrapped within <code>{ ... }</code> if necessary. The actual parsing and parameter
+ * binding of placeholders like {@code ?0} is delayed upon first call on the target {@link Document} via
+ * {@link #toDocument()}. <br />
+ *
+ * <pre class="code">
+ * $toUpper : $name                -> { '$toUpper' : '$name' }
+ *
+ * { '$toUpper' : '$name' }        -> { '$toUpper' : '$name' }
+ *
+ * { '$toUpper' : '?0' }, "$name"  -> { '$toUpper' : '$name' }
+ * </pre>
+ *
+ * Some types might require a special {@link org.bson.codecs.Codec}. If so, make sure to provide a {@link CodecRegistry}
+ * containing the required {@link org.bson.codecs.Codec codec} via {@link #withCodecRegistry(CodecRegistry)}.
+ *
+ * @author Christoph Strobl
+ * @author Giacomo Baso
+ * @since 3.2
+ */
+public class BindableMongoExpression implements MongoExpression {
+
+	private final String expressionString;
+
+	private final @Nullable CodecRegistryProvider codecRegistryProvider;
+
+	private final Object @Nullable [] args;
+
+	private final Lazy<Document> target;
+
+	/**
+	 * Create a new instance of {@link BindableMongoExpression}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @param args must not be {@literal null} but may contain {@literal null} elements.
+	 */
+	public BindableMongoExpression(String expression, Object @Nullable [] args) {
+		this(expression, null, args);
+	}
+
+	/**
+	 * Create a new instance of {@link BindableMongoExpression}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @param codecRegistryProvider can be {@literal null}.
+	 * @param args must not be {@literal null} but may contain {@literal null} elements.
+	 */
+	public BindableMongoExpression(String expression, @Nullable CodecRegistryProvider codecRegistryProvider,
+			Object @Nullable [] args) {
+
+		Assert.notNull(expression, "Expression must not be null");
+
+		this.expressionString = expression;
+		this.codecRegistryProvider = codecRegistryProvider;
+		this.args = args;
+		this.target = Lazy.of(this::parse);
+	}
+
+	/**
+	 * Provide the {@link CodecRegistry} used to convert expressions.
+	 *
+	 * @param codecRegistry must not be {@literal null}.
+	 * @return new instance of {@link BindableMongoExpression}.
+	 */
+	@Contract("_ -> new")
+	public BindableMongoExpression withCodecRegistry(CodecRegistry codecRegistry) {
+		return new BindableMongoExpression(expressionString, () -> codecRegistry, args);
+	}
+
+	/**
+	 * Provide the arguments to bind to the placeholders via their index.
+	 *
+	 * @param args must not be {@literal null}.
+	 * @return new instance of {@link BindableMongoExpression}.
+	 */
+	@Contract("_ -> new")
+	public BindableMongoExpression bind(Object... args) {
+		return new BindableMongoExpression(expressionString, codecRegistryProvider, args);
+	}
+
+	@Override
+	public Document toDocument() {
+		return target.get();
+	}
+
+	@Override
+	public String toString() {
+		return "BindableMongoExpression{" + "expressionString='" + expressionString + '\'' + ", args="
+				+ Arrays.toString(args) + '}';
+	}
+
+	private Document parse() {
+
+		String expression = wrapJsonIfNecessary(expressionString);
+
+		if (ObjectUtils.isEmpty(args)) {
+
+			if (codecRegistryProvider == null) {
+				return Document.parse(expression);
+			}
+
+			return Document.parse(expression, codecRegistryProvider.getCodecFor(Document.class)
+					.orElseGet(() -> new DocumentCodec(codecRegistryProvider.getCodecRegistry())));
+		}
+
+		ParameterBindingDocumentCodec codec = codecRegistryProvider == null ? new ParameterBindingDocumentCodec()
+				: new ParameterBindingDocumentCodec(codecRegistryProvider.getCodecRegistry());
+		return codec.decode(expression, args);
+	}
+
+	private static String wrapJsonIfNecessary(String json) {
+
+		if (!StringUtils.hasText(json)) {
+			return json;
+		}
+
+		String raw = json.trim();
+		return (raw.startsWith("{") && raw.endsWith("}")) ? raw : "{%s}".formatted(raw);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BulkOperationException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BulkOperationException.java
index 678f5c7f59..12d8c966af 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/BulkOperationException.java
+++ b/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-2025 the original author 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,11 +17,12 @@
 
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 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 +39,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 message can be {@literal null}.
 	 * @param source must not be {@literal null}.
 	 */
-	public BulkOperationException(String message, BulkWriteException source) {
+	public BulkOperationException(@Nullable String message, MongoBulkWriteException source) {
 
 		super(message, source);
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ClientSessionException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ClientSessionException.java
index 14a4e39cd8..c59eecb43a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ClientSessionException.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.NonTransientDataAccessException;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link NonTransientDataAccessException} specific to MongoDB {@link com.mongodb.session.ClientSession} related data
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CodecRegistryProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CodecRegistryProvider.java
index 4ede50ce00..53515f9fcd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/CodecRegistryProvider.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ default boolean hasCodecFor(Class<?> type) {
 	 */
 	default <T> Optional<Codec<T>> getCodecFor(Class<T> type) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 
 		try {
 			return Optional.of(getCodecRegistry().get(type));
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DefaultMongoTransactionOptionsResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DefaultMongoTransactionOptionsResolver.java
new file mode 100644
index 0000000000..87201ef9ee
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/DefaultMongoTransactionOptionsResolver.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2024-2025 the original author 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 java.util.Map;
+import java.util.Set;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Default implementation of {@link MongoTransactionOptions} using {@literal mongo:} as {@link #getLabelPrefix() label
+ * prefix} creating {@link SimpleMongoTransactionOptions} out of a given argument {@link Map}. Uses
+ * {@link SimpleMongoTransactionOptions#KNOWN_KEYS} to validate entries in arguments to resolve and errors on unknown
+ * entries.
+ *
+ * @author Christoph Strobl
+ * @since 4.3
+ */
+enum DefaultMongoTransactionOptionsResolver implements MongoTransactionOptionsResolver {
+
+	INSTANCE;
+
+	private static final String PREFIX = "mongo:";
+
+	@Override
+	public MongoTransactionOptions convert(Map<String, String> options) {
+
+		validateKeys(options.keySet());
+		return SimpleMongoTransactionOptions.of(options);
+	}
+
+	@Override
+	public @Nullable String getLabelPrefix() {
+		return PREFIX;
+	}
+
+	private static void validateKeys(Set<String> keys) {
+
+		if (!SimpleMongoTransactionOptions.KNOWN_KEYS.containsAll(keys)) {
+
+			throw new IllegalArgumentException("Transaction labels contained invalid values. Has to be one of %s"
+					.formatted(SimpleMongoTransactionOptions.KNOWN_KEYS));
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java
index bd3cbfe20a..f95a3c5310 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/InvalidMongoDbApiUsageException.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/LazyLoadingException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/LazyLoadingException.java
index f05eff0739..3fc3f82fbf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/LazyLoadingException.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,8 +25,10 @@ public class LazyLoadingException extends UncategorizedDataAccessException {
 	private static final long serialVersionUID = -7089224903873220037L;
 
 	/**
-	 * @param msg
-	 * @param cause
+	 * Constructor for LazyLoadingException.
+	 *
+	 * @param msg the detail message.
+	 * @param cause the exception thrown by underlying data access API.
 	 */
 	public LazyLoadingException(String msg, Throwable cause) {
 		super(msg, cause);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java
index 88ddc7e86d..72b2794d05 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoCollectionUtils.java
+++ b/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-2025 the original author 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,8 +20,8 @@
 
 /**
  * Helper class featuring helper methods for working with MongoDb collections.
- * <p/>
- * <p/>
+ * <br />
+ * <br />
  * Mainly intended for internal use within the framework.
  *
  * @author Thomas Risberg
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseFactory.java
similarity index 65%
rename from spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseFactory.java
index 50a9871899..1fcd5de516 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDbFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 
 import com.mongodb.ClientSessionOptions;
-import com.mongodb.DB;
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoDatabase;
 
@@ -31,25 +30,26 @@
  * @author Mark Pollack
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @since 3.0
  */
-public interface MongoDbFactory extends CodecRegistryProvider, MongoSessionProvider {
+public interface MongoDatabaseFactory extends CodecRegistryProvider, MongoSessionProvider {
 
 	/**
-	 * Creates a default {@link MongoDatabase} instance.
+	 * Obtain a {@link MongoDatabase} from the underlying factory.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getDb() throws DataAccessException;
+	MongoDatabase getMongoDatabase() throws DataAccessException;
 
 	/**
-	 * 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
+	 * @param dbName must not be {@literal null}.
+	 * @return never {@literal null}.
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getDb(String dbName) throws DataAccessException;
+	MongoDatabase getMongoDatabase(String dbName) throws DataAccessException;
 
 	/**
 	 * Exposes a shared {@link MongoExceptionTranslator}.
@@ -58,16 +58,6 @@ public interface MongoDbFactory extends CodecRegistryProvider, MongoSessionProvi
 	 */
 	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
-	DB getLegacyDb();
-
 	/**
 	 * Get the underlying {@link CodecRegistry} used by the MongoDB Java driver.
 	 *
@@ -75,7 +65,7 @@ public interface MongoDbFactory extends CodecRegistryProvider, MongoSessionProvi
 	 */
 	@Override
 	default CodecRegistry getCodecRegistry() {
-		return getDb().getCodecRegistry();
+		return getMongoDatabase().getCodecRegistry();
 	}
 
 	/**
@@ -88,29 +78,29 @@ default CodecRegistry getCodecRegistry() {
 	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}.
+	 * 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 MongoDbFactory withSession(ClientSessionOptions options) {
+	default MongoDatabaseFactory 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.
+	 * 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
 	 */
-	MongoDbFactory withSession(ClientSession session);
+	MongoDatabaseFactory withSession(ClientSession session);
 
 	/**
-	 * Returns if the given {@link MongoDbFactory} is bound to a {@link ClientSession} that has an
+	 * 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.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseUtils.java
index 2311c00098..042a5ba1d3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoDatabaseUtils.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.transaction.support.ResourceHolderSynchronization;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -27,10 +27,9 @@
 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 />
+ * {@link com.mongodb.client.MongoCollection} suitable for transactional usage. <br />
  * <strong>Note:</strong> Intended for internal usage only.
  *
  * @author Christoph Strobl
@@ -41,93 +40,92 @@
 public class MongoDatabaseUtils {
 
 	/**
-	 * Obtain the default {@link MongoDatabase database} form the given {@link MongoDbFactory factory} using
-	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
-	 * <p />
+	 * Obtain the default {@link MongoDatabase database} form the given {@link MongoDatabaseFactory factory} using
+	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}. <br />
 	 * 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}.
-	 * <p />
+	 * Obtain the default {@link MongoDatabase database} form the given {@link MongoDatabaseFactory factory}. <br />
 	 * 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
-	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
-	 * <p />
+	 * Obtain the {@link MongoDatabase database} with given name form the given {@link MongoDatabaseFactory factory} using
+	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}. <br />
 	 * 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(@Nullable 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}.
-	 * <p />
+	 * Obtain the {@link MongoDatabase database} with given name form the given {@link MongoDatabaseFactory factory}.
+	 * <br />
 	 * 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(@Nullable 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!");
+		Assert.notNull(factory, "Factory must not be null");
 
-		if (!TransactionSynchronizationManager.isSynchronizationActive()) {
-			return StringUtils.hasText(dbName) ? factory.getDb(dbName) : factory.getDb();
+		if (sessionSynchronization == SessionSynchronization.NEVER
+				|| !TransactionSynchronizationManager.isSynchronizationActive()) {
+			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;
@@ -137,8 +135,8 @@ public static boolean isTransactionActive(MongoDbFactory dbFactory) {
 		return resourceHolder != null && resourceHolder.hasActiveTransaction();
 	}
 
-	@Nullable
-	private static ClientSession doGetSession(MongoDbFactory dbFactory, SessionSynchronization sessionSynchronization) {
+	private static @Nullable ClientSession doGetSession(MongoDatabaseFactory dbFactory,
+			SessionSynchronization sessionSynchronization) {
 
 		MongoResourceHolder resourceHolder = (MongoResourceHolder) TransactionSynchronizationManager.getResource(dbFactory);
 
@@ -169,7 +167,7 @@ private static ClientSession doGetSession(MongoDbFactory dbFactory, SessionSynch
 		return resourceHolder.getSession();
 	}
 
-	private static ClientSession createClientSession(MongoDbFactory dbFactory) {
+	private static ClientSession createClientSession(MongoDatabaseFactory dbFactory) {
 		return dbFactory.getSession(ClientSessionOptions.builder().causallyConsistent(true).build());
 	}
 
@@ -184,25 +182,17 @@ private static class MongoSessionSynchronization extends ResourceHolderSynchroni
 
 		private final MongoResourceHolder resourceHolder;
 
-		MongoSessionSynchronization(MongoResourceHolder resourceHolder, MongoDbFactory dbFactory) {
+		MongoSessionSynchronization(MongoResourceHolder resourceHolder, MongoDatabaseFactory dbFactory) {
 
 			super(resourceHolder, dbFactory);
 			this.resourceHolder = resourceHolder;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.ResourceHolderSynchronization#shouldReleaseBeforeCompletion()
-		 */
 		@Override
 		protected boolean shouldReleaseBeforeCompletion() {
 			return false;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.ResourceHolderSynchronization#processResourceAfterCommit(java.lang.Object)
-		 */
 		@Override
 		protected void processResourceAfterCommit(MongoResourceHolder resourceHolder) {
 
@@ -211,10 +201,6 @@ protected void processResourceAfterCommit(MongoResourceHolder resourceHolder) {
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.ResourceHolderSynchronization#afterCompletion(int)
-		 */
 		@Override
 		public void afterCompletion(int status) {
 
@@ -225,10 +211,6 @@ public void afterCompletion(int status) {
 			super.afterCompletion(status);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.ResourceHolderSynchronization#releaseResource(java.lang.Object, java.lang.Object)
-		 */
 		@Override
 		protected void releaseResource(MongoResourceHolder resourceHolder, Object resourceKey) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoExpression.java
new file mode 100644
index 0000000000..a087439d72
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoExpression.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021-2025 the original author 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;
+
+/**
+ * Wrapper object for MongoDB expressions like {@code $toUpper : $name} that manifest as {@link org.bson.Document} when
+ * passed on to the driver.
+ * <br />
+ * A set of predefined {@link MongoExpression expressions}, including a
+ * {@link org.springframework.data.mongodb.core.aggregation.AggregationSpELExpression SpEL based variant} for method
+ * like expressions (eg. {@code toUpper(name)}) are available via the
+ * {@link org.springframework.data.mongodb.core.aggregation Aggregation API}.
+ *
+ * @author Christoph Strobl
+ * @since 3.2
+ * @see org.springframework.data.mongodb.core.aggregation.ArithmeticOperators
+ * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators
+ * @see org.springframework.data.mongodb.core.aggregation.ComparisonOperators
+ * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators
+ * @see org.springframework.data.mongodb.core.aggregation.ConvertOperators
+ * @see org.springframework.data.mongodb.core.aggregation.DateOperators
+ * @see org.springframework.data.mongodb.core.aggregation.ObjectOperators
+ * @see org.springframework.data.mongodb.core.aggregation.SetOperators
+ * @see org.springframework.data.mongodb.core.aggregation.StringOperators
+ */
+@FunctionalInterface
+public interface MongoExpression {
+
+	/**
+	 * Create a new {@link MongoExpression} from plain {@link String} (eg. {@code $toUpper : $name}). <br />
+	 * The given expression will be wrapped with <code>{ ... }</code> to match an actual MongoDB {@link org.bson.Document}
+	 * if necessary.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link MongoExpression}.
+	 */
+	static MongoExpression create(String expression) {
+		return new BindableMongoExpression(expression, null);
+	}
+
+	/**
+	 * Create a new {@link MongoExpression} from plain {@link String} containing placeholders (eg. {@code $toUpper : ?0})
+	 * that will be resolved on first call of {@link #toDocument()}. <br />
+	 * The given expression will be wrapped with <code>{ ... }</code> to match an actual MongoDB {@link org.bson.Document}
+	 * if necessary.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link MongoExpression}.
+	 */
+	static MongoExpression create(String expression, Object... args) {
+		return new BindableMongoExpression(expression, args);
+	}
+
+	/**
+	 * Obtain the native {@link org.bson.Document} representation.
+	 *
+	 * @return never {@literal null}.
+	 */
+	org.bson.Document toDocument();
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoManagedTypes.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoManagedTypes.java
new file mode 100644
index 0000000000..39c4815d47
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoManagedTypes.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2022-2025 the original author 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 java.util.Arrays;
+import java.util.function.Consumer;
+
+import org.springframework.data.domain.ManagedTypes;
+
+/**
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+public final class MongoManagedTypes implements ManagedTypes {
+
+	private final ManagedTypes delegate;
+
+	private MongoManagedTypes(ManagedTypes types) {
+		this.delegate = types;
+	}
+
+	/**
+	 * Wraps an existing {@link ManagedTypes} object with {@link MongoManagedTypes}.
+	 *
+	 * @param managedTypes
+	 * @return
+	 */
+	public static MongoManagedTypes from(ManagedTypes managedTypes) {
+		return new MongoManagedTypes(managedTypes);
+	}
+
+	/**
+	 * Factory method used to construct {@link MongoManagedTypes} from the given array of {@link Class types}.
+	 *
+	 * @param types array of {@link Class types} used to initialize the {@link ManagedTypes}; must not be {@literal null}.
+	 * @return new instance of {@link MongoManagedTypes} initialized from {@link Class types}.
+	 */
+	public static MongoManagedTypes from(Class<?>... types) {
+		return fromIterable(Arrays.asList(types));
+	}
+
+	/**
+	 * Factory method used to construct {@link MongoManagedTypes} from the given, required {@link Iterable} of
+	 * {@link Class types}.
+	 *
+	 * @param types {@link Iterable} of {@link Class types} used to initialize the {@link ManagedTypes}; must not be
+	 *          {@literal null}.
+	 * @return new instance of {@link MongoManagedTypes} initialized the given, required {@link Iterable} of {@link Class
+	 *         types}.
+	 */
+	public static MongoManagedTypes fromIterable(Iterable<? extends Class<?>> types) {
+		return from(ManagedTypes.fromIterable(types));
+	}
+
+	/**
+	 * Factory method to return an empty {@link MongoManagedTypes} object.
+	 *
+	 * @return an empty {@link MongoManagedTypes} object.
+	 */
+	public static MongoManagedTypes empty() {
+		return from(ManagedTypes.empty());
+	}
+
+	@Override
+	public void forEach(Consumer<Class<?>> action) {
+		delegate.forEach(action);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoResourceHolder.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoResourceHolder.java
index 8c2c2b9547..81c25d0998 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoResourceHolder.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.support.ResourceHolderSupport;
 
@@ -23,8 +23,7 @@
 
 /**
  * MongoDB specific {@link ResourceHolderSupport resource holder}, wrapping a {@link ClientSession}.
- * {@link MongoTransactionManager} binds instances of this class to the thread.
- * <p />
+ * {@link MongoTransactionManager} binds instances of this class to the thread. <br />
  * <strong>Note:</strong> Intended for internal usage only.
  *
  * @author Christoph Strobl
@@ -36,15 +35,15 @@
 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;
@@ -68,16 +67,16 @@ ClientSession getRequiredSession() {
 		ClientSession session = getSession();
 
 		if (session == null) {
-			throw new IllegalStateException("No session available!");
+			throw new IllegalStateException("No session available");
 		}
 
 		return session;
 	}
 
 	/**
-	 * @return the associated {@link MongoDbFactory}.
+	 * @return the associated {@link MongoDatabaseFactory}.
 	 */
-	public MongoDbFactory getDbFactory() {
+	public MongoDatabaseFactory getDbFactory() {
 		return dbFactory;
 	}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoSessionProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoSessionProvider.java
index d264f4e9cc..645b3508db 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoSessionProvider.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionException.java
index ff41b171cf..3d7bec6780 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionException.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A specific {@link ClientSessionException} related to issues with a transaction such as aborted or non existing
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionManager.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionManager.java
index 43f0289d61..1f97bb69e9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionManager.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionSystemException;
@@ -36,18 +36,15 @@
 
 /**
  * A {@link org.springframework.transaction.PlatformTransactionManager} implementation that manages
- * {@link ClientSession} based transactions for a single {@link MongoDbFactory}.
- * <p />
- * Binds a {@link ClientSession} from the specified {@link MongoDbFactory} to the thread.
- * <p />
+ * {@link ClientSession} based transactions for a single {@link MongoDatabaseFactory}. <br />
+ * Binds a {@link ClientSession} from the specified {@link MongoDatabaseFactory} to the thread. <br />
  * {@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 />
+ * commit} or {@link ClientSession#abortTransaction() abort} a transaction. <br />
  * 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.
- * <p />
+ * {@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. <br />
  * By default failure of a {@literal commit} operation raises a {@link TransactionSystemException}. One may override
  * {@link #doCommit(MongoTransactionObject)} to implement the
  * <a href="https://docs.mongodb.com/manual/core/transactions/#retry-commit-operation">Retry Commit Operation</a>
@@ -58,57 +55,72 @@
  * @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 TransactionOptions options;
+	private @Nullable MongoDatabaseFactory databaseFactory;
+	private MongoTransactionOptions options;
+	private final MongoTransactionOptionsResolver transactionOptionsResolver;
 
 	/**
-	 * 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}.
-	 * <p />
+	 * Create a new {@link MongoTransactionManager} for bean-style usage. <br />
+	 * <strong>Note:</strong>The {@link MongoDatabaseFactory db factory} has to be
+	 * {@link #setDatabaseFactory(MongoDatabaseFactory) set} before using the instance. Use this constructor to prepare a
+	 * {@link MongoTransactionManager} via a {@link org.springframework.beans.factory.BeanFactory}. <br />
 	 * 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 #setDatabaseFactory(MongoDatabaseFactory)
 	 * @see #setTransactionSynchronization(int)
 	 */
-	public MongoTransactionManager() {}
+	public MongoTransactionManager() {
+
+		this.transactionOptionsResolver = MongoTransactionOptionsResolver.defaultResolver();
+		this.options = MongoTransactionOptions.NONE;
+	}
 
 	/**
-	 * 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}.
+	 * @param databaseFactory must not be {@literal null}.
 	 */
-	public MongoTransactionManager(MongoDbFactory dbFactory) {
-		this(dbFactory, null);
+	public MongoTransactionManager(MongoDatabaseFactory databaseFactory) {
+		this(databaseFactory, 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 databaseFactory must not be {@literal null}.
 	 * @param options can be {@literal null}.
 	 */
-	public MongoTransactionManager(MongoDbFactory dbFactory, @Nullable TransactionOptions options) {
+	public MongoTransactionManager(MongoDatabaseFactory databaseFactory, @Nullable TransactionOptions options) {
+		this(databaseFactory, MongoTransactionOptionsResolver.defaultResolver(), MongoTransactionOptions.of(options));
+	}
+
+	/**
+	 * 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 databaseFactory must not be {@literal null}.
+	 * @param transactionOptionsResolver must not be {@literal null}.
+	 * @param defaultTransactionOptions can be {@literal null}.
+	 * @since 4.3
+	 */
+	public MongoTransactionManager(MongoDatabaseFactory databaseFactory,
+			MongoTransactionOptionsResolver transactionOptionsResolver, MongoTransactionOptions defaultTransactionOptions) {
 
-		Assert.notNull(dbFactory, "DbFactory must not be null!");
+		Assert.notNull(databaseFactory, "MongoDatabaseFactory must not be null");
+		Assert.notNull(transactionOptionsResolver, "MongoTransactionOptionsResolver must not be null");
 
-		this.dbFactory = dbFactory;
-		this.options = options;
+		this.databaseFactory = databaseFactory;
+		this.transactionOptionsResolver = transactionOptionsResolver;
+		this.options = defaultTransactionOptions;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doGetTransaction()
-	 */
 	@Override
 	protected Object doGetTransaction() throws TransactionException {
 
@@ -117,19 +129,11 @@ protected Object doGetTransaction() throws TransactionException {
 		return new MongoTransactionObject(resourceHolder);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#isExistingTransaction(java.lang.Object)
-	 */
 	@Override
 	protected boolean isExistingTransaction(Object transaction) throws TransactionException {
 		return extractMongoTransaction(transaction).hasResourceHolder();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doBegin(java.lang.Object, org.springframework.transaction.TransactionDefinition)
-	 */
 	@Override
 	protected void doBegin(Object transaction, TransactionDefinition definition) throws TransactionException {
 
@@ -145,7 +149,9 @@ protected void doBegin(Object transaction, TransactionDefinition definition) thr
 		}
 
 		try {
-			mongoTransactionObject.startTransaction(options);
+			MongoTransactionOptions mongoTransactionOptions = transactionOptionsResolver.resolve(definition)
+					.mergeWith(options);
+			mongoTransactionObject.startTransaction(mongoTransactionOptions.toDriverOptions());
 		} catch (MongoException ex) {
 			throw new TransactionSystemException(String.format("Could not start Mongo transaction for session %s.",
 					debugString(mongoTransactionObject.getSession())), ex);
@@ -159,10 +165,6 @@ protected void doBegin(Object transaction, TransactionDefinition definition) thr
 		TransactionSynchronizationManager.bindResource(getRequiredDbFactory(), resourceHolder);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doSuspend(java.lang.Object)
-	 */
 	@Override
 	protected Object doSuspend(Object transaction) throws TransactionException {
 
@@ -172,19 +174,11 @@ protected Object doSuspend(Object transaction) throws TransactionException {
 		return TransactionSynchronizationManager.unbindResource(getRequiredDbFactory());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doResume(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	protected void doResume(@Nullable Object transaction, Object suspendedResources) {
 		TransactionSynchronizationManager.bindResource(getRequiredDbFactory(), suspendedResources);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doCommit(org.springframework.transaction.support.DefaultTransactionStatus)
-	 */
 	@Override
 	protected final void doCommit(DefaultTransactionStatus status) throws TransactionException {
 
@@ -211,8 +205,9 @@ protected final void doCommit(DefaultTransactionStatus status) throws Transactio
 	 * By default those labels are ignored, nevertheless one might check for
 	 * {@link MongoException#UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL transient commit errors labels} and retry the the
 	 * commit. <br />
+	 * 
+	 * <pre>
 	 * <code>
-	 *     <pre>
 	 * int retries = 3;
 	 * do {
 	 *     try {
@@ -225,8 +220,8 @@ protected final void doCommit(DefaultTransactionStatus status) throws Transactio
 	 *     }
 	 *     Thread.sleep(500);
 	 * } while (--retries > 0);
-	 *     </pre>
 	 * </code>
+	 * </pre>
 	 *
 	 * @param transactionObject never {@literal null}.
 	 * @throws Exception in case of transaction errors.
@@ -235,10 +230,6 @@ protected void doCommit(MongoTransactionObject transactionObject) throws Excepti
 		transactionObject.commitTransaction();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doRollback(org.springframework.transaction.support.DefaultTransactionStatus)
-	 */
 	@Override
 	protected void doRollback(DefaultTransactionStatus status) throws TransactionException {
 
@@ -258,10 +249,6 @@ protected void doRollback(DefaultTransactionStatus status) throws TransactionExc
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doSetRollbackOnly(org.springframework.transaction.support.DefaultTransactionStatus)
-	 */
 	@Override
 	protected void doSetRollbackOnly(DefaultTransactionStatus status) throws TransactionException {
 
@@ -269,10 +256,6 @@ protected void doSetRollbackOnly(DefaultTransactionStatus status) throws Transac
 		transactionObject.getRequiredResourceHolder().setRollbackOnly();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.transaction.support.AbstractPlatformTransactionManager#doCleanupAfterCompletion(java.lang.Object)
-	 */
 	@Override
 	protected void doCleanupAfterCompletion(Object transaction) {
 
@@ -295,14 +278,14 @@ protected void doCleanupAfterCompletion(Object transaction) {
 	}
 
 	/**
-	 * 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}.
+	 * @param databaseFactory must not be {@literal null}.
 	 */
-	public void setDbFactory(MongoDbFactory dbFactory) {
+	public void setDatabaseFactory(MongoDatabaseFactory databaseFactory) {
 
-		Assert.notNull(dbFactory, "DbFactory must not be null!");
-		this.dbFactory = dbFactory;
+		Assert.notNull(databaseFactory, "DbFactory must not be null");
+		this.databaseFactory = databaseFactory;
 	}
 
 	/**
@@ -311,32 +294,23 @@ public void setDbFactory(MongoDbFactory dbFactory) {
 	 * @param options can be {@literal null}.
 	 */
 	public void setOptions(@Nullable TransactionOptions options) {
-		this.options = options;
+		this.options = MongoTransactionOptions.of(options);
 	}
 
 	/**
-	 * 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() {
-		return dbFactory;
+	public @Nullable MongoDatabaseFactory getDatabaseFactory() {
+		return databaseFactory;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.support.ResourceTransactionManager#getResourceFactory()
-	 */
 	@Override
-	public MongoDbFactory getResourceFactory() {
+	public MongoDatabaseFactory getResourceFactory() {
 		return getRequiredDbFactory();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 		getRequiredDbFactory();
@@ -344,7 +318,7 @@ public void afterPropertiesSet() {
 
 	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));
@@ -353,14 +327,14 @@ private MongoResourceHolder newResourceHolder(TransactionDefinition definition,
 	}
 
 	/**
-	 * @throws IllegalStateException if {@link #dbFactory} is {@literal null}.
+	 * @throws IllegalStateException if {@link #databaseFactory} 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.");
+		Assert.state(databaseFactory != null,
+				"MongoTransactionManager operates upon a MongoDbFactory; Did you forget to provide one; It's required");
 
-		return dbFactory;
+		return databaseFactory;
 	}
 
 	private static MongoTransactionObject extractMongoTransaction(Object transaction) {
@@ -396,7 +370,7 @@ private static String debugString(@Nullable ClientSession session) {
 				debugString += String.format("causallyConsistent = %s, ", session.isCausallyConsistent());
 				debugString += String.format("txActive = %s, ", session.hasActiveTransaction());
 				debugString += String.format("txNumber = %d, ", session.getServerSession().getTransactionNumber());
-				debugString += String.format("closed = %d, ", session.getServerSession().isClosed());
+				debugString += String.format("closed = %b, ", session.getServerSession().isClosed());
 				debugString += String.format("clusterTime = %s", session.getClusterTime());
 			} else {
 				debugString += "id = n/a";
@@ -486,37 +460,28 @@ void closeSession() {
 			}
 		}
 
-		@Nullable
-		public ClientSession getSession() {
+		public @Nullable ClientSession getSession() {
 			return resourceHolder != null ? resourceHolder.getSession() : null;
 		}
 
 		private MongoResourceHolder getRequiredResourceHolder() {
 
-			Assert.state(resourceHolder != null, "MongoResourceHolder is required but not present. o_O");
+			Assert.state(resourceHolder != null, "MongoResourceHolder is required but not present; o_O");
 			return resourceHolder;
 		}
 
 		private ClientSession getRequiredSession() {
 
 			ClientSession session = getSession();
-			Assert.state(session != null, "A Session is required but it turned out to be null.");
+			Assert.state(session != null, "A Session is required but it turned out to be null");
 			return session;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see  org.springframework.transaction.support.SmartTransactionObject#isRollbackOnly()
-		 */
 		@Override
 		public boolean isRollbackOnly() {
 			return this.resourceHolder != null && this.resourceHolder.isRollbackOnly();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see  org.springframework.transaction.support.SmartTransactionObject#flush()
-		 */
 		@Override
 		public void flush() {
 			TransactionSynchronizationUtils.triggerFlush();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionOptions.java
new file mode 100644
index 0000000000..04bcd36e35
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionOptions.java
@@ -0,0 +1,193 @@
+/*
+ * Copyright 2024-2025 the original author 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 java.time.Duration;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.ReadConcernAware;
+import org.springframework.data.mongodb.core.ReadPreferenceAware;
+import org.springframework.data.mongodb.core.WriteConcernAware;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+import org.springframework.lang.Contract;
+
+/**
+ * Options to be applied within a specific transaction scope.
+ *
+ * @author Christoph Strobl
+ * @since 4.3
+ */
+public interface MongoTransactionOptions
+		extends TransactionMetadata, ReadConcernAware, ReadPreferenceAware, WriteConcernAware {
+
+	/**
+	 * Value Object representing empty options enforcing client defaults. Returns {@literal null} for all getter methods.
+	 */
+	MongoTransactionOptions NONE = new MongoTransactionOptions() {
+
+		@Override
+		public @Nullable Duration getMaxCommitTime() {
+			return null;
+		}
+
+		@Override
+		public @Nullable ReadConcern getReadConcern() {
+			return null;
+		}
+
+		@Override
+		public @Nullable ReadPreference getReadPreference() {
+			return null;
+		}
+
+		@Override
+		public @Nullable WriteConcern getWriteConcern() {
+			return null;
+		}
+	};
+
+	/**
+	 * Merge current options with given ones. Will return first non {@literal null} value from getters whereas the
+	 * {@literal this} has precedence over the given fallbackOptions.
+	 *
+	 * @param fallbackOptions can be {@literal null}.
+	 * @return new instance of {@link MongoTransactionOptions} or this if {@literal fallbackOptions} is {@literal null} or
+	 *         {@link #NONE}.
+	 */
+	@Contract("null -> this")
+	default MongoTransactionOptions mergeWith(@Nullable MongoTransactionOptions fallbackOptions) {
+
+		if (fallbackOptions == null || MongoTransactionOptions.NONE.equals(fallbackOptions)) {
+			return this;
+		}
+
+		return new MongoTransactionOptions() {
+
+			@Override
+			public @Nullable Duration getMaxCommitTime() {
+				return MongoTransactionOptions.this.hasMaxCommitTime() ? MongoTransactionOptions.this.getMaxCommitTime()
+						: fallbackOptions.getMaxCommitTime();
+			}
+
+			@Override
+			public @Nullable ReadConcern getReadConcern() {
+				return MongoTransactionOptions.this.hasReadConcern() ? MongoTransactionOptions.this.getReadConcern()
+						: fallbackOptions.getReadConcern();
+			}
+
+			@Override
+			public @Nullable ReadPreference getReadPreference() {
+				return MongoTransactionOptions.this.hasReadPreference() ? MongoTransactionOptions.this.getReadPreference()
+						: fallbackOptions.getReadPreference();
+			}
+
+			@Override
+			public @Nullable WriteConcern getWriteConcern() {
+				return MongoTransactionOptions.this.hasWriteConcern() ? MongoTransactionOptions.this.getWriteConcern()
+						: fallbackOptions.getWriteConcern();
+			}
+		};
+	}
+
+	/**
+	 * Apply the current options using the given mapping {@link Function} and return its result.
+	 *
+	 * @param mappingFunction
+	 * @return result of the mapping function.
+	 */
+	default <T> T map(Function<MongoTransactionOptions, T> mappingFunction) {
+		return mappingFunction.apply(this);
+	}
+
+	/**
+	 * @return MongoDB driver native {@link TransactionOptions}.
+	 * @see MongoTransactionOptions#map(Function)
+	 */
+	@SuppressWarnings("NullAway")
+	default @Nullable TransactionOptions toDriverOptions() {
+
+		return map(it -> {
+
+			if (MongoTransactionOptions.NONE.equals(it)) {
+				return null;
+			}
+
+			TransactionOptions.Builder builder = TransactionOptions.builder();
+			if (it.hasMaxCommitTime()) {
+				builder.maxCommitTime(it.getMaxCommitTime().toMillis(), TimeUnit.MILLISECONDS);
+			}
+			if (it.hasReadConcern()) {
+				builder.readConcern(it.getReadConcern());
+			}
+			if (it.hasReadPreference()) {
+				builder.readPreference(it.getReadPreference());
+			}
+			if (it.hasWriteConcern()) {
+				builder.writeConcern(it.getWriteConcern());
+			}
+			return builder.build();
+		});
+	}
+
+	/**
+	 * Factory method to wrap given MongoDB driver native {@link TransactionOptions} into {@link MongoTransactionOptions}.
+	 *
+	 * @param options can be {@literal null}.
+	 * @return {@link MongoTransactionOptions#NONE} if given object is {@literal null}.
+	 */
+	static MongoTransactionOptions of(@Nullable TransactionOptions options) {
+
+		if (options == null) {
+			return NONE;
+		}
+
+		return new MongoTransactionOptions() {
+
+			@Override
+			public @Nullable Duration getMaxCommitTime() {
+
+				Long millis = options.getMaxCommitTime(TimeUnit.MILLISECONDS);
+				return millis != null ? Duration.ofMillis(millis) : null;
+			}
+
+			@Override
+			public @Nullable ReadConcern getReadConcern() {
+				return options.getReadConcern();
+			}
+
+			@Override
+			public @Nullable ReadPreference getReadPreference() {
+				return options.getReadPreference();
+			}
+
+			@Override
+			public @Nullable WriteConcern getWriteConcern() {
+				return options.getWriteConcern();
+			}
+
+			@Override
+			public @Nullable TransactionOptions toDriverOptions() {
+				return options;
+			}
+		};
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionOptionsResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionOptionsResolver.java
new file mode 100644
index 0000000000..c4bdbcca53
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/MongoTransactionOptionsResolver.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2024-2025 the original author 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 java.util.Map;
+import java.util.stream.Collectors;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.interceptor.TransactionAttribute;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * A {@link TransactionOptionResolver} reading MongoDB specific {@link MongoTransactionOptions transaction options} from
+ * a {@link TransactionDefinition}. Implementations of {@link MongoTransactionOptions} may choose a specific
+ * {@link #getLabelPrefix() prefix} for {@link TransactionAttribute#getLabels() transaction attribute labels} to avoid
+ * evaluating non-store specific ones.
+ * <p>
+ * {@link TransactionAttribute#getLabels()} evaluated by default should follow the property style using {@code =} to
+ * separate key and value pairs.
+ * <p>
+ * By default {@link #resolve(TransactionDefinition)} will filter labels by the {@link #getLabelPrefix() prefix} and
+ * strip the prefix from the label before handing the pruned {@link Map} to the {@link #convert(Map)} function.
+ * <p>
+ * A transaction definition with labels targeting MongoDB may look like the following:
+ * <p>
+ * <code class="java">
+ * &#64;Transactional(label = { "mongo:readConcern=majority" })
+ * </code>
+ *
+ * @author Christoph Strobl
+ * @since 4.3
+ */
+public interface MongoTransactionOptionsResolver extends TransactionOptionResolver<MongoTransactionOptions> {
+
+	/**
+	 * Obtain the default {@link MongoTransactionOptionsResolver} implementation using a {@literal mongo:}
+	 * {@link #getLabelPrefix() prefix}.
+	 *
+	 * @return instance of default {@link MongoTransactionOptionsResolver} implementation.
+	 */
+	static MongoTransactionOptionsResolver defaultResolver() {
+		return DefaultMongoTransactionOptionsResolver.INSTANCE;
+	}
+
+	/**
+	 * Get the prefix used to filter applicable {@link TransactionAttribute#getLabels() labels}.
+	 *
+	 * @return {@literal null} if no label defined.
+	 */
+	@Nullable
+	String getLabelPrefix();
+
+	/**
+	 * Resolve {@link MongoTransactionOptions} from a given {@link TransactionDefinition} by evaluating
+	 * {@link TransactionAttribute#getLabels()} labels if possible.
+	 * <p>
+	 * Splits applicable labels property style using {@literal =} as deliminator and removes a potential
+	 * {@link #getLabelPrefix() prefix} before calling {@link #convert(Map)} with filtered label values.
+	 *
+	 * @param definition
+	 * @return {@link MongoTransactionOptions#NONE} in case the given {@link TransactionDefinition} is not a
+	 *         {@link TransactionAttribute} if no matching {@link TransactionAttribute#getLabels() labels} could be found.
+	 * @throws IllegalArgumentException for options that do not map to valid transactions options or malformatted labels.
+	 */
+	@Override
+	default MongoTransactionOptions resolve(TransactionDefinition definition) {
+
+		if (!(definition instanceof TransactionAttribute attribute)) {
+			return MongoTransactionOptions.NONE;
+		}
+
+		if (attribute.getLabels().isEmpty()) {
+			return MongoTransactionOptions.NONE;
+		}
+
+		Map<String, String> attributeMap = attribute.getLabels().stream()
+				.filter(it -> !StringUtils.hasText(getLabelPrefix()) || it.startsWith(getLabelPrefix()))
+				.map(it -> StringUtils.hasText(getLabelPrefix()) ? it.substring(getLabelPrefix().length()) : it).map(it -> {
+
+					String[] kvPair = StringUtils.split(it, "=");
+					Assert.isTrue(kvPair != null && kvPair.length == 2,
+							() -> "No value present for transaction option %s".formatted(kvPair != null ? kvPair[0] : it));
+					return kvPair;
+				})
+
+				.collect(Collectors.toMap(it -> it[0].trim(), it -> it[1].trim()));
+
+		return attributeMap.isEmpty() ? MongoTransactionOptions.NONE : convert(attributeMap);
+	}
+
+	/**
+	 * Convert the given {@link Map} into an instance of {@link MongoTransactionOptions}.
+	 *
+	 * @param options never {@literal null}.
+	 * @return never {@literal null}.
+	 * @throws IllegalArgumentException for invalid options.
+	 */
+	MongoTransactionOptions convert(Map<String, String> options);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseFactory.java
index ac50328917..f2a6714a95 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseFactory.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,6 +31,7 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  * @since 2.0
  */
 public interface ReactiveMongoDatabaseFactory extends CodecRegistryProvider {
@@ -38,19 +39,19 @@ public interface ReactiveMongoDatabaseFactory extends CodecRegistryProvider {
 	/**
 	 * Creates a default {@link MongoDatabase} instance.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getMongoDatabase() throws DataAccessException;
+	Mono<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
+	 * @return never {@literal null}.
 	 * @throws DataAccessException
 	 */
-	MongoDatabase getMongoDatabase(String dbName) throws DataAccessException;
+	Mono<MongoDatabase> getMongoDatabase(String dbName) throws DataAccessException;
 
 	/**
 	 * Exposes a shared {@link MongoExceptionTranslator}.
@@ -64,10 +65,7 @@ public interface ReactiveMongoDatabaseFactory extends CodecRegistryProvider {
 	 *
 	 * @return never {@literal null}.
 	 */
-	@Override
-	default CodecRegistry getCodecRegistry() {
-		return getMongoDatabase().getCodecRegistry();
-	}
+	CodecRegistry getCodecRegistry();
 
 	/**
 	 * Obtain a {@link Mono} emitting a {@link ClientSession} for given {@link ClientSessionOptions options}.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java
index 9067b74ece..3d1c2ee89c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtils.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import reactor.core.publisher.Mono;
 import reactor.util.context.Context;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.transaction.NoTransactionException;
 import org.springframework.transaction.reactive.ReactiveResourceSynchronization;
 import org.springframework.transaction.reactive.TransactionSynchronization;
@@ -35,12 +35,12 @@
 /**
  * Helper class for managing reactive {@link MongoDatabase} instances via {@link ReactiveMongoDatabaseFactory}. Used for
  * obtaining {@link ClientSession session bound} resources, such as {@link MongoDatabase} and {@link MongoCollection}
- * suitable for transactional usage.
- * <p />
+ * suitable for transactional usage. <br />
  * <strong>Note:</strong> Intended for internal usage only.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  * @since 2.2
  */
 public class ReactiveMongoDatabaseUtils {
@@ -73,8 +73,7 @@ public static Mono<Boolean> isTransactionActive(ReactiveMongoDatabaseFactory dat
 
 	/**
 	 * Obtain the default {@link MongoDatabase database} form the given {@link ReactiveMongoDatabaseFactory factory} using
-	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
-	 * <p />
+	 * {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}. <br />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
 	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
@@ -87,7 +86,7 @@ public static Mono<MongoDatabase> getDatabase(ReactiveMongoDatabaseFactory facto
 
 	/**
 	 * Obtain the default {@link MongoDatabase database} form the given {@link ReactiveMongoDatabaseFactory factory}.
-	 * <p />
+	 * <br />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
 	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
@@ -102,32 +101,32 @@ public static Mono<MongoDatabase> getDatabase(ReactiveMongoDatabaseFactory facto
 
 	/**
 	 * Obtain the {@link MongoDatabase database} with given name form the given {@link ReactiveMongoDatabaseFactory
-	 * factory} using {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}.
-	 * <p />
+	 * factory} using {@link SessionSynchronization#ON_ACTUAL_TRANSACTION native session synchronization}. <br />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
 	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
-	 * @param dbName the name of the {@link MongoDatabase} to get.
+	 * @param dbName the name of the {@link MongoDatabase} to get. If {@literal null} the default database of the
+	 *          {@link ReactiveMongoDatabaseFactory}.
 	 * @param factory the {@link ReactiveMongoDatabaseFactory} to get the {@link MongoDatabase} from.
 	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
 	 */
-	public static Mono<MongoDatabase> getDatabase(String dbName, ReactiveMongoDatabaseFactory factory) {
+	public static Mono<MongoDatabase> getDatabase(@Nullable String dbName, ReactiveMongoDatabaseFactory factory) {
 		return doGetMongoDatabase(dbName, factory, SessionSynchronization.ON_ACTUAL_TRANSACTION);
 	}
 
 	/**
 	 * Obtain the {@link MongoDatabase database} with given name form the given {@link ReactiveMongoDatabaseFactory
-	 * factory}.
-	 * <p />
+	 * factory}. <br />
 	 * Registers a {@link MongoSessionSynchronization MongoDB specific transaction synchronization} within the subscriber
 	 * {@link Context} if {@link TransactionSynchronizationManager#isSynchronizationActive() synchronization is active}.
 	 *
-	 * @param dbName the name of the {@link MongoDatabase} to get.
+	 * @param dbName the name of the {@link MongoDatabase} to get. If {@literal null} the default database of the *
+	 *          {@link ReactiveMongoDatabaseFactory}.
 	 * @param factory the {@link ReactiveMongoDatabaseFactory} to get the {@link MongoDatabase} from.
 	 * @param sessionSynchronization the synchronization to use. Must not be {@literal null}.
 	 * @return the {@link MongoDatabase} that is potentially associated with a transactional {@link ClientSession}.
 	 */
-	public static Mono<MongoDatabase> getDatabase(String dbName, ReactiveMongoDatabaseFactory factory,
+	public static Mono<MongoDatabase> getDatabase(@Nullable String dbName, ReactiveMongoDatabaseFactory factory,
 			SessionSynchronization sessionSynchronization) {
 		return doGetMongoDatabase(dbName, factory, sessionSynchronization);
 	}
@@ -135,21 +134,24 @@ public static Mono<MongoDatabase> getDatabase(String dbName, ReactiveMongoDataba
 	private static Mono<MongoDatabase> doGetMongoDatabase(@Nullable String dbName, ReactiveMongoDatabaseFactory factory,
 			SessionSynchronization sessionSynchronization) {
 
-		Assert.notNull(factory, "DatabaseFactory must not be null!");
+		Assert.notNull(factory, "DatabaseFactory must not be null");
+
+		if (sessionSynchronization == SessionSynchronization.NEVER) {
+			return getMongoDatabaseOrDefault(dbName, factory);
+		}
 
 		return TransactionSynchronizationManager.forCurrentTransaction()
 				.filter(TransactionSynchronizationManager::isSynchronizationActive) //
 				.flatMap(synchronizationManager -> {
 
 					return doGetSession(synchronizationManager, factory, sessionSynchronization) //
-							.map(it -> getMongoDatabaseOrDefault(dbName, factory.withSession(it)));
-				})
-				.onErrorResume(NoTransactionException.class,
-						e -> Mono.fromSupplier(() -> getMongoDatabaseOrDefault(dbName, factory)))
-				.defaultIfEmpty(getMongoDatabaseOrDefault(dbName, factory));
+							.flatMap(it -> getMongoDatabaseOrDefault(dbName, factory.withSession(it)));
+				}) //
+				.onErrorResume(NoTransactionException.class, e -> getMongoDatabaseOrDefault(dbName, factory))
+				.switchIfEmpty(getMongoDatabaseOrDefault(dbName, factory));
 	}
 
-	private static MongoDatabase getMongoDatabaseOrDefault(@Nullable String dbName,
+	private static Mono<MongoDatabase> getMongoDatabaseOrDefault(@Nullable String dbName,
 			ReactiveMongoDatabaseFactory factory) {
 		return StringUtils.hasText(dbName) ? factory.getMongoDatabase(dbName) : factory.getMongoDatabase();
 	}
@@ -210,19 +212,11 @@ private static class MongoSessionSynchronization
 			this.resourceHolder = resourceHolder;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#shouldReleaseBeforeCompletion()
-		 */
 		@Override
 		protected boolean shouldReleaseBeforeCompletion() {
 			return false;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#processResourceAfterCommit(java.lang.Object)
-		 */
 		@Override
 		protected Mono<Void> processResourceAfterCommit(ReactiveMongoResourceHolder resourceHolder) {
 
@@ -233,10 +227,6 @@ protected Mono<Void> processResourceAfterCommit(ReactiveMongoResourceHolder reso
 			return Mono.empty();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#afterCompletion(int)
-		 */
 		@Override
 		public Mono<Void> afterCompletion(int status) {
 
@@ -252,10 +242,6 @@ public Mono<Void> afterCompletion(int status) {
 			});
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.reactive.ReactiveResourceSynchronization#releaseResource(java.lang.Object, java.lang.Object)
-		 */
 		@Override
 		protected Mono<Void> releaseResource(ReactiveMongoResourceHolder resourceHolder, Object resourceKey) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoResourceHolder.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoResourceHolder.java
index cb19f15ba9..d01364b202 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoResourceHolder.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,15 @@
  */
 package org.springframework.data.mongodb;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
-import org.springframework.lang.Nullable;
 import org.springframework.transaction.support.ResourceHolderSupport;
 
 import com.mongodb.reactivestreams.client.ClientSession;
 
 /**
  * MongoDB specific resource holder, wrapping a {@link ClientSession}. {@link ReactiveMongoTransactionManager} binds
- * instances of this class to the subscriber context.
- * <p />
+ * instances of this class to the subscriber context. <br />
  * <strong>Note:</strong> Intended for internal usage only.
  *
  * @author Mark Paluch
@@ -42,7 +41,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) {
 
@@ -99,12 +98,11 @@ boolean hasSession() {
 	 * If the {@link ReactiveMongoResourceHolder} is {@link #hasSession() not already associated} with a
 	 * {@link ClientSession} the given value is {@link #setSession(ClientSession) set} and returned, otherwise the current
 	 * bound session is returned.
-	 * 
+	 *
 	 * @param session
 	 * @return
 	 */
-	@Nullable
-	public ClientSession setSessionIfAbsent(@Nullable ClientSession session) {
+	public @Nullable ClientSession setSessionIfAbsent(@Nullable ClientSession session) {
 
 		if (!hasSession()) {
 			setSession(session);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java
index 9bd0fbfe06..4f293c8ed6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/ReactiveMongoTransactionManager.java
+++ b/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-2025 the original author 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,8 @@
 
 import reactor.core.publisher.Mono;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.lang.Nullable;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionException;
 import org.springframework.transaction.TransactionSystemException;
@@ -37,22 +37,19 @@
 /**
  * A {@link org.springframework.transaction.ReactiveTransactionManager} implementation that manages
  * {@link com.mongodb.reactivestreams.client.ClientSession} based transactions for a single
- * {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory}.
- * <p />
+ * {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory}. <br />
  * Binds a {@link ClientSession} from the specified
  * {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory} to the subscriber
- * {@link reactor.util.context.Context}.
- * <p />
+ * {@link reactor.util.context.Context}. <br />
  * {@link org.springframework.transaction.TransactionDefinition#isReadOnly() Readonly} transactions operate on a
  * {@link ClientSession} and enable causal consistency, and also {@link ClientSession#startTransaction() start},
  * {@link com.mongodb.reactivestreams.client.ClientSession#commitTransaction() commit} or
- * {@link ClientSession#abortTransaction() abort} a transaction.
- * <p />
+ * {@link ClientSession#abortTransaction() abort} a transaction. <br />
  * Application code is required to retrieve the {@link com.mongodb.reactivestreams.client.MongoDatabase} via
  * {@link org.springframework.data.mongodb.ReactiveMongoDatabaseUtils#getDatabase(ReactiveMongoDatabaseFactory)} instead
  * of a standard {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase()} call. Spring
  * classes such as {@link org.springframework.data.mongodb.core.ReactiveMongoTemplate} use this strategy implicitly.
- * <p />
+ * <br />
  * By default failure of a {@literal commit} operation raises a {@link TransactionSystemException}. You can override
  * {@link #doCommit(TransactionSynchronizationManager, ReactiveMongoTransactionObject)} to implement the
  * <a href="https://docs.mongodb.com/manual/core/transactions/#retry-commit-operation">Retry Commit Operation</a>
@@ -67,21 +64,25 @@
 public class ReactiveMongoTransactionManager extends AbstractReactiveTransactionManager implements InitializingBean {
 
 	private @Nullable ReactiveMongoDatabaseFactory databaseFactory;
-	private @Nullable TransactionOptions options;
+	private MongoTransactionOptions options;
+	private final MongoTransactionOptionsResolver transactionOptionsResolver;
 
 	/**
-	 * Create a new {@link ReactiveMongoTransactionManager} for bean-style usage.
-	 * <p />
+	 * Create a new {@link ReactiveMongoTransactionManager} for bean-style usage. <br />
 	 * <strong>Note:</strong>The {@link org.springframework.data.mongodb.ReactiveMongoDatabaseFactory db factory} has to
 	 * be {@link #setDatabaseFactory(ReactiveMongoDatabaseFactory)} set} before using the instance. Use this constructor
 	 * to prepare a {@link ReactiveMongoTransactionManager} via a {@link org.springframework.beans.factory.BeanFactory}.
-	 * <p />
+	 * <br />
 	 * Optionally it is possible to set default {@link TransactionOptions transaction options} defining
 	 * {@link com.mongodb.ReadConcern} and {@link com.mongodb.WriteConcern}.
 	 *
 	 * @see #setDatabaseFactory(ReactiveMongoDatabaseFactory)
 	 */
-	public ReactiveMongoTransactionManager() {}
+	public ReactiveMongoTransactionManager() {
+
+		this.transactionOptionsResolver = MongoTransactionOptionsResolver.defaultResolver();
+		this.options = MongoTransactionOptions.NONE;
+	}
 
 	/**
 	 * Create a new {@link ReactiveMongoTransactionManager} obtaining sessions from the given
@@ -99,21 +100,36 @@ public ReactiveMongoTransactionManager(ReactiveMongoDatabaseFactory databaseFact
 	 * starting a new transaction.
 	 *
 	 * @param databaseFactory must not be {@literal null}.
-	 * @param options can be {@literal null}.
+	 * @param options can be {@literal null}. Will default {@link MongoTransactionOptions#NONE} if {@literal null}.
 	 */
 	public ReactiveMongoTransactionManager(ReactiveMongoDatabaseFactory databaseFactory,
 			@Nullable TransactionOptions options) {
+		this(databaseFactory, MongoTransactionOptionsResolver.defaultResolver(), MongoTransactionOptions.of(options));
+	}
+
+	/**
+	 * Create a new {@link ReactiveMongoTransactionManager} obtaining sessions from the given
+	 * {@link ReactiveMongoDatabaseFactory} applying the given {@link TransactionOptions options}, if present, when
+	 * starting a new transaction.
+	 *
+	 * @param databaseFactory must not be {@literal null}.
+	 * @param transactionOptionsResolver must not be {@literal null}.
+	 * @param defaultTransactionOptions can be {@literal null}. Will default {@link MongoTransactionOptions#NONE} if
+	 *          {@literal null}.
+	 * @since 4.3
+	 */
+	public ReactiveMongoTransactionManager(ReactiveMongoDatabaseFactory databaseFactory,
+			MongoTransactionOptionsResolver transactionOptionsResolver,
+			@Nullable MongoTransactionOptions defaultTransactionOptions) {
 
-		Assert.notNull(databaseFactory, "DatabaseFactory must not be null!");
+		Assert.notNull(databaseFactory, "DatabaseFactory must not be null");
+		Assert.notNull(transactionOptionsResolver, "MongoTransactionOptionsResolver must not be null");
 
 		this.databaseFactory = databaseFactory;
-		this.options = options;
+		this.transactionOptionsResolver = transactionOptionsResolver;
+		this.options = defaultTransactionOptions != null ? defaultTransactionOptions : MongoTransactionOptions.NONE;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doGetTransaction(org.springframework.transaction.reactive.TransactionSynchronizationManager)
-	 */
 	@Override
 	protected Object doGetTransaction(TransactionSynchronizationManager synchronizationManager)
 			throws TransactionException {
@@ -123,19 +139,11 @@ protected Object doGetTransaction(TransactionSynchronizationManager synchronizat
 		return new ReactiveMongoTransactionObject(resourceHolder);
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#isExistingTransaction(java.lang.Object)
-	 */
 	@Override
 	protected boolean isExistingTransaction(Object transaction) throws TransactionException {
 		return extractMongoTransaction(transaction).hasResourceHolder();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doBegin(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object, org.springframework.transaction.TransactionDefinition)
-	 */
 	@Override
 	protected Mono<Void> doBegin(TransactionSynchronizationManager synchronizationManager, Object transaction,
 			TransactionDefinition definition) throws TransactionException {
@@ -158,7 +166,9 @@ protected Mono<Void> doBegin(TransactionSynchronizationManager synchronizationMa
 
 			}).doOnNext(resourceHolder -> {
 
-				mongoTransactionObject.startTransaction(options);
+				MongoTransactionOptions mongoTransactionOptions = transactionOptionsResolver.resolve(definition)
+						.mergeWith(options);
+				mongoTransactionObject.startTransaction(mongoTransactionOptions.toDriverOptions());
 
 				if (logger.isDebugEnabled()) {
 					logger.debug(String.format("Started transaction for session %s.", debugString(resourceHolder.getSession())));
@@ -175,10 +185,6 @@ protected Mono<Void> doBegin(TransactionSynchronizationManager synchronizationMa
 		});
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doSuspend(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object)
-	 */
 	@Override
 	protected Mono<Object> doSuspend(TransactionSynchronizationManager synchronizationManager, Object transaction)
 			throws TransactionException {
@@ -192,10 +198,6 @@ protected Mono<Object> doSuspend(TransactionSynchronizationManager synchronizati
 		});
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doResume(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	protected Mono<Void> doResume(TransactionSynchronizationManager synchronizationManager, @Nullable Object transaction,
 			Object suspendedResources) {
@@ -203,10 +205,6 @@ protected Mono<Void> doResume(TransactionSynchronizationManager synchronizationM
 				.fromRunnable(() -> synchronizationManager.bindResource(getRequiredDatabaseFactory(), suspendedResources));
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doCommit(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction)
-	 */
 	@Override
 	protected final Mono<Void> doCommit(TransactionSynchronizationManager synchronizationManager,
 			GenericReactiveTransaction status) throws TransactionException {
@@ -243,10 +241,6 @@ protected Mono<Void> doCommit(TransactionSynchronizationManager synchronizationM
 		return transactionObject.commitTransaction();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doRollback(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction)
-	 */
 	@Override
 	protected Mono<Void> doRollback(TransactionSynchronizationManager synchronizationManager,
 			GenericReactiveTransaction status) {
@@ -268,10 +262,6 @@ protected Mono<Void> doRollback(TransactionSynchronizationManager synchronizatio
 		});
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doSetRollbackOnly(org.springframework.transaction.reactive.TransactionSynchronizationManager, org.springframework.transaction.reactive.GenericReactiveTransaction)
-	 */
 	@Override
 	protected Mono<Void> doSetRollbackOnly(TransactionSynchronizationManager synchronizationManager,
 			GenericReactiveTransaction status) throws TransactionException {
@@ -282,10 +272,6 @@ protected Mono<Void> doSetRollbackOnly(TransactionSynchronizationManager synchro
 		});
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.transaction.reactive.AbstractReactiveTransactionManager#doCleanupAfterCompletion(org.springframework.transaction.reactive.TransactionSynchronizationManager, java.lang.Object)
-	 */
 	@Override
 	protected Mono<Void> doCleanupAfterCompletion(TransactionSynchronizationManager synchronizationManager,
 			Object transaction) {
@@ -317,7 +303,7 @@ protected Mono<Void> doCleanupAfterCompletion(TransactionSynchronizationManager
 	 */
 	public void setDatabaseFactory(ReactiveMongoDatabaseFactory databaseFactory) {
 
-		Assert.notNull(databaseFactory, "DatabaseFactory must not be null!");
+		Assert.notNull(databaseFactory, "DatabaseFactory must not be null");
 		this.databaseFactory = databaseFactory;
 	}
 
@@ -327,7 +313,7 @@ public void setDatabaseFactory(ReactiveMongoDatabaseFactory databaseFactory) {
 	 * @param options can be {@literal null}.
 	 */
 	public void setOptions(@Nullable TransactionOptions options) {
-		this.options = options;
+		this.options = MongoTransactionOptions.of(options);
 	}
 
 	/**
@@ -335,15 +321,10 @@ public void setOptions(@Nullable TransactionOptions options) {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public ReactiveMongoDatabaseFactory getDatabaseFactory() {
+	public @Nullable ReactiveMongoDatabaseFactory getDatabaseFactory() {
 		return databaseFactory;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 		getRequiredDatabaseFactory();
@@ -363,7 +344,7 @@ private Mono<ReactiveMongoResourceHolder> newResourceHolder(TransactionDefinitio
 	private ReactiveMongoDatabaseFactory getRequiredDatabaseFactory() {
 
 		Assert.state(databaseFactory != null,
-				"ReactiveMongoTransactionManager operates upon a ReactiveMongoDatabaseFactory. Did you forget to provide one? It's required.");
+				"ReactiveMongoTransactionManager operates upon a ReactiveMongoDatabaseFactory; Did you forget to provide one; It's required");
 
 		return databaseFactory;
 	}
@@ -401,7 +382,7 @@ private static String debugString(@Nullable ClientSession session) {
 				debugString += String.format("causallyConsistent = %s, ", session.isCausallyConsistent());
 				debugString += String.format("txActive = %s, ", session.hasActiveTransaction());
 				debugString += String.format("txNumber = %d, ", session.getServerSession().getTransactionNumber());
-				debugString += String.format("closed = %d, ", session.getServerSession().isClosed());
+				debugString += String.format("closed = %b, ", session.getServerSession().isClosed());
 				debugString += String.format("clusterTime = %s", session.getClusterTime());
 			} else {
 				debugString += "id = n/a";
@@ -491,37 +472,28 @@ void closeSession() {
 			}
 		}
 
-		@Nullable
-		public ClientSession getSession() {
+		public @Nullable ClientSession getSession() {
 			return resourceHolder != null ? resourceHolder.getSession() : null;
 		}
 
 		private ReactiveMongoResourceHolder getRequiredResourceHolder() {
 
-			Assert.state(resourceHolder != null, "ReactiveMongoResourceHolder is required but not present. o_O");
+			Assert.state(resourceHolder != null, "ReactiveMongoResourceHolder is required but not present; o_O");
 			return resourceHolder;
 		}
 
 		private ClientSession getRequiredSession() {
 
 			ClientSession session = getSession();
-			Assert.state(session != null, "A Session is required but it turned out to be null.");
+			Assert.state(session != null, "A Session is required but it turned out to be null");
 			return session;
 		}
 
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.SmartTransactionObject#isRollbackOnly()
-		 */
 		@Override
 		public boolean isRollbackOnly() {
 			return this.resourceHolder != null && this.resourceHolder.isRollbackOnly();
 		}
 
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.transaction.support.SmartTransactionObject#flush()
-		 */
 		@Override
 		public void flush() {
 			throw new UnsupportedOperationException("flush() not supported");
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java
index 50f77d3f29..ec30478a54 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionAwareMethodInterceptor.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.MethodClassKey;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
@@ -34,8 +34,7 @@
 
 /**
  * {@link MethodInterceptor} implementation looking up and invoking an alternative target method having
- * {@link ClientSession} as its first argument. This allows seamless integration with the existing code base.
- * <p />
+ * {@link ClientSession} as its first argument. This allows seamless integration with the existing code base. <br />
  * The {@link MethodInterceptor} is aware of methods on {@code MongoCollection} that my return new instances of itself
  * like (eg. {@link com.mongodb.reactivestreams.client.MongoCollection#withWriteConcern(WriteConcern)} and decorate them
  * if not already proxied.
@@ -76,13 +75,13 @@ public <T> SessionAwareMethodInterceptor(ClientSession session, T target, Class<
 			Class<D> databaseType, ClientSessionOperator<D> databaseDecorator, Class<C> collectionType,
 			ClientSessionOperator<C> collectionDecorator) {
 
-		Assert.notNull(session, "ClientSession must not be null!");
-		Assert.notNull(target, "Target must not be null!");
-		Assert.notNull(sessionType, "SessionType must not be null!");
-		Assert.notNull(databaseType, "Database type must not be null!");
-		Assert.notNull(databaseDecorator, "Database ClientSessionOperator must not be null!");
-		Assert.notNull(collectionType, "Collection type must not be null!");
-		Assert.notNull(collectionDecorator, "Collection ClientSessionOperator must not be null!");
+		Assert.notNull(session, "ClientSession must not be null");
+		Assert.notNull(target, "Target must not be null");
+		Assert.notNull(sessionType, "SessionType must not be null");
+		Assert.notNull(databaseType, "Database type must not be null");
+		Assert.notNull(databaseDecorator, "Database ClientSessionOperator must not be null");
+		Assert.notNull(collectionType, "Collection type must not be null");
+		Assert.notNull(collectionDecorator, "Collection ClientSessionOperator must not be null");
 
 		this.session = session;
 		this.target = target;
@@ -95,17 +94,13 @@ public <T> SessionAwareMethodInterceptor(ClientSession session, T target, Class<
 		this.sessionType = sessionType;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.aopalliance.intercept.MethodInterceptor(org.aopalliance.intercept.MethodInvocation)
-	 */
-	@Nullable
 	@Override
-	public Object invoke(MethodInvocation methodInvocation) throws Throwable {
+	public @Nullable Object invoke(MethodInvocation methodInvocation) throws Throwable {
 
 		if (requiresDecoration(methodInvocation.getMethod())) {
 
 			Object target = methodInvocation.proceed();
+			Assert.notNull(target, "invocation target was null");
 			if (target instanceof Proxy) {
 				return target;
 			}
@@ -139,12 +134,8 @@ protected Object decorate(Object target) {
 
 	private static boolean requiresSession(Method method) {
 
-		if (method.getParameterCount() == 0
-				|| !ClassUtils.isAssignable(ClientSession.class, method.getParameterTypes()[0])) {
-			return true;
-		}
-
-		return false;
+		return method.getParameterCount() == 0
+				|| !ClassUtils.isAssignable(ClientSession.class, method.getParameterTypes()[0]);
 	}
 
 	private static Object[] prependSessionToArguments(ClientSession session, MethodInvocation invocation) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionSynchronization.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionSynchronization.java
index 1482cde3c0..07b5c31586 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SessionSynchronization.java
+++ b/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-2025 the original author 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,20 @@
  */
 package org.springframework.data.mongodb;
 
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+
 /**
- * {@link SessionSynchronization} is used along with {@link org.springframework.data.mongodb.core.MongoTemplate} to
- * define in which type of transactions to participate if any.
+ * {@link SessionSynchronization} is used along with {@code MongoTemplate} to define in which type of transactions to
+ * participate if any.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
  * @since 2.1
+ * @see MongoTemplate#setSessionSynchronization(SessionSynchronization)
+ * @see MongoDatabaseUtils#getDatabase(MongoDatabaseFactory, SessionSynchronization)
+ * @see ReactiveMongoTemplate#setSessionSynchronization(SessionSynchronization)
+ * @see ReactiveMongoDatabaseUtils#getDatabase(ReactiveMongoDatabaseFactory, SessionSynchronization)
  */
 public enum SessionSynchronization {
 
@@ -34,5 +41,12 @@ public enum SessionSynchronization {
 	/**
 	 * Synchronize with native MongoDB transactions initiated via {@link MongoTransactionManager}.
 	 */
-	ON_ACTUAL_TRANSACTION;
+	ON_ACTUAL_TRANSACTION,
+
+	/**
+	 * Do not participate in ongoing transactions.
+	 *
+	 * @since 3.2.5
+	 */
+	NEVER
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoTransactionOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoTransactionOptions.java
new file mode 100644
index 0000000000..5c50ba686a
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SimpleMongoTransactionOptions.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2024-2025 the original author 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 java.time.Duration;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.Assert;
+
+import com.mongodb.Function;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+
+/**
+ * Trivial implementation of {@link MongoTransactionOptions}.
+ *
+ * @author Christoph Strobl
+ * @since 4.3
+ */
+class SimpleMongoTransactionOptions implements MongoTransactionOptions {
+
+	static final Set<String> KNOWN_KEYS = Arrays.stream(OptionKey.values()).map(OptionKey::getKey)
+			.collect(Collectors.toSet());
+
+	private final @Nullable Duration maxCommitTime;
+	private final @Nullable ReadConcern readConcern;
+	private final @Nullable ReadPreference readPreference;
+	private final @Nullable WriteConcern writeConcern;
+
+	static SimpleMongoTransactionOptions of(Map<String, String> options) {
+		return new SimpleMongoTransactionOptions(options);
+	}
+
+	private SimpleMongoTransactionOptions(Map<String, String> options) {
+
+		this.maxCommitTime = doGetMaxCommitTime(options);
+		this.readConcern = doGetReadConcern(options);
+		this.readPreference = doGetReadPreference(options);
+		this.writeConcern = doGetWriteConcern(options);
+	}
+
+	@Override
+	public @Nullable Duration getMaxCommitTime() {
+		return maxCommitTime;
+	}
+
+	@Override
+	public @Nullable ReadConcern getReadConcern() {
+		return readConcern;
+	}
+
+	@Override
+	public @Nullable ReadPreference getReadPreference() {
+		return readPreference;
+	}
+
+	@Override
+	public @Nullable WriteConcern getWriteConcern() {
+		return writeConcern;
+	}
+
+	@Override
+	public String toString() {
+
+		return "DefaultMongoTransactionOptions{" + "maxCommitTime=" + maxCommitTime + ", readConcern=" + readConcern
+				+ ", readPreference=" + readPreference + ", writeConcern=" + writeConcern + '}';
+	}
+
+	private static @Nullable Duration doGetMaxCommitTime(Map<String, String> options) {
+
+		return getValue(options, OptionKey.MAX_COMMIT_TIME, value -> {
+
+			Duration timeout = Duration.parse(value);
+			Assert.isTrue(!timeout.isNegative(), "%s cannot be negative".formatted(OptionKey.MAX_COMMIT_TIME));
+			return timeout;
+		});
+	}
+
+	private static @Nullable ReadConcern doGetReadConcern(Map<String, String> options) {
+		return getValue(options, OptionKey.READ_CONCERN, value -> new ReadConcern(ReadConcernLevel.fromString(value)));
+	}
+
+	private static @Nullable ReadPreference doGetReadPreference(Map<String, String> options) {
+		return getValue(options, OptionKey.READ_PREFERENCE, ReadPreference::valueOf);
+	}
+
+	private static @Nullable WriteConcern doGetWriteConcern(Map<String, String> options) {
+
+		return getValue(options, OptionKey.WRITE_CONCERN, value -> {
+
+			WriteConcern writeConcern = WriteConcern.valueOf(value);
+			if (writeConcern == null) {
+				throw new IllegalArgumentException("'%s' is not a valid WriteConcern".formatted(options.get("writeConcern")));
+			}
+			return writeConcern;
+		});
+	}
+
+	private static <T> @Nullable T getValue(Map<String, String> options, OptionKey key,
+			Function<String, T> convertFunction) {
+
+		String value = options.get(key.getKey());
+		return value != null ? convertFunction.apply(value) : null;
+	}
+
+	enum OptionKey {
+
+		MAX_COMMIT_TIME("maxCommitTime"), READ_CONCERN("readConcern"), READ_PREFERENCE("readPreference"), WRITE_CONCERN(
+				"writeConcern");
+
+		final String key;
+
+		OptionKey(String key) {
+			this.key = key;
+		}
+
+		public String getKey() {
+			return key;
+		}
+
+		@Override
+		public String toString() {
+			return getKey();
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SpringDataMongoDB.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SpringDataMongoDB.java
new file mode 100644
index 0000000000..a3d600270f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/SpringDataMongoDB.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2020-2025 the original author 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.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+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 Log LOGGER = LogFactory.getLog(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.
+	 * <br />
+	 * 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(String.format("Cannot read Spring Data MongoDB version '%s'.", versionString));
+		}
+
+		return FALLBACK_VERSION;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransactionMetadata.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransactionMetadata.java
new file mode 100644
index 0000000000..57ecec0342
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransactionMetadata.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024-2025 the original author 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 java.time.Duration;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * MongoDB-specific transaction metadata.
+ *
+ * @author Christoph Strobl
+ * @since 4.3
+ */
+public interface TransactionMetadata {
+
+	/**
+	 * @return the maximum commit time. Can be {@literal null} if not configured.
+	 */
+	@Nullable
+	Duration getMaxCommitTime();
+
+	/**
+	 * @return {@literal true} if the max commit time is configured; {@literal false} otherwise.
+	 */
+	default boolean hasMaxCommitTime() {
+		return getMaxCommitTime() != null;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransactionOptionResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransactionOptionResolver.java
new file mode 100644
index 0000000000..e42c26d95a
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransactionOptionResolver.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2024-2025 the original author 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.jspecify.annotations.Nullable;
+import org.springframework.transaction.TransactionDefinition;
+
+/**
+ * Interface that defines a resolver for {@link TransactionMetadata} based on a {@link TransactionDefinition}.
+ * Transaction metadata is used to enrich the MongoDB transaction with additional information.
+ *
+ * @author Christoph Strobl
+ * @since 4.3
+ */
+interface TransactionOptionResolver<T extends TransactionMetadata> {
+
+	/**
+	 * Resolves the transaction metadata from a given {@link TransactionDefinition}.
+	 *
+	 * @param definition the {@link TransactionDefinition}.
+	 * @return the resolved {@link TransactionMetadata} or {@literal null} if the resolver cannot resolve any metadata.
+	 */
+	@Nullable
+	T resolve(TransactionDefinition definition);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransientClientSessionException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransientClientSessionException.java
new file mode 100644
index 0000000000..5446170ff9
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransientClientSessionException.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2018-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.TransientDataAccessException;
+
+/**
+ * {@link TransientDataAccessException} specific to MongoDB {@link com.mongodb.session.ClientSession} related data
+ * access failures such as reading data using an already closed session.
+ *
+ * @author Christoph Strobl
+ * @since 4.4
+ */
+public class TransientClientSessionException extends TransientMongoDbException {
+
+	/**
+	 * Constructor for {@link TransientClientSessionException}.
+	 *
+	 * @param msg the detail message.
+	 * @param cause the root cause.
+	 */
+	public TransientClientSessionException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransientMongoDbException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransientMongoDbException.java
new file mode 100644
index 0000000000..cad05ca17c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/TransientMongoDbException.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2018-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb;
+
+import org.springframework.dao.TransientDataAccessException;
+
+/**
+ * Root of the hierarchy of MongoDB specific data access exceptions that are considered transient such as
+ * {@link com.mongodb.MongoException MongoExceptions} carrying {@link com.mongodb.MongoException#hasErrorLabel(String)
+ * specific labels}.
+ *
+ * @author Christoph Strobl
+ * @since 4.4
+ */
+public class TransientMongoDbException extends TransientDataAccessException {
+
+	/**
+	 * Constructor for {@link TransientMongoDbException}.
+	 *
+	 * @param msg the detail message.
+	 * @param cause the root cause.
+	 */
+	public TransientMongoDbException(String msg, Throwable cause) {
+		super(msg, cause);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java
index 25161214eb..69ec086e5a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/UncategorizedMongoDbException.java
+++ b/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-2025 the original author 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,14 @@
  */
 package org.springframework.data.mongodb;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.UncategorizedDataAccessException;
 
 public class UncategorizedMongoDbException extends UncategorizedDataAccessException {
 
 	private static final long serialVersionUID = -2336595514062364929L;
 
-	public UncategorizedMongoDbException(String msg, Throwable cause) {
+	public UncategorizedMongoDbException(String msg, @Nullable Throwable cause) {
 		super(msg, cause);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/LazyLoadingProxyAotProcessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/LazyLoadingProxyAotProcessor.java
new file mode 100644
index 0000000000..2254b3c9a8
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/LazyLoadingProxyAotProcessor.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2022-2025 the original author 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.aot;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.springframework.aot.generate.GenerationContext;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.core.annotation.MergedAnnotations;
+import org.springframework.data.annotation.Reference;
+import org.springframework.data.mongodb.core.convert.LazyLoadingProxyFactory;
+import org.springframework.data.mongodb.core.convert.LazyLoadingProxyFactory.LazyLoadingInterceptor;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
+
+/**
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+public class LazyLoadingProxyAotProcessor {
+
+	private boolean generalLazyLoadingProxyContributed = false;
+
+	public void registerLazyLoadingProxyIfNeeded(Class<?> type, GenerationContext generationContext) {
+
+		Set<Field> refFields = getFieldsWithAnnotationPresent(type, Reference.class);
+		if (refFields.isEmpty()) {
+			return;
+		}
+
+		refFields.stream() //
+				.filter(LazyLoadingProxyAotProcessor::isLazyLoading) //
+				.forEach(field -> {
+
+					if (!generalLazyLoadingProxyContributed) {
+						generationContext.getRuntimeHints().proxies().registerJdkProxy(
+								TypeReference.of(org.springframework.data.mongodb.core.convert.LazyLoadingProxy.class),
+								TypeReference.of(org.springframework.aop.SpringProxy.class),
+								TypeReference.of(org.springframework.aop.framework.Advised.class),
+								TypeReference.of(org.springframework.core.DecoratingProxy.class));
+						generalLazyLoadingProxyContributed = true;
+					}
+
+					if (field.getType().isInterface()) {
+
+						List<Class<?>> interfaces = new ArrayList<>(
+								Arrays.asList(LazyLoadingProxyFactory.prepareFactory(field.getType()).getProxiedInterfaces()));
+						interfaces.add(org.springframework.aop.SpringProxy.class);
+						interfaces.add(org.springframework.aop.framework.Advised.class);
+						interfaces.add(org.springframework.core.DecoratingProxy.class);
+
+						generationContext.getRuntimeHints().proxies().registerJdkProxy(interfaces.toArray(Class[]::new));
+					} else {
+
+						Class<?> proxyClass = LazyLoadingProxyFactory.resolveProxyType(field.getType(),
+								LazyLoadingInterceptor::none);
+
+						// see: spring-projects/spring-framework/issues/29309
+						generationContext.getRuntimeHints().reflection().registerType(proxyClass, MongoAotReflectionHelper::cglibProxyReflectionMemberAccess);
+					}
+				});
+	}
+
+	private static boolean isLazyLoading(Field field) {
+		if (AnnotatedElementUtils.isAnnotated(field, DBRef.class)) {
+			return AnnotatedElementUtils.findMergedAnnotation(field, DBRef.class).lazy();
+		}
+		if (AnnotatedElementUtils.isAnnotated(field, DocumentReference.class)) {
+			return AnnotatedElementUtils.findMergedAnnotation(field, DocumentReference.class).lazy();
+		}
+		return false;
+	}
+
+	private static Set<Field> getFieldsWithAnnotationPresent(Class<?> type, Class<? extends Annotation> annotation) {
+
+		Set<Field> fields = new LinkedHashSet<>();
+		for (Field field : type.getDeclaredFields()) {
+			if (MergedAnnotations.from(field).get(annotation).isPresent()) {
+				fields.add(field);
+			}
+		}
+		return fields;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotPredicates.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotPredicates.java
new file mode 100644
index 0000000000..86a70600a8
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotPredicates.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022-2025 the original author 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.aot;
+
+import java.util.function.Predicate;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
+import org.springframework.data.util.ReactiveWrappers;
+import org.springframework.data.util.ReactiveWrappers.ReactiveLibrary;
+import org.springframework.data.util.TypeUtils;
+import org.springframework.util.ClassUtils;
+
+/**
+ * Collection of {@link Predicate predicates} to determine dynamic library aspects during AOT computation. Intended for
+ * internal usage only.
+ *
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+public class MongoAotPredicates {
+
+	public static final Predicate<Class<?>> IS_SIMPLE_TYPE = (type) -> MongoSimpleTypes.HOLDER.isSimpleType(type)
+			|| TypeUtils.type(type).isPartOf("org.bson");
+	public static final Predicate<ReactiveLibrary> IS_REACTIVE_LIBARARY_AVAILABLE = ReactiveWrappers::isAvailable;
+	public static final Predicate<ClassLoader> IS_SYNC_CLIENT_PRESENT = (classLoader) -> ClassUtils
+			.isPresent("com.mongodb.client.MongoClient", classLoader);
+	public static final Predicate<ClassLoader> IS_REACTIVE_CLIENT_PRESENT = (classLoader) -> ClassUtils
+			.isPresent("com.mongodb.reactivestreams.client.MongoClient", classLoader);
+
+	/**
+	 * @return {@literal true} if the Project Reactor is present.
+	 */
+	public static boolean isReactorPresent() {
+		return IS_REACTIVE_LIBARARY_AVAILABLE.test(ReactiveWrappers.ReactiveLibrary.PROJECT_REACTOR);
+	}
+
+	/**
+	 * @param classLoader can be {@literal null}.
+	 * @return {@literal true} if the {@link com.mongodb.client.MongoClient} is present.
+	 * @since 4.0
+	 */
+	public static boolean isSyncClientPresent(@Nullable ClassLoader classLoader) {
+		return IS_SYNC_CLIENT_PRESENT.test(classLoader);
+	}
+
+	/**
+	 * @param classLoader can be {@literal null}.
+	 * @return {@literal true} if the {@link com.mongodb.reactivestreams.client.MongoClient} is present.
+	 * @since 4.3
+	 */
+	public static boolean isReactiveClientPresent(@Nullable ClassLoader classLoader) {
+		return IS_REACTIVE_CLIENT_PRESENT.test(classLoader);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotReflectionHelper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotReflectionHelper.java
new file mode 100644
index 0000000000..ff8d04b382
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoAotReflectionHelper.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2024-2025 the original author 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.aot;
+
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.TypeHint.Builder;
+
+/**
+ * @author Christoph Strobl
+ */
+public final class MongoAotReflectionHelper {
+
+	public static void cglibProxyReflectionMemberAccess(Builder builder) {
+
+		builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS, MemberCategory.INVOKE_DECLARED_METHODS,
+				MemberCategory.DECLARED_FIELDS);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoManagedTypesBeanRegistrationAotProcessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoManagedTypesBeanRegistrationAotProcessor.java
new file mode 100644
index 0000000000..4b7aa10c3f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoManagedTypesBeanRegistrationAotProcessor.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2022-2025 the original author 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.aot;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.aot.generate.GenerationContext;
+import org.springframework.core.ResolvableType;
+import org.springframework.data.aot.ManagedTypesBeanRegistrationAotProcessor;
+import org.springframework.data.mongodb.MongoManagedTypes;
+import org.springframework.util.ClassUtils;
+
+/**
+ * @author Christoph Strobl
+ * @since 2022/06
+ */
+class MongoManagedTypesBeanRegistrationAotProcessor extends ManagedTypesBeanRegistrationAotProcessor {
+
+	private final LazyLoadingProxyAotProcessor lazyLoadingProxyAotProcessor = new LazyLoadingProxyAotProcessor();
+
+	public MongoManagedTypesBeanRegistrationAotProcessor() {
+		setModuleIdentifier("mongo");
+	}
+
+	@Override
+	protected boolean isMatch(@Nullable Class<?> beanType, @Nullable String beanName) {
+		return isMongoManagedTypes(beanType) || super.isMatch(beanType, beanName);
+	}
+
+	protected boolean isMongoManagedTypes(@Nullable Class<?> beanType) {
+		return beanType != null && ClassUtils.isAssignable(MongoManagedTypes.class, beanType);
+	}
+
+	@Override
+	protected void contributeType(ResolvableType type, GenerationContext generationContext) {
+
+		if (MongoAotPredicates.IS_SIMPLE_TYPE.test(type.toClass())) {
+			return;
+		}
+
+		super.contributeType(type, generationContext);
+		lazyLoadingProxyAotProcessor.registerLazyLoadingProxyIfNeeded(type.toClass(), generationContext);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java
new file mode 100644
index 0000000000..f2442960ed
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/aot/MongoRuntimeHints.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2022-2025 the original author 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.aot;
+
+import static org.springframework.data.mongodb.aot.MongoAotPredicates.isReactorPresent;
+
+import java.util.Arrays;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveCallback;
+import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.BeforeSaveCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAfterConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAfterSaveCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeSaveCallback;
+import org.springframework.util.ClassUtils;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ServerAddress;
+import com.mongodb.UnixServerAddress;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.reactivestreams.client.MapReducePublisher;
+
+/**
+ * {@link RuntimeHintsRegistrar} for repository types and entity callbacks.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 4.0
+ */
+class MongoRuntimeHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+
+		hints.reflection().registerTypes(
+				Arrays.asList(TypeReference.of(BeforeConvertCallback.class), TypeReference.of(BeforeSaveCallback.class),
+						TypeReference.of(AfterConvertCallback.class), TypeReference.of(AfterSaveCallback.class)),
+				builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+						MemberCategory.INVOKE_PUBLIC_METHODS));
+
+		registerTransactionProxyHints(hints, classLoader);
+		registerMongoCompatibilityAdapterHints(hints, classLoader);
+
+		if (isReactorPresent()) {
+
+			hints.reflection()
+					.registerTypes(Arrays.asList(TypeReference.of(ReactiveBeforeConvertCallback.class),
+							TypeReference.of(ReactiveBeforeSaveCallback.class), TypeReference.of(ReactiveAfterConvertCallback.class),
+							TypeReference.of(ReactiveAfterSaveCallback.class)),
+							builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+									MemberCategory.INVOKE_PUBLIC_METHODS));
+		}
+	}
+
+	private static void registerTransactionProxyHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+
+		if (MongoAotPredicates.isSyncClientPresent(classLoader)
+				&& ClassUtils.isPresent("org.springframework.aop.SpringProxy", classLoader)) {
+
+			hints.proxies().registerJdkProxy(TypeReference.of("com.mongodb.client.MongoDatabase"),
+					TypeReference.of("org.springframework.aop.SpringProxy"),
+					TypeReference.of("org.springframework.core.DecoratingProxy"));
+			hints.proxies().registerJdkProxy(TypeReference.of("com.mongodb.client.MongoCollection"),
+					TypeReference.of("org.springframework.aop.SpringProxy"),
+					TypeReference.of("org.springframework.core.DecoratingProxy"));
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	private static void registerMongoCompatibilityAdapterHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+
+		hints.reflection() //
+				.registerType(MongoClientSettings.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+				.registerType(MongoClientSettings.Builder.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+				.registerType(IndexOptions.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+				.registerType(ServerAddress.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+				.registerType(UnixServerAddress.class, MemberCategory.INVOKE_PUBLIC_METHODS) //
+				.registerType(TypeReference.of("com.mongodb.connection.StreamFactoryFactory"),
+						MemberCategory.INTROSPECT_PUBLIC_METHODS)
+				.registerType(TypeReference.of("com.mongodb.internal.connection.StreamFactoryFactory"),
+						MemberCategory.INTROSPECT_PUBLIC_METHODS)
+				.registerType(TypeReference.of("com.mongodb.internal.build.MongoDriverVersion"), MemberCategory.PUBLIC_FIELDS);
+
+		if (MongoAotPredicates.isSyncClientPresent(classLoader)) {
+
+			hints.reflection() //
+					.registerType(MongoDatabase.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+					.registerType(TypeReference.of("com.mongodb.client.internal.MongoDatabaseImpl"),
+							MemberCategory.INVOKE_PUBLIC_METHODS)
+					.registerType(MapReduceIterable.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+					.registerType(TypeReference.of("com.mongodb.client.internal.MapReduceIterableImpl"),
+							MemberCategory.INVOKE_PUBLIC_METHODS);
+		}
+
+		if (MongoAotPredicates.isReactiveClientPresent(classLoader)) {
+
+			hints.reflection() //
+					.registerType(com.mongodb.reactivestreams.client.MongoDatabase.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+					.registerType(TypeReference.of("com.mongodb.reactivestreams.client.internal.MongoDatabaseImpl"),
+							MemberCategory.INVOKE_PUBLIC_METHODS)
+					.registerType(MapReducePublisher.class, MemberCategory.INVOKE_PUBLIC_METHODS)
+					.registerType(TypeReference.of("com.mongodb.reactivestreams.client.internal.MapReducePublisherImpl"),
+							MemberCategory.INVOKE_PUBLIC_METHODS);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoClientConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoClientConfiguration.java
index c5f10730f3..93033417fb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoClientConfiguration.java
+++ b/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-2025 the original author 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,20 @@
 
 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.mapping.Document;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
+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,78 +38,74 @@
  * @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());
-	}
-
-	/**
-	 * 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 AbstractMongoClientConfiguration} 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();
+	public MongoDatabaseFactory mongoDbFactory() {
+		return new SimpleMongoClientDatabaseFactory(mongoClient(), getDatabaseName());
 	}
 
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #mongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 * {@link #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)}. Will get {@link #customConversions()} applied.
 	 *
 	 * @see #customConversions()
-	 * @see #mongoMappingContext()
+	 * @see #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)
 	 * @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());
-		converter.setCodecRegistryProvider(mongoDbFactory());
+		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());
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
deleted file mode 100644
index bed47de650..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractMongoConfiguration.java
+++ /dev/null
@@ -1,121 +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
- * @deprecated since 2.2 in favor of {@link AbstractMongoClientConfiguration}.
- */
-@Configuration
-@Deprecated
-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());
-		converter.setCodecRegistryProvider(mongoDbFactory());
-
-		return converter;
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java
index 1b92254902..f93c4ae708 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfiguration.java
+++ b/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-2025 the original author 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 @@
 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 @@
  * @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 ReactiveMongoOperations reactiveMongoTemplate() throws Exception {
 	 * {@link MongoClient} instance configured in {@link #reactiveMongoClient()}.
 	 *
 	 * @see #reactiveMongoClient()
-	 * @see #reactiveMongoTemplate()
+	 * @see #reactiveMongoTemplate(ReactiveMongoDatabaseFactory, MappingMongoConverter)
 	 * @return never {@literal null}.
 	 */
 	@Bean
@@ -70,21 +84,31 @@ public ReactiveMongoDatabaseFactory reactiveMongoDbFactory() {
 
 	/**
 	 * Creates a {@link MappingMongoConverter} using the configured {@link #reactiveMongoDbFactory()} and
-	 * {@link #mongoMappingContext()}. Will get {@link #customConversions()} applied.
+	 * {@link #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)}. Will get {@link #customConversions()} applied.
 	 *
 	 * @see #customConversions()
-	 * @see #mongoMappingContext()
+	 * @see #mongoMappingContext(MongoCustomConversions, org.springframework.data.mongodb.MongoManagedTypes)
 	 * @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());
-		converter.setCodecRegistryProvider(reactiveMongoDbFactory());
+		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());
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
index 686df220d9..584fbfba30 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/BeanNames.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ConnectionStringPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ConnectionStringPropertyEditor.java
new file mode 100644
index 0000000000..0f6ba01704
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ConnectionStringPropertyEditor.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2019-2025 the original author 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.jspecify.annotations.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 {
+
+	@Override
+	public void setAsText(@Nullable String connectionString) {
+
+		if (!StringUtils.hasText(connectionString)) {
+			return;
+		}
+
+		setValue(new ConnectionString(connectionString));
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/EnableMongoAuditing.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/EnableMongoAuditing.java
index 4eaf613d0b..d6ce19f3ee 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/EnableMongoAuditing.java
+++ b/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-2025 the original author 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,29 +42,29 @@
 	/**
 	 * Configures the {@link AuditorAware} bean to be used to lookup the current principal.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String auditorAwareRef() default "";
 
 	/**
 	 * Configures whether the creation and modification dates are set. Defaults to {@literal true}.
 	 *
-	 * @return
+	 * @return {@literal true} by default.
 	 */
 	boolean setDates() default true;
 
 	/**
 	 * Configures whether the entity shall be marked as modified on creation. Defaults to {@literal true}.
 	 *
-	 * @return
+	 * @return {@literal true} by default.
 	 */
 	boolean modifyOnCreate() default true;
 
 	/**
-	 * Configures a {@link DateTimeProvider} bean name that allows customizing the {@link org.joda.time.DateTime} to be
-	 * used for setting creation and modification dates.
+	 * Configures a {@link DateTimeProvider} bean name that allows customizing the timestamp to be used for setting
+	 * creation and modification dates.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String dateTimeProviderRef() default "";
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/EnableReactiveMongoAuditing.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/EnableReactiveMongoAuditing.java
new file mode 100644
index 0000000000..21fadf86c6
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/EnableReactiveMongoAuditing.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2020-2025 the original author 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.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.context.annotation.Import;
+import org.springframework.data.auditing.DateTimeProvider;
+import org.springframework.data.domain.ReactiveAuditorAware;
+
+/**
+ * Annotation to enable auditing in MongoDB using reactive infrastructure via annotation configuration.
+ *
+ * @author Mark Paluch
+ * @since 3.1
+ */
+@Inherited
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Import(ReactiveMongoAuditingRegistrar.class)
+public @interface EnableReactiveMongoAuditing {
+
+	/**
+	 * Configures the {@link ReactiveAuditorAware} bean to be used to lookup the current principal.
+	 *
+	 * @return empty {@link String} by default.
+	 */
+	String auditorAwareRef() default "";
+
+	/**
+	 * Configures whether the creation and modification dates are set. Defaults to {@literal true}.
+	 *
+	 * @return {@literal true} by default.
+	 */
+	boolean setDates() default true;
+
+	/**
+	 * Configures whether the entity shall be marked as modified on creation. Defaults to {@literal true}.
+	 *
+	 * @return {@literal true} by default.
+	 */
+	boolean modifyOnCreate() default true;
+
+	/**
+	 * Configures a {@link DateTimeProvider} bean name that allows customizing the timestamp to be used for setting
+	 * creation and modification dates.
+	 *
+	 * @return empty {@link String} by default.
+	 */
+	String dateTimeProviderRef() default "";
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GeoJsonConfiguration.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GeoJsonConfiguration.java
index fdb7d3479e..3b10019cc0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GeoJsonConfiguration.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java
index 78545cd39e..b86da91dad 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/GridFsTemplateParser.java
+++ b/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-2025 the original author 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,10 +34,6 @@
  */
 class GridFsTemplateParser extends AbstractBeanDefinitionParser {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
@@ -46,10 +42,6 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P
 		return StringUtils.hasText(id) ? id : BeanNames.GRID_FS_TEMPLATE_BEAN_NAME;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
index bdbd7bd3c5..f3a7dc0437 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MappingMongoConverterParser.java
+++ b/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-2025 the original author 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,12 @@
 import static org.springframework.data.mongodb.config.BeanNames.*;
 
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.BeanMetadataElement;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
@@ -59,9 +58,9 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
@@ -76,11 +75,13 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Zied Yaich
+ * @author Tomasz Forys
  */
+@NullUnmarked
 public class MappingMongoConverterParser implements BeanDefinitionParser {
 
 	private static final String BASE_PACKAGE = "base-package";
-	private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("javax.validation.Validator",
+	private static final boolean JSR_303_PRESENT = ClassUtils.isPresent("jakarta.validation.Validator",
 			MappingMongoConverterParser.class.getClassLoader());
 
 	/* (non-Javadoc)
@@ -96,10 +97,12 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		String id = element.getAttribute(AbstractBeanDefinitionParser.ID_ATTRIBUTE);
 		id = StringUtils.hasText(id) ? id : DEFAULT_CONVERTER_BEAN_NAME;
 
+		boolean autoIndexCreationEnabled = isAutoIndexCreationEnabled(element);
+
 		parserContext.pushContainingComponent(new CompositeComponentDefinition("Mapping Mongo Converter", element));
 
 		BeanDefinition conversionsDefinition = getCustomConversions(element, parserContext);
-		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id);
+		String ctxRef = potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, id, autoIndexCreationEnabled);
 
 		// Need a reference to a Mongo instance
 		String dbFactoryRef = element.getAttribute("db-factory-ref");
@@ -132,9 +135,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 					new BeanComponentDefinition(indexOperationsProviderBuilder.getBeanDefinition(), "indexOperationsProvider"));
 		}
 
-		try {
-			registry.getBeanDefinition(INDEX_HELPER_BEAN_NAME);
-		} catch (NoSuchBeanDefinitionException ignored) {
+		if (!registry.containsBeanDefinition(INDEX_HELPER_BEAN_NAME)) {
 
 			BeanDefinitionBuilder indexHelperBuilder = BeanDefinitionBuilder
 					.genericBeanDefinition(MongoPersistentEntityIndexCreator.class);
@@ -148,7 +149,7 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 		BeanDefinition validatingMongoEventListener = potentiallyCreateValidatingMongoEventListener(element, parserContext);
 
-		if (validatingMongoEventListener != null) {
+		if (validatingMongoEventListener != null && !registry.containsBeanDefinition(VALIDATING_EVENT_LISTENER_BEAN_NAME)) {
 			parserContext.registerBeanComponent(
 					new BeanComponentDefinition(validatingMongoEventListener, VALIDATING_EVENT_LISTENER_BEAN_NAME));
 		}
@@ -158,19 +159,19 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		return null;
 	}
 
-	@Nullable
-	private BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
+	private @Nullable BeanDefinition potentiallyCreateValidatingMongoEventListener(Element element, ParserContext parserContext) {
 
 		String disableValidation = element.getAttribute("disable-validation");
-		boolean validationDisabled = StringUtils.hasText(disableValidation) && Boolean.valueOf(disableValidation);
+		boolean validationDisabled = StringUtils.hasText(disableValidation) && Boolean.parseBoolean(disableValidation);
 
 		if (!validationDisabled) {
 
 			BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition();
-			RuntimeBeanReference validator = getValidator(builder, parserContext);
+			RuntimeBeanReference validator = getValidator(element, parserContext);
 
 			if (validator != null) {
 				builder.getRawBeanDefinition().setBeanClass(ValidatingMongoEventListener.class);
+				builder.getRawBeanDefinition().setSource(element);
 				builder.addConstructorArgValue(validator);
 
 				return builder.getBeanDefinition();
@@ -192,13 +193,39 @@ private RuntimeBeanReference getValidator(Object source, ParserContext parserCon
 		validatorDef.setSource(source);
 		validatorDef.setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
 		String validatorName = parserContext.getReaderContext().registerWithGeneratedName(validatorDef);
-		parserContext.registerBeanComponent(new BeanComponentDefinition(validatorDef, validatorName));
 
 		return new RuntimeBeanReference(validatorName);
 	}
 
+	private static boolean isAutoIndexCreationEnabled(Element element) {
+
+		String autoIndexCreation = element.getAttribute("auto-index-creation");
+		return StringUtils.hasText(autoIndexCreation) && Boolean.parseBoolean(autoIndexCreation);
+	}
+
+	/**
+	 * Create and register the {@link BeanDefinition} for a {@link MongoMappingContext} if not explicitly referenced by a
+	 * given {@literal mapping-context-ref} {@link Element#getAttribute(String) attribuite}.
+	 * 
+	 * @return the mapping context bean name.
+	 * @deprecated since 4.3. Use
+	 *             {@link #potentiallyCreateMappingContext(Element, ParserContext, BeanDefinition, String, boolean)}
+	 *             instead.
+	 */
+	@Deprecated(since = "4.3", forRemoval = true)
 	public static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
 			@Nullable BeanDefinition conversionsDefinition, @Nullable String converterId) {
+		return potentiallyCreateMappingContext(element, parserContext, conversionsDefinition, converterId, false);
+	}
+
+	/**
+	 * Create and register the {@link BeanDefinition} for a {@link MongoMappingContext} if not explicitly referenced by a
+	 * given {@literal mapping-context-ref} {@link Element#getAttribute(String) attribuite}.
+	 * 
+	 * @return the mapping context bean name.
+	 */
+	public static String potentiallyCreateMappingContext(Element element, ParserContext parserContext,
+			@Nullable BeanDefinition conversionsDefinition, @Nullable String converterId, boolean autoIndexCreation) {
 
 		String ctxRef = element.getAttribute("mapping-context-ref");
 
@@ -226,6 +253,8 @@ public static String potentiallyCreateMappingContext(Element element, ParserCont
 			mappingContextBuilder.addPropertyValue("simpleTypeHolder", simpleTypesDefinition);
 		}
 
+		mappingContextBuilder.addPropertyValue("autoIndexCreation", autoIndexCreation);
+
 		parseFieldNamingStrategy(element, parserContext.getReaderContext(), mappingContextBuilder);
 
 		ctxRef = converterId == null || DEFAULT_CONVERTER_BEAN_NAME.equals(converterId) ? MAPPING_CONTEXT_BEAN_NAME
@@ -245,7 +274,7 @@ private static void parseFieldNamingStrategy(Element element, ReaderContext cont
 				&& Boolean.parseBoolean(abbreviateFieldNames);
 
 		if (fieldNamingStrategyReferenced && abbreviationActivated) {
-			context.error("Field name abbreviation cannot be activated if a field-naming-strategy-ref is configured!",
+			context.error("Field name abbreviation cannot be activated if a field-naming-strategy-ref is configured",
 					element);
 			return;
 		}
@@ -263,8 +292,7 @@ private static void parseFieldNamingStrategy(Element element, ReaderContext cont
 		}
 	}
 
-	@Nullable
-	private BeanDefinition getCustomConversions(Element element, ParserContext parserContext) {
+	private @Nullable BeanDefinition getCustomConversions(Element element, ParserContext parserContext) {
 
 		List<Element> customConvertersElements = DomUtils.getChildElementsByTagName(element, "custom-converters");
 
@@ -274,7 +302,7 @@ private BeanDefinition getCustomConversions(Element element, ParserContext parse
 			ManagedList<BeanMetadataElement> converterBeans = new ManagedList<>();
 			List<Element> converterElements = DomUtils.getChildElementsByTagName(customerConvertersElement, "converter");
 
-			if (converterElements != null) {
+			if (!ObjectUtils.isEmpty(converterElements)) {
 				for (Element listenerElement : converterElements) {
 					converterBeans.add(parseConverter(listenerElement, parserContext));
 				}
@@ -326,8 +354,7 @@ private static Set<String> getInitialEntityClasses(Element element) {
 		return classes;
 	}
 
-	@Nullable
-	public BeanMetadataElement parseConverter(Element element, ParserContext parserContext) {
+	public @Nullable BeanMetadataElement parseConverter(Element element, ParserContext parserContext) {
 
 		String converterRef = element.getAttribute("ref");
 		if (StringUtils.hasText(converterRef)) {
@@ -363,13 +390,9 @@ public NegatingFilter(TypeFilter... filters) {
 
 			Assert.notNull(filters, "TypeFilters must not be null");
 
-			this.delegates = new HashSet<>(Arrays.asList(filters));
+			this.delegates = Set.of(filters);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.type.filter.TypeFilter#match(org.springframework.core.type.classreading.MetadataReader, org.springframework.core.type.classreading.MetadataReaderFactory)
-		 */
 		public boolean match(MetadataReader metadataReader, MetadataReaderFactory metadataReaderFactory)
 				throws IOException {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java
index ba1bfd5332..a304199776 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingBeanDefinitionParser.java
+++ b/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-2025 the original author 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,6 +18,8 @@
 import static org.springframework.data.config.ParsingUtils.*;
 import static org.springframework.data.mongodb.config.BeanNames.*;
 
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -29,7 +31,6 @@
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
 import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 
@@ -42,33 +43,22 @@
  * @author Oliver Gierke
  * @author Mark Paluch
  */
+@NullUnmarked
 public class MongoAuditingBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
 
 	private static boolean PROJECT_REACTOR_AVAILABLE = ClassUtils.isPresent("reactor.core.publisher.Mono",
 			MongoAuditingRegistrar.class.getClassLoader());
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#getBeanClass(org.w3c.dom.Element)
-	 */
 	@Override
 	protected Class<?> getBeanClass(Element element) {
 		return AuditingEntityCallback.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#shouldGenerateId()
-	 */
 	@Override
 	protected boolean shouldGenerateId() {
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser#doParse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext, org.springframework.beans.factory.support.BeanDefinitionBuilder)
-	 */
 	@Override
 	protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java
index a87aa30a55..37e509a38a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoAuditingRegistrar.java
+++ b/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-2025 the original author 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,25 +17,17 @@
 
 import java.lang.annotation.Annotation;
 
-import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.Ordered;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
 import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
 import org.springframework.data.auditing.config.AuditingConfiguration;
 import org.springframework.data.config.ParsingUtils;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
-import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
 import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
 
 /**
  * {@link ImportBeanDefinitionRegistrar} to enable {@link EnableMongoAuditing} annotation.
@@ -43,71 +35,42 @@
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
-class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
+class MongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport implements Ordered {
 
-	private static boolean PROJECT_REACTOR_AVAILABLE = ClassUtils.isPresent("reactor.core.publisher.Mono",
-			MongoAuditingRegistrar.class.getClassLoader());
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableMongoAuditing.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditingHandlerBeanName()
-	 */
 	@Override
 	protected String getAuditingHandlerBeanName() {
 		return "mongoAuditingHandler";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerBeanDefinitions(org.springframework.core.type.AnnotationMetadata, org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
 	@Override
-	public void registerBeanDefinitions(AnnotationMetadata annotationMetadata, BeanDefinitionRegistry registry) {
-
-		Assert.notNull(annotationMetadata, "AnnotationMetadata must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+	protected void postProcess(BeanDefinitionBuilder builder, AuditingConfiguration configuration,
+			BeanDefinitionRegistry registry) {
 
-		super.registerBeanDefinitions(annotationMetadata, registry);
+		builder.setFactoryMethod("from").addConstructorArgReference("mongoMappingContext");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#getAuditHandlerBeanDefinitionBuilder(org.springframework.data.auditing.config.AuditingConfiguration)
-	 */
 	@Override
 	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
 
-		Assert.notNull(configuration, "AuditingConfiguration must not be null!");
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class);
-
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(MongoMappingContextLookup.class);
-		definition.setAutowireMode(AbstractBeanDefinition.AUTOWIRE_CONSTRUCTOR);
+		Assert.notNull(configuration, "AuditingConfiguration must not be null");
 
-		builder.addConstructorArgValue(definition.getBeanDefinition());
-		return configureDefaultAuditHandlerAttributes(configuration, builder);
+		return configureDefaultAuditHandlerAttributes(configuration,
+				BeanDefinitionBuilder.rootBeanDefinition(IsNewAwareAuditingHandler.class));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport#registerAuditListener(org.springframework.beans.factory.config.BeanDefinition, org.springframework.beans.factory.support.BeanDefinitionRegistry)
-	 */
 	@Override
 	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
 			BeanDefinitionRegistry registry) {
 
-		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null!");
-		Assert.notNull(registry, "BeanDefinitionRegistry must not be null!");
+		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
 
 		BeanDefinitionBuilder listenerBeanDefinitionBuilder = BeanDefinitionBuilder
 				.rootBeanDefinition(AuditingEntityCallback.class);
@@ -116,68 +79,10 @@ protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandle
 
 		registerInfrastructureBeanWithId(listenerBeanDefinitionBuilder.getBeanDefinition(),
 				AuditingEntityCallback.class.getName(), registry);
-
-		if (PROJECT_REACTOR_AVAILABLE) {
-			registerReactiveAuditingEntityCallback(registry, auditingHandlerDefinition.getSource());
-		}
 	}
 
-	private void registerReactiveAuditingEntityCallback(BeanDefinitionRegistry registry, Object source) {
-
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
-
-		builder.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
-		builder.getRawBeanDefinition().setSource(source);
-
-		registerInfrastructureBeanWithId(builder.getBeanDefinition(), ReactiveAuditingEntityCallback.class.getName(),
-				registry);
-	}
-
-	/**
-	 * Simple helper to be able to wire the {@link MappingContext} from a {@link MappingMongoConverter} bean available in
-	 * the application context.
-	 *
-	 * @author Oliver Gierke
-	 */
-	static class MongoMappingContextLookup
-			implements FactoryBean<MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty>> {
-
-		private final MappingMongoConverter converter;
-
-		/**
-		 * Creates a new {@link MongoMappingContextLookup} for the given {@link MappingMongoConverter}.
-		 *
-		 * @param converter must not be {@literal null}.
-		 */
-		public MongoMappingContextLookup(MappingMongoConverter converter) {
-			this.converter = converter;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.beans.factory.FactoryBean#getObject()
-		 */
-		@Override
-		public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getObject() throws Exception {
-			return converter.getMappingContext();
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-		 */
-		@Override
-		public Class<?> getObjectType() {
-			return MappingContext.class;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.beans.factory.FactoryBean#isSingleton()
-		 */
-		@Override
-		public boolean isSingleton() {
-			return true;
-		}
+	@Override
+	public int getOrder() {
+		return Ordered.LOWEST_PRECEDENCE;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java
index c08332390d..501c00b9d6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoClientParser.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,10 +35,6 @@
  */
 public class MongoClientParser implements BeanDefinitionParser {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.BeanDefinitionParser#parse(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 		Object source = parserContext.extractSource(element);
@@ -50,10 +46,11 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 
 		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 +59,34 @@ public BeanDefinition parse(Element element, ParserContext parserContext) {
 		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();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java
index eaa4c6b012..b01827d8c6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoConfigurationSupport.java
+++ b/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-2025 the original author 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,22 +20,28 @@
 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;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.data.annotation.Persistent;
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.mapping.model.CamelCaseAbbreviatingFieldNamingStrategy;
 import org.springframework.data.mapping.model.FieldNamingStrategy;
 import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
+import org.springframework.data.mongodb.MongoManagedTypes;
 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.Assert;
 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.
  *
@@ -47,7 +53,7 @@ public abstract class MongoConfigurationSupport {
 	/**
 	 * Return the name of the database to connect to.
 	 *
-	 * @return must not be {@literal null}.
+	 * @return never {@literal null}.
 	 */
 	protected abstract String getDatabaseName();
 
@@ -71,31 +77,57 @@ protected Collection<String> getMappingBasePackages() {
 	 * Creates a {@link MongoMappingContext} equipped with entity classes scanned from the mapping base package.
 	 *
 	 * @see #getMappingBasePackages()
-	 * @return
-	 * @throws ClassNotFoundException
+	 * @return never {@literal null}.
 	 */
 	@Bean
-	public MongoMappingContext mongoMappingContext() throws ClassNotFoundException {
+	public MongoMappingContext mongoMappingContext(MongoCustomConversions customConversions,
+			MongoManagedTypes mongoManagedTypes) {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setInitialEntitySet(getInitialEntitySet());
-		mappingContext.setSimpleTypeHolder(customConversions().getSimpleTypeHolder());
+		mappingContext.setManagedTypes(mongoManagedTypes);
+		mappingContext.setSimpleTypeHolder(customConversions.getSimpleTypeHolder());
 		mappingContext.setFieldNamingStrategy(fieldNamingStrategy());
 		mappingContext.setAutoIndexCreation(autoIndexCreation());
 
 		return mappingContext;
 	}
 
+	/**
+	 * @return new instance of {@link MongoManagedTypes}.
+	 * @throws ClassNotFoundException
+	 * @since 4.0
+	 */
+	@Bean
+	public MongoManagedTypes mongoManagedTypes() throws ClassNotFoundException {
+		return MongoManagedTypes.fromIterable(getInitialEntitySet());
+	}
+
 	/**
 	 * 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) {
+
 	}
 
 	/**
@@ -118,8 +150,7 @@ protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
 	}
 
 	/**
-	 * Scans the given base package for entities, i.e. MongoDB specific types annotated with {@link Document} and
-	 * {@link Persistent}.
+	 * Scans the given base package for entities, i.e. MongoDB specific types annotated with {@link Document}.
 	 *
 	 * @param basePackage must not be {@literal null}.
 	 * @return
@@ -139,12 +170,13 @@ protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFound
 			ClassPathScanningCandidateComponentProvider componentProvider = new ClassPathScanningCandidateComponentProvider(
 					false);
 			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Document.class));
-			componentProvider.addIncludeFilter(new AnnotationTypeFilter(Persistent.class));
 
 			for (BeanDefinition candidate : componentProvider.findCandidateComponents(basePackage)) {
 
-				initialEntitySet
-						.add(ClassUtils.forName(candidate.getBeanClassName(), MongoConfigurationSupport.class.getClassLoader()));
+				String beanClassName = candidate.getBeanClassName();
+				Assert.notNull(beanClassName, "BeanClassName cannot be null");
+
+				initialEntitySet.add(ClassUtils.forName(beanClassName, MongoConfigurationSupport.class.getClassLoader()));
 			}
 		}
 
@@ -153,8 +185,7 @@ protected Set<Class<?>> scanForEntities(String basePackage) throws ClassNotFound
 
 	/**
 	 * Configures whether to abbreviate field names for domain objects by configuring a
-	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created. For advanced
-	 * customization needs, consider overriding {@link #mappingMongoConverter()}.
+	 * {@link CamelCaseAbbreviatingFieldNamingStrategy} on the {@link MongoMappingContext} instance created.
 	 *
 	 * @return
 	 */
@@ -177,11 +208,36 @@ protected FieldNamingStrategy fieldNamingStrategy() {
 	 * Configure whether to automatically create indices for domain types by deriving the
 	 * {@link org.springframework.data.mongodb.core.index.IndexDefinition} from the entity or not.
 	 *
-	 * @return {@literal true} by default. <br />
-	 *         <strong>INFO</strong>: As of 3.x the default will be set to {@literal false}.
+	 * @return {@literal false} by default. <br />
+	 *         <strong>INFO:</strong> As of 3.x the default is set to {@literal false}; In 2.x it was {@literal true}.
 	 * @since 2.2
 	 */
 	protected boolean autoIndexCreation() {
-		return true;
+		return false;
+	}
+
+	/**
+	 * 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();
+		builder.uuidRepresentation(UuidRepresentation.JAVA_LEGACY);
+		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) {
+		// customization hook
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java
index 1ba95a407a..93d778c861 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditor.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 package org.springframework.data.mongodb.config;
 
 import java.beans.PropertyEditorSupport;
-import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Method;
 import java.net.URLDecoder;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -26,7 +26,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.ReflectionUtils;
 import org.springframework.util.StringUtils;
 
@@ -51,10 +51,6 @@ public class MongoCredentialPropertyEditor extends PropertyEditorSupport {
 	private static final String OPTIONS_DELIMITER = "?";
 	private static final String OPTION_VALUE_DELIMITER = "&";
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
-	 */
 	@Override
 	public void setAsText(@Nullable String text) throws IllegalArgumentException {
 
@@ -121,7 +117,7 @@ public void setAsText(@Nullable String text) throws IllegalArgumentException {
 								userNameAndPassword[1].toCharArray()));
 					} else {
 						throw new IllegalArgumentException(
-								String.format("Cannot create MongoCredentials for unknown auth mechanism '%s'!", authMechanism));
+								String.format("Cannot create MongoCredentials for unknown auth mechanism '%s'", authMechanism));
 					}
 				}
 			} else {
@@ -198,7 +194,7 @@ private static Properties extractOptions(String text) {
 			String[] optionArgs = option.split("=");
 
 			if (optionArgs.length == 1) {
-				throw new IllegalArgumentException(String.format("Query parameter '%s' has no value!", optionArgs[0]));
+				throw new IllegalArgumentException(String.format("Query parameter '%s' has no value", optionArgs[0]));
 			}
 
 			properties.put(optionArgs[0], optionArgs[1]);
@@ -213,29 +209,25 @@ private static void verifyUsernameAndPasswordPresent(String[] source) {
 
 		if (source.length != 2) {
 			throw new IllegalArgumentException(
-					"Credentials need to specify username and password like in 'username:password@database'!");
+					"Credentials need to specify username and password like in 'username:password@database'");
 		}
 	}
 
 	private static void verifyDatabasePresent(String source) {
 
 		if (!StringUtils.hasText(source)) {
-			throw new IllegalArgumentException("Credentials need to specify database like in 'username:password@database'!");
+			throw new IllegalArgumentException("Credentials need to specify database like in 'username:password@database'");
 		}
 	}
 
 	private static void verifyUserNamePresent(String[] source) {
 
 		if (source.length == 0 || !StringUtils.hasText(source[0])) {
-			throw new IllegalArgumentException("Credentials need to specify username!");
+			throw new IllegalArgumentException("Credentials need to specify username");
 		}
 	}
 
 	private static String decodeParameter(String it) {
-		try {
-			return URLDecoder.decode(it, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			throw new IllegalArgumentException("o_O UTF-8 not supported!", e);
-		}
+		return URLDecoder.decode(it, StandardCharsets.UTF_8);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java
index e0048a6d3c..2d3649c53a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoDbFactoryParser.java
+++ b/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-2025 the original author 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,10 +18,10 @@
 import static org.springframework.data.config.ParsingUtils.*;
 import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -32,14 +32,11 @@
 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.lang.Nullable;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 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.
@@ -51,23 +48,11 @@
  * @author Viktor Khoroshko
  * @author Mark Paluch
  */
+@NullUnmarked
 public class MongoDbFactoryParser extends AbstractBeanDefinitionParser {
 
-	private static final Set<String> MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES;
+	private static final Set<String> MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES = Set.of("id", "write-concern");
 
-	static {
-
-		Set<String> mongoUriAllowedAdditionalAttributes = new HashSet<String>();
-		mongoUriAllowedAdditionalAttributes.add("id");
-		mongoUriAllowedAdditionalAttributes.add("write-concern");
-
-		MONGO_URI_ALLOWED_ADDITIONAL_ATTRIBUTES = Collections.unmodifiableSet(mongoUriAllowedAdditionalAttributes);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
@@ -76,18 +61,15 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P
 		return StringUtils.hasText(id) ? id : BeanNames.DB_FACTORY_BEAN_NAME;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	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 +79,8 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 
 		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 +102,8 @@ protected AbstractBeanDefinition parseInternal(Element element, ParserContext pa
 	}
 
 	/**
-	 * 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 +119,7 @@ private BeanDefinition registerMongoBeanDefinition(Element element, ParserContex
 	}
 
 	/**
-	 * 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}.
 	 *
@@ -145,12 +127,19 @@ private BeanDefinition registerMongoBeanDefinition(Element element, ParserContex
 	 * @param parserContext
 	 * @return {@literal null} in case no client-/uri defined.
 	 */
-	@Nullable
-	private BeanDefinition getMongoUri(Element element, ParserContext parserContext) {
+	private @Nullable 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 +153,12 @@ private BeanDefinition getMongoUri(Element element, ParserContext parserContext)
 
 		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();
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java
deleted file mode 100644
index 4c2e55416f..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoJmxParser.java
+++ /dev/null
@@ -1,76 +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.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.parsing.BeanComponentDefinition;
-import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.BeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.mongodb.core.MongoAdmin;
-import org.springframework.data.mongodb.monitor.*;
-import org.springframework.util.StringUtils;
-import org.w3c.dom.Element;
-
-/**
- * @author Mark Pollack
- * @author Thomas Risberg
- * @author John Brisbin
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
-public class MongoJmxParser implements BeanDefinitionParser {
-
-	public BeanDefinition parse(Element element, ParserContext parserContext) {
-		String name = element.getAttribute("mongo-ref");
-		if (!StringUtils.hasText(name)) {
-			name = BeanNames.MONGO_BEAN_NAME;
-		}
-		registerJmxComponents(name, element, parserContext);
-		return null;
-	}
-
-	protected void registerJmxComponents(String mongoRefName, Element element, ParserContext parserContext) {
-		Object eleSource = parserContext.extractSource(element);
-
-		CompositeComponentDefinition compositeDef = new CompositeComponentDefinition(element.getTagName(), eleSource);
-
-		createBeanDefEntry(AssertMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(BackgroundFlushingMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(BtreeIndexCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(ConnectionMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(GlobalLockMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(MemoryMetrics.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(OperationCounters.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(ServerInfo.class, compositeDef, mongoRefName, eleSource, parserContext);
-		createBeanDefEntry(MongoAdmin.class, compositeDef, mongoRefName, eleSource, parserContext);
-
-		parserContext.registerComponent(compositeDef);
-
-	}
-
-	protected void createBeanDefEntry(Class<?> clazz, CompositeComponentDefinition compositeDef, String mongoRefName,
-			Object eleSource, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
-		builder.getRawBeanDefinition().setSource(eleSource);
-		builder.addConstructorArgReference(mongoRefName);
-		BeanDefinition assertDef = builder.getBeanDefinition();
-		String assertName = parserContext.getReaderContext().registerWithGeneratedName(assertDef);
-		compositeDef.addNestedComponent(new BeanComponentDefinition(assertDef, assertName));
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java
index 87868fa502..62a4a1082d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoNamespaceHandler.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,16 +26,11 @@
  */
 public class MongoNamespaceHandler extends NamespaceHandlerSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
-	 */
 	public void init() {
 
 		registerBeanDefinitionParser("mapping-converter", new MappingMongoConverterParser());
 		registerBeanDefinitionParser("mongo-client", new MongoClientParser());
 		registerBeanDefinitionParser("db-factory", new MongoDbFactoryParser());
-		registerBeanDefinitionParser("jmx", new MongoJmxParser());
 		registerBeanDefinitionParser("auditing", new MongoAuditingBeanDefinitionParser());
 		registerBeanDefinitionParser("template", new MongoTemplateParser());
 		registerBeanDefinitionParser("gridFsTemplate", new GridFsTemplateParser());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java
index 36c2544c48..00e993fdc8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoParsingUtils.java
+++ b/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-2025 the original author 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,12 +19,16 @@
 
 import java.util.Map;
 
+import org.jspecify.annotations.NullUnmarked;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.CustomEditorConfigurer;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionValidationException;
 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.data.mongodb.core.MongoServerApiFactoryBean;
+import org.springframework.util.StringUtils;
 import org.springframework.util.xml.DomUtils;
 import org.w3c.dom.Element;
 
@@ -37,66 +41,98 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@SuppressWarnings("deprecation")
+@NullUnmarked
 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) {
-
-		Element optionsElement = DomUtils.getChildElementByTagName(element, "client-options");
+	public static boolean parseMongoClientSettings(Element element, BeanDefinitionBuilder mongoClientBuilder) {
 
-		if (optionsElement == null) {
+		Element settingsElement = DomUtils.getChildElementByTagName(element, "client-settings");
+		if (settingsElement == null) {
 			return false;
 		}
 
 		BeanDefinitionBuilder clientOptionsDefBuilder = BeanDefinitionBuilder
-				.genericBeanDefinition(MongoClientOptionsFactoryBean.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");
-		setPropertyReference(clientOptionsDefBuilder, optionsElement, "encryption-settings-ref", "autoEncryptionSettings");
-		setPropertyValue(clientOptionsDefBuilder, optionsElement, "server-selection-timeout", "serverSelectionTimeout");
-
-		mongoClientBuilder.addPropertyValue("mongoClientOptions", clientOptionsDefBuilder.getBeanDefinition());
+				.genericBeanDefinition(MongoClientSettingsFactoryBean.class);
+
+		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");
+
+		// 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");
+
+		// ServerAPI
+		if (StringUtils.hasText(settingsElement.getAttribute("server-api-version"))) {
+
+			MongoServerApiFactoryBean serverApiFactoryBean = new MongoServerApiFactoryBean();
+			serverApiFactoryBean.setVersion(settingsElement.getAttribute("server-api-version"));
+			try {
+				clientOptionsDefBuilder.addPropertyValue("serverApi", serverApiFactoryBean.getObject());
+			} catch (Exception exception) {
+				throw new BeanDefinitionValidationException("Non parsable server-api.", exception);
+			}
+		} else {
+			setPropertyReference(clientOptionsDefBuilder, settingsElement, "server-api-ref", "serverApi");
+		}
+
+		// and the rest
+
+		mongoClientBuilder.addPropertyValue("mongoClientSettings", clientOptionsDefBuilder.getBeanDefinition());
 
 		return true;
 	}
@@ -118,6 +154,24 @@ static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
 		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
@@ -125,7 +179,7 @@ static BeanDefinitionBuilder getWriteConcernPropertyEditorBuilder() {
 	 */
 	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");
 
@@ -143,7 +197,7 @@ static BeanDefinitionBuilder getServerAddressPropertyEditorBuilder() {
 	 */
 	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);
@@ -169,4 +223,41 @@ static BeanDefinitionBuilder getMongoCredentialPropertyEditor() {
 
 		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;
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java
index c489547d80..5053e540fe 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/MongoTemplateParser.java
+++ b/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-2025 the original author 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,6 +18,7 @@
 import static org.springframework.data.config.ParsingUtils.*;
 import static org.springframework.data.mongodb.config.MongoParsingUtils.*;
 
+import org.jspecify.annotations.NullUnmarked;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -37,12 +38,9 @@
  * @author Martin Baumgartner
  * @author Oliver Gierke
  */
+@NullUnmarked
 class MongoTemplateParser extends AbstractBeanDefinitionParser {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#resolveId(org.w3c.dom.Element, org.springframework.beans.factory.support.AbstractBeanDefinition, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext)
 			throws BeanDefinitionStoreException {
@@ -51,10 +49,6 @@ protected String resolveId(Element element, AbstractBeanDefinition definition, P
 		return StringUtils.hasText(id) ? id : BeanNames.MONGO_TEMPLATE_BEAN_NAME;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext)
-	 */
 	@Override
 	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/PersistentEntitiesFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/PersistentEntitiesFactoryBean.java
new file mode 100644
index 0000000000..e46701a7f3
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/PersistentEntitiesFactoryBean.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2020-2025 the original author 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.beans.factory.FactoryBean;
+import org.springframework.data.mapping.context.PersistentEntities;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+
+/**
+ * Simple helper to be able to wire the {@link PersistentEntities} from a {@link MappingMongoConverter} bean available
+ * in the application context.
+ *
+ * @author Oliver Gierke
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 3.1
+ */
+public class PersistentEntitiesFactoryBean implements FactoryBean<PersistentEntities> {
+
+	private final MappingMongoConverter converter;
+
+	/**
+	 * Creates a new {@link PersistentEntitiesFactoryBean} for the given {@link MappingMongoConverter}.
+	 *
+	 * @param converter must not be {@literal null}.
+	 */
+	public PersistentEntitiesFactoryBean(MappingMongoConverter converter) {
+		this.converter = converter;
+	}
+
+	@Override
+	public PersistentEntities getObject() {
+		return PersistentEntities.of(converter.getMappingContext());
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return PersistentEntities.class;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReactiveMongoAuditingRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReactiveMongoAuditingRegistrar.java
new file mode 100644
index 0000000000..80cf404434
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReactiveMongoAuditingRegistrar.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2020-2025 the original author 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.lang.annotation.Annotation;
+
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.data.auditing.ReactiveIsNewAwareAuditingHandler;
+import org.springframework.data.auditing.config.AuditingBeanDefinitionRegistrarSupport;
+import org.springframework.data.auditing.config.AuditingConfiguration;
+import org.springframework.data.config.ParsingUtils;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
+import org.springframework.util.Assert;
+
+/**
+ * {@link ImportBeanDefinitionRegistrar} to enable {@link EnableReactiveMongoAuditing} annotation.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 3.1
+ */
+class ReactiveMongoAuditingRegistrar extends AuditingBeanDefinitionRegistrarSupport {
+
+	@Override
+	protected Class<? extends Annotation> getAnnotation() {
+		return EnableReactiveMongoAuditing.class;
+	}
+
+	@Override
+	protected String getAuditingHandlerBeanName() {
+		return "reactiveMongoAuditingHandler";
+	}
+
+	@Override
+	protected void postProcess(BeanDefinitionBuilder builder, AuditingConfiguration configuration,
+			BeanDefinitionRegistry registry) {
+		builder.setFactoryMethod("from").addConstructorArgReference("mongoMappingContext");
+	}
+
+	@Override
+	protected BeanDefinitionBuilder getAuditHandlerBeanDefinitionBuilder(AuditingConfiguration configuration) {
+
+		Assert.notNull(configuration, "AuditingConfiguration must not be null");
+
+		return configureDefaultAuditHandlerAttributes(configuration,
+				BeanDefinitionBuilder.rootBeanDefinition(ReactiveIsNewAwareAuditingHandler.class));
+	}
+
+	@Override
+	protected void registerAuditListenerBeanDefinition(BeanDefinition auditingHandlerDefinition,
+			BeanDefinitionRegistry registry) {
+
+		Assert.notNull(auditingHandlerDefinition, "BeanDefinition must not be null");
+		Assert.notNull(registry, "BeanDefinitionRegistry must not be null");
+
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(ReactiveAuditingEntityCallback.class);
+
+		builder.addConstructorArgValue(ParsingUtils.getObjectFactoryBeanDefinition(getAuditingHandlerBeanName(), registry));
+		builder.getRawBeanDefinition().setSource(auditingHandlerDefinition.getSource());
+
+		registerInfrastructureBeanWithId(builder.getBeanDefinition(), ReactiveAuditingEntityCallback.class.getName(),
+				registry);
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadConcernPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadConcernPropertyEditor.java
new file mode 100644
index 0000000000..3f5cb0ca62
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadConcernPropertyEditor.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2019-2025 the original author 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.jspecify.annotations.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 {
+
+	@Override
+	public void setAsText(@Nullable String readConcernString) {
+
+		if (!StringUtils.hasText(readConcernString)) {
+			return;
+		}
+
+		setValue(new ReadConcern(ReadConcernLevel.fromString(readConcernString)));
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java
index a46abcd4fb..f24c435348 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditor.java
+++ b/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-2025 the original author 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,10 +17,10 @@
 
 import java.beans.PropertyEditorSupport;
 
-import org.springframework.lang.Nullable;
-
 import com.mongodb.ReadPreference;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Parse a {@link String} to a {@link ReadPreference}.
  *
@@ -29,10 +29,6 @@
  */
 public class ReadPreferencePropertyEditor extends PropertyEditorSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
-	 */
 	@Override
 	public void setAsText(@Nullable String readPreferenceString) throws IllegalArgumentException {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java
index 0317d25fd5..9ff59e5b22 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditor.java
+++ b/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-2025 the original author 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,9 +21,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.lang.Nullable;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -43,13 +43,9 @@ public class ServerAddressPropertyEditor extends PropertyEditorSupport {
 	 * A port is a number without a leading 0 at the end of the address that is proceeded by just a single :.
 	 */
 	private static final String HOST_PORT_SPLIT_PATTERN = "(?<!:):(?=[123456789]\\d*$)";
-	private static final String COULD_NOT_PARSE_ADDRESS_MESSAGE = "Could not parse address {} '{}'. Check your replica set configuration!";
-	private static final Logger LOG = LoggerFactory.getLogger(ServerAddressPropertyEditor.class);
+	private static final String COULD_NOT_PARSE_ADDRESS_MESSAGE = "Could not parse address %s '%s'; Check your replica set configuration";
+	private static final Log LOG = LogFactory.getLog(ServerAddressPropertyEditor.class);
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.beans.PropertyEditorSupport#setAsText(java.lang.String)
-	 */
 	@Override
 	public void setAsText(@Nullable String replicaSetString) {
 
@@ -72,7 +68,7 @@ public void setAsText(@Nullable String replicaSetString) {
 
 		if (serverAddresses.isEmpty()) {
 			throw new IllegalArgumentException(
-					"Could not resolve at least one server of the replica set configuration! Validate your config!");
+					"Could not resolve at least one server of the replica set configuration; Validate your config");
 		}
 
 		setValue(serverAddresses.toArray(new ServerAddress[serverAddresses.size()]));
@@ -84,18 +80,21 @@ public void setAsText(@Nullable String replicaSetString) {
 	 * @param source
 	 * @return the
 	 */
-	@Nullable
-	private ServerAddress parseServerAddress(String source) {
+	private @Nullable ServerAddress parseServerAddress(String source) {
 
 		if (!StringUtils.hasText(source)) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
+			if (LOG.isWarnEnabled()) {
+				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source));
+			}
 			return null;
 		}
 
 		String[] hostAndPort = extractHostAddressAndPort(source.trim());
 
 		if (hostAndPort.length > 2) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source);
+			if (LOG.isWarnEnabled()) {
+				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "source", source));
+			}
 			return null;
 		}
 
@@ -105,9 +104,13 @@ private ServerAddress parseServerAddress(String source) {
 
 			return port == null ? new ServerAddress(hostAddress) : new ServerAddress(hostAddress, port);
 		} catch (UnknownHostException e) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]);
+			if (LOG.isWarnEnabled()) {
+				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "host", hostAndPort[0]));
+			}
 		} catch (NumberFormatException e) {
-			LOG.warn(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]);
+			if (LOG.isWarnEnabled()) {
+				LOG.warn(String.format(COULD_NOT_PARSE_ADDRESS_MESSAGE, "port", hostAndPort[1]));
+			}
 		}
 
 		return null;
@@ -121,7 +124,7 @@ private ServerAddress parseServerAddress(String source) {
 	 */
 	private String[] extractHostAddressAndPort(String addressAndPortSource) {
 
-		Assert.notNull(addressAndPortSource, "Address and port source must not be null!");
+		Assert.notNull(addressAndPortSource, "Address and port source must not be null");
 
 		String[] hostAndPort = addressAndPortSource.split(HOST_PORT_SPLIT_PATTERN);
 		String hostAddress = hostAndPort[0];
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java
index 84a388415d..9f579b8fe9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/StringToWriteConcernConverter.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,6 @@
  */
 public class StringToWriteConcernConverter implements Converter<String, WriteConcern> {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
 	public WriteConcern convert(String source) {
 
 		WriteConcern writeConcern = WriteConcern.valueOf(source);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/UUidRepresentationPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/UUidRepresentationPropertyEditor.java
new file mode 100644
index 0000000000..23c15102ac
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/UUidRepresentationPropertyEditor.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020-2025 the original author 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.jspecify.annotations.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 {
+
+	@Override
+	public void setAsText(@Nullable String value) {
+
+		if (!StringUtils.hasText(value)) {
+			return;
+		}
+
+		setValue(UuidRepresentation.valueOf(value));
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java
index 27d6ecf394..32c19e24c3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditor.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import java.beans.PropertyEditorSupport;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.WriteConcern;
@@ -34,7 +34,7 @@
 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 void setAsText(@Nullable String writeConcernString) {
 			// pass on the string to the constructor
 			setValue(new WriteConcern(writeConcernString));
 		}
-
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java
index 5a1e5b725e..555cc9f66e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/config/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Spring XML namespace configuration for MongoDB specific repositories.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.config;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/AggregationUtil.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/AggregationUtil.java
index c8984e13a3..ec7c368eaf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/AggregationUtil.java
+++ b/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-2025 the original author 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,31 +15,21 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AllArgsConstructor;
-
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
-import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
-import org.springframework.data.mongodb.core.aggregation.CountOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOptions.DomainTypeMapping;
+import org.springframework.data.mongodb.core.aggregation.FieldLookupPolicy;
 import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.ObjectUtils;
+import org.springframework.data.util.Lazy;
 
 /**
  * Utility methods to map {@link org.springframework.data.mongodb.core.aggregation.Aggregation} pipeline definitions and
@@ -49,34 +39,41 @@
  * @author Mark Paluch
  * @since 2.1
  */
-@AllArgsConstructor
 class AggregationUtil {
 
-	QueryMapper queryMapper;
-	MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	final QueryMapper queryMapper;
+	final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	final Lazy<AggregationOperationContext> untypedMappingContext;
 
-	/**
-	 * Prepare the {@link AggregationOperationContext} for a given aggregation by either returning the context itself it
-	 * is not {@literal null}, create a {@link TypeBasedAggregationOperationContext} if the aggregation contains type
-	 * information (is a {@link TypedAggregation}) or use the {@link Aggregation#DEFAULT_CONTEXT}.
-	 *
-	 * @param aggregation must not be {@literal null}.
-	 * @param context can be {@literal null}.
-	 * @return the root {@link AggregationOperationContext} to use.
-	 */
-	AggregationOperationContext prepareAggregationContext(Aggregation aggregation,
-			@Nullable AggregationOperationContext context) {
+	AggregationUtil(QueryMapper queryMapper,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+		this.queryMapper = queryMapper;
+		this.mappingContext = mappingContext;
+		this.untypedMappingContext = Lazy.of(() -> new TypeBasedAggregationOperationContext(Object.class, mappingContext,
+				queryMapper, FieldLookupPolicy.relaxed()));
+	}
+
+	AggregationOperationContext createAggregationContext(Aggregation aggregation, @Nullable Class<?> inputType) {
+
+		DomainTypeMapping domainTypeMapping = aggregation.getOptions().getDomainTypeMapping();
+
+		if (domainTypeMapping == DomainTypeMapping.NONE) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
 
-		if (context != null) {
-			return context;
+		FieldLookupPolicy lookupPolicy = domainTypeMapping == DomainTypeMapping.STRICT
+				&& !aggregation.getPipeline().containsUnionWith() ? FieldLookupPolicy.strict() : FieldLookupPolicy.relaxed();
+
+		if (aggregation instanceof TypedAggregation<?> ta) {
+			return new TypeBasedAggregationOperationContext(ta.getInputType(), mappingContext, queryMapper, lookupPolicy);
 		}
 
-		if (aggregation instanceof TypedAggregation) {
-			return new TypeBasedAggregationOperationContext(((TypedAggregation) aggregation).getInputType(), mappingContext,
-					queryMapper);
+		if (inputType == null) {
+			return untypedMappingContext.get();
 		}
 
-		return Aggregation.DEFAULT_CONTEXT;
+		return new TypeBasedAggregationOperationContext(inputType, mappingContext, queryMapper, lookupPolicy);
 	}
 
 	/**
@@ -87,12 +84,7 @@ AggregationOperationContext prepareAggregationContext(Aggregation aggregation,
 	 * @return
 	 */
 	List<Document> createPipeline(Aggregation aggregation, AggregationOperationContext context) {
-
-		if (!ObjectUtils.nullSafeEquals(context, Aggregation.DEFAULT_CONTEXT)) {
-			return aggregation.toPipeline(context);
-		}
-
-		return mapAggregationPipeline(aggregation.toPipeline(context));
+		return aggregation.toPipeline(context);
 	}
 
 	/**
@@ -103,68 +95,7 @@ List<Document> createPipeline(Aggregation aggregation, AggregationOperationConte
 	 * @return
 	 */
 	Document createCommand(String collection, Aggregation aggregation, AggregationOperationContext context) {
-
-		Document command = aggregation.toDocument(collection, context);
-
-		if (!ObjectUtils.nullSafeEquals(context, Aggregation.DEFAULT_CONTEXT)) {
-			return command;
-		}
-
-		command.put("pipeline", mapAggregationPipeline(command.get("pipeline", List.class)));
-
-		return command;
+		return aggregation.toDocument(collection, context);
 	}
 
-	/**
-	 * Create a {@code $count} aggregation for {@link Query} and optionally a {@link Class entity class}.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param entityClass can be {@literal null} if the {@link Query} object is empty.
-	 * @return the {@link Aggregation} pipeline definition to run a {@code $count} aggregation.
-	 */
-	Aggregation createCountAggregation(Query query, @Nullable Class<?> entityClass) {
-
-		List<AggregationOperation> pipeline = computeCountAggregationPipeline(query, entityClass);
-
-		Aggregation aggregation = entityClass != null ? Aggregation.newAggregation(entityClass, pipeline)
-				: Aggregation.newAggregation(pipeline);
-		aggregation.withOptions(AggregationOptions.builder().collation(query.getCollation().orElse(null)).build());
-
-		return aggregation;
-	}
-
-	private List<AggregationOperation> computeCountAggregationPipeline(Query query, @Nullable Class<?> entityType) {
-
-		CountOperation count = Aggregation.count().as("totalEntityCount");
-		if (query.getQueryObject().isEmpty()) {
-			return Collections.singletonList(count);
-		}
-
-		Assert.notNull(entityType, "Entity type must not be null!");
-
-		Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(),
-				mappingContext.getPersistentEntity(entityType));
-
-		CriteriaDefinition criteria = new CriteriaDefinition() {
-
-			@Override
-			public Document getCriteriaObject() {
-				return mappedQuery;
-			}
-
-			@Nullable
-			@Override
-			public String getKey() {
-				return null;
-			}
-		};
-
-		return Arrays.asList(Aggregation.match(criteria), count);
-	}
-
-	private List<Document> mapAggregationPipeline(List<Document> pipeline) {
-
-		return pipeline.stream().map(val -> queryMapper.getMappedObject(val, Optional.empty()))
-				.collect(Collectors.toList());
-	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperations.java
index 3d8c13a1ce..4820c2355c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperations.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,33 @@
 
 import java.util.List;
 
+import org.springframework.data.domain.Sort;
 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.util.Pair;
 
 import com.mongodb.bulk.BulkWriteResult;
 
 /**
- * Bulk operations for insert/update/remove actions on a collection. These bulks operation are available since MongoDB
- * 2.6 and make use of low level bulk commands on the protocol level. This interface defines a fluent API to add
- * multiple single operations or list of similar operations in sequence which can then eventually be executed by calling
+ * Bulk operations for insert/update/remove actions on a collection. Bulk operations are available since MongoDB 2.6 and
+ * make use of low level bulk commands on the protocol level. This interface defines a fluent API to add multiple single
+ * operations or list of similar operations in sequence which can then eventually be executed by calling
  * {@link #execute()}.
  *
+ * <pre class="code">
+ * MongoOperations ops = …;
+ *
+ * ops.bulkOps(BulkMode.UNORDERED, Person.class)
+ * 				.insert(newPerson)
+ * 				.updateOne(where("firstname").is("Joe"), Update.update("lastname", "Doe"))
+ * 				.execute();
+ * </pre>
+ * <p>
+ * Bulk operations are issued as one batch that pulls together all insert, update, and delete operations. Operations
+ * that require individual operation results such as optimistic locking (using {@code @Version}) are not supported and
+ * the version field remains not populated.
+ *
  * @author Tobias Trelle
  * @author Oliver Gierke
  * @author Minsu Kim
@@ -46,7 +61,7 @@ enum BulkMode {
 
 		/** Perform bulk operations in parallel. Processing will continue on errors. */
 		UNORDERED
-	};
+	}
 
 	/**
 	 * Add a single insert to the bulk operation.
@@ -67,11 +82,25 @@ enum BulkMode {
 	/**
 	 * Add a single update to the bulk operation. For the update request, only the first matching document is updated.
 	 *
-	 * @param query update criteria, must not be {@literal null}.
+	 * @param query update criteria, must not be {@literal null}. The {@link Query} may define a {@link Query#with(Sort)
+	 *          sort order} to influence which document to update when potentially matching multiple candidates.
+	 * @param update {@link Update} operation to perform, must not be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	default BulkOperations updateOne(Query query, Update update) {
+		return updateOne(query, (UpdateDefinition) update);
+	}
+
+	/**
+	 * Add a single update to the bulk operation. For the update request, only the first matching document is updated.
+	 *
+	 * @param query update criteria, must not be {@literal null}. The {@link Query} may define a {@link Query#with(Sort)
+	 *          sort order} to influence which document to update when potentially matching multiple candidates.
 	 * @param update {@link Update} operation to perform, must not be {@literal null}.
 	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 * @since 4.1
 	 */
-	BulkOperations updateOne(Query query, Update update);
+	BulkOperations updateOne(Query query, UpdateDefinition update);
 
 	/**
 	 * Add a list of updates to the bulk operation. For each update request, only the first matching document is updated.
@@ -79,7 +108,18 @@ enum BulkMode {
 	 * @param updates Update operations to perform.
 	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
 	 */
-	BulkOperations updateOne(List<Pair<Query, Update>> updates);
+	BulkOperations updateOne(List<Pair<Query, UpdateDefinition>> updates);
+
+	/**
+	 * Add a single update to the bulk operation. For the update request, all matching documents are updated.
+	 *
+	 * @param query Update criteria.
+	 * @param update Update operation to perform.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	default BulkOperations updateMulti(Query query, Update update) {
+		return updateMulti(query, (UpdateDefinition) update);
+	}
 
 	/**
 	 * Add a single update to the bulk operation. For the update request, all matching documents are updated.
@@ -87,17 +127,29 @@ enum BulkMode {
 	 * @param query Update criteria.
 	 * @param update Update operation to perform.
 	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 * @since 4.1
 	 */
-	BulkOperations updateMulti(Query query, Update update);
+	BulkOperations updateMulti(Query query, UpdateDefinition update);
 
 	/**
 	 * Add a list of updates to the bulk operation. For each update request, all matching documents are updated.
 	 *
 	 * @param updates Update operations to perform.
-	 * @return The bulk operation.
 	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
 	 */
-	BulkOperations updateMulti(List<Pair<Query, Update>> updates);
+	BulkOperations updateMulti(List<Pair<Query, UpdateDefinition>> updates);
+
+	/**
+	 * Add a single upsert to the bulk operation. An upsert is an update if the set of matching documents is not empty,
+	 * else an insert.
+	 *
+	 * @param query Update criteria.
+	 * @param update Update operation to perform.
+	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	default BulkOperations upsert(Query query, Update update) {
+		return upsert(query, (UpdateDefinition) update);
+	}
 
 	/**
 	 * Add a single upsert to the bulk operation. An upsert is an update if the set of matching documents is not empty,
@@ -105,17 +157,16 @@ enum BulkMode {
 	 *
 	 * @param query Update criteria.
 	 * @param update Update operation to perform.
-	 * @return The bulk operation.
 	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
+	 * @since 4.1
 	 */
-	BulkOperations upsert(Query query, Update update);
+	BulkOperations upsert(Query query, UpdateDefinition update);
 
 	/**
 	 * Add a list of upserts to the bulk operation. An upsert is an update if the set of matching documents is not empty,
 	 * else an insert.
 	 *
 	 * @param updates Updates/insert operations to perform.
-	 * @return The bulk operation.
 	 * @return the current {@link BulkOperations} instance with the update added, will never be {@literal null}.
 	 */
 	BulkOperations upsert(List<Pair<Query, Update>> updates);
@@ -139,9 +190,10 @@ enum BulkMode {
 	/**
 	 * Add a single replace operation to the bulk operation.
 	 *
-	 * @param query Update criteria.
+	 * @param query Replace criteria. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence
+	 *          which document to replace when potentially matching multiple candidates.
 	 * @param replacement the replacement document. Must not be {@literal null}.
-	 * @return the current {@link BulkOperations} instance with the replace added, will never be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the replacement added, will never be {@literal null}.
 	 * @since 2.2
 	 */
 	default BulkOperations replaceOne(Query query, Object replacement) {
@@ -151,10 +203,11 @@ default BulkOperations replaceOne(Query query, Object replacement) {
 	/**
 	 * Add a single replace operation to the bulk operation.
 	 *
-	 * @param query Update criteria.
+	 * @param query Replace criteria. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence
+	 *          which document to replace when potentially matching multiple candidates.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
-	 * @return the current {@link BulkOperations} instance with the replace added, will never be {@literal null}.
+	 * @return the current {@link BulkOperations} instance with the replacement added, will never be {@literal null}.
 	 * @since 2.2
 	 */
 	BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperationsSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperationsSupport.java
new file mode 100644
index 0000000000..1f5509cd60
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/BulkOperationsSupport.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright 2023-2025 the original author 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.List;
+import java.util.Optional;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.aggregation.RelaxedTypeBasedAggregationOperationContext;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
+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.util.Assert;
+
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOneModel;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.UpdateManyModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
+
+/**
+ * Support class for bulk operations.
+ *
+ * @author Mark Paluch
+ * @since 4.1
+ */
+abstract class BulkOperationsSupport {
+
+	private final String collectionName;
+
+	BulkOperationsSupport(String collectionName) {
+
+		Assert.hasText(collectionName, "CollectionName must not be null nor empty");
+
+		this.collectionName = collectionName;
+	}
+
+	/**
+	 * Emit a {@link BeforeSaveEvent}.
+	 *
+	 * @param holder
+	 */
+	void maybeEmitBeforeSaveEvent(SourceAwareWriteModelHolder holder) {
+
+		if (holder.model() instanceof InsertOneModel) {
+
+			Document target = ((InsertOneModel<Document>) holder.model()).getDocument();
+			maybeEmitEvent(new BeforeSaveEvent<>(holder.source(), target, collectionName));
+		} else if (holder.model() instanceof ReplaceOneModel) {
+
+			Document target = ((ReplaceOneModel<Document>) holder.model()).getReplacement();
+			maybeEmitEvent(new BeforeSaveEvent<>(holder.source(), target, collectionName));
+		}
+	}
+
+	/**
+	 * Emit a {@link AfterSaveEvent}.
+	 *
+	 * @param holder
+	 */
+	void maybeEmitAfterSaveEvent(SourceAwareWriteModelHolder holder) {
+
+		if (holder.model() instanceof InsertOneModel) {
+
+			Document target = ((InsertOneModel<Document>) holder.model()).getDocument();
+			maybeEmitEvent(new AfterSaveEvent<>(holder.source(), target, collectionName));
+		} else if (holder.model() instanceof ReplaceOneModel) {
+
+			Document target = ((ReplaceOneModel<Document>) holder.model()).getReplacement();
+			maybeEmitEvent(new AfterSaveEvent<>(holder.source(), target, collectionName));
+		}
+	}
+
+	WriteModel<Document> mapWriteModel(Object source, WriteModel<Document> writeModel) {
+
+		if (writeModel instanceof UpdateOneModel<Document> model) {
+
+			Bson sort = model.getOptions().getSort();
+			if (sort instanceof Document sortDocument) {
+				model.getOptions().sort(updateMapper().getMappedSort(sortDocument, entity().orElse(null)));
+			}
+
+			if (source instanceof AggregationUpdate aggregationUpdate) {
+
+				List<Document> pipeline = mapUpdatePipeline(aggregationUpdate);
+				return new UpdateOneModel<>(getMappedQuery(model.getFilter()), pipeline, model.getOptions());
+			}
+
+			return new UpdateOneModel<>(getMappedQuery(model.getFilter()), getMappedUpdate(model.getUpdate()),
+					model.getOptions());
+		}
+
+		if (writeModel instanceof UpdateManyModel<Document> model) {
+
+			if (source instanceof AggregationUpdate aggregationUpdate) {
+
+				List<Document> pipeline = mapUpdatePipeline(aggregationUpdate);
+				return new UpdateManyModel<>(getMappedQuery(model.getFilter()), pipeline, model.getOptions());
+			}
+
+			return new UpdateManyModel<>(getMappedQuery(model.getFilter()), getMappedUpdate(model.getUpdate()),
+					model.getOptions());
+		}
+
+		if (writeModel instanceof DeleteOneModel<Document> model) {
+			return new DeleteOneModel<>(getMappedQuery(model.getFilter()), model.getOptions());
+		}
+
+		if (writeModel instanceof DeleteManyModel<Document> model) {
+			return new DeleteManyModel<>(getMappedQuery(model.getFilter()), model.getOptions());
+		}
+
+		if (writeModel instanceof ReplaceOneModel<Document> model) {
+
+			Bson sort = model.getReplaceOptions().getSort();
+
+			if (sort instanceof Document sortDocument) {
+				model.getReplaceOptions().sort(updateMapper().getMappedSort(sortDocument, entity().orElse(null)));
+			}
+			return new ReplaceOneModel<>(getMappedQuery(model.getFilter()), model.getReplacement(),
+					model.getReplaceOptions());
+		}
+
+		return writeModel;
+	}
+
+	private List<Document> mapUpdatePipeline(AggregationUpdate source) {
+
+		Class<?> type = entity().isPresent() ? entity().map(PersistentEntity::getType).get() : Object.class;
+		AggregationOperationContext context = new RelaxedTypeBasedAggregationOperationContext(type,
+				updateMapper().getMappingContext(), queryMapper());
+
+		return new AggregationUtil(queryMapper(), queryMapper().getMappingContext()).createPipeline(source, context);
+	}
+
+	/**
+	 * Emit a {@link ApplicationEvent} if event multicasting is enabled.
+	 *
+	 * @param event
+	 */
+	protected abstract void maybeEmitEvent(ApplicationEvent event);
+
+	/**
+	 * @return the {@link UpdateMapper} to use.
+	 */
+	protected abstract UpdateMapper updateMapper();
+
+	/**
+	 * @return the {@link QueryMapper} to use.
+	 */
+	protected abstract QueryMapper queryMapper();
+
+	/**
+	 * @return the associated {@link PersistentEntity}. Can be {@link Optional#empty()}.
+	 */
+	protected abstract Optional<? extends MongoPersistentEntity<?>> entity();
+
+	protected Bson getMappedUpdate(Bson update) {
+		return updateMapper().getMappedObject(update, entity());
+	}
+
+	protected Bson getMappedQuery(Bson query) {
+		return queryMapper().getMappedObject(query, entity());
+	}
+
+	protected static BulkWriteOptions getBulkWriteOptions(BulkMode bulkMode) {
+
+		BulkWriteOptions options = new BulkWriteOptions();
+
+		return switch (bulkMode) {
+			case ORDERED -> options.ordered(true);
+			case UNORDERED -> options.ordered(false);
+		};
+	}
+
+	/**
+	 * @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.
+	 * @param multi flag to indicate if update might affect multiple documents.
+	 * @return new instance of {@link UpdateOptions}.
+	 */
+	protected UpdateOptions computeUpdateOptions(Query filterQuery, UpdateDefinition update, boolean upsert,
+			boolean multi) {
+
+		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);
+		}
+
+		if (!multi && filterQuery.isSorted()) {
+			options.sort(filterQuery.getSortObject());
+		}
+
+		filterQuery.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
+		return options;
+	}
+
+	/**
+	 * Value object chaining together an actual source with its {@link WriteModel} representation.
+	 *
+	 * @author Christoph Strobl
+	 */
+	record SourceAwareWriteModelHolder(Object source, WriteModel<Document> model) {
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java
index ff14ee61a2..8a74ace28b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamEvent.java
+++ b/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-2025 the original author 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,18 +15,17 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.EqualsAndHashCode;
-
 import java.time.Instant;
 import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 import org.bson.BsonTimestamp;
 import org.bson.BsonValue;
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.messaging.Message;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.OperationType;
@@ -37,22 +36,29 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Myroslav Kosinskyi
  * @since 2.1
  */
-@EqualsAndHashCode
 public class ChangeStreamEvent<T> {
 
 	@SuppressWarnings("rawtypes") //
-	private static final AtomicReferenceFieldUpdater<ChangeStreamEvent, Object> CONVERTED_UPDATER = AtomicReferenceFieldUpdater
-			.newUpdater(ChangeStreamEvent.class, Object.class, "converted");
+	private static final AtomicReferenceFieldUpdater<ChangeStreamEvent, Object> CONVERTED_FULL_DOCUMENT_UPDATER = AtomicReferenceFieldUpdater
+			.newUpdater(ChangeStreamEvent.class, Object.class, "convertedFullDocument");
+
+	@SuppressWarnings("rawtypes") //
+	private static final AtomicReferenceFieldUpdater<ChangeStreamEvent, Object> CONVERTED_FULL_DOCUMENT_BEFORE_CHANGE_UPDATER = AtomicReferenceFieldUpdater
+			.newUpdater(ChangeStreamEvent.class, Object.class, "convertedFullDocumentBeforeChange");
 
 	private final @Nullable ChangeStreamDocument<Document> raw;
 
 	private final Class<T> targetType;
 	private final MongoConverter converter;
 
-	// accessed through CONVERTED_UPDATER.
-	private volatile @Nullable T converted;
+	// accessed through CONVERTED_FULL_DOCUMENT_UPDATER.
+	private volatile @Nullable T convertedFullDocument;
+
+	// accessed through CONVERTED_FULL_DOCUMENT_BEFORE_CHANGE_UPDATER.
+	private volatile @Nullable T convertedFullDocumentBeforeChange;
 
 	/**
 	 * @param raw can be {@literal null}.
@@ -72,8 +78,7 @@ public ChangeStreamEvent(@Nullable ChangeStreamDocument<Document> raw, Class<T>
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public ChangeStreamDocument<Document> getRaw() {
+	public @Nullable ChangeStreamDocument<Document> getRaw() {
 		return raw;
 	}
 
@@ -82,10 +87,10 @@ public ChangeStreamDocument<Document> getRaw() {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public Instant getTimestamp() {
+	public @Nullable Instant getTimestamp() {
 
-		return getBsonTimestamp() != null ? converter.getConversionService().convert(raw.getClusterTime(), Instant.class)
+		return getBsonTimestamp() != null && raw != null
+				? converter.getConversionService().convert(raw.getClusterTime(), Instant.class)
 				: null;
 	}
 
@@ -105,8 +110,7 @@ public BsonTimestamp getBsonTimestamp() {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public BsonValue getResumeToken() {
+	public @Nullable BsonValue getResumeToken() {
 		return raw != null ? raw.getResumeToken() : null;
 	}
 
@@ -115,8 +119,7 @@ public BsonValue getResumeToken() {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public OperationType getOperationType() {
+	public @Nullable OperationType getOperationType() {
 		return raw != null ? raw.getOperationType() : null;
 	}
 
@@ -125,8 +128,7 @@ public OperationType getOperationType() {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public String getDatabaseName() {
+	public @Nullable String getDatabaseName() {
 		return raw != null ? raw.getNamespace().getDatabaseName() : null;
 	}
 
@@ -135,8 +137,7 @@ public String getDatabaseName() {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public String getCollectionName() {
+	public @Nullable String getCollectionName() {
 		return raw != null ? raw.getNamespace().getCollectionName() : null;
 	}
 
@@ -146,30 +147,46 @@ public String getCollectionName() {
 	 * @return {@literal null} when {@link #getRaw()} or {@link ChangeStreamDocument#getFullDocument()} is
 	 *         {@literal null}.
 	 */
-	@Nullable
-	public T getBody() {
+	public @Nullable T getBody() {
 
-		if (raw == null) {
+		if (raw == null || raw.getFullDocument() == null) {
 			return null;
 		}
 
-		Document fullDocument = raw.getFullDocument();
+		return getConvertedFullDocument(raw.getFullDocument());
+	}
+
+	/**
+	 * Get the potentially converted {@link ChangeStreamDocument#getFullDocumentBeforeChange() document} before being
+	 * changed.
+	 *
+	 * @return {@literal null} when {@link #getRaw()} or {@link ChangeStreamDocument#getFullDocumentBeforeChange()} is
+	 *         {@literal null}.
+	 * @since 4.0
+	 */
+	public @Nullable T getBodyBeforeChange() {
 
-		if (fullDocument == null) {
-			return targetType.cast(fullDocument);
+		if (raw == null || raw.getFullDocumentBeforeChange() == null) {
+			return null;
 		}
 
-		return getConverted(fullDocument);
+		return getConvertedFullDocumentBeforeChange(raw.getFullDocumentBeforeChange());
+	}
+
+	@SuppressWarnings("unchecked")
+	private T getConvertedFullDocumentBeforeChange(Document fullDocument) {
+		return (T) doGetConverted(fullDocument, CONVERTED_FULL_DOCUMENT_BEFORE_CHANGE_UPDATER);
 	}
 
 	@SuppressWarnings("unchecked")
-	private T getConverted(Document fullDocument) {
-		return (T) doGetConverted(fullDocument);
+	private T getConvertedFullDocument(Document fullDocument) {
+		return (T) doGetConverted(fullDocument, CONVERTED_FULL_DOCUMENT_UPDATER);
 	}
 
-	private Object doGetConverted(Document fullDocument) {
+	@SuppressWarnings("NullAway")
+	private Object doGetConverted(Document fullDocument, AtomicReferenceFieldUpdater<ChangeStreamEvent, Object> updater) {
 
-		Object result = CONVERTED_UPDATER.get(this);
+		Object result = updater.get(this);
 
 		if (result != null) {
 			return result;
@@ -178,25 +195,44 @@ private Object doGetConverted(Document fullDocument) {
 		if (ClassUtils.isAssignable(Document.class, fullDocument.getClass())) {
 
 			result = converter.read(targetType, fullDocument);
-			return CONVERTED_UPDATER.compareAndSet(this, null, result) ? result : CONVERTED_UPDATER.get(this);
+			return updater.compareAndSet(this, null, result) ? result : updater.get(this);
 		}
 
 		if (converter.getConversionService().canConvert(fullDocument.getClass(), targetType)) {
 
 			result = converter.getConversionService().convert(fullDocument, targetType);
-			return CONVERTED_UPDATER.compareAndSet(this, null, result) ? result : CONVERTED_UPDATER.get(this);
+			return updater.compareAndSet(this, null, result) ? result : updater.get(this);
 		}
 
-		throw new IllegalArgumentException(String.format("No converter found capable of converting %s to %s",
-				fullDocument.getClass(), targetType));
+		throw new IllegalArgumentException(
+				String.format("No converter found capable of converting %s to %s", fullDocument.getClass(), targetType));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return "ChangeStreamEvent {" + "raw=" + raw + ", targetType=" + targetType + '}';
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		ChangeStreamEvent<?> that = (ChangeStreamEvent<?>) o;
+
+		if (!ObjectUtils.nullSafeEquals(this.raw, that.raw)) {
+			return false;
+		}
+		return ObjectUtils.nullSafeEquals(this.targetType, that.targetType);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = raw != null ? raw.hashCode() : 0;
+		result = 31 * result + ObjectUtils.nullSafeHashCode(targetType);
+		return result;
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamOptions.java
index fc6f69a125..9c99b0e01f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ChangeStreamOptions.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.EqualsAndHashCode;
-
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Optional;
@@ -25,16 +23,17 @@
 import org.bson.BsonTimestamp;
 import org.bson.BsonValue;
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
 
 /**
  * Options applicable to MongoDB <a href="https://docs.mongodb.com/manual/changeStreams/">Change Streams</a>. Intended
@@ -43,14 +42,15 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Myroslav Kosinskyi
  * @since 2.1
  */
-@EqualsAndHashCode
 public class ChangeStreamOptions {
 
 	private @Nullable Object filter;
 	private @Nullable BsonValue resumeToken;
 	private @Nullable FullDocument fullDocumentLookup;
+	private @Nullable FullDocumentBeforeChange fullDocumentBeforeChangeLookup;
 	private @Nullable Collation collation;
 	private @Nullable Object resumeTimestamp;
 	private Resume resume = Resume.UNDEFINED;
@@ -78,6 +78,14 @@ public Optional<FullDocument> getFullDocumentLookup() {
 		return Optional.ofNullable(fullDocumentLookup);
 	}
 
+	/**
+	 * @return {@link Optional#empty()} if not set.
+	 * @since 4.0
+	 */
+	public Optional<FullDocumentBeforeChange> getFullDocumentBeforeChangeLookup() {
+		return Optional.ofNullable(fullDocumentBeforeChangeLookup);
+	}
+
 	/**
 	 * @return {@link Optional#empty()} if not set.
 	 */
@@ -125,7 +133,7 @@ public static ChangeStreamOptions empty() {
 
 	/**
 	 * Obtain a shiny new {@link ChangeStreamOptionsBuilder} and start defining options in this fancy fluent way. Just
-	 * don't forget to call {@link ChangeStreamOptionsBuilder#build() build()} when your're done.
+	 * don't forget to call {@link ChangeStreamOptionsBuilder#build() build()} when done.
 	 *
 	 * @return new instance of {@link ChangeStreamOptionsBuilder}.
 	 */
@@ -143,19 +151,61 @@ private static <T> Object doGetTimestamp(Object timestamp, Class<T> targetType)
 			return timestamp;
 		}
 
-		if (timestamp instanceof Instant) {
-			return new BsonTimestamp((int) ((Instant) timestamp).getEpochSecond(), 0);
+		if (timestamp instanceof Instant instant) {
+			return new BsonTimestamp((int) instant.getEpochSecond(), 0);
 		}
 
-		if (timestamp instanceof BsonTimestamp) {
-			return Instant.ofEpochSecond(((BsonTimestamp) timestamp).getTime());
+		if (timestamp instanceof BsonTimestamp bsonTimestamp) {
+			return Instant.ofEpochSecond(bsonTimestamp.getTime());
 		}
 
 		throw new IllegalArgumentException(
-				"o_O that should actually not happen. The timestamp should be an Instant or a BsonTimestamp but was "
+				"o_O that should actually not happen; The timestamp should be an Instant or a BsonTimestamp but was "
 						+ ObjectUtils.nullSafeClassName(timestamp));
 	}
 
+	@Override
+	public boolean equals(@Nullable Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		ChangeStreamOptions that = (ChangeStreamOptions) o;
+
+		if (!ObjectUtils.nullSafeEquals(this.filter, that.filter)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(this.resumeToken, that.resumeToken)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(this.fullDocumentLookup, that.fullDocumentLookup)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(this.fullDocumentBeforeChangeLookup, that.fullDocumentBeforeChangeLookup)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(this.collation, that.collation)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(this.resumeTimestamp, that.resumeTimestamp)) {
+			return false;
+		}
+		return resume == that.resume;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = ObjectUtils.nullSafeHashCode(filter);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(resumeToken);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(fullDocumentLookup);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(fullDocumentBeforeChangeLookup);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(collation);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(resumeTimestamp);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(resume);
+		return result;
+	}
+
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.2
@@ -186,6 +236,7 @@ public static class ChangeStreamOptionsBuilder {
 		private @Nullable Object filter;
 		private @Nullable BsonValue resumeToken;
 		private @Nullable FullDocument fullDocumentLookup;
+		private @Nullable FullDocumentBeforeChange fullDocumentBeforeChangeLookup;
 		private @Nullable Collation collation;
 		private @Nullable Object resumeTimestamp;
 		private Resume resume = Resume.UNDEFINED;
@@ -198,23 +249,22 @@ private ChangeStreamOptionsBuilder() {}
 		 * @param collation must not be {@literal null} nor {@literal empty}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder collation(Collation collation) {
 
-			Assert.notNull(collation, "Collation must not be null nor empty!");
+			Assert.notNull(collation, "Collation must not be null nor empty");
 
 			this.collation = collation;
 			return this;
 		}
 
 		/**
-		 * Set the filter to apply.
-		 * <p/>
+		 * Set the filter to apply. <br />
 		 * Fields on aggregation expression root level are prefixed to map to fields contained in
 		 * {@link ChangeStreamDocument#getFullDocument() fullDocument}. However {@literal operationType}, {@literal ns},
 		 * {@literal documentKey} and {@literal fullDocument} are reserved words that will be omitted, and therefore taken
 		 * as given, during the mapping procedure. You may want to have a look at the
-		 * <a href="https://docs.mongodb.com/manual/reference/change-events/">structure of Change Events</a>.
-		 * <p/>
+		 * <a href="https://docs.mongodb.com/manual/reference/change-events/">structure of Change Events</a>. <br />
 		 * Use {@link org.springframework.data.mongodb.core.aggregation.TypedAggregation} to ensure filter expressions are
 		 * mapped to domain type fields.
 		 *
@@ -222,9 +272,10 @@ public ChangeStreamOptionsBuilder collation(Collation collation) {
 		 *          {@literal null}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder filter(Aggregation filter) {
 
-			Assert.notNull(filter, "Filter must not be null!");
+			Assert.notNull(filter, "Filter must not be null");
 
 			this.filter = filter;
 			return this;
@@ -236,6 +287,7 @@ public ChangeStreamOptionsBuilder filter(Aggregation filter) {
 		 * @param filter must not be {@literal null} nor contain {@literal null} values.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder filter(Document... filter) {
 
 			Assert.noNullElements(filter, "Filter must not contain null values");
@@ -251,9 +303,10 @@ public ChangeStreamOptionsBuilder filter(Document... filter) {
 		 * @param resumeToken must not be {@literal null}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder resumeToken(BsonValue resumeToken) {
 
-			Assert.notNull(resumeToken, "ResumeToken must not be null!");
+			Assert.notNull(resumeToken, "ResumeToken must not be null");
 
 			this.resumeToken = resumeToken;
 
@@ -280,23 +333,52 @@ public ChangeStreamOptionsBuilder returnFullDocumentOnUpdate() {
 		 * @param lookup must not be {@literal null}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder fullDocumentLookup(FullDocument lookup) {
 
-			Assert.notNull(lookup, "Lookup must not be null!");
+			Assert.notNull(lookup, "Lookup must not be null");
 
 			this.fullDocumentLookup = lookup;
 			return this;
 		}
 
+		/**
+		 * Set the {@link FullDocumentBeforeChange} lookup to use.
+		 *
+		 * @param lookup must not be {@literal null}.
+		 * @return this.
+		 * @since 4.0
+		 */
+		@Contract("_ -> this")
+		public ChangeStreamOptionsBuilder fullDocumentBeforeChangeLookup(FullDocumentBeforeChange lookup) {
+
+			Assert.notNull(lookup, "Lookup must not be null");
+
+			this.fullDocumentBeforeChangeLookup = lookup;
+			return this;
+		}
+
+		/**
+		 * Return the full document before being changed if it is available.
+		 *
+		 * @return this.
+		 * @since 4.0
+		 * @see #fullDocumentBeforeChangeLookup(FullDocumentBeforeChange)
+		 */
+		public ChangeStreamOptionsBuilder returnFullDocumentBeforeChange() {
+			return fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.WHEN_AVAILABLE);
+		}
+
 		/**
 		 * Set the cluster time to resume from.
 		 *
 		 * @param resumeTimestamp must not be {@literal null}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder resumeAt(Instant resumeTimestamp) {
 
-			Assert.notNull(resumeTimestamp, "ResumeTimestamp must not be null!");
+			Assert.notNull(resumeTimestamp, "ResumeTimestamp must not be null");
 
 			this.resumeTimestamp = resumeTimestamp;
 			return this;
@@ -309,9 +391,10 @@ public ChangeStreamOptionsBuilder resumeAt(Instant resumeTimestamp) {
 		 * @return this.
 		 * @since 2.2
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder resumeAt(BsonTimestamp resumeTimestamp) {
 
-			Assert.notNull(resumeTimestamp, "ResumeTimestamp must not be null!");
+			Assert.notNull(resumeTimestamp, "ResumeTimestamp must not be null");
 
 			this.resumeTimestamp = resumeTimestamp;
 			return this;
@@ -324,6 +407,7 @@ public ChangeStreamOptionsBuilder resumeAt(BsonTimestamp resumeTimestamp) {
 		 * @return this.
 		 * @since 2.2
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder resumeAfter(BsonValue resumeToken) {
 
 			resumeToken(resumeToken);
@@ -339,6 +423,7 @@ public ChangeStreamOptionsBuilder resumeAfter(BsonValue resumeToken) {
 		 * @return this.
 		 * @since 2.2
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamOptionsBuilder startAfter(BsonValue resumeToken) {
 
 			resumeToken(resumeToken);
@@ -350,6 +435,7 @@ public ChangeStreamOptionsBuilder startAfter(BsonValue resumeToken) {
 		/**
 		 * @return the built {@link ChangeStreamOptions}
 		 */
+		@Contract("-> new")
 		public ChangeStreamOptions build() {
 
 			ChangeStreamOptions options = new ChangeStreamOptions();
@@ -357,6 +443,7 @@ public ChangeStreamOptions build() {
 			options.filter = this.filter;
 			options.resumeToken = this.resumeToken;
 			options.fullDocumentLookup = this.fullDocumentLookup;
+			options.fullDocumentBeforeChangeLookup = this.fullDocumentBeforeChangeLookup;
 			options.collation = this.collation;
 			options.resumeTimestamp = this.resumeTimestamp;
 			options.resume = this.resume;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionCallback.java
index d82df3e7b8..bf8be5ba69 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionCallback.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.springframework.data.mongodb.core;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoCollection;
@@ -29,7 +29,7 @@
  * @author Grame Rocher
  * @author Oliver Gierke
  * @author John Brisbin
- * @auhtor Christoph Strobl
+ * @author Christoph Strobl
  * @since 1.0
  */
 public interface CollectionCallback<T> {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionOptions.java
index 684bdc3b52..f4d1891703 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionOptions.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,37 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.RequiredArgsConstructor;
-
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.StreamSupport;
 
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonNull;
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.QueryableJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
+import org.springframework.data.mongodb.core.schema.QueryCharacteristic;
+import org.springframework.data.mongodb.core.timeseries.Granularity;
+import org.springframework.data.mongodb.core.timeseries.GranularityDefinition;
 import org.springframework.data.mongodb.core.validation.Validator;
 import org.springframework.data.util.Optionals;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.CheckReturnValue;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 import com.mongodb.client.model.ValidationAction;
 import com.mongodb.client.model.ValidationLevel;
@@ -36,6 +57,8 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Andreas Zink
+ * @author Ben Foster
+ * @author Ross Lawley
  */
 public class CollectionOptions {
 
@@ -44,29 +67,23 @@ public class CollectionOptions {
 	private @Nullable Boolean capped;
 	private @Nullable Collation collation;
 	private ValidationOptions validationOptions;
-
-	/**
-	 * Constructs a new <code>CollectionOptions</code> instance.
-	 *
-	 * @param size the collection size in bytes, this data space is preallocated. Can be {@literal null}.
-	 * @param maxDocuments the maximum number of documents in the collection. Can be {@literal null}.
-	 * @param capped true to created a "capped" collection (fixed size with auto-FIFO behavior based on insertion order),
-	 *          false otherwise. Can be {@literal null}.
-	 * @deprecated since 2.0 please use {@link CollectionOptions#empty()} as entry point.
-	 */
-	@Deprecated
-	public CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nullable Boolean capped) {
-		this(size, maxDocuments, capped, null, ValidationOptions.none());
-	}
+	private @Nullable TimeSeriesOptions timeSeriesOptions;
+	private @Nullable CollectionChangeStreamOptions changeStreamOptions;
+	private @Nullable EncryptedFieldsOptions encryptedFieldsOptions;
 
 	private CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nullable Boolean capped,
-			@Nullable Collation collation, ValidationOptions validationOptions) {
+			@Nullable Collation collation, ValidationOptions validationOptions, @Nullable TimeSeriesOptions timeSeriesOptions,
+			@Nullable CollectionChangeStreamOptions changeStreamOptions,
+			@Nullable EncryptedFieldsOptions encryptedFieldsOptions) {
 
 		this.maxDocuments = maxDocuments;
 		this.size = size;
 		this.capped = capped;
 		this.collation = collation;
 		this.validationOptions = validationOptions;
+		this.timeSeriesOptions = timeSeriesOptions;
+		this.changeStreamOptions = changeStreamOptions;
+		this.encryptedFieldsOptions = encryptedFieldsOptions;
 	}
 
 	/**
@@ -78,9 +95,9 @@ private CollectionOptions(@Nullable Long size, @Nullable Long maxDocuments, @Nul
 	 */
 	public static CollectionOptions just(Collation collation) {
 
-		Assert.notNull(collation, "Collation must not be null!");
+		Assert.notNull(collation, "Collation must not be null");
 
-		return new CollectionOptions(null, null, null, collation, ValidationOptions.none());
+		return new CollectionOptions(null, null, null, collation, ValidationOptions.none(), null, null, null);
 	}
 
 	/**
@@ -90,18 +107,97 @@ public static CollectionOptions just(Collation collation) {
 	 * @since 2.0
 	 */
 	public static CollectionOptions empty() {
-		return new CollectionOptions(null, null, null, null, ValidationOptions.none());
+		return new CollectionOptions(null, null, null, null, ValidationOptions.none(), null, null, null);
+	}
+
+	/**
+	 * Quick way to set up {@link CollectionOptions} for a Time Series collection. For more advanced settings use
+	 * {@link #timeSeries(String, Function)}.
+	 *
+	 * @param timeField The name of the property which contains the date in each time series document. Must not be
+	 *          {@literal null}.
+	 * @return new instance of {@link CollectionOptions}.
+	 * @see #timeSeries(TimeSeriesOptions)
+	 * @since 3.3
+	 */
+	public static CollectionOptions timeSeries(String timeField) {
+		return timeSeries(timeField, it -> it);
+	}
+
+	/**
+	 * Set up {@link CollectionOptions} for a Time Series collection.
+	 *
+	 * @param timeField the name of the field that contains the date in each time series document.
+	 * @param options a function to apply additional settings to {@link TimeSeriesOptions}.
+	 * @return new instance of {@link CollectionOptions}.
+	 * @since 4.4
+	 */
+	public static CollectionOptions timeSeries(String timeField, Function<TimeSeriesOptions, TimeSeriesOptions> options) {
+		return empty().timeSeries(options.apply(TimeSeriesOptions.timeSeries(timeField)));
+	}
+
+	/**
+	 * Quick way to set up {@link CollectionOptions} for emitting (pre & post) change events.
+	 *
+	 * @return new instance of {@link CollectionOptions}.
+	 * @see #changeStream(CollectionChangeStreamOptions)
+	 * @see CollectionChangeStreamOptions#preAndPostImages(boolean)
+	 * @since 4.0
+	 */
+	public static CollectionOptions emitChangedRevisions() {
+		return empty().changeStream(CollectionChangeStreamOptions.preAndPostImages(true));
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} with the given {@code encryptedFields}.
+	 *
+	 * @param encryptedFieldsOptions can be null
+	 * @return new instance of {@link CollectionOptions}.
+	 * @since 4.5.0
+	 */
+	@Contract("_ -> new")
+	@CheckReturnValue
+	public static CollectionOptions encryptedCollection(@Nullable EncryptedFieldsOptions encryptedFieldsOptions) {
+		return new CollectionOptions(null, null, null, null, ValidationOptions.NONE, null, null, encryptedFieldsOptions);
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} reading encryption options from the given {@link MongoJsonSchema}.
+	 *
+	 * @param schema must not be {@literal null}.
+	 * @return new instance of {@link CollectionOptions}.
+	 * @since 4.5.0
+	 */
+	@Contract("_ -> new")
+	@CheckReturnValue
+	public static CollectionOptions encryptedCollection(MongoJsonSchema schema) {
+		return encryptedCollection(EncryptedFieldsOptions.fromSchema(schema));
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} building encryption options in a fluent style.
+	 *
+	 * @param optionsFunction must not be {@literal null}.
+	 * @return new instance of {@link CollectionOptions}.
+	 * @since 4.5.0
+	 */
+	@Contract("_ -> new")
+	@CheckReturnValue
+	public static CollectionOptions encryptedCollection(
+			Function<EncryptedFieldsOptions, EncryptedFieldsOptions> optionsFunction) {
+		return encryptedCollection(optionsFunction.apply(new EncryptedFieldsOptions()));
 	}
 
 	/**
 	 * Create new {@link CollectionOptions} with already given settings and capped set to {@literal true}. <br />
-	 * <strong>NOTE</strong> Using capped collections requires defining {@link #size(int)}.
+	 * <strong>NOTE:</strong> Using capped collections requires defining {@link #size(long)}.
 	 *
 	 * @return new {@link CollectionOptions}.
 	 * @since 2.0
 	 */
 	public CollectionOptions capped() {
-		return new CollectionOptions(size, maxDocuments, true, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, true, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
 	}
 
 	/**
@@ -112,7 +208,8 @@ public CollectionOptions capped() {
 	 * @since 2.0
 	 */
 	public CollectionOptions maxDocuments(long maxDocuments) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
 	}
 
 	/**
@@ -123,7 +220,8 @@ public CollectionOptions maxDocuments(long maxDocuments) {
 	 * @since 2.0
 	 */
 	public CollectionOptions size(long size) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
 	}
 
 	/**
@@ -134,19 +232,20 @@ public CollectionOptions size(long size) {
 	 * @since 2.0
 	 */
 	public CollectionOptions collation(@Nullable Collation collation) {
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
 	}
 
 	/**
 	 * Create new {@link CollectionOptions} with already given settings and {@code validationOptions} set to given
 	 * {@link MongoJsonSchema}.
 	 *
-	 * @param schema can be {@literal null}.
+	 * @param schema must not be {@literal null}.
 	 * @return new {@link CollectionOptions}.
 	 * @since 2.1
 	 */
-	public CollectionOptions schema(@Nullable MongoJsonSchema schema) {
-		return validator(Validator.schema(schema));
+	public CollectionOptions schema(MongoJsonSchema schema) {
+		return validator(schema != null ? Validator.schema(schema) : null);
 	}
 
 	/**
@@ -226,7 +325,7 @@ public CollectionOptions failOnValidationError() {
 	 */
 	public CollectionOptions schemaValidationLevel(ValidationLevel validationLevel) {
 
-		Assert.notNull(validationLevel, "ValidationLevel must not be null!");
+		Assert.notNull(validationLevel, "ValidationLevel must not be null");
 		return validation(validationOptions.validationLevel(validationLevel));
 	}
 
@@ -240,7 +339,7 @@ public CollectionOptions schemaValidationLevel(ValidationLevel validationLevel)
 	 */
 	public CollectionOptions schemaValidationAction(ValidationAction validationAction) {
 
-		Assert.notNull(validationAction, "ValidationAction must not be null!");
+		Assert.notNull(validationAction, "ValidationAction must not be null");
 		return validation(validationOptions.validationAction(validationAction));
 	}
 
@@ -253,8 +352,52 @@ public CollectionOptions schemaValidationAction(ValidationAction validationActio
 	 */
 	public CollectionOptions validation(ValidationOptions validationOptions) {
 
-		Assert.notNull(validationOptions, "ValidationOptions must not be null!");
-		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions);
+		Assert.notNull(validationOptions, "ValidationOptions must not be null");
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} with the given {@link TimeSeriesOptions}.
+	 *
+	 * @param timeSeriesOptions must not be {@literal null}.
+	 * @return new instance of {@link CollectionOptions}.
+	 * @since 3.3
+	 */
+	public CollectionOptions timeSeries(TimeSeriesOptions timeSeriesOptions) {
+
+		Assert.notNull(timeSeriesOptions, "TimeSeriesOptions must not be null");
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
+	}
+
+	/**
+	 * Create new {@link CollectionOptions} with the given {@link TimeSeriesOptions}.
+	 *
+	 * @param changeStreamOptions must not be {@literal null}.
+	 * @return new instance of {@link CollectionOptions}.
+	 * @since 3.3
+	 */
+	public CollectionOptions changeStream(CollectionChangeStreamOptions changeStreamOptions) {
+
+		Assert.notNull(changeStreamOptions, "ChangeStreamOptions must not be null");
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
+	}
+
+	/**
+	 * Set the {@link EncryptedFieldsOptions} for collections using queryable encryption.
+	 *
+	 * @param encryptedFieldsOptions must not be {@literal null}.
+	 * @return new instance of {@link CollectionOptions}.
+	 */
+	@Contract("_ -> new")
+	@CheckReturnValue
+	public CollectionOptions encrypted(EncryptedFieldsOptions encryptedFieldsOptions) {
+
+		Assert.notNull(encryptedFieldsOptions, "EncryptedCollectionOptions must not be null");
+		return new CollectionOptions(size, maxDocuments, capped, collation, validationOptions, timeSeriesOptions,
+				changeStreamOptions, encryptedFieldsOptions);
 	}
 
 	/**
@@ -305,6 +448,94 @@ public Optional<ValidationOptions> getValidationOptions() {
 		return validationOptions.isEmpty() ? Optional.empty() : Optional.of(validationOptions);
 	}
 
+	/**
+	 * Get the {@link TimeSeriesOptions} if available.
+	 *
+	 * @return {@link Optional#empty()} if not specified.
+	 * @since 3.3
+	 */
+	public Optional<TimeSeriesOptions> getTimeSeriesOptions() {
+		return Optional.ofNullable(timeSeriesOptions);
+	}
+
+	/**
+	 * Get the {@link CollectionChangeStreamOptions} if available.
+	 *
+	 * @return {@link Optional#empty()} if not specified.
+	 * @since 4.0
+	 */
+	public Optional<CollectionChangeStreamOptions> getChangeStreamOptions() {
+		return Optional.ofNullable(changeStreamOptions);
+	}
+
+	/**
+	 * Get the {@code encryptedFields} if available.
+	 *
+	 * @return {@link Optional#empty()} if not specified.
+	 * @since 4.5
+	 */
+	public Optional<EncryptedFieldsOptions> getEncryptedFieldsOptions() {
+		return Optional.ofNullable(encryptedFieldsOptions);
+	}
+
+	@Override
+	public String toString() {
+		return "CollectionOptions{" + "maxDocuments=" + maxDocuments + ", size=" + size + ", capped=" + capped
+				+ ", collation=" + collation + ", validationOptions=" + validationOptions + ", timeSeriesOptions="
+				+ timeSeriesOptions + ", changeStreamOptions=" + changeStreamOptions + ", encryptedCollectionOptions="
+				+ encryptedFieldsOptions + ", disableValidation=" + disableValidation() + ", strictValidation="
+				+ strictValidation() + ", moderateValidation=" + moderateValidation() + ", warnOnValidationError="
+				+ warnOnValidationError() + ", failOnValidationError=" + failOnValidationError() + '}';
+	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		CollectionOptions that = (CollectionOptions) o;
+
+		if (!ObjectUtils.nullSafeEquals(maxDocuments, that.maxDocuments)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(size, that.size)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(capped, that.capped)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(collation, that.collation)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(validationOptions, that.validationOptions)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(timeSeriesOptions, that.timeSeriesOptions)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(changeStreamOptions, that.changeStreamOptions)) {
+			return false;
+		}
+		return ObjectUtils.nullSafeEquals(encryptedFieldsOptions, that.encryptedFieldsOptions);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = ObjectUtils.nullSafeHashCode(maxDocuments);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(size);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(capped);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(collation);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(validationOptions);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(timeSeriesOptions);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(changeStreamOptions);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(encryptedFieldsOptions);
+		return result;
+	}
+
 	/**
 	 * Encapsulation of ValidationOptions options.
 	 *
@@ -312,7 +543,6 @@ public Optional<ValidationOptions> getValidationOptions() {
 	 * @author Andreas Zink
 	 * @since 2.1
 	 */
-	@RequiredArgsConstructor
 	public static class ValidationOptions {
 
 		private static final ValidationOptions NONE = new ValidationOptions(null, null, null);
@@ -321,6 +551,14 @@ public static class ValidationOptions {
 		private final @Nullable ValidationLevel validationLevel;
 		private final @Nullable ValidationAction validationAction;
 
+		public ValidationOptions(@Nullable Validator validator, @Nullable ValidationLevel validationLevel,
+				@Nullable ValidationAction validationAction) {
+
+			this.validator = validator;
+			this.validationLevel = validationLevel;
+			this.validationAction = validationAction;
+		}
+
 		/**
 		 * Create an empty {@link ValidationOptions}.
 		 *
@@ -336,6 +574,7 @@ public static ValidationOptions none() {
 		 * @param validator can be {@literal null}.
 		 * @return new instance of {@link ValidationOptions}.
 		 */
+		@Contract("_ -> new")
 		public ValidationOptions validator(@Nullable Validator validator) {
 			return new ValidationOptions(validator, validationLevel, validationAction);
 		}
@@ -346,6 +585,7 @@ public ValidationOptions validator(@Nullable Validator validator) {
 		 * @param validationLevel can be {@literal null}.
 		 * @return new instance of {@link ValidationOptions}.
 		 */
+		@Contract("_ -> new")
 		public ValidationOptions validationLevel(ValidationLevel validationLevel) {
 			return new ValidationOptions(validator, validationLevel, validationAction);
 		}
@@ -356,6 +596,7 @@ public ValidationOptions validationLevel(ValidationLevel validationLevel) {
 		 * @param validationAction can be {@literal null}.
 		 * @return new instance of {@link ValidationOptions}.
 		 */
+		@Contract("_ -> new")
 		public ValidationOptions validationAction(ValidationAction validationAction) {
 			return new ValidationOptions(validator, validationLevel, validationAction);
 		}
@@ -381,7 +622,7 @@ public Optional<ValidationLevel> getValidationLevel() {
 		/**
 		 * Get the {@code validationAction} to perform.
 		 *
-		 * @return @return {@link Optional#empty()} if not set.
+		 * @return {@link Optional#empty()} if not set.
 		 */
 		public Optional<ValidationAction> getValidationAction() {
 			return Optional.ofNullable(validationAction);
@@ -393,5 +634,421 @@ public Optional<ValidationAction> getValidationAction() {
 		boolean isEmpty() {
 			return !Optionals.isAnyPresent(getValidator(), getValidationAction(), getValidationLevel());
 		}
+
+		@Override
+		public String toString() {
+
+			return "ValidationOptions{" + "validator=" + validator + ", validationLevel=" + validationLevel
+					+ ", validationAction=" + validationAction + '}';
+		}
+
+		@Override
+		public boolean equals(@Nullable Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+
+			ValidationOptions that = (ValidationOptions) o;
+
+			if (!ObjectUtils.nullSafeEquals(validator, that.validator)) {
+				return false;
+			}
+			if (validationLevel != that.validationLevel)
+				return false;
+			return validationAction == that.validationAction;
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(validator);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(validationLevel);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(validationAction);
+			return result;
+		}
+	}
+
+	/**
+	 * Encapsulation of Encryption options for collections.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.5
+	 */
+	public static class EncryptedFieldsOptions {
+
+		private static final EncryptedFieldsOptions NONE = new EncryptedFieldsOptions();
+
+		private final @Nullable MongoJsonSchema schema;
+		private final List<QueryableJsonSchemaProperty> queryableProperties;
+
+		EncryptedFieldsOptions() {
+			this(null, List.of());
+		}
+
+		private EncryptedFieldsOptions(@Nullable MongoJsonSchema schema,
+				List<QueryableJsonSchemaProperty> queryableProperties) {
+
+			this.schema = schema;
+			this.queryableProperties = queryableProperties;
+		}
+
+		/**
+		 * @return {@link EncryptedFieldsOptions#NONE}
+		 */
+		public static EncryptedFieldsOptions none() {
+			return NONE;
+		}
+
+		/**
+		 * @return new instance of {@link EncryptedFieldsOptions}.
+		 */
+		public static EncryptedFieldsOptions fromSchema(MongoJsonSchema schema) {
+			return new EncryptedFieldsOptions(schema, List.of());
+		}
+
+		/**
+		 * @return new instance of {@link EncryptedFieldsOptions}.
+		 */
+		public static EncryptedFieldsOptions fromProperties(List<QueryableJsonSchemaProperty> properties) {
+			return new EncryptedFieldsOptions(null, List.copyOf(properties));
+		}
+
+		/**
+		 * Add a new {@link QueryableJsonSchemaProperty queryable property} for the given source property.
+		 * <p>
+		 * Please note that, a given {@link JsonSchemaProperty} may override options from a given {@link MongoJsonSchema} if
+		 * set.
+		 *
+		 * @param property the queryable source - typically
+		 *          {@link org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.EncryptedJsonSchemaProperty
+		 *          encrypted}.
+		 * @param characteristics the query options to set.
+		 * @return new instance of {@link EncryptedFieldsOptions}.
+		 */
+		@Contract("_, _ -> new")
+		@CheckReturnValue
+		public EncryptedFieldsOptions queryable(JsonSchemaProperty property, QueryCharacteristic... characteristics) {
+
+			List<QueryableJsonSchemaProperty> targetPropertyList = new ArrayList<>(queryableProperties.size() + 1);
+			targetPropertyList.addAll(queryableProperties);
+			targetPropertyList.add(JsonSchemaProperty.queryable(property, List.of(characteristics)));
+
+			return new EncryptedFieldsOptions(schema, targetPropertyList);
+		}
+
+		public Document toDocument() {
+			return new Document("fields", selectPaths());
+		}
+
+		private List<Document> selectPaths() {
+
+			Map<String, Document> fields = new LinkedHashMap<>();
+			for (Document field : fromSchema()) {
+				fields.put(field.get("path", String.class), field);
+			}
+			for (Document field : fromProperties()) {
+				fields.put(field.get("path", String.class), field);
+			}
+			return List.copyOf(fields.values());
+		}
+
+		private List<Document> fromProperties() {
+
+			if (queryableProperties.isEmpty()) {
+				return List.of();
+			}
+
+			List<Document> converted = new ArrayList<>(queryableProperties.size());
+			for (QueryableJsonSchemaProperty property : queryableProperties) {
+
+				Document field = new Document("path", property.getIdentifier());
+
+				if (!property.getTypes().isEmpty()) {
+					field.append("bsonType", property.getTypes().iterator().next().toBsonType().value());
+				}
+
+				if (property
+						.getTargetProperty() instanceof IdentifiableJsonSchemaProperty.EncryptedJsonSchemaProperty encrypted) {
+					if (encrypted.getKeyId() != null) {
+						if (encrypted.getKeyId() instanceof String stringKey) {
+							field.append("keyId",
+									new BsonBinary(BsonBinarySubType.UUID_STANDARD, stringKey.getBytes(StandardCharsets.UTF_8)));
+						} else {
+							field.append("keyId", encrypted.getKeyId());
+						}
+					}
+				}
+
+				field.append("queries", StreamSupport.stream(property.getCharacteristics().spliterator(), false)
+						.map(QueryCharacteristic::toDocument).toList());
+
+				if (!field.containsKey("keyId")) {
+					field.append("keyId", BsonNull.VALUE);
+				}
+
+				converted.add(field);
+			}
+			return converted;
+		}
+
+		private List<Document> fromSchema() {
+
+			if (schema == null) {
+				return List.of();
+			}
+
+			Document root = schema.schemaDocument();
+			Map<String, Document> paths = new LinkedHashMap<>();
+			collectPaths(root, null, paths);
+
+			List<Document> fields = new ArrayList<>();
+			if (!paths.isEmpty()) {
+
+				for (Entry<String, Document> entry : paths.entrySet()) {
+					Document field = new Document("path", entry.getKey());
+					field.append("keyId", entry.getValue().getOrDefault("keyId", BsonNull.VALUE));
+					if (entry.getValue().containsKey("bsonType")) {
+						field.append("bsonType", entry.getValue().get("bsonType"));
+					}
+					field.put("queries", entry.getValue().get("queries"));
+					fields.add(field);
+				}
+			}
+
+			return fields;
+		}
+	}
+
+	private static void collectPaths(Document document, @Nullable String currentPath, Map<String, Document> paths) {
+
+		if (document.containsKey("type") && document.get("type").equals("object")) {
+			Object o = document.get("properties");
+			if (o == null) {
+				return;
+			}
+
+			if (o instanceof Document properties) {
+				for (Entry<String, Object> entry : properties.entrySet()) {
+					if (entry.getValue() instanceof Document nested) {
+
+						String path = currentPath == null ? entry.getKey() : (currentPath + "." + entry.getKey());
+						if (nested.containsKey("encrypt")) {
+							Document target = new Document(nested.get("encrypt", Document.class));
+							if (nested.containsKey("queries")) {
+								List<?> queries = nested.get("queries", List.class);
+								if (!queries.isEmpty() && queries.iterator().next() instanceof Document qd) {
+									target.putAll(qd);
+								}
+							}
+							paths.put(path, target);
+						} else {
+							collectPaths(nested, path, paths);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Encapsulation of options applied to define collections change stream behaviour.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class CollectionChangeStreamOptions {
+
+		private final boolean preAndPostImages;
+
+		private CollectionChangeStreamOptions(boolean emitChangedRevisions) {
+			this.preAndPostImages = emitChangedRevisions;
+		}
+
+		/**
+		 * Output the version of a document before and after changes (the document pre- and post-images).
+		 *
+		 * @return new instance of {@link CollectionChangeStreamOptions}.
+		 */
+		public static CollectionChangeStreamOptions preAndPostImages(boolean emitChangedRevisions) {
+			return new CollectionChangeStreamOptions(true);
+		}
+
+		public boolean getPreAndPostImages() {
+			return preAndPostImages;
+		}
+
+		@Override
+		public String toString() {
+			return "CollectionChangeStreamOptions{" + "preAndPostImages=" + preAndPostImages + '}';
+		}
+
+		@Override
+		public boolean equals(@Nullable Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+
+			CollectionChangeStreamOptions that = (CollectionChangeStreamOptions) o;
+
+			return preAndPostImages == that.preAndPostImages;
+		}
+
+		@Override
+		public int hashCode() {
+			return (preAndPostImages ? 1 : 0);
+		}
+	}
+
+	/**
+	 * Options applicable to Time Series collections.
+	 *
+	 * @author Christoph Strobl
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/core/timeseries-collections">https://docs.mongodb.com/manual/core/timeseries-collections</a>
+	 * @since 3.3
+	 */
+	public static class TimeSeriesOptions {
+
+		private final String timeField;
+
+		private @Nullable final String metaField;
+
+		private final GranularityDefinition granularity;
+
+		private final Duration expireAfter;
+
+		private TimeSeriesOptions(String timeField, @Nullable String metaField, GranularityDefinition granularity,
+				Duration expireAfter) {
+			Assert.hasText(timeField, "Time field must not be empty or null");
+
+			this.timeField = timeField;
+			this.metaField = metaField;
+			this.granularity = granularity;
+			this.expireAfter = expireAfter;
+		}
+
+		/**
+		 * Create a new instance of {@link TimeSeriesOptions} using the given field as its {@literal timeField}. The one,
+		 * that contains the date in each time series document. <br />
+		 * {@link Field#name() Annotated fieldnames} will be considered during the mapping process.
+		 *
+		 * @param timeField must not be {@literal null}.
+		 * @return new instance of {@link TimeSeriesOptions}.
+		 */
+		public static TimeSeriesOptions timeSeries(String timeField) {
+			return new TimeSeriesOptions(timeField, null, Granularity.DEFAULT, Duration.ofSeconds(-1));
+		}
+
+		/**
+		 * Set the name of the field which contains metadata in each time series document. Should not be the {@literal id}
+		 * nor {@link TimeSeriesOptions#timeSeries(String)} timeField} nor point to an {@literal array} or
+		 * {@link java.util.Collection}. <br />
+		 * {@link Field#name() Annotated fieldnames} will be considered during the mapping process.
+		 *
+		 * @param metaField must not be {@literal null}.
+		 * @return new instance of {@link TimeSeriesOptions}.
+		 */
+		@Contract("_ -> new")
+		public TimeSeriesOptions metaField(String metaField) {
+			return new TimeSeriesOptions(timeField, metaField, granularity, expireAfter);
+		}
+
+		/**
+		 * Select the {@link GranularityDefinition} parameter to define how data in the time series collection is organized.
+		 * Select one that is closest to the time span between incoming measurements.
+		 *
+		 * @return new instance of {@link TimeSeriesOptions}.
+		 * @see Granularity
+		 */
+		@Contract("_ -> new")
+		public TimeSeriesOptions granularity(GranularityDefinition granularity) {
+			return new TimeSeriesOptions(timeField, metaField, granularity, expireAfter);
+		}
+
+		/**
+		 * Set the {@link Duration} for automatic removal of documents older than a specified value.
+		 *
+		 * @param ttl must not be {@literal null}.
+		 * @return new instance of {@link TimeSeriesOptions}.
+		 * @see com.mongodb.client.model.CreateCollectionOptions#expireAfter(long, java.util.concurrent.TimeUnit)
+		 * @since 4.4
+		 */
+		@Contract("_ -> new")
+		public TimeSeriesOptions expireAfter(Duration ttl) {
+			return new TimeSeriesOptions(timeField, metaField, granularity, ttl);
+		}
+
+		/**
+		 * @return never {@literal null}.
+		 */
+		public String getTimeField() {
+			return timeField;
+		}
+
+		/**
+		 * @return can be {@literal null}. Might be an {@literal empty} {@link String} as well, so maybe check via
+		 *         {@link org.springframework.util.StringUtils#hasText(String)}.
+		 */
+		@Nullable
+		public String getMetaField() {
+			return metaField;
+		}
+
+		/**
+		 * @return never {@literal null}.
+		 */
+		public GranularityDefinition getGranularity() {
+			return granularity;
+		}
+
+		/**
+		 * Get the {@link Duration} for automatic removal of documents.
+		 *
+		 * @return a {@link Duration#isNegative() negative} value if not specified.
+		 * @since 4.4
+		 */
+		public Duration getExpireAfter() {
+			return expireAfter;
+		}
+
+		@Override
+		public String toString() {
+
+			return "TimeSeriesOptions{" + "timeField='" + timeField + '\'' + ", metaField='" + metaField + '\''
+					+ ", granularity=" + granularity + '}';
+		}
+
+		@Override
+		public boolean equals(@Nullable Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+
+			TimeSeriesOptions that = (TimeSeriesOptions) o;
+
+			if (!ObjectUtils.nullSafeEquals(timeField, that.timeField)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(metaField, that.metaField)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(granularity, that.granularity);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(timeField);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(metaField);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(granularity);
+			return result;
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionPreparer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionPreparer.java
new file mode 100644
index 0000000000..f3769355c7
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionPreparer.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.springframework.util.Assert;
+
+import com.mongodb.client.MongoCollection;
+
+/**
+ * Interface for functional preparation of a {@link MongoCollection}.
+ *
+ * @author Mark Paluch
+ * @since 4.1
+ */
+public interface CollectionPreparer<T> {
+
+	/**
+	 * Returns a preparer that always returns its input collection.
+	 *
+	 * @return a preparer that always returns its input collection.
+	 */
+	static <T> CollectionPreparer<T> identity() {
+		return it -> it;
+	}
+
+	/**
+	 * Prepare the {@code collection}.
+	 *
+	 * @param collection the collection to prepare.
+	 * @return the prepared collection.
+	 */
+	T prepare(T collection);
+
+	/**
+	 * Returns a composed {@code CollectionPreparer} that first applies this preparer to the collection, and then applies
+	 * the {@code after} preparer to the result. If evaluation of either function throws an exception, it is relayed to
+	 * the caller of the composed function.
+	 *
+	 * @param after the collection preparer to apply after this function is applied.
+	 * @return a composed {@code CollectionPreparer} that first applies this preparer and then applies the {@code after}
+	 *         preparer.
+	 */
+	default CollectionPreparer<T> andThen(CollectionPreparer<T> after) {
+		Assert.notNull(after, "After CollectionPreparer must not be null");
+		return c -> after.prepare(prepare(c));
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionPreparerSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionPreparerSupport.java
new file mode 100644
index 0000000000..bdf0b90ee3
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CollectionPreparerSupport.java
@@ -0,0 +1,183 @@
+/*
+ * Copyright 2023-2025 the original author 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.Arrays;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.client.MongoCollection;
+
+/**
+ * Support class for delegate implementations to apply {@link ReadConcern} and {@link ReadPreference} settings upon
+ * {@link CollectionPreparer preparing a collection}.
+ *
+ * @author Mark Paluch
+ * @since 4.1
+ */
+class CollectionPreparerSupport implements ReadConcernAware, ReadPreferenceAware {
+
+	private final List<Object> sources;
+
+	private CollectionPreparerSupport(List<Object> sources) {
+		this.sources = sources;
+	}
+
+	<T> T doPrepare(T collection, Function<T, ReadConcern> concernAccessor, BiFunction<T, ReadConcern, T> concernFunction,
+			Function<T, ReadPreference> preferenceAccessor, BiFunction<T, ReadPreference, T> preferenceFunction) {
+
+		T collectionToUse = collection;
+
+		for (Object source : sources) {
+			if (source instanceof ReadConcernAware rca && rca.hasReadConcern()) {
+
+				ReadConcern concern = rca.getReadConcern();
+				if (concernAccessor.apply(collectionToUse) != concern) {
+					collectionToUse = concernFunction.apply(collectionToUse, concern);
+				}
+				break;
+			}
+		}
+
+		for (Object source : sources) {
+			if (source instanceof ReadPreferenceAware rpa && rpa.hasReadPreference()) {
+
+				ReadPreference preference = rpa.getReadPreference();
+				if (preferenceAccessor.apply(collectionToUse) != preference) {
+					collectionToUse = preferenceFunction.apply(collectionToUse, preference);
+				}
+				break;
+			}
+		}
+
+		return collectionToUse;
+	}
+
+	@Override
+	public boolean hasReadConcern() {
+
+		for (Object aware : sources) {
+			if (aware instanceof ReadConcernAware rca && rca.hasReadConcern()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public @Nullable ReadConcern getReadConcern() {
+
+		for (Object aware : sources) {
+			if (aware instanceof ReadConcernAware rca && rca.hasReadConcern()) {
+				return rca.getReadConcern();
+			}
+		}
+
+		return null;
+	}
+
+	@Override
+	public boolean hasReadPreference() {
+
+		for (Object aware : sources) {
+			if (aware instanceof ReadPreferenceAware rpa && rpa.hasReadPreference()) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public @Nullable ReadPreference getReadPreference() {
+
+		for (Object aware : sources) {
+			if (aware instanceof ReadPreferenceAware rpa && rpa.hasReadPreference()) {
+				return rpa.getReadPreference();
+			}
+		}
+
+		return null;
+	}
+
+	static class CollectionPreparerDelegate extends CollectionPreparerSupport
+			implements CollectionPreparer<MongoCollection<Document>> {
+
+		private CollectionPreparerDelegate(List<Object> sources) {
+			super(sources);
+		}
+
+		public static CollectionPreparerDelegate of(ReadPreferenceAware... awares) {
+			return of((Object[]) awares);
+		}
+
+		public static CollectionPreparerDelegate of(Object... mixedAwares) {
+
+			if (mixedAwares.length == 1 && mixedAwares[0] instanceof CollectionPreparerDelegate) {
+				return (CollectionPreparerDelegate) mixedAwares[0];
+			}
+
+			return new CollectionPreparerDelegate(Arrays.asList(mixedAwares));
+		}
+
+		@Override
+		public MongoCollection<Document> prepare(MongoCollection<Document> collection) {
+			return doPrepare(collection, MongoCollection::getReadConcern, MongoCollection::withReadConcern,
+					MongoCollection::getReadPreference, MongoCollection::withReadPreference);
+		}
+
+	}
+
+	static class ReactiveCollectionPreparerDelegate extends CollectionPreparerSupport
+			implements CollectionPreparer<com.mongodb.reactivestreams.client.MongoCollection<Document>> {
+
+		private ReactiveCollectionPreparerDelegate(List<Object> sources) {
+			super(sources);
+		}
+
+		public static ReactiveCollectionPreparerDelegate of(ReadPreferenceAware... awares) {
+			return of((Object[]) awares);
+		}
+
+		public static ReactiveCollectionPreparerDelegate of(Object... mixedAwares) {
+
+			if (mixedAwares.length == 1 && mixedAwares[0] instanceof CollectionPreparerDelegate) {
+				return (ReactiveCollectionPreparerDelegate) mixedAwares[0];
+			}
+
+			return new ReactiveCollectionPreparerDelegate(Arrays.asList(mixedAwares));
+		}
+
+		@Override
+		public com.mongodb.reactivestreams.client.MongoCollection<Document> prepare(
+				com.mongodb.reactivestreams.client.MongoCollection<Document> collection) {
+			return doPrepare(collection, //
+					com.mongodb.reactivestreams.client.MongoCollection::getReadConcern,
+					com.mongodb.reactivestreams.client.MongoCollection::withReadConcern,
+					com.mongodb.reactivestreams.client.MongoCollection::getReadPreference,
+					com.mongodb.reactivestreams.client.MongoCollection::withReadPreference);
+		}
+
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CountQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CountQuery.java
index 4504597490..11d9f09afd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CountQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CountQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@
 import java.util.Map;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Point;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.query.MetricConversion;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -34,11 +34,11 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @since 2.3
+ * @since 3.0
  */
 class CountQuery {
 
-	private Document source;
+	private final Document source;
 
 	private CountQuery(Document source) {
 		this.source = source;
@@ -64,18 +64,15 @@ public Document toQueryDocument() {
 
 		for (Map.Entry<String, Object> entry : source.entrySet()) {
 
-			if (entry.getValue() instanceof Document && requiresRewrite(entry.getValue())) {
+			if (entry.getValue() instanceof Document document && requiresRewrite(entry.getValue())) {
 
-				Document theValue = (Document) entry.getValue();
-				target.putAll(createGeoWithin(entry.getKey(), theValue, source.get("$and")));
+				target.putAll(createGeoWithin(entry.getKey(), document, source.get("$and")));
 				continue;
 			}
 
-			if (entry.getValue() instanceof Collection && requiresRewrite(entry.getValue())) {
-
-				Collection<?> source = (Collection<?>) entry.getValue();
+			if (entry.getValue() instanceof Collection<?> collection && requiresRewrite(entry.getValue())) {
 
-				target.put(entry.getKey(), rewriteCollection(source));
+				target.put(entry.getKey(), rewriteCollection(collection));
 				continue;
 			}
 
@@ -96,12 +93,12 @@ public Document toQueryDocument() {
 	 */
 	private boolean requiresRewrite(Object valueToInspect) {
 
-		if (valueToInspect instanceof Document) {
-			return requiresRewrite((Document) valueToInspect);
+		if (valueToInspect instanceof Document document) {
+			return requiresRewrite(document);
 		}
 
-		if (valueToInspect instanceof Collection) {
-			return requiresRewrite((Collection) valueToInspect);
+		if (valueToInspect instanceof Collection<?> collection) {
+			return requiresRewrite(collection);
 		}
 
 		return false;
@@ -110,7 +107,7 @@ private boolean requiresRewrite(Object valueToInspect) {
 	private boolean requiresRewrite(Collection<?> collection) {
 
 		for (Object o : collection) {
-			if (o instanceof Document && requiresRewrite((Document) o)) {
+			if (o instanceof Document document && requiresRewrite(document)) {
 				return true;
 			}
 		}
@@ -139,8 +136,8 @@ 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());
+			if (item instanceof Document document && requiresRewrite(item)) {
+				rewrittenCollection.add(CountQuery.of(document).toQueryDocument());
 			} else {
 				rewrittenCollection.add(item);
 			}
@@ -157,12 +154,14 @@ private Collection<Object> rewriteCollection(Collection<?> source) {
 	 * @param $and potentially existing {@code $and} condition.
 	 * @return the rewritten query {@link Document}.
 	 */
+	@SuppressWarnings({ "unchecked", "NullAway" })
 	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;
+		Number maxDistance = getMaxDistance(source, $near, spheric);
+
 		List<Object> $centerMax = Arrays.asList(toCenterCoordinates($near), maxDistance);
 		Document $geoWithinMax = new Document("$geoWithin",
 				new Document(spheric ? "$centerSphere" : "$center", $centerMax));
@@ -176,23 +175,51 @@ private static Document createGeoWithin(String key, Document source, @Nullable O
 		Document $geoWithinMin = new Document("$geoWithin",
 				new Document(spheric ? "$centerSphere" : "$center", $centerMin));
 
-		List<Document> criteria = new ArrayList<>();
+		List<Document> criteria;
 
 		if ($and != null) {
 			if ($and instanceof Collection) {
-				criteria.addAll((Collection) $and);
+				Collection<Document> andElements = (Collection<Document>) $and;
+				criteria = new ArrayList<>(andElements.size() + 2);
+				criteria.addAll(andElements);
 			} else {
 				throw new IllegalArgumentException(
-						"Cannot rewrite query as it contains an '$and' element that is not a Collection!: Offending element: "
+						"Cannot rewrite query as it contains an '$and' element that is not a Collection: Offending element: "
 								+ $and);
 			}
+		} else {
+			criteria = new ArrayList<>(2);
 		}
 
 		criteria.add(new Document("$nor", Collections.singletonList(new Document(key, $geoWithinMin))));
 		criteria.add(new Document(key, $geoWithinMax));
+
 		return new Document("$and", criteria);
 	}
 
+	private static Number getMaxDistance(Document source, Object $near, boolean spheric) {
+
+		Number maxDistance = Double.MAX_VALUE;
+
+		if (source.containsKey("$maxDistance")) { // legacy coordinate pair
+			return (Number) source.get("$maxDistance");
+		}
+
+		if ($near instanceof Document nearDoc) {
+
+			if (nearDoc.containsKey("$maxDistance")) {
+
+				maxDistance = (Number) nearDoc.get("$maxDistance");
+				// geojson is in Meters but we need radians x/(6378.1*1000)
+				if (spheric && nearDoc.containsKey("$geometry")) {
+					maxDistance = MetricConversion.metersToRadians(maxDistance.doubleValue());
+				}
+			}
+		}
+
+		return maxDistance;
+	}
+
 	private static boolean containsNear(Document source) {
 		return source.containsKey("$near") || source.containsKey("$nearSphere");
 	}
@@ -206,20 +233,27 @@ private static boolean containsNearWithMinDistance(Document source) {
 		return source.containsKey("$minDistance");
 	}
 
+	@SuppressWarnings("NullAway")
 	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 Point point) {
+			return Arrays.asList(point.getX(), point.getY());
 		}
 
-		if (value instanceof Document && ((Document) value).containsKey("x")) {
+		if (value instanceof Document document) {
+
+			if (document.containsKey("x")) {
+				return Arrays.asList(document.get("x"), document.get("y"));
+			}
 
-			Document point = (Document) value;
-			return Arrays.asList(point.get("x"), point.get("y"));
+			if (document.containsKey("$geometry")) {
+				Document geoJsonPoint = document.get("$geometry", Document.class);
+				return geoJsonPoint.get("coordinates");
+			}
 		}
 
 		return value;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CursorPreparer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CursorPreparer.java
index 52bec22039..3b53cef8d0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/CursorPreparer.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import java.util.function.Function;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 import com.mongodb.ReadPreference;
@@ -43,25 +43,26 @@ public interface CursorPreparer extends ReadPreferenceAware {
 	/**
 	 * Prepare the given cursor (apply limits, skips and so on). Returns the prepared cursor.
 	 *
-	 * @param cursor
+	 * @param iterable must not be {@literal null}.
+	 * @return never {@literal null}.
 	 */
-	FindIterable<Document> prepare(FindIterable<Document> cursor);
+	FindIterable<Document> prepare(FindIterable<Document> iterable);
 
 	/**
-	 * Apply query specific settings to {@link MongoCollection} and initate a find operation returning a
+	 * Apply query specific settings to {@link MongoCollection} and initiate 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
+	 * @return never {@literal null}.
 	 * @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!");
+		Assert.notNull(collection, "Collection must not be null");
+		Assert.notNull(find, "Find function must not be null");
 
 		if (hasReadPreference()) {
 			collection = collection.withReadPreference(getReadPreference());
@@ -75,8 +76,7 @@ default FindIterable<Document> initiateFind(MongoCollection<Document> collection
 	 * @since 2.2
 	 */
 	@Override
-	@Nullable
-	default ReadPreference getReadPreference() {
+	default @Nullable ReadPreference getReadPreference() {
 		return null;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DbCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DbCallback.java
index 63ee762f3f..f450bddb30 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DbCallback.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
-import org.springframework.lang.Nullable;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoDatabase;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java
index 09bb2bb9a5..8bc5349e61 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultBulkOperations.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,39 +16,48 @@
 package org.springframework.data.mongodb.core;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
 import org.bson.Document;
-import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
+import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.data.mapping.callback.EntityCallback;
 import org.springframework.data.mapping.callback.EntityCallbacks;
+import org.springframework.data.mongodb.BulkOperationException;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.convert.UpdateMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveCallback;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeSaveCallback;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.util.Pair;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
+import com.mongodb.MongoBulkWriteException;
 import com.mongodb.WriteConcern;
 import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.MongoCollection;
-import com.mongodb.client.model.*;
-
-import lombok.NonNull;
-import lombok.Value;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.UpdateManyModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.WriteModel;
 
 /**
  * Default implementation for {@link BulkOperations}.
@@ -60,18 +69,18 @@
  * @author Minsu Kim
  * @author Jens Schauder
  * @author Michail Nikolaev
+ * @author Roman Puchkovskiy
+ * @author Jacob Botuck
  * @since 1.9
  */
-class DefaultBulkOperations implements BulkOperations {
+class DefaultBulkOperations extends BulkOperationsSupport implements BulkOperations {
 
 	private final MongoOperations mongoOperations;
 	private final String collectionName;
 	private final BulkOperationContext bulkOperationContext;
 	private final List<SourceAwareWriteModelHolder> models = new ArrayList<>();
 
-	private PersistenceExceptionTranslator exceptionTranslator;
 	private @Nullable WriteConcern defaultWriteConcern;
-
 	private BulkWriteOptions bulkOptions;
 
 	/**
@@ -86,24 +95,15 @@ class DefaultBulkOperations implements BulkOperations {
 	DefaultBulkOperations(MongoOperations mongoOperations, String collectionName,
 			BulkOperationContext bulkOperationContext) {
 
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
-		Assert.hasText(collectionName, "CollectionName must not be null nor empty!");
-		Assert.notNull(bulkOperationContext, "BulkOperationContext must not be null!");
+		super(collectionName);
+		Assert.notNull(mongoOperations, "MongoOperations must not be null");
+		Assert.hasText(collectionName, "CollectionName must not be null nor empty");
+		Assert.notNull(bulkOperationContext, "BulkOperationContext must not be null");
 
 		this.mongoOperations = mongoOperations;
 		this.collectionName = collectionName;
 		this.bulkOperationContext = bulkOperationContext;
-		this.exceptionTranslator = new MongoExceptionTranslator();
-		this.bulkOptions = getBulkWriteOptions(bulkOperationContext.getBulkMode());
-	}
-
-	/**
-	 * Configures the {@link PersistenceExceptionTranslator} to be used. Defaults to {@link MongoExceptionTranslator}.
-	 *
-	 * @param exceptionTranslator can be {@literal null}.
-	 */
-	public void setExceptionTranslator(@Nullable PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? new MongoExceptionTranslator() : exceptionTranslator;
+		this.bulkOptions = getBulkWriteOptions(bulkOperationContext.bulkMode());
 	}
 
 	/**
@@ -115,14 +115,11 @@ void setDefaultWriteConcern(@Nullable WriteConcern defaultWriteConcern) {
 		this.defaultWriteConcern = defaultWriteConcern;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.lang.Object)
-	 */
 	@Override
+	@Contract("_ -> this")
 	public BulkOperations insert(Object document) {
 
-		Assert.notNull(document, "Document must not be null!");
+		Assert.notNull(document, "Document must not be null");
 
 		maybeEmitEvent(new BeforeConvertEvent<>(document, collectionName));
 		Object source = maybeInvokeBeforeConvertCallback(document);
@@ -131,94 +128,73 @@ public BulkOperations insert(Object document) {
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#insert(java.util.List)
-	 */
 	@Override
+	@Contract("_ -> this")
 	public BulkOperations insert(List<? extends Object> documents) {
 
-		Assert.notNull(documents, "Documents must not be null!");
+		Assert.notNull(documents, "Documents must not be null");
 
 		documents.forEach(this::insert);
 
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
-	 */
 	@Override
-	@SuppressWarnings("unchecked")
-	public BulkOperations updateOne(Query query, Update update) {
+	@Contract("_, _ -> this")
+	public BulkOperations updateOne(Query query, UpdateDefinition update) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(update, "Update must not be null");
 
-		return updateOne(Collections.singletonList(Pair.of(query, update)));
+		return update(query, update, false, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateOne(java.util.List)
-	 */
 	@Override
-	public BulkOperations updateOne(List<Pair<Query, Update>> updates) {
+	@Contract("_ -> this")
+	public BulkOperations updateOne(List<Pair<Query, UpdateDefinition>> updates) {
 
-		Assert.notNull(updates, "Updates must not be null!");
+		Assert.notNull(updates, "Updates must not be null");
 
-		for (Pair<Query, Update> update : updates) {
+		for (Pair<Query, UpdateDefinition> update : updates) {
 			update(update.getFirst(), update.getSecond(), false, false);
 		}
 
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
-	 */
 	@Override
-	@SuppressWarnings("unchecked")
-	public BulkOperations updateMulti(Query query, Update update) {
+	@Contract("_, _ -> this")
+	public BulkOperations updateMulti(Query query, UpdateDefinition update) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(update, "Update must not be null");
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
+		update(query, update, false, true);
 
-		return updateMulti(Collections.singletonList(Pair.of(query, update)));
+		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#updateMulti(java.util.List)
-	 */
 	@Override
-	public BulkOperations updateMulti(List<Pair<Query, Update>> updates) {
+	@Contract("_ -> this")
+	public BulkOperations updateMulti(List<Pair<Query, UpdateDefinition>> updates) {
 
-		Assert.notNull(updates, "Updates must not be null!");
+		Assert.notNull(updates, "Updates must not be null");
 
-		for (Pair<Query, Update> update : updates) {
+		for (Pair<Query, UpdateDefinition> update : updates) {
 			update(update.getFirst(), update.getSecond(), false, true);
 		}
 
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.Update)
-	 */
 	@Override
-	public BulkOperations upsert(Query query, Update update) {
+	@Contract("_, _ -> this")
+	public BulkOperations upsert(Query query, UpdateDefinition update) {
 		return update(query, update, true, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#upsert(java.util.List)
-	 */
 	@Override
+	@Contract("_ -> this")
 	public BulkOperations upsert(List<Pair<Query, Update>> updates) {
 
 		for (Pair<Query, Update> update : updates) {
@@ -228,14 +204,11 @@ public BulkOperations upsert(List<Pair<Query, Update>> updates) {
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(org.springframework.data.mongodb.core.query.Query)
-	 */
 	@Override
+	@Contract("_ -> this")
 	public BulkOperations remove(Query query) {
 
-		Assert.notNull(query, "Query must not be null!");
+		Assert.notNull(query, "Query must not be null");
 
 		DeleteOptions deleteOptions = new DeleteOptions();
 		query.getCollation().map(Collation::toMongoCollation).ifPresent(deleteOptions::collation);
@@ -245,14 +218,11 @@ public BulkOperations remove(Query query) {
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#remove(java.util.List)
-	 */
 	@Override
+	@Contract("_ -> this")
 	public BulkOperations remove(List<Query> removes) {
 
-		Assert.notNull(removes, "Removals must not be null!");
+		Assert.notNull(removes, "Removals must not be null");
 
 		for (Query query : removes) {
 			remove(query);
@@ -261,33 +231,28 @@ public BulkOperations remove(List<Query> removes) {
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#replaceOne(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions)
-	 */
 	@Override
+	@Contract("_, _, _ -> this")
 	public BulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(replacement, "Replacement must not be null!");
-		Assert.notNull(options, "Options must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(replacement, "Replacement must not be null");
+		Assert.notNull(options, "Options must not be null");
 
 		ReplaceOptions replaceOptions = new ReplaceOptions();
 		replaceOptions.upsert(options.isUpsert());
+		if (query.isSorted()) {
+			replaceOptions.sort(query.getSortObject());
+		}
 		query.getCollation().map(Collation::toMongoCollation).ifPresent(replaceOptions::collation);
 
 		maybeEmitEvent(new BeforeConvertEvent<>(replacement, collectionName));
 		Object source = maybeInvokeBeforeConvertCallback(replacement);
-		addModel(source,
-				new ReplaceOneModel<>(getMappedQuery(query.getQueryObject()), getMappedObject(source), replaceOptions));
+		addModel(source, new ReplaceOneModel<>(query.getQueryObject(), getMappedObject(source), replaceOptions));
 
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.BulkOperations#executeBulk()
-	 */
 	@Override
 	public com.mongodb.bulk.BulkWriteResult execute() {
 
@@ -295,13 +260,14 @@ public com.mongodb.bulk.BulkWriteResult execute() {
 
 			com.mongodb.bulk.BulkWriteResult result = mongoOperations.execute(collectionName, this::bulkWriteTo);
 
-			Assert.state(result != null, "Result must not be null.");
+			Assert.state(result != null, "Result must not be null");
 
 			models.forEach(this::maybeEmitAfterSaveEvent);
+			models.forEach(this::maybeInvokeAfterSaveCallback);
 
 			return result;
 		} finally {
-			this.bulkOptions = getBulkWriteOptions(bulkOperationContext.getBulkMode());
+			this.bulkOptions = getBulkWriteOptions(bulkOperationContext.bulkMode());
 		}
 	}
 
@@ -311,28 +277,42 @@ private BulkWriteResult bulkWriteTo(MongoCollection<Document> collection) {
 			collection = collection.withWriteConcern(defaultWriteConcern);
 		}
 
-		return collection.bulkWrite( //
-				models.stream() //
-						.map(this::extractAndMapWriteModel) //
-						.collect(Collectors.toList()), //
-				bulkOptions);
+		try {
+
+			return collection.bulkWrite( //
+					models.stream() //
+							.map(this::extractAndMapWriteModel) //
+							.collect(Collectors.toList()), //
+					bulkOptions);
+		} catch (RuntimeException ex) {
+
+			if (ex instanceof MongoBulkWriteException mongoBulkWriteException) {
+
+				if (mongoBulkWriteException.getWriteConcernError() != null) {
+					throw new DataIntegrityViolationException(ex.getMessage(), ex);
+				}
+				throw new BulkOperationException(ex.getMessage(), mongoBulkWriteException);
+			}
+
+			throw ex;
+		}
 	}
 
 	private WriteModel<Document> extractAndMapWriteModel(SourceAwareWriteModelHolder it) {
 
 		maybeEmitBeforeSaveEvent(it);
 
-		if (it.getModel() instanceof InsertOneModel) {
+		if (it.model() instanceof InsertOneModel<Document> model) {
 
-			Document target = ((InsertOneModel<Document>) it.getModel()).getDocument();
-			maybeInvokeBeforeSaveCallback(it.getSource(), target);
-		} else if (it.getModel() instanceof ReplaceOneModel) {
+			Document target = model.getDocument();
+			maybeInvokeBeforeSaveCallback(it.source(), target);
+		} else if (it.model() instanceof ReplaceOneModel<Document> model) {
 
-			Document target = ((ReplaceOneModel<Document>) it.getModel()).getReplacement();
-			maybeInvokeBeforeSaveCallback(it.getSource(), target);
+			Document target = model.getReplacement();
+			maybeInvokeBeforeSaveCallback(it.source(), target);
 		}
 
-		return mapWriteModel(it.getModel());
+		return mapWriteModel(it.source(), it.model());
 	}
 
 	/**
@@ -344,14 +324,12 @@ private WriteModel<Document> extractAndMapWriteModel(SourceAwareWriteModelHolder
 	 * @param multi whether to issue a multi-update.
 	 * @return the {@link BulkOperations} with the update registered.
 	 */
-	private BulkOperations update(Query query, Update update, boolean upsert, boolean multi) {
+	private BulkOperations update(Query query, UpdateDefinition update, boolean upsert, boolean multi) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
+		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, multi);
 
 		if (multi) {
 			addModel(update, new UpdateManyModel<>(query.getQueryObject(), update.getUpdateObject(), options));
@@ -362,53 +340,30 @@ private BulkOperations update(Query query, Update update, boolean upsert, boolea
 		return this;
 	}
 
-	private WriteModel<Document> mapWriteModel(WriteModel<Document> writeModel) {
-
-		if (writeModel instanceof UpdateOneModel) {
-
-			UpdateOneModel<Document> model = (UpdateOneModel<Document>) writeModel;
-
-			return new UpdateOneModel<>(getMappedQuery(model.getFilter()), getMappedUpdate(model.getUpdate()),
-					model.getOptions());
-		}
-
-		if (writeModel instanceof UpdateManyModel) {
-
-			UpdateManyModel<Document> model = (UpdateManyModel<Document>) writeModel;
-
-			return new UpdateManyModel<>(getMappedQuery(model.getFilter()), getMappedUpdate(model.getUpdate()),
-					model.getOptions());
-		}
-
-		if (writeModel instanceof DeleteOneModel) {
-
-			DeleteOneModel<Document> model = (DeleteOneModel<Document>) writeModel;
-
-			return new DeleteOneModel<>(getMappedQuery(model.getFilter()), model.getOptions());
-		}
-
-		if (writeModel instanceof DeleteManyModel) {
-
-			DeleteManyModel<Document> model = (DeleteManyModel<Document>) writeModel;
-
-			return new DeleteManyModel<>(getMappedQuery(model.getFilter()), model.getOptions());
-		}
+	@Override
+	protected void maybeEmitEvent(ApplicationEvent event) {
+		bulkOperationContext.publishEvent(event);
+	}
 
-		return writeModel;
+	@Override
+	protected UpdateMapper updateMapper() {
+		return bulkOperationContext.updateMapper();
 	}
 
-	private Bson getMappedUpdate(Bson update) {
-		return bulkOperationContext.getUpdateMapper().getMappedObject(update, bulkOperationContext.getEntity());
+	@Override
+	protected QueryMapper queryMapper() {
+		return bulkOperationContext.queryMapper();
 	}
 
-	private Bson getMappedQuery(Bson query) {
-		return bulkOperationContext.getQueryMapper().getMappedObject(query, bulkOperationContext.getEntity());
+	@Override
+	protected Optional<? extends MongoPersistentEntity<?>> entity() {
+		return bulkOperationContext.entity();
 	}
 
 	private Document getMappedObject(Object source) {
 
-		if (source instanceof Document) {
-			return (Document) source;
+		if (source instanceof Document document) {
+			return document;
 		}
 
 		Document sink = new Document();
@@ -421,103 +376,84 @@ private void addModel(Object source, WriteModel<Document> model) {
 		models.add(new SourceAwareWriteModelHolder(source, model));
 	}
 
-	private void maybeEmitBeforeSaveEvent(SourceAwareWriteModelHolder it) {
+	private void maybeInvokeAfterSaveCallback(SourceAwareWriteModelHolder holder) {
 
-		if (it.getModel() instanceof InsertOneModel) {
+		if (holder.model() instanceof InsertOneModel<Document> model) {
 
-			Document target = ((InsertOneModel<Document>) it.getModel()).getDocument();
-			maybeEmitEvent(new BeforeSaveEvent<>(it.getSource(), target, collectionName));
-		} else if (it.getModel() instanceof ReplaceOneModel) {
+			Document target = model.getDocument();
+			maybeInvokeAfterSaveCallback(holder.source(), target);
+		} else if (holder.model() instanceof ReplaceOneModel<Document> model) {
 
-			Document target = ((ReplaceOneModel<Document>) it.getModel()).getReplacement();
-			maybeEmitEvent(new BeforeSaveEvent<>(it.getSource(), target, collectionName));
+			Document target = model.getReplacement();
+			maybeInvokeAfterSaveCallback(holder.source(), target);
 		}
 	}
 
-	private void maybeEmitAfterSaveEvent(SourceAwareWriteModelHolder it) {
+	private void publishEvent(MongoMappingEvent<?> event) {
+		bulkOperationContext.publishEvent(event);
+	}
 
-		if (it.getModel() instanceof InsertOneModel) {
+	private Object maybeInvokeBeforeConvertCallback(Object value) {
+		return bulkOperationContext.callback(BeforeConvertCallback.class, value, collectionName);
+	}
 
-			Document target = ((InsertOneModel<Document>) it.getModel()).getDocument();
-			maybeEmitEvent(new AfterSaveEvent<>(it.getSource(), target, collectionName));
-		} else if (it.getModel() instanceof ReplaceOneModel) {
+	private Object maybeInvokeBeforeSaveCallback(Object value, Document mappedDocument) {
+		return bulkOperationContext.callback(BeforeSaveCallback.class, value, mappedDocument, collectionName);
+	}
 
-			Document target = ((ReplaceOneModel<Document>) it.getModel()).getReplacement();
-			maybeEmitEvent(new AfterSaveEvent<>(it.getSource(), target, collectionName));
-		}
+	private Object maybeInvokeAfterSaveCallback(Object value, Document mappedDocument) {
+		return bulkOperationContext.callback(AfterSaveCallback.class, value, mappedDocument, collectionName);
 	}
 
-	private <E extends MongoMappingEvent<T>, T> E maybeEmitEvent(E event) {
+	/**
+	 * {@link BulkOperationContext} holds information about {@link BulkMode} the entity in use as well as references to
+	 * {@link QueryMapper} and {@link UpdateMapper}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	record BulkOperationContext(BulkMode bulkMode, Optional<? extends MongoPersistentEntity<?>> entity,
+			QueryMapper queryMapper, UpdateMapper updateMapper, @Nullable ApplicationEventPublisher eventPublisher,
+			@Nullable EntityCallbacks entityCallbacks) {
 
-		if (null != bulkOperationContext.getEventPublisher()) {
-			bulkOperationContext.getEventPublisher().publishEvent(event);
+		public boolean skipEntityCallbacks() {
+			return entityCallbacks == null;
 		}
 
-		return event;
-	}
-
-	private Object maybeInvokeBeforeConvertCallback(Object value) {
-
-		if (bulkOperationContext.getEntityCallbacks() == null) {
-			return value;
+		public boolean skipEventPublishing() {
+			return eventPublisher == null;
 		}
 
-		return bulkOperationContext.getEntityCallbacks().callback(BeforeConvertCallback.class, value, collectionName);
-	}
+		@SuppressWarnings({ "rawtypes", "NullAway" })
+		public <T> T callback(Class<? extends EntityCallback> callbackType, T entity, String collectionName) {
 
-	private Object maybeInvokeBeforeSaveCallback(Object value, Document mappedDocument) {
+			if (skipEntityCallbacks()) {
+				return entity;
+			}
 
-		if (bulkOperationContext.getEntityCallbacks() == null) {
-			return value;
+			return entityCallbacks.callback(callbackType, entity, collectionName);
 		}
 
-		return bulkOperationContext.getEntityCallbacks().callback(BeforeSaveCallback.class, value, mappedDocument,
-				collectionName);
-	}
-
-	private static BulkWriteOptions getBulkWriteOptions(BulkMode bulkMode) {
+		@SuppressWarnings({ "rawtypes", "NullAway" })
+		public <T> T callback(Class<? extends EntityCallback> callbackType, T entity, Document document,
+				String collectionName) {
 
-		BulkWriteOptions options = new BulkWriteOptions();
+			if (skipEntityCallbacks()) {
+				return entity;
+			}
 
-		switch (bulkMode) {
-			case ORDERED:
-				return options.ordered(true);
-			case UNORDERED:
-				return options.ordered(false);
+			return entityCallbacks.callback(callbackType, entity, document, collectionName);
 		}
 
-		throw new IllegalStateException("BulkMode was null!");
-	}
+		@SuppressWarnings("NullAway")
+		public void publishEvent(ApplicationEvent event) {
 
-	/**
-	 * {@link BulkOperationContext} holds information about
-	 * {@link org.springframework.data.mongodb.core.BulkOperations.BulkMode} the entity in use as well as references to
-	 * {@link QueryMapper} and {@link UpdateMapper}.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.0
-	 */
-	@Value
-	static class BulkOperationContext {
-
-		@NonNull BulkMode bulkMode;
-		@NonNull Optional<? extends MongoPersistentEntity<?>> entity;
-		@NonNull QueryMapper queryMapper;
-		@NonNull UpdateMapper updateMapper;
-		ApplicationEventPublisher eventPublisher;
-		EntityCallbacks entityCallbacks;
-	}
-
-	/**
-	 * Value object chaining together an actual source with its {@link WriteModel} representation.
-	 *
-	 * @since 2.2
-	 * @author Christoph Strobl
-	 */
-	@Value
-	private static class SourceAwareWriteModelHolder {
+			if (skipEventPublishing()) {
+				return;
+			}
 
-		Object source;
-		WriteModel<Document> model;
+			eventPublisher.publishEvent(event);
+		}
 	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java
index c1012080ab..24d22bd80a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperations.java
+++ b/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-2025 the original author 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,15 +20,17 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.UncategorizedMongoDbException;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.index.IndexOperations;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.NumberUtils;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoCollection;
@@ -52,7 +54,7 @@ public class DefaultIndexOperations implements IndexOperations {
 	private final QueryMapper mapper;
 	private final @Nullable Class<?> type;
 
-	private MongoOperations mongoOperations;
+	private final MongoOperations mongoOperations;
 
 	/**
 	 * Creates a new {@link DefaultIndexOperations}.
@@ -64,7 +66,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,12 +82,12 @@ public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionNa
 	 *             {@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!");
-		Assert.notNull(collectionName, "Collection name can not be null!");
-		Assert.notNull(queryMapper, "QueryMapper must not be null!");
+		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null");
+		Assert.notNull(collectionName, "Collection name can not be null");
+		Assert.notNull(queryMapper, "QueryMapper must not be null");
 
 		this.collectionName = collectionName;
 		this.mapper = queryMapper;
@@ -103,8 +105,8 @@ public DefaultIndexOperations(MongoDbFactory mongoDbFactory, String collectionNa
 	 */
 	public DefaultIndexOperations(MongoOperations mongoOperations, String collectionName, @Nullable Class<?> type) {
 
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(mongoOperations, "MongoOperations must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
 		this.mongoOperations = mongoOperations;
 		this.mapper = new QueryMapper(mongoOperations.getConverter());
@@ -112,11 +114,9 @@ public DefaultIndexOperations(MongoOperations mongoOperations, String collection
 		this.type = type;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
-	 */
-	public String ensureIndex(final IndexDefinition indexDefinition) {
+	@Override
+	@SuppressWarnings("NullAway")
+	public String ensureIndex(IndexDefinition indexDefinition) {
 
 		return execute(collection -> {
 
@@ -127,13 +127,12 @@ public String ensureIndex(final IndexDefinition indexDefinition) {
 			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);
 		});
 	}
 
-	@Nullable
-	private MongoPersistentEntity<?> lookupPersistentEntity(@Nullable Class<?> entityType, String collection) {
+	private @Nullable MongoPersistentEntity<?> lookupPersistentEntity(@Nullable Class<?> entityType, String collection) {
 
 		if (entityType != null) {
 			return mapper.getMappingContext().getRequiredPersistentEntity(entityType);
@@ -150,11 +149,8 @@ private MongoPersistentEntity<?> lookupPersistentEntity(@Nullable Class<?> entit
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexOperations#dropIndex(java.lang.String)
-	 */
-	public void dropIndex(final String name) {
+	@Override
+	public void dropIndex(String name) {
 
 		execute(collection -> {
 			collection.dropIndex(name);
@@ -163,18 +159,29 @@ public void dropIndex(final String name) {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexOperations#dropAllIndexes()
-	 */
+	@Override
+	@SuppressWarnings("NullAway")
+	public void alterIndex(String name, org.springframework.data.mongodb.core.index.IndexOptions options) {
+
+		Document indexOptions = new Document("name", name);
+		indexOptions.putAll(options.toDocument());
+
+		Document result = mongoOperations
+				.execute(db -> db.runCommand(new Document("collMod", collectionName).append("index", indexOptions)));
+
+		if (NumberUtils.convertNumberToTargetClass(result.get("ok", (Number) 0), Integer.class) != 1) {
+			throw new UncategorizedMongoDbException(
+					"Index '%s' could not be modified. Response was %s".formatted(name, result.toJson()), null);
+		}
+	}
+
+	@Override
 	public void dropAllIndexes() {
 		dropIndex("*");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexOperations#getIndexInfo()
-	 */
+	@Override
+	@SuppressWarnings("NullAway")
 	public List<IndexInfo> getIndexInfo() {
 
 		return execute(new CollectionCallback<List<IndexInfo>>() {
@@ -188,7 +195,8 @@ public List<IndexInfo> doInCollection(MongoCollection<Document> collection)
 
 			private List<IndexInfo> getIndexData(MongoCursor<Document> cursor) {
 
-				List<IndexInfo> indexInfoList = new ArrayList<>();
+				int available = cursor.available();
+				List<IndexInfo> indexInfoList = available > 0 ? new ArrayList<>(available) : new ArrayList<>();
 
 				while (cursor.hasNext()) {
 
@@ -202,14 +210,9 @@ private List<IndexInfo> getIndexData(MongoCursor<Document> cursor) {
 		});
 	}
 
-	@Nullable
-	public <T> T execute(CollectionCallback<T> callback) {
+	public <T> @Nullable T execute(CollectionCallback<T> callback) {
 
-		Assert.notNull(callback, "CollectionCallback must not be null!");
-
-		if (type != null) {
-			return mongoOperations.execute(type, callback);
-		}
+		Assert.notNull(callback, "CollectionCallback must not be null");
 
 		return mongoOperations.execute(collectionName, callback);
 	}
@@ -223,10 +226,12 @@ private IndexOptions addPartialFilterIfPresent(IndexOptions ops, Document source
 
 		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) {
+	@SuppressWarnings("NullAway")
+	private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops,
+			@Nullable MongoPersistentEntity<?> entity) {
 
 		if (ops.getCollation() != null || entity == null || !entity.hasCollation()) {
 			return ops;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java
index 9f47619f96..a34c1fb945 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultIndexOperationsProvider.java
+++ b/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-2025 the original author 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,14 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.jspecify.annotations.Nullable;
+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,25 +30,21 @@
  */
 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;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexOperationsProvider#reactiveIndexOps(java.lang.String)
-	 */
 	@Override
-	public IndexOperations indexOps(String collectionName) {
-		return new DefaultIndexOperations(mongoDbFactory, collectionName, mapper);
+	public IndexOperations indexOps(String collectionName, @Nullable Class<?> type) {
+		return new DefaultIndexOperations(mongoDbFactory, collectionName, mapper, type);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperations.java
new file mode 100644
index 0000000000..92c6a957dc
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperations.java
@@ -0,0 +1,403 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.springframework.lang.Contract;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.data.mapping.callback.EntityCallback;
+import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAfterSaveCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeSaveCallback;
+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.util.Assert;
+
+import com.mongodb.WriteConcern;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.UpdateManyModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.reactivestreams.client.MongoCollection;
+
+/**
+ * Default implementation for {@link ReactiveBulkOperations}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 4.1
+ */
+class DefaultReactiveBulkOperations extends BulkOperationsSupport implements ReactiveBulkOperations {
+
+	private final ReactiveMongoOperations mongoOperations;
+	private final String collectionName;
+	private final ReactiveBulkOperationContext bulkOperationContext;
+	private final List<Mono<SourceAwareWriteModelHolder>> models = new ArrayList<>();
+
+	private @Nullable WriteConcern defaultWriteConcern;
+
+	private BulkWriteOptions bulkOptions;
+
+	/**
+	 * Creates a new {@link DefaultReactiveBulkOperations} for the given {@link MongoOperations}, collection name and
+	 * {@link ReactiveBulkOperationContext}.
+	 *
+	 * @param mongoOperations must not be {@literal null}.
+	 * @param collectionName must not be {@literal null}.
+	 * @param bulkOperationContext must not be {@literal null}.
+	 */
+	DefaultReactiveBulkOperations(ReactiveMongoOperations mongoOperations, String collectionName,
+			ReactiveBulkOperationContext bulkOperationContext) {
+
+		super(collectionName);
+
+		Assert.notNull(mongoOperations, "MongoOperations must not be null");
+		Assert.hasText(collectionName, "CollectionName must not be null nor empty");
+		Assert.notNull(bulkOperationContext, "BulkOperationContext must not be null");
+
+		this.mongoOperations = mongoOperations;
+		this.collectionName = collectionName;
+		this.bulkOperationContext = bulkOperationContext;
+		this.bulkOptions = getBulkWriteOptions(bulkOperationContext.bulkMode());
+	}
+
+	/**
+	 * Configures the default {@link WriteConcern} to be used. Defaults to {@literal null}.
+	 *
+	 * @param defaultWriteConcern can be {@literal null}.
+	 */
+	void setDefaultWriteConcern(@Nullable WriteConcern defaultWriteConcern) {
+		this.defaultWriteConcern = defaultWriteConcern;
+	}
+
+	@Override
+	@Contract("_ -> this")
+	public ReactiveBulkOperations insert(Object document) {
+
+		Assert.notNull(document, "Document must not be null");
+
+		this.models.add(Mono.just(document).flatMap(it -> {
+			maybeEmitEvent(new BeforeConvertEvent<>(it, collectionName));
+			return maybeInvokeBeforeConvertCallback(it);
+		}).map(it -> new SourceAwareWriteModelHolder(it, new InsertOneModel<>(getMappedObject(it)))));
+
+		return this;
+	}
+
+	@Override
+	@Contract("_ -> this")
+	public ReactiveBulkOperations insert(List<? extends Object> documents) {
+
+		Assert.notNull(documents, "Documents must not be null");
+
+		documents.forEach(this::insert);
+
+		return this;
+	}
+
+	@Override
+	@Contract("_, _, _ -> this")
+	public ReactiveBulkOperations updateOne(Query query, UpdateDefinition update) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(update, "Update must not be null");
+
+		update(query, update, false, false);
+		return this;
+	}
+
+	@Override
+	@Contract("_, _ -> this")
+	public ReactiveBulkOperations updateMulti(Query query, UpdateDefinition update) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(update, "Update must not be null");
+
+		update(query, update, false, true);
+		return this;
+	}
+
+	@Override
+	@Contract("_, _ -> this")
+	public ReactiveBulkOperations upsert(Query query, UpdateDefinition update) {
+		return update(query, update, true, true);
+	}
+
+	@Override
+	@Contract("_ -> this")
+	public ReactiveBulkOperations remove(Query query) {
+
+		Assert.notNull(query, "Query must not be null");
+
+		DeleteOptions deleteOptions = new DeleteOptions();
+		query.getCollation().map(Collation::toMongoCollation).ifPresent(deleteOptions::collation);
+
+		this.models.add(Mono.just(query)
+				.map(it -> new SourceAwareWriteModelHolder(it, new DeleteManyModel<>(it.getQueryObject(), deleteOptions))));
+
+		return this;
+	}
+
+	@Override
+	@Contract("_ -> this")
+	public ReactiveBulkOperations remove(List<Query> removes) {
+
+		Assert.notNull(removes, "Removals must not be null");
+
+		for (Query query : removes) {
+			remove(query);
+		}
+
+		return this;
+	}
+
+	@Override
+	@Contract("_, _, _ -> this")
+	public ReactiveBulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(replacement, "Replacement must not be null");
+		Assert.notNull(options, "Options must not be null");
+
+		ReplaceOptions replaceOptions = new ReplaceOptions();
+		replaceOptions.upsert(options.isUpsert());
+		if (query.isSorted()) {
+			replaceOptions.sort(query.getSortObject());
+		}
+		query.getCollation().map(Collation::toMongoCollation).ifPresent(replaceOptions::collation);
+
+		this.models.add(Mono.just(replacement).flatMap(it -> {
+			maybeEmitEvent(new BeforeConvertEvent<>(it, collectionName));
+			return maybeInvokeBeforeConvertCallback(it);
+		}).map(it -> new SourceAwareWriteModelHolder(it,
+				new ReplaceOneModel<>(query.getQueryObject(), getMappedObject(it), replaceOptions))));
+
+		return this;
+	}
+
+	@Override
+	public Mono<BulkWriteResult> execute() {
+
+		try {
+			return mongoOperations.execute(collectionName, this::bulkWriteTo).next();
+		} finally {
+			this.bulkOptions = getBulkWriteOptions(bulkOperationContext.bulkMode());
+		}
+	}
+
+	private Mono<BulkWriteResult> bulkWriteTo(MongoCollection<Document> collection) {
+
+		if (defaultWriteConcern != null) {
+			collection = collection.withWriteConcern(defaultWriteConcern);
+		}
+
+		Flux<SourceAwareWriteModelHolder> concat = Flux.concat(models).flatMapSequential(it -> {
+
+			if (it.model() instanceof InsertOneModel<Document> iom) {
+
+				Document target = iom.getDocument();
+				maybeEmitBeforeSaveEvent(it);
+				return maybeInvokeBeforeSaveCallback(it.source(), target)
+						.map(afterCallback -> new SourceAwareWriteModelHolder(afterCallback, mapWriteModel(afterCallback, iom)));
+			} else if (it.model() instanceof ReplaceOneModel<Document> rom) {
+
+				Document target = rom.getReplacement();
+				maybeEmitBeforeSaveEvent(it);
+				return maybeInvokeBeforeSaveCallback(it.source(), target)
+						.map(afterCallback -> new SourceAwareWriteModelHolder(afterCallback, mapWriteModel(afterCallback, rom)));
+			}
+
+			return Mono.just(new SourceAwareWriteModelHolder(it.source(), mapWriteModel(it.source(), it.model())));
+		});
+
+		MongoCollection<Document> theCollection = collection;
+		return concat.collectList().flatMap(it -> {
+
+			return Mono
+					.from(theCollection
+							.bulkWrite(it.stream().map(SourceAwareWriteModelHolder::model).collect(Collectors.toList()), bulkOptions))
+					.doOnSuccess(state -> {
+						it.forEach(this::maybeEmitAfterSaveEvent);
+					}).flatMap(state -> {
+						List<Mono<Object>> monos = it.stream().map(this::maybeInvokeAfterSaveCallback).collect(Collectors.toList());
+
+						return Flux.concat(monos).then(Mono.just(state));
+					});
+		});
+	}
+
+	/**
+	 * Performs update and upsert bulk operations.
+	 *
+	 * @param query the {@link Query} to determine documents to update.
+	 * @param update the {@link Update} to perform, must not be {@literal null}.
+	 * @param upsert whether to upsert.
+	 * @param multi whether to issue a multi-update.
+	 * @return the {@link BulkOperations} with the update registered.
+	 */
+	private ReactiveBulkOperations update(Query query, UpdateDefinition update, boolean upsert, boolean multi) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(update, "Update must not be null");
+
+		UpdateOptions options = computeUpdateOptions(query, update, upsert, multi);
+
+		this.models.add(Mono.just(update).map(it -> {
+			if (multi) {
+				return new SourceAwareWriteModelHolder(update,
+						new UpdateManyModel<>(query.getQueryObject(), it.getUpdateObject(), options));
+			}
+			return new SourceAwareWriteModelHolder(update,
+					new UpdateOneModel<>(query.getQueryObject(), it.getUpdateObject(), options));
+		}));
+
+		return this;
+	}
+
+	@Override
+	protected void maybeEmitEvent(ApplicationEvent event) {
+		bulkOperationContext.publishEvent(event);
+	}
+
+	@Override
+	protected UpdateMapper updateMapper() {
+		return bulkOperationContext.updateMapper();
+	}
+
+	@Override
+	protected QueryMapper queryMapper() {
+		return bulkOperationContext.queryMapper();
+	}
+
+	@Override
+	protected Optional<? extends MongoPersistentEntity<?>> entity() {
+		return bulkOperationContext.entity();
+	}
+
+	private Document getMappedObject(Object source) {
+
+		if (source instanceof Document) {
+			return (Document) source;
+		}
+
+		Document sink = new Document();
+
+		mongoOperations.getConverter().write(source, sink);
+		return sink;
+	}
+
+	private Mono<Object> maybeInvokeAfterSaveCallback(SourceAwareWriteModelHolder holder) {
+
+		if (holder.model() instanceof InsertOneModel) {
+
+			Document target = ((InsertOneModel<Document>) holder.model()).getDocument();
+			return maybeInvokeAfterSaveCallback(holder.source(), target);
+		} else if (holder.model() instanceof ReplaceOneModel) {
+
+			Document target = ((ReplaceOneModel<Document>) holder.model()).getReplacement();
+			return maybeInvokeAfterSaveCallback(holder.source(), target);
+		}
+		return Mono.just(holder.source());
+	}
+
+	private Mono<Object> maybeInvokeBeforeConvertCallback(Object value) {
+		return bulkOperationContext.callback(ReactiveBeforeConvertCallback.class, value, collectionName);
+	}
+
+	private Mono<Object> maybeInvokeBeforeSaveCallback(Object value, Document mappedDocument) {
+		return bulkOperationContext.callback(ReactiveBeforeSaveCallback.class, value, mappedDocument, collectionName);
+	}
+
+	private Mono<Object> maybeInvokeAfterSaveCallback(Object value, Document mappedDocument) {
+		return bulkOperationContext.callback(ReactiveAfterSaveCallback.class, value, mappedDocument, collectionName);
+	}
+
+	/**
+	 * {@link ReactiveBulkOperationContext} holds information about {@link BulkMode} the entity in use as well as
+	 * references to {@link QueryMapper} and {@link UpdateMapper}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.0
+	 */
+	record ReactiveBulkOperationContext(BulkMode bulkMode, Optional<? extends MongoPersistentEntity<?>> entity,
+			QueryMapper queryMapper, UpdateMapper updateMapper, @Nullable ApplicationEventPublisher eventPublisher,
+			@Nullable ReactiveEntityCallbacks entityCallbacks) {
+
+		public boolean skipEntityCallbacks() {
+			return entityCallbacks == null;
+		}
+
+		public boolean skipEventPublishing() {
+			return eventPublisher == null;
+		}
+
+		@SuppressWarnings({ "rawtypes", "NullAway" })
+		public <T> Mono<T> callback(Class<? extends EntityCallback> callbackType, T entity, String collectionName) {
+
+			if (skipEntityCallbacks()) {
+				return Mono.just(entity);
+			}
+
+			return entityCallbacks.callback(callbackType, entity, collectionName);
+		}
+
+		@SuppressWarnings({ "rawtypes", "NullAway" })
+		public <T> Mono<T> callback(Class<? extends EntityCallback> callbackType, T entity, Document document,
+				String collectionName) {
+
+			if (skipEntityCallbacks()) {
+				return Mono.just(entity);
+			}
+
+			return entityCallbacks.callback(callbackType, entity, document, collectionName);
+		}
+
+		@SuppressWarnings("NullAway")
+		public void publishEvent(ApplicationEvent event) {
+
+			if (skipEventPublishing()) {
+				return;
+			}
+
+			eventPublisher.publishEvent(event);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java
index dbfc2a3b5b..69ade2e163 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperations.java
+++ b/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-2025 the original author 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,16 +19,17 @@
 import reactor.core.publisher.Mono;
 
 import java.util.Collection;
-import java.util.Optional;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.UncategorizedMongoDbException;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.index.ReactiveIndexOperations;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.NumberUtils;
 
 import com.mongodb.client.model.IndexOptions;
 
@@ -46,7 +47,7 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	private final ReactiveMongoOperations mongoOperations;
 	private final String collectionName;
 	private final QueryMapper queryMapper;
-	private final Optional<Class<?>> type;
+	private final @Nullable Class<?> type;
 
 	/**
 	 * Creates a new {@link DefaultReactiveIndexOperations}.
@@ -57,7 +58,7 @@ public class DefaultReactiveIndexOperations implements ReactiveIndexOperations {
 	 */
 	public DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName,
 			QueryMapper queryMapper) {
-		this(mongoOperations, collectionName, queryMapper, Optional.empty());
+		this(mongoOperations, collectionName, queryMapper, null);
 	}
 
 	/**
@@ -69,16 +70,11 @@ public DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, S
 	 * @param type used for mapping potential partial index filter expression, must not be {@literal null}.
 	 */
 	public DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName,
-			QueryMapper queryMapper, Class<?> type) {
-		this(mongoOperations, collectionName, queryMapper, Optional.of(type));
-	}
-
-	private DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations, String collectionName,
-			QueryMapper queryMapper, Optional<Class<?>> type) {
+			QueryMapper queryMapper, @Nullable Class<?> type) {
 
-		Assert.notNull(mongoOperations, "ReactiveMongoOperations must not be null!");
-		Assert.notNull(collectionName, "Collection must not be null!");
-		Assert.notNull(queryMapper, "QueryMapper must not be null!");
+		Assert.notNull(mongoOperations, "ReactiveMongoOperations must not be null");
+		Assert.notNull(collectionName, "Collection must not be null");
+		Assert.notNull(queryMapper, "QueryMapper must not be null");
 
 		this.mongoOperations = mongoOperations;
 		this.collectionName = collectionName;
@@ -86,17 +82,13 @@ private DefaultReactiveIndexOperations(ReactiveMongoOperations mongoOperations,
 		this.type = type;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)
-	 */
-	public Mono<String> ensureIndex(final IndexDefinition indexDefinition) {
+	@Override
+	@SuppressWarnings("NullAway")
+	public Mono<String> ensureIndex(IndexDefinition indexDefinition) {
 
 		return mongoOperations.execute(collectionName, collection -> {
 
-			MongoPersistentEntity<?> entity = type
-					.map(val -> (MongoPersistentEntity) queryMapper.getMappingContext().getRequiredPersistentEntity(val))
-					.orElseGet(() -> lookupPersistentEntity(collectionName));
+			MongoPersistentEntity<?> entity = getConfiguredEntity();
 
 			IndexOptions indexOptions = IndexConverters.indexDefinitionToIndexOptionsConverter().convert(indexDefinition);
 
@@ -108,8 +100,24 @@ public Mono<String> ensureIndex(final IndexDefinition indexDefinition) {
 		}).next();
 	}
 
-	@Nullable
-	private MongoPersistentEntity<?> lookupPersistentEntity(String collection) {
+	@Override
+	public Mono<Void> alterIndex(String name, org.springframework.data.mongodb.core.index.IndexOptions options) {
+
+		return mongoOperations.execute(db -> {
+			Document indexOptions = new Document("name", name);
+			indexOptions.putAll(options.toDocument());
+
+			return Flux.from(db.runCommand(new Document("collMod", collectionName).append("index", indexOptions)))
+					.doOnNext(result -> {
+						if (NumberUtils.convertNumberToTargetClass(result.get("ok", (Number) 0), Integer.class) != 1) {
+							throw new UncategorizedMongoDbException(
+									"Index '%s' could not be modified. Response was %s".formatted(name, result.toJson()), null);
+						}
+					});
+		}).then();
+	}
+
+	private @Nullable MongoPersistentEntity<?> lookupPersistentEntity(String collection) {
 
 		Collection<? extends MongoPersistentEntity<?>> entities = queryMapper.getMappingContext().getPersistentEntities();
 
@@ -119,32 +127,31 @@ private MongoPersistentEntity<?> lookupPersistentEntity(String collection) {
 				.orElse(null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropIndex(java.lang.String)
-	 */
-	public Mono<Void> dropIndex(final String name) {
+	@Override
+	public Mono<Void> dropIndex(String name) {
 		return mongoOperations.execute(collectionName, collection -> collection.dropIndex(name)).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#dropAllIndexes()
-	 */
+	@Override
 	public Mono<Void> dropAllIndexes() {
 		return dropIndex("*");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.ReactiveIndexOperations#getIndexInfo()
-	 */
+	@Override
 	public Flux<IndexInfo> getIndexInfo() {
 
 		return mongoOperations.execute(collectionName, collection -> collection.listIndexes(Document.class)) //
 				.map(IndexConverters.documentToIndexInfoConverter()::convert);
 	}
 
+	private @Nullable MongoPersistentEntity<?> getConfiguredEntity() {
+
+		if (type != null) {
+			return queryMapper.getMappingContext().getRequiredPersistentEntity(type);
+		}
+		return lookupPersistentEntity(collectionName);
+	}
+
 	private IndexOptions addPartialFilterIfPresent(IndexOptions ops, Document sourceOptions,
 			@Nullable MongoPersistentEntity<?> entity) {
 
@@ -157,7 +164,9 @@ private IndexOptions addPartialFilterIfPresent(IndexOptions ops, Document source
 				queryMapper.getMappedObject((Document) sourceOptions.get(PARTIAL_FILTER_EXPRESSION_KEY), entity));
 	}
 
-	private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops, MongoPersistentEntity<?> entity) {
+	@SuppressWarnings("NullAway")
+	private static IndexOptions addDefaultCollationIfRequired(IndexOptions ops,
+			@Nullable MongoPersistentEntity<?> entity) {
 
 		if (ops.getCollation() != null || entity == null || !entity.hasCollation()) {
 			return ops;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java
index 71d59993b8..6dde79e0e8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static java.util.UUID.*;
-import static org.springframework.data.mongodb.core.query.Criteria.*;
-import static org.springframework.data.mongodb.core.query.Query.*;
+import static java.util.UUID.randomUUID;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,18 +28,17 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.springframework.dao.DataAccessException;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
 import org.springframework.data.mongodb.core.script.NamedMongoScript;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBList;
-import com.mongodb.MongoException;
-import com.mongodb.client.MongoDatabase;
 
 /**
  * Default implementation of {@link ScriptOperations} capable of saving and executing {@link ExecutableMongoScript}.
@@ -51,6 +50,7 @@
  * @deprecated since 2.2. The {@code eval} command has been removed in MongoDB Server 4.2.0.
  */
 @Deprecated
+@NullUnmarked
 class DefaultScriptOperations implements ScriptOperations {
 
 	private static final String SCRIPT_COLLECTION_NAME = "system.js";
@@ -65,92 +65,59 @@ class DefaultScriptOperations implements ScriptOperations {
 	 */
 	public DefaultScriptOperations(MongoOperations mongoOperations) {
 
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
+		Assert.notNull(mongoOperations, "MongoOperations must not be null");
 
 		this.mongoOperations = mongoOperations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ScriptOperations#register(org.springframework.data.mongodb.core.script.ExecutableMongoScript)
-	 */
 	@Override
 	public NamedMongoScript register(ExecutableMongoScript script) {
 		return register(new NamedMongoScript(generateScriptName(), script));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ScriptOperations#register(org.springframework.data.mongodb.core.script.NamedMongoScript)
-	 */
 	@Override
 	public NamedMongoScript register(NamedMongoScript script) {
 
-		Assert.notNull(script, "Script must not be null!");
+		Assert.notNull(script, "Script must not be null");
 
 		mongoOperations.save(script, SCRIPT_COLLECTION_NAME);
 		return script;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ScriptOperations#execute(org.springframework.data.mongodb.core.script.ExecutableMongoScript, java.lang.Object[])
-	 */
 	@Override
-	public Object execute(final ExecutableMongoScript script, final Object... args) {
+	public @Nullable Object execute(ExecutableMongoScript script, Object... args) {
 
-		Assert.notNull(script, "Script must not be null!");
+		Assert.notNull(script, "Script must not be null");
 
-		return mongoOperations.execute(new DbCallback<Object>() {
+		return mongoOperations.execute(db -> {
 
-			@Override
-			public Object doInDB(MongoDatabase db) throws MongoException, DataAccessException {
-
-				Document command = new Document("$eval", script.getCode());
-				BasicDBList commandArgs = new BasicDBList();
-				commandArgs.addAll(Arrays.asList(convertScriptArgs(false, args)));
-				command.append("args", commandArgs);
-				return db.runCommand(command).get("retval");
-			}
+			Document command = new Document("$eval", script.getCode());
+			BasicDBList commandArgs = new BasicDBList();
+			commandArgs.addAll(Arrays.asList(convertScriptArgs(false, args)));
+			command.append("args", commandArgs);
+			return db.runCommand(command).get("retval");
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ScriptOperations#call(java.lang.String, java.lang.Object[])
-	 */
 	@Override
-	public Object call(final String scriptName, final Object... args) {
+	public @Nullable Object call(String scriptName, Object... args) {
 
-		Assert.hasText(scriptName, "ScriptName must not be null or empty!");
+		Assert.hasText(scriptName, "ScriptName must not be null or empty");
 
-		return mongoOperations.execute(new DbCallback<Object>() {
-
-			@Override
-			public Object doInDB(MongoDatabase db) throws MongoException, DataAccessException {
-
-				return db.runCommand(new Document("eval", String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args))))
-						.get("retval");
-			}
-		});
+		return mongoOperations.execute(
+				db -> db.runCommand(new Document("eval", String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args))))
+						.get("retval"));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ScriptOperations#exists(java.lang.String)
-	 */
 	@Override
 	public boolean exists(String scriptName) {
 
-		Assert.hasText(scriptName, "ScriptName must not be null or empty!");
+		Assert.hasText(scriptName, "ScriptName must not be null or empty");
 
-		return mongoOperations.exists(query(where("_id").is(scriptName)), NamedMongoScript.class, SCRIPT_COLLECTION_NAME);
+		return mongoOperations.exists(query(where(FieldName.ID.name()).is(scriptName)), NamedMongoScript.class,
+				SCRIPT_COLLECTION_NAME);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ScriptOperations#getScriptNames()
-	 */
 	@Override
 	public Set<String> getScriptNames() {
 
@@ -175,7 +142,7 @@ private Object[] convertScriptArgs(boolean quote, Object... args) {
 			return args;
 		}
 
-		List<Object> convertedValues = new ArrayList<Object>(args.length);
+		List<Object> convertedValues = new ArrayList<>(args.length);
 
 		for (Object arg : args) {
 			convertedValues.add(arg instanceof String && quote ? String.format("'%s'", arg)
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultWriteConcernResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultWriteConcernResolver.java
index 574ae14441..c445e06f8a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultWriteConcernResolver.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
+import org.jspecify.annotations.Nullable;
+
 import com.mongodb.WriteConcern;
 
 /**
@@ -26,7 +28,7 @@ enum DefaultWriteConcernResolver implements WriteConcernResolver {
 
 	INSTANCE;
 
-	public WriteConcern resolve(MongoAction action) {
+	public @Nullable WriteConcern resolve(MongoAction action) {
 		return action.getDefaultWriteConcern();
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DocumentCallbackHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DocumentCallbackHandler.java
index c712cfb60f..54f85051fb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DocumentCallbackHandler.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 
 /**
  * An interface used by {@link MongoTemplate} for processing documents returned from a MongoDB query on a per-document
- * basis. Implementations of this interface perform the actual work of prcoessing each document but don't need to worry
- * about exception handling. {@MongoException}s will be caught and translated by the calling MongoTemplate An
+ * basis. Implementations of this interface perform the actual work of processing each document but don't need to worry
+ * about exception handling. {@link MongoException}s will be caught and translated by the calling MongoTemplate An
  * DocumentCallbackHandler is typically stateful: It keeps the result state within the object, to be available later for
  * later inspection.
  *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EncryptionAlgorithms.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EncryptionAlgorithms.java
new file mode 100644
index 0000000000..601b6898b8
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EncryptionAlgorithms.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2021-2025 the original author 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;
+
+/**
+ * Encryption algorithms supported by MongoDB Client Side Field Level Encryption.
+ *
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 3.3
+ */
+public final class EncryptionAlgorithms {
+
+	public static final String AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic";
+	public static final String AEAD_AES_256_CBC_HMAC_SHA_512_Random = "AEAD_AES_256_CBC_HMAC_SHA_512-Random";
+	public static final String RANGE = "Range";
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityLifecycleEventDelegate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityLifecycleEventDelegate.java
new file mode 100644
index 0000000000..ad3c2b8564
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityLifecycleEventDelegate.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2022-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.context.ApplicationEventPublisher;
+
+/**
+ * Delegate class to encapsulate lifecycle event configuration and publishing.
+ *
+ * @author Mark Paluch
+ * @since 4.0
+ * @see ApplicationEventPublisher
+ */
+class EntityLifecycleEventDelegate {
+
+	private @Nullable ApplicationEventPublisher publisher;
+	private boolean eventsEnabled = true;
+
+	public void setPublisher(@Nullable ApplicationEventPublisher publisher) {
+		this.publisher = publisher;
+	}
+
+	public boolean isEventsEnabled() {
+		return eventsEnabled;
+	}
+
+	public void setEventsEnabled(boolean eventsEnabled) {
+		this.eventsEnabled = eventsEnabled;
+	}
+
+	/**
+	 * Publish an application event if event publishing is enabled.
+	 *
+	 * @param event the application event.
+	 */
+	@SuppressWarnings("NullAway")
+	public void publishEvent(Object event) {
+
+		if (canPublishEvent()) {
+			publisher.publishEvent(event);
+		}
+	}
+
+	private boolean canPublishEvent() {
+		return publisher != null && eventsEnabled;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java
index 343e83a1ee..1327656356 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityOperations.java
+++ b/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-2025 the original author 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,35 +15,69 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
+import java.time.Duration;
 import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Predicate;
 
+import org.bson.BsonNull;
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.EnvironmentCapable;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.expression.ValueEvaluationContext;
 import org.springframework.data.mapping.IdentifierAccessor;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.mapping.PersistentPropertyPath;
+import org.springframework.data.mapping.PropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
+import org.springframework.data.mongodb.core.CollectionOptions.EncryptedFieldsOptions;
+import org.springframework.data.mongodb.core.CollectionOptions.TimeSeriesOptions;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
+import org.springframework.data.mongodb.core.mapping.TimeSeries;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.timeseries.Granularity;
+import org.springframework.data.mongodb.core.validation.Validator;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.mongodb.util.DurationUtil;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.projection.EntityProjectionIntrospector;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.projection.TargetAware;
+import org.springframework.data.util.Optionals;
+import org.springframework.expression.spel.support.SimpleEvaluationContext;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.model.ChangeStreamPreAndPostImagesOptions;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.TimeSeriesGranularity;
+import com.mongodb.client.model.ValidationOptions;
 
 /**
  * Common operations performed on an entity in the context of it's mapping metadata.
@@ -51,37 +85,73 @@
  * @author Oliver Gierke
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Ben Foster
+ * @author Ross Lawley
  * @since 2.1
  * @see MongoTemplate
  * @see ReactiveMongoTemplate
  */
-@RequiredArgsConstructor
 class EntityOperations {
 
-	private static final String ID_FIELD = "_id";
+	private static final String ID_FIELD = FieldName.ID.name();
+
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context;
+	private final QueryMapper queryMapper;
+
+	private final EntityProjectionIntrospector introspector;
 
-	private final @NonNull MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context;
+	private final MongoJsonSchemaMapper schemaMapper;
+
+	private @Nullable Environment environment;
+
+	EntityOperations(MongoConverter converter) {
+		this(converter, new QueryMapper(converter));
+	}
+
+	EntityOperations(MongoConverter converter, QueryMapper queryMapper) {
+		this(converter, converter.getMappingContext(), converter.getCustomConversions(), converter.getProjectionFactory(),
+				queryMapper);
+	}
+
+	EntityOperations(MongoConverter converter,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
+			CustomConversions conversions, ProjectionFactory projectionFactory, QueryMapper queryMapper) {
+		this.context = context;
+		this.queryMapper = queryMapper;
+		this.introspector = EntityProjectionIntrospector.create(projectionFactory,
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and(((target, underlyingType) -> !conversions.isSimpleType(target))),
+				context);
+		this.schemaMapper = new MongoJsonSchemaMapper(converter);
+		if (converter instanceof EnvironmentCapable environmentCapable) {
+			this.environment = environmentCapable.getEnvironment();
+		}
+	}
 
 	/**
 	 * Creates a new {@link Entity} for the given bean.
 	 *
 	 * @param entity must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Entity}.
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public <T> Entity<T> forEntity(T entity) {
+	<T> Entity<T> forEntity(T entity) {
+
+		Assert.notNull(entity, "Bean must not be null");
 
-		Assert.notNull(entity, "Bean must not be null!");
+		if (entity instanceof TargetAware targetAware) {
+			return new SimpleMappedEntity((Map<String, Object>) targetAware.getTarget(), this);
+		}
 
 		if (entity instanceof String) {
-			return new UnmappedEntity(parse(entity.toString()));
+			return new UnmappedEntity(parse(entity.toString()), this);
 		}
 
 		if (entity instanceof Map) {
-			return new SimpleMappedEntity((Map<String, Object>) entity);
+			return new SimpleMappedEntity((Map<String, Object>) entity, this);
 		}
 
-		return MappedEntity.of(entity, context);
+		return MappedEntity.of(entity, context, this);
 	}
 
 	/**
@@ -89,33 +159,58 @@ public <T> Entity<T> forEntity(T entity) {
 	 *
 	 * @param entity must not be {@literal null}.
 	 * @param conversionService must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link AdaptibleEntity}.
 	 */
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public <T> AdaptibleEntity<T> forEntity(T entity, ConversionService conversionService) {
+	<T> AdaptibleEntity<T> forEntity(T entity, ConversionService conversionService) {
 
-		Assert.notNull(entity, "Bean must not be null!");
-		Assert.notNull(conversionService, "ConversionService must not be null!");
+		Assert.notNull(entity, "Bean must not be null");
+		Assert.notNull(conversionService, "ConversionService must not be null");
 
 		if (entity instanceof String) {
-			return new UnmappedEntity(parse(entity.toString()));
+			return new UnmappedEntity(parse(entity.toString()), this);
 		}
 
 		if (entity instanceof Map) {
-			return new SimpleMappedEntity((Map<String, Object>) entity);
+			return new SimpleMappedEntity((Map<String, Object>) entity, this);
 		}
 
-		return AdaptibleMappedEntity.of(entity, context, conversionService);
+		return AdaptibleMappedEntity.of(entity, context, conversionService, this);
 	}
 
+	/**
+	 * @param source can be {@literal null}.
+	 * @return {@literal true} if the given value is an {@literal array}, {@link Collection} or {@link Iterator}.
+	 * @since 3.2
+	 */
+	static boolean isCollectionLike(@Nullable Object source) {
+
+		if (source == null) {
+			return false;
+		}
+
+		return ObjectUtils.isArray(source) || source instanceof Collection || source instanceof Iterator;
+	}
+
+	/**
+	 * @param entityClass should not be null.
+	 * @return the {@link MongoPersistentEntity#getCollection() collection name}.
+	 */
 	public String determineCollectionName(@Nullable Class<?> entityClass) {
 
 		if (entityClass == null) {
 			throw new InvalidDataAccessApiUsageException(
-					"No class parameter provided, entity collection can't be determined!");
+					"No class parameter provided, entity collection can't be determined");
 		}
 
-		return context.getRequiredPersistentEntity(entityClass).getCollection();
+		MongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(entityClass);
+
+		if (persistentEntity == null) {
+			throw new MappingException(String.format(
+					"Cannot determine collection name from type '%s'. Is it a store native type?", entityClass.getName()));
+		}
+
+		return persistentEntity.getCollection();
 	}
 
 	public Query getByIdInQuery(Collection<?> entities) {
@@ -138,11 +233,11 @@ public Query getByIdInQuery(Collection<?> entities) {
 	 * {@code _id} if no identifier property can be found.
 	 *
 	 * @param type must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public String getIdPropertyName(Class<?> type) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 
 		MongoPersistentEntity<?> persistentEntity = context.getPersistentEntity(type);
 
@@ -181,12 +276,12 @@ private static Document parse(String source) {
 		try {
 			return Document.parse(source);
 		} catch (org.bson.json.JsonParseException o_O) {
-			throw new MappingException("Could not parse given String to save into a JSON document!", o_O);
+			throw new MappingException("Could not parse given String to save into a JSON document", o_O);
 		} catch (RuntimeException o_O) {
 
 			// legacy 3.x exception
 			if (ClassUtils.matchesTypeName(o_O.getClass(), "JSONParseException")) {
-				throw new MappingException("Could not parse given String to save into a JSON document!", o_O);
+				throw new MappingException("Could not parse given String to save into a JSON document", o_O);
 			}
 			throw o_O;
 		}
@@ -199,17 +294,120 @@ public <T> TypedOperations<T> forType(@Nullable Class<T> entityClass) {
 			MongoPersistentEntity<?> entity = context.getPersistentEntity(entityClass);
 
 			if (entity != null) {
-				return new TypedEntityOperations(entity);
+				return new TypedEntityOperations(entity, environment);
 			}
 
 		}
 		return UntypedOperations.instance();
 	}
 
+	/**
+	 * Introspect the given {@link Class result type} in the context of the {@link Class entity type} whether the returned
+	 * type is a projection and what property paths are participating in the projection.
+	 *
+	 * @param resultType the type to project on. Must not be {@literal null}.
+	 * @param entityType the source domain type. Must not be {@literal null}.
+	 * @return the introspection result.
+	 * @since 3.4
+	 * @see EntityProjectionIntrospector#introspect(Class, Class)
+	 */
+	public <M, D> EntityProjection<M, D> introspectProjection(Class<M> resultType, Class<D> entityType) {
+
+		MongoPersistentEntity<?> persistentEntity = queryMapper.getMappingContext().getPersistentEntity(entityType);
+		if (persistentEntity == null && !resultType.isInterface() || ClassUtils.isAssignable(Document.class, resultType)) {
+			return (EntityProjection) EntityProjection.nonProjecting(resultType);
+		}
+		return introspector.introspect(resultType, entityType);
+	}
+
+	/**
+	 * Convert {@link CollectionOptions} to {@link CreateCollectionOptions} using {@link Class entityType} to obtain
+	 * mapping metadata.
+	 *
+	 * @param collectionOptions
+	 * @param entityType
+	 * @return
+	 * @since 3.4
+	 */
+	public CreateCollectionOptions convertToCreateCollectionOptions(@Nullable CollectionOptions collectionOptions,
+			Class<?> entityType) {
+
+		Optional<Collation> collation = Optionals.firstNonEmpty(
+				() -> Optional.ofNullable(collectionOptions).flatMap(CollectionOptions::getCollation),
+				() -> forType(entityType).getCollation());//
+
+		CreateCollectionOptions result = new CreateCollectionOptions();
+		collation.map(Collation::toMongoCollation).ifPresent(result::collation);
+
+		if (collectionOptions == null) {
+			return result;
+		}
+
+		collectionOptions.getCapped().ifPresent(result::capped);
+		collectionOptions.getSize().ifPresent(result::sizeInBytes);
+		collectionOptions.getMaxDocuments().ifPresent(result::maxDocuments);
+		collectionOptions.getCollation().map(Collation::toMongoCollation).ifPresent(result::collation);
+
+		collectionOptions.getValidationOptions().ifPresent(it -> {
+
+			ValidationOptions validationOptions = new ValidationOptions();
+
+			it.getValidationAction().ifPresent(validationOptions::validationAction);
+			it.getValidationLevel().ifPresent(validationOptions::validationLevel);
+
+			it.getValidator().ifPresent(val -> validationOptions.validator(getMappedValidator(val, entityType)));
+
+			result.validationOptions(validationOptions);
+		});
+
+		collectionOptions.getTimeSeriesOptions().map(forType(entityType)::mapTimeSeriesOptions).ifPresent(it -> {
+
+			com.mongodb.client.model.TimeSeriesOptions options = new com.mongodb.client.model.TimeSeriesOptions(
+					it.getTimeField());
+
+			if (StringUtils.hasText(it.getMetaField())) {
+				options.metaField(it.getMetaField());
+			}
+			if (!Granularity.DEFAULT.equals(it.getGranularity())) {
+				options.granularity(TimeSeriesGranularity.valueOf(it.getGranularity().name().toUpperCase()));
+			}
+
+			if (!it.getExpireAfter().isNegative()) {
+				result.expireAfter(it.getExpireAfter().toSeconds(), TimeUnit.SECONDS);
+			}
+
+			result.timeSeriesOptions(options);
+		});
+
+		collectionOptions.getChangeStreamOptions() //
+				.map(CollectionOptions.CollectionChangeStreamOptions::getPreAndPostImages) //
+				.map(ChangeStreamPreAndPostImagesOptions::new) //
+				.ifPresent(result::changeStreamPreAndPostImagesOptions);
+
+		collectionOptions.getEncryptedFieldsOptions() //
+				.map(EncryptedFieldsOptions::toDocument) //
+				.filter(Predicate.not(Document::isEmpty)) //
+				.ifPresent(result::encryptedFields);
+
+		return result;
+	}
+
+	private Document getMappedValidator(Validator validator, Class<?> domainType) {
+
+		Document validationRules = validator.toDocument();
+
+		if (validationRules.containsKey("$jsonSchema")) {
+			return schemaMapper.mapSchema(validationRules, domainType);
+		}
+
+		return queryMapper.getMappedObject(validationRules, context.getPersistentEntity(domainType));
+	}
+
 	/**
 	 * A representation of information about an entity.
 	 *
 	 * @author Oliver Gierke
+	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
 	interface Entity<T> {
@@ -226,8 +424,19 @@ interface Entity<T> {
 		 *
 		 * @return
 		 */
+		@Nullable
 		Object getId();
 
+		/**
+		 * Returns the property value for {@code key}.
+		 *
+		 * @param key
+		 * @return
+		 * @since 4.1
+		 */
+		@Nullable
+		Object getPropertyValue(String key);
+
 		/**
 		 * Returns the {@link Query} to find the entity by its identifier.
 		 *
@@ -298,6 +507,15 @@ default boolean isVersionedEntity() {
 		 * @since 2.1.2
 		 */
 		boolean isNew();
+
+		/**
+		 * @param sortObject
+		 * @return
+		 * @since 4.1
+		 * @throws IllegalStateException if a sort key yields {@literal null}.
+		 */
+		Map<String, Object> extractKeys(Document sortObject, Class<?> sourceType);
+
 	}
 
 	/**
@@ -312,14 +530,13 @@ interface AdaptibleEntity<T> extends Entity<T> {
 		 * Populates the identifier of the backing entity if it has an identifier property and there's no identifier
 		 * currently present.
 		 *
-		 * @param id must not be {@literal null}.
+		 * @param id can be {@literal null}.
 		 * @return
 		 */
-		@Nullable
 		T populateIdIfNecessary(@Nullable Object id);
 
 		/**
-		 * Initializes the version property of the of the current entity if available.
+		 * Initializes the version property of the current entity if available.
 		 *
 		 * @return the entity with the version property updated if available.
 		 */
@@ -342,43 +559,36 @@ interface AdaptibleEntity<T> extends Entity<T> {
 		Number getVersion();
 	}
 
-	@RequiredArgsConstructor
 	private static class UnmappedEntity<T extends Map<String, Object>> implements AdaptibleEntity<T> {
 
 		private final T map;
+		private final EntityOperations entityOperations;
+
+		protected UnmappedEntity(T map, EntityOperations entityOperations) {
+			this.map = map;
+			this.entityOperations = entityOperations;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getIdPropertyName()
-		 */
 		@Override
 		public String getIdFieldName() {
 			return ID_FIELD;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getId()
-		 */
 		@Override
-		public Object getId() {
-			return map.get(ID_FIELD);
+		public @Nullable Object getId() {
+			return getPropertyValue(ID_FIELD);
+		}
+
+		@Override
+		public @Nullable Object getPropertyValue(String key) {
+			return map.get(key);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getByIdQuery()
-		 */
 		@Override
 		public Query getByIdQuery() {
 			return Query.query(Criteria.where(ID_FIELD).is(map.get(ID_FIELD)));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.MutablePersistableSource#populateIdIfNecessary(java.lang.Object)
-		 */
-		@Nullable
 		@Override
 		public T populateIdIfNecessary(@Nullable Object id) {
 
@@ -387,90 +597,95 @@ public T populateIdIfNecessary(@Nullable Object id) {
 			return map;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getQueryForVersion()
-		 */
 		@Override
 		public Query getQueryForVersion() {
-			throw new MappingException("Cannot query for version on plain Documents!");
+			throw new MappingException("Cannot query for version on plain Documents");
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#toMappedDocument(org.springframework.data.mongodb.core.convert.MongoWriter)
-		 */
 		@Override
 		public MappedDocument toMappedDocument(MongoWriter<? super T> writer) {
-			return MappedDocument.of(map instanceof Document //
-					? (Document) map //
+			return MappedDocument.of(map instanceof Document document //
+					? document //
 					: new Document(map));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.MutablePersistableSource#initializeVersionProperty()
-		 */
 		@Override
 		public T initializeVersionProperty() {
 			return map;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.MutablePersistableSource#getVersion()
-		 */
 		@Override
-		@Nullable
-		public Number getVersion() {
+		public @Nullable Number getVersion() {
 			return null;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.MutablePersistableSource#incrementVersion()
-		 */
 		@Override
 		public T incrementVersion() {
 			return map;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getBean()
-		 */
 		@Override
 		public T getBean() {
 			return map;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.Entity#isNew()
-		 */
 		@Override
 		public boolean isNew() {
 			return map.get(ID_FIELD) != null;
 		}
+
+		@Override
+		public Map<String, Object> extractKeys(Document sortObject, Class<?> sourceType) {
+
+			Map<String, Object> keyset = new LinkedHashMap<>();
+			MongoPersistentEntity<?> sourceEntity = entityOperations.context.getPersistentEntity(sourceType);
+			if (sourceEntity != null && sourceEntity.hasIdProperty()) {
+				keyset.put(sourceEntity.getRequiredIdProperty().getName(), getId());
+			} else {
+				keyset.put(ID_FIELD, getId());
+			}
+
+			for (String key : sortObject.keySet()) {
+
+				Object value = resolveValue(key, sourceEntity);
+
+				if (value == null) {
+					throw new IllegalStateException(
+							String.format("Cannot extract value for key %s because its value is null", key));
+				}
+
+				keyset.put(key, value);
+			}
+
+			return keyset;
+		}
+
+		@Nullable
+		private Object resolveValue(String key, @Nullable MongoPersistentEntity<?> sourceEntity) {
+
+			if (sourceEntity == null) {
+				return BsonUtils.resolveValue(map, key);
+			}
+			PropertyPath from = PropertyPath.from(key, sourceEntity.getTypeInformation());
+			PersistentPropertyPath<MongoPersistentProperty> persistentPropertyPath = entityOperations.context
+					.getPersistentPropertyPath(from);
+			return BsonUtils.resolveValue(map, persistentPropertyPath.toDotPath(MongoPersistentProperty::getFieldName));
+		}
 	}
 
 	private static class SimpleMappedEntity<T extends Map<String, Object>> extends UnmappedEntity<T> {
 
-		SimpleMappedEntity(T map) {
-			super(map);
+		protected SimpleMappedEntity(T map, EntityOperations entityOperations) {
+			super(map, entityOperations);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#toMappedDocument(org.springframework.data.mongodb.core.convert.MongoWriter)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
 		public MappedDocument toMappedDocument(MongoWriter<? super T> writer) {
 
 			T bean = getBean();
-			bean = (T) (bean instanceof Document //
-					? (Document) bean //
+			bean = (T) (bean instanceof Document document//
+					? document //
 					: new Document(bean));
 			Document document = new Document();
 			writer.write(bean, document);
@@ -479,50 +694,53 @@ public MappedDocument toMappedDocument(MongoWriter<? super T> writer) {
 		}
 	}
 
-	@RequiredArgsConstructor(access = AccessLevel.PROTECTED)
 	private static class MappedEntity<T> implements Entity<T> {
 
-		private final @NonNull MongoPersistentEntity<?> entity;
-		private final @NonNull IdentifierAccessor idAccessor;
-		private final @NonNull PersistentPropertyAccessor<T> propertyAccessor;
+		private final MongoPersistentEntity<?> entity;
+		private final IdentifierAccessor idAccessor;
+		private final PersistentPropertyAccessor<T> propertyAccessor;
+		private final EntityOperations entityOperations;
+
+		protected MappedEntity(MongoPersistentEntity<?> entity, IdentifierAccessor idAccessor,
+				PersistentPropertyAccessor<T> propertyAccessor, EntityOperations entityOperations) {
+
+			this.entity = entity;
+			this.idAccessor = idAccessor;
+			this.propertyAccessor = propertyAccessor;
+			this.entityOperations = entityOperations;
+		}
 
 		private static <T> MappedEntity<T> of(T bean,
-				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context) {
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
+				EntityOperations entityOperations) {
 
 			MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(bean.getClass());
 			IdentifierAccessor identifierAccessor = entity.getIdentifierAccessor(bean);
 			PersistentPropertyAccessor<T> propertyAccessor = entity.getPropertyAccessor(bean);
 
-			return new MappedEntity<>(entity, identifierAccessor, propertyAccessor);
+			return new MappedEntity<>(entity, identifierAccessor, propertyAccessor, entityOperations);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getIdPropertyName()
-		 */
 		@Override
 		public String getIdFieldName() {
 			return entity.getRequiredIdProperty().getFieldName();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getId()
-		 */
 		@Override
 		public Object getId() {
 			return idAccessor.getRequiredIdentifier();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getByIdQuery()
-		 */
+		@Override
+		public @Nullable Object getPropertyValue(String key) {
+			return propertyAccessor.getProperty(entity.getRequiredPersistentProperty(key));
+		}
+
 		@Override
 		public Query getByIdQuery() {
 
 			if (!entity.hasIdProperty()) {
-				throw new MappingException("No id property found for object of type " + entity.getType() + "!");
+				throw new MappingException("No id property found for object of type " + entity.getType());
 			}
 
 			MongoPersistentProperty idProperty = entity.getRequiredIdProperty();
@@ -530,10 +748,6 @@ public Query getByIdQuery() {
 			return Query.query(Criteria.where(idProperty.getName()).is(getId()));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getQueryForVersion(java.lang.Object)
-		 */
 		@Override
 		public Query getQueryForVersion() {
 
@@ -544,10 +758,6 @@ public Query getQueryForVersion() {
 					.and(versionProperty.getName()).is(getVersion()));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#toMappedDocument(org.springframework.data.mongodb.core.convert.MongoWriter)
-		 */
 		@Override
 		public MappedDocument toMappedDocument(MongoWriter<? super T> writer) {
 
@@ -563,10 +773,6 @@ public MappedDocument toMappedDocument(MongoWriter<? super T> writer) {
 			return MappedDocument.of(document);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.Entity#assertUpdateableIdIfNotSet()
-		 */
 		public void assertUpdateableIdIfNotSet() {
 
 			if (!entity.hasIdProperty()) {
@@ -582,47 +788,87 @@ public void assertUpdateableIdIfNotSet() {
 
 			if (!MongoSimpleTypes.AUTOGENERATED_ID_TYPES.contains(property.getType())) {
 				throw new InvalidDataAccessApiUsageException(
-						String.format("Cannot autogenerate id of type %s for entity of type %s!", property.getType().getName(),
+						String.format("Cannot autogenerate id of type %s for entity of type %s", property.getType().getName(),
 								entity.getType().getName()));
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#isVersionedEntity()
-		 */
 		@Override
 		public boolean isVersionedEntity() {
 			return entity.hasVersionProperty();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getVersion()
-		 */
 		@Override
-		@Nullable
-		public Object getVersion() {
+		public @Nullable Object getVersion() {
 			return propertyAccessor.getProperty(entity.getRequiredVersionProperty());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.PersistableSource#getBean()
-		 */
 		@Override
 		public T getBean() {
 			return propertyAccessor.getBean();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.Entity#isNew()
-		 */
 		@Override
 		public boolean isNew() {
 			return entity.isNew(propertyAccessor.getBean());
 		}
+
+		@Override
+		public Map<String, Object> extractKeys(Document sortObject, Class<?> sourceType) {
+
+			Map<String, Object> keyset = new LinkedHashMap<>();
+			MongoPersistentEntity<?> sourceEntity = entityOperations.context.getPersistentEntity(sourceType);
+			if (sourceEntity != null && sourceEntity.hasIdProperty()) {
+				keyset.put(sourceEntity.getRequiredIdProperty().getName(), getId());
+			} else {
+				keyset.put(entity.getRequiredIdProperty().getName(), getId());
+			}
+
+			for (String key : sortObject.keySet()) {
+
+				Object value;
+				if (key.indexOf('.') != -1) {
+
+					// follow the path across nested levels.
+					// TODO: We should have a MongoDB-specific property path abstraction to allow diving into Document.
+					value = getNestedPropertyValue(key);
+				} else {
+					value = getPropertyValue(key);
+				}
+
+				if (value == null) {
+					throw new IllegalStateException(
+							String.format("Cannot extract value for key %s because its value is null", key));
+				}
+
+				keyset.put(key, value);
+			}
+
+			return keyset;
+		}
+
+		private Object getNestedPropertyValue(String key) {
+
+			String[] segments = key.split("\\.");
+			Entity<?> currentEntity = this;
+			Object currentValue = BsonNull.VALUE;
+
+			for (int i = 0; i < segments.length; i++) {
+
+				String segment = segments[i];
+				currentValue = currentEntity.getPropertyValue(segment);
+
+				if (i < segments.length - 1) {
+					if (currentValue == null) {
+						return BsonNull.VALUE;
+					}
+
+					currentEntity = entityOperations.forEntity(currentValue);
+				}
+			}
+
+			return currentValue != null ? currentValue : BsonNull.VALUE;
+		}
 	}
 
 	private static class AdaptibleMappedEntity<T> extends MappedEntity<T> implements AdaptibleEntity<T> {
@@ -632,9 +878,9 @@ private static class AdaptibleMappedEntity<T> extends MappedEntity<T> implements
 		private final IdentifierAccessor identifierAccessor;
 
 		private AdaptibleMappedEntity(MongoPersistentEntity<?> entity, IdentifierAccessor identifierAccessor,
-				ConvertingPropertyAccessor<T> propertyAccessor) {
+				ConvertingPropertyAccessor<T> propertyAccessor, EntityOperations entityOperations) {
 
-			super(entity, identifierAccessor, propertyAccessor);
+			super(entity, identifierAccessor, propertyAccessor, entityOperations);
 
 			this.entity = entity;
 			this.propertyAccessor = propertyAccessor;
@@ -643,21 +889,16 @@ private AdaptibleMappedEntity(MongoPersistentEntity<?> entity, IdentifierAccesso
 
 		private static <T> AdaptibleEntity<T> of(T bean,
 				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
-				ConversionService conversionService) {
+				ConversionService conversionService, EntityOperations entityOperations) {
 
 			MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(bean.getClass());
 			IdentifierAccessor identifierAccessor = entity.getIdentifierAccessor(bean);
 			PersistentPropertyAccessor<T> propertyAccessor = entity.getPropertyAccessor(bean);
 
 			return new AdaptibleMappedEntity<>(entity, identifierAccessor,
-					new ConvertingPropertyAccessor<>(propertyAccessor, conversionService));
+					new ConvertingPropertyAccessor<>(propertyAccessor, conversionService), entityOperations);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#populateIdIfNecessary(java.lang.Object)
-		 */
-		@Nullable
 		@Override
 		public T populateIdIfNecessary(@Nullable Object id) {
 
@@ -678,23 +919,14 @@ public T populateIdIfNecessary(@Nullable Object id) {
 			return propertyAccessor.getBean();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.MappedEntity#getVersion()
-		 */
 		@Override
-		@Nullable
-		public Number getVersion() {
+		public @Nullable Number getVersion() {
 
 			MongoPersistentProperty versionProperty = entity.getRequiredVersionProperty();
 
 			return propertyAccessor.getProperty(versionProperty, Number.class);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#initializeVersionProperty()
-		 */
 		@Override
 		public T initializeVersionProperty() {
 
@@ -709,10 +941,6 @@ public T initializeVersionProperty() {
 			return propertyAccessor.getBean();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity#incrementVersion()
-		 */
 		@Override
 		public T incrementVersion() {
 
@@ -749,35 +977,54 @@ interface TypedOperations<T> {
 		 * @return
 		 */
 		Optional<Collation> getCollation(Query query);
+
+		/**
+		 * Derive the applicable {@link CollectionOptions} for the given type.
+		 *
+		 * @return never {@literal null}.
+		 * @since 3.3
+		 */
+		CollectionOptions getCollectionOptions();
+
+		/**
+		 * Map the fields of a given {@link TimeSeriesOptions} against the target domain type to consider potentially
+		 * annotated field names.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return never {@literal null}.
+		 * @since 3.3
+		 */
+		TimeSeriesOptions mapTimeSeriesOptions(TimeSeriesOptions options);
+
+		/**
+		 * @return the name of the id field.
+		 * @since 4.1
+		 */
+		default String getIdKeyName() {
+			return ID_FIELD;
+		}
 	}
 
 	/**
 	 * {@link TypedOperations} for generic entities that are not represented with {@link PersistentEntity} (e.g. custom
 	 * conversions).
 	 */
-	@RequiredArgsConstructor
 	enum UntypedOperations implements TypedOperations<Object> {
 
 		INSTANCE;
 
+		UntypedOperations() {}
+
 		@SuppressWarnings({ "unchecked", "rawtypes" })
 		public static <T> TypedOperations<T> instance() {
 			return (TypedOperations) INSTANCE;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation()
-		 */
 		@Override
 		public Optional<Collation> getCollation() {
 			return Optional.empty();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
 		public Optional<Collation> getCollation(Query query) {
 
@@ -787,6 +1034,16 @@ public Optional<Collation> getCollation(Query query) {
 
 			return query.getCollation();
 		}
+
+		@Override
+		public CollectionOptions getCollectionOptions() {
+			return CollectionOptions.empty();
+		}
+
+		@Override
+		public TimeSeriesOptions mapTimeSeriesOptions(TimeSeriesOptions options) {
+			return options;
+		}
 	}
 
 	/**
@@ -794,24 +1051,23 @@ public Optional<Collation> getCollation(Query query) {
 	 *
 	 * @param <T>
 	 */
-	@RequiredArgsConstructor
 	static class TypedEntityOperations<T> implements TypedOperations<T> {
 
-		private final @NonNull MongoPersistentEntity<T> entity;
+		private final MongoPersistentEntity<T> entity;
+
+		@Nullable private final Environment environment;
+
+		protected TypedEntityOperations(MongoPersistentEntity<T> entity, @Nullable Environment environment) {
+
+			this.entity = entity;
+			this.environment = environment;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation()
-		 */
 		@Override
 		public Optional<Collation> getCollation() {
 			return Optional.ofNullable(entity.getCollation());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.EntityOperations.TypedOperations#getCollation(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
 		public Optional<Collation> getCollation(Query query) {
 
@@ -821,6 +1077,100 @@ public Optional<Collation> getCollation(Query query) {
 
 			return Optional.ofNullable(entity.getCollation());
 		}
-	}
 
+		@Override
+		public CollectionOptions getCollectionOptions() {
+
+			CollectionOptions collectionOptions = CollectionOptions.empty();
+			if (entity.hasCollation()) {
+				collectionOptions = collectionOptions.collation(entity.getCollation());
+			}
+
+			if (entity.isAnnotationPresent(TimeSeries.class)) {
+
+				TimeSeries timeSeries = entity.getRequiredAnnotation(TimeSeries.class);
+
+				if (entity.getPersistentProperty(timeSeries.timeField()) == null) {
+					throw new MappingException(String.format("Time series field '%s' does not exist in type %s",
+							timeSeries.timeField(), entity.getName()));
+				}
+
+				TimeSeriesOptions options = TimeSeriesOptions.timeSeries(timeSeries.timeField());
+				if (StringUtils.hasText(timeSeries.metaField())) {
+
+					if (entity.getPersistentProperty(timeSeries.metaField()) == null) {
+						throw new MappingException(
+								String.format("Meta field '%s' does not exist in type %s", timeSeries.metaField(), entity.getName()));
+					}
+
+					options = options.metaField(timeSeries.metaField());
+				}
+				if (!Granularity.DEFAULT.equals(timeSeries.granularity())) {
+					options = options.granularity(timeSeries.granularity());
+				}
+
+				if (StringUtils.hasText(timeSeries.expireAfter())) {
+
+					Duration timeout = computeIndexTimeout(timeSeries.expireAfter(), getEvaluationContextForEntity(entity));
+					if (!timeout.isNegative()) {
+						options = options.expireAfter(timeout);
+					}
+				}
+
+				collectionOptions = collectionOptions.timeSeries(options);
+			}
+
+			return collectionOptions;
+		}
+
+		@Override
+		public TimeSeriesOptions mapTimeSeriesOptions(TimeSeriesOptions source) {
+
+			TimeSeriesOptions target = TimeSeriesOptions.timeSeries(mappedNameOrDefault(source.getTimeField()));
+
+			if (StringUtils.hasText(source.getMetaField())) {
+				target = target.metaField(mappedNameOrDefault(source.getMetaField()));
+			}
+			return target.granularity(source.getGranularity()).expireAfter(source.getExpireAfter());
+		}
+
+		@Override
+		public String getIdKeyName() {
+			return entity.getIdProperty() != null ? entity.getIdProperty().getName() : ID_FIELD;
+		}
+
+		private String mappedNameOrDefault(String name) {
+			MongoPersistentProperty persistentProperty = entity.getPersistentProperty(name);
+			return persistentProperty != null ? persistentProperty.getFieldName() : name;
+		}
+
+		/**
+		 * Get the {@link ValueEvaluationContext} for a given {@link PersistentEntity entity} the default one.
+		 *
+		 * @param persistentEntity can be {@literal null}
+		 * @return the context to use.
+		 */
+		private ValueEvaluationContext getEvaluationContextForEntity(@Nullable PersistentEntity<?, ?> persistentEntity) {
+
+			if (persistentEntity instanceof BasicMongoPersistentEntity<?> mongoEntity) {
+				return mongoEntity.getValueEvaluationContext(null);
+			}
+
+			return ValueEvaluationContext.of(this.environment != null ? this.environment : new StandardEnvironment(),
+					SimpleEvaluationContext.forReadOnlyDataBinding().build());
+		}
+
+		/**
+		 * Compute the index timeout value by evaluating a potential
+		 * {@link org.springframework.expression.spel.standard.SpelExpression} and parsing the final value.
+		 *
+		 * @param timeoutValue must not be {@literal null}.
+		 * @param evaluationContext must not be {@literal null}.
+		 * @return never {@literal null}
+		 * @throws IllegalArgumentException for invalid duration values.
+		 */
+		private static Duration computeIndexTimeout(String timeoutValue, ValueEvaluationContext evaluationContext) {
+			return DurationUtil.evaluate(timeoutValue, evaluationContext);
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityResultConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityResultConverter.java
new file mode 100644
index 0000000000..c04ae9d603
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/EntityResultConverter.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.bson.Document;
+
+enum EntityResultConverter implements QueryResultConverter<Object, Object> {
+
+	INSTANCE;
+
+	@Override
+	public Object mapDocument(Document document, ConversionResultSupplier<Object> reader) {
+		return reader.get();
+	}
+
+	@Override
+	public <V> QueryResultConverter<Object, V> andThen(QueryResultConverter<? super Object, ? extends V> after) {
+		return (QueryResultConverter) after;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperation.java
index 64bf134feb..57813a75ba 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperation.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package org.springframework.data.mongodb.core;
 
+import java.util.stream.Stream;
+
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
-import org.springframework.data.util.CloseableIterator;
+import org.springframework.lang.Contract;
 
 /**
  * {@link ExecutableAggregationOperation} allows creation and execution of MongoDB aggregation operations in a fluent
@@ -44,7 +46,7 @@ public interface ExecutableAggregationOperation {
 	/**
 	 * Start creating an aggregation operation that returns results mapped to the given domain type. <br />
 	 * Use {@link org.springframework.data.mongodb.core.aggregation.TypedAggregation} to specify a potentially different
-	 * input type for he aggregation.
+	 * input type for the aggregation.
 	 *
 	 * @param domainType must not be {@literal null}.
 	 * @return new instance of {@link ExecutableAggregation}.
@@ -75,10 +77,23 @@ interface AggregationWithCollection<T> {
 	 * Trigger execution by calling one of the terminating methods.
 	 *
 	 * @author Christoph Strobl
+	 * @author Mark Paluch
 	 * @since 2.0
 	 */
 	interface TerminatingAggregation<T> {
 
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingAggregation}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingAggregation<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 		/**
 		 * Apply pipeline operations as specified and get all matching elements.
 		 *
@@ -88,12 +103,12 @@ interface TerminatingAggregation<T> {
 
 		/**
 		 * Apply pipeline operations as specified and stream all matching elements. <br />
-		 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link com.mongodb.Cursor}
+		 * Returns a {@link Stream} that wraps the Mongo DB {@link com.mongodb.client.FindIterable}
 		 *
-		 * @return a {@link CloseableIterator} that wraps the a Mongo DB {@link com.mongodb.Cursor} that needs to be closed.
-		 *         Never {@literal null}.
+		 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+		 *         through a try-with-resources clause).
 		 */
-		CloseableIterator<T> stream();
+		Stream<T> stream();
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupport.java
index df0a24a20a..13dc8cd436 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupport.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
+import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -35,88 +31,91 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ExecutableAggregationOperationSupport implements ExecutableAggregationOperation {
 
-	private final @NonNull MongoTemplate template;
+	private final MongoTemplate template;
+
+	ExecutableAggregationOperationSupport(MongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableAggregation<T> aggregateAndReturn(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ExecutableAggregationSupport<>(template, domainType, null, null);
+		return new ExecutableAggregationSupport<>(template, domainType, QueryResultConverter.entity(), null, null);
 	}
 
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ExecutableAggregationSupport<T>
+	static class ExecutableAggregationSupport<S, T>
 			implements AggregationWithAggregation<T>, ExecutableAggregation<T>, TerminatingAggregation<T> {
 
-		@NonNull MongoTemplate template;
-		@NonNull Class<T> domainType;
-		@Nullable Aggregation aggregation;
-		@Nullable String collection;
+		private final MongoTemplate template;
+		private final Class<S> domainType;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+		private final @Nullable Aggregation aggregation;
+		private final @Nullable String collection;
+
+		public ExecutableAggregationSupport(MongoTemplate template, Class<S> domainType,
+				QueryResultConverter<? super S, ? extends T> resultConverter, @Nullable Aggregation aggregation,
+				@Nullable String collection) {
+			this.template = template;
+			this.domainType = domainType;
+			this.resultConverter = resultConverter;
+			this.aggregation = aggregation;
+			this.collection = collection;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.AggregationWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
 		public AggregationWithAggregation<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty!");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
-			return new ExecutableAggregationSupport<>(template, domainType, aggregation, collection);
+			return new ExecutableAggregationSupport<>(template, domainType, resultConverter, aggregation, collection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.AggregationWithAggregation#by(org.springframework.data.mongodb.core.aggregation.Aggregation)
-		 */
 		@Override
 		public TerminatingAggregation<T> by(Aggregation aggregation) {
 
-			Assert.notNull(aggregation, "Aggregation must not be null!");
+			Assert.notNull(aggregation, "Aggregation must not be null");
+
+			return new ExecutableAggregationSupport<>(template, domainType, resultConverter, aggregation, collection);
+		}
+
+		@Override
+		public <R> TerminatingAggregation<R> map(QueryResultConverter<? super T, ? extends R> converter) {
+
+			Assert.notNull(converter, "QueryResultConverter must not be null");
 
-			return new ExecutableAggregationSupport<>(template, domainType, aggregation, collection);
+			return new ExecutableAggregationSupport<>(template, domainType, this.resultConverter.andThen(converter),
+					aggregation, collection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#all()
-		 */
 		@Override
 		public AggregationResults<T> all() {
-			return template.aggregate(aggregation, getCollectionName(aggregation), domainType);
+
+			Assert.notNull(aggregation, "Aggregation must be set first");
+			return template.doAggregate(aggregation, getCollectionName(aggregation), domainType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation#stream()
-		 */
 		@Override
-		public CloseableIterator<T> stream() {
-			return template.aggregateStream(aggregation, getCollectionName(aggregation), domainType);
+		public Stream<T> stream() {
+
+			Assert.notNull(aggregation, "Aggregation must be set first");
+			return template.doAggregateStream(aggregation, getCollectionName(aggregation), domainType, resultConverter, null);
 		}
 
-		private String getCollectionName(Aggregation aggregation) {
+		private String getCollectionName(@Nullable Aggregation aggregation) {
 
 			if (StringUtils.hasText(collection)) {
 				return collection;
 			}
 
-			if (aggregation instanceof TypedAggregation) {
-
-				TypedAggregation<?> typedAggregation = (TypedAggregation<?>) aggregation;
+			if (aggregation instanceof TypedAggregation<?> typedAggregation) {
 
 				if (typedAggregation.getInputType() != null) {
 					return template.getCollectionName(typedAggregation.getInputType());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperation.java
index 26454e7e2e..43c0d521c3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperation.java
+++ b/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-2025 the original author 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,11 +19,16 @@
 import java.util.Optional;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.GeoResults;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 
 import com.mongodb.client.MongoCollection;
 
@@ -43,7 +48,7 @@
  *         query(Human.class)
  *             .inCollection("star-wars")
  *             .as(Jedi.class)
- *             .matching(query(where("firstname").is("luke")))
+ *             .matching(where("firstname").is("luke"))
  *             .all();
  *     </code>
  * </pre>
@@ -67,9 +72,33 @@ public interface ExecutableFindOperation {
 	 * Trigger find execution by calling one of the terminating methods.
 	 *
 	 * @author Christoph Strobl
+	 * @author Mark Paluch
 	 * @since 2.0
 	 */
-	interface TerminatingFind<T> {
+	interface TerminatingFind<T> extends TerminatingResults<T>, TerminatingProjection {
+
+	}
+
+	/**
+	 * Trigger find execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @author Mark Paluch
+	 * @since 5.0
+	 */
+	interface TerminatingResults<T> {
+
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingResults}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter);
 
 		/**
 		 * Get exactly zero or one result.
@@ -117,13 +146,44 @@ default Optional<T> first() {
 		/**
 		 * Stream all matching elements.
 		 *
-		 * @return a {@link Stream} that wraps the a Mongo DB {@link com.mongodb.Cursor} that needs to be closed. Never
-		 *         {@literal null}.
+		 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+		 *         through a try-with-resources clause).
 		 */
 		Stream<T> stream();
 
 		/**
-		 * Get the number of matching elements.
+		 * Return a window of elements either starting or resuming at
+		 * {@link org.springframework.data.domain.ScrollPosition}.
+		 * <p>
+		 * When using {@link KeysetScrollPosition}, make sure to use non-nullable
+		 * {@link org.springframework.data.domain.Sort sort properties} as MongoDB does not support criteria to reconstruct
+		 * a query result from absent document fields or {@literal null} values through {@code $gt/$lt} operators.
+		 *
+		 * @param scrollPosition the scroll position.
+		 * @return a window of the resulting elements.
+		 * @since 4.1
+		 * @see org.springframework.data.domain.OffsetScrollPosition
+		 * @see org.springframework.data.domain.KeysetScrollPosition
+		 */
+		Window<T> scroll(ScrollPosition scrollPosition);
+
+	}
+
+	/**
+	 * Trigger find execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 5.0
+	 */
+	interface TerminatingProjection {
+
+		/**
+		 * Get the number of matching elements. <br />
+		 * This method uses an
+		 * {@link com.mongodb.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+		 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but
+		 * guarantees shard, session and transaction compliance. In case an inaccurate count satisfies the applications
+		 * needs use {@link MongoOperations#estimatedCount(String)} for empty queries instead.
 		 *
 		 * @return total number of matching elements.
 		 */
@@ -135,16 +195,30 @@ default Optional<T> first() {
 		 * @return {@literal true} if at least one matching element exists.
 		 */
 		boolean exists();
+
 	}
 
 	/**
-	 * Trigger geonear execution by calling one of the terminating methods.
+	 * Trigger {@code geoNear} execution by calling one of the terminating methods.
 	 *
 	 * @author Christoph Strobl
+	 * @author Mark Paluch
 	 * @since 2.0
 	 */
 	interface TerminatingFindNear<T> {
 
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFindNear}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingFindNear<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 		/**
 		 * Find all matching elements and return them as {@link org.springframework.data.geo.GeoResult}.
 		 *
@@ -170,6 +244,18 @@ interface FindWithQuery<T> extends TerminatingFind<T> {
 		 */
 		TerminatingFind<T> matching(Query query);
 
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFind}.
+		 * @throws IllegalArgumentException if criteria is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingFind<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
+
 		/**
 		 * Set the filter query for the geoNear execution.
 		 *
@@ -291,9 +377,21 @@ interface DistinctWithQuery<T> extends DistinctWithProjection {
 		 *
 		 * @param query must not be {@literal null}.
 		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if resultType is {@literal null}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		TerminatingDistinct<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingDistinct}.
+		 * @throws IllegalArgumentException if criteria is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingDistinct<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java
index 06fce43e51..46289ecfa4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupport.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,28 +15,24 @@
  */
 package org.springframework.data.mongodb.core;
 
-import com.mongodb.ReadPreference;
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
 import java.util.List;
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Window;
+import org.springframework.data.geo.GeoResults;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.data.util.StreamUtils;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.ReadPreference;
 import com.mongodb.client.FindIterable;
 
 /**
@@ -46,23 +42,24 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ExecutableFindOperationSupport implements ExecutableFindOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull MongoTemplate template;
+	private final MongoTemplate template;
+
+	ExecutableFindOperationSupport(MongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableFindOperation#query(java.lang.Class)
-	 */
 	@Override
+	@Contract("_ -> new")
 	public <T> ExecutableFind<T> query(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ExecutableFindSupport<>(template, domainType, domainType, null, ALL_QUERY);
+		return new ExecutableFindSupport<>(template, domainType, domainType, QueryResultConverter.entity(), null,
+				ALL_QUERY);
 	}
 
 	/**
@@ -70,59 +67,66 @@ public <T> ExecutableFind<T> query(Class<T> domainType) {
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ExecutableFindSupport<T>
+	static class ExecutableFindSupport<S, T>
 			implements ExecutableFind<T>, FindWithCollection<T>, FindWithProjection<T>, FindWithQuery<T> {
 
-		@NonNull MongoTemplate template;
-		@NonNull Class<?> domainType;
-		Class<T> returnType;
-		@Nullable String collection;
-		Query query;
+		private final MongoTemplate template;
+		private final Class<?> domainType;
+		private final Class<S> returnType;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+		private final @Nullable String collection;
+		private final Query query;
+
+		ExecutableFindSupport(MongoTemplate template, Class<?> domainType, Class<S> returnType,
+				QueryResultConverter<? super S, ? extends T> resultConverter, @Nullable String collection,
+				Query query) {
+			this.template = template;
+			this.domainType = domainType;
+			this.resultConverter = resultConverter;
+			this.returnType = returnType;
+			this.collection = collection;
+			this.query = query;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public FindWithProjection<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection name must not be null nor empty!");
+			Assert.hasText(collection, "Collection name must not be null nor empty");
 
-			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
+			return new ExecutableFindSupport<>(template, domainType, returnType, resultConverter, collection, query);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithProjection#as(Class)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public <T1> FindWithQuery<T1> as(Class<T1> returnType) {
 
-			Assert.notNull(returnType, "ReturnType must not be null!");
+			Assert.notNull(returnType, "ReturnType must not be null");
 
-			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
+			return new ExecutableFindSupport<>(template, domainType, returnType, QueryResultConverter.entity(), collection,
+					query);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TerminatingFind<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
-			return new ExecutableFindSupport<>(template, domainType, returnType, collection, query);
+			return new ExecutableFindSupport<>(template, domainType, returnType, resultConverter, collection, query);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#oneValue()
-		 */
 		@Override
-		public T oneValue() {
+		public <R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter) {
+
+			Assert.notNull(converter, "QueryResultConverter must not be null");
+
+			return new ExecutableFindSupport<>(template, domainType, returnType, this.resultConverter.andThen(converter),
+					collection, query);
+		}
+
+		@Override
+		public @Nullable T oneValue() {
 
 			List<T> result = doFind(new DelegatingQueryCursorPreparer(getCursorPreparer(query, null)).limit(2));
 
@@ -131,78 +135,56 @@ public T oneValue() {
 			}
 
 			if (result.size() > 1) {
-				throw new IncorrectResultSizeDataAccessException("Query " + asString() + " returned non unique result.", 1);
+				throw new IncorrectResultSizeDataAccessException("Query " + asString() + " returned non unique result", 1);
 			}
 
 			return result.iterator().next();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#firstValue()
-		 */
 		@Override
-		public T firstValue() {
+		public @Nullable T firstValue() {
 
 			List<T> result = doFind(new DelegatingQueryCursorPreparer(getCursorPreparer(query, null)).limit(1));
 
 			return ObjectUtils.isEmpty(result) ? null : result.iterator().next();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#all()
-		 */
 		@Override
 		public List<T> all() {
 			return doFind(null);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#stream()
-		 */
 		@Override
 		public Stream<T> stream() {
-			return StreamUtils.createStreamFromIterator(doStream());
+			return doStream();
+		}
+
+		@Override
+		public Window<T> scroll(ScrollPosition scrollPosition) {
+			return template.doScroll(query.with(scrollPosition), domainType, returnType, resultConverter,
+					getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery#near(org.springframework.data.mongodb.core.query.NearQuery)
-		 */
 		@Override
 		public TerminatingFindNear<T> near(NearQuery nearQuery) {
-			return () -> template.geoNear(nearQuery, domainType, getCollectionName(), returnType);
+			return new TerminatingFindNearSupport<>(nearQuery, this.resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#count()
-		 */
 		@Override
 		public long count() {
 			return template.count(query, domainType, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind#exists()
-		 */
 		@Override
 		public boolean exists() {
 			return template.exists(query, domainType, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.FindDistinct#distinct(java.lang.String)
-		 */
 		@SuppressWarnings("unchecked")
 		@Override
 		public TerminatingDistinct<Object> distinct(String field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 
 			return new DistinctOperationSupport(this, field);
 		}
@@ -212,18 +194,18 @@ private List<T> doFind(@Nullable CursorPreparer preparer) {
 			Document queryObject = query.getQueryObject();
 			Document fieldsObject = query.getFieldsObject();
 
-			return template.doFind(getCollectionName(), queryObject, fieldsObject, domainType, returnType,
-					getCursorPreparer(query, preparer));
+			return template.doFind(template.createDelegate(query), getCollectionName(), queryObject, fieldsObject, domainType,
+					returnType, resultConverter, getCursorPreparer(query, preparer));
 		}
 
 		private List<T> doFindDistinct(String field) {
 
 			return template.findDistinct(query, field, getCollectionName(), domainType,
-					returnType == domainType ? (Class<T>) Object.class : returnType);
+					returnType == domainType ? (Class) Object.class : returnType);
 		}
 
-		private CloseableIterator<T> doStream() {
-			return template.doStream(query, domainType, getCollectionName(), returnType);
+		private Stream<T> doStream() {
+			return template.doStream(query, domainType, getCollectionName(), returnType, resultConverter);
 		}
 
 		private CursorPreparer getCursorPreparer(Query query, @Nullable CursorPreparer preparer) {
@@ -237,6 +219,31 @@ private String getCollectionName() {
 		private String asString() {
 			return SerializationUtils.serializeToJsonSafely(query);
 		}
+
+		class TerminatingFindNearSupport<G> implements TerminatingFindNear<G> {
+
+			private final NearQuery nearQuery;
+			private final QueryResultConverter<? super S, ? extends G> resultConverter;
+
+			public TerminatingFindNearSupport(NearQuery nearQuery,
+					QueryResultConverter<? super S, ? extends G> resultConverter) {
+				this.nearQuery = nearQuery;
+				this.resultConverter = resultConverter;
+			}
+
+			@Override
+			public <R> TerminatingFindNear<R> map(QueryResultConverter<? super G, ? extends R> converter) {
+
+				Assert.notNull(converter, "QueryResultConverter must not be null");
+
+				return new TerminatingFindNearSupport<>(nearQuery, this.resultConverter.andThen(converter));
+			}
+
+			@Override
+			public GeoResults<G> all() {
+				return template.doGeoNear(nearQuery, domainType, getCollectionName(), returnType, resultConverter);
+			}
+		}
 	}
 
 	/**
@@ -246,32 +253,32 @@ private String asString() {
 	static class DelegatingQueryCursorPreparer implements CursorPreparer {
 
 		private final @Nullable CursorPreparer delegate;
-		private Optional<Integer> limit = Optional.empty();
+		private int limit = -1;
 
 		DelegatingQueryCursorPreparer(@Nullable CursorPreparer delegate) {
 			this.delegate = delegate;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.clientFindIterable)
-		 */
 		@Override
-		public FindIterable<Document> prepare(FindIterable<Document> cursor) {
+		public FindIterable<Document> prepare(FindIterable<Document> iterable) {
 
-			FindIterable<Document> target = delegate != null ? delegate.prepare(cursor) : cursor;
-			return limit.map(target::limit).orElse(target);
+			FindIterable<Document> target = delegate != null ? delegate.prepare(iterable) : iterable;
+			if (limit >= 0) {
+				target.limit(limit);
+			}
+			return target;
 		}
 
+		@Contract("_ -> this")
 		CursorPreparer limit(int limit) {
 
-			this.limit = Optional.of(limit);
+			this.limit = limit;
 			return this;
 		}
 
 		@Override
-		public ReadPreference getReadPreference() {
-			return delegate.getReadPreference();
+		public @Nullable ReadPreference getReadPreference() {
+			return delegate != null ? delegate.getReadPreference() : null;
 		}
 	}
 
@@ -279,49 +286,40 @@ public ReadPreference getReadPreference() {
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	static class DistinctOperationSupport<T> implements TerminatingDistinct<T> {
+	static class DistinctOperationSupport<S, T> implements TerminatingDistinct<T> {
 
 		private final String field;
-		private final ExecutableFindSupport<T> delegate;
+		private final ExecutableFindSupport<S, T> delegate;
 
-		public DistinctOperationSupport(ExecutableFindSupport<T> delegate, String field) {
+		public DistinctOperationSupport(ExecutableFindSupport<S, T> delegate, String field) {
 
 			this.delegate = delegate;
 			this.field = field;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.DistinctWithProjection#as(java.lang.Class)
-		 */
 		@Override
-		@SuppressWarnings("unchecked")
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		@Contract("_ -> new")
 		public <R> TerminatingDistinct<R> as(Class<R> resultType) {
 
-			Assert.notNull(resultType, "ResultType must not be null!");
+			Assert.notNull(resultType, "ResultType must not be null");
 
 			return new DistinctOperationSupport<>((ExecutableFindSupport) delegate.as(resultType), field);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.DistinctWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TerminatingDistinct<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
-			return new DistinctOperationSupport<>((ExecutableFindSupport<T>) delegate.matching(query), field);
+			return new DistinctOperationSupport<>((ExecutableFindSupport<S, T>) delegate.matching(query), field);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingDistinct#all()
-		 */
 		@Override
 		public List<T> all() {
 			return delegate.doFindDistinct(field);
 		}
+
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperation.java
index c158be949b..c2b08c7e59 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperation.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupport.java
index 5ec1b78cfe..599a910035 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupport.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
 import java.util.ArrayList;
 import java.util.Collection;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -37,19 +33,19 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ExecutableInsertOperationSupport implements ExecutableInsertOperation {
 
-	private final @NonNull MongoTemplate template;
+	private final MongoTemplate template;
+
+	ExecutableInsertOperationSupport(MongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.coreExecutableInsertOperation#insert(java.lan.Class)
-	 */
 	@Override
+	@Contract("_ -> new")
 	public <T> ExecutableInsert<T> insert(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
 		return new ExecutableInsertSupport<>(template, domainType, null, null);
 	}
@@ -58,72 +54,61 @@ public <T> ExecutableInsert<T> insert(Class<T> domainType) {
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 	static class ExecutableInsertSupport<T> implements ExecutableInsert<T> {
 
-		@NonNull MongoTemplate template;
-		@NonNull Class<T> domainType;
-		@Nullable String collection;
-		@Nullable BulkMode bulkMode;
+		private final MongoTemplate template;
+		private final Class<T> domainType;
+		private final @Nullable String collection;
+		private final @Nullable BulkMode bulkMode;
+
+		ExecutableInsertSupport(MongoTemplate template, Class<T> domainType, @Nullable String collection,
+				@Nullable BulkMode bulkMode) {
+
+			this.template = template;
+			this.domainType = domainType;
+			this.collection = collection;
+			this.bulkMode = bulkMode;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#insert(java.lang.Class)
-		 */
 		@Override
 		public T one(T object) {
 
-			Assert.notNull(object, "Object must not be null!");
+			Assert.notNull(object, "Object must not be null");
 
 			return template.insert(object, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingInsert#all(java.util.Collection)
-		 */
 		@Override
 		public Collection<T> all(Collection<? extends T> objects) {
 
-			Assert.notNull(objects, "Objects must not be null!");
+			Assert.notNull(objects, "Objects must not be null");
 
 			return template.insert(objects, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.TerminatingBulkInsert#bulk(java.util.Collection)
-		 */
 		@Override
 		public BulkWriteResult bulk(Collection<? extends T> objects) {
 
-			Assert.notNull(objects, "Objects must not be null!");
+			Assert.notNull(objects, "Objects must not be null");
 
 			return template.bulkOps(bulkMode != null ? bulkMode : BulkMode.ORDERED, domainType, getCollectionName())
 					.insert(new ArrayList<>(objects)).execute();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.InsertWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public InsertWithBulkMode<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty.");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
 			return new ExecutableInsertSupport<>(template, domainType, collection, bulkMode);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation.InsertWithBulkMode#withBulkMode(org.springframework.data.mongodb.core.BulkMode)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TerminatingBulkInsert<T> withBulkMode(BulkMode bulkMode) {
 
-			Assert.notNull(bulkMode, "BulkMode must not be null!");
+			Assert.notNull(bulkMode, "BulkMode must not be null");
 
 			return new ExecutableInsertSupport<>(template, domainType, collection, bulkMode);
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperation.java
index dca70ef331..2d13ad3ea0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperation.java
+++ b/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-2025 the original author 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,6 +19,7 @@
 
 import org.springframework.data.mongodb.core.ExecutableFindOperation.ExecutableFind;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.Query;
 
 /**
@@ -30,7 +31,7 @@
  * The collection to operate on is by default derived from the initial {@literal domainType} and can be defined there
  * via {@link org.springframework.data.mongodb.core.mapping.Document}. Using {@code inCollection} allows to override the
  * collection name for the execution.
- * 
+ *
  * <pre>
  *     <code>
  *         mapReduce(Human.class)
@@ -44,6 +45,7 @@
  * </pre>
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 2.1
  */
 public interface ExecutableMapReduceOperation {
@@ -146,6 +148,18 @@ interface MapReduceWithQuery<T> extends TerminatingMapReduce<T> {
 		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		TerminatingMapReduce<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingMapReduce}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingMapReduce<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	/**
@@ -173,7 +187,9 @@ interface MapReduceWithProjection<T> extends MapReduceWithQuery<T> {
 	 *
 	 * @author Christoph Strobl
 	 * @since 2.1
+	 * @deprecated since 4.0 in favor of {@link org.springframework.data.mongodb.core.aggregation}.
 	 */
+	@Deprecated
 	interface MapReduceWithOptions<T> {
 
 		/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperationSupport.java
index 07cb70fbbc..55864cbd8e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperationSupport.java
+++ b/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-2025 the original author 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,12 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -32,21 +30,27 @@
  * @author Christoph Strobl
  * @since 2.1
  */
-@RequiredArgsConstructor
 class ExecutableMapReduceOperationSupport implements ExecutableMapReduceOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull MongoTemplate template;
+	private final MongoTemplate template;
+
+	ExecutableMapReduceOperationSupport(MongoTemplate template) {
+
+		Assert.notNull(template, "Template must not be null");
+		this.template = template;
+	}
 
 	/*
 	 * (non-Javascript)
 	 * @see in org.springframework.data.mongodb.core.ExecutableMapReduceOperation#mapReduce(java.lang.Class)
 	 */
 	@Override
+	@Contract("_ -> new")
 	public <T> ExecutableMapReduceSupport<T> mapReduce(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
 		return new ExecutableMapReduceSupport<>(template, domainType, domainType, null, ALL_QUERY, null, null, null);
 	}
@@ -87,6 +91,7 @@ static class ExecutableMapReduceSupport<T>
 		 * @see in org.springframework.data.mongodb.core.ExecutableMapReduceOperation.TerminatingMapReduce#all()
 		 */
 		@Override
+		@SuppressWarnings("NullAway")
 		public List<T> all() {
 			return template.mapReduce(query, domainType, getCollectionName(), mapFunction, reduceFunction, options,
 					returnType);
@@ -99,7 +104,7 @@ public List<T> all() {
 		@Override
 		public MapReduceWithProjection<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection name must not be null nor empty!");
+			Assert.hasText(collection, "Collection name must not be null nor empty");
 
 			return new ExecutableMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -112,7 +117,7 @@ public MapReduceWithProjection<T> inCollection(String collection) {
 		@Override
 		public TerminatingMapReduce<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
 			return new ExecutableMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -125,7 +130,7 @@ public TerminatingMapReduce<T> matching(Query query) {
 		@Override
 		public <R> MapReduceWithQuery<R> as(Class<R> resultType) {
 
-			Assert.notNull(resultType, "ResultType must not be null!");
+			Assert.notNull(resultType, "ResultType must not be null");
 
 			return new ExecutableMapReduceSupport<>(template, domainType, resultType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -138,7 +143,7 @@ public <R> MapReduceWithQuery<R> as(Class<R> resultType) {
 		@Override
 		public ExecutableMapReduce<T> with(MapReduceOptions options) {
 
-			Assert.notNull(options, "Options must not be null! Please consider empty MapReduceOptions#options() instead.");
+			Assert.notNull(options, "Options must not be null Please consider empty MapReduceOptions#options() instead");
 
 			return new ExecutableMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -151,7 +156,7 @@ public ExecutableMapReduce<T> with(MapReduceOptions options) {
 		@Override
 		public MapReduceWithReduceFunction<T> map(String mapFunction) {
 
-			Assert.hasText(mapFunction, "MapFunction name must not be null nor empty!");
+			Assert.hasText(mapFunction, "MapFunction name must not be null nor empty");
 
 			return new ExecutableMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -164,7 +169,7 @@ public MapReduceWithReduceFunction<T> map(String mapFunction) {
 		@Override
 		public ExecutableMapReduce<T> reduce(String reduceFunction) {
 
-			Assert.hasText(reduceFunction, "ReduceFunction name must not be null nor empty!");
+			Assert.hasText(reduceFunction, "ReduceFunction name must not be null nor empty");
 
 			return new ExecutableMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperation.java
index 6688ff23ec..c29a448f1c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperation.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,9 @@
 
 import java.util.List;
 
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.lang.Contract;
 
 import com.mongodb.client.result.DeleteResult;
 
@@ -53,11 +55,40 @@ public interface ExecutableRemoveOperation {
 	 */
 	<T> ExecutableRemove<T> remove(Class<T> domainType);
 
+	/**
+	 * @author Christoph Strobl
+	 * @since 5.0
+	 */
+	interface TerminatingResults<T> {
+
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link ExecutableFindOperation.TerminatingResults}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
+		/**
+		 * Remove and return all matching documents. <br/>
+		 * <strong>NOTE:</strong> The entire list of documents will be fetched before sending the actual delete commands.
+		 * Also, {@link org.springframework.context.ApplicationEvent}s will be published for each and every delete
+		 * operation.
+		 *
+		 * @return empty {@link List} if no match found. Never {@literal null}.
+		 */
+		List<T> findAndRemove();
+	}
+
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	interface TerminatingRemove<T> {
+	interface TerminatingRemove<T> extends TerminatingResults<T> {
 
 		/**
 		 * Remove all documents matching.
@@ -72,16 +103,6 @@ interface TerminatingRemove<T> {
 		 * @return the {@link DeleteResult}. Never {@literal null}.
 		 */
 		DeleteResult one();
-
-		/**
-		 * Remove and return all matching documents. <br/>
-		 * <strong>NOTE</strong> The entire list of documents will be fetched before sending the actual delete commands.
-		 * Also, {@link org.springframework.context.ApplicationEvent}s will be published for each and every delete
-		 * operation.
-		 *
-		 * @return empty {@link List} if no match found. Never {@literal null}.
-		 */
-		List<T> findAndRemove();
 	}
 
 	/**
@@ -104,7 +125,6 @@ interface RemoveWithCollection<T> extends RemoveWithQuery<T> {
 		RemoveWithQuery<T> inCollection(String collection);
 	}
 
-
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.0
@@ -119,6 +139,18 @@ interface RemoveWithQuery<T> extends TerminatingRemove<T> {
 		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		TerminatingRemove<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingRemove}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingRemove<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupport.java
index 370fb5bc7c..7817a7c8af 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupport.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,11 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -36,90 +32,86 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ExecutableRemoveOperationSupport implements ExecutableRemoveOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull MongoTemplate tempate;
+	private final MongoTemplate tempate;
+
+	public ExecutableRemoveOperationSupport(MongoTemplate tempate) {
+		this.tempate = tempate;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation#remove(java.lang.Class)
-	 */
 	@Override
+	@Contract("_ -> new")
 	public <T> ExecutableRemove<T> remove(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ExecutableRemoveSupport<>(tempate, domainType, ALL_QUERY, null);
+		return new ExecutableRemoveSupport<>(tempate, domainType, ALL_QUERY, null, QueryResultConverter.entity());
 	}
 
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ExecutableRemoveSupport<T> implements ExecutableRemove<T>, RemoveWithCollection<T> {
-
-		@NonNull MongoTemplate template;
-		@NonNull Class<T> domainType;
-		Query query;
-		@Nullable String collection;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.RemoveWithCollection#inCollection(java.lang.String)
-		 */
+	static class ExecutableRemoveSupport<S, T> implements ExecutableRemove<T>, RemoveWithCollection<T> {
+
+		private final MongoTemplate template;
+		private final Class<S> domainType;
+		private final Query query;
+		@Nullable private final String collection;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+
+		public ExecutableRemoveSupport(MongoTemplate template, Class<S> domainType, Query query,
+				@Nullable String collection, QueryResultConverter<? super S, ? extends T> resultConverter) {
+			this.template = template;
+			this.domainType = domainType;
+			this.query = query;
+			this.collection = collection;
+			this.resultConverter = resultConverter;
+		}
+
 		@Override
+		@Contract("_ -> new")
 		public RemoveWithQuery<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty!");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
-			return new ExecutableRemoveSupport<>(template, domainType, query, collection);
+			return new ExecutableRemoveSupport<>(template, domainType, query, collection, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.RemoveWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TerminatingRemove<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
-			return new ExecutableRemoveSupport<>(template, domainType, query, collection);
+			return new ExecutableRemoveSupport<>(template, domainType, query, collection, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#all()
-		 */
 		@Override
 		public DeleteResult all() {
 			return template.doRemove(getCollectionName(), query, domainType, true);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#one()
-		 */
 		@Override
 		public DeleteResult one() {
 			return template.doRemove(getCollectionName(), query, domainType, false);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove#findAndRemove()
-		 */
 		@Override
 		public List<T> findAndRemove() {
 
 			String collectionName = getCollectionName();
 
-			return template.doFindAndDelete(collectionName, query, domainType);
+			return template.doFindAndDelete(collectionName, query, domainType, resultConverter);
+		}
+
+		@Override
+		@SuppressWarnings({"unchecked", "rawtypes"})
+		public <R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter) {
+			return new ExecutableRemoveSupport<>(template, (Class) domainType, query, collection, converter);
 		}
 
 		private String getCollectionName() {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperation.java
index efd8d0568f..e671b7b7ce 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperation.java
+++ b/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-2025 the original author 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,11 +17,14 @@
 
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 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.lang.Contract;
 
 import com.mongodb.client.result.UpdateResult;
 
@@ -68,6 +71,18 @@ public interface ExecutableUpdateOperation {
 	 */
 	interface TerminatingFindAndModify<T> {
 
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFindAndModify}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingFindAndModify<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 		/**
 		 * Find, modify and return the first matching document.
 		 *
@@ -86,15 +101,32 @@ default Optional<T> findAndModify() {
 		T findAndModifyValue();
 	}
 
+	/**
+	 * Trigger <a href="https://docs.mongodb.com/manual/reference/method/db.collection.replaceOne/">replaceOne</a>
+	 * execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.2
+	 */
+	interface TerminatingReplace {
+
+		/**
+		 * Find first and replace/upsert.
+		 *
+		 * @return never {@literal null}.
+		 */
+		UpdateResult replaceFirst();
+	}
+
 	/**
 	 * Trigger
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * execution by calling one of the terminating methods.
 	 *
 	 * @author Mark Paluch
 	 * @since 2.1
 	 */
-	interface TerminatingFindAndReplace<T> {
+	interface TerminatingFindAndReplace<T> extends TerminatingReplace {
 
 		/**
 		 * Find, replace and return the first matching document.
@@ -112,6 +144,19 @@ default Optional<T> findAndReplace() {
 		 */
 		@Nullable
 		T findAndReplaceValue();
+
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFindAndModify}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingFindAndReplace<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 	}
 
 	/**
@@ -158,7 +203,7 @@ interface UpdateWithUpdate<T> {
 		 * @param update must not be {@literal null}.
 		 * @return new instance of {@link TerminatingUpdate}.
 		 * @throws IllegalArgumentException if update is {@literal null}.
-		 * @since 2.3
+		 * @since 3.0
 		 * @see Update
 		 * @see AggregationUpdate
 		 */
@@ -210,6 +255,18 @@ interface UpdateWithQuery<T> extends UpdateWithUpdate<T> {
 		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		UpdateWithUpdate<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link UpdateWithUpdate}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 * @since 3.0
+		 */
+		default UpdateWithUpdate<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	/**
@@ -230,6 +287,22 @@ interface FindAndModifyWithOptions<T> {
 		TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options);
 	}
 
+	/**
+	 * @author Christoph Strobl
+	 * @since 4.2
+	 */
+	interface ReplaceWithOptions extends TerminatingReplace {
+
+		/**
+		 * Explicitly define {@link ReplaceOptions}.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return new instance of {@link FindAndReplaceOptions}.
+		 * @throws IllegalArgumentException if options is {@literal null}.
+		 */
+		TerminatingReplace withOptions(ReplaceOptions options);
+	}
+
 	/**
 	 * Define {@link FindAndReplaceOptions}.
 	 *
@@ -237,7 +310,7 @@ interface FindAndModifyWithOptions<T> {
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	interface FindAndReplaceWithOptions<T> extends TerminatingFindAndReplace<T> {
+	interface FindAndReplaceWithOptions<T> extends TerminatingFindAndReplace<T>, ReplaceWithOptions {
 
 		/**
 		 * Explicitly define {@link FindAndReplaceOptions} for the {@link Update}.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupport.java
index 09bac18ba3..dc9ce5cacc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupport.java
+++ b/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-2025 the original author 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,10 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -35,187 +31,197 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ExecutableUpdateOperationSupport implements ExecutableUpdateOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull MongoTemplate template;
+	private final MongoTemplate template;
+
+	ExecutableUpdateOperationSupport(MongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation#update(java.lang.Class)
-	 */
 	@Override
+	@Contract("_ -> new")
 	public <T> ExecutableUpdate<T> update(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ExecutableUpdateSupport<>(template, domainType, ALL_QUERY, null, null, null, null, null, domainType);
+		return new ExecutableUpdateSupport<>(template, domainType, ALL_QUERY, null, null, null, null, null, domainType, QueryResultConverter.entity());
 	}
 
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ExecutableUpdateSupport<T>
+	@SuppressWarnings("rawtypes")
+	static class ExecutableUpdateSupport<S, T>
 			implements ExecutableUpdate<T>, UpdateWithCollection<T>, UpdateWithQuery<T>, TerminatingUpdate<T>,
 			FindAndReplaceWithOptions<T>, TerminatingFindAndReplace<T>, FindAndReplaceWithProjection<T> {
 
-		@NonNull MongoTemplate template;
-		@NonNull Class domainType;
-		Query query;
-		@Nullable UpdateDefinition update;
-		@Nullable String collection;
-		@Nullable FindAndModifyOptions findAndModifyOptions;
-		@Nullable FindAndReplaceOptions findAndReplaceOptions;
-		@Nullable Object replacement;
-		@NonNull Class<T> targetType;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.mongodb.core.query.UpdateDefinition)
-		 */
+		private final MongoTemplate template;
+		private final Class<?> domainType;
+		private final Query query;
+		@Nullable private final UpdateDefinition update;
+		@Nullable private final String collection;
+		@Nullable private final FindAndModifyOptions findAndModifyOptions;
+		@Nullable private final FindAndReplaceOptions findAndReplaceOptions;
+		@Nullable private final Object replacement;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+		private final Class<S> targetType;
+
+		ExecutableUpdateSupport(MongoTemplate template, Class<?> domainType, Query query, @Nullable UpdateDefinition update,
+				@Nullable String collection, @Nullable FindAndModifyOptions findAndModifyOptions,
+				@Nullable FindAndReplaceOptions findAndReplaceOptions, @Nullable Object replacement, Class<S> targetType,
+			QueryResultConverter<? super S, ? extends T> resultConverter) {
+
+			this.template = template;
+			this.domainType = domainType;
+			this.query = query;
+			this.update = update;
+			this.collection = collection;
+			this.findAndModifyOptions = findAndModifyOptions;
+			this.findAndReplaceOptions = findAndReplaceOptions;
+			this.replacement = replacement;
+			this.targetType = targetType;
+			this.resultConverter = resultConverter;
+		}
+
 		@Override
+		@Contract("_ -> new")
 		public TerminatingUpdate<T> apply(UpdateDefinition update) {
 
-			Assert.notNull(update, "Update must not be null!");
+			Assert.notNull(update, "Update must not be null");
 
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public UpdateWithQuery<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty!");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.FindAndModifyWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndModifyOptions)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options) {
 
-			Assert.notNull(options, "Options must not be null!");
+			Assert.notNull(options, "Options must not be null");
 
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, options,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate#replaceWith(Object)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public FindAndReplaceWithProjection<T> replaceWith(T replacement) {
 
-			Assert.notNull(replacement, "Replacement must not be null!");
+			Assert.notNull(replacement, "Replacement must not be null");
 
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.FindAndReplaceWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndReplaceOptions)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public FindAndReplaceWithProjection<T> withOptions(FindAndReplaceOptions options) {
 
-			Assert.notNull(options, "Options must not be null!");
+			Assert.notNull(options, "Options must not be null");
+
+			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
+					options, replacement, targetType, resultConverter);
+		}
+
+		@Override
+		@Contract("_ -> new")
+		public TerminatingReplace withOptions(ReplaceOptions options) {
 
+			FindAndReplaceOptions target = new FindAndReplaceOptions();
+			if (options.isUpsert()) {
+				target.upsert();
+			}
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					options, replacement, targetType);
+					target, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public UpdateWithUpdate<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithProjection#as(java.lang.Class)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public <R> FindAndReplaceWithOptions<R> as(Class<R> resultType) {
 
-			Assert.notNull(resultType, "ResultType must not be null!");
+			Assert.notNull(resultType, "ResultType must not be null");
 
 			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, resultType);
+					findAndReplaceOptions, replacement, resultType, QueryResultConverter.entity());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#all()
-		 */
 		@Override
 		public UpdateResult all() {
 			return doUpdate(true, false);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#first()
-		 */
 		@Override
 		public UpdateResult first() {
 			return doUpdate(false, false);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate#upsert()
-		 */
 		@Override
 		public UpdateResult upsert() {
 			return doUpdate(true, true);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingFindAndModify#findAndModifyValue()
-		 */
 		@Override
+		public <R> ExecutableUpdateSupport<S, R> map(QueryResultConverter<? super T, ? extends R> converter) {
+			return new ExecutableUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
+					findAndReplaceOptions, replacement, targetType, this.resultConverter.andThen(converter));
+		}
+
+		@Override
+		@SuppressWarnings("NullAway")
 		public @Nullable T findAndModifyValue() {
 
 			return template.findAndModify(query, update,
 					findAndModifyOptions != null ? findAndModifyOptions : new FindAndModifyOptions(), targetType,
-					getCollectionName());
+					getCollectionName(), resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingFindAndReplace#findAndReplaceValue()
-		 */
 		@Override
+		@SuppressWarnings({ "unchecked", "NullAway" })
 		public @Nullable T findAndReplaceValue() {
 
 			return (T) template.findAndReplace(query, replacement,
-					findAndReplaceOptions != null ? findAndReplaceOptions : FindAndReplaceOptions.empty(), domainType,
-					getCollectionName(), targetType);
+					findAndReplaceOptions != null ? findAndReplaceOptions : FindAndReplaceOptions.empty(), (Class) domainType,
+					getCollectionName(), targetType, (QueryResultConverter) resultConverter);
+		}
+
+		@Override
+		@SuppressWarnings({ "unchecked", "NullAway" })
+		public UpdateResult replaceFirst() {
+
+			if (replacement != null) {
+				return template.replace(query, domainType, replacement,
+						findAndReplaceOptions != null ? findAndReplaceOptions : ReplaceOptions.none(), getCollectionName());
+			}
+
+			return template.replace(query, domainType, update,
+					findAndReplaceOptions != null ? findAndReplaceOptions : ReplaceOptions.none(), getCollectionName());
 		}
 
+		@SuppressWarnings("NullAway")
 		private UpdateResult doUpdate(boolean multi, boolean upsert) {
 			return template.doUpdate(getCollectionName(), query, update, domainType, upsert, multi);
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindAndModifyOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindAndModifyOptions.java
index c9adf1f841..6e9b775324 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindAndModifyOptions.java
+++ b/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-2025 the original author 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,9 @@
 
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 
 /**
  * @author Mark Pollak
@@ -35,7 +36,7 @@ public class FindAndModifyOptions {
 
 	private static final FindAndModifyOptions NONE = new FindAndModifyOptions() {
 
-		private static final String ERROR_MSG = "FindAndModifyOptions.none() cannot be changed. Please use FindAndModifyOptions.options() instead.";
+		private static final String ERROR_MSG = "FindAndModifyOptions.none() cannot be changed; Please use FindAndModifyOptions.options() instead";
 
 		@Override
 		public FindAndModifyOptions returnNew(boolean returnNew) {
@@ -78,7 +79,7 @@ public static FindAndModifyOptions none() {
 	}
 
 	/**
-	 * Create new {@link FindAndModifyOptions} based on option of given {@litearl source}.
+	 * Create new {@link FindAndModifyOptions} based on option of given {@literal source}.
 	 *
 	 * @param source can be {@literal null}.
 	 * @return new instance of {@link FindAndModifyOptions}.
@@ -99,16 +100,19 @@ public static FindAndModifyOptions of(@Nullable FindAndModifyOptions source) {
 		return options;
 	}
 
+	@Contract("_ -> this")
 	public FindAndModifyOptions returnNew(boolean returnNew) {
 		this.returnNew = returnNew;
 		return this;
 	}
 
+	@Contract("_ -> this")
 	public FindAndModifyOptions upsert(boolean upsert) {
 		this.upsert = upsert;
 		return this;
 	}
 
+	@Contract("_ -> this")
 	public FindAndModifyOptions remove(boolean remove) {
 		this.remove = remove;
 		return this;
@@ -117,10 +121,11 @@ public FindAndModifyOptions remove(boolean remove) {
 	/**
 	 * Define the {@link Collation} specifying language-specific rules for string comparison.
 	 *
-	 * @param collation
-	 * @return
+	 * @param collation can be {@literal null}.
+	 * @return this.
 	 * @since 2.0
 	 */
+	@Contract("_ -> this")
 	public FindAndModifyOptions collation(@Nullable Collation collation) {
 
 		this.collation = collation;
@@ -142,7 +147,7 @@ public boolean isRemove() {
 	/**
 	 * Get the {@link Collation} specifying language-specific rules for string comparison.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @since 2.0
 	 */
 	public Optional<Collation> getCollation() {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindAndReplaceOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindAndReplaceOptions.java
index 1da434326e..2005ba3c6c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindAndReplaceOptions.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package org.springframework.data.mongodb.core;
 
+import org.springframework.lang.Contract;
+
 /**
  * Options for
- * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>.
+ * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>.
  * <br />
  * Defaults to
  * <dl>
@@ -31,14 +33,13 @@
  * @author Christoph Strobl
  * @since 2.1
  */
-public class FindAndReplaceOptions {
+public class FindAndReplaceOptions extends ReplaceOptions {
 
 	private boolean returnNew;
-	private boolean upsert;
 
 	private static final FindAndReplaceOptions NONE = new FindAndReplaceOptions() {
 
-		private static final String ERROR_MSG = "FindAndReplaceOptions.none() cannot be changed. Please use FindAndReplaceOptions.options() instead.";
+		private static final String ERROR_MSG = "FindAndReplaceOptions.none() cannot be changed; Please use FindAndReplaceOptions.options() instead";
 
 		@Override
 		public FindAndReplaceOptions returnNew() {
@@ -96,6 +97,7 @@ public static FindAndReplaceOptions empty() {
 	 *
 	 * @return this.
 	 */
+	@Contract("-> this")
 	public FindAndReplaceOptions returnNew() {
 
 		this.returnNew = true;
@@ -107,28 +109,20 @@ public FindAndReplaceOptions returnNew() {
 	 *
 	 * @return this.
 	 */
+	@Contract("-> this")
 	public FindAndReplaceOptions upsert() {
 
-		this.upsert = true;
+		super.upsert();
 		return this;
 	}
 
 	/**
 	 * Get the bit indicating to return the replacement document.
 	 *
-	 * @return
+	 * @return {@literal true} if set.
 	 */
 	public boolean isReturnNew() {
 		return returnNew;
 	}
 
-	/**
-	 * Get the bit indicating if to create a new document if not exists.
-	 *
-	 * @return
-	 */
-	public boolean isUpsert() {
-		return upsert;
-	}
-
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindPublisherPreparer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindPublisherPreparer.java
index 92b3fa3975..f04417325c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FindPublisherPreparer.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import java.util.function.Function;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 import com.mongodb.ReadPreference;
@@ -49,20 +49,20 @@ public interface FindPublisherPreparer extends ReadPreferenceAware {
 	FindPublisher<Document> prepare(FindPublisher<Document> findPublisher);
 
 	/**
-	 * Apply query specific settings to {@link MongoCollection} and initate a find operation returning a
+	 * Apply query specific settings to {@link MongoCollection} and initiate 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
+	 * @return never {@literal null}.
 	 * @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!");
+		Assert.notNull(collection, "Collection must not be null");
+		Assert.notNull(find, "Find function must not be null");
 
 		if (hasReadPreference()) {
 			collection = collection.withReadPreference(getReadPreference());
@@ -76,8 +76,7 @@ default FindPublisher<Document> initiateFind(MongoCollection<Document> collectio
 	 * @since 2.2
 	 */
 	@Override
-	@Nullable
-	default ReadPreference getReadPreference() {
+	default @Nullable ReadPreference getReadPreference() {
 		return null;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FluentMongoOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FluentMongoOperations.java
index 20fb73ca27..906afddd4a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/FluentMongoOperations.java
+++ b/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-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoCommandStatistics.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoCommandStatistics.java
index 63f48c20b1..654e7d4330 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoCommandStatistics.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/GeoCommandStatistics.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ class GeoCommandStatistics {
 	 */
 	private GeoCommandStatistics(Document source) {
 
-		Assert.notNull(source, "Source document must not be null!");
+		Assert.notNull(source, "Source document must not be null");
 		this.source = source;
 	}
 
@@ -47,11 +47,11 @@ private GeoCommandStatistics(Document source) {
 	 * Creates a new {@link GeoCommandStatistics} from the given command result extracting the statistics.
 	 *
 	 * @param commandResult must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public static GeoCommandStatistics from(Document commandResult) {
 
-		Assert.notNull(commandResult, "Command result must not be null!");
+		Assert.notNull(commandResult, "Command result must not be null");
 
 		Object stats = commandResult.get("stats");
 		return stats == null ? NONE : new GeoCommandStatistics((Document) stats);
@@ -61,7 +61,7 @@ public static GeoCommandStatistics from(Document commandResult) {
 	 * Returns the average distance reported by the command result. Mitigating a removal of the field in case the command
 	 * didn't return any result introduced in MongoDB 3.2 RC1.
 	 *
-	 * @return
+	 * @return never {@literal null}, uses {@link Double#NaN} if {@literal avgDistance} does not exist.
 	 * @see <a href="https://jira.mongodb.org/browse/SERVER-21024">MongoDB Jira SERVER-21024</a>
 	 */
 	public double getAverageDistance() {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/HintFunction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/HintFunction.java
new file mode 100644
index 0000000000..043613122a
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/HintFunction.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2023-2025 the original author 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.function.Function;
+
+import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.CodecRegistryProvider;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Function object to apply a query hint. Can be an index name or a BSON document.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+class HintFunction {
+
+	private static final HintFunction EMPTY = new HintFunction(null);
+
+	private final @Nullable Object hint;
+
+	private HintFunction(@Nullable Object hint) {
+		this.hint = hint;
+	}
+
+	/**
+	 * Return an empty hint function.
+	 *
+	 * @return
+	 */
+	static HintFunction empty() {
+		return EMPTY;
+	}
+
+	/**
+	 * Create a {@link HintFunction} from a {@link Bson document} or {@link String index name}.
+	 *
+	 * @param hint
+	 * @return
+	 */
+	static HintFunction from(@Nullable Object hint) {
+		return new HintFunction(hint);
+	}
+
+	/**
+	 * Return whether a hint is present.
+	 *
+	 * @return
+	 */
+	public boolean isPresent() {
+		return (hint instanceof String hintString && StringUtils.hasText(hintString)) || hint instanceof Bson;
+	}
+
+	/**
+	 * If a hint is not present, returns {@code true}, otherwise {@code false}.
+	 *
+	 * @return {@code true} if a hint is not present, otherwise {@code false}.
+	 */
+	public boolean isEmpty() {
+		return !isPresent();
+	}
+
+	/**
+	 * Apply the hint to consumers depending on the hint format if {@link #isPresent() present}.
+	 *
+	 * @param registryProvider
+	 * @param stringConsumer
+	 * @param bsonConsumer
+	 * @param <R>
+	 */
+	public <R> void ifPresent(@Nullable CodecRegistryProvider registryProvider, Function<String, R> stringConsumer,
+			Function<Bson, R> bsonConsumer) {
+
+		if (isEmpty()) {
+			return;
+		}
+		apply(registryProvider, stringConsumer, bsonConsumer);
+	}
+
+	/**
+	 * Apply the hint to consumers depending on the hint format.
+	 *
+	 * @param registryProvider
+	 * @param stringConsumer
+	 * @param bsonConsumer
+	 * @return
+	 * @param <R>
+	 */
+	public <R> R apply(@Nullable CodecRegistryProvider registryProvider, Function<String, R> stringConsumer,
+			Function<Bson, R> bsonConsumer) {
+
+		if (isEmpty()) {
+			throw new IllegalStateException("No hint present");
+		}
+
+		if (hint instanceof Bson bson) {
+			return bsonConsumer.apply(bson);
+		}
+
+		if (hint instanceof String hintString) {
+
+			if (BsonUtils.isJsonDocument(hintString)) {
+				return bsonConsumer.apply(BsonUtils.parse(hintString, registryProvider));
+			}
+			return stringConsumer.apply(hintString);
+		}
+
+		throw new IllegalStateException(
+				"Unable to read hint of type %s".formatted(hint != null ? hint.getClass() : "null"));
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexConverters.java
index 093a1d900c..9f9295bba3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexConverters.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/IndexConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,10 +18,10 @@
 import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 import com.mongodb.client.model.Collation;
@@ -88,9 +88,6 @@ private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexO
 			if (indexOptions.containsKey("bits")) {
 				ops = ops.bits((Integer) indexOptions.get("bits"));
 			}
-			if (indexOptions.containsKey("bucketSize")) {
-				ops = ops.bucketSize(((Number) indexOptions.get("bucketSize")).doubleValue());
-			}
 			if (indexOptions.containsKey("default_language")) {
 				ops = ops.defaultLanguage(indexOptions.get("default_language").toString());
 			}
@@ -115,12 +112,19 @@ private static Converter<IndexDefinition, IndexOptions> getIndexDefinitionIndexO
 				ops = ops.collation(fromDocument(indexOptions.get("collation", Document.class)));
 			}
 
+			if (indexOptions.containsKey("wildcardProjection")) {
+				ops.wildcardProjection(indexOptions.get("wildcardProjection", Document.class));
+			}
+
+			if (indexOptions.containsKey("hidden")) {
+				ops = ops.hidden((Boolean) indexOptions.get("hidden"));
+			}
+
 			return ops;
 		};
 	}
 
-	@Nullable
-	public static Collation fromDocument(@Nullable Document source) {
+	public static @Nullable Collation fromDocument(@Nullable Document source) {
 
 		if (source == null) {
 			return null;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java
index 474670b2a4..cd9ba90453 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappedDocument.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,20 +15,17 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 import java.util.Collection;
 import java.util.List;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.util.StreamUtils;
 
-import com.mongodb.client.model.Filters;
-
 /**
  * A MongoDB document in its mapped state. I.e. after a source document has been mapped using mapping information of the
  * entity the source document was supposed to represent.
@@ -36,13 +33,20 @@
  * @author Oliver Gierke
  * @since 2.1
  */
-@RequiredArgsConstructor(staticName = "of")
 public class MappedDocument {
 
-	private static final String ID_FIELD = "_id";
+	private static final String ID_FIELD = FieldName.ID.name();
 	private static final Document ID_ONLY_PROJECTION = new Document(ID_FIELD, 1);
 
-	private final @Getter Document document;
+	private final Document document;
+
+	private MappedDocument(Document document) {
+		this.document = document;
+	}
+
+	public static MappedDocument of(Document document) {
+		return new MappedDocument(document);
+	}
 
 	public static Document getIdOnlyProjection() {
 		return ID_ONLY_PROJECTION;
@@ -67,7 +71,7 @@ public boolean hasNonNullId() {
 		return hasId() && document.get(ID_FIELD) != null;
 	}
 
-	public Object getId() {
+	public @Nullable Object getId() {
 		return document.get(ID_FIELD);
 	}
 
@@ -80,13 +84,31 @@ public boolean isIdPresent(Class<?> type) {
 	}
 
 	public Bson getIdFilter() {
-		return Filters.eq(ID_FIELD, document.get(ID_FIELD));
+		return new Document(ID_FIELD, document.get(ID_FIELD));
+	}
+
+	public @Nullable Object get(String key) {
+		return document.get(key);
 	}
 
 	public UpdateDefinition updateWithoutId() {
 		return new MappedUpdate(Update.fromDocument(document, ID_FIELD));
 	}
 
+	public Document getDocument() {
+		return this.document;
+	}
+
+	/**
+	 * Updates the documents {@link #ID_FIELD}.
+	 *
+	 * @param value the {@literal _id} value to set.
+	 * @since 3.4.3
+	 */
+	public void updateId(Object value) {
+		document.put(ID_FIELD, value);
+	}
+
 	/**
 	 * An {@link UpdateDefinition} that indicates that the {@link #getUpdateObject() update object} has already been
 	 * mapped to the specific domain type.
@@ -94,7 +116,7 @@ public UpdateDefinition updateWithoutId() {
 	 * @author Christoph Strobl
 	 * @since 2.2
 	 */
-	class MappedUpdate implements UpdateDefinition {
+	static class MappedUpdate implements UpdateDefinition {
 
 		private final Update delegate;
 
@@ -102,49 +124,34 @@ class MappedUpdate implements UpdateDefinition {
 			this.delegate = delegate;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getUpdateObject()
-		 */
 		@Override
 		public Document getUpdateObject() {
 			return delegate.getUpdateObject();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#modifies(java.lang.String)
-		 */
 		@Override
 		public boolean modifies(String key) {
 			return delegate.modifies(key);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc(java.lang.String)
-		 */
 		@Override
 		public void inc(String version) {
 			delegate.inc(version);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#isIsolated()
-		 */
 		@Override
 		public Boolean isIsolated() {
 			return delegate.isIsolated();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters()
-		 */
 		@Override
 		public List<ArrayFilter> getArrayFilters() {
 			return delegate.getArrayFilters();
 		}
+
+		@Override
+		public boolean hasArrayFilters() {
+			return delegate.hasArrayFilters();
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java
index 815a68994d..396ae1ce8a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,24 +20,39 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.mapping.Encrypted;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.Queryable;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.ArrayJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.EncryptedJsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.ObjectJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.QueryableJsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
 import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema.MongoJsonSchemaBuilder;
+import org.springframework.data.mongodb.core.schema.QueryCharacteristic;
+import org.springframework.data.mongodb.core.schema.QueryCharacteristics;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link MongoJsonSchemaCreator} implementation using both {@link MongoConverter} and {@link MappingContext} to obtain
@@ -52,6 +67,8 @@ class MappingMongoJsonSchemaCreator implements MongoJsonSchemaCreator {
 
 	private final MongoConverter converter;
 	private final MappingContext<MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final Predicate<JsonSchemaPropertyContext> filter;
+	private final LinkedMultiValueMap<String, Class<?>> mergeProperties;
 
 	/**
 	 * Create a new instance of {@link MappingMongoJsonSchemaCreator}.
@@ -61,27 +78,82 @@ class MappingMongoJsonSchemaCreator implements MongoJsonSchemaCreator {
 	@SuppressWarnings("unchecked")
 	MappingMongoJsonSchemaCreator(MongoConverter converter) {
 
-		Assert.notNull(converter, "Converter must not be null!");
+		this(converter, (MappingContext<MongoPersistentEntity<?>, MongoPersistentProperty>) converter.getMappingContext(),
+				(property) -> true, new LinkedMultiValueMap<>());
+	}
+
+	@SuppressWarnings("unchecked")
+	MappingMongoJsonSchemaCreator(MongoConverter converter,
+			MappingContext<MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			Predicate<JsonSchemaPropertyContext> filter, LinkedMultiValueMap<String, Class<?>> mergeProperties) {
+
+		Assert.notNull(converter, "Converter must not be null");
 		this.converter = converter;
-		this.mappingContext = (MappingContext<MongoPersistentEntity<?>, MongoPersistentProperty>) converter
-				.getMappingContext();
+		this.mappingContext = mappingContext;
+		this.filter = filter;
+		this.mergeProperties = mergeProperties;
+	}
+
+	@Override
+	@Contract("_ -> new")
+	public MongoJsonSchemaCreator filter(Predicate<JsonSchemaPropertyContext> filter) {
+		return new MappingMongoJsonSchemaCreator(converter, mappingContext, filter, mergeProperties);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * org.springframework.data.mongodb.core.MongoJsonSchemaCreator#createSchemaFor(java.lang.Class)
+	@Override
+	public PropertySpecifier property(String path) {
+		return types -> withTypesFor(path, types);
+	}
+
+	/**
+	 * Specify additional types to be considered when rendering the schema for the given path.
+	 *
+	 * @param path path the path using {@literal dot '.'} notation.
+	 * @param types must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchemaCreator}.
+	 * @since 3.4
 	 */
+	@Contract("_, _ -> new")
+	public MongoJsonSchemaCreator withTypesFor(String path, Class<?>... types) {
+
+		LinkedMultiValueMap<String, Class<?>> clone = mergeProperties.clone();
+		for (Class<?> type : types) {
+			clone.add(path, type);
+		}
+		return new MappingMongoJsonSchemaCreator(converter, mappingContext, filter, clone);
+	}
+
 	@Override
 	public MongoJsonSchema createSchemaFor(Class<?> type) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(type);
 		MongoJsonSchemaBuilder schemaBuilder = MongoJsonSchema.builder();
 
+		Encrypted encrypted = entity.findAnnotation(Encrypted.class);
+		if (encrypted != null) {
+			schemaBuilder.encryptionMetadata(getEncryptionMetadata(entity, encrypted));
+		}
+
 		List<JsonSchemaProperty> schemaProperties = computePropertiesForEntity(Collections.emptyList(), entity);
 		schemaBuilder.properties(schemaProperties.toArray(new JsonSchemaProperty[0]));
 
 		return schemaBuilder.build();
+	}
+
+	private static Document getEncryptionMetadata(MongoPersistentEntity<?> entity, Encrypted encrypted) {
+
+		Document encryptionMetadata = new Document();
+
+		Collection<Object> encryptionKeyIds = entity.getEncryptionKeyIds();
+		if (!CollectionUtils.isEmpty(encryptionKeyIds)) {
+			encryptionMetadata.append("keyId", encryptionKeyIds);
+		}
+
+		if (StringUtils.hasText(encrypted.algorithm())) {
+			encryptionMetadata.append("algorithm", encrypted.algorithm());
+		}
 
+		return encryptionMetadata;
 	}
 
 	private List<JsonSchemaProperty> computePropertiesForEntity(List<MongoPersistentProperty> path,
@@ -93,6 +165,14 @@ private List<JsonSchemaProperty> computePropertiesForEntity(List<MongoPersistent
 
 			List<MongoPersistentProperty> currentPath = new ArrayList<>(path);
 
+			String stringPath = currentPath.stream().map(PersistentProperty::getName).collect(Collectors.joining("."));
+			stringPath = StringUtils.hasText(stringPath) ? (stringPath + "." + nested.getName()) : nested.getName();
+			if (!filter.test(new PropertyContext(stringPath, nested))) {
+				if (!mergeProperties.containsKey(stringPath)) {
+					continue;
+				}
+			}
+
 			if (path.contains(nested)) { // cycle guard
 				schemaProperties.add(createSchemaProperty(computePropertyFieldName(CollectionUtils.lastElement(currentPath)),
 						Object.class, false));
@@ -106,29 +186,152 @@ private List<JsonSchemaProperty> computePropertiesForEntity(List<MongoPersistent
 		return schemaProperties;
 	}
 
+	@SuppressWarnings("NullAway")
 	private JsonSchemaProperty computeSchemaForProperty(List<MongoPersistentProperty> path) {
 
+		String stringPath = path.stream().map(MongoPersistentProperty::getName).collect(Collectors.joining("."));
 		MongoPersistentProperty property = CollectionUtils.lastElement(path);
 
 		boolean required = isRequiredProperty(property);
 		Class<?> rawTargetType = computeTargetType(property); // target type before conversion
 		Class<?> targetType = converter.getTypeMapper().getWriteTargetTypeFor(rawTargetType); // conversion target type
 
-		if (property.isEntity() && ObjectUtils.nullSafeEquals(rawTargetType, targetType)) {
-			return createObjectSchemaPropertyForEntity(path, property, required);
+		if ((rawTargetType.isPrimitive() || ClassUtils.isPrimitiveArray(rawTargetType)) && targetType == Object.class
+				|| ClassUtils.isAssignable(targetType, rawTargetType)) {
+			targetType = rawTargetType;
+		}
+
+		if (!isCollection(property) && ObjectUtils.nullSafeEquals(rawTargetType, targetType)) {
+			if (property.isEntity() || mergeProperties.containsKey(stringPath)) {
+				List<JsonSchemaProperty> targetProperties = new ArrayList<>();
+
+				if (property.isEntity()) {
+					targetProperties.add(createObjectSchemaPropertyForEntity(path, property, required));
+				}
+				if (mergeProperties.containsKey(stringPath)) {
+					for (Class<?> theType : mergeProperties.get(stringPath)) {
+
+						ObjectJsonSchemaProperty target = JsonSchemaProperty.object(property.getName());
+						List<JsonSchemaProperty> nestedProperties = computePropertiesForEntity(path,
+								mappingContext.getRequiredPersistentEntity(theType));
+
+						targetProperties.add(createPotentiallyRequiredSchemaProperty(
+								target.properties(nestedProperties.toArray(new JsonSchemaProperty[0])), required));
+					}
+				}
+				JsonSchemaProperty schemaProperty = targetProperties.size() == 1 ? targetProperties.iterator().next()
+						: JsonSchemaProperty.merged(targetProperties);
+				return applyEncryptionDataIfNecessary(property, schemaProperty);
+			}
 		}
 
 		String fieldName = computePropertyFieldName(property);
 
-		if (property.isCollectionLike()) {
-			return createSchemaProperty(fieldName, targetType, required);
+		JsonSchemaProperty schemaProperty;
+		if (isCollection(property)) {
+			schemaProperty = createArraySchemaProperty(fieldName, property, required);
 		} else if (property.isMap()) {
-			return createSchemaProperty(fieldName, Type.objectType(), required);
+			schemaProperty = createSchemaProperty(fieldName, Type.objectType(), required);
 		} else if (ClassUtils.isAssignable(Enum.class, targetType)) {
-			return createEnumSchemaProperty(fieldName, targetType, required);
+			schemaProperty = createEnumSchemaProperty(fieldName, targetType, required);
+		} else {
+			schemaProperty = createSchemaProperty(fieldName, targetType, required);
+		}
+
+		return applyEncryptionDataIfNecessary(property, schemaProperty);
+	}
+
+	private JsonSchemaProperty createArraySchemaProperty(String fieldName, MongoPersistentProperty property,
+			boolean required) {
+
+		ArrayJsonSchemaProperty schemaProperty = JsonSchemaProperty.array(fieldName);
+
+		if (isSpecificType(property)) {
+			schemaProperty = potentiallyEnhanceArraySchemaProperty(property, schemaProperty);
+		}
+
+		return createPotentiallyRequiredSchemaProperty(schemaProperty, required);
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	private ArrayJsonSchemaProperty potentiallyEnhanceArraySchemaProperty(MongoPersistentProperty property,
+			ArrayJsonSchemaProperty schemaProperty) {
+
+		MongoPersistentEntity<?> persistentEntity = mappingContext
+				.getPersistentEntity(property.getTypeInformation().getRequiredComponentType());
+
+		if (persistentEntity != null) {
+
+			List<JsonSchemaProperty> nestedProperties = computePropertiesForEntity(Collections.emptyList(), persistentEntity);
+
+			if (nestedProperties.isEmpty()) {
+				return schemaProperty;
+			}
+
+			return schemaProperty
+					.items(JsonSchemaObject.object().properties(nestedProperties.toArray(new JsonSchemaProperty[0])));
+		}
+
+		if (ClassUtils.isAssignable(Enum.class, property.getActualType())) {
+
+			List<Object> possibleValues = getPossibleEnumValues((Class<Enum>) property.getActualType());
+
+			return schemaProperty
+					.items(createSchemaObject(computeTargetType(property.getActualType(), possibleValues), possibleValues));
 		}
 
-		return createSchemaProperty(fieldName, targetType, required);
+		return schemaProperty.items(JsonSchemaObject.of(property.getActualType()));
+	}
+
+	private boolean isSpecificType(MongoPersistentProperty property) {
+		return !TypeInformation.OBJECT.equals(property.getTypeInformation().getActualType());
+	}
+
+	private JsonSchemaProperty applyEncryptionDataIfNecessary(MongoPersistentProperty property,
+			JsonSchemaProperty schemaProperty) {
+
+		Encrypted encrypted = property.findAnnotation(Encrypted.class);
+		if (encrypted == null) {
+			return schemaProperty;
+		}
+
+		EncryptedJsonSchemaProperty enc = new EncryptedJsonSchemaProperty(schemaProperty);
+		if (StringUtils.hasText(encrypted.algorithm())) {
+			enc = enc.algorithm(encrypted.algorithm());
+		}
+		if (!ObjectUtils.isEmpty(encrypted.keyId())) {
+			enc = enc.keys(property.getEncryptionKeyIds());
+		}
+
+		Queryable queryable = property.findAnnotation(Queryable.class);
+		if (queryable == null || !StringUtils.hasText(queryable.queryType())) {
+			return enc;
+		}
+
+		QueryCharacteristic characteristic = new QueryCharacteristic() {
+
+			@Override
+			public String queryType() {
+				return queryable.queryType();
+			}
+
+			@Override
+			public Document toDocument() {
+
+				Document options = QueryCharacteristic.super.toDocument();
+
+				if (queryable.contentionFactor() >= 0) {
+					options.put("contention", queryable.contentionFactor());
+				}
+
+				if (StringUtils.hasText(queryable.queryAttributes())) {
+					options.putAll(Document.parse(queryable.queryAttributes()));
+				}
+
+				return options;
+			}
+		};
+		return new QueryableJsonSchemaProperty(enc, QueryCharacteristics.of(characteristic));
 	}
 
 	private JsonSchemaProperty createObjectSchemaPropertyForEntity(List<MongoPersistentProperty> path,
@@ -142,15 +345,12 @@ private JsonSchemaProperty createObjectSchemaPropertyForEntity(List<MongoPersist
 				target.properties(nestedProperties.toArray(new JsonSchemaProperty[0])), required);
 	}
 
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private JsonSchemaProperty createEnumSchemaProperty(String fieldName, Class<?> targetType, boolean required) {
 
-		List<Object> possibleValues = new ArrayList<>();
-
-		for (Object enumValue : EnumSet.allOf((Class) targetType)) {
-			possibleValues.add(converter.convertToMongoType(enumValue));
-		}
+		List<Object> possibleValues = getPossibleEnumValues((Class<Enum>) targetType);
 
-		targetType = possibleValues.isEmpty() ? targetType : possibleValues.iterator().next().getClass();
+		targetType = computeTargetType(targetType, possibleValues);
 		return createSchemaProperty(fieldName, targetType, required, possibleValues);
 	}
 
@@ -161,34 +361,41 @@ JsonSchemaProperty createSchemaProperty(String fieldName, Object type, boolean r
 	JsonSchemaProperty createSchemaProperty(String fieldName, Object type, boolean required,
 			Collection<?> possibleValues) {
 
-		TypedJsonSchemaObject schemaObject = type instanceof Type ? JsonSchemaObject.of(Type.class.cast(type))
+		TypedJsonSchemaObject schemaObject = createSchemaObject(type, possibleValues);
+
+		return createPotentiallyRequiredSchemaProperty(JsonSchemaProperty.named(fieldName).with(schemaObject), required);
+	}
+
+	private TypedJsonSchemaObject createSchemaObject(Object type, Collection<?> possibleValues) {
+
+		TypedJsonSchemaObject schemaObject = type instanceof Type typeObject ? JsonSchemaObject.of(typeObject)
 				: JsonSchemaObject.of(Class.class.cast(type));
 
 		if (!CollectionUtils.isEmpty(possibleValues)) {
 			schemaObject = schemaObject.possibleValues(possibleValues);
 		}
-
-		return createPotentiallyRequiredSchemaProperty(JsonSchemaProperty.named(fieldName).with(schemaObject), required);
+		return schemaObject;
 	}
 
-	private String computePropertyFieldName(PersistentProperty property) {
+	private String computePropertyFieldName(@Nullable PersistentProperty<?> property) {
+
+		Assert.notNull(property, "Property must not be null");
 
-		return property instanceof MongoPersistentProperty ? ((MongoPersistentProperty) property).getFieldName()
+		return property instanceof MongoPersistentProperty mongoPersistentProperty ? mongoPersistentProperty.getFieldName()
 				: property.getName();
 	}
 
-	private boolean isRequiredProperty(PersistentProperty property) {
+	private boolean isRequiredProperty(PersistentProperty<?> property) {
 		return property.getType().isPrimitive();
 	}
 
 	private Class<?> computeTargetType(PersistentProperty<?> property) {
 
-		if (!(property instanceof MongoPersistentProperty)) {
+		if (!(property instanceof MongoPersistentProperty mongoProperty)) {
 			return property.getType();
 		}
 
-		MongoPersistentProperty mongoProperty = (MongoPersistentProperty) property;
-		if (!mongoProperty.isIdProperty()) {
+		if (!property.getOwner().isIdProperty(property)) {
 			return mongoProperty.getFieldType();
 		}
 
@@ -199,12 +406,54 @@ private Class<?> computeTargetType(PersistentProperty<?> property) {
 		return mongoProperty.getFieldType() != mongoProperty.getActualType() ? Object.class : mongoProperty.getFieldType();
 	}
 
+	private static Class<?> computeTargetType(Class<?> fallback, List<Object> possibleValues) {
+		return possibleValues.isEmpty() ? fallback : possibleValues.iterator().next().getClass();
+	}
+
+	private <E extends Enum<E>> List<Object> getPossibleEnumValues(Class<E> targetType) {
+
+		EnumSet<E> enumSet = EnumSet.allOf(targetType);
+		List<Object> possibleValues = new ArrayList<>(enumSet.size());
+
+		for (Object enumValue : enumSet) {
+			possibleValues.add(converter.convertToMongoType(enumValue));
+		}
+
+		return possibleValues;
+	}
+
+	private static boolean isCollection(MongoPersistentProperty property) {
+		return property.isCollectionLike() && !property.getType().equals(byte[].class);
+	}
+
 	static JsonSchemaProperty createPotentiallyRequiredSchemaProperty(JsonSchemaProperty property, boolean required) {
+		return required ? JsonSchemaProperty.required(property) : property;
+	}
+
+	class PropertyContext implements JsonSchemaPropertyContext {
 
-		if (!required) {
+		private final String path;
+		private final MongoPersistentProperty property;
+
+		public PropertyContext(String path, MongoPersistentProperty property) {
+			this.path = path;
+			this.property = property;
+		}
+
+		@Override
+		public String getPath() {
+			return path;
+		}
+
+		@Override
+		public MongoPersistentProperty getProperty() {
 			return property;
 		}
 
-		return JsonSchemaProperty.required(property);
+		@Override
+		@SuppressWarnings("unchecked")
+		public <T> @Nullable MongoPersistentEntity<T> resolveEntity(MongoPersistentProperty property) {
+			return (MongoPersistentEntity<T>) mappingContext.getPersistentEntity(property);
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAction.java
index 9db8cca15d..c827c5b8a9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAction.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAction.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.core;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 import com.mongodb.WriteConcern;
@@ -57,8 +57,8 @@ public class MongoAction {
 	public MongoAction(@Nullable WriteConcern defaultWriteConcern, MongoActionOperation mongoActionOperation,
 			String collectionName, @Nullable Class<?> entityType, @Nullable Document document, @Nullable Document query) {
 
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		Assert.notNull(mongoActionOperation, "MongoActionOperation must not be null!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		Assert.notNull(mongoActionOperation, "MongoActionOperation must not be null");
 
 		this.defaultWriteConcern = defaultWriteConcern;
 		this.mongoActionOperation = mongoActionOperation;
@@ -72,28 +72,23 @@ public String getCollectionName() {
 		return collectionName;
 	}
 
-	@Nullable
-	public WriteConcern getDefaultWriteConcern() {
+	public @Nullable WriteConcern getDefaultWriteConcern() {
 		return defaultWriteConcern;
 	}
 
-	@Nullable
-	public Class<?> getEntityType() {
+	public @Nullable Class<?> getEntityType() {
 		return entityType;
 	}
 
-	@Nullable
-	public MongoActionOperation getMongoActionOperation() {
+	public @Nullable MongoActionOperation getMongoActionOperation() {
 		return mongoActionOperation;
 	}
 
-	@Nullable
-	public Document getQuery() {
+	public @Nullable Document getQuery() {
 		return query;
 	}
 
-	@Nullable
-	public Document getDocument() {
+	public @Nullable Document getDocument() {
 		return document;
 	}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoActionOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoActionOperation.java
index 627cca6ee0..509d10887b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoActionOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoActionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,9 +21,10 @@
  *
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @author Christoph Strobl
  * @see MongoAction
  */
 public enum MongoActionOperation {
 
-	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE, BULK;
+	REMOVE, UPDATE, INSERT, INSERT_LIST, SAVE, BULK, REPLACE
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java
index fe1d757f3c..5fcc6c9599 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdmin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import org.springframework.jmx.export.annotation.ManagedResource;
 import org.springframework.util.Assert;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoDatabase;
 
 /**
@@ -30,52 +30,34 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @deprecated since 4.5
  */
+@Deprecated(since = "4.5", forRemoval = true)
 @ManagedResource(description = "Mongo Admin Operations")
 public class MongoAdmin implements MongoAdminOperations {
 
-	private final Object mongoClient;
-
-	/**
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link MongoAdmin#MongoAdmin(com.mongodb.client.MongoClient)}.
-	 */
-	@Deprecated
-	public MongoAdmin(MongoClient mongoClient) {
-
-		Assert.notNull(mongoClient, "MongoClient must not be null!");
-		this.mongoClient = mongoClient;
-	}
+	private final MongoClient mongoClient;
 
 	/**
 	 * @param client the underlying {@link com.mongodb.client.MongoClient} used for data access.
 	 * @since 2.2
 	 */
-	public MongoAdmin(com.mongodb.client.MongoClient client) {
+	public MongoAdmin(MongoClient client) {
 
-		Assert.notNull(client, "Client must not be null!");
+		Assert.notNull(client, "Client must not be null");
 		this.mongoClient = client;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#dropDatabase(java.lang.String)
-	 */
 	@ManagedOperation
 	public void dropDatabase(String databaseName) {
 		getDB(databaseName).drop();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#createDatabase(java.lang.String)
-	 */
 	@ManagedOperation
 	public void createDatabase(String databaseName) {
 		getDB(databaseName);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.MongoAdminOperations#getDatabaseStats(java.lang.String)
-	 */
 	@ManagedOperation
 	public String getDatabaseStats(String databaseName) {
 		return getDB(databaseName).runCommand(new Document("dbStats", 1).append("scale", 1024)).toJson();
@@ -88,11 +70,6 @@ public String getServerStatus() {
 	}
 
 	MongoDatabase getDB(String databaseName) {
-
-		if (mongoClient instanceof MongoClient) {
-			return ((MongoClient) mongoClient).getDatabase(databaseName);
-		}
-
-		return ((com.mongodb.client.MongoClient) mongoClient).getDatabase(databaseName);
+		return mongoClient.getDatabase(databaseName);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdminOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdminOperations.java
index caf0134ddf..ec03302f7e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdminOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoAdminOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,6 +21,7 @@
  * @author Mark Pollack
  * @author Oliver Gierke
  */
+@Deprecated(since = "4.5", forRemoval = true)
 public interface MongoAdminOperations {
 
 	@ManagedOperation
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java
index fccb8c0251..9210dd85ec 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,70 +16,70 @@
 package org.springframework.data.mongodb.core;
 
 import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
+import org.bson.UuidRepresentation;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.SpringDataMongoDB;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoClientSettings.Builder;
 import com.mongodb.MongoCredential;
 import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.connection.ClusterSettings;
+import com.mongodb.connection.ConnectionPoolSettings;
+import com.mongodb.connection.ServerSettings;
+import com.mongodb.connection.SocketSettings;
+import com.mongodb.connection.SslSettings;
+import com.mongodb.event.ClusterListener;
 
 /**
  * Convenient factory for configuring MongoDB.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @since 1.7
- * @deprecated since 2.2 - There is no replacement for this {@link org.springframework.beans.factory.FactoryBean} at
- *             this time. However moving forward the {@link org.springframework.beans.factory.FactoryBean} will be
- *             suitable to provide instances of {@link com.mongodb.client.MongoClient}.
  */
-@Deprecated
 public class MongoClientFactoryBean extends AbstractFactoryBean<MongoClient> implements PersistenceExceptionTranslator {
 
-	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
-
-	private @Nullable MongoClientOptions mongoClientOptions;
+	private @Nullable MongoClientSettings mongoClientSettings;
 	private @Nullable String host;
 	private @Nullable Integer port;
-	private List<ServerAddress> replicaSetSeeds = Collections.emptyList();
-	private List<MongoCredential> credentials = Collections.emptyList();
+	private @Nullable List<MongoCredential> credential = null;
+	private @Nullable ConnectionString connectionString;
+	private @Nullable String replicaSet = null;
 
-	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
+	private PersistenceExceptionTranslator exceptionTranslator = MongoExceptionTranslator.DEFAULT_EXCEPTION_TRANSLATOR;
 
 	/**
-	 * Set the {@link MongoClientOptions} to be used when creating {@link MongoClient}.
+	 * Set the {@link MongoClientSettings} to be used when creating {@link MongoClient}.
 	 *
 	 * @param mongoClientOptions
 	 */
-	public void setMongoClientOptions(@Nullable MongoClientOptions mongoClientOptions) {
-		this.mongoClientOptions = mongoClientOptions;
+	public void setMongoClientSettings(@Nullable MongoClientSettings mongoClientOptions) {
+		this.mongoClientSettings = mongoClientOptions;
 	}
 
 	/**
 	 * Set the list of credentials to be used when creating {@link MongoClient}.
 	 *
-	 * @param credentials can be {@literal null}.
+	 * @param credential can be {@literal null}.
 	 */
-	public void setCredentials(@Nullable MongoCredential[] credentials) {
-		this.credentials = filterNonNullElementsAsList(credentials);
-	}
-
-	/**
-	 * Set the list of {@link ServerAddress} to build up a replica set for.
-	 *
-	 * @param replicaSetSeeds can be {@literal null}.
-	 */
-	public void setReplicaSetSeeds(@Nullable ServerAddress[] replicaSetSeeds) {
-		this.replicaSetSeeds = filterNonNullElementsAsList(replicaSetSeeds);
+	public void setCredential(MongoCredential @Nullable[] credential) {
+		this.credential = Arrays.asList(credential);
 	}
 
 	/**
@@ -100,50 +100,39 @@ public void setPort(int port) {
 		this.port = port;
 	}
 
+	public void setConnectionString(@Nullable ConnectionString connectionString) {
+		this.connectionString = connectionString;
+	}
+
+	public void setReplicaSet(@Nullable String replicaSet) {
+		this.replicaSet = replicaSet;
+	}
+
 	/**
 	 * Configures the {@link PersistenceExceptionTranslator} to use.
 	 *
 	 * @param exceptionTranslator
 	 */
 	public void setExceptionTranslator(@Nullable PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
+		this.exceptionTranslator = exceptionTranslator == null ? MongoExceptionTranslator.DEFAULT_EXCEPTION_TRANSLATOR
+				: exceptionTranslator;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
-	public Class<? extends MongoClient> getObjectType() {
-		return MongoClient.class;
+	@Override
+	public @Nullable DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+		return exceptionTranslator.translateExceptionIfPossible(ex);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
-	 */
-	@Nullable
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-		return exceptionTranslator.translateExceptionIfPossible(ex);
+	@Override
+	public Class<? extends MongoClient> getObjectType() {
+		return MongoClient.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
-	 */
 	@Override
 	protected MongoClient createInstance() throws Exception {
-
-		if (mongoClientOptions == null) {
-			mongoClientOptions = MongoClientOptions.builder().build();
-		}
-
-		return createMongoClient();
+		return createMongoClient(computeClientSetting());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#destroyInstance(java.lang.Object)
-	 */
 	@Override
 	protected void destroyInstance(@Nullable MongoClient instance) throws Exception {
 
@@ -152,43 +141,207 @@ protected void destroyInstance(@Nullable MongoClient instance) throws Exception
 		}
 	}
 
-	private MongoClient createMongoClient() throws UnknownHostException {
+	/**
+	 * Create {@link MongoClientSettings} based on configuration and priority (lower is better).
+	 * <ol>
+	 * <li>{@link MongoClientFactoryBean#mongoClientSettings}</li>
+	 * <li>{@link MongoClientFactoryBean#connectionString}</li>
+	 * <li>default {@link MongoClientSettings}</li>
+	 * </ol>
+	 *
+	 * @since 3.0
+	 */
+	protected MongoClientSettings computeClientSetting() {
 
-		if (!CollectionUtils.isEmpty(replicaSetSeeds)) {
-			return new MongoClient(replicaSetSeeds, credentials, mongoClientOptions);
+		if (connectionString != null && (StringUtils.hasText(host) || port != null)) {
+			throw new IllegalStateException("ConnectionString and host/port configuration exclude one another");
 		}
 
-		return new MongoClient(createConfiguredOrDefaultServerAddress(), credentials, mongoClientOptions);
-	}
+		ConnectionString connectionString = this.connectionString != null ? this.connectionString
+				: new ConnectionString(String.format("mongodb://%s:%s", getOrDefault(host, ServerAddress.defaultHost()),
+						getOrDefault(port, "" + ServerAddress.defaultPort())));
+
+		Builder builder = MongoClientSettings.builder().applyConnectionString(connectionString);
+		builder.uuidRepresentation(UuidRepresentation.JAVA_LEGACY);
+
+		if (mongoClientSettings != null) {
+
+			MongoClientSettings defaultSettings = MongoClientSettings.builder().build();
+
+			SslSettings sslSettings = mongoClientSettings.getSslSettings();
+			ClusterSettings clusterSettings = mongoClientSettings.getClusterSettings();
+			ConnectionPoolSettings connectionPoolSettings = mongoClientSettings.getConnectionPoolSettings();
+			SocketSettings socketSettings = mongoClientSettings.getSocketSettings();
+			ServerSettings serverSettings = mongoClientSettings.getServerSettings();
+
+			builder = builder //
+					.applicationName(computeSettingsValue(defaultSettings.getApplicationName(),
+							mongoClientSettings.getApplicationName(), connectionString.getApplicationName())) //
+					.applyToSslSettings(settings -> {
 
-	private ServerAddress createConfiguredOrDefaultServerAddress() throws UnknownHostException {
+						applySettings(settings::enabled, computeSettingsValue(SslSettings::isEnabled,
+								defaultSettings.getSslSettings(), sslSettings, connectionString.getSslEnabled()));
+						applySettings(settings::invalidHostNameAllowed, (computeSettingsValue(SslSettings::isInvalidHostNameAllowed,
+								defaultSettings.getSslSettings(), sslSettings, connectionString.getSslInvalidHostnameAllowed())));
+						settings.context(sslSettings.getContext());
+					}).applyToClusterSettings(settings -> {
 
-		ServerAddress defaultAddress = new ServerAddress();
+						applySettings(settings::hosts,
+								computeSettingsValue(ClusterSettings::getHosts, defaultSettings.getClusterSettings(), clusterSettings,
+										connectionString.getHosts().stream().map(ServerAddress::new).collect(Collectors.toList())));
 
-		return new ServerAddress(StringUtils.hasText(host) ? host : defaultAddress.getHost(),
-				port != null ? port.intValue() : defaultAddress.getPort());
+						applySettings(settings::requiredReplicaSetName,
+								computeSettingsValue(ClusterSettings::getRequiredReplicaSetName, defaultSettings.getClusterSettings(),
+										clusterSettings, connectionString.getRequiredReplicaSetName()));
+
+						applySettings(settings::srvHost, computeSettingsValue(ClusterSettings::getSrvHost,
+								defaultSettings.getClusterSettings(), clusterSettings, null));
+
+						applySettings(settings::mode, computeSettingsValue(ClusterSettings::getMode,
+								defaultSettings.getClusterSettings(), clusterSettings, null));
+
+						applySettings(it -> settings.localThreshold(it.longValue(), TimeUnit.MILLISECONDS),
+								computeSettingsValue((ClusterSettings it) -> it.getLocalThreshold(TimeUnit.MILLISECONDS),
+										defaultSettings.getClusterSettings(), clusterSettings, connectionString.getLocalThreshold()));
+
+						applySettings(settings::requiredClusterType, computeSettingsValue(ClusterSettings::getRequiredClusterType,
+								defaultSettings.getClusterSettings(), clusterSettings, null));
+						applySettings(it -> settings.serverSelectionTimeout(it.longValue(), TimeUnit.MILLISECONDS),
+								computeSettingsValue((ClusterSettings it) -> it.getServerSelectionTimeout(TimeUnit.MILLISECONDS),
+										defaultSettings.getClusterSettings(), clusterSettings,
+										connectionString.getServerSelectionTimeout()));
+
+						applySettings(settings::serverSelector, computeSettingsValue(ClusterSettings::getServerSelector,
+								defaultSettings.getClusterSettings(), clusterSettings, null));
+						List<ClusterListener> clusterListeners = computeSettingsValue(ClusterSettings::getClusterListeners,
+								defaultSettings.getClusterSettings(), clusterSettings, null);
+						if (clusterListeners != null) {
+							clusterListeners.forEach(settings::addClusterListener);
+						}
+					}) //
+					.applyToConnectionPoolSettings(settings -> {
+
+						applySettings(it -> settings.maintenanceFrequency(it, TimeUnit.MILLISECONDS),
+								computeSettingsValue((ConnectionPoolSettings it) -> it.getMaintenanceFrequency(TimeUnit.MILLISECONDS),
+										defaultSettings.getConnectionPoolSettings(), connectionPoolSettings, null));
+
+						applySettings(it -> settings.maxConnectionIdleTime(it.longValue(), TimeUnit.MILLISECONDS),
+								computeSettingsValue((ConnectionPoolSettings it) -> it.getMaxConnectionIdleTime(TimeUnit.MILLISECONDS),
+										defaultSettings.getConnectionPoolSettings(), connectionPoolSettings,
+										connectionString.getMaxConnectionIdleTime()));
+
+						applySettings(it -> settings.maxConnectionLifeTime(it.longValue(), TimeUnit.MILLISECONDS),
+								computeSettingsValue((ConnectionPoolSettings it) -> it.getMaxConnectionLifeTime(TimeUnit.MILLISECONDS),
+										defaultSettings.getConnectionPoolSettings(), connectionPoolSettings,
+										connectionString.getMaxConnectionLifeTime()));
+
+						applySettings(it -> settings.maxWaitTime(it.longValue(), TimeUnit.MILLISECONDS),
+								computeSettingsValue((ConnectionPoolSettings it) -> it.getMaxWaitTime(TimeUnit.MILLISECONDS),
+										defaultSettings.getConnectionPoolSettings(), connectionPoolSettings,
+										connectionString.getMaxWaitTime()));
+
+						applySettings(it -> settings.maintenanceInitialDelay(it, TimeUnit.MILLISECONDS),
+								computeSettingsValue(
+										(ConnectionPoolSettings it) -> it.getMaintenanceInitialDelay(TimeUnit.MILLISECONDS),
+										defaultSettings.getConnectionPoolSettings(), connectionPoolSettings, null));
+
+						applySettings(settings::minSize,
+								computeSettingsValue(ConnectionPoolSettings::getMinSize, defaultSettings.getConnectionPoolSettings(),
+										connectionPoolSettings, connectionString.getMinConnectionPoolSize()));
+						applySettings(settings::maxSize,
+								computeSettingsValue(ConnectionPoolSettings::getMaxSize, defaultSettings.getConnectionPoolSettings(),
+										connectionPoolSettings, connectionString.getMaxConnectionPoolSize()));
+					}) //
+					.applyToSocketSettings(settings -> {
+
+						applySettings(it -> settings.connectTimeout(it, TimeUnit.MILLISECONDS),
+								computeSettingsValue((SocketSettings it) -> it.getConnectTimeout(TimeUnit.MILLISECONDS),
+										defaultSettings.getSocketSettings(), socketSettings, connectionString.getConnectTimeout()));
+
+						applySettings(it -> settings.readTimeout(it, TimeUnit.MILLISECONDS),
+								computeSettingsValue((SocketSettings it) -> it.getReadTimeout(TimeUnit.MILLISECONDS),
+										defaultSettings.getSocketSettings(), socketSettings, connectionString.getSocketTimeout()));
+						applySettings(settings::receiveBufferSize, computeSettingsValue(SocketSettings::getReceiveBufferSize,
+								defaultSettings.getSocketSettings(), socketSettings, null));
+						applySettings(settings::sendBufferSize, computeSettingsValue(SocketSettings::getSendBufferSize,
+								defaultSettings.getSocketSettings(), socketSettings, null));
+					}) //
+					.applyToServerSettings(settings -> {
+
+						applySettings(it -> settings.minHeartbeatFrequency(it.intValue(), TimeUnit.MILLISECONDS),
+								computeSettingsValue((ServerSettings it) -> it.getMinHeartbeatFrequency(TimeUnit.MILLISECONDS),
+										defaultSettings.getServerSettings(), serverSettings, null));
+
+						applySettings(it -> settings.heartbeatFrequency(it.intValue(), TimeUnit.MILLISECONDS),
+								computeSettingsValue((ServerSettings it) -> it.getHeartbeatFrequency(TimeUnit.MILLISECONDS),
+										defaultSettings.getServerSettings(), serverSettings, connectionString.getHeartbeatFrequency()));
+						settings.applySettings(serverSettings);
+					}) //
+					.autoEncryptionSettings(mongoClientSettings.getAutoEncryptionSettings()) //
+					.codecRegistry(mongoClientSettings.getCodecRegistry()); //
+
+			applySettings(builder::readConcern, computeSettingsValue(defaultSettings.getReadConcern(),
+					mongoClientSettings.getReadConcern(), connectionString.getReadConcern()));
+			applySettings(builder::writeConcern, computeSettingsValue(defaultSettings.getWriteConcern(),
+					mongoClientSettings.getWriteConcern(), connectionString.getWriteConcern()));
+			applySettings(builder::readPreference, computeSettingsValue(defaultSettings.getReadPreference(),
+					mongoClientSettings.getReadPreference(), connectionString.getReadPreference()));
+			applySettings(builder::retryReads, computeSettingsValue(defaultSettings.getRetryReads(),
+					mongoClientSettings.getRetryReads(), connectionString.getRetryReads()));
+			applySettings(builder::retryWrites, computeSettingsValue(defaultSettings.getRetryWrites(),
+					mongoClientSettings.getRetryWrites(), connectionString.getRetryWritesValue()));
+			applySettings(builder::uuidRepresentation,
+					computeSettingsValue(null, mongoClientSettings.getUuidRepresentation(), UuidRepresentation.JAVA_LEGACY));
+		}
+
+		if (!CollectionUtils.isEmpty(credential)) {
+			builder = builder.credential(credential.iterator().next());
+		}
+
+		if (StringUtils.hasText(replicaSet)) {
+			builder.applyToClusterSettings((settings) -> {
+				settings.requiredReplicaSetName(replicaSet);
+			});
+		}
+
+		return builder.build();
 	}
 
-	/**
-	 * Returns the given array as {@link List} with all {@literal null} elements removed.
-	 *
-	 * @param elements the elements to filter <T>, can be {@literal null}.
-	 * @return a new unmodifiable {@link List#} from the given elements without {@literal null}s.
-	 */
-	private static <T> List<T> filterNonNullElementsAsList(@Nullable T[] elements) {
+	private <T> void applySettings(Consumer<T> settingsBuilder, @Nullable T value) {
 
-		if (elements == null) {
-			return Collections.emptyList();
+		if (ObjectUtils.isEmpty(value)) {
+			return;
 		}
+		settingsBuilder.accept(value);
+	}
 
-		List<T> candidateElements = new ArrayList<T>();
+	private <S, T> @Nullable T computeSettingsValue(Function<S, T> function, S defaultValueHolder, S settingsValueHolder,
+			@Nullable T connectionStringValue) {
+		return computeSettingsValue(function.apply(defaultValueHolder), function.apply(settingsValueHolder),
+				connectionStringValue);
+	}
+
+	private <T> @Nullable T computeSettingsValue(@Nullable T defaultValue, T fromSettings, @Nullable T fromConnectionString) {
 
-		for (T element : elements) {
-			if (element != null) {
-				candidateElements.add(element);
-			}
+		boolean fromSettingsIsDefault = ObjectUtils.nullSafeEquals(defaultValue, fromSettings);
+		boolean fromConnectionStringIsDefault = ObjectUtils.nullSafeEquals(defaultValue, fromConnectionString);
+
+		if (!fromSettingsIsDefault) {
+			return fromSettings;
 		}
+		return !fromConnectionStringIsDefault ? fromConnectionString : defaultValue;
+	}
 
-		return Collections.unmodifiableList(candidateElements);
+	private MongoClient createMongoClient(MongoClientSettings settings) throws UnknownHostException {
+		return MongoClients.create(settings, SpringDataMongoDB.driverInformation());
+	}
+
+	private String getOrDefault(@Nullable Object value, String defaultValue) {
+
+		if(value == null) {
+			return defaultValue;
+		}
+		String sValue = value.toString();
+		return StringUtils.hasText(sValue) ? sValue : defaultValue;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBean.java
deleted file mode 100644
index 84c3941883..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBean.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import javax.net.SocketFactory;
-import javax.net.ssl.SSLSocketFactory;
-
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.lang.Nullable;
-
-import com.mongodb.AutoEncryptionSettings;
-import com.mongodb.DBDecoderFactory;
-import com.mongodb.DBEncoderFactory;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-
-/**
- * A factory bean for construction of a {@link MongoClientOptions} instance.
- *
- * @author Christoph Strobl
- * @author Oliver Gierke
- * @author Mark Paluch
- * @since 1.7
- * @deprecated since 2.2 - There is no replacement for this {@link org.springframework.beans.factory.FactoryBean}.
- *             However moving forward there will be a dedicated factory bean for {@link com.mongodb.MongoClientSettings}
- *             replacing {@link MongoClientOptions}.
- */
-@Deprecated
-public class MongoClientOptionsFactoryBean extends AbstractFactoryBean<MongoClientOptions> {
-
-	private static final MongoClientOptions DEFAULT_MONGO_OPTIONS = MongoClientOptions.builder().build();
-
-	// TODO: Mongo Driver 4 - use application name insetad of description if not available
-	private @Nullable String description = DEFAULT_MONGO_OPTIONS.getApplicationName();
-	private int minConnectionsPerHost = DEFAULT_MONGO_OPTIONS.getMinConnectionsPerHost();
-	private int connectionsPerHost = DEFAULT_MONGO_OPTIONS.getConnectionsPerHost();
-	private int threadsAllowedToBlockForConnectionMultiplier = DEFAULT_MONGO_OPTIONS
-			.getThreadsAllowedToBlockForConnectionMultiplier();
-	private int maxWaitTime = DEFAULT_MONGO_OPTIONS.getMaxWaitTime();
-	private int maxConnectionIdleTime = DEFAULT_MONGO_OPTIONS.getMaxConnectionIdleTime();
-	private int maxConnectionLifeTime = DEFAULT_MONGO_OPTIONS.getMaxConnectionLifeTime();
-	private int connectTimeout = DEFAULT_MONGO_OPTIONS.getConnectTimeout();
-	private int socketTimeout = DEFAULT_MONGO_OPTIONS.getSocketTimeout();
-
-	// TODO: Mongo Driver 4 - check if available
-	private boolean socketKeepAlive = DEFAULT_MONGO_OPTIONS.isSocketKeepAlive();
-	private @Nullable ReadPreference readPreference = DEFAULT_MONGO_OPTIONS.getReadPreference();
-	private DBDecoderFactory dbDecoderFactory = DEFAULT_MONGO_OPTIONS.getDbDecoderFactory();
-	private DBEncoderFactory dbEncoderFactory = DEFAULT_MONGO_OPTIONS.getDbEncoderFactory();
-	private @Nullable WriteConcern writeConcern = DEFAULT_MONGO_OPTIONS.getWriteConcern();
-	private @Nullable SocketFactory socketFactory = DEFAULT_MONGO_OPTIONS.getSocketFactory();
-	private boolean cursorFinalizerEnabled = DEFAULT_MONGO_OPTIONS.isCursorFinalizerEnabled();
-
-	// TODO: Mongo Driver 4 - remove this option
-	private boolean alwaysUseMBeans = DEFAULT_MONGO_OPTIONS.isAlwaysUseMBeans();
-	private int heartbeatFrequency = DEFAULT_MONGO_OPTIONS.getHeartbeatFrequency();
-	private int minHeartbeatFrequency = DEFAULT_MONGO_OPTIONS.getMinHeartbeatFrequency();
-	private int heartbeatConnectTimeout = DEFAULT_MONGO_OPTIONS.getHeartbeatConnectTimeout();
-	private int heartbeatSocketTimeout = DEFAULT_MONGO_OPTIONS.getHeartbeatSocketTimeout();
-	private String requiredReplicaSetName = DEFAULT_MONGO_OPTIONS.getRequiredReplicaSetName();
-	private int serverSelectionTimeout = DEFAULT_MONGO_OPTIONS.getServerSelectionTimeout();
-
-	private boolean ssl;
-	private @Nullable SSLSocketFactory sslSocketFactory;
-	private @Nullable AutoEncryptionSettings autoEncryptionSettings;
-
-	/**
-	 * Set the {@link MongoClient} description.
-	 *
-	 * @param description
-	 */
-	// TODO: Mongo Driver 4 - deprecate that one and add application name
-	public void setDescription(@Nullable String description) {
-		this.description = description;
-	}
-
-	/**
-	 * Set the minimum number of connections per host.
-	 *
-	 * @param minConnectionsPerHost
-	 */
-	public void setMinConnectionsPerHost(int minConnectionsPerHost) {
-		this.minConnectionsPerHost = minConnectionsPerHost;
-	}
-
-	/**
-	 * Set the number of connections allowed per host. Will block if run out. Default is 10. System property
-	 * {@code MONGO.POOLSIZE} can override
-	 *
-	 * @param connectionsPerHost
-	 */
-	public void setConnectionsPerHost(int connectionsPerHost) {
-		this.connectionsPerHost = connectionsPerHost;
-	}
-
-	/**
-	 * Set the multiplier for connectionsPerHost for # of threads that can block. Default is 5. If connectionsPerHost is
-	 * 10, and threadsAllowedToBlockForConnectionMultiplier is 5, then 50 threads can block more than that and an
-	 * exception will be thrown.
-	 *
-	 * @param threadsAllowedToBlockForConnectionMultiplier
-	 */
-	public void setThreadsAllowedToBlockForConnectionMultiplier(int threadsAllowedToBlockForConnectionMultiplier) {
-		this.threadsAllowedToBlockForConnectionMultiplier = threadsAllowedToBlockForConnectionMultiplier;
-	}
-
-	/**
-	 * Set the max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
-	 *
-	 * @param maxWaitTime
-	 */
-	public void setMaxWaitTime(int maxWaitTime) {
-		this.maxWaitTime = maxWaitTime;
-	}
-
-	/**
-	 * The maximum idle time for a pooled connection.
-	 *
-	 * @param maxConnectionIdleTime
-	 */
-	public void setMaxConnectionIdleTime(int maxConnectionIdleTime) {
-		this.maxConnectionIdleTime = maxConnectionIdleTime;
-	}
-
-	/**
-	 * Set the maximum life time for a pooled connection.
-	 *
-	 * @param maxConnectionLifeTime
-	 */
-	public void setMaxConnectionLifeTime(int maxConnectionLifeTime) {
-		this.maxConnectionLifeTime = maxConnectionLifeTime;
-	}
-
-	/**
-	 * Set the connect timeout in milliseconds. 0 is default and infinite.
-	 *
-	 * @param connectTimeout
-	 */
-	public void setConnectTimeout(int connectTimeout) {
-		this.connectTimeout = connectTimeout;
-	}
-
-	/**
-	 * Set the socket timeout. 0 is default and infinite.
-	 *
-	 * @param socketTimeout
-	 */
-	public void setSocketTimeout(int socketTimeout) {
-		this.socketTimeout = socketTimeout;
-	}
-
-	/**
-	 * Set the keep alive flag, controls whether or not to have socket keep alive timeout. Defaults to false.
-	 *
-	 * @param socketKeepAlive
-	 */
-	public void setSocketKeepAlive(boolean socketKeepAlive) {
-		this.socketKeepAlive = socketKeepAlive;
-	}
-
-	/**
-	 * Set the {@link ReadPreference}.
-	 *
-	 * @param readPreference
-	 */
-	public void setReadPreference(@Nullable ReadPreference readPreference) {
-		this.readPreference = readPreference;
-	}
-
-	/**
-	 * Set the {@link WriteConcern} that will be the default value used when asking the {@link MongoDbFactory} for a DB
-	 * object.
-	 *
-	 * @param writeConcern
-	 */
-	public void setWriteConcern(@Nullable WriteConcern writeConcern) {
-		this.writeConcern = writeConcern;
-	}
-
-	/**
-	 * @param socketFactory
-	 */
-	public void setSocketFactory(@Nullable SocketFactory socketFactory) {
-		this.socketFactory = socketFactory;
-	}
-
-	/**
-	 * Set the frequency that the driver will attempt to determine the current state of each server in the cluster.
-	 *
-	 * @param heartbeatFrequency
-	 */
-	public void setHeartbeatFrequency(int heartbeatFrequency) {
-		this.heartbeatFrequency = heartbeatFrequency;
-	}
-
-	/**
-	 * In the event that the driver has to frequently re-check a server's availability, it will wait at least this long
-	 * since the previous check to avoid wasted effort.
-	 *
-	 * @param minHeartbeatFrequency
-	 */
-	public void setMinHeartbeatFrequency(int minHeartbeatFrequency) {
-		this.minHeartbeatFrequency = minHeartbeatFrequency;
-	}
-
-	/**
-	 * Set the connect timeout for connections used for the cluster heartbeat.
-	 *
-	 * @param heartbeatConnectTimeout
-	 */
-	public void setHeartbeatConnectTimeout(int heartbeatConnectTimeout) {
-		this.heartbeatConnectTimeout = heartbeatConnectTimeout;
-	}
-
-	/**
-	 * Set the socket timeout for connections used for the cluster heartbeat.
-	 *
-	 * @param heartbeatSocketTimeout
-	 */
-	public void setHeartbeatSocketTimeout(int heartbeatSocketTimeout) {
-		this.heartbeatSocketTimeout = heartbeatSocketTimeout;
-	}
-
-	/**
-	 * Configures the name of the replica set.
-	 *
-	 * @param requiredReplicaSetName
-	 */
-	public void setRequiredReplicaSetName(String requiredReplicaSetName) {
-		this.requiredReplicaSetName = requiredReplicaSetName;
-	}
-
-	/**
-	 * This controls if the driver should us an SSL connection. Defaults to {@literal false}.
-	 *
-	 * @param ssl
-	 */
-	public void setSsl(boolean ssl) {
-		this.ssl = ssl;
-	}
-
-	/**
-	 * Set the {@link SSLSocketFactory} to use for the {@literal SSL} connection. If none is configured here,
-	 * {@link SSLSocketFactory#getDefault()} will be used.
-	 *
-	 * @param sslSocketFactory
-	 */
-	public void setSslSocketFactory(@Nullable SSLSocketFactory sslSocketFactory) {
-
-		this.sslSocketFactory = sslSocketFactory;
-		this.ssl = sslSocketFactory != null;
-	}
-
-	/**
-	 * Set the {@literal server selection timeout} in msec for a 3.x MongoDB Java driver. If not set the default value of
-	 * 30 sec will be used. A value of 0 means that it will timeout immediately if no server is available. A negative
-	 * value means to wait indefinitely.
-	 *
-	 * @param serverSelectionTimeout in msec.
-	 */
-	public void setServerSelectionTimeout(int serverSelectionTimeout) {
-		this.serverSelectionTimeout = serverSelectionTimeout;
-	}
-
-	/**
-	 * Set the {@link AutoEncryptionSettings} to be used.
-	 *
-	 * @param autoEncryptionSettings can be {@literal null}.
-	 * @since 2.2
-	 */
-	public void setAutoEncryptionSettings(@Nullable AutoEncryptionSettings autoEncryptionSettings) {
-		this.autoEncryptionSettings = autoEncryptionSettings;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
-	 */
-	@SuppressWarnings("ConstantConditions")
-	@Override
-	protected MongoClientOptions createInstance() throws Exception {
-
-		SocketFactory socketFactoryToUse = ssl
-				? (sslSocketFactory != null ? sslSocketFactory : SSLSocketFactory.getDefault())
-				: this.socketFactory;
-
-		return MongoClientOptions.builder() //
-				.alwaysUseMBeans(this.alwaysUseMBeans) //
-				.connectionsPerHost(this.connectionsPerHost) //
-				.connectTimeout(connectTimeout) //
-				.cursorFinalizerEnabled(cursorFinalizerEnabled) //
-				.dbDecoderFactory(dbDecoderFactory) //
-				.dbEncoderFactory(dbEncoderFactory) //
-				.applicationName(description) // TODO: Mongo Driver 4 - use application name if description not available
-				.heartbeatConnectTimeout(heartbeatConnectTimeout) //
-				.heartbeatFrequency(heartbeatFrequency) //
-				.heartbeatSocketTimeout(heartbeatSocketTimeout) //
-				.maxConnectionIdleTime(maxConnectionIdleTime) //
-				.maxConnectionLifeTime(maxConnectionLifeTime) //
-				.maxWaitTime(maxWaitTime) //
-				.minConnectionsPerHost(minConnectionsPerHost) //
-				.minHeartbeatFrequency(minHeartbeatFrequency) //
-				.readPreference(readPreference) //
-				.requiredReplicaSetName(requiredReplicaSetName) //
-				.serverSelectionTimeout(serverSelectionTimeout) //
-				.sslEnabled(ssl) //
-				.autoEncryptionSettings(autoEncryptionSettings) //
-				.socketFactory(socketFactoryToUse) // TODO: Mongo Driver 4 -
-				.socketKeepAlive(socketKeepAlive) // TODO: Mongo Driver 4 - remove if not available
-				.socketTimeout(socketTimeout) //
-				.threadsAllowedToBlockForConnectionMultiplier(threadsAllowedToBlockForConnectionMultiplier) //
-				.writeConcern(writeConcern).build();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
-	public Class<?> getObjectType() {
-		return MongoClientOptions.class;
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java
new file mode 100644
index 0000000000..813d3a4a04
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBean.java
@@ -0,0 +1,497 @@
+/*
+ * Copyright 2019-2025 the original author 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.security.NoSuchAlgorithmException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLContext;
+
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
+import org.springframework.beans.factory.config.AbstractFactoryBean;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoClientSettings.Builder;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerApi;
+import com.mongodb.WriteConcern;
+import com.mongodb.connection.ClusterConnectionMode;
+import com.mongodb.connection.ClusterType;
+import com.mongodb.connection.TransportSettings;
+
+/**
+ * A factory bean for construction of a {@link MongoClientSettings} instance to be used with a MongoDB driver.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.0
+ */
+public class MongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoClientSettings> {
+
+	private static final MongoClientSettings DEFAULT_MONGO_SETTINGS = MongoClientSettings.builder().build();
+
+	private CodecRegistry codecRegistry = DEFAULT_MONGO_SETTINGS.getCodecRegistry();
+
+	@Nullable private TransportSettings transportSettings;
+
+	private ReadPreference readPreference = DEFAULT_MONGO_SETTINGS.getReadPreference();
+	private ReadConcern readConcern = DEFAULT_MONGO_SETTINGS.getReadConcern();
+	private @Nullable Boolean retryReads = null;
+
+	private WriteConcern writeConcern = DEFAULT_MONGO_SETTINGS.getWriteConcern();
+	private @Nullable Boolean retryWrites = null;
+
+	private @Nullable String applicationName = null;
+
+	private @Nullable UuidRepresentation uUidRepresentation = null;
+
+	// --> Socket Settings
+
+	private int socketConnectTimeoutMS = DEFAULT_MONGO_SETTINGS.getSocketSettings()
+			.getConnectTimeout(TimeUnit.MILLISECONDS);
+	private int socketReadTimeoutMS = DEFAULT_MONGO_SETTINGS.getSocketSettings().getReadTimeout(TimeUnit.MILLISECONDS);
+	private int socketReceiveBufferSize = DEFAULT_MONGO_SETTINGS.getSocketSettings().getReceiveBufferSize();
+	private int socketSendBufferSize = DEFAULT_MONGO_SETTINGS.getSocketSettings().getSendBufferSize();
+
+	// --> Cluster Settings
+
+	private @Nullable String clusterSrvHost = DEFAULT_MONGO_SETTINGS.getClusterSettings().getSrvHost();
+	private List<ServerAddress> clusterHosts = Collections.emptyList();
+	private @Nullable ClusterConnectionMode clusterConnectionMode = null;
+	private ClusterType custerRequiredClusterType = DEFAULT_MONGO_SETTINGS.getClusterSettings().getRequiredClusterType();
+	private String clusterRequiredReplicaSetName = DEFAULT_MONGO_SETTINGS.getClusterSettings()
+			.getRequiredReplicaSetName();
+	private long clusterLocalThresholdMS = DEFAULT_MONGO_SETTINGS.getClusterSettings()
+			.getLocalThreshold(TimeUnit.MILLISECONDS);
+	private long clusterServerSelectionTimeoutMS = DEFAULT_MONGO_SETTINGS.getClusterSettings()
+			.getServerSelectionTimeout(TimeUnit.MILLISECONDS);
+
+	// --> ConnectionPoolSettings
+
+	private int poolMaxSize = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings().getMaxSize();
+	private int poolMinSize = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings().getMinSize();
+	private long poolMaxWaitTimeMS = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings()
+			.getMaxWaitTime(TimeUnit.MILLISECONDS);
+	private long poolMaxConnectionLifeTimeMS = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings()
+			.getMaxConnectionLifeTime(TimeUnit.MILLISECONDS);
+	private long poolMaxConnectionIdleTimeMS = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings()
+			.getMaxConnectionIdleTime(TimeUnit.MILLISECONDS);
+	private long poolMaintenanceInitialDelayMS = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings()
+			.getMaintenanceInitialDelay(TimeUnit.MILLISECONDS);
+	private long poolMaintenanceFrequencyMS = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings()
+			.getMaintenanceFrequency(TimeUnit.MILLISECONDS);
+
+	// --> SSL Settings
+
+	private boolean sslEnabled = DEFAULT_MONGO_SETTINGS.getSslSettings().isEnabled();
+	private boolean sslInvalidHostNameAllowed = DEFAULT_MONGO_SETTINGS.getSslSettings().isInvalidHostNameAllowed();
+	private String sslProvider = DEFAULT_MONGO_SETTINGS.getSslSettings().isEnabled()
+			? DEFAULT_MONGO_SETTINGS.getSslSettings().getContext().getProvider().getName()
+			: "";
+
+	// encryption and retry
+
+	private @Nullable AutoEncryptionSettings autoEncryptionSettings;
+	private @Nullable ServerApi serverApi;
+
+	/**
+	 * @param socketConnectTimeoutMS in msec
+	 * @see com.mongodb.connection.SocketSettings.Builder#connectTimeout(int, TimeUnit)
+	 */
+	public void setSocketConnectTimeoutMS(int socketConnectTimeoutMS) {
+		this.socketConnectTimeoutMS = socketConnectTimeoutMS;
+	}
+
+	/**
+	 * @param socketReadTimeoutMS in msec
+	 * @see com.mongodb.connection.SocketSettings.Builder#readTimeout(int, TimeUnit)
+	 */
+	public void setSocketReadTimeoutMS(int socketReadTimeoutMS) {
+		this.socketReadTimeoutMS = socketReadTimeoutMS;
+	}
+
+	/**
+	 * @param socketReceiveBufferSize
+	 * @see com.mongodb.connection.SocketSettings.Builder#receiveBufferSize(int)
+	 */
+	public void setSocketReceiveBufferSize(int socketReceiveBufferSize) {
+		this.socketReceiveBufferSize = socketReceiveBufferSize;
+	}
+
+	/**
+	 * @param socketSendBufferSize
+	 * @see com.mongodb.connection.SocketSettings.Builder#sendBufferSize(int)
+	 */
+	public void setSocketSendBufferSize(int socketSendBufferSize) {
+		this.socketSendBufferSize = socketSendBufferSize;
+	}
+
+	// --> Server Settings
+
+	private long serverHeartbeatFrequencyMS = DEFAULT_MONGO_SETTINGS.getServerSettings()
+			.getHeartbeatFrequency(TimeUnit.MILLISECONDS);
+	private long serverMinHeartbeatFrequencyMS = DEFAULT_MONGO_SETTINGS.getServerSettings()
+			.getMinHeartbeatFrequency(TimeUnit.MILLISECONDS);
+
+	/**
+	 * @param serverHeartbeatFrequencyMS in msec
+	 * @see com.mongodb.connection.ServerSettings.Builder#heartbeatFrequency(long, TimeUnit)
+	 */
+	public void setServerHeartbeatFrequencyMS(long serverHeartbeatFrequencyMS) {
+		this.serverHeartbeatFrequencyMS = serverHeartbeatFrequencyMS;
+	}
+
+	/**
+	 * @param serverMinHeartbeatFrequencyMS in msec
+	 * @see com.mongodb.connection.ServerSettings.Builder#minHeartbeatFrequency(long, TimeUnit)
+	 */
+	public void setServerMinHeartbeatFrequencyMS(long serverMinHeartbeatFrequencyMS) {
+		this.serverMinHeartbeatFrequencyMS = serverMinHeartbeatFrequencyMS;
+	}
+
+	// --> Cluster Settings
+
+	/**
+	 * @param clusterSrvHost
+	 * @see com.mongodb.connection.ClusterSettings.Builder#srvHost(String)
+	 */
+	public void setClusterSrvHost(String clusterSrvHost) {
+		this.clusterSrvHost = clusterSrvHost;
+	}
+
+	/**
+	 * @param clusterHosts
+	 * @see com.mongodb.connection.ClusterSettings.Builder#hosts(List)
+	 */
+	public void setClusterHosts(ServerAddress[] clusterHosts) {
+		this.clusterHosts = Arrays.asList(clusterHosts);
+	}
+
+	/**
+	 * ????
+	 *
+	 * @param clusterConnectionMode
+	 * @see com.mongodb.connection.ClusterSettings.Builder#mode(ClusterConnectionMode)
+	 */
+	public void setClusterConnectionMode(ClusterConnectionMode clusterConnectionMode) {
+		this.clusterConnectionMode = clusterConnectionMode;
+	}
+
+	/**
+	 * @param custerRequiredClusterType
+	 * @see com.mongodb.connection.ClusterSettings.Builder#requiredClusterType(ClusterType)
+	 */
+	public void setCusterRequiredClusterType(ClusterType custerRequiredClusterType) {
+		this.custerRequiredClusterType = custerRequiredClusterType;
+	}
+
+	/**
+	 * @param clusterRequiredReplicaSetName
+	 * @see com.mongodb.connection.ClusterSettings.Builder#requiredReplicaSetName(String)
+	 */
+	public void setClusterRequiredReplicaSetName(String clusterRequiredReplicaSetName) {
+		this.clusterRequiredReplicaSetName = clusterRequiredReplicaSetName;
+	}
+
+	/**
+	 * @param clusterLocalThresholdMS in msec
+	 * @see com.mongodb.connection.ClusterSettings.Builder#localThreshold(long, TimeUnit)
+	 */
+	public void setClusterLocalThresholdMS(long clusterLocalThresholdMS) {
+		this.clusterLocalThresholdMS = clusterLocalThresholdMS;
+	}
+
+	/**
+	 * @param clusterServerSelectionTimeoutMS in msec
+	 * @see com.mongodb.connection.ClusterSettings.Builder#serverSelectionTimeout(long, TimeUnit)
+	 */
+	public void setClusterServerSelectionTimeoutMS(long clusterServerSelectionTimeoutMS) {
+		this.clusterServerSelectionTimeoutMS = clusterServerSelectionTimeoutMS;
+	}
+
+	// --> ConnectionPoolSettings
+
+	/**
+	 * @param poolMaxSize
+	 * @see com.mongodb.connection.ConnectionPoolSettings.Builder#maxSize(int)
+	 */
+	public void setPoolMaxSize(int poolMaxSize) {
+		this.poolMaxSize = poolMaxSize;
+	}
+
+	/**
+	 * @param poolMinSize
+	 * @see com.mongodb.connection.ConnectionPoolSettings.Builder#minSize(int)
+	 */
+	public void setPoolMinSize(int poolMinSize) {
+		this.poolMinSize = poolMinSize;
+	}
+
+	/**
+	 * @param poolMaxWaitTimeMS in mesec
+	 * @see com.mongodb.connection.ConnectionPoolSettings.Builder#maxWaitTime(long, TimeUnit)
+	 */
+	public void setPoolMaxWaitTimeMS(long poolMaxWaitTimeMS) {
+		this.poolMaxWaitTimeMS = poolMaxWaitTimeMS;
+	}
+
+	/**
+	 * @param poolMaxConnectionLifeTimeMS in msec
+	 * @see com.mongodb.connection.ConnectionPoolSettings.Builder#maxConnectionLifeTime(long, TimeUnit)
+	 */
+	public void setPoolMaxConnectionLifeTimeMS(long poolMaxConnectionLifeTimeMS) {
+		this.poolMaxConnectionLifeTimeMS = poolMaxConnectionLifeTimeMS;
+	}
+
+	/**
+	 * @param poolMaxConnectionIdleTimeMS in msec
+	 * @see com.mongodb.connection.ConnectionPoolSettings.Builder#maxConnectionIdleTime(long, TimeUnit)
+	 */
+	public void setPoolMaxConnectionIdleTimeMS(long poolMaxConnectionIdleTimeMS) {
+		this.poolMaxConnectionIdleTimeMS = poolMaxConnectionIdleTimeMS;
+	}
+
+	/**
+	 * @param poolMaintenanceInitialDelayMS in msec
+	 * @see com.mongodb.connection.ConnectionPoolSettings.Builder#maintenanceInitialDelay(long, TimeUnit)
+	 */
+	public void setPoolMaintenanceInitialDelayMS(long poolMaintenanceInitialDelayMS) {
+		this.poolMaintenanceInitialDelayMS = poolMaintenanceInitialDelayMS;
+	}
+
+	/**
+	 * @param poolMaintenanceFrequencyMS in msec
+	 * @see com.mongodb.connection.ConnectionPoolSettings.Builder#maintenanceFrequency(long, TimeUnit)
+	 */
+	public void setPoolMaintenanceFrequencyMS(long poolMaintenanceFrequencyMS) {
+		this.poolMaintenanceFrequencyMS = poolMaintenanceFrequencyMS;
+	}
+
+	// --> SSL Settings
+
+	/**
+	 * @param sslEnabled
+	 * @see com.mongodb.connection.SslSettings.Builder#enabled(boolean)
+	 */
+	public void setSslEnabled(Boolean sslEnabled) {
+		this.sslEnabled = sslEnabled;
+	}
+
+	/**
+	 * @param sslInvalidHostNameAllowed
+	 * @see com.mongodb.connection.SslSettings.Builder#invalidHostNameAllowed(boolean)
+	 */
+	public void setSslInvalidHostNameAllowed(Boolean sslInvalidHostNameAllowed) {
+		this.sslInvalidHostNameAllowed = sslInvalidHostNameAllowed;
+	}
+
+	/**
+	 * @param sslProvider
+	 * @see com.mongodb.connection.SslSettings.Builder#context(SSLContext)
+	 * @see SSLContext#getInstance(String)
+	 */
+	public void setSslProvider(String sslProvider) {
+		this.sslProvider = sslProvider;
+	}
+
+	// encryption and retry
+
+	/**
+	 * @param applicationName
+	 * @see MongoClientSettings.Builder#applicationName(String)
+	 */
+	public void setApplicationName(@Nullable String applicationName) {
+		this.applicationName = applicationName;
+	}
+
+	/**
+	 * @param retryReads
+	 * @see MongoClientSettings.Builder#retryReads(boolean)
+	 */
+	public void setRetryReads(@Nullable Boolean retryReads) {
+		this.retryReads = retryReads;
+	}
+
+	/**
+	 * @param readConcern
+	 * @see MongoClientSettings.Builder#readConcern(ReadConcern)
+	 */
+	public void setReadConcern(ReadConcern readConcern) {
+		this.readConcern = readConcern;
+	}
+
+	/**
+	 * @param writeConcern
+	 * @see MongoClientSettings.Builder#writeConcern(WriteConcern)
+	 */
+	public void setWriteConcern(WriteConcern writeConcern) {
+		this.writeConcern = writeConcern;
+	}
+
+	/**
+	 * @param retryWrites
+	 * @see MongoClientSettings.Builder#retryWrites(boolean)
+	 */
+	public void setRetryWrites(@Nullable Boolean retryWrites) {
+		this.retryWrites = retryWrites;
+	}
+
+	/**
+	 * @param readPreference
+	 * @see MongoClientSettings.Builder#readPreference(ReadPreference)
+	 */
+	public void setReadPreference(ReadPreference readPreference) {
+		this.readPreference = readPreference;
+	}
+
+	public void setTransportSettings(@Nullable TransportSettings transportSettings) {
+		this.transportSettings = transportSettings;
+	}
+
+	/**
+	 * @param codecRegistry
+	 * @see MongoClientSettings.Builder#codecRegistry(CodecRegistry)
+	 */
+	public void setCodecRegistry(CodecRegistry codecRegistry) {
+		this.codecRegistry = codecRegistry;
+	}
+
+	/**
+	 * @param uUidRepresentation
+	 */
+	public void setuUidRepresentation(@Nullable UuidRepresentation uUidRepresentation) {
+		this.uUidRepresentation = uUidRepresentation;
+	}
+
+	/**
+	 * @param autoEncryptionSettings can be {@literal null}.
+	 * @see MongoClientSettings.Builder#autoEncryptionSettings(AutoEncryptionSettings)
+	 */
+	public void setAutoEncryptionSettings(@Nullable AutoEncryptionSettings autoEncryptionSettings) {
+		this.autoEncryptionSettings = autoEncryptionSettings;
+	}
+
+	/**
+	 * @param serverApi can be {@literal null}.
+	 * @see MongoClientSettings.Builder#serverApi(ServerApi)
+	 * @since 3.3
+	 */
+	public void setServerApi(@Nullable ServerApi serverApi) {
+		this.serverApi = serverApi;
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return MongoClientSettings.class;
+	}
+
+	@Override
+	protected MongoClientSettings createInstance() {
+
+		Builder builder = MongoClientSettings.builder() //
+				.readPreference(readPreference) //
+				.writeConcern(writeConcern) //
+				.readConcern(readConcern) //
+				.codecRegistry(codecRegistry) //
+				.applicationName(applicationName) //
+				.autoEncryptionSettings(autoEncryptionSettings) //
+				.applyToClusterSettings((settings) -> {
+
+					settings.serverSelectionTimeout(clusterServerSelectionTimeoutMS, TimeUnit.MILLISECONDS);
+					if (clusterConnectionMode != null) {
+						settings.mode(clusterConnectionMode);
+					}
+					settings.requiredReplicaSetName(clusterRequiredReplicaSetName);
+
+					if (!CollectionUtils.isEmpty(clusterHosts)) {
+						settings.hosts(clusterHosts);
+					}
+					settings.localThreshold(clusterLocalThresholdMS, TimeUnit.MILLISECONDS);
+					settings.requiredClusterType(custerRequiredClusterType);
+
+					if (StringUtils.hasText(clusterSrvHost)) {
+						settings.srvHost(clusterSrvHost);
+					}
+				}) //
+				.applyToConnectionPoolSettings((settings) -> {
+
+					settings.minSize(poolMinSize);
+					settings.maxSize(poolMaxSize);
+					settings.maxConnectionIdleTime(poolMaxConnectionIdleTimeMS, TimeUnit.MILLISECONDS);
+					settings.maxWaitTime(poolMaxWaitTimeMS, TimeUnit.MILLISECONDS);
+					settings.maxConnectionLifeTime(poolMaxConnectionLifeTimeMS, TimeUnit.MILLISECONDS);
+					// settings.maxWaitQueueSize(poolMaxWaitQueueSize);
+					settings.maintenanceFrequency(poolMaintenanceFrequencyMS, TimeUnit.MILLISECONDS);
+					settings.maintenanceInitialDelay(poolMaintenanceInitialDelayMS, TimeUnit.MILLISECONDS);
+				}) //
+				.applyToServerSettings((settings) -> {
+
+					settings.minHeartbeatFrequency(serverMinHeartbeatFrequencyMS, TimeUnit.MILLISECONDS);
+					settings.heartbeatFrequency(serverHeartbeatFrequencyMS, TimeUnit.MILLISECONDS);
+				}) //
+				.applyToSocketSettings((settings) -> {
+
+					settings.connectTimeout(socketConnectTimeoutMS, TimeUnit.MILLISECONDS);
+					settings.readTimeout(socketReadTimeoutMS, TimeUnit.MILLISECONDS);
+					settings.receiveBufferSize(socketReceiveBufferSize);
+					settings.sendBufferSize(socketSendBufferSize);
+				}) //
+				.applyToSslSettings((settings) -> {
+
+					settings.enabled(sslEnabled);
+					if (sslEnabled) {
+
+						settings.invalidHostNameAllowed(sslInvalidHostNameAllowed);
+						try {
+							settings.context(
+									StringUtils.hasText(sslProvider) ? SSLContext.getInstance(sslProvider) : SSLContext.getDefault());
+						} catch (NoSuchAlgorithmException e) {
+							throw new IllegalArgumentException(e.getMessage(), e);
+						}
+					}
+				});
+
+		if (transportSettings != null) {
+			builder.transportSettings(transportSettings);
+		}
+
+		if (retryReads != null) {
+			builder = builder.retryReads(retryReads);
+		}
+
+		if (retryWrites != null) {
+			builder = builder.retryWrites(retryWrites);
+		}
+		if (uUidRepresentation != null) {
+			builder = builder.uuidRepresentation(uUidRepresentation);
+		}
+		if (serverApi != null) {
+			builder = builder.serverApi(serverApi);
+		}
+
+		return builder.build();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDataIntegrityViolationException.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDataIntegrityViolationException.java
index 10e0d3fe7e..df58a36770 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDataIntegrityViolationException.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDataIntegrityViolationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,9 @@
 package org.springframework.data.mongodb.core;
 
 import org.springframework.dao.DataIntegrityViolationException;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import com.mongodb.WriteResult;
+import com.mongodb.WriteConcernResult;
 
 /**
  * Mongo-specific {@link DataIntegrityViolationException}.
@@ -30,39 +29,39 @@ public class MongoDataIntegrityViolationException extends DataIntegrityViolation
 
 	private static final long serialVersionUID = -186980521176764046L;
 
-	private final WriteResult writeResult;
+	private final WriteConcernResult writeResult;
 	private final MongoActionOperation actionOperation;
 
 	/**
-	 * Creates a new {@link MongoDataIntegrityViolationException} using the given message and {@link WriteResult}.
+	 * Creates a new {@link MongoDataIntegrityViolationException} using the given message and {@link WriteConcernResult}.
 	 *
 	 * @param message the exception message
-	 * @param writeResult the {@link WriteResult} that causes the exception, must not be {@literal null}.
+	 * @param writeResult the {@link WriteConcernResult} that causes the exception, must not be {@literal null}.
 	 * @param actionOperation the {@link MongoActionOperation} that caused the exception, must not be {@literal null}.
 	 */
-	public MongoDataIntegrityViolationException(String message, WriteResult writeResult,
-												MongoActionOperation actionOperation) {
+	public MongoDataIntegrityViolationException(String message, WriteConcernResult writeResult,
+			MongoActionOperation actionOperation) {
 
 		super(message);
 
-		Assert.notNull(writeResult, "WriteResult must not be null!");
-		Assert.notNull(actionOperation, "MongoActionOperation must not be null!");
+		Assert.notNull(writeResult, "WriteResult must not be null");
+		Assert.notNull(actionOperation, "MongoActionOperation must not be null");
 
 		this.writeResult = writeResult;
 		this.actionOperation = actionOperation;
 	}
 
 	/**
-	 * Returns the {@link WriteResult} that caused the exception.
+	 * Returns the {@link WriteConcernResult} that caused the exception.
 	 *
 	 * @return the writeResult
 	 */
-	public WriteResult getWriteResult() {
+	public WriteConcernResult getWriteResult() {
 		return writeResult;
 	}
 
 	/**
-	 * Returns the {@link MongoActionOperation} in which the current exception occured.
+	 * Returns the {@link MongoActionOperation} in which the current exception occurred.
 	 *
 	 * @return the actionOperation
 	 */
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbFactorySupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java
similarity index 57%
rename from spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbFactorySupport.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java
index e607f0e3b1..0a62b7aa49 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDbFactorySupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoDatabaseFactorySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,62 +15,59 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.Value;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.SessionAwareMethodInterceptor;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 import com.mongodb.ClientSessionOptions;
-import com.mongodb.DB;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
 /**
- * Common base class for usage with both {@link com.mongodb.client.MongoClients} and {@link com.mongodb.MongoClient}
- * defining common properties such as database name and exception translator.
- * <p/>
+ * Common base class for usage with both {@link com.mongodb.client.MongoClients} defining common properties such as
+ * database name and exception translator. <br />
  * Not intended to be used directly.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
  * @param <C> Client type.
- * @since 2.1
- * @see SimpleMongoDbFactory
- * @see SimpleMongoClientDbFactory
+ * @since 3.0
+ * @see SimpleMongoClientDatabaseFactory
  */
-public abstract class MongoDbFactorySupport<C> implements MongoDbFactory {
+public abstract class MongoDatabaseFactorySupport<C> implements MongoDatabaseFactory {
 
 	private final C mongoClient;
 	private final String databaseName;
 	private final boolean mongoInstanceCreated;
-	private final PersistenceExceptionTranslator exceptionTranslator;
 
+	private PersistenceExceptionTranslator exceptionTranslator;
 	private @Nullable WriteConcern writeConcern;
 
 	/**
-	 * Create a new {@link MongoDbFactorySupport} object given {@code mongoClient}, {@code databaseName},
+	 * Create a new {@link MongoDatabaseFactorySupport} object given {@code mongoClient}, {@code databaseName},
 	 * {@code mongoInstanceCreated} and {@link PersistenceExceptionTranslator}.
-	 * 
+	 *
 	 * @param mongoClient must not be {@literal null}.
 	 * @param databaseName must not be {@literal null} or empty.
 	 * @param mongoInstanceCreated {@literal true} if the client instance was created by a subclass of
-	 *          {@link MongoDbFactorySupport} to close the client on {@link #destroy()}.
+	 *          {@link MongoDatabaseFactorySupport} to close the client on {@link #destroy()}.
 	 * @param exceptionTranslator must not be {@literal null}.
 	 */
-	protected MongoDbFactorySupport(C mongoClient, String databaseName, boolean mongoInstanceCreated,
+	protected MongoDatabaseFactorySupport(C mongoClient, String databaseName, boolean mongoInstanceCreated,
 			PersistenceExceptionTranslator exceptionTranslator) {
 
-		Assert.notNull(mongoClient, "MongoClient must not be null!");
-		Assert.hasText(databaseName, "Database name must not be empty!");
+		Assert.notNull(mongoClient, "MongoClient must not be null");
+		Assert.hasText(databaseName, "Database name must not be empty");
 		Assert.isTrue(databaseName.matches("[^/\\\\.$\"\\s]+"),
-				"Database name must not contain slashes, dots, spaces, quotes, or dollar signs!");
+				"Database name must not contain slashes, dots, spaces, quotes, or dollar signs");
 
 		this.mongoClient = mongoClient;
 		this.databaseName = databaseName;
@@ -78,31 +75,39 @@ protected MongoDbFactorySupport(C mongoClient, String databaseName, boolean mong
 		this.exceptionTranslator = exceptionTranslator;
 	}
 
+	/**
+	 * Configures the {@link PersistenceExceptionTranslator} to be used.
+	 *
+	 * @param exceptionTranslator the exception translator to set.
+	 * @since 4.4
+	 */
+	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
+		this.exceptionTranslator = exceptionTranslator;
+	}
+
+	@Override
+	public PersistenceExceptionTranslator getExceptionTranslator() {
+		return this.exceptionTranslator;
+	}
+
 	/**
 	 * Configures the {@link WriteConcern} to be used on the {@link MongoDatabase} instance being created.
 	 *
-	 * @param writeConcern the writeConcern to set
+	 * @param writeConcern the writeConcern to set.
 	 */
 	public void setWriteConcern(WriteConcern writeConcern) {
 		this.writeConcern = writeConcern;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb()
-	 */
-	public MongoDatabase getDb() throws DataAccessException {
-		return getDb(databaseName);
+	@Override
+	public MongoDatabase getMongoDatabase() throws DataAccessException {
+		return getMongoDatabase(getDefaultDatabaseName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getDb(java.lang.String)
-	 */
 	@Override
-	public MongoDatabase getDb(String dbName) throws DataAccessException {
+	public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
 
-		Assert.hasText(dbName, "Database name must not be empty!");
+		Assert.hasText(dbName, "Database name must not be empty");
 
 		MongoDatabase db = doGetMongoDatabase(dbName);
 
@@ -115,36 +120,22 @@ public MongoDatabase getDb(String dbName) throws DataAccessException {
 
 	/**
 	 * Get the actual {@link MongoDatabase} from the client.
-	 * 
+	 *
 	 * @param dbName must not be {@literal null} or empty.
 	 * @return
 	 */
 	protected abstract MongoDatabase doGetMongoDatabase(String dbName);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.DisposableBean#destroy()
-	 */
 	public void destroy() throws Exception {
 		if (mongoInstanceCreated) {
 			closeClient();
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getExceptionTranslator()
-	 */
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return this.exceptionTranslator;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#withSession(com.mongodb.session.Session)
-	 */
-	public MongoDbFactory withSession(ClientSession session) {
-		return new MongoDbFactorySupport.ClientSessionBoundMongoDbFactory(session, this);
+	@Override
+	@Contract("_ -> new")
+	public MongoDatabaseFactory withSession(ClientSession session) {
+		return new MongoDatabaseFactorySupport.ClientSessionBoundMongoDbFactory(session, this);
 	}
 
 	/**
@@ -167,76 +158,47 @@ protected String getDefaultDatabaseName() {
 	}
 
 	/**
-	 * {@link ClientSession} bound {@link MongoDbFactory} decorating the database with a
+	 * {@link ClientSession} bound {@link MongoDatabaseFactory} decorating the database with a
 	 * {@link SessionAwareMethodInterceptor}.
 	 *
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	@Value
-	static class ClientSessionBoundMongoDbFactory implements MongoDbFactory {
+	static final class ClientSessionBoundMongoDbFactory implements MongoDatabaseFactory {
 
-		ClientSession session;
-		MongoDbFactory delegate;
+		private final ClientSession session;
+		private final MongoDatabaseFactory delegate;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.MongoDbFactory#getDb()
-		 */
-		@Override
-		public MongoDatabase getDb() throws DataAccessException {
-			return proxyMongoDatabase(delegate.getDb());
+		public ClientSessionBoundMongoDbFactory(ClientSession session, MongoDatabaseFactory delegate) {
+			this.session = session;
+			this.delegate = delegate;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.MongoDbFactory#getDb(java.lang.String)
-		 */
 		@Override
-		public MongoDatabase getDb(String dbName) throws DataAccessException {
-			return proxyMongoDatabase(delegate.getDb(dbName));
+		public MongoDatabase getMongoDatabase() throws DataAccessException {
+			return proxyMongoDatabase(delegate.getMongoDatabase());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.MongoDbFactory#getExceptionTranslator()
-		 */
 		@Override
-		public PersistenceExceptionTranslator getExceptionTranslator() {
-			return delegate.getExceptionTranslator();
+		public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
+			return proxyMongoDatabase(delegate.getMongoDatabase(dbName));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.MongoDbFactory#getLegacyDb()
-		 */
 		@Override
-		public DB getLegacyDb() {
-			return delegate.getLegacyDb();
+		public PersistenceExceptionTranslator getExceptionTranslator() {
+			return delegate.getExceptionTranslator();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.MongoDbFactory#getSession(com.mongodb.ClientSessionOptions)
-		 */
 		@Override
 		public ClientSession getSession(ClientSessionOptions options) {
 			return delegate.getSession(options);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.MongoDbFactory#withSession(com.mongodb.session.ClientSession)
-		 */
 		@Override
-		public MongoDbFactory withSession(ClientSession session) {
+		public MongoDatabaseFactory withSession(ClientSession session) {
 			return delegate.withSession(session);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.MongoDbFactory#isTransactionActive()
-		 */
 		@Override
 		public boolean isTransactionActive() {
 			return session != null && session.hasActiveTransaction();
@@ -265,8 +227,42 @@ private <T> T createProxyInstance(com.mongodb.session.ClientSession session, T t
 			factory.addAdvice(new SessionAwareMethodInterceptor<>(session, target, ClientSession.class, MongoDatabase.class,
 					this::proxyDatabase, MongoCollection.class, this::proxyCollection));
 
-			return targetType.cast(factory.getProxy());
+			return targetType.cast(factory.getProxy(target.getClass().getClassLoader()));
+		}
+
+		public ClientSession getSession() {
+			return this.session;
 		}
-	}
 
+		public MongoDatabaseFactory getDelegate() {
+			return this.delegate;
+		}
+
+		@Override
+		public boolean equals(@Nullable Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+
+			ClientSessionBoundMongoDbFactory that = (ClientSessionBoundMongoDbFactory) o;
+
+			if (!ObjectUtils.nullSafeEquals(this.session, that.session)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(this.delegate, that.delegate);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(this.session);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(this.delegate);
+			return result;
+		}
+
+		public String toString() {
+			return "MongoDatabaseFactorySupport.ClientSessionBoundMongoDbFactory(session=" + this.getSession() + ", delegate="
+					+ this.getDelegate() + ")";
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java
index f09759039b..f361b19bba 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import java.util.Map;
 
 import org.bson.BsonDocument;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.FactoryBean;
-import org.springframework.lang.Nullable;
 
 import com.mongodb.AutoEncryptionSettings;
 import com.mongodb.MongoClientSettings;
@@ -34,11 +34,11 @@
 public class MongoEncryptionSettingsFactoryBean implements FactoryBean<AutoEncryptionSettings> {
 
 	private boolean bypassAutoEncryption;
-	private String keyVaultNamespace;
-	private Map<String, Object> extraOptions;
-	private MongoClientSettings keyVaultClientSettings;
-	private Map<String, Map<String, Object>> kmsProviders;
-	private Map<String, BsonDocument> schemaMap;
+	private @Nullable String keyVaultNamespace;
+	private @Nullable Map<String, Object> extraOptions;
+	private @Nullable MongoClientSettings keyVaultClientSettings;
+	private @Nullable Map<String, Map<String, Object>> kmsProviders;
+	private @Nullable Map<String, BsonDocument> schemaMap;
 
 	/**
 	 * @param bypassAutoEncryption
@@ -88,10 +88,6 @@ public void setSchemaMap(Map<String, BsonDocument> schemaMap) {
 		this.schemaMap = schemaMap;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see  org.springframework.beans.factory.FactoryBean#getObject()
-	 */
 	@Override
 	public AutoEncryptionSettings getObject() {
 
@@ -109,10 +105,6 @@ private <K, V> Map<K, V> orEmpty(@Nullable Map<K, V> source) {
 		return source != null ? source : Collections.emptyMap();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see  org.springframework.beans.factory.FactoryBean#getObjectType()
-	 */
 	@Override
 	public Class<?> getObjectType() {
 		return AutoEncryptionSettings.class;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java
index 695bec3bcc..2bde873c2f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoExceptionTranslator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,10 @@
  */
 package org.springframework.data.mongodb.core;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.bson.BsonInvalidOperationException;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -29,18 +27,16 @@
 import org.springframework.dao.InvalidDataAccessResourceUsageException;
 import org.springframework.dao.PermissionDeniedDataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.BulkOperationException;
 import org.springframework.data.mongodb.ClientSessionException;
-import org.springframework.data.mongodb.MongoTransactionException;
+import org.springframework.data.mongodb.TransientClientSessionException;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
 import org.springframework.data.mongodb.util.MongoDbErrorCodes;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
-import com.mongodb.BulkWriteException;
 import com.mongodb.MongoBulkWriteException;
 import com.mongodb.MongoException;
 import com.mongodb.MongoServerException;
+import com.mongodb.MongoSocketException;
 import com.mongodb.bulk.BulkWriteError;
 
 /**
@@ -51,28 +47,34 @@
  * @author Oliver Gierke
  * @author Michal Vich
  * @author Christoph Strobl
+ * @author Brice Vandeputte
  */
 public class MongoExceptionTranslator implements PersistenceExceptionTranslator {
 
-	private static final Set<String> DUPLICATE_KEY_EXCEPTIONS = new HashSet<>(
-			Arrays.asList("MongoException.DuplicateKey", "DuplicateKeyException"));
+	public static final MongoExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
 
-	private static final Set<String> RESOURCE_FAILURE_EXCEPTIONS = new HashSet<>(
-			Arrays.asList("MongoException.Network", "MongoSocketException", "MongoException.CursorNotFound",
-					"MongoCursorNotFoundException", "MongoServerSelectionException", "MongoTimeoutException"));
+	private static final Set<String> DUPLICATE_KEY_EXCEPTIONS = Set.of("MongoException.DuplicateKey",
+			"DuplicateKeyException");
 
-	private static final Set<String> RESOURCE_USAGE_EXCEPTIONS = new HashSet<>(
-			Collections.singletonList("MongoInternalException"));
+	private static final Set<String> RESOURCE_FAILURE_EXCEPTIONS = Set.of("MongoException.Network",
+			"MongoSocketException", "MongoException.CursorNotFound", "MongoCursorNotFoundException",
+			"MongoServerSelectionException", "MongoTimeoutException");
 
-	private static final Set<String> DATA_INTEGRITY_EXCEPTIONS = new HashSet<>(
-			Arrays.asList("WriteConcernException", "MongoWriteException", "MongoBulkWriteException"));
+	private static final Set<String> RESOURCE_USAGE_EXCEPTIONS = Set.of("MongoInternalException");
+
+	private static final Set<String> DATA_INTEGRITY_EXCEPTIONS = Set.of("WriteConcernException", "MongoWriteException",
+			"MongoBulkWriteException");
+
+	private static final Set<String> SECURITY_EXCEPTIONS = Set.of("MongoCryptException");
+
+	@Override
+	public @Nullable DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+		return doTranslateException(ex);
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.dao.support.PersistenceExceptionTranslator#translateExceptionIfPossible(java.lang.RuntimeException)
-	 */
 	@Nullable
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+	@SuppressWarnings("NullAway")
+	DataAccessException doTranslateException(RuntimeException ex) {
 
 		// Check for well-known MongoException subclasses.
 
@@ -80,6 +82,10 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 			throw new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
 		}
 
+		if (ex instanceof MongoSocketException) {
+			return new DataAccessResourceFailureException(ex.getMessage(), ex);
+		}
+
 		String exception = ClassUtils.getShortName(ClassUtils.getUserClass(ex.getClass()));
 
 		if (DUPLICATE_KEY_EXCEPTIONS.contains(exception)) {
@@ -97,12 +103,12 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		if (DATA_INTEGRITY_EXCEPTIONS.contains(exception)) {
 
 			if (ex instanceof MongoServerException) {
-				if (((MongoServerException) ex).getCode() == 11000) {
+				if (MongoDbErrorCodes.isDataDuplicateKeyError(ex)) {
 					return new DuplicateKeyException(ex.getMessage(), ex);
 				}
-				if (ex instanceof MongoBulkWriteException) {
-					for (BulkWriteError x : ((MongoBulkWriteException) ex).getWriteErrors()) {
-						if (x.getCode() == 11000) {
+				if (ex instanceof MongoBulkWriteException bulkException) {
+					for (BulkWriteError writeError : bulkException.getWriteErrors()) {
+						if (MongoDbErrorCodes.isDuplicateKeyCode(writeError.getCode())) {
 							return new DuplicateKeyException(ex.getMessage(), ex);
 						}
 					}
@@ -112,29 +118,35 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 			return new DataIntegrityViolationException(ex.getMessage(), ex);
 		}
 
-		if (ex instanceof BulkWriteException) {
-			return new BulkOperationException(ex.getMessage(), (BulkWriteException) ex);
-		}
-
 		// All other MongoExceptions
-		if (ex instanceof MongoException) {
+		if (ex instanceof MongoException mongoException) {
 
-			int code = ((MongoException) ex).getCode();
+			int code = mongoException.getCode();
 
-			if (MongoDbErrorCodes.isDuplicateKeyCode(code)) {
+			if (MongoDbErrorCodes.isDuplicateKeyError(mongoException)) {
 				return new DuplicateKeyException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isDataAccessResourceFailureCode(code)) {
+			}
+			if (MongoDbErrorCodes.isDataAccessResourceError(mongoException)) {
 				return new DataAccessResourceFailureException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isInvalidDataAccessApiUsageCode(code) || code == 10003 || code == 12001
-					|| code == 12010 || code == 12011 || code == 12012) {
+			}
+			if (MongoDbErrorCodes.isInvalidDataAccessApiUsageError(mongoException) || code == 12001 || code == 12010
+					|| code == 12011 || code == 12012) {
 				return new InvalidDataAccessApiUsageException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isPermissionDeniedCode(code)) {
+			}
+			if (MongoDbErrorCodes.isPermissionDeniedError(mongoException)) {
 				return new PermissionDeniedDataAccessException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isClientSessionFailureCode(code)) {
-				return new ClientSessionException(ex.getMessage(), ex);
-			} else if (MongoDbErrorCodes.isTransactionFailureCode(code)) {
-				return new MongoTransactionException(ex.getMessage(), ex);
 			}
+			if (MongoDbErrorCodes.isDataIntegrityViolationError(mongoException)) {
+				return new DataIntegrityViolationException(mongoException.getMessage(), mongoException);
+			}
+			if (MongoDbErrorCodes.isClientSessionFailure(mongoException)) {
+				return isTransientFailure(mongoException) ? new TransientClientSessionException(ex.getMessage(), ex)
+						: new ClientSessionException(ex.getMessage(), ex);
+			}
+			if (ex.getCause() != null && SECURITY_EXCEPTIONS.contains(ClassUtils.getShortName(ex.getCause().getClass()))) {
+				return new PermissionDeniedDataAccessException(ex.getMessage(), ex);
+			}
+
 			return new UncategorizedMongoDbException(ex.getMessage(), ex);
 		}
 
@@ -153,4 +165,27 @@ public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
 		// that translation should not occur.
 		return null;
 	}
+
+	/**
+	 * Check if a given exception holds an error label indicating a transient failure.
+	 *
+	 * @param e the exception to inspect.
+	 * @return {@literal true} if the given {@link Exception} is a {@link MongoException} holding one of the transient
+	 *         exception error labels.
+	 * @see MongoException#hasErrorLabel(String)
+	 * @since 4.4
+	 */
+	public boolean isTransientFailure(Exception e) {
+
+		if (e instanceof MongoException mongoException) {
+			return mongoException.hasErrorLabel(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL)
+					|| mongoException.hasErrorLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL);
+		}
+
+		if (e.getCause() != e && e.getCause() instanceof Exception ex) {
+			return isTransientFailure(ex);
+		}
+
+		return false;
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoJsonSchemaCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoJsonSchemaCreator.java
index a20b353e08..84c395bf2f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoJsonSchemaCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoJsonSchemaCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,24 @@
  */
 package org.springframework.data.mongodb.core;
 
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Predicate;
+
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.Encrypted;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
+import org.springframework.data.mongodb.core.mapping.Unwrapped.Nullable;
+import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
 import org.springframework.util.Assert;
 
@@ -24,6 +41,7 @@
  * following mapping rules.
  * <p>
  * <strong>Required Properties</strong>
+ * </p>
  * <ul>
  * <li>Properties of primitive type</li>
  * </ul>
@@ -45,7 +63,7 @@
  * {@link org.springframework.data.annotation.Id _id} properties using types that can be converted into
  * {@link org.bson.types.ObjectId} like {@link String} will be mapped to {@code type : 'object'} unless there is more
  * specific information available via the {@link org.springframework.data.mongodb.core.mapping.MongoId} annotation.
- * </p>
+ * {@link Encrypted} properties will contain {@literal encrypt} information.
  *
  * @author Christoph Strobl
  * @since 2.2
@@ -60,6 +78,111 @@ public interface MongoJsonSchemaCreator {
 	 */
 	MongoJsonSchema createSchemaFor(Class<?> type);
 
+	/**
+	 * Create a merged {@link MongoJsonSchema} out of the individual schemas of the given types by merging their
+	 * properties into one large {@link MongoJsonSchema schema}.
+	 *
+	 * @param types must not be {@literal null} nor contain {@literal null}.
+	 * @return new instance of {@link MongoJsonSchema}.
+	 * @since 3.4
+	 */
+	default MongoJsonSchema mergedSchemaFor(Class<?>... types) {
+
+		MongoJsonSchema[] schemas = Arrays.stream(types).map(this::createSchemaFor).toArray(MongoJsonSchema[]::new);
+		return MongoJsonSchema.merge(schemas);
+	}
+
+	/**
+	 * Filter matching {@link JsonSchemaProperty properties}.
+	 *
+	 * @param filter the {@link Predicate} to evaluate for inclusion. Must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchemaCreator}.
+	 * @since 3.3
+	 */
+	MongoJsonSchemaCreator filter(Predicate<JsonSchemaPropertyContext> filter);
+
+	/**
+	 * Entry point to specify additional behavior for a given path.
+	 *
+	 * @param path the path using {@literal dot '.'} notation.
+	 * @return new instance of {@link PropertySpecifier}.
+	 * @since 3.4
+	 */
+	PropertySpecifier property(String path);
+
+	/**
+	 * The context in which a specific {@link #getProperty()} is encountered during schema creation.
+	 *
+	 * @since 3.3
+	 */
+	interface JsonSchemaPropertyContext {
+
+		/**
+		 * The path to a given field/property in dot notation.
+		 *
+		 * @return never {@literal null}.
+		 */
+		String getPath();
+
+		/**
+		 * The current property.
+		 *
+		 * @return never {@literal null}.
+		 */
+		MongoPersistentProperty getProperty();
+
+		/**
+		 * Obtain the {@link MongoPersistentEntity} for a given property.
+		 *
+		 * @param property must not be {@literal null}.
+		 * @param <T>
+		 * @return {@literal null} if the property is not an entity. It is nevertheless recommend to check
+		 *         {@link PersistentProperty#isEntity()} first.
+		 */
+		<T> @Nullable MongoPersistentEntity<T> resolveEntity(MongoPersistentProperty property);
+
+	}
+
+	/**
+	 * A filter {@link Predicate} that matches {@link Encrypted encrypted properties} and those having nested ones.
+	 *
+	 * @return new instance of {@link Predicate}.
+	 * @since 3.3
+	 */
+	static Predicate<JsonSchemaPropertyContext> encryptedOnly() {
+
+		return new Predicate<JsonSchemaPropertyContext>() {
+
+			// cycle guard
+			private final Set<MongoPersistentProperty> seen = new HashSet<>();
+
+			@Override
+			public boolean test(JsonSchemaPropertyContext context) {
+				return extracted(context.getProperty(), context);
+			}
+
+			@SuppressWarnings("NullAway")
+			private boolean extracted(MongoPersistentProperty property, JsonSchemaPropertyContext context) {
+				if (property.isAnnotationPresent(Encrypted.class)) {
+					return true;
+				}
+
+				if (!property.isEntity() || seen.contains(property)) {
+					return false;
+				}
+
+				seen.add(property);
+
+				for (MongoPersistentProperty nested : context.resolveEntity(property)) {
+					if (extracted(nested, context)) {
+						return true;
+					}
+				}
+				return false;
+			}
+		};
+	}
+
 	/**
 	 * Creates a new {@link MongoJsonSchemaCreator} that is aware of conversions applied by the given
 	 * {@link MongoConverter}.
@@ -69,7 +192,59 @@ public interface MongoJsonSchemaCreator {
 	 */
 	static MongoJsonSchemaCreator create(MongoConverter mongoConverter) {
 
-		Assert.notNull(mongoConverter, "MongoConverter must not be null!");
+		Assert.notNull(mongoConverter, "MongoConverter must not be null");
 		return new MappingMongoJsonSchemaCreator(mongoConverter);
 	}
+
+	/**
+	 * Creates a new {@link MongoJsonSchemaCreator} that is aware of type mappings and potential
+	 * {@link org.springframework.data.spel.spi.EvaluationContextExtension extensions}.
+	 *
+	 * @param mappingContext must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchemaCreator}.
+	 * @since 3.3
+	 */
+	static MongoJsonSchemaCreator create(MappingContext mappingContext) {
+
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(config -> {}));
+		converter.afterPropertiesSet();
+
+		return create(converter);
+	}
+
+	/**
+	 * Creates a new {@link MongoJsonSchemaCreator} that does not consider potential extensions - suitable for testing. We
+	 * recommend to use {@link #create(MappingContext)}.
+	 *
+	 * @return new instance of {@link MongoJsonSchemaCreator}.
+	 * @since 3.3
+	 */
+	static MongoJsonSchemaCreator create() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setSimpleTypeHolder(MongoSimpleTypes.HOLDER);
+		mappingContext.afterPropertiesSet();
+
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(config -> {}));
+		converter.afterPropertiesSet();
+
+		return create(converter);
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 3.4
+	 */
+	interface PropertySpecifier {
+
+		/**
+		 * Set additional type parameters for polymorphic ones.
+		 *
+		 * @param types must not be {@literal null}.
+		 * @return the source
+		 */
+		MongoJsonSchemaCreator withTypes(Class<?>... types);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java
index ccc06584f6..6753f31c1a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,37 +18,42 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.index.IndexOperations;
-import org.springframework.data.mongodb.core.mapreduce.GroupBy;
-import org.springframework.data.mongodb.core.mapreduce.GroupByResults;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceResults;
 import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.lang.Nullable;
+import org.springframework.data.util.Lock;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
 import com.mongodb.ClientSessionOptions;
-import com.mongodb.Cursor;
 import com.mongodb.ReadPreference;
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoCollection;
@@ -58,8 +63,7 @@
 /**
  * Interface that specifies a basic set of MongoDB operations. Implemented by {@link MongoTemplate}. Not often used but
  * a useful option for extensibility and testability (as it can be easily mocked, stubbed, or be the target of a JDK
- * proxy).
- * <p/>
+ * proxy). <br />
  * <strong>NOTE:</strong> Some operations cannot be executed within a MongoDB transaction. Please refer to the MongoDB
  * specific documentation to learn more about <a href="https://docs.mongodb.com/manual/core/transactions/">Multi
  * Document Transactions</a>.
@@ -73,6 +77,7 @@
  * @author Thomas Darimont
  * @author Maninder Singh
  * @author Mark Paluch
+ * @author Woojin Shin
  */
 public interface MongoOperations extends FluentMongoOperations {
 
@@ -80,12 +85,13 @@ public interface MongoOperations extends FluentMongoOperations {
 	 * The collection name used for the specified class by this template.
 	 *
 	 * @param entityClass must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be derived from the type.
 	 */
 	String getCollectionName(Class<?> entityClass);
 
 	/**
-	 * Execute the a MongoDB command expressed as a JSON string. Parsing is delegated to {@link Document#parse(String)} to
+	 * Execute a MongoDB command expressed as a JSON string. Parsing is delegated to {@link Document#parse(String)} to
 	 * obtain the {@link Document} holding the actual command. Any errors that result from executing this command will be
 	 * converted into Spring's DAO exception hierarchy.
 	 *
@@ -117,7 +123,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	/**
 	 * Execute a MongoDB query and iterate over the query results on a per-document basis with a DocumentCallbackHandler.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
 	 * @param collectionName name of the collection to retrieve the objects from.
 	 * @param dch the handler that will extract results, one document at a time.
@@ -125,8 +131,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch);
 
 	/**
-	 * Executes a {@link DbCallback} translating any exceptions as necessary.
-	 * <p/>
+	 * Executes a {@link DbCallback} translating any exceptions as necessary. <br />
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
 	 *
 	 * @param action callback object that specifies the MongoDB actions to perform on the passed in DB instance. Must not
@@ -138,8 +143,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	<T> T execute(DbCallback<T> action);
 
 	/**
-	 * Executes the given {@link CollectionCallback} on the entity collection of the specified class.
-	 * <p/>
+	 * Executes the given {@link CollectionCallback} on the entity collection of the specified class. <br />
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
 	 *
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
@@ -151,8 +155,7 @@ public interface MongoOperations extends FluentMongoOperations {
 	<T> T execute(Class<?> entityClass, CollectionCallback<T> action);
 
 	/**
-	 * Executes the given {@link CollectionCallback} on the collection of the given name.
-	 * <p/>
+	 * Executes the given {@link CollectionCallback} on the collection of the given name. <br />
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
 	 *
 	 * @param collectionName the name of the collection that specifies which {@link MongoCollection} instance will be
@@ -176,8 +179,7 @@ public interface MongoOperations extends FluentMongoOperations {
 
 	/**
 	 * Obtain a {@link ClientSession session} bound instance of {@link SessionScoped} binding the {@link ClientSession}
-	 * provided by the given {@link Supplier} to each and every command issued against MongoDB.
-	 * <p/>
+	 * provided by the given {@link Supplier} to each and every command issued against MongoDB. <br />
 	 * <strong>Note:</strong> It is up to the caller to manage the {@link ClientSession} lifecycle. Use the
 	 * {@link SessionScoped#execute(SessionCallback, Consumer)} hook to potentially close the {@link ClientSession}.
 	 *
@@ -186,21 +188,23 @@ public interface MongoOperations extends FluentMongoOperations {
 	 */
 	default SessionScoped withSession(Supplier<ClientSession> sessionProvider) {
 
-		Assert.notNull(sessionProvider, "SessionProvider must not be null!");
+		Assert.notNull(sessionProvider, "SessionProvider must not be null");
 
 		return new SessionScoped() {
 
-			private final Object lock = new Object();
-			private @Nullable ClientSession session = null;
+			private final Lock lock = Lock.of(new ReentrantLock());
+			private @Nullable ClientSession session;
 
 			@Override
-			public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComplete) {
+			@SuppressWarnings("NullAway")
+			public <T> @Nullable T execute(SessionCallback<T> action, Consumer<ClientSession> onComplete) {
+
+				lock.executeWithoutResult(() -> {
 
-				synchronized (lock) {
 					if (session == null) {
 						session = sessionProvider.get();
 					}
-				}
+				});
 
 				try {
 					return action.doInSession(MongoOperations.this.withSession(session));
@@ -212,8 +216,7 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	}
 
 	/**
-	 * Obtain a {@link ClientSession} bound instance of {@link MongoOperations}.
-	 * <p/>
+	 * Obtain a {@link ClientSession} bound instance of {@link MongoOperations}. <br />
 	 * <strong>Note:</strong> It is up to the caller to manage the {@link ClientSession} lifecycle.
 	 *
 	 * @param session must not be {@literal null}.
@@ -224,34 +227,36 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 
 	/**
 	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} backed by a Mongo DB
-	 * {@link Cursor}.
+	 * {@link com.mongodb.client.FindIterable}.
 	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
+	 * Returns a {@link Stream} that wraps the Mongo DB {@link com.mongodb.client.FindIterable} that needs to be closed.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
 	 * @param entityType must not be {@literal null}.
 	 * @param <T> element return type
-	 * @return will never be {@literal null}.
+	 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+	 *         through a try-with-resources clause).
 	 * @since 1.7
 	 */
-	<T> CloseableIterator<T> stream(Query query, Class<T> entityType);
+	<T> Stream<T> stream(Query query, Class<T> entityType);
 
 	/**
 	 * Executes the given {@link Query} on the entity collection of the specified {@code entityType} and collection backed
-	 * by a Mongo DB {@link Cursor}.
+	 * by a Mongo DB {@link com.mongodb.client.FindIterable}.
 	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed.
+	 * Returns a {@link Stream} that wraps the Mongo DB {@link com.mongodb.client.FindIterable} that needs to be closed.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
 	 * @param entityType must not be {@literal null}.
 	 * @param collectionName must not be {@literal null} or empty.
 	 * @param <T> element return type
-	 * @return will never be {@literal null}.
+	 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+	 *         through a try-with-resources clause).
 	 * @since 1.10
 	 */
-	<T> CloseableIterator<T> stream(Query query, Class<T> entityType, String collectionName);
+	<T> Stream<T> stream(Query query, Class<T> entityType, String collectionName);
 
 	/**
 	 * Create an uncapped collection with a name based on the provided entity class.
@@ -287,6 +292,58 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	 */
 	MongoCollection<Document> createCollection(String collectionName, @Nullable CollectionOptions collectionOptions);
 
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationOperation pipeline
+	 * stages} on another collection or view identified by the given {@link #getCollectionName(Class) source type}.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the type defining the views source collection.
+	 * @param stages the {@link AggregationOperation aggregation pipeline stages} defining the view content.
+	 * @since 4.0
+	 */
+	default MongoCollection<Document> createView(String name, Class<?> source, AggregationOperation... stages) {
+		return createView(name, source, AggregationPipeline.of(stages));
+	}
+
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationPipeline pipeline} on
+	 * another collection or view identified by the given {@link #getCollectionName(Class) source type}.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the type defining the views source collection.
+	 * @param pipeline the {@link AggregationPipeline} defining the view content.
+	 * @since 4.0
+	 */
+	default MongoCollection<Document> createView(String name, Class<?> source, AggregationPipeline pipeline) {
+		return createView(name, source, pipeline, null);
+	}
+
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationPipeline pipeline} on
+	 * another collection or view identified by the given {@link #getCollectionName(Class) source type}.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the type defining the views source collection.
+	 * @param pipeline the {@link AggregationPipeline} defining the view content.
+	 * @param options additional settings to apply when creating the view. Can be {@literal null}.
+	 * @since 4.0
+	 */
+	MongoCollection<Document> createView(String name, Class<?> source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options);
+
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationPipeline pipeline} on
+	 * another collection or view identified by the given source.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the name of the collection or view defining the to be created views source.
+	 * @param pipeline the {@link AggregationPipeline} defining the view content.
+	 * @param options additional settings to apply when creating the view. Can be {@literal null}.
+	 * @since 4.0
+	 */
+	MongoCollection<Document> createView(String name, String source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options);
+
 	/**
 	 * A set of collection names.
 	 *
@@ -298,8 +355,7 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	 * Get a {@link MongoCollection} by its name. The returned collection may not exists yet (except in local memory) and
 	 * is created on first interaction with the server. Collections can be explicitly created via
 	 * {@link #createCollection(Class)}. Please make sure to check if the collection {@link #collectionExists(Class)
-	 * exists} first.
-	 * <p/>
+	 * exists} first. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param collectionName name of the collection. Must not be {@literal null}.
@@ -308,8 +364,7 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	MongoCollection<Document> getCollection(String collectionName);
 
 	/**
-	 * Check to see if a collection with a name indicated by the entity class exists.
-	 * <p/>
+	 * Check to see if a collection with a name indicated by the entity class exists. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param entityClass class that determines the name of the collection. Must not be {@literal null}.
@@ -318,8 +373,7 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	<T> boolean collectionExists(Class<T> entityClass);
 
 	/**
-	 * Check to see if a collection with a given name exists.
-	 * <p/>
+	 * Check to see if a collection with a given name exists. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param collectionName name of the collection. Must not be {@literal null}.
@@ -328,8 +382,7 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	boolean collectionExists(String collectionName);
 
 	/**
-	 * Drop the collection with the name indicated by the entity class.
-	 * <p/>
+	 * Drop the collection with the name indicated by the entity class. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param entityClass class that determines the collection to drop/delete. Must not be {@literal null}.
@@ -337,8 +390,7 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	<T> void dropCollection(Class<T> entityClass);
 
 	/**
-	 * Drop the collection with the given name.
-	 * <p/>
+	 * Drop the collection with the given name. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param collectionName name of the collection to drop/delete.
@@ -360,9 +412,9 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	IndexOperations indexOps(Class<?> entityClass);
 
 	/**
-	 * Returns the {@link ScriptOperations} that can be performed on {@link com.mongodb.DB} level.
+	 * Returns the {@link ScriptOperations} that can be performed on {@link com.mongodb.client.MongoDatabase} level.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @since 1.7
 	 * @deprecated since 2.2. The {@code eval} command has been removed without replacement in MongoDB Server 4.2.0.
 	 */
@@ -401,11 +453,9 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	BulkOperations bulkOps(BulkMode mode, @Nullable Class<?> entityType, String collectionName);
 
 	/**
-	 * Query for a list of objects of type T from the collection used by the entity class.
-	 * <p/>
+	 * Query for a list of objects of type T from the collection used by the entity class. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
 	 *
@@ -415,11 +465,9 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	<T> List<T> findAll(Class<T> entityClass);
 
 	/**
-	 * Query for a list of objects of type T from the specified collection.
-	 * <p/>
+	 * Query for a list of objects of type T from the specified collection. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
 	 *
@@ -429,43 +477,6 @@ public <T> T execute(SessionCallback<T> action, Consumer<ClientSession> onComple
 	 */
 	<T> List<T> findAll(Class<T> entityClass, String collectionName);
 
-	/**
-	 * Execute a group operation over the entire collection. The group operation entity class should match the 'shape' of
-	 * the returned object that takes int account the initial document structure as well as any finalize functions.
-	 *
-	 * @param inputCollectionName the collection where the group operation will read from
-	 * @param groupBy the conditions under which the group operation will be performed, e.g. keys, initial document,
-	 *          reduce function.
-	 * @param entityClass The parametrized type of the returned list
-	 * @return The results of the group operation
-	 * @deprecated since 2.2. The {@code group} command has been removed in MongoDB Server 4.2.0. <br />
-	 *             Please use {@link #aggregate(TypedAggregation, String, Class) } with a
-	 *             {@link org.springframework.data.mongodb.core.aggregation.GroupOperation} instead.
-	 */
-	@Deprecated
-	<T> GroupByResults<T> group(String inputCollectionName, GroupBy groupBy, Class<T> entityClass);
-
-	/**
-	 * Execute a group operation restricting the rows to those which match the provided Criteria. The group operation
-	 * entity class should match the 'shape' of the returned object that takes int account the initial document structure
-	 * as well as any finalize functions.
-	 *
-	 * @param criteria The criteria that restricts the row that are considered for grouping. If not specified all rows are
-	 *          considered.
-	 * @param inputCollectionName the collection where the group operation will read from
-	 * @param groupBy the conditions under which the group operation will be performed, e.g. keys, initial document,
-	 *          reduce function.
-	 * @param entityClass The parametrized type of the returned list
-	 * @return The results of the group operation
-	 * @deprecated since 2.2. The {@code group} command has been removed in MongoDB Server 4.2.0. <br />
-	 *             Please use {@link #aggregate(TypedAggregation, String, Class) } with a
-	 *             {@link org.springframework.data.mongodb.core.aggregation.GroupOperation} and
-	 *             {@link org.springframework.data.mongodb.core.aggregation.MatchOperation} instead.
-	 */
-	@Deprecated
-	<T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionName, GroupBy groupBy,
-			Class<T> entityClass);
-
 	/**
 	 * Execute an aggregation operation. The raw results will be mapped to the given entity class. The name of the
 	 * inputCollection is derived from the inputType of the aggregation.
@@ -518,11 +529,11 @@ <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionN
 	<O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType);
 
 	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
+	 * Execute an aggregation operation backed by a Mongo DB {@link com.mongodb.client.AggregateIterable}.
 	 * <p>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class. The name of the inputCollection is derived from the inputType of
-	 * the aggregation.
+	 * Returns a {@link Stream} that wraps the Mongo DB {@link com.mongodb.client.AggregateIterable} that needs to be
+	 * closed. The raw results will be mapped to the given entity class. The name of the inputCollection is derived from
+	 * the inputType of the aggregation.
 	 * <p>
 	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
 	 * explanation mode will throw an {@link IllegalArgumentException}.
@@ -531,35 +542,37 @@ <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionN
 	 *          {@literal null}.
 	 * @param collectionName The name of the input collection to use for the aggreation.
 	 * @param outputType The parametrized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
+	 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+	 *         through a try-with-resources clause).
 	 * @since 2.0
 	 */
-	<O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, String collectionName, Class<O> outputType);
+	<O> Stream<O> aggregateStream(TypedAggregation<?> aggregation, String collectionName, Class<O> outputType);
 
 	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
-	 * <p/>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class and are returned as stream. The name of the inputCollection is
-	 * derived from the inputType of the aggregation.
-	 * <p/>
+	 * Execute an aggregation operation backed by a Mongo DB {@link com.mongodb.client.AggregateIterable}.
+	 * <p>
+	 * Returns a {@link Stream} that wraps the Mongo DB {@link com.mongodb.client.AggregateIterable} that needs to be
+	 * closed. The raw results will be mapped to the given entity class and are returned as stream. The name of the
+	 * inputCollection is derived from the inputType of the aggregation.
+	 * <p>
 	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
 	 * explanation mode will throw an {@link IllegalArgumentException}.
 	 *
 	 * @param aggregation The {@link TypedAggregation} specification holding the aggregation operations, must not be
 	 *          {@literal null}.
 	 * @param outputType The parametrized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
+	 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+	 *         through a try-with-resources clause).
 	 * @since 2.0
 	 */
-	<O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, Class<O> outputType);
+	<O> Stream<O> aggregateStream(TypedAggregation<?> aggregation, Class<O> outputType);
 
 	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
-	 * <p/>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class.
-	 * <p/>
+	 * Execute an aggregation operation backed by a Mongo DB {@link com.mongodb.client.AggregateIterable}.
+	 * <p>
+	 * Returns a {@link Stream} that wraps the Mongo DB {@link com.mongodb.client.AggregateIterable} that needs to be
+	 * closed. The raw results will be mapped to the given entity class.
+	 * <p>
 	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
 	 * explanation mode will throw an {@link IllegalArgumentException}.
 	 *
@@ -568,17 +581,18 @@ <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionN
 	 * @param inputType the inputType where the aggregation operation will read from, must not be {@literal null} or
 	 *          empty.
 	 * @param outputType The parametrized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
+	 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+	 *         through a try-with-resources clause).
 	 * @since 2.0
 	 */
-	<O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType);
+	<O> Stream<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType);
 
 	/**
-	 * Execute an aggregation operation backed by a Mongo DB {@link Cursor}.
-	 * <p/>
-	 * Returns a {@link CloseableIterator} that wraps the a Mongo DB {@link Cursor} that needs to be closed. The raw
-	 * results will be mapped to the given entity class.
-	 * <p/>
+	 * Execute an aggregation operation backed by a Mongo DB {@link com.mongodb.client.AggregateIterable}.
+	 * <p>
+	 * Returns a {@link Stream} that wraps the Mongo DB {@link com.mongodb.client.AggregateIterable} that needs to be
+	 * closed. The raw results will be mapped to the given entity class.
+	 * <p>
 	 * Aggregation streaming can't be used with {@link AggregationOptions#isExplain() aggregation explain}. Enabling
 	 * explanation mode will throw an {@link IllegalArgumentException}.
 	 *
@@ -587,10 +601,11 @@ <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionN
 	 * @param collectionName the collection where the aggregation operation will read from, must not be {@literal null} or
 	 *          empty.
 	 * @param outputType The parametrized type of the returned list, must not be {@literal null}.
-	 * @return The results of the aggregation operation.
+	 * @return the result {@link Stream}, containing mapped objects, needing to be closed once fully processed (e.g.
+	 *         through a try-with-resources clause).
 	 * @since 2.0
 	 */
-	<O> CloseableIterator<O> aggregateStream(Aggregation aggregation, String collectionName, Class<O> outputType);
+	<O> Stream<O> aggregateStream(Aggregation aggregation, String collectionName, Class<O> outputType);
 
 	/**
 	 * Execute a map-reduce operation. The map-reduce operation will be formed with an output type of INLINE
@@ -600,7 +615,9 @@ <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionN
 	 * @param reduceFunction The JavaScript reduce function
 	 * @param entityClass The parametrized type of the returned list. Must not be {@literal null}.
 	 * @return The results of the map reduce operation
+	 * @deprecated since 3.4 in favor of {@link #aggregate(TypedAggregation, Class)}.
 	 */
+	@Deprecated
 	<T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction, String reduceFunction,
 			Class<T> entityClass);
 
@@ -613,7 +630,9 @@ <T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction
 	 * @param mapReduceOptions Options that specify detailed map-reduce behavior.
 	 * @param entityClass The parametrized type of the returned list. Must not be {@literal null}.
 	 * @return The results of the map reduce operation
+	 * @deprecated since 3.4 in favor of {@link #aggregate(TypedAggregation, Class)}.
 	 */
+	@Deprecated
 	<T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction, String reduceFunction,
 			@Nullable MapReduceOptions mapReduceOptions, Class<T> entityClass);
 
@@ -627,7 +646,9 @@ <T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction
 	 * @param reduceFunction The JavaScript reduce function
 	 * @param entityClass The parametrized type of the returned list. Must not be {@literal null}.
 	 * @return The results of the map reduce operation
+	 * @deprecated since 3.4 in favor of {@link #aggregate(TypedAggregation, Class)}.
 	 */
+	@Deprecated
 	<T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, String mapFunction, String reduceFunction,
 			Class<T> entityClass);
 
@@ -641,7 +662,9 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	 * @param mapReduceOptions Options that specify detailed map-reduce behavior
 	 * @param entityClass The parametrized type of the returned list. Must not be {@literal null}.
 	 * @return The results of the map reduce operation
+	 * @deprecated since 3.4 in favor of {@link #aggregate(TypedAggregation, Class)}.
 	 */
+	@Deprecated
 	<T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, String mapFunction, String reduceFunction,
 			@Nullable MapReduceOptions mapReduceOptions, Class<T> entityClass);
 
@@ -700,47 +723,41 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity class to a single instance of an object of the
-	 * specified type.
-	 * <p/>
+	 * specified type. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned list.
 	 * @return the converted object.
 	 */
-	@Nullable
-	<T> T findOne(Query query, Class<T> entityClass);
+	<T> @Nullable T findOne(Query query, Class<T> entityClass);
 
 	/**
 	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
-	 * type.
-	 * <p/>
+	 * type. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from.
 	 * @return the converted object.
 	 */
-	@Nullable
-	<T> T findOne(Query query, Class<T> entityClass, String collectionName);
+	<T> @Nullable T findOne(Query query, Class<T> entityClass, String collectionName);
 
 	/**
 	 * Determine result of given {@link Query} contains at least one element. <br />
 	 * <strong>NOTE:</strong> Any additional support for query/field mapping, etc. is not available due to the lack of
 	 * domain type information. Use {@link #exists(Query, Class, String)} to get full type specific support.
 	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param query the {@link Query} class that specifies the criteria used to find a document.
 	 * @param collectionName name of the collection to check for objects.
 	 * @return {@literal true} if the query yields a result.
 	 */
@@ -749,7 +766,7 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	/**
 	 * Determine result of given {@link Query} contains at least one element.
 	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param query the {@link Query} class that specifies the criteria used to find a document.
 	 * @param entityClass the parametrized type.
 	 * @return {@literal true} if the query yields a result.
 	 */
@@ -758,7 +775,7 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	/**
 	 * Determine result of given {@link Query} contains at least one element.
 	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param query the {@link Query} class that specifies the criteria used to find a document.
 	 * @param entityClass the parametrized type. Can be {@literal null}.
 	 * @param collectionName name of the collection to check for objects.
 	 * @return {@literal true} if the query yields a result.
@@ -766,15 +783,13 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	boolean exists(Query query, @Nullable Class<?> entityClass, String collectionName);
 
 	/**
-	 * Map the results of an ad-hoc query on the collection for the entity class to a List of the specified type.
-	 * <p/>
+	 * Map the results of an ad-hoc query on the collection for the entity class to a List of the specified type. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
 	 * @param entityClass the parametrized type of the returned list. Must not be {@literal null}.
 	 * @return the List of converted objects.
@@ -782,15 +797,13 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	<T> List<T> find(Query query, Class<T> entityClass);
 
 	/**
-	 * Map the results of an ad-hoc query on the specified collection to a List of the specified type.
-	 * <p/>
+	 * Map the results of an ad-hoc query on the specified collection to a List of the specified type. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
 	 * @param entityClass the parametrized type of the returned list. Must not be {@literal null}.
 	 * @param collectionName name of the collection to retrieve the objects from. Must not be {@literal null}.
@@ -798,6 +811,57 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	 */
 	<T> List<T> find(Query query, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Query for a window of objects of type T from the specified collection. <br />
+	 * Make sure to either set {@link Query#skip(long)} or {@link Query#with(KeysetScrollPosition)} along with
+	 * {@link Query#limit(int)} to limit large query results for efficient scrolling. <br />
+	 * Result objects are converted from the MongoDB native representation using an instance of {@see MongoConverter}.
+	 * Unless configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
+	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
+	 * to map objects since the test for class type is done in the client and not on the server.
+	 * <p>
+	 * When using {@link KeysetScrollPosition}, make sure to use non-nullable {@link org.springframework.data.domain.Sort
+	 * sort properties} as MongoDB does not support criteria to reconstruct a query result from absent document fields or
+	 * {@literal null} values through {@code $gt/$lt} operators.
+	 *
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
+	 *          specification. Must not be {@literal null}.
+	 * @param entityType the parametrized type of the returned window.
+	 * @return the converted window.
+	 * @throws IllegalStateException if a potential {@link Query#getKeyset() KeysetScrollPosition} contains an invalid
+	 *           position.
+	 * @since 4.1
+	 * @see Query#with(org.springframework.data.domain.OffsetScrollPosition)
+	 * @see Query#with(org.springframework.data.domain.KeysetScrollPosition)
+	 */
+	<T> Window<T> scroll(Query query, Class<T> entityType);
+
+	/**
+	 * Query for a window of objects of type T from the specified collection. <br />
+	 * Make sure to either set {@link Query#skip(long)} or {@link Query#with(KeysetScrollPosition)} along with
+	 * {@link Query#limit(int)} to limit large query results for efficient scrolling. <br />
+	 * Result objects are converted from the MongoDB native representation using an instance of {@see MongoConverter}.
+	 * Unless configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
+	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
+	 * to map objects since the test for class type is done in the client and not on the server.
+	 * <p>
+	 * When using {@link KeysetScrollPosition}, make sure to use non-nullable {@link org.springframework.data.domain.Sort
+	 * sort properties} as MongoDB does not support criteria to reconstruct a query result from absent document fields or
+	 * {@literal null} values through {@code $gt/$lt} operators.
+	 *
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
+	 *          specification. Must not be {@literal null}.
+	 * @param entityType the parametrized type of the returned window.
+	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @return the converted window.
+	 * @throws IllegalStateException if a potential {@link Query#getKeyset() KeysetScrollPosition} contains an invalid
+	 *           position.
+	 * @since 4.1
+	 * @see Query#with(org.springframework.data.domain.OffsetScrollPosition)
+	 * @see Query#with(org.springframework.data.domain.KeysetScrollPosition)
+	 */
+	<T> Window<T> scroll(Query query, Class<T> entityType, String collectionName);
+
 	/**
 	 * Returns a document with the given id mapped onto the given class. The collection the query is ran against will be
 	 * derived from the given target class as well.
@@ -806,8 +870,7 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	 * @param entityClass the type the document shall be converted into. Must not be {@literal null}.
 	 * @return the document with the given id mapped onto the given target class.
 	 */
-	@Nullable
-	<T> T findById(Object id, Class<T> entityClass);
+	<T> @Nullable T findById(Object id, Class<T> entityClass);
 
 	/**
 	 * Returns the document with the given id from the given collection mapped onto the given target class.
@@ -817,8 +880,7 @@ <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, Strin
 	 * @param collectionName the collection to query for the document.
 	 * @return he converted object or {@literal null} if document does not exist.
 	 */
-	@Nullable
-	<T> T findById(Object id, Class<T> entityClass, String collectionName);
+	<T> @Nullable T findById(Object id, Class<T> entityClass, String collectionName);
 
 	/**
 	 * Finds the distinct values for a specified {@literal field} across a single {@link MongoCollection} or view and
@@ -880,65 +942,74 @@ default <T> List<T> findDistinct(Query query, String field, String collection, C
 	}
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify </a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated or {@literal null}, if not found.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
-	@Nullable
-	<T> T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass);
+	<T> @Nullable T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass);
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify </a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated or {@literal null}, if not found.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
-	@Nullable
-	<T> T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass, String collectionName);
+	<T> @Nullable T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass, String collectionName);
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify </a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
 	 * {@link FindAndModifyOptions} into account.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents.
 	 * @param options the {@link FindAndModifyOptions} holding additional information.
 	 * @param entityClass the parametrized type.
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndModifyOptions#isReturnNew()} this will either be the object as it was before the update or as
 	 *         it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
-	@Nullable
-	<T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class<T> entityClass);
+	<T> @Nullable T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class<T> entityClass);
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify <a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify </a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
 	 * {@link FindAndModifyOptions} into account.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
@@ -946,84 +1017,84 @@ default <T> List<T> findDistinct(Query query, String field, String collection, C
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndModifyOptions#isReturnNew()} this will either be the object as it was before the update or as
 	 *         it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
-	@Nullable
-	<T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class<T> entityClass,
+	<T> @Nullable T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class<T> entityClass,
 			String collectionName);
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement}
 	 * document. <br />
 	 * The collection name is derived from the {@literal replacement} type. <br />
 	 * Options are defaulted to {@link FindAndReplaceOptions#empty()}. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@literal null}, if not found.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
-	@Nullable
-	default <T> T findAndReplace(Query query, T replacement) {
+	default <T> @Nullable T findAndReplace(Query query, T replacement) {
 		return findAndReplace(query, replacement, FindAndReplaceOptions.empty());
 	}
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement}
 	 * document.<br />
 	 * Options are defaulted to {@link FindAndReplaceOptions#empty()}. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@literal null}, if not found.
 	 * @since 2.1
 	 */
-	@Nullable
-	default <T> T findAndReplace(Query query, T replacement, String collectionName) {
+	default <T> @Nullable T findAndReplace(Query query, T replacement, String collectionName) {
 		return findAndReplace(query, replacement, FindAndReplaceOptions.empty(), collectionName);
 	}
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account.<br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndReplaceOptions#isReturnNew()} this will either be the object as it was before the update or
 	 *         as it is after the update.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
-	@Nullable
-	default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions options) {
+	default <T> @Nullable T findAndReplace(Query query, T replacement, FindAndReplaceOptions options) {
 		return findAndReplace(query, replacement, options, getCollectionName(ClassUtils.getUserClass(replacement)));
 	}
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account.<br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
@@ -1031,22 +1102,21 @@ default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions o
 	 *         as it is after the update.
 	 * @since 2.1
 	 */
-	@Nullable
-	default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions options, String collectionName) {
+	default <T> @Nullable T findAndReplace(Query query, T replacement, FindAndReplaceOptions options, String collectionName) {
 
-		Assert.notNull(replacement, "Replacement must not be null!");
+		Assert.notNull(replacement, "Replacement must not be null");
 		return findAndReplace(query, replacement, options, (Class<T>) ClassUtils.getUserClass(replacement), collectionName);
 	}
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account.<br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityType the parametrized type. Must not be {@literal null}.
@@ -1056,8 +1126,7 @@ default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions o
 	 *         as it is after the update.
 	 * @since 2.1
 	 */
-	@Nullable
-	default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions options, Class<T> entityType,
+	default <T> @Nullable T findAndReplace(Query query, T replacement, FindAndReplaceOptions options, Class<T> entityType,
 			String collectionName) {
 
 		return findAndReplace(query, replacement, options, entityType, collectionName, entityType);
@@ -1065,13 +1134,13 @@ default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions o
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account.<br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityType the type used for mapping the {@link Query} to domain type fields and deriving the collection
@@ -1081,10 +1150,11 @@ default <T> T findAndReplace(Query query, T replacement, FindAndReplaceOptions o
 	 * @return the converted object that was updated or {@literal null}, if not found. Depending on the value of
 	 *         {@link FindAndReplaceOptions#isReturnNew()} this will either be the object as it was before the update or
 	 *         as it is after the update.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
-	@Nullable
-	default <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
+	default <S, T> @Nullable T findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
 			Class<T> resultType) {
 
 		return findAndReplace(query, replacement, options, entityType,
@@ -1093,13 +1163,13 @@ default <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOption
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account.<br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityType the type used for mapping the {@link Query} to domain type fields. Must not be {@literal null}.
@@ -1111,46 +1181,40 @@ default <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOption
 	 *         as it is after the update.
 	 * @since 2.1
 	 */
-	@Nullable
-	<S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
+	<S, T> @Nullable T findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
 			String collectionName, Class<T> resultType);
 
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity type to a single instance of an object of the
 	 * specified type. The first document that matches the query is returned and also removed from the collection in the
-	 * database.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
+	 * database. <br />
+	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned list.
 	 * @return the converted object
 	 */
-	@Nullable
-	<T> T findAndRemove(Query query, Class<T> entityClass);
+	<T> @Nullable T findAndRemove(Query query, Class<T> entityClass);
 
 	/**
 	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
 	 * type. The first document that matches the query is returned and also removed from the collection in the database.
-	 * <p/>
+	 * <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned list.
 	 * @param collectionName name of the collection to retrieve the objects from.
 	 * @return the converted object.
 	 */
-	@Nullable
-	<T> T findAndRemove(Query query, Class<T> entityClass, String collectionName);
+	<T> @Nullable T findAndRemove(Query query, Class<T> entityClass, String collectionName);
 
 	/**
 	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
@@ -1158,12 +1222,19 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
 	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
 	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * count all matches. <br />
+	 * This method may choose to use {@link #estimatedCount(Class)} for empty queries instead of running an
+	 * {@link com.mongodb.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} which may have an impact on performance.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the count of matching documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @see #exactCount(Query, Class)
+	 * @see #estimatedCount(Class)
 	 */
 	long count(Query query, Class<?> entityClass);
 
@@ -1174,12 +1245,17 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
 	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
 	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * count all matches. <br />
+	 * This method may choose to use {@link #estimatedCount(Class)} for empty queries instead of running an
+	 * {@link com.mongodb.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} which may have an impact on performance.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents.
 	 * @param collectionName must not be {@literal null} or empty.
 	 * @return the count of matching documents.
 	 * @see #count(Query, Class, String)
+	 * @see #exactCount(Query, String)
+	 * @see #estimatedCount(String)
 	 */
 	long count(Query query, String collectionName);
 
@@ -1189,60 +1265,185 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
 	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
 	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * count all matches. <br />
+	 * This method may choose to use {@link #estimatedCount(Class)} for empty queries instead of running an
+	 * {@link com.mongodb.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} which may have an impact on performance.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
 	 * @param entityClass the parametrized type. Can be {@literal null}.
 	 * @param collectionName must not be {@literal null} or empty.
 	 * @return the count of matching documents.
+	 * @see #count(Query, Class, String)
+	 * @see #estimatedCount(String)
 	 */
 	long count(Query query, @Nullable Class<?> entityClass, String collectionName);
 
 	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
+	 * Estimate the number of documents, in the collection {@link #getCollectionName(Class) identified by the given type},
+	 * based on collection statistics. <br />
+	 * Please make sure to read the MongoDB reference documentation about limitations on eg. sharded cluster or inside
+	 * transactions.
+	 *
+	 * @param entityClass must not be {@literal null}.
+	 * @return the estimated number of documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.1
+	 */
+	default long estimatedCount(Class<?> entityClass) {
+
+		Assert.notNull(entityClass, "Entity class must not be null");
+		return estimatedCount(getCollectionName(entityClass));
+	}
+
+	/**
+	 * Estimate the number of documents in the given collection based on collection statistics. <br />
+	 * Please make sure to read the MongoDB reference documentation about limitations on eg. sharded cluster or inside
+	 * transactions.
+	 *
+	 * @param collectionName must not be {@literal null}.
+	 * @return the estimated number of documents.
+	 * @since 3.1
+	 */
+	long estimatedCount(String collectionName);
+
+	/**
+	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
+	 * <br />
+	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
+	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
+	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
+	 * count all matches. <br />
+	 * This method uses an
+	 * {@link com.mongodb.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but guarantees
+	 * shard, session and transaction compliance. In case an inaccurate count satisfies the applications needs use
+	 * {@link #estimatedCount(Class)} for empty queries instead.
+	 *
+	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
+	 *          {@literal null}.
+	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
+	 * @return the count of matching documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.4
+	 */
+	default long exactCount(Query query, Class<?> entityClass) {
+		return exactCount(query, entityClass, getCollectionName(entityClass));
+	}
+
+	/**
+	 * Returns the number of documents for the given {@link Query} querying the given collection. The given {@link Query}
+	 * must solely consist of document field references as we lack type information to map potential property references
+	 * onto document fields. Use {@link #count(Query, Class, String)} to get full type specific support. <br />
+	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
+	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
+	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
+	 * count all matches. <br />
+	 * This method uses an
+	 * {@link com.mongodb.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but guarantees
+	 * shard, session and transaction compliance. In case an inaccurate count satisfies the applications needs use
+	 * {@link #estimatedCount(String)} for empty queries instead.
+	 *
+	 * @param query the {@link Query} class that specifies the criteria used to find documents.
+	 * @param collectionName must not be {@literal null} or empty.
+	 * @return the count of matching documents.
+	 * @see #count(Query, Class, String)
+	 * @since 3.4
+	 */
+	default long exactCount(Query query, String collectionName) {
+		return exactCount(query, null, collectionName);
+	}
+
+	/**
+	 * Returns the number of documents for the given {@link Query} by querying the given collection using the given entity
+	 * class to map the given {@link Query}. <br />
+	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
+	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
+	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
+	 * count all matches. <br />
+	 * This method uses an
+	 * {@link com.mongodb.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but guarantees
+	 * shard, session and transaction compliance. In case an inaccurate count satisfies the applications needs use
+	 * {@link #estimatedCount(String)} for empty queries instead.
+	 *
+	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
+	 *          {@literal null}.
+	 * @param entityClass the parametrized type. Can be {@literal null}.
+	 * @param collectionName must not be {@literal null} or empty.
+	 * @return the count of matching documents.
+	 * @since 3.4
+	 */
+	long exactCount(Query query, @Nullable Class<?> entityClass, String collectionName);
+
+	/**
+	 * Insert the object into the collection for the entity type of the object to save. <br />
+	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. <br />
+	 * If your object has an {@literal Id} property which holds a {@literal null} value, it will be set with the generated
+	 * Id from MongoDB. If your Id property is a String then MongoDB ObjectId will be used to populate that string.
+	 * Otherwise, the conversion from ObjectId to your property type will be handled by Spring's BeanWrapper class that
+	 * leverages Type Conversion API. See
 	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
-	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
+	 * Type Conversion"</a> for more details. <br />
+	 * Insert is used to initially store the object into the database. To update an existing object use the
+	 * {@link #save(Object)} method.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
+	 * <p>
+	 * The {@code objectToSave} must not be collection-like.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the inserted object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	<T> T insert(T objectToSave);
 
 	/**
-	 * Insert the object into the specified collection.
-	 * <p/>
+	 * Insert the object into the specified collection. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
+	 * <p>
+	 * The {@code objectToSave} must not be collection-like.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
 	 * @return the inserted object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
 	 */
 	<T> T insert(T objectToSave, String collectionName);
 
 	/**
 	 * Insert a Collection of objects into a collection in a single batch write to the database.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param batchToSave the batch of objects to save. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the inserted objects that.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	<T> Collection<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass);
 
 	/**
 	 * Insert a batch of objects into the specified collection in a single batch write to the database.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param batchToSave the list of objects to save. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
@@ -1253,64 +1454,91 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	/**
 	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
 	 * class.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param objectsToSave the list of objects to save. Must not be {@literal null}.
 	 * @return the inserted objects.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} for the given objects.
 	 */
 	<T> Collection<T> insertAll(Collection<? extends T> objectsToSave);
 
 	/**
 	 * Save the object to the collection for the entity type of the object to save. This will perform an insert if the
-	 * object is not already present, that is an 'upsert'.
-	 * <p/>
+	 * object is not already present, that is an 'upsert'. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
 	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
 	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
 	 * Type Conversion"</a> for more details.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} the property will be auto incremented. The
+	 * operation raises an error in case the document has been modified in between.
+	 * <p>
+	 * The {@code objectToSave} must not be collection-like.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the saved object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
+	 * @throws org.springframework.dao.OptimisticLockingFailureException in case of version mismatch in case a
+	 *           {@link org.springframework.data.annotation.Version} is defined.
 	 */
 	<T> T save(T objectToSave);
 
 	/**
 	 * Save the object to the specified collection. This will perform an insert if the object is not already present, that
-	 * is an 'upsert'.
-	 * <p/>
+	 * is an 'upsert'. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
-	 * Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
+	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
+	 * Conversion</a> for more details.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} the property will be auto incremented. The
+	 * operation raises an error in case the document has been modified in between.
+	 * <p>
+	 * The {@code objectToSave} must not be collection-like.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
 	 * @return the saved object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.dao.OptimisticLockingFailureException in case of version mismatch in case a
+	 *           {@link org.springframework.data.annotation.Version} is defined.
 	 */
 	<T> T save(T objectToSave, String collectionName);
 
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document. <br />
+	 * combining the query document and the update document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
+	 * <p>
 	 * <strong>NOTE:</strong> {@link Query#getSortObject() sorting} is not supported by {@code db.collection.updateOne}.
 	 * Use {@link #findAndModify(Query, UpdateDefinition, FindAndModifyOptions, Class, String)} instead.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be upserted. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing object. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
 	 * @see Update
 	 * @see AggregationUpdate
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.0
 	 */
 	UpdateResult upsert(Query query, UpdateDefinition update, Class<?> entityClass);
 
@@ -1323,13 +1551,13 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * <strong>NOTE:</strong> {@link Query#getSortObject() sorting} is not supported by {@code db.collection.updateOne}.
 	 * Use {@link #findAndModify(Query, UpdateDefinition, FindAndModifyOptions, Class, String)} instead.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be upserted. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing object. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1338,15 +1566,18 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
 	 * combining the query document and the update document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be upserted. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing object. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1355,16 +1586,22 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	/**
 	 * Updates the first object that is found in the collection of the entity class that matches the query document with
 	 * the provided update document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
-	 *          {@literal null}.
+	 * @param query the query document that specifies the criteria used to select a document to be updated. The
+	 *          {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to update when
+	 *          potentially matching multiple candidates. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
 	 * @see Update
 	 * @see AggregationUpdate
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.0
 	 */
 	UpdateResult updateFirst(Query query, UpdateDefinition update, Class<?> entityClass);
 
@@ -1374,17 +1611,15 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * <strong>NOTE:</strong> Any additional support for field mapping, versions, etc. is not available due to the lack of
 	 * domain type information. Use {@link #updateFirst(Query, UpdateDefinition, Class, String)} to get full type specific
 	 * support.
-	 * <br />
-	 * <strong>NOTE:</strong> {@link Query#getSortObject() sorting} is not supported by {@code db.collection.updateOne}.
-	 * Use {@link #findAndModify(Query, Update, Class, String)} instead.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
-	 *          {@literal null}.
+	 * @param query the query document that specifies the criteria used to select a document to be updated. The
+	 *          {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to update when
+	 *          potentially matching multiple candidates. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1392,16 +1627,20 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 
 	/**
 	 * Updates the first object that is found in the specified collection that matches the query document criteria with
-	 * the provided updated document. <br />
+	 * the provided updated document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be auto
+	 * incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
-	 *          {@literal null}.
+	 * @param query the query document that specifies the criteria used to select a document to be updated. The
+	 *          {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to update when
+	 *          potentially matching multiple candidates. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1410,16 +1649,21 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be auto
+	 * incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be updated. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 * @see Update
 	 * @see AggregationUpdate
+	 * @since 3.0
 	 */
 	UpdateResult updateMulti(Query query, UpdateDefinition update, Class<?> entityClass);
 
@@ -1430,13 +1674,13 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * domain type information. Use {@link #updateMulti(Query, UpdateDefinition, Class, String)} to get full type specific
 	 * support.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be updated. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1445,15 +1689,18 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be auto
+	 * incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be updated. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1467,6 +1714,8 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 *
 	 * @param object must not be {@literal null}.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	DeleteResult remove(Object object);
 
@@ -1477,29 +1726,33 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * acknowledged} remove operation was successful or not.
 	 *
 	 * @param object must not be {@literal null}.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 */
 	DeleteResult remove(Object object, String collectionName);
 
 	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
+	 * Remove all documents that match the provided query document criteria from the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
 	 *
-	 * @param query the query document that specifies the criteria used to remove a record.
+	 * @param query the query document that specifies the criteria used to remove a document.
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 * @throws IllegalArgumentException when {@literal query} or {@literal entityClass} is {@literal null}.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	DeleteResult remove(Query query, Class<?> entityClass);
 
 	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
+	 * Remove all documents that match the provided query document criteria from the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
 	 *
-	 * @param query the query document that specifies the criteria used to remove a record.
+	 * @param query the query document that specifies the criteria used to remove a document.
 	 * @param entityClass class of the pojo to be operated on. Can be {@literal null}.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 * @throws IllegalArgumentException when {@literal query}, {@literal entityClass} or {@literal collectionName} is
 	 *           {@literal null}.
@@ -1512,8 +1765,9 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * <strong>NOTE:</strong> Any additional support for field mapping is not available due to the lack of domain type
 	 * information. Use {@link #remove(Query, Class, String)} to get full type specific support.
 	 *
-	 * @param query the query document that specifies the criteria used to remove a record.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param query the query document that specifies the criteria used to remove a document.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 * @throws IllegalArgumentException when {@literal query} or {@literal collectionName} is {@literal null}.
 	 */
@@ -1525,7 +1779,8 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * information. Use {@link #findAllAndRemove(Query, Class, String)} to get full type specific support.
 	 *
 	 * @param query the query document that specifies the criteria used to find and remove documents.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link List} converted objects deleted by this operation.
 	 * @since 1.5
 	 */
@@ -1537,27 +1792,101 @@ <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions option
 	 * @param query the query document that specifies the criteria used to find and remove documents.
 	 * @param entityClass class of the pojo to be operated on.
 	 * @return the {@link List} converted objects deleted by this operation.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 * @since 1.5
 	 */
 	<T> List<T> findAllAndRemove(Query query, Class<T> entityClass);
 
 	/**
-	 * Returns and removes all documents that match the provided query document criteria from the the collection used to
-	 * store the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in
-	 * the query.
+	 * Returns and removes all documents that match the provided query document criteria from the collection used to store
+	 * the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the
+	 * query.
 	 *
 	 * @param query the query document that specifies the criteria used to find and remove documents.
 	 * @param entityClass class of the pojo to be operated on.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link List} converted objects deleted by this operation.
 	 * @since 1.5
 	 */
 	<T> List<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document. <br />
+	 * The collection name is derived from the {@literal replacement} type. <br />
+	 * Options are defaulted to {@link ReplaceOptions#none()}.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document. The query may
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
+	 * @since 4.2
+	 */
+	default <T> UpdateResult replace(Query query, T replacement) {
+		return replace(query, replacement, ReplaceOptions.none());
+	}
+
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document. Options are defaulted to {@link ReplaceOptions#none()}.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document. The query may
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @param collectionName the collection to query. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @since 4.2
+	 */
+	default <T> UpdateResult replace(Query query, T replacement, String collectionName) {
+		return replace(query, replacement, ReplaceOptions.none(), collectionName);
+	}
+
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document taking {@link ReplaceOptions} into account.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document.The query may
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @param options the {@link ReplaceOptions} holding additional information. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
+	 * @since 4.2
+	 */
+	default <T> UpdateResult replace(Query query, T replacement, ReplaceOptions options) {
+		return replace(query, replacement, options, getCollectionName(ClassUtils.getUserClass(replacement)));
+	}
+
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document taking {@link ReplaceOptions} into account.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document. The query may *
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @param options the {@link ReplaceOptions} holding additional information. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @since 4.2
+	 */
+	<T> UpdateResult replace(Query query, T replacement, ReplaceOptions options, String collectionName);
+
 	/**
 	 * Returns the underlying {@link MongoConverter}.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	MongoConverter getConverter();
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBean.java
new file mode 100644
index 0000000000..574c0c8931
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBean.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2021-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.util.ObjectUtils;
+
+import com.mongodb.ServerApi;
+import com.mongodb.ServerApi.Builder;
+import com.mongodb.ServerApiVersion;
+
+/**
+ * {@link FactoryBean} for creating {@link ServerApi} using the {@link ServerApi.Builder}.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public class MongoServerApiFactoryBean implements FactoryBean<ServerApi> {
+
+	private @Nullable String version;
+	private @Nullable Boolean deprecationErrors;
+	private @Nullable Boolean strict;
+
+	/**
+	 * @param version the version string either as the enum name or the server version value.
+	 * @see ServerApiVersion
+	 */
+	public void setVersion(String version) {
+		this.version = version;
+	}
+
+	/**
+	 * @param deprecationErrors
+	 * @see ServerApi.Builder#deprecationErrors(boolean)
+	 */
+	public void setDeprecationErrors(@Nullable Boolean deprecationErrors) {
+		this.deprecationErrors = deprecationErrors;
+	}
+
+	/**
+	 * @param strict
+	 * @see ServerApi.Builder#strict(boolean)
+	 */
+	public void setStrict(@Nullable Boolean strict) {
+		this.strict = strict;
+	}
+
+	@Override
+	public @Nullable ServerApi getObject() throws Exception {
+
+		Builder builder = ServerApi.builder().version(version());
+
+		if (deprecationErrors != null) {
+			builder = builder.deprecationErrors(deprecationErrors);
+		}
+		if (strict != null) {
+			builder = builder.strict(strict);
+		}
+		return builder.build();
+	}
+
+	@Nullable
+	@Override
+	public Class<?> getObjectType() {
+		return ServerApi.class;
+	}
+
+	private ServerApiVersion version() {
+
+		if(version == null) {
+			return ServerApiVersion.V1;
+		}
+
+		try {
+			// lookup by name eg. 'V1'
+			return ObjectUtils.caseInsensitiveValueOf(ServerApiVersion.values(), version);
+		} catch (IllegalArgumentException e) {
+			// or just the version number, eg. just '1'
+			return ServerApiVersion.findByValue(version);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
index 8194262366..ab03b41424 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/MongoTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,24 +17,20 @@
 
 import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BiPredicate;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
-import org.bson.BsonValue;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
-import org.bson.codecs.Codec;
 import org.bson.conversions.Bson;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
@@ -50,29 +46,35 @@
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.convert.EntityReader;
+import org.springframework.data.domain.OffsetScrollPosition;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.geo.Metric;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.PropertyReferenceException;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.MongoDatabaseUtils;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.SessionSynchronization;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.data.mongodb.core.CollectionPreparerSupport.CollectionPreparerDelegate;
 import org.springframework.data.mongodb.core.DefaultBulkOperations.BulkOperationContext;
 import org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity;
-import org.springframework.data.mongodb.core.MappedDocument.MappedUpdate;
+import org.springframework.data.mongodb.core.QueryOperations.AggregationDefinition;
+import org.springframework.data.mongodb.core.QueryOperations.CountContext;
+import org.springframework.data.mongodb.core.QueryOperations.DeleteContext;
+import org.springframework.data.mongodb.core.QueryOperations.DistinctQueryContext;
+import org.springframework.data.mongodb.core.QueryOperations.QueryContext;
+import org.springframework.data.mongodb.core.QueryOperations.UpdateContext;
+import org.springframework.data.mongodb.core.ScrollUtils.KeysetScrollQuery;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
+import org.springframework.data.mongodb.core.aggregation.AggregationOptions.Builder;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
-import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
-import org.springframework.data.mongodb.core.aggregation.Fields;
-import org.springframework.data.mongodb.core.aggregation.RelaxedTypeBasedAggregationOperationContext;
-import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
@@ -84,41 +86,34 @@
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.index.DefaultSearchIndexOperations;
 import org.springframework.data.mongodb.core.index.IndexOperations;
 import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
 import org.springframework.data.mongodb.core.index.MongoMappingEventPublisher;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.core.index.SearchIndexOperations;
+import org.springframework.data.mongodb.core.index.SearchIndexOperationsProvider;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterDeleteEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveCallback;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
-import org.springframework.data.mongodb.core.mapreduce.GroupBy;
-import org.springframework.data.mongodb.core.mapreduce.GroupByResults;
+import org.springframework.data.mongodb.core.mapping.event.*;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceResults;
+import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Meta;
-import org.springframework.data.mongodb.core.query.Meta.CursorOption;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
+import org.springframework.data.mongodb.core.timeseries.Granularity;
 import org.springframework.data.mongodb.core.validation.Validator;
-import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.projection.EntityProjection;
 import org.springframework.data.util.CloseableIterator;
+import org.springframework.data.util.Lazy;
 import org.springframework.data.util.Optionals;
-import org.springframework.jca.cci.core.ConnectionCallback;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
@@ -128,11 +123,6 @@
 import org.springframework.util.StringUtils;
 
 import com.mongodb.ClientSessionOptions;
-import com.mongodb.Cursor;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.Mongo;
-import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
@@ -141,6 +131,7 @@
 import com.mongodb.client.DistinctIterable;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
@@ -150,7 +141,23 @@
 import com.mongodb.client.result.UpdateResult;
 
 /**
- * Primary implementation of {@link MongoOperations}.
+ * Primary implementation of {@link MongoOperations}. It simplifies the use of imperative MongoDB usage and helps to
+ * avoid common errors. It executes core MongoDB workflow, leaving application code to provide {@link Document} and
+ * extract results. This class executes BSON queries or updates, initiating iteration over {@link FindIterable} and
+ * catching MongoDB exceptions and translating them to the generic, more informative exception hierarchy defined in the
+ * org.springframework.dao package. Can be used within a service implementation via direct instantiation with a
+ * {@link MongoDatabaseFactory} reference, or get prepared in an application context and given to services as bean
+ * reference.
+ * <p>
+ * Note: The {@link MongoDatabaseFactory} should always be configured as a bean in the application context, in the first
+ * case given to the service directly, in the second case to the prepared template.
+ * <h3>{@link ReadPreference} and {@link com.mongodb.ReadConcern}</h3>
+ * <p>
+ * {@code ReadPreference} and {@code ReadConcern} are generally considered from {@link Query} and
+ * {@link AggregationOptions} objects for the action to be executed on a particular {@link MongoCollection}.
+ * <p>
+ * You can also set the default {@link #setReadPreference(ReadPreference) ReadPreference} on the template level to
+ * generally apply a {@link ReadPreference}.
  *
  * @author Thomas Risberg
  * @author Graeme Rocher
@@ -173,34 +180,31 @@
  * @author Andreas Zink
  * @author Cimon Lucas
  * @author Michael J. Simons
+ * @author Roman Puchkovskiy
+ * @author Yadhukrishna S Pai
+ * @author Anton Barkan
+ * @author Bartłomiej Mazur
+ * @author Michael Krog
+ * @author Jakub Zurawa
+ * @author Florian Lüdiger
  */
-@SuppressWarnings("deprecation")
-public class MongoTemplate implements MongoOperations, ApplicationContextAware, IndexOperationsProvider {
+public class MongoTemplate implements MongoOperations, ApplicationContextAware, IndexOperationsProvider,
+		SearchIndexOperationsProvider, ReadPreferenceAware {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoTemplate.class);
+	private static final Log LOGGER = LogFactory.getLog(MongoTemplate.class);
 	private static final WriteResultChecking DEFAULT_WRITE_RESULT_CHECKING = WriteResultChecking.NONE;
-	private static final Collection<String> ITERABLE_CLASSES;
-
-	static {
-
-		Set<String> iterableClasses = new HashSet<>();
-		iterableClasses.add(List.class.getName());
-		iterableClasses.add(Collection.class.getName());
-		iterableClasses.add(Iterator.class.getName());
-
-		ITERABLE_CLASSES = Collections.unmodifiableCollection(iterableClasses);
-	}
 
 	private final MongoConverter mongoConverter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-	private final MongoDbFactory mongoDbFactory;
+	private final MongoDatabaseFactory mongoDbFactory;
 	private final PersistenceExceptionTranslator exceptionTranslator;
 	private final QueryMapper queryMapper;
 	private final UpdateMapper updateMapper;
 	private final JsonSchemaMapper schemaMapper;
-	private final SpelAwareProxyProjectionFactory projectionFactory;
 	private final EntityOperations operations;
 	private final PropertyOperations propertyOperations;
+	private final QueryOperations queryOperations;
+	private final EntityLifecycleEventDelegate eventDelegate;
 
 	private @Nullable WriteConcern writeConcern;
 	private WriteConcernResolver writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
@@ -213,17 +217,7 @@ public class MongoTemplate implements MongoOperations, ApplicationContextAware,
 
 	private SessionSynchronization sessionSynchronization = SessionSynchronization.ON_ACTUAL_TRANSACTION;
 
-	/**
-	 * Constructor used for a basic template configuration.
-	 *
-	 * @param mongoClient must not be {@literal null}.
-	 * @param databaseName must not be {@literal null} or empty.
-	 * @deprecated since 2.2 in favor of {@link #MongoTemplate(com.mongodb.client.MongoClient, String)}.
-	 */
-	@Deprecated
-	public MongoTemplate(MongoClient mongoClient, String databaseName) {
-		this(new SimpleMongoDbFactory(mongoClient, databaseName), (MongoConverter) null);
-	}
+	private CountExecution countExecution = this::doExactCount;
 
 	/**
 	 * Constructor used for a basic template configuration.
@@ -232,8 +226,8 @@ public MongoTemplate(MongoClient mongoClient, String databaseName) {
 	 * @param databaseName must not be {@literal null} or empty.
 	 * @since 2.1
 	 */
-	public MongoTemplate(com.mongodb.client.MongoClient mongoClient, String databaseName) {
-		this(new SimpleMongoClientDbFactory(mongoClient, databaseName), (MongoConverter) null);
+	public MongoTemplate(MongoClient mongoClient, String databaseName) {
+		this(new SimpleMongoClientDatabaseFactory(mongoClient, databaseName), (MongoConverter) null);
 	}
 
 	/**
@@ -241,7 +235,7 @@ public MongoTemplate(com.mongodb.client.MongoClient mongoClient, String database
 	 *
 	 * @param mongoDbFactory must not be {@literal null}.
 	 */
-	public MongoTemplate(MongoDbFactory mongoDbFactory) {
+	public MongoTemplate(MongoDatabaseFactory mongoDbFactory) {
 		this(mongoDbFactory, (MongoConverter) null);
 	}
 
@@ -251,9 +245,9 @@ public MongoTemplate(MongoDbFactory mongoDbFactory) {
 	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param mongoConverter
 	 */
-	public MongoTemplate(MongoDbFactory mongoDbFactory, @Nullable MongoConverter mongoConverter) {
+	public MongoTemplate(MongoDatabaseFactory mongoDbFactory, @Nullable MongoConverter mongoConverter) {
 
-		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null!");
+		Assert.notNull(mongoDbFactory, "MongoDbFactory must not be null");
 
 		this.mongoDbFactory = mongoDbFactory;
 		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
@@ -261,16 +255,16 @@ public MongoTemplate(MongoDbFactory mongoDbFactory, @Nullable MongoConverter mon
 		this.queryMapper = new QueryMapper(this.mongoConverter);
 		this.updateMapper = new UpdateMapper(this.mongoConverter);
 		this.schemaMapper = new MongoJsonSchemaMapper(this.mongoConverter);
-		this.projectionFactory = new SpelAwareProxyProjectionFactory();
-		this.operations = new EntityOperations(this.mongoConverter.getMappingContext());
+		this.operations = new EntityOperations(this.mongoConverter, this.queryMapper);
 		this.propertyOperations = new PropertyOperations(this.mongoConverter.getMappingContext());
+		this.queryOperations = new QueryOperations(queryMapper, updateMapper, operations, propertyOperations,
+				mongoDbFactory);
+		this.eventDelegate = new EntityLifecycleEventDelegate();
 
 		// We always have a mapping context in the converter, whether it's a simple one or not
 		mappingContext = this.mongoConverter.getMappingContext();
 		// We create indexes based on mapping events
-		if (mappingContext instanceof MongoMappingContext) {
-
-			MongoMappingContext mappingContext = (MongoMappingContext) this.mappingContext;
+		if (mappingContext instanceof MongoMappingContext mappingContext) {
 
 			if (mappingContext.isAutoIndexCreation()) {
 
@@ -281,7 +275,7 @@ public MongoTemplate(MongoDbFactory mongoDbFactory, @Nullable MongoConverter mon
 		}
 	}
 
-	private MongoTemplate(MongoDbFactory dbFactory, MongoTemplate that) {
+	private MongoTemplate(MongoDatabaseFactory dbFactory, MongoTemplate that) {
 
 		this.mongoDbFactory = dbFactory;
 		this.exceptionTranslator = that.exceptionTranslator;
@@ -289,8 +283,8 @@ private MongoTemplate(MongoDbFactory dbFactory, MongoTemplate that) {
 
 		// we need to (re)create the MappingMongoConverter as we need to have it use a DbRefResolver that operates within
 		// the sames session. Otherwise loading referenced objects would happen outside of it.
-		if (that.mongoConverter instanceof MappingMongoConverter) {
-			this.mongoConverter = ((MappingMongoConverter) that.mongoConverter).with(dbFactory);
+		if (that.mongoConverter instanceof MappingMongoConverter mappingMongoConverter) {
+			this.mongoConverter = mappingMongoConverter.with(dbFactory);
 		} else {
 			this.mongoConverter = that.mongoConverter;
 		}
@@ -298,10 +292,11 @@ private MongoTemplate(MongoDbFactory dbFactory, MongoTemplate that) {
 		this.queryMapper = that.queryMapper;
 		this.updateMapper = that.updateMapper;
 		this.schemaMapper = that.schemaMapper;
-		this.projectionFactory = that.projectionFactory;
 		this.mappingContext = that.mappingContext;
 		this.operations = that.operations;
 		this.propertyOperations = that.propertyOperations;
+		this.queryOperations = that.queryOperations;
+		this.eventDelegate = that.eventDelegate;
 	}
 
 	/**
@@ -316,8 +311,7 @@ public void setWriteResultChecking(@Nullable WriteResultChecking resultChecking)
 
 	/**
 	 * Configures the {@link WriteConcern} to be used with the template. If none is configured the {@link WriteConcern}
-	 * configured on the {@link MongoDbFactory} will apply. If you configured a {@link Mongo} instance no
-	 * {@link WriteConcern} will be used.
+	 * configured on the {@link MongoDatabaseFactory} will apply.
 	 *
 	 * @param writeConcern
 	 */
@@ -345,34 +339,51 @@ public void setReadPreference(@Nullable ReadPreference readPreference) {
 		this.readPreference = readPreference;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
+	@Override
+	public boolean hasReadPreference() {
+		return this.readPreference != null;
+	}
+
+	@Override
+	public @Nullable ReadPreference getReadPreference() {
+		return this.readPreference;
+	}
+
+	/**
+	 * Configure whether lifecycle events such as {@link AfterLoadEvent}, {@link BeforeSaveEvent}, etc. should be
+	 * published or whether emission should be suppressed. Enabled by default.
+	 *
+	 * @param enabled {@code true} to enable entity lifecycle events; {@code false} to disable entity lifecycle events.
+	 * @since 4.0
+	 * @see MongoMappingEvent
 	 */
+	public void setEntityLifecycleEventsEnabled(boolean enabled) {
+		this.eventDelegate.setEventsEnabled(enabled);
+	}
+
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
 		prepareIndexCreator(applicationContext);
 
 		eventPublisher = applicationContext;
+		eventDelegate.setPublisher(eventPublisher);
 
 		if (entityCallbacks == null) {
 			setEntityCallbacks(EntityCallbacks.create(applicationContext));
 		}
 
-		if (mappingContext instanceof ApplicationEventPublisherAware) {
-			((ApplicationEventPublisherAware) mappingContext).setApplicationEventPublisher(eventPublisher);
+		if (mappingContext instanceof ApplicationEventPublisherAware applicationEventPublisherAware) {
+			applicationEventPublisherAware.setApplicationEventPublisher(eventPublisher);
 		}
 
 		resourceLoader = applicationContext;
-
-		projectionFactory.setBeanFactory(applicationContext);
-		projectionFactory.setBeanClassLoader(applicationContext.getClassLoader());
 	}
 
 	/**
 	 * Set the {@link EntityCallbacks} instance to use when invoking
 	 * {@link org.springframework.data.mapping.callback.EntityCallback callbacks} like the {@link BeforeSaveCallback}.
-	 * <p />
+	 * <br />
 	 * Overrides potentially existing {@link EntityCallbacks}.
 	 *
 	 * @param entityCallbacks must not be {@literal null}.
@@ -381,10 +392,51 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 	 */
 	public void setEntityCallbacks(EntityCallbacks entityCallbacks) {
 
-		Assert.notNull(entityCallbacks, "EntityCallbacks must not be null!");
+		Assert.notNull(entityCallbacks, "EntityCallbacks must not be null");
 		this.entityCallbacks = entityCallbacks;
 	}
 
+	/**
+	 * Configure whether to use estimated count. Defaults to exact counting.
+	 *
+	 * @param enabled use {@link com.mongodb.client.MongoCollection#estimatedDocumentCount()} for unpaged and empty
+	 *          {@link Query queries} if {@code true}.
+	 * @since 3.4
+	 */
+	public void useEstimatedCount(boolean enabled) {
+		useEstimatedCount(enabled, this::countCanBeEstimated);
+	}
+
+	/**
+	 * Configure whether to use estimated count based on the given {@link BiPredicate estimationFilter}.
+	 *
+	 * @param enabled use {@link com.mongodb.client.MongoCollection#estimatedDocumentCount()} for unpaged and empty
+	 *          {@link Query queries} if {@code true}.
+	 * @param estimationFilter the {@link BiPredicate filter}.
+	 * @since 3.4
+	 */
+	private void useEstimatedCount(boolean enabled, BiPredicate<Document, CountOptions> estimationFilter) {
+
+		if (enabled) {
+
+			this.countExecution = (collectionPreparer, collectionName, filter, options) -> {
+
+				if (!estimationFilter.test(filter, options)) {
+					return doExactCount(collectionPreparer, collectionName, filter, options);
+				}
+
+				EstimatedDocumentCountOptions estimatedDocumentCountOptions = new EstimatedDocumentCountOptions();
+				if (options.getMaxTime(TimeUnit.MILLISECONDS) > 0) {
+					estimatedDocumentCountOptions.maxTime(options.getMaxTime(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS);
+				}
+
+				return doEstimatedCount(collectionPreparer, collectionName, estimatedDocumentCountOptions);
+			};
+		} else {
+			this.countExecution = this::doExactCount;
+		}
+	}
+
 	/**
 	 * Inspects the given {@link ApplicationContext} for {@link MongoPersistentEntityIndexCreator} and those in turn if
 	 * they were registered for the current {@link MappingContext}. If no creator for the current {@link MappingContext}
@@ -404,8 +456,8 @@ private void prepareIndexCreator(ApplicationContext context) {
 			}
 		}
 
-		if (context instanceof ConfigurableApplicationContext && indexCreator != null) {
-			((ConfigurableApplicationContext) context).addApplicationListener(indexCreator);
+		if (context instanceof ConfigurableApplicationContext configurableApplicationContext && indexCreator != null) {
+			configurableApplicationContext.addApplicationListener(indexCreator);
 		}
 	}
 
@@ -414,49 +466,53 @@ private void prepareIndexCreator(ApplicationContext context) {
 	 *
 	 * @return
 	 */
+	@Override
 	public MongoConverter getConverter() {
 		return this.mongoConverter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#executeAsStream(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
 	@Override
-	public <T> CloseableIterator<T> stream(Query query, Class<T> entityType) {
+	public <T> Stream<T> stream(Query query, Class<T> entityType) {
 		return stream(query, entityType, getCollectionName(entityType));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#stream(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
 	@Override
-	public <T> CloseableIterator<T> stream(Query query, Class<T> entityType, String collectionName) {
+	public <T> Stream<T> stream(Query query, Class<T> entityType, String collectionName) {
 		return doStream(query, entityType, collectionName, entityType);
 	}
 
-	@SuppressWarnings("ConstantConditions")
-	protected <T> CloseableIterator<T> doStream(Query query, Class<?> entityType, String collectionName,
-			Class<T> returnType) {
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
+	protected <T> Stream<T> doStream(Query query, Class<?> entityType, String collectionName, Class<T> returnType) {
+		return doStream(query, entityType, collectionName, returnType, QueryResultConverter.entity());
+	}
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(entityType, "Entity type must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		Assert.notNull(returnType, "ReturnType must not be null!");
+	@SuppressWarnings({"ConstantConditions", "NullAway"})
+	<T, R> Stream<R> doStream(Query query, Class<?> entityType, String collectionName, Class<T> returnType,
+			QueryResultConverter<? super T, ? extends R> resultConverter) {
 
-		return execute(collectionName, (CollectionCallback<CloseableIterator<T>>) collection -> {
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(entityType, "Entity type must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		Assert.notNull(returnType, "ReturnType must not be null");
+
+		return execute(collectionName, (CollectionCallback<Stream<R>>) collection -> {
 
 			MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entityType);
 
-			Document mappedFields = getMappedFieldsObject(query.getFieldsObject(), persistentEntity, returnType);
-			Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), persistentEntity);
+			QueryContext queryContext = queryOperations.createQueryContext(query);
+			EntityProjection<T, ?> projection = operations.introspectProjection(returnType, entityType);
+
+			Document mappedQuery = queryContext.getMappedQuery(persistentEntity);
+			Document mappedFields = queryContext.getMappedFields(persistentEntity, projection);
 
+			CollectionPreparerDelegate readPreference = createDelegate(query);
 			FindIterable<Document> cursor = new QueryCursorPreparer(query, entityType).initiateFind(collection,
-					col -> col.find(mappedQuery, Document.class).projection(mappedFields));
+					col -> readPreference.prepare(col).find(mappedQuery, Document.class).projection(mappedFields));
+
+			DocumentCallback<R> resultReader = getResultReader(projection, collectionName, resultConverter);
 
 			return new CloseableIterableCursorAdapter<>(cursor, exceptionTranslator,
-					new ProjectingReadCallback<>(mongoConverter, entityType, returnType, collectionName));
+					resultReader).stream();
 		});
 	}
 
@@ -465,52 +521,35 @@ public String getCollectionName(Class<?> entityClass) {
 		return this.operations.determineCollectionName(entityClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#executeCommand(java.lang.String)
-	 */
 	@Override
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	public Document executeCommand(String jsonCommand) {
 
-		Assert.hasText(jsonCommand, "JsonCommand must not be null nor empty!");
+		Assert.hasText(jsonCommand, "JsonCommand must not be null nor empty");
 
 		return execute(db -> db.runCommand(Document.parse(jsonCommand), Document.class));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#executeCommand(org.bson.Document)
-	 */
 	@Override
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	public Document executeCommand(Document command) {
 
-		Assert.notNull(command, "Command must not be null!");
+		Assert.notNull(command, "Command must not be null");
 
 		return execute(db -> db.runCommand(command, Document.class));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#executeCommand(org.bson.Document, com.mongodb.ReadPreference)
-	 */
-
 	@Override
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	public Document executeCommand(Document command, @Nullable ReadPreference readPreference) {
 
-		Assert.notNull(command, "Command must not be null!");
+		Assert.notNull(command, "Command must not be null");
 
 		return execute(db -> readPreference != null //
 				? db.runCommand(command, readPreference, Document.class) //
 				: db.runCommand(command, Document.class));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#executeQuery(org.springframework.data.mongodb.core.query.Query, java.lang.String, org.springframework.data.mongodb.core.DocumentCallbackHandler)
-	 */
 	@Override
 	public void executeQuery(Query query, String collectionName, DocumentCallbackHandler dch) {
 		executeQuery(query, collectionName, dch, new QueryCursorPreparer(query, null));
@@ -524,36 +563,33 @@ public void executeQuery(Query query, String collectionName, DocumentCallbackHan
 	 *          specification, must not be {@literal null}.
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param documentCallbackHandler the handler that will extract results, one document at a time
-	 * @param preparer allows for customization of the {@link DBCursor} used when iterating over the result set, (apply
-	 *          limits, skips and so on).
+	 * @param preparer allows for customization of the {@link FindIterable} used when iterating over the result set,
+	 *          (apply limits, skips and so on).
 	 */
 	protected void executeQuery(Query query, String collectionName, DocumentCallbackHandler documentCallbackHandler,
 			@Nullable CursorPreparer preparer) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(documentCallbackHandler, "DocumentCallbackHandler must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(documentCallbackHandler, "DocumentCallbackHandler must not be null");
 
 		Document queryObject = queryMapper.getMappedObject(query.getQueryObject(), Optional.empty());
 		Document sortObject = query.getSortObject();
 		Document fieldsObject = query.getFieldsObject();
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Executing query: {} sort: {} fields: {} in collection: {}", serializeToJsonSafely(queryObject),
-					sortObject, fieldsObject, collectionName);
+			LOGGER.debug(String.format("Executing query: %s fields: %s sort: %s in collection: %s",
+					serializeToJsonSafely(queryObject), fieldsObject, serializeToJsonSafely(sortObject), collectionName));
 		}
 
-		this.executeQueryInternal(new FindCallback(queryObject, fieldsObject, null),
+		this.executeQueryInternal(new FindCallback(createDelegate(query), queryObject, fieldsObject, null),
 				preparer != null ? preparer : CursorPreparer.NO_OP_PREPARER, documentCallbackHandler, collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(org.springframework.data.mongodb.core.DbCallback)
-	 */
-	public <T> T execute(DbCallback<T> action) {
+	@Override
+	public <T> @Nullable T execute(DbCallback<T> action) {
 
-		Assert.notNull(action, "DbCallback must not be null!");
+		Assert.notNull(action, "DbCallback must not be null");
 
 		try {
 			MongoDatabase db = prepareDatabase(this.doGetDatabase());
@@ -563,24 +599,18 @@ public <T> T execute(DbCallback<T> action) {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(java.lang.Class, org.springframework.data.mongodb.core.DbCallback)
-	 */
-	public <T> T execute(Class<?> entityClass, CollectionCallback<T> callback) {
+	@Override
+	public <T> @Nullable T execute(Class<?> entityClass, CollectionCallback<T> callback) {
 
-		Assert.notNull(entityClass, "EntityClass must not be null!");
+		Assert.notNull(entityClass, "EntityClass must not be null");
 		return execute(getCollectionName(entityClass), callback);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#execute(java.lang.String, org.springframework.data.mongodb.core.DbCallback)
-	 */
-	public <T> T execute(String collectionName, CollectionCallback<T> callback) {
+	@Override
+	public <T> @Nullable T execute(String collectionName, CollectionCallback<T> callback) {
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(callback, "CollectionCallback must not be null!");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(callback, "CollectionCallback must not be null");
 
 		try {
 			MongoCollection<Document> collection = getAndPrepareCollection(doGetDatabase(), collectionName);
@@ -590,26 +620,19 @@ public <T> T execute(String collectionName, CollectionCallback<T> callback) {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#withSession(com.mongodb.ClientSessionOptions)
-	 */
 	@Override
 	public SessionScoped withSession(ClientSessionOptions options) {
 
-		Assert.notNull(options, "ClientSessionOptions must not be null!");
+		Assert.notNull(options, "ClientSessionOptions must not be null");
 
 		return withSession(() -> mongoDbFactory.getSession(options));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#withSession(com.mongodb.session.ClientSession)
-	 */
 	@Override
+	@Contract("_ -> new")
 	public MongoTemplate withSession(ClientSession session) {
 
-		Assert.notNull(session, "ClientSession must not be null!");
+		Assert.notNull(session, "ClientSession must not be null");
 
 		return new SessionBoundMongoTemplate(session, MongoTemplate.this);
 	}
@@ -625,82 +648,96 @@ public void setSessionSynchronization(SessionSynchronization sessionSynchronizat
 		this.sessionSynchronization = sessionSynchronization;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.Class)
-	 */
+	@Override
 	public <T> MongoCollection<Document> createCollection(Class<T> entityClass) {
-		return createCollection(entityClass, CollectionOptions.empty());
+		return createCollection(entityClass, operations.forType(entityClass).getCollectionOptions());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.Class, org.springframework.data.mongodb.core.CollectionOptions)
-	 */
+	@Override
 	public <T> MongoCollection<Document> createCollection(Class<T> entityClass,
 			@Nullable CollectionOptions collectionOptions) {
 
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-
-		CollectionOptions options = collectionOptions != null ? collectionOptions : CollectionOptions.empty();
-		options = Optionals
-				.firstNonEmpty(() -> Optional.ofNullable(collectionOptions).flatMap(CollectionOptions::getCollation),
-						() -> operations.forType(entityClass).getCollation()) //
-				.map(options::collation).orElse(options);
+		Assert.notNull(entityClass, "EntityClass must not be null");
 
-		return doCreateCollection(getCollectionName(entityClass), convertToDocument(options, entityClass));
+		return doCreateCollection(getCollectionName(entityClass),
+				operations.convertToCreateCollectionOptions(collectionOptions, entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.String)
-	 */
+	@Override
 	public MongoCollection<Document> createCollection(String collectionName) {
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		return doCreateCollection(collectionName, new Document());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#createCollection(java.lang.String, org.springframework.data.mongodb.core.CollectionOptions)
-	 */
+	@Override
 	public MongoCollection<Document> createCollection(String collectionName,
 			@Nullable CollectionOptions collectionOptions) {
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		return doCreateCollection(collectionName, convertToDocument(collectionOptions));
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		return doCreateCollection(collectionName,
+				operations.convertToCreateCollectionOptions(collectionOptions, Object.class));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#getCollection(java.lang.String)
-	 */
-	@SuppressWarnings("ConstantConditions")
-	public MongoCollection<Document> getCollection(String collectionName) {
+	@Override
+	public MongoCollection<Document> createView(String name, Class<?> source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options) {
+
+		return createView(name, getCollectionName(source),
+				queryOperations.createAggregation(Aggregation.newAggregation(source, pipeline.getOperations()), source),
+				options);
+	}
+
+	@Override
+	public MongoCollection<Document> createView(String name, String source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options) {
+
+		return createView(name, source,
+				queryOperations.createAggregation(Aggregation.newAggregation(pipeline.getOperations()), (Class<?>) null),
+				options);
+	}
+
+	private MongoCollection<Document> createView(String name, String source, AggregationDefinition aggregation,
+			@Nullable ViewOptions options) {
+		return doCreateView(name, source, aggregation.getAggregationPipeline(), options);
+	}
+
+	@SuppressWarnings("NullAway")
+	protected MongoCollection<Document> doCreateView(String name, String source, List<Document> pipeline,
+			@Nullable ViewOptions options) {
+
+		CreateViewOptions viewOptions = new CreateViewOptions();
+		if (options != null) {
+			options.getCollation().map(Collation::toMongoCollation).ifPresent(viewOptions::collation);
+		}
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		return execute(db -> {
+			db.createView(name, source, pipeline, viewOptions);
+			return db.getCollection(name);
+		});
+	}
+
+	@Override
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
+	@Contract("null -> fail")
+	public MongoCollection<Document> getCollection(@Nullable String collectionName) {
+
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		return execute(db -> db.getCollection(collectionName, Document.class));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.Class)
-	 */
+	@Override
 	public <T> boolean collectionExists(Class<T> entityClass) {
 		return collectionExists(getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollection(java.lang.String)
-	 */
-	@SuppressWarnings("ConstantConditions")
+	@Override
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	public boolean collectionExists(String collectionName) {
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		return execute(db -> {
 
@@ -713,87 +750,81 @@ public boolean collectionExists(String collectionName) {
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#dropCollection(java.lang.Class)
-	 */
+	@Override
 	public <T> void dropCollection(Class<T> entityClass) {
 		dropCollection(getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#dropCollection(java.lang.String)
-	 */
+	@Override
 	public void dropCollection(String collectionName) {
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		execute(collectionName, (CollectionCallback<Void>) collection -> {
 			collection.drop();
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Dropped collection [{}]",
-						collection.getNamespace() != null ? collection.getNamespace().getCollectionName() : collectionName);
+				LOGGER.debug(String.format("Dropped collection [%s]",
+						collection.getNamespace() != null ? collection.getNamespace().getCollectionName() : collectionName));
 			}
 			return null;
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.String)
-	 */
+	@Override
 	public IndexOperations indexOps(String collectionName) {
-		return new DefaultIndexOperations(this, collectionName, null);
+		return indexOps(collectionName, null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#indexOps(java.lang.Class)
-	 */
+	@Override
+	public IndexOperations indexOps(String collectionName, @Nullable Class<?> type) {
+		return new DefaultIndexOperations(this, collectionName, type);
+	}
+
+	@Override
 	public IndexOperations indexOps(Class<?> entityClass) {
-		return new DefaultIndexOperations(this, getCollectionName(entityClass), entityClass);
+		return indexOps(getCollectionName(entityClass), entityClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.String)
-	 */
-	public BulkOperations bulkOps(BulkMode bulkMode, String collectionName) {
-		return bulkOps(bulkMode, null, collectionName);
+	@Override
+	public SearchIndexOperations searchIndexOps(String collectionName) {
+		return searchIndexOps(null, collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.Class)
-	 */
+	@Override
+	public SearchIndexOperations searchIndexOps(Class<?> type) {
+		return new DefaultSearchIndexOperations(this, type);
+	}
+
+	@Override
+	public SearchIndexOperations searchIndexOps(@Nullable Class<?> type, String collectionName) {
+		return new DefaultSearchIndexOperations(this, collectionName, type);
+	}
+
+	@Override
+	public BulkOperations bulkOps(BulkMode mode, String collectionName) {
+		return bulkOps(mode, null, collectionName);
+	}
+
+	@Override
 	public BulkOperations bulkOps(BulkMode bulkMode, Class<?> entityClass) {
 		return bulkOps(bulkMode, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#bulkOps(org.springframework.data.mongodb.core.BulkMode, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public BulkOperations bulkOps(BulkMode mode, @Nullable Class<?> entityType, String collectionName) {
 
-		Assert.notNull(mode, "BulkMode must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(mode, "BulkMode must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
 		DefaultBulkOperations operations = new DefaultBulkOperations(this, collectionName,
 				new BulkOperationContext(mode, Optional.ofNullable(getPersistentEntity(entityType)), queryMapper, updateMapper,
 						eventPublisher, entityCallbacks));
 
-		operations.setExceptionTranslator(exceptionTranslator);
 		operations.setDefaultWriteConcern(writeConcern);
 
 		return operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#scriptOps()
-	 */
 	@Override
 	public ScriptOperations scriptOps() {
 		return new DefaultScriptOperations(this);
@@ -811,13 +842,13 @@ public <T> T findOne(Query query, Class<T> entityClass) {
 	@Override
 	public <T> T findOne(Query query, Class<T> entityClass, String collectionName) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(entityClass, "EntityClass must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		if (ObjectUtils.isEmpty(query.getSortObject())) {
 
-			return doFindOne(collectionName, query.getQueryObject(), query.getFieldsObject(),
+			return doFindOne(collectionName, createDelegate(query), query.getQueryObject(), query.getFieldsObject(),
 					new QueryCursorPreparer(query, entityClass), entityClass);
 		} else {
 			query.limit(1);
@@ -837,46 +868,83 @@ public boolean exists(Query query, String collectionName) {
 	}
 
 	@Override
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	public boolean exists(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		if (query == null) {
 			throw new InvalidDataAccessApiUsageException("Query passed in to exist can't be null");
 		}
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
-		Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), getPersistentEntity(entityClass));
+		QueryContext queryContext = queryOperations.createQueryContext(query);
+		Document mappedQuery = queryContext.getMappedQuery(entityClass, this::getPersistentEntity);
 
-		return execute(collectionName, new ExistsCallback(mappedQuery,
-				operations.forType(entityClass).getCollation(query).map(Collation::toMongoCollation).orElse(null)));
+		return execute(collectionName,
+				new ExistsCallback(createDelegate(query), mappedQuery, queryContext.getCollation(entityClass).orElse(null)));
 	}
 
 	// Find methods that take a Query to express the query and that return a List of objects.
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
 	@Override
 	public <T> List<T> find(Query query, Class<T> entityClass) {
 		return find(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
 	@Override
 	public <T> List<T> find(Query query, Class<T> entityClass, String collectionName) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(entityClass, "EntityClass must not be null");
 
-		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
+		return doFind(collectionName, createDelegate(query), query.getQueryObject(), query.getFieldsObject(), entityClass,
 				new QueryCursorPreparer(query, entityClass));
 	}
 
+	@Override
+	public <T> Window<T> scroll(Query query, Class<T> entityType) {
+
+		Assert.notNull(entityType, "Entity type must not be null");
+
+		return scroll(query, entityType, getCollectionName(entityType));
+	}
+
+	@Override
+	public <T> Window<T> scroll(Query query, Class<T> entityType, String collectionName) {
+		return doScroll(query, entityType, entityType, QueryResultConverter.entity(), collectionName);
+	}
+
+	<T, R> Window<R> doScroll(Query query, Class<?> sourceClass, Class<T> targetClass,
+			QueryResultConverter<? super T, ? extends R> resultConverter, String collectionName) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(sourceClass, "Entity type must not be null");
+		Assert.notNull(targetClass, "Target type must not be null");
+
+		EntityProjection<T, ?> projection = operations.introspectProjection(targetClass, sourceClass);
+		DocumentCallback<R> callback = getResultReader(projection, collectionName, resultConverter);
+		int limit = query.isLimited() ? query.getLimit() + 1 : Integer.MAX_VALUE;
+
+		if (query.hasKeyset()) {
+
+			KeysetScrollQuery keysetPaginationQuery = ScrollUtils.createKeysetPaginationQuery(query,
+					operations.getIdPropertyName(sourceClass));
+
+			List<R> result = doFind(collectionName, createDelegate(query), keysetPaginationQuery.query(),
+					keysetPaginationQuery.fields(), sourceClass,
+					new QueryCursorPreparer(query, keysetPaginationQuery.sort(), limit, 0, sourceClass), callback);
+
+			return ScrollUtils.createWindow(query, result, sourceClass, operations);
+		}
+
+		List<R> result = doFind(collectionName, createDelegate(query), query.getQueryObject(), query.getFieldsObject(),
+				sourceClass, new QueryCursorPreparer(query, query.getSortObject(), limit, query.getSkip(), sourceClass),
+				callback);
+
+		return ScrollUtils.createWindow(result, query.getLimit(), OffsetScrollPosition.positionFunction(query.getSkip()));
+	}
+
 	@Nullable
 	@Override
 	public <T> T findById(Object id, Class<T> entityClass) {
@@ -887,67 +955,52 @@ public <T> T findById(Object id, Class<T> entityClass) {
 	@Override
 	public <T> T findById(Object id, Class<T> entityClass, String collectionName) {
 
-		Assert.notNull(id, "Id must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(id, "Id must not be null");
+		Assert.notNull(entityClass, "EntityClass must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		String idKey = operations.getIdPropertyName(entityClass);
 
-		return doFindOne(collectionName, new Document(idKey, id), new Document(), entityClass);
+		return doFindOne(collectionName, CollectionPreparer.identity(), new Document(idKey, id), new Document(),
+				entityClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.Class, java.lang.Class)
-	 */
 	@Override
 	public <T> List<T> findDistinct(Query query, String field, Class<?> entityClass, Class<T> resultClass) {
 		return findDistinct(query, field, getCollectionName(entityClass), entityClass, resultClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.String, java.lang.Class, java.lang.Class)
-	 */
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "NullAway" })
 	public <T> List<T> findDistinct(Query query, String field, String collectionName, Class<?> entityClass,
 			Class<T> resultClass) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(field, "Field must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		Assert.notNull(resultClass, "ResultClass must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(field, "Field must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(entityClass, "EntityClass must not be null");
+		Assert.notNull(resultClass, "ResultClass must not be null");
 
 		MongoPersistentEntity<?> entity = entityClass != Object.class ? getPersistentEntity(entityClass) : null;
+		DistinctQueryContext distinctQueryContext = queryOperations.distinctQueryContext(query, field);
 
-		Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), entity);
-		String mappedFieldName = queryMapper.getMappedFields(new Document(field, 1), entity).keySet().iterator().next();
-
-		Class<T> mongoDriverCompatibleType = getMongoDbFactory().getCodecFor(resultClass) //
-				.map(Codec::getEncoderClass) //
-				.orElse((Class<T>) BsonValue.class);
+		Document mappedQuery = distinctQueryContext.getMappedQuery(entity);
+		String mappedFieldName = distinctQueryContext.getMappedFieldName(entity);
+		Class<T> mongoDriverCompatibleType = distinctQueryContext.getDriverCompatibleClass(resultClass);
 
 		MongoIterable<?> result = execute(collectionName, (collection) -> {
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Executing findDistinct using query {} for field: {} in collection: {}",
-						serializeToJsonSafely(mappedQuery), field, collectionName);
+				LOGGER.debug(String.format("Executing findDistinct using query %s for field: %s in collection: %s",
+						serializeToJsonSafely(mappedQuery), field, collectionName));
 			}
 
-			QueryCursorPreparer preparer = new QueryCursorPreparer(query, entityClass);
-			if (preparer.hasReadPreference()) {
-				collection = collection.withReadPreference(preparer.getReadPreference());
-			}
+			collection = createDelegate(query).prepare(collection);
 
 			DistinctIterable<T> iterable = collection.distinct(mappedFieldName, mappedQuery, mongoDriverCompatibleType);
+			distinctQueryContext.applyCollation(entityClass, iterable::collation);
 
-			return operations.forType(entityClass) //
-					.getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.map(iterable::collation) //
-					.orElse(iterable);
+			return iterable;
 		});
 
 		if (resultClass == Object.class || mongoDriverCompatibleType != resultClass) {
@@ -956,7 +1009,7 @@ public <T> List<T> findDistinct(Query query, String field, String collectionName
 			DefaultDbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory);
 
 			result = result.map((source) -> converter.mapValueToTargetType(source,
-					getMostSpecificConversionTargetType(resultClass, entityClass, field), dbRefResolver));
+					distinctQueryContext.getMostSpecificConversionTargetType(resultClass, entityClass), dbRefResolver));
 		}
 
 		try {
@@ -966,32 +1019,6 @@ public <T> List<T> findDistinct(Query query, String field, String collectionName
 		}
 	}
 
-	/**
-	 * @param userType must not be {@literal null}.
-	 * @param domainType must not be {@literal null}.
-	 * @param field must not be {@literal null}.
-	 * @return the most specific conversion target type depending on user preference and domain type property.
-	 * @since 2.1
-	 */
-	private static Class<?> getMostSpecificConversionTargetType(Class<?> userType, Class<?> domainType, String field) {
-
-		Class<?> conversionTargetType = userType;
-		try {
-
-			Class<?> propertyType = PropertyPath.from(field, domainType).getLeafProperty().getLeafType();
-
-			// use the more specific type but favor UserType over property one
-			if (ClassUtils.isAssignable(userType, propertyType)) {
-				conversionTargetType = propertyType;
-			}
-
-		} catch (PropertyReferenceException e) {
-			// just don't care about it as we default to Object.class anyway.
-		}
-
-		return conversionTargetType;
-	}
-
 	@Override
 	public <T> GeoResults<T> geoNear(NearQuery near, Class<T> entityClass) {
 		return geoNear(near, entityClass, getCollectionName(entityClass));
@@ -1003,113 +1030,135 @@ public <T> GeoResults<T> geoNear(NearQuery near, Class<T> domainType, String col
 	}
 
 	public <T> GeoResults<T> geoNear(NearQuery near, Class<?> domainType, String collectionName, Class<T> returnType) {
+		return doGeoNear(near, domainType, collectionName, returnType, QueryResultConverter.entity());
+	}
+
+	<T, R> GeoResults<R> doGeoNear(NearQuery near, Class<?> domainType, String collectionName, Class<T> returnType,
+			QueryResultConverter<? super T, ? extends R> resultConverter) {
 
 		if (near == null) {
-			throw new InvalidDataAccessApiUsageException("NearQuery must not be null!");
+			throw new InvalidDataAccessApiUsageException("NearQuery must not be null");
 		}
 
 		if (domainType == null) {
-			throw new InvalidDataAccessApiUsageException("Entity class must not be null!");
+			throw new InvalidDataAccessApiUsageException("Entity class must not be null");
 		}
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(returnType, "ReturnType must not be null!");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(returnType, "ReturnType must not be null");
 
 		String collection = StringUtils.hasText(collectionName) ? collectionName : getCollectionName(domainType);
 		String distanceField = operations.nearQueryDistanceFieldName(domainType);
 
+		Builder optionsBuilder = AggregationOptions.builder().collation(near.getCollation());
+
+		if (near.hasReadPreference()) {
+			optionsBuilder.readPreference(near.getReadPreference());
+		}
+
+		if (near.hasReadConcern()) {
+			optionsBuilder.readConcern(near.getReadConcern());
+		}
+
 		Aggregation $geoNear = TypedAggregation.newAggregation(domainType, Aggregation.geoNear(near, distanceField))
-				.withOptions(AggregationOptions.builder().collation(near.getCollation()).build());
+				.withOptions(optionsBuilder.build());
 
 		AggregationResults<Document> results = aggregate($geoNear, collection, Document.class);
+		EntityProjection<T, ?> projection = operations.introspectProjection(returnType, domainType);
 
-		DocumentCallback<GeoResult<T>> callback = new GeoNearResultDocumentCallback<>(distanceField,
-				new ProjectingReadCallback<>(mongoConverter, domainType, returnType, collection), near.getMetric());
+		DocumentCallback<GeoResult<R>> callback = new GeoNearResultDocumentCallback<>(distanceField,
+				getResultReader(projection, collectionName, resultConverter), near.getMetric());
 
-		List<GeoResult<T>> result = new ArrayList<>();
+		List<GeoResult<R>> result = new ArrayList<>(results.getMappedResults().size());
 
 		BigDecimal aggregate = BigDecimal.ZERO;
 		for (Document element : results) {
 
-			GeoResult<T> geoResult = callback.doWith(element);
-			aggregate = aggregate.add(new BigDecimal(geoResult.getDistance().getValue()));
+			GeoResult<R> geoResult = callback.doWith(element);
+			aggregate = aggregate.add(BigDecimal.valueOf(geoResult.getDistance().getValue()));
 			result.add(geoResult);
 		}
 
-		Distance avgDistance = new Distance(
+		Distance avgDistance = Distance.of(
 				result.size() == 0 ? 0 : aggregate.divide(new BigDecimal(result.size()), RoundingMode.HALF_UP).doubleValue(),
 				near.getMetric());
 
 		return new GeoResults<>(result, avgDistance);
 	}
 
-	@Nullable
-	@Override
-	public <T> T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass) {
+	public <T> @Nullable T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass) {
 		return findAndModify(query, update, new FindAndModifyOptions(), entityClass, getCollectionName(entityClass));
 	}
 
-	@Nullable
 	@Override
-	public <T> T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass, String collectionName) {
+	public <T> @Nullable T findAndModify(Query query, UpdateDefinition update, Class<T> entityClass,
+			String collectionName) {
 		return findAndModify(query, update, new FindAndModifyOptions(), entityClass, collectionName);
 	}
 
-	@Nullable
 	@Override
-	public <T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class<T> entityClass) {
+	public <T> @Nullable T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
+			Class<T> entityClass) {
 		return findAndModify(query, update, options, entityClass, getCollectionName(entityClass));
 	}
 
-	@Nullable
 	@Override
-	public <T> T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class<T> entityClass,
-			String collectionName) {
+	public <T> @Nullable T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
+		Class<T> entityClass, String collectionName) {
+		return findAndModify(query, update, options, entityClass, collectionName, QueryResultConverter.entity());
+	}
+
+	<S, T> @Nullable T findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
+			Class<S> entityClass, String collectionName, QueryResultConverter<? super S, ? extends T> resultConverter) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
-		Assert.notNull(options, "Options must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(update, "Update must not be null");
+		Assert.notNull(options, "Options must not be null");
+		Assert.notNull(entityClass, "EntityClass must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		FindAndModifyOptions optionsToUse = FindAndModifyOptions.of(options);
 
 		Optionals.ifAllPresent(query.getCollation(), optionsToUse.getCollation(), (l, r) -> {
 			throw new IllegalArgumentException(
-					"Both Query and FindAndModifyOptions define a collation. Please provide the collation only via one of the two.");
+					"Both Query and FindAndModifyOptions define a collation; Please provide the collation only via one of the two");
 		});
 
 		if (!options.getCollation().isPresent()) {
 			operations.forType(entityClass).getCollation(query).ifPresent(optionsToUse::collation);
 		}
 
-		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(),
-				getMappedSortObject(query, entityClass), entityClass, update, optionsToUse);
+		return doFindAndModify(createDelegate(query), collectionName, query.getQueryObject(), query.getFieldsObject(),
+				getMappedSortObject(query, entityClass), entityClass, update, optionsToUse, resultConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findAndReplace(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions, java.lang.Class, java.lang.String, java.lang.Class)
-	 */
 	@Override
-	public <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
-			String collectionName, Class<T> resultType) {
+	public <S, T> @Nullable T findAndReplace(Query query, S replacement, FindAndReplaceOptions options,
+		Class<S> entityType, String collectionName, Class<T> resultType) {
+		return findAndReplace(query, replacement, options, entityType, collectionName, resultType, QueryResultConverter.entity());
+	}
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(replacement, "Replacement must not be null!");
-		Assert.notNull(options, "Options must not be null! Use FindAndReplaceOptions#empty() instead.");
-		Assert.notNull(entityType, "EntityType must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(resultType, "ResultType must not be null! Use Object.class instead.");
+	<S, T, R> @Nullable R findAndReplace(Query query, S replacement, FindAndReplaceOptions options,
+			Class<S> entityType, String collectionName, Class<T> resultType, QueryResultConverter<? super T, ? extends R> resultConverter) {
 
-		Assert.isTrue(query.getLimit() <= 1, "Query must not define a limit other than 1 ore none!");
-		Assert.isTrue(query.getSkip() <= 0, "Query must not define skip.");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(replacement, "Replacement must not be null");
+		Assert.notNull(options, "Options must not be null Use FindAndReplaceOptions#empty() instead");
+		Assert.notNull(entityType, "EntityType must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(resultType, "ResultType must not be null Use Object.class instead");
+
+		Assert.isTrue(query.getLimit() <= 1, "Query must not define a limit other than 1 ore none");
+		Assert.isTrue(query.getSkip() <= 0, "Query must not define skip");
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityType);
+		QueryContext queryContext = queryOperations.createQueryContext(query);
 
-		Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), entity);
-		Document mappedFields = queryMapper.getMappedFields(query.getFieldsObject(), entity);
-		Document mappedSort = queryMapper.getMappedSort(query.getSortObject(), entity);
+		EntityProjection<T, S> projection = operations.introspectProjection(resultType, entityType);
+		CollectionPreparerDelegate collectionPreparer = createDelegate(query);
+		Document mappedQuery = queryContext.getMappedQuery(entity);
+		Document mappedFields = queryContext.getMappedFields(entity, projection);
+		Document mappedSort = queryContext.getMappedSort(entity);
 
 		replacement = maybeCallBeforeConvert(replacement, collectionName);
 		Document mappedReplacement = operations.forEntity(replacement).toMappedDocument(this.mongoConverter).getDocument();
@@ -1117,29 +1166,33 @@ public <S, T> T findAndReplace(Query query, S replacement, FindAndReplaceOptions
 		maybeEmitEvent(new BeforeSaveEvent<>(replacement, mappedReplacement, collectionName));
 		maybeCallBeforeSave(replacement, mappedReplacement, collectionName);
 
-		return doFindAndReplace(collectionName, mappedQuery, mappedFields, mappedSort,
-				operations.forType(entityType).getCollation(query).map(Collation::toMongoCollation).orElse(null), entityType,
-				mappedReplacement, options, resultType);
+		R saved = doFindAndReplace(collectionPreparer, collectionName, mappedQuery, mappedFields, mappedSort,
+				queryContext.getCollation(entityType).orElse(null), entityType, mappedReplacement, options, projection, resultConverter);
+
+		if (saved != null) {
+			maybeEmitEvent(new AfterSaveEvent<>(saved, mappedReplacement, collectionName));
+			return maybeCallAfterSave(saved, mappedReplacement, collectionName);
+		}
+
+		return saved;
 	}
 
 	// Find methods that take a Query to express the query and that return a single object that is also removed from the
 	// collection in the database.
 
-	@Nullable
 	@Override
-	public <T> T findAndRemove(Query query, Class<T> entityClass) {
+	public <T> @Nullable T findAndRemove(Query query, Class<T> entityClass) {
 		return findAndRemove(query, entityClass, getCollectionName(entityClass));
 	}
 
-	@Nullable
 	@Override
-	public <T> T findAndRemove(Query query, Class<T> entityClass, String collectionName) {
+	public <T> @Nullable T findAndRemove(Query query, Class<T> entityClass, String collectionName) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(entityClass, "EntityClass must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
-		return doFindAndRemove(collectionName, query.getQueryObject(), query.getFieldsObject(),
+		return doFindAndRemove(createDelegate(query), collectionName, query.getQueryObject(), query.getFieldsObject(),
 				getMappedSortObject(query, entityClass), operations.forType(entityClass).getCollation(query).orElse(null),
 				entityClass);
 	}
@@ -1147,7 +1200,7 @@ public <T> T findAndRemove(Query query, Class<T> entityClass, String collectionN
 	@Override
 	public long count(Query query, Class<?> entityClass) {
 
-		Assert.notNull(entityClass, "Entity class must not be null!");
+		Assert.notNull(entityClass, "Entity class must not be null");
 		return count(query, entityClass, getCollectionName(entityClass));
 	}
 
@@ -1160,87 +1213,125 @@ public long count(Query query, String collectionName) {
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.MongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
 	 */
+	@Override
 	public long count(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
-		CountOptions options = new CountOptions();
-		query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
-
-		if (query.getLimit() > 0) {
-			options.limit(query.getLimit());
-		}
-		if (query.getSkip() > 0) {
-			options.skip((int) query.getSkip());
-		}
-		if (StringUtils.hasText(query.getHint())) {
-			options.hint(Document.parse(query.getHint()));
-		}
+		CountContext countContext = queryOperations.countQueryContext(query);
 
-		Document document = queryMapper.getMappedObject(query.getQueryObject(),
-				Optional.ofNullable(entityClass).map(it -> mappingContext.getPersistentEntity(entityClass)));
+		CountOptions options = countContext.getCountOptions(entityClass);
+		Document mappedQuery = countContext.getMappedQuery(entityClass, mappingContext::getPersistentEntity);
 
-		return doCount(collectionName, document, options);
+		CollectionPreparerDelegate readPreference = createDelegate(query);
+		return doCount(readPreference, collectionName, mappedQuery, options);
 	}
 
-	@SuppressWarnings("ConstantConditions")
-	protected long doCount(String collectionName, Document filter, CountOptions options) {
+	protected long doCount(CollectionPreparer collectionPreparer, String collectionName, Document filter,
+			CountOptions options) {
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Executing count: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
+			LOGGER
+					.debug(String.format("Executing count: %s in collection: %s", serializeToJsonSafely(filter), collectionName));
 		}
 
-		return execute(collectionName,
-				collection -> collection.countDocuments(CountQuery.of(filter).toQueryDocument(), options));
+		return countExecution.countDocuments(collectionPreparer, collectionName, filter, options);
 	}
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#insert(java.lang.Object)
+	 * @see org.springframework.data.mongodb.core.MongoOperations#estimatedCount(java.lang.String)
 	 */
+	@Override
+	public long estimatedCount(String collectionName) {
+		return doEstimatedCount(CollectionPreparerDelegate.of(this), collectionName, new EstimatedDocumentCountOptions());
+	}
+
+	@SuppressWarnings("NullAway")
+	protected long doEstimatedCount(CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			String collectionName, EstimatedDocumentCountOptions options) {
+		return execute(collectionName,
+				collection -> collectionPreparer.prepare(collection).estimatedDocumentCount(options));
+	}
+
+	@Override
+	public long exactCount(Query query, @Nullable Class<?> entityClass, String collectionName) {
+
+		CountContext countContext = queryOperations.countQueryContext(query);
+
+		CountOptions options = countContext.getCountOptions(entityClass);
+		Document mappedQuery = countContext.getMappedQuery(entityClass, mappingContext::getPersistentEntity);
+
+		return doExactCount(createDelegate(query), collectionName, mappedQuery, options);
+	}
+
+	@SuppressWarnings("NullAway")
+	protected long doExactCount(CollectionPreparer<MongoCollection<Document>> collectionPreparer, String collectionName,
+			Document filter, CountOptions options) {
+		return execute(collectionName, collection -> collectionPreparer.prepare(collection)
+				.countDocuments(CountQuery.of(filter).toQueryDocument(), options));
+	}
+
+	protected boolean countCanBeEstimated(Document filter, CountOptions options) {
+
+		return
+		// only empty filter for estimatedCount
+		filter.isEmpty() &&
+		// no skip, no limit,...
+				isEmptyOptions(options) &&
+				// transaction active?
+				!MongoDatabaseUtils.isTransactionActive(getMongoDatabaseFactory());
+	}
+
+	private boolean isEmptyOptions(CountOptions options) {
+		return options.getLimit() <= 0 && options.getSkip() <= 0;
+	}
+
 	@Override
 	public <T> T insert(T objectToSave) {
 
-		Assert.notNull(objectToSave, "ObjectToSave must not be null!");
+		Assert.notNull(objectToSave, "ObjectToSave must not be null");
 
-		ensureNotIterable(objectToSave);
+		ensureNotCollectionLike(objectToSave);
 		return insert(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#insert(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> T insert(T objectToSave, String collectionName) {
 
-		Assert.notNull(objectToSave, "ObjectToSave must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(objectToSave, "ObjectToSave must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
-		ensureNotIterable(objectToSave);
+		ensureNotCollectionLike(objectToSave);
 		return (T) doInsert(collectionName, objectToSave, this.mongoConverter);
 	}
 
-	protected void ensureNotIterable(@Nullable Object o) {
-		if (null != o) {
-			if (o.getClass().isArray() || ITERABLE_CLASSES.contains(o.getClass().getName())) {
-				throw new IllegalArgumentException("Cannot use a collection here.");
-			}
+	/**
+	 * Ensure the given {@literal source} is not an {@link java.lang.reflect.Array}, {@link Collection} or
+	 * {@link Iterator}.
+	 *
+	 * @param source can be {@literal null}.
+	 * @since 3.2.
+	 */
+	protected void ensureNotCollectionLike(@Nullable Object source) {
+
+		if (EntityOperations.isCollectionLike(source)) {
+			throw new IllegalArgumentException("Cannot use a collection here");
 		}
 	}
 
 	/**
 	 * Prepare the collection before any processing is done using it. This allows a convenient way to apply settings like
-	 * slaveOk() etc. Can be overridden in sub-classes.
+	 * withCodecRegistry() etc. Can be overridden in sub-classes.
 	 *
 	 * @param collection
 	 */
 	protected MongoCollection<Document> prepareCollection(MongoCollection<Document> collection) {
 
-		if (this.readPreference != null) {
-			collection = collection.withReadPreference(readPreference);
+		if (this.readPreference != null && this.readPreference != collection.getReadPreference()) {
+			return collection.withReadPreference(readPreference);
 		}
 
 		return collection;
@@ -1267,7 +1358,7 @@ private WriteConcern potentiallyForceAcknowledgedWrite(@Nullable WriteConcern wc
 
 		if (ObjectUtils.nullSafeEquals(WriteResultChecking.EXCEPTION, writeResultChecking)) {
 			if (wc == null || wc.getWObject() == null
-					|| (wc.getWObject() instanceof Number && ((Number) wc.getWObject()).intValue() < 1)) {
+					|| (wc.getWObject() instanceof Number concern && concern.intValue() < 1)) {
 				return WriteConcern.ACKNOWLEDGED;
 			}
 		}
@@ -1292,15 +1383,14 @@ protected <T> T doInsert(String collectionName, T objectToSave, MongoWriter<T> w
 
 		T saved = populateIdIfNecessary(initialized, id);
 		maybeEmitEvent(new AfterSaveEvent<>(saved, dbDoc, collectionName));
-
-		return saved;
+		return maybeCallAfterSave(saved, dbDoc, collectionName);
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Collection<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass) {
 
-		Assert.notNull(batchToSave, "BatchToSave must not be null!");
+		Assert.notNull(batchToSave, "BatchToSave must not be null");
 
 		return (Collection<T>) doInsertBatch(getCollectionName(entityClass), batchToSave, this.mongoConverter);
 	}
@@ -1309,8 +1399,8 @@ public <T> Collection<T> insert(Collection<? extends T> batchToSave, Class<?> en
 	@SuppressWarnings("unchecked")
 	public <T> Collection<T> insert(Collection<? extends T> batchToSave, String collectionName) {
 
-		Assert.notNull(batchToSave, "BatchToSave must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
+		Assert.notNull(batchToSave, "BatchToSave must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
 
 		return (Collection<T>) doInsertBatch(collectionName, batchToSave, this.mongoConverter);
 	}
@@ -1319,7 +1409,7 @@ public <T> Collection<T> insert(Collection<? extends T> batchToSave, String coll
 	@SuppressWarnings("unchecked")
 	public <T> Collection<T> insertAll(Collection<? extends T> objectsToSave) {
 
-		Assert.notNull(objectsToSave, "ObjectsToSave must not be null!");
+		Assert.notNull(objectsToSave, "ObjectsToSave must not be null");
 		return (Collection<T>) doInsertAll(objectsToSave, this.mongoConverter);
 	}
 
@@ -1336,12 +1426,7 @@ protected <T> Collection<T> doInsertAll(Collection<? extends T> listToSave, Mong
 			}
 
 			String collection = getCollectionName(ClassUtils.getUserClass(element));
-			List<T> collectionElements = elementsByCollection.get(collection);
-
-			if (null == collectionElements) {
-				collectionElements = new ArrayList<>();
-				elementsByCollection.put(collection, collectionElements);
-			}
+			List<T> collectionElements = elementsByCollection.computeIfAbsent(collection, k -> new ArrayList<>());
 
 			collectionElements.add(element);
 		}
@@ -1356,9 +1441,9 @@ protected <T> Collection<T> doInsertAll(Collection<? extends T> listToSave, Mong
 	protected <T> Collection<T> doInsertBatch(String collectionName, Collection<? extends T> batchToSave,
 			MongoWriter<T> writer) {
 
-		Assert.notNull(writer, "MongoWriter must not be null!");
+		Assert.notNull(writer, "MongoWriter must not be null");
 
-		List<Document> documentList = new ArrayList<>();
+		List<Document> documentList = new ArrayList<>(batchToSave.size());
 		List<T> initializedBatchToSave = new ArrayList<>(batchToSave.size());
 		for (T uninitialized : batchToSave) {
 
@@ -1374,7 +1459,10 @@ protected <T> Collection<T> doInsertBatch(String collectionName, Collection<? ex
 			maybeEmitEvent(new BeforeSaveEvent<>(initialized, document, collectionName));
 			initialized = maybeCallBeforeSave(initialized, document, collectionName);
 
-			documentList.add(document);
+			MappedDocument mappedDocument = queryOperations.createInsertContext(MappedDocument.of(document))
+				.prepareId(uninitialized.getClass());
+
+			documentList.add(mappedDocument.getDocument());
 			initializedBatchToSave.add(initialized);
 		}
 
@@ -1386,8 +1474,9 @@ protected <T> Collection<T> doInsertBatch(String collectionName, Collection<? ex
 
 			if (i < ids.size()) {
 				T saved = populateIdIfNecessary(obj, ids.get(i));
-				maybeEmitEvent(new AfterSaveEvent<>(saved, documentList.get(i), collectionName));
-				savedObjects.add(saved);
+				Document doc = documentList.get(i);
+				maybeEmitEvent(new AfterSaveEvent<>(saved, doc, collectionName));
+				savedObjects.add(maybeCallAfterSave(saved, doc, collectionName));
 			} else {
 				savedObjects.add(obj);
 			}
@@ -1400,7 +1489,7 @@ protected <T> Collection<T> doInsertBatch(String collectionName, Collection<? ex
 	@Override
 	public <T> T save(T objectToSave) {
 
-		Assert.notNull(objectToSave, "Object to save must not be null!");
+		Assert.notNull(objectToSave, "Object to save must not be null");
 		return save(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
@@ -1408,15 +1497,15 @@ public <T> T save(T objectToSave) {
 	@SuppressWarnings("unchecked")
 	public <T> T save(T objectToSave, String collectionName) {
 
-		Assert.notNull(objectToSave, "Object to save must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(objectToSave, "Object to save must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		ensureNotCollectionLike(objectToSave);
 
 		AdaptibleEntity<T> source = operations.forEntity(objectToSave, mongoConverter.getConversionService());
 
 		return source.isVersionedEntity() //
 				? doSaveVersioned(source, collectionName) //
 				: (T) doSave(collectionName, objectToSave, this.mongoConverter);
-
 	}
 
 	@SuppressWarnings("unchecked")
@@ -1452,12 +1541,12 @@ private <T> T doSaveVersioned(AdaptibleEntity<T> source, String collectionName)
 		if (result.getModifiedCount() == 0) {
 
 			throw new OptimisticLockingFailureException(
-					String.format("Cannot save entity %s with version %s to collection %s. Has it been modified meanwhile?",
+					String.format("Cannot save entity %s with version %s to collection %s; Has it been modified meanwhile",
 							source.getId(), source.getVersion(), collectionName));
 		}
 		maybeEmitEvent(new AfterSaveEvent<>(toSave, mapped.getDocument(), collectionName));
 
-		return toSave;
+		return maybeCallAfterSave(toSave, mapped.getDocument(), collectionName);
 	}
 
 	protected <T> T doSave(String collectionName, T objectToSave, MongoWriter<T> writer) {
@@ -1478,28 +1567,32 @@ protected <T> T doSave(String collectionName, T objectToSave, MongoWriter<T> wri
 		T saved = populateIdIfNecessary(objectToSave, id);
 		maybeEmitEvent(new AfterSaveEvent<>(saved, dbDoc, collectionName));
 
-		return saved;
+		return maybeCallAfterSave(saved, dbDoc, collectionName);
 	}
 
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	protected Object insertDocument(String collectionName, Document document, Class<?> entityClass) {
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Inserting Document containing fields: {} in collection: {}", document.keySet(), collectionName);
+			LOGGER.debug(String.format("Inserting Document containing fields: %s in collection: %s", document.keySet(),
+					collectionName));
 		}
 
+		MappedDocument mappedDocument = queryOperations.createInsertContext(MappedDocument.of(document))
+				.prepareId(entityClass);
+
 		return execute(collectionName, collection -> {
 			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.INSERT, collectionName, entityClass,
-					document, null);
+					mappedDocument.getDocument(), null);
 			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
 			if (writeConcernToUse == null) {
-				collection.insertOne(document);
+				collection.insertOne(mappedDocument.getDocument());
 			} else {
-				collection.withWriteConcern(writeConcernToUse).insertOne(document);
+				collection.withWriteConcern(writeConcernToUse).insertOne(mappedDocument.getDocument());
 			}
 
-			return operations.forEntity(document).getId();
+			return operations.forEntity(mappedDocument.getDocument()).getId();
 		});
 	}
 
@@ -1510,7 +1603,7 @@ protected List<Object> insertDocumentList(String collectionName, List<Document>
 		}
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Inserting list of Documents containing {} items", documents.size());
+			LOGGER.debug(String.format("Inserting list of Documents containing %s items", documents.size()));
 		}
 
 		execute(collectionName, collection -> {
@@ -1531,30 +1624,46 @@ protected List<Object> insertDocumentList(String collectionName, List<Document>
 		return MappedDocument.toIds(documents);
 	}
 
+	@SuppressWarnings("NullAway")
 	protected Object saveDocument(String collectionName, Document dbDoc, Class<?> entityClass) {
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Saving Document containing fields: {}", dbDoc.keySet());
+			LOGGER.debug(String.format("Saving Document containing fields: %s", dbDoc.keySet()));
 		}
 
 		return execute(collectionName, collection -> {
+
 			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.SAVE, collectionName, entityClass,
 					dbDoc, null);
 			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
 			MappedDocument mapped = MappedDocument.of(dbDoc);
 
+			MongoCollection<Document> collectionToUse = writeConcernToUse == null //
+					? collection //
+					: collection.withWriteConcern(writeConcernToUse);
+
 			if (!mapped.hasId()) {
-				if (writeConcernToUse == null) {
-					collection.insertOne(dbDoc);
-				} else {
-					collection.withWriteConcern(writeConcernToUse).insertOne(dbDoc);
-				}
-			} else if (writeConcernToUse == null) {
-				collection.replaceOne(mapped.getIdFilter(), dbDoc, new ReplaceOptions().upsert(true));
+
+				mapped = queryOperations.createInsertContext(mapped).prepareId(mappingContext.getPersistentEntity(entityClass));
+				collectionToUse.insertOne(mapped.getDocument());
 			} else {
-				collection.withWriteConcern(writeConcernToUse).replaceOne(mapped.getIdFilter(), dbDoc,
-						new ReplaceOptions().upsert(true));
+
+				MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
+				UpdateContext updateContext = queryOperations.replaceSingleContext(mapped, true);
+				Document replacement = updateContext.getMappedUpdate(entity);
+				Document filter = updateContext.getReplacementQuery();
+				if (updateContext.requiresShardKey(filter, entity)) {
+
+					if (entity.getShardKey().isImmutable()) {
+						filter = updateContext.applyShardKey(entity, filter, null);
+					} else {
+						filter = updateContext.applyShardKey(entity, filter,
+								collection.find(filter, Document.class).projection(updateContext.getMappedShardKey(entity)).first());
+					}
+				}
+
+				collectionToUse.replaceOne(filter, replacement, new com.mongodb.client.model.ReplaceOptions().upsert(true));
 			}
 			return mapped.getId();
 		});
@@ -1573,7 +1682,7 @@ public UpdateResult upsert(Query query, UpdateDefinition update, String collecti
 	@Override
 	public UpdateResult upsert(Query query, UpdateDefinition update, Class<?> entityClass, String collectionName) {
 
-		Assert.notNull(entityClass, "EntityClass must not be null!");
+		Assert.notNull(entityClass, "EntityClass must not be null");
 
 		return doUpdate(collectionName, query, update, entityClass, true, false);
 	}
@@ -1591,7 +1700,7 @@ public UpdateResult updateFirst(Query query, UpdateDefinition update, String col
 	@Override
 	public UpdateResult updateFirst(Query query, UpdateDefinition update, Class<?> entityClass, String collectionName) {
 
-		Assert.notNull(entityClass, "EntityClass must not be null!");
+		Assert.notNull(entityClass, "EntityClass must not be null");
 
 		return doUpdate(collectionName, query, update, entityClass, false, false);
 	}
@@ -1609,99 +1718,78 @@ public UpdateResult updateMulti(Query query, UpdateDefinition update, String col
 	@Override
 	public UpdateResult updateMulti(Query query, UpdateDefinition update, Class<?> entityClass, String collectionName) {
 
-		Assert.notNull(entityClass, "EntityClass must not be null!");
+		Assert.notNull(entityClass, "EntityClass must not be null");
 
 		return doUpdate(collectionName, query, update, entityClass, false, true);
 	}
 
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	protected UpdateResult doUpdate(String collectionName, Query query, UpdateDefinition update,
 			@Nullable Class<?> entityClass, boolean upsert, boolean multi) {
 
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(update, "Update must not be null!");
-
-		if (query.isSorted() && LOGGER.isWarnEnabled()) {
-
-			LOGGER.warn("{} does not support sort ('{}'). Please use findAndModify() instead.",
-					upsert ? "Upsert" : "UpdateFirst", serializeToJsonSafely(query.getSortObject()));
-		}
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(update, "Update must not be null");
 
 		MongoPersistentEntity<?> entity = entityClass == null ? null : getPersistentEntity(entityClass);
-		increaseVersionForUpdateIfNecessary(entity, update);
-
-		UpdateOptions opts = new UpdateOptions();
-		opts.upsert(upsert);
-
-		if (update.hasArrayFilters()) {
-			opts.arrayFilters(update.getArrayFilters().stream().map(ArrayFilter::asDocument).collect(Collectors.toList()));
-		}
 
-		Document queryObj = new Document();
-
-		if (query != null) {
-			queryObj.putAll(queryMapper.getMappedObject(query.getQueryObject(), entity));
-		}
-
-		if (multi && update.isIsolated() && !queryObj.containsKey("$isolated")) {
-			queryObj.put("$isolated", 1);
-		}
+		UpdateContext updateContext = multi ? queryOperations.updateContext(update, query, upsert)
+				: queryOperations.updateSingleContext(update, query, upsert);
+		updateContext.increaseVersionForUpdateIfNecessary(entity);
 
-		if (update instanceof AggregationUpdate) {
+		Document queryObj = updateContext.getMappedQuery(entity);
+		UpdateOptions opts = updateContext.getUpdateOptions(entityClass, query);
 
-			AggregationOperationContext context = entityClass != null
-					? new RelaxedTypeBasedAggregationOperationContext(entityClass, mappingContext, queryMapper)
-					: Aggregation.DEFAULT_CONTEXT;
+		if (updateContext.isAggregationUpdate()) {
 
-			List<Document> pipeline = new AggregationUtil(queryMapper, mappingContext)
-					.createPipeline((AggregationUpdate) update, context);
+			List<Document> pipeline = updateContext.getUpdatePipeline(entityClass);
+			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName, entityClass,
+					update.getUpdateObject(), queryObj);
+			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
 			return execute(collectionName, collection -> {
 
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Calling update using query: {} and update: {} in collection: {}",
-							serializeToJsonSafely(queryObj), serializeToJsonSafely(pipeline), collectionName);
+					LOGGER.debug(String.format("Calling update using query: %s and update: %s in collection: %s",
+							serializeToJsonSafely(queryObj), serializeToJsonSafely(pipeline), collectionName));
 				}
 
-				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName,
-						entityClass, update.getUpdateObject(), queryObj);
-				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-
 				collection = writeConcernToUse != null ? collection.withWriteConcern(writeConcernToUse) : collection;
 
 				return multi ? collection.updateMany(queryObj, pipeline, opts) : collection.updateOne(queryObj, pipeline, opts);
 			});
 		}
 
-		return execute(collectionName, collection -> {
-
-			operations.forType(entityClass) //
-					.getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.ifPresent(opts::collation);
+		Document updateObj = updateContext.getMappedUpdate(entity);
+		MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName, entityClass,
+				updateObj, queryObj);
+		WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
-			Document updateObj = update instanceof MappedUpdate ? update.getUpdateObject()
-					: updateMapper.getMappedObject(update.getUpdateObject(), entity);
+		return execute(collectionName, collection -> {
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Calling update using query: {} and update: {} in collection: {}", serializeToJsonSafely(queryObj),
-						serializeToJsonSafely(updateObj), collectionName);
+				LOGGER.debug(String.format("Calling update using query: %s and update: %s in collection: %s",
+						serializeToJsonSafely(queryObj), serializeToJsonSafely(updateObj), collectionName));
 			}
 
-			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName, entityClass,
-					updateObj, queryObj);
-			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-
 			collection = writeConcernToUse != null ? collection.withWriteConcern(writeConcernToUse) : collection;
 
 			if (!UpdateMapper.isUpdateObject(updateObj)) {
 
-				ReplaceOptions replaceOptions = new ReplaceOptions();
-				replaceOptions.collation(opts.getCollation());
-				replaceOptions.upsert(opts.isUpsert());
+				Document filter = new Document(queryObj);
+
+				if (updateContext.requiresShardKey(filter, entity)) {
+
+					if (entity.getShardKey().isImmutable()) {
+						filter = updateContext.applyShardKey(entity, filter, null);
+					} else {
+						filter = updateContext.applyShardKey(entity, filter,
+								collection.find(filter, Document.class).projection(updateContext.getMappedShardKey(entity)).first());
+					}
+				}
 
-				return collection.replaceOne(queryObj, updateObj, replaceOptions);
+				com.mongodb.client.model.ReplaceOptions replaceOptions = updateContext.getReplaceOptions(entityClass);
+				return collection.replaceOne(filter, updateObj, replaceOptions);
 			} else {
 				return multi ? collection.updateMany(queryObj, updateObj, opts)
 						: collection.updateOne(queryObj, updateObj, opts);
@@ -1709,21 +1797,10 @@ protected UpdateResult doUpdate(String collectionName, Query query, UpdateDefini
 		});
 	}
 
-	private void increaseVersionForUpdateIfNecessary(@Nullable MongoPersistentEntity<?> persistentEntity,
-			UpdateDefinition update) {
-
-		if (persistentEntity != null && persistentEntity.hasVersionProperty()) {
-			String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName();
-			if (!update.modifies(versionFieldName)) {
-				update.inc(versionFieldName);
-			}
-		}
-	}
-
 	@Override
 	public DeleteResult remove(Object object) {
 
-		Assert.notNull(object, "Object must not be null!");
+		Assert.notNull(object, "Object must not be null");
 
 		return remove(object, getCollectionName(object.getClass()));
 	}
@@ -1731,8 +1808,8 @@ public DeleteResult remove(Object object) {
 	@Override
 	public DeleteResult remove(Object object, String collectionName) {
 
-		Assert.notNull(object, "Object must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(object, "Object must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
 		Query query = operations.forEntity(object).getRemoveByQuery();
 
@@ -1752,41 +1829,38 @@ public DeleteResult remove(Query query, Class<?> entityClass) {
 	@Override
 	public DeleteResult remove(Query query, Class<?> entityClass, String collectionName) {
 
-		Assert.notNull(entityClass, "EntityClass must not be null!");
+		Assert.notNull(entityClass, "EntityClass must not be null");
 		return doRemove(collectionName, query, entityClass, true);
 	}
 
-	@SuppressWarnings("ConstantConditions")
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	protected <T> DeleteResult doRemove(String collectionName, Query query, @Nullable Class<T> entityClass,
 			boolean multi) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
 		MongoPersistentEntity<?> entity = getPersistentEntity(entityClass);
-		Document queryObject = queryMapper.getMappedObject(query.getQueryObject(), entity);
 
-		return execute(collectionName, collection -> {
-
-			maybeEmitEvent(new BeforeDeleteEvent<>(queryObject, entityClass, collectionName));
+		DeleteContext deleteContext = multi ? queryOperations.deleteQueryContext(query)
+				: queryOperations.deleteSingleContext(query);
+		Document queryObject = deleteContext.getMappedQuery(entity);
+		DeleteOptions options = deleteContext.getDeleteOptions(entityClass);
 
-			Document removeQuery = queryObject;
+		MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName, entityClass,
+				null, queryObject);
 
-			DeleteOptions options = new DeleteOptions();
+		WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
-			operations.forType(entityClass) //
-					.getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.ifPresent(options::collation);
+		return execute(collectionName, collection -> {
 
-			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName, entityClass,
-					null, queryObject);
+			maybeEmitEvent(new BeforeDeleteEvent<>(queryObject, entityClass, collectionName));
 
-			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
+			Document removeQuery = queryObject;
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Remove using query: {} in collection: {}.",
-						new Object[] { serializeToJsonSafely(removeQuery), collectionName });
+				LOGGER.debug(String.format("Remove using query: %s in collection: %s.", serializeToJsonSafely(removeQuery),
+						collectionName));
 			}
 
 			if (query.getLimit() > 0 || query.getSkip() > 0) {
@@ -1824,7 +1898,7 @@ public <T> List<T> findAll(Class<T> entityClass) {
 	@Override
 	public <T> List<T> findAll(Class<T> entityClass, String collectionName) {
 		return executeFindMultiInternal(
-				new FindCallback(new Document(), new Document(),
+				new FindCallback(CollectionPreparer.identity(), new Document(), new Document(),
 						operations.forType(entityClass).getCollation().map(Collation::toMongoCollation).orElse(null)),
 				CursorPreparer.NO_OP_PREPARER, new ReadDocumentCallback<>(mongoConverter, entityClass, collectionName),
 				collectionName);
@@ -1833,8 +1907,8 @@ public <T> List<T> findAll(Class<T> entityClass, String collectionName) {
 	@Override
 	public <T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapFunction, String reduceFunction,
 			Class<T> entityClass) {
-		return mapReduce(new Query(), inputCollectionName, mapFunction, reduceFunction,
-				new MapReduceOptions().outputTypeInline(), entityClass);
+		return mapReduce(new Query(), inputCollectionName, mapFunction, reduceFunction, new MapReduceOptions(),
+				entityClass);
 	}
 
 	@Override
@@ -1846,8 +1920,7 @@ public <T> MapReduceResults<T> mapReduce(String inputCollectionName, String mapF
 	@Override
 	public <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName, String mapFunction,
 			String reduceFunction, Class<T> entityClass) {
-		return mapReduce(query, inputCollectionName, mapFunction, reduceFunction, new MapReduceOptions().outputTypeInline(),
-				entityClass);
+		return mapReduce(query, inputCollectionName, mapFunction, reduceFunction, new MapReduceOptions(), entityClass);
 	}
 
 	@Override
@@ -1869,19 +1942,23 @@ public <T> MapReduceResults<T> mapReduce(Query query, String inputCollectionName
 	 * @param resultType
 	 * @return
 	 * @since 2.1
+	 * @deprecated since 3.4 in favor of {@link #aggregate(TypedAggregation, Class)}.
 	 */
+	@Deprecated
 	public <T> List<T> mapReduce(Query query, Class<?> domainType, String inputCollectionName, String mapFunction,
 			String reduceFunction, @Nullable MapReduceOptions mapReduceOptions, Class<T> resultType) {
 
-		Assert.notNull(domainType, "Domain type must not be null!");
-		Assert.notNull(inputCollectionName, "Input collection name must not be null!");
-		Assert.notNull(resultType, "Result type must not be null!");
-		Assert.notNull(mapFunction, "Map function must not be null!");
-		Assert.notNull(reduceFunction, "Reduce function must not be null!");
+		Assert.notNull(domainType, "Domain type must not be null");
+		Assert.notNull(inputCollectionName, "Input collection name must not be null");
+		Assert.notNull(resultType, "Result type must not be null");
+		Assert.notNull(mapFunction, "Map function must not be null");
+		Assert.notNull(reduceFunction, "Reduce function must not be null");
 
 		String mapFunc = replaceWithResourceIfNecessary(mapFunction);
 		String reduceFunc = replaceWithResourceIfNecessary(reduceFunction);
-		MongoCollection<Document> inputCollection = getAndPrepareCollection(doGetDatabase(), inputCollectionName);
+		CollectionPreparerDelegate readPreference = createDelegate(query);
+		MongoCollection<Document> inputCollection = readPreference
+				.prepare(getAndPrepareCollection(doGetDatabase(), inputCollectionName));
 
 		// MapReduceOp
 		MapReduceIterable<Document> mapReduce = inputCollection.mapReduce(mapFunc, reduceFunc, Document.class);
@@ -1889,10 +1966,14 @@ public <T> List<T> mapReduce(Query query, Class<?> domainType, String inputColle
 		if (query.getLimit() > 0 && mapReduceOptions != null && mapReduceOptions.getLimit() == null) {
 			mapReduce = mapReduce.limit(query.getLimit());
 		}
-		if (query.getMeta().getMaxTimeMsec() != null) {
+		if (query.getMeta().hasMaxTime()) {
 			mapReduce = mapReduce.maxTime(query.getMeta().getMaxTimeMsec(), TimeUnit.MILLISECONDS);
 		}
-		mapReduce = mapReduce.sort(getMappedSortObject(query, domainType));
+
+		Document mappedSort = getMappedSortObject(query, domainType);
+		if (mappedSort != null && !mappedSort.isEmpty()) {
+			mapReduce = mapReduce.sort(mappedSort);
+		}
 
 		mapReduce = mapReduce
 				.filter(queryMapper.getMappedObject(query.getQueryObject(), mappingContext.getPersistentEntity(domainType)));
@@ -1903,7 +1984,7 @@ public <T> List<T> mapReduce(Query query, Class<?> domainType, String inputColle
 
 			Optionals.ifAllPresent(collation, mapReduceOptions.getCollation(), (l, r) -> {
 				throw new IllegalArgumentException(
-						"Both Query and MapReduceOptions define a collation. Please provide the collation only via one of the two.");
+						"Both Query and MapReduceOptions define a collation; Please provide the collation only via one of the two.");
 			});
 
 			if (mapReduceOptions.getCollation().isPresent()) {
@@ -1926,10 +2007,6 @@ public <T> List<T> mapReduce(Query query, Class<?> domainType, String inputColle
 				mapReduce = mapReduce.jsMode(mapReduceOptions.getJavaScriptMode());
 			}
 
-			if (mapReduceOptions.getOutputSharded().isPresent()) {
-				mapReduce = mapReduce.sharded(mapReduceOptions.getOutputSharded().get());
-			}
-
 			if (StringUtils.hasText(mapReduceOptions.getOutputCollection()) && !mapReduceOptions.usesInlineOutput()) {
 
 				mapReduce = mapReduce.collectionName(mapReduceOptions.getOutputCollection())
@@ -1957,171 +2034,116 @@ public <T> List<T> mapReduce(Query query, Class<?> domainType, String inputColle
 		return mappedResults;
 	}
 
-	public <T> GroupByResults<T> group(String inputCollectionName, GroupBy groupBy, Class<T> entityClass) {
-		return group(null, inputCollectionName, groupBy, entityClass);
-	}
-
-	public <T> GroupByResults<T> group(@Nullable Criteria criteria, String inputCollectionName, GroupBy groupBy,
-			Class<T> entityClass) {
-
-		Document document = groupBy.getGroupByObject();
-		document.put("ns", inputCollectionName);
-
-		if (criteria == null) {
-			document.put("cond", null);
-		} else {
-			document.put("cond", queryMapper.getMappedObject(criteria.getCriteriaObject(), Optional.empty()));
-		}
-		// If initial document was a JavaScript string, potentially loaded by Spring's Resource abstraction, load it and
-		// convert to Document
-
-		if (document.containsKey("initial")) {
-			Object initialObj = document.get("initial");
-			if (initialObj instanceof String) {
-				String initialAsString = replaceWithResourceIfNecessary((String) initialObj);
-				document.put("initial", Document.parse(initialAsString));
-			}
-		}
-
-		if (document.containsKey("$reduce")) {
-			document.put("$reduce", replaceWithResourceIfNecessary(ObjectUtils.nullSafeToString(document.get("$reduce"))));
-		}
-		if (document.containsKey("$keyf")) {
-			document.put("$keyf", replaceWithResourceIfNecessary(ObjectUtils.nullSafeToString(document.get("$keyf"))));
-		}
-		if (document.containsKey("finalize")) {
-			document.put("finalize", replaceWithResourceIfNecessary(ObjectUtils.nullSafeToString(document.get("finalize"))));
-		}
-
-		Document commandObject = new Document("group", document);
-
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Executing Group with Document [{}]", serializeToJsonSafely(commandObject));
-		}
-
-		Document commandResult = executeCommand(commandObject, this.readPreference);
-
-		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Group command result = [{}]", commandResult);
-		}
-
-		@SuppressWarnings("unchecked")
-		Iterable<Document> resultSet = (Iterable<Document>) commandResult.get("retval");
-		List<T> mappedResults = new ArrayList<>();
-		DocumentCallback<T> callback = new ReadDocumentCallback<>(mongoConverter, entityClass, inputCollectionName);
-
-		for (Document resultDocument : resultSet) {
-			mappedResults.add(callback.doWith(resultDocument));
-		}
-
-		return new GroupByResults<>(mappedResults, commandResult);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.Class)
-	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType) {
+
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregate(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(TypedAggregation<?> aggregation, String inputCollectionName,
 			Class<O> outputType) {
-
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-
-		AggregationOperationContext context = new TypeBasedAggregationOperationContext(aggregation.getInputType(),
-				mappingContext, queryMapper);
-		return aggregate(aggregation, inputCollectionName, outputType, context);
+		return aggregate(aggregation, inputCollectionName, outputType, (AggregationOperationContext) null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.Class, java.lang.Class)
-	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
 
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregate(aggregation, getCollectionName(inputType), outputType,
-				new TypeBasedAggregationOperationContext(inputType, mappingContext, queryMapper));
+				queryOperations.createAggregation(aggregation, inputType).getAggregationOperationContext());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType) {
-		return aggregate(aggregation, collectionName, outputType, null);
+		return doAggregate(aggregation, collectionName, outputType, QueryResultConverter.entity());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.String, java.lang.Class)
-	 */
 	@Override
-	public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, String inputCollectionName,
+	public <O> Stream<O> aggregateStream(TypedAggregation<?> aggregation, String inputCollectionName,
 			Class<O> outputType) {
-
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-
-		AggregationOperationContext context = new TypeBasedAggregationOperationContext(aggregation.getInputType(),
-				mappingContext, queryMapper);
-		return aggregateStream(aggregation, inputCollectionName, outputType, context);
+		return aggregateStream(aggregation, inputCollectionName, outputType, null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.Class)
-	 */
 	@Override
-	public <O> CloseableIterator<O> aggregateStream(TypedAggregation<?> aggregation, Class<O> outputType) {
+	public <O> Stream<O> aggregateStream(TypedAggregation<?> aggregation, Class<O> outputType) {
+
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregateStream(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.Class, java.lang.Class)
-	 */
 	@Override
-	public <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
+	public <O> Stream<O> aggregateStream(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
 
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregateStream(aggregation, getCollectionName(inputType), outputType,
-				new TypeBasedAggregationOperationContext(inputType, mappingContext, queryMapper));
+				queryOperations.createAggregation(aggregation, inputType).getAggregationOperationContext());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#aggregateStream(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.String, java.lang.Class)
-	 */
 	@Override
-	public <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, String collectionName, Class<O> outputType) {
+	public <O> Stream<O> aggregateStream(Aggregation aggregation, String collectionName, Class<O> outputType) {
 		return aggregateStream(aggregation, collectionName, outputType, null);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.String)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> List<T> findAllAndRemove(Query query, String collectionName) {
 		return (List<T>) findAllAndRemove(query, Object.class, collectionName);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
 	@Override
 	public <T> List<T> findAllAndRemove(Query query, Class<T> entityClass) {
 		return findAllAndRemove(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
 	@Override
 	public <T> List<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName) {
 		return doFindAndDelete(collectionName, query, entityClass);
 	}
 
+	@Override
+	public <T> UpdateResult replace(Query query, T replacement, ReplaceOptions options, String collectionName) {
+
+		Assert.notNull(replacement, "Replacement must not be null");
+		return replace(query, (Class<T>) ClassUtils.getUserClass(replacement), replacement, options, collectionName);
+	}
+
+	protected <S, T> UpdateResult replace(Query query, Class<S> entityType, T replacement, ReplaceOptions options,
+			String collectionName) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(replacement, "Replacement must not be null");
+		Assert.notNull(options, "Options must not be null Use ReplaceOptions#none() instead");
+		Assert.notNull(entityType, "EntityType must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+
+		Assert.isTrue(query.getLimit() <= 1, "Query must not define a limit other than 1 ore none");
+		Assert.isTrue(query.getSkip() <= 0, "Query must not define skip");
+
+		UpdateContext updateContext = queryOperations.replaceSingleContext(query,
+				operations.forEntity(replacement).toMappedDocument(this.mongoConverter), options.isUpsert());
+
+		replacement = maybeCallBeforeConvert(replacement, collectionName);
+		Document mappedReplacement = updateContext.getMappedUpdate(mappingContext.getPersistentEntity(entityType));
+		maybeEmitEvent(new BeforeSaveEvent<>(replacement, mappedReplacement, collectionName));
+		replacement = maybeCallBeforeSave(replacement, mappedReplacement, collectionName);
+
+		MongoAction action = new MongoAction(writeConcern, MongoActionOperation.REPLACE, collectionName, entityType,
+				mappedReplacement, updateContext.getQueryObject());
+
+		UpdateResult result = doReplace(options, entityType, collectionName, updateContext,
+				createCollectionPreparer(query, action), mappedReplacement);
+
+		if (result.wasAcknowledged()) {
+
+			maybeEmitEvent(new AfterSaveEvent<>(replacement, mappedReplacement, collectionName));
+			maybeCallAfterSave(replacement, mappedReplacement, collectionName);
+		}
+
+		return result;
+	}
+
 	/**
 	 * Retrieve and remove all documents matching the given {@code query} by calling {@link #find(Query, Class, String)}
 	 * and {@link #remove(Query, Class, String)}, whereas the {@link Query} for {@link #remove(Query, Class, String)} is
@@ -2133,14 +2155,39 @@ public <T> List<T> findAllAndRemove(Query query, Class<T> entityClass, String co
 	 * @return
 	 */
 	protected <T> List<T> doFindAndDelete(String collectionName, Query query, Class<T> entityClass) {
+		return doFindAndDelete(collectionName, query, entityClass, QueryResultConverter.entity());
+	}
 
-		List<T> result = find(query, entityClass, collectionName);
+	@SuppressWarnings("NullAway")
+	<S, T> List<T> doFindAndDelete(String collectionName, Query query, Class<S> entityClass,
+			QueryResultConverter<? super S, ? extends T> resultConverter) {
+
+		List<Object> ids = new ArrayList<>();
+
+		QueryResultConverterCallback<S, T> callback = new QueryResultConverterCallback<>(resultConverter,
+				new ProjectingReadCallback<>(getConverter(), EntityProjection.nonProjecting(entityClass), collectionName)) {
+			@Override
+			public T doWith(Document object) {
+				ids.add(object.get("_id"));
+				return super.doWith(object);
+			}
+		};
+
+		List<T> result = doFind(collectionName, createDelegate(query), query.getQueryObject(), query.getFieldsObject(), entityClass,
+			new QueryCursorPreparer(query, entityClass), callback);
 
 		if (!CollectionUtils.isEmpty(result)) {
 
-			Query byIdInQuery = operations.getByIdInQuery(result);
+			Criteria[] criterias = ids.stream() //
+				.map(it -> Criteria.where("_id").is(it)) //
+				.toArray(Criteria[]::new);
+
+			Query removeQuery = new Query(criterias.length == 1 ? criterias[0] : new Criteria().orOperator(criterias));
+			if (query.hasReadPreference()) {
+				removeQuery.withReadPreference(query.getReadPreference());
+			}
 
-			remove(byIdInQuery, entityClass, collectionName);
+			remove(removeQuery, entityClass, collectionName);
 		}
 
 		return result;
@@ -2149,20 +2196,38 @@ protected <T> List<T> doFindAndDelete(String collectionName, Query query, Class<
 	protected <O> AggregationResults<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType,
 			@Nullable AggregationOperationContext context) {
 
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-		Assert.notNull(outputType, "Output type must not be null!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
+		Assert.notNull(outputType, "Output type must not be null");
 
-		AggregationOperationContext contextToUse = new AggregationUtil(queryMapper, mappingContext)
-				.prepareAggregationContext(aggregation, context);
-		return doAggregate(aggregation, collectionName, outputType, contextToUse);
+		return doAggregate(aggregation, collectionName, outputType,
+				queryOperations.createAggregation(aggregation, context));
 	}
 
-	@SuppressWarnings("ConstantConditions")
+	private <O> AggregationResults<O> doAggregate(Aggregation aggregation, String collectionName, Class<O> outputType,
+			AggregationDefinition context) {
+		return doAggregate(aggregation, collectionName, outputType, context.getAggregationOperationContext());
+	}
+
+	<T, O> AggregationResults<O> doAggregate(Aggregation aggregation, String collectionName, Class<T> outputType,
+			QueryResultConverter<? super T, ? extends O> resultConverter) {
+
+		return doAggregate(aggregation, collectionName, outputType, resultConverter, queryOperations
+				.createAggregation(aggregation, (AggregationOperationContext) null).getAggregationOperationContext());
+	}
+
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String collectionName, Class<O> outputType,
 			AggregationOperationContext context) {
+		return doAggregate(aggregation, collectionName, outputType, QueryResultConverter.entity(), context);
+	}
 
-		DocumentCallback<O> callback = new UnwrapAndReadDocumentCallback<>(mongoConverter, outputType, collectionName);
+	@SuppressWarnings({"ConstantConditions", "NullAway"})
+	<T, O> AggregationResults<O> doAggregate(Aggregation aggregation, String collectionName, Class<T> outputType,
+			QueryResultConverter<? super T, ? extends O> resultConverter, AggregationOperationContext context) {
+
+		DocumentCallback<O> callback = new QueryResultConverterCallback<>(resultConverter,
+				new ReadDocumentCallback<>(mongoConverter, outputType, collectionName));
 
 		AggregationOptions options = aggregation.getOptions();
 		AggregationUtil aggregationUtil = new AggregationUtil(queryMapper, mappingContext);
@@ -2172,7 +2237,7 @@ protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String
 			Document command = aggregationUtil.createCommand(collectionName, aggregation, context);
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Executing aggregation: {}", serializeToJsonSafely(command));
+				LOGGER.debug(String.format("Executing aggregation: %s", serializeToJsonSafely(command)));
 			}
 
 			Document commandResult = executeCommand(command);
@@ -2183,34 +2248,53 @@ protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String
 		List<Document> pipeline = aggregationUtil.createPipeline(aggregation, context);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Executing aggregation: {} in collection {}", serializeToJsonSafely(pipeline), collectionName);
+			LOGGER.debug(
+					String.format("Executing aggregation: %s in collection %s", serializeToJsonSafely(pipeline), collectionName));
 		}
 
 		return execute(collectionName, collection -> {
 
 			List<Document> rawResult = new ArrayList<>();
-
-			Class<?> domainType = aggregation instanceof TypedAggregation ? ((TypedAggregation) aggregation).getInputType()
+			CollectionPreparerDelegate delegate = CollectionPreparerDelegate.of(options);
+			Class<?> domainType = aggregation instanceof TypedAggregation ? ((TypedAggregation<?>) aggregation).getInputType()
 					: null;
 
 			Optional<Collation> collation = Optionals.firstNonEmpty(options::getCollation,
 					() -> operations.forType(domainType) //
 							.getCollation());
 
-			AggregateIterable<Document> aggregateIterable = collection.aggregate(pipeline, Document.class) //
-					.collation(collation.map(Collation::toMongoCollation).orElse(null)) //
-					.allowDiskUse(options.isAllowDiskUse());
+			AggregateIterable<Document> aggregateIterable = delegate.prepare(collection).aggregate(pipeline, Document.class) //
+					.collation(collation.map(Collation::toMongoCollation).orElse(null));
+
+			if (options.isAllowDiskUseSet()) {
+				aggregateIterable = aggregateIterable.allowDiskUse(options.isAllowDiskUse());
+			}
 
 			if (options.getCursorBatchSize() != null) {
 				aggregateIterable = aggregateIterable.batchSize(options.getCursorBatchSize());
 			}
 
 			options.getComment().ifPresent(aggregateIterable::comment);
+			HintFunction hintFunction = options.getHintObject().map(HintFunction::from).orElseGet(HintFunction::empty);
+			if (hintFunction.isPresent()) {
+				aggregateIterable = hintFunction.apply(mongoDbFactory, aggregateIterable::hintString, aggregateIterable::hint);
+			}
 
 			if (options.hasExecutionTimeLimit()) {
 				aggregateIterable = aggregateIterable.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
 			}
 
+			if (options.isSkipResults()) {
+
+				// toCollection only allowed for $out and $merge if those are the last stages
+				if (aggregation.getPipeline().isOutOrMerge()) {
+					aggregateIterable.toCollection();
+				} else {
+					aggregateIterable.first();
+				}
+				return new AggregationResults<>(Collections.emptyList(), new Document());
+			}
+
 			MongoIterable<O> iterable = aggregateIterable.map(val -> {
 
 				rawResult.add(val);
@@ -2222,39 +2306,60 @@ protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String
 		});
 	}
 
-	@SuppressWarnings("ConstantConditions")
-	protected <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, String collectionName,
-			Class<O> outputType, @Nullable AggregationOperationContext context) {
+	protected <O> Stream<O> aggregateStream(Aggregation aggregation, String collectionName, Class<O> outputType,
+			@Nullable AggregationOperationContext context) {
+		return doAggregateStream(aggregation, collectionName, outputType, QueryResultConverter.entity(), context);
+	}
 
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-		Assert.notNull(outputType, "Output type must not be null!");
-		Assert.isTrue(!aggregation.getOptions().isExplain(), "Can't use explain option with streaming!");
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
+	<T, O> Stream<O> doAggregateStream(Aggregation aggregation, String collectionName, Class<T> outputType,
+			QueryResultConverter<? super T, ? extends O> resultConverter,
+			@Nullable AggregationOperationContext context) {
 
-		AggregationUtil aggregationUtil = new AggregationUtil(queryMapper, mappingContext);
-		AggregationOperationContext rootContext = aggregationUtil.prepareAggregationContext(aggregation, context);
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		Assert.notNull(outputType, "Output type must not be null");
+		Assert.isTrue(!aggregation.getOptions().isExplain(), "Can't use explain option with streaming");
+
+		AggregationDefinition aggregationDefinition = queryOperations.createAggregation(aggregation, context);
 
 		AggregationOptions options = aggregation.getOptions();
-		List<Document> pipeline = aggregationUtil.createPipeline(aggregation, rootContext);
+		List<Document> pipeline = aggregationDefinition.getAggregationPipeline();
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Streaming aggregation: {} in collection {}", serializeToJsonSafely(pipeline), collectionName);
+			LOGGER.debug(
+					String.format("Streaming aggregation: %s in collection %s", serializeToJsonSafely(pipeline), collectionName));
 		}
 
-		ReadDocumentCallback<O> readCallback = new ReadDocumentCallback<>(mongoConverter, outputType, collectionName);
+		DocumentCallback<O> readCallback = new QueryResultConverterCallback<>(resultConverter,
+				new ReadDocumentCallback<>(mongoConverter, outputType, collectionName));
 
-		return execute(collectionName, (CollectionCallback<CloseableIterator<O>>) collection -> {
+		return execute(collectionName, (CollectionCallback<Stream<O>>) collection -> {
 
-			AggregateIterable<Document> cursor = collection.aggregate(pipeline, Document.class) //
-					.allowDiskUse(options.isAllowDiskUse());
+			CollectionPreparerDelegate delegate = CollectionPreparerDelegate.of(options);
+
+			AggregateIterable<Document> cursor = delegate.prepare(collection).aggregate(pipeline, Document.class);
+
+			if (options.isAllowDiskUseSet()) {
+				cursor = cursor.allowDiskUse(options.isAllowDiskUse());
+			}
 
 			if (options.getCursorBatchSize() != null) {
 				cursor = cursor.batchSize(options.getCursorBatchSize());
 			}
 
 			options.getComment().ifPresent(cursor::comment);
+			HintFunction hintFunction = options.getHintObject().map(HintFunction::from).orElseGet(HintFunction::empty);
+			if (options.getHintObject().isPresent()) {
+				cursor = hintFunction.apply(mongoDbFactory, cursor::hintString, cursor::hint);
+			}
 
-			Class<?> domainType = aggregation instanceof TypedAggregation ? ((TypedAggregation) aggregation).getInputType()
+			if (options.hasExecutionTimeLimit()) {
+				cursor = cursor.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
+			}
+
+			Class<?> domainType = aggregation instanceof TypedAggregation<?> typedAggregation
+					? typedAggregation.getInputType()
 					: null;
 
 			Optionals.firstNonEmpty(options::getCollation, //
@@ -2262,59 +2367,35 @@ protected <O> CloseableIterator<O> aggregateStream(Aggregation aggregation, Stri
 					.map(Collation::toMongoCollation) //
 					.ifPresent(cursor::collation);
 
-			return new CloseableIterableCursorAdapter<>(cursor, exceptionTranslator, readCallback);
+			return new CloseableIterableCursorAdapter<>(cursor, exceptionTranslator, readCallback).stream();
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableFindOperation#query(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableFind<T> query(Class<T> domainType) {
 		return new ExecutableFindOperationSupport(this).query(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableUpdateOperation#update(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableUpdate<T> update(Class<T> domainType) {
 		return new ExecutableUpdateOperationSupport(this).update(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableRemoveOperation#remove(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableRemove<T> remove(Class<T> domainType) {
 		return new ExecutableRemoveOperationSupport(this).remove(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableAggregation<T> aggregateAndReturn(Class<T> domainType) {
 		return new ExecutableAggregationOperationSupport(this).aggregateAndReturn(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableAggregationOperation#aggregateAndReturn(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableMapReduce<T> mapReduce(Class<T> domainType) {
 		return new ExecutableMapReduceOperationSupport(this).mapReduce(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#insert(java.lang.Class)
-	 */
 	@Override
 	public <T> ExecutableInsert<T> insert(Class<T> domainType) {
 		return new ExecutableInsertOperationSupport(this).insert(domainType);
@@ -2322,14 +2403,12 @@ public <T> ExecutableInsert<T> insert(Class<T> domainType) {
 
 	protected String replaceWithResourceIfNecessary(String function) {
 
-		String func = function;
-
 		if (this.resourceLoader != null && ResourceUtils.isUrl(function)) {
 
-			Resource functionResource = resourceLoader.getResource(func);
+			Resource functionResource = resourceLoader.getResource(function);
 
 			if (!functionResource.exists()) {
-				throw new InvalidDataAccessApiUsageException(String.format("Resource %s not found!", function));
+				throw new InvalidDataAccessApiUsageException(String.format("Resource %s not found", function));
 			}
 
 			Scanner scanner = null;
@@ -2338,7 +2417,7 @@ protected String replaceWithResourceIfNecessary(String function) {
 				scanner = new Scanner(functionResource.getInputStream());
 				return scanner.useDelimiter("\\A").next();
 			} catch (IOException e) {
-				throw new InvalidDataAccessApiUsageException(String.format("Cannot read map-reduce file %s!", function), e);
+				throw new InvalidDataAccessApiUsageException(String.format("Cannot read map-reduce file %s", function), e);
 			} finally {
 				if (scanner != null) {
 					scanner.close();
@@ -2346,14 +2425,11 @@ protected String replaceWithResourceIfNecessary(String function) {
 			}
 		}
 
-		return func;
+		return function;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ExecutableInsertOperation#getCollectionNames()
-	 */
-	@SuppressWarnings("ConstantConditions")
+	@Override
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
 	public Set<String> getCollectionNames() {
 		return execute(db -> {
 			Set<String> result = new LinkedHashSet<>();
@@ -2377,29 +2453,41 @@ protected MongoDatabase prepareDatabase(MongoDatabase database) {
 	}
 
 	protected <E extends MongoMappingEvent<T>, T> E maybeEmitEvent(E event) {
+		eventDelegate.publishEvent(event);
+		return event;
+	}
+
+	protected <T> T maybeCallBeforeConvert(T object, String collection) {
 
-		if (null != eventPublisher) {
-			eventPublisher.publishEvent(event);
+		if (entityCallbacks != null) {
+			return entityCallbacks.callback(BeforeConvertCallback.class, object, collection);
 		}
 
-		return event;
+		return object;
 	}
 
-	@SuppressWarnings("unchecked")
-	protected <T> T maybeCallBeforeConvert(T object, String collection) {
+	protected <T> T maybeCallBeforeSave(T object, Document document, String collection) {
+
+		if (entityCallbacks != null) {
+			return entityCallbacks.callback(BeforeSaveCallback.class, object, document, collection);
+		}
+
+		return object;
+	}
+
+	protected <T> T maybeCallAfterSave(T object, Document document, String collection) {
 
-		if (null != entityCallbacks) {
-			return entityCallbacks.callback(BeforeConvertCallback.class, object, collection);
+		if (entityCallbacks != null) {
+			return entityCallbacks.callback(AfterSaveCallback.class, object, document, collection);
 		}
 
 		return object;
 	}
 
-	@SuppressWarnings("unchecked")
-	protected <T> T maybeCallBeforeSave(T object, Document document, String collection) {
+	protected <T> T maybeCallAfterConvert(T object, Document document, String collection) {
 
-		if (null != entityCallbacks) {
-			return entityCallbacks.callback(BeforeSaveCallback.class, object, document, collection);
+		if (entityCallbacks != null) {
+			return entityCallbacks.callback(AfterConvertCallback.class, object, document, collection);
 		}
 
 		return object;
@@ -2414,50 +2502,82 @@ protected <T> T maybeCallBeforeSave(T object, Document document, String collecti
 	 */
 	@SuppressWarnings("ConstantConditions")
 	protected MongoCollection<Document> doCreateCollection(String collectionName, Document collectionOptions) {
+		return doCreateCollection(collectionName, getCreateCollectionOptions(collectionOptions));
+	}
+
+	/**
+	 * Create the specified collection using the provided options
+	 *
+	 * @param collectionName
+	 * @param collectionOptions
+	 * @return the collection that was created
+	 * @since 3.3.3
+	 */
+	@SuppressWarnings({ "ConstantConditions", "NullAway" })
+	protected MongoCollection<Document> doCreateCollection(String collectionName,
+			CreateCollectionOptions collectionOptions) {
+
 		return execute(db -> {
 
-			CreateCollectionOptions co = new CreateCollectionOptions();
+			db.createCollection(collectionName, collectionOptions);
 
-			if (collectionOptions.containsKey("capped")) {
-				co.capped((Boolean) collectionOptions.get("capped"));
-			}
-			if (collectionOptions.containsKey("size")) {
-				co.sizeInBytes(((Number) collectionOptions.get("size")).longValue());
-			}
-			if (collectionOptions.containsKey("max")) {
-				co.maxDocuments(((Number) collectionOptions.get("max")).longValue());
-			}
+			MongoCollection<Document> coll = db.getCollection(collectionName, Document.class);
 
-			if (collectionOptions.containsKey("collation")) {
-				co.collation(IndexConverters.fromDocument(collectionOptions.get("collation", Document.class)));
+			// TODO: Emit a collection created event
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug(String.format("Created collection [%s]",
+						coll.getNamespace() != null ? coll.getNamespace().getCollectionName() : collectionName));
 			}
+			return coll;
+		});
+	}
 
-			if (collectionOptions.containsKey("validator")) {
+	private CreateCollectionOptions getCreateCollectionOptions(Document document) {
 
-				com.mongodb.client.model.ValidationOptions options = new com.mongodb.client.model.ValidationOptions();
+		CreateCollectionOptions options = new CreateCollectionOptions();
 
-				if (collectionOptions.containsKey("validationLevel")) {
-					options.validationLevel(ValidationLevel.fromString(collectionOptions.getString("validationLevel")));
-				}
-				if (collectionOptions.containsKey("validationAction")) {
-					options.validationAction(ValidationAction.fromString(collectionOptions.getString("validationAction")));
-				}
+		if (document.containsKey("capped")) {
+			options.capped((Boolean) document.get("capped"));
+		}
+		if (document.containsKey("size")) {
+			options.sizeInBytes(((Number) document.get("size")).longValue());
+		}
+		if (document.containsKey("max")) {
+			options.maxDocuments(((Number) document.get("max")).longValue());
+		}
+
+		if (document.containsKey("collation")) {
+			options.collation(IndexConverters.fromDocument(document.get("collation", Document.class)));
+		}
+
+		if (document.containsKey("validator")) {
+
+			ValidationOptions validation = new ValidationOptions();
 
-				options.validator(collectionOptions.get("validator", Document.class));
-				co.validationOptions(options);
+			if (document.containsKey("validationLevel")) {
+				validation.validationLevel(ValidationLevel.fromString(document.getString("validationLevel")));
+			}
+			if (document.containsKey("validationAction")) {
+				validation.validationAction(ValidationAction.fromString(document.getString("validationAction")));
 			}
 
-			db.createCollection(collectionName, co);
+			validation.validator(document.get("validator", Document.class));
+			options.validationOptions(validation);
+		}
 
-			MongoCollection<Document> coll = db.getCollection(collectionName, Document.class);
+		if (document.containsKey("timeseries")) {
 
-			// TODO: Emit a collection created event
-			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Created collection [{}]",
-						coll.getNamespace() != null ? coll.getNamespace().getCollectionName() : collectionName);
+			Document timeSeries = document.get("timeseries", Document.class);
+			TimeSeriesOptions timeseries = new TimeSeriesOptions(timeSeries.getString("timeField"));
+			if (timeSeries.containsKey("metaField")) {
+				timeseries.metaField(timeSeries.getString("metaField"));
 			}
-			return coll;
-		});
+			if (timeSeries.containsKey("granularity")) {
+				timeseries.granularity(TimeSeriesGranularity.valueOf(timeSeries.getString("granularity").toUpperCase()));
+			}
+			options.timeSeriesOptions(timeseries);
+		}
+		return options;
 	}
 
 	/**
@@ -2465,13 +2585,17 @@ protected MongoCollection<Document> doCreateCollection(String collectionName, Do
 	 * The query document is specified as a standard {@link Document} and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record.
 	 * @param fields the document that specifies the fields to be returned.
 	 * @param entityClass the parameterized type of the returned list.
-	 * @return the {@link List} of converted objects.
+	 * @return the converted object or {@literal null} if none exists.
 	 */
-	protected <T> T doFindOne(String collectionName, Document query, Document fields, Class<T> entityClass) {
-		return doFindOne(collectionName, query, fields, CursorPreparer.NO_OP_PREPARER, entityClass);
+	@Nullable
+	protected <T> T doFindOne(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document fields,
+			Class<T> entityClass) {
+		return doFindOne(collectionName, collectionPreparer, query, fields, CursorPreparer.NO_OP_PREPARER, entityClass);
 	}
 
 	/**
@@ -2479,27 +2603,32 @@ protected <T> T doFindOne(String collectionName, Document query, Document fields
 	 * The query document is specified as a standard {@link Document} and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record.
 	 * @param fields the document that specifies the fields to be returned.
-	 * @param entityClass the parameterized type of the returned list.
 	 * @param preparer the preparer used to modify the cursor on execution.
-	 * @return the {@link List} of converted objects.
+	 * @param entityClass the parameterized type of the returned list.
+	 * @return the converted object or {@literal null} if none exists.
 	 * @since 2.2
 	 */
+	@Nullable
 	@SuppressWarnings("ConstantConditions")
-	protected <T> T doFindOne(String collectionName, Document query, Document fields, CursorPreparer preparer,
-			Class<T> entityClass) {
+	protected <T> T doFindOne(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document fields,
+			CursorPreparer preparer, Class<T> entityClass) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
-		Document mappedQuery = queryMapper.getMappedObject(query, entity);
-		Document mappedFields = queryMapper.getMappedObject(fields, entity);
+
+		QueryContext queryContext = queryOperations.createQueryContext(new BasicQuery(query, fields));
+		Document mappedFields = queryContext.getMappedFields(entity, EntityProjection.nonProjecting(entityClass));
+		Document mappedQuery = queryContext.getMappedQuery(entity);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("findOne using query: {} fields: {} for class: {} in collection: {}", serializeToJsonSafely(query),
-					mappedFields, entityClass, collectionName);
+			LOGGER.debug(String.format("findOne using query: %s fields: %s for class: %s in collection: %s",
+					serializeToJsonSafely(query), mappedFields, entityClass, collectionName));
 		}
 
-		return executeFindOneInternal(new FindOneCallback(mappedQuery, mappedFields, preparer),
+		return executeFindOneInternal(new FindOneCallback(collectionPreparer, mappedQuery, mappedFields, preparer),
 				new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName), collectionName);
 	}
 
@@ -2508,13 +2637,15 @@ protected <T> T doFindOne(String collectionName, Document query, Document fields
 	 * query document is specified as a standard Document and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record
 	 * @param fields the document that specifies the fields to be returned
 	 * @param entityClass the parameterized type of the returned list.
 	 * @return the List of converted objects.
 	 */
-	protected <T> List<T> doFind(String collectionName, Document query, Document fields, Class<T> entityClass) {
-		return doFind(collectionName, query, fields, entityClass, null,
+	protected <T> List<T> doFind(String collectionName, CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			Document query, Document fields, Class<T> entityClass) {
+		return doFind(collectionName, collectionPreparer, query, fields, entityClass, null,
 				new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName));
 	}
 
@@ -2524,33 +2655,41 @@ protected <T> List<T> doFind(String collectionName, Document query, Document fie
 	 * specified as a standard Document and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record.
 	 * @param fields the document that specifies the fields to be returned.
 	 * @param entityClass the parameterized type of the returned list.
-	 * @param preparer allows for customization of the {@link DBCursor} used when iterating over the result set, (apply
-	 *          limits, skips and so on).
+	 * @param preparer allows for customization of the {@link FindIterable} used when iterating over the result set,
+	 *          (apply limits, skips and so on).
 	 * @return the {@link List} of converted objects.
 	 */
-	protected <T> List<T> doFind(String collectionName, Document query, Document fields, Class<T> entityClass,
-			CursorPreparer preparer) {
-		return doFind(collectionName, query, fields, entityClass, preparer,
+	protected <T> List<T> doFind(String collectionName, CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			Document query, Document fields, Class<T> entityClass, CursorPreparer preparer) {
+		return doFind(collectionName, collectionPreparer, query, fields, entityClass, preparer,
 				new ReadDocumentCallback<>(mongoConverter, entityClass, collectionName));
 	}
 
-	protected <S, T> List<T> doFind(String collectionName, Document query, Document fields, Class<S> entityClass,
-			@Nullable CursorPreparer preparer, DocumentCallback<T> objectCallback) {
+	protected <S, T> List<T> doFind(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document fields,
+			Class<S> entityClass, @Nullable CursorPreparer preparer, DocumentCallback<T> objectCallback) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		Document mappedFields = queryMapper.getMappedFields(fields, entity);
-		Document mappedQuery = queryMapper.getMappedObject(query, entity);
+		QueryContext queryContext = queryOperations.createQueryContext(new BasicQuery(query, fields));
+		Document mappedFields = queryContext.getMappedFields(entity, EntityProjection.nonProjecting(entityClass));
+		Document mappedQuery = queryContext.getMappedQuery(entity);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("find using query: {} fields: {} for class: {} in collection: {}",
-					serializeToJsonSafely(mappedQuery), mappedFields, entityClass, collectionName);
+
+			Document mappedSort = preparer instanceof SortingQueryCursorPreparer sqcp
+					? getMappedSortObject(sqcp.getSortObject(), entity)
+					: null;
+			LOGGER.debug(String.format("find using query: %s fields: %s sort: %s for class: %s in collection: %s",
+					serializeToJsonSafely(mappedQuery), mappedFields, serializeToJsonSafely(mappedSort), entityClass,
+					collectionName));
 		}
 
-		return executeFindMultiInternal(new FindCallback(mappedQuery, mappedFields, null),
+		return executeFindMultiInternal(new FindCallback(collectionPreparer, mappedQuery, mappedFields, null),
 				preparer != null ? preparer : CursorPreparer.NO_OP_PREPARER, objectCallback, collectionName);
 	}
 
@@ -2560,29 +2699,35 @@ protected <S, T> List<T> doFind(String collectionName, Document query, Document
 	 *
 	 * @since 2.0
 	 */
-	<S, T> List<T> doFind(String collectionName, Document query, Document fields, Class<S> sourceClass,
-			Class<T> targetClass, CursorPreparer preparer) {
+	<T, R> List<R> doFind(CollectionPreparer<MongoCollection<Document>> collectionPreparer, String collectionName,
+			Document query, Document fields, Class<?> sourceClass, Class<T> targetClass,
+			QueryResultConverter<? super T, ? extends R> resultConverter, CursorPreparer preparer) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(sourceClass);
+		EntityProjection<T, ?> projection = operations.introspectProjection(targetClass, sourceClass);
 
-		Document mappedFields = getMappedFieldsObject(fields, entity, targetClass);
-		Document mappedQuery = queryMapper.getMappedObject(query, entity);
+		QueryContext queryContext = queryOperations.createQueryContext(new BasicQuery(query, fields));
+		Document mappedFields = queryContext.getMappedFields(entity, projection);
+		Document mappedQuery = queryContext.getMappedQuery(entity);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("find using query: {} fields: {} for class: {} in collection: {}",
-					serializeToJsonSafely(mappedQuery), mappedFields, sourceClass, collectionName);
+
+			Document mappedSort = preparer instanceof SortingQueryCursorPreparer sqcp
+					? getMappedSortObject(sqcp.getSortObject(), entity)
+					: null;
+			LOGGER.debug(String.format("find using query: %s fields: %s sort: %s for class: %s in collection: %s",
+					serializeToJsonSafely(mappedQuery), mappedFields, serializeToJsonSafely(mappedSort), sourceClass,
+					collectionName));
 		}
 
-		return executeFindMultiInternal(new FindCallback(mappedQuery, mappedFields, null), preparer,
-				new ProjectingReadCallback<>(mongoConverter, sourceClass, targetClass, collectionName), collectionName);
+		DocumentCallback<R> callback = getResultReader(projection, collectionName, resultConverter);
+		return executeFindMultiInternal(new FindCallback(collectionPreparer, mappedQuery, mappedFields, null), preparer,
+				callback, collectionName);
 	}
 
 	/**
 	 * Convert given {@link CollectionOptions} to a document and take the domain type information into account when
 	 * creating a mapped schema for validation. <br />
-	 * This method calls {@link #convertToDocument(CollectionOptions)} for backwards compatibility and potentially
-	 * overwrites the validator with the mapped validator document. In the long run
-	 * {@link #convertToDocument(CollectionOptions)} will be removed so that this one becomes the only source of truth.
 	 *
 	 * @param collectionOptions can be {@literal null}.
 	 * @param targetType must not be {@literal null}. Use {@link Object} type instead.
@@ -2591,43 +2736,41 @@ <S, T> List<T> doFind(String collectionName, Document query, Document fields, Cl
 	 */
 	protected Document convertToDocument(@Nullable CollectionOptions collectionOptions, Class<?> targetType) {
 
-		Document doc = convertToDocument(collectionOptions);
-
-		if (collectionOptions != null) {
-
-			collectionOptions.getValidationOptions().ifPresent(it -> it.getValidator() //
-					.ifPresent(val -> doc.put("validator", getMappedValidator(val, targetType))));
+		if (collectionOptions == null) {
+			return new Document();
 		}
 
-		return doc;
-	}
-
-	/**
-	 * @param collectionOptions can be {@literal null}.
-	 * @return never {@literal null}.
-	 * @deprecated since 2.1 in favor of {@link #convertToDocument(CollectionOptions, Class)}.
-	 */
-	@Deprecated
-	protected Document convertToDocument(@Nullable CollectionOptions collectionOptions) {
+		Document doc = new Document();
+		collectionOptions.getCapped().ifPresent(val -> doc.put("capped", val));
+		collectionOptions.getSize().ifPresent(val -> doc.put("size", val));
+		collectionOptions.getMaxDocuments().ifPresent(val -> doc.put("max", val));
+		collectionOptions.getCollation().ifPresent(val -> doc.append("collation", val.toDocument()));
 
-		Document document = new Document();
+		collectionOptions.getValidationOptions().ifPresent(it -> {
 
-		if (collectionOptions != null) {
+			it.getValidationLevel().ifPresent(val -> doc.append("validationLevel", val.getValue()));
+			it.getValidationAction().ifPresent(val -> doc.append("validationAction", val.getValue()));
+			it.getValidator().ifPresent(val -> doc.append("validator", getMappedValidator(val, targetType)));
+		});
 
-			collectionOptions.getCapped().ifPresent(val -> document.put("capped", val));
-			collectionOptions.getSize().ifPresent(val -> document.put("size", val));
-			collectionOptions.getMaxDocuments().ifPresent(val -> document.put("max", val));
-			collectionOptions.getCollation().ifPresent(val -> document.append("collation", val.toDocument()));
+		collectionOptions.getTimeSeriesOptions().map(operations.forType(targetType)::mapTimeSeriesOptions).ifPresent(it -> {
 
-			collectionOptions.getValidationOptions().ifPresent(it -> {
+			Document timeseries = new Document("timeField", it.getTimeField());
+			if (StringUtils.hasText(it.getMetaField())) {
+				timeseries.append("metaField", it.getMetaField());
+			}
+			if (!Granularity.DEFAULT.equals(it.getGranularity())) {
+				timeseries.append("granularity", it.getGranularity().name().toLowerCase());
+			}
+			doc.put("timeseries", timeseries);
+		});
 
-				it.getValidationLevel().ifPresent(val -> document.append("validationLevel", val.getValue()));
-				it.getValidationAction().ifPresent(val -> document.append("validationAction", val.getValue()));
-				it.getValidator().ifPresent(val -> document.append("validator", getMappedValidator(val, Object.class)));
-			});
-		}
+		collectionOptions.getChangeStreamOptions().map(it -> new Document("enabled", it.getPreAndPostImages()))
+				.ifPresent(it -> {
+					doc.put("changeStreamPreAndPostImages", it);
+				});
 
-		return document;
+		return doc;
 	}
 
 	Document getMappedValidator(Validator validator, Class<?> domainType) {
@@ -2643,8 +2786,7 @@ Document getMappedValidator(Validator validator, Class<?> domainType) {
 
 	/**
 	 * Map the results of an ad-hoc query on the default MongoDB collection to an object using the template's converter.
-	 * The first document that matches the query is returned and also removed from the collection in the database.
-	 * <p/>
+	 * The first document that matches the query is returned and also removed from the collection in the database. <br />
 	 * The query document is specified as a standard Document and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from
@@ -2653,28 +2795,27 @@ Document getMappedValidator(Validator validator, Class<?> domainType) {
 	 * @return the List of converted objects.
 	 */
 	@SuppressWarnings("ConstantConditions")
-	protected <T> T doFindAndRemove(String collectionName, Document query, Document fields, Document sort,
-			@Nullable Collation collation, Class<T> entityClass) {
-
-		EntityReader<? super T, Bson> readerToUse = this.mongoConverter;
+	protected <T> @Nullable T doFindAndRemove(CollectionPreparer collectionPreparer, String collectionName,
+			Document query, @Nullable Document fields, @Nullable Document sort, @Nullable Collation collation,
+			Class<T> entityClass) {
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("findAndRemove using query: {} fields: {} sort: {} for class: {} in collection: {}",
-					serializeToJsonSafely(query), fields, sort, entityClass, collectionName);
+			LOGGER.debug(String.format("findAndRemove using query: %s fields: %s sort: %s for class: %s in collection: %s",
+					serializeToJsonSafely(query), fields, serializeToJsonSafely(sort), entityClass, collectionName));
 		}
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		return executeFindOneInternal(
-				new FindAndRemoveCallback(queryMapper.getMappedObject(query, entity), fields, sort, collation),
-				new ReadDocumentCallback<>(readerToUse, entityClass, collectionName), collectionName);
+		return executeFindOneInternal(new FindAndRemoveCallback(collectionPreparer,
+				queryMapper.getMappedObject(query, entity), fields, sort, collation),
+				new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName), collectionName);
 	}
 
 	@SuppressWarnings("ConstantConditions")
-	protected <T> T doFindAndModify(String collectionName, Document query, Document fields, Document sort,
-			Class<T> entityClass, UpdateDefinition update, @Nullable FindAndModifyOptions options) {
-
-		EntityReader<? super T, Bson> readerToUse = this.mongoConverter;
+	<S, T> @Nullable T doFindAndModify(CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			String collectionName,
+			Document query, @Nullable Document fields, @Nullable Document sort, Class<S> entityClass, UpdateDefinition update,
+			@Nullable FindAndModifyOptions options, QueryResultConverter<? super S, ? extends T> resultConverter) {
 
 		if (options == null) {
 			options = new FindAndModifyOptions();
@@ -2682,33 +2823,26 @@ protected <T> T doFindAndModify(String collectionName, Document query, Document
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		increaseVersionForUpdateIfNecessary(entity, update);
+		UpdateContext updateContext = queryOperations.updateSingleContext(update, query, false);
+		updateContext.increaseVersionForUpdateIfNecessary(entity);
 
-		Document mappedQuery = queryMapper.getMappedObject(query, entity);
-
-		Object mappedUpdate;
-		if (update instanceof AggregationUpdate) {
-
-			AggregationOperationContext context = entityClass != null
-					? new RelaxedTypeBasedAggregationOperationContext(entityClass, mappingContext, queryMapper)
-					: Aggregation.DEFAULT_CONTEXT;
-
-			mappedUpdate = new AggregationUtil(queryMapper, mappingContext).createPipeline((Aggregation) update, context);
-		} else {
-			mappedUpdate = updateMapper.getMappedObject(update.getUpdateObject(), entity);
-		}
+		Document mappedQuery = updateContext.getMappedQuery(entity);
+		Object mappedUpdate = updateContext.isAggregationUpdate() ? updateContext.getUpdatePipeline(entityClass)
+				: updateContext.getMappedUpdate(entity);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(
-					"findAndModify using query: {} fields: {} sort: {} for class: {} and update: {} " + "in collection: {}",
-					serializeToJsonSafely(mappedQuery), fields, sort, entityClass, serializeToJsonSafely(mappedUpdate),
-					collectionName);
+			LOGGER.debug(String.format(
+					"findAndModify using query: %s fields: %s sort: %s for class: %s and update: %s in collection: %s",
+					serializeToJsonSafely(mappedQuery), fields, serializeToJsonSafely(sort), entityClass,
+					serializeToJsonSafely(mappedUpdate), collectionName));
 		}
 
+		DocumentCallback<T> callback = getResultReader(EntityProjection.nonProjecting(entityClass), collectionName, resultConverter);
+
 		return executeFindOneInternal(
-				new FindAndModifyCallback(mappedQuery, fields, sort, mappedUpdate,
+				new FindAndModifyCallback(collectionPreparer, mappedQuery, fields, sort, mappedUpdate,
 						update.getArrayFilters().stream().map(ArrayFilter::asDocument).collect(Collectors.toList()), options),
-				new ReadDocumentCallback<>(readerToUse, entityClass, collectionName), collectionName);
+				callback, collectionName);
 	}
 
 	/**
@@ -2727,20 +2861,88 @@ protected <T> T doFindAndModify(String collectionName, Document query, Document
 	 *         {@literal false} and {@link FindAndReplaceOptions#isUpsert() upsert} is {@literal false}.
 	 */
 	@Nullable
-	protected <T> T doFindAndReplace(String collectionName, Document mappedQuery, Document mappedFields,
-			Document mappedSort, @Nullable com.mongodb.client.model.Collation collation, Class<?> entityType,
-			Document replacement, FindAndReplaceOptions options, Class<T> resultType) {
+	protected <S, T> T doFindAndReplace(CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			String collectionName,
+			Document mappedQuery, Document mappedFields, Document mappedSort,
+			com.mongodb.client.model.@Nullable Collation collation, Class<S> entityType, Document replacement,
+			FindAndReplaceOptions options, Class<T> resultType) {
+
+		EntityProjection<T, S> projection = operations.introspectProjection(resultType, entityType);
+
+		return doFindAndReplace(collectionPreparer, collectionName, mappedQuery, mappedFields, mappedSort, collation,
+				entityType, replacement, options, projection, QueryResultConverter.entity());
+	}
+
+	CollectionPreparerDelegate createDelegate(Query query) {
+		return CollectionPreparerDelegate.of(query);
+	}
+
+	CollectionPreparer<MongoCollection<Document>> createCollectionPreparer(Query query, @Nullable MongoAction action) {
+		CollectionPreparer<MongoCollection<Document>> collectionPreparer = createDelegate(query);
+		if (action == null) {
+			return collectionPreparer;
+		}
+		return collectionPreparer.andThen(collection -> {
+			WriteConcern writeConcern = prepareWriteConcern(action);
+			return writeConcern != null ? collection.withWriteConcern(writeConcern) : collection;
+		});
+	}
+
+	/**
+	 * Customize this part for findAndReplace.
+	 *
+	 * @param collectionName The name of the collection to perform the operation in.
+	 * @param mappedQuery the query to look up documents.
+	 * @param mappedFields the fields to project the result to.
+	 * @param mappedSort the sort to be applied when executing the query.
+	 * @param collation collation settings for the query. Can be {@literal null}.
+	 * @param entityType the source domain type.
+	 * @param replacement the replacement {@link Document}.
+	 * @param options applicable options.
+	 * @param projection the projection descriptor.
+	 * @return {@literal null} if object does not exist, {@link FindAndReplaceOptions#isReturnNew() return new} is
+	 *         {@literal false} and {@link FindAndReplaceOptions#isUpsert() upsert} is {@literal false}.
+	 * @since 3.4
+	 */
+	@Nullable
+	private <S, T, R> R doFindAndReplace(CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			String collectionName,
+			Document mappedQuery, Document mappedFields, Document mappedSort,
+			com.mongodb.client.model.@Nullable Collation collation, Class<T> entityType, Document replacement,
+			FindAndReplaceOptions options, EntityProjection<S, T> projection, QueryResultConverter<? super S, ? extends R> resultConverter) {
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug(
-					"findAndReplace using query: {} fields: {} sort: {} for class: {} and replacement: {} " + "in collection: {}",
-					serializeToJsonSafely(mappedQuery), serializeToJsonSafely(mappedFields), serializeToJsonSafely(mappedSort),
-					entityType, serializeToJsonSafely(replacement), collectionName);
+			LOGGER
+					.debug(String.format(
+							"findAndReplace using query: %s fields: %s sort: %s for class: %s and replacement: %s "
+									+ "in collection: %s",
+							serializeToJsonSafely(mappedQuery), serializeToJsonSafely(mappedFields),
+							serializeToJsonSafely(mappedSort), entityType, serializeToJsonSafely(replacement), collectionName));
 		}
 
-		return executeFindOneInternal(
-				new FindAndReplaceCallback(mappedQuery, mappedFields, mappedSort, replacement, collation, options),
-				new ProjectingReadCallback<>(mongoConverter, entityType, resultType, collectionName), collectionName);
+		DocumentCallback<R> callback = getResultReader(projection, collectionName, resultConverter);
+		return executeFindOneInternal(new FindAndReplaceCallback(collectionPreparer, mappedQuery, mappedFields, mappedSort,
+				replacement, collation, options),callback,
+				collectionName);
+	}
+
+	@SuppressWarnings("NullAway")
+	private <S> UpdateResult doReplace(ReplaceOptions options, Class<S> entityType, String collectionName,
+			UpdateContext updateContext, CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			Document replacement) {
+
+		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(entityType);
+
+		ReplaceCallback replaceCallback = new ReplaceCallback(collectionPreparer,
+				updateContext.getMappedQuery(persistentEntity), replacement, updateContext.getReplaceOptions(entityType, it -> {
+					it.upsert(options.isUpsert());
+				}));
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug(String.format("replace one using query: %s for class: %s in collection: %s",
+					serializeToJsonSafely(updateContext.getMappedQuery(persistentEntity)), entityType, collectionName));
+		}
+
+		return execute(collectionName, replaceCallback);
 	}
 
 	/**
@@ -2769,25 +2971,24 @@ private MongoCollection<Document> getAndPrepareCollection(MongoDatabase db, Stri
 	 * Internal method using callbacks to do queries against the datastore that requires reading a single object from a
 	 * collection of objects. It will take the following steps
 	 * <ol>
-	 * <li>Execute the given {@link ConnectionCallback} for a {@link Document}.</li>
+	 * <li>Execute the given {@link CollectionCallback} for a {@link Document}.</li>
 	 * <li>Apply the given {@link DocumentCallback} to each of the {@link Document}s to obtain the result.</li>
 	 * <ol>
 	 *
 	 * @param <T>
 	 * @param collectionCallback the callback to retrieve the {@link Document} with
-	 * @param objectCallback the {@link DocumentCallback} to transform {@link Document}s into the actual domain type
+	 * @param documentCallback the {@link DocumentCallback} to transform {@link Document}s into the actual domain type
 	 * @param collectionName the collection to be queried
 	 * @return
 	 */
 	@Nullable
 	private <T> T executeFindOneInternal(CollectionCallback<Document> collectionCallback,
-			DocumentCallback<T> objectCallback, String collectionName) {
+			DocumentCallback<T> documentCallback, String collectionName) {
 
 		try {
 
-			T result = objectCallback
-					.doWith(collectionCallback.doInCollection(getAndPrepareCollection(doGetDatabase(), collectionName)));
-			return result;
+			Document document = collectionCallback.doInCollection(getAndPrepareCollection(doGetDatabase(), collectionName));
+			return document != null ? documentCallback.doWith(document) : null;
 		} catch (RuntimeException e) {
 			throw potentiallyConvertRuntimeException(e, exceptionTranslator);
 		}
@@ -2797,46 +2998,38 @@ private <T> T executeFindOneInternal(CollectionCallback<Document> collectionCall
 	 * Internal method using callback to do queries against the datastore that requires reading a collection of objects.
 	 * It will take the following steps
 	 * <ol>
-	 * <li>Execute the given {@link ConnectionCallback} for a {@link DBCursor}.</li>
-	 * <li>Prepare that {@link DBCursor} with the given {@link CursorPreparer} (will be skipped if {@link CursorPreparer}
-	 * is {@literal null}</li>
-	 * <li>Iterate over the {@link DBCursor} and applies the given {@link DocumentCallback} to each of the
+	 * <li>Execute the given {@link CollectionCallback} for a {@link FindIterable}.</li>
+	 * <li>Prepare that {@link FindIterable} with the given {@link CursorPreparer} (will be skipped if
+	 * {@link CursorPreparer} is {@literal null}</li>
+	 * <li>Iterate over the {@link FindIterable} and applies the given {@link DocumentCallback} to each of the
 	 * {@link Document}s collecting the actual result {@link List}.</li>
 	 * <ol>
 	 *
 	 * @param <T>
-	 * @param collectionCallback the callback to retrieve the {@link DBCursor} with
-	 * @param preparer the {@link CursorPreparer} to potentially modify the {@link DBCursor} before iterating over it
-	 * @param objectCallback the {@link DocumentCallback} to transform {@link Document}s into the actual domain type
+	 * @param collectionCallback the callback to retrieve the {@link FindIterable} with
+	 * @param preparer the {@link CursorPreparer} to potentially modify the {@link FindIterable} before iterating over it
+	 * @param documentCallback the {@link DocumentCallback} to transform {@link Document}s into the actual domain type
 	 * @param collectionName the collection to be queried
 	 * @return
 	 */
 	private <T> List<T> executeFindMultiInternal(CollectionCallback<FindIterable<Document>> collectionCallback,
-			CursorPreparer preparer, DocumentCallback<T> objectCallback, String collectionName) {
+			CursorPreparer preparer, DocumentCallback<T> documentCallback, String collectionName) {
 
 		try {
 
-			MongoCursor<Document> cursor = null;
-
-			try {
-
-				cursor = preparer
-						.initiateFind(getAndPrepareCollection(doGetDatabase(), collectionName), collectionCallback::doInCollection)
-						.iterator();
+			try (MongoCursor<Document> cursor = preparer
+					.initiateFind(getAndPrepareCollection(doGetDatabase(), collectionName), collectionCallback::doInCollection)
+					.iterator()) {
 
-				List<T> result = new ArrayList<>();
+				int available = cursor.available();
+				List<T> result = available > 0 ? new ArrayList<>(available) : new ArrayList<>();
 
 				while (cursor.hasNext()) {
 					Document object = cursor.next();
-					result.add(objectCallback.doWith(object));
+					result.add(documentCallback.doWith(object));
 				}
 
 				return result;
-			} finally {
-
-				if (cursor != null) {
-					cursor.close();
-				}
 			}
 		} catch (RuntimeException e) {
 			throw potentiallyConvertRuntimeException(e, exceptionTranslator);
@@ -2846,29 +3039,28 @@ private <T> List<T> executeFindMultiInternal(CollectionCallback<FindIterable<Doc
 	private void executeQueryInternal(CollectionCallback<FindIterable<Document>> collectionCallback,
 			CursorPreparer preparer, DocumentCallbackHandler callbackHandler, String collectionName) {
 
-		try {
-
-			MongoCursor<Document> cursor = null;
+		try (MongoCursor<Document> cursor = preparer
+				.initiateFind(getAndPrepareCollection(doGetDatabase(), collectionName), collectionCallback::doInCollection)
+				.iterator()) {
 
-			try {
-
-				cursor = preparer
-						.initiateFind(getAndPrepareCollection(doGetDatabase(), collectionName), collectionCallback::doInCollection)
-						.iterator();
-
-				while (cursor.hasNext()) {
-					callbackHandler.processDocument(cursor.next());
-				}
-			} finally {
-				if (cursor != null) {
-					cursor.close();
-				}
+			while (cursor.hasNext()) {
+				callbackHandler.processDocument(cursor.next());
 			}
 		} catch (RuntimeException e) {
 			throw potentiallyConvertRuntimeException(e, exceptionTranslator);
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	private <T, R> DocumentCallback<R> getResultReader(EntityProjection<T, ?> projection, String collectionName,
+			QueryResultConverter<? super T, ? extends R> resultConverter) {
+
+		DocumentCallback<T> readCallback = new ProjectingReadCallback<>(mongoConverter, projection, collectionName);
+
+		return resultConverter == QueryResultConverter.entity() ? (DocumentCallback<R>) readCallback
+				: new QueryResultConverterCallback<T, R>(resultConverter, readCallback);
+	}
+
 	public PersistenceExceptionTranslator getExceptionTranslator() {
 		return exceptionTranslator;
 	}
@@ -2878,7 +3070,7 @@ private MongoPersistentEntity<?> getPersistentEntity(@Nullable Class<?> type) {
 		return type != null ? mappingContext.getPersistentEntity(type) : null;
 	}
 
-	private static MongoConverter getDefaultMongoConverter(MongoDbFactory factory) {
+	private static MongoConverter getDefaultMongoConverter(MongoDatabaseFactory factory) {
 
 		DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
 		MongoCustomConversions conversions = new MongoCustomConversions(Collections.emptyList());
@@ -2895,30 +3087,28 @@ private static MongoConverter getDefaultMongoConverter(MongoDbFactory factory) {
 		return converter;
 	}
 
-	private Document getMappedSortObject(Query query, Class<?> type) {
+	@Nullable
+	private Document getMappedSortObject(@Nullable Query query, Class<?> type) {
 
-		if (query == null || ObjectUtils.isEmpty(query.getSortObject())) {
+		if (query == null) {
 			return null;
 		}
 
-		return queryMapper.getMappedSort(query.getSortObject(), mappingContext.getPersistentEntity(type));
+		return getMappedSortObject(query.getSortObject(), type);
 	}
 
-	private Document getMappedFieldsObject(Document fields, @Nullable MongoPersistentEntity<?> entity,
-			Class<?> targetType) {
+	private @Nullable Document getMappedSortObject(@Nullable Document sortObject, Class<?> type) {
+		return getMappedSortObject(sortObject, mappingContext.getPersistentEntity(type));
+	}
 
-		if (entity == null) {
-			return fields;
-		}
 
-		Document projectedFields = propertyOperations.computeFieldsForProjection(projectionFactory, fields,
-				entity.getType(), targetType);
+	private @Nullable Document getMappedSortObject(@Nullable Document sortObject, @Nullable MongoPersistentEntity<?> entity) {
 
-		if (ObjectUtils.nullSafeEquals(fields, projectedFields)) {
-			return queryMapper.getMappedFields(projectedFields, entity);
+		if (ObjectUtils.isEmpty(sortObject)) {
+			return null;
 		}
 
-		return queryMapper.getMappedFields(projectedFields, mappingContext.getRequiredPersistentEntity(targetType));
+		return queryMapper.getMappedSort(sortObject, entity);
 	}
 
 	/**
@@ -2939,7 +3129,7 @@ static RuntimeException potentiallyConvertRuntimeException(RuntimeException ex,
 
 	/**
 	 * Simple {@link CollectionCallback} that takes a query {@link Document} plus an optional fields specification
-	 * {@link Document} and executes that against the {@link DBCollection}.
+	 * {@link Document} and executes that against the {@link MongoCollection}.
 	 *
 	 * @author Oliver Gierke
 	 * @author Thomas Risberg
@@ -2947,12 +3137,15 @@ static RuntimeException potentiallyConvertRuntimeException(RuntimeException ex,
 	 */
 	private static class FindOneCallback implements CollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
 		private final Optional<Document> fields;
 		private final CursorPreparer cursorPreparer;
 
-		FindOneCallback(Document query, Document fields, CursorPreparer preparer) {
+		FindOneCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document fields,
+				CursorPreparer preparer) {
 
+			this.collectionPreparer = collectionPreparer;
 			this.query = query;
 			this.fields = Optional.of(fields).filter(it -> !ObjectUtils.isEmpty(fields));
 			this.cursorPreparer = preparer;
@@ -2961,14 +3154,8 @@ private static class FindOneCallback implements CollectionCallback<Document> {
 		@Override
 		public Document doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
-			FindIterable<Document> iterable = cursorPreparer.initiateFind(collection, col -> col.find(query, Document.class));
-
-			if (LOGGER.isDebugEnabled()) {
-
-				LOGGER.debug("findOne using query: {} fields: {} in db.collection: {}", serializeToJsonSafely(query),
-						serializeToJsonSafely(fields.orElseGet(Document::new)),
-						collection.getNamespace() != null ? collection.getNamespace().getFullName() : "n/a");
-			}
+			FindIterable<Document> iterable = cursorPreparer.initiateFind(collection,
+					col -> collectionPreparer.prepare(col).find(query, Document.class));
 
 			if (fields.isPresent()) {
 				iterable = iterable.projection(fields.get());
@@ -2980,7 +3167,7 @@ public Document doInCollection(MongoCollection<Document> collection) throws Mong
 
 	/**
 	 * Simple {@link CollectionCallback} that takes a query {@link Document} plus an optional fields specification
-	 * {@link Document} and executes that against the {@link DBCollection}.
+	 * {@link Document} and executes that against the {@link MongoCollection}.
 	 *
 	 * @author Oliver Gierke
 	 * @author Thomas Risberg
@@ -2988,24 +3175,29 @@ public Document doInCollection(MongoCollection<Document> collection) throws Mong
 	 */
 	private static class FindCallback implements CollectionCallback<FindIterable<Document>> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
 		private final Document fields;
-		private final @Nullable com.mongodb.client.model.Collation collation;
+		private final com.mongodb.client.model.@Nullable Collation collation;
 
-		public FindCallback(Document query, Document fields, @Nullable com.mongodb.client.model.Collation collation) {
+		public FindCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				Document fields, com.mongodb.client.model.@Nullable Collation collation) {
 
-			Assert.notNull(query, "Query must not be null!");
-			Assert.notNull(fields, "Fields must not be null!");
+			Assert.notNull(query, "Query must not be null");
+			Assert.notNull(fields, "Fields must not be null");
 
+			this.collectionPreparer = collectionPreparer;
 			this.query = query;
 			this.fields = fields;
 			this.collation = collation;
 		}
 
+		@Override
 		public FindIterable<Document> doInCollection(MongoCollection<Document> collection)
 				throws MongoException, DataAccessException {
 
-			FindIterable<Document> findIterable = collection.find(query, Document.class).projection(fields);
+			FindIterable<Document> findIterable = collectionPreparer.prepare(collection).find(query, Document.class)
+					.projection(fields);
 
 			if (collation != null) {
 				findIterable = findIterable.collation(collation);
@@ -3021,34 +3213,45 @@ public FindIterable<Document> doInCollection(MongoCollection<Document> collectio
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
 	private class ExistsCallback implements CollectionCallback<Boolean> {
 
+		private final CollectionPreparer collectionPreparer;
 		private final Document mappedQuery;
-		private final com.mongodb.client.model.Collation collation;
+		private final com.mongodb.client.model.@Nullable Collation collation;
+
+		ExistsCallback(CollectionPreparer collectionPreparer, Document mappedQuery,
+				com.mongodb.client.model.@Nullable Collation collation) {
+
+			this.collectionPreparer = collectionPreparer;
+			this.mappedQuery = mappedQuery;
+			this.collation = collation;
+		}
 
 		@Override
 		public Boolean doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
-			return doCount(collection.getNamespace().getCollectionName(), mappedQuery,
+			return doCount(collectionPreparer, collection.getNamespace().getCollectionName(), mappedQuery,
 					new CountOptions().limit(1).collation(collation)) > 0;
 		}
 	}
 
 	/**
 	 * Simple {@link CollectionCallback} that takes a query {@link Document} plus an optional fields specification
-	 * {@link Document} and executes that against the {@link DBCollection}.
+	 * {@link Document} and executes that against the {@link MongoCollection}.
 	 *
 	 * @author Thomas Risberg
 	 */
 	private static class FindAndRemoveCallback implements CollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
-		private final Document fields;
-		private final Document sort;
+		private final @Nullable Document fields;
+		private final @Nullable Document sort;
 		private final Optional<Collation> collation;
 
-		public FindAndRemoveCallback(Document query, Document fields, Document sort, @Nullable Collation collation) {
+		FindAndRemoveCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				@Nullable Document fields, @Nullable Document sort, @Nullable Collation collation) {
+			this.collectionPreparer = collectionPreparer;
 
 			this.query = query;
 			this.fields = fields;
@@ -3056,26 +3259,31 @@ public FindAndRemoveCallback(Document query, Document fields, Document sort, @Nu
 			this.collation = Optional.ofNullable(collation);
 		}
 
+		@Override
 		public Document doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
 			FindOneAndDeleteOptions opts = new FindOneAndDeleteOptions().sort(sort).projection(fields);
 			collation.map(Collation::toMongoCollation).ifPresent(opts::collation);
 
-			return collection.findOneAndDelete(query, opts);
+			return collectionPreparer.prepare(collection).findOneAndDelete(query, opts);
 		}
 	}
 
 	private static class FindAndModifyCallback implements CollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
-		private final Document fields;
-		private final Document sort;
+		private final @Nullable Document fields;
+		private final @Nullable Document sort;
 		private final Object update;
 		private final List<Document> arrayFilters;
 		private final FindAndModifyOptions options;
 
-		public FindAndModifyCallback(Document query, Document fields, Document sort, Object update,
-				List<Document> arrayFilters, FindAndModifyOptions options) {
+		FindAndModifyCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				@Nullable Document fields, @Nullable Document sort, Object update, List<Document> arrayFilters,
+				FindAndModifyOptions options) {
+
+			this.collectionPreparer = collectionPreparer;
 			this.query = query;
 			this.fields = fields;
 			this.sort = sort;
@@ -3084,6 +3292,7 @@ public FindAndModifyCallback(Document query, Document fields, Document sort, Obj
 			this.options = options;
 		}
 
+		@Override
 		public Document doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
 			FindOneAndUpdateOptions opts = new FindOneAndUpdateOptions();
@@ -3102,10 +3311,10 @@ public Document doInCollection(MongoCollection<Document> collection) throws Mong
 				opts.arrayFilters(arrayFilters);
 			}
 
-			if (update instanceof Document) {
-				return collection.findOneAndUpdate(query, (Document) update, opts);
+			if (update instanceof Document document) {
+				return collectionPreparer.prepare(collection).findOneAndUpdate(query, document, opts);
 			} else if (update instanceof List) {
-				return collection.findOneAndUpdate(query, (List<Document>) update, opts);
+				return collectionPreparer.prepare(collection).findOneAndUpdate(query, (List<Document>) update, opts);
 			}
 
 			throw new IllegalArgumentException(String.format("Using %s is not supported in findOneAndUpdate", update));
@@ -3121,16 +3330,18 @@ public Document doInCollection(MongoCollection<Document> collection) throws Mong
 	 */
 	private static class FindAndReplaceCallback implements CollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
 		private final Document fields;
 		private final Document sort;
 		private final Document update;
-		private final @Nullable com.mongodb.client.model.Collation collation;
+		private final  com.mongodb.client.model.@Nullable Collation collation;
 		private final FindAndReplaceOptions options;
 
-		FindAndReplaceCallback(Document query, Document fields, Document sort, Document update,
-				@Nullable com.mongodb.client.model.Collation collation, FindAndReplaceOptions options) {
-
+		FindAndReplaceCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				Document fields, Document sort, Document update, com.mongodb.client.model.@Nullable Collation collation,
+				FindAndReplaceOptions options) {
+			this.collectionPreparer = collectionPreparer;
 			this.query = query;
 			this.fields = fields;
 			this.sort = sort;
@@ -3139,10 +3350,6 @@ private static class FindAndReplaceCallback implements CollectionCallback<Docume
 			this.collation = collation;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.CollectionCallback#doInCollection(com.mongodb.client.MongoCollection)
-		 */
 		@Override
 		public Document doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
 
@@ -3159,7 +3366,7 @@ public Document doInCollection(MongoCollection<Document> collection) throws Mong
 				opts.returnDocument(ReturnDocument.AFTER);
 			}
 
-			return collection.findOneAndReplace(query, update, opts);
+			return collectionPreparer.prepare(collection).findOneAndReplace(query, update, opts);
 		}
 	}
 
@@ -3170,10 +3377,9 @@ public Document doInCollection(MongoCollection<Document> collection) throws Mong
 	 * @author Thomas Darimont
 	 */
 
-	interface DocumentCallback<T> {
+	protected interface DocumentCallback<T> {
 
-		@Nullable
-		T doWith(@Nullable Document object);
+		T doWith(Document object);
 	}
 
 	/**
@@ -3182,28 +3388,53 @@ interface DocumentCallback<T> {
 	 *
 	 * @author Oliver Gierke
 	 * @author Christoph Strobl
+	 * @author Roman Puchkovskiy
 	 */
-	@RequiredArgsConstructor
 	private class ReadDocumentCallback<T> implements DocumentCallback<T> {
 
-		private final @NonNull EntityReader<? super T, Bson> reader;
-		private final @NonNull Class<T> type;
+		private final EntityReader<? super T, Bson> reader;
+		private final Class<T> type;
 		private final String collectionName;
 
-		@Nullable
-		public T doWith(@Nullable Document object) {
+		ReadDocumentCallback(EntityReader<? super T, Bson> reader, Class<T> type, String collectionName) {
 
-			if (null != object) {
-				maybeEmitEvent(new AfterLoadEvent<>(object, type, collectionName));
-			}
+			this.reader = reader;
+			this.type = type;
+			this.collectionName = collectionName;
+		}
+
+		@Override
+		public T doWith(Document document) {
 
-			T source = reader.read(type, object);
+			maybeEmitEvent(new AfterLoadEvent<>(document, type, collectionName));
+			T entity = reader.read(type, document);
 
-			if (null != source) {
-				maybeEmitEvent(new AfterConvertEvent<>(object, source, collectionName));
+			if (entity == null) {
+				throw new MappingException(String.format("EntityReader %s returned null", reader));
 			}
 
-			return source;
+			maybeEmitEvent(new AfterConvertEvent<>(document, entity, collectionName));
+			entity = maybeCallAfterConvert(entity, document, collectionName);
+
+			return entity;
+		}
+	}
+
+	static class QueryResultConverterCallback<T, R> implements DocumentCallback<R> {
+
+		private final QueryResultConverter<? super T, ? extends R> converter;
+		private final DocumentCallback<T> delegate;
+
+		QueryResultConverterCallback(QueryResultConverter<? super T, ? extends R> converter, DocumentCallback<T> delegate) {
+			this.converter = converter;
+			this.delegate = delegate;
+		}
+
+		@Override
+		public R doWith(Document object) {
+
+			Lazy<T> lazy = Lazy.of(() -> delegate.doWith(object));
+			return converter.mapDocument(object, lazy::get);
 		}
 	}
 
@@ -3215,144 +3446,106 @@ public T doWith(@Nullable Document object) {
 	 * @param <T>
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
 	private class ProjectingReadCallback<S, T> implements DocumentCallback<T> {
 
-		private final @NonNull EntityReader<Object, Bson> reader;
-		private final @NonNull Class<S> entityType;
-		private final @NonNull Class<T> targetType;
-		private final @NonNull String collectionName;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.MongoTemplate.DocumentCallback#doWith(org.bson.Document)
-		 */
-		@SuppressWarnings("unchecked")
-		@Nullable
-		public T doWith(@Nullable Document object) {
-
-			if (object == null) {
-				return null;
-			}
-
-			Class<?> typeToRead = targetType.isInterface() || targetType.isAssignableFrom(entityType) ? entityType
-					: targetType;
-
-			if (null != object) {
-				maybeEmitEvent(new AfterLoadEvent<>(object, targetType, collectionName));
-			}
-
-			Object source = reader.read(typeToRead, object);
-			Object result = targetType.isInterface() ? projectionFactory.createProjection(targetType, source) : source;
-
-			if (null != result) {
-				maybeEmitEvent(new AfterConvertEvent<>(object, result, collectionName));
-			}
-
-			return (T) result;
-		}
-	}
+		private final MongoConverter mongoConverter;
+		private final EntityProjection<T, S> projection;
+		private final String collectionName;
 
-	class UnwrapAndReadDocumentCallback<T> extends ReadDocumentCallback<T> {
+		ProjectingReadCallback(MongoConverter mongoConverter, EntityProjection<T, S> projection, String collectionName) {
 
-		public UnwrapAndReadDocumentCallback(EntityReader<? super T, Bson> reader, Class<T> type, String collectionName) {
-			super(reader, type, collectionName);
+			this.mongoConverter = mongoConverter;
+			this.projection = projection;
+			this.collectionName = collectionName;
 		}
 
 		@Override
-		public T doWith(@Nullable Document object) {
-
-			if (object == null) {
-				return null;
-			}
-
-			Object idField = object.get(Fields.UNDERSCORE_ID);
+		@SuppressWarnings("unchecked")
+		public T doWith(Document document) {
 
-			if (!(idField instanceof Document)) {
-				return super.doWith(object);
-			}
+			maybeEmitEvent(new AfterLoadEvent<>(document, projection.getMappedType().getType(), collectionName));
 
-			Document toMap = new Document();
-			Document nested = (Document) idField;
-			toMap.putAll(nested);
+			Object entity = mongoConverter.project(projection, document);
 
-			for (String key : object.keySet()) {
-				if (!Fields.UNDERSCORE_ID.equals(key)) {
-					toMap.put(key, object.get(key));
-				}
+			if (entity == null) {
+				throw new MappingException(String.format("EntityReader %s returned null", mongoConverter));
 			}
 
-			return super.doWith(toMap);
+			maybeEmitEvent(new AfterConvertEvent<>(document, entity, collectionName));
+			return (T) maybeCallAfterConvert(entity, document, collectionName);
 		}
 	}
 
-	class QueryCursorPreparer implements CursorPreparer {
+	class QueryCursorPreparer implements SortingQueryCursorPreparer {
 
 		private final Query query;
+		private final Document sortObject;
+		private final int limit;
+		private final long skip;
 		private final @Nullable Class<?> type;
 
-		public QueryCursorPreparer(Query query, @Nullable Class<?> type) {
+		QueryCursorPreparer(Query query, @Nullable Class<?> type) {
+			this(query, query.getSortObject(), query.getLimit(), query.getSkip(), type);
+		}
 
+		QueryCursorPreparer(Query query, Document sortObject, int limit, long skip, @Nullable Class<?> type) {
 			this.query = query;
+			this.sortObject = sortObject;
+			this.limit = limit;
+			this.skip = skip;
 			this.type = type;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.CursorPreparer#prepare(com.mongodb.DBCursor)
-		 */
-		public FindIterable<Document> prepare(FindIterable<Document> cursor) {
+		@Override
+		public FindIterable<Document> prepare(FindIterable<Document> iterable) {
 
-			FindIterable<Document> cursorToUse = cursor;
+			FindIterable<Document> cursorToUse = iterable;
 
 			operations.forType(type).getCollation(query) //
 					.map(Collation::toMongoCollation) //
 					.ifPresent(cursorToUse::collation);
 
 			Meta meta = query.getMeta();
-			if (query.getSkip() <= 0 && query.getLimit() <= 0 && ObjectUtils.isEmpty(query.getSortObject())
-					&& !StringUtils.hasText(query.getHint()) && !meta.hasValues() && !query.getCollation().isPresent()) {
+			HintFunction hintFunction = HintFunction.from(query.getHint());
+			if (skip <= 0 && limit <= 0 && ObjectUtils.isEmpty(sortObject) && hintFunction.isEmpty() && !meta.hasValues()
+					&& query.getCollation().isEmpty()) {
 				return cursorToUse;
 			}
 
 			try {
-				if (query.getSkip() > 0) {
-					cursorToUse = cursorToUse.skip((int) query.getSkip());
+				if (skip > 0) {
+					cursorToUse = cursorToUse.skip((int) skip);
 				}
-				if (query.getLimit() > 0) {
-					cursorToUse = cursorToUse.limit(query.getLimit());
+				if (limit > 0) {
+					cursorToUse = cursorToUse.limit(limit);
 				}
-				if (!ObjectUtils.isEmpty(query.getSortObject())) {
-					Document sort = type != null ? getMappedSortObject(query, type) : query.getSortObject();
+				if (!ObjectUtils.isEmpty(sortObject)) {
+					Document sort = type != null ? getMappedSortObject(sortObject, type) : sortObject;
 					cursorToUse = cursorToUse.sort(sort);
 				}
 
-				if (StringUtils.hasText(query.getHint())) {
-					cursorToUse = cursorToUse.hint(Document.parse(query.getHint()));
+				if (hintFunction.isPresent()) {
+					cursorToUse = hintFunction.apply(mongoDbFactory, cursorToUse::hintString, cursorToUse::hint);
 				}
 
 				if (meta.hasValues()) {
 
-					if (StringUtils.hasText(meta.getComment())) {
-						cursorToUse = cursorToUse.comment(meta.getComment());
-					}
-
-					if (meta.getSnapshot()) {
-						cursorToUse = cursorToUse.snapshot(meta.getSnapshot());
-					}
-
-					if (meta.getMaxScan() != null) {
-						cursorToUse = cursorToUse.maxScan(meta.getMaxScan());
+					if (meta.hasComment()) {
+						cursorToUse = cursorToUse.comment(meta.getRequiredComment());
 					}
 
-					if (meta.getMaxTimeMsec() != null) {
-						cursorToUse = cursorToUse.maxTime(meta.getMaxTimeMsec(), TimeUnit.MILLISECONDS);
+					if (meta.hasMaxTime()) {
+						cursorToUse = cursorToUse.maxTime(meta.getRequiredMaxTimeMsec(), TimeUnit.MILLISECONDS);
 					}
 
 					if (meta.getCursorBatchSize() != null) {
 						cursorToUse = cursorToUse.batchSize(meta.getCursorBatchSize());
 					}
 
+					if (meta.getAllowDiskUse() != null) {
+						cursorToUse = cursorToUse.allowDiskUse(meta.getAllowDiskUse());
+					}
+
 					for (Meta.CursorOption option : meta.getFlags()) {
 
 						switch (option) {
@@ -3363,7 +3556,7 @@ public FindIterable<Document> prepare(FindIterable<Document> cursor) {
 							case PARTIAL:
 								cursorToUse = cursorToUse.partial(true);
 								break;
-							case SLAVE_OK:
+							case SECONDARY_READS:
 								break;
 							default:
 								throw new IllegalArgumentException(String.format("%s is no supported flag.", option));
@@ -3378,9 +3571,10 @@ public FindIterable<Document> prepare(FindIterable<Document> cursor) {
 			return cursorToUse;
 		}
 
+		@Nullable
 		@Override
-		public ReadPreference getReadPreference() {
-			return query.getMeta().getFlags().contains(CursorOption.SLAVE_OK) ? ReadPreference.primaryPreferred() : null;
+		public Document getSortObject() {
+			return sortObject;
 		}
 	}
 
@@ -3407,15 +3601,15 @@ static class GeoNearResultDocumentCallback<T> implements DocumentCallback<GeoRes
 		 */
 		GeoNearResultDocumentCallback(String distanceField, DocumentCallback<T> delegate, Metric metric) {
 
-			Assert.notNull(delegate, "DocumentCallback must not be null!");
+			Assert.notNull(delegate, "DocumentCallback must not be null");
 
 			this.distanceField = distanceField;
 			this.delegate = delegate;
 			this.metric = metric;
 		}
 
-		@Nullable
-		public GeoResult<T> doWith(@Nullable Document object) {
+		@Override
+		public GeoResult<T> doWith(Document object) {
 
 			double distance = Double.NaN;
 			if (object.containsKey(distanceField)) {
@@ -3424,17 +3618,24 @@ public GeoResult<T> doWith(@Nullable Document object) {
 
 			T doWith = delegate.doWith(object);
 
-			return new GeoResult<>(doWith, new Distance(distance, metric));
+			return new GeoResult<>(doWith, Distance.of(distance, metric));
 		}
 	}
 
 	/**
-	 * A {@link CloseableIterator} that is backed by a MongoDB {@link Cursor}.
+	 * @return the {@link MongoDatabaseFactory} in use.
+	 * @since 3.1.4
+	 */
+	public MongoDatabaseFactory getMongoDatabaseFactory() {
+		return mongoDbFactory;
+	}
+
+	/**
+	 * A {@link CloseableIterator} that is backed by a MongoDB {@link MongoCollection}.
 	 *
 	 * @author Thomas Darimont
 	 * @since 1.7
 	 */
-	@AllArgsConstructor(access = AccessLevel.PACKAGE)
 	static class CloseableIterableCursorAdapter<T> implements CloseableIterator<T> {
 
 		private volatile @Nullable MongoCursor<Document> cursor;
@@ -3442,20 +3643,24 @@ static class CloseableIterableCursorAdapter<T> implements CloseableIterator<T> {
 		private DocumentCallback<T> objectReadCallback;
 
 		/**
-		 * Creates a new {@link CloseableIterableCursorAdapter} backed by the given {@link Cursor}.
-		 *
-		 * @param cursor
-		 * @param exceptionTranslator
-		 * @param objectReadCallback
+		 * Creates a new {@link CloseableIterableCursorAdapter} backed by the given {@link MongoCollection}.
 		 */
-		public CloseableIterableCursorAdapter(MongoIterable<Document> cursor,
-				PersistenceExceptionTranslator exceptionTranslator, DocumentCallback<T> objectReadCallback) {
+		CloseableIterableCursorAdapter(MongoIterable<Document> cursor, PersistenceExceptionTranslator exceptionTranslator,
+				DocumentCallback<T> objectReadCallback) {
 
 			this.cursor = cursor.iterator();
 			this.exceptionTranslator = exceptionTranslator;
 			this.objectReadCallback = objectReadCallback;
 		}
 
+		CloseableIterableCursorAdapter(MongoCursor<Document> cursor, PersistenceExceptionTranslator exceptionTranslator,
+				DocumentCallback<T> objectReadCallback) {
+
+			this.cursor = cursor;
+			this.exceptionTranslator = exceptionTranslator;
+			this.objectReadCallback = objectReadCallback;
+		}
+
 		@Override
 		public boolean hasNext() {
 
@@ -3482,8 +3687,7 @@ public T next() {
 
 			try {
 				Document item = cursor.next();
-				T converted = objectReadCallback.doWith(item);
-				return converted;
+				return objectReadCallback.doWith(item);
 			} catch (RuntimeException ex) {
 				throw potentiallyConvertRuntimeException(ex, exceptionTranslator);
 			}
@@ -3503,20 +3707,13 @@ public void close() {
 				throw potentiallyConvertRuntimeException(ex, exceptionTranslator);
 			} finally {
 				cursor = null;
-				exceptionTranslator = null;
-				objectReadCallback = null;
 			}
 		}
 	}
 
-	public MongoDbFactory getMongoDbFactory() {
-		return mongoDbFactory;
-	}
-
 	/**
 	 * {@link MongoTemplate} extension bound to a specific {@link ClientSession} that is applied when interacting with the
-	 * server through the driver API.
-	 * <p />
+	 * server through the driver API. <br />
 	 * The prepare steps for {@link MongoDatabase} and {@link MongoCollection} proxy the target and invoke the desired
 	 * target method matching the actual arguments plus a {@link ClientSession}.
 	 *
@@ -3534,32 +3731,57 @@ static class SessionBoundMongoTemplate extends MongoTemplate {
 		 */
 		SessionBoundMongoTemplate(ClientSession session, MongoTemplate that) {
 
-			super(that.getMongoDbFactory().withSession(session), that);
+			super(that.getMongoDatabaseFactory().withSession(session), that);
 
 			this.delegate = that;
 			this.session = session;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.MongoTemplate#getCollection(java.lang.String)
-		 */
 		@Override
-		public MongoCollection<Document> getCollection(String collectionName) {
+		public MongoCollection<Document> getCollection(@Nullable String collectionName) {
 
 			// native MongoDB objects that offer methods with ClientSession must not be proxied.
 			return delegate.getCollection(collectionName);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.MongoTemplate#getDb()
-		 */
 		@Override
 		public MongoDatabase getDb() {
 
 			// native MongoDB objects that offer methods with ClientSession must not be proxied.
 			return delegate.getDb();
 		}
+
+		@Override
+		protected boolean countCanBeEstimated(Document filter, CountOptions options) {
+			return false;
+		}
+	}
+
+	@FunctionalInterface
+	interface CountExecution {
+		long countDocuments(CollectionPreparer collectionPreparer, String collection, Document filter,
+				CountOptions options);
+	}
+
+	private static class ReplaceCallback implements CollectionCallback<UpdateResult> {
+
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
+		private final Document query;
+		private final Document update;
+		private final com.mongodb.client.model.ReplaceOptions options;
+
+		ReplaceCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document update,
+				com.mongodb.client.model.ReplaceOptions options) {
+			this.collectionPreparer = collectionPreparer;
+			this.query = query;
+			this.update = update;
+			this.options = options;
+		}
+
+		@Override
+		public UpdateResult doInCollection(MongoCollection<Document> collection)
+				throws MongoException, DataAccessException {
+			return collectionPreparer.prepare(collection).replaceOne(query, update, options);
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/PropertyOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/PropertyOperations.java
index 3ca684cac4..583b243aa8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/PropertyOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/PropertyOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,62 +15,63 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-
 import org.bson.Document;
-import org.springframework.data.mapping.SimplePropertyHandler;
+
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.projection.ProjectionInformation;
-import org.springframework.util.ClassUtils;
+import org.springframework.data.mongodb.core.mapping.PersistentPropertyTranslator;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.util.Predicates;
 
 /**
  * Common operations performed on properties of an entity like extracting fields information for projection creation.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 2.1
  */
-@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 class PropertyOperations {
 
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 
+	PropertyOperations(MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+		this.mappingContext = mappingContext;
+	}
+
 	/**
 	 * For cases where {@code fields} is {@link Document#isEmpty() empty} include only fields that are required for
-	 * creating the projection (target) type if the {@code targetType} is a {@literal DTO projection} or a
+	 * creating the projection (target) type if the {@code EntityProjection} is a {@literal DTO projection} or a
 	 * {@literal closed interface projection}.
 	 *
-	 * @param projectionFactory must not be {@literal null}.
+	 * @param projection must not be {@literal null}.
 	 * @param fields must not be {@literal null}.
-	 * @param domainType must not be {@literal null}.
-	 * @param targetType must not be {@literal null}.
 	 * @return {@link Document} with fields to be included.
 	 */
-	Document computeFieldsForProjection(ProjectionFactory projectionFactory, Document fields, Class<?> domainType,
-			Class<?> targetType) {
+	Document computeMappedFieldsForProjection(EntityProjection<?, ?> projection,
+			Document fields) {
 
-		if (!fields.isEmpty() || ClassUtils.isAssignable(domainType, targetType)) {
+		if (!projection.isClosedProjection()) {
 			return fields;
 		}
 
 		Document projectedFields = new Document();
 
-		if (targetType.isInterface()) {
-
-			ProjectionInformation projectionInformation = projectionFactory.getProjectionInformation(targetType);
-
-			if (projectionInformation.isClosed()) {
-				projectionInformation.getInputProperties().forEach(it -> projectedFields.append(it.getName(), 1));
-			}
+		if (projection.getMappedType().getType().isInterface()) {
+			projection.forEach(it -> {
+				projectedFields.put(it.getPropertyPath().getSegment(), 1);
+			});
 		} else {
 
-			MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(targetType);
-			if (entity != null) {
-				entity.doWithProperties(
-						(SimplePropertyHandler) persistentProperty -> projectedFields.append(persistentProperty.getName(), 1));
+			// DTO projections use merged metadata between domain type and result type
+			PersistentPropertyTranslator translator = PersistentPropertyTranslator.create(
+					mappingContext.getRequiredPersistentEntity(projection.getDomainType()),
+					Predicates.negate(MongoPersistentProperty::hasExplicitFieldName));
+
+			MongoPersistentEntity<?> persistentEntity = mappingContext
+					.getRequiredPersistentEntity(projection.getMappedType());
+			for (MongoPersistentProperty property : persistentEntity) {
+				projectedFields.put(translator.translate(property).getFieldName(), 1);
 			}
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java
new file mode 100644
index 0000000000..4ae618eaa1
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryOperations.java
@@ -0,0 +1,1051 @@
+/*
+ * Copyright 2020-2025 the original author 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.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.codecs.Codec;
+import org.bson.conversions.Bson;
+import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.mapping.PropertyReferenceException;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.CodecRegistryProvider;
+import org.springframework.data.mongodb.MongoExpression;
+import org.springframework.data.mongodb.core.MappedDocument.MappedUpdate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationExpression;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
+import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.aggregation.RelaxedTypeBasedAggregationOperationContext;
+import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.core.mapping.MongoId;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.ShardKey;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.Meta;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.util.Lazy;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+
+import com.mongodb.client.model.CountOptions;
+import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.UpdateOptions;
+
+/**
+ * {@link QueryOperations} centralizes common operations required before an operation is actually ready to be executed.
+ * This involves mapping {@link Query queries} into their respective MongoDB representation, computing execution options
+ * for {@literal count}, {@literal remove}, and other methods.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Florian Lüdiger
+ * @since 3.0
+ */
+class QueryOperations {
+
+	private final QueryMapper queryMapper;
+	private final UpdateMapper updateMapper;
+	private final EntityOperations entityOperations;
+	private final PropertyOperations propertyOperations;
+	private final CodecRegistryProvider codecRegistryProvider;
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final AggregationUtil aggregationUtil;
+	private final Map<Class<?>, Document> mappedShardKey = new ConcurrentHashMap<>(1);
+
+	/**
+	 * Create a new instance of {@link QueryOperations}.
+	 *
+	 * @param queryMapper must not be {@literal null}.
+	 * @param updateMapper must not be {@literal null}.
+	 * @param entityOperations must not be {@literal null}.
+	 * @param propertyOperations must not be {@literal null}.
+	 * @param codecRegistryProvider must not be {@literal null}.
+	 */
+	QueryOperations(QueryMapper queryMapper, UpdateMapper updateMapper, EntityOperations entityOperations,
+			PropertyOperations propertyOperations, CodecRegistryProvider codecRegistryProvider) {
+
+		this.queryMapper = queryMapper;
+		this.updateMapper = updateMapper;
+		this.entityOperations = entityOperations;
+		this.propertyOperations = propertyOperations;
+		this.codecRegistryProvider = codecRegistryProvider;
+		this.mappingContext = queryMapper.getMappingContext();
+		this.aggregationUtil = new AggregationUtil(queryMapper, mappingContext);
+	}
+
+	InsertContext createInsertContext(Document source) {
+		return createInsertContext(MappedDocument.of(source));
+	}
+
+	InsertContext createInsertContext(MappedDocument mappedDocument) {
+		return new InsertContext(mappedDocument);
+	}
+
+	/**
+	 * Create a new {@link QueryContext} instance.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return new instance of {@link QueryContext}.
+	 */
+	QueryContext createQueryContext(Query query) {
+		return new QueryContext(query);
+	}
+
+	/**
+	 * Create a new {@link DistinctQueryContext} instance.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return new instance of {@link DistinctQueryContext}.
+	 */
+	DistinctQueryContext distinctQueryContext(Query query, String fieldName) {
+		return new DistinctQueryContext(query, fieldName);
+	}
+
+	/**
+	 * Create a new {@link CountContext} instance.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return new instance of {@link CountContext}.
+	 */
+	CountContext countQueryContext(Query query) {
+		return new CountContext(query);
+	}
+
+	/**
+	 * Create a new {@link UpdateContext} instance affecting multiple documents.
+	 *
+	 * @param updateDefinition must not be {@literal null}.
+	 * @param query must not be {@literal null}.
+	 * @param upsert use {@literal true} to insert diff when no existing document found.
+	 * @return new instance of {@link UpdateContext}.
+	 */
+	UpdateContext updateContext(UpdateDefinition updateDefinition, Query query, boolean upsert) {
+		return new UpdateContext(updateDefinition, query, true, upsert);
+	}
+
+	/**
+	 * Create a new {@link UpdateContext} instance affecting a single document.
+	 *
+	 * @param updateDefinition must not be {@literal null}.
+	 * @param query must not be {@literal null}.
+	 * @param upsert use {@literal true} to insert diff when no existing document found.
+	 * @return new instance of {@link UpdateContext}.
+	 */
+	UpdateContext updateSingleContext(UpdateDefinition updateDefinition, Query query, boolean upsert) {
+		return new UpdateContext(updateDefinition, query, false, upsert);
+	}
+
+	/**
+	 * Create a new {@link UpdateContext} instance affecting a single document.
+	 *
+	 * @param updateDefinition must not be {@literal null}.
+	 * @param query must not be {@literal null}.
+	 * @param upsert use {@literal true} to insert diff when no existing document found.
+	 * @return new instance of {@link UpdateContext}.
+	 */
+	UpdateContext updateSingleContext(UpdateDefinition updateDefinition, Document query, boolean upsert) {
+		return new UpdateContext(updateDefinition, query, false, upsert);
+	}
+
+	/**
+	 * @param replacement the {@link MappedDocument mapped replacement} document.
+	 * @param upsert use {@literal true} to insert diff when no existing document found.
+	 * @return new instance of {@link UpdateContext}.
+	 */
+	UpdateContext replaceSingleContext(MappedDocument replacement, boolean upsert) {
+		return new UpdateContext(replacement, upsert);
+	}
+
+	/**
+	 * @param replacement the {@link MappedDocument mapped replacement} document.
+	 * @param upsert use {@literal true} to insert diff when no existing document found.
+	 * @return new instance of {@link UpdateContext}.
+	 */
+	UpdateContext replaceSingleContext(Query query, MappedDocument replacement, boolean upsert) {
+		return new UpdateContext(query, replacement, upsert);
+	}
+
+	/**
+	 * Create a new {@link DeleteContext} instance removing all matching documents.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return new instance of {@link QueryContext}.
+	 */
+	DeleteContext deleteQueryContext(Query query) {
+		return new DeleteContext(query, true);
+	}
+
+	/**
+	 * Create a new {@link DeleteContext} instance only the first matching document.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return new instance of {@link QueryContext}.
+	 */
+	DeleteContext deleteSingleContext(Query query) {
+		return new DeleteContext(query, false);
+	}
+
+	/**
+	 * Create a new {@link AggregationDefinition} for the given {@link Aggregation}.
+	 *
+	 * @param aggregation must not be {@literal null}.
+	 * @param inputType fallback mapping type in case of untyped aggregation. Can be {@literal null}.
+	 * @return new instance of {@link AggregationDefinition}.
+	 * @since 3.2
+	 */
+	AggregationDefinition createAggregation(Aggregation aggregation, @Nullable Class<?> inputType) {
+		return new AggregationDefinition(aggregation, inputType);
+	}
+
+	/**
+	 * Create a new {@link AggregationDefinition} for the given {@link Aggregation}.
+	 *
+	 * @param aggregation must not be {@literal null}.
+	 * @param aggregationOperationContext the {@link AggregationOperationContext} to use. Can be {@literal null}.
+	 * @return new instance of {@link AggregationDefinition}.
+	 * @since 3.2
+	 */
+	AggregationDefinition createAggregation(Aggregation aggregation,
+			@Nullable AggregationOperationContext aggregationOperationContext) {
+		return new AggregationDefinition(aggregation, aggregationOperationContext);
+	}
+
+	/**
+	 * {@link InsertContext} encapsulates common tasks required to interact with {@link Document} to be inserted.
+	 *
+	 * @since 3.4.3
+	 */
+	class InsertContext {
+
+		private final MappedDocument source;
+
+		private InsertContext(MappedDocument source) {
+			this.source = source;
+		}
+
+		/**
+		 * Prepare the {@literal _id} field. May generate a new {@literal id} value and convert it to the id properties
+		 * {@link MongoPersistentProperty#getFieldType() target type}.
+		 *
+		 * @param type must not be {@literal null}.
+		 * @param <T>
+		 * @return the {@link MappedDocument} containing the changes.
+		 * @see #prepareId(MongoPersistentEntity)
+		 */
+		<T> MappedDocument prepareId(Class<T> type) {
+			return prepareId(mappingContext.getPersistentEntity(type));
+		}
+
+		/**
+		 * Prepare the {@literal _id} field. May generate a new {@literal id} value and convert it to the id properties
+		 * {@link MongoPersistentProperty#getFieldType() target type}.
+		 *
+		 * @param entity can be {@literal null}.
+		 * @param <T>
+		 * @return the {@link MappedDocument} containing the changes.
+		 */
+		@SuppressWarnings("NullAway")
+		<T> MappedDocument prepareId(@Nullable MongoPersistentEntity<T> entity) {
+
+			if (entity == null || source.hasId()) {
+				return source;
+			}
+
+			MongoPersistentProperty idProperty = entity.getIdProperty();
+			if (idProperty != null
+					&& (idProperty.hasExplicitWriteTarget() || idProperty.isAnnotationPresent(MongoId.class))) {
+				if (!ClassUtils.isAssignable(ObjectId.class, idProperty.getFieldType())) {
+					source.updateId(queryMapper.convertId(new ObjectId(), idProperty.getFieldType()));
+				}
+			}
+			return source;
+		}
+	}
+
+	/**
+	 * {@link QueryContext} encapsulates common tasks required to convert a {@link Query} into its MongoDB document
+	 * representation, mapping field names, as well as determining and applying {@link Collation collations}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	class QueryContext {
+
+		private final Query query;
+
+		/**
+		 * Create new a {@link QueryContext} instance from the given {@literal query} (can be either a {@link Query} or a
+		 * plain {@link Document}.
+		 *
+		 * @param query can be {@literal null}.
+		 */
+		private QueryContext(@Nullable Query query) {
+			this.query = query != null ? query : new Query();
+		}
+
+		/**
+		 * @return never {@literal null}.
+		 */
+		Query getQuery() {
+			return query;
+		}
+
+		/**
+		 * Extract the raw {@link Query#getQueryObject() unmapped document} from the {@link Query}.
+		 *
+		 * @return
+		 */
+		Document getQueryObject() {
+			return query.getQueryObject();
+		}
+
+		/**
+		 * Get the already mapped MongoDB query representation.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @param entityLookup the {@link Function lookup} used to provide the {@link MongoPersistentEntity} for the
+		 *          given{@literal domainType}
+		 * @param <T>
+		 * @return never {@literal null}.
+		 */
+		<T> Document getMappedQuery(@Nullable Class<T> domainType,
+				Function<Class<T>, MongoPersistentEntity<?>> entityLookup) {
+			return getMappedQuery(domainType == null ? null : entityLookup.apply(domainType));
+		}
+
+		/**
+		 * Get the already mapped MongoDB query representation.
+		 *
+		 * @param entity the Entity to map field names to. Can be {@literal null}.
+		 * @param <T>
+		 * @return never {@literal null}.
+		 */
+		<T> Document getMappedQuery(@Nullable MongoPersistentEntity<T> entity) {
+			return queryMapper.getMappedObject(getQueryObject(), entity);
+		}
+
+		@SuppressWarnings("NullAway")
+		Document getMappedFields(@Nullable MongoPersistentEntity<?> entity, EntityProjection<?, ?> projection) {
+
+			Document fields = evaluateFields(entity);
+
+			if (entity == null) {
+				return fields;
+			}
+
+			Document mappedFields;
+			if (!fields.isEmpty()) {
+				mappedFields = queryMapper.getMappedFields(fields, entity);
+			} else {
+				mappedFields = propertyOperations.computeMappedFieldsForProjection(projection, fields);
+				mappedFields = queryMapper.addMetaAttributes(mappedFields, entity);
+			}
+
+			if (entity.hasTextScoreProperty() && mappedFields.containsKey(entity.getTextScoreProperty().getFieldName())
+					&& !query.getQueryObject().containsKey("$text")) {
+				mappedFields.remove(entity.getTextScoreProperty().getFieldName());
+			}
+
+			if (mappedFields.isEmpty()) {
+				return BsonUtils.EMPTY_DOCUMENT;
+			}
+
+			return mappedFields;
+		}
+
+		private Document evaluateFields(@Nullable MongoPersistentEntity<?> entity) {
+
+			Document fields = query.getFieldsObject();
+
+			if (fields.isEmpty()) {
+				return BsonUtils.EMPTY_DOCUMENT;
+			}
+
+			Document evaluated = new Document();
+
+			for (Entry<String, Object> entry : fields.entrySet()) {
+
+				if (entry.getValue() instanceof MongoExpression mongoExpression) {
+
+					AggregationOperationContext ctx = entity == null ? Aggregation.DEFAULT_CONTEXT
+							: new RelaxedTypeBasedAggregationOperationContext(entity.getType(), mappingContext, queryMapper);
+
+					evaluated.put(entry.getKey(), AggregationExpression.from(mongoExpression).toDocument(ctx));
+				} else {
+					evaluated.put(entry.getKey(), entry.getValue());
+				}
+			}
+
+			return evaluated;
+		}
+
+		/**
+		 * Get the already mapped {@link Query#getSortObject() sort} option.
+		 *
+		 * @param entity the Entity to map field names to. Can be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		Document getMappedSort(@Nullable MongoPersistentEntity<?> entity) {
+			return queryMapper.getMappedSort(query.getSortObject(), entity);
+		}
+
+		/**
+		 * Apply the {@link com.mongodb.client.model.Collation} if present extracted from the {@link Query} or fall back to
+		 * the {@literal domain types} default {@link org.springframework.data.mongodb.core.mapping.Document#collation()
+		 * collation}.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @param consumer must not be {@literal null}.
+		 */
+		void applyCollation(@Nullable Class<?> domainType, Consumer<com.mongodb.client.model.Collation> consumer) {
+			getCollation(domainType).ifPresent(consumer);
+		}
+
+		/**
+		 * Get the {@link com.mongodb.client.model.Collation} extracted from the {@link Query} if present or fall back to
+		 * the {@literal domain types} default {@link org.springframework.data.mongodb.core.mapping.Document#collation()
+		 * collation}.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		Optional<com.mongodb.client.model.Collation> getCollation(@Nullable Class<?> domainType) {
+
+			return entityOperations.forType(domainType).getCollation(query) //
+					.map(Collation::toMongoCollation);
+		}
+
+		/**
+		 * Get the {@link HintFunction} reading the actual hint form the {@link Query}.
+		 *
+		 * @return new instance of {@link HintFunction}.
+		 * @since 4.2
+		 */
+		HintFunction getHintFunction() {
+			return HintFunction.from(query.getHint());
+		}
+
+		/**
+		 * Read and apply the hint from the {@link Query}.
+		 *
+		 * @since 4.2
+		 */
+		<R> void applyHint(Function<String, R> stringConsumer, Function<Bson, R> bsonConsumer) {
+			getHintFunction().ifPresent(codecRegistryProvider, stringConsumer, bsonConsumer);
+		}
+	}
+
+	/**
+	 * A {@link QueryContext} that encapsulates common tasks required when running {@literal distinct} queries.
+	 *
+	 * @author Christoph Strobl
+	 */
+	class DistinctQueryContext extends QueryContext {
+
+		private final String fieldName;
+
+		/**
+		 * Create a new {@link DistinctQueryContext} instance.
+		 *
+		 * @param query can be {@literal null}.
+		 * @param fieldName must not be {@literal null}.
+		 */
+		private DistinctQueryContext(@Nullable Object query, String fieldName) {
+
+			super(query instanceof Document document ? new BasicQuery(document) : (Query) query);
+			this.fieldName = fieldName;
+		}
+
+		@Override
+		Document getMappedFields(@Nullable MongoPersistentEntity<?> entity, EntityProjection<?, ?> projection) {
+			return getMappedFields(entity);
+		}
+
+		Document getMappedFields(@Nullable MongoPersistentEntity<?> entity) {
+			return queryMapper.getMappedFields(new Document(fieldName, 1), entity);
+		}
+
+		/**
+		 * Get the mapped field name to project to.
+		 *
+		 * @param entity can be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		String getMappedFieldName(@Nullable MongoPersistentEntity<?> entity) {
+			return getMappedFields(entity).keySet().iterator().next();
+		}
+
+		/**
+		 * Get the MongoDB native representation of the given {@literal type}.
+		 *
+		 * @param type must not be {@literal null}.
+		 * @param <T>
+		 * @return never {@literal null}.
+		 */
+		@SuppressWarnings("unchecked")
+		<T> Class<T> getDriverCompatibleClass(Class<T> type) {
+
+			return codecRegistryProvider.getCodecFor(type) //
+					.map(Codec::getEncoderClass) //
+					.orElse((Class<T>) BsonValue.class);
+		}
+
+		/**
+		 * Get the most specific read target type based on the user {@literal requestedTargetType} an the property type
+		 * based on meta information extracted from the {@literal domainType}.
+		 *
+		 * @param requestedTargetType must not be {@literal null}.
+		 * @param domainType must not be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		Class<?> getMostSpecificConversionTargetType(Class<?> requestedTargetType, Class<?> domainType) {
+
+			Class<?> conversionTargetType = requestedTargetType;
+			try {
+
+				Class<?> propertyType = PropertyPath.from(fieldName, domainType).getLeafProperty().getLeafType();
+
+				// use the more specific type but favor UserType over property one
+				if (ClassUtils.isAssignable(requestedTargetType, propertyType)) {
+					conversionTargetType = propertyType;
+				}
+			} catch (PropertyReferenceException e) {
+				// just don't care about it as we default to Object.class anyway.
+			}
+
+			return conversionTargetType;
+		}
+	}
+
+	/**
+	 * A {@link QueryContext} that encapsulates common tasks required when running {@literal count} queries.
+	 *
+	 * @author Christoph Strobl
+	 */
+	class CountContext extends QueryContext {
+
+		/**
+		 * Creates a new {@link CountContext} instance.
+		 *
+		 * @param query can be {@literal null}.
+		 */
+		CountContext(@Nullable Query query) {
+			super(query);
+		}
+
+		/**
+		 * Get the {@link CountOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType must not be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		CountOptions getCountOptions(@Nullable Class<?> domainType) {
+			return getCountOptions(domainType, null);
+		}
+
+		/**
+		 * Get the {@link CountOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @param callback a callback to modify the generated options. Can be {@literal null}.
+		 * @return
+		 */
+		CountOptions getCountOptions(@Nullable Class<?> domainType, @Nullable Consumer<CountOptions> callback) {
+
+			CountOptions options = new CountOptions();
+			Query query = getQuery();
+
+			applyCollation(domainType, options::collation);
+
+			if (query.getLimit() > 0) {
+				options.limit(query.getLimit());
+			}
+
+			if (query.getSkip() > 0) {
+				options.skip((int) query.getSkip());
+			}
+
+			Meta meta = query.getMeta();
+			if (meta.hasValues()) {
+
+				if (meta.hasMaxTime()) {
+					options.maxTime(meta.getRequiredMaxTimeMsec(), TimeUnit.MILLISECONDS);
+				}
+
+				if (meta.hasComment()) {
+					options.comment(meta.getComment());
+				}
+			}
+
+			HintFunction hintFunction = HintFunction.from(query.getHint());
+
+			if (hintFunction.isPresent()) {
+				options = hintFunction.apply(codecRegistryProvider, options::hintString, options::hint);
+			}
+
+			if (callback != null) {
+				callback.accept(options);
+			}
+
+			return options;
+		}
+	}
+
+	/**
+	 * A {@link QueryContext} that encapsulates common tasks required when running {@literal delete} queries.
+	 *
+	 * @author Christoph Strobl
+	 */
+	class DeleteContext extends QueryContext {
+
+		private final boolean multi;
+
+		/**
+		 * Crate a new {@link DeleteContext} instance.
+		 *
+		 * @param query can be {@literal null}.
+		 * @param multi use {@literal true} to remove all matching documents, {@literal false} for just the first one.
+		 */
+		DeleteContext(@Nullable Query query, boolean multi) {
+
+			super(query);
+			this.multi = multi;
+		}
+
+		/**
+		 * Get the {@link DeleteOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType must not be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		DeleteOptions getDeleteOptions(@Nullable Class<?> domainType) {
+			return getDeleteOptions(domainType, null);
+		}
+
+		/**
+		 * Get the {@link DeleteOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @param callback a callback to modify the generated options. Can be {@literal null}.
+		 * @return
+		 */
+		DeleteOptions getDeleteOptions(@Nullable Class<?> domainType, @Nullable Consumer<DeleteOptions> callback) {
+
+			DeleteOptions options = new DeleteOptions();
+			applyCollation(domainType, options::collation);
+
+			if (callback != null) {
+				callback.accept(options);
+			}
+
+			return options;
+		}
+
+		/**
+		 * @return {@literal true} if all matching documents shall be deleted.
+		 */
+		boolean isMulti() {
+			return multi;
+		}
+	}
+
+	/**
+	 * A {@link QueryContext} that encapsulates common tasks required when running {@literal updates}.
+	 */
+	class UpdateContext extends QueryContext {
+
+		private final boolean multi;
+		private final boolean upsert;
+		private final @Nullable UpdateDefinition update;
+		private final @Nullable MappedDocument mappedDocument;
+
+		/**
+		 * Create a new {@link UpdateContext} instance.
+		 *
+		 * @param update must not be {@literal null}.
+		 * @param query must not be {@literal null}.
+		 * @param multi use {@literal true} to update all matching documents.
+		 * @param upsert use {@literal true} to insert a new document if none match.
+		 */
+		UpdateContext(UpdateDefinition update, Document query, boolean multi, boolean upsert) {
+			this(update, new BasicQuery(query), multi, upsert);
+		}
+
+		/**
+		 * Create a new {@link UpdateContext} instance.
+		 *
+		 * @param update must not be {@literal null}.
+		 * @param query can be {@literal null}.
+		 * @param multi use {@literal true} to update all matching documents.
+		 * @param upsert use {@literal true} to insert a new document if none match.
+		 */
+		UpdateContext(UpdateDefinition update, @Nullable Query query, boolean multi, boolean upsert) {
+
+			super(query);
+
+			this.multi = multi;
+			this.upsert = upsert;
+			this.update = update;
+			this.mappedDocument = null;
+		}
+
+		UpdateContext(MappedDocument update, boolean upsert) {
+			this(new BasicQuery(BsonUtils.asDocument(update.getIdFilter())), update, upsert);
+		}
+
+		UpdateContext(Query query, MappedDocument update, boolean upsert) {
+
+			super(query);
+			this.multi = false;
+			this.upsert = upsert;
+			this.mappedDocument = update;
+			this.update = null;
+		}
+
+		/**
+		 * Get the {@link UpdateOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		UpdateOptions getUpdateOptions(@Nullable Class<?> domainType) {
+			return getUpdateOptions(domainType, null);
+		}
+
+		/**
+		 * Get the {@link UpdateOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @param query can be {@literal null}
+		 * @return never {@literal null}.
+		 */
+		UpdateOptions getUpdateOptions(@Nullable Class<?> domainType, @Nullable Query query) {
+			UpdateOptions options = new UpdateOptions();
+			options.upsert(upsert);
+
+			if (update != null && update.hasArrayFilters()) {
+				options
+						.arrayFilters(update.getArrayFilters().stream().map(ArrayFilter::asDocument).collect(Collectors.toList()));
+			}
+
+			if (query != null && query.isSorted()) {
+				options.sort(getMappedSort(domainType != null ? mappingContext.getPersistentEntity(domainType) : null));
+			}
+
+			HintFunction.from(getQuery().getHint()).ifPresent(codecRegistryProvider, options::hintString, options::hint);
+			applyCollation(domainType, options::collation);
+
+			return options;
+		}
+
+		/**
+		 * Get the {@link ReplaceOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType must not be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		ReplaceOptions getReplaceOptions(@Nullable Class<?> domainType) {
+			return getReplaceOptions(domainType, null);
+		}
+
+		/**
+		 * Get the {@link ReplaceOptions} applicable for the {@link Query}.
+		 *
+		 * @param domainType can be {@literal null}.
+		 * @param callback a callback to modify the generated options. Can be {@literal null}.
+		 * @return
+		 */
+		ReplaceOptions getReplaceOptions(@Nullable Class<?> domainType, @Nullable Consumer<ReplaceOptions> callback) {
+
+			UpdateOptions updateOptions = getUpdateOptions(domainType);
+
+			ReplaceOptions options = new ReplaceOptions();
+			options.collation(updateOptions.getCollation());
+			options.upsert(updateOptions.isUpsert());
+			applyHint(options::hintString, options::hint);
+			if (!isMulti() && getQuery().isSorted()) {
+				options.sort(getMappedSort(domainType != null ? mappingContext.getPersistentEntity(domainType) : null));
+			}
+
+			if (callback != null) {
+				callback.accept(options);
+			}
+
+			return options;
+		}
+
+		@Override
+		<T> Document getMappedQuery(@Nullable MongoPersistentEntity<T> domainType) {
+			return applyIsolation(super.getMappedQuery(domainType));
+		}
+
+		/**
+		 * A replacement query that is derived from the already {@link MappedDocument}.
+		 *
+		 * @return
+		 */
+		Document getReplacementQuery() {
+			return applyIsolation(getQueryObject());
+		}
+
+		private Document applyIsolation(Document mappedQuery) {
+			if (multi && update != null && update.isIsolated() && !mappedQuery.containsKey("$isolated")) {
+				mappedQuery = new Document(mappedQuery);
+				mappedQuery.put("$isolated", 1);
+			}
+			return mappedQuery;
+		}
+
+		<T> Document applyShardKey(MongoPersistentEntity<T> domainType, Document filter, @Nullable Document existing) {
+
+			Document shardKeySource = existing != null ? existing
+					: mappedDocument != null ? mappedDocument.getDocument() : getMappedUpdate(domainType);
+
+			Document filterWithShardKey = new Document(filter);
+			getMappedShardKeyFields(domainType)
+					.forEach(key -> filterWithShardKey.putIfAbsent(key, BsonUtils.resolveValue((Bson) shardKeySource, key)));
+
+			return filterWithShardKey;
+		}
+
+		boolean requiresShardKey(Document filter, @Nullable MongoPersistentEntity<?> domainType) {
+
+			return !multi && domainType != null && domainType.isSharded() && !shardedById(domainType)
+					&& !filter.keySet().containsAll(getMappedShardKeyFields(domainType));
+		}
+
+		/**
+		 * @return {@literal true} if the {@link MongoPersistentEntity#getShardKey() shard key} is the entities
+		 *         {@literal id} property.
+		 * @since 3.0
+		 */
+		private boolean shardedById(MongoPersistentEntity<?> domainType) {
+
+			ShardKey shardKey = domainType.getShardKey();
+			if (shardKey.size() != 1) {
+				return false;
+			}
+
+			String key = shardKey.getPropertyNames().iterator().next();
+			if (FieldName.ID.name().equals(key)) {
+				return true;
+			}
+
+			MongoPersistentProperty idProperty = domainType.getIdProperty();
+			return idProperty != null && idProperty.getName().equals(key);
+		}
+
+		Set<String> getMappedShardKeyFields(MongoPersistentEntity<?> entity) {
+			return getMappedShardKey(entity).keySet();
+		}
+
+		Document getMappedShardKey(MongoPersistentEntity<?> entity) {
+			return mappedShardKey.computeIfAbsent(entity.getType(),
+					key -> queryMapper.getMappedFields(entity.getShardKey().getDocument(), entity));
+		}
+
+		/**
+		 * Get the already mapped aggregation pipeline to use with an {@link #isAggregationUpdate()}.
+		 *
+		 * @param domainType must not be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		List<Document> getUpdatePipeline(@Nullable Class<?> domainType) {
+
+			Assert.isInstanceOf(AggregationUpdate.class, update);
+
+			Class<?> type = domainType != null ? domainType : Object.class;
+
+			AggregationOperationContext context = new RelaxedTypeBasedAggregationOperationContext(type, mappingContext,
+					queryMapper);
+			return aggregationUtil.createPipeline((AggregationUpdate) update, context);
+		}
+
+		/**
+		 * Get the already mapped update {@link Document}.
+		 *
+		 * @param entity
+		 * @return
+		 */
+		@SuppressWarnings("NullAway")
+		Document getMappedUpdate(@Nullable MongoPersistentEntity<?> entity) {
+
+			if (update != null) {
+				return update instanceof MappedUpdate ? update.getUpdateObject()
+						: updateMapper.getMappedObject(update.getUpdateObject(), entity);
+			}
+			return mappedDocument.getDocument();
+		}
+
+		/**
+		 * Increase a potential {@link MongoPersistentEntity#getVersionProperty() version property} prior to update if not
+		 * already done in the actual {@link UpdateDefinition}
+		 *
+		 * @param persistentEntity can be {@literal null}.
+		 */
+		void increaseVersionForUpdateIfNecessary(@Nullable MongoPersistentEntity<?> persistentEntity) {
+
+			if (persistentEntity != null && persistentEntity.hasVersionProperty()) {
+
+				String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName();
+				if (update != null && !update.modifies(versionFieldName)) {
+					update.inc(versionFieldName);
+				}
+			}
+		}
+
+		/**
+		 * @return {@literal true} if the update holds an aggregation pipeline.
+		 */
+		boolean isAggregationUpdate() {
+			return update instanceof AggregationUpdate;
+		}
+
+		/**
+		 * @return {@literal true} if all matching documents should be updated.
+		 */
+		boolean isMulti() {
+			return multi;
+		}
+	}
+
+	/**
+	 * A value object that encapsulates common tasks required when running {@literal aggregations}.
+	 *
+	 * @since 3.2
+	 */
+	class AggregationDefinition {
+
+		private final Aggregation aggregation;
+		private final Lazy<AggregationOperationContext> aggregationOperationContext;
+		private final Lazy<List<Document>> pipeline;
+		private final @Nullable Class<?> inputType;
+
+		/**
+		 * Creates new instance of {@link AggregationDefinition} extracting the input type from either the
+		 * {@link org.springframework.data.mongodb.core.aggregation.Aggregation} in case of a {@link TypedAggregation} or
+		 * the given {@literal aggregationOperationContext} if present. <br />
+		 * Creates a new {@link AggregationOperationContext} if none given, based on the {@link Aggregation} input type and
+		 * the desired {@link AggregationOptions#getDomainTypeMapping() domain type mapping}. <br />
+		 * Pipelines are mapped on first access of {@link #getAggregationPipeline()} and cached for reuse.
+		 *
+		 * @param aggregation the source aggregation.
+		 * @param aggregationOperationContext can be {@literal null}.
+		 */
+		AggregationDefinition(Aggregation aggregation, @Nullable AggregationOperationContext aggregationOperationContext) {
+
+			this.aggregation = aggregation;
+
+			if (aggregation instanceof TypedAggregation typedAggregation) {
+				this.inputType = typedAggregation.getInputType();
+			} else if (aggregationOperationContext instanceof TypeBasedAggregationOperationContext typeBasedAggregationOperationContext) {
+				this.inputType = typeBasedAggregationOperationContext.getType();
+			} else {
+				this.inputType = null;
+			}
+
+			this.aggregationOperationContext = Lazy.of(() -> aggregationOperationContext != null ? aggregationOperationContext
+					: aggregationUtil.createAggregationContext(aggregation, getInputType()));
+			this.pipeline = Lazy.of(() -> aggregationUtil.createPipeline(this.aggregation, getAggregationOperationContext()));
+		}
+
+		/**
+		 * Creates new instance of {@link AggregationDefinition} extracting the input type from either the
+		 * {@link org.springframework.data.mongodb.core.aggregation.Aggregation} in case of a {@link TypedAggregation} or
+		 * the given {@literal aggregationOperationContext} if present. <br />
+		 * Creates a new {@link AggregationOperationContext} based on the {@link Aggregation} input type and the desired
+		 * {@link AggregationOptions#getDomainTypeMapping() domain type mapping}. <br />
+		 * Pipelines are mapped on first access of {@link #getAggregationPipeline()} and cached for reuse.
+		 *
+		 * @param aggregation the source aggregation.
+		 * @param inputType can be {@literal null}.
+		 */
+		AggregationDefinition(Aggregation aggregation, @Nullable Class<?> inputType) {
+
+			this.aggregation = aggregation;
+
+			if (aggregation instanceof TypedAggregation typedAggregation) {
+				this.inputType = typedAggregation.getInputType();
+			} else {
+				this.inputType = inputType;
+			}
+
+			this.aggregationOperationContext = Lazy
+					.of(() -> aggregationUtil.createAggregationContext(aggregation, getInputType()));
+			this.pipeline = Lazy.of(() -> aggregationUtil.createPipeline(this.aggregation, getAggregationOperationContext()));
+		}
+
+		/**
+		 * Obtain the already mapped pipeline.
+		 *
+		 * @return never {@literal null}.
+		 */
+		List<Document> getAggregationPipeline() {
+			return pipeline.get();
+		}
+
+		/**
+		 * @return {@literal true} if the last aggregation stage is either {@literal $out} or {@literal $merge}.
+		 * @see AggregationPipeline#isOutOrMerge()
+		 */
+		boolean isOutOrMerge() {
+			return aggregation.getPipeline().isOutOrMerge();
+		}
+
+		/**
+		 * Obtain the {@link AggregationOperationContext} used for mapping the pipeline.
+		 *
+		 * @return never {@literal null}.
+		 */
+		AggregationOperationContext getAggregationOperationContext() {
+			return aggregationOperationContext.get();
+		}
+
+		/**
+		 * @return the input type to map the pipeline against. Can be {@literal null}.
+		 */
+		@Nullable
+		Class<?> getInputType() {
+			return inputType;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryResultConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryResultConverter.java
new file mode 100644
index 0000000000..ca93940a9c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/QueryResultConverter.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.bson.Document;
+
+/**
+ * Converter for MongoDB query results.
+ * <p>
+ * This is a functional interface that allows for mapping a {@link Document} to a result type.
+ * {@link #mapDocument(Document, ConversionResultSupplier) row mapping} can obtain upstream a
+ * {@link ConversionResultSupplier upstream converter} to enrich the final result object. This is useful when e.g.
+ * wrapping result objects where the wrapper needs to obtain information from the actual {@link Document}.
+ *
+ * @param <T> object type accepted by this converter.
+ * @param <R> the returned result type.
+ * @author Mark Paluch
+ * @since 5.0
+ */
+@FunctionalInterface
+public interface QueryResultConverter<T, R> {
+
+	/**
+	 * Returns a function that returns the materialized entity.
+	 *
+	 * @param <T> the type of the input and output entity to the function.
+	 * @return a function that returns the materialized entity.
+	 */
+	@SuppressWarnings("unchecked")
+	static <T> QueryResultConverter<T, T> entity() {
+		return (QueryResultConverter<T, T>) EntityResultConverter.INSTANCE;
+	}
+
+	/**
+	 * Map a {@link Document} that is read from the MongoDB query/aggregation operation to a query result.
+	 *
+	 * @param document the raw document from the MongoDB query/aggregation result.
+	 * @param reader reader object that supplies an upstream result from an earlier converter.
+	 * @return the mapped result.
+	 */
+	R mapDocument(Document document, ConversionResultSupplier<T> reader);
+
+	/**
+	 * Returns a composed function that first applies this function to its input, and then applies the {@code after}
+	 * function to the result. If evaluation of either function throws an exception, it is relayed to the caller of the
+	 * composed function.
+	 *
+	 * @param <V> the type of output of the {@code after} function, and of the composed function.
+	 * @param after the function to apply after this function is applied.
+	 * @return a composed function that first applies this function and then applies the {@code after} function.
+	 */
+	default <V> QueryResultConverter<T, V> andThen(QueryResultConverter<? super R, ? extends V> after) {
+		return (row, reader) -> after.mapDocument(row, () -> mapDocument(row, reader));
+	}
+
+	/**
+	 * A supplier that converts a {@link Document} into {@code T}. Allows for lazy reading of query results.
+	 *
+	 * @param <T> type of the returned result.
+	 */
+	interface ConversionResultSupplier<T> {
+
+		/**
+		 * Obtain the upstream conversion result.
+		 *
+		 * @return the upstream conversion result.
+		 */
+		T get();
+
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperation.java
index 43d1c46042..99c94b19e4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,6 +18,7 @@
 import reactor.core.publisher.Flux;
 
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.lang.Contract;
 
 /**
  * {@link ReactiveAggregationOperation} allows creation and execution of reactive MongoDB aggregation operations in a
@@ -44,7 +45,7 @@ public interface ReactiveAggregationOperation {
 	/**
 	 * Start creating an aggregation operation that returns results mapped to the given domain type. <br />
 	 * Use {@link org.springframework.data.mongodb.core.aggregation.TypedAggregation} to specify a potentially different
-	 * input type for he aggregation.
+	 * input type for the aggregation.
 	 *
 	 * @param domainType must not be {@literal null}.
 	 * @return new instance of {@link ReactiveAggregation}. Never {@literal null}.
@@ -73,6 +74,18 @@ interface AggregationOperationWithCollection<T> {
 	 */
 	interface TerminatingAggregationOperation<T> {
 
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link ExecutableFindOperation.TerminatingFindNear}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingAggregationOperation<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 		/**
 		 * Apply pipeline operations as specified and stream all matching elements. <br />
 		 *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java
index 1079a8b9f4..fbaff2bc39 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -45,64 +42,70 @@ class ReactiveAggregationOperationSupport implements ReactiveAggregationOperatio
 	 */
 	ReactiveAggregationOperationSupport(ReactiveMongoTemplate template) {
 
-		Assert.notNull(template, "Template must not be null!");
+		Assert.notNull(template, "Template must not be null");
 
 		this.template = template;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation#aggregateAndReturn(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveAggregation<T> aggregateAndReturn(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ReactiveAggregationSupport<>(template, domainType, null, null);
+		return new ReactiveAggregationSupport<>(template, domainType, QueryResultConverter.entity(), null, null);
 	}
 
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ReactiveAggregationSupport<T>
+	static class ReactiveAggregationSupport<S, T>
 			implements AggregationOperationWithAggregation<T>, ReactiveAggregation<T>, TerminatingAggregationOperation<T> {
 
-		@NonNull ReactiveMongoTemplate template;
-		@NonNull Class<T> domainType;
-		Aggregation aggregation;
-		String collection;
+		private final ReactiveMongoTemplate template;
+		private final Class<S> domainType;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+		private final @Nullable Aggregation aggregation;
+		private final @Nullable String collection;
+
+		ReactiveAggregationSupport(ReactiveMongoTemplate template, Class<S> domainType,
+				QueryResultConverter<? super S, ? extends T> resultConverter, @Nullable Aggregation aggregation,
+				@Nullable String collection) {
+
+			this.template = template;
+			this.domainType = domainType;
+			this.resultConverter = resultConverter;
+			this.aggregation = aggregation;
+			this.collection = collection;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.AggregationOperationWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
 		public AggregationOperationWithAggregation<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty!");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
-			return new ReactiveAggregationSupport<>(template, domainType, aggregation, collection);
+			return new ReactiveAggregationSupport<>(template, domainType, resultConverter, aggregation, collection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.AggregationOperationWithAggregation#by(org.springframework.data.mongodb.core.Aggregation)
-		 */
 		@Override
 		public TerminatingAggregationOperation<T> by(Aggregation aggregation) {
 
-			Assert.notNull(aggregation, "Aggregation must not be null!");
+			Assert.notNull(aggregation, "Aggregation must not be null");
+
+			return new ReactiveAggregationSupport<>(template, domainType, resultConverter, aggregation, collection);
+		}
+
+		@Override
+		public <R> TerminatingAggregationOperation<R> map(QueryResultConverter<? super T, ? extends R> converter) {
+
+			Assert.notNull(converter, "QueryResultConverter must not be null");
 
-			return new ReactiveAggregationSupport<>(template, domainType, aggregation, collection);
+			return new ReactiveAggregationSupport<>(template, domainType, resultConverter.andThen(converter), aggregation,
+					collection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation.TerminatingAggregationOperation#all()
-		 */
 		@Override
 		public Flux<T> all() {
-			return template.aggregate(aggregation, getCollectionName(aggregation), domainType);
+
+			Assert.notNull(aggregation, "Aggregation must be set first");
+
+			return template.doAggregate(aggregation, getCollectionName(aggregation), domainType, domainType, resultConverter);
 		}
 
 		private String getCollectionName(Aggregation aggregation) {
@@ -111,9 +114,7 @@ private String getCollectionName(Aggregation aggregation) {
 				return collection;
 			}
 
-			if (aggregation instanceof TypedAggregation) {
-
-				TypedAggregation<?> typedAggregation = (TypedAggregation<?>) aggregation;
+			if (aggregation instanceof TypedAggregation typedAggregation) {
 
 				if (typedAggregation.getInputType() != null) {
 					return template.getCollectionName(typedAggregation.getInputType());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveBulkOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveBulkOperations.java
new file mode 100644
index 0000000000..7f88b63f28
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveBulkOperations.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2023-2025 the original author 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 reactor.core.publisher.Mono;
+
+import java.util.List;
+
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+
+import com.mongodb.bulk.BulkWriteResult;
+
+/**
+ * Bulk operations for insert/update/remove actions on a collection. Bulk operations are available since MongoDB 2.6 and
+ * make use of low level bulk commands on the protocol level. This interface defines a fluent API to add multiple single
+ * operations or list of similar operations in sequence which can then eventually be executed by calling
+ * {@link #execute()}.
+ *
+ * <pre class="code">
+ * ReactiveMongoOperations ops = …;
+ *
+ * ops.bulkOps(BulkMode.UNORDERED, Person.class)
+ * 				.insert(newPerson)
+ * 				.updateOne(where("firstname").is("Joe"), Update.update("lastname", "Doe"))
+ * 				.execute();
+ * </pre>
+ * <p>
+ * Bulk operations are issued as one batch that pulls together all insert, update, and delete operations. Operations
+ * that require individual operation results such as optimistic locking (using {@code @Version}) are not supported and
+ * the version field remains not populated.
+ *
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+public interface ReactiveBulkOperations {
+
+	/**
+	 * Add a single insert to the bulk operation.
+	 *
+	 * @param documents the document to insert, must not be {@literal null}.
+	 * @return the current {@link ReactiveBulkOperations} instance with the insert added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations insert(Object documents);
+
+	/**
+	 * Add a list of inserts to the bulk operation.
+	 *
+	 * @param documents List of documents to insert, must not be {@literal null}.
+	 * @return the current {@link ReactiveBulkOperations} instance with the insert added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations insert(List<? extends Object> documents);
+
+	/**
+	 * Add a single update to the bulk operation. For the update request, only the first matching document is updated.
+	 *
+	 * @param query update criteria, must not be {@literal null}. The {@link Query} may define a {@link Query#with(Sort)
+	 *          sort order} to influence which document to update when potentially matching multiple candidates.
+	 * @param update {@link UpdateDefinition} operation to perform, must not be {@literal null}.
+	 * @return the current {@link ReactiveBulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations updateOne(Query query, UpdateDefinition update);
+
+	/**
+	 * Add a single update to the bulk operation. For the update request, all matching documents are updated.
+	 *
+	 * @param query Update criteria.
+	 * @param update Update operation to perform.
+	 * @return the current {@link ReactiveBulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations updateMulti(Query query, UpdateDefinition update);
+
+	/**
+	 * Add a single upsert to the bulk operation. An upsert is an update if the set of matching documents is not empty,
+	 * else an insert.
+	 *
+	 * @param query Update criteria.
+	 * @param update Update operation to perform.
+	 * @return the current {@link ReactiveBulkOperations} instance with the update added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations upsert(Query query, UpdateDefinition update);
+
+	/**
+	 * Add a single remove operation to the bulk operation.
+	 *
+	 * @param remove the {@link Query} to select the documents to be removed, must not be {@literal null}.
+	 * @return the current {@link ReactiveBulkOperations} instance with the removal added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations remove(Query remove);
+
+	/**
+	 * Add a list of remove operations to the bulk operation.
+	 *
+	 * @param removes the remove operations to perform, must not be {@literal null}.
+	 * @return the current {@link ReactiveBulkOperations} instance with the removal added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations remove(List<Query> removes);
+
+	/**
+	 * Add a single replace operation to the bulk operation.
+	 *
+	 * @param query Replace criteria. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence
+	 *          which document to replace when potentially matching multiple candidates.
+	 * @param replacement the replacement document. Must not be {@literal null}. The {@link Query} may define a
+	 *          {@link Query#with(Sort) sort order} to influence which document to replace when potentially matching
+	 *          multiple candidates.
+	 * @return the current {@link ReactiveBulkOperations} instance with the replace added, will never be {@literal null}.
+	 */
+	default ReactiveBulkOperations replaceOne(Query query, Object replacement) {
+		return replaceOne(query, replacement, FindAndReplaceOptions.empty());
+	}
+
+	/**
+	 * Add a single replace operation to the bulk operation.
+	 *
+	 * @param query Replace criteria. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence
+	 *          which document to replace when potentially matching multiple candidates.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
+	 * @return the current {@link ReactiveBulkOperations} instance with the replace added, will never be {@literal null}.
+	 */
+	ReactiveBulkOperations replaceOne(Query query, Object replacement, FindAndReplaceOptions options);
+
+	/**
+	 * Execute all bulk operations using the default write concern.
+	 *
+	 * @return a {@link Mono} emitting the result of the bulk operation providing counters for inserts/updates etc.
+	 */
+	Mono<BulkWriteResult> execute();
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperation.java
index 89ca7f1173..4f936e0ffa 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -71,7 +71,7 @@ interface TerminatingChangeStream<T> {
 		/**
 		 * Start listening to changes. The stream will not be completed unless the {@link org.reactivestreams.Subscription}
 		 * is {@link org.reactivestreams.Subscription#cancel() canceled}.
-		 * <p />
+		 * <br />
 		 * However, the stream may become dead, or invalid, if all watched collections, databases are dropped.
 		 */
 		Flux<ChangeStreamEvent<T>> listen();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java
index e042b606db..589f264f17 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,11 +24,11 @@
 import org.bson.BsonTimestamp;
 import org.bson.BsonValue;
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.ChangeStreamOptions.ChangeStreamOptionsBuilder;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.MatchOperation;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -46,14 +46,10 @@ class ReactiveChangeStreamOperationSupport implements ReactiveChangeStreamOperat
 		this.template = template;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation#changeStream(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveChangeStream<T> changeStream(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 		return new ReactiveChangeStreamSupport<>(template, domainType, domainType, null, null);
 	}
 
@@ -76,51 +72,35 @@ private ReactiveChangeStreamSupport(ReactiveMongoTemplate template, Class<?> dom
 			this.options = options;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithCollection#watchCollection(java.lang.String)
-		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> watchCollection(String collection) {
 
-			Assert.hasText(collection, "Collection name must not be null nor empty!");
+			Assert.hasText(collection, "Collection name must not be null nor empty");
 
 			return new ReactiveChangeStreamSupport<>(template, domainType, returnType, collection, options);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithCollection#watchCollection(java.lang.Class)
-		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> watchCollection(Class<?> entityClass) {
 
-			Assert.notNull(entityClass, "Collection type not be null!");
+			Assert.notNull(entityClass, "Collection type not be null");
 
 			return watchCollection(template.getCollectionName(entityClass));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#resumeAt(java.lang.Object)
-		 */
 		@Override
 		public TerminatingChangeStream<T> resumeAt(Object token) {
 
 			return withOptions(builder -> {
 
-				if (token instanceof Instant) {
-					builder.resumeAt((Instant) token);
-				} else if (token instanceof BsonTimestamp) {
-					builder.resumeAt((BsonTimestamp) token);
+				if (token instanceof Instant instant) {
+					builder.resumeAt(instant);
+				} else if (token instanceof BsonTimestamp bsonTimestamp) {
+					builder.resumeAt(bsonTimestamp);
 				}
 			});
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#resumeAfter(java.lang.Object)
-		 */
 		@Override
 		public TerminatingChangeStream<T> resumeAfter(Object token) {
 
@@ -129,10 +109,6 @@ public TerminatingChangeStream<T> resumeAfter(Object token) {
 			return withOptions(builder -> builder.resumeAfter((BsonValue) token));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ResumingChangeStream#startAfter(java.lang.Object)
-		 */
 		@Override
 		public TerminatingChangeStream<T> startAfter(Object token) {
 
@@ -141,10 +117,6 @@ public TerminatingChangeStream<T> startAfter(Object token) {
 			return withOptions(builder -> builder.startAfter((BsonValue) token));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithOptions#withOptions(java.util.function.Consumer)
-		 */
 		@Override
 		public ReactiveChangeStreamSupport<T> withOptions(Consumer<ChangeStreamOptionsBuilder> optionsConsumer) {
 
@@ -154,31 +126,19 @@ public ReactiveChangeStreamSupport<T> withOptions(Consumer<ChangeStreamOptionsBu
 			return new ReactiveChangeStreamSupport<>(template, domainType, returnType, collection, builder.build());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithProjection#as(java.lang.Class)
-		 */
 		@Override
 		public <R> ChangeStreamWithFilterAndProjection<R> as(Class<R> resultType) {
 
-			Assert.notNull(resultType, "ResultType must not be null!");
+			Assert.notNull(resultType, "ResultType must not be null");
 
 			return new ReactiveChangeStreamSupport<>(template, domainType, resultType, collection, options);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithFilter#filter(org.springframework.data.mongodb.core.aggregation.Aggregation)
-		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> filter(Aggregation filter) {
 			return withOptions(builder -> builder.filter(filter));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.ChangeStreamWithFilter#filter(org.springframework.data.mongodb.core.query.CriteriaDefinition)
-		 */
 		@Override
 		public ChangeStreamWithFilterAndProjection<T> filter(CriteriaDefinition by) {
 
@@ -188,10 +148,6 @@ public ChangeStreamWithFilterAndProjection<T> filter(CriteriaDefinition by) {
 			return filter(aggregation);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation.TerminatingChangeStream#listen()
-		 */
 		@Override
 		public Flux<ChangeStreamEvent<T>> listen() {
 			return template.changeStream(collection, options != null ? options : ChangeStreamOptions.empty(), returnType);
@@ -205,13 +161,14 @@ private ChangeStreamOptionsBuilder initOptionsBuilder() {
 			}
 
 			options.getFilter().ifPresent(it -> {
-				if (it instanceof Aggregation) {
-					builder.filter((Aggregation) it);
+				if (it instanceof Aggregation aggregation) {
+					builder.filter(aggregation);
 				} else {
 					builder.filter(((List<Document>) it).toArray(new Document[0]));
 				}
 			});
 			options.getFullDocumentLookup().ifPresent(builder::fullDocumentLookup);
+			options.getFullDocumentBeforeChangeLookup().ifPresent(builder::fullDocumentBeforeChangeLookup);
 			options.getCollation().ifPresent(builder::collation);
 
 			if (options.isResumeAfter()) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveCollectionCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveCollectionCallback.java
index 133a11335b..dda6bf1b96 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveCollectionCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveCollectionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveDatabaseCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveDatabaseCallback.java
index 309c2b7821..470fd05ef7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveDatabaseCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveDatabaseCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperation.java
index 3ca84e8c67..eaa9da4a37 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,9 +18,14 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.GeoResult;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.lang.Contract;
 
 /**
  * {@link ReactiveFindOperation} allows creation and execution of reactive MongoDB find operations in a fluent API
@@ -38,13 +43,14 @@
  *         query(Human.class)
  *             .inCollection("star-wars")
  *             .as(Jedi.class)
- *             .matching(query(where("firstname").is("luke")))
+ *             .matching(where("firstname").is("luke"))
  *             .all();
  *     </code>
  * </pre>
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Juergen Zimmermann
  * @since 2.0
  */
 public interface ReactiveFindOperation {
@@ -61,7 +67,28 @@ public interface ReactiveFindOperation {
 	/**
 	 * Compose find execution by calling one of the terminating methods.
 	 */
-	interface TerminatingFind<T> {
+	interface TerminatingFind<T> extends TerminatingResults<T>, TerminatingProjection {
+
+	}
+
+	/**
+	 * Compose find execution by calling one of the terminating methods.
+	 *
+	 * @since 5.0
+	 */
+	interface TerminatingResults<T> {
+
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingResults}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter);
 
 		/**
 		 * Get exactly zero or one result.
@@ -85,14 +112,27 @@ interface TerminatingFind<T> {
 		 */
 		Flux<T> all();
 
+		/**
+		 * Return a scroll of elements either starting or resuming at {@link ScrollPosition}.
+		 * <p>
+		 * When using {@link KeysetScrollPosition}, make sure to use non-nullable
+		 * {@link org.springframework.data.domain.Sort sort properties} as MongoDB does not support criteria to reconstruct
+		 * a query result from absent document fields or {@literal null} values through {@code $gt/$lt} operators.
+		 *
+		 * @param scrollPosition the scroll position.
+		 * @return a scroll of the resulting elements.
+		 * @since 4.1
+		 * @see org.springframework.data.domain.OffsetScrollPosition
+		 * @see org.springframework.data.domain.KeysetScrollPosition
+		 */
+		Mono<Window<T>> scroll(ScrollPosition scrollPosition);
+
 		/**
 		 * Get all matching elements using a {@link com.mongodb.CursorType#TailableAwait tailable cursor}. The stream will
 		 * not be completed unless the {@link org.reactivestreams.Subscription} is
-		 * {@link org.reactivestreams.Subscription#cancel() canceled}.
-		 * <p />
+		 * {@link org.reactivestreams.Subscription#cancel() canceled}. <br />
 		 * However, the stream may become dead, or invalid, if either the query returns no match or the cursor returns the
-		 * document at the "end" of the collection and then the application deletes that document.
-		 * <p />
+		 * document at the "end" of the collection and then the application deletes that document. <br />
 		 * A stream that is no longer in use must be {@link reactor.core.Disposable#dispose()} disposed} otherwise the
 		 * streams will linger and exhaust resources. <br/>
 		 * <strong>NOTE:</strong> Requires a capped collection.
@@ -102,8 +142,22 @@ interface TerminatingFind<T> {
 		 */
 		Flux<T> tail();
 
+	}
+
+	/**
+	 * Compose find execution by calling one of the terminating methods.
+	 *
+	 * @since 5.0
+	 */
+	interface TerminatingProjection {
+
 		/**
-		 * Get the number of matching elements.
+		 * Get the number of matching elements. <br />
+		 * This method uses an
+		 * {@link com.mongodb.reactivestreams.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+		 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but
+		 * guarantees shard, session and transaction compliance. In case an inaccurate count satisfies the applications
+		 * needs use {@link ReactiveMongoOperations#estimatedCount(String)} for empty queries instead.
 		 *
 		 * @return {@link Mono} emitting total number of matching elements. Never {@literal null}.
 		 */
@@ -122,6 +176,18 @@ interface TerminatingFind<T> {
 	 */
 	interface TerminatingFindNear<T> {
 
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link ExecutableFindOperation.TerminatingFindNear}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingFindNear<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 		/**
 		 * Find all matching elements and return them as {@link org.springframework.data.geo.GeoResult}.
 		 *
@@ -144,6 +210,18 @@ interface FindWithQuery<T> extends TerminatingFind<T> {
 		 */
 		TerminatingFind<T> matching(Query query);
 
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFind}.
+		 * @throws IllegalArgumentException if criteria is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingFind<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
+
 		/**
 		 * Set the filter query for the geoNear execution.
 		 *
@@ -259,9 +337,21 @@ interface DistinctWithQuery<T> extends DistinctWithProjection {
 		 *
 		 * @param query must not be {@literal null}.
 		 * @return new instance of {@link TerminatingDistinct}.
-		 * @throws IllegalArgumentException if resultType is {@literal null}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		TerminatingDistinct<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingDistinct}.
+		 * @throws IllegalArgumentException if criteria is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingDistinct<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java
index 8957d93472..38e32dc977 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,20 +15,19 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Window;
+import org.springframework.data.geo.GeoResult;
+import org.springframework.data.mongodb.core.CollectionPreparerSupport.ReactiveCollectionPreparerDelegate;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -39,23 +38,22 @@
  * @author Christoph Strobl
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ReactiveFindOperationSupport implements ReactiveFindOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull ReactiveMongoTemplate template;
+	private final ReactiveMongoTemplate template;
+
+	ReactiveFindOperationSupport(ReactiveMongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveFindOperation#query(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveFind<T> query(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ReactiveFindSupport<>(template, domainType, domainType, null, ALL_QUERY);
+		return new ReactiveFindSupport<>(template, domainType, domainType, QueryResultConverter.entity(), null, ALL_QUERY);
 	}
 
 	/**
@@ -64,57 +62,62 @@ public <T> ReactiveFind<T> query(Class<T> domainType) {
 	 * @author Christoph Strobl
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ReactiveFindSupport<T>
+	static class ReactiveFindSupport<S, T>
 			implements ReactiveFind<T>, FindWithCollection<T>, FindWithProjection<T>, FindWithQuery<T> {
 
-		@NonNull ReactiveMongoTemplate template;
-		@NonNull Class<?> domainType;
-		Class<T> returnType;
-		String collection;
-		Query query;
+		private final ReactiveMongoTemplate template;
+		private final Class<?> domainType;
+		private final Class<S> returnType;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+		private final @Nullable String collection;
+		private final Query query;
+
+		ReactiveFindSupport(ReactiveMongoTemplate template, Class<?> domainType, Class<S> returnType,
+				QueryResultConverter<? super S, ? extends T> resultConverter, @Nullable String collection,
+				Query query) {
+
+			this.template = template;
+			this.domainType = domainType;
+			this.returnType = returnType;
+			this.resultConverter = resultConverter;
+			this.collection = collection;
+			this.query = query;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
 		public FindWithProjection<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection name must not be null nor empty!");
+			Assert.hasText(collection, "Collection name must not be null nor empty");
 
-			return new ReactiveFindSupport<>(template, domainType, returnType, collection, query);
+			return new ReactiveFindSupport<>(template, domainType, returnType, resultConverter, collection, query);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithProjection#as(java.lang.Class)
-		 */
 		@Override
 		public <T1> FindWithQuery<T1> as(Class<T1> returnType) {
 
-			Assert.notNull(returnType, "ReturnType must not be null!");
+			Assert.notNull(returnType, "ReturnType must not be null");
 
-			return new ReactiveFindSupport<>(template, domainType, returnType, collection, query);
+			return new ReactiveFindSupport<>(template, domainType, returnType, QueryResultConverter.entity(), collection,
+					query);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
 		public TerminatingFind<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
-			return new ReactiveFindSupport<>(template, domainType, returnType, collection, query);
+			return new ReactiveFindSupport<>(template, domainType, returnType, resultConverter, collection, query);
+		}
+
+		@Override
+		public <R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter) {
+
+			Assert.notNull(converter, "QueryResultConverter must not be null");
+
+			return new ReactiveFindSupport<>(template, domainType, returnType, this.resultConverter.andThen(converter),
+					collection, query);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#first()
-		 */
 		@Override
 		public Mono<T> first() {
 
@@ -124,10 +127,6 @@ public Mono<T> first() {
 			return result.next();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#one()
-		 */
 		@Override
 		public Mono<T> one() {
 
@@ -142,66 +141,48 @@ public Mono<T> one() {
 
 				if (it.size() > 1) {
 					return Mono.error(
-							new IncorrectResultSizeDataAccessException("Query " + asString() + " returned non unique result.", 1));
+							new IncorrectResultSizeDataAccessException("Query " + asString() + " returned non unique result", 1));
 				}
 
 				return Mono.just(it.get(0));
 			});
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#all()
-		 */
 		@Override
 		public Flux<T> all() {
 			return doFind(null);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#tail()
-		 */
+		@Override
+		public Mono<Window<T>> scroll(ScrollPosition scrollPosition) {
+			return template.doScroll(query.with(scrollPosition), domainType, returnType, resultConverter,
+					getCollectionName());
+		}
+
 		@Override
 		public Flux<T> tail() {
 			return doFind(template.new TailingQueryFindPublisherPreparer(query, domainType));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithQuery#near(org.springframework.data.mongodb.core.query.NearQuery)
-		 */
 		@Override
 		public TerminatingFindNear<T> near(NearQuery nearQuery) {
-			return () -> template.geoNear(nearQuery, domainType, getCollectionName(), returnType);
+			return new TerminatingFindNearSupport<>(nearQuery, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#count()
-		 */
 		@Override
 		public Mono<Long> count() {
 			return template.count(query, domainType, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind#exists()
-		 */
 		@Override
 		public Mono<Boolean> exists() {
 			return template.exists(query, domainType, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.FindDistinct#distinct(java.lang.String)
-		 */
 		@Override
 		public TerminatingDistinct<Object> distinct(String field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 
 			return new DistinctOperationSupport<>(this, field);
 		}
@@ -211,15 +192,16 @@ private Flux<T> doFind(@Nullable FindPublisherPreparer preparer) {
 			Document queryObject = query.getQueryObject();
 			Document fieldsObject = query.getFieldsObject();
 
-			return template.doFind(getCollectionName(), queryObject, fieldsObject, domainType, returnType,
+			return template.doFind(getCollectionName(), ReactiveCollectionPreparerDelegate.of(query), queryObject,
+					fieldsObject, domainType, returnType, resultConverter,
 					preparer != null ? preparer : getCursorPreparer(query));
 		}
 
-		@SuppressWarnings("unchecked")
+		@SuppressWarnings({ "unchecked", "rawtypes" })
 		private Flux<T> doFindDistinct(String field) {
 
 			return template.findDistinct(query, field, getCollectionName(), domainType,
-					returnType == domainType ? (Class<T>) Object.class : returnType);
+					returnType == domainType ? (Class) Object.class : returnType);
 		}
 
 		private FindPublisherPreparer getCursorPreparer(Query query) {
@@ -234,10 +216,36 @@ private String asString() {
 			return SerializationUtils.serializeToJsonSafely(query);
 		}
 
+		class TerminatingFindNearSupport<G> implements TerminatingFindNear<G> {
+
+			private final NearQuery nearQuery;
+			private final QueryResultConverter<? super S, ? extends G> resultConverter;
+
+			public TerminatingFindNearSupport(NearQuery nearQuery,
+					QueryResultConverter<? super S, ? extends G> resultConverter) {
+				this.nearQuery = nearQuery;
+				this.resultConverter = resultConverter;
+			}
+
+			@Override
+			public <R> TerminatingFindNear<R> map(QueryResultConverter<? super G, ? extends R> converter) {
+
+				Assert.notNull(converter, "QueryResultConverter must not be null");
+
+				return new TerminatingFindNearSupport<>(nearQuery, this.resultConverter.andThen(converter));
+			}
+
+			@Override
+			public Flux<GeoResult<G>> all() {
+				return template.doGeoNear(nearQuery, domainType, getCollectionName(), returnType, resultConverter);
+			}
+		}
+
 		/**
 		 * @author Christoph Strobl
 		 * @since 2.1
 		 */
+		@SuppressWarnings({ "unchecked", "rawtypes" })
 		static class DistinctOperationSupport<T> implements TerminatingDistinct<T> {
 
 			private final String field;
@@ -249,35 +257,22 @@ public DistinctOperationSupport(ReactiveFindSupport delegate, String field) {
 				this.field = field;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.DistinctWithProjection#as(java.lang.Class)
-			 */
 			@Override
 			public <R> TerminatingDistinct<R> as(Class<R> resultType) {
 
-				Assert.notNull(resultType, "ResultType must not be null!");
+				Assert.notNull(resultType, "ResultType must not be null");
 
 				return new DistinctOperationSupport<>((ReactiveFindSupport) delegate.as(resultType), field);
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.ReactiveFindOperation.DistinctWithQuery#matching(org.springframework.data.mongodb.core.query.Query)
-			 */
 			@Override
-			@SuppressWarnings("unchecked")
 			public TerminatingDistinct<T> matching(Query query) {
 
-				Assert.notNull(query, "Query must not be null!");
+				Assert.notNull(query, "Query must not be null");
 
-				return new DistinctOperationSupport<>((ReactiveFindSupport<T>) delegate.matching(query), field);
+				return new DistinctOperationSupport<>((ReactiveFindSupport) delegate.matching(query), field);
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core..ReactiveFindOperation.TerminatingDistinct#all()
-			 */
 			@Override
 			public Flux<T> all() {
 				return delegate.doFindDistinct(field);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFluentMongoOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFluentMongoOperations.java
index efb1d8a35c..30d61771df 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFluentMongoOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveFluentMongoOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperation.java
index 5eff2e1a28..ff3b690639 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java
index 85bb3766f4..9d424c2446 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -34,63 +31,55 @@
  * @author Christoph Strobl
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ReactiveInsertOperationSupport implements ReactiveInsertOperation {
 
-	private final @NonNull ReactiveMongoTemplate template;
+	private final ReactiveMongoTemplate template;
+
+	ReactiveInsertOperationSupport(ReactiveMongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation#insert(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveInsert<T> insert(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
 		return new ReactiveInsertSupport<>(template, domainType, null);
 	}
 
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
 	static class ReactiveInsertSupport<T> implements ReactiveInsert<T> {
 
-		@NonNull ReactiveMongoTemplate template;
-		@NonNull Class<T> domainType;
-		String collection;
+		private final ReactiveMongoTemplate template;
+		private final Class<T> domainType;
+		private final @Nullable String collection;
+
+		ReactiveInsertSupport(ReactiveMongoTemplate template, Class<T> domainType, @Nullable String collection) {
+
+			this.template = template;
+			this.domainType = domainType;
+			this.collection = collection;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.TerminatingInsert#one(java.lang.Object)
-		 */
 		@Override
 		public Mono<T> one(T object) {
 
-			Assert.notNull(object, "Object must not be null!");
+			Assert.notNull(object, "Object must not be null");
 
 			return template.insert(object, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.TerminatingInsert#all(java.util.Collection)
-		 */
 		@Override
 		public Flux<T> all(Collection<? extends T> objects) {
 
-			Assert.notNull(objects, "Objects must not be null!");
+			Assert.notNull(objects, "Objects must not be null");
 
 			return template.insert(objects, getCollectionName());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation.InsertWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
 		public ReactiveInsert<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty.");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
 			return new ReactiveInsertSupport<>(template, domainType, collection);
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperation.java
index 8d6fbe6c4e..798b1ca7dd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,6 +19,7 @@
 
 import org.springframework.data.mongodb.core.ExecutableFindOperation.ExecutableFind;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.Query;
 
 /**
@@ -30,7 +31,7 @@
  * The collection to operate on is by default derived from the initial {@literal domainType} and can be defined there
  * via {@link org.springframework.data.mongodb.core.mapping.Document}. Using {@code inCollection} allows to override the
  * collection name for the execution.
- * 
+ *
  * <pre>
  *     <code>
  *         mapReduce(Human.class)
@@ -146,6 +147,18 @@ interface MapReduceWithQuery<T> extends TerminatingMapReduce<T> {
 		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		TerminatingMapReduce<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingMapReduce}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingMapReduce<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	/**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupport.java
index 839aefcc4d..4e3379bad0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,11 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import reactor.core.publisher.Flux;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -31,12 +29,15 @@
  * @author Christoph Strobl
  * @since 2.1
  */
-@RequiredArgsConstructor
 class ReactiveMapReduceOperationSupport implements ReactiveMapReduceOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull ReactiveMongoTemplate template;
+	private final ReactiveMongoTemplate template;
+
+	ReactiveMapReduceOperationSupport(ReactiveMongoTemplate template) {
+		this.template = template;
+	}
 
 	/*
 	 * (non-Javascript)
@@ -45,7 +46,7 @@ class ReactiveMapReduceOperationSupport implements ReactiveMapReduceOperation {
 	@Override
 	public <T> ReactiveMapReduceSupport<T> mapReduce(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
 		return new ReactiveMapReduceSupport<>(template, domainType, domainType, null, ALL_QUERY, null, null, null);
 	}
@@ -88,8 +89,11 @@ static class ReactiveMapReduceSupport<T>
 		@Override
 		public Flux<T> all() {
 
+			Assert.notNull(mapFunction, "MapFunction must be set first");
+			Assert.notNull(reduceFunction, "ReduceFunction must be set first");
+
 			return template.mapReduce(query, domainType, getCollectionName(), returnType, mapFunction, reduceFunction,
-					options);
+					options != null ? options : MapReduceOptions.options());
 		}
 
 		/*
@@ -99,7 +103,7 @@ public Flux<T> all() {
 		@Override
 		public MapReduceWithProjection<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection name must not be null nor empty!");
+			Assert.hasText(collection, "Collection name must not be null nor empty");
 
 			return new ReactiveMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -112,7 +116,7 @@ public MapReduceWithProjection<T> inCollection(String collection) {
 		@Override
 		public TerminatingMapReduce<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
 			return new ReactiveMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -125,7 +129,7 @@ public TerminatingMapReduce<T> matching(Query query) {
 		@Override
 		public <R> MapReduceWithQuery<R> as(Class<R> resultType) {
 
-			Assert.notNull(resultType, "ResultType must not be null!");
+			Assert.notNull(resultType, "ResultType must not be null");
 
 			return new ReactiveMapReduceSupport<>(template, domainType, resultType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -138,7 +142,7 @@ public <R> MapReduceWithQuery<R> as(Class<R> resultType) {
 		@Override
 		public ReactiveMapReduce<T> with(MapReduceOptions options) {
 
-			Assert.notNull(options, "Options must not be null! Please consider empty MapReduceOptions#options() instead.");
+			Assert.notNull(options, "Options must not be null Please consider empty MapReduceOptions#options() instead");
 
 			return new ReactiveMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -151,7 +155,7 @@ public ReactiveMapReduce<T> with(MapReduceOptions options) {
 		@Override
 		public MapReduceWithReduceFunction<T> map(String mapFunction) {
 
-			Assert.hasText(mapFunction, "MapFunction name must not be null nor empty!");
+			Assert.hasText(mapFunction, "MapFunction name must not be null nor empty");
 
 			return new ReactiveMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
@@ -164,7 +168,7 @@ public MapReduceWithReduceFunction<T> map(String mapFunction) {
 		@Override
 		public ReactiveMapReduce<T> reduce(String reduceFunction) {
 
-			Assert.hasText(reduceFunction, "ReduceFunction name must not be null nor empty!");
+			Assert.hasText(reduceFunction, "ReduceFunction name must not be null nor empty");
 
 			return new ReactiveMapReduceSupport<>(template, domainType, returnType, collection, query, mapFunction,
 					reduceFunction, options);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoClientFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoClientFactoryBean.java
index 6458e45cd7..89caf3273c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoClientFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoClientFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,13 @@
 
 package org.springframework.data.mongodb.core;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.config.AbstractFactoryBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
-import com.mongodb.async.client.MongoClientSettings;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoClients;
 
@@ -36,13 +36,11 @@
 public class ReactiveMongoClientFactoryBean extends AbstractFactoryBean<MongoClient>
 		implements PersistenceExceptionTranslator {
 
-	private static final PersistenceExceptionTranslator DEFAULT_EXCEPTION_TRANSLATOR = new MongoExceptionTranslator();
-
 	private @Nullable String connectionString;
 	private @Nullable String host;
 	private @Nullable Integer port;
 	private @Nullable MongoClientSettings mongoClientSettings;
-	private PersistenceExceptionTranslator exceptionTranslator = DEFAULT_EXCEPTION_TRANSLATOR;
+	private PersistenceExceptionTranslator exceptionTranslator = MongoExceptionTranslator.DEFAULT_EXCEPTION_TRANSLATOR;
 
 	/**
 	 * Configures the host to connect to.
@@ -86,7 +84,13 @@ public void setMongoClientSettings(@Nullable MongoClientSettings mongoClientSett
 	 * @param exceptionTranslator
 	 */
 	public void setExceptionTranslator(@Nullable PersistenceExceptionTranslator exceptionTranslator) {
-		this.exceptionTranslator = exceptionTranslator == null ? DEFAULT_EXCEPTION_TRANSLATOR : exceptionTranslator;
+		this.exceptionTranslator = exceptionTranslator == null ? MongoExceptionTranslator.DEFAULT_EXCEPTION_TRANSLATOR
+				: exceptionTranslator;
+	}
+
+	@Override
+	public @Nullable DataAccessException translateExceptionIfPossible(RuntimeException ex) {
+		return exceptionTranslator.translateExceptionIfPossible(ex);
 	}
 
 	@Override
@@ -115,16 +119,14 @@ protected MongoClient createInstance() throws Exception {
 		}
 
 		throw new IllegalStateException(
-				"Cannot create MongoClients. One of the following is required: mongoClientSettings, connectionString or host/port");
+				"Cannot create MongoClients; One of the following is required: mongoClientSettings, connectionString or host/port");
 	}
 
 	@Override
 	protected void destroyInstance(@Nullable MongoClient instance) throws Exception {
-		instance.close();
+		if (instance != null) {
+			instance.close();
+		}
 	}
 
-	@Override
-	public DataAccessException translateExceptionIfPossible(RuntimeException ex) {
-		return exceptionTranslator.translateExceptionIfPossible(ex);
-	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoClientSettingsFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoClientSettingsFactoryBean.java
deleted file mode 100644
index 0b63352126..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoClientSettingsFactoryBean.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * Copyright 2016-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.bson.codecs.configuration.CodecRegistry;
-import org.springframework.beans.factory.config.AbstractFactoryBean;
-import org.springframework.util.Assert;
-
-import com.mongodb.MongoCredential;
-import com.mongodb.ReadConcern;
-import com.mongodb.ReadPreference;
-import com.mongodb.WriteConcern;
-import com.mongodb.async.client.MongoClientSettings;
-import com.mongodb.connection.ClusterSettings;
-import com.mongodb.connection.ConnectionPoolSettings;
-import com.mongodb.connection.ServerSettings;
-import com.mongodb.connection.SocketSettings;
-import com.mongodb.connection.SslSettings;
-import com.mongodb.connection.StreamFactoryFactory;
-
-/**
- * A factory bean for construction of a {@link MongoClientSettings} instance to be used with the async MongoDB driver.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-public class ReactiveMongoClientSettingsFactoryBean extends AbstractFactoryBean<MongoClientSettings> {
-
-	private static final MongoClientSettings DEFAULT_MONGO_SETTINGS = MongoClientSettings.builder().build();
-
-	private ReadPreference readPreference = DEFAULT_MONGO_SETTINGS.getReadPreference();
-	private WriteConcern writeConcern = DEFAULT_MONGO_SETTINGS.getWriteConcern();
-	private ReadConcern readConcern = DEFAULT_MONGO_SETTINGS.getReadConcern();
-	private List<MongoCredential> credentialList = new ArrayList<>();
-	private StreamFactoryFactory streamFactoryFactory = DEFAULT_MONGO_SETTINGS.getStreamFactoryFactory();
-	private CodecRegistry codecRegistry = DEFAULT_MONGO_SETTINGS.getCodecRegistry();
-	private ClusterSettings clusterSettings = DEFAULT_MONGO_SETTINGS.getClusterSettings();
-	private SocketSettings socketSettings = DEFAULT_MONGO_SETTINGS.getSocketSettings();
-	private SocketSettings heartbeatSocketSettings = DEFAULT_MONGO_SETTINGS.getHeartbeatSocketSettings();
-	private ConnectionPoolSettings connectionPoolSettings = DEFAULT_MONGO_SETTINGS.getConnectionPoolSettings();
-	private ServerSettings serverSettings = DEFAULT_MONGO_SETTINGS.getServerSettings();
-	private SslSettings sslSettings = DEFAULT_MONGO_SETTINGS.getSslSettings();
-
-	/**
-	 * Set the {@link ReadPreference}.
-	 *
-	 * @param readPreference
-	 */
-	public void setReadPreference(ReadPreference readPreference) {
-		this.readPreference = readPreference;
-	}
-
-	/**
-	 * Set the {@link WriteConcern}.
-	 *
-	 * @param writeConcern
-	 */
-	public void setWriteConcern(WriteConcern writeConcern) {
-		this.writeConcern = writeConcern;
-	}
-
-	/**
-	 * Set the {@link ReadConcern}.
-	 *
-	 * @param readConcern
-	 */
-	public void setReadConcern(ReadConcern readConcern) {
-		this.readConcern = readConcern;
-	}
-
-	/**
-	 * Set the List of {@link MongoCredential}s.
-	 *
-	 * @param credentialList must not be {@literal null}.
-	 */
-	public void setCredentialList(List<MongoCredential> credentialList) {
-
-		Assert.notNull(credentialList, "CredendialList must not be null!");
-
-		this.credentialList.addAll(credentialList);
-	}
-
-	/**
-	 * Adds the {@link MongoCredential} to the list of credentials.
-	 *
-	 * @param mongoCredential must not be {@literal null}.
-	 */
-	public void addMongoCredential(MongoCredential mongoCredential) {
-
-		Assert.notNull(mongoCredential, "MongoCredential must not be null!");
-
-		this.credentialList.add(mongoCredential);
-	}
-
-	/**
-	 * Set the {@link StreamFactoryFactory}.
-	 *
-	 * @param streamFactoryFactory
-	 */
-	public void setStreamFactoryFactory(StreamFactoryFactory streamFactoryFactory) {
-		this.streamFactoryFactory = streamFactoryFactory;
-	}
-
-	/**
-	 * Set the {@link CodecRegistry}.
-	 *
-	 * @param codecRegistry
-	 */
-	public void setCodecRegistry(CodecRegistry codecRegistry) {
-		this.codecRegistry = codecRegistry;
-	}
-
-	/**
-	 * Set the {@link ClusterSettings}.
-	 *
-	 * @param clusterSettings
-	 */
-	public void setClusterSettings(ClusterSettings clusterSettings) {
-		this.clusterSettings = clusterSettings;
-	}
-
-	/**
-	 * Set the {@link SocketSettings}.
-	 *
-	 * @param socketSettings
-	 */
-	public void setSocketSettings(SocketSettings socketSettings) {
-		this.socketSettings = socketSettings;
-	}
-
-	/**
-	 * Set the heartbeat {@link SocketSettings}.
-	 *
-	 * @param heartbeatSocketSettings
-	 */
-	public void setHeartbeatSocketSettings(SocketSettings heartbeatSocketSettings) {
-		this.heartbeatSocketSettings = heartbeatSocketSettings;
-	}
-
-	/**
-	 * Set the {@link ConnectionPoolSettings}.
-	 *
-	 * @param connectionPoolSettings
-	 */
-	public void setConnectionPoolSettings(ConnectionPoolSettings connectionPoolSettings) {
-		this.connectionPoolSettings = connectionPoolSettings;
-	}
-
-	/**
-	 * Set the {@link ServerSettings}.
-	 *
-	 * @param serverSettings
-	 */
-	public void setServerSettings(ServerSettings serverSettings) {
-		this.serverSettings = serverSettings;
-	}
-
-	/**
-	 * Set the {@link SslSettings}.
-	 *
-	 * @param sslSettings
-	 */
-	public void setSslSettings(SslSettings sslSettings) {
-		this.sslSettings = sslSettings;
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return MongoClientSettings.class;
-	}
-
-	@Override
-	protected MongoClientSettings createInstance() throws Exception {
-
-		return MongoClientSettings.builder() //
-				.readPreference(readPreference) //
-				.writeConcern(writeConcern) //
-				.readConcern(readConcern) //
-				.credentialList(credentialList) //
-				.streamFactoryFactory(streamFactoryFactory) //
-				.codecRegistry(codecRegistry) //
-				.clusterSettings(clusterSettings) //
-				.socketSettings(socketSettings) //
-				.heartbeatSocketSettings(heartbeatSocketSettings) //
-				.connectionPoolSettings(connectionPoolSettings) //
-				.serverSettings(serverSettings) //
-				.sslSettings(sslSettings) //
-				.build();
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoContext.java
index bd466a4b8a..8697ce4dcd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,11 +15,15 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.reactivestreams.Publisher;
-import org.springframework.util.Assert;
 import reactor.core.publisher.Mono;
 import reactor.util.context.Context;
 
+import java.util.function.Function;
+
+import org.reactivestreams.Publisher;
+
+import org.springframework.util.Assert;
+
 import com.mongodb.reactivestreams.client.ClientSession;
 
 /**
@@ -29,7 +33,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @since 2.1
- * @see Mono#subscriberContext()
+ * @see Mono#deferContextual(Function)
  * @see Context
  */
 public class ReactiveMongoContext {
@@ -46,8 +50,14 @@ public class ReactiveMongoContext {
 	 */
 	public static Mono<ClientSession> getSession() {
 
-		return Mono.subscriberContext().filter(ctx -> ctx.hasKey(SESSION_KEY))
-				.flatMap(ctx -> ctx.<Mono<ClientSession>> get(SESSION_KEY));
+		return Mono.deferContextual(ctx -> {
+
+			if (ctx.hasKey(SESSION_KEY)) {
+				return ctx.<Mono<ClientSession>> get(SESSION_KEY);
+			}
+
+			return Mono.empty();
+		});
 	}
 
 	/**
@@ -60,8 +70,8 @@ public static Mono<ClientSession> getSession() {
 	 */
 	public static Context setSession(Context context, Publisher<ClientSession> session) {
 
-		Assert.notNull(context, "Context must not be null!");
-		Assert.notNull(session, "Session publisher must not be null!");
+		Assert.notNull(context, "Context must not be null");
+		Assert.notNull(session, "Session publisher must not be null");
 
 		return context.put(SESSION_KEY, Mono.from(session));
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java
index c3d230b7bc..14f6ee2631 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,12 +23,19 @@
 import java.util.function.Supplier;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscription;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
 import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -36,13 +43,12 @@
 import org.springframework.data.mongodb.core.index.ReactiveIndexOperations;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
-import org.springframework.lang.Nullable;
-import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -58,14 +64,14 @@
  * <p>
  * Implemented by {@link ReactiveMongoTemplate}. Not often used but a useful option for extensibility and testability
  * (as it can be easily mocked, stubbed, or be the target of a JDK proxy). Command execution using
- * {@link ReactiveMongoOperations} is deferred until subscriber subscribes to the {@link Publisher}.
- * <p />
+ * {@link ReactiveMongoOperations} is deferred until subscriber subscribes to the {@link Publisher}. <br />
  * <strong>NOTE:</strong> Some operations cannot be executed within a MongoDB transaction. Please refer to the MongoDB
  * specific documentation to learn more about <a href="https://docs.mongodb.com/manual/core/transactions/">Multi
  * Document Transactions</a>.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  * @since 2.0
  * @see Flux
  * @see Mono
@@ -90,7 +96,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	ReactiveIndexOperations indexOps(Class<?> entityClass);
 
 	/**
-	 * Execute the a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the
+	 * Execute a MongoDB command expressed as a JSON string. This will call the method JSON.parse that is part of the
 	 * MongoDB driver to convert the JSON string to a Document. Any errors that result from executing this command will be
 	 * converted into Spring's DAO exception hierarchy.
 	 *
@@ -119,8 +125,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	Mono<Document> executeCommand(Document command, @Nullable ReadPreference readPreference);
 
 	/**
-	 * Executes a {@link ReactiveDatabaseCallback} translating any exceptions as necessary.
-	 * <p/>
+	 * Executes a {@link ReactiveDatabaseCallback} translating any exceptions as necessary. <br />
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
 	 *
 	 * @param action callback object that specifies the MongoDB actions to perform on the passed in DB instance. Must not
@@ -131,8 +136,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	<T> Flux<T> execute(ReactiveDatabaseCallback<T> action);
 
 	/**
-	 * Executes the given {@link ReactiveCollectionCallback} on the entity collection of the specified class.
-	 * <p/>
+	 * Executes the given {@link ReactiveCollectionCallback} on the entity collection of the specified class. <br />
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
 	 *
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
@@ -143,8 +147,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	<T> Flux<T> execute(Class<?> entityClass, ReactiveCollectionCallback<T> action);
 
 	/**
-	 * Executes the given {@link ReactiveCollectionCallback} on the collection of the given name.
-	 * <p/>
+	 * Executes the given {@link ReactiveCollectionCallback} on the collection of the given name. <br />
 	 * Allows for returning a result object, that is a domain object or a collection of domain objects.
 	 *
 	 * @param collectionName the name of the collection that specifies which {@link MongoCollection} instance will be
@@ -157,8 +160,7 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 
 	/**
 	 * Obtain a {@link ClientSession session} bound instance of {@link SessionScoped} binding the {@link ClientSession}
-	 * provided by the given {@link Supplier} to each and every command issued against MongoDB.
-	 * <p />
+	 * provided by the given {@link Supplier} to each and every command issued against MongoDB. <br />
 	 * <strong>Note:</strong> It is up to the caller to manage the {@link ClientSession} lifecycle. Use
 	 * {@link ReactiveSessionScoped#execute(ReactiveSessionCallback, Consumer)} to provide a hook for processing the
 	 * {@link ClientSession} when done.
@@ -169,15 +171,14 @@ public interface ReactiveMongoOperations extends ReactiveFluentMongoOperations {
 	 */
 	default ReactiveSessionScoped withSession(Supplier<ClientSession> sessionProvider) {
 
-		Assert.notNull(sessionProvider, "SessionProvider must not be null!");
+		Assert.notNull(sessionProvider, "SessionProvider must not be null");
 
 		return withSession(Mono.fromSupplier(sessionProvider));
 	}
 
 	/**
 	 * Obtain a {@link ClientSession session} bound instance of {@link SessionScoped} binding a new {@link ClientSession}
-	 * with given {@literal sessionOptions} to each and every command issued against MongoDB.
-	 * <p />
+	 * with given {@literal sessionOptions} to each and every command issued against MongoDB. <br />
 	 * <strong>Note:</strong> It is up to the caller to manage the {@link ClientSession} lifecycle. Use
 	 * {@link ReactiveSessionScoped#execute(ReactiveSessionCallback, Consumer)} to provide a hook for processing the
 	 * {@link ClientSession} when done.
@@ -191,7 +192,7 @@ default ReactiveSessionScoped withSession(Supplier<ClientSession> sessionProvide
 	/**
 	 * Obtain a {@link ClientSession session} bound instance of {@link ReactiveSessionScoped} binding the
 	 * {@link ClientSession} provided by the given {@link Publisher} to each and every command issued against MongoDB.
-	 * <p />
+	 * <br />
 	 * <strong>Note:</strong> It is up to the caller to manage the {@link ClientSession} lifecycle. Use
 	 * {@link ReactiveSessionScoped#execute(ReactiveSessionCallback, Consumer)} to provide a hook for processing the
 	 * {@link ClientSession} when done.
@@ -203,48 +204,14 @@ default ReactiveSessionScoped withSession(Supplier<ClientSession> sessionProvide
 	ReactiveSessionScoped withSession(Publisher<ClientSession> sessionProvider);
 
 	/**
-	 * Obtain a {@link ClientSession} bound instance of {@link ReactiveMongoOperations}.
-	 * <p />
+	 * Obtain a {@link ClientSession} bound instance of {@link ReactiveMongoOperations}. <br />
 	 * <strong>Note:</strong> It is up to the caller to manage the {@link ClientSession} lifecycle.
 	 *
-	 * @param session must not be {@literal null}.
 	 * @return {@link ClientSession} bound instance of {@link ReactiveMongoOperations}.
 	 * @since 2.1
 	 */
 	ReactiveMongoOperations withSession(ClientSession session);
 
-	/**
-	 * Initiate a new {@link ClientSession} and obtain a {@link ClientSession session} bound instance of
-	 * {@link ReactiveSessionScoped}. Starts the transaction and adds the {@link ClientSession} to each and every command
-	 * issued against MongoDB.
-	 * <p/>
-	 * Each {@link ReactiveSessionScoped#execute(ReactiveSessionCallback) execution} initiates a new managed transaction
-	 * that is {@link ClientSession#commitTransaction() committed} on success. Transactions are
-	 * {@link ClientSession#abortTransaction() rolled back} upon errors.
-	 *
-	 * @return new instance of {@link ReactiveSessionScoped}. Never {@literal null}.
-	 * @deprecated since 2.2. Use {@code @Transactional} or {@link TransactionalOperator}.
-	 */
-	@Deprecated
-	ReactiveSessionScoped inTransaction();
-
-	/**
-	 * Obtain a {@link ClientSession session} bound instance of {@link ReactiveSessionScoped}, start the transaction and
-	 * bind the {@link ClientSession} provided by the given {@link Publisher} to each and every command issued against
-	 * MongoDB.
-	 * <p/>
-	 * Each {@link ReactiveSessionScoped#execute(ReactiveSessionCallback) execution} initiates a new managed transaction
-	 * that is {@link ClientSession#commitTransaction() committed} on success. Transactions are
-	 * {@link ClientSession#abortTransaction() rolled back} upon errors.
-	 *
-	 * @param sessionProvider must not be {@literal null}.
-	 * @return new instance of {@link ReactiveSessionScoped}. Never {@literal null}.
-	 * @since 2.1
-	 * @deprecated since 2.2. Use {@code @Transactional} or {@link TransactionalOperator}.
-	 */
-	@Deprecated
-	ReactiveSessionScoped inTransaction(Publisher<ClientSession> sessionProvider);
-
 	/**
 	 * Create an uncapped collection with a name based on the provided entity class.
 	 *
@@ -280,6 +247,58 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	 */
 	Mono<MongoCollection<Document>> createCollection(String collectionName, CollectionOptions collectionOptions);
 
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationOperation pipeline
+	 * stages} on another collection or view identified by the given {@link #getCollectionName(Class) source type}.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the type defining the views source collection.
+	 * @param stages the {@link AggregationOperation aggregation pipeline stages} defining the view content.
+	 * @since 4.0
+	 */
+	default Mono<MongoCollection<Document>> createView(String name, Class<?> source, AggregationOperation... stages) {
+		return createView(name, source, AggregationPipeline.of(stages));
+	}
+
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationPipeline pipeline} on
+	 * another collection or view identified by the given {@link #getCollectionName(Class) source type}.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the type defining the views source collection.
+	 * @param pipeline the {@link AggregationPipeline} defining the view content.
+	 * @since 4.0
+	 */
+	default Mono<MongoCollection<Document>> createView(String name, Class<?> source, AggregationPipeline pipeline) {
+		return createView(name, source, pipeline, null);
+	}
+
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationPipeline pipeline} on
+	 * another collection or view identified by the given {@link #getCollectionName(Class) source type}.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the type defining the views source collection.
+	 * @param pipeline the {@link AggregationPipeline} defining the view content.
+	 * @param options additional settings to apply when creating the view. Can be {@literal null}.
+	 * @since 4.0
+	 */
+	Mono<MongoCollection<Document>> createView(String name, Class<?> source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options);
+
+	/**
+	 * Create a view with the provided name. The view content is defined by the {@link AggregationPipeline pipeline} on
+	 * another collection or view identified by the given source.
+	 *
+	 * @param name the name of the view to create.
+	 * @param source the name of the collection or view defining the to be created views source.
+	 * @param pipeline the {@link AggregationPipeline} defining the view content.
+	 * @param options additional settings to apply when creating the view. Can be {@literal null}.
+	 * @since 4.0
+	 */
+	Mono<MongoCollection<Document>> createView(String name, String source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options);
+
 	/**
 	 * A set of collection names.
 	 *
@@ -291,18 +310,16 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	 * Get a {@link MongoCollection} by name. The returned collection may not exists yet (except in local memory) and is
 	 * created on first interaction with the server. Collections can be explicitly created via
 	 * {@link #createCollection(Class)}. Please make sure to check if the collection {@link #collectionExists(Class)
-	 * exists} first.
-	 * <p/>
+	 * exists} first. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param collectionName name of the collection.
 	 * @return an existing collection or one created on first server interaction.
 	 */
-	MongoCollection<Document> getCollection(String collectionName);
+	Mono<MongoCollection<Document>> getCollection(String collectionName);
 
 	/**
-	 * Check to see if a collection with a name indicated by the entity class exists.
-	 * <p/>
+	 * Check to see if a collection with a name indicated by the entity class exists. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param entityClass class that determines the name of the collection. Must not be {@literal null}.
@@ -311,8 +328,7 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	<T> Mono<Boolean> collectionExists(Class<T> entityClass);
 
 	/**
-	 * Check to see if a collection with a given name exists.
-	 * <p/>
+	 * Check to see if a collection with a given name exists. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param collectionName name of the collection. Must not be {@literal null}.
@@ -321,8 +337,7 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	Mono<Boolean> collectionExists(String collectionName);
 
 	/**
-	 * Drop the collection with the name indicated by the entity class.
-	 * <p/>
+	 * Drop the collection with the name indicated by the entity class. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param entityClass class that determines the collection to drop/delete. Must not be {@literal null}.
@@ -330,8 +345,7 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	<T> Mono<Void> dropCollection(Class<T> entityClass);
 
 	/**
-	 * Drop the collection with the given name.
-	 * <p/>
+	 * Drop the collection with the given name. <br />
 	 * Translate any exceptions as necessary.
 	 *
 	 * @param collectionName name of the collection to drop/delete.
@@ -339,11 +353,43 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	Mono<Void> dropCollection(String collectionName);
 
 	/**
-	 * Query for a {@link Flux} of objects of type T from the collection used by the entity class.
-	 * <p/>
+	 * Returns a new {@link ReactiveBulkOperations} for the given collection. <br />
+	 * <strong>NOTE:</strong> Any additional support for field mapping, etc. is not available for {@literal update} or
+	 * {@literal remove} operations in bulk mode due to the lack of domain type information. Use
+	 * {@link #bulkOps(BulkMode, Class, String)} to get full type specific support.
+	 *
+	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
+	 * @param collectionName the name of the collection to work on, must not be {@literal null} or empty.
+	 * @return {@link ReactiveBulkOperations} on the named collection
+	 * @since 4.1
+	 */
+	ReactiveBulkOperations bulkOps(BulkMode mode, String collectionName);
+
+	/**
+	 * Returns a new {@link ReactiveBulkOperations} for the given entity type.
+	 *
+	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
+	 * @param entityClass the name of the entity class, must not be {@literal null}.
+	 * @return {@link ReactiveBulkOperations} on the named collection associated of the given entity class.
+	 * @since 4.1
+	 */
+	ReactiveBulkOperations bulkOps(BulkMode mode, Class<?> entityClass);
+
+	/**
+	 * Returns a new {@link ReactiveBulkOperations} for the given entity type and collection name.
+	 *
+	 * @param mode the {@link BulkMode} to use for bulk operations, must not be {@literal null}.
+	 * @param entityType the name of the entity class. Can be {@literal null}.
+	 * @param collectionName the name of the collection to work on, must not be {@literal null} or empty.
+	 * @return {@link ReactiveBulkOperations} on the named collection associated with the given entity class.
+	 * @since 4.1
+	 */
+	ReactiveBulkOperations bulkOps(BulkMode mode, @Nullable Class<?> entityType, String collectionName);
+
+	/**
+	 * Query for a {@link Flux} of objects of type T from the collection used by the entity class. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
 	 *
@@ -353,11 +399,9 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	<T> Flux<T> findAll(Class<T> entityClass);
 
 	/**
-	 * Query for a {@link Flux} of objects of type T from the specified collection.
-	 * <p/>
+	 * Query for a {@link Flux} of objects of type T from the specified collection. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
 	 * to map objects since the test for class type is done in the client and not on the server.
 	 *
@@ -369,15 +413,13 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity class to a single instance of an object of the
-	 * specified type.
-	 * <p/>
+	 * specified type. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned {@link Mono}.
 	 * @return the converted object.
@@ -386,15 +428,13 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 
 	/**
 	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
-	 * type.
-	 * <p/>
+	 * type. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned {@link Mono}.
 	 * @param collectionName name of the collection to retrieve the objects from.
@@ -407,7 +447,7 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	 * <strong>NOTE:</strong> Any additional support for query/field mapping, etc. is not available due to the lack of
 	 * domain type information. Use {@link #exists(Query, Class, String)} to get full type specific support.
 	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param query the {@link Query} class that specifies the criteria used to find a document.
 	 * @param collectionName name of the collection to check for objects.
 	 * @return {@literal true} if the query yields a result.
 	 */
@@ -416,7 +456,7 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	/**
 	 * Determine result of given {@link Query} contains at least one element.
 	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param query the {@link Query} class that specifies the criteria used to find a document.
 	 * @param entityClass the parametrized type.
 	 * @return {@literal true} if the query yields a result.
 	 */
@@ -425,7 +465,7 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	/**
 	 * Determine result of given {@link Query} contains at least one element.
 	 *
-	 * @param query the {@link Query} class that specifies the criteria used to find a record.
+	 * @param query the {@link Query} class that specifies the criteria used to find a document.
 	 * @param entityClass the parametrized type. Can be {@literal null}.
 	 * @param collectionName name of the collection to check for objects.
 	 * @return {@literal true} if the query yields a result.
@@ -434,14 +474,13 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity class to a {@link Flux} of the specified type.
-	 * <p/>
+	 * <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
 	 * @param entityClass the parametrized type of the returned {@link Flux}. Must not be {@literal null}.
 	 * @return the {@link Flux} of converted objects.
@@ -449,15 +488,13 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	<T> Flux<T> find(Query query, Class<T> entityClass);
 
 	/**
-	 * Map the results of an ad-hoc query on the specified collection to a {@link Flux} of the specified type.
-	 * <p/>
+	 * Map the results of an ad-hoc query on the specified collection to a {@link Flux} of the specified type. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification. Must not be {@literal null}.
 	 * @param entityClass the parametrized type of the returned {@link Flux}.
 	 * @param collectionName name of the collection to retrieve the objects from. Must not be {@literal null}.
@@ -465,6 +502,57 @@ <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 	 */
 	<T> Flux<T> find(Query query, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Query for a scroll of objects of type T from the specified collection. <br />
+	 * Make sure to either set {@link Query#skip(long)} or {@link Query#with(KeysetScrollPosition)} along with
+	 * {@link Query#limit(int)} to limit large query results for efficient scrolling. <br />
+	 * Result objects are converted from the MongoDB native representation using an instance of {@see MongoConverter}.
+	 * Unless configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
+	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
+	 * to map objects since the test for class type is done in the client and not on the server.
+	 * <p>
+	 * When using {@link KeysetScrollPosition}, make sure to use non-nullable {@link org.springframework.data.domain.Sort
+	 * sort properties} as MongoDB does not support criteria to reconstruct a query result from absent document fields or
+	 * {@literal null} values through {@code $gt/$lt} operators.
+	 *
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
+	 *          specification. Must not be {@literal null}.
+	 * @param entityType the parametrized type of the returned list.
+	 * @return {@link Mono} emitting the converted window.
+	 * @throws IllegalStateException if a potential {@link Query#getKeyset() KeysetScrollPosition} contains an invalid
+	 *           position.
+	 * @since 4.1
+	 * @see Query#with(org.springframework.data.domain.OffsetScrollPosition)
+	 * @see Query#with(org.springframework.data.domain.KeysetScrollPosition)
+	 */
+	<T> Mono<Window<T>> scroll(Query query, Class<T> entityType);
+
+	/**
+	 * Query for a window of objects of type T from the specified collection. <br />
+	 * Make sure to either set {@link Query#skip(long)} or {@link Query#with(KeysetScrollPosition)} along with
+	 * {@link Query#limit(int)} to limit large query results for efficient scrolling. <br />
+	 * Result objects are converted from the MongoDB native representation using an instance of {@see MongoConverter}.
+	 * Unless configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
+	 * If your collection does not contain a homogeneous collection of types, this operation will not be an efficient way
+	 * to map objects since the test for class type is done in the client and not on the server.
+	 * <p>
+	 * When using {@link KeysetScrollPosition}, make sure to use non-nullable {@link org.springframework.data.domain.Sort
+	 * sort properties} as MongoDB does not support criteria to reconstruct a query result from absent document fields or
+	 * {@literal null} values through {@code $gt/$lt} operators.
+	 *
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
+	 *          specification. Must not be {@literal null}.
+	 * @param entityType the parametrized type of the returned list.
+	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @return {@link Mono} emitting the converted window.
+	 * @throws IllegalStateException if a potential {@link Query#getKeyset() KeysetScrollPosition} contains an invalid
+	 *           position.
+	 * @since 4.1
+	 * @see Query#with(org.springframework.data.domain.OffsetScrollPosition)
+	 * @see Query#with(org.springframework.data.domain.KeysetScrollPosition)
+	 */
+	<T> Mono<Window<T>> scroll(Query query, Class<T> entityType, String collectionName);
+
 	/**
 	 * Returns a document with the given id mapped onto the given class. The collection the query is ran against will be
 	 * derived from the given target class as well.
@@ -564,11 +652,9 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	<O> Flux<O> aggregate(TypedAggregation<?> aggregation, String collectionName, Class<O> outputType);
 
 	/**
-	 * Execute an aggregation operation.
-	 * <p/>
+	 * Execute an aggregation operation. <br />
 	 * The raw results will be mapped to the given entity class and are returned as stream. The name of the
-	 * inputCollection is derived from the {@link TypedAggregation#getInputType() aggregation input type}.
-	 * <p/>
+	 * inputCollection is derived from the {@link TypedAggregation#getInputType() aggregation input type}. <br />
 	 * Aggregation streaming cannot be used with {@link AggregationOptions#isExplain() aggregation explain} nor with
 	 * {@link AggregationOptions#getCursorBatchSize()}. Enabling explanation mode or setting batch size cause
 	 * {@link IllegalArgumentException}.
@@ -582,11 +668,9 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	<O> Flux<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType);
 
 	/**
-	 * Execute an aggregation operation.
-	 * <p/>
+	 * Execute an aggregation operation. <br />
 	 * The raw results will be mapped to the given {@code ouputType}. The name of the inputCollection is derived from the
-	 * {@code inputType}.
-	 * <p/>
+	 * {@code inputType}. <br />
 	 * Aggregation streaming cannot be used with {@link AggregationOptions#isExplain() aggregation explain} nor with
 	 * {@link AggregationOptions#getCursorBatchSize()}. Enabling explanation mode or setting batch size cause
 	 * {@link IllegalArgumentException}.
@@ -602,10 +686,8 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	<O> Flux<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType);
 
 	/**
-	 * Execute an aggregation operation.
-	 * <p/>
-	 * The raw results will be mapped to the given entity class.
-	 * <p/>
+	 * Execute an aggregation operation. <br />
+	 * The raw results will be mapped to the given entity class. <br />
 	 * Aggregation streaming cannot be used with {@link AggregationOptions#isExplain() aggregation explain} nor with
 	 * {@link AggregationOptions#getCursorBatchSize()}. Enabling explanation mode or setting batch size cause
 	 * {@link IllegalArgumentException}.
@@ -675,68 +757,80 @@ default <T> Flux<T> findDistinct(Query query, String field, String collection, C
 	<T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass, String collectionName);
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify</a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
 	<T> Mono<T> findAndModify(Query query, UpdateDefinition update, Class<T> entityClass);
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify</a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query}.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated before it was updated.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
 	<T> Mono<T> findAndModify(Query query, UpdateDefinition update, Class<T> entityClass, String collectionName);
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify</a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
 	 * {@link FindAndModifyOptions} into account.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents.
 	 * @param options the {@link FindAndModifyOptions} holding additional information.
 	 * @param entityClass the parametrized type.
 	 * @return the converted object that was updated. Depending on the value of {@link FindAndModifyOptions#isReturnNew()}
 	 *         this will either be the object as it was before the update or as it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
 	<T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options, Class<T> entityClass);
 
 	/**
-	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify<a/>
+	 * Triggers <a href="https://docs.mongodb.org/manual/reference/method/db.collection.findAndModify/">findAndModify</a>
 	 * to apply provided {@link Update} on documents matching {@link Criteria} of given {@link Query} taking
 	 * {@link FindAndModifyOptions} into account.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} to apply on matching documents. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityClass the parametrized type. Must not be {@literal null}.
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated. Depending on the value of {@link FindAndModifyOptions#isReturnNew()}
 	 *         this will either be the object as it was before the update or as it is after the update.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -745,16 +839,18 @@ <T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOpt
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement}
 	 * document. <br />
 	 * Options are defaulted to {@link FindAndReplaceOptions#empty()}. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@link Mono#empty()}, if not found.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
 	default <T> Mono<T> findAndReplace(Query query, T replacement) {
@@ -763,14 +859,14 @@ default <T> Mono<T> findAndReplace(Query query, T replacement) {
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement}
 	 * document. <br />
 	 * Options are defaulted to {@link FindAndReplaceOptions#empty()}. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param collectionName the collection to query. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@link Mono#empty()}, if not found.
@@ -782,18 +878,20 @@ default <T> Mono<T> findAndReplace(Query query, T replacement, String collection
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@link Mono#empty()}, if not found. Depending on the value of
 	 *         {@link FindAndReplaceOptions#isReturnNew()} this will either be the object as it was before the update or
 	 *         as it is after the update.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
 	default <T> Mono<T> findAndReplace(Query query, T replacement, FindAndReplaceOptions options) {
@@ -802,13 +900,13 @@ default <T> Mono<T> findAndReplace(Query query, T replacement, FindAndReplaceOpt
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @return the converted object that was updated or {@link Mono#empty()}, if not found. Depending on the value of
@@ -818,19 +916,19 @@ default <T> Mono<T> findAndReplace(Query query, T replacement, FindAndReplaceOpt
 	 */
 	default <T> Mono<T> findAndReplace(Query query, T replacement, FindAndReplaceOptions options, String collectionName) {
 
-		Assert.notNull(replacement, "Replacement must not be null!");
+		Assert.notNull(replacement, "Replacement must not be null");
 		return findAndReplace(query, replacement, options, (Class<T>) ClassUtils.getUserClass(replacement), collectionName);
 	}
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityType the parametrized type. Must not be {@literal null}.
@@ -848,13 +946,13 @@ default <T> Mono<T> findAndReplace(Query query, T replacement, FindAndReplaceOpt
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityType the type used for mapping the {@link Query} to domain type fields and deriving the collection
@@ -864,6 +962,8 @@ default <T> Mono<T> findAndReplace(Query query, T replacement, FindAndReplaceOpt
 	 * @return the converted object that was updated or {@link Mono#empty()}, if not found. Depending on the value of
 	 *         {@link FindAndReplaceOptions#isReturnNew()} this will either be the object as it was before the update or
 	 *         as it is after the update.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
 	 * @since 2.1
 	 */
 	default <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
@@ -875,13 +975,13 @@ default <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplace
 
 	/**
 	 * Triggers
-	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace<a/>
+	 * <a href="https://docs.mongodb.com/manual/reference/method/db.collection.findOneAndReplace/">findOneAndReplace</a>
 	 * to replace a single document matching {@link Criteria} of given {@link Query} with the {@code replacement} document
 	 * taking {@link FindAndReplaceOptions} into account. <br />
 	 * <strong>NOTE:</strong> The replacement entity must not hold an {@literal id}.
 	 *
-	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a record and also an optional
-	 *          fields specification. Must not be {@literal null}.
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document and also an
+	 *          optional fields specification. Must not be {@literal null}.
 	 * @param replacement the replacement document. Must not be {@literal null}.
 	 * @param options the {@link FindAndModifyOptions} holding additional information. Must not be {@literal null}.
 	 * @param entityType the type used for mapping the {@link Query} to domain type fields and deriving the collection
@@ -900,14 +1000,12 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity type to a single instance of an object of the
 	 * specified type. The first document that matches the query is returned and also removed from the collection in the
-	 * database.
-	 * <p/>
-	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
+	 * database. <br />
+	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned {@link Mono}.
 	 * @return the converted object
@@ -917,14 +1015,13 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	/**
 	 * Map the results of an ad-hoc query on the specified collection to a single instance of an object of the specified
 	 * type. The first document that matches the query is returned and also removed from the collection in the database.
-	 * <p/>
+	 * <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned {@link Mono}.
 	 * @param collectionName name of the collection to retrieve the objects from.
@@ -938,12 +1035,19 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
 	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
 	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * count all matches. <br />
+	 * This method may choose to use {@link #estimatedCount(Class)} for empty queries instead of running an
+	 * {@link com.mongodb.reactivestreams.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} which may have an impact on performance.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the count of matching documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @see #exactCount(Query, Class)
+	 * @see #estimatedCount(Class)
 	 */
 	Mono<Long> count(Query query, Class<?> entityClass);
 
@@ -954,12 +1058,17 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
 	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
 	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * count all matches. <br />
+	 * This method may choose to use {@link #estimatedCount(Class)} for empty queries instead of running an
+	 * {@link com.mongodb.reactivestreams.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} which may have an impact on performance.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents.
 	 * @param collectionName must not be {@literal null} or empty.
 	 * @return the count of matching documents.
 	 * @see #count(Query, Class, String)
+	 * @see #estimatedCount(String)
+	 * @see #exactCount(Query, String)
 	 */
 	Mono<Long> count(Query query, String collectionName);
 
@@ -969,60 +1078,184 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
 	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
 	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
-	 * count all matches.
+	 * count all matches. <br />
+	 * This method may choose to use {@link #estimatedCount(Class)} for empty queries instead of running an
+	 * {@link com.mongodb.reactivestreams.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} which may have an impact on performance.
 	 *
 	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
 	 *          {@literal null}.
 	 * @param entityClass the parametrized type. Can be {@literal null}.
 	 * @param collectionName must not be {@literal null} or empty.
 	 * @return the count of matching documents.
+	 * @see #estimatedCount(String)
+	 * @see #exactCount(Query, Class, String)
 	 */
 	Mono<Long> count(Query query, @Nullable Class<?> entityClass, String collectionName);
 
 	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
-	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
-	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
+	 * Estimate the number of documents, in the collection {@link #getCollectionName(Class) identified by the given type},
+	 * based on collection statistics. <br />
+	 * Please make sure to read the MongoDB reference documentation about limitations on eg. sharded cluster or inside
+	 * transactions.
+	 *
+	 * @param entityClass must not be {@literal null}.
+	 * @return a {@link Mono} emitting the estimated number of documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.1
+	 */
+	default Mono<Long> estimatedCount(Class<?> entityClass) {
+
+		Assert.notNull(entityClass, "Entity class must not be null");
+		return estimatedCount(getCollectionName(entityClass));
+	}
+
+	/**
+	 * Estimate the number of documents in the given collection based on collection statistics. <br />
+	 * Please make sure to read the MongoDB reference documentation about limitations on eg. sharded cluster or inside
+	 * transactions.
+	 *
+	 * @param collectionName must not be {@literal null}.
+	 * @return a {@link Mono} emitting the estimated number of documents.
+	 * @since 3.1
+	 */
+	Mono<Long> estimatedCount(String collectionName);
+
+	/**
+	 * Returns the number of documents for the given {@link Query} by querying the collection of the given entity class.
+	 * <br />
+	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
+	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
+	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
+	 * count all matches. <br />
+	 * This method uses an
+	 * {@link com.mongodb.reactivestreams.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but guarantees
+	 * shard, session and transaction compliance. In case an inaccurate count satisfies the applications needs use
+	 * {@link #estimatedCount(Class)} for empty queries instead.
+	 *
+	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
+	 *          {@literal null}.
+	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
+	 * @return the count of matching documents.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.4
+	 */
+	default Mono<Long> exactCount(Query query, Class<?> entityClass) {
+		return exactCount(query, entityClass, getCollectionName(entityClass));
+	}
+
+	/**
+	 * Returns the number of documents for the given {@link Query} querying the given collection. The given {@link Query}
+	 * must solely consist of document field references as we lack type information to map potential property references
+	 * onto document fields. Use {@link #count(Query, Class, String)} to get full type specific support. <br />
+	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
+	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
+	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
+	 * count all matches. <br />
+	 * This method uses an
+	 * {@link com.mongodb.reactivestreams.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but guarantees
+	 * shard, session and transaction compliance. In case an inaccurate count satisfies the applications needs use
+	 * {@link #estimatedCount(String)} for empty queries instead.
+	 *
+	 * @param query the {@link Query} class that specifies the criteria used to find documents.
+	 * @param collectionName must not be {@literal null} or empty.
+	 * @return the count of matching documents.
+	 * @see #count(Query, Class, String)
+	 * @since 3.4
+	 */
+	default Mono<Long> exactCount(Query query, String collectionName) {
+		return exactCount(query, null, collectionName);
+	}
+
+	/**
+	 * Returns the number of documents for the given {@link Query} by querying the given collection using the given entity
+	 * class to map the given {@link Query}. <br />
+	 * <strong>NOTE:</strong> Query {@link Query#getSkip() offset} and {@link Query#getLimit() limit} can have direct
+	 * influence on the resulting number of documents found as those values are passed on to the server and potentially
+	 * limit the range and order within which the server performs the count operation. Use an {@literal unpaged} query to
+	 * count all matches. <br />
+	 * This method uses an
+	 * {@link com.mongodb.reactivestreams.client.MongoCollection#countDocuments(org.bson.conversions.Bson, com.mongodb.client.model.CountOptions)
+	 * aggregation execution} even for empty {@link Query queries} which may have an impact on performance, but guarantees
+	 * shard, session and transaction compliance. In case an inaccurate count satisfies the applications needs use
+	 * {@link #estimatedCount(String)} for empty queries instead.
+	 *
+	 * @param query the {@link Query} class that specifies the criteria used to find documents. Must not be
+	 *          {@literal null}.
+	 * @param entityClass the parametrized type. Can be {@literal null}.
+	 * @param collectionName must not be {@literal null} or empty.
+	 * @return the count of matching documents.
+	 * @since 3.4
+	 */
+	Mono<Long> exactCount(Query query, @Nullable Class<?> entityClass, String collectionName);
+
+	/**
+	 * Insert the object into the collection for the entity type of the object to save. <br />
+	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. <br />
+	 * If your object has an {@literal Id} property which holds a {@literal null} value, it will be set with the generated
+	 * Id from MongoDB. If your Id property is a String then MongoDB ObjectId will be used to populate that string.
+	 * Otherwise, the conversion from ObjectId to your property type will be handled by Spring's BeanWrapper class that
+	 * leverages Type Conversion API. See
 	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
+	 * Type Conversion"</a> for more details. <br />
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
+	 * <p>
+	 * The {@code objectToSave} must not be collection-like.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the inserted object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	<T> Mono<T> insert(T objectToSave);
 
 	/**
-	 * Insert the object into the specified collection.
-	 * <p/>
+	 * Insert the object into the specified collection. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
+	 * <p>
+	 * The {@code objectToSave} must not be collection-like.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
 	 * @return the inserted object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
 	 */
 	<T> Mono<T> insert(T objectToSave, String collectionName);
 
 	/**
 	 * Insert a Collection of objects into a collection in a single batch write to the database.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param batchToSave the batch of objects to save. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
-	 * @return the inserted objects .
+	 * @return the inserted objects.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	<T> Flux<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass);
 
 	/**
 	 * Insert a batch of objects into the specified collection in a single batch write to the database.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param batchToSave the list of objects to save. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
@@ -1033,25 +1266,31 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	/**
 	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
 	 * class.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param objectsToSave the list of objects to save. Must not be {@literal null}.
 	 * @return the saved objects.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} for the given objects.
 	 */
 	<T> Flux<T> insertAll(Collection<? extends T> objectsToSave);
 
 	/**
-	 * Insert the object into the collection for the entity type of the object to save.
-	 * <p/>
-	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}.
-	 * <p/>
+	 * Insert the object into the collection for the entity type of the object to save. <br />
+	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. <br />
 	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
 	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
 	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
-	 * <p/>
-	 * <p/>
+	 * Type Conversion"</a> for more details. <br />
 	 * Insert is used to initially store the object into the database. To update an existing object use the save method.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} the property will be auto incremented. The
+	 * operation raises an error in case the document has been modified in between.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the inserted objects.
@@ -1060,15 +1299,27 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 
 	/**
 	 * Insert a Collection of objects into a collection in a single batch write to the database.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param batchToSave the publisher which provides objects to save. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the inserted objects.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} for the type.
 	 */
 	<T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, Class<?> entityClass);
 
 	/**
 	 * Insert objects into the specified collection in a single batch write to the database.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param batchToSave the publisher which provides objects to save. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
@@ -1079,6 +1330,11 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	/**
 	 * Insert a mixed Collection of objects into a database collection determining the collection name to use based on the
 	 * class.
+	 * <p>
+	 * If an object within the batch has an {@literal Id} property which holds a {@literal null} value, it will be set
+	 * with the generated Id from MongoDB.
+	 * <p>
+	 * Inserting new objects will trigger {@link org.springframework.data.annotation.Version} property initialization.
 	 *
 	 * @param objectsToSave the publisher which provides objects to save. Must not be {@literal null}.
 	 * @return the inserted objects.
@@ -1087,91 +1343,117 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 
 	/**
 	 * Save the object to the collection for the entity type of the object to save. This will perform an insert if the
-	 * object is not already present, that is an 'upsert'.
-	 * <p/>
+	 * object is not already present, that is an 'upsert'. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
 	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
 	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
 	 * Type Conversion"</a> for more details.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} the property will be auto incremented. The
+	 * operation raises an error in case the document has been modified in between.
+	 * <p>
+	 * The {@code objectToSave} must not be collection-like.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the saved object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
+	 * @throws org.springframework.dao.OptimisticLockingFailureException in case of version mismatch in case a
+	 *           {@link org.springframework.data.annotation.Version} is defined.
 	 */
 	<T> Mono<T> save(T objectToSave);
 
 	/**
 	 * Save the object to the specified collection. This will perform an insert if the object is not already present, that
-	 * is an 'upsert'.
-	 * <p/>
+	 * is an 'upsert'. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
-	 * Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
+	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
+	 * Conversion</a> for more details.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} the property will be auto incremented. The
+	 * operation raises an error in case the document has been modified in between.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
 	 * @return the saved object.
+	 * @throws IllegalArgumentException in case the {@code objectToSave} is collection-like.
+	 * @throws org.springframework.dao.OptimisticLockingFailureException in case of version mismatch in case a
+	 *           {@link org.springframework.data.annotation.Version} is defined.
 	 */
 	<T> Mono<T> save(T objectToSave, String collectionName);
 
 	/**
 	 * Save the object to the collection for the entity type of the object to save. This will perform an insert if the
-	 * object is not already present, that is an 'upsert'.
-	 * <p/>
+	 * object is not already present, that is an 'upsert'. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
 	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
-	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation" > Spring's
-	 * Type Conversion"</a> for more details.
+	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation"> Spring's Type
+	 * Conversion</a> for more details.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} the property will be auto incremented. The
+	 * operation raises an error in case the document has been modified in between.
 	 *
 	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
 	 * @return the saved object.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
+	 * @throws org.springframework.dao.OptimisticLockingFailureException in case of version mismatch in case a
+	 *           {@link org.springframework.data.annotation.Version} is defined.
 	 */
 	<T> Mono<T> save(Mono<? extends T> objectToSave);
 
 	/**
 	 * Save the object to the specified collection. This will perform an insert if the object is not already present, that
-	 * is an 'upsert'.
-	 * <p/>
+	 * is an 'upsert'. <br />
 	 * The object is converted to the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * If your object has an "Id' property, it will be set with the generated Id from MongoDB. If your Id property is a
 	 * String then MongoDB ObjectId will be used to populate that string. Otherwise, the conversion from ObjectId to your
-	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See <a
-	 * https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
-	 * Conversion"</a> for more details.
+	 * property type will be handled by Spring's BeanWrapper class that leverages Type Conversion API. See
+	 * <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/core.html#validation">Spring's Type
+	 * Conversion</a> for more details.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} the property will be auto incremented. The
+	 * operation raises an error in case the document has been modified in between.
 	 *
-	 * @param objectToSave the object to store in the collection. Must not be {@literal null}.
+	 * @param objectToSave the object to store in the collReactiveMongoOperationsection. Must not be {@literal null}.
 	 * @param collectionName name of the collection to store the object in. Must not be {@literal null}.
 	 * @return the saved object.
+	 * @throws org.springframework.dao.OptimisticLockingFailureException in case of version mismatch in case a
+	 *           {@link org.springframework.data.annotation.Version} is defined.
 	 */
 	<T> Mono<T> save(Mono<? extends T> objectToSave, String collectionName);
 
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
-	 * combining the query document and the update document. <br />
+	 * combining the query document and the update document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
+	 * <p>
 	 * <strong>NOTE:</strong> {@link Query#getSortObject() sorting} is not supported by {@code db.collection.updateOne}.
 	 * Use {@link #findAndModify(Query, UpdateDefinition, Class)} instead.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be upserted. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing object. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1184,13 +1466,13 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * domain type information. Use {@link #upsert(Query, UpdateDefinition, Class, String)} to get full type specific
 	 * support.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be upserted. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing object. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1199,15 +1481,18 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	/**
 	 * Performs an upsert. If no document is found that matches the query, a new document is created and inserted by
 	 * combining the query document and the update document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be upserted. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be upserted. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing object. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1215,17 +1500,21 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 
 	/**
 	 * Updates the first object that is found in the collection of the entity class that matches the query document with
-	 * the provided update document. <br />
-	 * <strong>NOTE:</strong> {@link Query#getSortObject() sorting} is not supported by {@code db.collection.updateOne}.
-	 * Use {@link #findAndModify(Query, UpdateDefinition, Class)} instead.
+	 * the provided update document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
-	 *          {@literal null}.
+	 * @param query the query document that specifies the criteria used to select a document to be updated. The
+	 *          {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to update when
+	 *          potentially matching multiple candidates. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1236,17 +1525,16 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * the provided updated document. <br />
 	 * <strong>NOTE:</strong> Any additional support for field mapping, versions, etc. is not available due to the lack of
 	 * domain type information. Use {@link #updateFirst(Query, UpdateDefinition, Class, String)} to get full type specific
-	 * support. <br />
-	 * <strong>NOTE:</strong> {@link Query#getSortObject() sorting} is not supported by {@code db.collection.updateOne}.
-	 * Use {@link #findAndModify(Query, Update, Class, String)} instead.
+	 * support.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
-	 *          {@literal null}.
+	 * @param query the query document that specifies the criteria used to select a document to be updated. The
+	 *          {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to update when
+	 *          potentially matching multiple candidates. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1254,16 +1542,20 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 
 	/**
 	 * Updates the first object that is found in the specified collection that matches the query document criteria with
-	 * the provided updated document. <br />
+	 * the provided updated document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
-	 *          {@literal null}.
+	 * @param query the query document that specifies the criteria used to select a document to be updated. The
+	 *          {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to update when
+	 *          potentially matching multiple candidates. Must not be {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1272,14 +1564,19 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be updated. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1292,13 +1589,13 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * domain type information. Use {@link #updateMulti(Query, UpdateDefinition, Class, String)} to get full type specific
 	 * support.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be updated. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
@@ -1307,25 +1604,31 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	/**
 	 * Updates all objects that are found in the collection for the entity class that matches the query document criteria
 	 * with the provided updated document.
+	 * <p>
+	 * A potential {@link org.springframework.data.annotation.Version} property of the {@literal entityClass} will be
+	 * auto-incremented if not explicitly specified in the update.
 	 *
-	 * @param query the query document that specifies the criteria used to select a record to be updated. Must not be
+	 * @param query the query document that specifies the criteria used to select a document to be updated. Must not be
 	 *          {@literal null}.
 	 * @param update the {@link UpdateDefinition} that contains the updated object or {@code $} operators to manipulate
 	 *          the existing. Must not be {@literal null}.
 	 * @param entityClass class of the pojo to be operated on. Must not be {@literal null}.
 	 * @param collectionName name of the collection to update the object in. Must not be {@literal null}.
 	 * @return the {@link UpdateResult} which lets you access the results of the previous write.
-	 * @since 2.3
+	 * @since 3.0
 	 * @see Update
 	 * @see AggregationUpdate
 	 */
 	Mono<UpdateResult> updateMulti(Query query, UpdateDefinition update, Class<?> entityClass, String collectionName);
 
 	/**
-	 * Remove the given object from the collection by id.
+	 * Remove the given object from the collection by {@literal id} and (if applicable) its
+	 * {@link org.springframework.data.annotation.Version}.
 	 *
 	 * @param object must not be {@literal null}.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	Mono<DeleteResult> remove(Object object);
 
@@ -1333,45 +1636,54 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * Removes the given object from the given collection.
 	 *
 	 * @param object must not be {@literal null}.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 */
 	Mono<DeleteResult> remove(Object object, String collectionName);
 
 	/**
-	 * Remove the given object from the collection by id.
+	 * Remove the given object from the collection by {@literal id} and (if applicable) its
+	 * {@link org.springframework.data.annotation.Version}.
 	 *
 	 * @param objectToRemove must not be {@literal null}.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given object type.
 	 */
 	Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove);
 
 	/**
-	 * Removes the given object from the given collection.
+	 * Removes the given object from the given collection by {@literal id} and (if applicable) its
+	 * {@link org.springframework.data.annotation.Version}.
 	 *
 	 * @param objectToRemove must not be {@literal null}.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 */
 	Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove, String collectionName);
 
 	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
+	 * Remove all documents that match the provided query document criteria from the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
 	 *
-	 * @param query the query document that specifies the criteria used to remove a record.
+	 * @param query the query document that specifies the criteria used to remove a document.
 	 * @param entityClass class that determines the collection to use.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	Mono<DeleteResult> remove(Query query, Class<?> entityClass);
 
 	/**
-	 * Remove all documents that match the provided query document criteria from the the collection used to store the
+	 * Remove all documents that match the provided query document criteria from the collection used to store the
 	 * entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the query.
 	 *
-	 * @param query the query document that specifies the criteria used to remove a record.
+	 * @param query the query document that specifies the criteria used to remove a document.
 	 * @param entityClass class of the pojo to be operated on. Can be {@literal null}.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 */
 	Mono<DeleteResult> remove(Query query, @Nullable Class<?> entityClass, String collectionName);
@@ -1382,8 +1694,9 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * <strong>NOTE:</strong> Any additional support for field mapping is not available due to the lack of domain type
 	 * information. Use {@link #remove(Query, Class, String)} to get full type specific support.
 	 *
-	 * @param query the query document that specifies the criteria used to remove a record.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param query the query document that specifies the criteria used to remove a document.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link DeleteResult} which lets you access the results of the previous delete.
 	 */
 	Mono<DeleteResult> remove(Query query, String collectionName);
@@ -1394,7 +1707,8 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * information. Use {@link #findAllAndRemove(Query, Class, String)} to get full type specific support.
 	 *
 	 * @param query the query document that specifies the criteria used to find and remove documents.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link Flux} converted objects deleted by this operation.
 	 */
 	<T> Flux<T> findAllAndRemove(Query query, String collectionName);
@@ -1405,37 +1719,113 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * @param query the query document that specifies the criteria used to find and remove documents.
 	 * @param entityClass class of the pojo to be operated on.
 	 * @return the {@link Flux} converted objects deleted by this operation.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	<T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass);
 
 	/**
-	 * Returns and removes all documents that match the provided query document criteria from the the collection used to
-	 * store the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in
-	 * the query.
+	 * Returns and removes all documents that match the provided query document criteria from the collection used to store
+	 * the entityClass. The Class parameter is also used to help convert the Id of the object if it is present in the
+	 * query.
 	 *
 	 * @param query the query document that specifies the criteria used to find and remove documents.
 	 * @param entityClass class of the pojo to be operated on.
-	 * @param collectionName name of the collection where the objects will removed, must not be {@literal null} or empty.
+	 * @param collectionName name of the collection where the documents will be removed from, must not be {@literal null}
+	 *          or empty.
 	 * @return the {@link Flux} converted objects deleted by this operation.
 	 */
 	<T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName);
 
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document. <br />
+	 * The collection name is derived from the {@literal replacement} type. <br />
+	 * Options are defaulted to {@link ReplaceOptions#none()}.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document. The query may
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
+	 * @since 4.2
+	 */
+	default <T> Mono<UpdateResult> replace(Query query, T replacement) {
+		return replace(query, replacement, ReplaceOptions.none());
+	}
+
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document. Options are defaulted to {@link ReplaceOptions#none()}.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document. The query may
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @param collectionName the collection to query. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @since 4.2
+	 */
+	default <T> Mono<UpdateResult> replace(Query query, T replacement, String collectionName) {
+		return replace(query, replacement, ReplaceOptions.none(), collectionName);
+	}
+
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document taking {@link ReplaceOptions} into account.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document.The query may
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @param options the {@link ReplaceOptions} holding additional information. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
+	 * @since 4.2
+	 */
+	default <T> Mono<UpdateResult> replace(Query query, T replacement, ReplaceOptions options) {
+		return replace(query, replacement, options, getCollectionName(ClassUtils.getUserClass(replacement)));
+	}
+
+	/**
+	 * Replace a single document matching the {@link Criteria} of given {@link Query} with the {@code replacement}
+	 * document taking {@link ReplaceOptions} into account.
+	 *
+	 * @param query the {@link Query} class that specifies the {@link Criteria} used to find a document. The query may *
+	 *          contain an index {@link Query#withHint(String) hint} or the {@link Query#collation(Collation) collation}
+	 *          to use. The {@link Query} may define a {@link Query#with(Sort) sort order} to influence which document to
+	 *          replace when potentially matching multiple candidates. Must not be {@literal null}.
+	 * @param replacement the replacement document. Must not be {@literal null}.
+	 * @param options the {@link ReplaceOptions} holding additional information. Must not be {@literal null}.
+	 * @return the {@link UpdateResult} which lets you access the results of the previous replacement.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given replacement value.
+	 * @since 4.2
+	 */
+	<T> Mono<UpdateResult> replace(Query query, T replacement, ReplaceOptions options, String collectionName);
+
 	/**
 	 * Map the results of an ad-hoc query on the collection for the entity class to a stream of objects of the specified
 	 * type. The stream uses a {@link com.mongodb.CursorType#TailableAwait tailable} cursor that may be an infinite
 	 * stream. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p/>
+	 * {@link Subscription#cancel() canceled}. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned {@link Flux}.
 	 * @return the {@link Flux} of converted objects.
+	 * @throws org.springframework.data.mapping.MappingException if the target collection name cannot be
+	 *           {@link #getCollectionName(Class) derived} from the given type.
 	 */
 	<T> Flux<T> tail(Query query, Class<T> entityClass);
 
@@ -1443,15 +1833,13 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * Map the results of an ad-hoc query on the collection for the entity class to a stream of objects of the specified
 	 * type. The stream uses a {@link com.mongodb.CursorType#TailableAwait tailable} cursor that may be an infinite
 	 * stream. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p/>
+	 * {@link Subscription#cancel() canceled}. <br />
 	 * The object is converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless
-	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used.
-	 * <p/>
+	 * configured otherwise, an instance of {@link MappingMongoConverter} will be used. <br />
 	 * The query is specified as a {@link Query} which can be created either using the {@link BasicQuery} or the more
 	 * feature rich {@link Query}.
 	 *
-	 * @param query the query class that specifies the criteria used to find a record and also an optional fields
+	 * @param query the query class that specifies the criteria used to find a document and also an optional fields
 	 *          specification.
 	 * @param entityClass the parametrized type of the returned {@link Flux}.
 	 * @param collectionName name of the collection to retrieve the objects from.
@@ -1463,11 +1851,9 @@ <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions
 	 * Subscribe to a MongoDB <a href="https://docs.mongodb.com/manual/changeStreams/">Change Stream</a> for all events in
 	 * the configured default database via the reactive infrastructure. Use the optional provided {@link Aggregation} to
 	 * filter events. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p />
+	 * {@link Subscription#cancel() canceled}. <br />
 	 * The {@link ChangeStreamEvent#getBody()} is mapped to the {@literal resultType} while the
-	 * {@link ChangeStreamEvent#getRaw()} contains the unmodified payload.
-	 * <p />
+	 * {@link ChangeStreamEvent#getRaw()} contains the unmodified payload. <br />
 	 * Use {@link ChangeStreamOptions} to set arguments like {@link ChangeStreamOptions#getResumeToken() the resumseToken}
 	 * for resuming change streams.
 	 *
@@ -1487,11 +1873,9 @@ default <T> Flux<ChangeStreamEvent<T>> changeStream(ChangeStreamOptions options,
 	 * Subscribe to a MongoDB <a href="https://docs.mongodb.com/manual/changeStreams/">Change Stream</a> for all events in
 	 * the given collection via the reactive infrastructure. Use the optional provided {@link Aggregation} to filter
 	 * events. The stream will not be completed unless the {@link org.reactivestreams.Subscription} is
-	 * {@link Subscription#cancel() canceled}.
-	 * <p />
+	 * {@link Subscription#cancel() canceled}. <br />
 	 * The {@link ChangeStreamEvent#getBody()} is mapped to the {@literal resultType} while the
-	 * {@link ChangeStreamEvent#getRaw()} contains the unmodified payload.
-	 * <p />
+	 * {@link ChangeStreamEvent#getRaw()} contains the unmodified payload. <br />
 	 * Use {@link ChangeStreamOptions} to set arguments like {@link ChangeStreamOptions#getResumeToken() the resumseToken}
 	 * for resuming change streams.
 	 *
@@ -1512,11 +1896,9 @@ default <T> Flux<ChangeStreamEvent<T>> changeStream(@Nullable String collectionN
 	/**
 	 * Subscribe to a MongoDB <a href="https://docs.mongodb.com/manual/changeStreams/">Change Stream</a> via the reactive
 	 * infrastructure. Use the optional provided {@link Aggregation} to filter events. The stream will not be completed
-	 * unless the {@link org.reactivestreams.Subscription} is {@link Subscription#cancel() canceled}.
-	 * <p />
+	 * unless the {@link org.reactivestreams.Subscription} is {@link Subscription#cancel() canceled}. <br />
 	 * The {@link ChangeStreamEvent#getBody()} is mapped to the {@literal resultType} while the
-	 * {@link ChangeStreamEvent#getRaw()} contains the unmodified payload.
-	 * <p />
+	 * {@link ChangeStreamEvent#getRaw()} contains the unmodified payload. <br />
 	 * Use {@link ChangeStreamOptions} to set arguments like {@link ChangeStreamOptions#getResumeToken() the resumseToken}
 	 * for resuming change streams.
 	 *
@@ -1546,7 +1928,9 @@ <T> Flux<ChangeStreamEvent<T>> changeStream(@Nullable String database, @Nullable
 	 * @param options additional options like output collection. Must not be {@literal null}.
 	 * @return a {@link Flux} emitting the result document sequence. Never {@literal null}.
 	 * @since 2.1
+	 * @deprecated since 3.4 in favor of {@link #aggregate(TypedAggregation, Class)}.
 	 */
+	@Deprecated
 	<T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, Class<T> resultType, String mapFunction,
 			String reduceFunction, MapReduceOptions options);
 
@@ -1564,14 +1948,16 @@ <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, Class<T> resultTyp
 	 * @param options additional options like output collection. Must not be {@literal null}.
 	 * @return a {@link Flux} emitting the result document sequence. Never {@literal null}.
 	 * @since 2.1
+	 * @deprecated since 3.4 in favor of {@link #aggregate(TypedAggregation, Class)}.
 	 */
+	@Deprecated
 	<T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inputCollectionName, Class<T> resultType,
 			String mapFunction, String reduceFunction, MapReduceOptions options);
 
 	/**
 	 * Returns the underlying {@link MongoConverter}.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	MongoConverter getConverter();
 
@@ -1579,7 +1965,8 @@ <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inputCollec
 	 * The collection name used for the specified class by this template.
 	 *
 	 * @param entityClass must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
+	 * @throws org.springframework.data.mapping.MappingException if the collection name cannot be derived from the type.
 	 * @since 2.1
 	 */
 	String getCollectionName(Class<?> entityClass);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
index 47b272b79d..0ad473b8b7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,29 +17,36 @@
 
 import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.function.Tuple2;
 import reactor.util.function.Tuples;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
+import java.util.function.BiFunction;
+import java.util.function.BiPredicate;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.BsonValue;
 import org.bson.Document;
-import org.bson.codecs.Codec;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -52,34 +59,44 @@
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.convert.EntityReader;
+import org.springframework.data.domain.OffsetScrollPosition;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.geo.Metric;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mapping.PropertyReferenceException;
 import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.MappingContextEvent;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseUtils;
 import org.springframework.data.mongodb.SessionSynchronization;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.data.mongodb.core.CollectionPreparerSupport.ReactiveCollectionPreparerDelegate;
+import org.springframework.data.mongodb.core.DefaultReactiveBulkOperations.ReactiveBulkOperationContext;
 import org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity;
+import org.springframework.data.mongodb.core.QueryOperations.AggregationDefinition;
+import org.springframework.data.mongodb.core.QueryOperations.CountContext;
+import org.springframework.data.mongodb.core.QueryOperations.DeleteContext;
+import org.springframework.data.mongodb.core.QueryOperations.DistinctQueryContext;
+import org.springframework.data.mongodb.core.QueryOperations.QueryContext;
+import org.springframework.data.mongodb.core.QueryOperations.UpdateContext;
+import org.springframework.data.mongodb.core.ScrollUtils.KeysetScrollQuery;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
-import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.aggregation.AggregationOptions.Builder;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
 import org.springframework.data.mongodb.core.aggregation.PrefixingDelegatingAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.RelaxedTypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.JsonSchemaMapper;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
-import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
@@ -87,32 +104,24 @@
 import org.springframework.data.mongodb.core.index.MongoMappingEventPublisher;
 import org.springframework.data.mongodb.core.index.ReactiveIndexOperations;
 import org.springframework.data.mongodb.core.index.ReactiveMongoPersistentEntityIndexCreator;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
-import org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterDeleteEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
-import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeDeleteEvent;
-import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
-import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
-import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeSaveCallback;
+import org.springframework.data.mongodb.core.mapping.event.*;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
+import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Meta;
-import org.springframework.data.mongodb.core.query.Meta.CursorOption;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.core.query.UpdateDefinition.ArrayFilter;
-import org.springframework.data.mongodb.core.validation.Validator;
-import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.projection.EntityProjection;
 import org.springframework.data.util.Optionals;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
@@ -123,24 +132,22 @@
 
 import com.mongodb.ClientSessionOptions;
 import com.mongodb.CursorType;
-import com.mongodb.DBCollection;
-import com.mongodb.DBCursor;
-import com.mongodb.Mongo;
 import com.mongodb.MongoException;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.model.CountOptions;
 import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.CreateViewOptions;
 import com.mongodb.client.model.DeleteOptions;
+import com.mongodb.client.model.EstimatedDocumentCountOptions;
 import com.mongodb.client.model.FindOneAndDeleteOptions;
 import com.mongodb.client.model.FindOneAndReplaceOptions;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
-import com.mongodb.client.model.ReplaceOptions;
 import com.mongodb.client.model.ReturnDocument;
 import com.mongodb.client.model.UpdateOptions;
-import com.mongodb.client.model.ValidationOptions;
 import com.mongodb.client.model.changestream.FullDocument;
 import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.InsertOneResult;
 import com.mongodb.client.result.UpdateResult;
 import com.mongodb.reactivestreams.client.AggregatePublisher;
 import com.mongodb.reactivestreams.client.ChangeStreamPublisher;
@@ -151,7 +158,6 @@
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import com.mongodb.reactivestreams.client.MongoDatabase;
-import com.mongodb.reactivestreams.client.Success;
 
 /**
  * Primary implementation of {@link ReactiveMongoOperations}. It simplifies the use of Reactive MongoDB usage and helps
@@ -159,32 +165,33 @@
  * extract results. This class executes BSON queries or updates, initiating iteration over {@link FindPublisher} and
  * catching MongoDB exceptions and translating them to the generic, more informative exception hierarchy defined in the
  * org.springframework.dao package. Can be used within a service implementation via direct instantiation with a
- * {@link SimpleReactiveMongoDatabaseFactory} reference, or get prepared in an application context and given to services
- * as bean reference. Note: The {@link SimpleReactiveMongoDatabaseFactory} should always be configured as a bean in the
- * application context, in the first case given to the service directly, in the second case to the prepared template.
+ * {@link ReactiveMongoDatabaseFactory} reference, or get prepared in an application context and given to services as
+ * bean reference.
+ * <p>
+ * Note: The {@link ReactiveMongoDatabaseFactory} should always be configured as a bean in the application context, in
+ * the first case given to the service directly, in the second case to the prepared template.
+ * <h3>{@link ReadPreference} and {@link com.mongodb.ReadConcern}</h3>
+ * <p>
+ * {@code ReadPreference} and {@code ReadConcern} are generally considered from {@link Query} and
+ * {@link AggregationOptions} objects for the action to be executed on a particular {@link MongoCollection}.
+ * <p>
+ * You can also set the default {@link #setReadPreference(ReadPreference) ReadPreference} on the template level to
+ * generally apply a {@link ReadPreference}.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Roman Puchkovskiy
+ * @author Mathieu Ouellet
+ * @author Yadhukrishna S Pai
+ * @author Florian Lüdiger
  * @since 2.0
  */
 public class ReactiveMongoTemplate implements ReactiveMongoOperations, ApplicationContextAware {
 
 	public static final DbRefResolver NO_OP_REF_RESOLVER = NoOpDbRefResolver.INSTANCE;
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveMongoTemplate.class);
+	private static final Log LOGGER = LogFactory.getLog(ReactiveMongoTemplate.class);
 	private static final WriteResultChecking DEFAULT_WRITE_RESULT_CHECKING = WriteResultChecking.NONE;
-	private static final Collection<Class<?>> ITERABLE_CLASSES;
-
-	static {
-
-		Set<Class<?>> iterableClasses = new HashSet<>();
-		iterableClasses.add(List.class);
-		iterableClasses.add(Collection.class);
-		iterableClasses.add(Iterator.class);
-		iterableClasses.add(Publisher.class);
-
-		ITERABLE_CLASSES = Collections.unmodifiableCollection(iterableClasses);
-	}
 
 	private final MongoConverter mongoConverter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@@ -192,11 +199,11 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 	private final PersistenceExceptionTranslator exceptionTranslator;
 	private final QueryMapper queryMapper;
 	private final UpdateMapper updateMapper;
-	private final JsonSchemaMapper schemaMapper;
-	private final SpelAwareProxyProjectionFactory projectionFactory;
 	private final ApplicationListener<MappingContextEvent<?, ?>> indexCreatorListener;
 	private final EntityOperations operations;
 	private final PropertyOperations propertyOperations;
+	private final QueryOperations queryOperations;
+	private final EntityLifecycleEventDelegate eventDelegate;
 
 	private @Nullable WriteConcern writeConcern;
 	private WriteConcernResolver writeConcernResolver = DefaultWriteConcernResolver.INSTANCE;
@@ -208,6 +215,8 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
 
 	private SessionSynchronization sessionSynchronization = SessionSynchronization.ON_ACTUAL_TRANSACTION;
 
+	private CountExecution countExecution = this::doExactCount;
+
 	/**
 	 * Constructor used for a basic template configuration.
 	 *
@@ -251,26 +260,25 @@ public ReactiveMongoTemplate(ReactiveMongoDatabaseFactory mongoDatabaseFactory,
 	public ReactiveMongoTemplate(ReactiveMongoDatabaseFactory mongoDatabaseFactory,
 			@Nullable MongoConverter mongoConverter, Consumer<Throwable> subscriptionExceptionHandler) {
 
-		Assert.notNull(mongoDatabaseFactory, "ReactiveMongoDatabaseFactory must not be null!");
+		Assert.notNull(mongoDatabaseFactory, "ReactiveMongoDatabaseFactory must not be null");
 
 		this.mongoDatabaseFactory = mongoDatabaseFactory;
 		this.exceptionTranslator = mongoDatabaseFactory.getExceptionTranslator();
 		this.mongoConverter = mongoConverter == null ? getDefaultMongoConverter() : mongoConverter;
 		this.queryMapper = new QueryMapper(this.mongoConverter);
 		this.updateMapper = new UpdateMapper(this.mongoConverter);
-		this.schemaMapper = new MongoJsonSchemaMapper(this.mongoConverter);
-		this.projectionFactory = new SpelAwareProxyProjectionFactory();
 		this.indexCreatorListener = new IndexCreatorEventListener(subscriptionExceptionHandler);
 
 		// We always have a mapping context in the converter, whether it's a simple one or not
 		this.mappingContext = this.mongoConverter.getMappingContext();
-		this.operations = new EntityOperations(this.mappingContext);
-		this.propertyOperations = new PropertyOperations(this.mappingContext);
+		this.operations = new EntityOperations(this.mongoConverter, this.queryMapper);
+		this.propertyOperations = new PropertyOperations(this.mongoConverter.getMappingContext());
+		this.queryOperations = new QueryOperations(queryMapper, updateMapper, operations, propertyOperations,
+				mongoDatabaseFactory);
+		this.eventDelegate = new EntityLifecycleEventDelegate();
 
 		// We create indexes based on mapping events
-		if (this.mappingContext instanceof MongoMappingContext) {
-
-			MongoMappingContext mongoMappingContext = (MongoMappingContext) this.mappingContext;
+		if (this.mappingContext instanceof MongoMappingContext mongoMappingContext) {
 
 			if (mongoMappingContext.isAutoIndexCreation()) {
 				this.indexCreator = new ReactiveMongoPersistentEntityIndexCreator(mongoMappingContext, this::indexOps);
@@ -290,14 +298,14 @@ private ReactiveMongoTemplate(ReactiveMongoDatabaseFactory dbFactory, ReactiveMo
 		this.mongoConverter = that.mongoConverter;
 		this.queryMapper = that.queryMapper;
 		this.updateMapper = that.updateMapper;
-		this.schemaMapper = that.schemaMapper;
-		this.projectionFactory = that.projectionFactory;
 		this.indexCreator = that.indexCreator;
 		this.indexCreatorListener = that.indexCreatorListener;
 		this.mappingContext = that.mappingContext;
 		this.operations = that.operations;
 		this.propertyOperations = that.propertyOperations;
 		this.sessionSynchronization = that.sessionSynchronization;
+		this.queryOperations = that.queryOperations;
+		this.eventDelegate = that.eventDelegate;
 	}
 
 	private void onCheckForIndexes(MongoPersistentEntity<?> entity, Consumer<Throwable> subscriptionExceptionHandler) {
@@ -323,8 +331,7 @@ public void setWriteResultChecking(@Nullable WriteResultChecking resultChecking)
 
 	/**
 	 * Configures the {@link WriteConcern} to be used with the template. If none is configured the {@link WriteConcern}
-	 * configured on the {@link MongoDbFactory} will apply. If you configured a {@link Mongo} instance no
-	 * {@link WriteConcern} will be used.
+	 * configured on the {@link MongoDatabaseFactory} will apply.
 	 *
 	 * @param writeConcern can be {@literal null}.
 	 */
@@ -338,7 +345,8 @@ public void setWriteConcern(@Nullable WriteConcern writeConcern) {
 	 * @param writeConcernResolver can be {@literal null}.
 	 */
 	public void setWriteConcernResolver(@Nullable WriteConcernResolver writeConcernResolver) {
-		this.writeConcernResolver = writeConcernResolver;
+		this.writeConcernResolver = writeConcernResolver != null ? writeConcernResolver
+				: DefaultWriteConcernResolver.INSTANCE;
 	}
 
 	/**
@@ -351,33 +359,39 @@ public void setReadPreference(ReadPreference readPreference) {
 		this.readPreference = readPreference;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
+	/**
+	 * Configure whether lifecycle events such as {@link AfterLoadEvent}, {@link BeforeSaveEvent}, etc. should be
+	 * published or whether emission should be suppressed. Enabled by default.
+	 *
+	 * @param enabled {@code true} to enable entity lifecycle events; {@code false} to disable entity lifecycle events.
+	 * @since 4.0
+	 * @see MongoMappingEvent
 	 */
+	public void setEntityLifecycleEventsEnabled(boolean enabled) {
+		this.eventDelegate.setEventsEnabled(enabled);
+	}
+
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
 		prepareIndexCreator(applicationContext);
 
 		eventPublisher = applicationContext;
+		eventDelegate.setPublisher(eventPublisher);
 
 		if (entityCallbacks == null) {
 			setEntityCallbacks(ReactiveEntityCallbacks.create(applicationContext));
 		}
 
-		if (mappingContext instanceof ApplicationEventPublisherAware) {
-			((ApplicationEventPublisherAware) mappingContext).setApplicationEventPublisher(eventPublisher);
+		if (mappingContext instanceof ApplicationEventPublisherAware applicationEventPublisherAware) {
+			applicationEventPublisherAware.setApplicationEventPublisher(eventPublisher);
 		}
-
-		projectionFactory.setBeanFactory(applicationContext);
-		projectionFactory.setBeanClassLoader(applicationContext.getClassLoader());
 	}
 
 	/**
 	 * Set the {@link ReactiveEntityCallbacks} instance to use when invoking
 	 * {@link org.springframework.data.mapping.callback.EntityCallback callbacks} like the
-	 * {@link ReactiveBeforeSaveCallback}.
-	 * <p />
+	 * {@link ReactiveBeforeSaveCallback}. <br />
 	 * Overrides potentially existing {@link ReactiveEntityCallbacks}.
 	 *
 	 * @param entityCallbacks must not be {@literal null}.
@@ -386,10 +400,53 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 	 */
 	public void setEntityCallbacks(ReactiveEntityCallbacks entityCallbacks) {
 
-		Assert.notNull(entityCallbacks, "EntityCallbacks must not be null!");
+		Assert.notNull(entityCallbacks, "EntityCallbacks must not be null");
 		this.entityCallbacks = entityCallbacks;
 	}
 
+	/**
+	 * Configure whether to use estimated count. Defaults to exact counting.
+	 *
+	 * @param enabled use {@link com.mongodb.client.MongoCollection#estimatedDocumentCount()} for unpaged and empty
+	 *          {@link Query queries} if {@code true}.
+	 * @since 3.4
+	 */
+	public void useEstimatedCount(boolean enabled) {
+		useEstimatedCount(enabled, this::countCanBeEstimated);
+	}
+
+	/**
+	 * Configure whether to use estimated count based on the given {@link BiPredicate estimationFilter}.
+	 *
+	 * @param enabled use {@link com.mongodb.client.MongoCollection#estimatedDocumentCount()} for unpaged and empty
+	 *          {@link Query queries} if {@code true}.
+	 * @param estimationFilter the {@link BiPredicate filter}.
+	 * @since 3.4
+	 */
+	private void useEstimatedCount(boolean enabled, BiFunction<Document, CountOptions, Mono<Boolean>> estimationFilter) {
+
+		if (enabled) {
+
+			this.countExecution = (collectionName, filter, options) -> {
+
+				return estimationFilter.apply(filter, options).flatMap(canEstimate -> {
+					if (!canEstimate) {
+						return doExactCount(collectionName, filter, options);
+					}
+
+					EstimatedDocumentCountOptions estimatedDocumentCountOptions = new EstimatedDocumentCountOptions();
+					if (options.getMaxTime(TimeUnit.MILLISECONDS) > 0) {
+						estimatedDocumentCountOptions.maxTime(options.getMaxTime(TimeUnit.MILLISECONDS), TimeUnit.MILLISECONDS);
+					}
+
+					return doEstimatedCount(collectionName, estimatedDocumentCountOptions);
+				});
+			};
+		} else {
+			this.countExecution = this::doExactCount;
+		}
+	}
+
 	/**
 	 * Inspects the given {@link ApplicationContext} for {@link ReactiveMongoPersistentEntityIndexCreator} and those in
 	 * turn if they were registered for the current {@link MappingContext}. If no creator for the current
@@ -411,8 +468,8 @@ private void prepareIndexCreator(ApplicationContext context) {
 			}
 		}
 
-		if (context instanceof ConfigurableApplicationContext) {
-			((ConfigurableApplicationContext) context).addApplicationListener(indexCreatorListener);
+		if (context instanceof ConfigurableApplicationContext configurableApplicationContext) {
+			configurableApplicationContext.addApplicationListener(indexCreatorListener);
 		}
 	}
 
@@ -421,94 +478,66 @@ private void prepareIndexCreator(ApplicationContext context) {
 	 *
 	 * @return
 	 */
+	@Override
 	public MongoConverter getConverter() {
 		return this.mongoConverter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#reactiveIndexOps(java.lang.String)
-	 */
+	@Override
 	public ReactiveIndexOperations indexOps(String collectionName) {
 		return new DefaultReactiveIndexOperations(this, collectionName, this.queryMapper);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#reactiveIndexOps(java.lang.Class)
-	 */
+	@Override
 	public ReactiveIndexOperations indexOps(Class<?> entityClass) {
 		return new DefaultReactiveIndexOperations(this, getCollectionName(entityClass), this.queryMapper, entityClass);
 	}
 
+	@Override
 	public String getCollectionName(Class<?> entityClass) {
 		return operations.determineCollectionName(entityClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(java.lang.String)
-	 */
+	@Override
 	public Mono<Document> executeCommand(String jsonCommand) {
 
-		Assert.notNull(jsonCommand, "Command must not be empty!");
+		Assert.notNull(jsonCommand, "Command must not be empty");
 
 		return executeCommand(Document.parse(jsonCommand));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(org.bson.Document)
-	 */
+	@Override
 	public Mono<Document> executeCommand(Document command) {
 		return executeCommand(command, null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#executeCommand(org.bson.Document, com.mongodb.ReadPreference)
-	 */
+	@Override
 	public Mono<Document> executeCommand(Document command, @Nullable ReadPreference readPreference) {
 
-		Assert.notNull(command, "Command must not be null!");
+		Assert.notNull(command, "Command must not be null");
 
 		return createFlux(db -> readPreference != null ? db.runCommand(command, readPreference, Document.class)
 				: db.runCommand(command, Document.class)).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(java.lang.Class, org.springframework.data.mongodb.core.ReactiveCollectionCallback)
-	 */
 	@Override
 	public <T> Flux<T> execute(Class<?> entityClass, ReactiveCollectionCallback<T> action) {
 		return createFlux(getCollectionName(entityClass), action);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(org.springframework.data.mongodb.core.ReactiveDbCallback)
-	 */
 	@Override
 	public <T> Flux<T> execute(ReactiveDatabaseCallback<T> action) {
 		return createFlux(action);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#execute(java.lang.String, org.springframework.data.mongodb.core.ReactiveCollectionCallback)
-	 */
+	@Override
 	public <T> Flux<T> execute(String collectionName, ReactiveCollectionCallback<T> callback) {
 
-		Assert.notNull(callback, "ReactiveCollectionCallback must not be null!");
+		Assert.notNull(callback, "ReactiveCollectionCallback must not be null");
 
 		return createFlux(collectionName, callback);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#withSession(org.reactivestreams.Publisher, java.util.function.Consumer)
-	 */
 	@Override
 	public ReactiveSessionScoped withSession(Publisher<ClientSession> sessionProvider) {
 
@@ -541,68 +570,20 @@ public void setSessionSynchronization(SessionSynchronization sessionSynchronizat
 		this.sessionSynchronization = sessionSynchronization;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#inTransaction()
-	 */
-	@Override
-	public ReactiveSessionScoped inTransaction() {
-		return inTransaction(
-				mongoDatabaseFactory.getSession(ClientSessionOptions.builder().causallyConsistent(true).build()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#inTransaction(org.reactivestreams.Publisher)
-	 */
-	@Override
-	public ReactiveSessionScoped inTransaction(Publisher<ClientSession> sessionProvider) {
-
-		Mono<ClientSession> cachedSession = Mono.from(sessionProvider).cache();
-
-		return new ReactiveSessionScoped() {
-
-			@Override
-			public <T> Flux<T> execute(ReactiveSessionCallback<T> action, Consumer<ClientSession> doFinally) {
-
-				return cachedSession.flatMapMany(session -> {
-
-					if (!session.hasActiveTransaction()) {
-						session.startTransaction();
-					}
-
-					return Flux.usingWhen(Mono.just(session), //
-							s -> ReactiveMongoTemplate.this.withSession(action, s), //
-							ClientSession::commitTransaction, //
-							(sess, err) -> sess.abortTransaction(), //
-							ClientSession::commitTransaction) //
-							.doFinally(signalType -> doFinally.accept(session));
-				});
-			}
-		};
-	}
-
 	private <T> Flux<T> withSession(ReactiveSessionCallback<T> action, ClientSession session) {
 
 		ReactiveSessionBoundMongoTemplate operations = new ReactiveSessionBoundMongoTemplate(session,
 				ReactiveMongoTemplate.this);
 
 		return Flux.from(action.doInSession(operations)) //
-				.subscriberContext(ctx -> ReactiveMongoContext.setSession(ctx, Mono.just(session)));
+				.contextWrite(ctx -> ReactiveMongoContext.setSession(ctx, Mono.just(session)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#withSession(com.mongodb.session.ClientSession)
-	 */
+	@Override
 	public ReactiveMongoOperations withSession(ClientSession session) {
 		return new ReactiveSessionBoundMongoTemplate(session, ReactiveMongoTemplate.this);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#withSession(com.mongodb.ClientSessionOptions)
-	 */
 	@Override
 	public ReactiveSessionScoped withSession(ClientSessionOptions sessionOptions) {
 		return withSession(mongoDatabaseFactory.getSession(sessionOptions));
@@ -617,7 +598,7 @@ public ReactiveSessionScoped withSession(ClientSessionOptions sessionOptions) {
 	 */
 	public <T> Flux<T> createFlux(ReactiveDatabaseCallback<T> callback) {
 
-		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null!");
+		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null");
 
 		return Mono.defer(this::doGetDatabase).flatMapMany(database -> callback.doInDB(prepareDatabase(database)))
 				.onErrorMap(translateException());
@@ -632,7 +613,7 @@ public <T> Flux<T> createFlux(ReactiveDatabaseCallback<T> callback) {
 	 */
 	public <T> Mono<T> createMono(ReactiveDatabaseCallback<T> callback) {
 
-		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null!");
+		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null");
 
 		return Mono.defer(this::doGetDatabase).flatMap(database -> Mono.from(callback.doInDB(prepareDatabase(database))))
 				.onErrorMap(translateException());
@@ -647,8 +628,8 @@ public <T> Mono<T> createMono(ReactiveDatabaseCallback<T> callback) {
 	 */
 	public <T> Flux<T> createFlux(String collectionName, ReactiveCollectionCallback<T> callback) {
 
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		Assert.notNull(callback, "ReactiveDatabaseCallback must not be null");
 
 		Mono<MongoCollection<Document>> collectionPublisher = doGetDatabase()
 				.map(database -> getAndPrepareCollection(database, collectionName));
@@ -666,8 +647,8 @@ public <T> Flux<T> createFlux(String collectionName, ReactiveCollectionCallback<
 	 */
 	public <T> Mono<T> createMono(String collectionName, ReactiveCollectionCallback<T> callback) {
 
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		Assert.notNull(callback, "ReactiveCollectionCallback must not be null!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		Assert.notNull(callback, "ReactiveCollectionCallback must not be null");
 
 		Mono<MongoCollection<Document>> collectionPublisher = doGetDatabase()
 				.map(database -> getAndPrepareCollection(database, collectionName));
@@ -676,22 +657,16 @@ public <T> Mono<T> createMono(String collectionName, ReactiveCollectionCallback<
 				.onErrorMap(translateException());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.Class)
-	 */
+	@Override
 	public <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass) {
-		return createCollection(entityClass, CollectionOptions.empty());
+		return createCollection(entityClass, operations.forType(entityClass).getCollectionOptions());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.Class, org.springframework.data.mongodb.core.CollectionOptions)
-	 */
+	@Override
 	public <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass,
 			@Nullable CollectionOptions collectionOptions) {
 
-		Assert.notNull(entityClass, "EntityClass must not be null!");
+		Assert.notNull(entityClass, "EntityClass must not be null");
 
 		CollectionOptions options = collectionOptions != null ? collectionOptions : CollectionOptions.empty();
 		options = Optionals
@@ -702,69 +677,82 @@ public <T> Mono<MongoCollection<Document>> createCollection(Class<T> entityClass
 		return doCreateCollection(getCollectionName(entityClass), convertToCreateCollectionOptions(options, entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.String)
-	 */
+	@Override
 	public Mono<MongoCollection<Document>> createCollection(String collectionName) {
 		return doCreateCollection(collectionName, new CreateCollectionOptions());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#createCollection(java.lang.String, org.springframework.data.mongodb.core.CollectionOptions)
-	 */
+	@Override
 	public Mono<MongoCollection<Document>> createCollection(String collectionName,
 			@Nullable CollectionOptions collectionOptions) {
 		return doCreateCollection(collectionName, convertToCreateCollectionOptions(collectionOptions));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#getCollection(java.lang.String)
-	 */
-	public MongoCollection<Document> getCollection(String collectionName) {
+	@Override
+	public Mono<MongoCollection<Document>> createView(String name, Class<?> source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options) {
 
-		Assert.notNull(collectionName, "Collection name must not be null!");
+		return createView(name, getCollectionName(source),
+				queryOperations.createAggregation(Aggregation.newAggregation(source, pipeline.getOperations()), source),
+				options);
+	}
 
-		try {
-			return this.mongoDatabaseFactory.getMongoDatabase().getCollection(collectionName);
-		} catch (RuntimeException e) {
-			throw potentiallyConvertRuntimeException(e, exceptionTranslator);
+	@Override
+	public Mono<MongoCollection<Document>> createView(String name, String source, AggregationPipeline pipeline,
+			@Nullable ViewOptions options) {
+
+		return createView(name, source,
+				queryOperations.createAggregation(Aggregation.newAggregation(pipeline.getOperations()), (Class<?>) null),
+				options);
+	}
+
+	private Mono<MongoCollection<Document>> createView(String name, String source, AggregationDefinition aggregation,
+			@Nullable ViewOptions options) {
+		return doCreateView(name, source, aggregation.getAggregationPipeline(), options);
+	}
+
+	protected Mono<MongoCollection<Document>> doCreateView(String name, String source, List<Document> pipeline,
+			@Nullable ViewOptions options) {
+
+		CreateViewOptions viewOptions = new CreateViewOptions();
+		if (options != null) {
+			options.getCollation().map(Collation::toMongoCollation).ifPresent(viewOptions::collation);
 		}
+
+		return execute(db -> {
+			return Flux.from(db.createView(name, source, pipeline, viewOptions))
+					.then(Mono.fromSupplier(() -> db.getCollection(name)));
+		}).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#collectionExists(java.lang.Class)
-	 */
+	@Override
+	public Mono<MongoCollection<Document>> getCollection(String collectionName) {
+
+		Assert.notNull(collectionName, "Collection name must not be null");
+
+		return createMono(db -> Mono.just(db.getCollection(collectionName)));
+	}
+
+	@Override
 	public <T> Mono<Boolean> collectionExists(Class<T> entityClass) {
 		return collectionExists(getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#collectionExists(java.lang.String)
-	 */
+	@Override
 	public Mono<Boolean> collectionExists(String collectionName) {
-		return createMono(db -> Flux.from(db.listCollectionNames()) //
-				.filter(s -> s.equals(collectionName)) //
-				.map(s -> true) //
-				.single(false));
+		return createMono(
+				db -> Flux.from(db.listCollectionNames()) //
+						.filter(s -> s.equals(collectionName)) //
+						.map(s -> true) //
+						.single(false));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#dropCollection(java.lang.Class)
-	 */
+	@Override
 	public <T> Mono<Void> dropCollection(Class<T> entityClass) {
 		return dropCollection(getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#dropCollection(java.lang.String)
-	 */
+	@Override
 	public Mono<Void> dropCollection(String collectionName) {
 
 		return createMono(collectionName, MongoCollection::drop).doOnSuccess(success -> {
@@ -774,15 +762,37 @@ public Mono<Void> dropCollection(String collectionName) {
 		}).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#getCollectionNames()
-	 */
+	@Override
+	public ReactiveBulkOperations bulkOps(BulkMode mode, String collectionName) {
+		return bulkOps(mode, null, collectionName);
+	}
+
+	@Override
+	public ReactiveBulkOperations bulkOps(BulkMode mode, Class<?> entityClass) {
+		return bulkOps(mode, entityClass, getCollectionName(entityClass));
+	}
+
+	@Override
+	public ReactiveBulkOperations bulkOps(BulkMode mode, @Nullable Class<?> entityType, String collectionName) {
+
+		Assert.notNull(mode, "BulkMode must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+
+		DefaultReactiveBulkOperations operations = new DefaultReactiveBulkOperations(this, collectionName,
+				new ReactiveBulkOperationContext(mode, Optional.ofNullable(getPersistentEntity(entityType)), queryMapper,
+						updateMapper, eventPublisher, entityCallbacks));
+
+		operations.setDefaultWriteConcern(writeConcern);
+
+		return operations;
+	}
+
+	@Override
 	public Flux<String> getCollectionNames() {
-		return createFlux(MongoDatabase::listCollectionNames);
+		return createFlux(db -> db.listCollectionNames());
 	}
 
-	public MongoDatabase getMongoDatabase() {
+	public Mono<MongoDatabase> getMongoDatabase() {
 		return mongoDatabaseFactory.getMongoDatabase();
 	}
 
@@ -790,49 +800,34 @@ protected Mono<MongoDatabase> doGetDatabase() {
 		return ReactiveMongoDatabaseUtils.getDatabase(mongoDatabaseFactory, sessionSynchronization);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
+	@Override
 	public <T> Mono<T> findOne(Query query, Class<T> entityClass) {
 		return findOne(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findOne(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public <T> Mono<T> findOne(Query query, Class<T> entityClass, String collectionName) {
 
 		if (ObjectUtils.isEmpty(query.getSortObject())) {
-			return doFindOne(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
-					new QueryFindPublisherPreparer(query, entityClass));
+			return doFindOne(collectionName, ReactiveCollectionPreparerDelegate.of(query), query.getQueryObject(),
+					query.getFieldsObject(), entityClass, new QueryFindPublisherPreparer(query, entityClass));
 		}
 
 		query.limit(1);
 		return find(query, entityClass, collectionName).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#exists(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
+	@Override
 	public Mono<Boolean> exists(Query query, Class<?> entityClass) {
 		return exists(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#exists(org.springframework.data.mongodb.core.query.Query, java.lang.String)
-	 */
+	@Override
 	public Mono<Boolean> exists(Query query, String collectionName) {
 		return exists(query, null, collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#exists(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public Mono<Boolean> exists(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
 		if (query == null) {
@@ -841,115 +836,142 @@ public Mono<Boolean> exists(Query query, @Nullable Class<?> entityClass, String
 
 		return createFlux(collectionName, collection -> {
 
-			Document filter = queryMapper.getMappedObject(query.getQueryObject(), getPersistentEntity(entityClass));
-			FindPublisher<Document> findPublisher = collection.find(filter, Document.class)
-					.projection(new Document("_id", 1));
+			ReactiveCollectionPreparerDelegate collectionPreparer = ReactiveCollectionPreparerDelegate.of(query);
+			QueryContext queryContext = queryOperations.createQueryContext(query);
+			Document filter = queryContext.getMappedQuery(entityClass, this::getPersistentEntity);
+
+			FindPublisher<Document> findPublisher = collectionPreparer.prepare(collection).find(filter, Document.class)
+					.projection(new Document(FieldName.ID.name(), 1));
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("exists: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
+				LOGGER.debug(String.format("exists: %s in collection: %s", serializeToJsonSafely(filter), collectionName));
 			}
 
-			findPublisher = operations.forType(entityClass).getCollation(query).map(Collation::toMongoCollation)
-					.map(findPublisher::collation).orElse(findPublisher);
+			queryContext.applyCollation(entityClass, findPublisher::collation);
 
 			return findPublisher.limit(1);
 		}).hasElements();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#find(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
+	@Override
 	public <T> Flux<T> find(Query query, Class<T> entityClass) {
 		return find(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#find(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public <T> Flux<T> find(@Nullable Query query, Class<T> entityClass, String collectionName) {
 
 		if (query == null) {
 			return findAll(entityClass, collectionName);
 		}
 
-		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
-				new QueryFindPublisherPreparer(query, entityClass));
+		return doFind(collectionName, ReactiveCollectionPreparerDelegate.of(query), query.getQueryObject(),
+				query.getFieldsObject(), entityClass, new QueryFindPublisherPreparer(query, entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findById(java.lang.Object, java.lang.Class)
-	 */
+	@Override
+	public <T> Mono<Window<T>> scroll(Query query, Class<T> entityType) {
+
+		Assert.notNull(entityType, "Entity type must not be null");
+
+		return scroll(query, entityType, getCollectionName(entityType));
+	}
+
+	@Override
+	public <T> Mono<Window<T>> scroll(Query query, Class<T> entityType, String collectionName) {
+		return doScroll(query, entityType, entityType, QueryResultConverter.entity(), collectionName);
+	}
+
+	<T, R> Mono<Window<R>> doScroll(Query query, Class<?> sourceClass, Class<T> targetClass,
+			QueryResultConverter<? super T, ? extends R> resultConverter, String collectionName) {
+
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(sourceClass, "Entity type must not be null");
+		Assert.notNull(targetClass, "Target type must not be null");
+
+		EntityProjection<T, ?> projection = operations.introspectProjection(targetClass, sourceClass);
+		DocumentCallback<R> callback = getResultReader(projection, collectionName, resultConverter);
+		int limit = query.isLimited() ? query.getLimit() + 1 : Integer.MAX_VALUE;
+
+		if (query.hasKeyset()) {
+
+			KeysetScrollQuery keysetPaginationQuery = ScrollUtils.createKeysetPaginationQuery(query,
+					operations.getIdPropertyName(sourceClass));
+
+			Mono<List<R>> result = doFind(collectionName, ReactiveCollectionPreparerDelegate.of(query),
+					keysetPaginationQuery.query(), keysetPaginationQuery.fields(), sourceClass,
+					new QueryFindPublisherPreparer(query, keysetPaginationQuery.sort(), limit, 0, sourceClass), callback)
+					.collectList();
+
+			return result.map(it -> ScrollUtils.createWindow(query, it, sourceClass, operations));
+		}
+
+		Mono<List<R>> result = doFind(collectionName, ReactiveCollectionPreparerDelegate.of(query), query.getQueryObject(),
+				query.getFieldsObject(), sourceClass,
+				new QueryFindPublisherPreparer(query, query.getSortObject(), limit, query.getSkip(), sourceClass), callback)
+				.collectList();
+
+		return result.map(
+				it -> ScrollUtils.createWindow(it, query.getLimit(), OffsetScrollPosition.positionFunction(query.getSkip())));
+	}
+
+	@Override
 	public <T> Mono<T> findById(Object id, Class<T> entityClass) {
 		return findById(id, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findById(java.lang.Object, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public <T> Mono<T> findById(Object id, Class<T> entityClass, String collectionName) {
 
 		String idKey = operations.getIdPropertyName(entityClass);
 
-		return doFindOne(collectionName, new Document(idKey, id), null, entityClass, (Collation) null);
+		return doFindOne(collectionName, CollectionPreparer.identity(), new Document(idKey, id), null, entityClass,
+				(Collation) null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.Class, java.lang.Class)
-	 */
+	@Override
 	public <T> Flux<T> findDistinct(Query query, String field, Class<?> entityClass, Class<T> resultClass) {
 		return findDistinct(query, field, getCollectionName(entityClass), entityClass, resultClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findDistinct(org.springframework.data.mongodb.core.query.Query, java.lang.String, java.lang.String, java.lang.Class, java.lang.Class)
-	 */
+	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Flux<T> findDistinct(Query query, String field, String collectionName, Class<?> entityClass,
 			Class<T> resultClass) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(field, "Field must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(entityClass, "EntityClass must not be null!");
-		Assert.notNull(resultClass, "ResultClass must not be null!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(field, "Field must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(entityClass, "EntityClass must not be null");
+		Assert.notNull(resultClass, "ResultClass must not be null");
 
 		MongoPersistentEntity<?> entity = getPersistentEntity(entityClass);
+		DistinctQueryContext distinctQueryContext = queryOperations.distinctQueryContext(query, field);
 
-		Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), entity);
-		String mappedFieldName = queryMapper.getMappedFields(new Document(field, 1), entity).keySet().iterator().next();
-
-		Class<T> mongoDriverCompatibleType = mongoDatabaseFactory.getCodecFor(resultClass) //
-				.map(Codec::getEncoderClass) //
-				.orElse((Class<T>) BsonValue.class);
+		Document mappedQuery = distinctQueryContext.getMappedQuery(entity);
+		String mappedFieldName = distinctQueryContext.getMappedFieldName(entity);
+		Class<T> mongoDriverCompatibleType = distinctQueryContext.getDriverCompatibleClass(resultClass);
+		ReactiveCollectionPreparerDelegate collectionPreparer = ReactiveCollectionPreparerDelegate.of(query);
 
 		Flux<?> result = execute(collectionName, collection -> {
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Executing findDistinct using query {} for field: {} in collection: {}",
-						serializeToJsonSafely(mappedQuery), field, collectionName);
+				LOGGER.debug(String.format("Executing findDistinct using query %s for field: %s in collection: %s",
+						serializeToJsonSafely(mappedQuery), field, collectionName));
 			}
 
 			FindPublisherPreparer preparer = new QueryFindPublisherPreparer(query, entityClass);
-			if (preparer.hasReadPreference()) {
-				collection = collection.withReadPreference(preparer.getReadPreference());
-			}
 
-			DistinctPublisher<T> publisher = collection.distinct(mappedFieldName, mappedQuery, mongoDriverCompatibleType);
-			return operations.forType(entityClass).getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.map(publisher::collation) //
-					.orElse(publisher);
+			DistinctPublisher<T> publisher = collectionPreparer.prepare(collection).distinct(mappedFieldName, mappedQuery,
+					mongoDriverCompatibleType);
+			distinctQueryContext.applyCollation(entityClass, publisher::collation);
+			return publisher;
 		});
 
 		if (resultClass == Object.class || mongoDriverCompatibleType != resultClass) {
 
-			Class<?> targetType = getMostSpecificConversionTargetType(resultClass, entityClass, field);
+			Class<?> targetType = distinctQueryContext.getMostSpecificConversionTargetType(resultClass, entityClass);
 			MongoConverter converter = getConverter();
 
 			result = result.map(it -> converter.mapValueToTargetType(it, targetType, NO_OP_REF_RESOLVER));
@@ -958,111 +980,68 @@ public <T> Flux<T> findDistinct(Query query, String field, String collectionName
 		return (Flux<T>) result;
 	}
 
-	/**
-	 * @param userType must not be {@literal null}.
-	 * @param domainType must not be {@literal null}.
-	 * @param field must not be {@literal null}.
-	 * @return the most specific conversion target type depending on user preference and domain type property.
-	 * @since 2.1
-	 */
-	private static Class<?> getMostSpecificConversionTargetType(Class<?> userType, Class<?> domainType, String field) {
-
-		Class<?> conversionTargetType = userType;
-		try {
-
-			Class<?> propertyType = PropertyPath.from(field, domainType).getLeafProperty().getLeafType();
-
-			// use the more specific type but favor UserType over property one
-			if (ClassUtils.isAssignable(userType, propertyType)) {
-				conversionTargetType = propertyType;
-			}
-
-		} catch (PropertyReferenceException e) {
-			// just don't care about it as we default to Object.class anyway.
-		}
-
-		return conversionTargetType;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <O> Flux<O> aggregate(TypedAggregation<?> aggregation, String inputCollectionName, Class<O> outputType) {
 
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-
-		AggregationOperationContext context = new TypeBasedAggregationOperationContext(aggregation.getInputType(),
-				mappingContext, queryMapper);
-		return aggregate(aggregation, inputCollectionName, outputType, context);
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
+		return doAggregate(aggregation, inputCollectionName, aggregation.getInputType(), outputType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.TypedAggregation, java.lang.Class)
-	 */
 	@Override
 	public <O> Flux<O> aggregate(TypedAggregation<?> aggregation, Class<O> outputType) {
+
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
 		return aggregate(aggregation, getCollectionName(aggregation.getInputType()), outputType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.Class, java.lang.Class)
-	 */
 	@Override
 	public <O> Flux<O> aggregate(Aggregation aggregation, Class<?> inputType, Class<O> outputType) {
-
-		return aggregate(aggregation, getCollectionName(inputType), outputType,
-				new TypeBasedAggregationOperationContext(inputType, mappingContext, queryMapper));
+		return doAggregate(aggregation, getCollectionName(inputType), inputType, outputType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#aggregate(org.springframework.data.mongodb.core.aggregation.Aggregation, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <O> Flux<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType) {
-		return aggregate(aggregation, collectionName, outputType, null);
+		return doAggregate(aggregation, collectionName, null, outputType);
 	}
 
-	/**
-	 * @param aggregation must not be {@literal null}.
-	 * @param collectionName must not be {@literal null}.
-	 * @param outputType must not be {@literal null}.
-	 * @param context can be {@literal null} and will be defaulted to {@link Aggregation#DEFAULT_CONTEXT}.
-	 * @return never {@literal null}.
-	 */
-	protected <O> Flux<O> aggregate(Aggregation aggregation, String collectionName, Class<O> outputType,
-			@Nullable AggregationOperationContext context) {
+	protected <O> Flux<O> doAggregate(Aggregation aggregation, String collectionName, @Nullable Class<?> inputType,
+			Class<O> outputType) {
+		return doAggregate(aggregation, collectionName, inputType, outputType, QueryResultConverter.entity());
+	}
 
-		Assert.notNull(aggregation, "Aggregation pipeline must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
-		Assert.notNull(outputType, "Output type must not be null!");
+	<T, O> Flux<O> doAggregate(Aggregation aggregation, String collectionName, @Nullable Class<?> inputType,
+			Class<T> outputType, QueryResultConverter<? super T, ? extends O> resultConverter) {
 
-		AggregationUtil aggregationUtil = new AggregationUtil(queryMapper, mappingContext);
-		AggregationOperationContext rootContext = aggregationUtil.prepareAggregationContext(aggregation, context);
+		Assert.notNull(aggregation, "Aggregation pipeline must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
+		Assert.notNull(outputType, "Output type must not be null");
 
 		AggregationOptions options = aggregation.getOptions();
-		List<Document> pipeline = aggregationUtil.createPipeline(aggregation, rootContext);
+		Assert.isTrue(!options.isExplain(), "Cannot use explain option with streaming");
 
-		Assert.isTrue(!options.isExplain(), "Cannot use explain option with streaming!");
+		AggregationDefinition ctx = queryOperations.createAggregation(aggregation, inputType);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Streaming aggregation: {} in collection {}", serializeToJsonSafely(pipeline), collectionName);
+			LOGGER.debug(String.format("Streaming aggregation: %s in collection %s",
+					serializeToJsonSafely(ctx.getAggregationPipeline()), collectionName));
 		}
 
-		ReadDocumentCallback<O> readCallback = new ReadDocumentCallback<>(mongoConverter, outputType, collectionName);
-		return execute(collectionName, collection -> aggregateAndMap(collection, pipeline, options, readCallback,
-				aggregation instanceof TypedAggregation ? ((TypedAggregation) aggregation).getInputType() : null));
+		DocumentCallback<O> readCallback = new QueryResultConverterCallback<>(resultConverter,
+				new ReadDocumentCallback<>(mongoConverter, outputType, collectionName));
+		return execute(collectionName, collection -> aggregateAndMap(collection, ctx.getAggregationPipeline(),
+				ctx.isOutOrMerge(), options, readCallback, ctx.getInputType()));
 	}
 
 	private <O> Flux<O> aggregateAndMap(MongoCollection<Document> collection, List<Document> pipeline,
-			AggregationOptions options, ReadDocumentCallback<O> readCallback, @Nullable Class<?> inputType) {
+			boolean isOutOrMerge, AggregationOptions options, DocumentCallback<O> readCallback,
+			@Nullable Class<?> inputType) {
 
-		AggregatePublisher<Document> cursor = collection.aggregate(pipeline, Document.class)
-				.allowDiskUse(options.isAllowDiskUse());
+		ReactiveCollectionPreparerDelegate collectionPreparer = ReactiveCollectionPreparerDelegate.of(options);
+		AggregatePublisher<Document> cursor = collectionPreparer.prepare(collection).aggregate(pipeline, Document.class);
+
+		if (options.isAllowDiskUseSet()) {
+			cursor = cursor.allowDiskUse(options.isAllowDiskUse());
+		}
 
 		if (options.getCursorBatchSize() != null) {
 			cursor = cursor.batchSize(options.getCursorBatchSize());
@@ -1070,6 +1049,11 @@ private <O> Flux<O> aggregateAndMap(MongoCollection<Document> collection, List<D
 
 		options.getComment().ifPresent(cursor::comment);
 
+		HintFunction hintFunction = options.getHintObject().map(HintFunction::from).orElseGet(HintFunction::empty);
+		if (hintFunction.isPresent()) {
+			cursor = hintFunction.apply(mongoDatabaseFactory, cursor::hintString, cursor::hint);
+		}
+
 		Optionals.firstNonEmpty(options::getCollation, () -> operations.forType(inputType).getCollation()) //
 				.map(Collation::toMongoCollation) //
 				.ifPresent(cursor::collation);
@@ -1078,218 +1062,214 @@ private <O> Flux<O> aggregateAndMap(MongoCollection<Document> collection, List<D
 			cursor = cursor.maxTime(options.getMaxTime().toMillis(), TimeUnit.MILLISECONDS);
 		}
 
-		return Flux.from(cursor).map(readCallback::doWith);
+		if (options.isSkipResults()) {
+			return (isOutOrMerge ? Flux.from(cursor.toCollection()) : Flux.from(cursor.first())).thenMany(Mono.empty());
+		}
+
+		return Flux.from(cursor).flatMapSequential(readCallback::doWith);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#geoNear(org.springframework.data.mongodb.core.query.NearQuery, java.lang.Class)
-	 */
 	@Override
 	public <T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass) {
 		return geoNear(near, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#geoNear(org.springframework.data.mongodb.core.query.NearQuery, java.lang.Class, java.lang.String)
-	 */
 	@Override
 	public <T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<T> entityClass, String collectionName) {
 		return geoNear(near, entityClass, collectionName, entityClass);
 	}
 
-	@SuppressWarnings("unchecked")
 	protected <T> Flux<GeoResult<T>> geoNear(NearQuery near, Class<?> entityClass, String collectionName,
 			Class<T> returnType) {
+		return doGeoNear(near, entityClass, collectionName, returnType, QueryResultConverter.entity());
+	}
+
+	@SuppressWarnings("unchecked")
+	<T, R> Flux<GeoResult<R>> doGeoNear(NearQuery near, Class<?> entityClass, String collectionName, Class<T> returnType,
+			QueryResultConverter<? super T, ? extends R> resultConverter) {
 
 		if (near == null) {
-			throw new InvalidDataAccessApiUsageException("NearQuery must not be null!");
+			throw new InvalidDataAccessApiUsageException("NearQuery must not be null");
 		}
 
 		if (entityClass == null) {
-			throw new InvalidDataAccessApiUsageException("Entity class must not be null!");
+			throw new InvalidDataAccessApiUsageException("Entity class must not be null");
 		}
 
 		String collection = StringUtils.hasText(collectionName) ? collectionName : getCollectionName(entityClass);
 		String distanceField = operations.nearQueryDistanceFieldName(entityClass);
+		EntityProjection<T, ?> projection = operations.introspectProjection(returnType, entityClass);
+
+		GeoNearResultDocumentCallback<R> callback = new GeoNearResultDocumentCallback<>(distanceField,
+				getResultReader(projection, collectionName, resultConverter), near.getMetric());
+
+		Builder optionsBuilder = AggregationOptions.builder();
+		if (near.hasReadPreference()) {
+			optionsBuilder.readPreference(near.getReadPreference());
+		}
+
+		if (near.hasReadConcern()) {
+			optionsBuilder.readConcern(near.getReadConcern());
+		}
 
-		GeoNearResultDocumentCallback<T> callback = new GeoNearResultDocumentCallback<>(distanceField,
-				new ProjectingReadCallback<>(mongoConverter, entityClass, returnType, collection), near.getMetric());
+		optionsBuilder.collation(near.getCollation());
 
 		Aggregation $geoNear = TypedAggregation.newAggregation(entityClass, Aggregation.geoNear(near, distanceField))
-				.withOptions(AggregationOptions.builder().collation(near.getCollation()).build());
+				.withOptions(optionsBuilder.build());
 
 		return aggregate($geoNear, collection, Document.class) //
-				.map(callback::doWith);
+				.flatMapSequential(callback::doWith);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class)
-	 */
+	@Override
 	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, Class<T> entityClass) {
 		return findAndModify(query, update, new FindAndModifyOptions(), entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, Class<T> entityClass, String collectionName) {
 		return findAndModify(query, update, new FindAndModifyOptions(), entityClass, collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, org.springframework.data.mongodb.core.FindAndModifyOptions, java.lang.Class)
-	 */
+	@Override
 	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
 			Class<T> entityClass) {
 		return findAndModify(query, update, options, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndModify(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, org.springframework.data.mongodb.core.FindAndModifyOptions, java.lang.Class, java.lang.String)
-	 */
-	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
-			Class<T> entityClass, String collectionName) {
+	public <S, T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
+			Class<S> entityClass, String collectionName, QueryResultConverter<? super S, ? extends T> resultConverter) {
 
-		Assert.notNull(options, "Options must not be null! ");
-		Assert.notNull(entityClass, "Entity class must not be null!");
+		Assert.notNull(options, "Options must not be null ");
+		Assert.notNull(entityClass, "Entity class must not be null");
 
 		FindAndModifyOptions optionsToUse = FindAndModifyOptions.of(options);
 
 		Optionals.ifAllPresent(query.getCollation(), optionsToUse.getCollation(), (l, r) -> {
 			throw new IllegalArgumentException(
-					"Both Query and FindAndModifyOptions define a collation. Please provide the collation only via one of the two.");
+					"Both Query and FindAndModifyOptions define a collation; Please provide the collation only via one of the two");
 		});
 
 		if (!optionsToUse.getCollation().isPresent()) {
 			operations.forType(entityClass).getCollation(query).ifPresent(optionsToUse::collation);
 		}
 
-		return doFindAndModify(collectionName, query.getQueryObject(), query.getFieldsObject(),
-				getMappedSortObject(query, entityClass), entityClass, update, optionsToUse);
+		return doFindAndModify(collectionName, ReactiveCollectionPreparerDelegate.of(query), query.getQueryObject(),
+				query.getFieldsObject(), getMappedSortObject(query, entityClass), entityClass, update, optionsToUse,
+				resultConverter);
+	}
+
+	@Override
+	public <T> Mono<T> findAndModify(Query query, UpdateDefinition update, FindAndModifyOptions options,
+			Class<T> entityClass, String collectionName) {
+		return findAndModify(query, update, options, entityClass, collectionName, QueryResultConverter.entity());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndReplace(org.springframework.data.mongodb.core.query.Query, java.lang.Object, org.springframework.data.mongodb.core.FindAndReplaceOptions, java.lang.Class, java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <S, T> Mono<T> findAndReplace(Query query, S replacement, FindAndReplaceOptions options, Class<S> entityType,
 			String collectionName, Class<T> resultType) {
+		return findAndReplace(query, replacement, options, entityType, collectionName, resultType,
+				QueryResultConverter.entity());
+	}
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(replacement, "Replacement must not be null!");
-		Assert.notNull(options, "Options must not be null! Use FindAndReplaceOptions#empty() instead.");
-		Assert.notNull(entityType, "Entity class must not be null!");
-		Assert.notNull(collectionName, "CollectionName must not be null!");
-		Assert.notNull(resultType, "ResultType must not be null! Use Object.class instead.");
+	@SuppressWarnings("NullAway")
+	public <S, T, R> Mono<R> findAndReplace(Query query, S replacement, FindAndReplaceOptions options,
+			Class<S> entityType, String collectionName, Class<T> resultType,
+			QueryResultConverter<? super T, ? extends R> resultConverter) {
 
-		Assert.isTrue(query.getLimit() <= 1, "Query must not define a limit other than 1 ore none!");
-		Assert.isTrue(query.getSkip() <= 0, "Query must not define skip.");
+		Assert.notNull(query, "Query must not be null");
+		Assert.notNull(replacement, "Replacement must not be null");
+		Assert.notNull(options, "Options must not be null Use FindAndReplaceOptions#empty() instead");
+		Assert.notNull(entityType, "Entity class must not be null");
+		Assert.notNull(collectionName, "CollectionName must not be null");
+		Assert.notNull(resultType, "ResultType must not be null Use Object.class instead");
+
+		Assert.isTrue(query.getLimit() <= 1, "Query must not define a limit other than 1 ore none");
+		Assert.isTrue(query.getSkip() <= 0, "Query must not define skip");
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityType);
+		QueryContext queryContext = queryOperations.createQueryContext(query);
+		EntityProjection<T, S> projection = operations.introspectProjection(resultType, entityType);
 
-		Document mappedQuery = queryMapper.getMappedObject(query.getQueryObject(), entity);
-		Document mappedFields = queryMapper.getMappedFields(query.getFieldsObject(), entity);
-		Document mappedSort = queryMapper.getMappedSort(query.getSortObject(), entity);
+		Document mappedQuery = queryContext.getMappedQuery(entity);
+		Document mappedFields = queryContext.getMappedFields(entity, projection);
+		Document mappedSort = queryContext.getMappedSort(entity);
+		ReactiveCollectionPreparerDelegate collectionPreparer = ReactiveCollectionPreparerDelegate.of(query);
 
-		return Mono.just(PersistableEntityModel.of(replacement, collectionName)) //
-				.doOnNext(it -> maybeEmitEvent(new BeforeConvertEvent<>(it.getSource(), it.getCollection()))) //
-				.flatMap(it -> maybeCallBeforeConvert(it.getSource(), it.getCollection()).map(it::mutate))
-				.map(it -> it
-						.addTargetDocument(operations.forEntity(it.getSource()).toMappedDocument(mongoConverter).getDocument())) //
-				.doOnNext(it -> maybeEmitEvent(new BeforeSaveEvent(it.getSource(), it.getTarget(), it.getCollection()))) //
-				.flatMap(it -> {
+		return Mono.defer(() -> {
 
-					PersistableEntityModel<S> flowObject = (PersistableEntityModel<S>) it;
-					return maybeCallBeforeSave(flowObject.getSource(), flowObject.getTarget(), flowObject.getCollection())
-							.map(potentiallyModified -> PersistableEntityModel.of(potentiallyModified, flowObject.getTarget(),
-									flowObject.getCollection()));
-				}).flatMap(it -> {
+			PersistableEntityModel<S> pem = PersistableEntityModel.of(replacement, collectionName);
+
+			maybeEmitEvent(new BeforeConvertEvent<>(pem.getSource(), pem.getCollection()));
 
-					PersistableEntityModel<S> flowObject = (PersistableEntityModel<S>) it;
-					return doFindAndReplace(flowObject.getCollection(), mappedQuery, mappedFields, mappedSort,
-							operations.forType(entityType).getCollation(query).map(Collation::toMongoCollation).orElse(null),
-							entityType, flowObject.getTarget(), options, resultType);
+			return maybeCallBeforeConvert(pem.getSource(), pem.getCollection()).map(pem::mutate).flatMap(it -> {
+				PersistableEntityModel<S> mapped = it
+						.addTargetDocument(operations.forEntity(it.getSource()).toMappedDocument(mongoConverter).getDocument());
+				maybeEmitEvent(new BeforeSaveEvent(mapped.getSource(), mapped.getTarget(), mapped.getCollection()));
+
+				return maybeCallBeforeSave(it.getSource(), mapped.getTarget(), mapped.getCollection())
+						.map(potentiallyModified -> PersistableEntityModel.of(potentiallyModified, mapped.getTarget(),
+								mapped.getCollection()));
+			}).flatMap(it -> {
+
+				Mono<R> afterFindAndReplace = doFindAndReplace(it.getCollection(), collectionPreparer, mappedQuery,
+						mappedFields, mappedSort, queryContext.getCollation(entityType).orElse(null), entityType, it.getTarget(),
+						options, projection, resultConverter);
+				return afterFindAndReplace.flatMap(saved -> {
+					maybeEmitEvent(new AfterSaveEvent<>(saved, it.getTarget(), it.getCollection()));
+					return maybeCallAfterSave(saved, it.getTarget(), it.getCollection());
 				});
+			});
+		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
+	@Override
 	public <T> Mono<T> findAndRemove(Query query, Class<T> entityClass) {
 		return findAndRemove(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public <T> Mono<T> findAndRemove(Query query, Class<T> entityClass, String collectionName) {
 
 		operations.forType(entityClass).getCollation(query);
-		return doFindAndRemove(collectionName, query.getQueryObject(), query.getFieldsObject(),
-				getMappedSortObject(query, entityClass), operations.forType(entityClass).getCollation(query).orElse(null),
-				entityClass);
+		return doFindAndRemove(collectionName, ReactiveCollectionPreparerDelegate.of(query), query.getQueryObject(),
+				query.getFieldsObject(), getMappedSortObject(query, entityClass),
+				operations.forType(entityClass).getCollation(query).orElse(null), entityClass);
 	}
 
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
 	 */
+	@Override
 	public Mono<Long> count(Query query, Class<?> entityClass) {
 
-		Assert.notNull(entityClass, "Entity class must not be null!");
+		Assert.notNull(entityClass, "Entity class must not be null");
 
 		return count(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.String)
-	 */
+	@Override
 	public Mono<Long> count(Query query, String collectionName) {
 		return count(query, null, collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#count(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String collectionName) {
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(query, "Query must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
 		return createMono(collectionName, collection -> {
 
-			Document filter = queryMapper.getMappedObject(query.getQueryObject(),
-					entityClass == null ? null : mappingContext.getPersistentEntity(entityClass));
-
-			CountOptions options = new CountOptions();
-			query.getCollation().map(Collation::toMongoCollation).ifPresent(options::collation);
-
-			if (query.getLimit() > 0) {
-				options.limit(query.getLimit());
-			}
-			if (query.getSkip() > 0) {
-				options.skip((int) query.getSkip());
-			}
-			if (StringUtils.hasText(query.getHint())) {
-				options.hint(Document.parse(query.getHint()));
-			}
+			CountContext countContext = queryOperations.countQueryContext(query);
 
-			operations.forType(entityClass).getCollation(query).map(Collation::toMongoCollation) //
-					.ifPresent(options::collation);
+			CountOptions options = countContext.getCountOptions(entityClass);
+			Document filter = countContext.getMappedQuery(entityClass, mappingContext::getPersistentEntity);
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Executing count: {} in collection: {}", serializeToJsonSafely(filter), collectionName);
+				LOGGER.debug(
+						String.format("Executing count: %s in collection: %s", serializeToJsonSafely(filter), collectionName));
 			}
 
 			return doCount(collectionName, filter, options);
@@ -1306,10 +1286,56 @@ public Mono<Long> count(Query query, @Nullable Class<?> entityClass, String coll
 	 */
 	protected Mono<Long> doCount(String collectionName, Document filter, CountOptions options) {
 
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER
+					.debug(String.format("Executing count: %s in collection: %s", serializeToJsonSafely(filter), collectionName));
+		}
+
+		return countExecution.countDocuments(collectionName, filter, options);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#estimatedCount(java.lang.String)
+	 */
+	@Override
+	public Mono<Long> estimatedCount(String collectionName) {
+		return doEstimatedCount(collectionName, new EstimatedDocumentCountOptions());
+	}
+
+	protected Mono<Long> doEstimatedCount(String collectionName, EstimatedDocumentCountOptions options) {
+		return createMono(collectionName, collection -> collection.estimatedDocumentCount(options));
+	}
+
+	@Override
+	public Mono<Long> exactCount(Query query, @Nullable Class<?> entityClass, String collectionName) {
+
+		CountContext countContext = queryOperations.countQueryContext(query);
+
+		CountOptions options = countContext.getCountOptions(entityClass);
+		Document mappedQuery = countContext.getMappedQuery(entityClass, mappingContext::getPersistentEntity);
+
+		return doExactCount(collectionName, mappedQuery, options);
+	}
+
+	protected Mono<Long> doExactCount(String collectionName, Document filter, CountOptions options) {
+
 		return createMono(collectionName,
 				collection -> collection.countDocuments(CountQuery.of(filter).toQueryDocument(), options));
 	}
 
+	protected Mono<Boolean> countCanBeEstimated(Document filter, CountOptions options) {
+
+		if (!filter.isEmpty() || !isEmptyOptions(options)) {
+			return Mono.just(false);
+		}
+		return ReactiveMongoDatabaseUtils.isTransactionActive(getMongoDatabaseFactory()).map(it -> !it);
+	}
+
+	private boolean isEmptyOptions(CountOptions options) {
+		return options.getLimit() <= 0 && options.getSkip() <= 0;
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono)
@@ -1317,56 +1343,43 @@ protected Mono<Long> doCount(String collectionName, Document filter, CountOption
 	@Override
 	public <T> Mono<T> insert(Mono<? extends T> objectToSave) {
 
-		Assert.notNull(objectToSave, "Mono to insert must not be null!");
+		Assert.notNull(objectToSave, "Mono to insert must not be null");
 
 		return objectToSave.flatMap(this::insert);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono, java.lang.Class)
-	 */
 	@Override
 	public <T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, Class<?> entityClass) {
 		return insertAll(batchToSave, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(reactor.core.publisher.Mono, java.lang.String)
-	 */
 	@Override
 	public <T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> batchToSave, String collectionName) {
 
-		Assert.notNull(batchToSave, "Batch to insert must not be null!");
+		Assert.notNull(batchToSave, "Batch to insert must not be null");
 
-		return Flux.from(batchToSave).flatMap(collection -> insert(collection, collectionName));
+		return Flux.from(batchToSave).flatMapSequential(collection -> insert(collection, collectionName));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.lang.Object)
-	 */
+	@Override
 	public <T> Mono<T> insert(T objectToSave) {
 
-		Assert.notNull(objectToSave, "Object to insert must not be null!");
+		Assert.notNull(objectToSave, "Object to insert must not be null");
 
-		ensureNotIterable(objectToSave);
+		ensureNotCollectionLike(objectToSave);
 		return insert(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.lang.Object, java.lang.String)
-	 */
+	@Override
 	public <T> Mono<T> insert(T objectToSave, String collectionName) {
 
-		Assert.notNull(objectToSave, "Object to insert must not be null!");
+		Assert.notNull(objectToSave, "Object to insert must not be null");
 
-		ensureNotIterable(objectToSave);
+		ensureNotCollectionLike(objectToSave);
 		return doInsert(collectionName, objectToSave, this.mongoConverter);
 	}
 
+	@SuppressWarnings("NullAway")
 	protected <T> Mono<T> doInsert(String collectionName, T objectToSave, MongoWriter<Object> writer) {
 
 		return Mono.just(PersistableEntityModel.of(objectToSave, collectionName)) //
@@ -1377,58 +1390,47 @@ protected <T> Mono<T> doInsert(String collectionName, T objectToSave, MongoWrite
 					AdaptibleEntity<T> entity = operations.forEntity(it.getSource(), mongoConverter.getConversionService());
 					entity.assertUpdateableIdIfNotSet();
 
-					return PersistableEntityModel.of(entity.initializeVersionProperty(),
+					PersistableEntityModel<T> model = PersistableEntityModel.of(entity.initializeVersionProperty(),
 							entity.toMappedDocument(writer).getDocument(), it.getCollection());
-				}).doOnNext(it -> maybeEmitEvent(new BeforeSaveEvent<>(it.getSource(), it.getTarget(), it.getCollection()))) //
-				.flatMap(it -> {
 
+					maybeEmitEvent(new BeforeSaveEvent<>(model.getSource(), model.getTarget(), model.getCollection()));
+					return model;
+				})//
+				.flatMap(it -> {
 					return maybeCallBeforeSave(it.getSource(), it.getTarget(), it.getCollection()).map(it::mutate);
-
 				}).flatMap(it -> {
 
-					return insertDocument(it.getCollection(), it.getTarget(), it.getSource().getClass()).map(id -> {
+					return insertDocument(it.getCollection(), it.getTarget(), it.getSource().getClass()).flatMap(id -> {
 
 						T saved = operations.forEntity(it.getSource(), mongoConverter.getConversionService())
 								.populateIdIfNecessary(id);
 						maybeEmitEvent(new AfterSaveEvent<>(saved, it.getTarget(), collectionName));
-						return saved;
+						return maybeCallAfterSave(saved, it.getTarget(), collectionName);
 					});
 				});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.util.Collection, java.lang.Class)
-	 */
+	@Override
 	public <T> Flux<T> insert(Collection<? extends T> batchToSave, Class<?> entityClass) {
 		return doInsertBatch(getCollectionName(entityClass), batchToSave, this.mongoConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insert(java.util.Collection, java.lang.String)
-	 */
+	@Override
 	public <T> Flux<T> insert(Collection<? extends T> batchToSave, String collectionName) {
 		return doInsertBatch(collectionName, batchToSave, this.mongoConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insertAll(java.util.Collection)
-	 */
+	@Override
 	public <T> Flux<T> insertAll(Collection<? extends T> objectsToSave) {
 		return doInsertAll(objectsToSave, this.mongoConverter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#insertAll(reactor.core.publisher.Mono)
-	 */
 	@Override
 	public <T> Flux<T> insertAll(Mono<? extends Collection<? extends T>> objectsToSave) {
-		return Flux.from(objectsToSave).flatMap(this::insertAll);
+		return Flux.from(objectsToSave).flatMapSequential(this::insertAll);
 	}
 
+	@SuppressWarnings("NullAway")
 	protected <T> Flux<T> doInsertAll(Collection<? extends T> listToSave, MongoWriter<Object> writer) {
 
 		Map<String, List<T>> elementsByCollection = new HashMap<>();
@@ -1442,13 +1444,14 @@ protected <T> Flux<T> doInsertAll(Collection<? extends T> listToSave, MongoWrite
 		});
 
 		return Flux.fromIterable(elementsByCollection.keySet())
-				.flatMap(collectionName -> doInsertBatch(collectionName, elementsByCollection.get(collectionName), writer));
+				.concatMap(collectionName -> doInsertBatch(collectionName, elementsByCollection.get(collectionName), writer));
 	}
 
+	@SuppressWarnings("NullAway")
 	protected <T> Flux<T> doInsertBatch(String collectionName, Collection<? extends T> batchToSave,
 			MongoWriter<Object> writer) {
 
-		Assert.notNull(writer, "MongoWriter must not be null!");
+		Assert.notNull(writer, "MongoWriter must not be null");
 
 		Mono<List<Tuple2<AdaptibleEntity<T>, Document>>> prepareDocuments = Flux.fromIterable(batchToSave)
 				.flatMap(uninitialized -> {
@@ -1462,11 +1465,16 @@ protected <T> Flux<T> doInsertBatch(String collectionName, Collection<? extends
 						entity.assertUpdateableIdIfNotSet();
 
 						T initialized = entity.initializeVersionProperty();
-						Document dbDoc = entity.toMappedDocument(writer).getDocument();
+						MappedDocument mapped = entity.toMappedDocument(writer);
+
+						maybeEmitEvent(new BeforeSaveEvent<>(initialized, mapped.getDocument(), collectionName));
+						return maybeCallBeforeSave(initialized, mapped.getDocument(), collectionName).map(toSave -> {
 
-						maybeEmitEvent(new BeforeSaveEvent<>(initialized, dbDoc, collectionName));
+							MappedDocument mappedDocument = queryOperations.createInsertContext(mapped)
+									.prepareId(uninitialized.getClass());
 
-						return maybeCallBeforeSave(initialized, dbDoc, collectionName).thenReturn(Tuples.of(entity, dbDoc));
+							return Tuples.of(entity, mappedDocument.getDocument());
+						});
 					});
 				}).collectList();
 
@@ -1477,58 +1485,45 @@ protected <T> Flux<T> doInsertBatch(String collectionName, Collection<? extends
 			return insertDocumentList(collectionName, documents).thenMany(Flux.fromIterable(tuples));
 		});
 
-		return insertDocuments.map(tuple -> {
+		return insertDocuments.flatMapSequential(tuple -> {
 
-			Object id = MappedDocument.of(tuple.getT2()).getId();
+			Document document = tuple.getT2();
+			Object id = MappedDocument.of(document).getId();
 
 			T saved = tuple.getT1().populateIdIfNecessary(id);
-			maybeEmitEvent(new AfterSaveEvent<>(saved, tuple.getT2(), collectionName));
-			return saved;
+			maybeEmitEvent(new AfterSaveEvent<>(saved, document, collectionName));
+			return maybeCallAfterSave(saved, document, collectionName);
 		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(reactor.core.publisher.Mono)
-	 */
 	@Override
 	public <T> Mono<T> save(Mono<? extends T> objectToSave) {
 
-		Assert.notNull(objectToSave, "Mono to save must not be null!");
+		Assert.notNull(objectToSave, "Mono to save must not be null");
 
 		return objectToSave.flatMap(this::save);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(reactor.core.publisher.Mono, java.lang.String)
-	 */
 	@Override
 	public <T> Mono<T> save(Mono<? extends T> objectToSave, String collectionName) {
 
-		Assert.notNull(objectToSave, "Mono to save must not be null!");
+		Assert.notNull(objectToSave, "Mono to save must not be null");
 
 		return objectToSave.flatMap(o -> save(o, collectionName));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(java.lang.Object)
-	 */
+	@Override
 	public <T> Mono<T> save(T objectToSave) {
 
-		Assert.notNull(objectToSave, "Object to save must not be null!");
+		Assert.notNull(objectToSave, "Object to save must not be null");
 		return save(objectToSave, getCollectionName(ClassUtils.getUserClass(objectToSave)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#save(java.lang.Object, java.lang.String)
-	 */
+	@Override
 	public <T> Mono<T> save(T objectToSave, String collectionName) {
 
-		Assert.notNull(objectToSave, "Object to save must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(objectToSave, "Object to save must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
 		AdaptibleEntity<T> source = operations.forEntity(objectToSave, mongoConverter.getConversionService());
 
@@ -1563,14 +1558,17 @@ private <T> Mono<T> doSaveVersioned(AdaptibleEntity<T> source, String collection
 				maybeEmitEvent(new BeforeSaveEvent<>(toConvert, document, collectionName));
 				return maybeCallBeforeSave(toConvert, document, collectionName).flatMap(it -> {
 
-					return doUpdate(collectionName, query, mapped.updateWithoutId(), it.getClass(), false, false).map(result -> {
-						return maybeEmitEvent(new AfterSaveEvent<T>(it, document, collectionName)).getSource();
-					});
+					return doUpdate(collectionName, query, mapped.updateWithoutId(), it.getClass(), false, false)
+							.flatMap(result -> {
+								maybeEmitEvent(new AfterSaveEvent<T>(it, document, collectionName));
+								return maybeCallAfterSave(it, document, collectionName);
+							});
 				});
 			});
 		});
 	}
 
+	@SuppressWarnings("NullAway")
 	protected <T> Mono<T> doSave(String collectionName, T objectToSave, MongoWriter<Object> writer) {
 
 		assertUpdateableIdIfNotSet(objectToSave);
@@ -1587,10 +1585,11 @@ protected <T> Mono<T> doSave(String collectionName, T objectToSave, MongoWriter<
 
 				return maybeCallBeforeSave(toConvert, dbDoc, collectionName).flatMap(it -> {
 
-					return saveDocument(collectionName, dbDoc, it.getClass()).map(id -> {
+					return saveDocument(collectionName, dbDoc, it.getClass()).flatMap(id -> {
 
 						T saved = entity.populateIdIfNecessary(id);
-						return maybeEmitEvent(new AfterSaveEvent<>(saved, dbDoc, collectionName)).getSource();
+						maybeEmitEvent(new AfterSaveEvent<>(saved, dbDoc, collectionName));
+						return maybeCallAfterSave(saved, dbDoc, collectionName);
 					});
 				});
 			});
@@ -1600,12 +1599,14 @@ protected <T> Mono<T> doSave(String collectionName, T objectToSave, MongoWriter<
 	protected Mono<Object> insertDocument(String collectionName, Document dbDoc, Class<?> entityClass) {
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Inserting Document containing fields: " + dbDoc.keySet() + " in collection: " + collectionName);
+			LOGGER.debug(String
+					.format("Inserting Document containing fields: " + dbDoc.keySet() + " in collection: " + collectionName));
 		}
 
-		Document document = new Document(dbDoc);
+		MappedDocument document = MappedDocument.of(dbDoc);
+		queryOperations.createInsertContext(document).prepareId(entityClass);
 
-		Flux<Success> execute = execute(collectionName, collection -> {
+		Flux<InsertOneResult> execute = execute(collectionName, collection -> {
 
 			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.INSERT, collectionName, entityClass,
 					dbDoc, null);
@@ -1613,10 +1614,10 @@ protected Mono<Object> insertDocument(String collectionName, Document dbDoc, Cla
 
 			MongoCollection<Document> collectionToUse = prepareCollection(collection, writeConcernToUse);
 
-			return collectionToUse.insertOne(document);
+			return collectionToUse.insertOne(document.getDocument());
 		});
 
-		return Flux.from(execute).last().map(success -> MappedDocument.of(document).getId());
+		return Flux.from(execute).last().map(success -> document.getId());
 	}
 
 	protected Flux<ObjectId> insertDocumentList(String collectionName, List<Document> dbDocList) {
@@ -1626,10 +1627,10 @@ protected Flux<ObjectId> insertDocumentList(String collectionName, List<Document
 		}
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Inserting list of Documents containing " + dbDocList.size() + " items");
+			LOGGER.debug(String.format("Inserting list of Documents containing %d items", dbDocList.size()));
 		}
 
-		List<Document> documents = new ArrayList<>();
+		List<Document> documents = new ArrayList<>(dbDocList.size());
 
 		return execute(collectionName, collection -> {
 
@@ -1642,7 +1643,7 @@ protected Flux<ObjectId> insertDocumentList(String collectionName, List<Document
 
 			return collectionToUse.insertMany(documents);
 
-		}).flatMap(s -> {
+		}).flatMapSequential(s -> {
 
 			return Flux.fromStream(documents.stream() //
 					.map(MappedDocument::of) //
@@ -1661,10 +1662,11 @@ private MongoCollection<Document> prepareCollection(MongoCollection<Document> co
 		return collectionToUse;
 	}
 
+	@SuppressWarnings("NullAway")
 	protected Mono<Object> saveDocument(String collectionName, Document document, Class<?> entityClass) {
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("Saving Document containing fields: " + document.keySet());
+			LOGGER.debug(String.format("Saving Document containing fields: %s", document.keySet()));
 		}
 
 		return createMono(collectionName, collection -> {
@@ -1678,35 +1680,52 @@ protected Mono<Object> saveDocument(String collectionName, Document document, Cl
 					? collection //
 					: collection.withWriteConcern(writeConcernToUse);
 
-			Publisher<?> publisher = !mapped.hasId() //
-					? collectionToUse.insertOne(document) //
-					: collectionToUse.replaceOne(mapped.getIdFilter(), document, new ReplaceOptions().upsert(true));
+			Publisher<?> publisher;
+			if (!mapped.hasId()) {
+				publisher = collectionToUse
+						.insertOne(queryOperations.createInsertContext(mapped).prepareId(entityClass).getDocument());
+			} else {
+
+				MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
+				UpdateContext updateContext = queryOperations.replaceSingleContext(mapped, true);
+				Document filter = updateContext.getReplacementQuery();
+				Document replacement = updateContext.getMappedUpdate(entity);
+
+				Mono<Document> deferredFilter;
+
+				if (updateContext.requiresShardKey(filter, entity)) {
+					if (entity.getShardKey().isImmutable()) {
+						deferredFilter = Mono.just(updateContext.applyShardKey(entity, filter, null));
+					} else {
+						deferredFilter = Mono
+								.from(
+										collection.find(filter, Document.class).projection(updateContext.getMappedShardKey(entity)).first())
+								.defaultIfEmpty(replacement).map(it -> updateContext.applyShardKey(entity, filter, it));
+					}
+				} else {
+					deferredFilter = Mono.just(filter);
+				}
+
+				publisher = deferredFilter.flatMapMany(
+						it -> collectionToUse.replaceOne(it, replacement, updateContext.getReplaceOptions(entityClass)));
+			}
 
 			return Mono.from(publisher).map(o -> mapped.getId());
 		});
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class)
-	 */
+	@Override
 	public Mono<UpdateResult> upsert(Query query, UpdateDefinition update, Class<?> entityClass) {
 		return doUpdate(getCollectionName(entityClass), query, update, entityClass, true, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.String)
-	 */
+	@Override
 	public Mono<UpdateResult> upsert(Query query, UpdateDefinition update, String collectionName) {
 		return doUpdate(collectionName, query, update, null, true, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#upsert(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public Mono<UpdateResult> upsert(Query query, UpdateDefinition update, Class<?> entityClass, String collectionName) {
 		return doUpdate(collectionName, query, update, entityClass, true, false);
 	}
@@ -1715,90 +1734,59 @@ public Mono<UpdateResult> upsert(Query query, UpdateDefinition update, Class<?>
 	 * (non-Javadoc))
 	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateFirst(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class)
 	 */
+	@Override
 	public Mono<UpdateResult> updateFirst(Query query, UpdateDefinition update, Class<?> entityClass) {
 		return doUpdate(getCollectionName(entityClass), query, update, entityClass, false, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateFirst(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.String)
-	 */
+	@Override
 	public Mono<UpdateResult> updateFirst(Query query, UpdateDefinition update, String collectionName) {
 		return doUpdate(collectionName, query, update, null, false, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateFirst(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public Mono<UpdateResult> updateFirst(Query query, UpdateDefinition update, Class<?> entityClass,
 			String collectionName) {
 		return doUpdate(collectionName, query, update, entityClass, false, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class)
-	 */
+	@Override
 	public Mono<UpdateResult> updateMulti(Query query, UpdateDefinition update, Class<?> entityClass) {
 		return doUpdate(getCollectionName(entityClass), query, update, entityClass, false, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.String)
-	 */
+	@Override
 	public Mono<UpdateResult> updateMulti(Query query, UpdateDefinition update, String collectionName) {
 		return doUpdate(collectionName, query, update, null, false, true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#updateMulti(org.springframework.data.mongodb.core.query.Query, org.springframework.data.mongodb.core.query.UpdateDefinition, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public Mono<UpdateResult> updateMulti(Query query, UpdateDefinition update, Class<?> entityClass,
 			String collectionName) {
 		return doUpdate(collectionName, query, update, entityClass, false, true);
 	}
 
-	protected Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nullable UpdateDefinition update,
+	@SuppressWarnings("NullAway")
+	protected Mono<UpdateResult> doUpdate(String collectionName, Query query, UpdateDefinition update,
 			@Nullable Class<?> entityClass, boolean upsert, boolean multi) {
 
-		if (query.isSorted() && LOGGER.isWarnEnabled()) {
-
-			LOGGER.warn("{} does not support sort ('{}'). Please use findAndModify() instead.",
-					upsert ? "Upsert" : "UpdateFirst", serializeToJsonSafely(query.getSortObject()));
-		}
-
 		MongoPersistentEntity<?> entity = entityClass == null ? null : getPersistentEntity(entityClass);
-		increaseVersionForUpdateIfNecessary(entity, update);
-
-		Document queryObj = queryMapper.getMappedObject(query.getQueryObject(), entity);
-
-		UpdateOptions updateOptions = new UpdateOptions().upsert(upsert);
-		operations.forType(entityClass).getCollation(query) //
-				.map(Collation::toMongoCollation) //
-				.ifPresent(updateOptions::collation);
 
-		if (update.hasArrayFilters()) {
-			updateOptions.arrayFilters(update.getArrayFilters().stream().map(ArrayFilter::asDocument)
-					.map(it -> queryMapper.getMappedObject(it, entity)).collect(Collectors.toList()));
-		}
+		UpdateContext updateContext = multi ? queryOperations.updateContext(update, query, upsert)
+				: queryOperations.updateSingleContext(update, query, upsert);
+		updateContext.increaseVersionForUpdateIfNecessary(entity);
 
-		if (multi && update.isIsolated() && !queryObj.containsKey("$isolated")) {
-			queryObj.put("$isolated", 1);
-		}
+		Document queryObj = updateContext.getMappedQuery(entity);
+		UpdateOptions updateOptions = updateContext.getUpdateOptions(entityClass, query);
 
 		Flux<UpdateResult> result;
 
-		if (update instanceof AggregationUpdate) {
+		if (updateContext.isAggregationUpdate()) {
 
-			AggregationOperationContext context = entityClass != null
-					? new RelaxedTypeBasedAggregationOperationContext(entityClass, mappingContext, queryMapper)
-					: Aggregation.DEFAULT_CONTEXT;
-
-			List<Document> pipeline = new AggregationUtil(queryMapper, mappingContext)
-					.createPipeline((AggregationUpdate) update, context);
+			List<Document> pipeline = updateContext.getUpdatePipeline(entityClass);
+			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName, entityClass,
+					update.getUpdateObject(), queryObj);
+			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
 			result = execute(collectionName, collection -> {
 
@@ -1807,10 +1795,6 @@ protected Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nulla
 							serializeToJsonSafely(queryObj), serializeToJsonSafely(pipeline), collectionName));
 				}
 
-				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName,
-						entityClass, update.getUpdateObject(), queryObj);
-				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-
 				collection = writeConcernToUse != null ? collection.withWriteConcern(writeConcernToUse) : collection;
 
 				return multi ? collection.updateMany(queryObj, pipeline, updateOptions)
@@ -1818,27 +1802,39 @@ protected Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nulla
 			});
 		} else {
 
-			result = execute(collectionName, collection -> {
+			Document updateObj = updateContext.getMappedUpdate(entity);
+			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName, entityClass,
+					updateObj, queryObj);
+			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 
-				Document updateObj = updateMapper.getMappedObject(update.getUpdateObject(), entity);
+			result = execute(collectionName, collection -> {
 
 				if (LOGGER.isDebugEnabled()) {
 					LOGGER.debug(String.format("Calling update using query: %s and update: %s in collection: %s",
 							serializeToJsonSafely(queryObj), serializeToJsonSafely(updateObj), collectionName));
 				}
 
-				MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.UPDATE, collectionName,
-						entityClass, updateObj, queryObj);
-				WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
 				MongoCollection<Document> collectionToUse = prepareCollection(collection, writeConcernToUse);
 
 				if (!UpdateMapper.isUpdateObject(updateObj)) {
 
-					ReplaceOptions replaceOptions = new ReplaceOptions();
-					replaceOptions.upsert(updateOptions.isUpsert());
-					replaceOptions.collation(updateOptions.getCollation());
+					Document filter = new Document(queryObj);
+					Mono<Document> deferredFilter;
+
+					if (updateContext.requiresShardKey(filter, entity)) {
+						if (entity.getShardKey().isImmutable()) {
+							deferredFilter = Mono.just(updateContext.applyShardKey(entity, filter, null));
+						} else {
+							deferredFilter = Mono.from(
+									collection.find(filter, Document.class).projection(updateContext.getMappedShardKey(entity)).first())
+									.defaultIfEmpty(updateObj).map(it -> updateContext.applyShardKey(entity, filter, it));
+						}
+					} else {
+						deferredFilter = Mono.just(filter);
+					}
 
-					return collectionToUse.replaceOne(queryObj, updateObj, replaceOptions);
+					com.mongodb.client.model.ReplaceOptions replaceOptions = updateContext.getReplaceOptions(entityClass);
+					return deferredFilter.flatMap(it -> Mono.from(collectionToUse.replaceOne(it, updateObj, replaceOptions)));
 				}
 
 				return multi ? collectionToUse.updateMany(queryObj, updateObj, updateOptions)
@@ -1851,10 +1847,10 @@ protected Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nulla
 			if (entity != null && entity.hasVersionProperty() && !multi) {
 				if (updateResult.wasAcknowledged() && updateResult.getMatchedCount() == 0) {
 
-					Document updateObj = updateMapper.getMappedObject(update.getUpdateObject(), entity);
+					Document updateObj = updateContext.getMappedUpdate(entity);
 					if (containsVersionProperty(queryObj, entity))
-						throw new OptimisticLockingFailureException("Optimistic lock exception on saving entity: "
-								+ updateObj.toString() + " to collection " + collectionName);
+						throw new OptimisticLockingFailureException("Optimistic lock exception on saving entity %s to collection %s"
+								.formatted(entity.getName(), collectionName));
 				}
 			}
 		});
@@ -1862,17 +1858,6 @@ protected Mono<UpdateResult> doUpdate(String collectionName, Query query, @Nulla
 		return result.next();
 	}
 
-	private void increaseVersionForUpdateIfNecessary(@Nullable MongoPersistentEntity<?> persistentEntity,
-			UpdateDefinition update) {
-
-		if (persistentEntity != null && persistentEntity.hasVersionProperty()) {
-			String versionFieldName = persistentEntity.getRequiredVersionProperty().getFieldName();
-			if (!update.modifies(versionFieldName)) {
-				update.inc(versionFieldName);
-			}
-		}
-	}
-
 	private boolean containsVersionProperty(Document document, @Nullable MongoPersistentEntity<?> persistentEntity) {
 
 		if (persistentEntity == null || !persistentEntity.hasVersionProperty()) {
@@ -1882,43 +1867,29 @@ private boolean containsVersionProperty(Document document, @Nullable MongoPersis
 		return document.containsKey(persistentEntity.getRequiredVersionProperty().getFieldName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(reactor.core.publisher.Mono)
-	 */
 	@Override
 	public Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove) {
 		return objectToRemove.flatMap(this::remove);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(reactor.core.publisher.Mono, java.lang.String)
-	 */
 	@Override
 	public Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove, String collectionName) {
 		return objectToRemove.flatMap(it -> remove(it, collectionName));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(java.lang.Object)
-	 */
+	@Override
 	public Mono<DeleteResult> remove(Object object) {
 
-		Assert.notNull(object, "Object must not be null!");
+		Assert.notNull(object, "Object must not be null");
 
 		return remove(operations.forEntity(object).getRemoveByQuery(), object.getClass());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(java.lang.Object, java.lang.String)
-	 */
+	@Override
 	public Mono<DeleteResult> remove(Object object, String collectionName) {
 
-		Assert.notNull(object, "Object must not be null!");
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.notNull(object, "Object must not be null");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
 		return doRemove(collectionName, operations.forEntity(object).getRemoveByQuery(), object.getClass());
 	}
@@ -1938,32 +1909,23 @@ private void assertUpdateableIdIfNotSet(Object value) {
 
 			if (!MongoSimpleTypes.AUTOGENERATED_ID_TYPES.contains(property.getType())) {
 				throw new InvalidDataAccessApiUsageException(
-						String.format("Cannot autogenerate id of type %s for entity of type %s!", property.getType().getName(),
+						String.format("Cannot autogenerate id of type %s for entity of type %s", property.getType().getName(),
 								value.getClass().getName()));
 			}
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(org.springframework.data.mongodb.core.query.Query, java.lang.String)
-	 */
+	@Override
 	public Mono<DeleteResult> remove(Query query, String collectionName) {
 		return remove(query, null, collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
+	@Override
 	public Mono<DeleteResult> remove(Query query, Class<?> entityClass) {
 		return remove(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#remove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public Mono<DeleteResult> remove(Query query, @Nullable Class<?> entityClass, String collectionName) {
 		return doRemove(collectionName, query, entityClass);
 	}
@@ -1971,34 +1933,32 @@ public Mono<DeleteResult> remove(Query query, @Nullable Class<?> entityClass, St
 	protected <T> Mono<DeleteResult> doRemove(String collectionName, Query query, @Nullable Class<T> entityClass) {
 
 		if (query == null) {
-			throw new InvalidDataAccessApiUsageException("Query passed in to remove can't be null!");
+			throw new InvalidDataAccessApiUsageException("Query passed in to remove can't be null");
 		}
 
-		Assert.hasText(collectionName, "Collection name must not be null or empty!");
+		Assert.hasText(collectionName, "Collection name must not be null or empty");
 
-		Document queryObject = query.getQueryObject();
 		MongoPersistentEntity<?> entity = getPersistentEntity(entityClass);
-		Document removeQuery = queryMapper.getMappedObject(queryObject, entity);
+
+		DeleteContext deleteContext = queryOperations.deleteQueryContext(query);
+		Document queryObject = deleteContext.getMappedQuery(entity);
+		DeleteOptions deleteOptions = deleteContext.getDeleteOptions(entityClass);
+		Document removeQuery = deleteContext.getMappedQuery(entity);
+		MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName, entityClass,
+				null, removeQuery);
+		WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
+		ReactiveCollectionPreparerDelegate collectionPreparer = ReactiveCollectionPreparerDelegate.of(query);
 
 		return execute(collectionName, collection -> {
 
 			maybeEmitEvent(new BeforeDeleteEvent<>(removeQuery, entityClass, collectionName));
 
-			MongoAction mongoAction = new MongoAction(writeConcern, MongoActionOperation.REMOVE, collectionName, entityClass,
-					null, removeQuery);
-
-			DeleteOptions deleteOptions = new DeleteOptions();
-
-			operations.forType(entityClass).getCollation(query) //
-					.map(Collation::toMongoCollation) //
-					.ifPresent(deleteOptions::collation);
-
-			WriteConcern writeConcernToUse = prepareWriteConcern(mongoAction);
-			MongoCollection<Document> collectionToUse = prepareCollection(collection, writeConcernToUse);
+			MongoCollection<Document> collectionToUse = collectionPreparer
+					.prepare(prepareCollection(collection, writeConcernToUse));
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Remove using query: {} in collection: {}.",
-						new Object[] { serializeToJsonSafely(removeQuery), collectionName });
+				LOGGER.debug(String.format("Remove using query: %s in collection: %s.", serializeToJsonSafely(removeQuery),
+						collectionName));
 			}
 
 			if (query.getLimit() > 0 || query.getSkip() > 0) {
@@ -2022,64 +1982,69 @@ protected <T> Mono<DeleteResult> doRemove(String collectionName, Query query, @N
 				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAll(java.lang.Class)
-	 */
+	@Override
 	public <T> Flux<T> findAll(Class<T> entityClass) {
 		return findAll(entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAll(java.lang.Class, java.lang.String)
-	 */
+	@Override
 	public <T> Flux<T> findAll(Class<T> entityClass, String collectionName) {
-		return executeFindMultiInternal(new FindCallback(null), FindPublisherPreparer.NO_OP_PREPARER,
-				new ReadDocumentCallback<>(mongoConverter, entityClass, collectionName), collectionName);
+		return executeFindMultiInternal(new FindCallback(CollectionPreparer.identity(), null),
+				FindPublisherPreparer.NO_OP_PREPARER, new ReadDocumentCallback<>(mongoConverter, entityClass, collectionName),
+				collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.String)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public <T> Flux<T> findAllAndRemove(Query query, String collectionName) {
 		return (Flux<T>) findAllAndRemove(query, Object.class, collectionName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
 	@Override
 	public <T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass) {
 		return findAllAndRemove(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#findAllAndRemove(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
 	@Override
 	public <T> Flux<T> findAllAndRemove(Query query, Class<T> entityClass, String collectionName) {
 		return doFindAndDelete(collectionName, query, entityClass);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#tail(org.springframework.data.mongodb.core.query.Query, java.lang.Class)
-	 */
+	@Override
+	public <T> Mono<UpdateResult> replace(Query query, T replacement, ReplaceOptions options, String collectionName) {
+
+		Assert.notNull(replacement, "Replacement must not be null");
+		return replace(query, (Class<T>) ClassUtils.getUserClass(replacement), replacement, options, collectionName);
+	}
+
+	protected <S, T> Mono<UpdateResult> replace(Query query, Class<S> entityType, T replacement, ReplaceOptions options,
+			String collectionName) {
+
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityType);
+		UpdateContext updateContext = queryOperations.replaceSingleContext(query,
+				operations.forEntity(replacement).toMappedDocument(this.mongoConverter), options.isUpsert());
+
+		return createMono(collectionName, collection -> {
+
+			Document mappedUpdate = updateContext.getMappedUpdate(entity);
+
+			MongoAction action = new MongoAction(writeConcern, MongoActionOperation.REPLACE, collectionName, entityType,
+					mappedUpdate, updateContext.getQueryObject());
+
+			MongoCollection<Document> collectionToUse = createCollectionPreparer(query, action).prepare(collection);
+
+			return collectionToUse.replaceOne(updateContext.getMappedQuery(entity), mappedUpdate,
+					updateContext.getReplaceOptions(entityType, it -> {
+						it.upsert(options.isUpsert());
+					}));
+		});
+	}
+
 	@Override
 	public <T> Flux<T> tail(Query query, Class<T> entityClass) {
 		return tail(query, entityClass, getCollectionName(entityClass));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#tail(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-	 */
 	@Override
 	public <T> Flux<T> tail(@Nullable Query query, Class<T> entityClass, String collectionName) {
 
@@ -2088,12 +2053,14 @@ public <T> Flux<T> tail(@Nullable Query query, Class<T> entityClass, String coll
 			LOGGER.debug(String.format("Tail for class: %s in collection: %s", entityClass, collectionName));
 
 			return executeFindMultiInternal(
-					collection -> new FindCallback(null).doInCollection(collection).cursorType(CursorType.TailableAwait),
+					collection -> new FindCallback(CollectionPreparer.identity(), null).doInCollection(collection)
+							.cursorType(CursorType.TailableAwait),
 					FindPublisherPreparer.NO_OP_PREPARER, new ReadDocumentCallback<>(mongoConverter, entityClass, collectionName),
 					collectionName);
 		}
 
-		return doFind(collectionName, query.getQueryObject(), query.getFieldsObject(), entityClass,
+		ReactiveCollectionPreparerDelegate collectionPreparer = ReactiveCollectionPreparerDelegate.of(query);
+		return doFind(collectionName, collectionPreparer, query.getQueryObject(), query.getFieldsObject(), entityClass,
 				new TailingQueryFindPublisherPreparer(query, entityClass));
 	}
 
@@ -2105,36 +2072,46 @@ public <T> Flux<ChangeStreamEvent<T>> changeStream(@Nullable String database, @N
 		FullDocument fullDocument = ClassUtils.isAssignable(Document.class, targetType) ? FullDocument.DEFAULT
 				: FullDocument.UPDATE_LOOKUP;
 
-		MongoDatabase db = StringUtils.hasText(database) ? mongoDatabaseFactory.getMongoDatabase(database)
-				: getMongoDatabase();
+		return ReactiveMongoDatabaseUtils.getDatabase(database, mongoDatabaseFactory) //
+				.map(db -> {
+					ChangeStreamPublisher<Document> publisher;
+					if (StringUtils.hasText(collectionName)) {
+						publisher = filter.isEmpty() ? db.getCollection(collectionName).watch(Document.class)
+								: db.getCollection(collectionName).watch(filter, Document.class);
 
-		ChangeStreamPublisher<Document> publisher;
-		if (StringUtils.hasText(collectionName)) {
-			publisher = filter.isEmpty() ? db.getCollection(collectionName).watch(Document.class)
-					: db.getCollection(collectionName).watch(filter, Document.class);
-
-		} else {
-			publisher = filter.isEmpty() ? db.watch(Document.class) : db.watch(filter, Document.class);
-		}
+					} else {
+						publisher = filter.isEmpty() ? db.watch(Document.class) : db.watch(filter, Document.class);
+					}
 
-		publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::resumeAfter).orElse(publisher);
-		publisher = options.getCollation().map(Collation::toMongoCollation).map(publisher::collation).orElse(publisher);
-		publisher = options.getResumeBsonTimestamp().map(publisher::startAtOperationTime).orElse(publisher);
-		publisher = publisher.fullDocument(options.getFullDocumentLookup().orElse(fullDocument));
+					if (options.isResumeAfter()) {
+						publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::resumeAfter)
+								.orElse(publisher);
+					} else if (options.isStartAfter()) {
+						publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::startAfter)
+								.orElse(publisher);
+					}
+					publisher = options.getCollation().map(Collation::toMongoCollation).map(publisher::collation)
+							.orElse(publisher);
+					publisher = options.getResumeBsonTimestamp().map(publisher::startAtOperationTime).orElse(publisher);
 
-		return Flux.from(publisher).map(document -> new ChangeStreamEvent<>(document, targetType, getConverter()));
+					if (options.getFullDocumentBeforeChangeLookup().isPresent()) {
+						publisher = publisher.fullDocumentBeforeChange(options.getFullDocumentBeforeChangeLookup().get());
+					}
+					return publisher.fullDocument(options.getFullDocumentLookup().orElse(fullDocument));
+				}) //
+				.flatMapMany(publisher -> Flux.from(publisher)
+						.map(document -> new ChangeStreamEvent<>(document, targetType, getConverter())));
 	}
 
 	List<Document> prepareFilter(ChangeStreamOptions options) {
 
 		Object filter = options.getFilter().orElse(Collections.emptyList());
 
-		if (filter instanceof Aggregation) {
-			Aggregation agg = (Aggregation) filter;
-			AggregationOperationContext context = agg instanceof TypedAggregation
-					? new TypeBasedAggregationOperationContext(((TypedAggregation<?>) agg).getInputType(),
+		if (filter instanceof Aggregation agg) {
+			AggregationOperationContext context = agg instanceof TypedAggregation typedAggregation
+					? new TypeBasedAggregationOperationContext(typedAggregation.getInputType(),
 							getConverter().getMappingContext(), queryMapper)
-					: Aggregation.DEFAULT_CONTEXT;
+					: new RelaxedTypeBasedAggregationOperationContext(Object.class, mappingContext, queryMapper);
 
 			return agg.toPipeline(new PrefixingDelegatingAggregationOperationContext(context, "fullDocument",
 					Arrays.asList("operationType", "fullDocument", "documentKey", "updateDescription", "ns")));
@@ -2148,10 +2125,7 @@ List<Document> prepareFilter(ChangeStreamOptions options) {
 				"ChangeStreamRequestOptions.filter mut be either an Aggregation or a plain list of Documents");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#mapReduce(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.Class, java.lang.String, java.lang.String, org.springframework.data.mongodb.core.mapreduce.MapReduceOptions)
-	 */
+	@Override
 	public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, Class<T> resultType, String mapFunction,
 			String reduceFunction, MapReduceOptions options) {
 
@@ -2159,42 +2133,46 @@ public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, Class<T> re
 				options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMongoOperations#mapReduce(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String, java.lang.Class, java.lang.String, java.lang.String, org.springframework.data.mongodb.core.mapreduce.MapReduceOptions)
-	 */
+	@Override
 	public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inputCollectionName, Class<T> resultType,
 			String mapFunction, String reduceFunction, MapReduceOptions options) {
 
-		Assert.notNull(filterQuery, "Filter query must not be null!");
-		Assert.notNull(domainType, "Domain type must not be null!");
-		Assert.hasText(inputCollectionName, "Input collection name must not be null or empty!");
-		Assert.notNull(resultType, "Result type must not be null!");
-		Assert.notNull(mapFunction, "Map function must not be null!");
-		Assert.notNull(reduceFunction, "Reduce function must not be null!");
-		Assert.notNull(options, "MapReduceOptions must not be null!");
+		Assert.notNull(filterQuery, "Filter query must not be null");
+		Assert.notNull(domainType, "Domain type must not be null");
+		Assert.hasText(inputCollectionName, "Input collection name must not be null or empty");
+		Assert.notNull(resultType, "Result type must not be null");
+		Assert.notNull(mapFunction, "Map function must not be null");
+		Assert.notNull(reduceFunction, "Reduce function must not be null");
+		Assert.notNull(options, "MapReduceOptions must not be null");
 
 		assertLocalFunctionNames(mapFunction, reduceFunction);
 
+		ReactiveCollectionPreparerDelegate collectionPreparer = ReactiveCollectionPreparerDelegate.of(filterQuery);
 		return createFlux(inputCollectionName, collection -> {
 
 			Document mappedQuery = queryMapper.getMappedObject(filterQuery.getQueryObject(),
 					mappingContext.getPersistentEntity(domainType));
 
-			MapReducePublisher<Document> publisher = collection.mapReduce(mapFunction, reduceFunction, Document.class);
+			MapReducePublisher<Document> publisher = collectionPreparer.prepare(collection).mapReduce(mapFunction,
+					reduceFunction, Document.class);
 
 			publisher.filter(mappedQuery);
-			publisher.sort(getMappedSortObject(filterQuery, domainType));
 
-			if (filterQuery.getMeta().getMaxTimeMsec() != null) {
-				publisher.maxTime(filterQuery.getMeta().getMaxTimeMsec(), TimeUnit.MILLISECONDS);
+			Document mappedSort = getMappedSortObject(filterQuery, domainType);
+			if (mappedSort != null && !mappedSort.isEmpty()) {
+				publisher.sort(mappedSort);
+			}
+
+			Meta meta = filterQuery.getMeta();
+			if (meta.hasMaxTime()) {
+				publisher.maxTime(meta.getRequiredMaxTimeMsec(), TimeUnit.MILLISECONDS);
 			}
 
 			if (filterQuery.getLimit() > 0 || (options.getLimit() != null)) {
 
 				if (filterQuery.getLimit() > 0 && (options.getLimit() != null)) {
 					throw new IllegalArgumentException(
-							"Both Query and MapReduceOptions define a limit. Please provide the limit only via one of the two.");
+							"Both Query and MapReduceOptions define a limit; Please provide the limit only via one of the two.");
 				}
 
 				if (filterQuery.getLimit() > 0) {
@@ -2210,7 +2188,7 @@ public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inpu
 
 			Optionals.ifAllPresent(filterQuery.getCollation(), options.getCollation(), (l, r) -> {
 				throw new IllegalArgumentException(
-						"Both Query and MapReduceOptions define a collation. Please provide the collation only via one of the two.");
+						"Both Query and MapReduceOptions define a collation; Please provide the collation only via one of the two.");
 			});
 
 			if (options.getCollation().isPresent()) {
@@ -2233,10 +2211,6 @@ public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inpu
 				publisher = publisher.jsMode(options.getJavaScriptMode());
 			}
 
-			if (options.getOutputSharded().isPresent()) {
-				publisher = publisher.sharded(options.getOutputSharded().get());
-			}
-
 			if (StringUtils.hasText(options.getOutputCollection()) && !options.usesInlineOutput()) {
 				publisher = publisher.collectionName(options.getOutputCollection()).action(options.getMapReduceAction());
 
@@ -2248,7 +2222,7 @@ public <T> Flux<T> mapReduce(Query filterQuery, Class<?> domainType, String inpu
 			publisher = collation.map(Collation::toMongoCollation).map(publisher::collation).orElse(publisher);
 
 			return Flux.from(publisher)
-					.map(new ReadDocumentCallback<>(mongoConverter, resultType, inputCollectionName)::doWith);
+					.flatMapSequential(new ReadDocumentCallback<>(mongoConverter, resultType, inputCollectionName)::doWith);
 		});
 	}
 
@@ -2259,70 +2233,42 @@ private static void assertLocalFunctionNames(String... functions) {
 			if (ResourceUtils.isUrl(function)) {
 
 				throw new IllegalArgumentException(String.format(
-						"Blocking accessing to resource %s is not allowed using reactive infrastructure. You may load the resource at startup and cache its value.",
+						"Blocking accessing to resource %s is not allowed using reactive infrastructure; You may load the resource at startup and cache its value.",
 						function));
 			}
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveFindOperation#query(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveFind<T> query(Class<T> domainType) {
 		return new ReactiveFindOperationSupport(this).query(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation#update(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveUpdate<T> update(Class<T> domainType) {
 		return new ReactiveUpdateOperationSupport(this).update(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation#remove(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveRemove<T> remove(Class<T> domainType) {
 		return new ReactiveRemoveOperationSupport(this).remove(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveInsertOperation#insert(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveInsert<T> insert(Class<T> domainType) {
 		return new ReactiveInsertOperationSupport(this).insert(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveAggregationOperation#aggregateAndReturn(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveAggregation<T> aggregateAndReturn(Class<T> domainType) {
 		return new ReactiveAggregationOperationSupport(this).aggregateAndReturn(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveMapReduceOperation#mapReduce(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveMapReduce<T> mapReduce(Class<T> domainType) {
 		return new ReactiveMapReduceOperationSupport(this).mapReduce(domainType);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveChangeStreamOperation#changeStream(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveChangeStream<T> changeStream(Class<T> domainType) {
 		return new ReactiveChangeStreamOperationSupport(this).changeStream(domainType);
@@ -2344,7 +2290,45 @@ protected <T> Flux<T> doFindAndDelete(String collectionName, Query query, Class<
 
 		return Flux.from(flux).collectList().filter(it -> !it.isEmpty())
 				.flatMapMany(list -> Flux.from(remove(operations.getByIdInQuery(list), entityClass, collectionName))
-						.flatMap(deleteResult -> Flux.fromIterable(list)));
+						.flatMapSequential(deleteResult -> Flux.fromIterable(list)));
+	}
+
+	@SuppressWarnings({"rawtypes", "unchecked", "NullAway"})
+	<S, T> Flux<T> doFindAndDelete(String collectionName, Query query, Class<S> entityClass,
+			QueryResultConverter<? super S, ? extends T> resultConverter) {
+
+		List<Object> ids = new ArrayList<>();
+		ProjectingReadCallback readCallback = new ProjectingReadCallback(getConverter(),
+				EntityProjection.nonProjecting(entityClass), collectionName);
+
+		QueryResultConverterCallback<S, T> callback = new QueryResultConverterCallback<>(resultConverter, readCallback) {
+
+			@Override
+			public Mono<T> doWith(Document object) {
+				ids.add(object.get("_id"));
+				return super.doWith(object);
+			}
+		};
+
+		Flux<T> flux = doFind(collectionName, ReactiveCollectionPreparerDelegate.of(query), query.getQueryObject(),
+				query.getFieldsObject(), entityClass,
+				new QueryFindPublisherPreparer(query, query.getSortObject(), query.getLimit(), query.getSkip(), entityClass),
+				callback);
+
+		return Flux.from(flux).collectList().filter(it -> !it.isEmpty()).flatMapMany(list -> {
+
+			Criteria[] criterias = ids.stream() //
+					.map(it -> Criteria.where("_id").is(it)) //
+					.toArray(Criteria[]::new);
+
+			Query removeQuery = new Query(criterias.length == 1 ? criterias[0] : new Criteria().orOperator(criterias));
+			if (query.hasReadPreference()) {
+				removeQuery.withReadPreference(query.getReadPreference());
+			}
+
+			return Flux.from(remove(removeQuery, entityClass, collectionName))
+					.flatMapSequential(deleteResult -> Flux.fromIterable(list));
+		});
 	}
 
 	/**
@@ -2357,14 +2341,14 @@ protected <T> Flux<T> doFindAndDelete(String collectionName, Query query, Class<
 	protected Mono<MongoCollection<Document>> doCreateCollection(String collectionName,
 			CreateCollectionOptions collectionOptions) {
 
-		return createMono(db -> db.createCollection(collectionName, collectionOptions)).map(success -> {
+		return createMono(db -> db.createCollection(collectionName, collectionOptions)).doOnSuccess(it -> {
 
 			// TODO: Emit a collection created event
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Created collection [{}]", collectionName);
+				LOGGER.debug(String.format("Created collection [%s]", collectionName));
 			}
-			return getCollection(collectionName);
-		});
+
+		}).then(getCollection(collectionName));
 	}
 
 	/**
@@ -2372,16 +2356,18 @@ protected Mono<MongoCollection<Document>> doCreateCollection(String collectionNa
 	 * The query document is specified as a standard {@link Document} and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record.
 	 * @param fields the document that specifies the fields to be returned.
 	 * @param entityClass the parameterized type of the returned list.
 	 * @param collation can be {@literal null}.
 	 * @return the {@link List} of converted objects.
 	 */
-	protected <T> Mono<T> doFindOne(String collectionName, Document query, @Nullable Document fields,
+	protected <T> Mono<T> doFindOne(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, @Nullable Document fields,
 			Class<T> entityClass, @Nullable Collation collation) {
 
-		return doFindOne(collectionName, query, fields, entityClass,
+		return doFindOne(collectionName, collectionPreparer, query, fields, entityClass,
 				findPublisher -> collation != null ? findPublisher.collation(collation.toMongoCollation()) : findPublisher);
 	}
 
@@ -2390,6 +2376,7 @@ protected <T> Mono<T> doFindOne(String collectionName, Document query, @Nullable
 	 * The query document is specified as a standard {@link Document} and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record.
 	 * @param fields the document that specifies the fields to be returned.
 	 * @param entityClass the parameterized type of the returned list.
@@ -2397,19 +2384,23 @@ protected <T> Mono<T> doFindOne(String collectionName, Document query, @Nullable
 	 * @return the {@link List} of converted objects.
 	 * @since 2.2
 	 */
-	protected <T> Mono<T> doFindOne(String collectionName, Document query, @Nullable Document fields,
+	protected <T> Mono<T> doFindOne(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, @Nullable Document fields,
 			Class<T> entityClass, FindPublisherPreparer preparer) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
-		Document mappedQuery = queryMapper.getMappedObject(query, entity);
-		Document mappedFields = fields == null ? null : queryMapper.getMappedObject(fields, entity);
+
+		QueryContext queryContext = queryOperations
+				.createQueryContext(new BasicQuery(query, fields != null ? fields : new Document()));
+		Document mappedFields = queryContext.getMappedFields(entity, EntityProjection.nonProjecting(entityClass));
+		Document mappedQuery = queryContext.getMappedQuery(entity);
 
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug(String.format("findOne using query: %s fields: %s for class: %s in collection: %s",
 					serializeToJsonSafely(query), mappedFields, entityClass, collectionName));
 		}
 
-		return executeFindOneInternal(new FindOneCallback(mappedQuery, mappedFields, preparer),
+		return executeFindOneInternal(new FindOneCallback(collectionPreparer, mappedQuery, mappedFields, preparer),
 				new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName), collectionName);
 	}
 
@@ -2418,13 +2409,15 @@ protected <T> Mono<T> doFindOne(String collectionName, Document query, @Nullable
 	 * query document is specified as a standard Document and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record
 	 * @param fields the document that specifies the fields to be returned
 	 * @param entityClass the parameterized type of the returned list.
 	 * @return the List of converted objects.
 	 */
-	protected <T> Flux<T> doFind(String collectionName, Document query, Document fields, Class<T> entityClass) {
-		return doFind(collectionName, query, fields, entityClass, null,
+	protected <T> Flux<T> doFind(String collectionName, CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			Document query, Document fields, Class<T> entityClass) {
+		return doFind(collectionName, collectionPreparer, query, fields, entityClass, null,
 				new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName));
 	}
 
@@ -2434,34 +2427,52 @@ protected <T> Flux<T> doFind(String collectionName, Document query, Document fie
 	 * specified as a standard Document and so is the fields specification.
 	 *
 	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param query the query document that specifies the criteria used to find a record.
 	 * @param fields the document that specifies the fields to be returned.
 	 * @param entityClass the parameterized type of the returned list.
-	 * @param preparer allows for customization of the {@link DBCursor} used when iterating over the result set, (apply
-	 *          limits, skips and so on).
+	 * @param preparer allows for customization of the {@link com.mongodb.client.FindIterable} used when iterating over
+	 *          the result set, (apply limits, skips and so on).
 	 * @return the {@link List} of converted objects.
 	 */
-	protected <T> Flux<T> doFind(String collectionName, Document query, Document fields, Class<T> entityClass,
-			FindPublisherPreparer preparer) {
-		return doFind(collectionName, query, fields, entityClass, preparer,
+	protected <T> Flux<T> doFind(String collectionName, CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			Document query, Document fields, Class<T> entityClass, FindPublisherPreparer preparer) {
+		return doFind(collectionName, collectionPreparer, query, fields, entityClass, preparer,
 				new ReadDocumentCallback<>(mongoConverter, entityClass, collectionName));
 	}
 
-	protected <S, T> Flux<T> doFind(String collectionName, Document query, Document fields, Class<S> entityClass,
-			@Nullable FindPublisherPreparer preparer, DocumentCallback<T> objectCallback) {
+	protected <S, T> Flux<T> doFind(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document fields,
+			Class<S> entityClass, @Nullable FindPublisherPreparer preparer, DocumentCallback<T> objectCallback) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		Document mappedFields = queryMapper.getMappedFields(fields, entity);
-		Document mappedQuery = queryMapper.getMappedObject(query, entity);
+		QueryContext queryContext = queryOperations.createQueryContext(new BasicQuery(query, fields));
+		Document mappedFields = queryContext.getMappedFields(entity, EntityProjection.nonProjecting(entityClass));
+		Document mappedQuery = queryContext.getMappedQuery(entity);
 
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug(String.format("find using query: %s fields: %s for class: %s in collection: %s",
 					serializeToJsonSafely(mappedQuery), mappedFields, entityClass, collectionName));
 		}
 
-		return executeFindMultiInternal(new FindCallback(mappedQuery, mappedFields), preparer, objectCallback,
-				collectionName);
+		return executeFindMultiInternal(new FindCallback(collectionPreparer, mappedQuery, mappedFields),
+				preparer != null ? preparer : FindPublisherPreparer.NO_OP_PREPARER, objectCallback, collectionName);
+	}
+
+	CollectionPreparer<MongoCollection<Document>> createCollectionPreparer(Query query) {
+		return ReactiveCollectionPreparerDelegate.of(query);
+	}
+
+	CollectionPreparer<MongoCollection<Document>> createCollectionPreparer(Query query, @Nullable MongoAction action) {
+		CollectionPreparer<MongoCollection<Document>> collectionPreparer = createCollectionPreparer(query);
+		if (action == null) {
+			return collectionPreparer;
+		}
+		return collectionPreparer.andThen(collection -> {
+			WriteConcern writeConcern = prepareWriteConcern(action);
+			return writeConcern != null ? collection.withWriteConcern(writeConcern) : collection;
+		});
 	}
 
 	/**
@@ -2470,38 +2481,24 @@ protected <S, T> Flux<T> doFind(String collectionName, Document query, Document
 	 *
 	 * @since 2.0
 	 */
-	<S, T> Flux<T> doFind(String collectionName, Document query, Document fields, Class<S> sourceClass,
-			Class<T> targetClass, FindPublisherPreparer preparer) {
+	<T, R> Flux<R> doFind(String collectionName, CollectionPreparer<MongoCollection<Document>> collectionPreparer,
+			Document query, Document fields, Class<?> sourceClass, Class<T> targetClass,
+			QueryResultConverter<? super T, ? extends R> resultConverter, FindPublisherPreparer preparer) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(sourceClass);
+		EntityProjection<T, ?> projection = operations.introspectProjection(targetClass, sourceClass);
 
-		Document mappedFields = getMappedFieldsObject(fields, entity, targetClass);
-		Document mappedQuery = queryMapper.getMappedObject(query, entity);
+		QueryContext queryContext = queryOperations.createQueryContext(new BasicQuery(query, fields));
+		Document mappedFields = queryContext.getMappedFields(entity, projection);
+		Document mappedQuery = queryContext.getMappedQuery(entity);
 
 		if (LOGGER.isDebugEnabled()) {
-			LOGGER.debug("find using query: {} fields: {} for class: {} in collection: {}",
-					serializeToJsonSafely(mappedQuery), mappedFields, sourceClass, collectionName);
-		}
-
-		return executeFindMultiInternal(new FindCallback(mappedQuery, mappedFields), preparer,
-				new ProjectingReadCallback<>(mongoConverter, sourceClass, targetClass, collectionName), collectionName);
-	}
-
-	private Document getMappedFieldsObject(Document fields, @Nullable MongoPersistentEntity<?> entity,
-			Class<?> targetType) {
-
-		if (entity == null) {
-			return fields;
-		}
-
-		Document projectedFields = propertyOperations.computeFieldsForProjection(projectionFactory, fields,
-				entity.getType(), targetType);
-
-		if (ObjectUtils.nullSafeEquals(fields, projectedFields)) {
-			return queryMapper.getMappedFields(projectedFields, entity);
+			LOGGER.debug(String.format("find using query: %s fields: %s for class: %s in collection: %s",
+					serializeToJsonSafely(mappedQuery), mappedFields, sourceClass, collectionName));
 		}
 
-		return queryMapper.getMappedFields(projectedFields, mappingContext.getRequiredPersistentEntity(targetType));
+		return executeFindMultiInternal(new FindCallback(collectionPreparer, mappedQuery, mappedFields), preparer,
+				getResultReader(projection, collectionName, resultConverter), collectionName);
 	}
 
 	protected CreateCollectionOptions convertToCreateCollectionOptions(@Nullable CollectionOptions collectionOptions) {
@@ -2510,103 +2507,66 @@ protected CreateCollectionOptions convertToCreateCollectionOptions(@Nullable Col
 
 	protected CreateCollectionOptions convertToCreateCollectionOptions(@Nullable CollectionOptions collectionOptions,
 			Class<?> entityType) {
-
-		CreateCollectionOptions result = new CreateCollectionOptions();
-
-		if (collectionOptions == null) {
-			return result;
-		}
-
-		collectionOptions.getCapped().ifPresent(result::capped);
-		collectionOptions.getSize().ifPresent(result::sizeInBytes);
-		collectionOptions.getMaxDocuments().ifPresent(result::maxDocuments);
-		collectionOptions.getCollation().map(Collation::toMongoCollation).ifPresent(result::collation);
-
-		collectionOptions.getValidationOptions().ifPresent(it -> {
-
-			ValidationOptions validationOptions = new ValidationOptions();
-
-			it.getValidationAction().ifPresent(validationOptions::validationAction);
-			it.getValidationLevel().ifPresent(validationOptions::validationLevel);
-
-			it.getValidator().ifPresent(val -> validationOptions.validator(getMappedValidator(val, entityType)));
-
-			result.validationOptions(validationOptions);
-		});
-
-		return result;
-	}
-
-	private Document getMappedValidator(Validator validator, Class<?> domainType) {
-
-		Document validationRules = validator.toDocument();
-
-		if (validationRules.containsKey("$jsonSchema")) {
-			return schemaMapper.mapSchema(validationRules, domainType);
-		}
-
-		return queryMapper.getMappedObject(validationRules, mappingContext.getPersistentEntity(domainType));
+		return operations.convertToCreateCollectionOptions(collectionOptions, entityType);
 	}
 
 	/**
 	 * Map the results of an ad-hoc query on the default MongoDB collection to an object using the template's converter.
-	 * The first document that matches the query is returned and also removed from the collection in the database.
-	 * <p/>
+	 * The first document that matches the query is returned and also removed from the collection in the database. <br />
 	 * The query document is specified as a standard Document and so is the fields specification.
 	 *
-	 * @param collectionName name of the collection to retrieve the objects from
-	 * @param query the query document that specifies the criteria used to find a record
-	 * @param collation collation
+	 * @param collectionName name of the collection to retrieve the objects from.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
+	 * @param query the query document that specifies the criteria used to find a record.
+	 * @param collation collation.
 	 * @param entityClass the parameterized type of the returned list.
 	 * @return the List of converted objects.
 	 */
-	protected <T> Mono<T> doFindAndRemove(String collectionName, Document query, Document fields, Document sort,
-			@Nullable Collation collation, Class<T> entityClass) {
+	protected <T> Mono<T> doFindAndRemove(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document fields,
+			@Nullable Document sort, @Nullable Collation collation, Class<T> entityClass) {
 
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug(String.format("findAndRemove using query: %s fields: %s sort: %s for class: %s in collection: %s",
-					serializeToJsonSafely(query), fields, sort, entityClass, collectionName));
+					serializeToJsonSafely(query), fields, serializeToJsonSafely(sort), entityClass, collectionName));
 		}
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		return executeFindOneInternal(
-				new FindAndRemoveCallback(queryMapper.getMappedObject(query, entity), fields, sort, collation),
+		return executeFindOneInternal(new FindAndRemoveCallback(collectionPreparer,
+				queryMapper.getMappedObject(query, entity), fields, sort, collation),
 				new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName), collectionName);
 	}
 
-	protected <T> Mono<T> doFindAndModify(String collectionName, Document query, Document fields, Document sort,
-			Class<T> entityClass, UpdateDefinition update, FindAndModifyOptions options) {
+	<S, T> Mono<T> doFindAndModify(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query, Document fields,
+			@Nullable Document sort, Class<S> entityClass, UpdateDefinition update, FindAndModifyOptions options,
+			QueryResultConverter<? super S, ? extends T> resultConverter) {
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
-		increaseVersionForUpdateIfNecessary(entity, update);
+		UpdateContext updateContext = queryOperations.updateSingleContext(update, query, false);
+		updateContext.increaseVersionForUpdateIfNecessary(entity);
 
 		return Mono.defer(() -> {
 
-			Document mappedQuery = queryMapper.getMappedObject(query, entity);
-
-			Object mappedUpdate;
-			if (update instanceof AggregationUpdate) {
-
-				AggregationOperationContext context = new RelaxedTypeBasedAggregationOperationContext(entityClass,
-						mappingContext, queryMapper);
-
-				mappedUpdate = new AggregationUtil(queryMapper, mappingContext).createPipeline((Aggregation) update, context);
-			} else {
-				mappedUpdate = updateMapper.getMappedObject(update.getUpdateObject(), entity);
-			}
+			Document mappedQuery = updateContext.getMappedQuery(entity);
+			Object mappedUpdate = updateContext.isAggregationUpdate() ? updateContext.getUpdatePipeline(entityClass)
+					: updateContext.getMappedUpdate(entity);
 
 			if (LOGGER.isDebugEnabled()) {
 				LOGGER.debug(String.format(
 						"findAndModify using query: %s fields: %s sort: %s for class: %s and update: %s " + "in collection: %s",
-						serializeToJsonSafely(mappedQuery), fields, sort, entityClass, serializeToJsonSafely(mappedUpdate),
-						collectionName));
+						serializeToJsonSafely(mappedQuery), fields, serializeToJsonSafely(sort), entityClass,
+						serializeToJsonSafely(mappedUpdate), collectionName));
 			}
 
+			EntityProjection<S, ?> projection = EntityProjection.nonProjecting(entityClass);
+			DocumentCallback<T> callback = getResultReader(projection, collectionName, resultConverter);
+
 			return executeFindOneInternal(
-					new FindAndModifyCallback(mappedQuery, fields, sort, mappedUpdate,
+					new FindAndModifyCallback(collectionPreparer, mappedQuery, fields, sort, mappedUpdate,
 							update.getArrayFilters().stream().map(ArrayFilter::asDocument).collect(Collectors.toList()), options),
-					new ReadDocumentCallback<>(this.mongoConverter, entityClass, collectionName), collectionName);
+					callback, collectionName);
 		});
 	}
 
@@ -2614,6 +2574,7 @@ protected <T> Mono<T> doFindAndModify(String collectionName, Document query, Doc
 	 * Customize this part for findAndReplace.
 	 *
 	 * @param collectionName The name of the collection to perform the operation in.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
 	 * @param mappedQuery the query to look up documents.
 	 * @param mappedFields the fields to project the result to.
 	 * @param mappedSort the sort to be applied when executing the query.
@@ -2626,56 +2587,99 @@ protected <T> Mono<T> doFindAndModify(String collectionName, Document query, Doc
 	 *         {@literal false} and {@link FindAndReplaceOptions#isUpsert() upsert} is {@literal false}.
 	 * @since 2.1
 	 */
-	protected <T> Mono<T> doFindAndReplace(String collectionName, Document mappedQuery, Document mappedFields,
+	protected <T> Mono<T> doFindAndReplace(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document mappedQuery, Document mappedFields,
 			Document mappedSort, com.mongodb.client.model.Collation collation, Class<?> entityType, Document replacement,
 			FindAndReplaceOptions options, Class<T> resultType) {
 
+		EntityProjection<T, ?> projection = operations.introspectProjection(resultType, entityType);
+
+		return doFindAndReplace(collectionName, collectionPreparer, mappedQuery, mappedFields, mappedSort, collation,
+				entityType, replacement, options, projection, QueryResultConverter.entity());
+	}
+
+	/**
+	 * Customize this part for findAndReplace.
+	 *
+	 * @param collectionName The name of the collection to perform the operation in.
+	 * @param collectionPreparer the preparer to prepare the collection for the actual use.
+	 * @param mappedQuery the query to look up documents.
+	 * @param mappedFields the fields to project the result to.
+	 * @param mappedSort the sort to be applied when executing the query.
+	 * @param collation collation settings for the query. Can be {@literal null}.
+	 * @param entityType the source domain type.
+	 * @param replacement the replacement {@link Document}.
+	 * @param options applicable options.
+	 * @param projection the projection descriptor.
+	 * @return {@link Mono#empty()} if object does not exist, {@link FindAndReplaceOptions#isReturnNew() return new} is
+	 *         {@literal false} and {@link FindAndReplaceOptions#isUpsert() upsert} is {@literal false}.
+	 * @since 3.4
+	 */
+	private <S, T> Mono<T> doFindAndReplace(String collectionName,
+			CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document mappedQuery, Document mappedFields,
+			Document mappedSort, com.mongodb.client.model.Collation collation, Class<?> entityType, Document replacement,
+			FindAndReplaceOptions options, EntityProjection<S, ?> projection,
+			QueryResultConverter<? super S, ? extends T> resultConverter) {
+
 		return Mono.defer(() -> {
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug(
-						"findAndReplace using query: {} fields: {} sort: {} for class: {} and replacement: {} "
-								+ "in collection: {}",
-						serializeToJsonSafely(mappedQuery), mappedFields, mappedSort, entityType,
-						serializeToJsonSafely(replacement), collectionName);
+				LOGGER.debug(String.format(
+						"findAndReplace using query: %s fields: %s sort: %s for class: %s and replacement: %s "
+								+ "in collection: %s",
+						serializeToJsonSafely(mappedQuery), mappedFields, serializeToJsonSafely(mappedSort), entityType,
+						serializeToJsonSafely(replacement), collectionName));
 			}
 
-			return executeFindOneInternal(
-					new FindAndReplaceCallback(mappedQuery, mappedFields, mappedSort, replacement, collation, options),
-					new ProjectingReadCallback<>(this.mongoConverter, entityType, resultType, collectionName), collectionName);
+			DocumentCallback<T> resultReader = getResultReader(projection, collectionName, resultConverter);
+
+			return executeFindOneInternal(new FindAndReplaceCallback(collectionPreparer, mappedQuery, mappedFields,
+					mappedSort, replacement, collation, options), resultReader, collectionName);
 
 		});
 	}
 
 	protected <E extends MongoMappingEvent<T>, T> E maybeEmitEvent(E event) {
-
-		if (null != eventPublisher) {
-			eventPublisher.publishEvent(event);
-		}
-
+		eventDelegate.publishEvent(event);
 		return event;
 	}
 
-	@SuppressWarnings("unchecked")
 	protected <T> Mono<T> maybeCallBeforeConvert(T object, String collection) {
 
-		if (null != entityCallbacks) {
+		if (entityCallbacks != null) {
 			return entityCallbacks.callback(ReactiveBeforeConvertCallback.class, object, collection);
 		}
 
 		return Mono.just(object);
 	}
 
-	@SuppressWarnings("unchecked")
 	protected <T> Mono<T> maybeCallBeforeSave(T object, Document document, String collection) {
 
-		if (null != entityCallbacks) {
+		if (entityCallbacks != null) {
 			return entityCallbacks.callback(ReactiveBeforeSaveCallback.class, object, document, collection);
 		}
 
 		return Mono.just(object);
 	}
 
+	protected <T> Mono<T> maybeCallAfterSave(T object, Document document, String collection) {
+
+		if (entityCallbacks != null) {
+			return entityCallbacks.callback(ReactiveAfterSaveCallback.class, object, document, collection);
+		}
+
+		return Mono.just(object);
+	}
+
+	protected <T> Mono<T> maybeCallAfterConvert(T object, Document document, String collection) {
+
+		if (entityCallbacks != null) {
+			return entityCallbacks.callback(ReactiveAfterConvertCallback.class, object, document, collection);
+		}
+
+		return Mono.just(object);
+	}
+
 	private MongoCollection<Document> getAndPrepareCollection(MongoDatabase db, String collectionName) {
 
 		try {
@@ -2686,25 +2690,33 @@ private MongoCollection<Document> getAndPrepareCollection(MongoDatabase db, Stri
 		}
 	}
 
-	protected void ensureNotIterable(Object o) {
-
-		boolean isIterable = o.getClass().isArray()
-				|| ITERABLE_CLASSES.stream().anyMatch(iterableClass -> iterableClass.isAssignableFrom(o.getClass())
-						|| o.getClass().getName().equals(iterableClass.getName()));
+	/**
+	 * Ensure the given {@literal source} is not an {@link java.lang.reflect.Array}, {@link Collection} or
+	 * {@link Iterator}.
+	 *
+	 * @param source can be {@literal null}.
+	 * @since 3.2.
+	 */
+	protected void ensureNotCollectionLike(@Nullable Object source) {
 
-		if (isIterable) {
+		if (EntityOperations.isCollectionLike(source) || source instanceof Publisher) {
 			throw new IllegalArgumentException("Cannot use a collection here.");
 		}
 	}
 
 	/**
 	 * Prepare the collection before any processing is done using it. This allows a convenient way to apply settings like
-	 * slaveOk() etc. Can be overridden in sub-classes.
+	 * withCodecRegistry() etc. Can be overridden in sub-classes.
 	 *
 	 * @param collection
 	 */
 	protected MongoCollection<Document> prepareCollection(MongoCollection<Document> collection) {
-		return this.readPreference != null ? collection.withReadPreference(readPreference) : collection;
+
+		if (this.readPreference != null && this.readPreference != collection.getReadPreference()) {
+			return collection.withReadPreference(readPreference);
+		}
+
+		return collection;
 	}
 
 	/**
@@ -2727,19 +2739,26 @@ protected MongoDatabase prepareDatabase(MongoDatabase database) {
 	 * @see #setWriteConcern(WriteConcern)
 	 * @see #setWriteConcernResolver(WriteConcernResolver)
 	 */
-	@Nullable
-	protected WriteConcern prepareWriteConcern(MongoAction mongoAction) {
+	protected @Nullable WriteConcern prepareWriteConcern(MongoAction mongoAction) {
 
 		WriteConcern wc = writeConcernResolver.resolve(mongoAction);
 		return potentiallyForceAcknowledgedWrite(wc);
 	}
 
+	/**
+	 * @return the {@link MongoDatabaseFactory} in use.
+	 * @since 3.1.4
+	 */
+	public ReactiveMongoDatabaseFactory getMongoDatabaseFactory() {
+		return mongoDatabaseFactory;
+	}
+
 	@Nullable
 	private WriteConcern potentiallyForceAcknowledgedWrite(@Nullable WriteConcern wc) {
 
 		if (ObjectUtils.nullSafeEquals(WriteResultChecking.EXCEPTION, writeResultChecking)) {
 			if (wc == null || wc.getWObject() == null
-					|| (wc.getWObject() instanceof Number && ((Number) wc.getWObject()).intValue() < 1)) {
+					|| (wc.getWObject() instanceof Number concern && concern.intValue() < 1)) {
 				return WriteConcern.ACKNOWLEDGED;
 			}
 		}
@@ -2763,7 +2782,7 @@ private <T> Mono<T> executeFindOneInternal(ReactiveCollectionCallback<Document>
 			DocumentCallback<T> objectCallback, String collectionName) {
 
 		return createMono(collectionName,
-				collection -> Mono.from(collectionCallback.doInCollection(collection)).map(objectCallback::doWith));
+				collection -> Mono.from(collectionCallback.doInCollection(collection)).flatMap(objectCallback::doWith));
 	}
 
 	/**
@@ -2785,14 +2804,24 @@ private <T> Mono<T> executeFindOneInternal(ReactiveCollectionCallback<Document>
 	 * @return
 	 */
 	private <T> Flux<T> executeFindMultiInternal(ReactiveCollectionQueryCallback<Document> collectionCallback,
-			@Nullable FindPublisherPreparer preparer, DocumentCallback<T> objectCallback, String collectionName) {
+			FindPublisherPreparer preparer, DocumentCallback<T> objectCallback, String collectionName) {
 
 		return createFlux(collectionName, collection -> {
 			return Flux.from(preparer.initiateFind(collection, collectionCallback::doInCollection))
-					.map(objectCallback::doWith);
+					.flatMapSequential(objectCallback::doWith);
 		});
 	}
 
+	@SuppressWarnings("unchecked")
+	private <T, R> DocumentCallback<R> getResultReader(EntityProjection<T, ?> projection, String collectionName,
+			QueryResultConverter<? super T, ? extends R> resultConverter) {
+
+		DocumentCallback<T> readCallback = new ProjectingReadCallback<>(mongoConverter, projection, collectionName);
+
+		return resultConverter == QueryResultConverter.entity() ? (DocumentCallback<R>) readCallback
+				: new QueryResultConverterCallback<>(resultConverter, readCallback);
+	}
+
 	/**
 	 * Exception translation {@link Function} intended for {@link Flux#onErrorMap(Function)} usage.
 	 *
@@ -2802,8 +2831,8 @@ private Function<Throwable, Throwable> translateException() {
 
 		return throwable -> {
 
-			if (throwable instanceof RuntimeException) {
-				return potentiallyConvertRuntimeException((RuntimeException) throwable, exceptionTranslator);
+			if (throwable instanceof RuntimeException runtimeException) {
+				return potentiallyConvertRuntimeException(runtimeException, exceptionTranslator);
 			}
 
 			return throwable;
@@ -2824,8 +2853,7 @@ private static RuntimeException potentiallyConvertRuntimeException(RuntimeExcept
 		return resolved == null ? ex : resolved;
 	}
 
-	@Nullable
-	private MongoPersistentEntity<?> getPersistentEntity(@Nullable Class<?> type) {
+	private @Nullable MongoPersistentEntity<?> getPersistentEntity(@Nullable Class<?> type) {
 		return type == null ? null : mappingContext.getPersistentEntity(type);
 	}
 
@@ -2845,20 +2873,31 @@ private MappingMongoConverter getDefaultMongoConverter() {
 		return converter;
 	}
 
-	private Document getMappedSortObject(Query query, Class<?> type) {
+	@Contract("null, _ -> null")
+	private @Nullable Document getMappedSortObject(@Nullable Query query, Class<?> type) {
 
 		if (query == null) {
 			return null;
 		}
 
-		return queryMapper.getMappedSort(query.getSortObject(), mappingContext.getPersistentEntity(type));
+		return getMappedSortObject(query.getSortObject(), type);
+	}
+
+	@Contract("null, _ -> null")
+	private @Nullable Document getMappedSortObject(@Nullable Document sortObject, Class<?> type) {
+
+		if (ObjectUtils.isEmpty(sortObject)) {
+			return null;
+		}
+
+		return queryMapper.getMappedSort(sortObject, mappingContext.getPersistentEntity(type));
 	}
 
 	// Callback implementations
 
 	/**
 	 * Simple {@link ReactiveCollectionCallback} that takes a query {@link Document} plus an optional fields specification
-	 * {@link Document} and executes that against the {@link DBCollection}.
+	 * {@link Document} and executes that against the {@link MongoCollection}.
 	 *
 	 * @author Oliver Gierke
 	 * @author Thomas Risberg
@@ -2866,11 +2905,14 @@ private Document getMappedSortObject(Query query, Class<?> type) {
 	 */
 	private static class FindOneCallback implements ReactiveCollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
 		private final Optional<Document> fields;
 		private final FindPublisherPreparer preparer;
 
-		FindOneCallback(Document query, @Nullable Document fields, FindPublisherPreparer preparer) {
+		FindOneCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				@Nullable Document fields, FindPublisherPreparer preparer) {
+			this.collectionPreparer = collectionPreparer;
 			this.query = query;
 			this.fields = Optional.ofNullable(fields);
 			this.preparer = preparer;
@@ -2880,13 +2922,8 @@ private static class FindOneCallback implements ReactiveCollectionCallback<Docum
 		public Publisher<Document> doInCollection(MongoCollection<Document> collection)
 				throws MongoException, DataAccessException {
 
-			if (LOGGER.isDebugEnabled()) {
-
-				LOGGER.debug("findOne using query: {} fields: {} in db.collection: {}", serializeToJsonSafely(query),
-						serializeToJsonSafely(fields.orElseGet(Document::new)), collection.getNamespace().getFullName());
-			}
-
-			FindPublisher<Document> publisher = preparer.initiateFind(collection, col -> col.find(query, Document.class));
+			FindPublisher<Document> publisher = preparer.initiateFind(collectionPreparer.prepare(collection),
+					col -> col.find(query, Document.class));
 
 			if (fields.isPresent()) {
 				publisher = publisher.projection(fields.get());
@@ -2902,24 +2939,33 @@ public Publisher<Document> doInCollection(MongoCollection<Document> collection)
 	 *
 	 * @author Mark Paluch
 	 */
-	@RequiredArgsConstructor
 	private static class FindCallback implements ReactiveCollectionQueryCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
+
 		private final @Nullable Document query;
 		private final @Nullable Document fields;
 
-		FindCallback(@Nullable Document query) {
-			this(query, null);
+		FindCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, @Nullable Document query) {
+			this(collectionPreparer, query, null);
+		}
+
+		FindCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, @Nullable Document query,
+				@Nullable Document fields) {
+			this.collectionPreparer = collectionPreparer;
+			this.query = query;
+			this.fields = fields;
 		}
 
 		@Override
 		public FindPublisher<Document> doInCollection(MongoCollection<Document> collection) {
 
+			MongoCollection<Document> collectionToUse = collectionPreparer.prepare(collection);
 			FindPublisher<Document> findPublisher;
 			if (ObjectUtils.isEmpty(query)) {
-				findPublisher = collection.find(Document.class);
+				findPublisher = collectionToUse.find(Document.class);
 			} else {
-				findPublisher = collection.find(query, Document.class);
+				findPublisher = collectionToUse.find(query, Document.class);
 			}
 
 			if (ObjectUtils.isEmpty(fields)) {
@@ -2938,13 +2984,15 @@ public FindPublisher<Document> doInCollection(MongoCollection<Document> collecti
 	 */
 	private static class FindAndRemoveCallback implements ReactiveCollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
 		private final Document fields;
-		private final Document sort;
+		private final @Nullable Document sort;
 		private final Optional<Collation> collation;
 
-		FindAndRemoveCallback(Document query, Document fields, Document sort, @Nullable Collation collation) {
-
+		FindAndRemoveCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				Document fields, @Nullable Document sort, @Nullable Collation collation) {
+			this.collectionPreparer = collectionPreparer;
 			this.query = query;
 			this.fields = fields;
 			this.sort = sort;
@@ -2958,42 +3006,56 @@ public Publisher<Document> doInCollection(MongoCollection<Document> collection)
 			FindOneAndDeleteOptions findOneAndDeleteOptions = convertToFindOneAndDeleteOptions(fields, sort);
 			collation.map(Collation::toMongoCollation).ifPresent(findOneAndDeleteOptions::collation);
 
-			return collection.findOneAndDelete(query, findOneAndDeleteOptions);
+			return collectionPreparer.prepare(collection).findOneAndDelete(query, findOneAndDeleteOptions);
 		}
 	}
 
 	/**
 	 * @author Mark Paluch
 	 */
-	@RequiredArgsConstructor
 	private static class FindAndModifyCallback implements ReactiveCollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
-		private final Document fields;
-		private final Document sort;
+		private final @Nullable Document fields;
+		private final @Nullable Document sort;
 		private final Object update;
 		private final List<Document> arrayFilters;
 		private final FindAndModifyOptions options;
 
+		FindAndModifyCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				@Nullable Document fields, @Nullable Document sort, Object update, List<Document> arrayFilters,
+				FindAndModifyOptions options) {
+
+			this.collectionPreparer = collectionPreparer;
+			this.query = query;
+			this.fields = fields;
+			this.sort = sort;
+			this.update = update;
+			this.arrayFilters = arrayFilters;
+			this.options = options;
+		}
+
 		@Override
 		public Publisher<Document> doInCollection(MongoCollection<Document> collection)
 				throws MongoException, DataAccessException {
 
+			MongoCollection<Document> collectionToUse = collectionPreparer.prepare(collection);
 			if (options.isRemove()) {
 				FindOneAndDeleteOptions findOneAndDeleteOptions = convertToFindOneAndDeleteOptions(fields, sort);
 
 				findOneAndDeleteOptions = options.getCollation().map(Collation::toMongoCollation)
 						.map(findOneAndDeleteOptions::collation).orElse(findOneAndDeleteOptions);
 
-				return collection.findOneAndDelete(query, findOneAndDeleteOptions);
+				return collectionToUse.findOneAndDelete(query, findOneAndDeleteOptions);
 			}
 
 			FindOneAndUpdateOptions findOneAndUpdateOptions = convertToFindOneAndUpdateOptions(options, fields, sort,
 					arrayFilters);
-			if (update instanceof Document) {
-				return collection.findOneAndUpdate(query, (Document) update, findOneAndUpdateOptions);
+			if (update instanceof Document document) {
+				return collection.findOneAndUpdate(query, document, findOneAndUpdateOptions);
 			} else if (update instanceof List) {
-				return collection.findOneAndUpdate(query, (List<Document>) update, findOneAndUpdateOptions);
+				return collectionToUse.findOneAndUpdate(query, (List<Document>) update, findOneAndUpdateOptions);
 			}
 
 			return Flux
@@ -3001,7 +3063,7 @@ public Publisher<Document> doInCollection(MongoCollection<Document> collection)
 		}
 
 		private static FindOneAndUpdateOptions convertToFindOneAndUpdateOptions(FindAndModifyOptions options,
-				Document fields, Document sort, List<Document> arrayFilters) {
+				@Nullable Document fields, @Nullable Document sort, List<Document> arrayFilters) {
 
 			FindOneAndUpdateOptions result = new FindOneAndUpdateOptions();
 
@@ -3014,7 +3076,10 @@ private static FindOneAndUpdateOptions convertToFindOneAndUpdateOptions(FindAndM
 			}
 
 			result = options.getCollation().map(Collation::toMongoCollation).map(result::collation).orElse(result);
-			result.arrayFilters(arrayFilters);
+
+			if (!CollectionUtils.isEmpty(arrayFilters)) {
+				result.arrayFilters(arrayFilters);
+			}
 
 			return result;
 		}
@@ -3027,26 +3092,34 @@ private static FindOneAndUpdateOptions convertToFindOneAndUpdateOptions(FindAndM
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 	private static class FindAndReplaceCallback implements ReactiveCollectionCallback<Document> {
 
+		private final CollectionPreparer<MongoCollection<Document>> collectionPreparer;
 		private final Document query;
 		private final Document fields;
 		private final Document sort;
 		private final Document update;
-		private final @Nullable com.mongodb.client.model.Collation collation;
+		private final com.mongodb.client.model.@Nullable Collation collation;
 		private final FindAndReplaceOptions options;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveCollectionCallback#doInCollection(com.mongodb.reactivestreams.client.MongoCollection)
-		 */
+		FindAndReplaceCallback(CollectionPreparer<MongoCollection<Document>> collectionPreparer, Document query,
+				Document fields, Document sort, Document update, com.mongodb.client.model.@Nullable Collation collation,
+				FindAndReplaceOptions options) {
+			this.collectionPreparer = collectionPreparer;
+			this.query = query;
+			this.fields = fields;
+			this.sort = sort;
+			this.update = update;
+			this.collation = collation;
+			this.options = options;
+		}
+
 		@Override
 		public Publisher<Document> doInCollection(MongoCollection<Document> collection)
 				throws MongoException, DataAccessException {
 
 			FindOneAndReplaceOptions findOneAndReplaceOptions = convertToFindOneAndReplaceOptions(options, fields, sort);
-			return collection.findOneAndReplace(query, update, findOneAndReplaceOptions);
+			return collectionPreparer.prepare(collection).findOneAndReplace(query, update, findOneAndReplaceOptions);
 		}
 
 		private FindOneAndReplaceOptions convertToFindOneAndReplaceOptions(FindAndReplaceOptions options, Document fields,
@@ -3066,7 +3139,8 @@ private FindOneAndReplaceOptions convertToFindOneAndReplaceOptions(FindAndReplac
 		}
 	}
 
-	private static FindOneAndDeleteOptions convertToFindOneAndDeleteOptions(Document fields, Document sort) {
+	private static FindOneAndDeleteOptions convertToFindOneAndDeleteOptions(@Nullable Document fields,
+			@Nullable Document sort) {
 
 		FindOneAndDeleteOptions result = new FindOneAndDeleteOptions();
 		result = result.projection(fields).sort(sort);
@@ -3082,7 +3156,7 @@ private static FindOneAndDeleteOptions convertToFindOneAndDeleteOptions(Document
 
 	interface DocumentCallback<T> {
 
-		T doWith(Document object);
+		Mono<T> doWith(Document object);
 	}
 
 	/**
@@ -3103,14 +3177,32 @@ interface MongoDatabaseCallback<T> {
 	 */
 	interface ReactiveCollectionQueryCallback<T> extends ReactiveCollectionCallback<T> {
 
+		@Override
 		FindPublisher<T> doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException;
 	}
 
+	static class QueryResultConverterCallback<T, R> implements DocumentCallback<R> {
+
+		private final QueryResultConverter<? super T, ? extends R> converter;
+		private final DocumentCallback<T> delegate;
+
+		QueryResultConverterCallback(QueryResultConverter<? super T, ? extends R> converter, DocumentCallback<T> delegate) {
+			this.converter = converter;
+			this.delegate = delegate;
+		}
+
+		@Override
+		public Mono<R> doWith(Document object) {
+			return delegate.doWith(object).map(it -> converter.mapDocument(object, () -> it));
+		}
+	}
+
 	/**
 	 * Simple {@link DocumentCallback} that will transform {@link Document} into the given target type using the given
 	 * {@link EntityReader}.
 	 *
 	 * @author Mark Paluch
+	 * @author Roman Puchkovskiy
 	 */
 	class ReadDocumentCallback<T> implements DocumentCallback<T> {
 
@@ -3120,68 +3212,68 @@ class ReadDocumentCallback<T> implements DocumentCallback<T> {
 
 		ReadDocumentCallback(EntityReader<? super T, Bson> reader, Class<T> type, String collectionName) {
 
-			Assert.notNull(reader, "EntityReader must not be null!");
-			Assert.notNull(type, "Entity type must not be null!");
+			Assert.notNull(reader, "EntityReader must not be null");
+			Assert.notNull(type, "Entity type must not be null");
 
 			this.reader = reader;
 			this.type = type;
 			this.collectionName = collectionName;
 		}
 
-		public T doWith(@Nullable Document object) {
+		@Override
+		public Mono<T> doWith(Document document) {
+
+			maybeEmitEvent(new AfterLoadEvent<>(document, type, collectionName));
 
-			if (null != object) {
-				maybeEmitEvent(new AfterLoadEvent<>(object, type, collectionName));
-			}
-			T source = reader.read(type, object);
-			if (null != source) {
-				maybeEmitEvent(new AfterConvertEvent<>(object, source, collectionName));
+			T entity = reader.read(type, document);
+
+			if (entity == null) {
+				throw new MappingException(String.format("EntityReader %s returned null", reader));
 			}
-			return source;
+
+			maybeEmitEvent(new AfterConvertEvent<>(document, entity, collectionName));
+			return maybeCallAfterConvert(entity, document, collectionName);
 		}
 	}
 
 	/**
-	 * {@link MongoTemplate.DocumentCallback} transforming {@link Document} into the given {@code targetType} or
-	 * decorating the {@code sourceType} with a {@literal projection} in case the {@code targetType} is an
-	 * {@litera interface}.
+	 * {@link DocumentCallback} transforming {@link Document} into the given {@code targetType} or decorating the
+	 * {@code sourceType} with a {@literal projection} in case the {@code targetType} is an {@literal interface}.
 	 *
 	 * @param <S>
 	 * @param <T>
 	 * @author Christoph Strobl
+	 * @author Roman Puchkovskiy
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor
 	private class ProjectingReadCallback<S, T> implements DocumentCallback<T> {
 
-		private final @NonNull EntityReader<Object, Bson> reader;
-		private final @NonNull Class<S> entityType;
-		private final @NonNull Class<T> targetType;
-		private final @NonNull String collectionName;
+		private final MongoConverter reader;
+		private final EntityProjection<T, S> projection;
+		private final String collectionName;
 
-		@Nullable
+		ProjectingReadCallback(MongoConverter reader, EntityProjection<T, S> projection, String collectionName) {
+			this.reader = reader;
+			this.projection = projection;
+			this.collectionName = collectionName;
+		}
+
+		@Override
 		@SuppressWarnings("unchecked")
-		public T doWith(@Nullable Document object) {
+		public Mono<T> doWith(Document document) {
 
-			if (object == null) {
-				return null;
-			}
+			Class<T> returnType = projection.getMappedType().getType();
+			maybeEmitEvent(new AfterLoadEvent<>(document, returnType, collectionName));
 
-			Class<?> typeToRead = targetType.isInterface() || targetType.isAssignableFrom(entityType) //
-					? entityType //
-					: targetType;
+			Object entity = reader.project(projection, document);
 
-			if (null != object) {
-				maybeEmitEvent(new AfterLoadEvent<>(object, typeToRead, collectionName));
+			if (entity == null) {
+				throw new MappingException(String.format("EntityReader %s returned null", reader));
 			}
 
-			Object source = reader.read(typeToRead, object);
-			Object result = targetType.isInterface() ? projectionFactory.createProjection(targetType, source) : source;
-
-			if (null != source) {
-				maybeEmitEvent(new AfterConvertEvent<>(object, result, collectionName));
-			}
-			return (T) result;
+			T castEntity = (T) entity;
+			maybeEmitEvent(new AfterConvertEvent<>(document, castEntity, collectionName));
+			return maybeCallAfterConvert(castEntity, document, collectionName);
 		}
 	}
 
@@ -3191,6 +3283,7 @@ public T doWith(@Nullable Document object) {
 	 *
 	 * @author Mark Paluch
 	 * @author Chrstoph Strobl
+	 * @author Roman Puchkovskiy
 	 */
 	static class GeoNearResultDocumentCallback<T> implements DocumentCallback<GeoResult<T>> {
 
@@ -3208,23 +3301,28 @@ static class GeoNearResultDocumentCallback<T> implements DocumentCallback<GeoRes
 		 */
 		GeoNearResultDocumentCallback(String distanceField, DocumentCallback<T> delegate, Metric metric) {
 
-			Assert.notNull(delegate, "DocumentCallback must not be null!");
+			Assert.notNull(delegate, "DocumentCallback must not be null");
 
 			this.distanceField = distanceField;
 			this.delegate = delegate;
 			this.metric = metric;
 		}
 
-		public GeoResult<T> doWith(Document object) {
+		@Override
+		public Mono<GeoResult<T>> doWith(Document object) {
+
+			double distance = getDistance(object);
+
+			return delegate.doWith(object).map(doWith -> new GeoResult<>(doWith, Distance.of(distance, metric)));
+		}
+
+		double getDistance(Document object) {
 
-			double distance = Double.NaN;
 			if (object.containsKey(distanceField)) {
-				distance = NumberUtils.convertNumberToTargetClass(object.get(distanceField, Number.class), Double.class);
+				return NumberUtils.convertNumberToTargetClass(object.get(distanceField, Number.class), Double.class);
 			}
 
-			T doWith = delegate.doWith(object);
-
-			return new GeoResult<>(doWith, new Distance(distance, metric));
+			return Double.NaN;
 		}
 	}
 
@@ -3234,15 +3332,28 @@ public GeoResult<T> doWith(Document object) {
 	class QueryFindPublisherPreparer implements FindPublisherPreparer {
 
 		private final Query query;
+
+		private final Document sortObject;
+
+		private final int limit;
+
+		private final long skip;
 		private final @Nullable Class<?> type;
 
 		QueryFindPublisherPreparer(Query query, @Nullable Class<?> type) {
+			this(query, query.getSortObject(), query.getLimit(), query.getSkip(), type);
+		}
+
+		QueryFindPublisherPreparer(Query query, Document sortObject, int limit, long skip, @Nullable Class<?> type) {
 
 			this.query = query;
+			this.sortObject = sortObject;
+			this.limit = limit;
+			this.skip = skip;
 			this.type = type;
 		}
 
-		@SuppressWarnings("deprecation")
+		@Override
 		public FindPublisher<Document> prepare(FindPublisher<Document> findPublisher) {
 
 			FindPublisher<Document> findPublisherToUse = operations.forType(type) //
@@ -3251,52 +3362,49 @@ public FindPublisher<Document> prepare(FindPublisher<Document> findPublisher) {
 					.map(findPublisher::collation) //
 					.orElse(findPublisher);
 
+			HintFunction hintFunction = HintFunction.from(query.getHint());
 			Meta meta = query.getMeta();
-			if (query.getSkip() <= 0 && query.getLimit() <= 0 && ObjectUtils.isEmpty(query.getSortObject())
-					&& !StringUtils.hasText(query.getHint()) && !meta.hasValues()) {
+			if (skip <= 0 && limit <= 0 && ObjectUtils.isEmpty(sortObject) && hintFunction.isEmpty() && !meta.hasValues()) {
 				return findPublisherToUse;
 			}
 
 			try {
 
-				if (query.getSkip() > 0) {
-					findPublisherToUse = findPublisherToUse.skip((int) query.getSkip());
+				if (skip > 0) {
+					findPublisherToUse = findPublisherToUse.skip((int) skip);
 				}
 
-				if (query.getLimit() > 0) {
-					findPublisherToUse = findPublisherToUse.limit(query.getLimit());
+				if (limit > 0) {
+					findPublisherToUse = findPublisherToUse.limit(limit);
 				}
 
-				if (!ObjectUtils.isEmpty(query.getSortObject())) {
-					Document sort = type != null ? getMappedSortObject(query, type) : query.getSortObject();
+				if (!ObjectUtils.isEmpty(sortObject)) {
+					Document sort = type != null ? getMappedSortObject(sortObject, type) : sortObject;
 					findPublisherToUse = findPublisherToUse.sort(sort);
 				}
 
-				if (StringUtils.hasText(query.getHint())) {
-					findPublisherToUse = findPublisherToUse.hint(Document.parse(query.getHint()));
+				if (hintFunction.isPresent()) {
+					findPublisherToUse = hintFunction.apply(mongoDatabaseFactory, findPublisherToUse::hintString,
+							findPublisherToUse::hint);
 				}
 
 				if (meta.hasValues()) {
 
-					if (StringUtils.hasText(meta.getComment())) {
-						findPublisherToUse = findPublisherToUse.comment(meta.getComment());
-					}
-
-					if (meta.getSnapshot()) {
-						findPublisherToUse = findPublisherToUse.snapshot(meta.getSnapshot());
-					}
-
-					if (meta.getMaxScan() != null) {
-						findPublisherToUse = findPublisherToUse.maxScan(meta.getMaxScan());
+					if (meta.hasComment()) {
+						findPublisherToUse = findPublisherToUse.comment(meta.getRequiredComment());
 					}
 
-					if (meta.getMaxTimeMsec() != null) {
-						findPublisherToUse = findPublisherToUse.maxTime(meta.getMaxTimeMsec(), TimeUnit.MILLISECONDS);
+					if (meta.hasMaxTime()) {
+						findPublisherToUse = findPublisherToUse.maxTime(meta.getRequiredMaxTimeMsec(), TimeUnit.MILLISECONDS);
 					}
 
 					if (meta.getCursorBatchSize() != null) {
 						findPublisherToUse = findPublisherToUse.batchSize(meta.getCursorBatchSize());
 					}
+
+					if (meta.getAllowDiskUse() != null) {
+						findPublisherToUse = findPublisherToUse.allowDiskUse(meta.getAllowDiskUse());
+					}
 				}
 
 			} catch (RuntimeException e) {
@@ -3306,10 +3414,6 @@ public FindPublisher<Document> prepare(FindPublisher<Document> findPublisher) {
 			return findPublisherToUse;
 		}
 
-		@Override
-		public ReadPreference getReadPreference() {
-			return query.getMeta().getFlags().contains(CursorOption.SLAVE_OK) ? ReadPreference.primaryPreferred() : null;
-		}
 	}
 
 	class TailingQueryFindPublisherPreparer extends QueryFindPublisherPreparer {
@@ -3330,8 +3434,7 @@ private static List<? extends Document> toDocuments(Collection<? extends Documen
 
 	/**
 	 * {@link MongoTemplate} extension bound to a specific {@link ClientSession} that is applied when interacting with the
-	 * server through the driver API.
-	 * <p />
+	 * server through the driver API. <br />
 	 * The prepare steps for {@link MongoDatabase} and {@link MongoCollection} proxy the target and invoke the desired
 	 * target method matching the actual arguments plus a {@link ClientSession}.
 	 *
@@ -3355,34 +3458,34 @@ static class ReactiveSessionBoundMongoTemplate extends ReactiveMongoTemplate {
 			this.session = session;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#getCollection(java.lang.String)
-		 */
 		@Override
-		public MongoCollection<Document> getCollection(String collectionName) {
+		public Mono<MongoCollection<Document>> getCollection(String collectionName) {
 
 			// native MongoDB objects that offer methods with ClientSession must not be proxied.
 			return delegate.getCollection(collectionName);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveMongoTemplate#getMongoDatabase()
-		 */
 		@Override
-		public MongoDatabase getMongoDatabase() {
+		public Mono<MongoDatabase> getMongoDatabase() {
 
 			// native MongoDB objects that offer methods with ClientSession must not be proxied.
 			return delegate.getMongoDatabase();
 		}
+
+		@Override
+		protected Mono<Boolean> countCanBeEstimated(Document filter, CountOptions options) {
+			return Mono.just(false);
+		}
 	}
 
-	@RequiredArgsConstructor
 	class IndexCreatorEventListener implements ApplicationListener<MappingContextEvent<?, ?>> {
 
 		final Consumer<Throwable> subscriptionExceptionHandler;
 
+		public IndexCreatorEventListener(Consumer<Throwable> subscriptionExceptionHandler) {
+			this.subscriptionExceptionHandler = subscriptionExceptionHandler;
+		}
+
 		@Override
 		public void onApplicationEvent(MappingContextEvent<?, ?> event) {
 
@@ -3393,9 +3496,9 @@ public void onApplicationEvent(MappingContextEvent<?, ?> event) {
 			PersistentEntity<?, ?> entity = event.getPersistentEntity();
 
 			// Double check type as Spring infrastructure does not consider nested generics
-			if (entity instanceof MongoPersistentEntity) {
+			if (entity instanceof MongoPersistentEntity<?> mongoPersistentProperties) {
 
-				onCheckForIndexes((MongoPersistentEntity<?>) entity, subscriptionExceptionHandler);
+				onCheckForIndexes(mongoPersistentProperties, subscriptionExceptionHandler);
 			}
 		}
 	}
@@ -3450,4 +3553,9 @@ String getCollection() {
 			return collection;
 		}
 	}
+
+	@FunctionalInterface
+	interface CountExecution {
+		Mono<Long> countDocuments(String collection, Document filter, CountOptions options);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperation.java
index e8b243c804..dd515cb37c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,9 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.lang.Contract;
 
 import com.mongodb.client.result.DeleteResult;
 
@@ -55,20 +57,26 @@ public interface ReactiveRemoveOperation {
 	<T> ReactiveRemove<T> remove(Class<T> domainType);
 
 	/**
-	 * Compose remove execution by calling one of the terminating methods.
+	 * @author Christoph Strobl
+	 * @since 5.0
 	 */
-	interface TerminatingRemove<T> {
+	interface TerminatingResults<T> {
 
 		/**
-		 * Remove all documents matching.
+		 * Map the query result to a different type using {@link QueryResultConverter}.
 		 *
-		 * @return {@link Mono} emitting the {@link DeleteResult}. Never {@literal null}.
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link ExecutableFindOperation.TerminatingResults}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
 		 */
-		Mono<DeleteResult> all();
+		@Contract("_ -> new")
+		<R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter);
 
 		/**
 		 * Remove and return all matching documents. <br/>
-		 * <strong>NOTE</strong> The entire list of documents will be fetched before sending the actual delete commands.
+		 * <strong>NOTE:</strong> The entire list of documents will be fetched before sending the actual delete commands.
 		 * Also, {@link org.springframework.context.ApplicationEvent}s will be published for each and every delete
 		 * operation.
 		 *
@@ -77,6 +85,20 @@ interface TerminatingRemove<T> {
 		Flux<T> findAndRemove();
 	}
 
+	/**
+	 * Compose remove execution by calling one of the terminating methods.
+	 */
+	interface TerminatingRemove<T> extends TerminatingResults<T> {
+
+		/**
+		 * Remove all documents matching.
+		 *
+		 * @return {@link Mono} emitting the {@link DeleteResult}. Never {@literal null}.
+		 */
+		Mono<DeleteResult> all();
+
+	}
+
 	/**
 	 * Collection override (optional).
 	 */
@@ -106,6 +128,18 @@ interface RemoveWithQuery<T> extends TerminatingRemove<T> {
 		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		TerminatingRemove<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link TerminatingRemove}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 * @since 3.0
+		 */
+		default TerminatingRemove<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	interface ReactiveRemove<T> extends RemoveWithCollection<T> {}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java
index 23a1578a0f..f77b5296d7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,10 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
@@ -35,62 +32,58 @@
  * @author Christoph Strobl
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ReactiveRemoveOperationSupport implements ReactiveRemoveOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull ReactiveMongoTemplate tempate;
+	private final ReactiveMongoTemplate template;
+
+	ReactiveRemoveOperationSupport(ReactiveMongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation#remove(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveRemove<T> remove(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ReactiveRemoveSupport<>(tempate, domainType, ALL_QUERY, null);
+		return new ReactiveRemoveSupport<>(template, domainType, ALL_QUERY, null, QueryResultConverter.entity());
 	}
 
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ReactiveRemoveSupport<T> implements ReactiveRemove<T>, RemoveWithCollection<T> {
+	static class ReactiveRemoveSupport<S, T> implements ReactiveRemove<T>, RemoveWithCollection<T> {
+
+		private final ReactiveMongoTemplate template;
+		private final Class<S> domainType;
+		private final Query query;
+		private final @Nullable String collection;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+
+		ReactiveRemoveSupport(ReactiveMongoTemplate template, Class<S> domainType, Query query, @Nullable String collection,
+				QueryResultConverter<? super S, ? extends T> resultConverter) {
 
-		@NonNull ReactiveMongoTemplate template;
-		@NonNull Class<T> domainType;
-		Query query;
-		String collection;
+			this.template = template;
+			this.domainType = domainType;
+			this.query = query;
+			this.collection = collection;
+			this.resultConverter = resultConverter;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.RemoveWithCollection#inCollection(String)
-		 */
 		@Override
 		public RemoveWithQuery<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty!");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
-			return new ReactiveRemoveSupport<>(template, domainType, query, collection);
+			return new ReactiveRemoveSupport<>(template, domainType, query, collection, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.RemoveWithQuery#matching(org.springframework.data.mongodb.core.Query)
-		 */
 		@Override
 		public TerminatingRemove<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
-			return new ReactiveRemoveSupport<>(template, domainType, query, collection);
+			return new ReactiveRemoveSupport<>(template, domainType, query, collection, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.TerminatingRemove#all()
-		 */
 		@Override
 		public Mono<DeleteResult> all() {
 
@@ -99,16 +92,18 @@ public Mono<DeleteResult> all() {
 			return template.doRemove(collectionName, query, domainType);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveRemoveOperation.TerminatingRemove#findAndRemove()
-		 */
 		@Override
 		public Flux<T> findAndRemove() {
 
 			String collectionName = getCollectionName();
 
-			return template.doFindAndDelete(collectionName, query, domainType);
+			return template.doFindAndDelete(collectionName, query, domainType, resultConverter);
+		}
+
+		@Override
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		public <R> TerminatingResults<R> map(QueryResultConverter<? super T, ? extends R> converter) {
+			return new ReactiveRemoveSupport<>(template, (Class) domainType, query, collection, converter);
 		}
 
 		private String getCollectionName() {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionCallback.java
index d69f79eaba..aeb0e88e24 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public interface ReactiveSessionCallback<T> {
 	/**
 	 * Execute operations against a MongoDB instance via session bound {@link ReactiveMongoOperations}. The session is
 	 * inferred directly into the operation so that no further interaction is necessary.
-	 * <p />
+	 * <br />
 	 * Please note that only Spring Data-specific abstractions like {@link ReactiveMongoOperations#find(Query, Class)} and
 	 * others are enhanced with the {@link com.mongodb.session.ClientSession}. When obtaining plain MongoDB gateway
 	 * objects like {@link com.mongodb.reactivestreams.client.MongoCollection} or
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionScoped.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionScoped.java
index d4016f4907..f0ffc1ba60 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionScoped.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveSessionScoped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public interface ReactiveSessionScoped {
 
 	/**
 	 * Executes the given {@link ReactiveSessionCallback} within the {@link com.mongodb.session.ClientSession}.
-	 * <p/>
+	 * <br />
 	 * It is up to the caller to make sure the {@link com.mongodb.session.ClientSession} is {@link ClientSession#close()
 	 * closed} when done.
 	 *
@@ -47,7 +47,7 @@ default <T> Flux<T> execute(ReactiveSessionCallback<T> action) {
 
 	/**
 	 * Executes the given {@link ReactiveSessionCallback} within the {@link com.mongodb.session.ClientSession}.
-	 * <p/>
+	 * <br />
 	 * It is up to the caller to make sure the {@link com.mongodb.session.ClientSession} is {@link ClientSession#close()
 	 * closed} when done.
 	 *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperation.java
index 711a20cb32..c9f92029cc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,14 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
-import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.jetbrains.annotations.Contract;
 import reactor.core.publisher.Mono;
 
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 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 com.mongodb.client.result.UpdateResult;
 
@@ -63,6 +65,18 @@ public interface ReactiveUpdateOperation {
 	 */
 	interface TerminatingFindAndModify<T> {
 
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFindAndModify}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingFindAndModify<R> map(QueryResultConverter<? super T, ? extends R> converter);
+
 		/**
 		 * Find, modify and return the first matching document.
 		 *
@@ -71,13 +85,42 @@ interface TerminatingFindAndModify<T> {
 		Mono<T> findAndModify();
 	}
 
+	/**
+	 * Trigger <a href="https://docs.mongodb.com/manual/reference/method/db.collection.replaceOne/">replaceOne</a>
+	 * execution by calling one of the terminating methods.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.2
+	 */
+	interface TerminatingReplace {
+
+		/**
+		 * Find first and replace/upsert.
+		 *
+		 * @return never {@literal null}.
+		 */
+		Mono<UpdateResult> replaceFirst();
+	}
+
 	/**
 	 * Compose findAndReplace execution by calling one of the terminating methods.
 	 *
 	 * @author Mark Paluch
 	 * @since 2.1
 	 */
-	interface TerminatingFindAndReplace<T> {
+	interface TerminatingFindAndReplace<T> extends TerminatingReplace {
+
+		/**
+		 * Map the query result to a different type using {@link QueryResultConverter}.
+		 *
+		 * @param <R> {@link Class type} of the result.
+		 * @param converter the converter, must not be {@literal null}.
+		 * @return new instance of {@link TerminatingFindAndModify}.
+		 * @throws IllegalArgumentException if {@link QueryResultConverter converter} is {@literal null}.
+		 * @since 5.0
+		 */
+		@Contract("_ -> new")
+		<R> TerminatingFindAndReplace<R> map(QueryResultConverter<? super T, ? extends R> converter);
 
 		/**
 		 * Find, replace and return the first matching document.
@@ -125,7 +168,7 @@ interface UpdateWithUpdate<T> {
 		 * @param update must not be {@literal null}.
 		 * @return new instance of {@link TerminatingUpdate}. Never {@literal null}.
 		 * @throws IllegalArgumentException if update is {@literal null}.
-		 * @since 2.3
+		 * @since 3.0
 		 * @see Update
 		 * @see AggregationUpdate
 		 */
@@ -171,6 +214,18 @@ interface UpdateWithQuery<T> extends UpdateWithUpdate<T> {
 		 * @throws IllegalArgumentException if query is {@literal null}.
 		 */
 		UpdateWithUpdate<T> matching(Query query);
+
+		/**
+		 * Set the filter {@link CriteriaDefinition criteria} to be used.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return new instance of {@link UpdateWithUpdate}.
+		 * @throws IllegalArgumentException if query is {@literal null}.
+		 * @since 3.0
+		 */
+		default UpdateWithUpdate<T> matching(CriteriaDefinition criteria) {
+			return matching(Query.query(criteria));
+		}
 	}
 
 	/**
@@ -189,6 +244,22 @@ interface FindAndModifyWithOptions<T> {
 		TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options);
 	}
 
+	/**
+	 * @author Christoph Strobl
+	 * @since 4.2
+	 */
+	interface ReplaceWithOptions extends TerminatingReplace {
+
+		/**
+		 * Explicitly define {@link ReplaceOptions}.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return new instance of {@link FindAndReplaceOptions}.
+		 * @throws IllegalArgumentException if options is {@literal null}.
+		 */
+		TerminatingReplace withOptions(ReplaceOptions options);
+	}
+
 	/**
 	 * Define {@link FindAndReplaceOptions}.
 	 *
@@ -196,7 +267,7 @@ interface FindAndModifyWithOptions<T> {
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	interface FindAndReplaceWithOptions<T> extends TerminatingFindAndReplace<T> {
+	interface FindAndReplaceWithOptions<T> extends TerminatingFindAndReplace<T>, ReplaceWithOptions {
 
 		/**
 		 * Explicitly define {@link FindAndReplaceOptions} for the {@link Update}.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java
index 22c1ad6899..876a7a5aa2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,11 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-import lombok.experimental.FieldDefaults;
 import reactor.core.publisher.Mono;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -35,182 +32,186 @@
  * @author Christoph Strobl
  * @since 2.0
  */
-@RequiredArgsConstructor
 class ReactiveUpdateOperationSupport implements ReactiveUpdateOperation {
 
 	private static final Query ALL_QUERY = new Query();
 
-	private final @NonNull ReactiveMongoTemplate template;
+	private final ReactiveMongoTemplate template;
+
+	ReactiveUpdateOperationSupport(ReactiveMongoTemplate template) {
+		this.template = template;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation#update(java.lang.Class)
-	 */
 	@Override
 	public <T> ReactiveUpdate<T> update(Class<T> domainType) {
 
-		Assert.notNull(domainType, "DomainType must not be null!");
+		Assert.notNull(domainType, "DomainType must not be null");
 
-		return new ReactiveUpdateSupport<>(template, domainType, ALL_QUERY, null, null, null, null, null, domainType);
+		return new ReactiveUpdateSupport<>(template, domainType, ALL_QUERY, null, null, null, null, null, domainType, QueryResultConverter.entity());
 	}
 
-	@RequiredArgsConstructor
-	@FieldDefaults(level = AccessLevel.PRIVATE, makeFinal = true)
-	static class ReactiveUpdateSupport<T>
+	static class ReactiveUpdateSupport<S, T>
 			implements ReactiveUpdate<T>, UpdateWithCollection<T>, UpdateWithQuery<T>, TerminatingUpdate<T>,
 			FindAndReplaceWithOptions<T>, FindAndReplaceWithProjection<T>, TerminatingFindAndReplace<T> {
 
-		@NonNull ReactiveMongoTemplate template;
-		@NonNull Class<?> domainType;
-		Query query;
-		org.springframework.data.mongodb.core.query.UpdateDefinition update;
-		@Nullable String collection;
-		@Nullable FindAndModifyOptions findAndModifyOptions;
-		@Nullable FindAndReplaceOptions findAndReplaceOptions;
-		@Nullable Object replacement;
-		@NonNull Class<T> targetType;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithUpdate#apply(org.springframework.data.mongodb.core.query.UpdateDefinition)
-		 */
+		private final ReactiveMongoTemplate template;
+		private final Class<?> domainType;
+		private final Query query;
+		private final org.springframework.data.mongodb.core.query.@Nullable UpdateDefinition update;
+		private final @Nullable String collection;
+		private final @Nullable FindAndModifyOptions findAndModifyOptions;
+		private final @Nullable FindAndReplaceOptions findAndReplaceOptions;
+		private final @Nullable Object replacement;
+		private final Class<S> targetType;
+		private final QueryResultConverter<? super S, ? extends T> resultConverter;
+
+		ReactiveUpdateSupport(ReactiveMongoTemplate template, Class<?> domainType, Query query, @Nullable UpdateDefinition update,
+			@Nullable String collection, @Nullable FindAndModifyOptions findAndModifyOptions, @Nullable FindAndReplaceOptions findAndReplaceOptions,
+			@Nullable Object replacement, Class<S> targetType, QueryResultConverter<? super S, ? extends T> resultConverter) {
+
+			this.template = template;
+			this.domainType = domainType;
+			this.query = query;
+			this.update = update;
+			this.collection = collection;
+			this.findAndModifyOptions = findAndModifyOptions;
+			this.findAndReplaceOptions = findAndReplaceOptions;
+			this.replacement = replacement;
+			this.targetType = targetType;
+			this.resultConverter = resultConverter;
+		}
+
 		@Override
 		public TerminatingUpdate<T> apply(org.springframework.data.mongodb.core.query.UpdateDefinition update) {
 
-			Assert.notNull(update, "Update must not be null!");
+			Assert.notNull(update, "Update must not be null");
 
 			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithCollection#inCollection(java.lang.String)
-		 */
 		@Override
 		public UpdateWithQuery<T> inCollection(String collection) {
 
-			Assert.hasText(collection, "Collection must not be null nor empty!");
+			Assert.hasText(collection, "Collection must not be null nor empty");
 
 			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#first()
-		 */
 		@Override
 		public Mono<UpdateResult> first() {
 			return doUpdate(false, false);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#upsert()
-		 */
 		@Override
 		public Mono<UpdateResult> upsert() {
 			return doUpdate(true, true);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingFindAndModify#findAndModify()
-		 */
 		@Override
+		@SuppressWarnings({"unchecked", "rawtypes", "NullAway"})
 		public Mono<T> findAndModify() {
 
 			String collectionName = getCollectionName();
 
-			return template.findAndModify(query, update, findAndModifyOptions != null ? findAndModifyOptions : FindAndModifyOptions.none(), targetType, collectionName);
+			return template.findAndModify(query, update,
+					findAndModifyOptions != null ? findAndModifyOptions : FindAndModifyOptions.none(), (Class) targetType,
+					collectionName, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingFindAndReplace#findAndReplace()
-		 */
 		@Override
+		@SuppressWarnings({"unchecked","rawtypes"})
 		public Mono<T> findAndReplace() {
+
+			Assert.notNull(replacement, "Replacement must be set first");
+
 			return template.findAndReplace(query, replacement,
 					findAndReplaceOptions != null ? findAndReplaceOptions : FindAndReplaceOptions.none(), (Class) domainType,
-					getCollectionName(), targetType);
+					getCollectionName(), targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery#matching(org.springframework.data.mongodb.core.Query)
-		 */
 		@Override
 		public UpdateWithUpdate<T> matching(Query query) {
 
-			Assert.notNull(query, "Query must not be null!");
+			Assert.notNull(query, "Query must not be null");
 
 			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate#all()
-		 */
 		@Override
 		public Mono<UpdateResult> all() {
 			return doUpdate(true, false);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndModifyWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndModifyOptions)
-		 */
 		@Override
 		public TerminatingFindAndModify<T> withOptions(FindAndModifyOptions options) {
 
-			Assert.notNull(options, "Options must not be null!");
+			Assert.notNull(options, "Options must not be null");
 
 			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, options,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithUpdate#replaceWith(java.lang.Object)
-		 */
 		@Override
 		public FindAndReplaceWithProjection<T> replaceWith(T replacement) {
 
-			Assert.notNull(replacement, "Replacement must not be null!");
+			Assert.notNull(replacement, "Replacement must not be null");
 
 			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, targetType);
+					findAndReplaceOptions, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithOptions#withOptions(org.springframework.data.mongodb.core.FindAndReplaceOptions)
-		 */
 		@Override
 		public FindAndReplaceWithProjection<T> withOptions(FindAndReplaceOptions options) {
 
-			Assert.notNull(options, "Options must not be null!");
+			Assert.notNull(options, "Options must not be null");
 
 			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions, options,
-					replacement, targetType);
+					replacement, targetType, resultConverter);
+		}
+
+		@Override
+		public TerminatingReplace withOptions(ReplaceOptions options) {
+
+			FindAndReplaceOptions target = new FindAndReplaceOptions();
+			if (options.isUpsert()) {
+				target.upsert();
+			}
+			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
+					target, replacement, targetType, resultConverter);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.ReactiveUpdateOperation.FindAndReplaceWithProjection#as(java.lang.Class)
-		 */
 		@Override
 		public <R> FindAndReplaceWithOptions<R> as(Class<R> resultType) {
 
-			Assert.notNull(resultType, "ResultType must not be null!");
+			Assert.notNull(resultType, "ResultType must not be null");
 
 			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
-					findAndReplaceOptions, replacement, resultType);
+					findAndReplaceOptions, replacement, resultType, QueryResultConverter.entity());
+		}
+
+		@Override
+		public <R> ReactiveUpdateSupport<S, R> map(QueryResultConverter<? super T, ? extends R> converter) {
+			return new ReactiveUpdateSupport<>(template, domainType, query, update, collection, findAndModifyOptions,
+				findAndReplaceOptions, replacement, targetType, this.resultConverter.andThen(converter));
+		}
+
+		@Override
+		@SuppressWarnings("NullAway")
+		public Mono <UpdateResult> replaceFirst() {
+
+			if (replacement != null) {
+				return template.replace(query, domainType, replacement,
+						findAndReplaceOptions != null ? findAndReplaceOptions : ReplaceOptions.none(), getCollectionName());
+			}
+
+			return template.replace(query, domainType, update,
+					findAndReplaceOptions != null ? findAndReplaceOptions : ReplaceOptions.none(), getCollectionName());
 		}
 
+		@SuppressWarnings("NullAway")
 		private Mono<UpdateResult> doUpdate(boolean multi, boolean upsert) {
 			return template.doUpdate(getCollectionName(), query, update, domainType, upsert, multi);
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReadConcernAware.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReadConcernAware.java
new file mode 100644
index 0000000000..7a7e5fdfb2
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReadConcernAware.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.jspecify.annotations.Nullable;
+
+import com.mongodb.ReadConcern;
+
+/**
+ * Interface to be implemented by any object that wishes to expose the {@link ReadConcern}.
+ * <p>
+ * Typically implemented by cursor or query preparer objects.
+ *
+ * @author Mark Paluch
+ * @since 4.1
+ * @see org.springframework.data.mongodb.core.query.Query
+ * @see org.springframework.data.mongodb.core.aggregation.AggregationOptions
+ */
+public interface ReadConcernAware {
+
+	/**
+	 * @return {@literal true} if a {@link ReadConcern} is set.
+	 */
+	default boolean hasReadConcern() {
+		return getReadConcern() != null;
+	}
+
+	/**
+	 * @return the {@link ReadConcern} to apply or {@literal null} if none set.
+	 */
+	@Nullable
+	ReadConcern getReadConcern();
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReadPreferenceAware.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReadPreferenceAware.java
index 3e46c0411e..e6f3fc0daf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReadPreferenceAware.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReadPreferenceAware.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import com.mongodb.ReadPreference;
 
@@ -27,6 +27,8 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @since 2.2
+ * @see org.springframework.data.mongodb.core.query.Query
+ * @see org.springframework.data.mongodb.core.aggregation.AggregationOptions
  */
 public interface ReadPreferenceAware {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReplaceOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReplaceOptions.java
new file mode 100644
index 0000000000..a487cde669
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReplaceOptions.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.lang.Contract;
+
+/**
+ * Options for {@link org.springframework.data.mongodb.core.MongoOperations#replace(Query, Object) replace operations}. Defaults to
+ * <dl>
+ * <dt>upsert</dt>
+ * <dd>false</dd>
+ * </dl>
+ *
+ * @author Jakub Zurawa
+ * @author Christoph Strob
+ * @since 4.2
+ */
+public class ReplaceOptions {
+
+	private boolean upsert;
+
+	private static final ReplaceOptions NONE = new ReplaceOptions() {
+
+		private static final String ERROR_MSG = "ReplaceOptions.none() cannot be changed; Please use ReplaceOptions.options() instead";
+
+		@Override
+		public ReplaceOptions upsert() {
+			throw new UnsupportedOperationException(ERROR_MSG);
+		}
+	};
+
+	/**
+	 * Static factory method to create a {@link ReplaceOptions} instance.
+	 * <dl>
+	 * <dt>upsert</dt>
+	 * <dd>false</dd>
+	 * </dl>
+	 *
+	 * @return new instance of {@link ReplaceOptions}.
+	 */
+	public static ReplaceOptions replaceOptions() {
+		return new ReplaceOptions();
+	}
+
+	/**
+	 * Static factory method returning an unmodifiable {@link ReplaceOptions} instance.
+	 *
+	 * @return unmodifiable {@link ReplaceOptions} instance.
+	 */
+	public static ReplaceOptions none() {
+		return NONE;
+	}
+
+	/**
+	 * Insert a new document if not exists.
+	 *
+	 * @return this.
+	 */
+	@Contract("-> this")
+	public ReplaceOptions upsert() {
+
+		this.upsert = true;
+		return this;
+	}
+
+	/**
+	 * Get the bit indicating if to create a new document if not exists.
+	 *
+	 * @return {@literal true} if set.
+	 */
+	public boolean isUpsert() {
+		return upsert;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ScriptOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ScriptOperations.java
index 0dafcee5bb..2ec71b415a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ScriptOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ScriptOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,14 +17,13 @@
 
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
 import org.springframework.data.mongodb.core.script.NamedMongoScript;
-import org.springframework.lang.Nullable;
 
-import com.mongodb.DB;
 
 /**
- * Script operations on {@link com.mongodb.DB} level. Allows interaction with server side JavaScript functions.
+ * Script operations on {@link com.mongodb.client.MongoDatabase} level. Allows interaction with server side JavaScript functions.
  *
  * @author Christoph Strobl
  * @author Oliver Gierke
@@ -35,7 +34,7 @@
 public interface ScriptOperations {
 
 	/**
-	 * Store given {@link ExecutableMongoScript} generating a syntheitcal name so that it can be called by it
+	 * Store given {@link ExecutableMongoScript} generating a synthetic name so that it can be called by it
 	 * subsequently.
 	 *
 	 * @param script must not be {@literal null}.
@@ -73,10 +72,10 @@ public interface ScriptOperations {
 	Object call(String scriptName, Object... args);
 
 	/**
-	 * Checks {@link DB} for existence of {@link ServerSideJavaScript} with given name.
+	 * Checks {@link com.mongodb.client.MongoDatabase} for existence of {@literal ServerSideJavaScript} with given name.
 	 *
 	 * @param scriptName must not be {@literal null} or empty.
-	 * @return false if no {@link ServerSideJavaScript} with given name exists.
+	 * @return false if no {@literal ServerSideJavaScript} with given name exists.
 	 */
 	boolean exists(String scriptName);
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ScrollUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ScrollUtils.java
new file mode 100644
index 0000000000..62e6d6c513
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ScrollUtils.java
@@ -0,0 +1,276 @@
+/*
+ * Copyright 2023-2025 the original author 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.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.IntFunction;
+
+import org.bson.BsonNull;
+import org.bson.Document;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.ScrollPosition.Direction;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.EntityOperations.Entity;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.util.Assert;
+
+/**
+ * Utilities to run scroll queries and create {@link Window} results.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+class ScrollUtils {
+
+	/**
+	 * Create the actual query to run keyset-based pagination. Affects projection, sorting, and the criteria.
+	 *
+	 * @param query
+	 * @param idPropertyName
+	 * @return
+	 */
+	static KeysetScrollQuery createKeysetPaginationQuery(Query query, String idPropertyName) {
+
+
+		KeysetScrollPosition keyset = query.getKeyset();
+
+		Assert.notNull(keyset, "Query.keyset must not be null");
+
+		KeysetScrollDirector director = KeysetScrollDirector.of(keyset.getDirection());
+		Document sortObject = director.getSortObject(idPropertyName, query);
+		Document fieldsObject = director.getFieldsObject(query.getFieldsObject(), sortObject);
+		Document queryObject = director.createQuery(keyset, query.getQueryObject(), sortObject);
+
+		return new KeysetScrollQuery(queryObject, fieldsObject, sortObject);
+	}
+
+	static <T> Window<T> createWindow(Query query, List<T> result, Class<?> sourceType, EntityOperations operations) {
+
+		Document sortObject = query.getSortObject();
+		KeysetScrollPosition keyset = query.getKeyset();
+
+		Assert.notNull(keyset, "Query.keyset must not be null");
+
+		Direction direction = keyset.getDirection();
+		KeysetScrollDirector director = KeysetScrollDirector.of(direction);
+
+		List<T> resultsToUse = director.postPostProcessResults(result, query.getLimit());
+
+		IntFunction<ScrollPosition> positionFunction = value -> {
+
+			T last = resultsToUse.get(value);
+			Entity<T> entity = operations.forEntity(last);
+
+			Map<String, Object> keys = entity.extractKeys(sortObject, sourceType);
+			return ScrollPosition.of(keys, direction);
+		};
+
+		return Window.from(resultsToUse, positionFunction, hasMoreElements(result, query.getLimit()));
+	}
+
+	static <T> Window<T> createWindow(List<T> result, int limit, IntFunction<? extends ScrollPosition> positionFunction) {
+		return Window.from(getSubList(result, limit), positionFunction, hasMoreElements(result, limit));
+	}
+
+	static boolean hasMoreElements(List<?> result, int limit) {
+		return !result.isEmpty() && result.size() > limit;
+	}
+
+	static <T> List<T> getSubList(List<T> result, int limit) {
+
+		if (limit > 0 && result.size() > limit) {
+			return result.subList(0, limit);
+		}
+
+		return result;
+	}
+
+	record KeysetScrollQuery(Document query, Document fields, Document sort) {
+
+	}
+
+	/**
+	 * Director for keyset scrolling.
+	 */
+	static class KeysetScrollDirector {
+
+		private static final KeysetScrollDirector FORWARD = new KeysetScrollDirector();
+		private static final KeysetScrollDirector REVERSE = new ReverseKeysetScrollDirector();
+
+		/**
+		 * Factory method to obtain the right {@link KeysetScrollDirector}.
+		 *
+		 * @param direction
+		 * @return
+		 */
+		public static KeysetScrollDirector of(ScrollPosition.Direction direction) {
+			return direction == Direction.FORWARD ? FORWARD : REVERSE;
+		}
+
+		public Document getSortObject(String idPropertyName, Query query) {
+
+			Document sortObject = query.isSorted() ? query.getSortObject() : new Document();
+			sortObject.put(idPropertyName, 1);
+
+			return sortObject;
+		}
+
+		public Document getFieldsObject(Document fieldsObject, Document sortObject) {
+
+			// make sure we can extract the keyset
+			if (!fieldsObject.isEmpty()) {
+				for (String field : sortObject.keySet()) {
+					fieldsObject.put(field, 1);
+				}
+			}
+
+			return fieldsObject;
+		}
+
+		public Document createQuery(KeysetScrollPosition keyset, Document queryObject, Document sortObject) {
+
+			Map<String, Object> keysetValues = keyset.getKeys();
+			List<Document> or = (List<Document>) queryObject.getOrDefault("$or", new ArrayList<>());
+			List<String> sortKeys = new ArrayList<>(sortObject.keySet());
+
+			// first query doesn't come with a keyset
+			if (keysetValues.isEmpty()) {
+				return queryObject;
+			}
+
+			if (!keysetValues.keySet().containsAll(sortKeys)) {
+				throw new IllegalStateException("KeysetScrollPosition does not contain all keyset values");
+			}
+
+			// build matrix query for keyset paging that contains sort^2 queries
+			// reflecting a query that follows sort order semantics starting from the last returned keyset
+			for (int i = 0; i < sortKeys.size(); i++) {
+
+				Document sortConstraint = new Document();
+
+				for (int j = 0; j < sortKeys.size(); j++) {
+
+					String sortSegment = sortKeys.get(j);
+					int sortOrder = sortObject.getInteger(sortSegment);
+					Object o = keysetValues.get(sortSegment);
+
+					if (j >= i) { // tail segment
+						if (o instanceof BsonNull) {
+							throw new IllegalStateException(
+									"Cannot resume from KeysetScrollPosition. Offending key: '%s' is 'null'".formatted(sortSegment));
+						}
+						sortConstraint.put(sortSegment, new Document(getComparator(sortOrder), o));
+						break;
+					}
+
+					sortConstraint.put(sortSegment, o);
+				}
+
+				if (!sortConstraint.isEmpty()) {
+					or.add(sortConstraint);
+				}
+			}
+
+			if (!or.isEmpty()) {
+				queryObject.put("$or", or);
+			}
+
+			return queryObject;
+		}
+
+		protected String getComparator(int sortOrder) {
+			return sortOrder == 1 ? "$gt" : "$lt";
+		}
+
+		protected <T> List<T> postPostProcessResults(List<T> list, int limit) {
+			return getFirst(limit, list);
+		}
+
+	}
+
+	/**
+	 * Reverse scrolling director variant applying {@link KeysetScrollPosition.Direction#BACKWARD}. In reverse scrolling,
+	 * we need to flip directions for the actual query so that we do not get everything from the top position and apply
+	 * the limit but rather flip the sort direction, apply the limit and then reverse the result to restore the actual
+	 * sort order.
+	 */
+	private static class ReverseKeysetScrollDirector extends KeysetScrollDirector {
+
+		@Override
+		public Document getSortObject(String idPropertyName, Query query) {
+
+			Document sortObject = super.getSortObject(idPropertyName, query);
+
+			// flip sort direction for backward scrolling
+
+			for (String field : sortObject.keySet()) {
+				sortObject.put(field, sortObject.getInteger(field) == 1 ? -1 : 1);
+			}
+
+			return sortObject;
+		}
+
+		@Override
+		public <T> List<T> postPostProcessResults(List<T> list, int limit) {
+
+			// flip direction of the result list as we need to accomodate for the flipped sort order for proper offset
+			// querying.
+			Collections.reverse(list);
+
+			return getLast(limit, list);
+		}
+
+	}
+
+	/**
+	 * Return the first {@code count} items from the list.
+	 *
+	 * @param count
+	 * @param list
+	 * @return
+	 * @param <T>
+	 */
+	static <T> List<T> getFirst(int count, List<T> list) {
+
+		if (count > 0 && list.size() > count) {
+			return list.subList(0, count);
+		}
+
+		return list;
+	}
+
+	/**
+	 * Return the last {@code count} items from the list.
+	 *
+	 * @param count
+	 * @param list
+	 * @return
+	 * @param <T>
+	 */
+	static <T> List<T> getLast(int count, List<T> list) {
+
+		if (count > 0 && list.size() > count) {
+			return list.subList(list.size() - count, list.size());
+		}
+
+		return list;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionCallback.java
index adf02e4c5c..76a6d525f8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
 
 /**
  * Callback interface for executing operations within a {@link com.mongodb.session.ClientSession}.
@@ -31,7 +31,7 @@ public interface SessionCallback<T> {
 	/**
 	 * Execute operations against a MongoDB instance via session bound {@link MongoOperations}. The session is inferred
 	 * directly into the operation so that no further interaction is necessary.
-	 * <p />
+	 * <br />
 	 * Please note that only Spring Data-specific abstractions like {@link MongoOperations#find(Query, Class)} and others
 	 * are enhanced with the {@link com.mongodb.session.ClientSession}. When obtaining plain MongoDB gateway objects like
 	 * {@link com.mongodb.client.MongoCollection} or {@link com.mongodb.client.MongoDatabase} via eg.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionScoped.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionScoped.java
index 236ff91c85..906d682685 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionScoped.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SessionScoped.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,13 +17,13 @@
 
 import java.util.function.Consumer;
 
-import org.springframework.lang.Nullable;
-
 import com.mongodb.client.ClientSession;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Gateway interface to execute {@link ClientSession} bound operations against MongoDB via a {@link SessionCallback}.
- * <p />
+ * <br />
  * The very same bound {@link ClientSession} is used for all invocations of {@code execute} on the instance.
  *
  * @author Christoph Strobl
@@ -34,7 +34,7 @@ public interface SessionScoped {
 
 	/**
 	 * Executes the given {@link SessionCallback} within the {@link com.mongodb.session.ClientSession}.
-	 * <p/>
+	 * <br />
 	 * It is up to the caller to make sure the {@link com.mongodb.session.ClientSession} is {@link ClientSession#close()
 	 * closed} when done.
 	 *
@@ -42,14 +42,13 @@ public interface SessionScoped {
 	 * @param <T> return type.
 	 * @return a result object returned by the action. Can be {@literal null}.
 	 */
-	@Nullable
-	default <T> T execute(SessionCallback<T> action) {
+	default <T> @Nullable T execute(SessionCallback<T> action) {
 		return execute(action, session -> {});
 	}
 
 	/**
 	 * Executes the given {@link SessionCallback} within the {@link com.mongodb.session.ClientSession}.
-	 * <p/>
+	 * <br />
 	 * It is up to the caller to make sure the {@link com.mongodb.session.ClientSession} is {@link ClientSession#close()
 	 * closed} when done.
 	 *
@@ -60,6 +59,5 @@ default <T> T execute(SessionCallback<T> action) {
 	 * @param <T> return type.
 	 * @return a result object returned by the action. Can be {@literal null}.
 	 */
-	@Nullable
-	<T> T execute(SessionCallback<T> action, Consumer<ClientSession> doFinally);
+	<T> @Nullable T execute(SessionCallback<T> action, Consumer<ClientSession> doFinally);
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactory.java
similarity index 57%
rename from spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDbFactory.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactory.java
index e9059955bd..2b51b5e077 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDbFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 
 import com.mongodb.ClientSessionOptions;
 import com.mongodb.ConnectionString;
-import com.mongodb.DB;
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -29,86 +28,63 @@
  * Factory to create {@link MongoDatabase} instances from a {@link MongoClient} instance.
  *
  * @author Christoph Strobl
- * @since 2.1
+ * @since 3.0
  */
-public class SimpleMongoClientDbFactory extends MongoDbFactorySupport<MongoClient> implements DisposableBean {
+public class SimpleMongoClientDatabaseFactory extends MongoDatabaseFactorySupport<MongoClient>
+		implements DisposableBean {
 
 	/**
-	 * Creates a new {@link SimpleMongoClientDbFactory} instance for the given {@code connectionString}.
+	 * Creates a new {@link SimpleMongoClientDatabaseFactory} instance for the given {@code connectionString}.
 	 *
 	 * @param connectionString connection coordinates for a database connection. Must contain a database name and must not
 	 *          be {@literal null} or empty.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/connection-string/">MongoDB Connection String reference</a>
 	 */
-	public SimpleMongoClientDbFactory(String connectionString) {
+	public SimpleMongoClientDatabaseFactory(String connectionString) {
 		this(new ConnectionString(connectionString));
 	}
 
 	/**
-	 * Creates a new {@link SimpleMongoClientDbFactory} instance from the given {@link MongoClient}.
+	 * Creates a new {@link SimpleMongoClientDatabaseFactory} instance from the given {@link MongoClient}.
 	 *
 	 * @param connectionString connection coordinates for a database connection. Must contain also a database name and not
 	 *          be {@literal null}.
 	 */
-	public SimpleMongoClientDbFactory(ConnectionString connectionString) {
+	public SimpleMongoClientDatabaseFactory(ConnectionString connectionString) {
 		this(MongoClients.create(connectionString), connectionString.getDatabase(), true);
 	}
 
 	/**
-	 * Creates a new {@link SimpleMongoClientDbFactory} instance from the given {@link MongoClient}.
+	 * Creates a new {@link SimpleMongoClientDatabaseFactory} instance from the given {@link MongoClient}.
 	 *
 	 * @param mongoClient must not be {@literal null}.
 	 * @param databaseName must not be {@literal null} or empty.
 	 */
-	public SimpleMongoClientDbFactory(MongoClient mongoClient, String databaseName) {
+	public SimpleMongoClientDatabaseFactory(MongoClient mongoClient, String databaseName) {
 		this(mongoClient, databaseName, false);
 	}
 
 	/**
-	 * Creates a new {@link SimpleMongoClientDbFactory} instance from the given {@link MongoClient}.
+	 * Creates a new {@link SimpleMongoClientDatabaseFactory} instance from the given {@link MongoClient}.
 	 *
 	 * @param mongoClient must not be {@literal null}.
 	 * @param databaseName must not be {@literal null} or empty.
 	 * @param mongoInstanceCreated
 	 */
-	private SimpleMongoClientDbFactory(MongoClient mongoClient, String databaseName, boolean mongoInstanceCreated) {
-		super(mongoClient, databaseName, mongoInstanceCreated, new MongoExceptionTranslator());
+	SimpleMongoClientDatabaseFactory(MongoClient mongoClient, String databaseName, boolean mongoInstanceCreated) {
+		super(mongoClient, databaseName, mongoInstanceCreated, MongoExceptionTranslator.DEFAULT_EXCEPTION_TRANSLATOR);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getLegacyDb()
-	 */
-	@Override
-	public DB getLegacyDb() {
-
-		throw new UnsupportedOperationException(String.format(
-				"%s does not support legacy DBObject API! Please consider using SimpleMongoDbFactory for that purpose.",
-				MongoClient.class));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getSession(com.mongodb.ClientSessionOptions)
-	 */
 	@Override
 	public ClientSession getSession(ClientSessionOptions options) {
 		return getMongoClient().startSession(options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoDbFactoryBase#closeClient()
-	 */
 	@Override
 	protected void closeClient() {
 		getMongoClient().close();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoDbFactoryBase#doGetMongoDatabase(java.lang.String)
-	 */
 	@Override
 	protected MongoDatabase doGetMongoDatabase(String dbName) {
 		return getMongoClient().getDatabase(dbName);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java
deleted file mode 100644
index 4ed67a9c4a..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleMongoDbFactory.java
+++ /dev/null
@@ -1,107 +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.core;
-
-import org.springframework.beans.factory.DisposableBean;
-
-import com.mongodb.ClientSessionOptions;
-import com.mongodb.DB;
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientURI;
-import com.mongodb.client.ClientSession;
-import com.mongodb.client.MongoDatabase;
-
-/**
- * Factory to create {@link MongoDatabase} instances from a {@link MongoClient} instance.
- *
- * @author Mark Pollack
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
- * @author George Moraitis
- * @author Mark Paluch
- * @deprecated since 2.2 in favor of {@link SimpleMongoClientDbFactory}.
- */
-@Deprecated
-public class SimpleMongoDbFactory extends MongoDbFactorySupport<MongoClient> implements DisposableBean {
-
-	/**
-	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoClientURI}.
-	 *
-	 * @param uri coordinates for a database connection. Must contain a database name and must not be {@literal null}.
-	 * @since 1.7
-	 */
-	public SimpleMongoDbFactory(MongoClientURI uri) {
-		this(new MongoClient(uri), uri.getDatabase(), true);
-	}
-
-	/**
-	 * Creates a new {@link SimpleMongoDbFactory} instance from the given {@link MongoClient}.
-	 *
-	 * @param mongoClient must not be {@literal null}.
-	 * @param databaseName must not be {@literal null} or empty.
-	 * @since 1.7
-	 */
-	public SimpleMongoDbFactory(MongoClient mongoClient, String databaseName) {
-		this(mongoClient, databaseName, false);
-	}
-
-	/**
-	 * @param mongoClient
-	 * @param databaseName
-	 * @param mongoInstanceCreated
-	 * @since 1.7
-	 */
-	private SimpleMongoDbFactory(MongoClient mongoClient, String databaseName, boolean mongoInstanceCreated) {
-		super(mongoClient, databaseName, mongoInstanceCreated, new MongoExceptionTranslator());
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getLegacyDb()
-	 */
-	@Override
-	public DB getLegacyDb() {
-		return getMongoClient().getDB(getDefaultDatabaseName());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.MongoDbFactory#getSession(com.mongodb.ClientSessionOptions)
-	 */
-	@Override
-	public ClientSession getSession(ClientSessionOptions options) {
-		return getMongoClient().startSession(options);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoDbFactoryBase#closeClient()
-	 */
-	@Override
-	protected void closeClient() {
-		getMongoClient().close();
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.MongoDbFactoryBase#doGetMongoDatabase(java.lang.String)
-	 */
-	@Override
-	protected MongoDatabase doGetMongoDatabase(String dbName) {
-		return getMongoClient().getDatabase(dbName);
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java
index f7effcf38a..529f912e6c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,17 +15,18 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.Value;
 import reactor.core.publisher.Mono;
 
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.SessionAwareMethodInterceptor;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 import com.mongodb.ClientSessionOptions;
 import com.mongodb.ConnectionString;
@@ -41,6 +42,7 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  * @since 2.0
  */
 public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, ReactiveMongoDatabaseFactory {
@@ -49,8 +51,7 @@ public class SimpleReactiveMongoDatabaseFactory implements DisposableBean, React
 	private final String databaseName;
 	private final boolean mongoInstanceCreated;
 
-	private final PersistenceExceptionTranslator exceptionTranslator;
-
+	private PersistenceExceptionTranslator exceptionTranslator = MongoExceptionTranslator.DEFAULT_EXCEPTION_TRANSLATOR;
 	private @Nullable WriteConcern writeConcern;
 
 	/**
@@ -75,15 +76,29 @@ public SimpleReactiveMongoDatabaseFactory(MongoClient mongoClient, String databa
 
 	private SimpleReactiveMongoDatabaseFactory(MongoClient client, String databaseName, boolean mongoInstanceCreated) {
 
-		Assert.notNull(client, "MongoClient must not be null!");
-		Assert.hasText(databaseName, "Database name must not be empty!");
+		Assert.notNull(client, "MongoClient must not be null");
+		Assert.hasText(databaseName, "Database name must not be empty");
 		Assert.isTrue(databaseName.matches("[^/\\\\.$\"\\s]+"),
-				"Database name must not contain slashes, dots, spaces, quotes, or dollar signs!");
+				"Database name must not contain slashes, dots, spaces, quotes, or dollar signs");
 
 		this.mongo = client;
 		this.databaseName = databaseName;
 		this.mongoInstanceCreated = mongoInstanceCreated;
-		this.exceptionTranslator = new MongoExceptionTranslator();
+	}
+
+	/**
+	 * Configures the {@link PersistenceExceptionTranslator} to be used.
+	 *
+	 * @param exceptionTranslator the exception translator to set.
+	 * @since 4.4
+	 */
+	public void setExceptionTranslator(PersistenceExceptionTranslator exceptionTranslator) {
+		this.exceptionTranslator = exceptionTranslator;
+	}
+
+	@Override
+	public PersistenceExceptionTranslator getExceptionTranslator() {
+		return this.exceptionTranslator;
 	}
 
 	/**
@@ -95,24 +110,22 @@ public void setWriteConcern(WriteConcern writeConcern) {
 		this.writeConcern = writeConcern;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase()
-	 */
-	public MongoDatabase getMongoDatabase() throws DataAccessException {
+	@Override
+	public Mono<MongoDatabase> getMongoDatabase() throws DataAccessException {
 		return getMongoDatabase(databaseName);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getMongoDatabase(java.lang.String)
-	 */
-	public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
+	@Override
+	public Mono<MongoDatabase> getMongoDatabase(String dbName) throws DataAccessException {
+
+		Assert.hasText(dbName, "Database name must not be empty");
 
-		Assert.hasText(dbName, "Database name must not be empty.");
+		return Mono.fromSupplier(() -> {
 
-		MongoDatabase db = mongo.getDatabase(dbName);
-		return writeConcern != null ? db.withWriteConcern(writeConcern) : db;
+			MongoDatabase db = mongo.getDatabase(dbName);
+
+			return writeConcern != null ? db.withWriteConcern(writeConcern) : db;
+		});
 	}
 
 	/**
@@ -120,6 +133,7 @@ public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException
 	 *
 	 * @see DisposableBean#destroy()
 	 */
+	@Override
 	public void destroy() throws Exception {
 
 		if (mongoInstanceCreated) {
@@ -127,27 +141,16 @@ public void destroy() throws Exception {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getExceptionTranslator()
-	 */
-	public PersistenceExceptionTranslator getExceptionTranslator() {
-		return this.exceptionTranslator;
+	@Override
+	public CodecRegistry getCodecRegistry() {
+		return this.mongo.getDatabase(databaseName).getCodecRegistry();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#getSession(com.mongodb.ClientSessionOptions)
-	 */
 	@Override
 	public Mono<ClientSession> getSession(ClientSessionOptions options) {
 		return Mono.from(mongo.startSession(options));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.ReactiveMongoDbFactory#withSession(com.mongodb.session.ClientSession)
-	 */
 	@Override
 	public ReactiveMongoDatabaseFactory withSession(ClientSession session) {
 		return new ClientSessionBoundMongoDbFactory(session, this);
@@ -160,61 +163,47 @@ public ReactiveMongoDatabaseFactory withSession(ClientSession session) {
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	@Value
-	static class ClientSessionBoundMongoDbFactory implements ReactiveMongoDatabaseFactory {
+	static final class ClientSessionBoundMongoDbFactory implements ReactiveMongoDatabaseFactory {
 
-		ClientSession session;
-		ReactiveMongoDatabaseFactory delegate;
+		private final ClientSession session;
+		private final ReactiveMongoDatabaseFactory delegate;
+
+		ClientSessionBoundMongoDbFactory(ClientSession session, ReactiveMongoDatabaseFactory delegate) {
+
+			this.session = session;
+			this.delegate = delegate;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase()
-		 */
 		@Override
-		public MongoDatabase getMongoDatabase() throws DataAccessException {
-			return decorateDatabase(delegate.getMongoDatabase());
+		public Mono<MongoDatabase> getMongoDatabase() throws DataAccessException {
+			return delegate.getMongoDatabase().map(this::decorateDatabase);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getMongoDatabase(java.lang.String)
-		 */
 		@Override
-		public MongoDatabase getMongoDatabase(String dbName) throws DataAccessException {
-			return decorateDatabase(delegate.getMongoDatabase(dbName));
+		public Mono<MongoDatabase> getMongoDatabase(String dbName) throws DataAccessException {
+			return delegate.getMongoDatabase(dbName).map(this::decorateDatabase);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getExceptionTranslator()
-		 */
 		@Override
 		public PersistenceExceptionTranslator getExceptionTranslator() {
 			return delegate.getExceptionTranslator();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#getSession(com.mongodb.ClientSessionOptions)
-		 */
+		@Override
+		public CodecRegistry getCodecRegistry() {
+			return delegate.getCodecRegistry();
+		}
+
 		@Override
 		public Mono<ClientSession> getSession(ClientSessionOptions options) {
 			return delegate.getSession(options);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#withSession(com.mongodb.session.ClientSession)
-		 */
 		@Override
 		public ReactiveMongoDatabaseFactory withSession(ClientSession session) {
 			return delegate.withSession(session);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.ReactiveMongoDatabaseFactory#isTransactionActive()
-		 */
 		@Override
 		public boolean isTransactionActive() {
 			return session != null && session.hasActiveTransaction();
@@ -242,7 +231,42 @@ private <T> T createProxyInstance(com.mongodb.session.ClientSession session, T t
 			factory.addAdvice(new SessionAwareMethodInterceptor<>(session, target, ClientSession.class, MongoDatabase.class,
 					this::proxyDatabase, MongoCollection.class, this::proxyCollection));
 
-			return targetType.cast(factory.getProxy());
+			return targetType.cast(factory.getProxy(target.getClass().getClassLoader()));
+		}
+
+		public ClientSession getSession() {
+			return this.session;
+		}
+
+		public ReactiveMongoDatabaseFactory getDelegate() {
+			return this.delegate;
+		}
+
+		@Override
+		public boolean equals(@Nullable Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+
+			ClientSessionBoundMongoDbFactory that = (ClientSessionBoundMongoDbFactory) o;
+
+			if (!ObjectUtils.nullSafeEquals(this.session, that.session)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(this.delegate, that.delegate);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(this.session);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(this.delegate);
+			return result;
+		}
+
+		public String toString() {
+			return "SimpleReactiveMongoDatabaseFactory.ClientSessionBoundMongoDbFactory(session=" + this.getSession()
+					+ ", delegate=" + this.getDelegate() + ")";
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JmxServer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SortingQueryCursorPreparer.java
similarity index 56%
rename from spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JmxServer.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SortingQueryCursorPreparer.java
index 7a1698b310..1652dca259 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JmxServer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/SortingQueryCursorPreparer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,18 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 
 /**
- * Server application than can be run as an app or unit test.
+ * {@link CursorPreparer} that exposes its {@link Document sort document}.
  *
- * @author Mark Pollack
- * @author Oliver Gierke
+ * @author Christoph Strobl
+ * @since 4.4.3
  */
-public class JmxServer {
+interface SortingQueryCursorPreparer extends CursorPreparer {
 
-	public static void main(String[] args) {
-		new JmxServer().run();
-	}
+	@Nullable
+	Document getSortObject();
 
-	@SuppressWarnings("resource")
-	public void run() {
-		new ClassPathXmlApplicationContext(new String[] { "infrastructure.xml", "server-jmx.xml" });
-	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ViewOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ViewOptions.java
new file mode 100644
index 0000000000..b4b525fc97
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ViewOptions.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022-2025 the original author 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.Optional;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.lang.Contract;
+
+/**
+ * Immutable object holding additional options to be applied when creating a MongoDB
+ * <a href="https://www.mongodb.com/docs/manual/core/views/">views</a>.
+ *
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+public class ViewOptions {
+
+	private final @Nullable Collation collation;
+
+	static ViewOptions none() {
+		return new ViewOptions();
+	}
+
+	/**
+	 * Creates new instance of {@link ViewOptions}.
+	 */
+	public ViewOptions() {
+		this(null);
+	}
+
+	private ViewOptions(@Nullable Collation collation) {
+		this.collation = collation;
+	}
+
+	/**
+	 * Get the {@link Collation} to be set.
+	 *
+	 * @return {@link Optional#empty()} if not set.
+	 */
+	public Optional<Collation> getCollation() {
+		return Optional.ofNullable(collation);
+	}
+
+	/**
+	 * @param collation the {@link Collation} to use for language-specific string comparison.
+	 * @return new instance of {@link ViewOptions}.
+	 */
+	@Contract("_ -> new")
+	public ViewOptions collation(Collation collation) {
+		return new ViewOptions(collation);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernAware.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernAware.java
new file mode 100644
index 0000000000..bdc7de6663
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernAware.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core;
+
+import org.jspecify.annotations.Nullable;
+
+import com.mongodb.WriteConcern;
+
+/**
+ * Interface indicating a component that contains and exposes an {@link WriteConcern}.
+ *
+ * @author Christoph Strobl
+ * @since 4.3
+ */
+public interface WriteConcernAware {
+
+	/**
+	 * @return the {@link WriteConcern} to apply or {@literal null} if none set.
+	 */
+	@Nullable
+	WriteConcern getWriteConcern();
+
+	/**
+	 * @return {@literal true} if a {@link com.mongodb.WriteConcern} is set.
+	 */
+	default boolean hasWriteConcern() {
+		return getWriteConcern() != null;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernResolver.java
index f47bd9c48d..a72c656e47 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteConcernResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import com.mongodb.WriteConcern;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteResultChecking.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteResultChecking.java
index 01505189bc..fbefe4a075 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteResultChecking.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/WriteResultChecking.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.springframework.data.mongodb.core;
 
 /**
- * Enum to represent how strict the check of {@link com.mongodb.WriteResult} shall be. It can either be skipped entirely
- * (use {@link #NONE}) or cause an exception to be thrown {@link #EXCEPTION}.
+ * Enum to represent how strict the check of {@link com.mongodb.WriteConcernResult} shall be. It can either be skipped
+ * entirely (use {@link #NONE}) or cause an exception to be thrown {@link #EXCEPTION}.
  *
  * @author Thomas Risberg
  * @author Oliver Gierke
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java
index b1f24e6cf1..710b570ed7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AbstractAggregationExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018. the original author or authors.
+ * Copyright 2016-2025 the original author 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,19 +17,28 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.bson.Document;
-import org.springframework.data.mongodb.core.aggregation.Aggregation.SystemVariable;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
 /**
+ * Support class for {@link AggregationExpression} implementations.
+ *
  * @author Christoph Strobl
  * @author Matt Morrissette
+ * @author Mark Paluch
  * @since 1.10
  */
 abstract class AbstractAggregationExpression implements AggregationExpression {
@@ -40,15 +49,11 @@ protected AbstractAggregationExpression(Object value) {
 		this.value = value;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return toDocument(this.value, context);
 	}
 
-	@SuppressWarnings("unchecked")
 	public Document toDocument(Object value, AggregationOperationContext context) {
 		return new Document(getMongoMethod(), unpack(value, context));
 	}
@@ -65,12 +70,35 @@ protected static List<Field> asFields(String... fieldRefs) {
 	@SuppressWarnings("unchecked")
 	private Object unpack(Object value, AggregationOperationContext context) {
 
-		if (value instanceof AggregationExpression) {
-			return ((AggregationExpression) value).toDocument(context);
+		if (value instanceof AggregationExpression aggregationExpression) {
+			return aggregationExpression.toDocument(context);
+		}
+
+		if (value instanceof Field field) {
+			return context.getReference(field).toString();
+		}
+
+		if (value instanceof Fields fields) {
+
+			List<Object> mapped = new ArrayList<>(fields.size());
+
+			for (Field field : fields) {
+				mapped.add(unpack(field, context));
+			}
+
+			return mapped;
 		}
 
-		if (value instanceof Field) {
-			return context.getReference((Field) value).toString();
+		if (value instanceof Sort sort) {
+
+			Document sortDoc = new Document();
+			for (Order order : sort) {
+
+				// Check reference
+				FieldReference reference = context.getReference(order.getProperty());
+				sortDoc.put(reference.getRaw(), order.isAscending() ? 1 : -1);
+			}
+			return sortDoc;
 		}
 
 		if (value instanceof List) {
@@ -78,7 +106,9 @@ private Object unpack(Object value, AggregationOperationContext context) {
 			List<Object> sourceList = (List<Object>) value;
 			List<Object> mappedList = new ArrayList<>(sourceList.size());
 
-			sourceList.stream().map((item) -> unpack(item, context)).forEach(mappedList::add);
+			for (Object o : sourceList) {
+				mappedList.add(unpack(o, context));
+			}
 
 			return mappedList;
 		}
@@ -100,42 +130,134 @@ private Object unpack(Object value, AggregationOperationContext context) {
 		return value;
 	}
 
-	protected List<Object> append(Object value) {
+	@SuppressWarnings("unchecked")
+	protected List<Object> append(Object value, Expand expandList) {
 
 		if (this.value instanceof List) {
 
-			List<Object> clone = new ArrayList<Object>((List) this.value);
+			List<Object> clone = new ArrayList<>((List<Object>) this.value);
 
-			if (value instanceof List) {
-				clone.addAll((List) value);
+			if (value instanceof Collection<?> collection && Expand.EXPAND_VALUES.equals(expandList)) {
+				clone.addAll(collection);
 			} else {
 				clone.add(value);
 			}
+
 			return clone;
 		}
 
 		return Arrays.asList(this.value, value);
 	}
 
-	@SuppressWarnings("unchecked")
-	protected java.util.Map<String, Object> append(String key, Object value) {
+	/**
+	 * Expand a nested list of values to single entries or keep the list.
+	 */
+	protected enum Expand {
+		EXPAND_VALUES, KEEP_SOURCE
+	}
+
+	protected List<Object> append(Object value) {
+		return append(value, Expand.EXPAND_VALUES);
+	}
+
+	@SuppressWarnings({ "unchecked" })
+	protected Map<String, Object> append(String key, Object value) {
+
+		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map");
 
-		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map!");
+		return append((Map<String, Object>) this.value, key, value);
+	}
+
+	private Map<String, Object> append(Map<String, Object> existing, String key, Object value) {
 
-		java.util.Map<String, Object> clone = new LinkedHashMap<>((java.util.Map) this.value);
+		Map<String, Object> clone = new LinkedHashMap<>(existing);
 		clone.put(key, value);
 		return clone;
+	}
+
+	@SuppressWarnings("rawtypes")
+	protected Map<String, Object> appendTo(String key, Object value) {
+
+		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map");
+
+		if (this.value instanceof Map map) {
+
+			Map<String, Object> target = new HashMap<>(map);
+			if (!target.containsKey(key)) {
+				target.put(key, value);
+				return target;
+			}
+			target.computeIfPresent(key, (k, v) -> {
+
+				if (v instanceof List<?> list) {
+					List<Object> targetList = new ArrayList<>(list);
+					targetList.add(value);
+					return targetList;
+				}
+				return Arrays.asList(v, value);
+			});
+			return target;
+		}
+		throw new IllegalStateException(
+				String.format("Cannot append value to %s type", ObjectUtils.nullSafeClassName(this.value)));
+
+	}
+
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	protected Map<String, Object> remove(String key) {
+
+		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map");
+
+		Map<String, Object> clone = new LinkedHashMap<>((java.util.Map) this.value);
+		clone.remove(key);
+		return clone;
+	}
+
+	/**
+	 * Append the given key at the position in the underlying {@link LinkedHashMap}.
+	 *
+	 * @param index
+	 * @param key
+	 * @param value
+	 * @return
+	 * @since 3.1
+	 */
+	@SuppressWarnings({ "unchecked" })
+	protected Map<String, Object> appendAt(int index, String key, Object value) {
+
+		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map");
+
+		Map<String, Object> clone = new LinkedHashMap<>();
+
+		int i = 0;
+		for (Map.Entry<String, Object> entry : ((Map<String, Object>) this.value).entrySet()) {
+
+			if (i == index) {
+				clone.put(key, value);
+			}
+			if (!entry.getKey().equals(key)) {
+				clone.put(entry.getKey(), entry.getValue());
+			}
+			i++;
+		}
+		if (i <= index) {
+			clone.put(key, value);
+		}
+		return clone;
 
 	}
 
+	@SuppressWarnings({ "rawtypes" })
 	protected List<Object> values() {
 
 		if (value instanceof List) {
 			return new ArrayList<Object>((List) value);
 		}
+
 		if (value instanceof java.util.Map) {
 			return new ArrayList<Object>(((java.util.Map) value).values());
 		}
+
 		return new ArrayList<>(Collections.singletonList(value));
 	}
 
@@ -161,11 +283,15 @@ protected <T> T get(int index) {
 	 * @since 2.1
 	 */
 	@SuppressWarnings("unchecked")
-	protected <T> T get(Object key) {
+	protected <T> @Nullable T get(Object key) {
 
-		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map!");
+		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map");
+
+		return (T) ((Map<String, Object>) this.value).get(key);
+	}
 
-		return (T) ((java.util.Map<String, Object>) this.value).get(key);
+	protected boolean isArgumentMap() {
+		return this.value instanceof Map;
 	}
 
 	/**
@@ -175,11 +301,11 @@ protected <T> T get(Object key) {
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	protected java.util.Map<String, Object> argumentMap() {
+	protected Map<String, Object> argumentMap() {
 
-		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map!");
+		Assert.isInstanceOf(Map.class, this.value, "Value must be a type of Map");
 
-		return Collections.unmodifiableMap((java.util.Map) value);
+		return Collections.unmodifiableMap((java.util.Map<String, Object>) value);
 	}
 
 	/**
@@ -196,7 +322,7 @@ protected boolean contains(Object key) {
 			return false;
 		}
 
-		return ((java.util.Map<String, Object>) this.value).containsKey(key);
+		return ((Map<String, Object>) this.value).containsKey(key);
 	}
 
 	protected abstract String getMongoMethod();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java
index d1a7c01a15..fa44656c99 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,22 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
  * Gateway to {@literal accumulator} aggregation operations.
  *
  * @author Christoph Strobl
+ * @author Julia Lee
  * @since 1.10
  * @soundtrack Rage Against The Machine - Killing In The Name
  */
@@ -34,7 +40,7 @@ public class AccumulatorOperators {
 	 * Take the numeric value referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link AccumulatorOperatorFactory}.
 	 */
 	public static AccumulatorOperatorFactory valueOf(String fieldReference) {
 		return new AccumulatorOperatorFactory(fieldReference);
@@ -44,7 +50,7 @@ public static AccumulatorOperatorFactory valueOf(String fieldReference) {
 	 * Take the numeric value referenced resulting from given {@link AggregationExpression}.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link AccumulatorOperatorFactory}.
 	 */
 	public static AccumulatorOperatorFactory valueOf(AggregationExpression expression) {
 		return new AccumulatorOperatorFactory(expression);
@@ -52,11 +58,12 @@ public static AccumulatorOperatorFactory valueOf(AggregationExpression expressio
 
 	/**
 	 * @author Christoph Strobl
+	 * @author Julia Lee
 	 */
 	public static class AccumulatorOperatorFactory {
 
-		private final String fieldReference;
-		private final AggregationExpression expression;
+		private final @Nullable String fieldReference;
+		private final @Nullable AggregationExpression expression;
 
 		/**
 		 * Creates new {@link AccumulatorOperatorFactory} for given {@literal fieldReference}.
@@ -65,7 +72,7 @@ public static class AccumulatorOperatorFactory {
 		 */
 		public AccumulatorOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			this.fieldReference = fieldReference;
 			this.expression = null;
 		}
@@ -77,7 +84,7 @@ public AccumulatorOperatorFactory(String fieldReference) {
 		 */
 		public AccumulatorOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			this.fieldReference = null;
 			this.expression = expression;
 		}
@@ -86,8 +93,9 @@ public AccumulatorOperatorFactory(AggregationExpression expression) {
 		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates and
 		 * returns the sum.
 		 *
-		 * @return
+		 * @return new instance of {@link Sum}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Sum sum() {
 			return usesFieldRef() ? Sum.sumOf(fieldReference) : Sum.sumOf(expression);
 		}
@@ -96,8 +104,9 @@ public Sum sum() {
 		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
 		 * average value.
 		 *
-		 * @return
+		 * @return new instance of {@link Avg}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Avg avg() {
 			return usesFieldRef() ? Avg.avgOf(fieldReference) : Avg.avgOf(expression);
 		}
@@ -106,28 +115,53 @@ public Avg avg() {
 		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
 		 * maximum value.
 		 *
-		 * @return
+		 * @return new instance of {@link Max}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Max max() {
 			return usesFieldRef() ? Max.maxOf(fieldReference) : Max.maxOf(expression);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
+		 * requested number of maximum values.
+		 *
+		 * @return new instance of {@link Max}.
+		 * @since 4.0
+		 */
+		public Max max(int numberOfResults) {
+			return max().limit(numberOfResults);
+		}
+
 		/**
 		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
 		 * minimum value.
 		 *
-		 * @return
+		 * @return new instance of {@link Min}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Min min() {
 			return usesFieldRef() ? Min.minOf(fieldReference) : Min.minOf(expression);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and returns the
+		 * requested number of maximum values.
+		 *
+		 * @return new instance of {@link Max}.
+		 * @since 4.0
+		 */
+		public Min min(int numberOfResults) {
+			return min().limit(numberOfResults);
+		}
+
 		/**
 		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
 		 * population standard deviation of the input values.
 		 *
-		 * @return
+		 * @return new instance of {@link StdDevPop}.
 		 */
+		@SuppressWarnings("NullAway")
 		public StdDevPop stdDevPop() {
 			return usesFieldRef() ? StdDevPop.stdDevPopOf(fieldReference) : StdDevPop.stdDevPopOf(expression);
 		}
@@ -136,17 +170,154 @@ public StdDevPop stdDevPop() {
 		 * Creates new {@link AggregationExpression} that takes the associated numeric value expression and calculates the
 		 * sample standard deviation of the input values.
 		 *
-		 * @return
+		 * @return new instance of {@link StdDevSamp}.
 		 */
+		@SuppressWarnings("NullAway")
 		public StdDevSamp stdDevSamp() {
 			return usesFieldRef() ? StdDevSamp.stdDevSampOf(fieldReference) : StdDevSamp.stdDevSampOf(expression);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the value of the
+		 * given field to calculate the population covariance of the two.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovariancePop covariancePop(String fieldReference) {
+			return covariancePop().and(fieldReference);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the result of the
+		 * given {@link AggregationExpression expression} to calculate the population covariance of the two.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovariancePop covariancePop(AggregationExpression expression) {
+			return covariancePop().and(expression);
+		}
+
+		@SuppressWarnings("NullAway")
+		private CovariancePop covariancePop() {
+			return usesFieldRef() ? CovariancePop.covariancePopOf(fieldReference) : CovariancePop.covariancePopOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the value of the
+		 * given field to calculate the sample covariance of the two.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovarianceSamp covarianceSamp(String fieldReference) {
+			return covarianceSamp().and(fieldReference);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the result of the
+		 * given {@link AggregationExpression expression} to calculate the sample covariance of the two.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovarianceSamp covarianceSamp(AggregationExpression expression) {
+			return covarianceSamp().and(expression);
+		}
+
+		@SuppressWarnings("NullAway")
+		private CovarianceSamp covarianceSamp() {
+			return usesFieldRef() ? CovarianceSamp.covarianceSampOf(fieldReference)
+					: CovarianceSamp.covarianceSampOf(expression);
+		}
+
+		/**
+		 * Creates new {@link ExpMovingAvgBuilder} that to build {@link AggregationExpression expMovingAvg} that calculates
+		 * the exponential moving average of numeric values
+		 *
+		 * @return new instance of {@link ExpMovingAvg}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public ExpMovingAvgBuilder expMovingAvg() {
+
+			ExpMovingAvg expMovingAvg = usesFieldRef() ? ExpMovingAvg.expMovingAvgOf(fieldReference)
+					: ExpMovingAvg.expMovingAvgOf(expression);
+			return new ExpMovingAvgBuilder() {
+
+				@Override
+				public ExpMovingAvg historicalDocuments(int numberOfHistoricalDocuments) {
+					return expMovingAvg.n(numberOfHistoricalDocuments);
+				}
+
+				@Override
+				public ExpMovingAvg alpha(double exponentialDecayValue) {
+					return expMovingAvg.alpha(exponentialDecayValue);
+				}
+			};
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the requested percentile(s) of the associated numeric
+		 * value expression.
+		 *
+		 * @return new instance of {@link Percentile}.
+		 * @param percentages must not be {@literal null}.
+		 * @since 4.2
+		 */
+		@SuppressWarnings("NullAway")
+		public Percentile percentile(Double... percentages) {
+			Percentile percentile = usesFieldRef() ? Percentile.percentileOf(fieldReference)
+					: Percentile.percentileOf(expression);
+			return percentile.percentages(percentages);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the median of the associated numeric value expression.
+		 *
+		 * @return new instance of {@link Median}.
+		 * @since 4.2
+		 */
+		@SuppressWarnings("NullAway")
+		public Median median() {
+			return usesFieldRef() ? Median.medianOf(fieldReference) : Median.medianOf(expression);
+		}
+
 		private boolean usesFieldRef() {
 			return fieldReference != null;
 		}
 	}
 
+	/**
+	 * Builder for {@link ExpMovingAvg}.
+	 *
+	 * @since 3.3
+	 */
+	public interface ExpMovingAvgBuilder {
+
+		/**
+		 * Define the number of historical documents with significant mathematical weight.
+		 *
+		 * @param numberOfHistoricalDocuments
+		 * @return new instance of {@link ExpMovingAvg}.
+		 */
+		ExpMovingAvg historicalDocuments(int numberOfHistoricalDocuments);
+
+		/**
+		 * Define the exponential decay value.
+		 *
+		 * @param exponentialDecayValue
+		 * @return new instance of {@link ExpMovingAvg}.
+		 */
+		ExpMovingAvg alpha(double exponentialDecayValue);
+
+	}
+
 	/**
 	 * {@link AggregationExpression} for {@code $sum}.
 	 *
@@ -167,11 +338,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Sum}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Sum}.
 		 */
 		public static Sum sumOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Sum(asFields(fieldReference));
 		}
 
@@ -179,11 +350,12 @@ public static Sum sumOf(String fieldReference) {
 		 * Creates new {@link Sum}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Sum}.
 		 */
+		@Contract("_ -> new")
 		public static Sum sumOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Sum(Collections.singletonList(expression));
 		}
 
@@ -192,11 +364,12 @@ public static Sum sumOf(AggregationExpression expression) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Sum}.
 		 */
+		@Contract("_ -> new")
 		public Sum and(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Sum(append(Fields.field(fieldReference)));
 		}
 
@@ -205,11 +378,12 @@ public Sum and(String fieldReference) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Sum}.
 		 */
+		@Contract("_ -> new")
 		public Sum and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Sum(append(expression));
 		}
 
@@ -221,23 +395,18 @@ public Sum and(AggregationExpression expression) {
 		 * @return new instance of {@link Sum}.
 		 * @since 2.2
 		 */
+		@Contract("_ -> new")
 		public Sum and(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Sum(append(value));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
-		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
 
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
+			if (value instanceof List<?> list && list.size() == 1) {
+				return super.toDocument(list.iterator().next(), context);
 			}
 
 			return super.toDocument(value, context);
@@ -264,11 +433,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Avg}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Avg}.
 		 */
 		public static Avg avgOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Avg(asFields(fieldReference));
 		}
 
@@ -276,11 +445,11 @@ public static Avg avgOf(String fieldReference) {
 		 * Creates new {@link Avg}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Avg}.
 		 */
 		public static Avg avgOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Avg(Collections.singletonList(expression));
 		}
 
@@ -289,11 +458,12 @@ public static Avg avgOf(AggregationExpression expression) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Avg}.
 		 */
+		@Contract("_ -> new")
 		public Avg and(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Avg(append(Fields.field(fieldReference)));
 		}
 
@@ -302,25 +472,20 @@ public Avg and(String fieldReference) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Avg}.
 		 */
+		@Contract("_ -> new")
 		public Avg and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Avg(append(expression));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
-		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
 
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
+			if (value instanceof List<?> list && list.size() == 1) {
+				return super.toDocument(list.iterator().next(), context);
 			}
 
 			return super.toDocument(value, context);
@@ -340,31 +505,31 @@ private Max(Object value) {
 
 		@Override
 		protected String getMongoMethod() {
-			return "$max";
+			return contains("n") ? "$maxN" : "$max";
 		}
 
 		/**
 		 * Creates new {@link Max}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Max}.
 		 */
 		public static Max maxOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Max(asFields(fieldReference));
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Max(Collections.singletonMap("input", Fields.field(fieldReference)));
 		}
 
 		/**
 		 * Creates new {@link Max}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Max}.
 		 */
 		public static Max maxOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Max(Collections.singletonList(expression));
+			Assert.notNull(expression, "Expression must not be null");
+			return new Max(Collections.singletonMap("input", expression));
 		}
 
 		/**
@@ -372,12 +537,13 @@ public static Max maxOf(AggregationExpression expression) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Max}.
 		 */
+		@Contract("_ -> new")
 		public Max and(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Max(append(Fields.field(fieldReference)));
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Max(appendTo("input", Fields.field(fieldReference)));
 		}
 
 		/**
@@ -385,25 +551,42 @@ public Max and(String fieldReference) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Max}.
 		 */
+		@Contract("_ -> new")
 		public Max and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Max(append(expression));
+			Assert.notNull(expression, "Expression must not be null");
+			return new Max(appendTo("input", expression));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		/**
+		 * Creates new {@link Max} that returns the given number of maximum values ({@literal $maxN}).
+		 * <strong>NOTE</strong>: Cannot be used with more than one {@literal input} value.
+		 *
+		 * @param numberOfResults
+		 * @return new instance of {@link Max}.
 		 */
+		@Contract("_ -> new")
+		public Max limit(int numberOfResults) {
+			return new Max(append("n", numberOfResults));
+		}
+
+		@Override
+		@SuppressWarnings("NullAway")
+		public Document toDocument(AggregationOperationContext context) {
+			if (get("n") == null) {
+				return toDocument(get("input"), context);
+			}
+			return super.toDocument(context);
+		}
+
 		@Override
 		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
 
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
+			if (value instanceof List<?> list && list.size() == 1) {
+				return super.toDocument(list.iterator().next(), context);
 			}
 
 			return super.toDocument(value, context);
@@ -423,31 +606,31 @@ private Min(Object value) {
 
 		@Override
 		protected String getMongoMethod() {
-			return "$min";
+			return contains("n") ? "$minN" : "$min";
 		}
 
 		/**
 		 * Creates new {@link Min}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Min}.
 		 */
 		public static Min minOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Min(asFields(fieldReference));
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Min(Collections.singletonMap("input", Fields.field(fieldReference)));
 		}
 
 		/**
 		 * Creates new {@link Min}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Min}.
 		 */
 		public static Min minOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Min(Collections.singletonList(expression));
+			Assert.notNull(expression, "Expression must not be null");
+			return new Min(Collections.singletonMap("input", expression));
 		}
 
 		/**
@@ -455,12 +638,13 @@ public static Min minOf(AggregationExpression expression) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Min}.
 		 */
+		@Contract("_ -> new")
 		public Min and(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return new Min(append(Fields.field(fieldReference)));
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Min(appendTo("input", Fields.field(fieldReference)));
 		}
 
 		/**
@@ -468,25 +652,42 @@ public Min and(String fieldReference) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Min}.
 		 */
+		@Contract("_ -> new")
 		public Min and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
-			return new Min(append(expression));
+			Assert.notNull(expression, "Expression must not be null");
+			return new Min(appendTo("input", expression));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+		/**
+		 * Creates new {@link Min} that returns the given number of minimum values ({@literal $minN}).
+		 * <strong>NOTE</strong>: Cannot be used with more than one {@literal input} value.
+		 *
+		 * @param numberOfResults
+		 * @return new instance of {@link Min}.
 		 */
+		@Contract("_ -> new")
+		public Min limit(int numberOfResults) {
+			return new Min(append("n", numberOfResults));
+		}
+
+		@Override
+		@SuppressWarnings("NullAway")
+		public Document toDocument(AggregationOperationContext context) {
+
+			if (get("n") == null) {
+				return toDocument(get("input"), context);
+			}
+			return super.toDocument(context);
+		}
+
 		@Override
-		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
 
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
+			if (value instanceof List<?> list && list.size() == 1) {
+				return super.toDocument(list.iterator().next(), context);
 			}
 
 			return super.toDocument(value, context);
@@ -513,11 +714,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link StdDevPop}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevPop}.
 		 */
 		public static StdDevPop stdDevPopOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new StdDevPop(asFields(fieldReference));
 		}
 
@@ -525,11 +726,11 @@ public static StdDevPop stdDevPopOf(String fieldReference) {
 		 * Creates new {@link StdDevPop} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevPop}.
 		 */
 		public static StdDevPop stdDevPopOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StdDevPop(Collections.singletonList(expression));
 		}
 
@@ -538,11 +739,12 @@ public static StdDevPop stdDevPopOf(AggregationExpression expression) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevPop}.
 		 */
+		@Contract("_ -> new")
 		public StdDevPop and(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new StdDevPop(append(Fields.field(fieldReference)));
 		}
 
@@ -551,25 +753,20 @@ public StdDevPop and(String fieldReference) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevPop}.
 		 */
+		@Contract("_ -> new")
 		public StdDevPop and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StdDevPop(append(expression));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
-		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
 
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
+			if (value instanceof List<?> list && list.size() == 1) {
+				return super.toDocument(list.iterator().next(), context);
 			}
 
 			return super.toDocument(value, context);
@@ -596,11 +793,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link StdDevSamp}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevSamp}.
 		 */
 		public static StdDevSamp stdDevSampOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new StdDevSamp(asFields(fieldReference));
 		}
 
@@ -608,11 +805,11 @@ public static StdDevSamp stdDevSampOf(String fieldReference) {
 		 * Creates new {@link StdDevSamp}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevSamp}.
 		 */
 		public static StdDevSamp stdDevSampOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StdDevSamp(Collections.singletonList(expression));
 		}
 
@@ -621,11 +818,12 @@ public static StdDevSamp stdDevSampOf(AggregationExpression expression) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevSamp}.
 		 */
+		@Contract("_ -> new")
 		public StdDevSamp and(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new StdDevSamp(append(Fields.field(fieldReference)));
 		}
 
@@ -634,28 +832,375 @@ public StdDevSamp and(String fieldReference) {
 		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StdDevSamp}.
 		 */
+		@Contract("_ -> new")
 		public StdDevSamp and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StdDevSamp(append(expression));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
-		@SuppressWarnings("unchecked")
 		public Document toDocument(Object value, AggregationOperationContext context) {
 
-			if (value instanceof List) {
-				if (((List) value).size() == 1) {
-					return super.toDocument(((List<Object>) value).iterator().next(), context);
-				}
+			if (value instanceof List<?> list && list.size() == 1) {
+				return super.toDocument(list.iterator().next(), context);
 			}
 
 			return super.toDocument(value, context);
 		}
 	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $covariancePop}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class CovariancePop extends AbstractAggregationExpression {
+
+		private CovariancePop(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link CovariancePop}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 */
+		public static CovariancePop covariancePopOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new CovariancePop(asFields(fieldReference));
+		}
+
+		/**
+		 * Creates new {@link CovariancePop}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 */
+		public static CovariancePop covariancePopOf(AggregationExpression expression) {
+			return new CovariancePop(Collections.singletonList(expression));
+		}
+
+		/**
+		 * Creates new {@link CovariancePop} with all previously added arguments appending the given one.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 */
+		@Contract("_ -> new")
+		public CovariancePop and(String fieldReference) {
+			return new CovariancePop(append(asFields(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link CovariancePop} with all previously added arguments appending the given one.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 */
+		@Contract("_ -> new")
+		public CovariancePop and(AggregationExpression expression) {
+			return new CovariancePop(append(expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$covariancePop";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $covarianceSamp}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class CovarianceSamp extends AbstractAggregationExpression {
+
+		private CovarianceSamp(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link CovarianceSamp}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovarianceSamp}.
+		 */
+		public static CovarianceSamp covarianceSampOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new CovarianceSamp(asFields(fieldReference));
+		}
+
+		/**
+		 * Creates new {@link CovarianceSamp}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovarianceSamp}.
+		 */
+		public static CovarianceSamp covarianceSampOf(AggregationExpression expression) {
+			return new CovarianceSamp(Collections.singletonList(expression));
+		}
+
+		/**
+		 * Creates new {@link CovarianceSamp} with all previously added arguments appending the given one.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovarianceSamp}.
+		 */
+		@Contract("_ -> new")
+		public CovarianceSamp and(String fieldReference) {
+			return new CovarianceSamp(append(asFields(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link CovarianceSamp} with all previously added arguments appending the given one.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovarianceSamp}.
+		 */
+		@Contract("_ -> new")
+		public CovarianceSamp and(AggregationExpression expression) {
+			return new CovarianceSamp(append(expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$covarianceSamp";
+		}
+	}
+
+	/**
+	 * {@link ExpMovingAvg} calculates the exponential moving average of numeric values.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class ExpMovingAvg extends AbstractAggregationExpression {
+
+		private ExpMovingAvg(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Create a new {@link ExpMovingAvg} by defining the field holding the value to be used as input.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link ExpMovingAvg}.
+		 */
+		public static ExpMovingAvg expMovingAvgOf(String fieldReference) {
+			return new ExpMovingAvg(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Create a new {@link ExpMovingAvg} by defining the {@link AggregationExpression expression} to compute the value
+		 * to be used as input.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ExpMovingAvg}.
+		 */
+		public static ExpMovingAvg expMovingAvgOf(AggregationExpression expression) {
+			return new ExpMovingAvg(Collections.singletonMap("input", expression));
+		}
+
+		/**
+		 * Define the number of historical documents with significant mathematical weight. <br />
+		 * Specify either {@link #n(int) N} or {@link #alpha(double) aplha}. Not both!
+		 *
+		 * @param numberOfHistoricalDocuments
+		 * @return new instance of {@link ExpMovingAvg}.
+		 */
+		@Contract("_ -> new")
+		public ExpMovingAvg n/*umber of historical documents*/(int numberOfHistoricalDocuments) {
+			return new ExpMovingAvg(append("N", numberOfHistoricalDocuments));
+		}
+
+		/**
+		 * Define the exponential decay value. <br />
+		 * Specify either {@link #alpha(double) aplha} or {@link #n(int) N}. Not both!
+		 *
+		 * @param exponentialDecayValue
+		 * @return new instance of {@link ExpMovingAvg}.
+		 */
+		@Contract("_ -> new")
+		public ExpMovingAvg alpha(double exponentialDecayValue) {
+			return new ExpMovingAvg(append("alpha", exponentialDecayValue));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$expMovingAvg";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $percentile}.
+	 *
+	 * @author Julia Lee
+	 * @since 4.2
+	 */
+	public static class Percentile extends AbstractAggregationExpression {
+
+		private Percentile(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link Percentile}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Percentile}.
+		 */
+		public static Percentile percentileOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			Map<String, Object> fields = new HashMap<>();
+			fields.put("input", Fields.field(fieldReference));
+			fields.put("method", "approximate");
+			return new Percentile(fields);
+		}
+
+		/**
+		 * Creates new {@link Percentile}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Percentile}.
+		 */
+		public static Percentile percentileOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			Map<String, Object> fields = new HashMap<>();
+			fields.put("input", expression);
+			fields.put("method", "approximate");
+			return new Percentile(fields);
+		}
+
+		/**
+		 * Define the percentile value(s) that must resolve to percentages in the range {@code 0.0 - 1.0} inclusive.
+		 *
+		 * @param percentages must not be {@literal null}.
+		 * @return new instance of {@link Percentile}.
+		 */
+		@Contract("_ -> new")
+		public Percentile percentages(Double... percentages) {
+
+			Assert.notEmpty(percentages, "Percentages must not be null or empty");
+			return new Percentile(append("p", Arrays.asList(percentages)));
+		}
+
+		/**
+		 * Creates new {@link Percentile} with all previously added inputs appending the given one. <br />
+		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Percentile}.
+		 */
+		@Contract("_ -> new")
+		public Percentile and(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Percentile(appendTo("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link Percentile} with all previously added inputs appending the given one. <br />
+		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Percentile}.
+		 */
+		@Contract("_ -> new")
+		public Percentile and(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new Percentile(appendTo("input", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$percentile";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $median}.
+	 *
+	 * @author Julia Lee
+	 * @since 4.2
+	 */
+	public static class Median extends AbstractAggregationExpression {
+
+		private Median(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link Median}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Median}.
+		 */
+		public static Median medianOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			Map<String, Object> fields = new HashMap<>();
+			fields.put("input", Fields.field(fieldReference));
+			fields.put("method", "approximate");
+			return new Median(fields);
+		}
+
+		/**
+		 * Creates new {@link Median}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Median}.
+		 */
+		public static Median medianOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			Map<String, Object> fields = new HashMap<>();
+			fields.put("input", expression);
+			fields.put("method", "approximate");
+			return new Median(fields);
+		}
+
+		/**
+		 * Creates new {@link Median} with all previously added inputs appending the given one. <br />
+		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Median}.
+		 */
+		@Contract("_ -> new")
+		public Median and(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Median(appendTo("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link Median} with all previously added inputs appending the given one. <br />
+		 * <strong>NOTE:</strong> Only possible in {@code $project} stage.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Median}.
+		 */
+		@Contract("_ -> new")
+		public Median and(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new Median(appendTo("input", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$median";
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperation.java
new file mode 100644
index 0000000000..3cb75d3050
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperation.java
@@ -0,0 +1,205 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.aggregation.AddFieldsOperation.AddFieldsOperationBuilder.ValueAppender;
+import org.springframework.lang.Contract;
+
+/**
+ * Adds new fields to documents. {@code $addFields} outputs documents that contain all existing fields from the input
+ * documents and newly added fields.
+ *
+ * <pre class="code">
+ * AddFieldsOperation.addField("totalHomework").withValue("A+").and().addField("totalQuiz").withValue("B-")
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @author Kim Sumin
+ * @since 3.0
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/addFields/">MongoDB Aggregation
+ *      Framework: $addFields</a>
+ */
+public class AddFieldsOperation extends DocumentEnhancingOperation {
+
+	/**
+	 * Create new instance of {@link AddFieldsOperation} adding map keys as exposed fields.
+	 *
+	 * @param source must not be {@literal null}.
+	 */
+	private AddFieldsOperation(Map<Object, Object> source) {
+		super(source);
+	}
+
+	/**
+	 * Create new instance of {@link AddFieldsOperation}
+	 *
+	 * @param field must not be {@literal null}.
+	 * @param value can be {@literal null}.
+	 */
+	public AddFieldsOperation(Object field, @Nullable Object value) {
+		this(Collections.singletonMap(field, value));
+	}
+
+	/**
+	 * Define the {@link AddFieldsOperation} via {@link AddFieldsOperationBuilder}.
+	 *
+	 * @return new instance of {@link AddFieldsOperationBuilder}.
+	 */
+	public static AddFieldsOperationBuilder builder() {
+		return new AddFieldsOperationBuilder();
+	}
+
+	/**
+	 * Concatenate another field to add.
+	 *
+	 * @param field must not be {@literal null}.
+	 * @return new instance of {@link AddFieldsOperationBuilder}.
+	 */
+	public static ValueAppender addField(String field) {
+		return new AddFieldsOperationBuilder().addField(field);
+	}
+
+	/**
+	 * Append the value for a specific field to the operation.
+	 *
+	 * @param field the target field to add.
+	 * @param value the value to assign.
+	 * @return new instance of {@link AddFieldsOperation}.
+	 */
+	@Contract("_ -> new")
+	public AddFieldsOperation addField(Object field, Object value) {
+
+		LinkedHashMap<Object, Object> target = new LinkedHashMap<>(getValueMap());
+		target.put(field, value);
+
+		return new AddFieldsOperation(target);
+	}
+
+	/**
+	 * Concatenate additional fields to add.
+	 *
+	 * @return new instance of {@link AddFieldsOperationBuilder}.
+	 */
+	@Contract("-> new")
+	public AddFieldsOperationBuilder and() {
+		return new AddFieldsOperationBuilder(getValueMap());
+	}
+
+	@Override
+	protected String mongoOperator() {
+		return "$addFields";
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 3.0
+	 */
+	public static class AddFieldsOperationBuilder {
+
+		private final Map<Object, Object> valueMap;
+
+		private AddFieldsOperationBuilder() {
+			this.valueMap = new LinkedHashMap<>();
+		}
+
+		private AddFieldsOperationBuilder(Map<Object, Object> source) {
+			this.valueMap = new LinkedHashMap<>(source);
+		}
+
+		public AddFieldsOperationBuilder addFieldWithValue(String field, @Nullable Object value) {
+			return addField(field).withValue(value);
+		}
+
+		public AddFieldsOperationBuilder addFieldWithValueOf(String field, Object value) {
+			return addField(field).withValueOf(value);
+		}
+
+		/**
+		 * Define the field to add.
+		 *
+		 * @param field must not be {@literal null}.
+		 * @return new instance of {@link ValueAppender}.
+		 */
+		public ValueAppender addField(String field) {
+
+			return new ValueAppender() {
+
+				@Override
+				public AddFieldsOperationBuilder withValue(@Nullable Object value) {
+
+					valueMap.put(field, value);
+					return AddFieldsOperationBuilder.this;
+				}
+
+				@Override
+				public AddFieldsOperationBuilder withValueOf(Object value) {
+
+					valueMap.put(field, value instanceof String stringValue ? Fields.field(stringValue) : value);
+					return AddFieldsOperationBuilder.this;
+				}
+
+				@Override
+				public AddFieldsOperationBuilder withValueOfExpression(String operation, Object... values) {
+
+					valueMap.put(field, new ExpressionProjection(operation, values));
+					return AddFieldsOperationBuilder.this;
+				}
+			};
+		}
+
+		public AddFieldsOperation build() {
+			return new AddFieldsOperation(valueMap);
+		}
+
+		/**
+		 * @author Christoph Strobl
+		 * @since 3.0
+		 */
+		public interface ValueAppender {
+
+			/**
+			 * Define the value to assign as is.
+			 *
+			 * @param value can be {@literal null}.
+			 * @return new instance of {@link AddFieldsOperation}.
+			 */
+			AddFieldsOperationBuilder withValue(@Nullable Object value);
+
+			/**
+			 * Define the value to assign. Plain {@link String} values are treated as {@link Field field references}.
+			 *
+			 * @param value must not be {@literal null}.
+			 * @return new instance of {@link AddFieldsOperation}.
+			 */
+			AddFieldsOperationBuilder withValueOf(Object value);
+
+			/**
+			 * Adds a generic projection for the current field.
+			 *
+			 * @param operation the operation key, e.g. {@code $add}.
+			 * @param values the values to be set for the projection operation.
+			 * @return new instance of {@link AddFieldsOperation}.
+			 */
+			AddFieldsOperationBuilder withValueOfExpression(String operation, Object... values);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java
index 70d2987ca7..45de38ed21 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Aggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,18 +21,22 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.bson.conversions.Bson;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.aggregation.AddFieldsOperation.AddFieldsOperationBuilder;
 import org.springframework.data.mongodb.core.aggregation.CountOperation.CountOperationBuilder;
 import org.springframework.data.mongodb.core.aggregation.FacetOperation.FacetOperationBuilder;
 import org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder;
+import org.springframework.data.mongodb.core.aggregation.LookupOperation.LookupOperationBuilder;
+import org.springframework.data.mongodb.core.aggregation.MergeOperation.MergeOperationBuilder;
 import org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplaceRootDocumentOperationBuilder;
 import org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplaceRootOperationBuilder;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -48,6 +52,7 @@
  * @author Nikolay Bogdanov
  * @author Gustavo de Geus
  * @author Jérôme Guyon
+ * @author Sangyong Choi
  * @since 1.3
  */
 public class Aggregation {
@@ -94,7 +99,7 @@ public class Aggregation {
 	public static final AggregationOperationContext DEFAULT_CONTEXT = AggregationOperationRenderer.DEFAULT_CONTEXT;
 	public static final AggregationOptions DEFAULT_OPTIONS = newAggregationOptions().build();
 
-	protected final List<AggregationOperation> operations;
+	protected final AggregationPipeline pipeline;
 	private final AggregationOptions options;
 
 	/**
@@ -117,10 +122,10 @@ public static Aggregation newAggregation(AggregationOperation... operations) {
 
 	/**
 	 * Creates a new {@link AggregationUpdate} from the given {@link AggregationOperation}s.
-	 * 
+	 *
 	 * @param operations can be {@literal empty} but must not be {@literal null}.
 	 * @return new instance of {@link AggregationUpdate}.
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	public static AggregationUpdate newUpdate(AggregationOperation... operations) {
 		return AggregationUpdate.from(Arrays.asList(operations));
@@ -131,13 +136,13 @@ public static AggregationUpdate newUpdate(AggregationOperation... operations) {
 	 * supported in MongoDB version 2.6+.
 	 *
 	 * @param options must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Aggregation}.
 	 * @since 1.6
 	 */
 	public Aggregation withOptions(AggregationOptions options) {
 
-		Assert.notNull(options, "AggregationOptions must not be null.");
-		return new Aggregation(this.operations, options);
+		Assert.notNull(options, "AggregationOptions must not be null");
+		return new Aggregation(this.pipeline.getOperations(), options);
 	}
 
 	/**
@@ -175,7 +180,7 @@ protected Aggregation(AggregationOperation... aggregationOperations) {
 	 */
 	protected static List<AggregationOperation> asAggregationList(AggregationOperation... aggregationOperations) {
 
-		Assert.notEmpty(aggregationOperations, "AggregationOperations must not be null or empty!");
+		Assert.notEmpty(aggregationOperations, "AggregationOperations must not be null or empty");
 
 		return Arrays.asList(aggregationOperations);
 	}
@@ -197,24 +202,13 @@ protected Aggregation(List<AggregationOperation> aggregationOperations) {
 	 */
 	protected Aggregation(List<AggregationOperation> aggregationOperations, AggregationOptions options) {
 
-		Assert.notNull(aggregationOperations, "AggregationOperations must not be null!");
-		Assert.notNull(options, "AggregationOptions must not be null!");
-
-		// check $out is the last operation if it exists
-		for (AggregationOperation aggregationOperation : aggregationOperations) {
-			if (aggregationOperation instanceof OutOperation && !isLast(aggregationOperation, aggregationOperations)) {
-				throw new IllegalArgumentException("The $out operator must be the last stage in the pipeline.");
-			}
-		}
+		Assert.notNull(aggregationOperations, "AggregationOperations must not be null");
+		Assert.notNull(options, "AggregationOptions must not be null");
 
-		this.operations = aggregationOperations;
+		this.pipeline = new AggregationPipeline(aggregationOperations);
 		this.options = options;
 	}
 
-	private boolean isLast(AggregationOperation aggregationOperation, List<AggregationOperation> aggregationOperations) {
-		return aggregationOperations.indexOf(aggregationOperation) == aggregationOperations.size() - 1;
-	}
-
 	/**
 	 * Get the {@link AggregationOptions}.
 	 *
@@ -231,14 +225,61 @@ public AggregationOptions getOptions() {
 	 * @return
 	 */
 	public static String previousOperation() {
-		return "_id";
+		return FieldName.ID.name();
+	}
+
+	/**
+	 * Obtain an {@link AddFieldsOperationBuilder builder} instance to create a new {@link AddFieldsOperation}. <br />
+	 * Starting in version 4.2, MongoDB adds a new aggregation pipeline stage {@link AggregationUpdate#set $set} that is
+	 * an alias for {@code $addFields}.
+	 *
+	 * @return new instance of {@link AddFieldsOperationBuilder}.
+	 * @see AddFieldsOperation
+	 * @since 3.0
+	 */
+	public static AddFieldsOperationBuilder addFields() {
+		return AddFieldsOperation.builder();
+	}
+
+	/**
+	 * Creates a new {@link AggregationOperation} taking the given {@link Bson bson value} as is. <br />
+	 *
+	 * <pre class="code">
+	 * Aggregation.stage(Aggregates.search(exists(fieldPath("..."))));
+	 * </pre>
+	 *
+	 * Field mapping against a potential domain type or previous aggregation stages will not happen.
+	 *
+	 * @param aggregationOperation the must not be {@literal null}.
+	 * @return new instance of {@link AggregationOperation}.
+	 * @since 4.0
+	 */
+	public static AggregationOperation stage(Bson aggregationOperation) {
+		return new BasicAggregationOperation(aggregationOperation);
+	}
+
+	/**
+	 * Creates a new {@link AggregationOperation} taking the given {@link String json value} as is. <br />
+	 *
+	 * <pre class="code">
+	 * Aggregation.stage("{ $search : { near : { path : 'released' , origin : ... } } }");
+	 * </pre>
+	 *
+	 * Field mapping against a potential domain type or previous aggregation stages will not happen.
+	 *
+	 * @param json the JSON representation of the pipeline stage. Must not be {@literal null}.
+	 * @return new instance of {@link AggregationOperation}.
+	 * @since 4.0
+	 */
+	public static AggregationOperation stage(String json) {
+		return new BasicAggregationOperation(json);
 	}
 
 	/**
 	 * Creates a new {@link ProjectionOperation} including the given fields.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ProjectionOperation}.
 	 */
 	public static ProjectionOperation project(String... fields) {
 		return project(fields(fields));
@@ -248,7 +289,7 @@ public static ProjectionOperation project(String... fields) {
 	 * Creates a new {@link ProjectionOperation} including the given {@link Fields}.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ProjectionOperation}.
 	 */
 	public static ProjectionOperation project(Fields fields) {
 		return new ProjectionOperation(fields);
@@ -263,7 +304,7 @@ public static ProjectionOperation project(Fields fields) {
 	 */
 	public static ProjectionOperation project(Class<?> type) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 		return new ProjectionOperation(type);
 	}
 
@@ -271,7 +312,7 @@ public static ProjectionOperation project(Class<?> type) {
 	 * Factory method to create a new {@link UnwindOperation} for the field with the given name.
 	 *
 	 * @param field must not be {@literal null} or empty.
-	 * @return
+	 * @return new instance of {@link UnwindOperation}.
 	 */
 	public static UnwindOperation unwind(String field) {
 		return new UnwindOperation(field(field));
@@ -281,7 +322,7 @@ public static UnwindOperation unwind(String field) {
 	 * Factory method to create a new {@link ReplaceRootOperation} for the field with the given name.
 	 *
 	 * @param fieldName must not be {@literal null} or empty.
-	 * @return
+	 * @return new instance of {@link ReplaceRootOperation}.
 	 * @since 1.10
 	 */
 	public static ReplaceRootOperation replaceRoot(String fieldName) {
@@ -293,7 +334,7 @@ public static ReplaceRootOperation replaceRoot(String fieldName) {
 	 * {@link AggregationExpression}.
 	 *
 	 * @param aggregationExpression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ReplaceRootOperation}.
 	 * @since 1.10
 	 */
 	public static ReplaceRootOperation replaceRoot(AggregationExpression aggregationExpression) {
@@ -340,9 +381,9 @@ public static UnwindOperation unwind(String field, String arrayIndex) {
 	}
 
 	/**
-	 * Factory method to create a new {@link UnwindOperation} for the field with the given nameincluding the name of a new
-	 * field to hold the array index of the element as {@code arrayIndex} using {@code preserveNullAndEmptyArrays}. Note
-	 * that extended unwind is supported in MongoDB version 3.2+.
+	 * Factory method to create a new {@link UnwindOperation} for the field with the given name, including the name of a
+	 * new field to hold the array index of the element as {@code arrayIndex} using {@code preserveNullAndEmptyArrays}.
+	 * Note that extended unwind is supported in MongoDB version 3.2+.
 	 *
 	 * @param field must not be {@literal null} or empty.
 	 * @param arrayIndex must not be {@literal null} or empty.
@@ -359,7 +400,7 @@ public static UnwindOperation unwind(String field, String arrayIndex, boolean pr
 	 * Creates a new {@link GroupOperation} for the given fields.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link GroupOperation}.
 	 */
 	public static GroupOperation group(String... fields) {
 		return group(fields(fields));
@@ -380,18 +421,32 @@ public static GroupOperation group(Fields fields) {
 	 * {@link GraphLookupOperation} given {@literal fromCollection}.
 	 *
 	 * @param fromCollection must not be {@literal null} or empty.
-	 * @return
+	 * @return new instance of {@link StartWithBuilder} for creating a {@link GraphLookupOperation}.
 	 * @since 1.10
 	 */
 	public static StartWithBuilder graphLookup(String fromCollection) {
 		return GraphLookupOperation.builder().from(fromCollection);
 	}
 
+	/**
+	 * Creates a new {@link VectorSearchOperation} by starting from the {@code indexName} to use.
+	 *
+	 * @param indexName must not be {@literal null} or empty.
+	 * @return new instance of {@link VectorSearchOperation.PathContributor}.
+	 * @since 4.5
+	 */
+	public static VectorSearchOperation.PathContributor vectorSearch(String indexName) {
+
+		Assert.hasText(indexName, "Index name must not be null or empty");
+
+		return VectorSearchOperation.search(indexName);
+	}
+
 	/**
 	 * Factory method to create a new {@link SortOperation} for the given {@link Sort}.
 	 *
 	 * @param sort must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link SortOperation}.
 	 */
 	public static SortOperation sort(Sort sort) {
 		return new SortOperation(sort);
@@ -402,7 +457,7 @@ public static SortOperation sort(Sort sort) {
 	 *
 	 * @param direction must not be {@literal null}.
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link SortOperation}.
 	 */
 	public static SortOperation sort(Direction direction, String... fields) {
 		return new SortOperation(Sort.by(direction, fields));
@@ -412,7 +467,7 @@ public static SortOperation sort(Direction direction, String... fields) {
 	 * Creates a new {@link SortByCountOperation} given {@literal groupByField}.
 	 *
 	 * @param field must not be {@literal null} or empty.
-	 * @return
+	 * @return new instance of {@link SortByCountOperation}.
 	 * @since 2.1
 	 */
 	public static SortByCountOperation sortByCount(String field) {
@@ -423,7 +478,7 @@ public static SortByCountOperation sortByCount(String field) {
 	 * Creates a new {@link SortByCountOperation} given {@link AggregationExpression group and sort expression}.
 	 *
 	 * @param groupAndSortExpression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link SortByCountOperation}.
 	 * @since 2.1
 	 */
 	public static SortByCountOperation sortByCount(AggregationExpression groupAndSortExpression) {
@@ -434,18 +489,7 @@ public static SortByCountOperation sortByCount(AggregationExpression groupAndSor
 	 * Creates a new {@link SkipOperation} skipping the given number of elements.
 	 *
 	 * @param elementsToSkip must not be less than zero.
-	 * @return
-	 * @deprecated prepare to get this one removed in favor of {@link #skip(long)}.
-	 */
-	public static SkipOperation skip(int elementsToSkip) {
-		return new SkipOperation(elementsToSkip);
-	}
-
-	/**
-	 * Creates a new {@link SkipOperation} skipping the given number of elements.
-	 *
-	 * @param elementsToSkip must not be less than zero.
-	 * @return
+	 * @return new instance of {@link SkipOperation}.
 	 */
 	public static SkipOperation skip(long elementsToSkip) {
 		return new SkipOperation(elementsToSkip);
@@ -455,7 +499,7 @@ public static SkipOperation skip(long elementsToSkip) {
 	 * Creates a new {@link LimitOperation} limiting the result to the given number of elements.
 	 *
 	 * @param maxElements must not be less than zero.
-	 * @return
+	 * @return new instance of {@link LimitOperation}.
 	 */
 	public static LimitOperation limit(long maxElements) {
 		return new LimitOperation(maxElements);
@@ -465,7 +509,7 @@ public static LimitOperation limit(long maxElements) {
 	 * Creates a new {@link SampleOperation} to select the specified number of documents from its input randomly.
 	 *
 	 * @param sampleSize must not be less than zero.
-	 * @return
+	 * @return new instance of {@link SampleOperation}.
 	 * @since 2.0
 	 */
 	public static SampleOperation sample(long sampleSize) {
@@ -476,7 +520,7 @@ public static SampleOperation sample(long sampleSize) {
 	 * Creates a new {@link MatchOperation} using the given {@link Criteria}.
 	 *
 	 * @param criteria must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link MatchOperation}.
 	 */
 	public static MatchOperation match(Criteria criteria) {
 		return new MatchOperation(criteria);
@@ -486,13 +530,48 @@ public static MatchOperation match(Criteria criteria) {
 	 * Creates a new {@link MatchOperation} using the given {@link CriteriaDefinition}.
 	 *
 	 * @param criteria must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link MatchOperation}.
 	 * @since 1.10
 	 */
 	public static MatchOperation match(CriteriaDefinition criteria) {
 		return new MatchOperation(criteria);
 	}
 
+	/**
+	 * Creates a new {@link MatchOperation} using the given {@link AggregationExpression}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link MatchOperation}.
+	 * @since 3.3
+	 */
+	public static MatchOperation match(AggregationExpression expression) {
+		return new MatchOperation(expression);
+	}
+
+	/**
+	 * Creates a new {@link GeoNearOperation} instance from the given {@link NearQuery} and the {@code distanceField}. The
+	 * {@code distanceField} defines output field that contains the calculated distance.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @param distanceField must not be {@literal null} or empty.
+	 * @return new instance of {@link GeoNearOperation}.
+	 * @since 1.7
+	 */
+	public static GeoNearOperation geoNear(NearQuery query, String distanceField) {
+		return new GeoNearOperation(query, distanceField);
+	}
+
+	/**
+	 * Obtain a {@link MergeOperationBuilder builder} instance to create a new {@link MergeOperation}.
+	 *
+	 * @return new instance of {@link MergeOperationBuilder}.
+	 * @see MergeOperation
+	 * @since 3.0
+	 */
+	public static MergeOperationBuilder merge() {
+		return MergeOperation.builder();
+	}
+
 	/**
 	 * Creates a new {@link OutOperation} using the given collection name. This operation must be the last operation in
 	 * the pipeline.
@@ -501,7 +580,7 @@ public static MatchOperation match(CriteriaDefinition criteria) {
 	 *          collection in the current database if one does not already exist. The collection is not visible until the
 	 *          aggregation completes. If the aggregation fails, MongoDB does not create the collection. Must not be
 	 *          {@literal null}.
-	 * @return
+	 * @return new instance of {@link OutOperation}.
 	 */
 	public static OutOperation out(String outCollectionName) {
 		return new OutOperation(outCollectionName);
@@ -511,7 +590,7 @@ public static OutOperation out(String outCollectionName) {
 	 * Creates a new {@link BucketOperation} given {@literal groupByField}.
 	 *
 	 * @param groupByField must not be {@literal null} or empty.
-	 * @return
+	 * @return new instance of {@link BucketOperation}.
 	 * @since 1.10
 	 */
 	public static BucketOperation bucket(String groupByField) {
@@ -522,7 +601,7 @@ public static BucketOperation bucket(String groupByField) {
 	 * Creates a new {@link BucketOperation} given {@link AggregationExpression group-by expression}.
 	 *
 	 * @param groupByExpression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link BucketOperation}.
 	 * @since 1.10
 	 */
 	public static BucketOperation bucket(AggregationExpression groupByExpression) {
@@ -534,7 +613,7 @@ public static BucketOperation bucket(AggregationExpression groupByExpression) {
 	 *
 	 * @param groupByField must not be {@literal null} or empty.
 	 * @param buckets number of buckets, must be a positive integer.
-	 * @return
+	 * @return new instance of {@link BucketAutoOperation}.
 	 * @since 1.10
 	 */
 	public static BucketAutoOperation bucketAuto(String groupByField, int buckets) {
@@ -546,7 +625,7 @@ public static BucketAutoOperation bucketAuto(String groupByField, int buckets) {
 	 *
 	 * @param groupByExpression must not be {@literal null}.
 	 * @param buckets number of buckets, must be a positive integer.
-	 * @return
+	 * @return new instance of {@link BucketAutoOperation}.
 	 * @since 1.10
 	 */
 	public static BucketAutoOperation bucketAuto(AggregationExpression groupByExpression, int buckets) {
@@ -556,7 +635,7 @@ public static BucketAutoOperation bucketAuto(AggregationExpression groupByExpres
 	/**
 	 * Creates a new {@link FacetOperation}.
 	 *
-	 * @return
+	 * @return new instance of {@link FacetOperation}.
 	 * @since 1.10
 	 */
 	public static FacetOperation facet() {
@@ -567,7 +646,7 @@ public static FacetOperation facet() {
 	 * Creates a new {@link FacetOperationBuilder} given {@link Aggregation}.
 	 *
 	 * @param aggregationOperations the sub-pipeline, must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link FacetOperation}.
 	 * @since 1.10
 	 */
 	public static FacetOperationBuilder facet(AggregationOperation... aggregationOperations) {
@@ -602,6 +681,23 @@ public static LookupOperation lookup(Field from, Field localField, Field foreign
 		return new LookupOperation(from, localField, foreignField, as);
 	}
 
+	/**
+	 * Entrypoint for creating {@link LookupOperation $lookup} using a fluent builder API.
+	 *
+	 * <pre class="code">
+	 * Aggregation.lookup().from("restaurants").localField("restaurant_name").foreignField("name")
+	 * 		.let(newVariable("orders_drink").forField("drink"))
+	 * 		.pipeline(match(ctx -> new Document("$expr", new Document("$in", List.of("$$orders_drink", "$beverages")))))
+	 * 		.as("matches")
+	 * </pre>
+	 *
+	 * @return new instance of {@link LookupOperationBuilder}.
+	 * @since 4.1
+	 */
+	public static LookupOperationBuilder lookup() {
+		return new LookupOperationBuilder();
+	}
+
 	/**
 	 * Creates a new {@link CountOperationBuilder}.
 	 *
@@ -612,11 +708,31 @@ public static CountOperationBuilder count() {
 		return new CountOperationBuilder();
 	}
 
+	/**
+	 * Creates a new {@link RedactOperation} that can restrict the content of a document based on information stored
+	 * within the document itself.
+	 *
+	 * <pre class="code">
+	 *
+	 * Aggregation.redact(ConditionalOperators.when(Criteria.where("level").is(5)) //
+	 * 		.then(RedactOperation.PRUNE) //
+	 * 		.otherwise(RedactOperation.DESCEND));
+	 * </pre>
+	 *
+	 * @param condition Any {@link AggregationExpression} that resolves to {@literal $$DESCEND}, {@literal $$PRUNE}, or
+	 *          {@literal $$KEEP}. Must not be {@literal null}.
+	 * @return new instance of {@link RedactOperation}. Never {@literal null}.
+	 * @since 3.0
+	 */
+	public static RedactOperation redact(AggregationExpression condition) {
+		return new RedactOperation(condition);
+	}
+
 	/**
 	 * Creates a new {@link Fields} instance for the given field names.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Fields}.
 	 * @see Fields#fields(String...)
 	 */
 	public static Fields fields(String... fields) {
@@ -628,29 +744,16 @@ public static Fields fields(String... fields) {
 	 *
 	 * @param name must not be {@literal null} or empty.
 	 * @param target must not be {@literal null} or empty.
-	 * @return
+	 * @return new instance of {@link Fields}.
 	 */
 	public static Fields bind(String name, String target) {
 		return Fields.from(field(name, target));
 	}
 
-	/**
-	 * Creates a new {@link GeoNearOperation} instance from the given {@link NearQuery} and the {@code distanceField}. The
-	 * {@code distanceField} defines output field that contains the calculated distance.
-	 *
-	 * @param query must not be {@literal null}.
-	 * @param distanceField must not be {@literal null} or empty.
-	 * @return
-	 * @since 1.7
-	 */
-	public static GeoNearOperation geoNear(NearQuery query, String distanceField) {
-		return new GeoNearOperation(query, distanceField);
-	}
-
 	/**
 	 * Returns a new {@link AggregationOptions.Builder}.
 	 *
-	 * @return
+	 * @return new instance of {@link AggregationOptions.Builder}.
 	 * @since 1.6
 	 */
 	public static AggregationOptions.Builder newAggregationOptions() {
@@ -665,12 +768,19 @@ public static AggregationOptions.Builder newAggregationOptions() {
 	 * @since 2.1
 	 */
 	public List<Document> toPipeline(AggregationOperationContext rootContext) {
-		return AggregationOperationRenderer.toDocument(operations, rootContext);
+		return pipeline.toDocuments(rootContext);
+	}
+
+	/**
+	 * @return the {@link AggregationPipeline}.
+	 * @since 3.0.2
+	 */
+	public AggregationPipeline getPipeline() {
+		return pipeline;
 	}
 
 	/**
-	 * Converts this {@link Aggregation} specification to a {@link Document}.
-	 * <p/>
+	 * Converts this {@link Aggregation} specification to a {@link Document}. <br />
 	 * MongoDB requires as of 3.6 cursor-based aggregation. Use {@link #toPipeline(AggregationOperationContext)} to render
 	 * an aggregation pipeline.
 	 *
@@ -685,60 +795,8 @@ public Document toDocument(String inputCollectionName, AggregationOperationConte
 		return options.applyAndReturnPotentiallyChangedCommand(command);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return SerializationUtils.serializeToJsonSafely(toDocument("__collection__", DEFAULT_CONTEXT));
 	}
-
-	/**
-	 * Describes the system variables available in MongoDB aggregation framework pipeline expressions.
-	 *
-	 * @author Thomas Darimont
-	 * @author Christoph Strobl
-	 * @see <a href="https://docs.mongodb.com/manual/reference/aggregation-variables">Aggregation Variables</a>.
-	 */
-	enum SystemVariable {
-
-		ROOT, CURRENT, REMOVE;
-
-		private static final String PREFIX = "$$";
-
-		/**
-		 * Return {@literal true} if the given {@code fieldRef} denotes a well-known system variable, {@literal false}
-		 * otherwise.
-		 *
-		 * @param fieldRef may be {@literal null}.
-		 * @return
-		 */
-		public static boolean isReferingToSystemVariable(@Nullable String fieldRef) {
-
-			if (fieldRef == null || !fieldRef.startsWith(PREFIX) || fieldRef.length() <= 2) {
-				return false;
-			}
-
-			int indexOfFirstDot = fieldRef.indexOf('.');
-			String candidate = fieldRef.substring(2, indexOfFirstDot == -1 ? fieldRef.length() : indexOfFirstDot);
-
-			for (SystemVariable value : values()) {
-				if (value.name().equals(candidate)) {
-					return true;
-				}
-			}
-
-			return false;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Enum#toString()
-		 */
-		@Override
-		public String toString() {
-			return PREFIX.concat(name());
-		}
-	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpression.java
index dd0ac96be3..1cb38ef362 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpression.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,58 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
+import org.springframework.data.mongodb.MongoExpression;
 
 /**
  * An {@link AggregationExpression} can be used with field expressions in aggregation pipeline stages like
  * {@code project} and {@code group}.
+ * <p>
+ * The {@link AggregationExpression expressions} {@link #toDocument(AggregationOperationContext)} method is called during
+ * the mapping process to obtain the mapped, ready to use representation that can be handed over to the driver as part
+ * of an {@link AggregationOperation pipleine stage}.
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-public interface AggregationExpression {
+public interface AggregationExpression extends MongoExpression {
+
+	/**
+	 * Create an {@link AggregationExpression} out of a given {@link MongoExpression} to ensure the resulting
+	 * {@link MongoExpression#toDocument() Document} is mapped against the {@link AggregationOperationContext}. <br />
+	 * If the given expression is already an {@link AggregationExpression} the very same instance is returned.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 3.2
+	 */
+	static AggregationExpression from(MongoExpression expression) {
+
+		if (expression instanceof AggregationExpression aggregationExpression) {
+			return aggregationExpression;
+		}
+
+		return context -> context.getMappedObject(expression.toDocument());
+	}
+
+	/**
+	 * Obtain the as is (unmapped) representation of the {@link AggregationExpression}. Use
+	 * {@link #toDocument(AggregationOperationContext)} with a matching {@link AggregationOperationContext context} to
+	 * engage domain type mapping including field name resolution.
+	 *
+	 * @see org.springframework.data.mongodb.MongoExpression#toDocument()
+	 */
+	@Override
+	default Document toDocument() {
+		return toDocument(Aggregation.DEFAULT_CONTEXT);
+	}
 
 	/**
 	 * Turns the {@link AggregationExpression} into a {@link Document} within the given
 	 * {@link AggregationOperationContext}.
 	 *
-	 * @param context
-	 * @return
+	 * @param context must not be {@literal null}.
+	 * @return the MongoDB native ({@link Document}) form of the expression.
 	 */
 	Document toDocument(AggregationOperationContext context);
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpressionCriteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpressionCriteria.java
new file mode 100644
index 0000000000..1ae935a92b
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpressionCriteria.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2023-2025 the original author 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.aggregation;
+
+import org.bson.Document;
+import org.springframework.data.mongodb.core.aggregation.EvaluationOperators.Expr;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
+
+/**
+ * A {@link CriteriaDefinition criteria} to use {@code $expr} within a
+ * {@link org.springframework.data.mongodb.core.query.Query}.
+ *
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+public class AggregationExpressionCriteria implements CriteriaDefinition {
+
+	private final AggregationExpression expression;
+
+	AggregationExpressionCriteria(AggregationExpression expression) {
+		this.expression = expression;
+	}
+
+	/**
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link AggregationExpressionCriteria}.
+	 */
+	public static AggregationExpressionCriteria whereExpr(AggregationExpression expression) {
+		return new AggregationExpressionCriteria(expression);
+	}
+
+	@Override
+	public Document getCriteriaObject() {
+
+		if (expression instanceof Expr expr) {
+			return new Document(getKey(), expr.get(0));
+		}
+		return new Document(getKey(), expression);
+	}
+
+	@Override
+	public String getKey() {
+		return "$expr";
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpressionTransformer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpressionTransformer.java
index 3e950f110b..e33c565d11 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpressionTransformer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationExpressionTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.AggregationExpressionTransformer.AggregationExpressionTransformationContext;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.data.mongodb.core.spel.ExpressionNode;
 import org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport;
 import org.springframework.data.mongodb.core.spel.ExpressionTransformer;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -53,21 +53,21 @@ class AggregationExpressionTransformationContext<T extends ExpressionNode>
 		 * @param currentNode must not be {@literal null}.
 		 * @param parentNode may be {@literal null}.
 		 * @param previousOperationObject may be {@literal null}.
-		 * @param aggregationContext must not be {@literal null}.
+		 * @param context must not be {@literal null}.
 		 */
 		public AggregationExpressionTransformationContext(T currentNode, @Nullable ExpressionNode parentNode,
 				@Nullable Document previousOperationObject, AggregationOperationContext context) {
 
 			super(currentNode, parentNode, previousOperationObject);
 
-			Assert.notNull(context, "AggregationOperationContext must not be null!");
+			Assert.notNull(context, "AggregationOperationContext must not be null");
 			this.aggregationContext = context;
 		}
 
 		/**
 		 * Returns the underlying {@link AggregationOperationContext}.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public AggregationOperationContext getAggregationContext() {
 			return aggregationContext;
@@ -76,7 +76,7 @@ public AggregationOperationContext getAggregationContext() {
 		/**
 		 * Returns the {@link FieldReference} for the current {@link ExpressionNode}.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public FieldReference getFieldReference() {
 			return aggregationContext.getReference(getCurrentNode().getName());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java
deleted file mode 100644
index 54c973ee3a..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationFunctionExpressions.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright 2015-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.aggregation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.util.Assert;
-
-/**
- * An enum of supported {@link AggregationExpression}s in aggregation pipeline stages.
- *
- * @author Thomas Darimont
- * @author Oliver Gierke
- * @author Christoph Strobl
- * @author Mark Paluch
- * @since 1.7
- * @deprecated since 1.10. Please use {@link ArithmeticOperators} and {@link ComparisonOperators} instead.
- */
-@Deprecated
-public enum AggregationFunctionExpressions {
-
-	SIZE, CMP, EQ, GT, GTE, LT, LTE, NE, SUBTRACT, ADD, MULTIPLY;
-
-	/**
-	 * Returns an {@link AggregationExpression} build from the current {@link Enum} name and the given parameters.
-	 *
-	 * @param parameters must not be {@literal null}
-	 * @return
-	 */
-	public AggregationExpression of(Object... parameters) {
-
-		Assert.notNull(parameters, "Parameters must not be null!");
-		return new FunctionExpression(name().toLowerCase(), parameters);
-	}
-
-	/**
-	 * An {@link AggregationExpression} representing a function call.
-	 *
-	 * @author Thomas Darimont
-	 * @author Oliver Gierke
-	 * @since 1.7
-	 */
-	static class FunctionExpression implements AggregationExpression {
-
-		private final String name;
-		private final List<Object> values;
-
-		/**
-		 * Creates a new {@link FunctionExpression} for the given name and values.
-		 *
-		 * @param name must not be {@literal null} or empty.
-		 * @param values must not be {@literal null}.
-		 */
-		public FunctionExpression(String name, Object[] values) {
-
-			Assert.hasText(name, "Name must not be null!");
-			Assert.notNull(values, "Values must not be null!");
-
-			this.name = name;
-			this.values = Arrays.asList(values);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Expression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
-		@Override
-		public Document toDocument(AggregationOperationContext context) {
-
-			List<Object> args = new ArrayList<Object>(values.size());
-
-			for (Object value : values) {
-				args.add(unpack(value, context));
-			}
-
-			return new Document("$" + name, args);
-		}
-
-		private static Object unpack(Object value, AggregationOperationContext context) {
-
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
-			}
-
-			if (value instanceof Field) {
-				return context.getReference((Field) value).toString();
-			}
-
-			return value;
-		}
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperation.java
index 932fbaf6b2..923a1e73cf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,4 +54,15 @@ public interface AggregationOperation {
 	default List<Document> toPipelineStages(AggregationOperationContext context) {
 		return Collections.singletonList(toDocument(context));
 	}
+
+	/**
+	 * Return the MongoDB operator that is used for this {@link AggregationOperation}. Aggregation operations should
+	 * implement this method to avoid document rendering.
+	 *
+	 * @return the operator used for this {@link AggregationOperation}.
+	 * @since 3.0.2
+	 */
+	default String getOperator() {
+		return toDocument(Aggregation.DEFAULT_CONTEXT).keySet().iterator().next();
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationContext.java
index e16d398cd3..5027328461 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,21 +20,25 @@
 import java.util.Arrays;
 
 import org.bson.Document;
-
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.BeanUtils;
+import org.springframework.data.mongodb.CodecRegistryProvider;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ReflectionUtils;
 
+import com.mongodb.MongoClientSettings;
+
 /**
  * The context for an {@link AggregationOperation}.
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 1.3
  */
-public interface AggregationOperationContext {
+public interface AggregationOperationContext extends CodecRegistryProvider {
 
 	/**
 	 * Returns the mapped {@link Document}, potentially converting the source considering mapping metadata etc.
@@ -58,20 +62,20 @@ default Document getMappedObject(Document document) {
 	Document getMappedObject(Document document, @Nullable Class<?> type);
 
 	/**
-	 * Returns a {@link FieldReference} for the given field or {@literal null} if the context does not expose the given
-	 * field.
+	 * Returns a {@link FieldReference} for the given field.
 	 *
 	 * @param field must not be {@literal null}.
-	 * @return
+	 * @return the {@link FieldReference} for the given {@link Field}.
+	 * @throws IllegalArgumentException if the context does not expose a field with the given name
 	 */
 	FieldReference getReference(Field field);
 
 	/**
-	 * Returns the {@link FieldReference} for the field with the given name or {@literal null} if the context does not
-	 * expose a field with the given name.
+	 * Returns the {@link FieldReference} for the field with the given name.
 	 *
 	 * @param name must not be {@literal null} or empty.
-	 * @return
+	 * @return the {@link FieldReference} for the field with given {@literal name}.
+	 * @throws IllegalArgumentException if the context does not expose a field with the given name
 	 */
 	FieldReference getReference(String name);
 
@@ -87,7 +91,7 @@ default Document getMappedObject(Document document) {
 	 */
 	default Fields getFields(Class<?> type) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 
 		return Fields.fields(Arrays.stream(BeanUtils.getPropertyDescriptors(type)) //
 				.filter(it -> { // object and default methods
@@ -103,4 +107,54 @@ default Fields getFields(Class<?> type) {
 				.map(PropertyDescriptor::getName) //
 				.toArray(String[]::new));
 	}
+
+	/**
+	 * Create a nested {@link AggregationOperationContext} from this context that exposes {@link ExposedFields fields}.
+	 * <p>
+	 * Implementations of {@link AggregationOperationContext} retain their {@link FieldLookupPolicy}. If no policy is
+	 * specified, then lookup defaults to {@link FieldLookupPolicy#strict()}.
+	 *
+	 * @param fields the fields to expose, must not be {@literal null}.
+	 * @return the new {@link AggregationOperationContext} exposing {@code fields}.
+	 * @since 4.3.1
+	 */
+	default AggregationOperationContext expose(ExposedFields fields) {
+		return new ExposedFieldsAggregationOperationContext(fields, this, FieldLookupPolicy.strict());
+	}
+
+	/**
+	 * Create a nested {@link AggregationOperationContext} from this context that inherits exposed fields from this
+	 * context and exposes {@link ExposedFields fields}.
+	 * <p>
+	 * Implementations of {@link AggregationOperationContext} retain their {@link FieldLookupPolicy}. If no policy is
+	 * specified, then lookup defaults to {@link FieldLookupPolicy#strict()}.
+	 *
+	 * @param fields the fields to expose, must not be {@literal null}.
+	 * @return the new {@link AggregationOperationContext} exposing {@code fields}.
+	 * @since 4.3.1
+	 */
+	default AggregationOperationContext inheritAndExpose(ExposedFields fields) {
+		return new InheritingExposedFieldsAggregationOperationContext(fields, this, FieldLookupPolicy.strict());
+	}
+
+	/**
+	 * This toggle allows the {@link AggregationOperationContext context} to use any given field name without checking for
+	 * its existence. Typically, the {@link AggregationOperationContext} fails when referencing unknown fields, those that
+	 * are not present in one of the previous stages or the input source, throughout the pipeline.
+	 *
+	 * @return a more relaxed {@link AggregationOperationContext}.
+	 * @since 3.0
+	 * @deprecated since 4.3.1, {@link FieldLookupPolicy} should be specified explicitly when creating the
+	 *             AggregationOperationContext.
+	 */
+	@Deprecated(since = "4.3.1", forRemoval = true)
+	default AggregationOperationContext continueOnMissingFieldReference() {
+		return this;
+	}
+
+	@Override
+	default CodecRegistry getCodecRegistry() {
+		return MongoClientSettings.getDefaultCodecRegistry();
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java
index 7f57f35b8d..6437ec981d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRenderer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,12 +19,12 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.data.mongodb.core.aggregation.Fields.AggregationField;
 import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
-import org.springframework.lang.Nullable;
 
 /**
  * Rendering support for {@link AggregationOperation} into a {@link List} of {@link org.bson.Document}.
@@ -55,23 +55,56 @@ static List<Document> toDocument(List<AggregationOperation> operations, Aggregat
 
 			operationDocuments.addAll(operation.toPipelineStages(contextToUse));
 
-			if (operation instanceof FieldsExposingAggregationOperation) {
+			if (operation instanceof FieldsExposingAggregationOperation exposedFieldsOperation) {
 
-				FieldsExposingAggregationOperation exposedFieldsOperation = (FieldsExposingAggregationOperation) operation;
 				ExposedFields fields = exposedFieldsOperation.getFields();
 
 				if (operation instanceof InheritsFieldsAggregationOperation || exposedFieldsOperation.inheritsFields()) {
-					contextToUse = new InheritingExposedFieldsAggregationOperationContext(fields, contextToUse);
+					contextToUse = contextToUse.inheritAndExpose(fields);
 				} else {
-					contextToUse = fields.exposesNoFields() ? DEFAULT_CONTEXT
-							: new ExposedFieldsAggregationOperationContext(exposedFieldsOperation.getFields(), contextToUse);
+					contextToUse = fields.exposesNoFields() ? ConverterAwareNoOpContext.instance(rootContext)
+							: contextToUse.expose(fields);
 				}
 			}
+
 		}
 
 		return operationDocuments;
 	}
 
+	private static class ConverterAwareNoOpContext implements AggregationOperationContext {
+
+		AggregationOperationContext ctx;
+
+		static ConverterAwareNoOpContext instance(AggregationOperationContext ctx) {
+
+			if(ctx instanceof ConverterAwareNoOpContext noOpContext) {
+				return noOpContext;
+			}
+
+			return new ConverterAwareNoOpContext(ctx);
+		}
+
+		ConverterAwareNoOpContext(AggregationOperationContext ctx) {
+			this.ctx = ctx;
+		}
+
+		@Override
+		public Document getMappedObject(Document document, @Nullable Class<?> type) {
+			return ctx.getMappedObject(document, null);
+		}
+
+		@Override
+		public FieldReference getReference(Field field) {
+			return new DirectFieldReference(new ExposedField(field, true));
+		}
+
+		@Override
+		public FieldReference getReference(String name) {
+			return new DirectFieldReference(new ExposedField(new AggregationField(name), true));
+		}
+	}
+
 	/**
 	 * Simple {@link AggregationOperationContext} that just returns {@link FieldReference}s as is.
 	 *
@@ -80,28 +113,16 @@ static List<Document> toDocument(List<AggregationOperation> operations, Aggregat
 	 */
 	private static class NoOpAggregationOperationContext implements AggregationOperationContext {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-		 */
 		@Override
 		public Document getMappedObject(Document document, @Nullable Class<?> type) {
 			return document;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
-		 */
 		@Override
 		public FieldReference getReference(Field field) {
 			return new DirectFieldReference(new ExposedField(field, true));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
-		 */
 		@Override
 		public FieldReference getReference(String name) {
 			return new DirectFieldReference(new ExposedField(new AggregationField(name), true));
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java
index 149e9fc2c3..278da408c6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,26 +19,37 @@
 import java.util.Optional;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.ReadConcernAware;
+import org.springframework.data.mongodb.core.ReadPreferenceAware;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
-import com.mongodb.DBObject;
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
 
 /**
  * Holds a set of configurable aggregation options that can be used within an aggregation pipeline. A list of support
- * aggregation options can be found in the MongoDB reference documentation
- * https://docs.mongodb.org/manual/reference/command/aggregate/#aggregate
+ * aggregation options can be found in the
+ * <a href="https://docs.mongodb.org/manual/reference/command/aggregate/#aggregate">MongoDB reference documentation</a>.
+ * <p>
+ * As off 4.3 {@link #allowDiskUse} can be {@literal null}, indicating use of server default, and may only be applied if
+ * {@link #isAllowDiskUseSet() explicitly set}. For compatibility reasons {@link #isAllowDiskUse()} will remain
+ * returning {@literal false} if the no value has been set.
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Yadhukrishna S Pai
+ * @author Soumya Prakash Behera
  * @see Aggregation#withOptions(AggregationOptions)
  * @see TypedAggregation#withOptions(AggregationOptions)
  * @since 1.6
  */
-public class AggregationOptions {
+public class AggregationOptions implements ReadConcernAware, ReadPreferenceAware {
 
 	private static final String BATCH_SIZE = "batchSize";
 	private static final String CURSOR = "cursor";
@@ -47,13 +58,21 @@ public class AggregationOptions {
 	private static final String COLLATION = "collation";
 	private static final String COMMENT = "comment";
 	private static final String MAX_TIME = "maxTimeMS";
+	private static final String HINT = "hint";
 
-	private final boolean allowDiskUse;
+	private final Optional<Boolean> allowDiskUse;
 	private final boolean explain;
 	private final Optional<Document> cursor;
 	private final Optional<Collation> collation;
 	private final Optional<String> comment;
+	private final Optional<Object> hint;
+
+	private Optional<ReadConcern> readConcern;
+
+	private Optional<ReadPreference> readPreference;
 	private Duration maxTime = Duration.ZERO;
+	private ResultOptions resultOptions = ResultOptions.READ;
+	private DomainTypeMapping domainTypeMapping = DomainTypeMapping.RELAXED;
 
 	/**
 	 * Creates a new {@link AggregationOptions}.
@@ -62,7 +81,7 @@ public class AggregationOptions {
 	 * @param explain whether to get the execution plan for the aggregation instead of the actual results.
 	 * @param cursor can be {@literal null}, used to pass additional options to the aggregation.
 	 */
-	public AggregationOptions(boolean allowDiskUse, boolean explain, Document cursor) {
+	public AggregationOptions(boolean allowDiskUse, boolean explain, @Nullable Document cursor) {
 		this(allowDiskUse, explain, cursor, null);
 	}
 
@@ -78,7 +97,7 @@ public AggregationOptions(boolean allowDiskUse, boolean explain, Document cursor
 	 */
 	public AggregationOptions(boolean allowDiskUse, boolean explain, @Nullable Document cursor,
 			@Nullable Collation collation) {
-		this(allowDiskUse, explain, cursor, collation, null);
+		this(allowDiskUse, explain, cursor, collation, null, null);
 	}
 
 	/**
@@ -94,12 +113,32 @@ public AggregationOptions(boolean allowDiskUse, boolean explain, @Nullable Docum
 	 */
 	public AggregationOptions(boolean allowDiskUse, boolean explain, @Nullable Document cursor,
 			@Nullable Collation collation, @Nullable String comment) {
+		this(allowDiskUse, explain, cursor, collation, comment, null);
+	}
 
-		this.allowDiskUse = allowDiskUse;
+	/**
+	 * Creates a new {@link AggregationOptions}.
+	 *
+	 * @param allowDiskUse whether to off-load intensive sort-operations to disk.
+	 * @param explain whether to get the execution plan for the aggregation instead of the actual results.
+	 * @param cursor can be {@literal null}, used to pass additional options (such as {@code batchSize}) to the
+	 *          aggregation.
+	 * @param collation collation for string comparison. Can be {@literal null}.
+	 * @param comment execution comment. Can be {@literal null}.
+	 * @param hint can be {@literal null}, used to provide an index that would be forcibly used by query optimizer.
+	 * @since 3.1
+	 */
+	private AggregationOptions(@Nullable Boolean allowDiskUse, boolean explain, @Nullable Document cursor,
+			@Nullable Collation collation, @Nullable String comment, @Nullable Object hint) {
+
+		this.allowDiskUse = Optional.ofNullable(allowDiskUse);
 		this.explain = explain;
 		this.cursor = Optional.ofNullable(cursor);
 		this.collation = Optional.ofNullable(collation);
 		this.comment = Optional.ofNullable(comment);
+		this.hint = Optional.ofNullable(hint);
+		this.readConcern = Optional.empty();
+		this.readPreference = Optional.empty();
 	}
 
 	/**
@@ -115,7 +154,7 @@ public AggregationOptions(boolean allowDiskUse, boolean explain, int cursorBatch
 	}
 
 	/**
-	 * Creates new {@link AggregationOptions} given {@link DBObject} containing aggregation options.
+	 * Creates new {@link AggregationOptions} given {@link Document} containing aggregation options.
 	 *
 	 * @param document must not be {@literal null}.
 	 * @return the {@link AggregationOptions}.
@@ -123,16 +162,17 @@ public AggregationOptions(boolean allowDiskUse, boolean explain, int cursorBatch
 	 */
 	public static AggregationOptions fromDocument(Document document) {
 
-		Assert.notNull(document, "Document must not be null!");
+		Assert.notNull(document, "Document must not be null");
 
-		boolean allowDiskUse = document.getBoolean(ALLOW_DISK_USE, false);
+		Boolean allowDiskUse = document.get(ALLOW_DISK_USE, Boolean.class);
 		boolean explain = document.getBoolean(EXPLAIN, false);
 		Document cursor = document.get(CURSOR, Document.class);
 		Collation collation = document.containsKey(COLLATION) ? Collation.from(document.get(COLLATION, Document.class))
 				: null;
 		String comment = document.getString(COMMENT);
+		Document hint = document.get(HINT, Document.class);
 
-		AggregationOptions options = new AggregationOptions(allowDiskUse, explain, cursor, collation, comment);
+		AggregationOptions options = new AggregationOptions(allowDiskUse, explain, cursor, collation, comment, hint);
 		if (document.containsKey(MAX_TIME)) {
 			options.maxTime = Duration.ofMillis(document.getLong(MAX_TIME));
 		}
@@ -150,19 +190,29 @@ public static Builder builder() {
 	}
 
 	/**
-	 * Enables writing to temporary files. When set to true, aggregation stages can write data to the _tmp subdirectory in
-	 * the dbPath directory.
+	 * Enables writing to temporary files. When set to {@literal true}, aggregation stages can write data to the
+	 * {@code _tmp} subdirectory in the {@code dbPath} directory.
 	 *
-	 * @return
+	 * @return {@literal true} if enabled; {@literal false} otherwise (or if not set).
 	 */
 	public boolean isAllowDiskUse() {
-		return allowDiskUse;
+		return allowDiskUse.orElse(false);
+	}
+
+	/**
+	 * Return whether {@link #isAllowDiskUse} is configured.
+	 *
+	 * @return {@literal true} if is {@code allowDiskUse} is configured, {@literal false} otherwise.
+	 * @since 4.2.5
+	 */
+	public boolean isAllowDiskUseSet() {
+		return allowDiskUse.isPresent();
 	}
 
 	/**
 	 * Specifies to return the information on the processing of the pipeline.
 	 *
-	 * @return
+	 * @return {@literal true} if enabled.
 	 */
 	public boolean isExplain() {
 		return explain;
@@ -187,7 +237,7 @@ public Integer getCursorBatchSize() {
 	/**
 	 * Specify a document that contains options that control the creation of the cursor object.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public Optional<Document> getCursor() {
 		return cursor;
@@ -196,7 +246,7 @@ public Optional<Document> getCursor() {
 	/**
 	 * Get collation settings for string comparison.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @since 2.0
 	 */
 	public Optional<Collation> getCollation() {
@@ -206,21 +256,89 @@ public Optional<Collation> getCollation() {
 	/**
 	 * Get the comment for the aggregation.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @since 2.2
 	 */
 	public Optional<String> getComment() {
 		return comment;
 	}
 
+	/**
+	 * Get the hint used to fulfill the aggregation.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.1
+	 * @deprecated since 4.1, use {@link #getHintObject()} instead.
+	 */
+	public Optional<Document> getHint() {
+		return hint.map(it -> {
+			if (it instanceof Document doc) {
+				return doc;
+			}
+			if (it instanceof String hintString) {
+				if (BsonUtils.isJsonDocument(hintString)) {
+					return BsonUtils.parse(hintString, null);
+				}
+			}
+			throw new IllegalStateException("Unable to read hint of type %s".formatted(it.getClass()));
+		});
+	}
+
+	/**
+	 * Get the hint used to fulfill the aggregation.
+	 *
+	 * @return never {@literal null}.
+	 * @since 4.1
+	 */
+	public Optional<Object> getHintObject() {
+		return hint;
+	}
+
+	@Override
+	public boolean hasReadConcern() {
+		return readConcern.isPresent();
+	}
+
+	@Override
+	public @Nullable ReadConcern getReadConcern() {
+		return readConcern.orElse(null);
+	}
+
+	@Override
+	public boolean hasReadPreference() {
+		return readPreference.isPresent();
+	}
+
+	@Override
+	public @Nullable ReadPreference getReadPreference() {
+		return readPreference.orElse(null);
+	}
+
 	/**
 	 * @return the time limit for processing. {@link Duration#ZERO} is used for the default unbounded behavior.
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	public Duration getMaxTime() {
 		return maxTime;
 	}
 
+	/**
+	 * @return {@literal true} to skip results when running an aggregation. Useful in combination with {@code $merge} or
+	 *         {@code $out}.
+	 * @since 3.0.2
+	 */
+	public boolean isSkipResults() {
+		return ResultOptions.SKIP.equals(resultOptions);
+	}
+
+	/**
+	 * @return the domain type mapping strategy do apply. Never {@literal null}.
+	 * @since 3.2
+	 */
+	public DomainTypeMapping getDomainTypeMapping() {
+		return domainTypeMapping;
+	}
+
 	/**
 	 * Returns a new potentially adjusted copy for the given {@code aggregationCommandObject} with the configuration
 	 * applied.
@@ -232,14 +350,18 @@ Document applyAndReturnPotentiallyChangedCommand(Document command) {
 
 		Document result = new Document(command);
 
-		if (allowDiskUse && !result.containsKey(ALLOW_DISK_USE)) {
-			result.put(ALLOW_DISK_USE, allowDiskUse);
+		if (isAllowDiskUseSet() && !result.containsKey(ALLOW_DISK_USE)) {
+			result.put(ALLOW_DISK_USE, isAllowDiskUse());
 		}
 
 		if (explain && !result.containsKey(EXPLAIN)) {
 			result.put(EXPLAIN, explain);
 		}
 
+		if (result.containsKey(HINT)) {
+			hint.ifPresent(val -> result.append(HINT, val));
+		}
+
 		if (!result.containsKey(CURSOR)) {
 			cursor.ifPresent(val -> result.put(CURSOR, val));
 		}
@@ -258,17 +380,20 @@ Document applyAndReturnPotentiallyChangedCommand(Document command) {
 	/**
 	 * Returns a {@link Document} representation of this {@link AggregationOptions}.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public Document toDocument() {
 
 		Document document = new Document();
-		document.put(ALLOW_DISK_USE, allowDiskUse);
+		if (isAllowDiskUseSet()) {
+			document.put(ALLOW_DISK_USE, isAllowDiskUse());
+		}
 		document.put(EXPLAIN, explain);
 
 		cursor.ifPresent(val -> document.put(CURSOR, val));
 		collation.ifPresent(val -> document.append(COLLATION, val.toDocument()));
 		comment.ifPresent(val -> document.append(COMMENT, val));
+		hint.ifPresent(val -> document.append(HINT, val));
 
 		if (hasExecutionTimeLimit()) {
 			document.append(MAX_TIME, maxTime.toMillis());
@@ -278,16 +403,13 @@ public Document toDocument() {
 	}
 
 	/**
-	 * @return
-	 * @since 2.3
+	 * @return {@literal true} if {@link #maxTime} is set to a positive value.
+	 * @since 3.0
 	 */
 	public boolean hasExecutionTimeLimit() {
 		return !maxTime.isZero() && !maxTime.isNegative();
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return toDocument().toJson();
@@ -305,19 +427,25 @@ static Document createCursor(int cursorBatchSize) {
 	 */
 	public static class Builder {
 
-		private boolean allowDiskUse;
+		private @Nullable Boolean allowDiskUse;
 		private boolean explain;
 		private @Nullable Document cursor;
 		private @Nullable Collation collation;
 		private @Nullable String comment;
+		private @Nullable Object hint;
+		private @Nullable ReadConcern readConcern;
+		private @Nullable ReadPreference readPreference;
 		private @Nullable Duration maxTime;
+		private @Nullable ResultOptions resultOptions;
+		private @Nullable DomainTypeMapping domainTypeMapping;
 
 		/**
 		 * Defines whether to off-load intensive sort-operations to disk.
 		 *
-		 * @param allowDiskUse
-		 * @return
+		 * @param allowDiskUse use {@literal true} to allow disk use during the aggregation.
+		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public Builder allowDiskUse(boolean allowDiskUse) {
 
 			this.allowDiskUse = allowDiskUse;
@@ -327,9 +455,10 @@ public Builder allowDiskUse(boolean allowDiskUse) {
 		/**
 		 * Defines whether to get the execution plan for the aggregation instead of the actual results.
 		 *
-		 * @param explain
-		 * @return
+		 * @param explain use {@literal true} to enable explain feature.
+		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public Builder explain(boolean explain) {
 
 			this.explain = explain;
@@ -339,9 +468,10 @@ public Builder explain(boolean explain) {
 		/**
 		 * Additional options to the aggregation.
 		 *
-		 * @param cursor
-		 * @return
+		 * @param cursor must not be {@literal null}.
+		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public Builder cursor(Document cursor) {
 
 			this.cursor = cursor;
@@ -351,10 +481,11 @@ public Builder cursor(Document cursor) {
 		/**
 		 * Define the initial cursor batch size.
 		 *
-		 * @param batchSize
-		 * @return
+		 * @param batchSize use a positive int.
+		 * @return this.
 		 * @since 2.0
 		 */
+		@Contract("_ -> this")
 		public Builder cursorBatchSize(int batchSize) {
 
 			this.cursor = createCursor(batchSize);
@@ -365,9 +496,10 @@ public Builder cursorBatchSize(int batchSize) {
 		 * Define collation settings for string comparison.
 		 *
 		 * @param collation can be {@literal null}.
-		 * @return
+		 * @return this.
 		 * @since 2.0
 		 */
+		@Contract("_ -> this")
 		public Builder collation(@Nullable Collation collation) {
 
 			this.collation = collation;
@@ -378,42 +510,207 @@ public Builder collation(@Nullable Collation collation) {
 		 * Define a comment to describe the execution.
 		 *
 		 * @param comment can be {@literal null}.
-		 * @return
+		 * @return this.
 		 * @since 2.2
 		 */
+		@Contract("_ -> this")
 		public Builder comment(@Nullable String comment) {
 
 			this.comment = comment;
 			return this;
 		}
 
+		/**
+		 * Define a hint that is used by query optimizer to to fulfill the aggregation.
+		 *
+		 * @param hint can be {@literal null}.
+		 * @return this.
+		 * @since 3.1
+		 */
+		@Contract("_ -> this")
+		public Builder hint(@Nullable Document hint) {
+
+			this.hint = hint;
+			return this;
+		}
+
+		/**
+		 * Define a hint that is used by query optimizer to to fulfill the aggregation.
+		 *
+		 * @param indexName can be {@literal null}.
+		 * @return this.
+		 * @since 4.1
+		 */
+		@Contract("_ -> this")
+		public Builder hint(@Nullable String indexName) {
+
+			this.hint = indexName;
+			return this;
+		}
+
+		/**
+		 * Define a {@link ReadConcern} to apply to the aggregation.
+		 *
+		 * @param readConcern can be {@literal null}.
+		 * @return this.
+		 * @since 4.1
+		 */
+		@Contract("_ -> this")
+		public Builder readConcern(@Nullable ReadConcern readConcern) {
+
+			this.readConcern = readConcern;
+			return this;
+		}
+
+		/**
+		 * Define a {@link ReadPreference} to apply to the aggregation.
+		 *
+		 * @param readPreference can be {@literal null}.
+		 * @return this.
+		 * @since 4.1
+		 */
+		@Contract("_ -> this")
+		public Builder readPreference(@Nullable ReadPreference readPreference) {
+
+			this.readPreference = readPreference;
+			return this;
+		}
+
 		/**
 		 * Set the time limit for processing.
 		 *
 		 * @param maxTime {@link Duration#ZERO} is used for the default unbounded behavior. {@link Duration#isNegative()
 		 *          Negative} values will be ignored.
 		 * @return this.
-		 * @sinve 2.3
+		 * @since 3.0
 		 */
+		@Contract("_ -> this")
 		public Builder maxTime(@Nullable Duration maxTime) {
 
 			this.maxTime = maxTime;
 			return this;
 		}
 
+		/**
+		 * Run the aggregation, but do NOT read the aggregation result from the store. <br />
+		 * If the expected result of the aggregation is rather large, eg. when using an {@literal $out} operation, this
+		 * option allows to execute the aggregation without having the cursor return the operation result.
+		 *
+		 * @return this.
+		 * @since 3.0.2
+		 */
+		@Contract("-> this")
+		public Builder skipOutput() {
+
+			this.resultOptions = ResultOptions.SKIP;
+			return this;
+		}
+
+		/**
+		 * Apply a strict domain type mapping considering {@link org.springframework.data.mongodb.core.mapping.Field}
+		 * annotations throwing errors for non-existent, but referenced fields.
+		 *
+		 * @return this.
+		 * @since 3.2
+		 */
+		@Contract("-> this")
+		public Builder strictMapping() {
+
+			this.domainTypeMapping = DomainTypeMapping.STRICT;
+			return this;
+		}
+
+		/**
+		 * Apply a relaxed domain type mapping considering {@link org.springframework.data.mongodb.core.mapping.Field}
+		 * annotations using the user provided name if a referenced field does not exist.
+		 *
+		 * @return this.
+		 * @since 3.2
+		 */
+		@Contract("-> this")
+		public Builder relaxedMapping() {
+
+			this.domainTypeMapping = DomainTypeMapping.RELAXED;
+			return this;
+		}
+
+		/**
+		 * Apply no domain type mapping at all taking the pipeline as-is.
+		 *
+		 * @return this.
+		 * @since 3.2
+		 */
+		@Contract("-> this")
+		public Builder noMapping() {
+
+			this.domainTypeMapping = DomainTypeMapping.NONE;
+			return this;
+		}
+
 		/**
 		 * Returns a new {@link AggregationOptions} instance with the given configuration.
 		 *
-		 * @return
+		 * @return new instance of {@link AggregationOptions}.
 		 */
+		@Contract("-> new")
 		public AggregationOptions build() {
 
-			AggregationOptions options = new AggregationOptions(allowDiskUse, explain, cursor, collation, comment);
+			AggregationOptions options = new AggregationOptions(allowDiskUse, explain, cursor, collation, comment, hint);
 			if (maxTime != null) {
 				options.maxTime = maxTime;
 			}
+			if (resultOptions != null) {
+				options.resultOptions = resultOptions;
+			}
+			if (domainTypeMapping != null) {
+				options.domainTypeMapping = domainTypeMapping;
+			}
+			if (readConcern != null) {
+				options.readConcern = Optional.of(readConcern);
+			}
+			if (readPreference != null) {
+				options.readPreference = Optional.of(readPreference);
+			}
 
 			return options;
 		}
 	}
+
+	/**
+	 * @since 3.0
+	 */
+	private enum ResultOptions {
+
+		/**
+		 * Just do it!, and do not read the operation result.
+		 */
+		SKIP,
+		/**
+		 * Read the aggregation result from the cursor.
+		 */
+		READ
+	}
+
+	/**
+	 * Aggregation pipeline Domain type mappings supported by the mapping layer.
+	 *
+	 * @since 3.2
+	 */
+	public enum DomainTypeMapping {
+
+		/**
+		 * Mapping throws errors for non-existent, but referenced fields.
+		 */
+		STRICT,
+
+		/**
+		 * Fields that do not exist in the model are treated as-is.
+		 */
+		RELAXED,
+
+		/**
+		 * Do not attempt to map fields against the model and treat the entire pipeline as-is.
+		 */
+		NONE
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationPipeline.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationPipeline.java
new file mode 100644
index 0000000000..f06803997b
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationPipeline.java
@@ -0,0 +1,179 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * The {@link AggregationPipeline} holds the collection of {@link AggregationOperation aggregation stages}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.0.2
+ */
+public class AggregationPipeline {
+
+	private final List<AggregationOperation> pipeline;
+
+	public static AggregationPipeline of(AggregationOperation... stages) {
+		return new AggregationPipeline(Arrays.asList(stages));
+	}
+
+	/**
+	 * Create an empty pipeline
+	 */
+	public AggregationPipeline() {
+		this(new ArrayList<>());
+	}
+
+	/**
+	 * Create a new pipeline with given {@link AggregationOperation stages}.
+	 *
+	 * @param aggregationOperations must not be {@literal null}.
+	 */
+	public AggregationPipeline(List<AggregationOperation> aggregationOperations) {
+
+		Assert.notNull(aggregationOperations, "AggregationOperations must not be null");
+		pipeline = new ArrayList<>(aggregationOperations);
+	}
+
+	/**
+	 * Append the given {@link AggregationOperation stage} to the pipeline.
+	 *
+	 * @param aggregationOperation must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public AggregationPipeline add(AggregationOperation aggregationOperation) {
+
+		Assert.notNull(aggregationOperation, "AggregationOperation must not be null");
+
+		pipeline.add(aggregationOperation);
+		return this;
+	}
+
+	/**
+	 * Get the list of {@link AggregationOperation aggregation stages}.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public List<AggregationOperation> getOperations() {
+		return Collections.unmodifiableList(pipeline);
+	}
+
+	public @Nullable AggregationOperation firstOperation() {
+		return CollectionUtils.firstElement(pipeline);
+	}
+
+	public @Nullable AggregationOperation lastOperation() {
+		return CollectionUtils.lastElement(pipeline);
+	}
+
+	List<Document> toDocuments(AggregationOperationContext context) {
+
+		verify();
+		return AggregationOperationRenderer.toDocument(pipeline, context);
+	}
+
+	/**
+	 * @return {@literal true} if the last aggregation stage is either {@literal $out} or {@literal $merge}.
+	 */
+	public boolean isOutOrMerge() {
+
+		if (isEmpty()) {
+			return false;
+		}
+
+		AggregationOperation operation = lastOperation();
+		return operation != null && (isOut(operation) || isMerge(operation));
+	}
+
+	void verify() {
+
+		// check $out/$merge is the last operation if it exists
+		for (AggregationOperation operation : pipeline) {
+
+			if (isOut(operation) && !isLast(operation)) {
+				throw new IllegalArgumentException("The $out operator must be the last stage in the pipeline");
+			}
+
+			if (isMerge(operation) && !isLast(operation)) {
+				throw new IllegalArgumentException("The $merge operator must be the last stage in the pipeline");
+			}
+		}
+	}
+
+	/**
+	 * Return whether this aggregation pipeline defines a {@code $unionWith} stage that may contribute documents from
+	 * other collections. Checking for presence of union stages is useful when attempting to determine the aggregation
+	 * element type for mapping metadata computation.
+	 *
+	 * @return {@literal true} the aggregation pipeline makes use of {@code $unionWith}.
+	 * @since 3.1
+	 */
+	public boolean containsUnionWith() {
+		return containsOperation(AggregationPipeline::isUnionWith);
+	}
+
+	/**
+	 * @return {@literal true} if the pipeline does not contain any stages.
+	 * @since 3.1
+	 */
+	public boolean isEmpty() {
+		return pipeline.isEmpty();
+	}
+
+	private boolean containsOperation(Predicate<AggregationOperation> predicate) {
+
+		if (isEmpty()) {
+			return false;
+		}
+
+		for (AggregationOperation element : pipeline) {
+			if (predicate.test(element)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	private boolean isLast(AggregationOperation aggregationOperation) {
+		return pipeline.indexOf(aggregationOperation) == pipeline.size() - 1;
+	}
+
+	private static boolean isUnionWith(AggregationOperation operator) {
+		return operator instanceof UnionWithOperation || operator.getOperator().equals("$unionWith");
+	}
+
+	private static boolean isMerge(AggregationOperation operator) {
+		return operator instanceof MergeOperation || operator.getOperator().equals("$merge");
+	}
+
+	private static boolean isOut(AggregationOperation operator) {
+		return operator instanceof OutOperation || operator.getOperator().equals("$out");
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java
index 034b1a1f92..7b27739229 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -48,8 +48,8 @@ public class AggregationResults<T> implements Iterable<T> {
 	 */
 	public AggregationResults(List<T> mappedResults, Document rawResults) {
 
-		Assert.notNull(mappedResults, "List of mapped results must not be null!");
-		Assert.notNull(rawResults, "Raw results must not be null!");
+		Assert.notNull(mappedResults, "List of mapped results must not be null");
+		Assert.notNull(rawResults, "Raw results must not be null");
 
 		this.mappedResults = Collections.unmodifiableList(mappedResults);
 		this.rawResults = rawResults;
@@ -59,7 +59,7 @@ public AggregationResults(List<T> mappedResults, Document rawResults) {
 	/**
 	 * Returns the aggregation results.
 	 *
-	 * @return
+	 * @return the list of already mapped results or an empty one if none found.
 	 */
 	public List<T> getMappedResults() {
 		return mappedResults;
@@ -68,19 +68,14 @@ public List<T> getMappedResults() {
 	/**
 	 * Returns the unique mapped result. Assumes no result or exactly one.
 	 *
-	 * @return
+	 * @return the single already mapped result object or raise an error if more than one found.
 	 * @throws IllegalArgumentException in case more than one result is available.
 	 */
-	@Nullable
-	public T getUniqueMappedResult() {
-		Assert.isTrue(mappedResults.size() < 2, "Expected unique result or null, but got more than one!");
+	public @Nullable T getUniqueMappedResult() {
+		Assert.isTrue(mappedResults.size() < 2, "Expected unique result or null, but got more than one");
 		return mappedResults.size() == 1 ? mappedResults.get(0) : null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	public Iterator<T> iterator() {
 		return mappedResults.iterator();
 	}
@@ -88,7 +83,7 @@ public Iterator<T> iterator() {
 	/**
 	 * Returns the server that has been used to perform the aggregation.
 	 *
-	 * @return
+	 * @return can be {@literal null}.
 	 */
 	@Nullable
 	public String getServerUsed() {
@@ -98,17 +93,17 @@ public String getServerUsed() {
 	/**
 	 * Returns the raw result that was returned by the server.
 	 *
-	 * @return
+	 * @return the raw response.
 	 * @since 1.6
 	 */
 	public Document getRawResults() {
 		return rawResults;
 	}
 
-	@Nullable
-	private String parseServerUsed() {
+	private @Nullable String parseServerUsed() {
 
 		Object object = rawResults.get("serverUsed");
-		return object instanceof String ? (String) object : null;
+		return object instanceof String stringValue ? stringValue : null;
 	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java
index c6b9838339..c5b53ef0c6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationSpELExpression.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,15 +24,15 @@
  * expression</a>. <br />
  * <br />
  * <strong>Samples:</strong> <br />
- * <code>
  * <pre>
+ * <code>
  * // { $and: [ { $gt: [ "$qty", 100 ] }, { $lt: [ "$qty", 250 ] } ] }
  * expressionOf("qty > 100 && qty < 250);
  *
  * // { $cond : { if : { $gte : [ "$a", 42 ]}, then : "answer", else : "no-answer" } }
  * expressionOf("cond(a >= 42, 'answer', 'no-answer')");
- * </pre>
  * </code>
+ * </pre>
  *
  * @author Christoph Strobl
  * @author Mark Paluch
@@ -56,19 +56,18 @@ private AggregationSpELExpression(String rawExpression, Object[] parameters) {
 	 *
 	 * @param expressionString must not be {@literal null}.
 	 * @param parameters can be empty.
-	 * @return
+	 * @return new instance of {@link AggregationSpELExpression}.
 	 */
 	public static AggregationSpELExpression expressionOf(String expressionString, Object... parameters) {
 
-		Assert.notNull(expressionString, "ExpressionString must not be null!");
+		Assert.notNull(expressionString, "ExpressionString must not be null");
 		return new AggregationSpELExpression(expressionString, parameters);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
-		return (Document) TRANSFORMER.transform(rawExpression, context, parameters);
+
+		Document doc = (Document) TRANSFORMER.transform(rawExpression, context, parameters);
+		return doc != null ? doc : new Document();
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java
index 0803eb0f76..9e8564c03e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,11 +25,11 @@
 import java.util.stream.Collectors;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 import org.springframework.data.mongodb.core.query.UpdateDefinition;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -71,15 +71,14 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
- * @see <a href=
- *      "https://docs.mongodb.com/manual/reference/method/db.collection.update/#update-with-aggregation-pipeline">MongoDB
+ * @see <a href="https://docs.mongodb.com/manual/reference/method/db.collection.update/#update-with-aggregation-pipeline">MongoDB
  *      Reference Documentation</a>
- * @since 2.3
+ * @since 3.0
  */
 public class AggregationUpdate extends Aggregation implements UpdateDefinition {
 
 	private boolean isolated = false;
-	private Set<String> keysTouched = new HashSet<>();
+	private final Set<String> keysTouched = new HashSet<>();
 
 	/**
 	 * Create new {@link AggregationUpdate}.
@@ -98,10 +97,8 @@ protected AggregationUpdate(List<AggregationOperation> pipeline) {
 		super(pipeline);
 
 		for (AggregationOperation operation : pipeline) {
-			if (operation instanceof FieldsExposingAggregationOperation) {
-				((FieldsExposingAggregationOperation) operation).getFields().forEach(it -> {
-					keysTouched.add(it.getName());
-				});
+			if (operation instanceof FieldsExposingAggregationOperation exposingAggregationOperation) {
+				exposingAggregationOperation.getFields().forEach(it -> keysTouched.add(it.getName()));
 			}
 		}
 	}
@@ -132,14 +129,15 @@ public static AggregationUpdate from(List<AggregationOperation> pipeline) {
 	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/set/">$set Aggregation Reference</a>
 	 */
+	@Contract("_ -> this")
 	public AggregationUpdate set(SetOperation setOperation) {
 
-		Assert.notNull(setOperation, "SetOperation must not be null!");
+		Assert.notNull(setOperation, "SetOperation must not be null");
 
 		setOperation.getFields().forEach(it -> {
 			keysTouched.add(it.getName());
 		});
-		operations.add(setOperation);
+		pipeline.add(setOperation);
 		return this;
 	}
 
@@ -151,11 +149,12 @@ public AggregationUpdate set(SetOperation setOperation) {
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/unset/">$unset Aggregation
 	 *      Reference</a>
 	 */
+	@Contract("_ -> this")
 	public AggregationUpdate unset(UnsetOperation unsetOperation) {
 
-		Assert.notNull(unsetOperation, "UnsetOperation must not be null!");
+		Assert.notNull(unsetOperation, "UnsetOperation must not be null");
 
-		operations.add(unsetOperation);
+		pipeline.add(unsetOperation);
 		keysTouched.addAll(unsetOperation.removedFieldNames());
 		return this;
 	}
@@ -164,15 +163,16 @@ public AggregationUpdate unset(UnsetOperation unsetOperation) {
 	 * {@code $replaceWith} replaces the input document with the specified document. The operation replaces all existing
 	 * fields in the input document, including the <strong>_id</strong> field.
 	 *
-	 * @param replaceWithOperation
+	 * @param replaceWithOperation must not be {@literal null}.
 	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/replaceWith/">$replaceWith Aggregation
 	 *      Reference</a>
 	 */
+	@Contract("_ -> this")
 	public AggregationUpdate replaceWith(ReplaceWithOperation replaceWithOperation) {
 
-		Assert.notNull(replaceWithOperation, "ReplaceWithOperation must not be null!");
-		operations.add(replaceWithOperation);
+		Assert.notNull(replaceWithOperation, "ReplaceWithOperation must not be null");
+		pipeline.add(replaceWithOperation);
 		return this;
 	}
 
@@ -182,9 +182,10 @@ public AggregationUpdate replaceWith(ReplaceWithOperation replaceWithOperation)
 	 * @param value must not be {@literal null}.
 	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public AggregationUpdate replaceWith(Object value) {
 
-		Assert.notNull(value, "Value must not be null!");
+		Assert.notNull(value, "Value must not be null");
 		return replaceWith(ReplaceWithOperation.replaceWithValue(value));
 	}
 
@@ -196,9 +197,10 @@ public AggregationUpdate replaceWith(Object value) {
 	 * @return new instance of {@link SetValueAppender}.
 	 * @see #set(SetOperation)
 	 */
+	@Contract("_ -> new")
 	public SetValueAppender set(String key) {
 
-		Assert.notNull(key, "Key must not be null!");
+		Assert.notNull(key, "Key must not be null");
 
 		return new SetValueAppender() {
 
@@ -210,7 +212,7 @@ public AggregationUpdate toValue(@Nullable Object value) {
 			@Override
 			public AggregationUpdate toValueOf(Object value) {
 
-				Assert.notNull(value, "Value must not be null!");
+				Assert.notNull(value, "Value must not be null");
 				return set(SetOperation.builder().set(key).toValueOf(value));
 			}
 		};
@@ -219,13 +221,14 @@ public AggregationUpdate toValueOf(Object value) {
 	/**
 	 * Short for {@link #unset(UnsetOperation)}.
 	 *
-	 * @param keys
-	 * @return
+	 * @param keys the fields to remove.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public AggregationUpdate unset(String... keys) {
 
-		Assert.notNull(keys, "Keys must not be null!");
-		Assert.noNullElements(keys, "Keys must not contain null elements.");
+		Assert.notNull(keys, "Keys must not be null");
+		Assert.noNullElements(keys, "Keys must not contain null elements");
 
 		return unset(new UnsetOperation(Arrays.stream(keys).map(Fields::field).collect(Collectors.toList())));
 	}
@@ -237,54 +240,33 @@ public AggregationUpdate unset(String... keys) {
 	 *
 	 * @return never {@literal null}.
 	 */
+	@Contract("-> this")
 	public AggregationUpdate isolated() {
 
 		isolated = true;
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#isIsolated()
-	 */
 	@Override
 	public Boolean isIsolated() {
 		return isolated;
 	}
 
-	/*
-	 * Returns a update document containing the update pipeline.
-	 * The resulting document needs to be unwrapped to be used with update operations.
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getUpdateObject()
-	 */
 	@Override
 	public Document getUpdateObject() {
 		return new Document("", toPipeline(Aggregation.DEFAULT_CONTEXT));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#modifies(java.lang.String)
-	 */
 	@Override
 	public boolean modifies(String key) {
 		return keysTouched.contains(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc(java.lang.String)
-	 */
 	@Override
 	public void inc(String key) {
 		set(new SetOperation(key, ArithmeticOperators.valueOf(key).add(1)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters()
-	 */
 	@Override
 	public List<ArrayFilter> getArrayFilters() {
 		return Collections.emptyList();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUtils.java
index bd78316b5c..e84f7ed1b0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,16 +32,16 @@ interface AggregationUtils {
 	 * Converts the given {@link Range} into an array of values.
 	 *
 	 * @param range must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
 	 */
-	public static List<Long> toRangeValues(Range<Long> range) {
+	static List<Long> toRangeValues(Range<Long> range) {
 
-		Assert.notNull(range, "Range must not be null!");
+		Assert.notNull(range, "Range must not be null");
 
 		List<Long> result = new ArrayList<Long>(2);
 		result.add(range.getLowerBound().getValue()
-				.orElseThrow(() -> new IllegalArgumentException("Lower bound of range must be bounded!")));
-		range.getUpperBound().getValue().ifPresent(it -> result.add(it));
+				.orElseThrow(() -> new IllegalArgumentException("Lower bound of range must be bounded")));
+		range.getUpperBound().getValue().ifPresent(result::add);
 
 		return result;
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationVariable.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationVariable.java
new file mode 100644
index 0000000000..522dd5eae5
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/AggregationVariable.java
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * A special field that points to a variable {@code $$} expression.
+ *
+ * @author Christoph Strobl
+ * @since 4.1.3
+ */
+public interface AggregationVariable extends Field {
+
+	String PREFIX = "$$";
+
+	/**
+	 * @return {@literal true} if the fields {@link #getName() name} does not match the defined {@link #getTarget()
+	 *         target}.
+	 */
+	@Override
+	default boolean isAliased() {
+		return !ObjectUtils.nullSafeEquals(getName(), getTarget());
+	}
+
+	@Override
+	default String getName() {
+		return getTarget();
+	}
+
+	@Override
+	default boolean isInternal() {
+		return false;
+	}
+
+	/**
+	 * Create a new {@link AggregationVariable} for the given name.
+	 * <p>
+	 * Variables start with {@code $$}. If not, the given value gets prefixed with {@code $$}.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @return new instance of {@link AggregationVariable}.
+	 * @throws IllegalArgumentException if given value is {@literal null}.
+	 */
+	static AggregationVariable variable(String value) {
+
+		Assert.notNull(value, "Value must not be null");
+		return new AggregationVariable() {
+
+			private final String val = AggregationVariable.prefixVariable(value);
+
+			@Override
+			public String getTarget() {
+				return val;
+			}
+		};
+	}
+
+	/**
+	 * Create a new {@link #isInternal() local} {@link AggregationVariable} for the given name.
+	 * <p>
+	 * Variables start with {@code $$}. If not, the given value gets prefixed with {@code $$}.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @return new instance of {@link AggregationVariable}.
+	 * @throws IllegalArgumentException if given value is {@literal null}.
+	 */
+	static AggregationVariable localVariable(String value) {
+
+		Assert.notNull(value, "Value must not be null");
+		return new AggregationVariable() {
+
+			private final String val = AggregationVariable.prefixVariable(value);
+
+			@Override
+			public String getTarget() {
+				return val;
+			}
+
+			@Override
+			public boolean isInternal() {
+				return true;
+			}
+		};
+	}
+
+	/**
+	 * Check if the given field name reference may be variable.
+	 *
+	 * @param fieldRef can be {@literal null}.
+	 * @return true if given value matches the variable identification pattern.
+	 */
+	static boolean isVariable(@Nullable String fieldRef) {
+		return fieldRef != null && fieldRef.stripLeading().matches("^\\$\\$\\w.*");
+	}
+
+	/**
+	 * Check if the given field may be variable.
+	 *
+	 * @param field can be {@literal null}.
+	 * @return true if given {@link Field field} is an {@link AggregationVariable} or if its value is a
+	 *         {@link #isVariable(String) variable}.
+	 */
+	static boolean isVariable(Field field) {
+
+		if (field instanceof AggregationVariable) {
+			return true;
+		}
+		return isVariable(field.getTarget());
+	}
+
+	private static String prefixVariable(String variable) {
+
+		var trimmed = variable.stripLeading();
+		return trimmed.startsWith(PREFIX) ? trimmed : (PREFIX + trimmed);
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperators.java
index 10785623e3..c7787b382c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author 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,19 +17,34 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Avg;
+import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.CovariancePop;
+import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.CovarianceSamp;
 import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Max;
+import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Median;
 import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Min;
+import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Percentile;
 import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.StdDevPop;
 import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.StdDevSamp;
 import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Sum;
+import org.springframework.data.mongodb.core.aggregation.SetWindowFieldsOperation.WindowUnit;
+import org.springframework.data.mongodb.core.aggregation.SetWindowFieldsOperation.WindowUnits;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Gateway to {@literal Arithmetic} aggregation operations that perform math operations on numbers.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Mushtaq Ahmed
+ * @author Julia Lee
  * @since 1.10
  */
 public class ArithmeticOperators {
@@ -38,7 +53,7 @@ public class ArithmeticOperators {
 	 * Take the field referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ArithmeticOperatorFactory}.
 	 */
 	public static ArithmeticOperatorFactory valueOf(String fieldReference) {
 		return new ArithmeticOperatorFactory(fieldReference);
@@ -48,19 +63,30 @@ public static ArithmeticOperatorFactory valueOf(String fieldReference) {
 	 * Take the value resulting from the given {@link AggregationExpression}.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ArithmeticOperatorFactory}.
 	 */
 	public static ArithmeticOperatorFactory valueOf(AggregationExpression expression) {
 		return new ArithmeticOperatorFactory(expression);
 	}
 
+	/**
+	 * Creates new {@link AggregationExpression} that returns a random float between {@code 0} and {@code 1} each time it
+	 * is called.
+	 *
+	 * @return new instance of {@link Rand}.
+	 * @since 3.3
+	 */
+	public static Rand rand() {
+		return new Rand();
+	}
+
 	/**
 	 * @author Christoph Strobl
 	 */
 	public static class ArithmeticOperatorFactory {
 
-		private final String fieldReference;
-		private final AggregationExpression expression;
+		private final @Nullable String fieldReference;
+		private final @Nullable AggregationExpression expression;
 
 		/**
 		 * Creates new {@link ArithmeticOperatorFactory} for given {@literal fieldReference}.
@@ -69,7 +95,7 @@ public static class ArithmeticOperatorFactory {
 		 */
 		public ArithmeticOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			this.fieldReference = fieldReference;
 			this.expression = null;
 		}
@@ -81,7 +107,7 @@ public ArithmeticOperatorFactory(String fieldReference) {
 		 */
 		public ArithmeticOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			this.fieldReference = null;
 			this.expression = expression;
 		}
@@ -89,8 +115,9 @@ public ArithmeticOperatorFactory(AggregationExpression expression) {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the absolute value of the associated number.
 		 *
-		 * @return
+		 * @return new instance of {@link Abs}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Abs abs() {
 			return usesFieldRef() ? Abs.absoluteValueOf(fieldReference) : Abs.absoluteValueOf(expression);
 		}
@@ -100,11 +127,11 @@ public Abs abs() {
 		 * number.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Add}.
 		 */
 		public Add add(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createAdd().add(fieldReference);
 		}
 
@@ -113,11 +140,11 @@ public Add add(String fieldReference) {
 		 * {@link AggregationExpression} to the associated number.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Add}.
 		 */
 		public Add add(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createAdd().add(expression);
 		}
 
@@ -125,38 +152,81 @@ public Add add(AggregationExpression expression) {
 		 * Creates new {@link AggregationExpression} that adds the given {@literal value} to the associated number.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Add}.
 		 */
 		public Add add(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createAdd().add(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Add createAdd() {
 			return usesFieldRef() ? Add.valueOf(fieldReference) : Add.valueOf(expression);
 		}
 
 		/**
 		 * Creates new {@link AggregationExpression} that returns the smallest integer greater than or equal to the
-		 * assoicated number.
+		 * associated number.
 		 *
-		 * @return
+		 * @return new instance of {@link Ceil}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Ceil ceil() {
 			return usesFieldRef() ? Ceil.ceilValueOf(fieldReference) : Ceil.ceilValueOf(expression);
 		}
 
 		/**
-		 * Creates new {@link AggregationExpression} that ivides the associated number by number referenced via
+		 * Creates new {@link AggregationExpression} that calculates the mathematical derivative value.
+		 *
+		 * @return new instance of {@link Derivative}.
+		 * @since 3.3
+		 */
+		public Derivative derivative() {
+			return derivative((String) null);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the mathematical derivative value.
+		 *
+		 * @param unit The time unit ({@link WindowUnits#WEEK}, {@link WindowUnits#DAY}, {@link WindowUnits#HOUR},
+		 *          {@link WindowUnits#MINUTE}, {@link WindowUnits#SECOND}, {@link WindowUnits#MILLISECOND}) to apply.
+		 * @return new instance of {@link Derivative}.
+		 * @since 3.3
+		 */
+		public Derivative derivative(WindowUnit unit) {
+
+			Assert.notNull(unit, "Window unit must not be null");
+
+			return derivative(unit.name().toLowerCase(Locale.ROOT));
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the mathematical derivative value.
+		 *
+		 * @param unit The time unit ({@literal week, day, hour, minute, second, millisecond}) to apply can be
+		 *          {@literal null}.
+		 * @return new instance of {@link Derivative}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Derivative derivative(@Nullable String unit) {
+
+			Derivative derivative = usesFieldRef() ? Derivative.derivativeOf(fieldReference)
+					: Derivative.derivativeOf(expression);
+			return StringUtils.hasText(unit) ? derivative.unit(unit) : derivative;
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that divides the associated number by number referenced via
 		 * {@literal fieldReference}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Divide}.
 		 */
 		public Divide divideBy(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createDivide().divideBy(fieldReference);
 		}
 
@@ -165,26 +235,27 @@ public Divide divideBy(String fieldReference) {
 		 * {@literal expression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Divide}.
 		 */
 		public Divide divideBy(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createDivide().divideBy(expression);
 		}
 
 		/**
 		 * Creates new {@link AggregationExpression} that divides the associated number by given {@literal value}.
 		 *
-		 * @param value
-		 * @return
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Divide}.
 		 */
 		public Divide divideBy(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createDivide().divideBy(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Divide createDivide() {
 			return usesFieldRef() ? Divide.valueOf(fieldReference) : Divide.valueOf(expression);
 		}
@@ -192,8 +263,9 @@ private Divide createDivide() {
 		/**
 		 * Creates new {@link AggregationExpression} that raises Euler’s number (i.e. e ) on the associated number.
 		 *
-		 * @return
+		 * @return new instance of {@link Exp}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Exp exp() {
 			return usesFieldRef() ? Exp.expValueOf(fieldReference) : Exp.expValueOf(expression);
 		}
@@ -202,18 +274,60 @@ public Exp exp() {
 		 * Creates new {@link AggregationExpression} that returns the largest integer less than or equal to the associated
 		 * number.
 		 *
-		 * @return
+		 * @return new instance of {@link Floor}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Floor floor() {
 			return usesFieldRef() ? Floor.floorValueOf(fieldReference) : Floor.floorValueOf(expression);
 		}
 
 		/**
-		 * Creates new {@link AggregationExpression} that calculates the natural logarithm ln (i.e loge) of the assoicated
+		 * Creates new {@link AggregationExpression} that calculates the approximation for the mathematical integral value.
+		 *
+		 * @return new instance of {@link Integral}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Integral integral() {
+			return usesFieldRef() ? Integral.integralOf(fieldReference) : Integral.integralOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the approximation for the mathematical integral value.
+		 *
+		 * @param unit The time unit ({@link WindowUnits#WEEK}, {@link WindowUnits#DAY}, {@link WindowUnits#HOUR},
+		 *          {@link WindowUnits#MINUTE}, {@link WindowUnits#SECOND}, {@link WindowUnits#MILLISECOND}) to apply.
+		 * @return new instance of {@link Derivative}.
+		 * @since 3.3
+		 */
+		public Integral integral(WindowUnit unit) {
+
+			Assert.notNull(unit, "Window unit must not be null");
+
+			return integral(unit.name().toLowerCase(Locale.ROOT));
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the approximation for the mathematical integral value.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Integral}.
+		 * @since 3.3
+		 */
+		public Integral integral(String unit) {
+
+			Assert.hasText(unit, "Unit must not be empty");
+
+			return integral().unit(unit);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the natural logarithm ln (i.e loge) of the associated
 		 * number.
 		 *
-		 * @return
+		 * @return new instance of {@link Ln}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Ln ln() {
 			return usesFieldRef() ? Ln.lnValueOf(fieldReference) : Ln.lnValueOf(expression);
 		}
@@ -223,11 +337,11 @@ public Ln ln() {
 		 * referenced via {@literal fieldReference}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log}.
 		 */
 		public Log log(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createLog().log(fieldReference);
 		}
 
@@ -236,12 +350,12 @@ public Log log(String fieldReference) {
 		 * extracted by given {@link AggregationExpression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log}.
 		 */
 		public Log log(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
-			return createLog().log(fieldReference);
+			Assert.notNull(expression, "Expression must not be null");
+			return createLog().log(expression);
 		}
 
 		/**
@@ -249,14 +363,15 @@ public Log log(AggregationExpression expression) {
 		 * {@literal base}.
 		 *
 		 * @param base must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log}.
 		 */
 		public Log log(Number base) {
 
-			Assert.notNull(base, "Base must not be null!");
+			Assert.notNull(base, "Base must not be null");
 			return createLog().log(base);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Log createLog() {
 			return usesFieldRef() ? Log.valueOf(fieldReference) : Log.valueOf(expression);
 		}
@@ -264,8 +379,9 @@ private Log createLog() {
 		/**
 		 * Creates new {@link AggregationExpression} that calculates the log base 10 for the associated number.
 		 *
-		 * @return
+		 * @return new instance of {@link Log10}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Log10 log10() {
 			return usesFieldRef() ? Log10.log10ValueOf(fieldReference) : Log10.log10ValueOf(expression);
 		}
@@ -275,11 +391,11 @@ public Log10 log10() {
 		 * remainder.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Mod}.
 		 */
 		public Mod mod(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createMod().mod(fieldReference);
 		}
 
@@ -288,11 +404,11 @@ public Mod mod(String fieldReference) {
 		 * remainder.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Mod}.
 		 */
 		public Mod mod(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createMod().mod(expression);
 		}
 
@@ -301,14 +417,15 @@ public Mod mod(AggregationExpression expression) {
 		 * remainder.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Mod}.
 		 */
 		public Mod mod(Number value) {
 
-			Assert.notNull(value, "Base must not be null!");
+			Assert.notNull(value, "Base must not be null");
 			return createMod().mod(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Mod createMod() {
 			return usesFieldRef() ? Mod.valueOf(fieldReference) : Mod.valueOf(expression);
 		}
@@ -317,11 +434,11 @@ private Mod createMod() {
 		 * Creates new {@link AggregationExpression} that multiplies the associated number with another.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Multiply}.
 		 */
 		public Multiply multiplyBy(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createMultiply().multiplyBy(fieldReference);
 		}
 
@@ -329,11 +446,11 @@ public Multiply multiplyBy(String fieldReference) {
 		 * Creates new {@link AggregationExpression} that multiplies the associated number with another.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Multiply}.
 		 */
 		public Multiply multiplyBy(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createMultiply().multiplyBy(expression);
 		}
 
@@ -341,14 +458,15 @@ public Multiply multiplyBy(AggregationExpression expression) {
 		 * Creates new {@link AggregationExpression} that multiplies the associated number with another.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Multiply}.
 		 */
 		public Multiply multiplyBy(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createMultiply().multiplyBy(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Multiply createMultiply() {
 			return usesFieldRef() ? Multiply.valueOf(fieldReference) : Multiply.valueOf(expression);
 		}
@@ -357,11 +475,11 @@ private Multiply createMultiply() {
 		 * Creates new {@link AggregationExpression} that raises the associated number to the specified exponent.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Pow}.
 		 */
 		public Pow pow(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createPow().pow(fieldReference);
 		}
 
@@ -369,11 +487,11 @@ public Pow pow(String fieldReference) {
 		 * Creates new {@link AggregationExpression} that raises the associated number to the specified exponent.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Pow}.
 		 */
 		public Pow pow(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createPow().pow(expression);
 		}
 
@@ -381,14 +499,15 @@ public Pow pow(AggregationExpression expression) {
 		 * Creates new {@link AggregationExpression} that raises the associated number to the specified exponent.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Pow}.
 		 */
 		public Pow pow(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createPow().pow(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Pow createPow() {
 			return usesFieldRef() ? Pow.valueOf(fieldReference) : Pow.valueOf(expression);
 		}
@@ -396,8 +515,9 @@ private Pow createPow() {
 		/**
 		 * Creates new {@link AggregationExpression} that calculates the square root of the associated number.
 		 *
-		 * @return
+		 * @return new instance of {@link Sqrt}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Sqrt sqrt() {
 			return usesFieldRef() ? Sqrt.sqrtOf(fieldReference) : Sqrt.sqrtOf(expression);
 		}
@@ -406,11 +526,11 @@ public Sqrt sqrt() {
 		 * Creates new {@link AggregationExpression} that subtracts value of given from the associated number.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Subtract}.
 		 */
 		public Subtract subtract(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createSubtract().subtract(fieldReference);
 		}
 
@@ -418,26 +538,27 @@ public Subtract subtract(String fieldReference) {
 		 * Creates new {@link AggregationExpression} that subtracts value of given from the associated number.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Subtract}.
 		 */
 		public Subtract subtract(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createSubtract().subtract(expression);
 		}
 
 		/**
 		 * Creates new {@link AggregationExpression} that subtracts value from the associated number.
 		 *
-		 * @param value
-		 * @return
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Subtract}.
 		 */
 		public Subtract subtract(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createSubtract().subtract(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Subtract createSubtract() {
 			return usesFieldRef() ? Subtract.valueOf(fieldReference) : Subtract.valueOf(expression);
 		}
@@ -445,8 +566,9 @@ private Subtract createSubtract() {
 		/**
 		 * Creates new {@link AggregationExpression} that truncates a number to its integer.
 		 *
-		 * @return
+		 * @return new instance of {@link Trunc}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Trunc trunc() {
 			return usesFieldRef() ? Trunc.truncValueOf(fieldReference) : Trunc.truncValueOf(expression);
 		}
@@ -454,8 +576,9 @@ public Trunc trunc() {
 		/**
 		 * Creates new {@link AggregationExpression} that calculates and returns the sum of numeric values.
 		 *
-		 * @return
+		 * @return new instance of {@link Sum}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Sum sum() {
 			return usesFieldRef() ? AccumulatorOperators.Sum.sumOf(fieldReference)
 					: AccumulatorOperators.Sum.sumOf(expression);
@@ -464,8 +587,9 @@ public Sum sum() {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the average value of the numeric values.
 		 *
-		 * @return
+		 * @return new instance of {@link Avg}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Avg avg() {
 			return usesFieldRef() ? AccumulatorOperators.Avg.avgOf(fieldReference)
 					: AccumulatorOperators.Avg.avgOf(expression);
@@ -474,8 +598,9 @@ public Avg avg() {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the maximum value.
 		 *
-		 * @return
+		 * @return new instance of {@link Max}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Max max() {
 			return usesFieldRef() ? AccumulatorOperators.Max.maxOf(fieldReference)
 					: AccumulatorOperators.Max.maxOf(expression);
@@ -484,8 +609,9 @@ public Max max() {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the minimum value.
 		 *
-		 * @return
+		 * @return new instance of {@link Min}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Min min() {
 			return usesFieldRef() ? AccumulatorOperators.Min.minOf(fieldReference)
 					: AccumulatorOperators.Min.minOf(expression);
@@ -494,8 +620,9 @@ public Min min() {
 		/**
 		 * Creates new {@link AggregationExpression} that calculates the population standard deviation of the input values.
 		 *
-		 * @return
+		 * @return new instance of {@link StdDevPop}.
 		 */
+		@SuppressWarnings("NullAway")
 		public StdDevPop stdDevPop() {
 			return usesFieldRef() ? AccumulatorOperators.StdDevPop.stdDevPopOf(fieldReference)
 					: AccumulatorOperators.StdDevPop.stdDevPopOf(expression);
@@ -504,13 +631,376 @@ public StdDevPop stdDevPop() {
 		/**
 		 * Creates new {@link AggregationExpression} that calculates the sample standard deviation of the input values.
 		 *
-		 * @return
+		 * @return new instance of {@link StdDevSamp}.
 		 */
+		@SuppressWarnings("NullAway")
 		public StdDevSamp stdDevSamp() {
 			return usesFieldRef() ? AccumulatorOperators.StdDevSamp.stdDevSampOf(fieldReference)
 					: AccumulatorOperators.StdDevSamp.stdDevSampOf(expression);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the value of the
+		 * given field to calculate the population covariance of the two.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovariancePop covariancePop(String fieldReference) {
+			return covariancePop().and(fieldReference);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the result of the
+		 * given {@link AggregationExpression expression} to calculate the population covariance of the two.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovariancePop covariancePop(AggregationExpression expression) {
+			return covariancePop().and(expression);
+		}
+
+		@SuppressWarnings("NullAway")
+		private CovariancePop covariancePop() {
+			return usesFieldRef() ? CovariancePop.covariancePopOf(fieldReference) : CovariancePop.covariancePopOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the value of the
+		 * given field to calculate the sample covariance of the two.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovarianceSamp covarianceSamp(String fieldReference) {
+			return covarianceSamp().and(fieldReference);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that uses the previous input (field/expression) and the result of the
+		 * given {@link AggregationExpression expression} to calculate the sample covariance of the two.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link CovariancePop}.
+		 * @since 3.3
+		 */
+		public CovarianceSamp covarianceSamp(AggregationExpression expression) {
+			return covarianceSamp().and(expression);
+		}
+
+		@SuppressWarnings("NullAway")
+		private CovarianceSamp covarianceSamp() {
+			return usesFieldRef() ? CovarianceSamp.covarianceSampOf(fieldReference)
+					: CovarianceSamp.covarianceSampOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that rounds a number to a whole integer or to a specified decimal
+		 * place.
+		 *
+		 * @return new instance of {@link Round}.
+		 * @since 3.0
+		 */
+		@SuppressWarnings("NullAway")
+		public Round round() {
+			return usesFieldRef() ? Round.roundValueOf(fieldReference) : Round.roundValueOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that rounds a number to a specified decimal place.
+		 *
+		 * @return new instance of {@link Round}.
+		 * @since 3.0
+		 */
+		public Round roundToPlace(int place) {
+			return round().place(place);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the sine of a numeric value given in
+		 * {@link AngularUnit#RADIANS radians}.
+		 *
+		 * @return new instance of {@link Sin}.
+		 * @since 3.3
+		 */
+		public Sin sin() {
+			return sin(AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the sine of a numeric value in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Sin}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Sin sin(AngularUnit unit) {
+			return usesFieldRef() ? Sin.sinOf(fieldReference, unit) : Sin.sinOf(expression, unit);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the sine of a numeric value given in
+		 * {@link AngularUnit#RADIANS radians}.
+		 *
+		 * @return new instance of {@link Sinh}.
+		 * @since 3.3
+		 */
+		public Sinh sinh() {
+			return sinh(AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the sine of a numeric value.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Sinh}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Sinh sinh(AngularUnit unit) {
+			return usesFieldRef() ? Sinh.sinhOf(fieldReference, unit) : Sinh.sinhOf(expression, unit);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse sine of a numeric value.
+		 *
+		 * @return new instance of {@link ASin}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public ASin asin() {
+			return usesFieldRef() ? ASin.asinOf(fieldReference) : ASin.asinOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse hyperbolic sine of a numeric value.
+		 *
+		 * @return new instance of {@link ASinh}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public ASinh asinh() {
+			return usesFieldRef() ? ASinh.asinhOf(fieldReference) : ASinh.asinhOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the cosine of a numeric value given in
+		 * {@link AngularUnit#RADIANS radians}.
+		 *
+		 * @return new instance of {@link Cos}.
+		 * @since 3.3
+		 */
+		public Cos cos() {
+			return cos(AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the cosine of a numeric value in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Cos}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Cos cos(AngularUnit unit) {
+			return usesFieldRef() ? Cos.cosOf(fieldReference, unit) : Cos.cosOf(expression, unit);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the hyperbolic cosine of a numeric value given in
+		 * {@link AngularUnit#RADIANS radians}.
+		 *
+		 * @return new instance of {@link Cosh}.
+		 * @since 3.3
+		 */
+		public Cosh cosh() {
+			return cosh(AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the hyperbolic cosine of a numeric value.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Cosh}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Cosh cosh(AngularUnit unit) {
+			return usesFieldRef() ? Cosh.coshOf(fieldReference, unit) : Cosh.coshOf(expression, unit);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse cosine of a numeric value.
+		 *
+		 * @return new instance of {@link ACos}.
+		 * @since 3.4
+		 */
+		@SuppressWarnings("NullAway")
+		public ACos acos() {
+			return usesFieldRef() ? ACos.acosOf(fieldReference) : ACos.acosOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse hyperbolic cosine of a numeric value.
+		 *
+		 * @return new instance of {@link ACosh}.
+		 * @since 3.4
+		 */
+		@SuppressWarnings("NullAway")
+		public ACosh acosh() {
+			return usesFieldRef() ? ACosh.acoshOf(fieldReference) : ACosh.acoshOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the tangent of a numeric value given in
+		 * {@link AngularUnit#RADIANS radians}.
+		 *
+		 * @return new instance of {@link Tan}.
+		 * @since 3.3
+		 */
+		public Tan tan() {
+			return tan(AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse tangent of a numeric value.
+		 *
+		 * @return new instance of {@link ATan}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public ATan atan() {
+			return usesFieldRef() ? ATan.atanOf(fieldReference) : ATan.atanOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse tangent of the the numeric value divided by
+		 * the given numeric value in the argument.
+		 *
+		 * @param value the numeric value
+		 * @return new instance of {@link ATan2}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public ATan2 atan2(Number value) {
+
+			Assert.notNull(value, "Value must not be null");
+			return createATan2().atan2of(value);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse tangent of the the numeric value divided by
+		 * the given field reference in the argument.
+		 *
+		 * @param fieldReference the numeric value
+		 * @return new instance of {@link ATan2}.
+		 * @since 3.3
+		 */
+		public ATan2 atan2(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return createATan2().atan2of(fieldReference);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse tangent of the the numeric value divided by
+		 * the given {@link AggregationExpression} in the argument.
+		 *
+		 * @param expression the expression evaluating to a numeric value
+		 * @return new instance of {@link ATan2}.
+		 * @since 3.3
+		 */
+		public ATan2 atan2(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return createATan2().atan2of(expression);
+		}
+
+		@SuppressWarnings("NullAway")
+		private ATan2 createATan2() {
+			return usesFieldRef() ? ATan2.valueOf(fieldReference) : ATan2.valueOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the inverse hyperbolic tangent of a numeric value.
+		 *
+		 * @return new instance of {@link ATanh}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public ATanh atanh() {
+			return usesFieldRef() ? ATanh.atanhOf(fieldReference) : ATanh.atanhOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the tangent of a numeric value in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Tan}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Tan tan(AngularUnit unit) {
+			return usesFieldRef() ? Tan.tanOf(fieldReference, unit) : Tan.tanOf(expression, unit);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the hyperbolic tangent of a numeric value given in
+		 * {@link AngularUnit#RADIANS radians}.
+		 *
+		 * @return new instance of {@link Tan}.
+		 * @since 3.3
+		 */
+		public Tanh tanh() {
+			return tanh(AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the hyperbolic tangent of a numeric value.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Tanh}.
+		 * @since 3.3
+		 */
+		@SuppressWarnings("NullAway")
+		public Tanh tanh(AngularUnit unit) {
+			return usesFieldRef() ? Tanh.tanhOf(fieldReference, unit) : Tanh.tanhOf(expression, unit);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the requested percentile(s) of the numeric value.
+		 *
+		 * @return new instance of {@link Percentile}.
+		 * @param percentages must not be {@literal null}.
+		 * @since 4.2
+		 */
+		@SuppressWarnings("NullAway")
+		public Percentile percentile(Double... percentages) {
+			Percentile percentile = usesFieldRef() ? AccumulatorOperators.Percentile.percentileOf(fieldReference)
+					: AccumulatorOperators.Percentile.percentileOf(expression);
+			return percentile.percentages(percentages);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the requested percentile(s) of the numeric value.
+		 *
+		 * @return new instance of {@link Median}.
+		 * @since 4.2
+		 */
+		@SuppressWarnings("NullAway")
+		public Median median() {
+			return usesFieldRef() ? AccumulatorOperators.Median.medianOf(fieldReference)
+					: AccumulatorOperators.Median.medianOf(expression);
+		}
+
 		private boolean usesFieldRef() {
 			return fieldReference != null;
 		}
@@ -536,11 +1026,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Abs}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Abs}.
 		 */
 		public static Abs absoluteValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Abs(Fields.field(fieldReference));
 		}
 
@@ -548,11 +1038,11 @@ public static Abs absoluteValueOf(String fieldReference) {
 		 * Creates new {@link Abs}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Abs}.
 		 */
 		public static Abs absoluteValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Abs(expression);
 		}
 
@@ -560,11 +1050,11 @@ public static Abs absoluteValueOf(AggregationExpression expression) {
 		 * Creates new {@link Abs}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Abs}.
 		 */
 		public static Abs absoluteValueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Abs(value);
 		}
 	}
@@ -589,11 +1079,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Add}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Add}.
 		 */
 		public static Add valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Add(asFields(fieldReference));
 		}
 
@@ -601,11 +1091,11 @@ public static Add valueOf(String fieldReference) {
 		 * Creates new {@link Add}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Add}.
 		 */
 		public static Add valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Add(Collections.singletonList(expression));
 		}
 
@@ -613,26 +1103,47 @@ public static Add valueOf(AggregationExpression expression) {
 		 * Creates new {@link Add}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Add}.
 		 */
 		public static Add valueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Add(Collections.singletonList(value));
 		}
 
+		/**
+		 * Add the value stored at the given field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Add}.
+		 */
+		@Contract("_ -> new")
 		public Add add(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Add(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Add the evaluation result of the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Add}.
+		 */
+		@Contract("_ -> new")
 		public Add add(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Add(append(expression));
 		}
 
+		/**
+		 * Add the given value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Add}.
+		 */
+		@Contract("_ -> new")
 		public Add add(Number value) {
 			return new Add(append(value));
 		}
@@ -658,11 +1169,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Ceil}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ceil}.
 		 */
 		public static Ceil ceilValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Ceil(Fields.field(fieldReference));
 		}
 
@@ -670,11 +1181,11 @@ public static Ceil ceilValueOf(String fieldReference) {
 		 * Creates new {@link Ceil}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ceil}.
 		 */
 		public static Ceil ceilValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Ceil(expression);
 		}
 
@@ -682,11 +1193,11 @@ public static Ceil ceilValueOf(AggregationExpression expression) {
 		 * Creates new {@link Ceil}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ceil}.
 		 */
 		public static Ceil ceilValueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Ceil(value);
 		}
 	}
@@ -711,11 +1222,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Divide}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Divide}.
 		 */
 		public static Divide valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Divide(asFields(fieldReference));
 		}
 
@@ -723,11 +1234,11 @@ public static Divide valueOf(String fieldReference) {
 		 * Creates new {@link Divide}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Divide}.
 		 */
 		public static Divide valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Divide(Collections.singletonList(expression));
 		}
 
@@ -735,26 +1246,47 @@ public static Divide valueOf(AggregationExpression expression) {
 		 * Creates new {@link Divide}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Divide}.
 		 */
 		public static Divide valueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Divide(Collections.singletonList(value));
 		}
 
+		/**
+		 * Divide by the value stored at the given field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Divide}.
+		 */
+		@Contract("_ -> new")
 		public Divide divideBy(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Divide(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Divide by the evaluation results of the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Divide}.
+		 */
+		@Contract("_ -> new")
 		public Divide divideBy(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Divide(append(expression));
 		}
 
+		/**
+		 * Divide by the given value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Divide}.
+		 */
+		@Contract("_ -> new")
 		public Divide divideBy(Number value) {
 			return new Divide(append(value));
 		}
@@ -780,11 +1312,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Exp}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Exp}.
 		 */
 		public static Exp expValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Exp(Fields.field(fieldReference));
 		}
 
@@ -792,11 +1324,11 @@ public static Exp expValueOf(String fieldReference) {
 		 * Creates new {@link Exp}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Exp}.
 		 */
 		public static Exp expValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Exp(expression);
 		}
 
@@ -804,11 +1336,11 @@ public static Exp expValueOf(AggregationExpression expression) {
 		 * Creates new {@link Exp}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Exp}.
 		 */
 		public static Exp expValueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Exp(value);
 		}
 	}
@@ -833,11 +1365,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Floor}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Floor}.
 		 */
 		public static Floor floorValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Floor(Fields.field(fieldReference));
 		}
 
@@ -845,11 +1377,11 @@ public static Floor floorValueOf(String fieldReference) {
 		 * Creates new {@link Floor}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Floor}.
 		 */
 		public static Floor floorValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Floor(expression);
 		}
 
@@ -857,11 +1389,11 @@ public static Floor floorValueOf(AggregationExpression expression) {
 		 * Creates new {@link Floor}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Floor}.
 		 */
 		public static Floor floorValueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Floor(value);
 		}
 	}
@@ -886,11 +1418,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Ln}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ln}.
 		 */
 		public static Ln lnValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Ln(Fields.field(fieldReference));
 		}
 
@@ -898,11 +1430,11 @@ public static Ln lnValueOf(String fieldReference) {
 		 * Creates new {@link Ln}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ln}.
 		 */
 		public static Ln lnValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Ln(expression);
 		}
 
@@ -910,11 +1442,11 @@ public static Ln lnValueOf(AggregationExpression expression) {
 		 * Creates new {@link Ln}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ln}.
 		 */
 		public static Ln lnValueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Ln(value);
 		}
 	}
@@ -939,11 +1471,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Min}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log}.
 		 */
 		public static Log valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Log(asFields(fieldReference));
 		}
 
@@ -951,11 +1483,11 @@ public static Log valueOf(String fieldReference) {
 		 * Creates new {@link Log}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log}.
 		 */
 		public static Log valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Log(Collections.singletonList(expression));
 		}
 
@@ -967,22 +1499,43 @@ public static Log valueOf(AggregationExpression expression) {
 		 */
 		public static Log valueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Log(Collections.singletonList(value));
 		}
 
+		/**
+		 * Use the value stored at the given field as log base.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Log}.
+		 */
+		@Contract("_ -> new")
 		public Log log(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Log(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Use the evaluated value of the given {@link AggregationExpression} as log base.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Log}.
+		 */
+		@Contract("_ -> new")
 		public Log log(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Log(append(expression));
 		}
 
+		/**
+		 * Use the given value as log base.
+		 *
+		 * @param base must not be {@literal null}.
+		 * @return new instance of {@link Log}.
+		 */
+		@Contract("_ -> new")
 		public Log log(Number base) {
 			return new Log(append(base));
 		}
@@ -1008,11 +1561,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Log10}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log10}.
 		 */
 		public static Log10 log10ValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Log10(Fields.field(fieldReference));
 		}
 
@@ -1020,11 +1573,11 @@ public static Log10 log10ValueOf(String fieldReference) {
 		 * Creates new {@link Log10}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log10}.
 		 */
 		public static Log10 log10ValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Log10(expression);
 		}
 
@@ -1032,11 +1585,11 @@ public static Log10 log10ValueOf(AggregationExpression expression) {
 		 * Creates new {@link Log10}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Log10}.
 		 */
 		public static Log10 log10ValueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Log10(value);
 		}
 	}
@@ -1061,11 +1614,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Mod}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Mod}.
 		 */
 		public static Mod valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Mod(asFields(fieldReference));
 		}
 
@@ -1073,11 +1626,11 @@ public static Mod valueOf(String fieldReference) {
 		 * Creates new {@link Mod}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Mod}.
 		 */
 		public static Mod valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Mod(Collections.singletonList(expression));
 		}
 
@@ -1085,26 +1638,47 @@ public static Mod valueOf(AggregationExpression expression) {
 		 * Creates new {@link Mod}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Mod}.
 		 */
 		public static Mod valueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Mod(Collections.singletonList(value));
 		}
 
+		/**
+		 * Use the value stored at the given field as mod base.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Mod}.
+		 */
+		@Contract("_ -> new")
 		public Mod mod(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Mod(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Use evaluated value of the given {@link AggregationExpression} as mod base.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Mod}.
+		 */
+		@Contract("_ -> new")
 		public Mod mod(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Mod(append(expression));
 		}
 
+		/**
+		 * Use the given value as mod base.
+		 *
+		 * @param base must not be {@literal null}.
+		 * @return new instance of {@link Mod}.
+		 */
+		@Contract("_ -> new")
 		public Mod mod(Number base) {
 			return new Mod(append(base));
 		}
@@ -1130,11 +1704,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Multiply}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Multiply}.
 		 */
 		public static Multiply valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Multiply(asFields(fieldReference));
 		}
 
@@ -1142,11 +1716,11 @@ public static Multiply valueOf(String fieldReference) {
 		 * Creates new {@link Multiply}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Multiply}.
 		 */
 		public static Multiply valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Multiply(Collections.singletonList(expression));
 		}
 
@@ -1154,26 +1728,47 @@ public static Multiply valueOf(AggregationExpression expression) {
 		 * Creates new {@link Multiply}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Multiply}.
 		 */
 		public static Multiply valueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Multiply(Collections.singletonList(value));
 		}
 
+		/**
+		 * Multiply by the value stored at the given field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Multiply}.
+		 */
+		@Contract("_ -> new")
 		public Multiply multiplyBy(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Multiply(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Multiply by the evaluated value of the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Multiply}.
+		 */
+		@Contract("_ -> new")
 		public Multiply multiplyBy(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Multiply(append(expression));
 		}
 
+		/**
+		 * Multiply by the given value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Multiply}.
+		 */
+		@Contract("_ -> new")
 		public Multiply multiplyBy(Number value) {
 			return new Multiply(append(value));
 		}
@@ -1203,7 +1798,7 @@ protected String getMongoMethod() {
 		 */
 		public static Pow valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Pow(asFields(fieldReference));
 		}
 
@@ -1215,7 +1810,7 @@ public static Pow valueOf(String fieldReference) {
 		 */
 		public static Pow valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Pow(Collections.singletonList(expression));
 		}
 
@@ -1227,22 +1822,43 @@ public static Pow valueOf(AggregationExpression expression) {
 		 */
 		public static Pow valueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Pow(Collections.singletonList(value));
 		}
 
+		/**
+		 * Pow by the value stored at the given field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Pow}.
+		 */
+		@Contract("_ -> new")
 		public Pow pow(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Pow(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Pow by the evaluated value of the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Pow}.
+		 */
+		@Contract("_ -> new")
 		public Pow pow(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Pow(append(expression));
 		}
 
+		/**
+		 * Pow by the given value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Pow}.
+		 */
+		@Contract("_ -> new")
 		public Pow pow(Number value) {
 			return new Pow(append(value));
 		}
@@ -1268,11 +1884,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Sqrt}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Sqrt}.
 		 */
 		public static Sqrt sqrtOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Sqrt(Fields.field(fieldReference));
 		}
 
@@ -1280,11 +1896,11 @@ public static Sqrt sqrtOf(String fieldReference) {
 		 * Creates new {@link Sqrt}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Sqrt}.
 		 */
 		public static Sqrt sqrtOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Sqrt(expression);
 		}
 
@@ -1292,11 +1908,11 @@ public static Sqrt sqrtOf(AggregationExpression expression) {
 		 * Creates new {@link Sqrt}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Sqrt}.
 		 */
 		public static Sqrt sqrtOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Sqrt(value);
 		}
 	}
@@ -1321,11 +1937,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Subtract}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Subtract}.
 		 */
 		public static Subtract valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Subtract(asFields(fieldReference));
 		}
 
@@ -1333,11 +1949,11 @@ public static Subtract valueOf(String fieldReference) {
 		 * Creates new {@link Subtract}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Subtract}.
 		 */
 		public static Subtract valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Subtract(Collections.singletonList(expression));
 		}
 
@@ -1345,26 +1961,47 @@ public static Subtract valueOf(AggregationExpression expression) {
 		 * Creates new {@link Subtract}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Subtract}.
 		 */
 		public static Subtract valueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Subtract(Collections.singletonList(value));
 		}
 
+		/**
+		 * Subtract the value stored at the given field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Pow}.
+		 */
+		@Contract("_ -> new")
 		public Subtract subtract(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Subtract(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Subtract the evaluated value of the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Pow}.
+		 */
+		@Contract("_ -> new")
 		public Subtract subtract(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Subtract(append(expression));
 		}
 
+		/**
+		 * Subtract the given value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Pow}.
+		 */
+		@Contract("_ -> new")
 		public Subtract subtract(Number value) {
 			return new Subtract(append(value));
 		}
@@ -1390,11 +2027,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Trunc}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Trunc}.
 		 */
 		public static Trunc truncValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Trunc(Fields.field(fieldReference));
 		}
 
@@ -1402,11 +2039,11 @@ public static Trunc truncValueOf(String fieldReference) {
 		 * Creates new {@link Trunc}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Trunc}.
 		 */
 		public static Trunc truncValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Trunc(expression);
 		}
 
@@ -1414,12 +2051,1220 @@ public static Trunc truncValueOf(AggregationExpression expression) {
 		 * Creates new {@link Trunc}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Trunc}.
 		 */
 		public static Trunc truncValueOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Trunc(value);
 		}
 	}
+
+	/**
+	 * {@link Round} rounds a number to a whole integer or to a specified decimal place.
+	 * <ul>
+	 * <li>If {@link Round#place(int)} resolves to a positive integer, {@code $round} rounds to the given decimal
+	 * places.</li>
+	 * <li>If {@link Round#place(int)} resolves to a negative integer, {@code $round} rounds to the left of the
+	 * decimal.</li>
+	 * <li>If {@link Round#place(int)} resolves to a zero, {@code $round} rounds using the first digit to the right of the
+	 * decimal.</li>
+	 * </ul>
+	 *
+	 * @since 3.0
+	 */
+	public static class Round extends AbstractAggregationExpression {
+
+		private Round(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Round the value of the field that resolves to an integer, double, decimal, or long.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Round}.
+		 */
+		public static Round roundValueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Round(Collections.singletonList(Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Round the outcome of the given expression hat resolves to an integer, double, decimal, or long.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Round}.
+		 */
+		public static Round roundValueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new Round(Collections.singletonList(expression));
+		}
+
+		/**
+		 * Round the given numeric (integer, double, decimal, or long) value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Round}.
+		 */
+		public static Round round(Number value) {
+
+			Assert.notNull(value, "Value must not be null");
+			return new Round(Collections.singletonList(value));
+		}
+
+		/**
+		 * The place to round to. Can be between -20 and 100, exclusive.
+		 *
+		 * @param place value between -20 and 100, exclusive.
+		 * @return new instance of {@link Round}.
+		 */
+		@Contract("_ -> new")
+		public Round place(int place) {
+			return new Round(append(place));
+		}
+
+		/**
+		 * The place to round to defined by an expression that resolves to an integer between -20 and 100, exclusive.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Round}.
+		 */
+		@Contract("_ -> new")
+		public Round placeOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new Round(append(expression));
+		}
+
+		/**
+		 * The place to round to defined by via a field reference that resolves to an integer between -20 and 100,
+		 * exclusive.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Round}.
+		 */
+		@Contract("_ -> new")
+		public Round placeOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "fieldReference must not be null");
+			return new Round(append(Fields.field(fieldReference)));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$round";
+		}
+	}
+
+	/**
+	 * Value object to represent an {@link AggregationExpression expression} that calculates the average rate of change
+	 * within the specified window.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Derivative extends AbstractAggregationExpression {
+
+		private Derivative(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Create a new instance of {@link Derivative} for the value stored at the given field holding a numeric value.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Derivative}.
+		 */
+		public static Derivative derivativeOf(String fieldReference) {
+			return new Derivative(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Create a new instance of {@link Derivative} for the value provided by the given expression that resolves to a
+		 * numeric value.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Derivative}.
+		 */
+		public static Derivative derivativeOf(AggregationExpression expression) {
+			return new Derivative(Collections.singletonMap("input", expression));
+		}
+
+		public static Derivative derivativeOfValue(Number value) {
+			return new Derivative(Collections.singletonMap("input", value));
+		}
+
+		@Contract("_ -> new")
+		public Derivative unit(String unit) {
+			return new Derivative(append("unit", unit));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$derivative";
+		}
+	}
+
+	/**
+	 * Value object to represent an {@link AggregationExpression expression} that calculates the approximation for the
+	 * mathematical integral value.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Integral extends AbstractAggregationExpression {
+
+		private Integral(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Create a new instance of {@link Integral} for the value stored at the given field holding a numeric value.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Integral}.
+		 */
+		public static Integral integralOf(String fieldReference) {
+			return new Integral(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Create a new instance of {@link Integral} for the value provided by the given expression that resolves to a
+		 * numeric value.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Integral}.
+		 */
+		public static Integral integralOf(AggregationExpression expression) {
+			return new Integral(Collections.singletonMap("input", expression));
+		}
+
+		/**
+		 * Set the unit of measure.
+		 *
+		 * @param unit the unit of measure.
+		 * @return new instance of {@link Integral}.
+		 */
+		@Contract("_ -> new")
+		public Integral unit(String unit) {
+			return new Integral(append("unit", unit));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$integral";
+		}
+	}
+
+	/**
+	 * The unit of measure for computations that operate upon angles.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public enum AngularUnit {
+		RADIANS, DEGREES
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the sine of a value that is measured in radians.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Sin extends AbstractAggregationExpression {
+
+		private Sin(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the sine of a value that is measured in
+		 * {@link AngularUnit#RADIANS radians}. <br />
+		 * Use {@code sinhOf("angle", DEGREES)} as shortcut for
+		 *
+		 * <pre>
+		 * { $sinh : { $degreesToRadians : "$angle" } }
+		 * </pre>
+		 *
+		 * .
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sin sinOf(String fieldReference) {
+			return sinOf(fieldReference, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the sine of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sin sinOf(String fieldReference, AngularUnit unit) {
+			return sin(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the sine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sin sinOf(AggregationExpression expression) {
+			return sinOf(expression, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the sine of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sin sinOf(AggregationExpression expression, AngularUnit unit) {
+			return sin(expression, unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the sine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sin sin(Object value) {
+			return sin(value, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the sine of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sin sin(Object value, AngularUnit unit) {
+
+			if (ObjectUtils.nullSafeEquals(AngularUnit.DEGREES, unit)) {
+				return new Sin(ConvertOperators.DegreesToRadians.degreesToRadians(value));
+			}
+			return new Sin(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$sin";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the hyperbolic sine of a value that is measured in
+	 * {@link AngularUnit#RADIANS}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Sinh extends AbstractAggregationExpression {
+
+		private Sinh(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic sine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sinh sinhOf(String fieldReference) {
+			return sinhOf(fieldReference, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic sine of a value that is measured in
+		 * the given {@link AngularUnit unit}. <br />
+		 * Use {@code sinhOf("angle", DEGREES)} as shortcut for
+		 *
+		 * <pre>
+		 * { $sinh : { $degreesToRadians : "$angle" } }
+		 * </pre>
+		 *
+		 * .
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sinh sinhOf(String fieldReference, AngularUnit unit) {
+			return sinh(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic sine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}. <br />
+		 * Use {@code sinhOf("angle", DEGREES)} as shortcut for eg.
+		 * {@code sinhOf(ConvertOperators.valueOf("angle").degreesToRadians())}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sinh sinhOf(AggregationExpression expression) {
+			return sinhOf(expression, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic sine of a value that is measured in
+		 * the given {@link AngularUnit unit}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sinh sinhOf(AggregationExpression expression, AngularUnit unit) {
+			return sinh(expression, unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic sine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sinh sinh(Object value) {
+			return sinh(value, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic sine of a value that is measured in
+		 * the given {@link AngularUnit unit}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Sin}.
+		 */
+		public static Sinh sinh(Object value, AngularUnit unit) {
+
+			if (ObjectUtils.nullSafeEquals(AngularUnit.DEGREES, unit)) {
+				return new Sinh(ConvertOperators.DegreesToRadians.degreesToRadians(value));
+			}
+			return new Sinh(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$sinh";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the inverse sine of a value.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class ASin extends AbstractAggregationExpression {
+
+		private ASin(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse sine of a value.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link ASin}.
+		 */
+		public static ASin asinOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new ASin(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse sine of a value. <br />
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link ASin}.
+		 */
+		public static ASin asinOf(AggregationExpression expression) {
+			return new ASin(expression);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse sine of a value.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link ASin}.
+		 */
+		public static ASin asinOf(Number value) {
+			return new ASin(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$asin";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the inverse hyperbolic sine of a value
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class ASinh extends AbstractAggregationExpression {
+
+		private ASinh(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic sine of a value.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link ASinh}.
+		 */
+		public static ASinh asinhOf(String fieldReference) {
+			return new ASinh(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic sine of a value. <br />
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link ASinh}.
+		 */
+		public static ASinh asinhOf(AggregationExpression expression) {
+			return new ASinh(expression);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic sine of a value.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link ASinh}.
+		 */
+		public static ASinh asinhOf(Object value) {
+			return new ASinh(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$asinh";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the cosine of a value that is measured in radians.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Cos extends AbstractAggregationExpression {
+
+		private Cos(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the cosine of a value that is measured in
+		 * {@link AngularUnit#RADIANS radians}. <br />
+		 * Use {@code cosOf("angle", DEGREES)} as shortcut for
+		 *
+		 * <pre>
+		 * { $cos : { $degreesToRadians : "$angle" } }
+		 * </pre>
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link Cos}.
+		 */
+		public static Cos cosOf(String fieldReference) {
+			return cosOf(fieldReference, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the cosine of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Cos}.
+		 */
+		public static Cos cosOf(String fieldReference, AngularUnit unit) {
+			return cos(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the cosine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link Cos}.
+		 */
+		public static Cos cosOf(AggregationExpression expression) {
+			return cosOf(expression, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the cosine of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Cos}.
+		 */
+		public static Cos cosOf(AggregationExpression expression, AngularUnit unit) {
+			return cos(expression, unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the cosine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value
+		 * @return new instance of {@link Cos}.
+		 */
+		public static Cos cos(Object value) {
+			return cos(value, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the cosine of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Cos}.
+		 */
+		public static Cos cos(Object value, AngularUnit unit) {
+
+			if (ObjectUtils.nullSafeEquals(AngularUnit.DEGREES, unit)) {
+				return new Cos(ConvertOperators.DegreesToRadians.degreesToRadians(value));
+			}
+			return new Cos(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$cos";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the hyperbolic cosine of a value that is measured in
+	 * {@link AngularUnit#RADIANS}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Cosh extends AbstractAggregationExpression {
+
+		private Cosh(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic cosine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link Cosh}.
+		 */
+		public static Cosh coshOf(String fieldReference) {
+			return coshOf(fieldReference, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic cosine of a value that is measured in
+		 * the given {@link AngularUnit unit}. <br />
+		 * Use {@code coshOf("angle", DEGREES)} as shortcut for
+		 *
+		 * <pre>
+		 * { $cosh : { $degreesToRadians : "$angle" } }
+		 * </pre>
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Cosh}.
+		 */
+		public static Cosh coshOf(String fieldReference, AngularUnit unit) {
+			return cosh(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic cosine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}. <br />
+		 * Use {@code sinhOf("angle", DEGREES)} as shortcut for eg.
+		 * {@code sinhOf(ConvertOperators.valueOf("angle").degreesToRadians())}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link Cosh}.
+		 */
+		public static Cosh coshOf(AggregationExpression expression) {
+			return coshOf(expression, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic cosine of a value that is measured in
+		 * the given {@link AngularUnit unit}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Cosh}.
+		 */
+		public static Cosh coshOf(AggregationExpression expression, AngularUnit unit) {
+			return cosh(expression, unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic cosine of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link Cosh}.
+		 */
+		public static Cosh cosh(Object value) {
+			return cosh(value, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic cosine of a value that is measured in
+		 * the given {@link AngularUnit unit}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Cosh}.
+		 */
+		public static Cosh cosh(Object value, AngularUnit unit) {
+
+			if (ObjectUtils.nullSafeEquals(AngularUnit.DEGREES, unit)) {
+				return new Cosh(ConvertOperators.DegreesToRadians.degreesToRadians(value));
+			}
+			return new Cosh(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$cosh";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the inverse cosine of a value.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.4
+	 */
+	public static class ACos extends AbstractAggregationExpression {
+
+		private ACos(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse cosine of a value.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link ACos}.
+		 */
+		public static ACos acosOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new ACos(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse cosine of a value. <br />
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link ACos}.
+		 */
+		public static ACos acosOf(AggregationExpression expression) {
+			return new ACos(expression);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse cosine of a value.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link ACos}.
+		 */
+		public static ACos acosOf(Number value) {
+			return new ACos(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$acos";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the inverse hyperbolic cosine of a value.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.4
+	 */
+	public static class ACosh extends AbstractAggregationExpression {
+
+		private ACosh(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic cosine of a value.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link ACosh}.
+		 */
+		public static ACosh acoshOf(String fieldReference) {
+			return new ACosh(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic cosine of a value. <br />
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link ACosh}.
+		 */
+		public static ACosh acoshOf(AggregationExpression expression) {
+			return new ACosh(expression);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic cosine of a value.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link ACosh}.
+		 */
+		public static ACosh acoshOf(Object value) {
+			return new ACosh(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$acosh";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the tangent of a value that is measured in radians.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Tan extends AbstractAggregationExpression {
+
+		private Tan(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the tangent of a value that is measured in
+		 * {@link AngularUnit#RADIANS radians}. <br />
+		 * Use {@code tanOf("angle", DEGREES)} as shortcut for
+		 *
+		 * <pre>
+		 * { $tan : { $degreesToRadians : "$angle" } }
+		 * </pre>
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link Tan}.
+		 */
+		public static Tan tanOf(String fieldReference) {
+			return tanOf(fieldReference, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the tangent of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Tan}.
+		 */
+		public static Tan tanOf(String fieldReference, AngularUnit unit) {
+			return tan(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the tangent of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link Tan}.
+		 */
+		public static Tan tanOf(AggregationExpression expression) {
+			return tanOf(expression, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the tangent of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Tan}.
+		 */
+		public static Tan tanOf(AggregationExpression expression, AngularUnit unit) {
+			return tan(expression, unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the tangent of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value
+		 * @return new instance of {@link Tan}.
+		 */
+		public static Tan tan(Object value) {
+			return tan(value, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the tangent of a value that is measured in the given
+		 * {@link AngularUnit unit}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Tan}.
+		 */
+		public static Tan tan(Object value, AngularUnit unit) {
+
+			if (ObjectUtils.nullSafeEquals(AngularUnit.DEGREES, unit)) {
+				return new Tan(ConvertOperators.DegreesToRadians.degreesToRadians(value));
+			}
+			return new Tan(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$tan";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the inverse tangent of a value.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class ATan extends AbstractAggregationExpression {
+
+		private ATan(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse tangent of a value.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link ATan}.
+		 */
+		public static ATan atanOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new ATan(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse tangent of a value.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link ATan}.
+		 */
+		public static ATan atanOf(AggregationExpression expression) {
+			return new ATan(expression);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse tangent of a value.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link ATan}.
+		 */
+		public static ATan atanOf(Number value) {
+			return new ATan(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$atan";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the inverse tangent of y / x, where y and x are the
+	 * first and second values passed to the expression respectively.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class ATan2 extends AbstractAggregationExpression {
+
+		private ATan2(List<?> value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse tangent of of y / x, where y and x are
+		 * the first and second values passed to the expression respectively.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link ATan2}.
+		 */
+		public static ATan2 valueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new ATan2(asFields(fieldReference));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse tangent of of y / x, where y and x are
+		 * the first and second values passed to the expression respectively.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link ATan2}.
+		 */
+		public static ATan2 valueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new ATan2((Collections.singletonList(expression)));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse tangent of of y / x, where y and x are
+		 * the first and second values passed to the expression respectively.
+		 *
+		 * @param fieldReference anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves
+		 *          to a numeric value.
+		 * @return new instance of {@link ATan2}.
+		 */
+		public ATan2 atan2of(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new ATan2(append(Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic tangent of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param expression anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to
+		 *          a numeric value.
+		 * @return new instance of {@link ATan2}.
+		 */
+		public ATan2 atan2of(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new ATan2(append(expression));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse tangent of of y / x, where y and x are
+		 * the first and second values passed to the expression respectively.
+		 *
+		 * @param value of type {@link Number}
+		 * @return new instance of {@link ATan2}.
+		 */
+		public ATan2 atan2of(Number value) {
+			return new ATan2(append(value));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$atan2";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the hyperbolic tangent of a value that is measured in
+	 * {@link AngularUnit#RADIANS}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Tanh extends AbstractAggregationExpression {
+
+		private Tanh(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic tangent of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link Tanh}.
+		 */
+		public static Tanh tanhOf(String fieldReference) {
+			return tanhOf(fieldReference, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic tangent of a value that is measured in
+		 * the given {@link AngularUnit unit}. <br />
+		 * Use {@code tanhOf("angle", DEGREES)} as shortcut for
+		 *
+		 * <pre>
+		 * { $tanh : { $degreesToRadians : "$angle" } }
+		 * </pre>
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Tanh}.
+		 */
+		public static Tanh tanhOf(String fieldReference, AngularUnit unit) {
+			return tanh(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic tangent of a value that is measured in
+		 * {@link AngularUnit#RADIANS}. <br />
+		 * Use {@code sinhOf("angle", DEGREES)} as shortcut for eg.
+		 * {@code sinhOf(ConvertOperators.valueOf("angle").degreesToRadians())}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link Tanh}.
+		 */
+		public static Tanh tanhOf(AggregationExpression expression) {
+			return tanhOf(expression, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic tangent of a value that is measured in
+		 * the given {@link AngularUnit unit}.
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Tanh}.
+		 */
+		public static Tanh tanhOf(AggregationExpression expression, AngularUnit unit) {
+			return tanh(expression, unit);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic tangent of a value that is measured in
+		 * {@link AngularUnit#RADIANS}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link Tanh}.
+		 */
+		public static Tanh tanh(Object value) {
+			return tanh(value, AngularUnit.RADIANS);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the hyperbolic tangent of a value that is measured in
+		 * the given {@link AngularUnit unit}.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value
+		 * @param unit the unit of measure used by the value of the given field.
+		 * @return new instance of {@link Tanh}.
+		 */
+		public static Tanh tanh(Object value, AngularUnit unit) {
+
+			if (ObjectUtils.nullSafeEquals(AngularUnit.DEGREES, unit)) {
+				return new Tanh(ConvertOperators.DegreesToRadians.degreesToRadians(value));
+			}
+			return new Tanh(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$tanh";
+		}
+	}
+
+	/**
+	 * An {@link AggregationExpression expression} that calculates the inverse hyperbolic tangent of a value
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class ATanh extends AbstractAggregationExpression {
+
+		private ATanh(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic tangent of a value.
+		 *
+		 * @param fieldReference the name of the {@link Field field} that resolves to a numeric value.
+		 * @return new instance of {@link ATanh}.
+		 */
+		public static ATanh atanhOf(String fieldReference) {
+			return new ATanh(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic tangent of a value. <br />
+		 *
+		 * @param expression the {@link AggregationExpression expression} that resolves to a numeric value.
+		 * @return new instance of {@link ATanh}.
+		 */
+		public static ATanh atanhOf(AggregationExpression expression) {
+			return new ATanh(expression);
+		}
+
+		/**
+		 * Creates a new {@link AggregationExpression} that calculates the inverse hyperbolic tangent of a value.
+		 *
+		 * @param value anything ({@link Field field}, {@link AggregationExpression expression}, ...) that resolves to a
+		 *          numeric value.
+		 * @return new instance of {@link ATanh}.
+		 */
+		public static ATanh atanhOf(Object value) {
+			return new ATanh(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$atanh";
+		}
+	}
+
+	/**
+	 * {@link Rand} returns a floating value between 0 and 1.
+	 *
+	 * @author Mushtaq Ahmed
+	 * @since 3.3
+	 */
+	public static class Rand implements AggregationExpression {
+
+		@Override
+		public Document toDocument(AggregationOperationContext context) {
+			return new Document("$rand", new Document());
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java
index 2750549669..85952d8f39 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ArrayOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,14 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.AsBuilder;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Reduce.PropertyExpression;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -35,6 +38,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Shashank Sharma
+ * @author Divya Srivastava
  * @since 1.0
  */
 public class ArrayOperators {
@@ -43,7 +47,7 @@ public class ArrayOperators {
 	 * Take the array referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ArrayOperatorFactory}.
 	 */
 	public static ArrayOperatorFactory arrayOf(String fieldReference) {
 		return new ArrayOperatorFactory(fieldReference);
@@ -53,7 +57,7 @@ public static ArrayOperatorFactory arrayOf(String fieldReference) {
 	 * Take the array referenced resulting from the given {@link AggregationExpression}.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ArrayOperatorFactory}.
 	 */
 	public static ArrayOperatorFactory arrayOf(AggregationExpression expression) {
 		return new ArrayOperatorFactory(expression);
@@ -77,7 +81,7 @@ public static class ArrayOperatorFactory {
 
 		private final @Nullable String fieldReference;
 		private final @Nullable AggregationExpression expression;
-		private final @Nullable Collection values;
+		private final @Nullable Collection<?> values;
 
 		/**
 		 * Creates new {@link ArrayOperatorFactory} for given {@literal fieldReference}.
@@ -86,7 +90,7 @@ public static class ArrayOperatorFactory {
 		 */
 		public ArrayOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			this.fieldReference = fieldReference;
 			this.expression = null;
 			this.values = null;
@@ -99,7 +103,7 @@ public ArrayOperatorFactory(String fieldReference) {
 		 */
 		public ArrayOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			this.fieldReference = null;
 			this.expression = expression;
 			this.values = null;
@@ -113,7 +117,7 @@ public ArrayOperatorFactory(AggregationExpression expression) {
 		 */
 		public ArrayOperatorFactory(Collection<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 			this.fieldReference = null;
 			this.expression = null;
 			this.values = values;
@@ -123,8 +127,8 @@ public ArrayOperatorFactory(Collection<?> values) {
 		 * Creates new {@link AggregationExpression} that takes the associated array and returns the element at the
 		 * specified array {@literal position}.
 		 *
-		 * @param position
-		 * @return
+		 * @param position the element index.
+		 * @return new instance of {@link ArrayElemAt}.
 		 */
 		public ArrayElemAt elementAt(int position) {
 			return createArrayElemAt().elementAt(position);
@@ -135,11 +139,11 @@ public ArrayElemAt elementAt(int position) {
 		 * resulting form the given {@literal expression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ArrayElemAt}.
 		 */
 		public ArrayElemAt elementAt(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createArrayElemAt().elementAt(expression);
 		}
 
@@ -148,14 +152,15 @@ public ArrayElemAt elementAt(AggregationExpression expression) {
 		 * defined by the referenced {@literal field}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ArrayElemAt}.
 		 */
 		public ArrayElemAt elementAt(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createArrayElemAt().elementAt(fieldReference);
 		}
 
+		@SuppressWarnings("NullAway")
 		private ArrayElemAt createArrayElemAt() {
 
 			if (usesFieldRef()) {
@@ -170,11 +175,11 @@ private ArrayElemAt createArrayElemAt() {
 		 * {@literal arrayFieldReference} to it.
 		 *
 		 * @param arrayFieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ConcatArrays}.
 		 */
 		public ConcatArrays concat(String arrayFieldReference) {
 
-			Assert.notNull(arrayFieldReference, "ArrayFieldReference must not be null!");
+			Assert.notNull(arrayFieldReference, "ArrayFieldReference must not be null");
 			return createConcatArrays().concat(arrayFieldReference);
 		}
 
@@ -183,14 +188,15 @@ public ConcatArrays concat(String arrayFieldReference) {
 		 * the given {@literal expression} to it.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ConcatArrays}.
 		 */
 		public ConcatArrays concat(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createConcatArrays().concat(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private ConcatArrays createConcatArrays() {
 
 			if (usesFieldRef()) {
@@ -204,26 +210,32 @@ private ConcatArrays createConcatArrays() {
 		 * Creates new {@link AggregationExpression} that takes the associated array and selects a subset of the array to
 		 * return based on the specified condition.
 		 *
-		 * @return
+		 * @return new instance of {@link AsBuilder} to create a {@link Filter}.
 		 */
+		@SuppressWarnings("NullAway")
 		public AsBuilder filter() {
 
 			if (usesFieldRef()) {
 				return Filter.filter(fieldReference);
 			}
 
-			Assert.state(values != null, "Values must not be null!");
+			if (usesExpression()) {
+				return Filter.filter(expression);
+			}
+
+			Assert.state(values != null, "Values must not be null");
 			return Filter.filter(new ArrayList<>(values));
 		}
 
 		/**
 		 * Creates new {@link AggregationExpression} that takes the associated array and an check if its an array.
 		 *
-		 * @return
+		 * @return new instance of {@link IsArray}.
 		 */
+		@SuppressWarnings("NullAway")
 		public IsArray isArray() {
 
-			Assert.state(values == null, "Does it make sense to call isArray on an array? Maybe just skip it?");
+			Assert.state(values == null, "Does it make sense to call isArray on an array; Maybe just skip it");
 
 			return usesFieldRef() ? IsArray.isArray(fieldReference) : IsArray.isArray(expression);
 		}
@@ -231,8 +243,9 @@ public IsArray isArray() {
 		/**
 		 * Creates new {@link AggregationExpression} that takes the associated array and retrieves its length.
 		 *
-		 * @return
+		 * @return new instance of {@link Size}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Size length() {
 
 			if (usesFieldRef()) {
@@ -245,8 +258,9 @@ public Size length() {
 		/**
 		 * Creates new {@link AggregationExpression} that takes the associated array and selects a subset from it.
 		 *
-		 * @return
+		 * @return new instance of {@link Slice}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Slice slice() {
 
 			if (usesFieldRef()) {
@@ -261,8 +275,9 @@ public Slice slice() {
 		 * value and returns the array index (zero-based) of the first occurrence.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfArray}.
 		 */
+		@SuppressWarnings("NullAway")
 		public IndexOfArray indexOf(Object value) {
 
 			if (usesFieldRef()) {
@@ -276,8 +291,9 @@ public IndexOfArray indexOf(Object value) {
 		/**
 		 * Creates new {@link AggregationExpression} that returns an array with the elements in reverse order.
 		 *
-		 * @return
+		 * @return new instance of {@link ReverseArray}.
 		 */
+		@SuppressWarnings("NullAway")
 		public ReverseArray reverse() {
 
 			if (usesFieldRef()) {
@@ -293,8 +309,9 @@ public ReverseArray reverse() {
 		 * an array and combines them into a single value.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ReduceInitialValueBuilder} to create {@link Reduce}.
 		 */
+		@SuppressWarnings("NullAway")
 		public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(AggregationExpression expression) {
 
 			return initialValue -> (usesFieldRef() ? Reduce.arrayOf(fieldReference)
@@ -305,23 +322,59 @@ public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(AggregationExpressi
 		 * Start creating new {@link AggregationExpression} that applies an {@link AggregationExpression} to each element in
 		 * an array and combines them into a single value.
 		 *
-		 * @param expressions
-		 * @return
+		 * @param expressions must not be {@literal null}.
+		 * @return new instance of {@link ReduceInitialValueBuilder} to create {@link Reduce}.
 		 */
+		@SuppressWarnings("NullAway")
 		public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(PropertyExpression... expressions) {
 
 			return initialValue -> (usesFieldRef() ? Reduce.arrayOf(fieldReference) : Reduce.arrayOf(expression))
 					.withInitialValue(initialValue).reduce(expressions);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated array and sorts it by the given {@link Sort
+		 * order}.
+		 *
+		 * @return new instance of {@link SortArray}.
+		 * @since 4.0
+		 */
+		@SuppressWarnings("NullAway")
+		public SortArray sort(Sort sort) {
+
+			if (usesFieldRef()) {
+				return SortArray.sortArrayOf(fieldReference).by(sort);
+			}
+
+			return (usesExpression() ? SortArray.sortArrayOf(expression) : SortArray.sortArray(values)).by(sort);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated array and sorts it by the given
+		 * {@link Direction order}.
+		 *
+		 * @return new instance of {@link SortArray}.
+		 * @since 4.5
+		 */
+		@SuppressWarnings("NullAway")
+		public SortArray sort(Direction direction) {
+
+			if (usesFieldRef()) {
+				return SortArray.sortArrayOf(fieldReference).direction(direction);
+			}
+
+			return (usesExpression() ? SortArray.sortArrayOf(expression) : SortArray.sortArray(values)).direction(direction);
+		}
+
 		/**
 		 * Creates new {@link AggregationExpression} that transposes an array of input arrays so that the first element of
 		 * the output array would be an array containing, the first element of the first input array, the first element of
 		 * the second input array, etc.
 		 *
 		 * @param arrays must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Zip}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Zip zipWith(Object... arrays) {
 
 			if (usesFieldRef()) {
@@ -336,8 +389,9 @@ public Zip zipWith(Object... arrays) {
 		 * associated array.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link In}.
 		 */
+		@SuppressWarnings("NullAway")
 		public In containsValue(Object value) {
 
 			if (usesFieldRef()) {
@@ -354,6 +408,7 @@ public In containsValue(Object value) {
 		 * @return new instance of {@link ArrayToObject}.
 		 * @since 2.1
 		 */
+		@SuppressWarnings("NullAway")
 		public ArrayToObject toObject() {
 
 			if (usesFieldRef()) {
@@ -363,6 +418,40 @@ public ArrayToObject toObject() {
 			return usesExpression() ? ArrayToObject.arrayValueOfToObject(expression) : ArrayToObject.arrayToObject(values);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that return the first element in the associated array.
+		 * <strong>NOTE:</strong> Requires MongoDB 4.4 or later.
+		 *
+		 * @return new instance of {@link First}.
+		 * @since 3.4
+		 */
+		@SuppressWarnings("NullAway")
+		public First first() {
+
+			if (usesFieldRef()) {
+				return First.firstOf(fieldReference);
+			}
+
+			return usesExpression() ? First.firstOf(expression) : First.first(values);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that return the last element in the given array. <strong>NOTE:</strong>
+		 * Requires MongoDB 4.4 or later.
+		 *
+		 * @return new instance of {@link Last}.
+		 * @since 3.4
+		 */
+		@SuppressWarnings("NullAway")
+		public Last last() {
+
+			if (usesFieldRef()) {
+				return Last.lastOf(fieldReference);
+			}
+
+			return usesExpression() ? Last.lastOf(expression) : Last.last(values);
+		}
+
 		/**
 		 * @author Christoph Strobl
 		 */
@@ -413,11 +502,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link ArrayElemAt}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ArrayElemAt}.
 		 */
 		public static ArrayElemAt arrayOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new ArrayElemAt(asFields(fieldReference));
 		}
 
@@ -425,11 +514,11 @@ public static ArrayElemAt arrayOf(String fieldReference) {
 		 * Creates new {@link ArrayElemAt}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ArrayElemAt}.
 		 */
 		public static ArrayElemAt arrayOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new ArrayElemAt(Collections.singletonList(expression));
 		}
 
@@ -442,23 +531,44 @@ public static ArrayElemAt arrayOf(AggregationExpression expression) {
 		 */
 		public static ArrayElemAt arrayOf(Collection<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 			return new ArrayElemAt(Collections.singletonList(values));
 		}
 
+		/**
+		 * Use the element with given index number.
+		 *
+		 * @param index the index number
+		 * @return new instance of {@link ArrayElemAt}.
+		 */
+		@Contract("_ -> new")
 		public ArrayElemAt elementAt(int index) {
 			return new ArrayElemAt(append(index));
 		}
 
+		/**
+		 * Use the element at the index number evaluated from the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ArrayElemAt}.
+		 */
+		@Contract("_ -> new")
 		public ArrayElemAt elementAt(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new ArrayElemAt(append(expression));
 		}
 
+		/**
+		 * Use the element at the index number taken from the given field.
+		 *
+		 * @param arrayFieldReference the field name.
+		 * @return new instance of {@link ArrayElemAt}.
+		 */
+		@Contract("_ -> new")
 		public ArrayElemAt elementAt(String arrayFieldReference) {
 
-			Assert.notNull(arrayFieldReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayFieldReference, "ArrayReference must not be null");
 			return new ArrayElemAt(append(Fields.field(arrayFieldReference)));
 		}
 	}
@@ -483,11 +593,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link ConcatArrays}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ConcatArrays}.
 		 */
 		public static ConcatArrays arrayOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new ConcatArrays(asFields(fieldReference));
 		}
 
@@ -495,11 +605,11 @@ public static ConcatArrays arrayOf(String fieldReference) {
 		 * Creates new {@link ConcatArrays}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ConcatArrays}.
 		 */
 		public static ConcatArrays arrayOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new ConcatArrays(Collections.singletonList(expression));
 		}
 
@@ -512,19 +622,33 @@ public static ConcatArrays arrayOf(AggregationExpression expression) {
 		 */
 		public static ConcatArrays arrayOf(Collection<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 			return new ConcatArrays(Collections.singletonList(values));
 		}
 
+		/**
+		 * Concat with the array stored at the given field.
+		 *
+		 * @param arrayFieldReference must not be {@literal null}.
+		 * @return new instance of {@link ConcatArrays}.
+		 */
+		@Contract("_ -> new")
 		public ConcatArrays concat(String arrayFieldReference) {
 
-			Assert.notNull(arrayFieldReference, "ArrayFieldReference must not be null!");
+			Assert.notNull(arrayFieldReference, "ArrayFieldReference must not be null");
 			return new ConcatArrays(append(Fields.field(arrayFieldReference)));
 		}
 
+		/**
+		 * Concat with the array resulting from the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ConcatArrays}.
+		 */
+		@Contract("_ -> new")
 		public ConcatArrays concat(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new ConcatArrays(append(expression));
 		}
 	}
@@ -554,7 +678,7 @@ private Filter() {
 		 */
 		public static AsBuilder filter(String field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 			return filter(Fields.field(field));
 		}
 
@@ -566,36 +690,47 @@ public static AsBuilder filter(String field) {
 		 */
 		public static AsBuilder filter(Field field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 			return new FilterExpressionBuilder().filter(field);
 		}
 
+		/**
+		 * Set the {@link AggregationExpression} resolving to an array to apply the {@code $filter} to.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return never {@literal null}.
+		 * @since 4.2
+		 */
+		public static AsBuilder filter(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Field must not be null");
+			return new FilterExpressionBuilder().filter(expression);
+		}
+
 		/**
 		 * Set the {@literal values} to apply the {@code $filter} to.
 		 *
 		 * @param values must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link AsBuilder} to create the {@link Filter}.
 		 */
 		public static AsBuilder filter(List<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 			return new FilterExpressionBuilder().filter(values);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(final AggregationOperationContext context) {
+
+			Assert.notNull(as, "As must be set first");
 			return toFilter(ExposedFields.from(as), context);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Document toFilter(ExposedFields exposedFields, AggregationOperationContext context) {
 
 			Document filterExpression = new Document();
-			InheritingExposedFieldsAggregationOperationContext operationContext = new InheritingExposedFieldsAggregationOperationContext(
-					exposedFields, context);
+			AggregationOperationContext operationContext = context.inheritAndExpose(exposedFields);
 
 			filterExpression.putAll(context.getMappedObject(new Document("input", getMappedInput(context))));
 			filterExpression.put("as", as.getTarget());
@@ -605,19 +740,28 @@ private Document toFilter(ExposedFields exposedFields, AggregationOperationConte
 			return new Document("$filter", filterExpression);
 		}
 
-		private Object getMappedInput(AggregationOperationContext context) {
-			return input instanceof Field ? context.getReference((Field) input).toString() : input;
+		private @Nullable Object getMappedInput(AggregationOperationContext context) {
+
+			if (input instanceof Field field) {
+				return context.getReference(field).toString();
+			}
+
+			if (input instanceof AggregationExpression expression) {
+				return expression.toDocument(context);
+			}
+
+			return input;
 		}
 
-		private Object getMappedCondition(AggregationOperationContext context) {
+		private @Nullable Object getMappedCondition(AggregationOperationContext context) {
 
-			if (!(condition instanceof AggregationExpression)) {
+			if (!(condition instanceof AggregationExpression aggregationExpression)) {
 				return condition;
 			}
 
 			NestedDelegatingExpressionAggregationOperationContext nea = new NestedDelegatingExpressionAggregationOperationContext(
 					context, Collections.singleton(as));
-			return ((AggregationExpression) condition).toDocument(nea);
+			return aggregationExpression.toDocument(nea);
 		}
 
 		/**
@@ -640,6 +784,15 @@ public interface InputBuilder {
 			 * @return
 			 */
 			AsBuilder filter(Field field);
+
+			/**
+			 * Set the {@link AggregationExpression} resolving to an array to apply the {@code $filter} to.
+			 *
+			 * @param expression must not be {@literal null}.
+			 * @return
+			 * @since 4.1.1
+			 */
+			AsBuilder filter(AggregationExpression expression);
 		}
 
 		/**
@@ -651,7 +804,7 @@ public interface AsBuilder {
 			 * Set the {@literal variableName} for the elements in the input array.
 			 *
 			 * @param variableName must not be {@literal null}.
-			 * @return
+			 * @return never {@literal null}.
 			 */
 			ConditionBuilder as(String variableName);
 		}
@@ -665,7 +818,7 @@ public interface ConditionBuilder {
 			 * Set the {@link AggregationExpression} that determines whether to include the element in the resulting array.
 			 *
 			 * @param expression must not be {@literal null}.
-			 * @return
+			 * @return never {@literal null}.
 			 */
 			Filter by(AggregationExpression expression);
 
@@ -673,7 +826,7 @@ public interface ConditionBuilder {
 			 * Set the {@literal expression} that determines whether to include the element in the resulting array.
 			 *
 			 * @param expression must not be {@literal null}.
-			 * @return
+			 * @return never {@literal null}.
 			 */
 			Filter by(String expression);
 
@@ -681,7 +834,7 @@ public interface ConditionBuilder {
 			 * Set the {@literal expression} that determines whether to include the element in the resulting array.
 			 *
 			 * @param expression must not be {@literal null}.
-			 * @return
+			 * @return never {@literal null}.
 			 */
 			Filter by(Document expression);
 		}
@@ -700,80 +853,68 @@ static final class FilterExpressionBuilder implements InputBuilder, AsBuilder, C
 			/**
 			 * Creates new {@link InputBuilder}.
 			 *
-			 * @return
+			 * @return new instance of {@link FilterExpressionBuilder}.
 			 */
 			public static InputBuilder newBuilder() {
 				return new FilterExpressionBuilder();
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.InputBuilder#filter(java.util.List)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public AsBuilder filter(List<?> array) {
 
-				Assert.notNull(array, "Array must not be null!");
-				filter.input = new ArrayList<Object>(array);
+				Assert.notNull(array, "Array must not be null");
+				filter.input = new ArrayList<>(array);
 				return this;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.InputBuilder#filter(org.springframework.data.mongodb.core.aggregation.Field)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public AsBuilder filter(Field field) {
 
-				Assert.notNull(field, "Field must not be null!");
+				Assert.notNull(field, "Field must not be null");
 				filter.input = field;
 				return this;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.AsBuilder#as(java.lang.String)
-			 */
 			@Override
+			@Contract("_ -> this")
+			public AsBuilder filter(AggregationExpression expression) {
+
+				Assert.notNull(expression, "Expression must not be null");
+				filter.input = expression;
+				return this;
+			}
+
+			@Override
+			@Contract("_ -> this")
 			public ConditionBuilder as(String variableName) {
 
-				Assert.notNull(variableName, "Variable name  must not be null!");
+				Assert.notNull(variableName, "Variable name  must not be null");
 				filter.as = new ExposedField(variableName, true);
 				return this;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
 			@Override
 			public Filter by(AggregationExpression condition) {
 
-				Assert.notNull(condition, "Condition must not be null!");
+				Assert.notNull(condition, "Condition must not be null");
 				filter.condition = condition;
 				return filter;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(java.lang.String)
-			 */
 			@Override
 			public Filter by(String expression) {
 
-				Assert.notNull(expression, "Expression must not be null!");
+				Assert.notNull(expression, "Expression must not be null");
 				filter.condition = expression;
 				return filter;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ArrayOperators.Filter.ConditionBuilder#by(org.bson.Document)
-			 */
 			@Override
 			public Filter by(Document expression) {
 
-				Assert.notNull(expression, "Expression must not be null!");
+				Assert.notNull(expression, "Expression must not be null");
 				filter.condition = expression;
 				return filter;
 			}
@@ -800,11 +941,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link IsArray}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsArray}.
 		 */
 		public static IsArray isArray(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new IsArray(Fields.field(fieldReference));
 		}
 
@@ -812,11 +953,11 @@ public static IsArray isArray(String fieldReference) {
 		 * Creates new {@link IsArray}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsArray}.
 		 */
 		public static IsArray isArray(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new IsArray(expression);
 		}
 	}
@@ -841,11 +982,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Size}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Size}.
 		 */
 		public static Size lengthOfArray(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Size(Fields.field(fieldReference));
 		}
 
@@ -853,11 +994,11 @@ public static Size lengthOfArray(String fieldReference) {
 		 * Creates new {@link Size}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Size}.
 		 */
 		public static Size lengthOfArray(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Size(expression);
 		}
 
@@ -870,7 +1011,7 @@ public static Size lengthOfArray(AggregationExpression expression) {
 		 */
 		public static Size lengthOfArray(Collection<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 			return new Size(Collections.singletonList(values));
 		}
 	}
@@ -895,11 +1036,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Slice}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Slice}.
 		 */
 		public static Slice sliceArrayOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Slice(asFields(fieldReference));
 		}
 
@@ -907,11 +1048,11 @@ public static Slice sliceArrayOf(String fieldReference) {
 		 * Creates new {@link Slice}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Slice}.
 		 */
 		public static Slice sliceArrayOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Slice(Collections.singletonList(expression));
 		}
 
@@ -924,37 +1065,86 @@ public static Slice sliceArrayOf(AggregationExpression expression) {
 		 */
 		public static Slice sliceArrayOf(Collection<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 			return new Slice(Collections.singletonList(values));
 		}
 
-		public Slice itemCount(int nrElements) {
-			return new Slice(append(nrElements));
+		/**
+		 * Slice the number of elements.
+		 *
+		 * @param count number of elements to slice.
+		 * @return new instance of {@link Slice}.
+		 */
+		@Contract("_ -> new")
+		public Slice itemCount(int count) {
+			return new Slice(append(count));
 		}
 
-		public SliceElementsBuilder offset(final int position) {
+		/**
+		 * Slice the number of elements.
+		 *
+		 * @param count an {@link AggregationExpression} that evaluates to a numeric value used as number of elements to
+		 *          slice.
+		 * @return new instance of {@link Slice}.
+		 * @since 4.5
+		 */
+		@Contract("_ -> new")
+		public Slice itemCount(AggregationExpression count) {
+			return new Slice(append(count));
+		}
 
-			return new SliceElementsBuilder() {
+		/**
+		 * Slice using offset and count.
+		 *
+		 * @param position the start position
+		 * @return new instance of {@link SliceElementsBuilder} to create {@link Slice}.
+		 */
+		public SliceElementsBuilder offset(int position) {
+			return new SliceElementsBuilder(position);
+		}
 
-				@Override
-				public Slice itemCount(int nrElements) {
-					return new Slice(append(position)).itemCount(nrElements);
-				}
-			};
+		/**
+		 * Slice using offset and count.
+		 *
+		 * @param position the start position
+		 * @return new instance of {@link SliceElementsBuilder} to create {@link Slice}.
+		 */
+		public SliceElementsBuilder offset(AggregationExpression position) {
+			return new SliceElementsBuilder(position);
 		}
 
 		/**
 		 * @author Christoph Strobl
 		 */
-		public interface SliceElementsBuilder {
+		public class SliceElementsBuilder {
+
+			private final Object position;
+
+			SliceElementsBuilder(Object position) {
+				this.position = position;
+			}
 
 			/**
-			 * Set the number of elements given {@literal nrElements}.
+			 * Set the number of elements given {@literal count}.
 			 *
-			 * @param nrElements
-			 * @return
+			 * @param count number of elements to slice.
+			 * @return new instance of {@link Slice}.
 			 */
-			Slice itemCount(int nrElements);
+			public Slice itemCount(int count) {
+				return new Slice(append(position)).itemCount(count);
+			}
+
+			/**
+			 * Slice the number of elements.
+			 *
+			 * @param count an {@link AggregationExpression} that evaluates to a numeric value used as number of elements to
+			 *          slice.
+			 * @return new instance of {@link Slice}.
+			 * @since 4.5
+			 */
+			public Slice itemCount(AggregationExpression count) {
+				return new Slice(append(position)).itemCount(count);
+			}
 		}
 	}
 
@@ -978,11 +1168,11 @@ protected String getMongoMethod() {
 		 * Start creating new {@link IndexOfArray}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfArray}.
 		 */
 		public static IndexOfArrayBuilder arrayOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new IndexOfArrayBuilder(Fields.field(fieldReference));
 		}
 
@@ -990,11 +1180,11 @@ public static IndexOfArrayBuilder arrayOf(String fieldReference) {
 		 * Start creating new {@link IndexOfArray}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfArray}.
 		 */
 		public static IndexOfArrayBuilder arrayOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new IndexOfArrayBuilder(expression);
 		}
 
@@ -1002,15 +1192,22 @@ public static IndexOfArrayBuilder arrayOf(AggregationExpression expression) {
 		 * Start creating new {@link IndexOfArray}.
 		 *
 		 * @param values must not be {@literal null}.
-		 * @return new instance of {@link IndexOfArray}.
+		 * @return new instance of {@link IndexOfArrayBuilder} to create {@link IndexOfArray}.
 		 * @since 2.2
 		 */
 		public static IndexOfArrayBuilder arrayOf(Collection<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 			return new IndexOfArrayBuilder(values);
 		}
 
+		/**
+		 * Lookup within a given range.
+		 *
+		 * @param range the lookup range.
+		 * @return new instance of {@link IndexOfArray}.
+		 */
+		@Contract("_ -> new")
 		public IndexOfArray within(Range<Long> range) {
 			return new IndexOfArray(append(AggregationUtils.toRangeValues(range)));
 		}
@@ -1030,11 +1227,11 @@ private IndexOfArrayBuilder(Object targetArray) {
 			 * Set the {@literal value} to check for its index in the array.
 			 *
 			 * @param value must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IndexOfArray}.
 			 */
 			public IndexOfArray indexOf(Object value) {
 
-				Assert.notNull(value, "Value must not be null!");
+				Assert.notNull(value, "Value must not be null");
 				return new IndexOfArray(Arrays.asList(targetArray, value));
 			}
 		}
@@ -1060,7 +1257,7 @@ protected String getMongoMethod() {
 		 * Start creating new {@link RangeOperator}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link RangeOperatorBuilder} to create {@link RangeOperator}.
 		 */
 		public static RangeOperatorBuilder rangeStartingAt(String fieldReference) {
 			return new RangeOperatorBuilder(Fields.field(fieldReference));
@@ -1070,7 +1267,7 @@ public static RangeOperatorBuilder rangeStartingAt(String fieldReference) {
 		 * Start creating new {@link RangeOperator}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link RangeOperatorBuilder} to create {@link RangeOperator}.
 		 */
 		public static RangeOperatorBuilder rangeStartingAt(AggregationExpression expression) {
 			return new RangeOperatorBuilder(expression);
@@ -1080,12 +1277,13 @@ public static RangeOperatorBuilder rangeStartingAt(AggregationExpression express
 		 * Start creating new {@link RangeOperator}.
 		 *
 		 * @param value
-		 * @return
+		 * @return new instance of {@link RangeOperator}.
 		 */
 		public static RangeOperatorBuilder rangeStartingAt(long value) {
 			return new RangeOperatorBuilder(value);
 		}
 
+		@Contract("_ -> new")
 		public RangeOperator withStepSize(long stepSize) {
 			return new RangeOperator(append(stepSize));
 		}
@@ -1102,7 +1300,7 @@ private RangeOperatorBuilder(Object startPoint) {
 			 * Creates new {@link RangeOperator}.
 			 *
 			 * @param index
-			 * @return
+			 * @return new instance of {@link RangeOperator}.
 			 */
 			public RangeOperator to(long index) {
 				return new RangeOperator(Arrays.asList(startPoint, index));
@@ -1112,7 +1310,7 @@ public RangeOperator to(long index) {
 			 * Creates new {@link RangeOperator}.
 			 *
 			 * @param expression must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link RangeOperator}.
 			 */
 			public RangeOperator to(AggregationExpression expression) {
 				return new RangeOperator(Arrays.asList(startPoint, expression));
@@ -1122,7 +1320,7 @@ public RangeOperator to(AggregationExpression expression) {
 			 * Creates new {@link RangeOperator}.
 			 *
 			 * @param fieldReference must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link RangeOperator}.
 			 */
 			public RangeOperator to(String fieldReference) {
 				return new RangeOperator(Arrays.asList(startPoint, Fields.field(fieldReference)));
@@ -1150,7 +1348,7 @@ protected String getMongoMethod() {
 		 * Creates new {@link ReverseArray} given {@literal fieldReference}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ReverseArray}.
 		 */
 		public static ReverseArray reverseArrayOf(String fieldReference) {
 			return new ReverseArray(Fields.field(fieldReference));
@@ -1160,7 +1358,7 @@ public static ReverseArray reverseArrayOf(String fieldReference) {
 		 * Creates new {@link ReverseArray} given {@link AggregationExpression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ReverseArray}.
 		 */
 		public static ReverseArray reverseArrayOf(AggregationExpression expression) {
 			return new ReverseArray(expression);
@@ -1196,9 +1394,6 @@ private Reduce(Object input, Object initialValue, List<AggregationExpression> re
 			this.reduceExpressions = reduceExpressions;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -1221,15 +1416,16 @@ public Document toDocument(AggregationOperationContext context) {
 			return new Document("$reduce", document);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Object getMappedValue(Object value, AggregationOperationContext context) {
 
 			if (value instanceof Document) {
 				return value;
 			}
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
-			} else if (value instanceof Field) {
-				return context.getReference(((Field) value)).toString();
+			if (value instanceof AggregationExpression aggregationExpression) {
+				return aggregationExpression.toDocument(context);
+			} else if (value instanceof Field field) {
+				return context.getReference(field).toString();
 			} else {
 				return context.getMappedObject(new Document("###val###", value)).get("###val###");
 			}
@@ -1239,7 +1435,7 @@ private Object getMappedValue(Object value, AggregationOperationContext context)
 		 * Start creating new {@link Reduce}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link InitialValueBuilder} to create {@link Reduce}.
 		 */
 		public static InitialValueBuilder arrayOf(final String fieldReference) {
 
@@ -1278,7 +1474,7 @@ public Reduce reduce(PropertyExpression... expressions) {
 		 * Start creating new {@link Reduce}.
 		 *
 		 * @param arrayValueExpression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link InitialValueBuilder} to create {@link Reduce}.
 		 */
 		public static InitialValueBuilder arrayOf(final AggregationExpression arrayValueExpression) {
 
@@ -1318,7 +1514,7 @@ public interface InitialValueBuilder {
 			 * Define the initial cumulative value set before in is applied to the first element of the input array.
 			 *
 			 * @param initialValue must not be {@literal null}.
-			 * @return
+			 * @return never {@literal null}.
 			 */
 			ReduceBuilder withInitialValue(Object initialValue);
 		}
@@ -1335,7 +1531,7 @@ public interface ReduceBuilder {
 			 * {@link Variable#VALUE} are available.
 			 *
 			 * @param expression must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link Reduce}.
 			 */
 			Reduce reduce(AggregationExpression expression);
 
@@ -1346,7 +1542,7 @@ public interface ReduceBuilder {
 			 * {@link Variable#VALUE} are available.
 			 *
 			 * @param expressions must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link Reduce}.
 			 */
 			Reduce reduce(PropertyExpression... expressions);
 		}
@@ -1361,8 +1557,8 @@ public static class PropertyExpression implements AggregationExpression {
 
 			protected PropertyExpression(String propertyName, AggregationExpression aggregationExpression) {
 
-				Assert.notNull(propertyName, "Property name must not be null!");
-				Assert.notNull(aggregationExpression, "AggregationExpression must not be null!");
+				Assert.notNull(propertyName, "Property name must not be null");
+				Assert.notNull(aggregationExpression, "AggregationExpression must not be null");
 
 				this.propertyName = propertyName;
 				this.aggregationExpression = aggregationExpression;
@@ -1372,7 +1568,7 @@ protected PropertyExpression(String propertyName, AggregationExpression aggregat
 			 * Define a result property for an {@link AggregationExpression} used in {@link Reduce}.
 			 *
 			 * @param name must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link AsBuilder} to create {@link Reduce}.
 			 */
 			public static AsBuilder property(final String name) {
 
@@ -1385,9 +1581,6 @@ public PropertyExpression definedAs(AggregationExpression expression) {
 				};
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(propertyName, aggregationExpression.toDocument(context));
@@ -1402,30 +1595,21 @@ public interface AsBuilder {
 				 * Set the {@link AggregationExpression} resulting in the properties value.
 				 *
 				 * @param expression must not be {@literal null}.
-				 * @return
+				 * @return never {@literal null}.
 				 */
 				PropertyExpression definedAs(AggregationExpression expression);
 			}
 		}
 
-		public enum Variable implements Field {
+		public enum Variable implements AggregationVariable {
 
 			THIS {
-				@Override
-				public String getName() {
-					return "$$this";
-				}
 
 				@Override
 				public String getTarget() {
 					return "$$this";
 				}
 
-				@Override
-				public boolean isAliased() {
-					return false;
-				}
-
 				@Override
 				public String toString() {
 					return getName();
@@ -1433,33 +1617,29 @@ public String toString() {
 			},
 
 			VALUE {
-				@Override
-				public String getName() {
-					return "$$value";
-				}
 
 				@Override
 				public String getTarget() {
 					return "$$value";
 				}
 
-				@Override
-				public boolean isAliased() {
-					return false;
-				}
-
 				@Override
 				public String toString() {
 					return getName();
 				}
 			};
 
+			@Override
+			public boolean isInternal() {
+				return true;
+			}
+
 			/**
 			 * Create a {@link Field} reference to a given {@literal property} prefixed with the {@link Variable} identifier.
 			 * eg. {@code $$value.product}
 			 *
 			 * @param property must not be {@literal null}.
-			 * @return
+			 * @return never {@literal null}.
 			 */
 			public Field referringTo(final String property) {
 
@@ -1485,6 +1665,16 @@ public String toString() {
 					}
 				};
 			}
+
+			public static boolean isVariable(Field field) {
+
+				for (Variable var : values()) {
+					if (field.getTarget().startsWith(var.getTarget())) {
+						return true;
+					}
+				}
+				return false;
+			}
 		}
 	}
 
@@ -1508,11 +1698,11 @@ protected String getMongoMethod() {
 		 * Start creating new {@link Zip}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ZipBuilder} to create {@link Zip}.
 		 */
 		public static ZipBuilder arrayOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new ZipBuilder(Fields.field(fieldReference));
 		}
 
@@ -1520,11 +1710,11 @@ public static ZipBuilder arrayOf(String fieldReference) {
 		 * Start creating new {@link Zip}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ZipBuilder} to create {@link Zip}.
 		 */
 		public static ZipBuilder arrayOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new ZipBuilder(expression);
 		}
 
@@ -1537,15 +1727,16 @@ public static ZipBuilder arrayOf(AggregationExpression expression) {
 		 */
 		public static ZipBuilder arrayOf(Collection<?> values) {
 
-			Assert.notNull(values, "Expression must not be null!");
+			Assert.notNull(values, "Expression must not be null");
 			return new ZipBuilder(values);
 		}
 
 		/**
 		 * Create new {@link Zip} and set the {@code useLongestLength} property to {@literal true}.
 		 *
-		 * @return
+		 * @return new instance of {@link Zip}.
 		 */
+		@Contract("-> new")
 		public Zip useLongestLength() {
 			return new Zip(append("useLongestLength", true));
 		}
@@ -1554,11 +1745,12 @@ public Zip useLongestLength() {
 		 * Optionally provide a default value.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Zip}.
 		 */
+		@Contract("_ -> new")
 		public Zip defaultTo(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Zip(append("defaults", Fields.field(fieldReference)));
 		}
 
@@ -1566,11 +1758,12 @@ public Zip defaultTo(String fieldReference) {
 		 * Optionally provide a default value.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Zip}.
 		 */
+		@Contract("_ -> new")
 		public Zip defaultTo(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Zip(append("defaults", expression));
 		}
 
@@ -1578,11 +1771,12 @@ public Zip defaultTo(AggregationExpression expression) {
 		 * Optionally provide a default value.
 		 *
 		 * @param array must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Zip}.
 		 */
+		@Contract("_ -> new")
 		public Zip defaultTo(Object[] array) {
 
-			Assert.notNull(array, "Array must not be null!");
+			Assert.notNull(array, "Array must not be null");
 			return new Zip(append("defaults", Arrays.asList(array)));
 		}
 
@@ -1592,7 +1786,7 @@ public static class ZipBuilder {
 
 			private ZipBuilder(Object sourceArray) {
 
-				this.sourceArrays = new ArrayList<Object>();
+				this.sourceArrays = new ArrayList<>();
 				this.sourceArrays.add(sourceArray);
 			}
 
@@ -1602,21 +1796,21 @@ private ZipBuilder(Object sourceArray) {
 			 * array, etc.
 			 *
 			 * @param arrays arrays to zip the referenced one with. must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link Zip}.
 			 */
 			public Zip zip(Object... arrays) {
 
-				Assert.notNull(arrays, "Arrays must not be null!");
+				Assert.notNull(arrays, "Arrays must not be null");
 				for (Object value : arrays) {
 
-					if (value instanceof String) {
-						sourceArrays.add(Fields.field((String) value));
+					if (value instanceof String stringValue) {
+						sourceArrays.add(Fields.field(stringValue));
 					} else {
 						sourceArrays.add(value);
 					}
 				}
 
-				return new Zip(Collections.<String, Object> singletonMap("inputs", sourceArrays));
+				return new Zip(Collections.singletonMap("inputs", sourceArrays));
 			}
 		}
 	}
@@ -1645,15 +1839,15 @@ protected String getMongoMethod() {
 		 * Start creating {@link In}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link InBuilder} to create {@link In}.
 		 */
 		public static InBuilder arrayOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 
 			return value -> {
 
-				Assert.notNull(value, "Value must not be null!");
+				Assert.notNull(value, "Value must not be null");
 				return new In(Arrays.asList(value, Fields.field(fieldReference)));
 			};
 		}
@@ -1662,15 +1856,15 @@ public static InBuilder arrayOf(String fieldReference) {
 		 * Start creating {@link In}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link InBuilder} to create {@link In}.
 		 */
 		public static InBuilder arrayOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 
 			return value -> {
 
-				Assert.notNull(value, "Value must not be null!");
+				Assert.notNull(value, "Value must not be null");
 
 				return new In(Arrays.asList(value, expression));
 			};
@@ -1685,11 +1879,11 @@ public static InBuilder arrayOf(AggregationExpression expression) {
 		 */
 		public static InBuilder arrayOf(Collection<?> values) {
 
-			Assert.notNull(values, "Values must not be null!");
+			Assert.notNull(values, "Values must not be null");
 
 			return value -> {
 
-				Assert.notNull(value, "Value must not be null!");
+				Assert.notNull(value, "Value must not be null");
 
 				return new In(Arrays.asList(value, values));
 			};
@@ -1704,7 +1898,7 @@ public interface InBuilder {
 			 * Set the {@literal value} to check for existence in the array.
 			 *
 			 * @param value must not be {@literal value}.
-			 * @return
+			 * @return new instance of {@link In}.
 			 */
 			In containsValue(Object value);
 		}
@@ -1755,13 +1949,201 @@ public static ArrayToObject arrayValueOfToObject(AggregationExpression expressio
 			return new ArrayToObject(expression);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod()
-		 */
 		@Override
 		protected String getMongoMethod() {
 			return "$arrayToObject";
 		}
 	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $first} that returns the first element in an array. <br />
+	 * <strong>NOTE:</strong> Requires MongoDB 4.4 or later.
+	 *
+	 * @author Divya Srivastava
+	 * @author Christoph Strobl
+	 * @since 3.4
+	 */
+	public static class First extends AbstractAggregationExpression {
+
+		private First(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Returns the first element in the given array.
+		 *
+		 * @param array must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		public static First first(Object array) {
+			return new First(array);
+		}
+
+		/**
+		 * Returns the first element in the array pointed to by the given {@link Field field reference}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		public static First firstOf(String fieldReference) {
+			return new First(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Returns the first element of the array computed by the given {@link AggregationExpression expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		public static First firstOf(AggregationExpression expression) {
+			return new First(expression);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$first";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $last} that returns the last element in an array. <br />
+	 * <strong>NOTE:</strong> Requires MongoDB 4.4 or later.
+	 *
+	 * @author Divya Srivastava
+	 * @author Christoph Strobl
+	 * @since 3.4
+	 */
+	public static class Last extends AbstractAggregationExpression {
+
+		private Last(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Returns the last element in the given array.
+		 *
+		 * @param array must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		public static Last last(Object array) {
+			return new Last(array);
+		}
+
+		/**
+		 * Returns the last element in the array pointed to by the given {@link Field field reference}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		public static Last lastOf(String fieldReference) {
+			return new Last(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Returns the last element of the array computed buy the given {@link AggregationExpression expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		public static Last lastOf(AggregationExpression expression) {
+			return new Last(expression);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$last";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $sortArray} that sorts elements in an array. <br />
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class SortArray extends AbstractAggregationExpression {
+
+		private SortArray(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Returns the given array.
+		 *
+		 * @param array must not be {@literal null}.
+		 * @return new instance of {@link SortArray}.
+		 */
+		public static SortArray sortArray(Object array) {
+			return new SortArray(Collections.singletonMap("input", array));
+		}
+
+		/**
+		 * Sorts the elements in the array pointed to by the given {@link Field field reference}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link SortArray}.
+		 */
+		public static SortArray sortArrayOf(String fieldReference) {
+			return sortArray(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Sorts the elements of the array computed buy the given {@link AggregationExpression expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link SortArray}.
+		 */
+		public static SortArray sortArrayOf(AggregationExpression expression) {
+			return sortArray(expression);
+		}
+
+		/**
+		 * Set the order to put elements in.
+		 *
+		 * @param sort must not be {@literal null}.
+		 * @return new instance of {@link SortArray}.
+		 */
+		@Contract("_ -> new")
+		public SortArray by(Sort sort) {
+			return new SortArray(append("sortBy", sort));
+		}
+
+		/**
+		 * Order the values for the array in the given direction.
+		 *
+		 * @param direction must not be {@literal null}.
+		 * @return new instance of {@link SortArray}.
+		 * @since 4.5
+		 */
+		public SortArray direction(Direction direction) {
+			return new SortArray(append("sortBy", direction.isAscending() ? 1 : -1));
+		}
+
+		/**
+		 * Sort the array elements by their values in ascending order. Suitable for arrays of simple types (e.g., integers,
+		 * strings).
+		 *
+		 * @return new instance of {@link SortArray}.
+		 * @since 4.5
+		 */
+		public SortArray byValueAscending() {
+			return direction(Direction.ASC);
+		}
+
+		/**
+		 * Sort the array elements by their values in descending order. Suitable for arrays of simple types (e.g., integers,
+		 * strings).
+		 *
+		 * @return new instance of {@link SortArray}.
+		 * @since 4.5
+		 */
+		public SortArray byValueDescending() {
+			return direction(Direction.DESC);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$sortArray";
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BasicAggregationOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BasicAggregationOperation.java
new file mode 100644
index 0000000000..4d321c4715
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BasicAggregationOperation.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * {@link AggregationOperation} implementation that can return a {@link Document} from a {@link Bson} or {@link String}
+ * document.
+ *
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+record BasicAggregationOperation(Object value) implements AggregationOperation {
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+
+		if (value instanceof Bson bson) {
+			return BsonUtils.asDocument(bson, context.getCodecRegistry());
+		}
+
+		if (value instanceof String json && BsonUtils.isJsonDocument(json)) {
+			return BsonUtils.parse(json, context);
+		}
+
+		throw new IllegalStateException(
+				String.format("%s cannot be converted to org.bson.Document", ObjectUtils.nullSafeClassName(value)));
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BooleanOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BooleanOperators.java
index ff1b0e8e4e..f3ffdb7ad1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BooleanOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BooleanOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author 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,6 +19,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -34,7 +36,7 @@ public class BooleanOperators {
 	 * Take the array referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link BooleanOperatorFactory}.
 	 */
 	public static BooleanOperatorFactory valueOf(String fieldReference) {
 		return new BooleanOperatorFactory(fieldReference);
@@ -44,7 +46,7 @@ public static BooleanOperatorFactory valueOf(String fieldReference) {
 	 * Take the value resulting of the given {@link AggregationExpression}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link BooleanOperatorFactory}.
 	 */
 	public static BooleanOperatorFactory valueOf(AggregationExpression fieldReference) {
 		return new BooleanOperatorFactory(fieldReference);
@@ -55,7 +57,7 @@ public static BooleanOperatorFactory valueOf(AggregationExpression fieldReferenc
 	 * opposite boolean value.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Not}.
 	 */
 	public static Not not(String fieldReference) {
 		return Not.not(fieldReference);
@@ -66,7 +68,7 @@ public static Not not(String fieldReference) {
 	 * and returns the opposite boolean value.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Not}.
 	 */
 	public static Not not(AggregationExpression expression) {
 		return Not.not(expression);
@@ -77,8 +79,8 @@ public static Not not(AggregationExpression expression) {
 	 */
 	public static class BooleanOperatorFactory {
 
-		private final String fieldReference;
-		private final AggregationExpression expression;
+		private final @Nullable String fieldReference;
+		private final @Nullable AggregationExpression expression;
 
 		/**
 		 * Creates new {@link BooleanOperatorFactory} for given {@literal fieldReference}.
@@ -87,7 +89,7 @@ public static class BooleanOperatorFactory {
 		 */
 		public BooleanOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			this.fieldReference = fieldReference;
 			this.expression = null;
 		}
@@ -99,7 +101,7 @@ public BooleanOperatorFactory(String fieldReference) {
 		 */
 		public BooleanOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			this.fieldReference = null;
 			this.expression = expression;
 		}
@@ -109,11 +111,11 @@ public BooleanOperatorFactory(AggregationExpression expression) {
 		 * all of the expressions are {@literal true}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link And}.
 		 */
 		public And and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createAnd().andExpression(expression);
 		}
 
@@ -122,14 +124,15 @@ public And and(AggregationExpression expression) {
 		 * all of the expressions are {@literal true}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link And}.
 		 */
 		public And and(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createAnd().andField(fieldReference);
 		}
 
+		@SuppressWarnings("NullAway")
 		private And createAnd() {
 			return usesFieldRef() ? And.and(Fields.field(fieldReference)) : And.and(expression);
 		}
@@ -139,11 +142,11 @@ private And createAnd() {
 		 * any of the expressions are {@literal true}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Or}.
 		 */
 		public Or or(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createOr().orExpression(expression);
 		}
 
@@ -152,14 +155,15 @@ public Or or(AggregationExpression expression) {
 		 * any of the expressions are {@literal true}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Or}.
 		 */
 		public Or or(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createOr().orField(fieldReference);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Or createOr() {
 			return usesFieldRef() ? Or.or(Fields.field(fieldReference)) : Or.or(expression);
 		}
@@ -167,8 +171,9 @@ private Or createOr() {
 		/**
 		 * Creates new {@link AggregationExpression} that evaluates a boolean and returns the opposite boolean value.
 		 *
-		 * @return
+		 * @return new instance of {@link Not}.
 		 */
+		@SuppressWarnings("NullAway")
 		public Not not() {
 			return usesFieldRef() ? Not.not(fieldReference) : Not.not(expression);
 		}
@@ -198,8 +203,8 @@ protected String getMongoMethod() {
 		 * Creates new {@link And} that evaluates one or more expressions and returns {@literal true} if all of the
 		 * expressions are {@literal true}.
 		 *
-		 * @param expressions
-		 * @return
+		 * @param expressions must not be {@literal null}.
+		 * @return new instance of {@link And}.
 		 */
 		public static And and(Object... expressions) {
 			return new And(Arrays.asList(expressions));
@@ -209,11 +214,12 @@ public static And and(Object... expressions) {
 		 * Creates new {@link And} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link And}.
 		 */
+		@Contract("_ -> new")
 		public And andExpression(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new And(append(expression));
 		}
 
@@ -221,11 +227,12 @@ public And andExpression(AggregationExpression expression) {
 		 * Creates new {@link And} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link And}.
 		 */
+		@Contract("_ -> new")
 		public And andField(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new And(append(Fields.field(fieldReference)));
 		}
 
@@ -233,11 +240,12 @@ public And andField(String fieldReference) {
 		 * Creates new {@link And} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link And}.
 		 */
+		@Contract("_ -> new")
 		public And andValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new And(append(value));
 		}
 	}
@@ -263,11 +271,11 @@ protected String getMongoMethod() {
 		 * expressions are {@literal true}.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Or}.
 		 */
 		public static Or or(Object... expressions) {
 
-			Assert.notNull(expressions, "Expressions must not be null!");
+			Assert.notNull(expressions, "Expressions must not be null");
 			return new Or(Arrays.asList(expressions));
 		}
 
@@ -275,11 +283,12 @@ public static Or or(Object... expressions) {
 		 * Creates new {@link Or} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Or}.
 		 */
+		@Contract("_ -> new")
 		public Or orExpression(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Or(append(expression));
 		}
 
@@ -287,11 +296,12 @@ public Or orExpression(AggregationExpression expression) {
 		 * Creates new {@link Or} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Or}.
 		 */
+		@Contract("_ -> new")
 		public Or orField(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Or(append(Fields.field(fieldReference)));
 		}
 
@@ -299,11 +309,12 @@ public Or orField(String fieldReference) {
 		 * Creates new {@link Or} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Or}.
 		 */
+		@Contract("_ -> new")
 		public Or orValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Or(append(value));
 		}
 	}
@@ -329,11 +340,11 @@ protected String getMongoMethod() {
 		 * value.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Not}.
 		 */
 		public static Not not(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Not(asFields(fieldReference));
 		}
 
@@ -342,11 +353,11 @@ public static Not not(String fieldReference) {
 		 * returns the opposite boolean value.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Not}.
 		 */
 		public static Not not(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Not(Collections.singletonList(expression));
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java
index 8e5b7d1503..16eca4ec22 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.BucketAutoOperation.BucketAutoOperationOutputBuilder;
 import org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder;
 import org.springframework.util.Assert;
 
-import org.bson.Document;
-
 /**
  * Encapsulates the aggregation framework {@code $bucketAuto}-operation. <br />
  * Bucket stage is typically used with {@link Aggregation} and {@code $facet}. Categorizes incoming documents into a
@@ -29,8 +29,7 @@
  * We recommend to use the static factory method {@link Aggregation#bucketAuto(String, int)} instead of creating
  * instances of this class directly.
  *
- * @see <a href=
- *      "https://docs.mongodb.org/manual/reference/aggregation/bucketAuto/">https://docs.mongodb.org/manual/reference/aggregation/bucketAuto/</a>
+ * @see <a href="https://docs.mongodb.org/manual/reference/aggregation/bucketAuto/">https://docs.mongodb.org/manual/reference/aggregation/bucketAuto/</a>
  * @see BucketOperationSupport
  * @author Mark Paluch
  * @author Christoph Strobl
@@ -40,7 +39,7 @@ public class BucketAutoOperation extends BucketOperationSupport<BucketAutoOperat
 		implements FieldsExposingAggregationOperation {
 
 	private final int buckets;
-	private final String granularity;
+	private final @Nullable String granularity;
 
 	/**
 	 * Creates a new {@link BucketAutoOperation} given a {@link Field group-by field}.
@@ -52,7 +51,7 @@ public BucketAutoOperation(Field groupByField, int buckets) {
 
 		super(groupByField);
 
-		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0!");
+		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0");
 
 		this.buckets = buckets;
 		this.granularity = null;
@@ -68,7 +67,7 @@ public BucketAutoOperation(AggregationExpression groupByExpression, int buckets)
 
 		super(groupByExpression);
 
-		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0!");
+		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0");
 
 		this.buckets = buckets;
 		this.granularity = null;
@@ -82,7 +81,7 @@ private BucketAutoOperation(BucketAutoOperation bucketOperation, Outputs outputs
 		this.granularity = bucketOperation.granularity;
 	}
 
-	private BucketAutoOperation(BucketAutoOperation bucketOperation, int buckets, String granularity) {
+	private BucketAutoOperation(BucketAutoOperation bucketOperation, int buckets, @Nullable String granularity) {
 
 		super(bucketOperation);
 
@@ -90,9 +89,6 @@ private BucketAutoOperation(BucketAutoOperation bucketOperation, int buckets, St
 		this.granularity = granularity;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -106,18 +102,23 @@ public Document toDocument(AggregationOperationContext context) {
 
 		options.putAll(super.toDocument(context));
 
-		return new Document("$bucketAuto", options);
+		return new Document(getOperator(), options);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$bucketAuto";
 	}
 
 	/**
 	 * Configures a number of bucket {@literal buckets} and return a new {@link BucketAutoOperation}.
 	 *
 	 * @param buckets must be a positive number.
-	 * @return
+	 * @return new instance of {@link BucketAutoOperation}.
 	 */
 	public BucketAutoOperation withBuckets(int buckets) {
 
-		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0!");
+		Assert.isTrue(buckets > 0, "Number of buckets must be greater 0");
 		return new BucketAutoOperation(this, buckets, granularity);
 	}
 
@@ -128,42 +129,30 @@ public BucketAutoOperation withBuckets(int buckets) {
 	 * Use either predefined {@link Granularities} or provide a own one.
 	 *
 	 * @param granularity must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link BucketAutoOperation}.
 	 */
 	public BucketAutoOperation withGranularity(Granularity granularity) {
 
-		Assert.notNull(granularity, "Granularity must not be null!");
+		Assert.notNull(granularity, "Granularity must not be null");
 
 		return new BucketAutoOperation(this, buckets, granularity.getMongoRepresentation());
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#newBucketOperation(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Outputs)
-	 */
 	@Override
 	protected BucketAutoOperation newBucketOperation(Outputs outputs) {
 		return new BucketAutoOperation(this, outputs);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutputExpression(java.lang.String, java.lang.Object[])
-	 */
 	@Override
 	public ExpressionBucketAutoOperationBuilder andOutputExpression(String expression, Object... params) {
 		return new ExpressionBucketAutoOperationBuilder(expression, this, params);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-	 */
 	@Override
 	public BucketAutoOperationOutputBuilder andOutput(AggregationExpression expression) {
 		return new BucketAutoOperationOutputBuilder(expression, this);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(java.lang.String)
-	 */
 	@Override
 	public BucketAutoOperationOutputBuilder andOutput(String fieldName) {
 		return new BucketAutoOperationOutputBuilder(Fields.field(fieldName), this);
@@ -185,9 +174,6 @@ protected BucketAutoOperationOutputBuilder(Object value, BucketAutoOperation ope
 			super(value, operation);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
 		@Override
 		protected BucketAutoOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketAutoOperationOutputBuilder(operationOutput, this.operation);
@@ -209,16 +195,13 @@ public static class ExpressionBucketAutoOperationBuilder
 		 *
 		 * @param expression must not be {@literal null}.
 		 * @param operation must not be {@literal null}.
-		 * @param parameters
+		 * @param parameters must not be {@literal null}.
 		 */
 		protected ExpressionBucketAutoOperationBuilder(String expression, BucketAutoOperation operation,
 				Object[] parameters) {
 			super(expression, operation, parameters);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
 		@Override
 		protected BucketAutoOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketAutoOperationOutputBuilder(operationOutput, this.operation);
@@ -240,8 +223,7 @@ public interface Granularity {
 	/**
 	 * Supported MongoDB granularities.
 	 *
-	 * @see <a
-	 *      href="https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/#granularity>https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/#granularity</a>
+	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/#granularity">https://docs.mongodb.com/manual/reference/operator/aggregation/bucketAuto/#granularity</a>
 	 * @author Mark Paluch
 	 */
 	public enum Granularities implements Granularity {
@@ -264,9 +246,6 @@ public enum Granularities implements Granularity {
 			this.granularity = granularity;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.GranularitytoMongoGranularity()
-		 */
 		@Override
 		public String getMongoRepresentation() {
 			return granularity;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java
index dd84973b29..6ed686c086 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,17 +20,16 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.BucketOperation.BucketOperationOutputBuilder;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
-import org.bson.Document;
-
 /**
  * Encapsulates the aggregation framework {@code $bucket}-operation. <br />
- *
  * Bucket stage is typically used with {@link Aggregation} and {@code $facet}. Categorizes incoming documents into
  * groups, called buckets, based on a specified expression and bucket boundaries. <br />
- *
  * We recommend to use the static factory method {@link Aggregation#bucket(String)} instead of creating instances of
  * this class directly.
  *
@@ -43,7 +42,7 @@ public class BucketOperation extends BucketOperationSupport<BucketOperation, Buc
 		implements FieldsExposingAggregationOperation {
 
 	private final List<Object> boundaries;
-	private final Object defaultBucket;
+	private final @Nullable Object defaultBucket;
 
 	/**
 	 * Creates a new {@link BucketOperation} given a {@link Field group-by field}.
@@ -79,17 +78,14 @@ private BucketOperation(BucketOperation bucketOperation, Outputs outputs) {
 		this.defaultBucket = bucketOperation.defaultBucket;
 	}
 
-	private BucketOperation(BucketOperation bucketOperation, List<Object> boundaries, Object defaultBucket) {
+	private BucketOperation(BucketOperation bucketOperation, List<Object> boundaries, @Nullable Object defaultBucket) {
 
 		super(bucketOperation);
 
-		this.boundaries = new ArrayList<Object>(boundaries);
+		this.boundaries = new ArrayList<>(boundaries);
 		this.defaultBucket = defaultBucket;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -103,18 +99,24 @@ public Document toDocument(AggregationOperationContext context) {
 
 		options.putAll(super.toDocument(context));
 
-		return new Document("$bucket", options);
+		return new Document(getOperator(), options);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$bucket";
 	}
 
 	/**
 	 * Configures a default bucket {@literal literal} and return a new {@link BucketOperation}.
 	 *
 	 * @param literal must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link BucketOperation}.
 	 */
+	@Contract("_ -> new")
 	public BucketOperation withDefaultBucket(Object literal) {
 
-		Assert.notNull(literal, "Default bucket literal must not be null!");
+		Assert.notNull(literal, "Default bucket literal must not be null");
 		return new BucketOperation(this, boundaries, literal);
 	}
 
@@ -123,47 +125,36 @@ public BucketOperation withDefaultBucket(Object literal) {
 	 * preserved and the new {@literal boundaries} are appended.
 	 *
 	 * @param boundaries must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link BucketOperation}.
 	 */
+	@Contract("_ -> new")
 	public BucketOperation withBoundaries(Object... boundaries) {
 
-		Assert.notNull(boundaries, "Boundaries must not be null!");
-		Assert.noNullElements(boundaries, "Boundaries must not contain null values!");
+		Assert.notNull(boundaries, "Boundaries must not be null");
+		Assert.noNullElements(boundaries, "Boundaries must not contain null values");
 
-		List<Object> newBoundaries = new ArrayList<Object>(this.boundaries.size() + boundaries.length);
+		List<Object> newBoundaries = new ArrayList<>(this.boundaries.size() + boundaries.length);
 		newBoundaries.addAll(this.boundaries);
 		newBoundaries.addAll(Arrays.asList(boundaries));
 
 		return new BucketOperation(this, newBoundaries, defaultBucket);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#newBucketOperation(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Outputs)
-	 */
 	@Override
 	protected BucketOperation newBucketOperation(Outputs outputs) {
 		return new BucketOperation(this, outputs);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutputExpression(java.lang.String, java.lang.Object[])
-	 */
 	@Override
 	public ExpressionBucketOperationBuilder andOutputExpression(String expression, Object... params) {
 		return new ExpressionBucketOperationBuilder(expression, this, params);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-	 */
 	@Override
 	public BucketOperationOutputBuilder andOutput(AggregationExpression expression) {
 		return new BucketOperationOutputBuilder(expression, this);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#andOutput(java.lang.String)
-	 */
 	@Override
 	public BucketOperationOutputBuilder andOutput(String fieldName) {
 		return new BucketOperationOutputBuilder(Fields.field(fieldName), this);
@@ -185,9 +176,6 @@ protected BucketOperationOutputBuilder(Object value, BucketOperation operation)
 			super(value, operation);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
 		@Override
 		protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketOperationOutputBuilder(operationOutput, this.operation);
@@ -204,20 +192,17 @@ public static class ExpressionBucketOperationBuilder
 			extends ExpressionBucketOperationBuilderSupport<BucketOperationOutputBuilder, BucketOperation> {
 
 		/**
-		 * Creates a new {@link ExpressionBucketOperationBuilderSupport} for the given value, {@link BucketOperation}
-		 * and parameters.
+		 * Creates a new {@link ExpressionBucketOperationBuilderSupport} for the given value, {@link BucketOperation} and
+		 * parameters.
 		 *
 		 * @param expression must not be {@literal null}.
 		 * @param operation must not be {@literal null}.
-		 * @param parameters
+		 * @param parameters must not be {@literal null}.
 		 */
 		protected ExpressionBucketOperationBuilder(String expression, BucketOperation operation, Object[] parameters) {
 			super(expression, operation, parameters);
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder#apply(org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OperationOutput)
-		 */
 		@Override
 		protected BucketOperationOutputBuilder apply(OperationOutput operationOutput) {
 			return new BucketOperationOutputBuilder(operationOutput, this.operation);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java
index 4b750a3eb8..3d5ded05c2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/BucketOperationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,14 +21,14 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.OutputBuilder;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder;
 import org.springframework.expression.spel.ast.Projection;
 import org.springframework.util.Assert;
 
-import org.bson.Document;
-
 /**
  * Base class for bucket operations that support output expressions the aggregation framework. <br />
  * Bucket stages collect documents into buckets and can contribute output fields. <br />
@@ -41,8 +41,8 @@
 public abstract class BucketOperationSupport<T extends BucketOperationSupport<T, B>, B extends OutputBuilder<B, T>>
 		implements FieldsExposingAggregationOperation {
 
-	private final Field groupByField;
-	private final AggregationExpression groupByExpression;
+	private final @Nullable Field groupByField;
+	private final @Nullable AggregationExpression groupByExpression;
 	private final Outputs outputs;
 
 	/**
@@ -52,7 +52,7 @@ public abstract class BucketOperationSupport<T extends BucketOperationSupport<T,
 	 */
 	protected BucketOperationSupport(Field groupByField) {
 
-		Assert.notNull(groupByField, "Group by field must not be null!");
+		Assert.notNull(groupByField, "Group by field must not be null");
 
 		this.groupByField = groupByField;
 		this.groupByExpression = null;
@@ -66,7 +66,7 @@ protected BucketOperationSupport(Field groupByField) {
 	 */
 	protected BucketOperationSupport(AggregationExpression groupByExpression) {
 
-		Assert.notNull(groupByExpression, "Group by AggregationExpression must not be null!");
+		Assert.notNull(groupByExpression, "Group by AggregationExpression must not be null");
 
 		this.groupByExpression = groupByExpression;
 		this.groupByField = null;
@@ -90,8 +90,8 @@ protected BucketOperationSupport(BucketOperationSupport<?, ?> operationSupport)
 	 */
 	protected BucketOperationSupport(BucketOperationSupport<?, ?> operationSupport, Outputs outputs) {
 
-		Assert.notNull(operationSupport, "BucketOperationSupport must not be null!");
-		Assert.notNull(outputs, "Outputs must not be null!");
+		Assert.notNull(operationSupport, "BucketOperationSupport must not be null");
+		Assert.notNull(outputs, "Outputs must not be null");
 
 		this.groupByField = operationSupport.groupByField;
 		this.groupByExpression = operationSupport.groupByExpression;
@@ -104,7 +104,7 @@ protected BucketOperationSupport(BucketOperationSupport<?, ?> operationSupport,
 	 *
 	 * @param expression the SpEL expression, must not be {@literal null} or empty.
 	 * @param params must not be {@literal null}
-	 * @return
+	 * @return new instance of {@link ExpressionBucketOperationBuilderSupport} to create {@link BucketOperation}.
 	 */
 	public abstract ExpressionBucketOperationBuilderSupport<B, T> andOutputExpression(String expression,
 			Object... params);
@@ -114,7 +114,7 @@ public abstract ExpressionBucketOperationBuilderSupport<B, T> andOutputExpressio
 	 * resulting bucket documents.
 	 *
 	 * @param expression the SpEL expression, must not be {@literal null} or empty.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public abstract B andOutput(AggregationExpression expression);
 
@@ -124,14 +124,14 @@ public abstract ExpressionBucketOperationBuilderSupport<B, T> andOutputExpressio
 	 * {@literal fieldName}.
 	 *
 	 * @param fieldName must not be {@literal null} or empty.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public abstract B andOutput(String fieldName);
 
 	/**
 	 * Creates a new {@link BucketOperationSupport} given to add a count field to the resulting bucket documents.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public B andOutputCount() {
 		return andOutput(new AggregationExpression() {
@@ -142,16 +142,18 @@ public Document toDocument(AggregationOperationContext context) {
 		});
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
+
 	public Document toDocument(AggregationOperationContext context) {
 
 		Document document = new Document();
 
-		document.put("groupBy", groupByExpression == null ? context.getReference(groupByField).toString()
-				: groupByExpression.toDocument(context));
+		if(groupByExpression != null) {
+			document.put("groupBy", groupByExpression.toDocument(context));
+		} else if (groupByField != null) {
+			document.put("groupBy", context.getReference(groupByField).toString());
+
+		}
 
 		if (!outputs.isEmpty()) {
 			document.put("output", outputs.toDocument(context));
@@ -160,9 +162,6 @@ public Document toDocument(AggregationOperationContext context) {
 		return document;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 		return outputs.asExposedFields();
@@ -220,8 +219,8 @@ public abstract static class OutputBuilder<B extends OutputBuilder<B, T>, T exte
 		 */
 		protected OutputBuilder(Object value, T operation) {
 
-			Assert.notNull(value, "Value must not be null or empty!");
-			Assert.notNull(operation, "ProjectionOperation must not be null!");
+			Assert.notNull(value, "Value must not be null or empty");
+			Assert.notNull(operation, "ProjectionOperation must not be null");
 
 			this.value = value;
 			this.operation = operation;
@@ -231,7 +230,7 @@ protected OutputBuilder(Object value, T operation) {
 		 * Generates a builder for a {@code $sum}-expression. <br />
 		 * Count expressions are emulated via {@code $sum: 1}.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B count() {
 			return sum(1);
@@ -240,7 +239,7 @@ public B count() {
 		/**
 		 * Generates a builder for a {@code $sum}-expression for the current value.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B sum() {
 			return apply(Accumulators.SUM);
@@ -249,8 +248,8 @@ public B sum() {
 		/**
 		 * Generates a builder for a {@code $sum}-expression for the given {@literal value}.
 		 *
-		 * @param value
-		 * @return
+		 * @param value must not be {@literal null}.
+		 * @return never {@literal null}.
 		 */
 		public B sum(Number value) {
 			return apply(new OperationOutput(Accumulators.SUM.getMongoOperator(), Collections.singleton(value)));
@@ -259,7 +258,7 @@ public B sum(Number value) {
 		/**
 		 * Generates a builder for an {@code $last}-expression for the current value..
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B last() {
 			return apply(Accumulators.LAST);
@@ -268,7 +267,7 @@ public B last() {
 		/**
 		 * Generates a builder for a {@code $first}-expression the current value.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B first() {
 			return apply(Accumulators.FIRST);
@@ -277,8 +276,7 @@ public B first() {
 		/**
 		 * Generates a builder for an {@code $avg}-expression for the current value.
 		 *
-		 * @param reference
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B avg() {
 			return apply(Accumulators.AVG);
@@ -287,7 +285,7 @@ public B avg() {
 		/**
 		 * Generates a builder for an {@code $min}-expression for the current value.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B min() {
 			return apply(Accumulators.MIN);
@@ -296,7 +294,7 @@ public B min() {
 		/**
 		 * Generates a builder for an {@code $max}-expression for the current value.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B max() {
 			return apply(Accumulators.MAX);
@@ -305,7 +303,7 @@ public B max() {
 		/**
 		 * Generates a builder for an {@code $push}-expression for the current value.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B push() {
 			return apply(Accumulators.PUSH);
@@ -314,7 +312,7 @@ public B push() {
 		/**
 		 * Generates a builder for an {@code $addToSet}-expression for the current value.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B addToSet() {
 			return apply(Accumulators.ADDTOSET);
@@ -325,14 +323,14 @@ public B addToSet() {
 		 *
 		 * @param operation the operation name, must not be {@literal null} or empty.
 		 * @param values must not be {@literal null}.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public B apply(String operation, Object... values) {
 
-			Assert.hasText(operation, "Operation must not be empty or null!");
-			Assert.notNull(value, "Values must not be null!");
+			Assert.hasText(operation, "Operation must not be empty or null");
+			Assert.notNull(value, "Values must not be null");
 
-			List<Object> objects = new ArrayList<Object>(values.length + 1);
+			List<Object> objects = new ArrayList<>(values.length + 1);
 			objects.add(value);
 			objects.addAll(Arrays.asList(values));
 			return apply(new OperationOutput(operation, objects));
@@ -342,7 +340,7 @@ public B apply(String operation, Object... values) {
 		 * Apply an {@link OperationOutput} to this output.
 		 *
 		 * @param operationOutput must not be {@literal null}.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		protected abstract B apply(OperationOutput operationOutput);
 
@@ -354,16 +352,16 @@ private B apply(Accumulators operation) {
 		 * Returns the finally to be applied {@link BucketOperation} with the given alias.
 		 *
 		 * @param alias will never be {@literal null} or empty.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public T as(String alias) {
 
-			if (value instanceof OperationOutput) {
-				return this.operation.andOutput(((OperationOutput) this.value).withAlias(alias));
+			if (value instanceof OperationOutput operationOutput) {
+				return this.operation.andOutput(operationOutput.withAlias(alias));
 			}
 
 			if (value instanceof Field) {
-				throw new IllegalStateException("Cannot add a field as top-level output. Use accumulator expressions.");
+				throw new IllegalStateException("Cannot add a field as top-level output; Use accumulator expressions");
 			}
 
 			return this.operation
@@ -376,7 +374,7 @@ private enum Accumulators {
 		SUM("$sum"), AVG("$avg"), FIRST("$first"), LAST("$last"), MAX("$max"), MIN("$min"), PUSH("$push"), ADDTOSET(
 				"$addToSet");
 
-		private String mongoOperator;
+		private final String mongoOperator;
 
 		Accumulators(String mongoOperator) {
 			this.mongoOperator = mongoOperator;
@@ -396,7 +394,7 @@ protected static class Outputs implements AggregationExpression {
 
 		protected static final Outputs EMPTY = new Outputs();
 
-		private List<Output> outputs;
+		private final List<Output> outputs;
 
 		/**
 		 * Creates a new, empty {@link Outputs}.
@@ -445,7 +443,7 @@ protected ExposedFields asExposedFields() {
 		 */
 		protected Outputs and(Output output) {
 
-			Assert.notNull(output, "BucketOutput must not be null!");
+			Assert.notNull(output, "BucketOutput must not be null");
 			return new Outputs(this.outputs, output);
 		}
 
@@ -456,9 +454,6 @@ protected boolean isEmpty() {
 			return outputs.isEmpty();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -491,7 +486,7 @@ protected abstract static class Output implements AggregationExpression {
 		 */
 		protected Output(Field field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 			this.field = new ExposedField(field, true);
 		}
 
@@ -527,11 +522,11 @@ public OperationOutput(String operation, Collection<? extends Object> values) {
 
 			super(Fields.field(operation));
 
-			Assert.hasText(operation, "Operation must not be null or empty!");
-			Assert.notNull(values, "Values must not be null!");
+			Assert.hasText(operation, "Operation must not be null or empty");
+			Assert.notNull(values, "Values must not be null");
 
 			this.operation = operation;
-			this.values = new ArrayList<Object>(values);
+			this.values = new ArrayList<>(values);
 		}
 
 		private OperationOutput(Field field, OperationOutput operationOutput) {
@@ -542,32 +537,27 @@ private OperationOutput(Field field, OperationOutput operationOutput) {
 			this.values = operationOutput.values;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
 			List<Object> operationArguments = getOperationArguments(context);
-			return new Document(operation,
-					operationArguments.size() == 1 ? operationArguments.get(0) : operationArguments);
+			return new Document(operation, operationArguments.size() == 1 ? operationArguments.get(0) : operationArguments);
 		}
 
 		protected List<Object> getOperationArguments(AggregationOperationContext context) {
 
-			List<Object> result = new ArrayList<Object>(values != null ? values.size() : 1);
+			List<Object> result = new ArrayList<>(values != null ? values.size() : 1);
 
 			for (Object element : values) {
 
-				if (element instanceof Field) {
-					result.add(context.getReference((Field) element).toString());
-				} else if (element instanceof Fields) {
-					for (Field field : (Fields) element) {
+				if (element instanceof Field field) {
+					result.add(context.getReference(field).toString());
+				} else if (element instanceof Fields fields) {
+					for (Field field : fields) {
 						result.add(context.getReference(field).toString());
 					}
-				} else if (element instanceof AggregationExpression) {
-					result.add(((AggregationExpression) element).toDocument(context));
+				} else if (element instanceof AggregationExpression aggregationExpression) {
+					result.add(aggregationExpression.toDocument(context));
 				} else {
 					result.add(element);
 				}
@@ -579,7 +569,7 @@ protected List<Object> getOperationArguments(AggregationOperationContext context
 		/**
 		 * Returns the field that holds the {@link ProjectionOperationBuilder.OperationProjection}.
 		 *
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		protected Field getField() {
 			return getExposedField();
@@ -589,7 +579,7 @@ protected Field getField() {
 		 * Creates a new instance of this {@link OperationOutput} with the given alias.
 		 *
 		 * @param alias the alias to set
-		 * @return
+		 * @return new instance of {@link OperationOutput}.
 		 */
 		public OperationOutput withAlias(String alias) {
 
@@ -632,19 +622,18 @@ public SpelExpressionOutput(String expression, Object[] parameters) {
 
 			super(Fields.field(expression));
 
-			Assert.hasText(expression, "Expression must not be null!");
-			Assert.notNull(parameters, "Parameters must not be null!");
+			Assert.hasText(expression, "Expression must not be null");
+			Assert.notNull(parameters, "Parameters must not be null");
 
 			this.expression = expression;
 			this.params = parameters.clone();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
-			return (Document) TRANSFORMER.transform(expression, context, params);
+
+			Object o =  TRANSFORMER.transform(expression, context, params);
+			return o instanceof Document document ? document : new Document();
 		}
 	}
 
@@ -658,8 +647,8 @@ private static class AggregationExpressionOutput extends Output {
 		/**
 		 * Creates a new {@link AggregationExpressionOutput}.
 		 *
-		 * @param field
-		 * @param expression
+		 * @param field must not be {@literal null}.
+		 * @param expression must not be {@literal null}.
 		 */
 		protected AggregationExpressionOutput(Field field, AggregationExpression expression) {
 
@@ -668,9 +657,6 @@ protected AggregationExpressionOutput(Field field, AggregationExpression express
 			this.expression = expression;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return expression.toDocument(context);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ComparisonOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ComparisonOperators.java
index 3780b4d242..e2626c3a16 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ComparisonOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ComparisonOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,6 +18,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -32,7 +34,7 @@ public class ComparisonOperators {
 	 * Take the field referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ComparisonOperatorFactory}.
 	 */
 	public static ComparisonOperatorFactory valueOf(String fieldReference) {
 		return new ComparisonOperatorFactory(fieldReference);
@@ -42,7 +44,7 @@ public static ComparisonOperatorFactory valueOf(String fieldReference) {
 	 * Take the value resulting from the given {@link AggregationExpression}.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ComparisonOperatorFactory}.
 	 */
 	public static ComparisonOperatorFactory valueOf(AggregationExpression expression) {
 		return new ComparisonOperatorFactory(expression);
@@ -50,8 +52,8 @@ public static ComparisonOperatorFactory valueOf(AggregationExpression expression
 
 	public static class ComparisonOperatorFactory {
 
-		private final String fieldReference;
-		private final AggregationExpression expression;
+		private final @Nullable String fieldReference;
+		private final @Nullable AggregationExpression expression;
 
 		/**
 		 * Creates new {@link ComparisonOperatorFactory} for given {@literal fieldReference}.
@@ -60,7 +62,7 @@ public static class ComparisonOperatorFactory {
 		 */
 		public ComparisonOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			this.fieldReference = fieldReference;
 			this.expression = null;
 		}
@@ -72,7 +74,7 @@ public ComparisonOperatorFactory(String fieldReference) {
 		 */
 		public ComparisonOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			this.fieldReference = null;
 			this.expression = expression;
 		}
@@ -81,7 +83,7 @@ public ComparisonOperatorFactory(AggregationExpression expression) {
 		 * Creates new {@link AggregationExpression} that compares two values.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
 		public Cmp compareTo(String fieldReference) {
 			return createCmp().compareTo(fieldReference);
@@ -91,7 +93,7 @@ public Cmp compareTo(String fieldReference) {
 		 * Creates new {@link AggregationExpression} that compares two values.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
 		public Cmp compareTo(AggregationExpression expression) {
 			return createCmp().compareTo(expression);
@@ -101,12 +103,13 @@ public Cmp compareTo(AggregationExpression expression) {
 		 * Creates new {@link AggregationExpression} that compares two values.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
 		public Cmp compareToValue(Object value) {
 			return createCmp().compareToValue(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Cmp createCmp() {
 			return usesFieldRef() ? Cmp.valueOf(fieldReference) : Cmp.valueOf(expression);
 		}
@@ -116,7 +119,7 @@ private Cmp createCmp() {
 		 * value is equal to the value of the referenced field.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
 		public Eq equalTo(String fieldReference) {
 			return createEq().equalTo(fieldReference);
@@ -127,7 +130,7 @@ public Eq equalTo(String fieldReference) {
 		 * value is equal to the expression result.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
 		public Eq equalTo(AggregationExpression expression) {
 			return createEq().equalTo(expression);
@@ -138,12 +141,13 @@ public Eq equalTo(AggregationExpression expression) {
 		 * value is equal to the given value.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
 		public Eq equalToValue(Object value) {
 			return createEq().equalToValue(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Eq createEq() {
 			return usesFieldRef() ? Eq.valueOf(fieldReference) : Eq.valueOf(expression);
 		}
@@ -153,7 +157,7 @@ private Eq createEq() {
 		 * value is greater than the value of the referenced field.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
 		public Gt greaterThan(String fieldReference) {
 			return createGt().greaterThan(fieldReference);
@@ -164,7 +168,7 @@ public Gt greaterThan(String fieldReference) {
 		 * value is greater than the expression result.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
 		public Gt greaterThan(AggregationExpression expression) {
 			return createGt().greaterThan(expression);
@@ -175,12 +179,13 @@ public Gt greaterThan(AggregationExpression expression) {
 		 * value is greater than the given value.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
 		public Gt greaterThanValue(Object value) {
 			return createGt().greaterThanValue(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Gt createGt() {
 			return usesFieldRef() ? Gt.valueOf(fieldReference) : Gt.valueOf(expression);
 		}
@@ -190,7 +195,7 @@ private Gt createGt() {
 		 * value is greater than or equivalent to the value of the referenced field.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
 		public Gte greaterThanEqualTo(String fieldReference) {
 			return createGte().greaterThanEqualTo(fieldReference);
@@ -201,7 +206,7 @@ public Gte greaterThanEqualTo(String fieldReference) {
 		 * value is greater than or equivalent to the expression result.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
 		public Gte greaterThanEqualTo(AggregationExpression expression) {
 			return createGte().greaterThanEqualTo(expression);
@@ -212,12 +217,13 @@ public Gte greaterThanEqualTo(AggregationExpression expression) {
 		 * value is greater than or equivalent to the given value.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
 		public Gte greaterThanEqualToValue(Object value) {
 			return createGte().greaterThanEqualToValue(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Gte createGte() {
 			return usesFieldRef() ? Gte.valueOf(fieldReference) : Gte.valueOf(expression);
 		}
@@ -227,7 +233,7 @@ private Gte createGte() {
 		 * value is less than the value of the referenced field.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
 		public Lt lessThan(String fieldReference) {
 			return createLt().lessThan(fieldReference);
@@ -238,7 +244,7 @@ public Lt lessThan(String fieldReference) {
 		 * value is less than the expression result.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
 		public Lt lessThan(AggregationExpression expression) {
 			return createLt().lessThan(expression);
@@ -249,12 +255,13 @@ public Lt lessThan(AggregationExpression expression) {
 		 * value is less than to the given value.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
 		public Lt lessThanValue(Object value) {
 			return createLt().lessThanValue(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Lt createLt() {
 			return usesFieldRef() ? Lt.valueOf(fieldReference) : Lt.valueOf(expression);
 		}
@@ -264,7 +271,7 @@ private Lt createLt() {
 		 * value is less than or equivalent to the value of the referenced field.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lte}.
 		 */
 		public Lte lessThanEqualTo(String fieldReference) {
 			return createLte().lessThanEqualTo(fieldReference);
@@ -275,7 +282,7 @@ public Lte lessThanEqualTo(String fieldReference) {
 		 * value is less than or equivalent to the expression result.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lte}.
 		 */
 		public Lte lessThanEqualTo(AggregationExpression expression) {
 			return createLte().lessThanEqualTo(expression);
@@ -285,13 +292,14 @@ public Lte lessThanEqualTo(AggregationExpression expression) {
 		 * Creates new {@link AggregationExpression} that compares two values and returns {@literal true} when the first
 		 * value is less than or equivalent to the given value.
 		 *
-		 * @param value
-		 * @return
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Lte}.
 		 */
 		public Lte lessThanEqualToValue(Object value) {
 			return createLte().lessThanEqualToValue(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Lte createLte() {
 			return usesFieldRef() ? Lte.valueOf(fieldReference) : Lte.valueOf(expression);
 		}
@@ -301,7 +309,7 @@ private Lte createLte() {
 		 * are not equivalent.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
 		public Ne notEqualTo(String fieldReference) {
 			return createNe().notEqualTo(fieldReference);
@@ -312,7 +320,7 @@ public Ne notEqualTo(String fieldReference) {
 		 * are not equivalent.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
 		public Ne notEqualTo(AggregationExpression expression) {
 			return createNe().notEqualTo(expression);
@@ -323,12 +331,13 @@ public Ne notEqualTo(AggregationExpression expression) {
 		 * are not equivalent.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
 		public Ne notEqualToValue(Object value) {
 			return createNe().notEqualToValue(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Ne createNe() {
 			return usesFieldRef() ? Ne.valueOf(fieldReference) : Ne.valueOf(expression);
 		}
@@ -358,11 +367,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Cmp}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
 		public static Cmp valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Cmp(asFields(fieldReference));
 		}
 
@@ -370,11 +379,11 @@ public static Cmp valueOf(String fieldReference) {
 		 * Creates new {@link Cmp}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
 		public static Cmp valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Cmp(Collections.singletonList(expression));
 		}
 
@@ -382,11 +391,12 @@ public static Cmp valueOf(AggregationExpression expression) {
 		 * Creates new {@link Cmp} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
+		@Contract("_ -> new")
 		public Cmp compareTo(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Cmp(append(Fields.field(fieldReference)));
 		}
 
@@ -394,11 +404,12 @@ public Cmp compareTo(String fieldReference) {
 		 * Creates new {@link Cmp} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
+		@Contract("_ -> new")
 		public Cmp compareTo(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Cmp(append(expression));
 		}
 
@@ -406,12 +417,13 @@ public Cmp compareTo(AggregationExpression expression) {
 		 * Creates new {@link Cmp} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Cmp}.
 		 */
+		@Contract("_ -> new")
 		public Cmp compareToValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
-			return new Cmp(append(value));
+			Assert.notNull(value, "Value must not be null");
+			return new Cmp(append(value, Expand.KEEP_SOURCE));
 		}
 	}
 
@@ -435,11 +447,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Eq}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
 		public static Eq valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Eq(asFields(fieldReference));
 		}
 
@@ -447,11 +459,11 @@ public static Eq valueOf(String fieldReference) {
 		 * Creates new {@link Eq}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
 		public static Eq valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Eq(Collections.singletonList(expression));
 		}
 
@@ -459,11 +471,12 @@ public static Eq valueOf(AggregationExpression expression) {
 		 * Creates new {@link Eq} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
+		@Contract("_ -> new")
 		public Eq equalTo(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Eq(append(Fields.field(fieldReference)));
 		}
 
@@ -471,11 +484,12 @@ public Eq equalTo(String fieldReference) {
 		 * Creates new {@link Eq} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
+		@Contract("_ -> new")
 		public Eq equalTo(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Eq(append(expression));
 		}
 
@@ -483,12 +497,13 @@ public Eq equalTo(AggregationExpression expression) {
 		 * Creates new {@link Eq} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Eq}.
 		 */
+		@Contract("_ -> new")
 		public Eq equalToValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
-			return new Eq(append(value));
+			Assert.notNull(value, "Value must not be null");
+			return new Eq(append(value, Expand.KEEP_SOURCE));
 		}
 	}
 
@@ -512,11 +527,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Gt}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
 		public static Gt valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Gt(asFields(fieldReference));
 		}
 
@@ -524,11 +539,11 @@ public static Gt valueOf(String fieldReference) {
 		 * Creates new {@link Gt}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
 		public static Gt valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Gt(Collections.singletonList(expression));
 		}
 
@@ -536,11 +551,12 @@ public static Gt valueOf(AggregationExpression expression) {
 		 * Creates new {@link Gt} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
+		@Contract("_ -> new")
 		public Gt greaterThan(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Gt(append(Fields.field(fieldReference)));
 		}
 
@@ -548,11 +564,12 @@ public Gt greaterThan(String fieldReference) {
 		 * Creates new {@link Gt} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
+		@Contract("_ -> new")
 		public Gt greaterThan(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Gt(append(expression));
 		}
 
@@ -560,11 +577,12 @@ public Gt greaterThan(AggregationExpression expression) {
 		 * Creates new {@link Gt} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gt}.
 		 */
+		@Contract("_ -> new")
 		public Gt greaterThanValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Gt(append(value));
 		}
 	}
@@ -589,11 +607,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Lt}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
 		public static Lt valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Lt(asFields(fieldReference));
 		}
 
@@ -601,11 +619,11 @@ public static Lt valueOf(String fieldReference) {
 		 * Creates new {@link Lt}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
 		public static Lt valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Lt(Collections.singletonList(expression));
 		}
 
@@ -613,11 +631,12 @@ public static Lt valueOf(AggregationExpression expression) {
 		 * Creates new {@link Lt} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
+		@Contract("_ -> new")
 		public Lt lessThan(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Lt(append(Fields.field(fieldReference)));
 		}
 
@@ -625,11 +644,12 @@ public Lt lessThan(String fieldReference) {
 		 * Creates new {@link Lt} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
+		@Contract("_ -> new")
 		public Lt lessThan(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Lt(append(expression));
 		}
 
@@ -637,11 +657,12 @@ public Lt lessThan(AggregationExpression expression) {
 		 * Creates new {@link Lt} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lt}.
 		 */
+		@Contract("_ -> new")
 		public Lt lessThanValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Lt(append(value));
 		}
 	}
@@ -666,11 +687,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Gte}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
 		public static Gte valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Gte(asFields(fieldReference));
 		}
 
@@ -678,11 +699,11 @@ public static Gte valueOf(String fieldReference) {
 		 * Creates new {@link Gte}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
 		public static Gte valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Gte(Collections.singletonList(expression));
 		}
 
@@ -690,11 +711,12 @@ public static Gte valueOf(AggregationExpression expression) {
 		 * Creates new {@link Gte} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
+		@Contract("_ -> new")
 		public Gte greaterThanEqualTo(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Gte(append(Fields.field(fieldReference)));
 		}
 
@@ -702,11 +724,12 @@ public Gte greaterThanEqualTo(String fieldReference) {
 		 * Creates new {@link Gte} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
+		@Contract("_ -> new")
 		public Gte greaterThanEqualTo(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Gte(append(expression));
 		}
 
@@ -714,11 +737,12 @@ public Gte greaterThanEqualTo(AggregationExpression expression) {
 		 * Creates new {@link Gte} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Gte}.
 		 */
+		@Contract("_ -> new")
 		public Gte greaterThanEqualToValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Gte(append(value));
 		}
 	}
@@ -743,11 +767,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Lte}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lte}.
 		 */
 		public static Lte valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Lte(asFields(fieldReference));
 		}
 
@@ -755,11 +779,11 @@ public static Lte valueOf(String fieldReference) {
 		 * Creates new {@link Lte}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lte}.
 		 */
 		public static Lte valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Lte(Collections.singletonList(expression));
 		}
 
@@ -767,11 +791,12 @@ public static Lte valueOf(AggregationExpression expression) {
 		 * Creates new {@link Lte} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lte}.
 		 */
+		@Contract("_ -> new")
 		public Lte lessThanEqualTo(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Lte(append(Fields.field(fieldReference)));
 		}
 
@@ -779,11 +804,12 @@ public Lte lessThanEqualTo(String fieldReference) {
 		 * Creates new {@link Lte} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lte}.
 		 */
+		@Contract("_ -> new")
 		public Lte lessThanEqualTo(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Lte(append(expression));
 		}
 
@@ -791,11 +817,12 @@ public Lte lessThanEqualTo(AggregationExpression expression) {
 		 * Creates new {@link Lte} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Lte}.
 		 */
+		@Contract("_ -> new")
 		public Lte lessThanEqualToValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Lte(append(value));
 		}
 	}
@@ -820,11 +847,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Ne}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
 		public static Ne valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Ne(asFields(fieldReference));
 		}
 
@@ -832,11 +859,11 @@ public static Ne valueOf(String fieldReference) {
 		 * Creates new {@link Ne}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
 		public static Ne valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Ne(Collections.singletonList(expression));
 		}
 
@@ -844,11 +871,12 @@ public static Ne valueOf(AggregationExpression expression) {
 		 * Creates new {@link Ne} with all previously added arguments appending the given one.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
+		@Contract("_ -> new")
 		public Ne notEqualTo(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Ne(append(Fields.field(fieldReference)));
 		}
 
@@ -856,11 +884,12 @@ public Ne notEqualTo(String fieldReference) {
 		 * Creates new {@link Ne} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
+		@Contract("_ -> new")
 		public Ne notEqualTo(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Ne(append(expression));
 		}
 
@@ -868,12 +897,13 @@ public Ne notEqualTo(AggregationExpression expression) {
 		 * Creates new {@link Eq} with all previously added arguments appending the given one.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Ne}.
 		 */
+		@Contract("_ -> new")
 		public Ne notEqualToValue(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
-			return new Ne(append(value));
+			Assert.notNull(value, "Value must not be null");
+			return new Ne(append(value, Expand.KEEP_SOURCE));
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java
index 5e2d42b21b..462d94d6f1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,16 +17,18 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Switch.CaseOperator;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -43,7 +45,7 @@ public class ConditionalOperators {
 	 * Take the field referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ConditionalOperatorFactory}.
 	 */
 	public static ConditionalOperatorFactory when(String fieldReference) {
 		return new ConditionalOperatorFactory(fieldReference);
@@ -53,7 +55,7 @@ public static ConditionalOperatorFactory when(String fieldReference) {
 	 * Take the value resulting from the given {@literal expression}.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ConditionalOperatorFactory}.
 	 */
 	public static ConditionalOperatorFactory when(AggregationExpression expression) {
 		return new ConditionalOperatorFactory(expression);
@@ -63,7 +65,7 @@ public static ConditionalOperatorFactory when(AggregationExpression expression)
 	 * Take the value resulting from the given {@literal criteriaDefinition}.
 	 *
 	 * @param criteriaDefinition must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ConditionalOperatorFactory}.
 	 */
 	public static ConditionalOperatorFactory when(CriteriaDefinition criteriaDefinition) {
 		return new ConditionalOperatorFactory(criteriaDefinition);
@@ -75,11 +77,11 @@ public static ConditionalOperatorFactory when(CriteriaDefinition criteriaDefinit
 	 * instances of undefined values or missing fields, returns the value of the replacement expression.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link IfNull.ThenBuilder} to create {@link IfNull}.
 	 */
 	public static IfNull.ThenBuilder ifNull(String fieldReference) {
 
-		Assert.notNull(fieldReference, "FieldReference must not be null!");
+		Assert.notNull(fieldReference, "FieldReference must not be null");
 		return IfNull.ifNull(fieldReference);
 	}
 
@@ -89,11 +91,11 @@ public static IfNull.ThenBuilder ifNull(String fieldReference) {
 	 * instances of undefined values or missing fields, returns the value of the replacement expression.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link IfNull.ThenBuilder} to create {@link IfNull}.
 	 */
 	public static IfNull.ThenBuilder ifNull(AggregationExpression expression) {
 
-		Assert.notNull(expression, "Expression must not be null!");
+		Assert.notNull(expression, "Expression must not be null");
 		return IfNull.ifNull(expression);
 	}
 
@@ -103,7 +105,7 @@ public static IfNull.ThenBuilder ifNull(AggregationExpression expression) {
 	 * out of the control flow.
 	 *
 	 * @param conditions must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Switch}.
 	 */
 	public static Switch switchCases(CaseOperator... conditions) {
 		return Switch.switchCases(conditions);
@@ -115,7 +117,7 @@ public static Switch switchCases(CaseOperator... conditions) {
 	 * out of the control flow.
 	 *
 	 * @param conditions must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Switch}.
 	 */
 	public static Switch switchCases(List<CaseOperator> conditions) {
 		return Switch.switchCases(conditions);
@@ -136,7 +138,7 @@ public static class ConditionalOperatorFactory {
 		 */
 		public ConditionalOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 
 			this.fieldReference = fieldReference;
 			this.expression = null;
@@ -150,7 +152,7 @@ public ConditionalOperatorFactory(String fieldReference) {
 		 */
 		public ConditionalOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 
 			this.fieldReference = null;
 			this.expression = expression;
@@ -164,7 +166,7 @@ public ConditionalOperatorFactory(AggregationExpression expression) {
 		 */
 		public ConditionalOperatorFactory(CriteriaDefinition criteriaDefinition) {
 
-			Assert.notNull(criteriaDefinition, "CriteriaDefinition must not be null!");
+			Assert.notNull(criteriaDefinition, "CriteriaDefinition must not be null");
 
 			this.fieldReference = null;
 			this.expression = null;
@@ -176,11 +178,11 @@ public ConditionalOperatorFactory(CriteriaDefinition criteriaDefinition) {
 		 * return expressions.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link OtherwiseBuilder} to create {@link Cond}.
 		 */
 		public OtherwiseBuilder then(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createThenBuilder().then(value);
 		}
 
@@ -189,11 +191,11 @@ public OtherwiseBuilder then(Object value) {
 		 * return expressions.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link OtherwiseBuilder} to create {@link Cond}.
 		 */
 		public OtherwiseBuilder thenValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createThenBuilder().then(expression);
 		}
 
@@ -202,14 +204,15 @@ public OtherwiseBuilder thenValueOf(AggregationExpression expression) {
 		 * return expressions.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link OtherwiseBuilder} to create {@link Cond}.
 		 */
 		public OtherwiseBuilder thenValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
-			return createThenBuilder().then(fieldReference);
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return createThenBuilder().thenValueOf(fieldReference);
 		}
 
+		@SuppressWarnings("NullAway")
 		private ThenBuilder createThenBuilder() {
 
 			if (usesFieldRef()) {
@@ -233,9 +236,9 @@ private boolean usesCriteriaDefinition() {
 	 * field references}, {@link AggregationExpression expressions}, values of simple MongoDB types or values that can be
 	 * converted to a simple MongoDB type.
 	 *
+	 * @author Mark Paluch
 	 * @see <a href=
 	 *      "https://docs.mongodb.com/manual/reference/operator/aggregation/ifNull/">https://docs.mongodb.com/manual/reference/operator/aggregation/ifNull/</a>
-	 * @author Mark Paluch
 	 */
 	public static class IfNull implements AggregationExpression {
 
@@ -251,13 +254,13 @@ private IfNull(Object condition, Object value) {
 		/**
 		 * Creates new {@link IfNull}.
 		 *
-		 * @param fieldReference the field to check for a {@literal null} value, field reference must not be {@literal null}
-		 *          .
-		 * @return
+		 * @param fieldReference the field to check for a {@literal null} value, field reference must not be
+		 *          {@literal null}.
+		 * @return never {@literal null}.
 		 */
 		public static ThenBuilder ifNull(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new IfNullOperatorBuilder().ifNull(fieldReference);
 		}
 
@@ -266,42 +269,49 @@ public static ThenBuilder ifNull(String fieldReference) {
 		 *
 		 * @param expression the expression to check for a {@literal null} value, field reference must not be
 		 *          {@literal null}.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public static ThenBuilder ifNull(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new IfNullOperatorBuilder().ifNull(expression);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
-			List<Object> list = new ArrayList<Object>();
+			List<Object> list = new ArrayList<>();
 
-			if (condition instanceof Field) {
-				list.add(context.getReference((Field) condition).toString());
-			} else if (condition instanceof AggregationExpression) {
-				list.add(((AggregationExpression) condition).toDocument(context));
+			if (condition instanceof Collection<?> collection) {
+				for (Object val : collection) {
+					list.add(mapCondition(val, context));
+				}
 			} else {
-				list.add(condition);
+				list.add(mapCondition(condition, context));
 			}
 
 			list.add(resolve(value, context));
-
 			return new Document("$ifNull", list);
 		}
 
+		private Object mapCondition(Object condition, AggregationOperationContext context) {
+
+			if (condition instanceof Field field) {
+				return context.getReference(field).toString();
+			} else if (condition instanceof AggregationExpression aggregationExpression) {
+				return aggregationExpression.toDocument(context);
+			} else {
+				return condition;
+			}
+		}
+
+		@SuppressWarnings("NullAway")
 		private Object resolve(Object value, AggregationOperationContext context) {
 
-			if (value instanceof Field) {
-				return context.getReference((Field) value).toString();
-			} else if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
+			if (value instanceof Field field) {
+				return context.getReference(field).toString();
+			} else if (value instanceof AggregationExpression aggregationExpression) {
+				return aggregationExpression.toDocument(context);
 			} else if (value instanceof Document) {
 				return value;
 			}
@@ -324,33 +334,53 @@ public interface IfNullBuilder {
 			/**
 			 * @param expression the expression to check for a {@literal null} value, field name must not be {@literal null}
 			 *          or empty.
-			 * @return the {@link ThenBuilder}
+			 * @return the {@link ThenBuilder}.
 			 */
 			ThenBuilder ifNull(AggregationExpression expression);
 		}
 
+		/**
+		 * @author Christoph Strobl
+		 * @since 3.3
+		 */
+		public interface OrBuilder {
+
+			/**
+			 * @param fieldReference the field to check for a {@literal null} value, field reference must not be
+			 *          {@literal null}.
+			 * @return the {@link ThenBuilder}
+			 */
+			ThenBuilder orIfNull(String fieldReference);
+
+			/**
+			 * @param expression the expression to check for a {@literal null} value,
+			 * @return the {@link ThenBuilder}.
+			 */
+			ThenBuilder orIfNull(AggregationExpression expression);
+		}
+
 		/**
 		 * @author Mark Paluch
 		 */
-		public interface ThenBuilder {
+		public interface ThenBuilder extends OrBuilder {
 
 			/**
 			 * @param value the value to be used if the {@code $ifNull} condition evaluates {@literal true}. Can be a
 			 *          {@link Document}, a value that is supported by MongoDB or a value that can be converted to a MongoDB
 			 *          representation but must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IfNull}.
 			 */
 			IfNull then(Object value);
 
 			/**
 			 * @param fieldReference the field holding the replacement value, must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IfNull}.
 			 */
 			IfNull thenValueOf(String fieldReference);
 
 			/**
 			 * @param expression the expression yielding to the replacement value, must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IfNull}.
 			 */
 			IfNull thenValueOf(AggregationExpression expression);
 		}
@@ -362,9 +392,11 @@ public interface ThenBuilder {
 		 */
 		static final class IfNullOperatorBuilder implements IfNullBuilder, ThenBuilder {
 
-			private @Nullable Object condition;
+			private List<Object> conditions;
 
-			private IfNullOperatorBuilder() {}
+			private IfNullOperatorBuilder() {
+				conditions = new ArrayList<>();
+			}
 
 			/**
 			 * Creates a new builder for {@link IfNull}.
@@ -375,50 +407,52 @@ public static IfNullOperatorBuilder newBuilder() {
 				return new IfNullOperatorBuilder();
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.IfNullBuilder#ifNull(java.lang.String)
-			 */
+			@Contract("_ -> this")
 			public ThenBuilder ifNull(String fieldReference) {
 
-				Assert.hasText(fieldReference, "FieldReference name must not be null or empty!");
-				this.condition = Fields.field(fieldReference);
+				Assert.hasText(fieldReference, "FieldReference name must not be null or empty");
+				this.conditions.add(Fields.field(fieldReference));
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.IfNullBuilder#ifNull(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public ThenBuilder ifNull(AggregationExpression expression) {
 
-				Assert.notNull(expression, "AggregationExpression name must not be null or empty!");
-				this.condition = expression;
+				Assert.notNull(expression, "AggregationExpression name must not be null or empty");
+				this.conditions.add(expression);
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#then(java.lang.Object)
-			 */
+			@Override
+			@Contract("_ -> this")
+			public ThenBuilder orIfNull(String fieldReference) {
+				return ifNull(fieldReference);
+			}
+
+			@Override
+			@Contract("_ -> this")
+			public ThenBuilder orIfNull(AggregationExpression expression) {
+				return ifNull(expression);
+			}
+
+			@Contract("_ -> new")
 			public IfNull then(Object value) {
-				return new IfNull(condition, value);
+				return new IfNull(conditions, value);
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#thenValueOf(java.lang.String)
-			 */
+			@Contract("_ -> new")
 			public IfNull thenValueOf(String fieldReference) {
 
-				Assert.notNull(fieldReference, "FieldReference must not be null!");
-				return new IfNull(condition, Fields.field(fieldReference));
+				Assert.notNull(fieldReference, "FieldReference must not be null");
+				return new IfNull(conditions, Fields.field(fieldReference));
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull.ThenBuilder#thenValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
+			@Contract("_ -> new")
 			public IfNull thenValueOf(AggregationExpression expression) {
 
-				Assert.notNull(expression, "Expression must not be null!");
-				return new IfNull(condition, expression);
+				Assert.notNull(expression, "Expression must not be null");
+				return new IfNull(conditions, expression);
 			}
 		}
 	}
@@ -446,7 +480,7 @@ protected String getMongoMethod() {
 		 */
 		public static Switch switchCases(CaseOperator... conditions) {
 
-			Assert.notNull(conditions, "Conditions must not be null!");
+			Assert.notNull(conditions, "Conditions must not be null");
 			return switchCases(Arrays.asList(conditions));
 		}
 
@@ -457,10 +491,17 @@ public static Switch switchCases(CaseOperator... conditions) {
 		 */
 		public static Switch switchCases(List<CaseOperator> conditions) {
 
-			Assert.notNull(conditions, "Conditions must not be null!");
-			return new Switch(Collections.<String, Object> singletonMap("branches", new ArrayList<CaseOperator>(conditions)));
+			Assert.notNull(conditions, "Conditions must not be null");
+			return new Switch(Collections.singletonMap("branches", new ArrayList<>(conditions)));
 		}
 
+		/**
+		 * Set the default value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Switch}.
+		 */
+		@Contract("_ -> new")
 		public Switch defaultTo(Object value) {
 			return new Switch(append("default", value));
 		}
@@ -481,31 +522,28 @@ private CaseOperator(AggregationExpression when, Object then) {
 
 			public static ThenBuilder when(final AggregationExpression condition) {
 
-				Assert.notNull(condition, "Condition must not be null!");
+				Assert.notNull(condition, "Condition must not be null");
 
 				return new ThenBuilder() {
 
 					@Override
 					public CaseOperator then(Object value) {
 
-						Assert.notNull(value, "Value must not be null!");
+						Assert.notNull(value, "Value must not be null");
 						return new CaseOperator(condition, value);
 					}
 				};
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 
 				Document dbo = new Document("case", when.toDocument(context));
 
-				if (then instanceof AggregationExpression) {
-					dbo.put("then", ((AggregationExpression) then).toDocument(context));
-				} else if (then instanceof Field) {
-					dbo.put("then", context.getReference((Field) then).toString());
+				if (then instanceof AggregationExpression aggregationExpression) {
+					dbo.put("then", aggregationExpression.toDocument(context));
+				} else if (then instanceof Field field) {
+					dbo.put("then", context.getReference(field).toString());
 				} else {
 					dbo.put("then", then);
 				}
@@ -522,7 +560,7 @@ public interface ThenBuilder {
 				 * Set the then {@literal value}.
 				 *
 				 * @param value must not be {@literal null}.
-				 * @return
+				 * @return new instance of {@link CaseOperator}.
 				 */
 				CaseOperator then(Object value);
 			}
@@ -536,10 +574,10 @@ public interface ThenBuilder {
 	 * {@link AggregationExpression expressions}, values of simple MongoDB types or values that can be converted to a
 	 * simple MongoDB type.
 	 *
-	 * @see <a href=
-	 *      "https://docs.mongodb.com/manual/reference/operator/aggregation/cond/">https://docs.mongodb.com/manual/reference/operator/aggregation/cond/</a>
 	 * @author Mark Paluch
 	 * @author Christoph Strobl
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/reference/operator/aggregation/cond/">https://docs.mongodb.com/manual/reference/operator/aggregation/cond/</a>
 	 */
 	public static class Cond implements AggregationExpression {
 
@@ -571,9 +609,9 @@ private Cond(CriteriaDefinition condition, Object thenValue, Object otherwiseVal
 
 		private Cond(Object condition, Object thenValue, Object otherwiseValue) {
 
-			Assert.notNull(condition, "Condition must not be null!");
-			Assert.notNull(thenValue, "Then value must not be null!");
-			Assert.notNull(otherwiseValue, "Otherwise value must not be null!");
+			Assert.notNull(condition, "Condition must not be null");
+			Assert.notNull(thenValue, "Then value must not be null");
+			Assert.notNull(otherwiseValue, "Otherwise value must not be null");
 
 			assertNotBuilder(condition, "Condition");
 			assertNotBuilder(thenValue, "Then value");
@@ -584,10 +622,6 @@ private Cond(Object condition, Object thenValue, Object otherwiseValue) {
 			this.otherwiseValue = otherwiseValue;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -600,14 +634,15 @@ public Document toDocument(AggregationOperationContext context) {
 			return new Document("$cond", condObject);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Object resolveValue(AggregationOperationContext context, Object value) {
 
 			if (value instanceof Document || value instanceof Field) {
 				return resolve(context, value);
 			}
 
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
+			if (value instanceof AggregationExpression aggregationExpression) {
+				return aggregationExpression.toDocument(context);
 			}
 
 			return context.getMappedObject(new Document("$set", value)).get("$set");
@@ -619,27 +654,24 @@ private Object resolveCriteria(AggregationOperationContext context, Object value
 				return resolve(context, value);
 			}
 
-			if (value instanceof AggregationExpression) {
-				return ((AggregationExpression) value).toDocument(context);
+			if (value instanceof AggregationExpression aggregationExpression) {
+				return aggregationExpression.toDocument(context);
 			}
 
-			if (value instanceof CriteriaDefinition) {
-
-				Document mappedObject = context.getMappedObject(((CriteriaDefinition) value).getCriteriaObject());
-				List<Object> clauses = new ArrayList<Object>();
-
-				clauses.addAll(getClauses(context, mappedObject));
+			if (value instanceof CriteriaDefinition criteriaDefinition) {
 
+				Document mappedObject = context.getMappedObject(criteriaDefinition.getCriteriaObject());
+				List<Object> clauses = getClauses(context, mappedObject);
 				return clauses.size() == 1 ? clauses.get(0) : clauses;
 			}
 
 			throw new InvalidDataAccessApiUsageException(
-					String.format("Invalid value in condition. Supported: Document, Field references, Criteria, got: %s", value));
+					String.format("Invalid value in condition; Supported: Document, Field references, Criteria, got: %s", value));
 		}
 
 		private List<Object> getClauses(AggregationOperationContext context, Document mappedObject) {
 
-			List<Object> clauses = new ArrayList<Object>();
+			List<Object> clauses = new ArrayList<>();
 
 			for (String key : mappedObject.keySet()) {
 
@@ -652,22 +684,20 @@ private List<Object> getClauses(AggregationOperationContext context, Document ma
 
 		private List<Object> getClauses(AggregationOperationContext context, String key, Object predicate) {
 
-			List<Object> clauses = new ArrayList<Object>();
+			List<Object> clauses = new ArrayList<>();
+
+			if (predicate instanceof List<?> predicates) {
 
-			if (predicate instanceof List) {
+				List<Object> args = new ArrayList<>(predicates.size());
 
-				List<Object> args = new ArrayList<Object>();
-				for (Object clause : (List<?>) predicate) {
-					if (clause instanceof Document) {
-						args.addAll(getClauses(context, (Document) clause));
+				for (Object clause : predicates) {
+					if (clause instanceof Document document) {
+						args.addAll(getClauses(context, document));
 					}
 				}
 
 				clauses.add(new Document(key, args));
-
-			} else if (predicate instanceof Document) {
-
-				Document nested = (Document) predicate;
+			} else if (predicate instanceof Document nested) {
 
 				for (String s : nested.keySet()) {
 
@@ -675,15 +705,14 @@ private List<Object> getClauses(AggregationOperationContext context, String key,
 						continue;
 					}
 
-					List<Object> args = new ArrayList<Object>();
+					List<Object> args = new ArrayList<>(2);
 					args.add("$" + key);
 					args.add(nested.get(s));
 					clauses.add(new Document(s, args));
 				}
-
 			} else if (!isKeyword(key)) {
 
-				List<Object> args = new ArrayList<Object>();
+				List<Object> args = new ArrayList<>(2);
 				args.add("$" + key);
 				args.add(predicate);
 				clauses.add(new Document("$eq", args));
@@ -704,8 +733,8 @@ private boolean isKeyword(String candidate) {
 
 		private Object resolve(AggregationOperationContext context, Object value) {
 
-			if (value instanceof Document) {
-				return context.getMappedObject((Document) value);
+			if (value instanceof Document document) {
+				return context.getMappedObject(document);
 			}
 
 			return context.getReference((Field) value).toString();
@@ -868,111 +897,97 @@ public static ConditionalExpressionBuilder newBuilder() {
 				return new ConditionalExpressionBuilder();
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.bson.Document)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public ConditionalExpressionBuilder when(Document booleanExpression) {
 
-				Assert.notNull(booleanExpression, "'Boolean expression' must not be null!");
+				Assert.notNull(booleanExpression, "'Boolean expression' must not be null");
 
 				this.condition = booleanExpression;
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.springframework.data.mongodb.core.query.CriteriaDefinition)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public ThenBuilder when(CriteriaDefinition criteria) {
 
-				Assert.notNull(criteria, "Criteria must not be null!");
+				Assert.notNull(criteria, "Criteria must not be null");
 				this.condition = criteria;
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public ThenBuilder when(AggregationExpression expression) {
 
-				Assert.notNull(expression, "AggregationExpression field must not be null!");
+				Assert.notNull(expression, "AggregationExpression field must not be null");
 				this.condition = expression;
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.WhenBuilder#when(java.lang.String)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public ThenBuilder when(String booleanField) {
 
-				Assert.hasText(booleanField, "Boolean field name must not be null or empty!");
+				Assert.hasText(booleanField, "Boolean field name must not be null or empty");
 				this.condition = Fields.field(booleanField);
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#then(java.lang.Object)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public OtherwiseBuilder then(Object thenValue) {
 
-				Assert.notNull(thenValue, "Then-value must not be null!");
+				Assert.notNull(thenValue, "Then-value must not be null");
 				this.thenValue = thenValue;
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#thenValueOf(java.lang.String)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public OtherwiseBuilder thenValueOf(String fieldReference) {
 
-				Assert.notNull(fieldReference, "FieldReference must not be null!");
+				Assert.notNull(fieldReference, "FieldReference must not be null");
 				this.thenValue = Fields.field(fieldReference);
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder#thenValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
 			@Override
+			@Contract("_ -> this")
 			public OtherwiseBuilder thenValueOf(AggregationExpression expression) {
 
-				Assert.notNull(expression, "AggregationExpression must not be null!");
+				Assert.notNull(expression, "AggregationExpression must not be null");
 				this.thenValue = expression;
 				return this;
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwise(java.lang.Object)
-			 */
 			@Override
+			@Contract("_ -> new")
 			public Cond otherwise(Object otherwiseValue) {
 
-				Assert.notNull(otherwiseValue, "Value must not be null!");
+				Assert.notNull(otherwiseValue, "Value must not be null");
+				Assert.notNull(condition, "Condition value needs to be set first");
+				Assert.notNull(thenValue, "Then value needs to be set first");
 				return new Cond(condition, thenValue, otherwiseValue);
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwiseValueOf(java.lang.String)
-			 */
 			@Override
+			@Contract("_ -> new")
 			public Cond otherwiseValueOf(String fieldReference) {
 
-				Assert.notNull(fieldReference, "FieldReference must not be null!");
+				Assert.notNull(fieldReference, "FieldReference must not be null");
+				Assert.notNull(condition, "Condition value needs to be set first");
+				Assert.notNull(thenValue, "Then value needs to be set first");
 				return new Cond(condition, thenValue, Fields.field(fieldReference));
 			}
 
-			/* (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.OtherwiseBuilder#otherwiseValueOf(org.springframework.data.mongodb.core.aggregation.AggregationExpression)
-			 */
 			@Override
+			@Contract("_ -> new")
 			public Cond otherwiseValueOf(AggregationExpression expression) {
 
-				Assert.notNull(expression, "AggregationExpression must not be null!");
+				Assert.notNull(expression, "AggregationExpression must not be null");
+				Assert.notNull(condition, "Condition value needs to be set first");
+				Assert.notNull(thenValue, "Then value needs to be set first");
 				return new Cond(condition, thenValue, expression);
 			}
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConvertOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConvertOperators.java
index d112724bff..35a6ad061c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConvertOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ConvertOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,8 @@
 
 import java.util.Collections;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -64,7 +64,7 @@ public static class ConvertOperatorFactory {
 		 */
 		public ConvertOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 
 			this.fieldReference = fieldReference;
 			this.expression = null;
@@ -77,7 +77,7 @@ public ConvertOperatorFactory(String fieldReference) {
 		 */
 		public ConvertOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 
 			this.fieldReference = null;
 			this.expression = expression;
@@ -231,10 +231,23 @@ public ToString convertToString() {
 			return ToString.toString(valueObject());
 		}
 
+		/**
+		 * {@link AggregationExpression} for {@code $degreesToRadians} that converts an input value measured in degrees to
+		 * radians.
+		 *
+		 * @return new instance of {@link DegreesToRadians}.
+		 * @since 3.3
+		 */
+		public DegreesToRadians convertDegreesToRadians() {
+			return DegreesToRadians.degreesToRadians(valueObject());
+		}
+
+		@SuppressWarnings("NullAway")
 		private Convert createConvert() {
 			return usesFieldRef() ? Convert.convertValueOf(fieldReference) : Convert.convertValueOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Object valueObject() {
 			return usesFieldRef() ? Fields.field(fieldReference) : expression;
 		}
@@ -317,9 +330,9 @@ public Convert to(String stringTypeIdentifier) {
 		 * <dt>1</dt>
 		 * <dd>double</dd>
 		 * <dt>2</dt>
-		 * <dd>string</li>
+		 * <dd>string</dd>
 		 * <dt>7</dt>
-		 * <dd>objectId</li>
+		 * <dd>objectId</dd>
 		 * <dt>8</dt>
 		 * <dd>bool</dd>
 		 * <dt>9</dt>
@@ -692,4 +705,52 @@ protected String getMongoMethod() {
 			return "$toString";
 		}
 	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $degreesToRadians} that converts an input value measured in degrees to radians.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class DegreesToRadians extends AbstractAggregationExpression {
+
+		private DegreesToRadians(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Create a new instance of {@link DegreesToRadians} that converts the value of the given field, measured in degrees, to radians.
+		 *
+		 * @param fieldName must not be {@literal null}.
+		 * @return new instance of {@link DegreesToRadians}.
+		 */
+		public static DegreesToRadians degreesToRadiansOf(String fieldName) {
+			return degreesToRadians(Fields.field(fieldName));
+		}
+
+		/**
+		 * Create a new instance of {@link DegreesToRadians} that converts the result of the given {@link AggregationExpression expression}, measured in degrees, to radians.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link DegreesToRadians}.
+		 */
+		public static DegreesToRadians degreesToRadiansOf(AggregationExpression expression) {
+			return degreesToRadians(expression);
+		}
+
+		/**
+		 * Create a new instance of {@link DegreesToRadians} that converts the given value, measured in degrees, to radians.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link DegreesToRadians}.
+		 */
+		public static DegreesToRadians degreesToRadians(Object value) {
+			return new DegreesToRadians(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$degreesToRadians";
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java
index 5560e0d4aa..6a6108f832 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/CountOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,7 @@
  * We recommend to use the static factory method {@link Aggregation#count()} instead of creating instances of this class
  * directly.
  *
- * @see <a href=
- *      "https://docs.mongodb.com/manual/reference/operator/aggregation/count/#pipe._S_count">https://docs.mongodb.com/manual/reference/operator/aggregation/count/</a>
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/count/#pipe._S_count">https://docs.mongodb.com/manual/reference/operator/aggregation/count/</a>
  * @author Mark Paluch
  * @since 1.10
  */
@@ -34,27 +33,26 @@ public class CountOperation implements FieldsExposingAggregationOperation {
 	private final String fieldName;
 
 	/**
-	 * Creates a new {@link CountOperation} given the {@link fieldName} field name.
+	 * Creates a new {@link CountOperation} given the {@literal fieldName} field name.
 	 *
-	 * @param asFieldName must not be {@literal null} or empty.
+	 * @param fieldName must not be {@literal null} or empty.
 	 */
 	public CountOperation(String fieldName) {
 
-		Assert.hasText(fieldName, "Field name must not be null or empty!");
+		Assert.hasText(fieldName, "Field name must not be null or empty");
 		this.fieldName = fieldName;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$count", fieldName);
+		return new Document(getOperator(), fieldName);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$count";
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 		return ExposedFields.from(new ExposedField(fieldName, true));
@@ -71,7 +69,7 @@ public static class CountOperationBuilder {
 		 * Returns the finally to be applied {@link CountOperation} with the given alias.
 		 *
 		 * @param fieldName must not be {@literal null} or empty.
-		 * @return
+		 * @return new instance of {@link CountOperation}.
 		 */
 		public CountOperation as(String fieldName) {
 			return new CountOperation(fieldName);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DataTypeOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DataTypeOperators.java
index 910c658092..26a85bf2c3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DataTypeOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DataTypeOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,7 @@ public class DataTypeOperators {
 	 * Return the BSON data type of the given {@literal field}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Type}.
 	 */
 	public static Type typeOf(String fieldReference) {
 		return Type.typeOf(fieldReference);
@@ -56,11 +56,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Type}.
 		 *
 		 * @param field must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Type}.
 		 */
 		public static Type typeOf(String field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 			return new Type(Fields.field(field));
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DateOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DateOperators.java
index b5a8ab0742..7bf8a231ff 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DateOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DateOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2018. the original author or authors.
+ * Copyright 2016-2025 the original author 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,11 +15,19 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
+import java.util.Locale;
 import java.util.Map;
+import java.util.TimeZone;
+import java.util.concurrent.TimeUnit;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -37,29 +45,54 @@ public class DateOperators {
 	 * Take the date referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link DateOperatorFactory}.
 	 */
 	public static DateOperatorFactory dateOf(String fieldReference) {
 
-		Assert.notNull(fieldReference, "FieldReference must not be null!");
+		Assert.notNull(fieldReference, "FieldReference must not be null");
 		return new DateOperatorFactory(fieldReference);
 	}
 
+	/**
+	 * Take the date referenced by given {@literal fieldReference}.
+	 *
+	 * @param fieldReference must not be {@literal null}.
+	 * @return new instance of {@link DateOperatorFactory}.
+	 * @since 3.3
+	 */
+	public static DateOperatorFactory zonedDateOf(String fieldReference, Timezone timezone) {
+
+		Assert.notNull(fieldReference, "FieldReference must not be null");
+		return new DateOperatorFactory(fieldReference).withTimezone(timezone);
+	}
+
 	/**
 	 * Take the date resulting from the given {@link AggregationExpression}.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link DateOperatorFactory}.
 	 */
 	public static DateOperatorFactory dateOf(AggregationExpression expression) {
 
-		Assert.notNull(expression, "Expression must not be null!");
+		Assert.notNull(expression, "Expression must not be null");
 		return new DateOperatorFactory(expression);
 	}
 
 	/**
-	 * Take the given value as date.
-	 * <p/>
+	 * Take the date resulting from the given {@link AggregationExpression}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link DateOperatorFactory}.
+	 * @since 3.3
+	 */
+	public static DateOperatorFactory zonedDateOf(AggregationExpression expression, Timezone timezone) {
+
+		Assert.notNull(expression, "Expression must not be null");
+		return new DateOperatorFactory(expression).withTimezone(timezone);
+	}
+
+	/**
+	 * Take the given value as date. <br />
 	 * This can be one of:
 	 * <ul>
 	 * <li>{@link java.util.Date}</li>
@@ -77,7 +110,7 @@ public static DateOperatorFactory dateOf(AggregationExpression expression) {
 	 */
 	public static DateOperatorFactory dateValue(Object value) {
 
-		Assert.notNull(value, "Value must not be null!");
+		Assert.notNull(value, "Value must not be null");
 		return new DateOperatorFactory(value);
 	}
 
@@ -109,7 +142,7 @@ public static DateFromString dateFromString(String value) {
 	 * Timezone represents a MongoDB timezone abstraction which can be represented with a timezone ID or offset as a
 	 * {@link String}. Also accepts a {@link AggregationExpression} or {@link Field} that resolves to a {@link String} of
 	 * either Olson Timezone Identifier or a UTC Offset.<br />
-	 * <table valign="top">
+	 * <table>
 	 * <tr>
 	 * <th>Format</th>
 	 * <th>Example</th>
@@ -127,9 +160,10 @@ public static DateFromString dateFromString(String value) {
 	 * +/-[hh], e.g. "+03"</td>
 	 * </tr>
 	 * </table>
-	 * <strong>NOTE: </strong>Support for timezones in aggregations Requires MongoDB 3.6 or later.
+	 * <strong>NOTE:</strong> Support for timezones in aggregations Requires MongoDB 3.6 or later.
 	 *
 	 * @author Christoph Strobl
+	 * @author Mark Paluch
 	 * @since 2.1
 	 */
 	public static class Timezone {
@@ -161,10 +195,65 @@ public static Timezone none() {
 		 */
 		public static Timezone valueOf(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Timezone(value);
 		}
 
+		/**
+		 * Create a {@link Timezone} for the given {@link TimeZone} rendering the offset as UTC offset.
+		 *
+		 * @param timeZone {@link TimeZone} rendering the offset as UTC offset.
+		 * @return new instance of {@link Timezone}.
+		 * @since 3.3
+		 */
+		public static Timezone fromOffset(TimeZone timeZone) {
+
+			Assert.notNull(timeZone, "TimeZone must not be null");
+
+			return fromOffset(
+					ZoneOffset.ofTotalSeconds(Math.toIntExact(TimeUnit.MILLISECONDS.toSeconds(timeZone.getRawOffset()))));
+		}
+
+		/**
+		 * Create a {@link Timezone} for the given {@link ZoneOffset} rendering the offset as UTC offset.
+		 *
+		 * @param offset {@link ZoneOffset} rendering the offset as UTC offset.
+		 * @return new instance of {@link Timezone}.
+		 * @since 3.3
+		 */
+		public static Timezone fromOffset(ZoneOffset offset) {
+
+			Assert.notNull(offset, "ZoneOffset must not be null");
+			return new Timezone(offset.toString());
+		}
+
+		/**
+		 * Create a {@link Timezone} for the given {@link TimeZone} rendering the offset as UTC offset.
+		 *
+		 * @param timeZone {@link Timezone} rendering the offset as zone identifier.
+		 * @return new instance of {@link Timezone}.
+		 * @since 3.3
+		 */
+		public static Timezone fromZone(TimeZone timeZone) {
+
+			Assert.notNull(timeZone, "TimeZone must not be null");
+
+			return valueOf(timeZone.getID());
+		}
+
+		/**
+		 * Create a {@link Timezone} for the given {@link java.time.ZoneId} rendering the offset as UTC offset.
+		 *
+		 * @param zoneId {@link ZoneId} rendering the offset as zone identifier.
+		 * @return new instance of {@link Timezone}.
+		 * @since 3.3
+		 */
+		public static Timezone fromZone(ZoneId zoneId) {
+
+			Assert.notNull(zoneId, "ZoneId must not be null");
+			return new Timezone(zoneId.toString());
+		}
+
 		/**
 		 * Create a {@link Timezone} for the {@link Field} reference holding the Olson Timezone Identifier or UTC Offset.
 		 *
@@ -185,6 +274,11 @@ public static Timezone ofField(String fieldReference) {
 		public static Timezone ofExpression(AggregationExpression expression) {
 			return valueOf(expression);
 		}
+
+		@Nullable
+		Object getValue() {
+			return value;
+		}
 	}
 
 	/**
@@ -223,7 +317,7 @@ public DateOperatorFactory(String fieldReference) {
 
 			this(fieldReference, null, null, Timezone.none());
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 		}
 
 		/**
@@ -235,12 +329,11 @@ public DateOperatorFactory(AggregationExpression expression) {
 
 			this(null, expression, null, Timezone.none());
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 		}
 
 		/**
-		 * Creates new {@link DateOperatorFactory} for given {@code value} that resolves to a Date.
-		 * <p/>
+		 * Creates new {@link DateOperatorFactory} for given {@code value} that resolves to a Date. <br />
 		 * <ul>
 		 * <li>{@link java.util.Date}</li>
 		 * <li>{@link java.util.Calendar}</li>
@@ -256,7 +349,7 @@ public DateOperatorFactory(Object value) {
 
 			this(null, null, value, Timezone.none());
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 		}
 
 		/**
@@ -270,15 +363,213 @@ public DateOperatorFactory(Object value) {
 		 */
 		public DateOperatorFactory withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null!");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new DateOperatorFactory(fieldReference, expression, dateValue, timezone);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that adds the value of the given {@link AggregationExpression
+		 * expression} (in {@literal units}).
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateAdd addValueOf(AggregationExpression expression, String unit) {
+			return applyTimezone(DateAdd.addValueOf(expression, unit).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that adds the value of the given {@link AggregationExpression
+		 * expression} (in {@literal units}).
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateAdd addValueOf(AggregationExpression expression, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+			return applyTimezone(DateAdd.addValueOf(expression, unit.name().toLowerCase(Locale.ROOT)).toDate(dateReference()),
+					timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that adds the value stored at the given {@literal field} (in
+		 * {@literal units}).
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateAdd addValueOf(String fieldReference, String unit) {
+			return applyTimezone(DateAdd.addValueOf(fieldReference, unit).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that adds the value stored at the given {@literal field} (in
+		 * {@literal units}).
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateAdd addValueOf(String fieldReference, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+
+			return applyTimezone(
+					DateAdd.addValueOf(fieldReference, unit.name().toLowerCase(Locale.ROOT)).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that adds the given value (in {@literal units}).
+		 *
+		 * @param value must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return
+		 * @since 3.3 new instance of {@link DateAdd}.
+		 */
+		public DateAdd add(Object value, String unit) {
+			return applyTimezone(DateAdd.addValue(value, unit).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that adds the given value (in {@literal units}).
+		 *
+		 * @param value must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return
+		 * @since 3.3 new instance of {@link DateAdd}.
+		 */
+		public DateAdd add(Object value, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+
+			return applyTimezone(DateAdd.addValue(value, unit.name().toLowerCase(Locale.ROOT)).toDate(dateReference()),
+					timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that subtracts the value of the given {@link AggregationExpression
+		 * expression} (in {@literal units}).
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 * @since 4.0
+		 */
+		public DateSubtract subtractValueOf(AggregationExpression expression, String unit) {
+			return applyTimezone(DateSubtract.subtractValueOf(expression, unit).fromDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that subtracts the value of the given {@link AggregationExpression
+		 * expression} (in {@literal units}).
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 * @since 4.0
+		 */
+		public DateSubtract subtractValueOf(AggregationExpression expression, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+			return applyTimezone(
+					DateSubtract.subtractValueOf(expression, unit.name().toLowerCase(Locale.ROOT)).fromDate(dateReference()),
+					timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that subtracts the value stored at the given {@literal field} (in
+		 * {@literal units}).
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 * @since 4.0
+		 */
+		public DateSubtract subtractValueOf(String fieldReference, String unit) {
+			return applyTimezone(DateSubtract.subtractValueOf(fieldReference, unit).fromDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that subtracts the value stored at the given {@literal field} (in
+		 * {@literal units}).
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 * @since 4.0
+		 */
+		public DateSubtract subtractValueOf(String fieldReference, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+
+			return applyTimezone(
+					DateSubtract.subtractValueOf(fieldReference, unit.name().toLowerCase(Locale.ROOT)).fromDate(dateReference()),
+					timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that subtracts the given value (in {@literal units}).
+		 *
+		 * @param value must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 * @since 4.0
+		 */
+		public DateSubtract subtract(Object value, String unit) {
+			return applyTimezone(DateSubtract.subtractValue(value, unit).fromDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that subtracts the given value (in {@literal units}).
+		 *
+		 * @param value must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 * @since 4.0
+		 */
+		public DateSubtract subtract(Object value, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+
+			return applyTimezone(
+					DateSubtract.subtractValue(value, unit.name().toLowerCase(Locale.ROOT)).fromDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that truncates a date to the given {@literal unit}.
+		 *
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 * @since 4.0
+		 */
+		public DateTrunc truncate(String unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+			return applyTimezone(DateTrunc.truncateValue(dateReference()).to(unit), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that truncates a date to the given {@literal unit}.
+		 *
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 * @since 4.0
+		 */
+		public DateTrunc truncate(TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+			return truncate(unit.name().toLowerCase(Locale.ROOT));
+		}
+
 		/**
 		 * Creates new {@link AggregationExpression} that returns the day of the year for a date as a number between 1 and
 		 * 366.
 		 *
-		 * @return
+		 * @return new instance of {@link DayOfYear}.
 		 */
 		public DayOfYear dayOfYear() {
 			return applyTimezone(DayOfYear.dayOfYear(dateReference()), timezone);
@@ -288,7 +579,7 @@ public DayOfYear dayOfYear() {
 		 * Creates new {@link AggregationExpression} that returns the day of the month for a date as a number between 1 and
 		 * 31.
 		 *
-		 * @return
+		 * @return new instance of {@link DayOfMonth}.
 		 */
 		public DayOfMonth dayOfMonth() {
 			return applyTimezone(DayOfMonth.dayOfMonth(dateReference()), timezone);
@@ -298,16 +589,100 @@ public DayOfMonth dayOfMonth() {
 		 * Creates new {@link AggregationExpression} that returns the day of the week for a date as a number between 1
 		 * (Sunday) and 7 (Saturday).
 		 *
-		 * @return
+		 * @return new instance of {@link DayOfWeek}.
 		 */
 		public DayOfWeek dayOfWeek() {
 			return applyTimezone(DayOfWeek.dayOfWeek(dateReference()), timezone);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the difference (in {@literal units}) to the date
+		 * computed by the given {@link AggregationExpression expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateDiff diffValueOf(AggregationExpression expression, String unit) {
+			return applyTimezone(DateDiff.diffValueOf(expression, unit).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the difference (in {@literal units}) to the date
+		 * computed by the given {@link AggregationExpression expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateDiff diffValueOf(AggregationExpression expression, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+
+			return applyTimezone(
+					DateDiff.diffValueOf(expression, unit.name().toLowerCase(Locale.ROOT)).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the difference (in {@literal units}) to the date stored
+		 * at the given {@literal field}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateDiff diffValueOf(String fieldReference, String unit) {
+			return applyTimezone(DateDiff.diffValueOf(fieldReference, unit).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the difference (in {@literal units}) to the date stored
+		 * at the given {@literal field}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateDiff diffValueOf(String fieldReference, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+
+			return applyTimezone(
+					DateDiff.diffValueOf(fieldReference, unit.name().toLowerCase(Locale.ROOT)).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the difference (in {@literal units}) to the date given
+		 * {@literal value}.
+		 *
+		 * @param value anything the resolves to a valid date. Must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateDiff diff(Object value, String unit) {
+			return applyTimezone(DateDiff.diffValue(value, unit).toDate(dateReference()), timezone);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that calculates the difference (in {@literal units}) to the date given
+		 * {@literal value}.
+		 *
+		 * @param value anything the resolves to a valid date. Must not be {@literal null}.
+		 * @param unit the unit of measure. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}. @since 3.3
+		 */
+		public DateDiff diff(Object value, TemporalUnit unit) {
+
+			Assert.notNull(unit, "TemporalUnit must not be null");
+
+			return applyTimezone(DateDiff.diffValue(value, unit.name().toLowerCase(Locale.ROOT)).toDate(dateReference()),
+					timezone);
+		}
+
 		/**
 		 * Creates new {@link AggregationExpression} that returns the year portion of a date.
 		 *
-		 * @return
+		 * @return new instance of {@link Year}.
 		 */
 		public Year year() {
 			return applyTimezone(Year.year(dateReference()), timezone);
@@ -316,7 +691,7 @@ public Year year() {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the month of a date as a number between 1 and 12.
 		 *
-		 * @return
+		 * @return new instance of {@link Month}.
 		 */
 		public Month month() {
 			return applyTimezone(Month.month(dateReference()), timezone);
@@ -326,7 +701,7 @@ public Month month() {
 		 * Creates new {@link AggregationExpression} that returns the week of the year for a date as a number between 0 and
 		 * 53.
 		 *
-		 * @return
+		 * @return new instance of {@link Week}.
 		 */
 		public Week week() {
 			return applyTimezone(Week.week(dateReference()), timezone);
@@ -335,7 +710,7 @@ public Week week() {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the hour portion of a date as a number between 0 and 23.
 		 *
-		 * @return
+		 * @return new instance of {@link Hour}.
 		 */
 		public Hour hour() {
 			return applyTimezone(Hour.hour(dateReference()), timezone);
@@ -344,7 +719,7 @@ public Hour hour() {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the minute portion of a date as a number between 0 and 59.
 		 *
-		 * @return
+		 * @return new instance of {@link Minute}.
 		 */
 		public Minute minute() {
 			return applyTimezone(Minute.minute(dateReference()), timezone);
@@ -354,7 +729,7 @@ public Minute minute() {
 		 * Creates new {@link AggregationExpression} that returns the second portion of a date as a number between 0 and 59,
 		 * but can be 60 to account for leap seconds.
 		 *
-		 * @return
+		 * @return new instance of {@link Second}.
 		 */
 		public Second second() {
 			return applyTimezone(Second.second(dateReference()), timezone);
@@ -364,7 +739,7 @@ public Second second() {
 		 * Creates new {@link AggregationExpression} that returns the millisecond portion of a date as an integer between 0
 		 * and 999.
 		 *
-		 * @return
+		 * @return new instance of {@link Millisecond}.
 		 */
 		public Millisecond millisecond() {
 			return applyTimezone(Millisecond.millisecond(dateReference()), timezone);
@@ -375,7 +750,7 @@ public Millisecond millisecond() {
 		 * {@literal format}.
 		 *
 		 * @param format must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link DateToString}.
 		 */
 		public DateToString toString(String format) {
 			return applyTimezone(DateToString.dateToString(dateReference()).toString(format), timezone);
@@ -396,7 +771,7 @@ public DateToString toStringWithDefaultFormat() {
 		 * Creates new {@link AggregationExpression} that returns the weekday number in ISO 8601-2018 format, ranging from 1
 		 * (for Monday) to 7 (for Sunday).
 		 *
-		 * @return
+		 * @return new instance of {@link IsoDayOfWeek}.
 		 */
 		public IsoDayOfWeek isoDayOfWeek() {
 			return applyTimezone(IsoDayOfWeek.isoDayWeek(dateReference()), timezone);
@@ -406,7 +781,7 @@ public IsoDayOfWeek isoDayOfWeek() {
 		 * Creates new {@link AggregationExpression} that returns the week number in ISO 8601-2018 format, ranging from 1 to
 		 * 53.
 		 *
-		 * @return
+		 * @return new instance of {@link IsoWeek}.
 		 */
 		public IsoWeek isoWeek() {
 			return applyTimezone(IsoWeek.isoWeek(dateReference()), timezone);
@@ -415,7 +790,7 @@ public IsoWeek isoWeek() {
 		/**
 		 * Creates new {@link AggregationExpression} that returns the year number in ISO 8601-2018 format.
 		 *
-		 * @return
+		 * @return new instance of {@link IsoWeekYear}.
 		 */
 		public IsoWeekYear isoWeekYear() {
 			return applyTimezone(IsoWeekYear.isoWeekYear(dateReference()), timezone);
@@ -444,6 +819,37 @@ public DateFromString fromString() {
 			return applyTimezone(DateFromString.fromString(dateReference()), timezone);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that returns the incrementing ordinal from a timestamp.
+		 *
+		 * @return new instance of {@link TsIncrement}.
+		 * @since 4.0
+		 */
+		public TsIncrement tsIncrement() {
+
+			if (timezone != null && !Timezone.none().equals(timezone)) {
+				throw new IllegalArgumentException("$tsIncrement does not support timezones");
+			}
+
+			return TsIncrement.tsIncrement(dateReference());
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that returns the seconds from a timestamp.
+		 *
+		 * @return new instance of {@link TsIncrement}.
+		 * @since 4.0
+		 */
+		public TsSecond tsSecond() {
+
+			if (timezone != null && !Timezone.none().equals(timezone)) {
+				throw new IllegalArgumentException("$tsSecond does not support timezones");
+			}
+
+			return TsSecond.tsSecond(dateReference());
+		}
+
+		@SuppressWarnings("NullAway")
 		private Object dateReference() {
 
 			if (usesFieldRef()) {
@@ -552,7 +958,7 @@ public DateFromParts yearOf(AggregationExpression expression) {
 		 */
 		public DateFromPartsOperatorFactory withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null!");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new DateFromPartsOperatorFactory(timezone);
 		}
 	}
@@ -581,8 +987,8 @@ protected static java.util.Map<String, Object> appendTimezone(Object source, Tim
 
 			java.util.Map<String, Object> args;
 
-			if (source instanceof Map) {
-				args = new LinkedHashMap<>((Map) source);
+			if (source instanceof Map map) {
+				args = new LinkedHashMap<>(map);
 			} else {
 				args = new LinkedHashMap<>(2);
 				args.put("date", source);
@@ -634,7 +1040,7 @@ private DayOfYear(Object value) {
 		 */
 		public static DayOfYear dayOfYear(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new DayOfYear(value);
 		}
 
@@ -642,11 +1048,11 @@ public static DayOfYear dayOfYear(Object value) {
 		 * Creates new {@link DayOfYear}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link DayOfYear}.
 		 */
 		public static DayOfYear dayOfYear(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return dayOfYear(Fields.field(fieldReference));
 		}
 
@@ -654,11 +1060,11 @@ public static DayOfYear dayOfYear(String fieldReference) {
 		 * Creates new {@link DayOfYear}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link DayOfYear}.
 		 */
 		public static DayOfYear dayOfYear(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return dayOfYear((Object) expression);
 		}
 
@@ -672,9 +1078,10 @@ public static DayOfYear dayOfYear(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public DayOfYear withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new DayOfYear(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -706,7 +1113,7 @@ private DayOfMonth(Object value) {
 		 */
 		public static DayOfMonth dayOfMonth(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new DayOfMonth(value);
 		}
 
@@ -714,11 +1121,11 @@ public static DayOfMonth dayOfMonth(Object value) {
 		 * Creates new {@link DayOfMonth}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link DayOfMonth}.
 		 */
 		public static DayOfMonth dayOfMonth(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return dayOfMonth(Fields.field(fieldReference));
 		}
 
@@ -726,11 +1133,11 @@ public static DayOfMonth dayOfMonth(String fieldReference) {
 		 * Creates new {@link DayOfMonth}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link DayOfMonth}.
 		 */
 		public static DayOfMonth dayOfMonth(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return dayOfMonth((Object) expression);
 		}
 
@@ -744,9 +1151,10 @@ public static DayOfMonth dayOfMonth(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public DayOfMonth withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new DayOfMonth(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -778,7 +1186,7 @@ private DayOfWeek(Object value) {
 		 */
 		public static DayOfWeek dayOfWeek(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new DayOfWeek(value);
 		}
 
@@ -786,11 +1194,11 @@ public static DayOfWeek dayOfWeek(Object value) {
 		 * Creates new {@link DayOfWeek}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link DayOfWeek}.
 		 */
 		public static DayOfWeek dayOfWeek(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return dayOfWeek(Fields.field(fieldReference));
 		}
 
@@ -798,11 +1206,11 @@ public static DayOfWeek dayOfWeek(String fieldReference) {
 		 * Creates new {@link DayOfWeek}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link DayOfWeek}.
 		 */
 		public static DayOfWeek dayOfWeek(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return dayOfWeek((Object) expression);
 		}
 
@@ -816,9 +1224,10 @@ public static DayOfWeek dayOfWeek(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public DayOfWeek withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new DayOfWeek(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -850,7 +1259,7 @@ private Year(Object value) {
 		 */
 		public static Year year(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new Year(value);
 		}
 
@@ -858,11 +1267,11 @@ public static Year year(Object value) {
 		 * Creates new {@link Year}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Year}.
 		 */
 		public static Year yearOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return year(Fields.field(fieldReference));
 		}
 
@@ -870,11 +1279,11 @@ public static Year yearOf(String fieldReference) {
 		 * Creates new {@link Year}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Year}.
 		 */
 		public static Year yearOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return year(expression);
 		}
 
@@ -888,9 +1297,10 @@ public static Year yearOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public Year withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new Year(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -922,7 +1332,7 @@ private Month(Object value) {
 		 */
 		public static Month month(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new Month(value);
 		}
 
@@ -930,11 +1340,11 @@ public static Month month(Object value) {
 		 * Creates new {@link Month}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Month}.
 		 */
 		public static Month monthOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return month(Fields.field(fieldReference));
 		}
 
@@ -942,11 +1352,11 @@ public static Month monthOf(String fieldReference) {
 		 * Creates new {@link Month}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Month}.
 		 */
 		public static Month monthOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return month(expression);
 		}
 
@@ -960,9 +1370,10 @@ public static Month monthOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public Month withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new Month(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -994,7 +1405,7 @@ private Week(Object value) {
 		 */
 		public static Week week(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new Week(value);
 		}
 
@@ -1002,11 +1413,11 @@ public static Week week(Object value) {
 		 * Creates new {@link Week}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Week}.
 		 */
 		public static Week weekOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return week(Fields.field(fieldReference));
 		}
 
@@ -1014,11 +1425,11 @@ public static Week weekOf(String fieldReference) {
 		 * Creates new {@link Week}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Week}.
 		 */
 		public static Week weekOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return week(expression);
 		}
 
@@ -1032,9 +1443,10 @@ public static Week weekOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public Week withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new Week(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1066,7 +1478,7 @@ private Hour(Object value) {
 		 */
 		public static Hour hour(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new Hour(value);
 		}
 
@@ -1074,11 +1486,11 @@ public static Hour hour(Object value) {
 		 * Creates new {@link Hour}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Hour}.
 		 */
 		public static Hour hourOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return hour(Fields.field(fieldReference));
 		}
 
@@ -1086,11 +1498,11 @@ public static Hour hourOf(String fieldReference) {
 		 * Creates new {@link Hour}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Hour}.
 		 */
 		public static Hour hourOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return hour(expression);
 		}
 
@@ -1104,9 +1516,10 @@ public static Hour hourOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public Hour withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new Hour(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1138,7 +1551,7 @@ private Minute(Object value) {
 		 */
 		public static Minute minute(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new Minute(value);
 		}
 
@@ -1146,11 +1559,11 @@ public static Minute minute(Object value) {
 		 * Creates new {@link Minute}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Minute}.
 		 */
 		public static Minute minuteOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return minute(Fields.field(fieldReference));
 		}
 
@@ -1158,11 +1571,11 @@ public static Minute minuteOf(String fieldReference) {
 		 * Creates new {@link Minute}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Minute}.
 		 */
 		public static Minute minuteOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return minute(expression);
 		}
 
@@ -1176,9 +1589,10 @@ public static Minute minuteOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public Minute withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new Minute(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1210,7 +1624,7 @@ private Second(Object value) {
 		 */
 		public static Second second(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new Second(value);
 		}
 
@@ -1218,11 +1632,11 @@ public static Second second(Object value) {
 		 * Creates new {@link Second}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Second}.
 		 */
 		public static Second secondOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return second(Fields.field(fieldReference));
 		}
 
@@ -1230,11 +1644,11 @@ public static Second secondOf(String fieldReference) {
 		 * Creates new {@link Second}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Second}.
 		 */
 		public static Second secondOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return second(expression);
 		}
 
@@ -1248,9 +1662,10 @@ public static Second secondOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public Second withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new Second(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1282,7 +1697,7 @@ private Millisecond(Object value) {
 		 */
 		public static Millisecond millisecond(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new Millisecond(value);
 		}
 
@@ -1290,11 +1705,11 @@ public static Millisecond millisecond(Object value) {
 		 * Creates new {@link Millisecond}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Millisecond}.
 		 */
 		public static Millisecond millisecondOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return millisecond(Fields.field(fieldReference));
 		}
 
@@ -1302,11 +1717,11 @@ public static Millisecond millisecondOf(String fieldReference) {
 		 * Creates new {@link Millisecond}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Millisecond}.
 		 */
 		public static Millisecond millisecondOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return millisecond(expression);
 		}
 
@@ -1320,9 +1735,10 @@ public static Millisecond millisecondOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public Millisecond withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new Millisecond(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1354,14 +1770,14 @@ private DateToString(Object value) {
 		 */
 		public static FormatBuilder dateToString(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 
 			return new FormatBuilder() {
 
 				@Override
 				public DateToString toString(String format) {
 
-					Assert.notNull(format, "Format must not be null!");
+					Assert.notNull(format, "Format must not be null");
 					return new DateToString(argumentMap(value, format, Timezone.none()));
 				}
 
@@ -1376,11 +1792,11 @@ public DateToString defaultFormat() {
 		 * Creates new {@link FormatBuilder} allowing to define the date format to apply.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link FormatBuilder} to crate {@link DateToString}.
 		 */
 		public static FormatBuilder dateOf(final String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return dateToString(Fields.field(fieldReference));
 		}
 
@@ -1388,11 +1804,11 @@ public static FormatBuilder dateOf(final String fieldReference) {
 		 * Creates new {@link FormatBuilder} allowing to define the date format to apply.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link FormatBuilder} to crate {@link DateToString}.
 		 */
 		public static FormatBuilder dateOf(final AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return dateToString(expression);
 		}
 
@@ -1406,9 +1822,10 @@ public static FormatBuilder dateOf(final AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public DateToString withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new DateToString(append("timezone", timezone));
 		}
 
@@ -1420,6 +1837,7 @@ public DateToString withTimezone(Timezone timezone) {
 		 * @return new instance of {@link DateToString}.
 		 * @since 2.1
 		 */
+		@Contract("_ -> new")
 		public DateToString onNullReturn(Object value) {
 			return new DateToString(append("onNull", value));
 		}
@@ -1432,6 +1850,7 @@ public DateToString onNullReturn(Object value) {
 		 * @return new instance of {@link DateToString}.
 		 * @since 2.1
 		 */
+		@Contract("_ -> new")
 		public DateToString onNullReturnValueOf(String fieldReference) {
 			return onNullReturn(Fields.field(fieldReference));
 		}
@@ -1444,6 +1863,7 @@ public DateToString onNullReturnValueOf(String fieldReference) {
 		 * @return new instance of {@link DateToString}.
 		 * @since 2.1
 		 */
+		@Contract("_ -> new")
 		public DateToString onNullReturnValueOf(AggregationExpression expression) {
 			return onNullReturn(expression);
 		}
@@ -1473,14 +1893,13 @@ protected java.util.Map<String, Object> append(String key, Object value) {
 
 			java.util.Map<String, Object> clone = new LinkedHashMap<>(argumentMap());
 
-			if (value instanceof Timezone) {
+			if (value instanceof Timezone timezone) {
 
 				if (ObjectUtils.nullSafeEquals(value, Timezone.none())) {
 					clone.remove("timezone");
 				} else {
-					clone.put("timezone", ((Timezone) value).value);
+					clone.put("timezone", timezone.value);
 				}
-
 			} else {
 				clone.put(key, value);
 			}
@@ -1532,7 +1951,7 @@ private IsoDayOfWeek(Object value) {
 		 */
 		public static IsoDayOfWeek isoDayWeek(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new IsoDayOfWeek(value);
 		}
 
@@ -1540,11 +1959,11 @@ public static IsoDayOfWeek isoDayWeek(Object value) {
 		 * Creates new {@link IsoDayOfWeek}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsoDayOfWeek}.
 		 */
 		public static IsoDayOfWeek isoDayOfWeek(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return isoDayWeek(Fields.field(fieldReference));
 		}
 
@@ -1552,11 +1971,11 @@ public static IsoDayOfWeek isoDayOfWeek(String fieldReference) {
 		 * Creates new {@link IsoDayOfWeek}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsoDayOfWeek}.
 		 */
 		public static IsoDayOfWeek isoDayOfWeek(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return isoDayWeek(expression);
 		}
 
@@ -1570,9 +1989,10 @@ public static IsoDayOfWeek isoDayOfWeek(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public IsoDayOfWeek withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new IsoDayOfWeek(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1604,7 +2024,7 @@ private IsoWeek(Object value) {
 		 */
 		public static IsoWeek isoWeek(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new IsoWeek(value);
 		}
 
@@ -1612,11 +2032,11 @@ public static IsoWeek isoWeek(Object value) {
 		 * Creates new {@link IsoWeek}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsoWeek}.
 		 */
 		public static IsoWeek isoWeekOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return isoWeek(Fields.field(fieldReference));
 		}
 
@@ -1624,11 +2044,11 @@ public static IsoWeek isoWeekOf(String fieldReference) {
 		 * Creates new {@link IsoWeek}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsoWeek}.
 		 */
 		public static IsoWeek isoWeekOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return isoWeek(expression);
 		}
 
@@ -1642,9 +2062,10 @@ public static IsoWeek isoWeekOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public IsoWeek withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new IsoWeek(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1676,7 +2097,7 @@ private IsoWeekYear(Object value) {
 		 */
 		public static IsoWeekYear isoWeekYear(Object value) {
 
-			Assert.notNull(value, "value must not be null!");
+			Assert.notNull(value, "value must not be null");
 			return new IsoWeekYear(value);
 		}
 
@@ -1684,11 +2105,11 @@ public static IsoWeekYear isoWeekYear(Object value) {
 		 * Creates new {@link IsoWeekYear}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsoWeekYear}.
 		 */
 		public static IsoWeekYear isoWeekYearOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return isoWeekYear(Fields.field(fieldReference));
 		}
 
@@ -1696,11 +2117,11 @@ public static IsoWeekYear isoWeekYearOf(String fieldReference) {
 		 * Creates new {@link Millisecond}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IsoWeekYear}.
 		 */
 		public static IsoWeekYear isoWeekYearOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return isoWeekYear(expression);
 		}
 
@@ -1714,9 +2135,10 @@ public static IsoWeekYear isoWeekYearOf(AggregationExpression expression) {
 		 * @since 2.1
 		 */
 		@Override
+		@Contract("_ -> new")
 		public IsoWeekYear withTimezone(Timezone timezone) {
 
-			Assert.notNull(timezone, "Timezone must not be null.");
+			Assert.notNull(timezone, "Timezone must not be null");
 			return new IsoWeekYear(appendTimezone(values().iterator().next(), timezone));
 		}
 
@@ -1829,24 +2251,26 @@ default T secondOf(AggregationExpression expression) {
 		}
 
 		/**
-		 * Set the {@literal milliseconds} to the given value which must resolve to a value in range {@code 0 - 999}. Can be
+		 * Set the {@literal millisecond} to the given value which must resolve to a value in range {@code 0 - 999}. Can be
 		 * a simple value, {@link Field field reference} or {@link AggregationExpression expression}.
 		 *
-		 * @param milliseconds must not be {@literal null}.
+		 * @param millisecond must not be {@literal null}.
 		 * @return new instance.
-		 * @throws IllegalArgumentException if given {@literal milliseconds} is {@literal null}
+		 * @throws IllegalArgumentException if given {@literal millisecond} is {@literal null}
+		 * @since 3.2
 		 */
-		T milliseconds(Object milliseconds);
+		T millisecond(Object millisecond);
 
 		/**
-		 * Set the {@literal milliseconds} to the value resolved by following the given {@link Field field reference}.
+		 * Set the {@literal millisecond} to the value resolved by following the given {@link Field field reference}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
+		 * @since 3.2
 		 */
-		default T millisecondsOf(String fieldReference) {
-			return milliseconds(Fields.field(fieldReference));
+		default T millisecondOf(String fieldReference) {
+			return millisecond(Fields.field(fieldReference));
 		}
 
 		/**
@@ -1855,9 +2279,10 @@ default T millisecondsOf(String fieldReference) {
 		 * @param expression must not be {@literal null}.
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
+		 * @since 3.2
 		 */
-		default T millisecondsOf(AggregationExpression expression) {
-			return milliseconds(expression);
+		default T millisecondOf(AggregationExpression expression) {
+			return millisecond(expression);
 		}
 	}
 
@@ -1895,6 +2320,7 @@ public static DateFromPartsWithYear dateFromParts() {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal month} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public DateFromParts month(Object month) {
 			return new DateFromParts(append("month", month));
 		}
@@ -1906,6 +2332,7 @@ public DateFromParts month(Object month) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public DateFromParts monthOf(String fieldReference) {
 			return month(Fields.field(fieldReference));
 		}
@@ -1917,6 +2344,7 @@ public DateFromParts monthOf(String fieldReference) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public DateFromParts monthOf(AggregationExpression expression) {
 			return month(expression);
 		}
@@ -1929,6 +2357,7 @@ public DateFromParts monthOf(AggregationExpression expression) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal day} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public DateFromParts day(Object day) {
 			return new DateFromParts(append("day", day));
 		}
@@ -1940,6 +2369,7 @@ public DateFromParts day(Object day) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public DateFromParts dayOf(String fieldReference) {
 			return day(Fields.field(fieldReference));
 		}
@@ -1951,28 +2381,33 @@ public DateFromParts dayOf(String fieldReference) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public DateFromParts dayOf(AggregationExpression expression) {
 			return day(expression);
 		}
 
 		@Override
+		@Contract("_ -> new")
 		public DateFromParts hour(Object hour) {
 			return new DateFromParts(append("hour", hour));
 		}
 
 		@Override
+		@Contract("_ -> new")
 		public DateFromParts minute(Object minute) {
 			return new DateFromParts(append("minute", minute));
 		}
 
 		@Override
+		@Contract("_ -> new")
 		public DateFromParts second(Object second) {
 			return new DateFromParts(append("second", second));
 		}
 
 		@Override
-		public DateFromParts milliseconds(Object milliseconds) {
-			return new DateFromParts(append("milliseconds", milliseconds));
+		@Contract("_ -> new")
+		public DateFromParts millisecond(Object millisecond) {
+			return new DateFromParts(append("millisecond", millisecond));
 		}
 
 		/**
@@ -1984,6 +2419,7 @@ public DateFromParts milliseconds(Object milliseconds) {
 		 * @throws IllegalArgumentException if given {@literal timezone} is {@literal null}.
 		 */
 		@Override
+		@Contract("_ -> new")
 		public DateFromParts withTimezone(Timezone timezone) {
 			return new DateFromParts(appendTimezone(argumentMap(), timezone));
 		}
@@ -2017,7 +2453,7 @@ public interface DateFromPartsWithYear {
 			 */
 			default DateFromParts yearOf(String fieldReference) {
 
-				Assert.hasText(fieldReference, "Field reference must not be null nor empty.");
+				Assert.hasText(fieldReference, "Field reference must not be null nor empty");
 				return year(Fields.field(fieldReference));
 			}
 
@@ -2030,7 +2466,7 @@ default DateFromParts yearOf(String fieldReference) {
 			 */
 			default DateFromParts yearOf(AggregationExpression expression) {
 
-				Assert.notNull(expression, "Expression must not be null!");
+				Assert.notNull(expression, "Expression must not be null");
 				return year(expression);
 			}
 		}
@@ -2071,6 +2507,7 @@ public static IsoDateFromPartsWithYear dateFromParts() {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal isoWeek} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public IsoDateFromParts isoWeek(Object isoWeek) {
 			return new IsoDateFromParts(append("isoWeek", isoWeek));
 		}
@@ -2082,6 +2519,7 @@ public IsoDateFromParts isoWeek(Object isoWeek) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public IsoDateFromParts isoWeekOf(String fieldReference) {
 			return isoWeek(Fields.field(fieldReference));
 		}
@@ -2093,6 +2531,7 @@ public IsoDateFromParts isoWeekOf(String fieldReference) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public IsoDateFromParts isoWeekOf(AggregationExpression expression) {
 			return isoWeek(expression);
 		}
@@ -2105,6 +2544,7 @@ public IsoDateFromParts isoWeekOf(AggregationExpression expression) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal isoWeek} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public IsoDateFromParts isoDayOfWeek(Object day) {
 			return new IsoDateFromParts(append("isoDayOfWeek", day));
 		}
@@ -2116,6 +2556,7 @@ public IsoDateFromParts isoDayOfWeek(Object day) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public IsoDateFromParts isoDayOfWeekOf(String fieldReference) {
 			return isoDayOfWeek(Fields.field(fieldReference));
 		}
@@ -2127,28 +2568,33 @@ public IsoDateFromParts isoDayOfWeekOf(String fieldReference) {
 		 * @return new instance.
 		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public IsoDateFromParts isoDayOfWeekOf(AggregationExpression expression) {
 			return isoDayOfWeek(expression);
 		}
 
 		@Override
+		@Contract("_ -> new")
 		public IsoDateFromParts hour(Object hour) {
 			return new IsoDateFromParts(append("hour", hour));
 		}
 
 		@Override
+		@Contract("_ -> new")
 		public IsoDateFromParts minute(Object minute) {
 			return new IsoDateFromParts(append("minute", minute));
 		}
 
 		@Override
+		@Contract("_ -> new")
 		public IsoDateFromParts second(Object second) {
 			return new IsoDateFromParts(append("second", second));
 		}
 
 		@Override
-		public IsoDateFromParts milliseconds(Object milliseconds) {
-			return new IsoDateFromParts(append("milliseconds", milliseconds));
+		@Contract("_ -> new")
+		public IsoDateFromParts millisecond(Object millisecond) {
+			return new IsoDateFromParts(append("millisecond", millisecond));
 		}
 
 		/**
@@ -2160,6 +2606,7 @@ public IsoDateFromParts milliseconds(Object milliseconds) {
 		 * @throws IllegalArgumentException if given {@literal timezone} is {@literal null}.
 		 */
 		@Override
+		@Contract("_ -> new")
 		public IsoDateFromParts withTimezone(Timezone timezone) {
 			return new IsoDateFromParts(appendTimezone(argumentMap(), timezone));
 		}
@@ -2193,7 +2640,7 @@ public interface IsoDateFromPartsWithYear {
 			 */
 			default IsoDateFromParts isoWeekYearOf(String fieldReference) {
 
-				Assert.hasText(fieldReference, "Field reference must not be null nor empty.");
+				Assert.hasText(fieldReference, "Field reference must not be null nor empty");
 				return isoWeekYear(Fields.field(fieldReference));
 			}
 
@@ -2206,7 +2653,7 @@ default IsoDateFromParts isoWeekYearOf(String fieldReference) {
 			 */
 			default IsoDateFromParts isoWeekYearOf(AggregationExpression expression) {
 
-				Assert.notNull(expression, "Expression must not be null!");
+				Assert.notNull(expression, "Expression must not be null");
 				return isoWeekYear(expression);
 			}
 		}
@@ -2237,7 +2684,7 @@ private DateToParts(Object value) {
 		 */
 		public static DateToParts dateToParts(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new DateToParts(Collections.singletonMap("date", value));
 		}
 
@@ -2250,7 +2697,7 @@ public static DateToParts dateToParts(Object value) {
 		 */
 		public static DateToParts datePartsOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return dateToParts(Fields.field(fieldReference));
 		}
 
@@ -2270,6 +2717,7 @@ public static DateToParts datePartsOf(AggregationExpression expression) {
 		 *
 		 * @return new instance of {@link DateToParts}.
 		 */
+		@Contract("_ -> new")
 		public DateToParts iso8601() {
 			return new DateToParts(append("iso8601", true));
 		}
@@ -2283,6 +2731,7 @@ public DateToParts iso8601() {
 		 * @throws IllegalArgumentException if given {@literal timezone} is {@literal null}.
 		 */
 		@Override
+		@Contract("_ -> new")
 		public DateToParts withTimezone(Timezone timezone) {
 			return new DateToParts(appendTimezone(argumentMap(), timezone));
 		}
@@ -2327,6 +2776,7 @@ public static DateFromString fromString(Object value) {
 		 * @return new instance of {@link DateFromString}.
 		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public static DateFromString fromStringOf(String fieldReference) {
 			return fromString(Fields.field(fieldReference));
 		}
@@ -2338,6 +2788,7 @@ public static DateFromString fromStringOf(String fieldReference) {
 		 * @return new instance of {@link DateFromString}.
 		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public static DateFromString fromStringOf(AggregationExpression expression) {
 			return fromString(expression);
 		}
@@ -2351,6 +2802,7 @@ public static DateFromString fromStringOf(AggregationExpression expression) {
 		 * @throws IllegalArgumentException if given {@literal timezone} is {@literal null}.
 		 */
 		@Override
+		@Contract("_ -> new")
 		public DateFromString withTimezone(Timezone timezone) {
 			return new DateFromString(appendTimezone(argumentMap(), timezone));
 		}
@@ -2363,9 +2815,10 @@ public DateFromString withTimezone(Timezone timezone) {
 		 * @return new instance of {@link DateFromString}.
 		 * @throws IllegalArgumentException if given {@literal format} is {@literal null}.
 		 */
+		@Contract("_ -> new")
 		public DateFromString withFormat(String format) {
 
-			Assert.notNull(format, "Format must not be null!");
+			Assert.notNull(format, "Format must not be null");
 			return new DateFromString(append("format", format));
 		}
 
@@ -2375,9 +2828,655 @@ protected String getMongoMethod() {
 		}
 	}
 
+	/**
+	 * {@link AggregationExpression} for {@code $dateAdd}.<br />
+	 * <strong>NOTE:</strong> Requires MongoDB 5.0 or later.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class DateAdd extends TimezonedDateAggregationExpression {
+
+		private DateAdd(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Add the number of {@literal units} of the result of the given {@link AggregationExpression expression} to a
+		 * {@link #toDate(Object) start date}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		public static DateAdd addValueOf(AggregationExpression expression, String unit) {
+			return addValue(expression, unit);
+		}
+
+		/**
+		 * Add the number of {@literal units} from a {@literal field} to a {@link #toDate(Object) start date}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		public static DateAdd addValueOf(String fieldReference, String unit) {
+			return addValue(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Add the number of {@literal units} to a {@link #toDate(Object) start date}.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		public static DateAdd addValue(Object value, String unit) {
+
+			Map<String, Object> args = new HashMap<>();
+			args.put("unit", unit);
+			args.put("amount", value);
+			return new DateAdd(args);
+		}
+
+		/**
+		 * Define the start date, in UTC, for the addition operation.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateAdd toDateOf(AggregationExpression expression) {
+			return toDate(expression);
+		}
+
+		/**
+		 * Define the start date, in UTC, for the addition operation.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateAdd toDateOf(String fieldReference) {
+			return toDate(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Define the start date, in UTC, for the addition operation.
+		 *
+		 * @param dateExpression anything that evaluates to a valid date. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateAdd toDate(Object dateExpression) {
+			return new DateAdd(append("startDate", dateExpression));
+		}
+
+		/**
+		 * Optionally set the {@link Timezone} to use. If not specified {@literal UTC} is used.
+		 *
+		 * @param timezone must not be {@literal null}. Consider {@link Timezone#none()} instead.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateAdd withTimezone(Timezone timezone) {
+			return new DateAdd(appendTimezone(argumentMap(), timezone));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$dateAdd";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $dateSubtract}.<br />
+	 * <strong>NOTE:</strong> Requires MongoDB 5.0 or later.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class DateSubtract extends TimezonedDateAggregationExpression {
+
+		private DateSubtract(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Subtract the number of {@literal units} of the result of the given {@link AggregationExpression expression} from
+		 * a {@link #fromDate(Object) start date}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 */
+		public static DateSubtract subtractValueOf(AggregationExpression expression, String unit) {
+			return subtractValue(expression, unit);
+		}
+
+		/**
+		 * Subtract the number of {@literal units} from a {@literal field} from a {@link #fromDate(Object) start date}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 */
+		public static DateSubtract subtractValueOf(String fieldReference, String unit) {
+			return subtractValue(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Subtract the number of {@literal units} from a {@link #fromDate(Object) start date}.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 */
+		public static DateSubtract subtractValue(Object value, String unit) {
+
+			Map<String, Object> args = new HashMap<>();
+			args.put("unit", unit);
+			args.put("amount", value);
+			return new DateSubtract(args);
+		}
+
+		/**
+		 * Define the start date, in UTC, for the subtraction operation.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 */
+		@Contract("_ -> new")
+		public DateSubtract fromDateOf(AggregationExpression expression) {
+			return fromDate(expression);
+		}
+
+		/**
+		 * Define the start date, in UTC, for the subtraction operation.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 */
+		@Contract("_ -> new")
+		public DateSubtract fromDateOf(String fieldReference) {
+			return fromDate(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Define the start date, in UTC, for the subtraction operation.
+		 *
+		 * @param dateExpression anything that evaluates to a valid date. Must not be {@literal null}.
+		 * @return new instance of {@link DateSubtract}.
+		 */
+		@Contract("_ -> new")
+		public DateSubtract fromDate(Object dateExpression) {
+			return new DateSubtract(append("startDate", dateExpression));
+		}
+
+		/**
+		 * Optionally set the {@link Timezone} to use. If not specified {@literal UTC} is used.
+		 *
+		 * @param timezone must not be {@literal null}. Consider {@link Timezone#none()} instead.
+		 * @return new instance of {@link DateSubtract}.
+		 */
+		@Contract("_ -> new")
+		public DateSubtract withTimezone(Timezone timezone) {
+			return new DateSubtract(appendTimezone(argumentMap(), timezone));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$dateSubtract";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $dateDiff}.<br />
+	 * <strong>NOTE:</strong> Requires MongoDB 5.0 or later.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class DateDiff extends TimezonedDateAggregationExpression {
+
+		private DateDiff(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Add the number of {@literal units} of the result of the given {@link AggregationExpression expression} to a
+		 * {@link #toDate(Object) start date}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		public static DateDiff diffValueOf(AggregationExpression expression, String unit) {
+			return diffValue(expression, unit);
+		}
+
+		/**
+		 * Add the number of {@literal units} from a {@literal field} to a {@link #toDate(Object) start date}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		public static DateDiff diffValueOf(String fieldReference, String unit) {
+			return diffValue(Fields.field(fieldReference), unit);
+		}
+
+		/**
+		 * Add the number of {@literal units} to a {@link #toDate(Object) start date}.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		public static DateDiff diffValue(Object value, String unit) {
+
+			Map<String, Object> args = new HashMap<>();
+			args.put("unit", unit);
+			args.put("endDate", value);
+			return new DateDiff(args);
+		}
+
+		/**
+		 * Define the start date, in UTC, for the addition operation.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateDiff toDateOf(AggregationExpression expression) {
+			return toDate(expression);
+		}
+
+		/**
+		 * Define the start date, in UTC, for the addition operation.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateDiff toDateOf(String fieldReference) {
+			return toDate(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Define the start date, in UTC, for the addition operation.
+		 *
+		 * @param dateExpression anything that evaluates to a valid date. Must not be {@literal null}.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateDiff toDate(Object dateExpression) {
+			return new DateDiff(append("startDate", dateExpression));
+		}
+
+		/**
+		 * Optionally set the {@link Timezone} to use. If not specified {@literal UTC} is used.
+		 *
+		 * @param timezone must not be {@literal null}. Consider {@link Timezone#none()} instead.
+		 * @return new instance of {@link DateAdd}.
+		 */
+		@Contract("_ -> new")
+		public DateDiff withTimezone(Timezone timezone) {
+			return new DateDiff(appendTimezone(argumentMap(), timezone));
+		}
+
+		/**
+		 * Set the start day of the week if the unit if measure is set to {@literal week}. Uses {@literal Sunday} by
+		 * default.
+		 *
+		 * @param day must not be {@literal null}.
+		 * @return new instance of {@link DateDiff}.
+		 */
+		@Contract("_ -> new")
+		public DateDiff startOfWeek(Object day) {
+			return new DateDiff(append("startOfWeek", day));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$dateDiff";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $dateTrunc}.<br />
+	 * <strong>NOTE:</strong> Requires MongoDB 5.0 or later.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class DateTrunc extends TimezonedDateAggregationExpression {
+
+		private DateTrunc(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Truncates the date value of computed by the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		public static DateTrunc truncateValueOf(AggregationExpression expression) {
+			return truncateValue(expression);
+		}
+
+		/**
+		 * Truncates the date value of the referenced {@literal field}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		public static DateTrunc truncateValueOf(String fieldReference) {
+			return truncateValue(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Truncates the date value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		public static DateTrunc truncateValue(Object value) {
+			return new DateTrunc(Collections.singletonMap("date", value));
+		}
+
+		/**
+		 * Define the unit of time.
+		 *
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc to(String unit) {
+			return new DateTrunc(append("unit", unit));
+		}
+
+		/**
+		 * Define the unit of time via an {@link AggregationExpression}.
+		 *
+		 * @param unit must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc to(AggregationExpression unit) {
+			return new DateTrunc(append("unit", unit));
+		}
+
+		/**
+		 * Define the weeks starting day if {@link #to(String)} resolves to {@literal week}.
+		 *
+		 * @param day must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc startOfWeek(java.time.DayOfWeek day) {
+			return startOfWeek(day.name().toLowerCase(Locale.US));
+		}
+
+		/**
+		 * Define the weeks starting day if {@link #to(String)} resolves to {@literal week}.
+		 *
+		 * @param day must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc startOfWeek(String day) {
+			return new DateTrunc(append("startOfWeek", day));
+		}
+
+		/**
+		 * Define the numeric time value.
+		 *
+		 * @param binSize must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc binSize(int binSize) {
+			return binSize((Object) binSize);
+		}
+
+		/**
+		 * Define the numeric time value via an {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc binSize(AggregationExpression expression) {
+			return binSize((Object) expression);
+		}
+
+		/**
+		 * Define the numeric time value.
+		 *
+		 * @param binSize must not be {@literal null}.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc binSize(Object binSize) {
+			return new DateTrunc(append("binSize", binSize));
+		}
+
+		/**
+		 * Optionally set the {@link Timezone} to use. If not specified {@literal UTC} is used.
+		 *
+		 * @param timezone must not be {@literal null}. Consider {@link Timezone#none()} instead.
+		 * @return new instance of {@link DateTrunc}.
+		 */
+		@Contract("_ -> new")
+		public DateTrunc withTimezone(Timezone timezone) {
+			return new DateTrunc(appendTimezone(argumentMap(), timezone));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$dateTrunc";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $tsIncrement}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class TsIncrement extends AbstractAggregationExpression {
+
+		private TsIncrement(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link TsIncrement} that returns the incrementing ordinal from a timestamp.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link TsIncrement}.
+		 * @throws IllegalArgumentException if given {@literal value} is {@literal null}.
+		 */
+		public static TsIncrement tsIncrement(Object value) {
+
+			Assert.notNull(value, "Value must not be null");
+			return new TsIncrement(value);
+		}
+
+		/**
+		 * Creates new {@link TsIncrement} that returns the incrementing ordinal from a timestamp.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link TsIncrement}.
+		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
+		 */
+		public static TsIncrement tsIncrementValueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return tsIncrement(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates new {@link TsIncrement}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link TsIncrement}.
+		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
+		 */
+		public static TsIncrement tsIncrementValueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return tsIncrement(expression);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$tsIncrement";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $tsSecond}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class TsSecond extends AbstractAggregationExpression {
+
+		private TsSecond(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link TsSecond} that returns the incrementing ordinal from a timestamp.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link TsSecond}.
+		 * @throws IllegalArgumentException if given {@literal value} is {@literal null}.
+		 */
+		public static TsSecond tsSecond(Object value) {
+
+			Assert.notNull(value, "Value must not be null");
+			return new TsSecond(value);
+		}
+
+		/**
+		 * Creates new {@link TsSecond} that returns the incrementing ordinal from a timestamp.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link TsSecond}.
+		 * @throws IllegalArgumentException if given {@literal fieldReference} is {@literal null}.
+		 */
+		public static TsSecond tsSecondValueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return tsSecond(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates new {@link TsSecond}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link TsSecond}.
+		 * @throws IllegalArgumentException if given {@literal expression} is {@literal null}.
+		 */
+		public static TsSecond tsSecondValueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return tsSecond(expression);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$tsSecond";
+		}
+	}
+
+	/**
+	 * Interface defining a temporal unit for date operators.
+	 *
+	 * @author Mark Paluch
+	 * @since 3.3
+	 */
+	public interface TemporalUnit {
+
+		String name();
+
+		/**
+		 * Converts the given time unit into a {@link TemporalUnit}. Supported units are: days, hours, minutes, seconds, and
+		 * milliseconds.
+		 *
+		 * @param timeUnit the time unit to convert, must not be {@literal null}.
+		 * @return
+		 * @throws IllegalArgumentException if the {@link TimeUnit} is {@literal null} or not supported for conversion.
+		 */
+		static TemporalUnit from(TimeUnit timeUnit) {
+
+			Assert.notNull(timeUnit, "TimeUnit must not be null");
+
+			switch (timeUnit) {
+				case DAYS:
+					return TemporalUnits.DAY;
+				case HOURS:
+					return TemporalUnits.HOUR;
+				case MINUTES:
+					return TemporalUnits.MINUTE;
+				case SECONDS:
+					return TemporalUnits.SECOND;
+				case MILLISECONDS:
+					return TemporalUnits.MILLISECOND;
+			}
+
+			throw new IllegalArgumentException(String.format("Cannot create TemporalUnit from %s", timeUnit));
+		}
+
+		/**
+		 * Converts the given chrono unit into a {@link TemporalUnit}. Supported units are: years, weeks, months, days,
+		 * hours, minutes, seconds, and millis.
+		 *
+		 * @param chronoUnit the chrono unit to convert, must not be {@literal null}.
+		 * @return
+		 * @throws IllegalArgumentException if the {@link TimeUnit} is {@literal null} or not supported for conversion.
+		 */
+		static TemporalUnit from(ChronoUnit chronoUnit) {
+
+			switch (chronoUnit) {
+				case YEARS:
+					return TemporalUnits.YEAR;
+				case WEEKS:
+					return TemporalUnits.WEEK;
+				case MONTHS:
+					return TemporalUnits.MONTH;
+				case DAYS:
+					return TemporalUnits.DAY;
+				case HOURS:
+					return TemporalUnits.HOUR;
+				case MINUTES:
+					return TemporalUnits.MINUTE;
+				case SECONDS:
+					return TemporalUnits.SECOND;
+				case MILLIS:
+					return TemporalUnits.MILLISECOND;
+			}
+
+			throw new IllegalArgumentException(String.format("Cannot create TemporalUnit from %s", chronoUnit));
+		}
+	}
+
+	/**
+	 * Supported temporal units.
+	 */
+	enum TemporalUnits implements TemporalUnit {
+		YEAR, QUARTER, WEEK, MONTH, DAY, HOUR, MINUTE, SECOND, MILLISECOND
+
+	}
+
 	@SuppressWarnings("unchecked")
 	private static <T extends TimezonedDateAggregationExpression> T applyTimezone(T instance, Timezone timezone) {
 		return !ObjectUtils.nullSafeEquals(Timezone.none(), timezone) && !instance.hasTimezone()
-				? (T) instance.withTimezone(timezone) : instance;
+				? (T) instance.withTimezone(timezone)
+				: instance;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DensifyOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DensifyOperation.java
new file mode 100644
index 0000000000..1a559fd26e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DensifyOperation.java
@@ -0,0 +1,390 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+/***
+ * Encapsulates the aggregation framework {@code $densify}-operation.
+ *
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+public class DensifyOperation implements AggregationOperation {
+
+	private @Nullable Field field;
+	private @Nullable List<?> partitionBy;
+	private @Nullable Range range;
+
+	protected DensifyOperation(@Nullable Field field, @Nullable List<?> partitionBy, @Nullable Range range) {
+
+		this.field = field;
+		this.partitionBy = partitionBy;
+		this.range = range;
+	}
+
+	/**
+	 * Obtain a builder to create the {@link DensifyOperation}.
+	 *
+	 * @return new instance of {@link DensifyOperationBuilder}.
+	 */
+	public static DensifyOperationBuilder builder() {
+		return new DensifyOperationBuilder();
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+
+		Assert.notNull(field, "Field must be set first");
+		Assert.notNull(range, "Range must be set first");
+
+		Document densify = new Document();
+		densify.put("field", context.getReference(field).getRaw());
+		if (!ObjectUtils.isEmpty(partitionBy)) {
+			densify.put("partitionByFields", partitionBy.stream().map(it -> {
+				if (it instanceof Field field) {
+					return context.getReference(field).getRaw();
+				}
+				if (it instanceof AggregationExpression expression) {
+					return expression.toDocument(context);
+				}
+				return it;
+			}).collect(Collectors.toList()));
+		}
+		densify.put("range", range.toDocument(context));
+		return new Document("$densify", densify);
+	}
+
+	/**
+	 * The {@link Range} specifies how the data is densified.
+	 */
+	public interface Range {
+
+		/**
+		 * Add documents spanning the range of values within the given lower (inclusive) and upper (exclusive) bound.
+		 *
+		 * @param lower must not be {@literal null}.
+		 * @param upper must not be {@literal null}.
+		 * @return new instance of {@link DensifyRange}.
+		 */
+		static DensifyRange bounded(Object lower, Object upper) {
+			return new BoundedRange(lower, upper, DensifyUnits.NONE);
+		}
+
+		/**
+		 * Add documents spanning the full value range.
+		 *
+		 * @return new instance of {@link DensifyRange}.
+		 */
+		static DensifyRange full() {
+
+			return new DensifyRange(DensifyUnits.NONE) {
+
+				@Override
+				Object getBounds(AggregationOperationContext ctx) {
+					return "full";
+				}
+			};
+		}
+
+		/**
+		 * Add documents spanning the full value range for each partition.
+		 *
+		 * @return new instance of {@link DensifyRange}.
+		 */
+		static DensifyRange partition() {
+			return new DensifyRange(DensifyUnits.NONE) {
+
+				@Override
+				Object getBounds(AggregationOperationContext ctx) {
+					return "partition";
+				}
+			};
+		}
+
+		/**
+		 * Obtain the document representation of the window in a default {@link AggregationOperationContext context}.
+		 *
+		 * @return never {@literal null}.
+		 */
+		default Document toDocument() {
+			return toDocument(Aggregation.DEFAULT_CONTEXT);
+		}
+
+		/**
+		 * Obtain the document representation of the window in the given {@link AggregationOperationContext context}.
+		 *
+		 * @return never {@literal null}.
+		 */
+		Document toDocument(AggregationOperationContext ctx);
+	}
+
+	/**
+	 * Base {@link Range} implementation.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static abstract class DensifyRange implements Range {
+
+		private @Nullable DensifyUnit unit;
+		private @Nullable Number step;
+
+		public DensifyRange(@Nullable DensifyUnit unit) {
+			this.unit = unit;
+		}
+
+		@Override
+		public Document toDocument(AggregationOperationContext ctx) {
+
+			Document range = new Document("step", step);
+			if (unit != null && !DensifyUnits.NONE.equals(unit)) {
+				range.put("unit", unit.name().toLowerCase(Locale.US));
+			}
+			range.put("bounds", getBounds(ctx));
+			return range;
+		}
+
+		/**
+		 * Set the increment for the value.
+		 *
+		 * @param step must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public DensifyRange incrementBy(Number step) {
+			this.step = step;
+			return this;
+		}
+
+		/**
+		 * Set the increment for the value.
+		 *
+		 * @param step must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_, _ -> this")
+		public DensifyRange incrementBy(Number step, DensifyUnit unit) {
+			this.step = step;
+			return unit(unit);
+		}
+
+		/**
+		 * Set the {@link DensifyUnit unit} for the step field.
+		 *
+		 * @param unit
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public DensifyRange unit(DensifyUnit unit) {
+
+			this.unit = unit;
+			return this;
+		}
+
+		abstract Object getBounds(AggregationOperationContext ctx);
+	}
+
+	/**
+	 * {@link Range} implementation holding lower and upper bound values.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class BoundedRange extends DensifyRange {
+
+		private List<Object> bounds;
+
+		protected BoundedRange(Object lower, Object upper, DensifyUnit unit) {
+
+			super(unit);
+			this.bounds = Arrays.asList(lower, upper);
+		}
+
+		@Override
+		List<Object> getBounds(AggregationOperationContext ctx) {
+			return bounds.stream().map(it -> {
+				if (it instanceof AggregationExpression expression) {
+					return expression.toDocument(ctx);
+				}
+				return it;
+			}).collect(Collectors.toList());
+		}
+	}
+
+	/**
+	 * The actual time unit to apply to a {@link Range}.
+	 */
+	public interface DensifyUnit {
+
+		String name();
+
+		/**
+		 * Converts the given time unit into a {@link DensifyUnit}. Supported units are: days, hours, minutes, seconds, and
+		 * milliseconds.
+		 *
+		 * @param timeUnit the time unit to convert, must not be {@literal null}.
+		 * @return
+		 * @throws IllegalArgumentException if the {@link TimeUnit} is {@literal null} or not supported for conversion.
+		 */
+		static DensifyUnit from(TimeUnit timeUnit) {
+
+			Assert.notNull(timeUnit, "TimeUnit must not be null");
+
+			switch (timeUnit) {
+				case DAYS:
+					return DensifyUnits.DAY;
+				case HOURS:
+					return DensifyUnits.HOUR;
+				case MINUTES:
+					return DensifyUnits.MINUTE;
+				case SECONDS:
+					return DensifyUnits.SECOND;
+				case MILLISECONDS:
+					return DensifyUnits.MILLISECOND;
+			}
+
+			throw new IllegalArgumentException(String.format("Cannot create DensifyUnit from %s", timeUnit));
+		}
+
+		/**
+		 * Converts the given chrono unit into a {@link DensifyUnit}. Supported units are: years, weeks, months, days,
+		 * hours, minutes, seconds, and millis.
+		 *
+		 * @param chronoUnit the chrono unit to convert, must not be {@literal null}.
+		 * @return
+		 * @throws IllegalArgumentException if the {@link TimeUnit} is {@literal null} or not supported for conversion.
+		 */
+		static DensifyUnits from(ChronoUnit chronoUnit) {
+
+			switch (chronoUnit) {
+				case YEARS:
+					return DensifyUnits.YEAR;
+				case WEEKS:
+					return DensifyUnits.WEEK;
+				case MONTHS:
+					return DensifyUnits.MONTH;
+				case DAYS:
+					return DensifyUnits.DAY;
+				case HOURS:
+					return DensifyUnits.HOUR;
+				case MINUTES:
+					return DensifyUnits.MINUTE;
+				case SECONDS:
+					return DensifyUnits.SECOND;
+				case MILLIS:
+					return DensifyUnits.MILLISECOND;
+			}
+
+			throw new IllegalArgumentException(String.format("Cannot create DensifyUnit from %s", chronoUnit));
+		}
+	}
+
+	/**
+	 * Quick access to available {@link DensifyUnit units}.
+	 */
+	public enum DensifyUnits implements DensifyUnit {
+		NONE, YEAR, QUARTER, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND
+	}
+
+	public static class DensifyOperationBuilder {
+
+		DensifyOperation target;
+
+		public DensifyOperationBuilder() {
+			this.target = new DensifyOperation(null, Collections.emptyList(), null);
+		}
+
+		/**
+		 * Set the field to densify.
+		 *
+		 * @param fieldname must not be {@literal null}.
+		 * @return this.
+		 */
+		public DensifyOperationBuilder densify(String fieldname) {
+			this.target.field = Fields.field(fieldname);
+			return this;
+		}
+
+		/**
+		 * Set the fields used for grouping documents.
+		 *
+		 * @param fields must not be {@literal null}.
+		 * @return this.
+		 */
+		public DensifyOperationBuilder partitionBy(String... fields) {
+			target.partitionBy = Fields.fields(fields).asList();
+			return this;
+		}
+
+		/**
+		 * Set the operational range.
+		 *
+		 * @param range must not be {@literal null}.
+		 * @return this.
+		 */
+		public DensifyOperationBuilder range(Range range) {
+
+			target.range = range;
+			return this;
+		}
+
+		/**
+		 * Operate on full range.
+		 *
+		 * @param consumer
+		 * @return this.
+		 */
+		public DensifyOperationBuilder fullRange(Consumer<DensifyRange> consumer) {
+
+			Assert.notNull(consumer, "Consumer must not be null");
+
+			DensifyRange range = Range.full();
+			consumer.accept(range);
+
+			return range(range);
+		}
+
+		/**
+		 * Operate on full range.
+		 *
+		 * @param consumer
+		 * @return this.
+		 */
+		public DensifyOperationBuilder partitionRange(Consumer<DensifyRange> consumer) {
+
+			DensifyRange range = Range.partition();
+			consumer.accept(range);
+
+			return range(range);
+		}
+
+		public DensifyOperation build() {
+			return new DensifyOperation(target.field, target.partitionBy, target.range);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentEnhancingOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentEnhancingOperation.java
new file mode 100644
index 0000000000..431215e852
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentEnhancingOperation.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
+import org.springframework.util.Assert;
+
+/**
+ * Base class for common tasks required by {@link SetOperation} and {@link AddFieldsOperation}.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+abstract class DocumentEnhancingOperation implements InheritsFieldsAggregationOperation {
+
+	private final Map<Object, Object> valueMap;
+
+	private ExposedFields exposedFields = ExposedFields.empty();
+
+	protected DocumentEnhancingOperation(Map<Object, Object> source) {
+
+		this.valueMap = new LinkedHashMap<>(source);
+		for (Object key : source.keySet()) {
+			this.exposedFields = add(key);
+		}
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+
+		AggregationOperationContext operationContext = context.inheritAndExpose(exposedFields);
+
+		if (valueMap.size() == 1) {
+			return context.getMappedObject(
+					new Document(mongoOperator(), toSetEntry(valueMap.entrySet().iterator().next(), operationContext)));
+		}
+
+		Document $set = new Document();
+		valueMap.entrySet().stream().map(it -> toSetEntry(it, operationContext)).forEach($set::putAll);
+		return context.getMappedObject(new Document(mongoOperator(), $set));
+	}
+
+	/**
+	 * @return the String representation of the native MongoDB operator.
+	 */
+	protected abstract String mongoOperator();
+
+	@Override
+	public String getOperator() {
+		return mongoOperator();
+	}
+
+	/**
+	 * @return the raw value map
+	 */
+	protected Map<Object, Object> getValueMap() {
+		return this.valueMap;
+	}
+
+	@Override
+	public ExposedFields getFields() {
+		return exposedFields;
+	}
+
+	private ExposedFields add(Object fieldValue) {
+
+		if (fieldValue instanceof Field field) {
+			return exposedFields.and(new ExposedField(field, true));
+		}
+		if (fieldValue instanceof String fieldName) {
+			return exposedFields.and(new ExposedField(Fields.field(fieldName), true));
+		}
+
+		throw new IllegalArgumentException(String.format("Expected %s to be a field/property", fieldValue));
+	}
+
+	private static Document toSetEntry(Entry<Object, Object> entry, AggregationOperationContext context) {
+
+		String field = entry.getKey() instanceof String key ? context.getReference(key).getRaw()
+				: context.getReference((Field) entry.getKey()).getRaw();
+
+		Object value = computeValue(entry.getValue(), context);
+
+		return new Document(field, value);
+	}
+
+	private static @Nullable Object computeValue(@Nullable Object value, AggregationOperationContext context) {
+
+		if(value == null) {
+			return value;
+		}
+
+		if (value instanceof Field field) {
+			return context.getReference(field).toString();
+		}
+
+		if (value instanceof ExpressionProjection expressionProjection) {
+			return expressionProjection.toExpression(context);
+		}
+
+		if (value instanceof AggregationExpression aggregationExpression) {
+			return aggregationExpression.toDocument(context);
+		}
+
+		if (value instanceof Collection<?> collection) {
+			return collection.stream().map(it -> computeValue(it, context)).collect(Collectors.toList());
+		}
+
+		return value;
+	}
+
+	/**
+	 * A {@link AggregationExpression} based on a SpEL expression.
+	 *
+	 * @author Mark Paluch
+	 */
+	static class ExpressionProjection {
+
+		private static final SpelExpressionTransformer TRANSFORMER = new SpelExpressionTransformer();
+
+		private final String expression;
+		private final Object[] params;
+
+		/**
+		 * Creates a new {@link ProjectionOperation.ExpressionProjectionOperationBuilder.ExpressionProjection} for the given
+		 * field, SpEL expression and parameters.
+		 *
+		 * @param expression must not be {@literal null} or empty.
+		 * @param parameters must not be {@literal null}.
+		 */
+		ExpressionProjection(String expression, Object[] parameters) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			Assert.notNull(parameters, "Parameters must not be null");
+
+			this.expression = expression;
+			this.params = parameters.clone();
+		}
+
+		@Nullable Object toExpression(AggregationOperationContext context) {
+			return TRANSFORMER.transform(expression, context, params);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentOperators.java
new file mode 100644
index 0000000000..a0cd1d056a
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentOperators.java
@@ -0,0 +1,226 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import java.util.Collections;
+
+import org.bson.Document;
+import org.springframework.lang.Contract;
+
+/**
+ * Gateway to {@literal document expressions} such as {@literal $rank, $documentNumber, etc.}
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public class DocumentOperators {
+
+	/**
+	 * Obtain the document position (including gaps) relative to others (rank).
+	 *
+	 * @return new instance of {@link Rank}.
+	 * @since 3.3
+	 */
+	public static Rank rank() {
+		return new Rank();
+	}
+
+	/**
+	 * Obtain the document position (without gaps) relative to others (rank).
+	 *
+	 * @return new instance of {@link DenseRank}.
+	 * @since 3.3
+	 */
+	public static DenseRank denseRank() {
+		return new DenseRank();
+	}
+
+	/**
+	 * Take the field referenced by given {@literal fieldReference}.
+	 *
+	 * @param fieldReference must not be {@literal null}.
+	 * @return new instance of {@link DocumentOperatorsFactory}.
+	 */
+	public static DocumentOperatorsFactory valueOf(String fieldReference) {
+		return new DocumentOperatorsFactory(fieldReference);
+	}
+
+	/**
+	 * Take the value resulting from the given {@link AggregationExpression}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link DocumentOperatorsFactory}.
+	 */
+	public static DocumentOperatorsFactory valueOf(AggregationExpression expression) {
+		return new DocumentOperatorsFactory(expression);
+	}
+
+	/**
+	 * Obtain the current document position.
+	 *
+	 * @return new instance of {@link DocumentNumber}.
+	 * @since 3.3
+	 */
+	public static DocumentNumber documentNumber() {
+		return new DocumentNumber();
+	}
+
+	/**
+	 * @author Christoph Strobl
+	 */
+	public static class DocumentOperatorsFactory {
+
+		private final Object target;
+
+		public DocumentOperatorsFactory(Object target) {
+			this.target = target;
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that applies the expression to a document at specified position
+		 * relative to the current document.
+		 *
+		 * @param by the value to add to the current position.
+		 * @return new instance of {@link Shift}.
+		 */
+		public Shift shift(int by) {
+
+			Shift shift = usesExpression() ? Shift.shift((AggregationExpression) target) : Shift.shift(target.toString());
+			return shift.by(by);
+		}
+
+		private boolean usesExpression() {
+			return target instanceof AggregationExpression;
+		}
+	}
+
+	/**
+	 * {@link Rank} resolves the current document position (the rank) relative to other documents. If multiple documents
+	 * occupy the same rank, {@literal $rank} places the document with the subsequent value at a rank with a gap.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Rank implements AggregationExpression {
+
+		@Override
+		public Document toDocument(AggregationOperationContext context) {
+			return new Document("$rank", new Document());
+		}
+	}
+
+	/**
+	 * {@link DenseRank} resolves the current document position (the rank) relative to other documents. If multiple
+	 * documents occupy the same rank, {@literal $denseRank} places the document with the subsequent value at the next
+	 * rank without any gaps.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class DenseRank implements AggregationExpression {
+
+		@Override
+		public Document toDocument(AggregationOperationContext context) {
+			return new Document("$denseRank", new Document());
+		}
+	}
+
+	/**
+	 * {@link DocumentNumber} resolves the current document position.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class DocumentNumber implements AggregationExpression {
+
+		@Override
+		public Document toDocument(AggregationOperationContext context) {
+			return new Document("$documentNumber", new Document());
+		}
+	}
+
+	/**
+	 * Shift applies an expression to a document in a specified position relative to the current document.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.3
+	 */
+	public static class Shift extends AbstractAggregationExpression {
+
+		private Shift(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Specifies the field to evaluate and return.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Shift}.
+		 */
+		public static Shift shift(String fieldReference) {
+			return new Shift(Collections.singletonMap("output", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Specifies the {@link AggregationExpression expression} to evaluate and return.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Shift}.
+		 */
+		public static Shift shift(AggregationExpression expression) {
+			return new Shift(Collections.singletonMap("output", expression));
+		}
+
+		/**
+		 * Shift the document position relative to the current. Use a positive value for follow up documents (eg. 1 for the
+		 * next) or a negative value for the predecessor documents (eg. -1 for the previous).
+		 *
+		 * @param shiftBy value to add to the current position.
+		 * @return new instance of {@link Shift}.
+		 */
+		@Contract("_ -> new")
+		public Shift by(int shiftBy) {
+			return new Shift(append("by", shiftBy));
+		}
+
+		/**
+		 * Define the default value if the target document is out of range.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Shift}.
+		 */
+		@Contract("_ -> new")
+		public Shift defaultTo(Object value) {
+			return new Shift(append("default", value));
+		}
+
+		/**
+		 * Define the {@link AggregationExpression expression} to evaluate if the target document is out of range.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Shift}.
+		 */
+		@Contract("_ -> new")
+		public Shift defaultToValueOf(AggregationExpression expression) {
+			return defaultTo(expression);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$shift";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/EvaluationOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/EvaluationOperators.java
new file mode 100644
index 0000000000..dfdc2d620c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/EvaluationOperators.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
+import org.springframework.util.Assert;
+
+/**
+ * Gateway to {@literal evaluation operators} such as {@literal $expr}.
+ *
+ * @author Divya Srivastava
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public class EvaluationOperators {
+
+	/**
+	 * Take the value resulting from the given fieldReference.
+	 *
+	 * @param fieldReference must not be {@literal null}.
+	 * @return new instance of {@link EvaluationOperatorFactory}.
+	 */
+	public static EvaluationOperatorFactory valueOf(String fieldReference) {
+		return new EvaluationOperatorFactory(fieldReference);
+	}
+
+	/**
+	 * Take the value resulting from the given {@link AggregationExpression}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link EvaluationOperatorFactory}.
+	 */
+	public static EvaluationOperatorFactory valueOf(AggregationExpression expression) {
+		return new EvaluationOperatorFactory(expression);
+	}
+
+	public static class EvaluationOperatorFactory {
+
+		private final @Nullable String fieldReference;
+		private final @Nullable AggregationExpression expression;
+
+		/**
+		 * Creates new {@link EvaluationOperatorFactory} for given {@literal fieldReference}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 */
+		public EvaluationOperatorFactory(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			this.fieldReference = fieldReference;
+			this.expression = null;
+		}
+
+		/**
+		 * Creates new {@link EvaluationOperatorFactory} for given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 */
+		public EvaluationOperatorFactory(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			this.fieldReference = null;
+			this.expression = expression;
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that is a valid aggregation expression.
+		 *
+		 * @return new instance of {@link Expr}.
+		 */
+		@SuppressWarnings("NullAway")
+		public Expr expr() {
+			return usesFieldRef() ? Expr.valueOf(fieldReference) : Expr.valueOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that is a valid aggregation expression.
+		 *
+		 * @return new instance of {@link Expr}.
+		 */
+		@SuppressWarnings("NullAway")
+		public LastObservationCarriedForward locf() {
+			return usesFieldRef() ? LastObservationCarriedForward.locfValueOf(fieldReference)
+					: LastObservationCarriedForward.locfValueOf(expression);
+		}
+
+		private boolean usesFieldRef() {
+			return fieldReference != null;
+		}
+	}
+
+	/**
+	 * Allows the use of aggregation expressions within the query language.
+	 */
+	public static class Expr extends AbstractAggregationExpression {
+
+		private Expr(Object value) {
+			super(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$expr";
+		}
+
+		/**
+		 * Creates new {@link Expr}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Expr}.
+		 */
+		public static Expr valueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new Expr(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates new {@link Expr}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Expr}.
+		 */
+		public static Expr valueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new Expr(expression);
+		}
+
+		/**
+		 * Creates {@code $expr} as {@link CriteriaDefinition}.
+		 *
+		 * @return the {@link CriteriaDefinition} from this expression.
+		 */
+		public CriteriaDefinition toCriteriaDefinition(AggregationOperationContext context) {
+
+			Document criteriaObject = toDocument(context);
+
+			return new CriteriaDefinition() {
+				@Override
+				public Document getCriteriaObject() {
+					return criteriaObject;
+				}
+
+				@Override
+				public String getKey() {
+					return getMongoMethod();
+				}
+			};
+		}
+	}
+
+	/**
+	 * Sets {@literal null} and missing values to the last non-null value.
+	 *
+	 * @since 4.0
+	 */
+	public static class LastObservationCarriedForward extends AbstractAggregationExpression {
+
+		private LastObservationCarriedForward(Object value) {
+			super(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$locf";
+		}
+
+		/**
+		 * Creates new {@link LastObservationCarriedForward}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link LastObservationCarriedForward}.
+		 */
+		public static LastObservationCarriedForward locfValueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new LastObservationCarriedForward(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates new {@link LastObservationCarriedForward}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link LastObservationCarriedForward}.
+		 */
+		public static LastObservationCarriedForward locfValueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+			return new LastObservationCarriedForward(expression);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java
index 3c190ee5f2..703d5d5f06 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,8 +21,8 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CompositeIterator;
 import org.springframework.util.ObjectUtils;
@@ -46,7 +46,7 @@ public final class ExposedFields implements Iterable<ExposedField> {
 	/**
 	 * Returns an empty {@link ExposedFields} instance.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @since 2.0
 	 */
 	public static ExposedFields empty() {
@@ -57,7 +57,7 @@ public static ExposedFields empty() {
 	 * Creates a new {@link ExposedFields} instance from the given {@link ExposedField}s.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public static ExposedFields from(ExposedField... fields) {
 		return from(Arrays.asList(fields));
@@ -67,7 +67,7 @@ public static ExposedFields from(ExposedField... fields) {
 	 * Creates a new {@link ExposedFields} instance from the given {@link ExposedField}s.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	private static ExposedFields from(List<ExposedField> fields) {
 
@@ -84,7 +84,7 @@ private static ExposedFields from(List<ExposedField> fields) {
 	 * Creates synthetic {@link ExposedFields} from the given {@link Fields}.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public static ExposedFields synthetic(Fields fields) {
 		return createFields(fields, true);
@@ -94,7 +94,7 @@ public static ExposedFields synthetic(Fields fields) {
 	 * Creates non-synthetic {@link ExposedFields} from the given {@link Fields}.
 	 *
 	 * @param fields must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public static ExposedFields nonSynthetic(Fields fields) {
 		return createFields(fields, false);
@@ -105,12 +105,12 @@ public static ExposedFields nonSynthetic(Fields fields) {
 	 *
 	 * @param fields must not be {@literal null}.
 	 * @param synthetic
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	private static ExposedFields createFields(Fields fields, boolean synthetic) {
 
-		Assert.notNull(fields, "Fields must not be null!");
-		List<ExposedField> result = new ArrayList<ExposedField>();
+		Assert.notNull(fields, "Fields must not be null");
+		List<ExposedField> result = new ArrayList<ExposedField>(fields.size());
 
 		for (Field field : fields) {
 			result.add(new ExposedField(field, synthetic));
@@ -135,13 +135,13 @@ private ExposedFields(List<ExposedField> originals, List<ExposedField> synthetic
 	 * Creates a new {@link ExposedFields} adding the given {@link ExposedField}.
 	 *
 	 * @param field must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ExposedFields}.
 	 */
 	public ExposedFields and(ExposedField field) {
 
-		Assert.notNull(field, "Exposed field must not be null!");
+		Assert.notNull(field, "Exposed field must not be null");
 
-		ArrayList<ExposedField> result = new ArrayList<ExposedField>();
+		ArrayList<ExposedField> result = new ArrayList<>();
 		result.addAll(field.synthetic ? syntheticFields : originalFields);
 		result.add(field);
 
@@ -151,11 +151,10 @@ public ExposedFields and(ExposedField field) {
 	/**
 	 * Returns the field with the given name or {@literal null} if no field with the given name is available.
 	 *
-	 * @param name
-	 * @return
+	 * @param name must not be {@literal null}.
+	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public ExposedField getField(String name) {
+	public @Nullable ExposedField getField(String name) {
 
 		for (ExposedField field : this) {
 			if (field.canBeReferredToBy(name)) {
@@ -209,10 +208,6 @@ private int exposedFieldsCount() {
 		return originalFields.size() + syntheticFields.size();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	@Override
 	public Iterator<ExposedField> iterator() {
 
@@ -260,28 +255,16 @@ public ExposedField(Field delegate, boolean synthetic) {
 			this.synthetic = synthetic;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Field#getKey()
-		 */
 		@Override
 		public String getName() {
 			return field.getName();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Field#getTarget()
-		 */
 		@Override
 		public String getTarget() {
 			return field.getTarget();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Field#isAliased()
-		 */
 		@Override
 		public boolean isAliased() {
 			return field.isAliased();
@@ -304,39 +287,25 @@ public boolean canBeReferredToBy(String name) {
 			return getName().equals(name) || getTarget().equals(name);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return String.format("AggregationField: %s, synthetic: %s", field, synthetic);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (this == obj) {
 				return true;
 			}
 
-			if (!(obj instanceof ExposedField)) {
+			if (!(obj instanceof ExposedField that)) {
 				return false;
 			}
 
-			ExposedField that = (ExposedField) obj;
-
 			return this.field.equals(that.field) && this.synthetic == that.synthetic;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 
@@ -389,33 +358,21 @@ static class DirectFieldReference implements FieldReference {
 		 */
 		public DirectFieldReference(ExposedField field) {
 
-			Assert.notNull(field, "ExposedField must not be null!");
+			Assert.notNull(field, "ExposedField must not be null");
 
 			this.field = field;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getRaw()
-		 */
 		public String getRaw() {
 
 			String target = field.getTarget();
 			return field.synthetic ? target : String.format("%s.%s", Fields.UNDERSCORE_ID, target);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getReferenceValue()
-		 */
 		public Object getReferenceValue() {
 			return field.synthetic && !field.isAliased() ? 1 : toString();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 
@@ -426,30 +383,20 @@ public String toString() {
 			return String.format("$%s", getRaw());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (this == obj) {
 				return true;
 			}
 
-			if (!(obj instanceof DirectFieldReference)) {
+			if (!(obj instanceof DirectFieldReference fieldReference)) {
 				return false;
 			}
 
-			DirectFieldReference that = (DirectFieldReference) obj;
-
-			return this.field.equals(that.field);
+			return this.field.equals(fieldReference.field);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			return field.hashCode();
@@ -475,19 +422,11 @@ public ExpressionFieldReference(FieldReference field) {
 			delegate = field;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getRaw()
-		 */
 		@Override
 		public String getRaw() {
 			return delegate.getRaw();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference#getReferenceValue()
-		 */
 		@Override
 		public Object getReferenceValue() {
 			return delegate.getReferenceValue();
@@ -510,18 +449,17 @@ public String toString() {
 		}
 
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (this == obj) {
 				return true;
 			}
 
-			if (!(obj instanceof ExpressionFieldReference)) {
+			if (!(obj instanceof ExpressionFieldReference fieldReference)) {
 				return false;
 			}
 
-			ExpressionFieldReference that = (ExpressionFieldReference) obj;
-			return ObjectUtils.nullSafeEquals(this.delegate, that.delegate);
+			return ObjectUtils.nullSafeEquals(this.delegate, fieldReference.delegate);
 		}
 
 		@Override
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java
index 3e32433880..1639a54d48 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsAggregationOperationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,11 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -36,6 +37,7 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 
 	private final ExposedFields exposedFields;
 	private final AggregationOperationContext rootContext;
+	private final FieldLookupPolicy lookupPolicy;
 
 	/**
 	 * Creates a new {@link ExposedFieldsAggregationOperationContext} from the given {@link ExposedFields}. Uses the given
@@ -43,30 +45,25 @@ class ExposedFieldsAggregationOperationContext implements AggregationOperationCo
 	 *
 	 * @param exposedFields must not be {@literal null}.
 	 * @param rootContext must not be {@literal null}.
+	 * @param lookupPolicy must not be {@literal null}.
 	 */
-	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields,
-			AggregationOperationContext rootContext) {
+	public ExposedFieldsAggregationOperationContext(ExposedFields exposedFields, AggregationOperationContext rootContext,
+			FieldLookupPolicy lookupPolicy) {
 
-		Assert.notNull(exposedFields, "ExposedFields must not be null!");
-		Assert.notNull(rootContext, "RootContext must not be null!");
+		Assert.notNull(exposedFields, "ExposedFields must not be null");
+		Assert.notNull(rootContext, "RootContext must not be null");
+		Assert.notNull(lookupPolicy, "FieldLookupPolicy must not be null");
 
 		this.exposedFields = exposedFields;
 		this.rootContext = rootContext;
+		this.lookupPolicy = lookupPolicy;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-	 */
 	@Override
 	public Document getMappedObject(Document document, @Nullable Class<?> type) {
 		return rootContext.getMappedObject(document, type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.ExposedFields.AvailableField)
-	 */
 	@Override
 	public FieldReference getReference(Field field) {
 
@@ -77,19 +74,11 @@ public FieldReference getReference(Field field) {
 		return getReference(field, field.getTarget());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
-	 */
 	@Override
 	public FieldReference getReference(String name) {
 		return getReference(null, name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class)
-	 */
 	@Override
 	public Fields getFields(Class<?> type) {
 		return rootContext.getFields(type);
@@ -104,14 +93,22 @@ public Fields getFields(Class<?> type) {
 	 */
 	private FieldReference getReference(@Nullable Field field, String name) {
 
-		Assert.notNull(name, "Name must not be null!");
+		Assert.notNull(name, "Name must not be null");
 
 		FieldReference exposedField = resolveExposedField(field, name);
 		if (exposedField != null) {
 			return exposedField;
 		}
 
-		throw new IllegalArgumentException(String.format("Invalid reference '%s'!", name));
+		if (lookupPolicy.isStrict()) {
+			throw new IllegalArgumentException(String.format("Invalid reference '%s'", name));
+		}
+
+		if (field != null) {
+			return new DirectFieldReference(new ExposedField(field, true));
+		}
+
+		return new DirectFieldReference(new ExposedField(name, true));
 	}
 
 	/**
@@ -121,8 +118,7 @@ private FieldReference getReference(@Nullable Field field, String name) {
 	 * @param name must not be {@literal null}.
 	 * @return the resolved reference or {@literal null}.
 	 */
-	@Nullable
-	protected FieldReference resolveExposedField(@Nullable Field field, String name) {
+	protected @Nullable FieldReference resolveExposedField(@Nullable Field field, String name) {
 
 		ExposedField exposedField = exposedFields.getField(name);
 
@@ -149,4 +145,37 @@ protected FieldReference resolveExposedField(@Nullable Field field, String name)
 		}
 		return null;
 	}
+
+	/**
+	 * @return obtain the root context used to resolve references.
+	 * @since 3.1
+	 */
+	AggregationOperationContext getRootContext() {
+		return rootContext;
+	}
+
+	@Override
+	public CodecRegistry getCodecRegistry() {
+		return getRootContext().getCodecRegistry();
+	}
+
+	@Override
+	@Deprecated(since = "4.3.1", forRemoval = true)
+	public AggregationOperationContext continueOnMissingFieldReference() {
+		if (!lookupPolicy.isStrict()) {
+			return this;
+		}
+		return new ExposedFieldsAggregationOperationContext(exposedFields, rootContext, FieldLookupPolicy.relaxed());
+	}
+
+	@Override
+	public AggregationOperationContext expose(ExposedFields fields) {
+		return new ExposedFieldsAggregationOperationContext(fields, this, lookupPolicy);
+	}
+
+	@Override
+	public AggregationOperationContext inheritAndExpose(ExposedFields fields) {
+		return new InheritingExposedFieldsAggregationOperationContext(fields, this, lookupPolicy);
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java
index 6c070160a8..d1ca95f659 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FacetOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.BucketOperationSupport.Output;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
-import org.bson.Document;
-
 /**
  * Encapsulates the aggregation framework {@code $facet}-operation. <br />
  * Facet of {@link AggregationOperation}s to be used in an {@link Aggregation}. Processes multiple
@@ -73,23 +73,22 @@ private FacetOperation(Facets facets) {
 	 */
 	public FacetOperationBuilder and(AggregationOperation... operations) {
 
-		Assert.notNull(operations, "AggregationOperations must not be null!");
-		Assert.notEmpty(operations, "AggregationOperations must not be empty!");
+		Assert.notNull(operations, "AggregationOperations must not be null");
+		Assert.notEmpty(operations, "AggregationOperations must not be empty");
 
 		return new FacetOperationBuilder(facets, Arrays.asList(operations));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$facet", facets.toDocument(context));
+		return new Document(getOperator(), facets.toDocument(context));
+	}
+
+	@Override
+	public String getOperator() {
+		return "$facet";
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 		return facets.asExposedFields();
@@ -120,7 +119,7 @@ private FacetOperationBuilder(Facets current, List<AggregationOperation> operati
 		 */
 		public FacetOperation as(String fieldName) {
 
-			Assert.hasText(fieldName, "FieldName must not be null or empty!");
+			Assert.hasText(fieldName, "FieldName must not be null or empty");
 
 			return new FacetOperation(current.and(fieldName, operations));
 		}
@@ -180,8 +179,8 @@ protected Document toDocument(AggregationOperationContext context) {
 		 */
 		Facets and(String fieldName, List<AggregationOperation> operations) {
 
-			Assert.hasText(fieldName, "FieldName must not be null or empty!");
-			Assert.notNull(operations, "AggregationOperations must not be null!");
+			Assert.hasText(fieldName, "FieldName must not be null or empty");
+			Assert.notNull(operations, "AggregationOperations must not be null");
 
 			List<Facet> facets = new ArrayList<Facet>(this.facets.size() + 1);
 			facets.addAll(this.facets);
@@ -209,8 +208,8 @@ private static class Facet {
 		 */
 		Facet(ExposedField exposedField, List<AggregationOperation> operations) {
 
-			Assert.notNull(exposedField, "ExposedField must not be null!");
-			Assert.notNull(operations, "AggregationOperations must not be null!");
+			Assert.notNull(exposedField, "ExposedField must not be null");
+			Assert.notNull(operations, "AggregationOperations must not be null");
 
 			this.exposedField = exposedField;
 			this.operations = operations;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Field.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Field.java
index 0aca376876..a6737dc574 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Field.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldLookupPolicy.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldLookupPolicy.java
new file mode 100644
index 0000000000..b438be3f31
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldLookupPolicy.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2024-2025 the original author 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.aggregation;
+
+/**
+ * Lookup policy for aggregation fields. Allows strict lookups that fail if the field is absent or relaxed ones that
+ * pass-thru the requested field even if we have to assume that the field isn't present because of the limited scope of
+ * our input.
+ *
+ * @author Mark Paluch
+ * @since 4.3.1
+ */
+public abstract class FieldLookupPolicy {
+
+	private static final FieldLookupPolicy STRICT = new FieldLookupPolicy() {
+		@Override
+		boolean isStrict() {
+			return true;
+		}
+	};
+
+	private static final FieldLookupPolicy RELAXED = new FieldLookupPolicy() {
+		@Override
+		boolean isStrict() {
+			return false;
+		}
+	};
+
+	private FieldLookupPolicy() {}
+
+	/**
+	 * @return a relaxed lookup policy.
+	 */
+	public static FieldLookupPolicy relaxed() {
+		return RELAXED;
+	}
+
+	/**
+	 * @return a strict lookup policy.
+	 */
+	public static FieldLookupPolicy strict() {
+		return STRICT;
+	}
+
+	/**
+	 * @return {@code true} if the policy uses a strict lookup; {@code false} to allow references to fields that cannot be
+	 *         determined to be exactly present.
+	 */
+	abstract boolean isStrict();
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java
index acec863b2d..7f574a850e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/Fields.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -37,10 +39,10 @@
  */
 public final class Fields implements Iterable<Field> {
 
-	private static final String AMBIGUOUS_EXCEPTION = "Found two fields both using '%s' as name: %s and %s! Please "
-			+ "customize your field definitions to get to unique field names!";
+	private static final String AMBIGUOUS_EXCEPTION = "Found two fields both using '%s' as name: %s and %s; Please "
+			+ "customize your field definitions to get to unique field names";
 
-	public static final String UNDERSCORE_ID = "_id";
+	public static final String UNDERSCORE_ID = FieldName.ID.name();
 	public static final String UNDERSCORE_ID_REF = "$_id";
 
 	private final List<Field> fields;
@@ -53,7 +55,7 @@ public final class Fields implements Iterable<Field> {
 	 */
 	public static Fields from(Field... fields) {
 
-		Assert.notNull(fields, "Fields must not be null!");
+		Assert.notNull(fields, "Fields must not be null");
 		return new Fields(Arrays.asList(fields));
 	}
 
@@ -65,9 +67,9 @@ public static Fields from(Field... fields) {
 	 */
 	public static Fields fields(String... names) {
 
-		Assert.notNull(names, "Field names must not be null!");
+		Assert.notNull(names, "Field names must not be null");
 
-		List<Field> fields = new ArrayList<Field>();
+		List<Field> fields = new ArrayList<>();
 
 		for (String name : names) {
 			fields.add(field(name));
@@ -96,7 +98,7 @@ public static Field field(String name) {
 	 * @return
 	 */
 	public static Field field(String name, String target) {
-		Assert.hasText(target, "Target must not be null or empty!");
+		Assert.hasText(target, "Target must not be null or empty");
 		return new AggregationField(name, target);
 	}
 
@@ -107,14 +109,14 @@ public static Field field(String name, String target) {
 	 */
 	private Fields(List<Field> fields) {
 
-		Assert.notNull(fields, "Fields must not be null!");
+		Assert.notNull(fields, "Fields must not be null");
 
 		this.fields = verify(fields);
 	}
 
 	private static List<Field> verify(List<Field> fields) {
 
-		Map<String, Field> reference = new HashMap<String, Field>();
+		Map<String, Field> reference = new HashMap<>();
 
 		for (Field field : fields) {
 
@@ -133,7 +135,7 @@ private static List<Field> verify(List<Field> fields) {
 
 	private Fields(Fields existing, Field tail) {
 
-		this.fields = new ArrayList<Field>(existing.fields.size() + 1);
+		this.fields = new ArrayList<>(existing.fields.size() + 1);
 		this.fields.addAll(existing.fields);
 		this.fields.add(tail);
 	}
@@ -144,14 +146,17 @@ private Fields(Fields existing, Field tail) {
 	 * @param name must not be {@literal null}.
 	 * @return
 	 */
+	@Contract("_ -> new")
 	public Fields and(String name) {
 		return and(new AggregationField(name));
 	}
 
+	@Contract("_ -> new")
 	public Fields and(String name, String target) {
 		return and(new AggregationField(name, target));
 	}
 
+	@Contract("_ -> new")
 	public Fields and(Field field) {
 		return new Fields(this, field);
 	}
@@ -167,8 +172,11 @@ public Fields and(Fields fields) {
 		return result;
 	}
 
-	@Nullable
-	public Field getField(String name) {
+	public int size() {
+		return fields.size();
+	}
+
+	public @Nullable Field getField(String name) {
 
 		for (Field field : fields) {
 			if (field.getName().equals(name)) {
@@ -179,10 +187,6 @@ public Field getField(String name) {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	@Override
 	public Iterator<Field> iterator() {
 		return fields.iterator();
@@ -205,7 +209,7 @@ static class AggregationField implements Field {
 
 		private final String raw;
 		private final String name;
-		private final String target;
+		private final @Nullable String target;
 
 		/**
 		 * Creates an aggregation field with the given {@code name}.
@@ -232,7 +236,7 @@ public AggregationField(String name, @Nullable String target) {
 			String nameToSet = name != null ? cleanUp(name) : null;
 			String targetToSet = target != null ? cleanUp(target) : null;
 
-			Assert.hasText(nameToSet, "AggregationField name must not be null or empty!");
+			Assert.hasText(nameToSet, "AggregationField name must not be null or empty");
 
 			if (target == null && name.contains(".")) {
 				this.name = nameToSet.substring(nameToSet.indexOf('.') + 1);
@@ -245,7 +249,7 @@ public AggregationField(String name, @Nullable String target) {
 
 		private static String cleanUp(String source) {
 
-			if (Aggregation.SystemVariable.isReferingToSystemVariable(source)) {
+			if (AggregationVariable.isVariable(source)) {
 				return source;
 			}
 
@@ -253,31 +257,21 @@ private static String cleanUp(String source) {
 			return dollarIndex == -1 ? source : source.substring(dollarIndex + 1);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Field#getKey()
-		 */
+		@Override
 		public String getName() {
 			return name;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Field#getAlias()
-		 */
+		@Override
 		public String getTarget() {
 
-			if (isLocalVar()) {
+			if (isLocalVar() || pointsToDBRefId()) {
 				return this.getRaw();
 			}
 
 			return StringUtils.hasText(this.target) ? this.target : this.name;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.Field#isAliased()
-		 */
 		@Override
 		public boolean isAliased() {
 			return !getName().equals(getTarget());
@@ -296,6 +290,10 @@ public boolean isLocalVar() {
 			return raw.startsWith("$$") && !raw.startsWith("$$$");
 		}
 
+		protected boolean pointsToDBRefId() { // see https://jira.mongodb.org/browse/SERVER-14466
+			return raw.endsWith(".$id");
+		}
+
 		/**
 		 * @return
 		 * @since 1.10
@@ -304,39 +302,25 @@ public String getRaw() {
 			return raw;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return String.format("AggregationField - name: %s, target: %s", name, target);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (this == obj) {
 				return true;
 			}
 
-			if (!(obj instanceof AggregationField)) {
+			if (!(obj instanceof AggregationField field)) {
 				return false;
 			}
 
-			AggregationField that = (AggregationField) obj;
-
-			return this.name.equals(that.name) && ObjectUtils.nullSafeEquals(this.target, that.target);
+			return this.name.equals(field.name) && ObjectUtils.nullSafeEquals(this.target, field.target);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java
index 5fad7274ca..4fdea92dde 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/FieldsExposingAggregationOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,10 +46,6 @@ default boolean inheritsFields() {
 	 */
 	interface InheritsFieldsAggregationOperation extends FieldsExposingAggregationOperation {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#inheritsFields()
-		 */
 		@Override
 		default boolean inheritsFields() {
 			return true;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java
index 6295cd45ed..bcfc64f2b4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,13 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
-import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -66,8 +65,8 @@ public GeoNearOperation(NearQuery nearQuery, String distanceField) {
 	 */
 	private GeoNearOperation(NearQuery nearQuery, String distanceField, @Nullable String indexKey) {
 
-		Assert.notNull(nearQuery, "NearQuery must not be null.");
-		Assert.hasLength(distanceField, "Distance field must not be null or empty.");
+		Assert.notNull(nearQuery, "NearQuery must not be null");
+		Assert.hasLength(distanceField, "Distance field must not be null or empty");
 
 		this.nearQuery = nearQuery;
 		this.distanceField = distanceField;
@@ -82,54 +81,49 @@ private GeoNearOperation(NearQuery nearQuery, String distanceField, @Nullable St
 	 * @return new instance of {@link GeoNearOperation}.
 	 * @since 2.1
 	 */
+	@Contract("_ -> new")
 	public GeoNearOperation useIndex(String key) {
 		return new GeoNearOperation(nearQuery, distanceField, key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
 		Document command = context.getMappedObject(nearQuery.toDocument());
 
-		if(command.containsKey("query")) {
+		if (command.containsKey("query")) {
 			command.replace("query", context.getMappedObject(command.get("query", Document.class)));
 		}
 
-		if(command.containsKey("collation")) {
-			command.remove("collation");
-		}
-
+		command.remove("collation");
 		command.put("distanceField", distanceField);
 
 		if (StringUtils.hasText(indexKey)) {
 			command.put("key", indexKey);
 		}
 
-		return new Document("$geoNear", command);
+		return new Document(getOperator(), command);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$geoNear";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toPipelineStages(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public List<Document> toPipelineStages(AggregationOperationContext context) {
 
 		Document command = toDocument(context);
 		Number limit = (Number) command.get("$geoNear", Document.class).remove("num");
 
-		List<Document> stages = new ArrayList<>();
+		List<Document> stages = new ArrayList<>(3);
 		stages.add(command);
 
-		if(nearQuery.getSkip() != null && nearQuery.getSkip() > 0){
+		if (nearQuery.getSkip() != null && nearQuery.getSkip() > 0) {
 			stages.add(new Document("$skip", nearQuery.getSkip()));
 		}
 
-		if(limit != null) {
+		if (limit != null) {
 			stages.add(new Document("$limit", limit.longValue()));
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java
index b5fa88c6d8..ad1f8ae643 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,15 +17,15 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -44,8 +44,8 @@
  */
 public class GraphLookupOperation implements InheritsFieldsAggregationOperation {
 
-	private static final Set<Class<?>> ALLOWED_START_TYPES = new HashSet<Class<?>>(
-			Arrays.<Class<?>> asList(AggregationExpression.class, String.class, Field.class, Document.class));
+	private static final Set<Class<?>> ALLOWED_START_TYPES = Set.of(AggregationExpression.class, String.class,
+			Field.class, Document.class);
 
 	private final String from;
 	private final List<Object> startWith;
@@ -78,9 +78,6 @@ public static FromBuilder builder() {
 		return new GraphLookupOperationFromBuilder();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -88,14 +85,14 @@ public Document toDocument(AggregationOperationContext context) {
 
 		graphLookup.put("from", from);
 
-		List<Object> mappedStartWith = new ArrayList<Object>(startWith.size());
+		List<Object> mappedStartWith = new ArrayList<>(startWith.size());
 
 		for (Object startWithElement : startWith) {
 
-			if (startWithElement instanceof AggregationExpression) {
-				mappedStartWith.add(((AggregationExpression) startWithElement).toDocument(context));
-			} else if (startWithElement instanceof Field) {
-				mappedStartWith.add(context.getReference((Field) startWithElement).toString());
+			if (startWithElement instanceof AggregationExpression aggregationExpression) {
+				mappedStartWith.add(aggregationExpression.toDocument(context));
+			} else if (startWithElement instanceof Field field) {
+				mappedStartWith.add(context.getReference(field).toString());
 			} else {
 				mappedStartWith.add(startWithElement);
 			}
@@ -119,19 +116,20 @@ public Document toDocument(AggregationOperationContext context) {
 			graphLookup.put("restrictSearchWithMatch", context.getMappedObject(restrictSearchWithMatch.getCriteriaObject()));
 		}
 
-		return new Document("$graphLookup", graphLookup);
+		return new Document(getOperator(), graphLookup);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$graphLookup";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 
 		List<ExposedField> fields = new ArrayList<>(2);
 		fields.add(new ExposedField(as, true));
-		if(depthField != null) {
+		if (depthField != null) {
 			fields.add(new ExposedField(depthField, true));
 		}
 		return ExposedFields.from(fields.toArray(new ExposedField[0]));
@@ -146,7 +144,7 @@ public interface FromBuilder {
 		 * Set the {@literal collectionName} to apply the {@code $graphLookup} to.
 		 *
 		 * @param collectionName must not be {@literal null} or empty.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		StartWithBuilder from(String collectionName);
 	}
@@ -161,7 +159,7 @@ public interface StartWithBuilder {
 		 * Set the startWith {@literal fieldReferences} to apply the {@code $graphLookup} to.
 		 *
 		 * @param fieldReferences must not be {@literal null}.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		ConnectFromBuilder startWith(String... fieldReferences);
 
@@ -169,7 +167,7 @@ public interface StartWithBuilder {
 		 * Set the startWith {@literal expressions} to apply the {@code $graphLookup} to.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		ConnectFromBuilder startWith(AggregationExpression... expressions);
 
@@ -178,7 +176,7 @@ public interface StartWithBuilder {
 		 * {@link AggregationExpression} to apply the {@code $graphLookup} to.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return never {@literal null}.
 		 * @throws IllegalArgumentException
 		 */
 		ConnectFromBuilder startWith(Object... expressions);
@@ -193,7 +191,7 @@ public interface ConnectFromBuilder {
 		 * Set the connectFrom {@literal fieldName} to apply the {@code $graphLookup} to.
 		 *
 		 * @param fieldName must not be {@literal null} or empty.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		ConnectToBuilder connectFrom(String fieldName);
 	}
@@ -207,7 +205,7 @@ public interface ConnectToBuilder {
 		 * Set the connectTo {@literal fieldName} to apply the {@code $graphLookup} to.
 		 *
 		 * @param fieldName must not be {@literal null} or empty.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		GraphLookupOperationBuilder connectTo(String fieldName);
 	}
@@ -222,31 +220,27 @@ static final class GraphLookupOperationFromBuilder
 			implements FromBuilder, StartWithBuilder, ConnectFromBuilder, ConnectToBuilder {
 
 		private @Nullable String from;
-		private @Nullable List<? extends Object> startWith;
+		private @Nullable List<?> startWith;
 		private @Nullable String connectFrom;
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.FromBuilder#from(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> this")
 		public StartWithBuilder from(String collectionName) {
 
-			Assert.hasText(collectionName, "CollectionName must not be null or empty!");
+			Assert.hasText(collectionName, "CollectionName must not be null or empty");
 
 			this.from = collectionName;
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder#startWith(java.lang.String[])
-		 */
 		@Override
+		@Contract("_ -> this")
 		public ConnectFromBuilder startWith(String... fieldReferences) {
 
-			Assert.notNull(fieldReferences, "FieldReferences must not be null!");
-			Assert.noNullElements(fieldReferences, "FieldReferences must not contain null elements!");
+			Assert.notNull(fieldReferences, "FieldReferences must not be null");
+			Assert.noNullElements(fieldReferences, "FieldReferences must not contain null elements");
 
-			List<Object> fields = new ArrayList<Object>(fieldReferences.length);
+			List<Object> fields = new ArrayList<>(fieldReferences.length);
 
 			for (String fieldReference : fieldReferences) {
 				fields.add(Fields.field(fieldReference));
@@ -256,24 +250,23 @@ public ConnectFromBuilder startWith(String... fieldReferences) {
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.StartWithBuilder#startWith(org.springframework.data.mongodb.core.aggregation.AggregationExpression[])
-		 */
 		@Override
+		@Contract("_ -> this")
 		public ConnectFromBuilder startWith(AggregationExpression... expressions) {
 
-			Assert.notNull(expressions, "AggregationExpressions must not be null!");
-			Assert.noNullElements(expressions, "AggregationExpressions must not contain null elements!");
+			Assert.notNull(expressions, "AggregationExpressions must not be null");
+			Assert.noNullElements(expressions, "AggregationExpressions must not contain null elements");
 
 			this.startWith = Arrays.asList(expressions);
 			return this;
 		}
 
 		@Override
+		@Contract("_ -> this")
 		public ConnectFromBuilder startWith(Object... expressions) {
 
-			Assert.notNull(expressions, "Expressions must not be null!");
-			Assert.noNullElements(expressions, "Expressions must not contain null elements!");
+			Assert.notNull(expressions, "Expressions must not be null");
+			Assert.noNullElements(expressions, "Expressions must not contain null elements");
 
 			this.startWith = verifyAndPotentiallyTransformStartsWithTypes(expressions);
 			return this;
@@ -281,14 +274,14 @@ public ConnectFromBuilder startWith(Object... expressions) {
 
 		private List<Object> verifyAndPotentiallyTransformStartsWithTypes(Object... expressions) {
 
-			List<Object> expressionsToUse = new ArrayList<Object>(expressions.length);
+			List<Object> expressionsToUse = new ArrayList<>(expressions.length);
 
 			for (Object expression : expressions) {
 
 				assertStartWithType(expression);
 
-				if (expression instanceof String) {
-					expressionsToUse.add(Fields.field((String) expression));
+				if (expression instanceof String stringValue) {
+					expressionsToUse.add(Fields.field(stringValue));
 				} else {
 					expressionsToUse.add(expression);
 				}
@@ -310,26 +303,25 @@ private void assertStartWithType(Object expression) {
 					String.format("Expression must be any of %s but was %s", ALLOWED_START_TYPES, expression.getClass()));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.ConnectFromBuilder#connectFrom(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> this")
 		public ConnectToBuilder connectFrom(String fieldName) {
 
-			Assert.hasText(fieldName, "ConnectFrom must not be null or empty!");
+			Assert.hasText(fieldName, "ConnectFrom must not be null or empty");
 
 			this.connectFrom = fieldName;
 			return this;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.GraphLookupOperation.ConnectToBuilder#connectTo(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public GraphLookupOperationBuilder connectTo(String fieldName) {
 
-			Assert.hasText(fieldName, "ConnectTo must not be null or empty!");
+			Assert.hasText(fieldName, "ConnectTo must not be null or empty");
 
+			Assert.notNull(from, "From must not be null");
+			Assert.notNull(startWith, "startWith must ne set first");
+			Assert.notNull(connectFrom, "ConnectFrom must be set first");
 			return new GraphLookupOperationBuilder(from, startWith, connectFrom, fieldName);
 		}
 	}
@@ -347,11 +339,10 @@ public static final class GraphLookupOperationBuilder {
 		private @Nullable Field depthField;
 		private @Nullable CriteriaDefinition restrictSearchWithMatch;
 
-		protected GraphLookupOperationBuilder(String from, List<? extends Object> startWith, String connectFrom,
-				String connectTo) {
+		private GraphLookupOperationBuilder(String from, List<?> startWith, String connectFrom, String connectTo) {
 
 			this.from = from;
-			this.startWith = new ArrayList<Object>(startWith);
+			this.startWith = new ArrayList<>(startWith);
 			this.connectFrom = Fields.field(connectFrom);
 			this.connectTo = Fields.field(connectTo);
 		}
@@ -360,11 +351,12 @@ protected GraphLookupOperationBuilder(String from, List<? extends Object> startW
 		 * Optionally limit the number of recursions.
 		 *
 		 * @param numberOfRecursions must be greater or equal to zero.
-		 * @return
+		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public GraphLookupOperationBuilder maxDepth(long numberOfRecursions) {
 
-			Assert.isTrue(numberOfRecursions >= 0, "Max depth must be >= 0!");
+			Assert.isTrue(numberOfRecursions >= 0, "Max depth must be >= 0");
 
 			this.maxDepth = numberOfRecursions;
 			return this;
@@ -374,11 +366,12 @@ public GraphLookupOperationBuilder maxDepth(long numberOfRecursions) {
 		 * Optionally add a depth field {@literal fieldName} to each traversed document in the search path.
 		 *
 		 * @param fieldName must not be {@literal null} or empty.
-		 * @return
+		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public GraphLookupOperationBuilder depthField(String fieldName) {
 
-			Assert.hasText(fieldName, "Depth field name must not be null or empty!");
+			Assert.hasText(fieldName, "Depth field name must not be null or empty");
 
 			this.depthField = Fields.field(fieldName);
 			return this;
@@ -390,9 +383,10 @@ public GraphLookupOperationBuilder depthField(String fieldName) {
 		 * @param criteriaDefinition must not be {@literal null}.
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public GraphLookupOperationBuilder restrict(CriteriaDefinition criteriaDefinition) {
 
-			Assert.notNull(criteriaDefinition, "CriteriaDefinition must not be null!");
+			Assert.notNull(criteriaDefinition, "CriteriaDefinition must not be null");
 
 			this.restrictSearchWithMatch = criteriaDefinition;
 			return this;
@@ -405,9 +399,10 @@ public GraphLookupOperationBuilder restrict(CriteriaDefinition criteriaDefinitio
 		 * @param fieldName must not be {@literal null} or empty.
 		 * @return the final {@link GraphLookupOperation}.
 		 */
+		@Contract("_ -> new")
 		public GraphLookupOperation as(String fieldName) {
 
-			Assert.hasText(fieldName, "As field name must not be null or empty!");
+			Assert.hasText(fieldName, "As field name must not be null or empty");
 
 			return new GraphLookupOperation(from, startWith, connectFrom, connectTo, Fields.field(fieldName), maxDepth,
 					depthField, restrictSearchWithMatch);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java
index aceb8759e7..b6d36f1baf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/GroupOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,14 +16,14 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.aggregation.ScriptOperators.Accumulator;
 import org.springframework.util.Assert;
 
 /**
@@ -79,8 +79,8 @@ protected GroupOperation(GroupOperation groupOperation) {
 	 */
 	private GroupOperation(GroupOperation groupOperation, List<Operation> nextOperations) {
 
-		Assert.notNull(groupOperation, "GroupOperation must not be null!");
-		Assert.notNull(nextOperations, "NextOperations must not be null!");
+		Assert.notNull(groupOperation, "GroupOperation must not be null");
+		Assert.notNull(nextOperations, "NextOperations must not be null");
 
 		this.idFields = groupOperation.idFields;
 		this.operations = new ArrayList<Operation>(nextOperations.size() + 1);
@@ -95,7 +95,7 @@ private GroupOperation(GroupOperation groupOperation, List<Operation> nextOperat
 	 * @return
 	 */
 	protected GroupOperation and(Operation operation) {
-		return new GroupOperation(this, Arrays.asList(operation));
+		return new GroupOperation(this, List.of(operation));
 	}
 
 	/**
@@ -116,8 +116,8 @@ public static final class GroupOperationBuilder {
 		 */
 		private GroupOperationBuilder(GroupOperation groupOperation, Operation operation) {
 
-			Assert.notNull(groupOperation, "GroupOperation must not be null!");
-			Assert.notNull(operation, "Operation must not be null!");
+			Assert.notNull(groupOperation, "GroupOperation must not be null");
+			Assert.notNull(operation, "Operation must not be null");
 
 			this.groupOperation = groupOperation;
 			this.operation = operation;
@@ -138,7 +138,7 @@ public GroupOperation as(String alias) {
 	 * Generates an {@link GroupOperationBuilder} for a {@code $sum}-expression.
 	 * <p>
 	 * Count expressions are emulated via {@code $sum: 1}.
-	 * <p>
+	 * </p>
 	 *
 	 * @return
 	 */
@@ -167,7 +167,7 @@ public GroupOperationBuilder sum(String reference) {
 	 */
 	public GroupOperationBuilder sum(AggregationExpression expr) {
 
-		Assert.notNull(expr, "Expr must not be null!");
+		Assert.notNull(expr, "Expr must not be null");
 		return newBuilder(GroupOps.SUM, null, expr);
 	}
 
@@ -375,14 +375,32 @@ public GroupOperationBuilder stdDevPop(AggregationExpression expr) {
 		return newBuilder(GroupOps.STD_DEV_POP, null, expr);
 	}
 
+	/**
+	 * Generates an {@link GroupOperationBuilder} for an {@code $accumulator}-expression.
+	 *
+	 * @param accumulator must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 3.2
+	 */
+	public GroupOperationBuilder accumulate(Accumulator accumulator) {
+		return new GroupOperationBuilder(this, new Operation(accumulator));
+	}
+
+	/**
+	 * Adds a computed field to the {@link GroupOperation}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.0
+	 */
+	public GroupOperation and(String fieldName, AggregationExpression expression) {
+		return new GroupOperationBuilder(this, new Operation(expression)).as(fieldName);
+	}
+
 	private GroupOperationBuilder newBuilder(Keyword keyword, @Nullable String reference, @Nullable Object value) {
 		return new GroupOperationBuilder(this, new Operation(keyword, null, reference, value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 
@@ -395,10 +413,6 @@ public ExposedFields getFields() {
 		return fields;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -429,7 +443,12 @@ public Document toDocument(AggregationOperationContext context) {
 			operationObject.putAll(operation.toDocument(context));
 		}
 
-		return new Document("$group", operationObject);
+		return new Document(getOperator(), operationObject);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$group";
 	}
 
 	interface Keyword {
@@ -437,12 +456,12 @@ interface Keyword {
 		String toString();
 	}
 
-	private static enum GroupOps implements Keyword {
+	private enum GroupOps implements Keyword {
 
 		SUM("$sum"), LAST("$last"), FIRST("$first"), PUSH("$push"), AVG("$avg"), MIN("$min"), MAX("$max"), ADD_TO_SET(
 				"$addToSet"), STD_DEV_POP("$stdDevPop"), STD_DEV_SAMP("$stdDevSamp");
 
-		private String mongoOperator;
+		private final String mongoOperator;
 
 		GroupOps(String mongoOperator) {
 			this.mongoOperator = mongoOperator;
@@ -456,12 +475,16 @@ public String toString() {
 
 	static class Operation implements AggregationOperation {
 
-		private final Keyword op;
+		private final @Nullable Keyword op;
 		private final @Nullable String key;
 		private final @Nullable String reference;
 		private final @Nullable Object value;
 
-		public Operation(Keyword op, @Nullable String key, @Nullable String reference, @Nullable Object value) {
+		Operation(AggregationExpression expression) {
+			this(null, null, null, expression);
+		}
+
+		public Operation(@Nullable Keyword op, @Nullable String key, @Nullable String reference, @Nullable Object value) {
 
 			this.op = op;
 			this.key = key;
@@ -474,25 +497,33 @@ public Operation withAlias(String key) {
 		}
 
 		public ExposedField asField() {
+			Assert.notNull(key, "Key must be set first");
 			return new ExposedField(key, true);
 		}
 
 		public Document toDocument(AggregationOperationContext context) {
-			return new Document(key, new Document(op.toString(), getValue(context)));
+
+			Object value = getValue(context);
+			if(op == null && value instanceof Document) {
+				return new Document(key, value);
+			}
+
+			Assert.notNull(op, "Operation keyword must be set");
+			return new Document(key, new Document(op.toString(), value));
 		}
 
-		public Object getValue(AggregationOperationContext context) {
+		public @Nullable Object getValue(AggregationOperationContext context) {
 
 			if (reference == null) {
 
-				if (value instanceof AggregationExpression) {
-					return ((AggregationExpression) value).toDocument(context);
+				if (value instanceof AggregationExpression aggregationExpression) {
+					return aggregationExpression.toDocument(context);
 				}
 
 				return value;
 			}
 
-			if (Aggregation.SystemVariable.isReferingToSystemVariable(reference)) {
+			if (SystemVariable.isReferingToSystemVariable(reference)) {
 				return reference;
 			}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java
index 5a6dce072f..739b7c52a9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/InheritingExposedFieldsAggregationOperationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 
 /**
@@ -22,6 +24,7 @@
  * {@link AggregationOperationContext}.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 1.9
  */
 class InheritingExposedFieldsAggregationOperationContext extends ExposedFieldsAggregationOperationContext {
@@ -34,21 +37,23 @@ class InheritingExposedFieldsAggregationOperationContext extends ExposedFieldsAg
 	 *
 	 * @param exposedFields must not be {@literal null}.
 	 * @param previousContext must not be {@literal null}.
+	 * @param lookupPolicy must not be {@literal null}.
 	 */
 	public InheritingExposedFieldsAggregationOperationContext(ExposedFields exposedFields,
-			AggregationOperationContext previousContext) {
+			AggregationOperationContext previousContext, FieldLookupPolicy lookupPolicy) {
 
-		super(exposedFields, previousContext);
+		super(exposedFields, previousContext, lookupPolicy);
 
 		this.previousContext = previousContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.ExposedFieldsAggregationOperationContext#resolveExposedField(org.springframework.data.mongodb.core.aggregation.Field, java.lang.String)
-	 */
 	@Override
-	protected FieldReference resolveExposedField(Field field, String name) {
+	public Document getMappedObject(Document document) {
+		return previousContext.getMappedObject(document);
+	}
+
+	@Override
+	protected FieldReference resolveExposedField(@Nullable Field field, String name) {
 
 		FieldReference fieldReference = super.resolveExposedField(field, name);
 		if (fieldReference != null) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java
index c855ada17a..e73dba1b9f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LimitOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,16 +39,17 @@ public class LimitOperation implements AggregationOperation {
 	 */
 	public LimitOperation(long maxElements) {
 
-		Assert.isTrue(maxElements >= 0, "Maximum number of elements must be greater or equal to zero!");
+		Assert.isTrue(maxElements >= 0, "Maximum number of elements must be greater or equal to zero");
 		this.maxElements = maxElements;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$limit", Long.valueOf(maxElements));
+		return new Document(getOperator(), maxElements);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$limit";
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java
index 64ac1a1d26..e277539315 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LiteralOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ public class LiteralOperators {
 	 */
 	public static LiteralOperatorFactory valueOf(Object value) {
 
-		Assert.notNull(value, "Value must not be null!");
+		Assert.notNull(value, "Value must not be null");
 		return new LiteralOperatorFactory(value);
 	}
 
@@ -51,7 +51,7 @@ public static class LiteralOperatorFactory {
 		 */
 		public LiteralOperatorFactory(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			this.value = value;
 		}
 
@@ -89,7 +89,7 @@ protected String getMongoMethod() {
 		 */
 		public static Literal asLiteral(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Literal(value);
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java
index 099e49101e..52cd36b5bb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/LookupOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,28 +15,41 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
+import java.util.function.Supplier;
+
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let;
+import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
- * Encapsulates the aggregation framework {@code $lookup}-operation. We recommend to use the static factory method
- * {@link Aggregation#lookup(String, String, String, String)} instead of creating instances of this class directly.
+ * Encapsulates the aggregation framework {@code $lookup}-operation. We recommend to use the builder provided via
+ * {@link #newLookup()} instead of creating instances of this class directly.
  *
  * @author Alessio Fachechi
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Sangyong Choi
  * @since 1.9
  * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/lookup/">MongoDB Aggregation Framework:
  *      $lookup</a>
  */
 public class LookupOperation implements FieldsExposingAggregationOperation, InheritsFieldsAggregationOperation {
 
-	private final Field from;
-	private final Field localField;
-	private final Field foreignField;
+	private final String from;
+
+	private final @Nullable Field localField;
+
+	private final @Nullable Field foreignField;
+
+	private final @Nullable Let let;
+
+	private final @Nullable AggregationPipeline pipeline;
+
 	private final ExposedField as;
 
 	/**
@@ -48,86 +61,193 @@ public class LookupOperation implements FieldsExposingAggregationOperation, Inhe
 	 * @param as must not be {@literal null}.
 	 */
 	public LookupOperation(Field from, Field localField, Field foreignField, Field as) {
+		this(((Supplier<String>) () -> {
+
+			Assert.notNull(from, "From must not be null");
+			return from.getTarget();
+		}).get(), localField, foreignField, null, null, as);
+	}
+
+	/**
+	 * Creates a new {@link LookupOperation} for the given combination of {@link Field}s and {@link AggregationPipeline
+	 * pipeline}.
+	 *
+	 * @param from must not be {@literal null}.
+	 * @param let must not be {@literal null}.
+	 * @param as must not be {@literal null}.
+	 * @since 4.1
+	 */
+	public LookupOperation(String from, @Nullable Let let, AggregationPipeline pipeline, Field as) {
+		this(from, null, null, let, pipeline, as);
+	}
+
+	/**
+	 * Creates a new {@link LookupOperation} for the given combination of {@link Field}s and {@link AggregationPipeline
+	 * pipeline}.
+	 *
+	 * @param from must not be {@literal null}.
+	 * @param localField can be {@literal null} if {@literal pipeline} is present.
+	 * @param foreignField can be {@literal null} if {@literal pipeline} is present.
+	 * @param let can be {@literal null} if {@literal localField} and {@literal foreignField} are present.
+	 * @param as must not be {@literal null}.
+	 * @since 4.1
+	 */
+	public LookupOperation(String from, @Nullable Field localField, @Nullable Field foreignField, @Nullable Let let,
+			@Nullable AggregationPipeline pipeline, Field as) {
 
-		Assert.notNull(from, "From must not be null!");
-		Assert.notNull(localField, "LocalField must not be null!");
-		Assert.notNull(foreignField, "ForeignField must not be null!");
-		Assert.notNull(as, "As must not be null!");
+		Assert.notNull(from, "From must not be null");
+		if (pipeline == null) {
+			Assert.notNull(localField, "LocalField must not be null");
+			Assert.notNull(foreignField, "ForeignField must not be null");
+		} else if (localField == null && foreignField == null) {
+			Assert.notNull(pipeline, "Pipeline must not be null");
+		}
+		Assert.notNull(as, "As must not be null");
 
 		this.from = from;
 		this.localField = localField;
 		this.foreignField = foreignField;
 		this.as = new ExposedField(as, true);
+		this.let = let;
+		this.pipeline = pipeline;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 		return ExposedFields.from(as);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
 		Document lookupObject = new Document();
 
-		lookupObject.append("from", from.getTarget());
-		lookupObject.append("localField", localField.getTarget());
-		lookupObject.append("foreignField", foreignField.getTarget());
+		lookupObject.append("from", from);
+		if (localField != null) {
+			lookupObject.append("localField", localField.getTarget());
+		}
+		if (foreignField != null) {
+			lookupObject.append("foreignField", foreignField.getTarget());
+		}
+		if (let != null) {
+			lookupObject.append("let", let.toDocument(context).get("$let", Document.class).get("vars"));
+		}
+		if (pipeline != null) {
+			lookupObject.append("pipeline", pipeline.toDocuments(context));
+		}
+
 		lookupObject.append("as", as.getTarget());
 
-		return new Document("$lookup", lookupObject);
+		return new Document(getOperator(), lookupObject);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$lookup";
 	}
 
 	/**
 	 * Get a builder that allows creation of {@link LookupOperation}.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public static FromBuilder newLookup() {
 		return new LookupOperationBuilder();
 	}
 
-	public static interface FromBuilder {
+	public interface FromBuilder {
 
 		/**
 		 * @param name the collection in the same database to perform the join with, must not be {@literal null} or empty.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		LocalFieldBuilder from(String name);
 	}
 
-	public static interface LocalFieldBuilder {
+	public interface LocalFieldBuilder extends PipelineBuilder {
 
 		/**
 		 * @param name the field from the documents input to the {@code $lookup} stage, must not be {@literal null} or
 		 *          empty.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		ForeignFieldBuilder localField(String name);
 	}
 
-	public static interface ForeignFieldBuilder {
+	public interface ForeignFieldBuilder {
 
 		/**
 		 * @param name the field from the documents in the {@code from} collection, must not be {@literal null} or empty.
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		AsBuilder foreignField(String name);
 	}
 
-	public static interface AsBuilder {
+	/**
+	 * @since 4.1
+	 * @author Christoph Strobl
+	 */
+	public interface LetBuilder {
+
+		/**
+		 * Specifies {@link Let#getVariableNames() variables) that can be used in the
+		 * {@link PipelineBuilder#pipeline(AggregationOperation...) pipeline stages}.
+		 *
+		 * @param let must not be {@literal null}.
+		 * @return never {@literal null}.
+		 * @see PipelineBuilder
+		 */
+		PipelineBuilder let(Let let);
+
+		/**
+		 * Specifies {@link Let#getVariableNames() variables) that can be used in the
+		 * {@link PipelineBuilder#pipeline(AggregationOperation...) pipeline stages}.
+		 *
+		 * @param variables must not be {@literal null}.
+		 * @return never {@literal null}.
+		 * @see PipelineBuilder
+		 */
+		default PipelineBuilder let(ExpressionVariable... variables) {
+			return let(Let.just(variables));
+		}
+	}
+
+	/**
+	 * @since 4.1
+	 * @author Christoph Strobl
+	 */
+	public interface PipelineBuilder extends LetBuilder {
+
+		/**
+		 * Specifies the {@link AggregationPipeline pipeline} that determines the resulting documents.
+		 *
+		 * @param pipeline must not be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		AsBuilder pipeline(AggregationPipeline pipeline);
+
+		/**
+		 * Specifies the {@link AggregationPipeline#getOperations() stages} that determine the resulting documents.
+		 *
+		 * @param stages must not be {@literal null} can be empty.
+		 * @return never {@literal null}.
+		 */
+		default AsBuilder pipeline(AggregationOperation... stages) {
+			return pipeline(AggregationPipeline.of(stages));
+		}
 
 		/**
 		 * @param name the name of the new array field to add to the input documents, must not be {@literal null} or empty.
-		 * @return
+		 * @return new instance of {@link LookupOperation}.
+		 */
+		LookupOperation as(String name);
+	}
+
+	public interface AsBuilder extends PipelineBuilder {
+
+		/**
+		 * @param name the name of the new array field to add to the input documents, must not be {@literal null} or empty.
+		 * @return new instance of {@link LookupOperation}.
 		 */
 		LookupOperation as(String name);
 	}
@@ -141,10 +261,12 @@ public static interface AsBuilder {
 	public static final class LookupOperationBuilder
 			implements FromBuilder, LocalFieldBuilder, ForeignFieldBuilder, AsBuilder {
 
-		private @Nullable Field from;
+		private @Nullable String from;
 		private @Nullable Field localField;
 		private @Nullable Field foreignField;
 		private @Nullable ExposedField as;
+		private @Nullable Let let;
+		private @Nullable AggregationPipeline pipeline;
 
 		/**
 		 * Creates new builder for {@link LookupOperation}.
@@ -156,36 +278,58 @@ public static FromBuilder newBuilder() {
 		}
 
 		@Override
+		@Contract("_ -> this")
 		public LocalFieldBuilder from(String name) {
 
-			Assert.hasText(name, "'From' must not be null or empty!");
-			from = Fields.field(name);
+			Assert.hasText(name, "'From' must not be null or empty");
+			from = name;
 			return this;
 		}
 
 		@Override
-		public LookupOperation as(String name) {
-
-			Assert.hasText(name, "'As' must not be null or empty!");
-			as = new ExposedField(Fields.field(name), true);
-			return new LookupOperation(from, localField, foreignField,
-					as);
-		}
-
-		@Override
+		@Contract("_ -> this")
 		public AsBuilder foreignField(String name) {
 
-			Assert.hasText(name, "'ForeignField' must not be null or empty!");
+			Assert.hasText(name, "'ForeignField' must not be null or empty");
 			foreignField = Fields.field(name);
 			return this;
 		}
 
 		@Override
+		@Contract("_ -> this")
 		public ForeignFieldBuilder localField(String name) {
 
-			Assert.hasText(name, "'LocalField' must not be null or empty!");
+			Assert.hasText(name, "'LocalField' must not be null or empty");
 			localField = Fields.field(name);
 			return this;
 		}
+
+		@Override
+		@Contract("_ -> this")
+		public PipelineBuilder let(Let let) {
+
+			Assert.notNull(let, "Let must not be null");
+			this.let = let;
+			return this;
+		}
+
+		@Override
+		@Contract("_ -> this")
+		public AsBuilder pipeline(AggregationPipeline pipeline) {
+
+			Assert.notNull(pipeline, "Pipeline must not be null");
+			this.pipeline = pipeline;
+			return this;
+		}
+
+		@Override
+		@Contract("_ -> new")
+		public LookupOperation as(String name) {
+
+			Assert.hasText(name, "'As' must not be null or empty");
+			Assert.notNull(from, "From must be set first");
+			as = new ExposedField(Fields.field(name), true);
+			return new LookupOperation(from, localField, foreignField, let, pipeline, as);
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java
index f91cda9f9d..5f736b55a0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MatchOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,8 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
+
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.util.Assert;
 
@@ -29,12 +31,15 @@
  * @author Sebastian Herold
  * @author Thomas Darimont
  * @author Oliver Gierke
+ * @author Divya Srivastava
  * @since 1.3
- * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/match/">MongoDB Aggregation Framework: $match</a>
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/match/">MongoDB Aggregation Framework:
+ *      $match</a>
  */
 public class MatchOperation implements AggregationOperation {
 
-	private final CriteriaDefinition criteriaDefinition;
+	private final @Nullable CriteriaDefinition criteriaDefinition;
+	private final @Nullable AggregationExpression expression;
 
 	/**
 	 * Creates a new {@link MatchOperation} for the given {@link CriteriaDefinition}.
@@ -43,16 +48,36 @@ public class MatchOperation implements AggregationOperation {
 	 */
 	public MatchOperation(CriteriaDefinition criteriaDefinition) {
 
-		Assert.notNull(criteriaDefinition, "Criteria must not be null!");
+		Assert.notNull(criteriaDefinition, "Criteria must not be null");
+
 		this.criteriaDefinition = criteriaDefinition;
+		this.expression = null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
+	/**
+	 * Creates a new {@link MatchOperation} for the given {@link AggregationExpression}.
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @since 3.3
 	 */
+	public MatchOperation(AggregationExpression expression) {
+
+		Assert.notNull(expression, "Expression must not be null");
+
+		this.criteriaDefinition = null;
+		this.expression = expression;
+	}
+
 	@Override
+	@SuppressWarnings("NullAway")
 	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$match", context.getMappedObject(criteriaDefinition.getCriteriaObject()));
+
+		return new Document(getOperator(),
+				context.getMappedObject(expression != null ? expression.toDocument() : criteriaDefinition.getCriteriaObject()));
+	}
+
+	@Override
+	public String getOperator() {
+		return "$match";
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MergeOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MergeOperation.java
new file mode 100644
index 0000000000..bda9a3330d
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/MergeOperation.java
@@ -0,0 +1,604 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
+import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Encapsulates the {@code $merge}-operation.
+ * <p>
+ * We recommend to use the {@link MergeOperationBuilder builder} via {@link MergeOperation#builder()} instead of
+ * creating instances of this class directly.
+ *
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/merge/">MongoDB Documentation</a>
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public class MergeOperation implements FieldsExposingAggregationOperation, InheritsFieldsAggregationOperation {
+
+	private final MergeOperationTarget into;
+	private final UniqueMergeId on;
+	private final @Nullable Let let;
+	private final @Nullable WhenDocumentsMatch whenMatched;
+	private final @Nullable WhenDocumentsDontMatch whenNotMatched;
+
+	/**
+	 * Create new instance of {@link MergeOperation}.
+	 *
+	 * @param into the target (collection and database)
+	 * @param on the unique identifier. Can be {@literal null}.
+	 * @param let exposed variables for {@link WhenDocumentsMatch#updateWith(Aggregation)}. Can be {@literal null}.
+	 * @param whenMatched behavior if a result document matches an existing one in the target collection. Can be
+	 *          {@literal null}.
+	 * @param whenNotMatched behavior if a result document does not match an existing one in the target collection. Can be
+	 *          {@literal null}.
+	 */
+	public MergeOperation(MergeOperationTarget into, UniqueMergeId on, @Nullable Let let,
+			@Nullable WhenDocumentsMatch whenMatched, @Nullable WhenDocumentsDontMatch whenNotMatched) {
+
+		Assert.notNull(into, "Into must not be null Please provide a target collection");
+		Assert.notNull(on, "On must not be null Use UniqueMergeId.id() instead");
+
+		this.into = into;
+		this.on = on;
+		this.let = let;
+		this.whenMatched = whenMatched;
+		this.whenNotMatched = whenNotMatched;
+	}
+
+	/**
+	 * Simplified form to apply all default options for {@code $merge} (including writing to a collection in the same
+	 * database).
+	 *
+	 * @param collection the output collection within the same database.
+	 * @return new instance of {@link MergeOperation}.
+	 */
+	public static MergeOperation mergeInto(String collection) {
+		return builder().intoCollection(collection).build();
+	}
+
+	/**
+	 * Access the {@link MergeOperationBuilder builder API} to create a new instance of {@link MergeOperation}.
+	 *
+	 * @return new instance of {@link MergeOperationBuilder}.
+	 */
+	public static MergeOperationBuilder builder() {
+		return new MergeOperationBuilder();
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+
+		if (isJustCollection()) {
+			return new Document(getOperator(), into.collection);
+		}
+
+		Document $merge = new Document();
+		$merge.putAll(into.toDocument(context));
+
+		if (!on.isJustIdField()) {
+			$merge.putAll(on.toDocument(context));
+		}
+
+		if (let != null) {
+			$merge.append("let", let.toDocument(context).get("$let", Document.class).get("vars"));
+		}
+
+		if (whenMatched != null) {
+			$merge.putAll(whenMatched.toDocument(context));
+		}
+
+		if (whenNotMatched != null) {
+			$merge.putAll(whenNotMatched.toDocument(context));
+		}
+
+		return new Document(getOperator(), $merge);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$merge";
+	}
+
+	@Override
+	public ExposedFields getFields() {
+
+		if (let == null) {
+			return ExposedFields.from();
+		}
+
+		return ExposedFields.synthetic(Fields.fields(let.getVariableNames()));
+	}
+
+	@Override
+	public boolean inheritsFields() {
+		return true;
+	}
+
+	/**
+	 * @return true if nothing more than the collection is specified.
+	 */
+	private boolean isJustCollection() {
+		return into.isTargetingSameDatabase() && on.isJustIdField() && let == null && whenMatched == null
+				&& whenNotMatched == null;
+	}
+
+	/**
+	 * Value object representing the unique id used during the merge operation to identify duplicates in the target
+	 * collection.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class UniqueMergeId {
+
+		private static final UniqueMergeId ID = new UniqueMergeId(Collections.emptyList());
+
+		private final Collection<String> uniqueIdentifier;
+
+		private UniqueMergeId(Collection<String> uniqueIdentifier) {
+			this.uniqueIdentifier = uniqueIdentifier;
+		}
+
+		public static UniqueMergeId ofIdFields(String... fields) {
+
+			Assert.noNullElements(fields, "Fields must not contain null values");
+
+			if (ObjectUtils.isEmpty(fields)) {
+				return id();
+			}
+
+			return new UniqueMergeId(Arrays.asList(fields));
+		}
+
+		/**
+		 * Merge Documents by using the MongoDB {@literal _id} field.
+		 *
+		 * @return never {@literal null}.
+		 */
+		public static UniqueMergeId id() {
+			return ID;
+		}
+
+		boolean isJustIdField() {
+			return this.equals(ID);
+		}
+
+		Document toDocument(AggregationOperationContext context) {
+
+			List<String> mappedOn = uniqueIdentifier.stream().map(context::getReference).map(FieldReference::getRaw)
+					.collect(Collectors.toList());
+			return new Document("on", mappedOn.size() == 1 ? mappedOn.iterator().next() : mappedOn);
+		}
+	}
+
+	/**
+	 * Value Object representing the {@code into} field of a {@code $merge} aggregation stage. <br />
+	 * If not stated explicitly via {@link MergeOperationTarget#inDatabase(String)} the {@literal collection} is created
+	 * in the very same {@literal database}. In this case {@code into} is just a single String holding the collection
+	 * name. <br />
+	 *
+	 * <pre class="code">
+	 *     into: "target-collection-name"
+	 * </pre>
+	 *
+	 * If the collection needs to be in a different database {@code into} will be a {@link Document} like the following
+	 *
+	 * <pre class="code">
+	 * {
+	 * 	into: {}
+	 * }
+	 * </pre>
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.3
+	 */
+	public static class MergeOperationTarget {
+
+		private final @Nullable String database;
+		private final String collection;
+
+		private MergeOperationTarget(@Nullable String database, String collection) {
+
+			Assert.hasText(collection, "Collection must not be null nor empty");
+
+			this.database = database;
+			this.collection = collection;
+		}
+
+		/**
+		 * @param collection The output collection results will be stored in. Must not be {@literal null}.
+		 * @return new instance of {@link MergeOperationTarget}.
+		 */
+		public static MergeOperationTarget collection(String collection) {
+			return new MergeOperationTarget(null, collection);
+		}
+
+		/**
+		 * Optionally specify the target database if different from the source one.
+		 *
+		 * @param database must not be {@literal null}.
+		 * @return new instance of {@link MergeOperationTarget}.
+		 */
+		public MergeOperationTarget inDatabase(String database) {
+			return new MergeOperationTarget(database, collection);
+		}
+
+		boolean isTargetingSameDatabase() {
+			return !StringUtils.hasText(database);
+		}
+
+		Document toDocument(AggregationOperationContext context) {
+
+			return new Document("into",
+					!StringUtils.hasText(database) ? collection : new Document("db", database).append("coll", collection));
+		}
+	}
+
+	/**
+	 * Value Object specifying how to deal with a result document that matches an existing document in the collection
+	 * based on the fields of the {@code on} property describing the unique identifier.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.3
+	 */
+	public static class WhenDocumentsMatch {
+
+		private final Object value;
+
+		private WhenDocumentsMatch(Object value) {
+			this.value = value;
+		}
+
+		public static WhenDocumentsMatch whenMatchedOf(String value) {
+			return new WhenDocumentsMatch(value);
+		}
+
+		/**
+		 * Replace the existing document in the output collection with the matching results document.
+		 *
+		 * @return new instance of {@link WhenDocumentsMatch}.
+		 */
+		public static WhenDocumentsMatch replaceDocument() {
+			return whenMatchedOf("replace");
+		}
+
+		/**
+		 * Keep the existing document in the output collection.
+		 *
+		 * @return new instance of {@link WhenDocumentsMatch}.
+		 */
+		public static WhenDocumentsMatch keepExistingDocument() {
+			return whenMatchedOf("keepExisting");
+		}
+
+		/**
+		 * Merge the matching documents. Please see the MongoDB reference documentation for details.
+		 *
+		 * @return new instance of {@link WhenDocumentsMatch}.
+		 */
+		public static WhenDocumentsMatch mergeDocuments() {
+			return whenMatchedOf("merge");
+		}
+
+		/**
+		 * Stop and fail the aggregation operation. Does not revert already performed changes on previous documents.
+		 *
+		 * @return new instance of {@link WhenDocumentsMatch}.
+		 */
+		public static WhenDocumentsMatch failOnMatch() {
+			return whenMatchedOf("fail");
+		}
+
+		/**
+		 * Use an {@link Aggregation} to update the document in the collection. Please see the MongoDB reference
+		 * documentation for details.
+		 *
+		 * @param aggregation must not be {@literal null}.
+		 * @return new instance of {@link WhenDocumentsMatch}.
+		 */
+		public static WhenDocumentsMatch updateWith(Aggregation aggregation) {
+			return new WhenDocumentsMatch(aggregation);
+		}
+
+		/**
+		 * Use an aggregation pipeline to update the document in the collection. Please see the MongoDB reference
+		 * documentation for details.
+		 *
+		 * @param aggregationPipeline must not be {@literal null}.
+		 * @return new instance of {@link WhenDocumentsMatch}.
+		 */
+		public static WhenDocumentsMatch updateWith(List<AggregationOperation> aggregationPipeline) {
+			return new WhenDocumentsMatch(aggregationPipeline);
+		}
+
+		Document toDocument(AggregationOperationContext context) {
+
+			if (value instanceof Aggregation aggregation) {
+				return new Document("whenMatched", aggregation.toPipeline(context));
+			}
+
+			return new Document("whenMatched", value);
+		}
+	}
+
+	/**
+	 * Value Object specifying how to deal with a result document that do not match an existing document in the collection
+	 * based on the fields of the {@code on} property describing the unique identifier.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.3
+	 */
+	public static class WhenDocumentsDontMatch {
+
+		private final String value;
+
+		private WhenDocumentsDontMatch(String value) {
+
+			Assert.notNull(value, "Value must not be null");
+
+			this.value = value;
+		}
+
+		/**
+		 * Factory method creating {@link WhenDocumentsDontMatch} from a {@code value} literal.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link WhenDocumentsDontMatch}.
+		 */
+		public static WhenDocumentsDontMatch whenNotMatchedOf(String value) {
+			return new WhenDocumentsDontMatch(value);
+		}
+
+		/**
+		 * Insert the document into the output collection.
+		 *
+		 * @return new instance of {@link WhenDocumentsDontMatch}.
+		 */
+		public static WhenDocumentsDontMatch insertNewDocument() {
+			return whenNotMatchedOf("insert");
+		}
+
+		/**
+		 * Discard the document - do not insert the document into the output collection.
+		 *
+		 * @return new instance of {@link WhenDocumentsDontMatch}.
+		 */
+		public static WhenDocumentsDontMatch discardDocument() {
+			return whenNotMatchedOf("discard");
+		}
+
+		/**
+		 * Stop and fail the aggregation operation. Does not revert already performed changes on previous documents.
+		 *
+		 * @return new instance of {@link WhenDocumentsDontMatch}.
+		 */
+		public static WhenDocumentsDontMatch failWhenNotMatch() {
+			return whenNotMatchedOf("fail");
+		}
+
+		public Document toDocument(AggregationOperationContext context) {
+			return new Document("whenNotMatched", value);
+		}
+	}
+
+	/**
+	 * Builder API to construct a {@link MergeOperation}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.3
+	 */
+	public static class MergeOperationBuilder {
+
+		private @Nullable String collection;
+		private @Nullable String database;
+		private UniqueMergeId id = UniqueMergeId.id();
+		private @Nullable Let let;
+		private @Nullable WhenDocumentsMatch whenMatched;
+		private @Nullable WhenDocumentsDontMatch whenNotMatched;
+
+		public MergeOperationBuilder() {}
+
+		/**
+		 * Required output collection name to store results to.
+		 *
+		 * @param collection must not be {@literal null} nor empty.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder intoCollection(String collection) {
+
+			Assert.hasText(collection, "Collection must not be null nor empty");
+
+			this.collection = collection;
+			return this;
+		}
+
+		/**
+		 * Optionally define a target database if different from the current one.
+		 *
+		 * @param database must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder inDatabase(String database) {
+
+			this.database = database;
+			return this;
+		}
+
+		/**
+		 * Define the target to store results in.
+		 *
+		 * @param into must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder into(MergeOperationTarget into) {
+
+			this.database = into.database;
+			this.collection = into.collection;
+			return this;
+		}
+
+		/**
+		 * Define the target to store results in.
+		 *
+		 * @param target must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder target(MergeOperationTarget target) {
+			return into(target);
+		}
+
+		/**
+		 * Appends a single field or multiple fields that act as a unique identifier for a document. The identifier
+		 * determines if a results document matches an already existing document in the output collection. <br />
+		 * The aggregation results documents must contain the field(s) specified via {@code on}, unless it's the {@code _id}
+		 * field.
+		 *
+		 * @param fields must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder on(String... fields) {
+			return id(UniqueMergeId.ofIdFields(fields));
+		}
+
+		/**
+		 * Set the identifier that determines if a results document matches an already existing document in the output
+		 * collection.
+		 *
+		 * @param id must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder id(UniqueMergeId id) {
+
+			this.id = id;
+			return this;
+		}
+
+		/**
+		 * Expose the variables defined by {@link Let} to the {@link WhenDocumentsMatch#updateWith(Aggregation) update
+		 * aggregation}.
+		 *
+		 * @param let the variable expressions
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder let(Let let) {
+
+			this.let = let;
+			return this;
+		}
+
+		/**
+		 * Expose the variables defined by {@link Let} to the {@link WhenDocumentsMatch#updateWith(Aggregation) update
+		 * aggregation}.
+		 *
+		 * @param let the variable expressions
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder exposeVariablesOf(Let let) {
+			return let(let);
+		}
+
+		/**
+		 * The action to take place when documents already exist in the target collection.
+		 *
+		 * @param whenMatched must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder whenMatched(WhenDocumentsMatch whenMatched) {
+
+			this.whenMatched = whenMatched;
+			return this;
+		}
+
+		/**
+		 * The action to take place when documents already exist in the target collection.
+		 *
+		 * @param whenMatched must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder whenDocumentsMatch(WhenDocumentsMatch whenMatched) {
+			return whenMatched(whenMatched);
+		}
+
+		/**
+		 * The {@link Aggregation action} to take place when documents already exist in the target collection.
+		 *
+		 * @param aggregation must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder whenDocumentsMatchApply(Aggregation aggregation) {
+			return whenMatched(WhenDocumentsMatch.updateWith(aggregation));
+		}
+
+		/**
+		 * The action to take place when documents do not already exist in the target collection.
+		 *
+		 * @param whenNotMatched must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder whenNotMatched(WhenDocumentsDontMatch whenNotMatched) {
+
+			this.whenNotMatched = whenNotMatched;
+			return this;
+		}
+
+		/**
+		 * The action to take place when documents do not already exist in the target collection.
+		 *
+		 * @param whenNotMatched must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MergeOperationBuilder whenDocumentsDontMatch(WhenDocumentsDontMatch whenNotMatched) {
+			return whenNotMatched(whenNotMatched);
+		}
+
+		/**
+		 * @return new instance of {@link MergeOperation}.
+		 */
+		@Contract("-> new")
+		public MergeOperation build() {
+			
+			Assert.notNull(collection, "Collection must not be null");
+			return new MergeOperation(new MergeOperationTarget(database, collection), id, let, whenMatched, whenNotMatched);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java
index 1aa4432eea..a5124320f6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/NestedDelegatingExpressionAggregationOperationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author 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,6 +19,8 @@
 
 import org.bson.Document;
 
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExpressionFieldReference;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.util.Assert;
@@ -45,33 +47,21 @@ class NestedDelegatingExpressionAggregationOperationContext implements Aggregati
 	NestedDelegatingExpressionAggregationOperationContext(AggregationOperationContext referenceContext,
 			Collection<Field> inners) {
 
-		Assert.notNull(referenceContext, "Reference context must not be null!");
+		Assert.notNull(referenceContext, "Reference context must not be null");
 		this.delegate = referenceContext;
 		this.inners = inners;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
-	 */
 	@Override
 	public Document getMappedObject(Document document) {
 		return delegate.getMappedObject(document);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-	 */
 	@Override
-	public Document getMappedObject(Document document, Class<?> type) {
+	public Document getMappedObject(Document document, @Nullable Class<?> type) {
 		return delegate.getMappedObject(document, type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)
-	 */
 	@Override
 	public FieldReference getReference(Field field) {
 
@@ -95,21 +85,18 @@ private boolean isInnerVariableReference(Field field) {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
-	 */
 	@Override
 	public FieldReference getReference(String name) {
 		return new ExpressionFieldReference(delegate.getReference(name));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class)
-	 */
 	@Override
 	public Fields getFields(Class<?> type) {
 		return delegate.getFields(type);
 	}
+
+	@Override
+	public CodecRegistry getCodecRegistry() {
+		return delegate.getCodecRegistry();
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java
index c6df7a8122..4e21ab7bde 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ObjectOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 
 import org.bson.Document;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -51,6 +53,41 @@ public static ObjectOperatorFactory valueOf(AggregationExpression expression) {
 		return new ObjectOperatorFactory(expression);
 	}
 
+	/**
+	 * Use the value from the given {@link SystemVariable} as input for the target {@link AggregationExpression expression}.
+	 *
+	 * @param variable the {@link SystemVariable} to use (eg. {@link SystemVariable#ROOT}.
+	 * @return new instance of {@link ObjectOperatorFactory}.
+	 * @since 4.2
+	 */
+	public static ObjectOperatorFactory valueOf(SystemVariable variable) {
+		return new ObjectOperatorFactory(Fields.field(variable.getName(), variable.getTarget()));
+	}
+
+	/**
+	 * Get the value of the field with given name from the {@literal $$CURRENT} object.
+	 * Short version for {@code ObjectOperators.valueOf("$$CURRENT").getField(fieldName)}.
+	 *
+	 * @param fieldName the field name.
+	 * @return new instance of {@link AggregationExpression}.
+	 * @since 4.2
+	 */
+	public static AggregationExpression getValueOf(String fieldName) {
+		return new ObjectOperatorFactory(SystemVariable.CURRENT).getField(fieldName);
+	}
+
+	/**
+	 * Set the value of the field with given name on the {@literal $$CURRENT} object.
+	 * Short version for {@code ObjectOperators.valueOf($$CURRENT).setField(fieldName).toValue(value)}.
+	 *
+	 * @param fieldName the field name.
+	 * @return new instance of {@link AggregationExpression}.
+	 * @since 4.2
+	 */
+	public static AggregationExpression setValueTo(String fieldName, Object value) {
+		return new ObjectOperatorFactory(SystemVariable.CURRENT).setField(fieldName).toValue(value);
+	}
+
 	/**
 	 * @author Christoph Strobl
 	 */
@@ -65,7 +102,7 @@ public static class ObjectOperatorFactory {
 		 */
 		public ObjectOperatorFactory(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 
 			this.value = value;
 		}
@@ -118,12 +155,42 @@ public MergeObjects mergeWithValuesOf(AggregationExpression... expression) {
 		 * Creates new {@link ObjectToArray aggregation expression} that takes the associated value and converts it to an
 		 * array of {@link Document documents} that contain two fields {@literal k} and {@literal v} each. <br />
 		 * <strong>NOTE:</strong> Requires MongoDB 3.6 or later.
-		 * 
+		 *
 		 * @since 2.1
 		 */
 		public ObjectToArray toArray() {
 			return ObjectToArray.toArray(value);
 		}
+
+		/**
+		 * Creates new {@link GetField aggregation expression} that takes the associated value and obtains the value of the
+		 * field with matching name.
+		 *
+		 * @since 4.0
+		 */
+		public GetField getField(String fieldName) {
+			return GetField.getField(Fields.field(fieldName)).of(value);
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} that takes the associated value and obtains the value of the
+		 * field with matching name.
+		 *
+		 * @since 4.0
+		 */
+		public SetField setField(String fieldName) {
+			return SetField.field(Fields.field(fieldName)).input(value);
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} that takes the associated value and obtains the value of the
+		 * field with matching name.
+		 *
+		 * @since 4.0
+		 */
+		public AggregationExpression removeField(String fieldName) {
+			return SetField.field(fieldName).input(value).toValue(SystemVariable.REMOVE);
+		}
 	}
 
 	/**
@@ -206,32 +273,20 @@ public MergeObjects mergeWith(Object... values) {
 			return new MergeObjects(append(Arrays.asList(values)));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#toDocument(java.lang.Object, org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(Object value, AggregationOperationContext context) {
 			return super.toDocument(potentiallyExtractSingleValue(value), context);
 		}
 
-		@SuppressWarnings("unchecked")
+		@SuppressWarnings("NullAway")
 		private Object potentiallyExtractSingleValue(Object value) {
 
-			if (value instanceof Collection) {
-
-				Collection<Object> collection = ((Collection<Object>) value);
-				if (collection.size() == 1) {
-					return collection.iterator().next();
-				}
+			if (value instanceof Collection<?> collection && collection.size() == 1) {
+				return collection.iterator().next();
 			}
 			return value;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod()
-		 */
 		@Override
 		protected String getMongoMethod() {
 			return "$mergeObjects";
@@ -286,13 +341,201 @@ public static ObjectToArray toArray(Object value) {
 			return new ObjectToArray(value);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AbstractAggregationExpression#getMongoMethod()
-		 */
 		@Override
 		protected String getMongoMethod() {
 			return "$objectToArray";
 		}
 	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $getField}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class GetField extends AbstractAggregationExpression {
+
+		protected GetField(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link GetField aggregation expression} that takes the value pointed to by given {@code fieldName}.
+		 *
+		 * @param fieldName must not be {@literal null}.
+		 * @return new instance of {@link GetField}.
+		 */
+		public static GetField getField(String fieldName) {
+			return new GetField(Collections.singletonMap("field", fieldName));
+		}
+
+		/**
+		 * Creates new {@link GetField aggregation expression} that takes the value pointed to by given {@link Field}.
+		 *
+		 * @param field must not be {@literal null}.
+		 * @return new instance of {@link GetField}.
+		 */
+		public static GetField getField(Field field) {
+			return new GetField(Collections.singletonMap("field", field));
+		}
+
+		/**
+		 * Creates new {@link GetField aggregation expression} that takes the value pointed to by given
+		 * {@code field reference}.
+		 *
+		 * @param fieldRef must not be {@literal null}.
+		 * @return new instance of {@link GetField}.
+		 */
+		@Contract("_ -> new")
+		public GetField of(String fieldRef) {
+			return of(Fields.field(fieldRef));
+		}
+
+		/**
+		 * Creates new {@link GetField aggregation expression} that takes the value pointed to by given
+		 * {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link GetField}.
+		 */
+		@Contract("_ -> new")
+		public GetField of(AggregationExpression expression) {
+			return of((Object) expression);
+		}
+
+		private GetField of(Object fieldRef) {
+			return new GetField(append("input", fieldRef));
+		}
+
+		@Override
+		public Document toDocument(AggregationOperationContext context) {
+
+			if(isArgumentMap() && get("field") instanceof Field field) {
+				return new GetField(append("field", context.getReference(field).getRaw())).toDocument(context);
+			}
+			return super.toDocument(context);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$getField";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $setField}.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.0
+	 */
+	public static class SetField extends AbstractAggregationExpression {
+
+		protected SetField(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} that takes the value pointed to by given input
+		 * {@code fieldName}.
+		 *
+		 * @param fieldName must not be {@literal null}.
+		 * @return new instance of {@link SetField}.
+		 */
+		public static SetField field(String fieldName) {
+			return new SetField(Collections.singletonMap("field", fieldName));
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} that takes the value pointed to by given input {@link Field}.
+		 *
+		 * @param field must not be {@literal null}.
+		 * @return new instance of {@link SetField}.
+		 */
+		public static SetField field(Field field) {
+			return new SetField(Collections.singletonMap("field", field));
+		}
+
+		/**
+		 * Creates new {@link GetField aggregation expression} that takes the value pointed to by given input
+		 * {@code field reference}.
+		 *
+		 * @param fieldRef must not be {@literal null}.
+		 * @return new instance of {@link GetField}.
+		 */
+		@Contract("_ -> new")
+		public SetField input(String fieldRef) {
+			return input(Fields.field(fieldRef));
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} that takes the value pointed to by given input
+		 * {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link SetField}.
+		 */
+		@Contract("_ -> new")
+		public SetField input(AggregationExpression expression) {
+			return input((Object) expression);
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} that takes the value pointed to by given input
+		 * {@code field reference}.
+		 *
+		 * @param fieldRef must not be {@literal null}.
+		 * @return new instance of {@link SetField}.
+		 */
+		@Contract("_ -> new")
+		private SetField input(Object fieldRef) {
+			return new SetField(append("input", fieldRef));
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} providing the {@code value} using {@literal fieldReference}.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link SetField}.
+		 */
+		@Contract("_ -> new")
+		public SetField toValueOf(String fieldReference) {
+			return toValue(Fields.field(fieldReference));
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} providing the {@code value} using
+		 * {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link SetField}.
+		 */
+		@Contract("_ -> new")
+		public SetField toValueOf(AggregationExpression expression) {
+			return toValue(expression);
+		}
+
+		/**
+		 * Creates new {@link SetField aggregation expression} providing the {@code value}.
+		 *
+		 * @param value
+		 * @return new instance of {@link SetField}.
+		 */
+		@Contract("_ -> new")
+		public SetField toValue(Object value) {
+			return new SetField(append("value", value));
+		}
+
+		@Override
+		public Document toDocument(AggregationOperationContext context) {
+			if(get("field") instanceof Field field) {
+				return new SetField(append("field", context.getReference(field).getRaw())).toDocument(context);
+			}
+			return super.toDocument(context);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$setField";
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java
index b0b29ca731..7dbed3a855 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/OutOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.util.BsonUtils;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -58,7 +58,7 @@ public OutOperation(String outCollectionName) {
 	private OutOperation(@Nullable String databaseName, String collectionName, @Nullable Document uniqueKey,
 			@Nullable OutMode mode) {
 
-		Assert.notNull(collectionName, "Collection name must not be null!");
+		Assert.notNull(collectionName, "Collection name must not be null");
 
 		this.databaseName = databaseName;
 		this.collectionName = collectionName;
@@ -74,6 +74,7 @@ private OutOperation(@Nullable String databaseName, String collectionName, @Null
 	 * @return new instance of {@link OutOperation}.
 	 * @since 2.2
 	 */
+	@Contract("_ -> new")
 	public OutOperation in(@Nullable String database) {
 		return new OutOperation(database, collectionName, uniqueKey, mode);
 	}
@@ -103,6 +104,7 @@ public OutOperation in(@Nullable String database) {
 	 * @return new instance of {@link OutOperation}.
 	 * @since 2.2
 	 */
+	@Contract("_ -> new")
 	public OutOperation uniqueKey(@Nullable String key) {
 
 		Document uniqueKey = key == null ? null : BsonUtils.toDocumentOrElse(key, it -> new Document(it, 1));
@@ -127,9 +129,10 @@ public OutOperation uniqueKey(@Nullable String key) {
 	 * @return new instance of {@link OutOperation}.
 	 * @since 2.2
 	 */
+	@Contract("_ -> new")
 	public OutOperation uniqueKeyOf(Iterable<String> fields) {
 
-		Assert.notNull(fields, "Fields must not be null!");
+		Assert.notNull(fields, "Fields must not be null");
 
 		Document uniqueKey = new Document();
 		fields.forEach(it -> uniqueKey.append(it, 1));
@@ -145,9 +148,10 @@ public OutOperation uniqueKeyOf(Iterable<String> fields) {
 	 * @return new instance of {@link OutOperation}.
 	 * @since 2.2
 	 */
+	@Contract("_ -> new")
 	public OutOperation mode(OutMode mode) {
 
-		Assert.notNull(mode, "Mode must not be null!");
+		Assert.notNull(mode, "Mode must not be null");
 		return new OutOperation(databaseName, collectionName, uniqueKey, mode);
 	}
 
@@ -159,6 +163,7 @@ public OutOperation mode(OutMode mode) {
 	 * @see OutMode#REPLACE_COLLECTION
 	 * @since 2.2
 	 */
+	@Contract("-> new")
 	public OutOperation replaceCollection() {
 		return mode(OutMode.REPLACE_COLLECTION);
 	}
@@ -171,6 +176,7 @@ public OutOperation replaceCollection() {
 	 * @see OutMode#REPLACE
 	 * @since 2.2
 	 */
+	@Contract("-> new")
 	public OutOperation replaceDocuments() {
 		return mode(OutMode.REPLACE);
 	}
@@ -183,14 +189,11 @@ public OutOperation replaceDocuments() {
 	 * @see OutMode#INSERT
 	 * @since 2.2
 	 */
+	@Contract("-> new")
 	public OutOperation insertDocuments() {
 		return mode(OutMode.INSERT);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -198,7 +201,7 @@ public Document toDocument(AggregationOperationContext context) {
 			return new Document("$out", collectionName);
 		}
 
-		Assert.state(mode != null, "Mode must not be null!");
+		Assert.state(mode != null, "Mode must not be null");
 
 		Document $out = new Document("to", collectionName) //
 				.append("mode", mode.getMongoMode());
@@ -211,7 +214,12 @@ public Document toDocument(AggregationOperationContext context) {
 			$out.append("uniqueKey", uniqueKey);
 		}
 
-		return new Document("$out", $out);
+		return new Document(getOperator(), $out);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$out";
 	}
 
 	private boolean requiresMongoDb42Format() {
@@ -241,7 +249,7 @@ public enum OutMode {
 		 */
 		REPLACE_COLLECTION("replaceCollection");
 
-		private String mode;
+		private final String mode;
 
 		OutMode(String mode) {
 			this.mode = mode;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java
index 911b69f2e1..54ed40b035 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/PrefixingDelegatingAggregationOperationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,15 @@
 import java.util.Set;
 
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link AggregationOperationContext} implementation prefixing non-command keys on root level with the given prefix.
  * Useful when mapping fields to domain specific types while having to prefix keys for query purpose.
- * <p />
- * Fields to be excluded from prefixing my be added to a {@literal blacklist}.
+ * <br />
+ * Fields to be excluded from prefixing my be added to a {@literal denylist}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
@@ -41,65 +42,50 @@ public class PrefixingDelegatingAggregationOperationContext implements Aggregati
 
 	private final AggregationOperationContext delegate;
 	private final String prefix;
-	private final Set<String> blacklist;
+	private final Set<String> denylist;
 
 	public PrefixingDelegatingAggregationOperationContext(AggregationOperationContext delegate, String prefix) {
 		this(delegate, prefix, Collections.emptySet());
 	}
 
 	public PrefixingDelegatingAggregationOperationContext(AggregationOperationContext delegate, String prefix,
-			Collection<String> blacklist) {
+			Collection<String> denylist) {
 
 		this.delegate = delegate;
 		this.prefix = prefix;
-		this.blacklist = new HashSet<>(blacklist);
+		this.denylist = new HashSet<>(denylist);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
-	 */
 	@Override
 	public Document getMappedObject(Document document) {
 		return doPrefix(delegate.getMappedObject(document));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-	 */
 	@Override
 	public Document getMappedObject(Document document, @Nullable Class<?> type) {
 		return doPrefix(delegate.getMappedObject(document, type));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)
-	 */
 	@Override
 	public FieldReference getReference(Field field) {
 		return delegate.getReference(field);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
-	 */
 	@Override
 	public FieldReference getReference(String name) {
 		return delegate.getReference(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class)
-	 */
 	@Override
 	public Fields getFields(Class<?> type) {
 		return delegate.getFields(type);
 	}
 
+	@Override
+	public CodecRegistry getCodecRegistry() {
+		return delegate.getCodecRegistry();
+	}
+
 	@SuppressWarnings("unchecked")
 	private Document doPrefix(Document source) {
 
@@ -121,7 +107,7 @@ private Document doPrefix(Document source) {
 	}
 
 	private String prefixKey(String key) {
-		return (key.startsWith("$") || isBlacklisted(key)) ? key : (prefix + "." + key);
+		return (key.startsWith("$") || isDenied(key)) ? key : (prefix + "." + key);
 	}
 
 	private Object prefixCollection(Collection<Object> sourceCollection) {
@@ -129,8 +115,8 @@ private Object prefixCollection(Collection<Object> sourceCollection) {
 		List<Object> prefixed = new ArrayList<>(sourceCollection.size());
 
 		for (Object o : sourceCollection) {
-			if (o instanceof Document) {
-				prefixed.add(doPrefix((Document) o));
+			if (o instanceof Document document) {
+				prefixed.add(doPrefix(document));
 			} else {
 				prefixed.add(o);
 			}
@@ -139,9 +125,9 @@ private Object prefixCollection(Collection<Object> sourceCollection) {
 		return prefixed;
 	}
 
-	private boolean isBlacklisted(String key) {
+	private boolean isDenied(String key) {
 
-		if (blacklist.contains(key)) {
+		if (denylist.contains(key)) {
 			return true;
 		}
 
@@ -149,8 +135,8 @@ private boolean isBlacklisted(String key) {
 			return false;
 		}
 
-		for (String blacklisted : blacklist) {
-			if (key.startsWith(blacklisted + ".")) {
+		for (String denied : denylist) {
+			if (key.startsWith(denied + ".")) {
 				return true;
 			}
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java
index 85f83acfc1..af7cf5bfb2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,13 +23,14 @@
 import java.util.stream.Collectors;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.IfNull;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.data.mongodb.core.aggregation.Fields.AggregationField;
 import org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.FieldProjection;
 import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -53,8 +54,8 @@
 public class ProjectionOperation implements FieldsExposingAggregationOperation {
 
 	private static final List<Projection> NONE = Collections.emptyList();
-	private static final String EXCLUSION_ERROR = "Exclusion of field %s not allowed. Projections by the mongodb "
-			+ "aggregation framework only support the exclusion of the %s field!";
+	private static final String EXCLUSION_ERROR = "Exclusion of field %s not allowed; Projections by the mongodb"
+			+ " aggregation framework only support the exclusion of the %s field";
 
 	private final List<Projection> projections;
 
@@ -93,8 +94,8 @@ public ProjectionOperation(Class<?> type) {
 	 */
 	private ProjectionOperation(List<? extends Projection> current, List<? extends Projection> projections) {
 
-		Assert.notNull(current, "Current projections must not be null!");
-		Assert.notNull(projections, "Projections must not be null!");
+		Assert.notNull(current, "Current projections must not be null");
+		Assert.notNull(projections, "Projections must not be null");
 
 		this.projections = new ArrayList<ProjectionOperation.Projection>(current.size() + projections.size());
 		this.projections.addAll(current);
@@ -149,6 +150,7 @@ public ProjectionOperationBuilder and(AggregationExpression expression) {
 	 * @param fieldNames must not be {@literal null}.
 	 * @return
 	 */
+	@Contract("_ -> new")
 	public ProjectionOperation andExclude(String... fieldNames) {
 
 		List<FieldProjection> excludeProjections = FieldProjection.from(Fields.fields(fieldNames), false);
@@ -161,6 +163,7 @@ public ProjectionOperation andExclude(String... fieldNames) {
 	 * @param fieldNames must not be {@literal null}.
 	 * @return
 	 */
+	@Contract("_ -> new")
 	public ProjectionOperation andInclude(String... fieldNames) {
 
 		List<FieldProjection> projections = FieldProjection.from(Fields.fields(fieldNames), true);
@@ -173,6 +176,7 @@ public ProjectionOperation andInclude(String... fieldNames) {
 	 * @param fields must not be {@literal null}.
 	 * @return
 	 */
+	@Contract("_ -> new")
 	public ProjectionOperation andInclude(Fields fields) {
 		return new ProjectionOperation(this.projections, FieldProjection.from(fields, true));
 	}
@@ -185,6 +189,7 @@ public ProjectionOperation andInclude(Fields fields) {
 	 * @return new instance of {@link ProjectionOperation}.
 	 * @since 2.2
 	 */
+	@Contract("_ -> new")
 	public ProjectionOperation asArray(String name) {
 
 		return new ProjectionOperation(Collections.emptyList(),
@@ -207,10 +212,10 @@ public ArrayProjectionOperationBuilder andArrayOf(Object... values) {
 
 		for (Object value : values) {
 
-			if (value instanceof Field) {
-				builder.and((Field) value);
-			} else if (value instanceof AggregationExpression) {
-				builder.and((AggregationExpression) value);
+			if (value instanceof Field field) {
+				builder.and(field);
+			} else if (value instanceof AggregationExpression aggregationExpression) {
+				builder.and(aggregationExpression);
 			} else {
 				builder.and(value);
 			}
@@ -219,10 +224,6 @@ public ArrayProjectionOperationBuilder andArrayOf(Object... values) {
 		return builder;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 
@@ -236,10 +237,6 @@ public ExposedFields getFields() {
 		return fields != null ? fields : ExposedFields.empty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#inheritsFields()
-	 */
 	@Override
 	public boolean inheritsFields() {
 
@@ -248,10 +245,6 @@ public boolean inheritsFields() {
 				.anyMatch(FieldProjection::isExcluded);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -261,7 +254,12 @@ public Document toDocument(AggregationOperationContext context) {
 			fieldObject.putAll(projection.toDocument(context));
 		}
 
-		return new Document("$project", fieldObject);
+		return new Document(getOperator(), fieldObject);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$project";
 	}
 
 	/**
@@ -282,17 +280,13 @@ private static abstract class AbstractProjectionOperationBuilder implements Aggr
 		 */
 		public AbstractProjectionOperationBuilder(Object value, ProjectionOperation operation) {
 
-			Assert.notNull(value, "value must not be null or empty!");
-			Assert.notNull(operation, "ProjectionOperation must not be null!");
+			Assert.notNull(value, "value must not be null or empty");
+			Assert.notNull(operation, "ProjectionOperation must not be null");
 
 			this.value = value;
 			this.operation = operation;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return this.operation.toDocument(context);
@@ -341,7 +335,7 @@ public static class ExpressionProjectionOperationBuilder extends ProjectionOpera
 		 *
 		 * @param expression must not be {@literal null}.
 		 * @param operation must not be {@literal null}.
-		 * @param parameters
+		 * @param parameters parameters must not be {@literal null}.
 		 */
 		public ExpressionProjectionOperationBuilder(String expression, ProjectionOperation operation, Object[] parameters) {
 
@@ -350,9 +344,6 @@ public ExpressionProjectionOperationBuilder(String expression, ProjectionOperati
 			this.params = parameters.clone();
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder#project(java.lang.String, java.lang.Object[])
-		 */
 		@Override
 		public ProjectionOperationBuilder project(String operation, final Object... values) {
 
@@ -361,7 +352,7 @@ public ProjectionOperationBuilder project(String operation, final Object... valu
 				@Override
 				protected List<Object> getOperationArguments(AggregationOperationContext context) {
 
-					List<Object> result = new ArrayList<Object>(values.length + 1);
+					List<Object> result = new ArrayList<>(values.length + 1);
 					result.add(ExpressionProjection.toMongoExpression(context,
 							ExpressionProjectionOperationBuilder.this.expression, ExpressionProjectionOperationBuilder.this.params));
 					result.addAll(Arrays.asList(values));
@@ -373,10 +364,6 @@ protected List<Object> getOperationArguments(AggregationOperationContext context
 			return new ProjectionOperationBuilder(value, this.operation.and(operationProjection), operationProjection);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#as(java.lang.String)
-		 */
 		@Override
 		public ProjectionOperation as(String alias) {
 
@@ -408,23 +395,19 @@ public ExpressionProjection(Field field, String expression, Object[] parameters)
 
 				super(field);
 
-				Assert.hasText(expression, "Expression must not be null!");
-				Assert.notNull(parameters, "Parameters must not be null!");
+				Assert.hasText(expression, "Expression must not be null");
+				Assert.notNull(parameters, "Parameters must not be null");
 
 				this.expression = expression;
 				this.params = parameters.clone();
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(getExposedField().getName(), toMongoExpression(context, expression, params));
 			}
 
-			protected static Object toMongoExpression(AggregationOperationContext context, String expression,
+			protected static @Nullable Object toMongoExpression(AggregationOperationContext context, String expression,
 					Object[] params) {
 				return TRANSFORMER.transform(expression, context, params);
 			}
@@ -440,8 +423,8 @@ protected static Object toMongoExpression(AggregationOperationContext context, S
 	 */
 	public static class ProjectionOperationBuilder extends AbstractProjectionOperationBuilder {
 
-		private static final String NUMBER_NOT_NULL = "Number must not be null!";
-		private static final String FIELD_REFERENCE_NOT_NULL = "Field reference must not be null!";
+		private static final String NUMBER_NOT_NULL = "Number must not be null";
+		private static final String FIELD_REFERENCE_NOT_NULL = "Field reference must not be null";
 
 		private final @Nullable String name;
 		private final @Nullable OperationProjection previousProjection;
@@ -521,25 +504,17 @@ public ProjectionOperation as(String alias) {
 			return this.operation.and(new FieldProjection(Fields.field(alias, getRequiredName()), null));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#transform(org.springframework.data.mongodb.core.aggregation.ConditionalOperator)
-		 */
 		@Override
 		public ProjectionOperation applyCondition(Cond cond) {
 
-			Assert.notNull(cond, "ConditionalOperator must not be null!");
+			Assert.notNull(cond, "ConditionalOperator must not be null");
 			return this.operation.and(new ExpressionProjection(Fields.field(getRequiredName()), cond));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.AbstractProjectionOperationBuilder#transform(org.springframework.data.mongodb.core.aggregation.IfNullOperator)
-		 */
 		@Override
 		public ProjectionOperation applyCondition(IfNull ifNull) {
 
-			Assert.notNull(ifNull, "IfNullOperator must not be null!");
+			Assert.notNull(ifNull, "IfNullOperator must not be null");
 			return this.operation.and(new ExpressionProjection(Fields.field(getRequiredName()), ifNull));
 		}
 
@@ -563,7 +538,7 @@ public ProjectionOperationBuilder plus(Number number) {
 		 */
 		public ProjectionOperationBuilder plus(String fieldReference) {
 
-			Assert.notNull(fieldReference, "Field reference must not be null!");
+			Assert.notNull(fieldReference, "Field reference must not be null");
 			return project("add", Fields.field(fieldReference));
 		}
 
@@ -575,7 +550,7 @@ public ProjectionOperationBuilder plus(String fieldReference) {
 		 */
 		public ProjectionOperationBuilder minus(Number number) {
 
-			Assert.notNull(number, "Number must not be null!");
+			Assert.notNull(number, "Number must not be null");
 			return project("subtract", number);
 		}
 
@@ -602,7 +577,7 @@ public ProjectionOperationBuilder minus(String fieldReference) {
 		 */
 		public ProjectionOperationBuilder minus(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return project("subtract", expression);
 		}
 
@@ -641,7 +616,7 @@ public ProjectionOperationBuilder multiply(String fieldReference) {
 		 */
 		public ProjectionOperationBuilder multiply(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return project("multiply", expression);
 		}
 
@@ -654,7 +629,7 @@ public ProjectionOperationBuilder multiply(AggregationExpression expression) {
 		public ProjectionOperationBuilder divide(Number number) {
 
 			Assert.notNull(number, FIELD_REFERENCE_NOT_NULL);
-			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
+			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero");
 			return project("divide", number);
 		}
 
@@ -681,7 +656,7 @@ public ProjectionOperationBuilder divide(String fieldReference) {
 		 */
 		public ProjectionOperationBuilder divide(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return project("divide", expression);
 		}
 
@@ -695,7 +670,7 @@ public ProjectionOperationBuilder divide(AggregationExpression expression) {
 		public ProjectionOperationBuilder mod(Number number) {
 
 			Assert.notNull(number, NUMBER_NOT_NULL);
-			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero!");
+			Assert.isTrue(Math.abs(number.intValue()) != 0, "Number must not be zero");
 			return project("mod", number);
 		}
 
@@ -722,7 +697,7 @@ public ProjectionOperationBuilder mod(String fieldReference) {
 		 */
 		public ProjectionOperationBuilder mod(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return project("mod", expression);
 		}
 
@@ -865,7 +840,7 @@ public ProjectionOperationBuilder filter(String as, AggregationExpression condit
 		 */
 		public ProjectionOperationBuilder equalsArrays(String... arrays) {
 
-			Assert.notEmpty(arrays, "Arrays must not be null or empty!");
+			Assert.notEmpty(arrays, "Arrays must not be null or empty");
 			return project("setEquals", Fields.fields(arrays));
 		}
 
@@ -879,7 +854,7 @@ public ProjectionOperationBuilder equalsArrays(String... arrays) {
 		 */
 		public ProjectionOperationBuilder intersectsArrays(String... arrays) {
 
-			Assert.notEmpty(arrays, "Arrays must not be null or empty!");
+			Assert.notEmpty(arrays, "Arrays must not be null or empty");
 			return project("setIntersection", Fields.fields(arrays));
 		}
 
@@ -893,7 +868,7 @@ public ProjectionOperationBuilder intersectsArrays(String... arrays) {
 		 */
 		public ProjectionOperationBuilder unionArrays(String... arrays) {
 
-			Assert.notEmpty(arrays, "Arrays must not be null or empty!");
+			Assert.notEmpty(arrays, "Arrays must not be null or empty");
 			return project("setUnion", Fields.fields(arrays));
 		}
 
@@ -907,7 +882,7 @@ public ProjectionOperationBuilder unionArrays(String... arrays) {
 		 */
 		public ProjectionOperationBuilder differenceToArray(String array) {
 
-			Assert.hasText(array, "Array must not be null or empty!");
+			Assert.hasText(array, "Array must not be null or empty");
 			return project("setDifference", Fields.fields(array));
 		}
 
@@ -921,7 +896,7 @@ public ProjectionOperationBuilder differenceToArray(String array) {
 		 */
 		public ProjectionOperationBuilder subsetOfArray(String array) {
 
-			Assert.hasText(array, "Array must not be null or empty!");
+			Assert.hasText(array, "Array must not be null or empty");
 			return project("setIsSubset", Fields.fields(array));
 		}
 
@@ -1300,15 +1275,11 @@ public ProjectionOperationBuilder let(Collection<ExpressionVariable> variables,
 
 		private String getRequiredName() {
 
-			Assert.state(name != null, "Projection field name must not be null!");
+			Assert.state(name != null, "Projection field name must not be null");
 
 			return name;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return this.operation.toDocument(context);
@@ -1346,10 +1317,6 @@ public PreviousOperationProjection(String name) {
 				this.name = name;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(name, Fields.UNDERSCORE_ID_REF);
@@ -1406,7 +1373,7 @@ public static List<? extends Projection> from(Fields fields) {
 			 */
 			public static List<FieldProjection> from(Fields fields, @Nullable Object value) {
 
-				Assert.notNull(fields, "Fields must not be null!");
+				Assert.notNull(fields, "Fields must not be null");
 				List<FieldProjection> projections = new ArrayList<FieldProjection>();
 
 				for (Field field : fields) {
@@ -1423,10 +1390,6 @@ public boolean isExcluded() {
 				return Boolean.FALSE.equals(value);
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 				return new Document(field.getName(), renderFieldValue(context));
@@ -1437,10 +1400,18 @@ private Object renderFieldValue(AggregationOperationContext context) {
 				// implicit reference or explicit include?
 				if (value == null || Boolean.TRUE.equals(value)) {
 
-					if (Aggregation.SystemVariable.isReferingToSystemVariable(field.getTarget())) {
+					if (SystemVariable.isReferingToSystemVariable(field.getTarget())) {
 						return field.getTarget();
 					}
 
+					if (field.getTarget().equals(Fields.UNDERSCORE_ID)) {
+						try {
+							return context.getReference(field).getReferenceValue();
+						} catch (java.lang.IllegalArgumentException e) {
+							return Fields.UNDERSCORE_ID_REF;
+						}
+					}
+
 					// check whether referenced field exists in the context
 					return context.getReference(field).getReferenceValue();
 
@@ -1471,18 +1442,14 @@ static class OperationProjection extends Projection {
 
 				super(field);
 
-				Assert.hasText(operation, "Operation must not be null or empty!");
-				Assert.notNull(values, "Values must not be null!");
+				Assert.hasText(operation, "Operation must not be null or empty");
+				Assert.notNull(values, "Values must not be null");
 
 				this.field = field;
 				this.operation = operation;
 				this.values = Arrays.asList(values);
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 
@@ -1493,19 +1460,19 @@ public Document toDocument(AggregationOperationContext context) {
 
 			protected List<Object> getOperationArguments(AggregationOperationContext context) {
 
-				List<Object> result = new ArrayList<Object>(values.size());
+				List<Object> result = new ArrayList<>(values.size());
 				result.add(context.getReference(getField()).toString());
 
 				for (Object element : values) {
 
-					if (element instanceof Field) {
-						result.add(context.getReference((Field) element).toString());
-					} else if (element instanceof Fields) {
-						for (Field field : (Fields) element) {
+					if (element instanceof Field field) {
+						result.add(context.getReference(field).toString());
+					} else if (element instanceof Fields fields) {
+						for (Field field : fields) {
 							result.add(context.getReference(field).toString());
 						}
-					} else if (element instanceof AggregationExpression) {
-						result.add(((AggregationExpression) element).toDocument(context));
+					} else if (element instanceof AggregationExpression aggregationExpression) {
+						result.add(aggregationExpression.toDocument(context));
 					} else {
 						result.add(element);
 					}
@@ -1523,10 +1490,6 @@ protected Field getField() {
 				return field;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#getExposedField()
-			 */
 			@Override
 			public ExposedField getExposedField() {
 
@@ -1548,10 +1511,6 @@ OperationProjection withAlias(String alias) {
 				final Field aliasedField = Fields.field(alias, this.field.getName());
 				return new OperationProjection(aliasedField, operation, values.toArray()) {
 
-					/* 
-					 * (non-Javadoc)
-					 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.ProjectionOperationBuilder.OperationProjection#getField()
-					 */
 					@Override
 					protected Field getField() {
 						return aliasedField;
@@ -1581,10 +1540,6 @@ static class NestedFieldProjection extends Projection {
 				this.fields = fields;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-			 */
 			@Override
 			public Document toDocument(AggregationOperationContext context) {
 
@@ -1705,7 +1660,7 @@ private static abstract class Projection {
 		 */
 		public Projection(Field field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 			this.field = new ExposedField(field, true);
 		}
 
@@ -1749,10 +1704,6 @@ public ExpressionProjection(Field field, AggregationExpression expression) {
 			this.expression = expression;
 		}
 
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return new Document(field.getName(), expression.toDocument(context));
@@ -1776,18 +1727,38 @@ static class TypeProjection extends Projection {
 			this.type = type;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
 			Document projections = new Document();
 
 			Fields fields = context.getFields(type);
-			fields.forEach(it -> projections.append(it.getName(), 1));
-			return context.getMappedObject(projections, type);
+
+			fields.forEach(it -> projections.append(it.getTarget(), 1));
+			return projections;
+		}
+	}
+
+	/**
+	 * A {@link Projection} including all top level fields of the given target type mapped to include potentially
+	 * deviating field names.
+	 *
+	 * @since 2.2
+	 * @author Christoph Strobl
+	 */
+	static class FilterProjection extends Projection {
+
+		public static String FILTER_ELEMENT = "filterElement";
+		private final Object value;
+
+		FilterProjection(String fieldReference, Object value) {
+			super(Fields.field(FILTER_ELEMENT + "." + fieldReference));
+			this.value = value;
+		}
+
+		@Override
+		public Document toDocument(AggregationOperationContext context) {
+			return new Document(getExposedField().getName(), value);
 		}
 	}
 
@@ -1814,9 +1785,10 @@ public ArrayProjectionOperationBuilder(ProjectionOperation target) {
 		 * @param expression
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public ArrayProjectionOperationBuilder and(AggregationExpression expression) {
 
-			Assert.notNull(expression, "AggregationExpression must not be null!");
+			Assert.notNull(expression, "AggregationExpression must not be null");
 
 			this.projections.add(expression);
 			return this;
@@ -1828,9 +1800,10 @@ public ArrayProjectionOperationBuilder and(AggregationExpression expression) {
 		 * @param field
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public ArrayProjectionOperationBuilder and(Field field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 
 			this.projections.add(field);
 			return this;
@@ -1842,6 +1815,7 @@ public ArrayProjectionOperationBuilder and(Field field) {
 		 * @param value
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public ArrayProjectionOperationBuilder and(Object value) {
 
 			this.projections.add(value);
@@ -1854,6 +1828,7 @@ public ArrayProjectionOperationBuilder and(Object value) {
 		 * @param name The target property name. Must not be {@literal null}.
 		 * @return new instance of {@link ArrayProjectionOperationBuilder}.
 		 */
+		@Contract("_ -> new")
 		public ProjectionOperation as(String name) {
 
 			return new ProjectionOperation(target.projections,
@@ -1877,10 +1852,6 @@ public ArrayProjection(Field targetField, List<Object> projections) {
 			this.projections = projections;
 		}
 
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ProjectionOperation.Projection#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -1890,20 +1861,16 @@ public Document toDocument(AggregationOperationContext context) {
 
 		private Object toArrayEntry(Object projection, AggregationOperationContext ctx) {
 
-			if (projection instanceof Field) {
-				return ctx.getReference((Field) projection).toString();
-			}
-
-			if (projection instanceof AggregationExpression) {
-				return ((AggregationExpression) projection).toDocument(ctx);
+			if (projection instanceof Field field) {
+				return ctx.getReference(field).toString();
 			}
 
-			if (projection instanceof FieldProjection) {
-				return ctx.getReference(((FieldProjection) projection).getExposedField().getTarget()).toString();
+			if (projection instanceof AggregationExpression aggregationExpression) {
+				return aggregationExpression.toDocument(ctx);
 			}
 
-			if (projection instanceof Projection) {
-				((Projection) projection).toDocument(ctx);
+			if (projection instanceof FieldProjection fieldProjection) {
+				return ctx.getReference(fieldProjection.getExposedField().getTarget()).toString();
 			}
 
 			return projection;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RedactOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RedactOperation.java
new file mode 100644
index 0000000000..5f16fcfc16
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RedactOperation.java
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond.ThenBuilder;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+
+/**
+ * {@link RedactOperation} allows to restrict the content of a {@link Document} based on information stored within
+ * itself.
+ *
+ * <pre class="code">
+ * RedactOperation.builder() //
+ * 		.when(Criteria.where("level").is(5)) //
+ * 		.thenPrune() //
+ * 		.otherwiseDescend() //
+ * 		.build();
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @see <a href=
+ *      "https://docs.mongodb.com/manual/reference/operator/aggregation/redact/">https://docs.mongodb.com/manual/reference/operator/aggregation/redact/</a>
+ * @since 3.0
+ */
+public class RedactOperation implements AggregationOperation {
+
+	/**
+	 * Return fields at the current document level. Exclude embedded ones.
+	 */
+	public static final String DESCEND = "$$DESCEND";
+
+	/**
+	 * Return/Keep all fields at the current document/embedded level.
+	 */
+	public static final String KEEP = "$$KEEP";
+
+	/**
+	 * Exclude all fields at this current document/embedded level.
+	 */
+	public static final String PRUNE = "$$PRUNE";
+
+	private final AggregationExpression condition;
+
+	/**
+	 * Create new {@link RedactOperation}.
+	 *
+	 * @param condition Any {@link AggregationExpression} that resolves to {@literal $$DESCEND}, {@literal $$PRUNE}, or
+	 *          {@literal $$KEEP}. Must not be {@literal null}.
+	 */
+	public RedactOperation(AggregationExpression condition) {
+
+		Assert.notNull(condition, "Condition must not be null");
+		this.condition = condition;
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+		return new Document(getOperator(), condition.toDocument(context));
+	}
+
+	@Override
+	public String getOperator() {
+		return "$redact";
+	}
+
+	/**
+	 * Obtain a new instance of {@link RedactOperationBuilder} to specify condition and outcome of the {@literal $redact}
+	 * operation.
+	 *
+	 * @return new instance of {@link RedactOperationBuilder}.
+	 */
+	public static RedactOperationBuilder builder() {
+		return new RedactOperationBuilder();
+	}
+
+	/**
+	 * Builder to create new instance of {@link RedactOperation}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class RedactOperationBuilder {
+
+		private @Nullable Object when;
+		private @Nullable Object then;
+		private @Nullable Object otherwise;
+
+		private RedactOperationBuilder() {
+
+		}
+
+		/**
+		 * Specify the evaluation condition.
+		 *
+		 * @param criteria must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RedactOperationBuilder when(CriteriaDefinition criteria) {
+
+			this.when = criteria;
+			return this;
+		}
+
+		/**
+		 * Specify the evaluation condition.
+		 *
+		 * @param condition must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RedactOperationBuilder when(AggregationExpression condition) {
+
+			this.when = condition;
+			return this;
+		}
+
+		/**
+		 * Specify the evaluation condition.
+		 *
+		 * @param condition must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RedactOperationBuilder when(Document condition) {
+
+			this.when = condition;
+			return this;
+		}
+
+		/**
+		 * Return fields at the current document level and exclude embedded ones if the condition is met.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RedactOperationBuilder thenDescend() {
+			return then(DESCEND);
+		}
+
+		/**
+		 * Return/Keep all fields at the current document/embedded level if the condition is met.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RedactOperationBuilder thenKeep() {
+			return then(KEEP);
+		}
+
+		/**
+		 * Exclude all fields at this current document/embedded level if the condition is met.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RedactOperationBuilder thenPrune() {
+			return then(PRUNE);
+		}
+
+		/**
+		 * Define the outcome (anything that resolves to {@literal $$DESCEND}, {@literal $$PRUNE}, or {@literal $$KEEP})
+		 * when the condition is met.
+		 *
+		 * @param then must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RedactOperationBuilder then(Object then) {
+
+			this.then = then;
+			return this;
+		}
+
+		/**
+		 * Return fields at the current document level and exclude embedded ones if the condition is not met.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RedactOperationBuilder otherwiseDescend() {
+			return otherwise(DESCEND);
+		}
+
+		/**
+		 * Return/Keep all fields at the current document/embedded level if the condition is not met.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RedactOperationBuilder otherwiseKeep() {
+			return otherwise(KEEP);
+		}
+
+		/**
+		 * Exclude all fields at this current document/embedded level if the condition is not met.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RedactOperationBuilder otherwisePrune() {
+			return otherwise(PRUNE);
+		}
+
+		/**
+		 * Define the outcome (anything that resolves to {@literal $$DESCEND}, {@literal $$PRUNE}, or {@literal $$KEEP})
+		 * when the condition is not met.
+		 *
+		 * @param otherwise must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RedactOperationBuilder otherwise(Object otherwise) {
+			this.otherwise = otherwise;
+			return this;
+		}
+
+		/**
+		 * @return new instance of {@link RedactOperation}.
+		 */
+		@Contract("-> new")
+		public RedactOperation build() {
+
+			Assert.notNull(then, "Then must be set first");
+			Assert.notNull(otherwise, "Otherwise must be set first");
+
+			return new RedactOperation(when().then(then).otherwise(otherwise));
+		}
+
+		private ThenBuilder when() {
+
+			if (when instanceof CriteriaDefinition criteriaDefinition) {
+				return ConditionalOperators.Cond.when(criteriaDefinition);
+			}
+			if (when instanceof AggregationExpression aggregationExpression) {
+				return ConditionalOperators.Cond.when(aggregationExpression);
+			}
+			if (when instanceof Document document) {
+				return ConditionalOperators.Cond.when(document);
+			}
+
+			throw new IllegalArgumentException(String.format(
+					"Invalid Condition; Expected CriteriaDefinition, AggregationExpression or Document but was %s", when));
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java
index dd96750f77..a27b9fcb45 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/RelaxedTypeBasedAggregationOperationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,9 +17,6 @@
 
 import org.springframework.data.mapping.context.InvalidPersistentPropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@@ -29,8 +26,10 @@
  * {@link InvalidPersistentPropertyPath} exceptions when resolving mapped field names.
  *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
+ * @deprecated since 4.3.1
  */
+@Deprecated(since = "4.3.1")
 public class RelaxedTypeBasedAggregationOperationContext extends TypeBasedAggregationOperationContext {
 
 	/**
@@ -43,20 +42,6 @@ public class RelaxedTypeBasedAggregationOperationContext extends TypeBasedAggreg
 	 */
 	public RelaxedTypeBasedAggregationOperationContext(Class<?> type,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext, QueryMapper mapper) {
-		super(type, mappingContext, mapper);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext#getReferenceFor(rg.springframework.data.mongodb.core.aggregation.Field)
-	 */
-	@Override
-	protected FieldReference getReferenceFor(Field field) {
-
-		try {
-			return super.getReferenceFor(field);
-		} catch (InvalidPersistentPropertyPath e) {
-			return new DirectFieldReference(new ExposedField(field, true));
-		}
+		super(type, mappingContext, mapper, FieldLookupPolicy.relaxed());
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java
index 00c7bbc22b..ec306eb6c5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 import org.springframework.expression.spel.ast.Projection;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -65,7 +66,7 @@ public ReplaceRootOperation(AggregationExpression aggregationExpression) {
 	 */
 	public ReplaceRootOperation(Replacement replacement) {
 
-		Assert.notNull(replacement, "Replacement must not be null!");
+		Assert.notNull(replacement, "Replacement must not be null");
 		this.replacement = replacement;
 	}
 
@@ -78,17 +79,16 @@ public static ReplaceRootOperationBuilder builder() {
 		return new ReplaceRootOperationBuilder();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return new Document("$replaceRoot", new Document("newRoot", getReplacement().toDocumentExpression(context)));
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
+	@Override
+	public String getOperator() {
+		return "$replaceRoot";
+	}
+
 	@Override
 	public ExposedFields getFields() {
 		return ExposedFields.from();
@@ -98,7 +98,7 @@ public ExposedFields getFields() {
 	 * Obtain the {@link Replacement}.
 	 *
 	 * @return never {@literal null}.
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	protected Replacement getReplacement() {
 		return replacement;
@@ -152,7 +152,7 @@ public ReplaceRootDocumentOperation withDocument() {
 		 */
 		public ReplaceRootOperation withDocument(Document document) {
 
-			Assert.notNull(document, "Document must not be null!");
+			Assert.notNull(document, "Document must not be null");
 
 			return new ReplaceRootDocumentOperation().andValuesOf(document);
 		}
@@ -166,7 +166,7 @@ public ReplaceRootOperation withDocument(Document document) {
 	 *
 	 * @author Mark Paluch
 	 */
-	static class ReplaceRootDocumentOperation extends ReplaceRootOperation {
+	public static class ReplaceRootDocumentOperation extends ReplaceRootOperation {
 
 		private final static ReplacementDocument EMPTY = new ReplacementDocument();
 		private final ReplacementDocument current;
@@ -240,8 +240,8 @@ public static class ReplaceRootDocumentOperationBuilder {
 
 		protected ReplaceRootDocumentOperationBuilder(ReplaceRootDocumentOperation currentOperation, Object value) {
 
-			Assert.notNull(currentOperation, "Current ReplaceRootDocumentOperation must not be null!");
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(currentOperation, "Current ReplaceRootDocumentOperation must not be null");
+			Assert.notNull(value, "Value must not be null");
 
 			this.currentOperation = currentOperation;
 			this.value = value;
@@ -249,9 +249,9 @@ protected ReplaceRootDocumentOperationBuilder(ReplaceRootDocumentOperation curre
 
 		public ReplaceRootDocumentOperation as(String fieldName) {
 
-			if (value instanceof AggregationExpression) {
+			if (value instanceof AggregationExpression aggregationExpression) {
 				return new ReplaceRootDocumentOperation(currentOperation,
-						ReplacementDocument.forExpression(fieldName, (AggregationExpression) value));
+						ReplacementDocument.forExpression(fieldName, aggregationExpression));
 			}
 
 			return new ReplaceRootDocumentOperation(currentOperation, ReplacementDocument.forSingleValue(fieldName, value));
@@ -287,13 +287,10 @@ private static class AggregationExpressionReplacement implements Replacement {
 
 		protected AggregationExpressionReplacement(AggregationExpression aggregationExpression) {
 
-			Assert.notNull(aggregationExpression, "AggregationExpression must not be null!");
+			Assert.notNull(aggregationExpression, "AggregationExpression must not be null");
 			this.aggregationExpression = aggregationExpression;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.Replacement#toObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocumentExpression(AggregationOperationContext context) {
 			return aggregationExpression.toDocument(context);
@@ -314,13 +311,10 @@ private static class FieldReplacement implements Replacement {
 		 */
 		protected FieldReplacement(Field field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 			this.field = field;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.Replacement#toObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Object toDocumentExpression(AggregationOperationContext context) {
 			return context.getReference(field).toString();
@@ -346,11 +340,11 @@ protected ReplacementDocument() {
 		/**
 		 * Creates a {@link ReplacementDocument} given {@link ReplacementContributor}.
 		 *
-		 * @param contributor
+		 * @param contributor must not be {@literal null}.
 		 */
 		protected ReplacementDocument(ReplacementContributor contributor) {
 
-			Assert.notNull(contributor, "ReplacementContributor must not be null!");
+			Assert.notNull(contributor, "ReplacementContributor must not be null");
 			replacements = Collections.singleton(contributor);
 		}
 
@@ -362,7 +356,7 @@ private ReplacementDocument(Collection<ReplacementContributor> replacements) {
 		 * Creates a {@link ReplacementDocument} given a {@literal value}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ReplacementDocument}.
 		 */
 		public static ReplacementDocument valueOf(Object value) {
 			return new ReplacementDocument(new DocumentContributor(value));
@@ -372,7 +366,7 @@ public static ReplacementDocument valueOf(Object value) {
 		 * Creates a {@link ReplacementDocument} given a single {@literal field} and {@link AggregationExpression}.
 		 *
 		 * @param aggregationExpression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ReplacementDocument}.
 		 */
 		public static ReplacementDocument forExpression(String field, AggregationExpression aggregationExpression) {
 			return new ReplacementDocument(new ExpressionFieldContributor(Fields.field(field), aggregationExpression));
@@ -382,15 +376,12 @@ public static ReplacementDocument forExpression(String field, AggregationExpress
 		 * Creates a {@link ReplacementDocument} given a single {@literal field} and {@literal value}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link ReplacementDocument}.
 		 */
 		public static ReplacementDocument forSingleValue(String field, Object value) {
 			return new ReplacementDocument(new ValueFieldContributor(Fields.field(field), value));
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.Replacement#toObject(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocumentExpression(AggregationOperationContext context) {
 
@@ -438,8 +429,9 @@ private interface ReplacementContributor extends AggregationExpression {
 		 * {@link AggregationOperationContext}.
 		 *
 		 * @param context will never be {@literal null}.
-		 * @return
+		 * @return never {@literal null}.
 		 */
+		@Override
 		Document toDocument(AggregationOperationContext context);
 	}
 
@@ -461,14 +453,12 @@ private static class DocumentContributor implements ReplacementContributor {
 		 */
 		public DocumentContributor(Object value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			this.value = value;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplacementContributor#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
+		@SuppressWarnings("NullAway")
 		public Document toDocument(AggregationOperationContext context) {
 
 			Document document = new Document("$set", value);
@@ -494,7 +484,7 @@ private abstract static class FieldContributorSupport implements ReplacementCont
 		 */
 		public FieldContributorSupport(Field field) {
 
-			Assert.notNull(field, "Field must not be null!");
+			Assert.notNull(field, "Field must not be null");
 			this.field = new ExposedField(field, true);
 		}
 
@@ -526,14 +516,11 @@ public ValueFieldContributor(Field field, Object value) {
 
 			super(field);
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 
 			this.value = value;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplacementContributor#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 
@@ -562,14 +549,11 @@ public ExpressionFieldContributor(Field field, AggregationExpression aggregation
 
 			super(field);
 
-			Assert.notNull(aggregationExpression, "AggregationExpression must not be null!");
+			Assert.notNull(aggregationExpression, "AggregationExpression must not be null");
 
 			this.aggregationExpression = aggregationExpression;
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplacementContributor#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(AggregationOperationContext context) {
 			return new Document(getField().getTarget(), aggregationExpression.toDocument(context));
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java
index 81454326bc..795644ee61 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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 @@
  * possible to promote an embedded document to the top-level or specify a new document.
  *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
  * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/replaceWith/">MongoDB Aggregation
  *      Framework: $replaceWith</a>
  */
@@ -57,37 +57,33 @@ public static ReplaceWithOperation replaceWithValue(Object value) {
 	 * {@link Field field reference}.
 	 *
 	 * @param value must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link ReplaceWithOperation}.
 	 */
 	public static ReplaceWithOperation replaceWithValueOf(Object value) {
 
-		Assert.notNull(value, "Value must not be null!");
-		return new ReplaceWithOperation((ctx) -> {
+		Assert.notNull(value, "Value must not be null");
+		return new ReplaceWithOperation(ctx -> {
 
-			Object target = value instanceof String ? Fields.field((String) value) : value;
+			Object target = value instanceof String stringValue ? Fields.field(stringValue) : value;
 			return computeValue(target, ctx);
 		});
 	}
 
 	private static Object computeValue(Object value, AggregationOperationContext context) {
 
-		if (value instanceof Field) {
-			return context.getReference((Field) value).toString();
+		if (value instanceof Field field) {
+			return context.getReference(field).toString();
 		}
-		if (value instanceof AggregationExpression) {
-			return ((AggregationExpression) value).toDocument(context);
+		if (value instanceof AggregationExpression aggregationExpression) {
+			return aggregationExpression.toDocument(context);
 		}
-		if (value instanceof Collection) {
-			return ((Collection) value).stream().map(it -> computeValue(it, context)).collect(Collectors.toList());
+		if (value instanceof Collection<?> collection) {
+			return collection.stream().map(it -> computeValue(it, context)).collect(Collectors.toList());
 		}
 
 		return value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 		return context.getMappedObject(new Document("$replaceWith", getReplacement().toDocumentExpression(context)));
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java
index af7a2d3b92..a366850f8a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SampleOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,16 +38,17 @@ public class SampleOperation implements AggregationOperation {
 	 */
 	public SampleOperation(long sampleSize) {
 
-		Assert.isTrue(sampleSize > 0, "Sample size must be greater than zero!");
+		Assert.isTrue(sampleSize > 0, "Sample size must be greater than zero");
 		this.sampleSize = sampleSize;
 	}
 
-	/*
-	  (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.BucketOperationSupport#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$sample", new Document("size", this.sampleSize));
+		return new Document(getOperator(), new Document("size", this.sampleSize));
+	}
+
+	@Override
+	public String getOperator() {
+		return "$sample";
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ScriptOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ScriptOperators.java
new file mode 100644
index 0000000000..ed615d9863
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/ScriptOperators.java
@@ -0,0 +1,592 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.aggregation.ScriptOperators.Accumulator.AccumulatorBuilder;
+import org.springframework.data.mongodb.core.aggregation.ScriptOperators.Accumulator.AccumulatorInitBuilder;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * Gateway to {@literal $function} and {@literal $accumulator} aggregation operations. <br />
+ * Using {@link ScriptOperators} as part of the {@link Aggregation} requires MongoDB server to have
+ * <a href="https://docs.mongodb.com/master/core/server-side-javascript/">server-side JavaScript</a> execution
+ * <a href="https://docs.mongodb.com/master/reference/configuration-options/#security.javascriptEnabled">enabled</a>.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.1
+ */
+public class ScriptOperators {
+
+	/**
+	 * Create a custom aggregation
+	 * <a href="https://docs.mongodb.com/master/reference/operator/aggregation/function/">$function</a> in JavaScript.
+	 *
+	 * @param body The function definition. Must not be {@literal null}.
+	 * @return new instance of {@link Function}.
+	 */
+	public static Function function(String body) {
+		return Function.function(body);
+	}
+
+	/**
+	 * Create a custom <a href="https://docs.mongodb.com/master/reference/operator/aggregation/accumulator/">$accumulator
+	 * operator</a> in Javascript.
+	 *
+	 * @return new instance of {@link AccumulatorInitBuilder}.
+	 */
+	public static AccumulatorInitBuilder accumulatorBuilder() {
+		return new AccumulatorBuilder();
+	}
+
+	/**
+	 * {@link Function} defines a custom aggregation
+	 * <a href="https://docs.mongodb.com/master/reference/operator/aggregation/function/">$function</a> in JavaScript.
+	 * <br />
+	 * <code class="java">
+	 * {
+	 *   $function: {
+	 *     body: ...,
+	 *     args: ...,
+	 *     lang: "js"
+	 *   }
+	 * }
+	 * </code> <br />
+	 * {@link Function} cannot be used as part of {@link org.springframework.data.mongodb.core.schema.MongoJsonSchema
+	 * schema} validation query expression. <br />
+	 * <b>NOTE:</b> <a href="https://docs.mongodb.com/master/core/server-side-javascript/">Server-Side JavaScript</a>
+	 * execution must be
+	 * <a href="https://docs.mongodb.com/master/reference/configuration-options/#security.javascriptEnabled">enabled</a>
+	 *
+	 * @see <a href="https://docs.mongodb.com/master/reference/operator/aggregation/function/">MongoDB Documentation:
+	 *      $function</a>
+	 */
+	public static class Function extends AbstractAggregationExpression {
+
+		private Function(Map<String, Object> values) {
+			super(values);
+		}
+
+		/**
+		 * Create a new {@link Function} with the given function definition.
+		 *
+		 * @param body must not be {@literal null}.
+		 * @return new instance of {@link Function}.
+		 */
+		public static Function function(String body) {
+
+			Assert.notNull(body, "Function body must not be null");
+
+			Map<String, Object> function = new LinkedHashMap<>(2);
+			function.put(Fields.BODY.toString(), body);
+			function.put(Fields.ARGS.toString(), Collections.emptyList());
+			function.put(Fields.LANG.toString(), "js");
+
+			return new Function(function);
+		}
+
+		/**
+		 * Set the arguments passed to the function body.
+		 *
+		 * @param args the arguments passed to the function body. Leave empty if the function does not take any arguments.
+		 * @return new instance of {@link Function}.
+		 */
+		public Function args(Object... args) {
+			return args(Arrays.asList(args));
+		}
+
+		/**
+		 * Set the arguments passed to the function body.
+		 *
+		 * @param args the arguments passed to the function body. Leave empty if the function does not take any arguments.
+		 * @return new instance of {@link Function}.
+		 */
+		public Function args(List<Object> args) {
+
+			Assert.notNull(args, "Args must not be null Use an empty list instead");
+
+			return new Function(appendAt(1, Fields.ARGS.toString(), args));
+		}
+
+		/**
+		 * The language used in the body.
+		 *
+		 * @param lang must not be {@literal null} nor empty.
+		 * @return new instance of {@link Function}.
+		 */
+		public Function lang(String lang) {
+
+			Assert.hasText(lang, "Lang must not be null nor empty; The default would be 'js'");
+
+			return new Function(appendAt(2, Fields.LANG.toString(), lang));
+		}
+
+		@Nullable
+		List<Object> getArgs() {
+			return get(Fields.ARGS.toString());
+		}
+
+		@Nullable
+		String getBody() {
+			return get(Fields.BODY.toString());
+		}
+
+		@Nullable
+		String getLang() {
+			return get(Fields.LANG.toString());
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$function";
+		}
+
+		enum Fields {
+
+			BODY, ARGS, LANG;
+
+			@Override
+			public String toString() {
+				return name().toLowerCase();
+			}
+		}
+	}
+
+	/**
+	 * {@link Accumulator} defines a custom aggregation
+	 * <a href="https://docs.mongodb.com/master/reference/operator/aggregation/accumulator/">$accumulator operator</a>,
+	 * one that maintains its state (e.g. totals, maximums, minimums, and related data) as documents progress through the
+	 * pipeline, in JavaScript. <br />
+	 * <code class="java">
+	 * {
+	 *   $accumulator: {
+	 *     init: ...,
+	 *     intArgs: ...,
+	 *     accumulate: ...,
+	 *     accumulateArgs: ...,
+	 *     merge: ...,
+	 *     finalize: ...,
+	 *     lang: "js"
+	 *   }
+	 * }
+	 * </code> <br />
+	 * {@link Accumulator} can be used as part of {@link GroupOperation $group}, {@link BucketOperation $bucket} and
+	 * {@link BucketAutoOperation $bucketAuto} pipeline stages. <br />
+	 * <b>NOTE:</b> <a href="https://docs.mongodb.com/master/core/server-side-javascript/">Server-Side JavaScript</a>
+	 * execution must be
+	 * <a href="https://docs.mongodb.com/master/reference/configuration-options/#security.javascriptEnabled">enabled</a>
+	 *
+	 * @see <a href="https://docs.mongodb.com/master/reference/operator/aggregation/accumulator/">MongoDB Documentation:
+	 *      $accumulator</a>
+	 */
+	public static class Accumulator extends AbstractAggregationExpression {
+
+		private Accumulator(Map<String, Object> value) {
+			super(value);
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$accumulator";
+		}
+
+		enum Fields {
+
+			ACCUMULATE("accumulate"), //
+			ACCUMULATE_ARGS("accumulateArgs"), //
+			FINALIZE("finalize"), //
+			INIT("init"), //
+			INIT_ARGS("initArgs"), //
+			LANG("lang"), //
+			MERGE("merge"); //
+
+			private final String field;
+
+			Fields(String field) {
+				this.field = field;
+			}
+
+			@Override
+			public String toString() {
+				return field;
+			}
+		}
+
+		public interface AccumulatorInitBuilder {
+
+			/**
+			 * Define the {@code init} {@link Function} for the {@link Accumulator accumulators} initial state. The function
+			 * receives its arguments from the {@link Function#args(Object...) initArgs} array expression. <br />
+			 * <code class="java">
+			 * function(initArg1, initArg2, ...) {
+			 *   ...
+			 *   return initialState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			default AccumulatorAccumulateBuilder init(Function function) {
+
+				Assert.notNull(function.getBody(), "Function body must not be null");
+
+				List<Object> args = function.getArgs();
+				return init(function.getBody()).initArgs(args != null ? args : List.of());
+			}
+
+			/**
+			 * Define the {@code init} function for the {@link Accumulator accumulators} initial state. The function receives
+			 * its arguments from the {@link AccumulatorInitArgsBuilder#initArgs(Object...)} array expression. <br />
+			 * <code class="java">
+			 * function(initArg1, initArg2, ...) {
+			 *   ...
+			 *   return initialState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			AccumulatorInitArgsBuilder init(String function);
+
+			/**
+			 * The language used in the {@code $accumulator} code.
+			 *
+			 * @param lang must not be {@literal null}. Default is {@literal js}.
+			 * @return this.
+			 */
+			AccumulatorInitBuilder lang(String lang);
+		}
+
+		public interface AccumulatorInitArgsBuilder extends AccumulatorAccumulateBuilder {
+
+			/**
+			 * Define the optional {@code initArgs} for the {@link AccumulatorInitBuilder#init(String)} function.
+			 *
+			 * @param args must not be {@literal null}.
+			 * @return this.
+			 */
+			default AccumulatorAccumulateBuilder initArgs(Object... args) {
+				return initArgs(Arrays.asList(args));
+			}
+
+			/**
+			 * Define the optional {@code initArgs} for the {@link AccumulatorInitBuilder#init(String)} function.
+			 *
+			 * @param args must not be {@literal null}.
+			 * @return this.
+			 */
+			AccumulatorAccumulateBuilder initArgs(List<Object> args);
+		}
+
+		public interface AccumulatorAccumulateBuilder {
+
+			/**
+			 * Set the {@code accumulate} {@link Function} that updates the state for each document. The functions first
+			 * argument is the current {@code state}, additional arguments can be defined via {@link Function#args(Object...)
+			 * accumulateArgs}. <br />
+			 * <code class="java">
+			 * function(state, accumArg1, accumArg2, ...) {
+			 *   ...
+			 *   return newState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			default AccumulatorMergeBuilder accumulate(Function function) {
+
+				Assert.notNull(function.getBody(), "Function body must not be null");
+
+				List<Object> args = function.getArgs();
+				return accumulate(function.getBody()).accumulateArgs(args != null ? args : List.of());
+			}
+
+			/**
+			 * Set the {@code accumulate} function that updates the state for each document. The functions first argument is
+			 * the current {@code state}, additional arguments can be defined via
+			 * {@link AccumulatorAccumulateArgsBuilder#accumulateArgs(Object...)}. <br />
+			 * <code class="java">
+			 * function(state, accumArg1, accumArg2, ...) {
+			 *   ...
+			 *   return newState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			AccumulatorAccumulateArgsBuilder accumulate(String function);
+		}
+
+		public interface AccumulatorAccumulateArgsBuilder extends AccumulatorMergeBuilder {
+
+			/**
+			 * Define additional {@code accumulateArgs} for the {@link AccumulatorAccumulateBuilder#accumulate(String)}
+			 * function.
+			 *
+			 * @param args must not be {@literal null}.
+			 * @return this.
+			 */
+			default AccumulatorMergeBuilder accumulateArgs(Object... args) {
+				return accumulateArgs(Arrays.asList(args));
+			}
+
+			/**
+			 * Define additional {@code accumulateArgs} for the {@link AccumulatorAccumulateBuilder#accumulate(String)}
+			 * function.
+			 *
+			 * @param args must not be {@literal null}.
+			 * @return this.
+			 */
+			AccumulatorMergeBuilder accumulateArgs(List<Object> args);
+		}
+
+		public interface AccumulatorMergeBuilder {
+
+			/**
+			 * Set the {@code merge} function used to merge two internal states. <br />
+			 * This might be required because the operation is run on a sharded cluster or when the operator exceeds its
+			 * memory limit. <br />
+			 * <code class="java">
+			 * function(state1, state2) {
+			 *   ...
+			 *   return newState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			AccumulatorFinalizeBuilder merge(String function);
+		}
+
+		public interface AccumulatorFinalizeBuilder {
+
+			/**
+			 * Set the {@code finalize} function used to update the result of the accumulation when all documents have been
+			 * processed. <br />
+			 * <code class="java">
+			 * function(state) {
+			 *   ...
+			 *   return finalState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return new instance of {@link Accumulator}.
+			 */
+			Accumulator finalize(String function);
+
+			/**
+			 * Build the {@link Accumulator} object without specifying a {@link #finalize(String) finalize function}.
+			 *
+			 * @return new instance of {@link Accumulator}.
+			 */
+			Accumulator build();
+		}
+
+		static class AccumulatorBuilder
+				implements AccumulatorInitBuilder, AccumulatorInitArgsBuilder, AccumulatorAccumulateBuilder,
+				AccumulatorAccumulateArgsBuilder, AccumulatorMergeBuilder, AccumulatorFinalizeBuilder {
+
+			private @Nullable List<Object> initArgs;
+			private @Nullable String initFunction;
+			private @Nullable List<Object> accumulateArgs;
+			private @Nullable String accumulateFunction;
+			private @Nullable String mergeFunction;
+			private @Nullable String finalizeFunction;
+			private String lang = "js";
+
+			/**
+			 * Define the {@code init} function for the {@link Accumulator accumulators} initial state. The function receives
+			 * its arguments from the {@link #initArgs(Object...)} array expression. <br />
+			 * <code class="java">
+			 * function(initArg1, initArg2, ...) {
+			 *   ...
+			 *   return initialState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			@Override
+			@Contract("_ -> this")
+			public AccumulatorBuilder init(String function) {
+
+				this.initFunction = function;
+				return this;
+			}
+
+			/**
+			 * Define the optional {@code initArgs} for the {@link #init(String)} function.
+			 *
+			 * @param args must not be {@literal null}.
+			 * @return this.
+			 */
+			@Override
+			@Contract("_ -> this")
+			public AccumulatorBuilder initArgs(List<Object> args) {
+
+				Assert.notNull(args, "Args must not be null");
+
+				this.initArgs = new ArrayList<>(args);
+				return this;
+			}
+
+			/**
+			 * Set the {@code accumulate} function that updates the state for each document. The functions first argument is
+			 * the current {@code state}, additional arguments can be defined via {@link #accumulateArgs(Object...)}. <br />
+			 * <code class="java">
+			 * function(state, accumArg1, accumArg2, ...) {
+			 *   ...
+			 *   return newState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			@Override
+			@Contract("_ -> this")
+			public AccumulatorBuilder accumulate(String function) {
+
+				Assert.notNull(function, "Accumulate function must not be null");
+
+				this.accumulateFunction = function;
+				return this;
+			}
+
+			/**
+			 * Define additional {@code accumulateArgs} for the {@link #accumulate(String)} function.
+			 *
+			 * @param args must not be {@literal null}.
+			 * @return this.
+			 */
+			@Override
+			@Contract("_ -> this")
+			public AccumulatorBuilder accumulateArgs(List<Object> args) {
+
+				Assert.notNull(args, "Args must not be null");
+
+				this.accumulateArgs = new ArrayList<>(args);
+				return this;
+			}
+
+			/**
+			 * Set the {@code merge} function used to merge two internal states. <br />
+			 * This might be required because the operation is run on a sharded cluster or when the operator exceeds its
+			 * memory limit. <br />
+			 * <code class="java">
+			 * function(state1, state2) {
+			 *   ...
+			 *   return newState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return this.
+			 */
+			@Override
+			@Contract("_ -> this")
+			public AccumulatorBuilder merge(String function) {
+
+				Assert.notNull(function, "Merge function must not be null");
+
+				this.mergeFunction = function;
+				return this;
+			}
+
+			/**
+			 * The language used in the {@code $accumulator} code.
+			 *
+			 * @param lang must not be {@literal null}. Default is {@literal js}.
+			 * @return this.
+			 */
+			@Contract("_ -> this")
+			public AccumulatorBuilder lang(String lang) {
+
+				Assert.hasText(lang, "Lang must not be null nor empty; The default would be 'js'");
+
+				this.lang = lang;
+				return this;
+			}
+
+			/**
+			 * Set the {@code finalize} function used to update the result of the accumulation when all documents have been
+			 * processed. <br />
+			 * <code class="java">
+			 * function(state) {
+			 *   ...
+			 *   return finalState
+			 * }
+			 * </code>
+			 *
+			 * @param function must not be {@literal null}.
+			 * @return new instance of {@link Accumulator}.
+			 */
+			@Override
+			@Contract("_ -> new")
+			public Accumulator finalize(String function) {
+
+				Assert.notNull(function, "Finalize function must not be null");
+
+				this.finalizeFunction = function;
+
+				Map<String, Object> args = createArgumentMap();
+				args.put(Fields.FINALIZE.toString(), finalizeFunction);
+
+				return new Accumulator(args);
+			}
+
+			@Override
+			@Contract("-> new")
+			public Accumulator build() {
+				return new Accumulator(createArgumentMap());
+			}
+
+			private Map<String, Object> createArgumentMap() {
+
+				Map<String, Object> args = new LinkedHashMap<>();
+				args.put(Fields.INIT.toString(), initFunction);
+				if (!CollectionUtils.isEmpty(initArgs)) {
+					args.put(Fields.INIT_ARGS.toString(), initArgs);
+				}
+				args.put(Fields.ACCUMULATE.toString(), accumulateFunction);
+				if (!CollectionUtils.isEmpty(accumulateArgs)) {
+					args.put(Fields.ACCUMULATE_ARGS.toString(), accumulateArgs);
+				}
+				args.put(Fields.MERGE.toString(), mergeFunction);
+				args.put(Fields.LANG.toString(), lang);
+
+				return args;
+			}
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SelectionOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SelectionOperators.java
new file mode 100644
index 0000000000..4db0181d39
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SelectionOperators.java
@@ -0,0 +1,450 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.springframework.data.domain.Sort;
+import org.springframework.lang.Contract;
+
+/**
+ * Gateway to {@literal selection operators} such as {@literal $bottom}.
+ *
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+public class SelectionOperators {
+
+	/**
+	 * {@link AbstractAggregationExpression} to return the bottom element according to the specified {@link #sortBy(Sort)
+	 * order}.
+	 */
+	public static class Bottom extends AbstractAggregationExpression {
+
+		private Bottom(Object value) {
+			super(value);
+		}
+
+		/**
+		 * In case a limit value ({@literal n}) is present {@literal $bottomN} is used instead of {@literal $bottom}.
+		 *
+		 * @return
+		 */
+		@Override
+		protected String getMongoMethod() {
+			return get("n") == null ? "$bottom" : "$bottomN";
+		}
+
+		/**
+		 * @return new instance of {@link Bottom}.
+		 */
+		public static Bottom bottom() {
+			return new Bottom(Collections.emptyMap());
+		}
+
+		/**
+		 * @param numberOfResults Limits the number of returned elements to the given value.
+		 * @return new instance of {@link Bottom}.
+		 */
+		public static Bottom bottom(int numberOfResults) {
+			return bottom().limit(numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the given value.
+		 *
+		 * @param numberOfResults
+		 * @return new instance of {@link Bottom}.
+		 */
+		@Contract("_ -> new")
+		public Bottom limit(int numberOfResults) {
+			return limit((Object) numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the value defined by the given {@link AggregationExpression
+		 * expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Bottom}.
+		 */
+		@Contract("_ -> new")
+		public Bottom limit(AggregationExpression expression) {
+			return limit((Object) expression);
+		}
+
+		@Contract("_ -> new")
+		private Bottom limit(Object value) {
+			return new Bottom(append("n", value));
+		}
+
+		/**
+		 * Define result ordering.
+		 *
+		 * @param sort must not be {@literal null}.
+		 * @return new instance of {@link Bottom}.
+		 */
+		@Contract("_ -> new")
+		public Bottom sortBy(Sort sort) {
+			return new Bottom(append("sortBy", sort));
+		}
+
+		/**
+		 * Define result ordering.
+		 *
+		 * @param out must not be {@literal null}.
+		 * @return new instance of {@link Bottom}.
+		 */
+		@Contract("_ -> new")
+		public Bottom output(Fields out) {
+			return new Bottom(append("output", out));
+		}
+
+		/**
+		 * Define fields included in the output for each element.
+		 *
+		 * @param fieldNames must not be {@literal null}.
+		 * @return new instance of {@link Bottom}.
+		 * @see #output(Fields)
+		 */
+		@Contract("_ -> new")
+		public Bottom output(String... fieldNames) {
+			return output(Fields.fields(fieldNames));
+		}
+
+		/**
+		 * Define expressions building the value included in the output for each element.
+		 *
+		 * @param out must not be {@literal null}.
+		 * @return new instance of {@link Bottom}.
+		 * @see #output(Fields)
+		 */
+		@Contract("_ -> new")
+		public Bottom output(AggregationExpression... out) {
+			return new Bottom(append("output", Arrays.asList(out)));
+		}
+	}
+
+	/**
+	 * {@link AbstractAggregationExpression} to return the top element according to the specified {@link #sortBy(Sort)
+	 * order}.
+	 */
+	public static class Top extends AbstractAggregationExpression {
+
+		private Top(Object value) {
+			super(value);
+		}
+
+		/**
+		 * In case a limit value ({@literal n}) is present {@literal $topN} is used instead of {@literal $top}.
+		 *
+		 * @return
+		 */
+		@Override
+		protected String getMongoMethod() {
+			return get("n") == null ? "$top" : "$topN";
+		}
+
+		/**
+		 * @return new instance of {@link Top}.
+		 */
+		public static Top top() {
+			return new Top(Collections.emptyMap());
+		}
+
+		/**
+		 * @param numberOfResults Limits the number of returned elements to the given value.
+		 * @return new instance of {@link Top}.
+		 */
+		public static Top top(int numberOfResults) {
+			return top().limit(numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the given value.
+		 *
+		 * @param numberOfResults
+		 * @return new instance of {@link Top}.
+		 */
+		@Contract("_ -> new")
+		public Top limit(int numberOfResults) {
+			return limit((Object) numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the value defined by the given {@link AggregationExpression
+		 * expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Top}.
+		 */
+		@Contract("_ -> new")
+		public Top limit(AggregationExpression expression) {
+			return limit((Object) expression);
+		}
+
+		private Top limit(Object value) {
+			return new Top(append("n", value));
+		}
+
+		/**
+		 * Define result ordering.
+		 *
+		 * @param sort must not be {@literal null}.
+		 * @return new instance of {@link Top}.
+		 */
+		@Contract("_ -> new")
+		public Top sortBy(Sort sort) {
+			return new Top(append("sortBy", sort));
+		}
+
+		/**
+		 * Define result ordering.
+		 *
+		 * @param out must not be {@literal null}.
+		 * @return new instance of {@link Top}.
+		 */
+		@Contract("_ -> new")
+		public Top output(Fields out) {
+			return new Top(append("output", out));
+		}
+
+		/**
+		 * Define fields included in the output for each element.
+		 *
+		 * @param fieldNames must not be {@literal null}.
+		 * @return new instance of {@link Top}.
+		 * @see #output(Fields)
+		 */
+		@Contract("_ -> new")
+		public Top output(String... fieldNames) {
+			return output(Fields.fields(fieldNames));
+		}
+
+		/**
+		 * Define expressions building the value included in the output for each element.
+		 *
+		 * @param out must not be {@literal null}.
+		 * @return new instance of {@link Top}.
+		 * @see #output(Fields)
+		 */
+		@Contract("_ -> new")
+		public Top output(AggregationExpression... out) {
+			return new Top(append("output", Arrays.asList(out)));
+		}
+	}
+
+	/**
+	 * {@link AbstractAggregationExpression} to return the {@literal $firstN} elements.
+	 */
+	public static class First extends AbstractAggregationExpression {
+
+		protected First(Object value) {
+			super(value);
+		}
+
+		/**
+		 * @return new instance of {@link First}.
+		 */
+		public static First first() {
+			return new First(Collections.emptyMap());
+		}
+
+		/**
+		 * @return new instance of {@link First}.
+		 */
+		public static First first(int numberOfResults) {
+			return first().limit(numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the given value.
+		 *
+		 * @param numberOfResults
+		 * @return new instance of {@link First}.
+		 */
+		@Contract("_ -> new")
+		public First limit(int numberOfResults) {
+			return limit((Object) numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the value defined by the given {@link AggregationExpression
+		 * expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		@Contract("_ -> new")
+		public First limit(AggregationExpression expression) {
+			return limit((Object) expression);
+		}
+
+		private First limit(Object value) {
+			return new First(append("n", value));
+		}
+
+		/**
+		 * Define the field to serve as source.
+		 *
+		 * @param fieldName must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		@Contract("_ -> new")
+		public First of(String fieldName) {
+			return input(fieldName);
+		}
+
+		/**
+		 * Define the expression building the value to serve as source.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		@Contract("_ -> new")
+		public First of(AggregationExpression expression) {
+			return input(expression);
+		}
+
+		/**
+		 * Define the field to serve as source.
+		 *
+		 * @param fieldName must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		@Contract("_ -> new")
+		public First input(String fieldName) {
+			return new First(append("input", Fields.field(fieldName)));
+		}
+
+		/**
+		 * Define the expression building the value to serve as source.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link First}.
+		 */
+		@Contract("_ -> new")
+		public First input(AggregationExpression expression) {
+			return new First(append("input", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$firstN";
+		}
+	}
+
+	/**
+	 * {@link AbstractAggregationExpression} to return the {@literal $lastN} elements.
+	 */
+	public static class Last extends AbstractAggregationExpression {
+
+		protected Last(Object value) {
+			super(value);
+		}
+
+		/**
+		 * @return new instance of {@link Last}.
+		 */
+		public static Last last() {
+			return new Last(Collections.emptyMap());
+		}
+
+		/**
+		 * @return new instance of {@link Last}.
+		 */
+		public static Last last(int numberOfResults) {
+			return last().limit(numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the given value.
+		 *
+		 * @param numberOfResults
+		 * @return new instance of {@link Last}.
+		 */
+		@Contract("_ -> new")
+		public Last limit(int numberOfResults) {
+			return limit((Object) numberOfResults);
+		}
+
+		/**
+		 * Limits the number of returned elements to the value defined by the given {@link AggregationExpression
+		 * expression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		@Contract("_ -> new")
+		public Last limit(AggregationExpression expression) {
+			return limit((Object) expression);
+		}
+
+		private Last limit(Object value) {
+			return new Last(append("n", value));
+		}
+
+		/**
+		 * Define the field to serve as source.
+		 *
+		 * @param fieldName must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		@Contract("_ -> new")
+		public Last of(String fieldName) {
+			return input(fieldName);
+		}
+
+		/**
+		 * Define the expression building the value to serve as source.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		@Contract("_ -> new")
+		public Last of(AggregationExpression expression) {
+			return input(expression);
+		}
+
+		/**
+		 * Define the field to serve as source.
+		 *
+		 * @param fieldName must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		@Contract("_ -> new")
+		public Last input(String fieldName) {
+			return new Last(append("input", Fields.field(fieldName)));
+		}
+
+		/**
+		 * Define the expression building the value to serve as source.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Last}.
+		 */
+		@Contract("_ -> new")
+		public Last input(AggregationExpression expression) {
+			return new Last(append("input", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$lastN";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java
index 0c7933eeca..800d8b37d2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,36 +15,28 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.stream.Collectors;
 
-import org.bson.Document;
-import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.SetOperation.FieldAppender.ValueAppender;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 
 /**
  * Adds new fields to documents. {@code $set} outputs documents that contain all existing fields from the input
  * documents and newly added fields.
- * 
+ *
  * <pre class="code">
  * SetOperation.set("totalHomework").toValue("A+").and().set("totalQuiz").toValue("B-")
  * </pre>
  *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
  * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/set/">MongoDB Aggregation Framework:
  *      $set</a>
  */
-public class SetOperation implements InheritsFieldsAggregationOperation {
-
-	private Map<Object, Object> valueMap;
-	private ExposedFields exposedFields = ExposedFields.empty();
+public class SetOperation extends DocumentEnhancingOperation {
 
 	/**
 	 * Create new instance of {@link SetOperation} adding map keys as exposed fields.
@@ -52,11 +44,7 @@ public class SetOperation implements InheritsFieldsAggregationOperation {
 	 * @param source must not be {@literal null}.
 	 */
 	private SetOperation(Map<Object, Object> source) {
-
-		this.valueMap = new LinkedHashMap<>(source);
-		for (Object key : source.keySet()) {
-			this.exposedFields = add(key);
-		}
+		super(source);
 	}
 
 	/**
@@ -95,9 +83,10 @@ public static ValueAppender set(String field) {
 	 * @param value the value to assign.
 	 * @return new instance of {@link SetOperation}.
 	 */
+	@Contract("_, _ -> new")
 	public SetOperation set(Object field, Object value) {
 
-		LinkedHashMap<Object, Object> target = new LinkedHashMap<>(this.valueMap);
+		LinkedHashMap<Object, Object> target = new LinkedHashMap<>(getValueMap());
 		target.put(field, value);
 
 		return new SetOperation(target);
@@ -109,78 +98,17 @@ public SetOperation set(Object field, Object value) {
 	 * @return new instance of {@link FieldAppender}.
 	 */
 	public FieldAppender and() {
-		return new FieldAppender(this.valueMap);
+		return new FieldAppender(getValueMap());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
-	public Document toDocument(AggregationOperationContext context) {
-
-		InheritingExposedFieldsAggregationOperationContext operationContext = new InheritingExposedFieldsAggregationOperationContext(
-				exposedFields, context);
-
-		if (valueMap.size() == 1) {
-			return context
-					.getMappedObject(new Document("$set", toSetEntry(valueMap.entrySet().iterator().next(), operationContext)));
-		}
-
-		Document $set = new Document();
-		valueMap.entrySet().stream().map(it -> toSetEntry(it, operationContext)).forEach($set::putAll);
-		return context.getMappedObject(new Document("$set", $set));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
-	@Override
-	public ExposedFields getFields() {
-		return exposedFields;
-	}
-
-	private ExposedFields add(Object field) {
-
-		if (field instanceof Field) {
-			return exposedFields.and(new ExposedField((Field) field, true));
-		}
-		if (field instanceof String) {
-			return exposedFields.and(new ExposedField(Fields.field((String) field), true));
-		}
-
-		throw new IllegalArgumentException(String.format("Expected %s to be a field/property.", field));
-	}
-
-	private static Document toSetEntry(Entry<Object, Object> entry, AggregationOperationContext context) {
-
-		String field = entry.getKey() instanceof String ? context.getReference((String) entry.getKey()).getRaw()
-				: context.getReference((Field) entry.getKey()).getRaw();
-
-		Object value = computeValue(entry.getValue(), context);
-
-		return new Document(field, value);
-	}
-
-	private static Object computeValue(Object value, AggregationOperationContext context) {
-
-		if (value instanceof Field) {
-			return context.getReference((Field) value).toString();
-		}
-		if (value instanceof AggregationExpression) {
-			return ((AggregationExpression) value).toDocument(context);
-		}
-		if (value instanceof Collection) {
-			return ((Collection) value).stream().map(it -> computeValue(it, context)).collect(Collectors.toList());
-		}
-
-		return value;
+	protected String mongoOperator() {
+		return "$set";
 	}
 
 	/**
 	 * @author Christoph Strobl
-	 * @since 2.3
+	 * @since 3.0
 	 */
 	public static class FieldAppender {
 
@@ -205,7 +133,7 @@ public ValueAppender set(String field) {
 			return new ValueAppender() {
 
 				@Override
-				public SetOperation toValue(Object value) {
+				public SetOperation toValue(@Nullable Object value) {
 
 					valueMap.put(field, value);
 					return FieldAppender.this.build();
@@ -214,7 +142,14 @@ public SetOperation toValue(Object value) {
 				@Override
 				public SetOperation toValueOf(Object value) {
 
-					valueMap.put(field, value instanceof String ? Fields.fields((String) value) : value);
+					valueMap.put(field, value instanceof String stringValue ? Fields.field(stringValue) : value);
+					return FieldAppender.this.build();
+				}
+
+				@Override
+				public SetOperation withValueOfExpression(String operation, Object... values) {
+
+					valueMap.put(field, new ExpressionProjection(operation, values));
 					return FieldAppender.this.build();
 				}
 			};
@@ -226,7 +161,8 @@ private SetOperation build() {
 
 		/**
 		 * @author Christoph Strobl
-		 * @since 2.3
+		 * @author Mark Paluch
+		 * @since 3.0
 		 */
 		public interface ValueAppender {
 
@@ -245,6 +181,16 @@ public interface ValueAppender {
 			 * @return new instance of {@link SetOperation}.
 			 */
 			SetOperation toValueOf(Object value);
+
+			/**
+			 * Adds a generic projection for the current field.
+			 *
+			 * @param operation the operation key, e.g. {@code $add}.
+			 * @param values the values to be set for the projection operation.
+			 * @return new instance of {@link SetOperation}.
+			 */
+			SetOperation withValueOfExpression(String operation, Object... values);
 		}
+
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperators.java
index b26ad24c26..a99c0926f4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,9 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Sum;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -34,7 +36,7 @@ public class SetOperators {
 	 * Take the array referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link SetOperatorFactory}.
 	 */
 	public static SetOperatorFactory arrayAsSet(String fieldReference) {
 		return new SetOperatorFactory(fieldReference);
@@ -44,7 +46,7 @@ public static SetOperatorFactory arrayAsSet(String fieldReference) {
 	 * Take the array resulting from the given {@link AggregationExpression}.
 	 *
 	 * @param expression must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link SetOperatorFactory}.
 	 */
 	public static SetOperatorFactory arrayAsSet(AggregationExpression expression) {
 		return new SetOperatorFactory(expression);
@@ -55,8 +57,8 @@ public static SetOperatorFactory arrayAsSet(AggregationExpression expression) {
 	 */
 	public static class SetOperatorFactory {
 
-		private final String fieldReference;
-		private final AggregationExpression expression;
+		private final @Nullable String fieldReference;
+		private final @Nullable AggregationExpression expression;
 
 		/**
 		 * Creates new {@link SetOperatorFactory} for given {@literal fieldReference}.
@@ -65,7 +67,7 @@ public static class SetOperatorFactory {
 		 */
 		public SetOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			this.fieldReference = fieldReference;
 			this.expression = null;
 		}
@@ -77,7 +79,7 @@ public SetOperatorFactory(String fieldReference) {
 		 */
 		public SetOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			this.fieldReference = null;
 			this.expression = expression;
 		}
@@ -87,7 +89,7 @@ public SetOperatorFactory(AggregationExpression expression) {
 		 * returns {@literal true} if they have the same distinct elements and {@literal false} otherwise.
 		 *
 		 * @param arrayReferences must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetEquals}.
 		 */
 		public SetEquals isEqualTo(String... arrayReferences) {
 			return createSetEquals().isEqualTo(arrayReferences);
@@ -98,12 +100,13 @@ public SetEquals isEqualTo(String... arrayReferences) {
 		 * returns {@literal true} if they have the same distinct elements and {@literal false} otherwise.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetEquals}.
 		 */
 		public SetEquals isEqualTo(AggregationExpression... expressions) {
 			return createSetEquals().isEqualTo(expressions);
 		}
 
+		@SuppressWarnings("NullAway")
 		private SetEquals createSetEquals() {
 			return usesFieldRef() ? SetEquals.arrayAsSet(fieldReference) : SetEquals.arrayAsSet(expression);
 		}
@@ -113,7 +116,7 @@ private SetEquals createSetEquals() {
 		 * arrays and returns an array that contains the elements that appear in every of those.
 		 *
 		 * @param arrayReferences must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIntersection}.
 		 */
 		public SetIntersection intersects(String... arrayReferences) {
 			return createSetIntersection().intersects(arrayReferences);
@@ -124,12 +127,13 @@ public SetIntersection intersects(String... arrayReferences) {
 		 * arrays and returns an array that contains the elements that appear in every of those.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIntersection}.
 		 */
 		public SetIntersection intersects(AggregationExpression... expressions) {
 			return createSetIntersection().intersects(expressions);
 		}
 
+		@SuppressWarnings("NullAway")
 		private SetIntersection createSetIntersection() {
 			return usesFieldRef() ? SetIntersection.arrayAsSet(fieldReference) : SetIntersection.arrayAsSet(expression);
 		}
@@ -139,7 +143,7 @@ private SetIntersection createSetIntersection() {
 		 * arrays and returns an array that contains the elements that appear in any of those.
 		 *
 		 * @param arrayReferences must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetUnion}.
 		 */
 		public SetUnion union(String... arrayReferences) {
 			return createSetUnion().union(arrayReferences);
@@ -150,12 +154,13 @@ public SetUnion union(String... arrayReferences) {
 		 * arrays and returns an array that contains the elements that appear in any of those.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetUnion}.
 		 */
 		public SetUnion union(AggregationExpression... expressions) {
 			return createSetUnion().union(expressions);
 		}
 
+		@SuppressWarnings("NullAway")
 		private SetUnion createSetUnion() {
 			return usesFieldRef() ? SetUnion.arrayAsSet(fieldReference) : SetUnion.arrayAsSet(expression);
 		}
@@ -165,7 +170,7 @@ private SetUnion createSetUnion() {
 		 * containing the elements that do not exist in the given {@literal arrayReference}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetDifference}.
 		 */
 		public SetDifference differenceTo(String arrayReference) {
 			return createSetDifference().differenceTo(arrayReference);
@@ -176,12 +181,13 @@ public SetDifference differenceTo(String arrayReference) {
 		 * containing the elements that do not exist in the given {@link AggregationExpression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetDifference}.
 		 */
 		public SetDifference differenceTo(AggregationExpression expression) {
 			return createSetDifference().differenceTo(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private SetDifference createSetDifference() {
 			return usesFieldRef() ? SetDifference.arrayAsSet(fieldReference) : SetDifference.arrayAsSet(expression);
 		}
@@ -191,7 +197,7 @@ private SetDifference createSetDifference() {
 		 * {@literal true} if it is a subset of the given {@literal arrayReference}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIsSubset}.
 		 */
 		public SetIsSubset isSubsetOf(String arrayReference) {
 			return createSetIsSubset().isSubsetOf(arrayReference);
@@ -202,12 +208,13 @@ public SetIsSubset isSubsetOf(String arrayReference) {
 		 * {@literal true} if it is a subset of the given {@link AggregationExpression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIsSubset}.
 		 */
 		public SetIsSubset isSubsetOf(AggregationExpression expression) {
 			return createSetIsSubset().isSubsetOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private SetIsSubset createSetIsSubset() {
 			return usesFieldRef() ? SetIsSubset.arrayAsSet(fieldReference) : SetIsSubset.arrayAsSet(expression);
 		}
@@ -216,8 +223,9 @@ private SetIsSubset createSetIsSubset() {
 		 * Creates new {@link AggregationExpression} that takes array of the previously mentioned field and returns
 		 * {@literal true} if any of the elements are {@literal true} and {@literal false} otherwise.
 		 *
-		 * @return
+		 * @return new instance of {@link AnyElementTrue}.
 		 */
+		@SuppressWarnings("NullAway")
 		public AnyElementTrue anyElementTrue() {
 			return usesFieldRef() ? AnyElementTrue.arrayAsSet(fieldReference) : AnyElementTrue.arrayAsSet(expression);
 		}
@@ -226,8 +234,9 @@ public AnyElementTrue anyElementTrue() {
 		 * Creates new {@link AggregationExpression} that tkes array of the previously mentioned field and returns
 		 * {@literal true} if no elements is {@literal false}.
 		 *
-		 * @return
+		 * @return new instance of {@link AllElementsTrue}.
 		 */
+		@SuppressWarnings("NullAway")
 		public AllElementsTrue allElementsTrue() {
 			return usesFieldRef() ? AllElementsTrue.arrayAsSet(fieldReference) : AllElementsTrue.arrayAsSet(expression);
 		}
@@ -257,11 +266,11 @@ protected String getMongoMethod() {
 		 * Create new {@link SetEquals}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetEquals}.
 		 */
 		public static SetEquals arrayAsSet(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new SetEquals(asFields(arrayReference));
 		}
 
@@ -269,11 +278,11 @@ public static SetEquals arrayAsSet(String arrayReference) {
 		 * Create new {@link SetEquals}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetEquals}.
 		 */
 		public static SetEquals arrayAsSet(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SetEquals(Collections.singletonList(expression));
 		}
 
@@ -281,11 +290,12 @@ public static SetEquals arrayAsSet(AggregationExpression expression) {
 		 * Creates new {@link java.util.Set} with all previously added arguments appending the given one.
 		 *
 		 * @param arrayReferences must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetEquals}.
 		 */
+		@Contract("_ -> new")
 		public SetEquals isEqualTo(String... arrayReferences) {
 
-			Assert.notNull(arrayReferences, "ArrayReferences must not be null!");
+			Assert.notNull(arrayReferences, "ArrayReferences must not be null");
 			return new SetEquals(append(Fields.fields(arrayReferences).asList()));
 		}
 
@@ -293,11 +303,12 @@ public SetEquals isEqualTo(String... arrayReferences) {
 		 * Creates new {@link Sum} with all previously added arguments appending the given one.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetEquals}.
 		 */
+		@Contract("_ -> new")
 		public SetEquals isEqualTo(AggregationExpression... expressions) {
 
-			Assert.notNull(expressions, "Expressions must not be null!");
+			Assert.notNull(expressions, "Expressions must not be null");
 			return new SetEquals(append(Arrays.asList(expressions)));
 		}
 
@@ -305,11 +316,12 @@ public SetEquals isEqualTo(AggregationExpression... expressions) {
 		 * Creates new {@link Sum} with all previously added arguments appending the given one.
 		 *
 		 * @param array must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetEquals}.
 		 */
+		@Contract("_ -> new")
 		public SetEquals isEqualTo(Object[] array) {
 
-			Assert.notNull(array, "Array must not be null!");
+			Assert.notNull(array, "Array must not be null");
 			return new SetEquals(append(array));
 		}
 	}
@@ -334,11 +346,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link SetIntersection}
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIntersection}.
 		 */
 		public static SetIntersection arrayAsSet(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new SetIntersection(asFields(arrayReference));
 		}
 
@@ -346,11 +358,11 @@ public static SetIntersection arrayAsSet(String arrayReference) {
 		 * Creates new {@link SetIntersection}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIntersection}.
 		 */
 		public static SetIntersection arrayAsSet(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SetIntersection(Collections.singletonList(expression));
 		}
 
@@ -358,11 +370,12 @@ public static SetIntersection arrayAsSet(AggregationExpression expression) {
 		 * Creates new {@link SetIntersection} with all previously added arguments appending the given one.
 		 *
 		 * @param arrayReferences must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIntersection}.
 		 */
+		@Contract("_ -> new")
 		public SetIntersection intersects(String... arrayReferences) {
 
-			Assert.notNull(arrayReferences, "ArrayReferences must not be null!");
+			Assert.notNull(arrayReferences, "ArrayReferences must not be null");
 			return new SetIntersection(append(asFields(arrayReferences)));
 		}
 
@@ -370,11 +383,12 @@ public SetIntersection intersects(String... arrayReferences) {
 		 * Creates new {@link SetIntersection} with all previously added arguments appending the given one.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIntersection}.
 		 */
+		@Contract("_ -> new")
 		public SetIntersection intersects(AggregationExpression... expressions) {
 
-			Assert.notNull(expressions, "Expressions must not be null!");
+			Assert.notNull(expressions, "Expressions must not be null");
 			return new SetIntersection(append(Arrays.asList(expressions)));
 		}
 	}
@@ -399,11 +413,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link SetUnion}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetUnion}.
 		 */
 		public static SetUnion arrayAsSet(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new SetUnion(asFields(arrayReference));
 		}
 
@@ -411,11 +425,11 @@ public static SetUnion arrayAsSet(String arrayReference) {
 		 * Creates new {@link SetUnion}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetUnion}.
 		 */
 		public static SetUnion arrayAsSet(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SetUnion(Collections.singletonList(expression));
 		}
 
@@ -423,11 +437,12 @@ public static SetUnion arrayAsSet(AggregationExpression expression) {
 		 * Creates new {@link SetUnion} with all previously added arguments appending the given one.
 		 *
 		 * @param arrayReferences must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetUnion}.
 		 */
+		@Contract("_ -> new")
 		public SetUnion union(String... arrayReferences) {
 
-			Assert.notNull(arrayReferences, "ArrayReferences must not be null!");
+			Assert.notNull(arrayReferences, "ArrayReferences must not be null");
 			return new SetUnion(append(asFields(arrayReferences)));
 		}
 
@@ -435,11 +450,12 @@ public SetUnion union(String... arrayReferences) {
 		 * Creates new {@link SetUnion} with all previously added arguments appending the given one.
 		 *
 		 * @param expressions must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetUnion}.
 		 */
+		@Contract("_ -> new")
 		public SetUnion union(AggregationExpression... expressions) {
 
-			Assert.notNull(expressions, "Expressions must not be null!");
+			Assert.notNull(expressions, "Expressions must not be null");
 			return new SetUnion(append(Arrays.asList(expressions)));
 		}
 	}
@@ -464,11 +480,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link SetDifference}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetDifference}.
 		 */
 		public static SetDifference arrayAsSet(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new SetDifference(asFields(arrayReference));
 		}
 
@@ -476,11 +492,11 @@ public static SetDifference arrayAsSet(String arrayReference) {
 		 * Creates new {@link SetDifference}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetDifference}.
 		 */
 		public static SetDifference arrayAsSet(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SetDifference(Collections.singletonList(expression));
 		}
 
@@ -488,11 +504,12 @@ public static SetDifference arrayAsSet(AggregationExpression expression) {
 		 * Creates new {@link SetDifference} with all previously added arguments appending the given one.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetDifference}.
 		 */
+		@Contract("_ -> new")
 		public SetDifference differenceTo(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new SetDifference(append(Fields.field(arrayReference)));
 		}
 
@@ -500,11 +517,12 @@ public SetDifference differenceTo(String arrayReference) {
 		 * Creates new {@link SetDifference} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetDifference}.
 		 */
+		@Contract("_ -> new")
 		public SetDifference differenceTo(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SetDifference(append(expression));
 		}
 	}
@@ -529,11 +547,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link SetIsSubset}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIsSubset}.
 		 */
 		public static SetIsSubset arrayAsSet(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new SetIsSubset(asFields(arrayReference));
 		}
 
@@ -541,11 +559,11 @@ public static SetIsSubset arrayAsSet(String arrayReference) {
 		 * Creates new {@link SetIsSubset}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIsSubset}.
 		 */
 		public static SetIsSubset arrayAsSet(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SetIsSubset(Collections.singletonList(expression));
 		}
 
@@ -553,11 +571,12 @@ public static SetIsSubset arrayAsSet(AggregationExpression expression) {
 		 * Creates new {@link SetIsSubset} with all previously added arguments appending the given one.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIsSubset}.
 		 */
+		@Contract("_ -> new")
 		public SetIsSubset isSubsetOf(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new SetIsSubset(append(Fields.field(arrayReference)));
 		}
 
@@ -565,11 +584,12 @@ public SetIsSubset isSubsetOf(String arrayReference) {
 		 * Creates new {@link SetIsSubset} with all previously added arguments appending the given one.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SetIsSubset}.
 		 */
+		@Contract("_ -> new")
 		public SetIsSubset isSubsetOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SetIsSubset(append(expression));
 		}
 	}
@@ -594,11 +614,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link AnyElementTrue}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link AnyElementTrue}.
 		 */
 		public static AnyElementTrue arrayAsSet(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new AnyElementTrue(asFields(arrayReference));
 		}
 
@@ -606,14 +626,15 @@ public static AnyElementTrue arrayAsSet(String arrayReference) {
 		 * Creates new {@link AnyElementTrue}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link AnyElementTrue}.
 		 */
 		public static AnyElementTrue arrayAsSet(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new AnyElementTrue(Collections.singletonList(expression));
 		}
 
+		@Contract("-> this")
 		public AnyElementTrue anyElementTrue() {
 			return this;
 		}
@@ -639,11 +660,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link AllElementsTrue}.
 		 *
 		 * @param arrayReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link AllElementsTrue}.
 		 */
 		public static AllElementsTrue arrayAsSet(String arrayReference) {
 
-			Assert.notNull(arrayReference, "ArrayReference must not be null!");
+			Assert.notNull(arrayReference, "ArrayReference must not be null");
 			return new AllElementsTrue(asFields(arrayReference));
 		}
 
@@ -651,14 +672,15 @@ public static AllElementsTrue arrayAsSet(String arrayReference) {
 		 * Creates new {@link AllElementsTrue}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link AllElementsTrue}.
 		 */
 		public static AllElementsTrue arrayAsSet(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new AllElementsTrue(Collections.singletonList(expression));
 		}
 
+		@Contract("-> this")
 		public AllElementsTrue allElementsTrue() {
 			return this;
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java
new file mode 100644
index 0000000000..e1fec17811
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperation.java
@@ -0,0 +1,890 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import java.time.temporal.ChronoUnit;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Sort;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+
+/**
+ * Encapsulates the {@code setWindowFields}-operation.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ * @see <a href=
+ *      "https://docs.mongodb.com/manual/reference/operator/aggregation/setWindowFields/">https://docs.mongodb.com/manual/reference/operator/aggregation/setWindowFields/</a>
+ */
+public class SetWindowFieldsOperation
+		implements AggregationOperation, FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation {
+
+	private static final String CURRENT = "current";
+	private static final String UNBOUNDED = "unbounded";
+
+	private final @Nullable Object partitionBy;
+	private final @Nullable AggregationOperation sortBy;
+	private final WindowOutput output;
+
+	/**
+	 * Create a new {@link SetWindowFieldsOperation} with given args.
+	 *
+	 * @param partitionBy The field or {@link AggregationExpression} to group by.
+	 * @param sortBy the {@link SortOperation operation} to sort the documents by in the partition.
+	 * @param output the {@link WindowOutput} containing the fields to add and the rules to calculate their respective
+	 *          values.
+	 */
+	protected SetWindowFieldsOperation(@Nullable Object partitionBy, @Nullable AggregationOperation sortBy,
+			WindowOutput output) {
+
+		this.partitionBy = partitionBy;
+		this.sortBy = sortBy;
+		this.output = output;
+	}
+
+	/**
+	 * Obtain a {@link SetWindowFieldsOperationBuilder builder} to create a {@link SetWindowFieldsOperation}.
+	 *
+	 * @return new instance of {@link SetWindowFieldsOperationBuilder}.
+	 */
+	public static SetWindowFieldsOperationBuilder builder() {
+		return new SetWindowFieldsOperationBuilder();
+	}
+
+	@Override
+	public ExposedFields getFields() {
+		return ExposedFields.synthetic(Fields.from(output.fields.toArray(new Field[0])));
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+
+		Document $setWindowFields = new Document();
+		if (partitionBy != null) {
+			if (partitionBy instanceof AggregationExpression aggregationExpression) {
+				$setWindowFields.append("partitionBy", aggregationExpression.toDocument(context));
+			} else if (partitionBy instanceof Field field) {
+				$setWindowFields.append("partitionBy", context.getReference(field).toString());
+			} else {
+				$setWindowFields.append("partitionBy", partitionBy);
+			}
+		}
+
+		if (sortBy != null) {
+			$setWindowFields.append("sortBy", sortBy.toDocument(context).get(sortBy.getOperator()));
+		}
+
+		Document output = new Document();
+		for (ComputedField field : this.output.fields) {
+
+			Document fieldOperation = field.getWindowOperator().toDocument(context);
+			if (field.window != null) {
+				fieldOperation.put("window", field.window.toDocument(context));
+			}
+			output.append(field.getName(), fieldOperation);
+		}
+		$setWindowFields.append("output", output);
+
+		return new Document(getOperator(), $setWindowFields);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$setWindowFields";
+	}
+
+	/**
+	 * {@link WindowOutput} defines output of {@literal $setWindowFields} stage by defining the {@link ComputedField
+	 * field(s)} to append to the documents in the output.
+	 */
+	public static class WindowOutput {
+
+		private final List<ComputedField> fields;
+
+		/**
+		 * Create a new output containing the single given {@link ComputedField field}.
+		 *
+		 * @param outputField must not be {@literal null}.
+		 */
+		public WindowOutput(ComputedField outputField) {
+
+			Assert.notNull(outputField, "OutputField must not be null");
+
+			this.fields = new ArrayList<>();
+			this.fields.add(outputField);
+		}
+
+		/**
+		 * Append the given {@link ComputedField field} to the outptut.
+		 *
+		 * @param field must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public WindowOutput append(ComputedField field) {
+
+			Assert.notNull(field, "Field must not be null");
+
+			fields.add(field);
+			return this;
+		}
+
+		/**
+		 * Append the given {@link AggregationExpression} as a {@link ComputedField field} in a fluent way.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ComputedFieldAppender}.
+		 * @see #append(ComputedField)
+		 */
+		@Contract("_ -> new")
+		public ComputedFieldAppender append(AggregationExpression expression) {
+
+			return new ComputedFieldAppender() {
+
+				@Nullable private Window window;
+
+				@Override
+				public WindowOutput as(String fieldname) {
+
+					return WindowOutput.this.append(new ComputedField(fieldname, expression, window));
+				}
+
+				@Override
+				public ComputedFieldAppender within(Window window) {
+					this.window = window;
+					return this;
+				}
+			};
+		}
+
+		/**
+		 * Tiny little helper to allow fluent API usage for {@link #append(ComputedField)}.
+		 */
+		public interface ComputedFieldAppender {
+
+			/**
+			 * Specify the target field name.
+			 *
+			 * @param fieldname the name of field to add to the target document.
+			 * @return the {@link WindowOutput} that started the append operation.
+			 */
+			WindowOutput as(String fieldname);
+
+			/**
+			 * Specify the window boundaries.
+			 *
+			 * @param window must not be {@literal null}.
+			 * @return this.
+			 */
+			ComputedFieldAppender within(Window window);
+		}
+	}
+
+	/**
+	 * A {@link Field} that the result of a computation done via an {@link AggregationExpression}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class ComputedField implements Field {
+
+		private final String name;
+		private final AggregationExpression windowOperator;
+		private final @Nullable Window window;
+
+		/**
+		 * Create a new {@link ComputedField}.
+		 *
+		 * @param name the target field name.
+		 * @param windowOperator the expression to calculate the field value.
+		 */
+		public ComputedField(String name, AggregationExpression windowOperator) {
+			this(name, windowOperator, null);
+		}
+
+		/**
+		 * Create a new {@link ComputedField}.
+		 *
+		 * @param name the target field name.
+		 * @param windowOperator the expression to calculate the field value.
+		 * @param window the boundaries to operate within. Can be {@literal null}.
+		 */
+		public ComputedField(String name, AggregationExpression windowOperator, @Nullable Window window) {
+
+			this.name = name;
+			this.windowOperator = windowOperator;
+			this.window = window;
+		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		@Override
+		public String getTarget() {
+			return getName();
+		}
+
+		@Override
+		public boolean isAliased() {
+			return false;
+		}
+
+		public AggregationExpression getWindowOperator() {
+			return windowOperator;
+		}
+
+		public @Nullable Window getWindow() {
+			return window;
+		}
+	}
+
+	/**
+	 * Quick access to {@link DocumentWindow documents} and {@literal RangeWindow range} {@link Window windows}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public interface Windows {
+
+		/**
+		 * Create a document window relative to the position of the current document.
+		 *
+		 * @param lower an integer for a position relative to the current document, {@literal current} or
+		 *          {@literal unbounded}.
+		 * @param upper an integer for a position relative to the current document, {@literal current} or
+		 *          {@literal unbounded}.
+		 * @return new instance of {@link DocumentWindow}.
+		 */
+		static DocumentWindow documents(Object lower, Object upper) {
+			return new DocumentWindow(lower, upper);
+		}
+
+		/**
+		 * Create a range window defined based on sort expression.
+		 *
+		 * @param lower a numeric value to add the sort by field value of the current document, {@literal current} or
+		 *          {@literal unbounded}.
+		 * @param upper a numeric value to add the sort by field value of the current document, {@literal current} or
+		 *          {@literal unbounded}.
+		 * @return new instance of {@link RangeWindow}.
+		 */
+		static RangeWindow range(Object lower, Object upper, @Nullable WindowUnit unit) {
+			return new RangeWindow(lower, upper, unit == null ? WindowUnits.DEFAULT : unit);
+		}
+
+		/**
+		 * Create a range window based on the {@link Sort sort value} of the current document via a fluent API.
+		 *
+		 * @return new instance of {@link RangeWindowBuilder}.
+		 */
+		static RangeWindowBuilder range() {
+			return new RangeWindowBuilder();
+		}
+
+		/**
+		 * Create a document window relative to the position of the current document via a fluent API.
+		 *
+		 * @return new instance of {@link DocumentWindowBuilder}.
+		 */
+		static DocumentWindowBuilder documents() {
+			return new DocumentWindowBuilder();
+		}
+	}
+
+	/**
+	 * A {@link Window} to be used for {@link ComputedField#getWindow() ComputedField}.
+	 */
+	public interface Window {
+
+		/**
+		 * The lower (inclusive) boundary.
+		 *
+		 * @return
+		 */
+		Object getLower();
+
+		/**
+		 * The upper (inclusive) boundary.
+		 *
+		 * @return
+		 */
+		Object getUpper();
+
+		/**
+		 * Obtain the document representation of the window in a default {@link AggregationOperationContext context}.
+		 *
+		 * @return never {@literal null}.
+		 */
+		default Document toDocument() {
+			return toDocument(Aggregation.DEFAULT_CONTEXT);
+		}
+
+		/**
+		 * Obtain the document representation of the window in the given {@link AggregationOperationContext context}.
+		 *
+		 * @return never {@literal null}.
+		 */
+		Document toDocument(AggregationOperationContext ctx);
+	}
+
+	/**
+	 * Builder API for a {@link RangeWindow}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class RangeWindowBuilder {
+
+		private @Nullable Object lower;
+		private @Nullable Object upper;
+		private @Nullable WindowUnit unit;
+
+		/**
+		 * The lower (inclusive) range limit based on the sortBy field.
+		 *
+		 * @param lower eg. {@literal current} or {@literal unbounded}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RangeWindowBuilder from(String lower) {
+
+			this.lower = lower;
+			return this;
+		}
+
+		/**
+		 * The upper (inclusive) range limit based on the sortBy field.
+		 *
+		 * @param upper eg. {@literal current} or {@literal unbounded}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RangeWindowBuilder to(String upper) {
+
+			this.upper = upper;
+			return this;
+		}
+
+		/**
+		 * The lower (inclusive) range limit value to add to the value based on the sortBy field. Use a negative integer for
+		 * a position before the current document. Use a positive integer for a position after the current document.
+		 * {@code 0} is the current document position.
+		 *
+		 * @param lower
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RangeWindowBuilder from(Number lower) {
+
+			this.lower = lower;
+			return this;
+		}
+
+		/**
+		 * The upper (inclusive) range limit value to add to the value based on the sortBy field. Use a negative integer for
+		 * a position before the current document. Use a positive integer for a position after the current document.
+		 * {@code 0} is the current document position.
+		 *
+		 * @param upper
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RangeWindowBuilder to(Number upper) {
+
+			this.upper = upper;
+			return this;
+		}
+
+		/**
+		 * Use {@literal current} as {@link #from(String) lower} limit.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RangeWindowBuilder fromCurrent() {
+			return from(CURRENT);
+		}
+
+		/**
+		 * Use {@literal unbounded} as {@link #from(String) lower} limit.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RangeWindowBuilder fromUnbounded() {
+			return from(UNBOUNDED);
+		}
+
+		/**
+		 * Use {@literal current} as {@link #to(String) upper} limit.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RangeWindowBuilder toCurrent() {
+			return to(CURRENT);
+		}
+
+		/**
+		 * Use {@literal unbounded} as {@link #to(String) upper} limit.
+		 *
+		 * @return this.
+		 */
+		@Contract("-> this")
+		public RangeWindowBuilder toUnbounded() {
+			return to(UNBOUNDED);
+		}
+
+		/**
+		 * Set the {@link WindowUnit unit} or measure for the given {@link Window}.
+		 *
+		 * @param windowUnit must not be {@literal null}. Can be on of {@link Windows}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public RangeWindowBuilder unit(WindowUnit windowUnit) {
+
+			Assert.notNull(windowUnit, "WindowUnit must not be null");
+			this.unit = windowUnit;
+			return this;
+		}
+
+		/**
+		 * Build the {@link RangeWindow}.
+		 *
+		 * @return new instance of {@link RangeWindow}.
+		 */
+		@Contract("-> new")
+		public RangeWindow build() {
+
+			Assert.notNull(lower, "Lower bound must not be null");
+			Assert.notNull(upper, "Upper bound must not be null");
+			Assert.notNull(unit, "WindowUnit bound must not be null");
+
+			return new RangeWindow(lower, upper, unit);
+		}
+	}
+
+	/**
+	 * Builder API for a {@link RangeWindow}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class DocumentWindowBuilder {
+
+		private @Nullable Object lower;
+		private @Nullable Object upper;
+
+		/**
+		 * The lower (inclusive) range limit based on current document. Use a negative integer for a position before the
+		 * current document. Use a positive integer for a position after the current document. {@code 0} is the current
+		 * document position.
+		 *
+		 * @param lower
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public DocumentWindowBuilder from(Number lower) {
+
+			this.lower = lower;
+			return this;
+		}
+
+		@Contract("-> this")
+		public DocumentWindowBuilder fromCurrent() {
+			return from(CURRENT);
+		}
+
+		@Contract("-> this")
+		public DocumentWindowBuilder fromUnbounded() {
+			return from(UNBOUNDED);
+		}
+
+		@Contract("-> this")
+		public DocumentWindowBuilder to(String upper) {
+
+			this.upper = upper;
+			return this;
+		}
+
+		/**
+		 * The lower (inclusive) range limit based on current document.
+		 *
+		 * @param lower eg. {@literal current} or {@literal unbounded}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public DocumentWindowBuilder from(String lower) {
+
+			this.lower = lower;
+			return this;
+		}
+
+		/**
+		 * The upper (inclusive) range limit based on current document. Use a negative integer for a position before the
+		 * current document. Use a positive integer for a position after the current document. {@code 0} is the current
+		 * document position.
+		 *
+		 * @param upper
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public DocumentWindowBuilder to(Number upper) {
+
+			this.upper = upper;
+			return this;
+		}
+
+		@Contract("-> this")
+		public DocumentWindowBuilder toCurrent() {
+			return to(CURRENT);
+		}
+
+		@Contract("-> this")
+		public DocumentWindowBuilder toUnbounded() {
+			return to(UNBOUNDED);
+		}
+
+		@Contract("-> new")
+		public DocumentWindow build() {
+
+			Assert.notNull(lower, "Lower bound must not be null");
+			Assert.notNull(upper, "Upper bound must not be null");
+
+			return new DocumentWindow(lower, upper);
+		}
+	}
+
+	/**
+	 * Common base class for {@link Window} implementation.
+	 *
+	 * @author Christoph Strobl
+	 */
+	static abstract class WindowImpl implements Window {
+
+		private final Object lower;
+		private final Object upper;
+
+		protected WindowImpl(Object lower, Object upper) {
+			this.lower = lower;
+			this.upper = upper;
+		}
+
+		@Override
+		public Object getLower() {
+			return lower;
+		}
+
+		@Override
+		public Object getUpper() {
+			return upper;
+		}
+	}
+
+	/**
+	 * {@link Window} implementation based on the current document.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class DocumentWindow extends WindowImpl {
+
+		DocumentWindow(Object lower, Object upper) {
+			super(lower, upper);
+		}
+
+		@Override
+		public Document toDocument(AggregationOperationContext ctx) {
+			return new Document("documents", Arrays.asList(getLower(), getUpper()));
+		}
+	}
+
+	/**
+	 * {@link Window} implementation based on the sort fields.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class RangeWindow extends WindowImpl {
+
+		private final WindowUnit unit;
+
+		protected RangeWindow(Object lower, Object upper, WindowUnit unit) {
+
+			super(lower, upper);
+			this.unit = unit;
+		}
+
+		@Override
+		public Document toDocument(AggregationOperationContext ctx) {
+
+			Document range = new Document("range", new Object[] { getLower(), getUpper() });
+			if (unit != null && !WindowUnits.DEFAULT.equals(unit)) {
+				range.append("unit", unit.name().toLowerCase());
+			}
+			return range;
+		}
+	}
+
+	/**
+	 * The actual time unit to apply to a {@link Window}.
+	 */
+	public interface WindowUnit {
+
+		String name();
+
+		/**
+		 * Converts the given time unit into a {@link WindowUnit}. Supported units are: days, hours, minutes, seconds, and
+		 * milliseconds.
+		 *
+		 * @param timeUnit the time unit to convert, must not be {@literal null}.
+		 * @return
+		 * @throws IllegalArgumentException if the {@link TimeUnit} is {@literal null} or not supported for conversion.
+		 */
+		static WindowUnit from(TimeUnit timeUnit) {
+
+			Assert.notNull(timeUnit, "TimeUnit must not be null");
+
+			return switch (timeUnit) {
+				case DAYS -> WindowUnits.DAY;
+				case HOURS -> WindowUnits.HOUR;
+				case MINUTES -> WindowUnits.MINUTE;
+				case SECONDS -> WindowUnits.SECOND;
+				case MILLISECONDS -> WindowUnits.MILLISECOND;
+				default -> throw new IllegalArgumentException(String.format("Cannot create WindowUnit from %s", timeUnit));
+			};
+
+		}
+
+		/**
+		 * Converts the given chrono unit into a {@link WindowUnit}. Supported units are: years, weeks, months, days, hours,
+		 * minutes, seconds, and millis.
+		 *
+		 * @param chronoUnit the chrono unit to convert, must not be {@literal null}.
+		 * @return
+		 * @throws IllegalArgumentException if the {@link TimeUnit} is {@literal null} or not supported for conversion.
+		 */
+		static WindowUnit from(ChronoUnit chronoUnit) {
+
+			return switch (chronoUnit) {
+				case YEARS -> WindowUnits.YEAR;
+				case WEEKS -> WindowUnits.WEEK;
+				case MONTHS -> WindowUnits.MONTH;
+				case DAYS -> WindowUnits.DAY;
+				case HOURS -> WindowUnits.HOUR;
+				case MINUTES -> WindowUnits.MINUTE;
+				case SECONDS -> WindowUnits.SECOND;
+				case MILLIS -> WindowUnits.MILLISECOND;
+				default -> throw new IllegalArgumentException(String.format("Cannot create WindowUnit from %s", chronoUnit));
+			};
+
+		}
+	}
+
+	/**
+	 * Quick access to available {@link WindowUnit units}.
+	 */
+	public enum WindowUnits implements WindowUnit {
+		DEFAULT, YEAR, QUARTER, MONTH, WEEK, DAY, HOUR, MINUTE, SECOND, MILLISECOND
+	}
+
+	/**
+	 * A fluent builder to create a {@link SetWindowFieldsOperation}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	public static class SetWindowFieldsOperationBuilder {
+
+		private @Nullable Object partitionBy;
+		private @Nullable SortOperation sortOperation;
+		private @Nullable WindowOutput output;
+
+		/**
+		 * Specify the field to group by.
+		 *
+		 * @param fieldName must not be {@literal null} or null.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public SetWindowFieldsOperationBuilder partitionByField(String fieldName) {
+
+			Assert.hasText(fieldName, "Field name must not be empty or null");
+			return partitionBy(Fields.field("$" + fieldName, fieldName));
+		}
+
+		/**
+		 * Specify the {@link AggregationExpression expression} to group by.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public SetWindowFieldsOperationBuilder partitionByExpression(AggregationExpression expression) {
+			return partitionBy(expression);
+		}
+
+		/**
+		 * Sort {@link Sort.Direction#ASC ascending} by the given fields.
+		 *
+		 * @param fields must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public SetWindowFieldsOperationBuilder sortBy(String... fields) {
+			return sortBy(Sort.by(fields));
+		}
+
+		/**
+		 * Set the sort order.
+		 *
+		 * @param sort must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public SetWindowFieldsOperationBuilder sortBy(Sort sort) {
+			return sortBy(new SortOperation(sort));
+		}
+
+		/**
+		 * Set the {@link SortOperation} to use.
+		 *
+		 * @param sort must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public SetWindowFieldsOperationBuilder sortBy(SortOperation sort) {
+
+			Assert.notNull(sort, "SortOperation must not be null");
+
+			this.sortOperation = sort;
+			return this;
+		}
+
+		/**
+		 * Define the actual output computation.
+		 *
+		 * @param output must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public SetWindowFieldsOperationBuilder output(WindowOutput output) {
+
+			Assert.notNull(output, "WindowOutput must not be null");
+
+			this.output = output;
+			return this;
+		}
+
+		/**
+		 * Add a field capturing the result of the given {@link AggregationExpression expression} to the output.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link WindowChoice}.
+		 */
+		@Contract("_ -> new")
+		public WindowChoice output(AggregationExpression expression) {
+
+			return new WindowChoice() {
+
+				@Nullable private Window window;
+
+				@Override
+				public As within(Window window) {
+
+					Assert.notNull(window, "Window must not be null");
+
+					this.window = window;
+					return this;
+				}
+
+				@Override
+				public SetWindowFieldsOperationBuilder as(String targetFieldName) {
+
+					Assert.hasText(targetFieldName, "Target field name must not be empty or null");
+
+					ComputedField computedField = new ComputedField(targetFieldName, expression, window);
+
+					if (SetWindowFieldsOperationBuilder.this.output == null) {
+						SetWindowFieldsOperationBuilder.this.output = new WindowOutput(computedField);
+					} else {
+						SetWindowFieldsOperationBuilder.this.output.append(computedField);
+					}
+
+					return SetWindowFieldsOperationBuilder.this;
+				}
+			};
+		}
+
+		/**
+		 * Interface to capture field name used to capture the computation result.
+		 */
+		public interface As {
+
+			/**
+			 * Define the target name field name to hold the computation result.
+			 *
+			 * @param targetFieldName must not be {@literal null} or empty.
+			 * @return the starting point {@link SetWindowFieldsOperationBuilder builder} instance.
+			 */
+			SetWindowFieldsOperationBuilder as(String targetFieldName);
+		}
+
+		/**
+		 * Interface to capture an optional {@link Window} applicable to the field computation.
+		 */
+		public interface WindowChoice extends As {
+
+			/**
+			 * Specify calculation boundaries.
+			 *
+			 * @param window must not be {@literal null}.
+			 * @return never {@literal null}.
+			 */
+			As within(Window window);
+
+		}
+
+		/**
+		 * Partition by a value that translates to a valid mongodb expression.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public SetWindowFieldsOperationBuilder partitionBy(Object value) {
+
+			Assert.notNull(value, "Partition By must not be null");
+
+			partitionBy = value;
+			return this;
+		}
+
+		/**
+		 * Obtain a new instance of {@link SetWindowFieldsOperation} with previously set arguments.
+		 *
+		 * @return new instance of {@link SetWindowFieldsOperation}.
+		 */
+		@Contract("-> new")
+		public SetWindowFieldsOperation build() {
+
+			Assert.notNull(output, "Output must be set first");
+			return new SetWindowFieldsOperation(partitionBy, sortOperation, output);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java
index bb8922fb9c..4d5de23087 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SkipOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,14 +21,15 @@
 /**
  * Encapsulates the aggregation framework {@code $skip}-operation.
  * <p>
- * We recommend to use the static factory method {@link Aggregation#skip(int)} instead of creating instances of this
+ * We recommend to use the static factory method {@link Aggregation#skip(long)} instead of creating instances of this
  * class directly.
  *
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @since 1.3
- * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/skip/">MongoDB Aggregation Framework: $skip</a>
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/skip/">MongoDB Aggregation Framework:
+ *      $skip</a>
  */
 public class SkipOperation implements AggregationOperation {
 
@@ -41,16 +42,17 @@ public class SkipOperation implements AggregationOperation {
 	 */
 	public SkipOperation(long skipCount) {
 
-		Assert.isTrue(skipCount >= 0, "Skip count must not be negative!");
+		Assert.isTrue(skipCount >= 0, "Skip count must not be negative");
 		this.skipCount = skipCount;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
-		return new Document("$skip", skipCount);
+		return new Document(getOperator(), skipCount);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$skip";
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java
index e5080420f2..e6a9a23d31 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,21 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 /**
  * Encapsulates the aggregation framework {@code $sortByCount}-operation.
- * <p/>
+ * <br />
  * {@code $sortByCount} stage is typically used with {@link Aggregation} and {@code $facet}. Groups incoming documents
  * based on the value of a specified expression and computes the count of documents in each distinct group.
  * {@link SortByCountOperation} is equivalent to {@code { $group: { _id: <expression>, count: { $sum: 1 } } }, { $sort:
  * { count: -1 } }}.
- * <p/>
+ * <br />
  * We recommend to use the static factory method {@link Aggregation#sortByCount(String)} instead of creating instances
  * of this class directly.
  *
- * @see <a href=
- *      "https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/">https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/</a>
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/">https://docs.mongodb.com/manual/reference/operator/aggregation/sortByCount/</a>
  * @author Jérôme Guyon
  * @author Mark Paluch
  * @since 2.1
@@ -48,7 +47,7 @@ public class SortByCountOperation implements AggregationOperation {
 	 */
 	public SortByCountOperation(Field groupByField) {
 
-		Assert.notNull(groupByField, "Group by field must not be null!");
+		Assert.notNull(groupByField, "Group by field must not be null");
 
 		this.groupByField = groupByField;
 		this.groupByExpression = null;
@@ -61,20 +60,22 @@ public SortByCountOperation(Field groupByField) {
 	 */
 	public SortByCountOperation(AggregationExpression groupByExpression) {
 
-		Assert.notNull(groupByExpression, "Group by expression must not be null!");
+		Assert.notNull(groupByExpression, "Group by expression must not be null");
 
 		this.groupByExpression = groupByExpression;
 		this.groupByField = null;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
+	@SuppressWarnings("NullAway")
 	public Document toDocument(AggregationOperationContext context) {
 
-		return new Document("$sortByCount", groupByExpression == null ? context.getReference(groupByField).toString()
+		return new Document(getOperator(), groupByExpression == null ? context.getReference(groupByField).toString()
 				: groupByExpression.toDocument(context));
 	}
+
+	@Override
+	public String getOperator() {
+		return "$sortByCount";
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java
index 761c9eef89..b8c6096f1e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SortOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,8 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @since 1.3
- * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/sort/">MongoDB Aggregation Framework: $sort</a>
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/sort/">MongoDB Aggregation Framework:
+ *      $sort</a>
  */
 public class SortOperation implements AggregationOperation {
 
@@ -46,7 +47,7 @@ public class SortOperation implements AggregationOperation {
 	 */
 	public SortOperation(Sort sort) {
 
-		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(sort, "Sort must not be null");
 		this.sort = sort;
 	}
 
@@ -58,10 +59,6 @@ public SortOperation and(Sort sort) {
 		return new SortOperation(this.sort.and(sort));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
@@ -74,6 +71,11 @@ public Document toDocument(AggregationOperationContext context) {
 			object.put(reference.getRaw(), order.isAscending() ? 1 : -1);
 		}
 
-		return new Document("$sort", object);
+		return new Document(getOperator(), object);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$sort";
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java
index 74d7fc8b76..ade4f5328e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,10 +17,10 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.GenericTypeResolver;
 import org.springframework.data.mongodb.core.spel.ExpressionNode;
 import org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport;
@@ -43,7 +43,6 @@
 import org.springframework.expression.spel.standard.SpelExpression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
@@ -66,19 +65,11 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 	 * Creates a new {@link SpelExpressionTransformer}.
 	 */
 	SpelExpressionTransformer() {
-
-		List<ExpressionNodeConversion<? extends ExpressionNode>> conversions = new ArrayList<ExpressionNodeConversion<? extends ExpressionNode>>();
-		conversions.add(new OperatorNodeConversion(this));
-		conversions.add(new LiteralNodeConversion(this));
-		conversions.add(new IndexerNodeConversion(this));
-		conversions.add(new InlineListNodeConversion(this));
-		conversions.add(new PropertyOrFieldReferenceNodeConversion(this));
-		conversions.add(new CompoundExpressionNodeConversion(this));
-		conversions.add(new MethodReferenceNodeConversion(this));
-		conversions.add(new NotOperatorNodeConversion(this));
-		conversions.add(new ValueRetrievingNodeConversion(this));
-
-		this.conversions = Collections.unmodifiableList(conversions);
+		this.conversions = List.of(new OperatorNodeConversion(this), new LiteralNodeConversion(this),
+				new IndexerNodeConversion(this), new InlineListNodeConversion(this),
+				new PropertyOrFieldReferenceNodeConversion(this), new CompoundExpressionNodeConversion(this),
+				new MethodReferenceNodeConversion(this), new NotOperatorNodeConversion(this),
+				new ValueRetrievingNodeConversion(this));
 	}
 
 	/**
@@ -92,24 +83,20 @@ class SpelExpressionTransformer implements AggregationExpressionTransformer {
 	 * @param params must not be {@literal null}
 	 * @return
 	 */
-	public Object transform(String expression, AggregationOperationContext context, Object... params) {
+	public @Nullable Object transform(String expression, AggregationOperationContext context, Object... params) {
 
-		Assert.notNull(expression, "Expression must not be null!");
-		Assert.notNull(context, "AggregationOperationContext must not be null!");
-		Assert.notNull(params, "Parameters must not be null!");
+		Assert.notNull(expression, "Expression must not be null");
+		Assert.notNull(context, "AggregationOperationContext must not be null");
+		Assert.notNull(params, "Parameters must not be null");
 
 		SpelExpression spelExpression = (SpelExpression) PARSER.parseExpression(expression);
 		ExpressionState state = new ExpressionState(new StandardEvaluationContext(params), CONFIG);
 		ExpressionNode node = ExpressionNode.from(spelExpression.getAST(), state);
 
-		return transform(new AggregationExpressionTransformationContext<ExpressionNode>(node, null, null, context));
+		return transform(new AggregationExpressionTransformationContext<>(node, null, null, context));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.spel.ExpressionTransformer#transform(org.springframework.data.mongodb.core.spel.ExpressionTransformationContextSupport)
-	 */
-	public Object transform(AggregationExpressionTransformationContext<ExpressionNode> context) {
+	public @Nullable Object transform(AggregationExpressionTransformationContext<ExpressionNode> context) {
 		return lookupConversionFor(context.getCurrentNode()).convert(context);
 	}
 
@@ -130,7 +117,7 @@ private ExpressionNodeConversion<ExpressionNode> lookupConversionFor(ExpressionN
 		}
 
 		throw new IllegalArgumentException("Unsupported Element: " + node + " Type: " + node.getClass()
-				+ " You probably have a syntax error in your SpEL expression!");
+				+ " You probably have a syntax error in your SpEL expression");
 	}
 
 	/**
@@ -150,10 +137,10 @@ private static abstract class ExpressionNodeConversion<T extends ExpressionNode>
 		 *
 		 * @param transformer must not be {@literal null}.
 		 */
-		@SuppressWarnings("unchecked")
+		@SuppressWarnings({"unchecked", "NullAway"})
 		public ExpressionNodeConversion(AggregationExpressionTransformer transformer) {
 
-			Assert.notNull(transformer, "Transformer must not be null!");
+			Assert.notNull(transformer, "Transformer must not be null");
 
 			this.nodeType = (Class<? extends ExpressionNode>) GenericTypeResolver.resolveTypeArgument(this.getClass(),
 					ExpressionNodeConversion.class);
@@ -178,10 +165,10 @@ protected boolean supports(ExpressionNode node) {
 		 * @param context must not be {@literal null}.
 		 * @return
 		 */
-		protected Object transform(ExpressionNode node, AggregationExpressionTransformationContext<?> context) {
+		protected @Nullable Object transform(ExpressionNode node, AggregationExpressionTransformationContext<?> context) {
 
-			Assert.notNull(node, "ExpressionNode must not be null!");
-			Assert.notNull(context, "AggregationExpressionTransformationContext must not be null!");
+			Assert.notNull(node, "ExpressionNode must not be null");
+			Assert.notNull(context, "AggregationExpressionTransformationContext must not be null");
 
 			return transform(node, context.getParentNode(), null, context);
 		}
@@ -196,22 +183,18 @@ protected Object transform(ExpressionNode node, AggregationExpressionTransformat
 		 * @param context must not be {@literal null}.
 		 * @return
 		 */
-		protected Object transform(ExpressionNode node, @Nullable ExpressionNode parent, @Nullable Document operation,
+		protected @Nullable Object transform(ExpressionNode node, @Nullable ExpressionNode parent, @Nullable Document operation,
 				AggregationExpressionTransformationContext<?> context) {
 
-			Assert.notNull(node, "ExpressionNode must not be null!");
-			Assert.notNull(context, "AggregationExpressionTransformationContext must not be null!");
+			Assert.notNull(node, "ExpressionNode must not be null");
+			Assert.notNull(context, "AggregationExpressionTransformationContext must not be null");
 
 			return transform(new AggregationExpressionTransformationContext<ExpressionNode>(node, parent, operation,
 					context.getAggregationContext()));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#transform(org.springframework.data.mongodb.core.aggregation.AggregationExpressionTransformer.AggregationExpressionTransformationContext)
-		 */
 		@Override
-		public Object transform(AggregationExpressionTransformationContext<ExpressionNode> context) {
+		public @Nullable Object transform(AggregationExpressionTransformationContext<ExpressionNode> context) {
 			return transformer.transform(context);
 		}
 
@@ -221,7 +204,7 @@ public Object transform(AggregationExpressionTransformationContext<ExpressionNod
 		 * @param context
 		 * @return
 		 */
-		protected abstract Object convert(AggregationExpressionTransformationContext<T> context);
+		protected abstract @Nullable Object convert(AggregationExpressionTransformationContext<T> context);
 	}
 
 	/**
@@ -235,10 +218,6 @@ public OperatorNodeConversion(AggregationExpressionTransformer transformer) {
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
 		@Override
 		protected Object convert(AggregationExpressionTransformationContext<OperatorNode> context) {
 
@@ -268,10 +247,11 @@ protected Object convert(AggregationExpressionTransformationContext<OperatorNode
 			return operationObject;
 		}
 
+		@SuppressWarnings("NullAway")
 		private Document createOperationObjectAndAddToPreviousArgumentsIfNecessary(
 				AggregationExpressionTransformationContext<OperatorNode> context, OperatorNode currentNode) {
 
-			Document nextDocument = new Document(currentNode.getMongoOperator(), new ArrayList<Object>());
+			Document nextDocument = new Document(currentNode.getMongoOperator(), new ArrayList<>());
 
 			if (!context.hasPreviousOperation()) {
 				return nextDocument;
@@ -294,7 +274,7 @@ private Object convertUnaryMinusOp(ExpressionTransformationContextSupport<Operat
 				@Nullable Object leftResult) {
 
 			Object result = leftResult instanceof Number ? leftResult
-					: new Document("$multiply", Arrays.<Object> asList(Integer.valueOf(-1), leftResult));
+					: new Document("$multiply", Arrays.asList(-1, leftResult));
 
 			if (leftResult != null && context.hasPreviousOperation()) {
 				context.addToPreviousOperation(result);
@@ -303,10 +283,6 @@ private Object convertUnaryMinusOp(ExpressionTransformationContextSupport<Operat
 			return result;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#supports(java.lang.Class)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isMathematicalOperation() || node.isLogicalOperator();
@@ -325,19 +301,11 @@ private static class IndexerNodeConversion extends ExpressionNodeConversion<Expr
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
 		@Override
-		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
 			return context.addToPreviousOrReturn(context.getCurrentNode().getValue());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isOfType(Indexer.class);
@@ -355,13 +323,8 @@ private static class InlineListNodeConversion extends ExpressionNodeConversion<E
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
-		@Nullable
 		@Override
-		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
 
 			ExpressionNode currentNode = context.getCurrentNode();
 
@@ -373,10 +336,6 @@ protected Object convert(AggregationExpressionTransformationContext<ExpressionNo
 			return transform(currentNode.getChild(0), currentNode, null, context);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isOfType(InlineList.class);
@@ -395,21 +354,13 @@ private static class PropertyOrFieldReferenceNodeConversion extends ExpressionNo
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#convert(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionTransformationContext)
-		 */
 		@Override
-		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
 
 			String fieldReference = context.getFieldReference().toString();
 			return context.addToPreviousOrReturn(fieldReference);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isOfType(PropertyOrFieldReference.class);
@@ -428,20 +379,16 @@ private static class LiteralNodeConversion extends ExpressionNodeConversion<Lite
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		protected Object convert(AggregationExpressionTransformationContext<LiteralNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<LiteralNode> context) {
 
 			LiteralNode node = context.getCurrentNode();
 			Object value = node.getValue();
 
 			if (context.hasPreviousOperation()) {
 
-				if (node.isUnaryMinus(context.getParentNode())) {
+				if (node.isUnaryMinus(context.getParentNode()) && value != null) {
 					// unary minus operator
 					return NumberUtils.convertNumberToTargetClass(((Number) value).doubleValue() * -1,
 							(Class<Number>) value.getClass()); // retain type, e.g. int to -int
@@ -453,10 +400,6 @@ protected Object convert(AggregationExpressionTransformationContext<LiteralNode>
 			return value;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#supports(org.springframework.expression.spel.SpelNode)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isLiteral();
@@ -475,17 +418,13 @@ private static class MethodReferenceNodeConversion extends ExpressionNodeConvers
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
 		@Override
-		protected Object convert(AggregationExpressionTransformationContext<MethodReferenceNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<MethodReferenceNode> context) {
 
 			MethodReferenceNode node = context.getCurrentNode();
 			AggregationMethodReference methodReference = node.getMethodReference();
 
-			Assert.state(methodReference != null, "Cannot resolve current node to AggregationMethodReference!");
+			Assert.state(methodReference != null, "Cannot resolve current node to AggregationMethodReference");
 
 			Object args = null;
 
@@ -500,9 +439,11 @@ protected Object convert(AggregationExpressionTransformationContext<MethodRefere
 					dbo.put(methodReference.getArgumentMap()[i++], transform(child, context));
 				}
 				args = dbo;
+			} else if (ObjectUtils.nullSafeEquals(methodReference.getArgumentType(), ArgumentType.EMPTY_DOCUMENT)) {
+				args = new Document();
 			} else {
 
-				List<Object> argList = new ArrayList<Object>();
+				List<Object> argList = new ArrayList<>();
 
 				for (ExpressionNode childNode : node) {
 					argList.add(transform(childNode, context));
@@ -527,12 +468,8 @@ private static class CompoundExpressionNodeConversion extends ExpressionNodeConv
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
 		@Override
-		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
 
 			ExpressionNode currentNode = context.getCurrentNode();
 
@@ -544,10 +481,6 @@ protected Object convert(AggregationExpressionTransformationContext<ExpressionNo
 			return context.addToPreviousOrReturn(currentNode.getValue());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isOfType(CompoundExpression.class);
@@ -569,15 +502,11 @@ static class NotOperatorNodeConversion extends ExpressionNodeConversion<NotOpera
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
 		@Override
-		protected Object convert(AggregationExpressionTransformationContext<NotOperatorNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<NotOperatorNode> context) {
 
 			NotOperatorNode node = context.getCurrentNode();
-			List<Object> args = new ArrayList<Object>();
+			List<Object> args = new ArrayList<>();
 
 			for (ExpressionNode childNode : node) {
 				args.add(transform(childNode, context));
@@ -586,10 +515,6 @@ protected Object convert(AggregationExpressionTransformationContext<NotOperatorN
 			return context.addToPreviousOrReturn(new Document(node.getMongoOperator(), args));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isOfType(OperatorNot.class);
@@ -611,21 +536,13 @@ static class ValueRetrievingNodeConversion extends ExpressionNodeConversion<Expr
 			super(transformer);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.SpelNodeWrapper#convertSpelNodeToMongoObjectExpression(org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.ExpressionConversionContext)
-		 */
 		@Override
-		protected Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
+		protected @Nullable Object convert(AggregationExpressionTransformationContext<ExpressionNode> context) {
 
 			Object value = context.getCurrentNode().getValue();
 			return ObjectUtils.isArray(value) ? Arrays.asList(ObjectUtils.toObjectArray(value)) : value;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.SpelExpressionTransformer.NodeConversion#supports(org.springframework.data.mongodb.core.spel.ExpressionNode)
-		 */
 		@Override
 		protected boolean supports(ExpressionNode node) {
 			return node.isOfType(InlineMap.class) || node.isOfType(InlineList.class)
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/StringOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/StringOperators.java
index b9d04a9495..0f3447a476 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/StringOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/StringOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,8 +18,13 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.mongodb.util.RegexFlags;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -27,6 +32,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Divya Srivastava
  * @since 1.10
  */
 public class StringOperators {
@@ -35,7 +41,7 @@ public class StringOperators {
 	 * Take the array referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link StringOperatorFactory}.
 	 */
 	public static StringOperatorFactory valueOf(String fieldReference) {
 		return new StringOperatorFactory(fieldReference);
@@ -45,7 +51,7 @@ public static StringOperatorFactory valueOf(String fieldReference) {
 	 * Take the array referenced by given {@literal fieldReference}.
 	 *
 	 * @param fieldReference must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link StringOperatorFactory}.
 	 */
 	public static StringOperatorFactory valueOf(AggregationExpression fieldReference) {
 		return new StringOperatorFactory(fieldReference);
@@ -56,8 +62,8 @@ public static StringOperatorFactory valueOf(AggregationExpression fieldReference
 	 */
 	public static class StringOperatorFactory {
 
-		private final String fieldReference;
-		private final AggregationExpression expression;
+		private final @Nullable String fieldReference;
+		private final @Nullable AggregationExpression expression;
 
 		/**
 		 * Creates new {@link StringOperatorFactory} for given {@literal fieldReference}.
@@ -66,7 +72,7 @@ public static class StringOperatorFactory {
 		 */
 		public StringOperatorFactory(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			this.fieldReference = fieldReference;
 			this.expression = null;
 		}
@@ -78,7 +84,7 @@ public StringOperatorFactory(String fieldReference) {
 		 */
 		public StringOperatorFactory(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			this.fieldReference = null;
 			this.expression = expression;
 		}
@@ -88,11 +94,11 @@ public StringOperatorFactory(AggregationExpression expression) {
 		 * of the referenced field to it.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Concat}.
 		 */
 		public Concat concatValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createConcat().concatValueOf(fieldReference);
 		}
 
@@ -101,11 +107,11 @@ public Concat concatValueOf(String fieldReference) {
 		 * of the given {@link AggregationExpression} to it.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Concat}.
 		 */
 		public Concat concatValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createConcat().concatValueOf(expression);
 		}
 
@@ -114,14 +120,15 @@ public Concat concatValueOf(AggregationExpression expression) {
 		 * {@literal value} to it.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Concat}.
 		 */
 		public Concat concat(String value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createConcat().concat(value);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Concat createConcat() {
 			return usesFieldRef() ? Concat.valueOf(fieldReference) : Concat.valueOf(expression);
 		}
@@ -130,8 +137,8 @@ private Concat createConcat() {
 		 * Creates new {@link AggregationExpression} that takes the associated string representation and returns a substring
 		 * starting at a specified index position.
 		 *
-		 * @param start
-		 * @return
+		 * @param start start index number (including)
+		 * @return new instance of {@link Substr}.
 		 */
 		public Substr substring(int start) {
 			return substring(start, -1);
@@ -141,14 +148,15 @@ public Substr substring(int start) {
 		 * Creates new {@link AggregationExpression} that takes the associated string representation and returns a substring
 		 * starting at a specified index position including the specified number of characters.
 		 *
-		 * @param start
-		 * @param nrOfChars
-		 * @return
+		 * @param start start index number (including)
+		 * @param nrOfChars number of characters.
+		 * @return new instance of {@link Substr}.
 		 */
 		public Substr substring(int start, int nrOfChars) {
 			return createSubstr().substring(start, nrOfChars);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Substr createSubstr() {
 			return usesFieldRef() ? Substr.valueOf(fieldReference) : Substr.valueOf(expression);
 		}
@@ -156,8 +164,9 @@ private Substr createSubstr() {
 		/**
 		 * Creates new {@link AggregationExpression} that takes the associated string representation and lowers it.
 		 *
-		 * @return
+		 * @return new instance of {@link ToLower}.
 		 */
+		@SuppressWarnings("NullAway")
 		public ToLower toLower() {
 			return usesFieldRef() ? ToLower.lowerValueOf(fieldReference) : ToLower.lowerValueOf(expression);
 		}
@@ -165,8 +174,9 @@ public ToLower toLower() {
 		/**
 		 * Creates new {@link AggregationExpression} that takes the associated string representation and uppers it.
 		 *
-		 * @return
+		 * @return new instance of {@link ToUpper}.
 		 */
+		@SuppressWarnings("NullAway")
 		public ToUpper toUpper() {
 			return usesFieldRef() ? ToUpper.upperValueOf(fieldReference) : ToUpper.upperValueOf(expression);
 		}
@@ -176,11 +186,11 @@ public ToUpper toUpper() {
 		 * case-insensitive comparison to the given {@literal value}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrCaseCmp}.
 		 */
 		public StrCaseCmp strCaseCmp(String value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return createStrCaseCmp().strcasecmp(value);
 		}
 
@@ -189,11 +199,11 @@ public StrCaseCmp strCaseCmp(String value) {
 		 * case-insensitive comparison to the referenced {@literal fieldReference}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrCaseCmp}.
 		 */
 		public StrCaseCmp strCaseCmpValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createStrCaseCmp().strcasecmpValueOf(fieldReference);
 		}
 
@@ -202,14 +212,15 @@ public StrCaseCmp strCaseCmpValueOf(String fieldReference) {
 		 * case-insensitive comparison to the result of the given {@link AggregationExpression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrCaseCmp}.
 		 */
 		public StrCaseCmp strCaseCmpValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createStrCaseCmp().strcasecmpValueOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private StrCaseCmp createStrCaseCmp() {
 			return usesFieldRef() ? StrCaseCmp.valueOf(fieldReference) : StrCaseCmp.valueOf(expression);
 		}
@@ -220,11 +231,11 @@ private StrCaseCmp createStrCaseCmp() {
 		 * occurrence.
 		 *
 		 * @param substring must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfBytes}.
 		 */
 		public IndexOfBytes indexOf(String substring) {
 
-			Assert.notNull(substring, "Substring must not be null!");
+			Assert.notNull(substring, "Substring must not be null");
 			return createIndexOfBytesSubstringBuilder().indexOf(substring);
 		}
 
@@ -234,11 +245,11 @@ public IndexOfBytes indexOf(String substring) {
 		 * index (zero-based) of the first occurrence.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfBytes}.
 		 */
 		public IndexOfBytes indexOf(Field fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createIndexOfBytesSubstringBuilder().indexOf(fieldReference);
 		}
 
@@ -248,14 +259,15 @@ public IndexOfBytes indexOf(Field fieldReference) {
 		 * byte index (zero-based) of the first occurrence.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfBytes}.
 		 */
 		public IndexOfBytes indexOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createIndexOfBytesSubstringBuilder().indexOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private IndexOfBytes.SubstringBuilder createIndexOfBytesSubstringBuilder() {
 			return usesFieldRef() ? IndexOfBytes.valueOf(fieldReference) : IndexOfBytes.valueOf(expression);
 		}
@@ -266,11 +278,11 @@ private IndexOfBytes.SubstringBuilder createIndexOfBytesSubstringBuilder() {
 		 * first occurrence.
 		 *
 		 * @param substring must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfCP}.
 		 */
 		public IndexOfCP indexOfCP(String substring) {
 
-			Assert.notNull(substring, "Substring must not be null!");
+			Assert.notNull(substring, "Substring must not be null");
 			return createIndexOfCPSubstringBuilder().indexOf(substring);
 		}
 
@@ -280,11 +292,11 @@ public IndexOfCP indexOfCP(String substring) {
 		 * point index (zero-based) of the first occurrence.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfCP}.
 		 */
 		public IndexOfCP indexOfCP(Field fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return createIndexOfCPSubstringBuilder().indexOf(fieldReference);
 		}
 
@@ -294,14 +306,15 @@ public IndexOfCP indexOfCP(Field fieldReference) {
 		 * code point index (zero-based) of the first occurrence.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfCP}.
 		 */
 		public IndexOfCP indexOfCP(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return createIndexOfCPSubstringBuilder().indexOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private IndexOfCP.SubstringBuilder createIndexOfCPSubstringBuilder() {
 			return usesFieldRef() ? IndexOfCP.valueOf(fieldReference) : IndexOfCP.valueOf(expression);
 		}
@@ -311,7 +324,7 @@ private IndexOfCP.SubstringBuilder createIndexOfCPSubstringBuilder() {
 		 * substrings based on the given delimiter.
 		 *
 		 * @param delimiter must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
 		public Split split(String delimiter) {
 			return createSplit().split(delimiter);
@@ -322,7 +335,7 @@ public Split split(String delimiter) {
 		 * substrings based on the delimiter resulting from the referenced field..
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
 		public Split split(Field fieldReference) {
 			return createSplit().split(fieldReference);
@@ -333,12 +346,13 @@ public Split split(Field fieldReference) {
 		 * substrings based on a delimiter resulting from the given {@link AggregationExpression}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
 		public Split split(AggregationExpression expression) {
 			return createSplit().split(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Split createSplit() {
 			return usesFieldRef() ? Split.valueOf(fieldReference) : Split.valueOf(expression);
 		}
@@ -347,8 +361,9 @@ private Split createSplit() {
 		 * Creates new {@link AggregationExpression} that returns the number of UTF-8 bytes in the associated string
 		 * representation.
 		 *
-		 * @return
+		 * @return new instance of {@link StrLenBytes}.
 		 */
+		@SuppressWarnings("NullAway")
 		public StrLenBytes length() {
 			return usesFieldRef() ? StrLenBytes.stringLengthOf(fieldReference) : StrLenBytes.stringLengthOf(expression);
 		}
@@ -357,8 +372,9 @@ public StrLenBytes length() {
 		 * Creates new {@link AggregationExpression} that returns the number of UTF-8 code points in the associated string
 		 * representation.
 		 *
-		 * @return
+		 * @return new instance of {@link StrLenCP}.
 		 */
+		@SuppressWarnings("NullAway")
 		public StrLenCP lengthCP() {
 			return usesFieldRef() ? StrLenCP.stringLengthOfCP(fieldReference) : StrLenCP.stringLengthOfCP(expression);
 		}
@@ -368,7 +384,7 @@ public StrLenCP lengthCP() {
 		 * starting at a specified code point index position.
 		 *
 		 * @param codePointStart
-		 * @return
+		 * @return new instance of {@link SubstrCP}.
 		 */
 		public SubstrCP substringCP(int codePointStart) {
 			return substringCP(codePointStart, -1);
@@ -378,14 +394,15 @@ public SubstrCP substringCP(int codePointStart) {
 		 * Creates new {@link AggregationExpression} that takes the associated string representation and returns a substring
 		 * starting at a specified code point index position including the specified number of code points.
 		 *
-		 * @param codePointStart
+		 * @param codePointStart start point (including).
 		 * @param nrOfCodePoints
-		 * @return
+		 * @return new instance of {@link SubstrCP}.
 		 */
 		public SubstrCP substringCP(int codePointStart, int nrOfCodePoints) {
 			return createSubstrCP().substringCP(codePointStart, nrOfCodePoints);
 		}
 
+		@SuppressWarnings("NullAway")
 		private SubstrCP createSubstrCP() {
 			return usesFieldRef() ? SubstrCP.valueOf(fieldReference) : SubstrCP.valueOf(expression);
 		}
@@ -428,6 +445,7 @@ public Trim trim(AggregationExpression expression) {
 			return trim().charsOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Trim createTrim() {
 			return usesFieldRef() ? Trim.valueOf(fieldReference) : Trim.valueOf(expression);
 		}
@@ -470,6 +488,7 @@ public LTrim ltrim(AggregationExpression expression) {
 			return ltrim().charsOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private LTrim createLTrim() {
 			return usesFieldRef() ? LTrim.valueOf(fieldReference) : LTrim.valueOf(expression);
 		}
@@ -512,10 +531,243 @@ public RTrim rtrim(AggregationExpression expression) {
 			return rtrim().charsOf(expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private RTrim createRTrim() {
 			return usesFieldRef() ? RTrim.valueOf(fieldReference) : RTrim.valueOf(expression);
 		}
 
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the given
+		 * regular expression to find the document with the first match.<br />
+		 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+		 *
+		 * @param regex must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 * @since 3.3
+		 */
+		public RegexFind regexFind(String regex) {
+			return createRegexFind().regex(regex);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the regular
+		 * expression resulting from the given {@link AggregationExpression} to find the document with the first
+		 * match.<br />
+		 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 * @since 3.3
+		 */
+		public RegexFind regexFind(AggregationExpression expression) {
+			return createRegexFind().regexOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the {@link Pattern} and applies the regular expression with
+		 * the options specified in the argument to find the document with the first match.
+		 *
+		 * @param pattern the pattern object to apply.
+		 * @return new instance of {@link RegexFind}.
+		 * @since 3.3
+		 */
+		public RegexFind regexFind(Pattern pattern) {
+			return createRegexFind().pattern(pattern);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the regular
+		 * expression with the options specified in the argument to find the document with the first match.
+		 *
+		 * @param regex the regular expression to apply.
+		 * @param options the options to use.
+		 * @return new instance of {@link RegexFind}.
+		 * @since 3.3
+		 */
+		public RegexFind regexFind(String regex, String options) {
+			return createRegexFind().regex(regex).options(options);
+		}
+
+		@SuppressWarnings("NullAway")
+		private RegexFind createRegexFind() {
+			return usesFieldRef() ? RegexFind.valueOf(fieldReference) : RegexFind.valueOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the given
+		 * regular expression to find all the documents with the match.<br />
+		 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+		 *
+		 * @param regex must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 * @since 3.3
+		 */
+		public RegexFindAll regexFindAll(String regex) {
+			return createRegexFindAll().regex(regex);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the regular
+		 * expression resulting from the given {@link AggregationExpression} to find all the documents with the
+		 * match..<br />
+		 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 * @since 3.3
+		 */
+		public RegexFindAll regexFindAll(AggregationExpression expression) {
+			return createRegexFindAll().regexOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes a {@link Pattern} and applies the regular expression with
+		 * the options specified in the argument to find all the documents with the match.
+		 *
+		 * @param pattern the pattern object to apply.
+		 * @return new instance of {@link RegexFindAll}.
+		 * @since 3.3
+		 */
+		public RegexFindAll regexFindAll(Pattern pattern) {
+			return createRegexFindAll().pattern(pattern);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the regular
+		 * expression with the options specified in the argument to find all the documents with the match.
+		 *
+		 * @param regex the regular expression to apply.
+		 * @param options the options to use.
+		 * @return new instance of {@link RegexFindAll}.
+		 * @since 3.3
+		 */
+		public RegexFindAll regexFindAll(String regex, String options) {
+			return createRegexFindAll().regex(regex).options(options);
+		}
+
+		@SuppressWarnings("NullAway")
+		private RegexFindAll createRegexFindAll() {
+			return usesFieldRef() ? RegexFindAll.valueOf(fieldReference) : RegexFindAll.valueOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the given
+		 * regular expression to find if a match is found or not.<br />
+		 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+		 *
+		 * @param regex must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 * @since 3.3
+		 */
+		public RegexMatch regexMatch(String regex) {
+			return createRegexMatch().regex(regex);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the regular
+		 * expression resulting from the given {@link AggregationExpression} to find if a match is found or not.<br />
+		 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 * @since 3.3
+		 */
+		public RegexMatch regexMatch(AggregationExpression expression) {
+			return createRegexMatch().regexOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes a {@link Pattern} and applies the regular expression with
+		 * the options specified in the argument to find if a match is found or not.
+		 *
+		 * @param pattern the pattern object to apply.
+		 * @return new instance of {@link RegexMatch}.
+		 * @since 3.3
+		 */
+		public RegexMatch regexMatch(Pattern pattern) {
+			return createRegexMatch().pattern(pattern);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and applies the regular
+		 * expression with the options specified in the argument to find if a match is found or not.
+		 *
+		 * @param regex the regular expression to apply.
+		 * @param options the options to use.
+		 * @return new instance of {@link RegexMatch}.
+		 * @since 3.3
+		 */
+		public RegexMatch regexMatch(String regex, String options) {
+			return createRegexMatch().regex(regex).options(options);
+		}
+
+		@SuppressWarnings("NullAway")
+		private RegexMatch createRegexMatch() {
+			return usesFieldRef() ? RegexMatch.valueOf(fieldReference) : RegexMatch.valueOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and replaces the first
+		 * occurrence of the search string with the given replacement.
+		 * 
+		 * @param search
+		 * @param replacement
+		 * @return new instance of {@link ReplaceOne}.
+		 * @since 3.4
+		 */
+		public ReplaceOne replaceOne(String search, String replacement) {
+			return createReplaceOne().find(search).replacement(replacement);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and replaces the first
+		 * occurrence of the search string computed by the given {@link AggregationExpression} with the given replacement.
+		 *
+		 * @param search
+		 * @param replacement
+		 * @return new instance of {@link ReplaceOne}.
+		 * @since 3.4
+		 */
+		public ReplaceOne replaceOne(AggregationExpression search, String replacement) {
+			return createReplaceOne().findValueOf(search).replacement(replacement);
+		}
+
+		@SuppressWarnings("NullAway")
+		private ReplaceOne createReplaceOne() {
+			return usesFieldRef() ? ReplaceOne.valueOf(fieldReference) : ReplaceOne.valueOf(expression);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and replaces all
+		 * occurrences of the search string with the given replacement.
+		 *
+		 * @param search
+		 * @param replacement
+		 * @return new instance of {@link ReplaceOne}.
+		 * @since 3.4
+		 */
+		public ReplaceAll replaceAll(String search, String replacement) {
+			return createReplaceAll().find(search).replacement(replacement);
+		}
+
+		/**
+		 * Creates new {@link AggregationExpression} that takes the associated string representation and replaces all
+		 * occurrences of the search string computed by the given {@link AggregationExpression} with the given replacement.
+		 *
+		 * @param search
+		 * @param replacement
+		 * @return new instance of {@link ReplaceOne}.
+		 * @since 3.4
+		 */
+		public ReplaceAll replaceAll(AggregationExpression search, String replacement) {
+			return createReplaceAll().findValueOf(search).replacement(replacement);
+		}
+
+		@SuppressWarnings("NullAway")
+		private ReplaceAll createReplaceAll() {
+			return usesFieldRef() ? ReplaceAll.valueOf(fieldReference) : ReplaceAll.valueOf(expression);
+		}
+
 		private boolean usesFieldRef() {
 			return fieldReference != null;
 		}
@@ -541,11 +793,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Concat}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Concat}.
 		 */
 		public static Concat valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Concat(asFields(fieldReference));
 		}
 
@@ -553,11 +805,11 @@ public static Concat valueOf(String fieldReference) {
 		 * Creates new {@link Concat}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Concat}.
 		 */
 		public static Concat valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Concat(Collections.singletonList(expression));
 		}
 
@@ -565,26 +817,47 @@ public static Concat valueOf(AggregationExpression expression) {
 		 * Creates new {@link Concat}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Concat}.
 		 */
 		public static Concat stringValue(String value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new Concat(Collections.singletonList(value));
 		}
 
+		/**
+		 * Concat the value of the given field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link Concat}.
+		 */
+		@Contract("_ -> new")
 		public Concat concatValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Concat(append(Fields.field(fieldReference)));
 		}
 
+		/**
+		 * Concat the value resulting from the given {@link AggregationExpression}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link Concat}.
+		 */
+		@Contract("_ -> new")
 		public Concat concatValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Concat(append(expression));
 		}
 
+		/**
+		 * Concat the given value.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link Concat}.
+		 */
+		@Contract("_ -> new")
 		public Concat concat(String value) {
 			return new Concat(append(value));
 		}
@@ -610,11 +883,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link Substr}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Substr}.
 		 */
 		public static Substr valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Substr(asFields(fieldReference));
 		}
 
@@ -622,18 +895,29 @@ public static Substr valueOf(String fieldReference) {
 		 * Creates new {@link Substr}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Substr}.
 		 */
 		public static Substr valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Substr(Collections.singletonList(expression));
 		}
 
+		/**
+		 * @param start start index (including)
+		 * @return new instance of {@link Substr}.
+		 */
+		@Contract("_ -> new")
 		public Substr substring(int start) {
 			return substring(start, -1);
 		}
 
+		/**
+		 * @param start start index (including)
+		 * @param nrOfChars
+		 * @return new instance of {@link Substr}.
+		 */
+		@Contract("_, _ -> new")
 		public Substr substring(int start, int nrOfChars) {
 			return new Substr(append(Arrays.asList(start, nrOfChars)));
 		}
@@ -663,7 +947,7 @@ protected String getMongoMethod() {
 		 */
 		public static ToLower lowerValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new ToLower(Fields.field(fieldReference));
 		}
 
@@ -675,7 +959,7 @@ public static ToLower lowerValueOf(String fieldReference) {
 		 */
 		public static ToLower lowerValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new ToLower(Collections.singletonList(expression));
 		}
 
@@ -687,7 +971,7 @@ public static ToLower lowerValueOf(AggregationExpression expression) {
 		 */
 		public static ToLower lower(String value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new ToLower(value);
 		}
 	}
@@ -716,7 +1000,7 @@ protected String getMongoMethod() {
 		 */
 		public static ToUpper upperValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new ToUpper(Fields.field(fieldReference));
 		}
 
@@ -728,7 +1012,7 @@ public static ToUpper upperValueOf(String fieldReference) {
 		 */
 		public static ToUpper upperValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new ToUpper(Collections.singletonList(expression));
 		}
 
@@ -740,7 +1024,7 @@ public static ToUpper upperValueOf(AggregationExpression expression) {
 		 */
 		public static ToUpper upper(String value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new ToUpper(value);
 		}
 	}
@@ -769,7 +1053,7 @@ protected String getMongoMethod() {
 		 */
 		public static StrCaseCmp valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new StrCaseCmp(asFields(fieldReference));
 		}
 
@@ -777,11 +1061,11 @@ public static StrCaseCmp valueOf(String fieldReference) {
 		 * Creates new {@link StrCaseCmp}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrCaseCmp}.
 		 */
 		public static StrCaseCmp valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StrCaseCmp(Collections.singletonList(expression));
 		}
 
@@ -789,27 +1073,30 @@ public static StrCaseCmp valueOf(AggregationExpression expression) {
 		 * Creates new {@link StrCaseCmp}.
 		 *
 		 * @param value must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrCaseCmp}.
 		 */
 		public static StrCaseCmp stringValue(String value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			return new StrCaseCmp(Collections.singletonList(value));
 		}
 
+		@Contract("_ -> new")
 		public StrCaseCmp strcasecmp(String value) {
 			return new StrCaseCmp(append(value));
 		}
 
+		@Contract("_ -> new")
 		public StrCaseCmp strcasecmpValueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new StrCaseCmp(append(Fields.field(fieldReference)));
 		}
 
+		@Contract("_ -> new")
 		public StrCaseCmp strcasecmpValueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StrCaseCmp(append(expression));
 		}
 	}
@@ -834,11 +1121,11 @@ protected String getMongoMethod() {
 		 * Start creating a new {@link IndexOfBytes}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SubstringBuilder}.
 		 */
 		public static SubstringBuilder valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new SubstringBuilder(Fields.field(fieldReference));
 		}
 
@@ -846,11 +1133,11 @@ public static SubstringBuilder valueOf(String fieldReference) {
 		 * Start creating a new {@link IndexOfBytes}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SubstringBuilder}.
 		 */
 		public static SubstringBuilder valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SubstringBuilder(expression);
 		}
 
@@ -858,8 +1145,9 @@ public static SubstringBuilder valueOf(AggregationExpression expression) {
 		 * Optionally define the substring search start and end position.
 		 *
 		 * @param range must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfBytes}.
 		 */
+		@Contract("_ -> new")
 		public IndexOfBytes within(Range<Long> range) {
 			return new IndexOfBytes(append(AggregationUtils.toRangeValues(range)));
 		}
@@ -876,7 +1164,7 @@ private SubstringBuilder(Object stringExpression) {
 			 * Creates a new {@link IndexOfBytes} given {@literal substring}.
 			 *
 			 * @param substring must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IndexOfBytes}.
 			 */
 			public IndexOfBytes indexOf(String substring) {
 				return new IndexOfBytes(Arrays.asList(stringExpression, substring));
@@ -886,7 +1174,7 @@ public IndexOfBytes indexOf(String substring) {
 			 * Creates a new {@link IndexOfBytes} given {@link AggregationExpression} that resolves to the substring.
 			 *
 			 * @param expression must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IndexOfBytes}.
 			 */
 			public IndexOfBytes indexOf(AggregationExpression expression) {
 				return new IndexOfBytes(Arrays.asList(stringExpression, expression));
@@ -896,7 +1184,7 @@ public IndexOfBytes indexOf(AggregationExpression expression) {
 			 * Creates a new {@link IndexOfBytes} given {@link Field} that resolves to the substring.
 			 *
 			 * @param fieldReference must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IndexOfBytes}.
 			 */
 			public IndexOfBytes indexOf(Field fieldReference) {
 				return new IndexOfBytes(Arrays.asList(stringExpression, fieldReference));
@@ -924,11 +1212,11 @@ protected String getMongoMethod() {
 		 * Start creating a new {@link IndexOfCP}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfCP}.
 		 */
 		public static SubstringBuilder valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new SubstringBuilder(Fields.field(fieldReference));
 		}
 
@@ -936,11 +1224,11 @@ public static SubstringBuilder valueOf(String fieldReference) {
 		 * Start creating a new {@link IndexOfCP}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfCP}.
 		 */
 		public static SubstringBuilder valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SubstringBuilder(expression);
 		}
 
@@ -948,8 +1236,9 @@ public static SubstringBuilder valueOf(AggregationExpression expression) {
 		 * Optionally define the substring search start and end position.
 		 *
 		 * @param range must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IndexOfCP}.
 		 */
+		@Contract("_ -> new")
 		public IndexOfCP within(Range<Long> range) {
 			return new IndexOfCP(append(AggregationUtils.toRangeValues(range)));
 		}
@@ -966,7 +1255,7 @@ private SubstringBuilder(Object stringExpression) {
 			 * Creates a new {@link IndexOfCP} given {@literal substring}.
 			 *
 			 * @param substring must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IndexOfCP}.
 			 */
 			public IndexOfCP indexOf(String substring) {
 				return new IndexOfCP(Arrays.asList(stringExpression, substring));
@@ -976,7 +1265,7 @@ public IndexOfCP indexOf(String substring) {
 			 * Creates a new {@link IndexOfCP} given {@link AggregationExpression} that resolves to the substring.
 			 *
 			 * @param expression must not be {@literal null}.
-			 * @return
+			 * @return new instance of {@link IndexOfCP}.
 			 */
 			public IndexOfCP indexOf(AggregationExpression expression) {
 				return new IndexOfCP(Arrays.asList(stringExpression, expression));
@@ -1014,11 +1303,11 @@ protected String getMongoMethod() {
 		 * Start creating a new {@link Split}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
 		public static Split valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Split(asFields(fieldReference));
 		}
 
@@ -1026,11 +1315,11 @@ public static Split valueOf(String fieldReference) {
 		 * Start creating a new {@link Split}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
 		public static Split valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Split(Collections.singletonList(expression));
 		}
 
@@ -1038,11 +1327,12 @@ public static Split valueOf(AggregationExpression expression) {
 		 * Use given {@link String} as delimiter.
 		 *
 		 * @param delimiter must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
+		@Contract("_ -> new")
 		public Split split(String delimiter) {
 
-			Assert.notNull(delimiter, "Delimiter must not be null!");
+			Assert.notNull(delimiter, "Delimiter must not be null");
 			return new Split(append(delimiter));
 		}
 
@@ -1050,11 +1340,12 @@ public Split split(String delimiter) {
 		 * Use value of referenced field as delimiter.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
+		@Contract("_ -> new")
 		public Split split(Field fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Split(append(fieldReference));
 		}
 
@@ -1062,11 +1353,12 @@ public Split split(Field fieldReference) {
 		 * Use value resulting from {@link AggregationExpression} as delimiter.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link Split}.
 		 */
+		@Contract("_ -> new")
 		public Split split(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Split(append(expression));
 		}
 	}
@@ -1091,7 +1383,7 @@ protected String getMongoMethod() {
 		 * Creates new {@link StrLenBytes}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrLenBytes}.
 		 */
 		public static StrLenBytes stringLengthOf(String fieldReference) {
 			return new StrLenBytes(Fields.field(fieldReference));
@@ -1101,11 +1393,11 @@ public static StrLenBytes stringLengthOf(String fieldReference) {
 		 * Creates new {@link StrLenBytes}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrLenBytes}.
 		 */
 		public static StrLenBytes stringLengthOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StrLenBytes(expression);
 		}
 	}
@@ -1130,7 +1422,7 @@ protected String getMongoMethod() {
 		 * Creates new {@link StrLenCP}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrLenCP}.
 		 */
 		public static StrLenCP stringLengthOfCP(String fieldReference) {
 			return new StrLenCP(Fields.field(fieldReference));
@@ -1140,11 +1432,11 @@ public static StrLenCP stringLengthOfCP(String fieldReference) {
 		 * Creates new {@link StrLenCP}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link StrLenCP}.
 		 */
 		public static StrLenCP stringLengthOfCP(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new StrLenCP(expression);
 		}
 	}
@@ -1169,11 +1461,11 @@ protected String getMongoMethod() {
 		 * Creates new {@link SubstrCP}.
 		 *
 		 * @param fieldReference must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SubstrCP}.
 		 */
 		public static SubstrCP valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new SubstrCP(asFields(fieldReference));
 		}
 
@@ -1181,18 +1473,20 @@ public static SubstrCP valueOf(String fieldReference) {
 		 * Creates new {@link SubstrCP}.
 		 *
 		 * @param expression must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link SubstrCP}.
 		 */
 		public static SubstrCP valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new SubstrCP(Collections.singletonList(expression));
 		}
 
+		@Contract("_ -> new")
 		public SubstrCP substringCP(int start) {
 			return substringCP(start, -1);
 		}
 
+		@Contract("_, _ -> new")
 		public SubstrCP substringCP(int start, int nrOfChars) {
 			return new SubstrCP(append(Arrays.asList(start, nrOfChars)));
 		}
@@ -1220,7 +1514,7 @@ private Trim(Object value) {
 		 */
 		public static Trim valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new Trim(Collections.singletonMap("input", Fields.field(fieldReference)));
 		}
 
@@ -1233,7 +1527,7 @@ public static Trim valueOf(String fieldReference) {
 		 */
 		public static Trim valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new Trim(Collections.singletonMap("input", expression));
 		}
 
@@ -1243,9 +1537,10 @@ public static Trim valueOf(AggregationExpression expression) {
 		 * @param chars must not be {@literal null}.
 		 * @return new instance of {@link Trim}.
 		 */
+		@Contract("_ -> new")
 		public Trim chars(String chars) {
 
-			Assert.notNull(chars, "Chars must not be null!");
+			Assert.notNull(chars, "Chars must not be null");
 			return new Trim(append("chars", chars));
 		}
 
@@ -1256,6 +1551,7 @@ public Trim chars(String chars) {
 		 * @param fieldReference must not be {@literal null}.
 		 * @return new instance of {@link Trim}.
 		 */
+		@Contract("_ -> new")
 		public Trim charsOf(String fieldReference) {
 			return new Trim(append("chars", Fields.field(fieldReference)));
 		}
@@ -1267,6 +1563,7 @@ public Trim charsOf(String fieldReference) {
 		 * @param expression must not be {@literal null}.
 		 * @return new instance of {@link Trim}.
 		 */
+		@Contract("_ -> new")
 		public Trim charsOf(AggregationExpression expression) {
 			return new Trim(append("chars", expression));
 		}
@@ -1317,7 +1614,7 @@ private LTrim(Object value) {
 		 */
 		public static LTrim valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new LTrim(Collections.singletonMap("input", Fields.field(fieldReference)));
 		}
 
@@ -1330,7 +1627,7 @@ public static LTrim valueOf(String fieldReference) {
 		 */
 		public static LTrim valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new LTrim(Collections.singletonMap("input", expression));
 		}
 
@@ -1340,9 +1637,10 @@ public static LTrim valueOf(AggregationExpression expression) {
 		 * @param chars must not be {@literal null}.
 		 * @return new instance of {@link LTrim}.
 		 */
+		@Contract("_ -> new")
 		public LTrim chars(String chars) {
 
-			Assert.notNull(chars, "Chars must not be null!");
+			Assert.notNull(chars, "Chars must not be null");
 			return new LTrim(append("chars", chars));
 		}
 
@@ -1353,6 +1651,7 @@ public LTrim chars(String chars) {
 		 * @param fieldReference must not be {@literal null}.
 		 * @return new instance of {@link LTrim}.
 		 */
+		@Contract("_ -> new")
 		public LTrim charsOf(String fieldReference) {
 			return new LTrim(append("chars", Fields.field(fieldReference)));
 		}
@@ -1360,10 +1659,11 @@ public LTrim charsOf(String fieldReference) {
 		/**
 		 * Optional specify the {@link AggregationExpression} evaluating to the character sequence to trim from the
 		 * beginning.
-		 * 
+		 *
 		 * @param expression must not be {@literal null}.
 		 * @return new instance of {@link LTrim}.
 		 */
+		@Contract("_ -> new")
 		public LTrim charsOf(AggregationExpression expression) {
 			return new LTrim(append("chars", expression));
 		}
@@ -1396,7 +1696,7 @@ private RTrim(Object value) {
 		 */
 		public static RTrim valueOf(String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 			return new RTrim(Collections.singletonMap("input", Fields.field(fieldReference)));
 		}
 
@@ -1409,7 +1709,7 @@ public static RTrim valueOf(String fieldReference) {
 		 */
 		public static RTrim valueOf(AggregationExpression expression) {
 
-			Assert.notNull(expression, "Expression must not be null!");
+			Assert.notNull(expression, "Expression must not be null");
 			return new RTrim(Collections.singletonMap("input", expression));
 		}
 
@@ -1419,9 +1719,10 @@ public static RTrim valueOf(AggregationExpression expression) {
 		 * @param chars must not be {@literal null}.
 		 * @return new instance of {@link RTrim}.
 		 */
+		@Contract("_ -> new")
 		public RTrim chars(String chars) {
 
-			Assert.notNull(chars, "Chars must not be null!");
+			Assert.notNull(chars, "Chars must not be null");
 			return new RTrim(append("chars", chars));
 		}
 
@@ -1431,6 +1732,7 @@ public RTrim chars(String chars) {
 		 * @param fieldReference must not be {@literal null}.
 		 * @return new instance of {@link RTrim}.
 		 */
+		@Contract("_ -> new")
 		public RTrim charsOf(String fieldReference) {
 			return new RTrim(append("chars", Fields.field(fieldReference)));
 		}
@@ -1441,6 +1743,7 @@ public RTrim charsOf(String fieldReference) {
 		 * @param expression must not be {@literal null}.
 		 * @return new instance of {@link RTrim}.
 		 */
+		@Contract("_ -> new")
 		public RTrim charsOf(AggregationExpression expression) {
 			return new RTrim(append("chars", expression));
 		}
@@ -1450,4 +1753,753 @@ protected String getMongoMethod() {
 			return "$rtrim";
 		}
 	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $regexFind} which applies a regular expression (regex) to a string and
+	 * returns information on the first matched substring. <br />
+	 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class RegexFind extends AbstractAggregationExpression {
+
+		protected RegexFind(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link RegexFind} using the value of the provided {@link Field fieldReference} as {@literal input}
+		 * value.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		public static RegexFind valueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new RegexFind(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link RegexFind} using the result of the provided {@link AggregationExpression} as {@literal input}
+		 * value.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		public static RegexFind valueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexFind(Collections.singletonMap("input", expression));
+		}
+
+		/**
+		 * Optional specify the options to use with the regular expression.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		@Contract("_ -> new")
+		public RegexFind options(String options) {
+
+			Assert.notNull(options, "Options must not be null");
+
+			return new RegexFind(append("options", options));
+		}
+
+		/**
+		 * Optional specify the reference to the {@link Field field} holding the options values to use with the regular
+		 * expression.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		@Contract("_ -> new")
+		public RegexFind optionsOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new RegexFind(append("options", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Optional specify the {@link AggregationExpression} evaluating to the options values to use with the regular
+		 * expression.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		@Contract("_ -> new")
+		public RegexFind optionsOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexFind(append("options", expression));
+		}
+
+		/**
+		 * Specify the regular expression to apply.
+		 *
+		 * @param regex must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		@Contract("_ -> new")
+		public RegexFind regex(String regex) {
+
+			Assert.notNull(regex, "Regex must not be null");
+
+			return new RegexFind(append("regex", regex));
+		}
+
+		/**
+		 * Apply a {@link Pattern} into {@code regex} and {@code options} fields.
+		 *
+		 * @param pattern must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		@Contract("_ -> new")
+		public RegexFind pattern(Pattern pattern) {
+
+			Assert.notNull(pattern, "Pattern must not be null");
+
+			Map<String, Object> regex = append("regex", pattern.pattern());
+			regex.put("options", RegexFlags.toRegexOptions(pattern.flags()));
+
+			return new RegexFind(regex);
+		}
+
+		/**
+		 * Specify the reference to the {@link Field field} holding the regular expression to apply.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		@Contract("_ -> new")
+		public RegexFind regexOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "fieldReference must not be null");
+
+			return new RegexFind(append("regex", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Specify the {@link AggregationExpression} evaluating to the regular expression to apply.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFind}.
+		 */
+		@Contract("_ -> new")
+		public RegexFind regexOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexFind(append("regex", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$regexFind";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $regexFindAll} which applies a regular expression (regex) to a string and
+	 * returns information on all the matched substrings. <br />
+	 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class RegexFindAll extends AbstractAggregationExpression {
+
+		protected RegexFindAll(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link RegexFindAll} using the value of the provided {@link Field fieldReference} as {@literal input}
+		 * value.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		public static RegexFindAll valueOf(String fieldReference) {
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+			return new RegexFindAll(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link RegexFindAll} using the result of the provided {@link AggregationExpression} as
+		 * {@literal input} value.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		public static RegexFindAll valueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexFindAll(Collections.singletonMap("input", expression));
+		}
+
+		/**
+		 * Optional specify the options to use with the regular expression.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		@Contract("_ -> new")
+		public RegexFindAll options(String options) {
+
+			Assert.notNull(options, "Options must not be null");
+
+			return new RegexFindAll(append("options", options));
+		}
+
+		/**
+		 * Optional specify the reference to the {@link Field field} holding the options values to use with the regular
+		 * expression.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		@Contract("_ -> new")
+		public RegexFindAll optionsOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "fieldReference must not be null");
+
+			return new RegexFindAll(append("options", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Optional specify the {@link AggregationExpression} evaluating to the options values to use with the regular
+		 * expression.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		@Contract("_ -> new")
+		public RegexFindAll optionsOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexFindAll(append("options", expression));
+		}
+
+		/**
+		 * Apply a {@link Pattern} into {@code regex} and {@code options} fields.
+		 *
+		 * @param pattern must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		@Contract("_ -> new")
+		public RegexFindAll pattern(Pattern pattern) {
+
+			Assert.notNull(pattern, "Pattern must not be null");
+
+			Map<String, Object> regex = append("regex", pattern.pattern());
+			regex.put("options", RegexFlags.toRegexOptions(pattern.flags()));
+
+			return new RegexFindAll(regex);
+		}
+
+		/**
+		 * Specify the regular expression to apply.
+		 *
+		 * @param regex must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		@Contract("_ -> new")
+		public RegexFindAll regex(String regex) {
+
+			Assert.notNull(regex, "Regex must not be null");
+
+			return new RegexFindAll(append("regex", regex));
+		}
+
+		/**
+		 * Specify the reference to the {@link Field field} holding the regular expression to apply.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		@Contract("_ -> new")
+		public RegexFindAll regexOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "fieldReference must not be null");
+
+			return new RegexFindAll(append("regex", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Specify the {@link AggregationExpression} evaluating to the regular expression to apply.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexFindAll}.
+		 */
+		@Contract("_ -> new")
+		public RegexFindAll regexOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexFindAll(append("regex", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$regexFindAll";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $regexMatch} which applies a regular expression (regex) to a string and
+	 * returns a boolean that indicates if a match is found or not. <br />
+	 * <strong>NOTE:</strong> Requires MongoDB 4.0 or later.
+	 *
+	 * @author Divya Srivastava
+	 * @since 3.3
+	 */
+	public static class RegexMatch extends AbstractAggregationExpression {
+
+		protected RegexMatch(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link RegexMatch} using the value of the provided {@link Field fieldReference} as {@literal input}
+		 * value.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		public static RegexMatch valueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new RegexMatch(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link RegexMatch} using the result of the provided {@link AggregationExpression} as {@literal input}
+		 * value.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		public static RegexMatch valueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexMatch(Collections.singletonMap("input", expression));
+		}
+
+		/**
+		 * Optional specify the options to use with the regular expression.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		@Contract("_ -> new")
+		public RegexMatch options(String options) {
+
+			Assert.notNull(options, "Options must not be null");
+
+			return new RegexMatch(append("options", options));
+		}
+
+		/**
+		 * Optional specify the reference to the {@link Field field} holding the options values to use with the regular
+		 * expression.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		@Contract("_ -> new")
+		public RegexMatch optionsOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new RegexMatch(append("options", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Optional specify the {@link AggregationExpression} evaluating to the options values to use with the regular
+		 * expression.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		@Contract("_ -> new")
+		public RegexMatch optionsOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexMatch(append("options", expression));
+		}
+
+		/**
+		 * Apply a {@link Pattern} into {@code regex} and {@code options} fields.
+		 *
+		 * @param pattern must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		@Contract("_ -> new")
+		public RegexMatch pattern(Pattern pattern) {
+
+			Assert.notNull(pattern, "Pattern must not be null");
+
+			Map<String, Object> regex = append("regex", pattern.pattern());
+			regex.put("options", RegexFlags.toRegexOptions(pattern.flags()));
+
+			return new RegexMatch(regex);
+		}
+
+		/**
+		 * Specify the regular expression to apply.
+		 *
+		 * @param regex must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		@Contract("_ -> new")
+		public RegexMatch regex(String regex) {
+
+			Assert.notNull(regex, "Regex must not be null");
+
+			return new RegexMatch(append("regex", regex));
+		}
+
+		/**
+		 * Specify the reference to the {@link Field field} holding the regular expression to apply.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		@Contract("_ -> new")
+		public RegexMatch regexOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new RegexMatch(append("regex", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Optional specify the {@link AggregationExpression} evaluating to the regular expression to apply.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link RegexMatch}.
+		 */
+		@Contract("_ -> new")
+		public RegexMatch regexOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new RegexMatch(append("regex", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$regexMatch";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $replaceOne} which replaces the first instance of a search string in an
+	 * input string with a replacement string. <br />
+	 * <strong>NOTE:</strong> Requires MongoDB 4.4 or later.
+	 *
+	 * @author Divya Srivastava
+	 * @author Christoph Strobl
+	 * @since 3.4
+	 */
+	public static class ReplaceOne extends AbstractAggregationExpression {
+
+		protected ReplaceOne(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link ReplaceOne} using the given as {@literal input}.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		public static ReplaceOne value(String value) {
+
+			Assert.notNull(value, "Value must not be null");
+
+			return new ReplaceOne(Collections.singletonMap("input", value));
+		}
+
+		/**
+		 * Creates new {@link ReplaceOne} using the value of the provided {@link Field fieldReference} as {@literal input}
+		 * value.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		public static ReplaceOne valueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new ReplaceOne(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link ReplaceOne} using the result of the provided {@link AggregationExpression} as {@literal input}
+		 * value.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		public static ReplaceOne valueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new ReplaceOne(Collections.singletonMap("input", expression));
+		}
+
+		/**
+		 * The string to use to replace the first matched instance of {@code find} in input.
+		 *
+		 * @param replacement must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceOne replacement(String replacement) {
+
+			Assert.notNull(replacement, "Replacement must not be null");
+
+			return new ReplaceOne(append("replacement", replacement));
+		}
+
+		/**
+		 * Specifies the reference to the {@link Field field} holding the string to use to replace the first matched
+		 * instance of {@code find} in input.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceOne replacementOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new ReplaceOne(append("replacement", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Specifies the {@link AggregationExpression} evaluating to the string to use to replace the first matched instance
+		 * of {@code find} in {@code input}.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceOne replacementOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new ReplaceOne(append("replacement", expression));
+		}
+
+		/**
+		 * The string to search for within the given input field.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceOne find(String value) {
+
+			Assert.notNull(value, "Search string must not be null");
+
+			return new ReplaceOne(append("find", value));
+		}
+
+		/**
+		 * Specify the reference to the {@link Field field} holding the string to search for within the given input field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceOne findValueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "fieldReference must not be null");
+
+			return new ReplaceOne(append("find", fieldReference));
+		}
+
+		/**
+		 * Specify the {@link AggregationExpression} evaluating to the the string to search for within the given input
+		 * field.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceOne findValueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new ReplaceOne(append("find", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$replaceOne";
+		}
+	}
+
+	/**
+	 * {@link AggregationExpression} for {@code $replaceAll} which replaces all instances of a search string in an input
+	 * string with a replacement string. <br />
+	 * <strong>NOTE:</strong> Requires MongoDB 4.4 or later.
+	 *
+	 * @author Divya Srivastava
+	 * @author Christoph Strobl
+	 * @since 3.4
+	 */
+	public static class ReplaceAll extends AbstractAggregationExpression {
+
+		protected ReplaceAll(Object value) {
+			super(value);
+		}
+
+		/**
+		 * Creates new {@link ReplaceAll} using the given as {@literal input}.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link ReplaceOne}.
+		 */
+		public static ReplaceAll value(String value) {
+
+			Assert.notNull(value, "Value must not be null");
+
+			return new ReplaceAll(Collections.singletonMap("input", value));
+		}
+
+		/**
+		 * Creates new {@link ReplaceAll} using the value of the provided {@link Field fieldReference} as {@literal input}
+		 * value.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		public static ReplaceAll valueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new ReplaceAll(Collections.singletonMap("input", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Creates new {@link ReplaceAll} using the result of the provided {@link AggregationExpression} as {@literal input}
+		 * value.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		public static ReplaceAll valueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new ReplaceAll(Collections.singletonMap("input", expression));
+		}
+
+		/**
+		 * The string to use to replace the first matched instance of {@code find} in input.
+		 *
+		 * @param replacement must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceAll replacement(String replacement) {
+
+			Assert.notNull(replacement, "Replacement must not be null");
+
+			return new ReplaceAll(append("replacement", replacement));
+		}
+
+		/**
+		 * Specifies the reference to the {@link Field field} holding the string to use to replace the first matched
+		 * instance of {@code find} in input.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceAll replacementValueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "FieldReference must not be null");
+
+			return new ReplaceAll(append("replacement", Fields.field(fieldReference)));
+		}
+
+		/**
+		 * Specifies the {@link AggregationExpression} evaluating to the string to use to replace the first matched instance
+		 * of {@code find} in input.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceAll replacementValueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new ReplaceAll(append("replacement", expression));
+		}
+
+		/**
+		 * The string to search for within the given input field.
+		 *
+		 * @param value must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceAll find(String value) {
+
+			Assert.notNull(value, "Search string must not be null");
+
+			return new ReplaceAll(append("find", value));
+		}
+
+		/**
+		 * Specify the reference to the {@link Field field} holding the string to search for within the given input field.
+		 *
+		 * @param fieldReference must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceAll findValueOf(String fieldReference) {
+
+			Assert.notNull(fieldReference, "fieldReference must not be null");
+
+			return new ReplaceAll(append("find", fieldReference));
+		}
+
+		/**
+		 * Specify the {@link AggregationExpression} evaluating to the string to search for within the given input field.
+		 *
+		 * @param expression must not be {@literal null}.
+		 * @return new instance of {@link ReplaceAll}.
+		 */
+		@Contract("_ -> new")
+		public ReplaceAll findValueOf(AggregationExpression expression) {
+
+			Assert.notNull(expression, "Expression must not be null");
+
+			return new ReplaceAll(append("find", expression));
+		}
+
+		@Override
+		protected String getMongoMethod() {
+			return "$replaceAll";
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SystemVariable.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SystemVariable.java
new file mode 100644
index 0000000000..cc0296c900
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SystemVariable.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Describes the system variables available in MongoDB aggregation framework pipeline expressions.
+ *
+ * @author Thomas Darimont
+ * @author Christoph Strobl
+ * @see <a href="https://docs.mongodb.com/manual/reference/aggregation-variables">Aggregation Variables</a>.
+ */
+public enum SystemVariable implements AggregationVariable {
+
+	/**
+	 * Variable for the current datetime.
+	 *
+	 * @since 4.0
+	 */
+	NOW,
+
+	/**
+	 * Variable for the current timestamp.
+	 *
+	 * @since 4.0
+	 */
+	CLUSTER_TIME,
+
+	/**
+	 * Variable that references the root document.
+	 */
+	ROOT,
+
+	/**
+	 * Variable that references the start of the field path being processed.
+	 */
+	CURRENT,
+
+	/**
+	 * Variable that evaluates to a missing value.
+	 */
+	REMOVE,
+
+	/**
+	 * One of the allowed results of a {@literal $redact} expression
+	 *
+	 * @since 4.0
+	 */
+	DESCEND,
+
+	/**
+	 * One of the allowed results of a {@literal $redact} expression
+	 *
+	 * @since 4.0
+	 */
+	PRUNE,
+	/**
+	 * One of the allowed results of a {@literal $redact} expression
+	 *
+	 * @since 4.0
+	 */
+	KEEP,
+
+	/**
+	 * A variable that stores the metadata results of an Atlas Search query.
+	 *
+	 * @since 4.0
+	 */
+	SEARCH_META;
+
+	/**
+	 * Return {@literal true} if the given {@code fieldRef} denotes a well-known system variable, {@literal false}
+	 * otherwise.
+	 *
+	 * @param fieldRef may be {@literal null}.
+	 * @return {@literal true} if the given field refers to a {@link SystemVariable}.
+	 */
+	public static boolean isReferingToSystemVariable(@Nullable String fieldRef) {
+
+		String candidate = variableNameFrom(fieldRef);
+		if (candidate == null) {
+			return false;
+		}
+
+		candidate = candidate.startsWith(PREFIX) ? candidate.substring(2) : candidate;
+		for (SystemVariable value : values()) {
+			if (value.name().equals(candidate)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	@Override
+	public String toString() {
+		return PREFIX.concat(name());
+	}
+
+	@Override
+	public String getTarget() {
+		return toString();
+	}
+
+	static @Nullable String variableNameFrom(@Nullable String fieldRef) {
+
+		if (fieldRef == null || !fieldRef.startsWith(PREFIX) || fieldRef.length() <= 2) {
+			return null;
+		}
+
+		int indexOfFirstDot = fieldRef.indexOf('.');
+		return indexOfFirstDot == -1 ? fieldRef : fieldRef.substring(2, indexOfFirstDot);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContext.java
index 75a7ff41df..d2d49abf78 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,6 +21,9 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentPropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
@@ -29,7 +32,7 @@
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
+import org.springframework.data.util.Lazy;
 import org.springframework.util.Assert;
 
 /**
@@ -46,6 +49,8 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 	private final Class<?> type;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	private final QueryMapper mapper;
+	private final Lazy<MongoPersistentEntity<?>> entity;
+	private final FieldLookupPolicy lookupPolicy;
 
 	/**
 	 * Creates a new {@link TypeBasedAggregationOperationContext} for the given type, {@link MappingContext} and
@@ -57,60 +62,59 @@ public class TypeBasedAggregationOperationContext implements AggregationOperatio
 	 */
 	public TypeBasedAggregationOperationContext(Class<?> type,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext, QueryMapper mapper) {
+		this(type, mappingContext, mapper, FieldLookupPolicy.strict());
+	}
+
+	/**
+	 * Creates a new {@link TypeBasedAggregationOperationContext} for the given type, {@link MappingContext} and
+	 * {@link QueryMapper}.
+	 *
+	 * @param type must not be {@literal null}.
+	 * @param mappingContext must not be {@literal null}.
+	 * @param mapper must not be {@literal null}.
+	 * @param lookupPolicy must not be {@literal null}.
+	 * @since 4.3.1
+	 */
+	public TypeBasedAggregationOperationContext(Class<?> type,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext, QueryMapper mapper,
+			FieldLookupPolicy lookupPolicy) {
 
-		Assert.notNull(type, "Type must not be null!");
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
-		Assert.notNull(mapper, "QueryMapper must not be null!");
+		Assert.notNull(type, "Type must not be null");
+		Assert.notNull(mappingContext, "MappingContext must not be null");
+		Assert.notNull(mapper, "QueryMapper must not be null");
+		Assert.notNull(lookupPolicy, "FieldLookupPolicy must not be null");
 
 		this.type = type;
 		this.mappingContext = mappingContext;
 		this.mapper = mapper;
+		this.entity = Lazy.of(() -> mappingContext.getPersistentEntity(type));
+		this.lookupPolicy = lookupPolicy;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document)
-	 */
 	@Override
 	public Document getMappedObject(Document document) {
 		return getMappedObject(document, type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getMappedObject(org.bson.Document, java.lang.Class)
-	 */
 	@Override
 	public Document getMappedObject(Document document, @Nullable Class<?> type) {
 		return mapper.getMappedObject(document, type != null ? mappingContext.getPersistentEntity(type) : null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(org.springframework.data.mongodb.core.aggregation.Field)
-	 */
 	@Override
 	public FieldReference getReference(Field field) {
 		return getReferenceFor(field);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getReference(java.lang.String)
-	 */
 	@Override
 	public FieldReference getReference(String name) {
 		return getReferenceFor(field(name));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperationContext#getFields(java.lang.Class)
-	 */
 	@Override
 	public Fields getFields(Class<?> type) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(type);
 
@@ -118,17 +122,65 @@ public Fields getFields(Class<?> type) {
 			return AggregationOperationContext.super.getFields(type);
 		}
 
-		List<String> fields = new ArrayList<>();
+		List<Field> fields = new ArrayList<>();
 
 		for (MongoPersistentProperty property : entity) {
-			fields.add(property.getName());
+			fields.add(Fields.field(property.getName(), property.getFieldName()));
 		}
 
-		return Fields.fields(fields.toArray(new String[0]));
+		return Fields.from(fields.toArray(new Field[0]));
+	}
+
+	@Override
+	@Deprecated(since = "4.3.1", forRemoval = true)
+	public AggregationOperationContext continueOnMissingFieldReference() {
+		return continueOnMissingFieldReference(type);
+	}
+
+	/**
+	 * This toggle allows the {@link AggregationOperationContext context} to use any given field name without checking for
+	 * its existence. Typically, the {@link AggregationOperationContext} fails when referencing unknown fields, those that
+	 * are not present in one of the previous stages or the input source, throughout the pipeline.
+	 *
+	 * @param type The domain type to map fields to.
+	 * @return a more relaxed {@link AggregationOperationContext}.
+	 * @since 3.1
+	 * @see RelaxedTypeBasedAggregationOperationContext
+	 */
+	public AggregationOperationContext continueOnMissingFieldReference(Class<?> type) {
+		return new TypeBasedAggregationOperationContext(type, mappingContext, mapper, FieldLookupPolicy.relaxed());
+	}
+
+	@Override
+	public AggregationOperationContext expose(ExposedFields fields) {
+		return new ExposedFieldsAggregationOperationContext(fields, this, lookupPolicy);
+	}
+
+	@Override
+	public AggregationOperationContext inheritAndExpose(ExposedFields fields) {
+		return new InheritingExposedFieldsAggregationOperationContext(fields, this, lookupPolicy);
 	}
 
 	protected FieldReference getReferenceFor(Field field) {
 
+		try {
+			return doGetFieldReference(field);
+		} catch (MappingException e) {
+
+			if (lookupPolicy.isStrict()) {
+				throw e;
+			}
+
+			return new DirectFieldReference(new ExposedField(field, true));
+		}
+	}
+
+	private DirectFieldReference doGetFieldReference(Field field) {
+
+		if (entity.getNullable() == null || AggregationVariable.isVariable(field)) {
+			return new DirectFieldReference(new ExposedField(field, true));
+		}
+
 		PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext
 				.getPersistentPropertyPath(field.getTarget(), type);
 		Field mappedField = field(field.getName(),
@@ -136,4 +188,13 @@ protected FieldReference getReferenceFor(Field field) {
 
 		return new DirectFieldReference(new ExposedField(mappedField, true));
 	}
+
+	public Class<?> getType() {
+		return type;
+	}
+
+	@Override
+	public CodecRegistry getCodecRegistry() {
+		return this.mapper.getConverter().getCodecRegistry();
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java
index 03c6660a71..432a0c6c6b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/TypedAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,7 +61,7 @@ public TypedAggregation(Class<I> inputType, List<AggregationOperation> operation
 
 		super(operations, options);
 
-		Assert.notNull(inputType, "Input type must not be null!");
+		Assert.notNull(inputType, "Input type must not be null");
 		this.inputType = inputType;
 	}
 
@@ -74,13 +74,9 @@ public Class<I> getInputType() {
 		return inputType;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.Aggregation#withOptions(org.springframework.data.mongodb.core.aggregation.AggregationOptions)
-	 */
 	public TypedAggregation<I> withOptions(AggregationOptions options) {
 
-		Assert.notNull(options, "AggregationOptions must not be null.");
-		return new TypedAggregation<I>(inputType, operations, options);
+		Assert.notNull(options, "AggregationOptions must not be null");
+		return new TypedAggregation<I>(inputType, pipeline.getOperations(), options);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperation.java
new file mode 100644
index 0000000000..c93c1bad9e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperation.java
@@ -0,0 +1,156 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * The <a href="https://docs.mongodb.com/master/reference/operator/aggregation/unionWith/">$unionWith</a> aggregation
+ * stage (available since MongoDB 4.4) performs a union of two collections by combining pipeline results, potentially
+ * containing duplicates, into a single result set that is handed over to the next stage. <br />
+ * In order to remove duplicates it is possible to append a {@link GroupOperation} right after
+ * {@link UnionWithOperation}.
+ * <br />
+ * If the {@link UnionWithOperation} uses a
+ * <a href="https://docs.mongodb.com/master/reference/operator/aggregation/unionWith/#unionwith-pipeline">pipeline</a>
+ * to process documents, field names within the pipeline will be treated as is. In order to map domain type property
+ * names to actual field names (considering potential {@link org.springframework.data.mongodb.core.mapping.Field}
+ * annotations) make sure the enclosing aggregation is a {@link TypedAggregation} and provide the target type for the
+ * {@code $unionWith} stage via {@link #mapFieldsTo(Class)}.
+ *
+ * @author Christoph Strobl
+ * @see <a href="https://docs.mongodb.com/master/reference/operator/aggregation/unionWith/">Aggregation Pipeline Stage:
+ *      $unionWith</a>
+ * @since 3.1
+ */
+public class UnionWithOperation implements AggregationOperation {
+
+	private final String collection;
+
+	private final @Nullable AggregationPipeline pipeline;
+
+	private final @Nullable Class<?> domainType;
+
+	public UnionWithOperation(String collection, @Nullable AggregationPipeline pipeline, @Nullable Class<?> domainType) {
+
+		Assert.notNull(collection, "Collection must not be null");
+
+		this.collection = collection;
+		this.pipeline = pipeline;
+		this.domainType = domainType;
+	}
+
+	/**
+	 * Set the name of the collection from which pipeline results should be included in the result set.<br />
+	 * The collection name is used to set the {@code coll} parameter of {@code $unionWith}.
+	 *
+	 * @param collection the MongoDB collection name. Must not be {@literal null}.
+	 * @return new instance of {@link UnionWithOperation}.
+	 * @throws IllegalArgumentException if the required argument is {@literal null}.
+	 */
+	public static UnionWithOperation unionWith(String collection) {
+		return new UnionWithOperation(collection, null, null);
+	}
+
+	/**
+	 * Set the {@link AggregationPipeline} to apply to the specified collection. The pipeline corresponds to the optional
+	 * {@code pipeline} field of the {@code $unionWith} aggregation stage and is used to compute the documents going into
+	 * the result set.
+	 *
+	 * @param pipeline the {@link AggregationPipeline} that computes the documents. Must not be {@literal null}.
+	 * @return new instance of {@link UnionWithOperation}.
+	 * @throws IllegalArgumentException if the required argument is {@literal null}.
+	 */
+	public UnionWithOperation pipeline(AggregationPipeline pipeline) {
+		return new UnionWithOperation(collection, pipeline, domainType);
+	}
+
+	/**
+	 * Set the aggregation pipeline stages to apply to the specified collection. The pipeline corresponds to the optional
+	 * {@code pipeline} field of the {@code $unionWith} aggregation stage and is used to compute the documents going into
+	 * the result set.
+	 *
+	 * @param aggregationStages the aggregation pipeline stages that compute the documents. Must not be {@literal null}.
+	 * @return new instance of {@link UnionWithOperation}.
+	 * @throws IllegalArgumentException if the required argument is {@literal null}.
+	 */
+	public UnionWithOperation pipeline(List<AggregationOperation> aggregationStages) {
+		return new UnionWithOperation(collection, new AggregationPipeline(aggregationStages), domainType);
+	}
+
+	/**
+	 * Set the aggregation pipeline stages to apply to the specified collection. The pipeline corresponds to the optional
+	 * {@code pipeline} field of the {@code $unionWith} aggregation stage and is used to compute the documents going into
+	 * the result set.
+	 *
+	 * @param aggregationStages the aggregation pipeline stages that compute the documents. Must not be {@literal null}.
+	 * @return new instance of {@link UnionWithOperation}.
+	 * @throws IllegalArgumentException if the required argument is {@literal null}.
+	 */
+	public UnionWithOperation pipeline(AggregationOperation... aggregationStages) {
+		return new UnionWithOperation(collection, new AggregationPipeline(Arrays.asList(aggregationStages)), domainType);
+	}
+
+	/**
+	 * Set domain type used for field name mapping of property references used by the {@link AggregationPipeline}.
+	 * Remember to also use a {@link TypedAggregation} in the outer pipeline.<br />
+	 * If not set, field names used within {@link AggregationOperation pipeline operations} are taken as is.
+	 *
+	 * @param domainType the domain type to map field names used in pipeline operations to. Must not be {@literal null}.
+	 * @return new instance of {@link UnionWithOperation}.
+	 * @throws IllegalArgumentException if the required argument is {@literal null}.
+	 */
+	public UnionWithOperation mapFieldsTo(Class<?> domainType) {
+
+		Assert.notNull(domainType, "DomainType must not be null");
+		return new UnionWithOperation(collection, pipeline, domainType);
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+
+		Document $unionWith = new Document("coll", collection);
+		if (pipeline == null || pipeline.isEmpty()) {
+			return new Document(getOperator(), $unionWith);
+		}
+
+		$unionWith.append("pipeline", pipeline.toDocuments(computeContext(context)));
+		return new Document(getOperator(), $unionWith);
+	}
+
+	private AggregationOperationContext computeContext(AggregationOperationContext source) {
+
+		if (source instanceof TypeBasedAggregationOperationContext aggregationOperationContext) {
+			return aggregationOperationContext.continueOnMissingFieldReference(domainType != null ? domainType : Object.class);
+		}
+
+		if (source instanceof ExposedFieldsAggregationOperationContext aggregationOperationContext) {
+			return computeContext(aggregationOperationContext.getRootContext());
+		}
+
+		return source;
+	}
+
+	@Override
+	public String getOperator() {
+		return "$unionWith";
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java
index f2db18ad4e..0bcc192ded 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnsetOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import org.bson.Document;
 import org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
@@ -30,7 +31,7 @@
  * Removes fields from documents.
  *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
  * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/unset/">MongoDB Aggregation Framework:
  *      $unset</a>
  */
@@ -40,13 +41,13 @@ public class UnsetOperation implements InheritsFieldsAggregationOperation {
 
 	/**
 	 * Create new instance of {@link UnsetOperation}.
-	 * 
+	 *
 	 * @param fields must not be {@literal null}.
 	 */
 	public UnsetOperation(Collection<Object> fields) {
 
-		Assert.notNull(fields, "Fields must not be null!");
-		Assert.noNullElements(fields, "Fields must not contain null values.");
+		Assert.notNull(fields, "Fields must not be null");
+		Assert.noNullElements(fields, "Fields must not contain null values");
 
 		this.fields = fields;
 	}
@@ -67,6 +68,7 @@ public static UnsetOperation unset(String... fields) {
 	 * @param fields must not be {@literal null}.
 	 * @return new instance of {@link UnsetOperation}.
 	 */
+	@Contract("_ -> new")
 	public UnsetOperation and(String... fields) {
 
 		List<Object> target = new ArrayList<>(this.fields);
@@ -80,6 +82,7 @@ public UnsetOperation and(String... fields) {
 	 * @param fields must not be {@literal null}.
 	 * @return new instance of {@link UnsetOperation}.
 	 */
+	@Contract("_ -> new")
 	public UnsetOperation and(Field... fields) {
 
 		List<Object> target = new ArrayList<>(this.fields);
@@ -87,10 +90,6 @@ public UnsetOperation and(Field... fields) {
 		return new UnsetOperation(target);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *  @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 		return ExposedFields.from();
@@ -100,8 +99,8 @@ Collection<String> removedFieldNames() {
 
 		List<String> fieldNames = new ArrayList<>(fields.size());
 		for (Object it : fields) {
-			if (it instanceof Field) {
-				fieldNames.add(((Field) it).getName());
+			if (it instanceof Field field) {
+				fieldNames.add(field.getName());
 			} else {
 				fieldNames.add(it.toString());
 			}
@@ -109,33 +108,34 @@ Collection<String> removedFieldNames() {
 		return fieldNames;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *  @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
 		if (fields.size() == 1) {
-			return new Document("$unset", computeFieldName(fields.iterator().next(), context));
+			return new Document(getOperator(), computeFieldName(fields.iterator().next(), context));
 		}
 
-		return new Document("$unset",
+		return new Document(getOperator(),
 				fields.stream().map(it -> computeFieldName(it, context)).collect(Collectors.toList()));
 	}
 
+	@Override
+	public String getOperator() {
+		return "$unset";
+	}
+
 	private Object computeFieldName(Object field, AggregationOperationContext context) {
 
-		if (field instanceof Field) {
-			return context.getReference((Field) field).getRaw();
+		if (field instanceof Field fieldObject) {
+			return context.getReference(fieldObject).getRaw();
 		}
 
-		if (field instanceof AggregationExpression) {
-			return ((AggregationExpression) field).toDocument(context);
+		if (field instanceof AggregationExpression aggregationExpression) {
+			return aggregationExpression.toDocument(context);
 		}
 
-		if (field instanceof String) {
-			return context.getReference((String) field).getRaw();
+		if (field instanceof String stringValue) {
+			return context.getReference(stringValue).getRaw();
 		}
 
 		return field;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java
index 0f9aece97d..cc0552cd1c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/UnwindOperation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,9 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -31,7 +32,8 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  * @since 1.3
- * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/unwind/">MongoDB Aggregation Framework: $unwind</a>
+ * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/unwind/">MongoDB Aggregation Framework:
+ *      $unwind</a>
  */
 public class UnwindOperation
 		implements AggregationOperation, FieldsExposingAggregationOperation.InheritsFieldsAggregationOperation {
@@ -58,7 +60,7 @@ public UnwindOperation(Field field) {
 	 * @since 1.10
 	 */
 	public UnwindOperation(Field field, boolean preserveNullAndEmptyArrays) {
-		Assert.notNull(field, "Field must not be null!");
+		Assert.notNull(field, "Field must not be null");
 
 		this.field = new ExposedField(field, true);
 		this.arrayIndex = null;
@@ -76,25 +78,21 @@ public UnwindOperation(Field field, boolean preserveNullAndEmptyArrays) {
 	 */
 	public UnwindOperation(Field field, Field arrayIndex, boolean preserveNullAndEmptyArrays) {
 
-		Assert.notNull(field, "Field must not be null!");
-		Assert.notNull(arrayIndex, "ArrayIndex must not be null!");
+		Assert.notNull(field, "Field must not be null");
+		Assert.notNull(arrayIndex, "ArrayIndex must not be null");
 
 		this.field = new ExposedField(field, true);
 		this.arrayIndex = new ExposedField(arrayIndex, true);
 		this.preserveNullAndEmptyArrays = preserveNullAndEmptyArrays;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-	 */
 	@Override
 	public Document toDocument(AggregationOperationContext context) {
 
 		String path = context.getReference(field).toString();
 
 		if (!preserveNullAndEmptyArrays && arrayIndex == null) {
-			return new Document("$unwind", path);
+			return new Document(getOperator(), path);
 		}
 
 		Document unwindArgs = new Document();
@@ -104,13 +102,14 @@ public Document toDocument(AggregationOperationContext context) {
 		}
 		unwindArgs.put("preserveNullAndEmptyArrays", preserveNullAndEmptyArrays);
 
-		return new Document("$unwind", unwindArgs);
+		return new Document(getOperator(), unwindArgs);
+	}
+
+	@Override
+	public String getOperator() {
+		return "$unwind";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.aggregation.FieldsExposingAggregationOperation#getFields()
-	 */
 	@Override
 	public ExposedFields getFields() {
 		return arrayIndex != null ? ExposedFields.from(arrayIndex) : ExposedFields.from();
@@ -130,7 +129,7 @@ public static PathBuilder newUnwind() {
 	 * @author Mark Paluch
 	 * @since 1.10
 	 */
-	public static interface PathBuilder {
+	public interface PathBuilder {
 
 		/**
 		 * @param path the path to unwind, must not be {@literal null} or empty.
@@ -143,7 +142,7 @@ public static interface PathBuilder {
 	 * @author Mark Paluch
 	 * @since 1.10
 	 */
-	public static interface IndexBuilder {
+	public interface IndexBuilder {
 
 		/**
 		 * Exposes the array index as {@code field}.
@@ -161,7 +160,7 @@ public static interface IndexBuilder {
 		EmptyArraysBuilder noArrayIndex();
 	}
 
-	public static interface EmptyArraysBuilder {
+	public interface EmptyArraysBuilder {
 
 		/**
 		 * Output documents if the array is null or empty.
@@ -200,13 +199,11 @@ public static PathBuilder newBuilder() {
 			return new UnwindOperationBuilder();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.EmptyArraysBuilder#preserveNullAndEmptyArrays()
-		 */
 		@Override
 		public UnwindOperation preserveNullAndEmptyArrays() {
 
+			Assert.notNull(field, "Path needs to be set first");
+
 			if (arrayIndex != null) {
 				return new UnwindOperation(field, arrayIndex, true);
 			}
@@ -214,13 +211,11 @@ public UnwindOperation preserveNullAndEmptyArrays() {
 			return new UnwindOperation(field, true);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.EmptyArraysBuilder#skipNullAndEmptyArrays()
-		 */
 		@Override
 		public UnwindOperation skipNullAndEmptyArrays() {
 
+			Assert.notNull(field, "Path needs to be set first");
+
 			if (arrayIndex != null) {
 				return new UnwindOperation(field, arrayIndex, false);
 			}
@@ -228,37 +223,28 @@ public UnwindOperation skipNullAndEmptyArrays() {
 			return new UnwindOperation(field, false);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.IndexBuilder#arrayIndex(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> this")
 		public EmptyArraysBuilder arrayIndex(String field) {
 
-			Assert.hasText(field, "'ArrayIndex' must not be null or empty!");
+			Assert.hasText(field, "'ArrayIndex' must not be null or empty");
 			arrayIndex = Fields.field(field);
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.IndexBuilder#noArrayIndex()
-		 */
 		@Override
+		@Contract("-> this")
 		public EmptyArraysBuilder noArrayIndex() {
 
 			arrayIndex = null;
 			return this;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.UnwindOperation.PathBuilder#path(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> this")
 		public UnwindOperationBuilder path(String path) {
 
-			Assert.hasText(path, "'Path' must not be null or empty!");
+			Assert.hasText(path, "'Path' must not be null or empty");
 			field = Fields.field(path);
 			return this;
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java
index 4daef44e6b..b5a9ca0f21 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VariableOperators.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,14 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -91,9 +90,9 @@ public static class Map implements AggregationExpression {
 
 		private Map(Object sourceArray, String itemVariableName, AggregationExpression functionToApply) {
 
-			Assert.notNull(sourceArray, "SourceArray must not be null!");
-			Assert.notNull(itemVariableName, "ItemVariableName must not be null!");
-			Assert.notNull(functionToApply, "FunctionToApply must not be null!");
+			Assert.notNull(sourceArray, "SourceArray must not be null");
+			Assert.notNull(itemVariableName, "ItemVariableName must not be null");
+			Assert.notNull(functionToApply, "FunctionToApply must not be null");
 
 			this.sourceArray = sourceArray;
 			this.itemVariableName = itemVariableName;
@@ -109,21 +108,21 @@ private Map(Object sourceArray, String itemVariableName, AggregationExpression f
 		 */
 		public static AsBuilder itemsOf(final String fieldReference) {
 
-			Assert.notNull(fieldReference, "FieldReference must not be null!");
+			Assert.notNull(fieldReference, "FieldReference must not be null");
 
 			return new AsBuilder() {
 
 				@Override
 				public FunctionBuilder as(final String variableName) {
 
-					Assert.notNull(variableName, "VariableName must not be null!");
+					Assert.notNull(variableName, "VariableName must not be null");
 
 					return new FunctionBuilder() {
 
 						@Override
 						public Map andApply(final AggregationExpression expression) {
 
-							Assert.notNull(expression, "AggregationExpression must not be null!");
+							Assert.notNull(expression, "AggregationExpression must not be null");
 							return new Map(Fields.field(fieldReference), variableName, expression);
 						}
 					};
@@ -141,21 +140,21 @@ public Map andApply(final AggregationExpression expression) {
 		 */
 		public static AsBuilder itemsOf(final AggregationExpression source) {
 
-			Assert.notNull(source, "AggregationExpression must not be null!");
+			Assert.notNull(source, "AggregationExpression must not be null");
 
 			return new AsBuilder() {
 
 				@Override
 				public FunctionBuilder as(final String variableName) {
 
-					Assert.notNull(variableName, "VariableName must not be null!");
+					Assert.notNull(variableName, "VariableName must not be null");
 
 					return new FunctionBuilder() {
 
 						@Override
 						public Map andApply(final AggregationExpression expression) {
 
-							Assert.notNull(expression, "AggregationExpression must not be null!");
+							Assert.notNull(expression, "AggregationExpression must not be null");
 							return new Map(source, variableName, expression);
 						}
 					};
@@ -163,9 +162,6 @@ public Map andApply(final AggregationExpression expression) {
 			};
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
 		public Document toDocument(final AggregationOperationContext context) {
 			return toMap(ExposedFields.synthetic(Fields.fields(itemVariableName)), context);
@@ -174,12 +170,11 @@ public Document toDocument(final AggregationOperationContext context) {
 		private Document toMap(ExposedFields exposedFields, AggregationOperationContext context) {
 
 			Document map = new Document();
-			InheritingExposedFieldsAggregationOperationContext operationContext = new InheritingExposedFieldsAggregationOperationContext(
-					exposedFields, context);
+			AggregationOperationContext operationContext = context.inheritAndExpose(exposedFields);
 
 			Document input;
-			if (sourceArray instanceof Field) {
-				input = new Document("input", context.getReference((Field) sourceArray).toString());
+			if (sourceArray instanceof Field field) {
+				input = new Document("input", context.getReference(field).toString());
 			} else {
 				input = new Document("input", ((AggregationExpression) sourceArray).toDocument(context));
 			}
@@ -227,30 +222,42 @@ public interface FunctionBuilder {
 	public static class Let implements AggregationExpression {
 
 		private final List<ExpressionVariable> vars;
-		private final AggregationExpression expression;
 
-		private Let(List<ExpressionVariable> vars, AggregationExpression expression) {
+		private final @Nullable AggregationExpression expression;
+
+		private Let(List<ExpressionVariable> vars, @Nullable AggregationExpression expression) {
 
 			this.vars = vars;
 			this.expression = expression;
 		}
 
+		/**
+		 * Create a new {@link Let} holding just the given {@literal variables}.
+		 *
+		 * @param variables must not be {@literal null}.
+		 * @return new instance of {@link Let}.
+		 * @since 4.1
+		 */
+		public static Let just(ExpressionVariable... variables) {
+			return new Let(List.of(variables), null);
+		}
+
 		/**
 		 * Start creating new {@link Let} by defining the variables for {@code $vars}.
 		 *
 		 * @param variables must not be {@literal null}.
 		 * @return
 		 */
-		public static LetBuilder define(final Collection<ExpressionVariable> variables) {
+		public static LetBuilder define(Collection<ExpressionVariable> variables) {
 
-			Assert.notNull(variables, "Variables must not be null!");
+			Assert.notNull(variables, "Variables must not be null");
 
 			return new LetBuilder() {
 
 				@Override
-				public Let andApply(final AggregationExpression expression) {
+				public Let andApply(AggregationExpression expression) {
 
-					Assert.notNull(expression, "Expression must not be null!");
+					Assert.notNull(expression, "Expression must not be null");
 					return new Let(new ArrayList<ExpressionVariable>(variables), expression);
 				}
 			};
@@ -262,19 +269,10 @@ public Let andApply(final AggregationExpression expression) {
 		 * @param variables must not be {@literal null}.
 		 * @return
 		 */
-		public static LetBuilder define(final ExpressionVariable... variables) {
-
-			Assert.notNull(variables, "Variables must not be null!");
-
-			return new LetBuilder() {
-
-				@Override
-				public Let andApply(final AggregationExpression expression) {
+		public static LetBuilder define(ExpressionVariable... variables) {
 
-					Assert.notNull(expression, "Expression must not be null!");
-					return new Let(Arrays.asList(variables), expression);
-				}
-			};
+			Assert.notNull(variables, "Variables must not be null");
+			return define(List.of(variables));
 		}
 
 		public interface LetBuilder {
@@ -286,17 +284,15 @@ public interface LetBuilder {
 			 * @return
 			 */
 			Let andApply(AggregationExpression expression);
+
 		}
 
-		/* (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.aggregation.AggregationExpression#toDocument(org.springframework.data.mongodb.core.aggregation.AggregationOperationContext)
-		 */
 		@Override
-		public Document toDocument(final AggregationOperationContext context) {
+		public Document toDocument(AggregationOperationContext context) {
 			return toLet(ExposedFields.synthetic(Fields.fields(getVariableNames())), context);
 		}
 
-		private String[] getVariableNames() {
+		String[] getVariableNames() {
 
 			String[] varNames = new String[this.vars.size()];
 			for (int i = 0; i < this.vars.size(); i++) {
@@ -310,26 +306,33 @@ private Document toLet(ExposedFields exposedFields, AggregationOperationContext
 
 			Document letExpression = new Document();
 			Document mappedVars = new Document();
-			InheritingExposedFieldsAggregationOperationContext operationContext = new InheritingExposedFieldsAggregationOperationContext(
-					exposedFields, context);
 
 			for (ExpressionVariable var : this.vars) {
 				mappedVars.putAll(getMappedVariable(var, context));
 			}
 
 			letExpression.put("vars", mappedVars);
-			letExpression.put("in", getMappedIn(operationContext));
+			if (expression != null) {
+
+				AggregationOperationContext operationContext = context.inheritAndExpose(exposedFields);
+				letExpression.put("in", getMappedIn(operationContext));
+			}
 
 			return new Document("$let", letExpression);
 		}
 
 		private Document getMappedVariable(ExpressionVariable var, AggregationOperationContext context) {
 
-			return new Document(var.variableName,
-					var.expression instanceof AggregationExpression ? ((AggregationExpression) var.expression).toDocument(context)
-							: var.expression);
+			if (var.expression instanceof AggregationExpression expression) {
+				return new Document(var.variableName, expression.toDocument(context));
+			}
+			if (var.expression instanceof Field field) {
+				return new Document(var.variableName, context.getReference(field).toString());
+			}
+			return new Document(var.variableName, var.expression);
 		}
 
+		@SuppressWarnings("NullAway")
 		private Object getMappedIn(AggregationOperationContext context) {
 			return expression.toDocument(new NestedDelegatingExpressionAggregationOperationContext(context,
 					this.vars.stream().map(var -> Fields.field(var.variableName)).collect(Collectors.toList())));
@@ -363,7 +366,7 @@ private ExpressionVariable(@Nullable String variableName, @Nullable Object expre
 			 */
 			public static ExpressionVariable newVariable(String variableName) {
 
-				Assert.notNull(variableName, "VariableName must not be null!");
+				Assert.notNull(variableName, "VariableName must not be null");
 				return new ExpressionVariable(variableName, null);
 			}
 
@@ -375,10 +378,14 @@ public static ExpressionVariable newVariable(String variableName) {
 			 */
 			public ExpressionVariable forExpression(AggregationExpression expression) {
 
-				Assert.notNull(expression, "Expression must not be null!");
+				Assert.notNull(expression, "Expression must not be null");
 				return new ExpressionVariable(variableName, expression);
 			}
 
+			public ExpressionVariable forField(String fieldRef) {
+				return new ExpressionVariable(variableName, Fields.field(fieldRef));
+			}
+
 			/**
 			 * Create a new {@link ExpressionVariable} with current name and given {@literal expressionObject}.
 			 *
@@ -387,7 +394,7 @@ public ExpressionVariable forExpression(AggregationExpression expression) {
 			 */
 			public ExpressionVariable forExpression(Document expressionObject) {
 
-				Assert.notNull(expressionObject, "Expression must not be null!");
+				Assert.notNull(expressionObject, "Expression must not be null");
 				return new ExpressionVariable(variableName, expressionObject);
 			}
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperation.java
new file mode 100644
index 0000000000..de266a3064
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperation.java
@@ -0,0 +1,528 @@
+/*
+ * Copyright 2024 the original author 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.aggregation;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import org.bson.BinaryVector;
+import org.bson.Document;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.mongodb.core.mapping.MongoVector;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * Performs a semantic search on data in your Atlas cluster. This stage is only available for Atlas Vector Search.
+ * Vector data must be less than or equal to 4096 dimensions in width.
+ * <h3>Limitations</h3> You cannot use this stage together with:
+ * <ul>
+ * <li>{@link org.springframework.data.mongodb.core.aggregation.LookupOperation Lookup} stages</li>
+ * <li>{@link org.springframework.data.mongodb.core.aggregation.FacetOperation Facet} stage</li>
+ * </ul>
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class VectorSearchOperation implements AggregationOperation {
+
+	private final SearchType searchType;
+	private final @Nullable CriteriaDefinition filter;
+	private final String indexName;
+	private final Limit limit;
+	private final @Nullable Integer numCandidates;
+	private final QueryPaths path;
+	private final Vector vector;
+	private final @Nullable String score;
+	private final @Nullable Consumer<Criteria> scoreCriteria;
+
+	private VectorSearchOperation(SearchType searchType, @Nullable CriteriaDefinition filter, String indexName,
+			Limit limit, @Nullable Integer numCandidates, QueryPaths path, Vector vector, @Nullable String searchScore,
+			@Nullable Consumer<Criteria> scoreCriteria) {
+
+		this.searchType = searchType;
+		this.filter = filter;
+		this.indexName = indexName;
+		this.limit = limit;
+		this.numCandidates = numCandidates;
+		this.path = path;
+		this.vector = vector;
+		this.score = searchScore;
+		this.scoreCriteria = scoreCriteria;
+	}
+
+	VectorSearchOperation(String indexName, QueryPaths path, Limit limit, Vector vector) {
+		this(SearchType.DEFAULT, null, indexName, limit, null, path, vector, null, null);
+	}
+
+	/**
+	 * Entrypoint to build a {@link VectorSearchOperation} starting from the {@code index} name to search. Atlas Vector
+	 * Search doesn't return results if you misspell the index name or if the specified index doesn't already exist on the
+	 * cluster.
+	 *
+	 * @param index must not be {@literal null} or empty.
+	 * @return new instance of {@link VectorSearchOperation.PathContributor}.
+	 */
+	public static PathContributor search(String index) {
+		return new VectorSearchBuilder().index(index);
+	}
+
+	/**
+	 * Configure the search type to use. {@link SearchType#ENN} leads to an exact search while {@link SearchType#ANN} uses
+	 * {@code exact=false}.
+	 *
+	 * @param searchType must not be null.
+	 * @return a new {@link VectorSearchOperation} with {@link SearchType} applied.
+	 */
+	@Contract("_ -> new")
+	public VectorSearchOperation searchType(SearchType searchType) {
+		return new VectorSearchOperation(searchType, filter, indexName, limit, numCandidates, path, vector, score,
+				scoreCriteria);
+	}
+
+	/**
+	 * Criteria expression that compares an indexed field with a boolean, date, objectId, number (not decimals), string,
+	 * or UUID to use as a pre-filter.
+	 * <p>
+	 * Atlas Vector Search supports only the filters for the following MQL match expressions:
+	 * <ul>
+	 * <li>$gt</li>
+	 * <li>$lt</li>
+	 * <li>$gte</li>
+	 * <li>$lte</li>
+	 * <li>$eq</li>
+	 * <li>$ne</li>
+	 * <li>$in</li>
+	 * <li>$nin</li>
+	 * <li>$nor</li>
+	 * <li>$not</li>
+	 * <li>$and</li>
+	 * <li>$or</li>
+	 * </ul>
+	 *
+	 * @param filter must not be null.
+	 * @return a new {@link VectorSearchOperation} with {@link CriteriaDefinition} applied.
+	 */
+	@Contract("_ -> new")
+	public VectorSearchOperation filter(CriteriaDefinition filter) {
+		return new VectorSearchOperation(searchType, filter, indexName, limit, numCandidates, path, vector, score,
+				scoreCriteria);
+	}
+
+	/**
+	 * Criteria expression that compares an indexed field with a boolean, date, objectId, number (not decimals), string,
+	 * or UUID to use as a pre-filter.
+	 * <p>
+	 * Atlas Vector Search supports only the filters for the following MQL match expressions:
+	 * <ul>
+	 * <li>$gt</li>
+	 * <li>$lt</li>
+	 * <li>$gte</li>
+	 * <li>$lte</li>
+	 * <li>$eq</li>
+	 * <li>$ne</li>
+	 * <li>$in</li>
+	 * <li>$nin</li>
+	 * <li>$nor</li>
+	 * <li>$not</li>
+	 * <li>$and</li>
+	 * <li>$or</li>
+	 * </ul>
+	 *
+	 * @param filter must not be null.
+	 * @return a new {@link VectorSearchOperation} with {@link CriteriaDefinition} applied.
+	 */
+	@Contract("_ -> new")
+	public VectorSearchOperation filter(Document filter) {
+
+		return filter(new CriteriaDefinition() {
+			@Override
+			public Document getCriteriaObject() {
+				return filter;
+			}
+
+			@Nullable
+			@Override
+			public String getKey() {
+				return null;
+			}
+		});
+	}
+
+	/**
+	 * Number of nearest neighbors to use during the search. Value must be less than or equal to (<=) {@code 10000}. You
+	 * can't specify a number less than the number of documents to return (limit). This field is required if
+	 * {@link #searchType(SearchType)} is {@link SearchType#ANN} or {@link SearchType#DEFAULT}.
+	 *
+	 * @param numCandidates number of nearest neighbors to use during the search
+	 * @return a new {@link VectorSearchOperation} with {@code numCandidates} applied.
+	 */
+	@Contract("_ -> new")
+	public VectorSearchOperation numCandidates(int numCandidates) {
+		return new VectorSearchOperation(searchType, filter, indexName, limit, numCandidates, path, vector, score,
+				scoreCriteria);
+	}
+
+	/**
+	 * Add a {@link AddFieldsOperation} stage including the search score using {@code score} as field name.
+	 *
+	 * @return a new {@link VectorSearchOperation} with search score applied.
+	 * @see #withSearchScore(String)
+	 */
+	@Contract("-> new")
+	public VectorSearchOperation withSearchScore() {
+		return withSearchScore("score");
+	}
+
+	/**
+	 * Add a {@link AddFieldsOperation} stage including the search score using {@code scoreFieldName} as field name.
+	 *
+	 * @param scoreFieldName name of the score field.
+	 * @return a new {@link VectorSearchOperation} with {@code scoreFieldName} applied.
+	 * @see #withSearchScore()
+	 */
+	@Contract("_ -> new")
+	public VectorSearchOperation withSearchScore(String scoreFieldName) {
+		return new VectorSearchOperation(searchType, filter, indexName, limit, numCandidates, path, vector, scoreFieldName,
+				scoreCriteria);
+	}
+
+	/**
+	 * Add a {@link MatchOperation} stage targeting the score field name. Implies that the score field is present by
+	 * either reusing a previous {@link AddFieldsOperation} from {@link #withSearchScore()} or
+	 * {@link #withSearchScore(String)} or by adding a new {@link AddFieldsOperation} stage.
+	 *
+	 * @return a new {@link VectorSearchOperation} with search score filter applied.
+	 */
+	@Contract("_ -> new")
+	public VectorSearchOperation withFilterBySore(Consumer<Criteria> score) {
+		return new VectorSearchOperation(searchType, filter, indexName, limit, numCandidates, path, vector,
+				StringUtils.hasText(this.score) ? this.score : "score", score);
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+
+		Document $vectorSearch = new Document();
+
+		if (searchType != null && !searchType.equals(SearchType.DEFAULT)) {
+			$vectorSearch.append("exact", searchType.equals(SearchType.ENN));
+		}
+
+		if (filter != null) {
+			$vectorSearch.append("filter", context.getMappedObject(filter.getCriteriaObject()));
+		}
+
+		$vectorSearch.append("index", indexName);
+
+		if(limit.isLimited()) {
+			$vectorSearch.append("limit", limit.max());
+		}
+
+		if (numCandidates != null) {
+			$vectorSearch.append("numCandidates", numCandidates);
+		}
+
+		Object path = this.path.getPathObject();
+
+		if (path instanceof String pathFieldName) {
+			Document mappedObject = context.getMappedObject(new Document(pathFieldName, 1));
+			path = mappedObject.keySet().iterator().next();
+		}
+
+		Object source = vector.getSource();
+
+		if (source instanceof float[]) {
+			source = vector.toDoubleArray();
+		}
+
+		if (source instanceof double[] ds) {
+			source = Arrays.stream(ds).boxed().collect(Collectors.toList());
+		}
+
+		$vectorSearch.append("path", path);
+		$vectorSearch.append("queryVector", source);
+
+		return new Document(getOperator(), $vectorSearch);
+	}
+
+	@Override
+	public List<Document> toPipelineStages(AggregationOperationContext context) {
+
+		if (!StringUtils.hasText(score)) {
+			return List.of(toDocument(context));
+		}
+
+		AddFieldsOperation $vectorSearchScore = Aggregation.addFields().addField(score)
+				.withValueOfExpression("{\"$meta\":\"vectorSearchScore\"}").build();
+
+		if (scoreCriteria == null) {
+			return List.of(toDocument(context), $vectorSearchScore.toDocument(context));
+		}
+
+		Criteria criteria = Criteria.where(score);
+		scoreCriteria.accept(criteria);
+		MatchOperation $filterByScore = Aggregation.match(criteria);
+
+		return List.of(toDocument(context), $vectorSearchScore.toDocument(context), $filterByScore.toDocument(context));
+	}
+
+	@Override
+	public String getOperator() {
+		return "$vectorSearch";
+	}
+
+	/**
+	 * Builder helper to create a {@link VectorSearchOperation}.
+	 */
+	private static class VectorSearchBuilder implements PathContributor, VectorContributor, LimitContributor {
+
+		@Nullable String index;
+		@Nullable QueryPath<String> paths;
+		@Nullable Vector vector;
+
+		PathContributor index(String index) {
+			this.index = index;
+			return this;
+		}
+
+		@Override
+		public VectorContributor path(String path) {
+
+			this.paths = QueryPath.path(path);
+			return this;
+		}
+
+		@Override
+		public VectorSearchOperation limit(Limit limit) {
+
+			Assert.notNull(index, "Index must be set first");
+			Assert.notNull(paths, "Path must be set first");
+			Assert.notNull(vector, "Vector must be set first");
+			
+			return new VectorSearchOperation(index, QueryPaths.of(paths), limit, vector);
+		}
+
+		@Override
+		public LimitContributor vector(Vector vector) {
+			this.vector = vector;
+			return this;
+		}
+	}
+
+	/**
+	 * Search type, ANN as approximation or ENN for exact search.
+	 */
+	public enum SearchType {
+
+		/** MongoDB Server default (value will be omitted) */
+		DEFAULT,
+		/** Approximate Nearest Neighbour */
+		ANN,
+		/** Exact Nearest Neighbour */
+		ENN
+	}
+
+	/**
+	 * Value object capturing query paths.
+	 */
+	public static class QueryPaths {
+
+		private final Set<QueryPath<?>> paths;
+
+		private QueryPaths(Set<QueryPath<?>> paths) {
+			this.paths = paths;
+		}
+
+		/**
+		 * Factory method to create {@link QueryPaths} from a single {@link QueryPath}.
+		 *
+		 * @param path
+		 * @return a new {@link QueryPaths} instance.
+		 */
+		public static QueryPaths of(QueryPath<String> path) {
+			return new QueryPaths(Set.of(path));
+		}
+
+		Object getPathObject() {
+
+			if (paths.size() == 1) {
+				return paths.iterator().next().value();
+			}
+			return paths.stream().map(QueryPath::value).collect(Collectors.toList());
+		}
+	}
+
+	/**
+	 * Interface describing a query path contract. Query paths might be simple field names, wildcard paths, or
+	 * multi-paths. paths.
+	 *
+	 * @param <T>
+	 */
+	public interface QueryPath<T> {
+
+		T value();
+
+		static QueryPath<String> path(String field) {
+			return new SimplePath(field);
+		}
+	}
+
+	public static class SimplePath implements QueryPath<String> {
+
+		String name;
+
+		public SimplePath(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public String value() {
+			return name;
+		}
+	}
+
+	/**
+	 * Fluent API to configure a path on the VectorSearchOperation builder.
+	 */
+	public interface PathContributor {
+
+		/**
+		 * Indexed vector type field to search.
+		 *
+		 * @param path name of the search path.
+		 * @return
+		 */
+		@Contract("_ -> this")
+		VectorContributor path(String path);
+	}
+
+	/**
+	 * Fluent API to configure a vector on the VectorSearchOperation builder.
+	 */
+	public interface VectorContributor {
+
+		/**
+		 * Array of float numbers that represent the query vector. The number type must match the indexed field value type.
+		 * Otherwise, Atlas Vector Search doesn't return any results or errors.
+		 *
+		 * @param vector the query vector.
+		 * @return
+		 */
+		@Contract("_ -> this")
+		default LimitContributor vector(float... vector) {
+			return vector(Vector.of(vector));
+		}
+
+		/**
+		 * Array of byte numbers that represent the query vector. The number type must match the indexed field value type.
+		 * Otherwise, Atlas Vector Search doesn't return any results or errors.
+		 *
+		 * @param vector the query vector.
+		 * @return
+		 */
+		@Contract("_ -> this")
+		default LimitContributor vector(byte[] vector) {
+			return vector(BinaryVector.int8Vector(vector));
+		}
+
+		/**
+		 * Array of double numbers that represent the query vector. The number type must match the indexed field value type.
+		 * Otherwise, Atlas Vector Search doesn't return any results or errors.
+		 *
+		 * @param vector the query vector.
+		 * @return
+		 */
+		@Contract("_ -> this")
+		default LimitContributor vector(double... vector) {
+			return vector(Vector.of(vector));
+		}
+
+		/**
+		 * Array of numbers that represent the query vector. The number type must match the indexed field value type.
+		 * Otherwise, Atlas Vector Search doesn't return any results or errors.
+		 *
+		 * @param vector the query vector.
+		 * @return
+		 */
+		@Contract("_ -> this")
+		default LimitContributor vector(List<? extends Number> vector) {
+			return vector(Vector.of(vector));
+		}
+
+		/**
+		 * Binary vector (BSON BinData vector subtype float32, or BSON BinData vector subtype int1 or int8 type) that
+		 * represent the query vector. The number type must match the indexed field value type. Otherwise, Atlas Vector
+		 * Search doesn't return any results or errors.
+		 *
+		 * @param vector the query vector.
+		 * @return
+		 */
+		@Contract("_ -> this")
+		default LimitContributor vector(BinaryVector vector) {
+			return vector(MongoVector.of(vector));
+		}
+
+		/**
+		 * The query vector. The number type must match the indexed field value type. Otherwise, Atlas Vector Search doesn't
+		 * return any results or errors.
+		 *
+		 * @param vector the query vector.
+		 * @return
+		 */
+		@Contract("_ -> this")
+		LimitContributor vector(Vector vector);
+	}
+
+	/**
+	 * Fluent API to configure a limit on the VectorSearchOperation builder.
+	 */
+	public interface LimitContributor {
+
+		/**
+		 * Number (of type int only) of documents to return in the results. This value can't exceed the value of
+		 * numCandidates if you specify numCandidates.
+		 *
+		 * @param limit
+		 * @return
+		 */
+		@Contract("_ -> this")
+		default VectorSearchOperation limit(int limit) {
+			return limit(Limit.of(limit));
+		}
+
+		/**
+		 * Number (of type int only) of documents to return in the results. This value can't exceed the value of
+		 * numCandidates if you specify numCandidates.
+		 *
+		 * @param limit
+		 * @return
+		 */
+		@Contract("_ -> this")
+		VectorSearchOperation limit(Limit limit);
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/package-info.java
index 0e30b8b855..2769990ca6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/package-info.java
@@ -3,6 +3,6 @@
  * 
  * @since 1.3
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.aggregation;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/annotation/Collation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/annotation/Collation.java
new file mode 100644
index 0000000000..2ce2d7ed46
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/annotation/Collation.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2022-2025 the original author 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.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * {@link Collation} allows to define the rules used for language-specific string comparison.
+ *
+ * @see <a href="https://www.mongodb.com/docs/manual/reference/collation/">https://www.mongodb.com/docs/manual/reference/collation/</a>
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+public @interface Collation {
+
+	/**
+	 * The actual collation definition in JSON format or a
+	 * {@link org.springframework.expression.spel.standard.SpelExpression template expression} resolving to either a JSON
+	 * String or a {@link org.bson.Document}. The keys of the JSON document are configuration options for the collation.
+	 *
+	 * @return an empty {@link String} by default.
+	 */
+	String value() default "";
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/annotation/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/annotation/package-info.java
new file mode 100644
index 0000000000..9ada2014a0
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/annotation/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Core Spring Data MongoDB annotations not limited to a special use case (like Query,...).
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.mongodb.core.annotation;
+
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
index d50c5bd91b..9b1c744be2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,18 +20,18 @@
 
 import org.bson.types.Code;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.convert.ConverterBuilder;
 import org.springframework.data.convert.CustomConversions;
-import org.springframework.data.convert.EntityInstantiators;
+import org.springframework.data.mapping.model.EntityInstantiators;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToObjectIdConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToBigIntegerConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToObjectIdConverter;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -65,14 +65,14 @@ public AbstractMongoConverter(@Nullable GenericConversionService conversionServi
 	 */
 	public void setCustomConversions(CustomConversions conversions) {
 
-		Assert.notNull(conversions, "Conversions must not be null!");
+		Assert.notNull(conversions, "Conversions must not be null");
 		this.conversions = conversions;
 	}
 
 	/**
 	 * Registers {@link EntityInstantiators} to customize entity instantiation.
 	 *
-	 * @param instantiators
+	 * @param instantiators can be {@literal null}. Uses default {@link EntityInstantiators} if so.
 	 */
 	public void setInstantiators(@Nullable EntityInstantiators instantiators) {
 		this.instantiators = instantiators == null ? new EntityInstantiators() : instantiators;
@@ -107,9 +107,8 @@ private void initializeConverters() {
 
 		if (!conversionService.canConvert(ObjectId.class, Date.class)) {
 
-			conversionService.addConverter(
-					ConverterBuilder.reading(ObjectId.class, Date.class, objectId -> new Date(objectId.getTimestamp()))
-							.getReadingConverter());
+			conversionService.addConverter(ConverterBuilder
+					.reading(ObjectId.class, Date.class, objectId -> new Date(objectId.getTimestamp())).getReadingConverter());
 		}
 
 		conversionService
@@ -117,18 +116,11 @@ private void initializeConverters() {
 		conversions.registerConvertersIn(conversionService);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.convert.MongoConverter#getConversionService()
-	 */
 	@Override
 	public ConversionService getConversionService() {
 		return conversionService;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.beans.factory.InitializingBean#afterPropertiesSet()
-	 */
 	public void afterPropertiesSet() {
 		initializeConverters();
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java
deleted file mode 100644
index 0483a2f889..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/CustomConversions.java
+++ /dev/null
@@ -1,55 +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.core.convert;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.mapping.model.SimpleTypeHolder;
-
-/**
- * Value object to capture custom conversion. That is essentially a {@link List} of converters and some additional logic
- * around them. The converters are pretty much builds up two sets of types which Mongo basic types {@see #MONGO_TYPES}
- * can be converted into and from. These types will be considered simple ones (which means they neither need deeper
- * inspection nor nested conversion. Thus the {@link CustomConversions} also act as factory for {@link SimpleTypeHolder}
- * .
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Christoph Strobl
- * @author Mark Paluch
- * @deprecated since 2.0, use {@link MongoCustomConversions}.
- */
-@Deprecated
-public class CustomConversions extends MongoCustomConversions {
-
-	/**
-	 * Creates an empty {@link CustomConversions} object.
-	 */
-	CustomConversions() {
-		this(new ArrayList<>());
-	}
-
-	/**
-	 * Creates a new {@link CustomConversions} instance registering the given converters.
-	 *
-	 * @param converters
-	 */
-	public CustomConversions(List<?> converters) {
-		super(converters);
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefProxyHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefProxyHandler.java
index f2bfdbc072..3b4dd99d4e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefProxyHandler.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefProxyHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
 
 import com.mongodb.DBRef;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolver.java
index 4b4336aaad..ee1f568494 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,10 +18,10 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.DBRef;
@@ -35,7 +35,7 @@
  * @author Mark Paluch
  * @since 1.4
  */
-public interface DbRefResolver {
+public interface DbRefResolver extends ReferenceResolver {
 
 	/**
 	 * Resolves the given {@link DBRef} into an object of the given {@link MongoPersistentProperty}'s type. The method
@@ -45,7 +45,7 @@ public interface DbRefResolver {
 	 * @param property will never be {@literal null}.
 	 * @param dbref the {@link DBRef} to resolve.
 	 * @param callback will never be {@literal null}.
-	 * @return
+	 * @return can be {@literal null}.
 	 */
 	@Nullable
 	Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbRefResolverCallback callback,
@@ -58,9 +58,9 @@ Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbR
 	 * @param annotation will never be {@literal null}.
 	 * @param entity will never be {@literal null}.
 	 * @param id will never be {@literal null}.
-	 * @return
+	 * @return new instance of {@link DBRef}.
 	 */
-	default DBRef createDbRef(@Nullable org.springframework.data.mongodb.core.mapping.DBRef annotation,
+	default DBRef createDbRef(org.springframework.data.mongodb.core.mapping.@Nullable DBRef annotation,
 			MongoPersistentEntity<?> entity, Object id) {
 
 		if (annotation != null && StringUtils.hasText(annotation.db())) {
@@ -74,7 +74,7 @@ default DBRef createDbRef(@Nullable org.springframework.data.mongodb.core.mappin
 	 * Actually loads the {@link DBRef} from the datasource.
 	 *
 	 * @param dbRef must not be {@literal null}.
-	 * @return
+	 * @return can be {@literal null}.
 	 * @since 1.7
 	 */
 	@Nullable
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolverCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolverCallback.java
index b95d653bf3..fd80029118 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolverCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DbRefResolverCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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.convert;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
 /**
@@ -31,5 +32,5 @@ public interface DbRefResolverCallback {
 	 * @param property will never be {@literal null}.
 	 * @return
 	 */
-	Object resolve(MongoPersistentProperty property);
+	@Nullable Object resolve(MongoPersistentProperty property);
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java
index d1278add38..13c0198aa0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefProxyHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,15 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.util.function.Function;
+
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
-import org.springframework.data.mapping.model.SpELContext;
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
 
 import com.mongodb.DBRef;
 
@@ -34,28 +34,22 @@
  */
 class DefaultDbRefProxyHandler implements DbRefProxyHandler {
 
-	private final SpELContext spELContext;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	private final ValueResolver resolver;
+	private final Function<Object, ValueExpressionEvaluator> evaluatorFactory;
 
 	/**
-	 * @param spELContext must not be {@literal null}.
 	 * @param mappingContext must not be {@literal null}.
 	 * @param resolver must not be {@literal null}.
 	 */
-	public DefaultDbRefProxyHandler(SpELContext spELContext,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
-			ValueResolver resolver) {
+	public DefaultDbRefProxyHandler(MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			ValueResolver resolver, Function<Object, ValueExpressionEvaluator> evaluatorFactory) {
 
-		this.spELContext = spELContext;
 		this.mappingContext = mappingContext;
 		this.resolver = resolver;
+		this.evaluatorFactory = evaluatorFactory;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefProxyHandler#populateId(com.mongodb.DBRef, java.lang.Object)
-	 */
 	@Override
 	public Object populateId(MongoPersistentProperty property, @Nullable DBRef source, Object proxy) {
 
@@ -70,7 +64,7 @@ public Object populateId(MongoPersistentProperty property, @Nullable DBRef sourc
 			return proxy;
 		}
 
-		SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(proxy, spELContext);
+		ValueExpressionEvaluator evaluator = evaluatorFactory.apply(proxy);
 		PersistentPropertyAccessor accessor = entity.getPropertyAccessor(proxy);
 
 		Document object = new Document(idProperty.getFieldName(), source.getId());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java
index 0c6b75574f..c72bc4b886 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,6 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import static org.springframework.util.ReflectionUtils.*;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.io.Serializable;
-import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -29,27 +22,19 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.aopalliance.intercept.MethodInterceptor;
-import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.aop.framework.ProxyFactory;
-import org.springframework.cglib.proxy.Callback;
-import org.springframework.cglib.proxy.Enhancer;
-import org.springframework.cglib.proxy.Factory;
-import org.springframework.cglib.proxy.MethodProxy;
-import org.springframework.dao.DataAccessException;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.dao.support.PersistenceExceptionTranslator;
-import org.springframework.data.mongodb.ClientSessionException;
-import org.springframework.data.mongodb.LazyLoadingException;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.MongoDatabaseUtils;
+import org.springframework.data.mongodb.core.convert.ReferenceLoader.DocumentReferenceQuery;
+import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
-import org.springframework.objenesis.ObjenesisStd;
 import org.springframework.util.Assert;
-import org.springframework.util.ReflectionUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.DBRef;
@@ -66,39 +51,33 @@
  * @author Mark Paluch
  * @since 1.4
  */
-public class DefaultDbRefResolver implements DbRefResolver {
+public class DefaultDbRefResolver extends DefaultReferenceResolver implements DbRefResolver, ReferenceResolver {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(DefaultDbRefResolver.class);
+	private static final Log LOGGER = LogFactory.getLog(DefaultDbRefResolver.class);
 
-	private final MongoDbFactory mongoDbFactory;
-	private final PersistenceExceptionTranslator exceptionTranslator;
-	private final ObjenesisStd objenesis;
+	private final MongoDatabaseFactory mongoDbFactory;
 
 	/**
-	 * Creates a new {@link DefaultDbRefResolver} with the given {@link MongoDbFactory}.
+	 * Creates a new {@link DefaultDbRefResolver} with the given {@link MongoDatabaseFactory}.
 	 *
 	 * @param mongoDbFactory must not be {@literal null}.
 	 */
-	public DefaultDbRefResolver(MongoDbFactory mongoDbFactory) {
+	public DefaultDbRefResolver(MongoDatabaseFactory mongoDbFactory) {
+
+		super(new MongoDatabaseFactoryReferenceLoader(mongoDbFactory), mongoDbFactory.getExceptionTranslator());
 
-		Assert.notNull(mongoDbFactory, "MongoDbFactory translator must not be null!");
+		Assert.notNull(mongoDbFactory, "MongoDbFactory translator must not be null");
 
 		this.mongoDbFactory = mongoDbFactory;
-		this.exceptionTranslator = mongoDbFactory.getExceptionTranslator();
-		this.objenesis = new ObjenesisStd(true);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#resolveDbRef(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.convert.DbRefResolverCallback)
-	 */
 	@Override
-	public Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbRefResolverCallback callback,
+	public @Nullable Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbRefResolverCallback callback,
 			DbRefProxyHandler handler) {
 
-		Assert.notNull(property, "Property must not be null!");
-		Assert.notNull(callback, "Callback must not be null!");
-		Assert.notNull(handler, "Handler must not be null!");
+		Assert.notNull(property, "Property must not be null");
+		Assert.notNull(callback, "Callback must not be null");
+		Assert.notNull(handler, "Handler must not be null");
 
 		if (isLazyDbRef(property)) {
 			return createLazyLoadingProxy(property, dbref, callback, handler);
@@ -107,32 +86,18 @@ public Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbr
 		return callback.resolve(property);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#fetch(com.mongodb.DBRef)
-	 */
 	@Override
-	public Document fetch(DBRef dbRef) {
-
-		if (LOGGER.isTraceEnabled()) {
-			LOGGER.trace("Fetching DBRef '{}' from {}.{}.", dbRef.getId(),
-					StringUtils.hasText(dbRef.getDatabaseName()) ? dbRef.getDatabaseName() : mongoDbFactory.getDb().getName(),
-					dbRef.getCollectionName());
-		}
-
-		StringUtils.hasText(dbRef.getDatabaseName());
-		return getCollection(dbRef).find(Filters.eq("_id", dbRef.getId())).first();
+	public @Nullable Document fetch(DBRef dbRef) {
+		return getReferenceLoader().fetchOne(
+				DocumentReferenceQuery.forSingleDocument(Filters.eq(FieldName.ID.name(), dbRef.getId())),
+				ReferenceCollection.fromDBRef(dbRef));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#bulkFetch(java.util.List)
-	 */
 	@Override
 	public List<Document> bulkFetch(List<DBRef> refs) {
 
-		Assert.notNull(mongoDbFactory, "Factory must not be null!");
-		Assert.notNull(refs, "DBRef to fetch must not be null!");
+		Assert.notNull(mongoDbFactory, "Factory must not be null");
+		Assert.notNull(refs, "DBRef to fetch must not be null");
 
 		if (refs.isEmpty()) {
 			return Collections.emptyList();
@@ -145,24 +110,25 @@ public List<Document> bulkFetch(List<DBRef> refs) {
 
 			if (!collection.equals(ref.getCollectionName())) {
 				throw new InvalidDataAccessApiUsageException(
-						"DBRefs must all target the same collection for bulk fetch operation.");
+						"DBRefs must all target the same collection for bulk fetch operation");
 			}
 
 			ids.add(ref.getId());
 		}
 
 		DBRef databaseSource = refs.iterator().next();
+		MongoCollection<Document> mongoCollection = getCollection(databaseSource);
 
 		if (LOGGER.isTraceEnabled()) {
-			LOGGER.trace("Bulk fetching DBRefs {} from {}.{}.", ids,
+			LOGGER.trace(String.format("Bulk fetching DBRefs %s from %s.%s", ids,
 					StringUtils.hasText(databaseSource.getDatabaseName()) ? databaseSource.getDatabaseName()
-							: mongoDbFactory.getDb().getName(),
-					databaseSource.getCollectionName());
+							: mongoCollection.getNamespace().getDatabaseName(),
+					databaseSource.getCollectionName()));
 		}
 
-		List<Document> result = getCollection(databaseSource) //
-				.find(new Document("_id", new Document("$in", ids))) //
-				.into(new ArrayList<>());
+		List<Document> result = mongoCollection //
+				.find(new Document(BasicMongoPersistentProperty.ID_FIELD_NAME, new Document("$in", ids))) //
+				.into(new ArrayList<>(ids.size()));
 
 		return ids.stream() //
 				.flatMap(id -> documentWithId(id, result)) //
@@ -181,44 +147,9 @@ public List<Document> bulkFetch(List<DBRef> refs) {
 	private Object createLazyLoadingProxy(MongoPersistentProperty property, @Nullable DBRef dbref,
 			DbRefResolverCallback callback, DbRefProxyHandler handler) {
 
-		Class<?> propertyType = property.getType();
-		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, dbref, exceptionTranslator, callback);
-
-		if (!propertyType.isInterface()) {
-
-			Factory factory = (Factory) objenesis.newInstance(getEnhancedTypeFor(propertyType));
-			factory.setCallbacks(new Callback[] { interceptor });
-
-			return handler.populateId(property, dbref, factory);
-		}
-
-		ProxyFactory proxyFactory = new ProxyFactory();
-
-		for (Class<?> type : propertyType.getInterfaces()) {
-			proxyFactory.addInterface(type);
-		}
-
-		proxyFactory.addInterface(LazyLoadingProxy.class);
-		proxyFactory.addInterface(propertyType);
-		proxyFactory.addAdvice(interceptor);
-
-		return handler.populateId(property, dbref, proxyFactory.getProxy());
-	}
-
-	/**
-	 * Returns the CGLib enhanced type for the given source type.
-	 *
-	 * @param type
-	 * @return
-	 */
-	private Class<?> getEnhancedTypeFor(Class<?> type) {
-
-		Enhancer enhancer = new Enhancer();
-		enhancer.setSuperclass(type);
-		enhancer.setCallbackType(org.springframework.cglib.proxy.MethodInterceptor.class);
-		enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
+		Object lazyLoadingProxy = getProxyFactory().createLazyLoadingProxy(property, callback, dbref);
 
-		return enhancer.createClass();
+		return handler.populateId(property, dbref, lazyLoadingProxy);
 	}
 
 	/**
@@ -241,253 +172,10 @@ private boolean isLazyDbRef(MongoPersistentProperty property) {
 	private static Stream<Document> documentWithId(Object identifier, Collection<Document> documents) {
 
 		return documents.stream() //
-				.filter(it -> it.get("_id").equals(identifier)) //
+				.filter(it -> ObjectUtils.nullSafeEquals(it.get(BasicMongoPersistentProperty.ID_FIELD_NAME), identifier)) //
 				.limit(1);
 	}
 
-	/**
-	 * A {@link MethodInterceptor} that is used within a lazy loading proxy. The property resolving is delegated to a
-	 * {@link DbRefResolverCallback}. The resolving process is triggered by a method invocation on the proxy and is
-	 * guaranteed to be performed only once.
-	 *
-	 * @author Thomas Darimont
-	 * @author Oliver Gierke
-	 * @author Christoph Strobl
-	 */
-	static class LazyLoadingInterceptor
-			implements MethodInterceptor, org.springframework.cglib.proxy.MethodInterceptor, Serializable {
-
-		private static final Method INITIALIZE_METHOD, TO_DBREF_METHOD, FINALIZE_METHOD;
-
-		private final DbRefResolverCallback callback;
-		private final MongoPersistentProperty property;
-		private final PersistenceExceptionTranslator exceptionTranslator;
-
-		private volatile boolean resolved;
-		private final @Nullable DBRef dbref;
-		private @Nullable Object result;
-
-		static {
-			try {
-				INITIALIZE_METHOD = LazyLoadingProxy.class.getMethod("getTarget");
-				TO_DBREF_METHOD = LazyLoadingProxy.class.getMethod("toDBRef");
-				FINALIZE_METHOD = Object.class.getDeclaredMethod("finalize");
-			} catch (Exception e) {
-				throw new RuntimeException(e);
-			}
-		}
-
-		/**
-		 * Creates a new {@link LazyLoadingInterceptor} for the given {@link MongoPersistentProperty},
-		 * {@link PersistenceExceptionTranslator} and {@link DbRefResolverCallback}.
-		 *
-		 * @param property must not be {@literal null}.
-		 * @param dbref can be {@literal null}.
-		 * @param callback must not be {@literal null}.
-		 */
-		public LazyLoadingInterceptor(MongoPersistentProperty property, @Nullable DBRef dbref,
-				PersistenceExceptionTranslator exceptionTranslator, DbRefResolverCallback callback) {
-
-			Assert.notNull(property, "Property must not be null!");
-			Assert.notNull(exceptionTranslator, "Exception translator must not be null!");
-			Assert.notNull(callback, "Callback must not be null!");
-
-			this.dbref = dbref;
-			this.callback = callback;
-			this.exceptionTranslator = exceptionTranslator;
-			this.property = property;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.aopalliance.intercept.MethodInterceptor#invoke(org.aopalliance.intercept.MethodInvocation)
-		 */
-		@Override
-		public Object invoke(@Nullable MethodInvocation invocation) throws Throwable {
-			return intercept(invocation.getThis(), invocation.getMethod(), invocation.getArguments(), null);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.cglib.proxy.MethodInterceptor#intercept(java.lang.Object, java.lang.reflect.Method, java.lang.Object[], org.springframework.cglib.proxy.MethodProxy)
-		 */
-		@Nullable
-		@Override
-		public Object intercept(Object obj, Method method, Object[] args, @Nullable MethodProxy proxy) throws Throwable {
-
-			if (INITIALIZE_METHOD.equals(method)) {
-				return ensureResolved();
-			}
-
-			if (TO_DBREF_METHOD.equals(method)) {
-				return this.dbref;
-			}
-
-			if (isObjectMethod(method) && Object.class.equals(method.getDeclaringClass())) {
-
-				if (ReflectionUtils.isToStringMethod(method)) {
-					return proxyToString(proxy);
-				}
-
-				if (ReflectionUtils.isEqualsMethod(method)) {
-					return proxyEquals(proxy, args[0]);
-				}
-
-				if (ReflectionUtils.isHashCodeMethod(method)) {
-					return proxyHashCode(proxy);
-				}
-
-				// DATAMONGO-1076 - finalize methods should not trigger proxy initialization
-				if (FINALIZE_METHOD.equals(method)) {
-					return null;
-				}
-			}
-
-			Object target = ensureResolved();
-
-			if (target == null) {
-				return null;
-			}
-
-			ReflectionUtils.makeAccessible(method);
-
-			return method.invoke(target, args);
-		}
-
-		/**
-		 * Returns a to string representation for the given {@code proxy}.
-		 *
-		 * @param proxy
-		 * @return
-		 */
-		private String proxyToString(@Nullable Object proxy) {
-
-			StringBuilder description = new StringBuilder();
-			if (dbref != null) {
-				description.append(dbref.getCollectionName());
-				description.append(":");
-				description.append(dbref.getId());
-			} else {
-				description.append(System.identityHashCode(proxy));
-			}
-			description.append("$").append(LazyLoadingProxy.class.getSimpleName());
-
-			return description.toString();
-		}
-
-		/**
-		 * Returns the hashcode for the given {@code proxy}.
-		 *
-		 * @param proxy
-		 * @return
-		 */
-		private int proxyHashCode(@Nullable Object proxy) {
-			return proxyToString(proxy).hashCode();
-		}
-
-		/**
-		 * Performs an equality check for the given {@code proxy}.
-		 *
-		 * @param proxy
-		 * @param that
-		 * @return
-		 */
-		private boolean proxyEquals(@Nullable Object proxy, Object that) {
-
-			if (!(that instanceof LazyLoadingProxy)) {
-				return false;
-			}
-
-			if (that == proxy) {
-				return true;
-			}
-
-			return proxyToString(proxy).equals(that.toString());
-		}
-
-		/**
-		 * Will trigger the resolution if the proxy is not resolved already or return a previously resolved result.
-		 *
-		 * @return
-		 */
-		@Nullable
-		private Object ensureResolved() {
-
-			if (!resolved) {
-				this.result = resolve();
-				this.resolved = true;
-			}
-
-			return this.result;
-		}
-
-		/**
-		 * Callback method for serialization.
-		 *
-		 * @param out
-		 * @throws IOException
-		 */
-		private void writeObject(ObjectOutputStream out) throws IOException {
-
-			ensureResolved();
-			out.writeObject(this.result);
-		}
-
-		/**
-		 * Callback method for deserialization.
-		 *
-		 * @param in
-		 * @throws IOException
-		 */
-		private void readObject(ObjectInputStream in) throws IOException {
-
-			try {
-				this.resolved = true;
-				this.result = in.readObject();
-			} catch (ClassNotFoundException e) {
-				throw new LazyLoadingException("Could not deserialize result", e);
-			}
-		}
-
-		/**
-		 * Resolves the proxy into its backing object.
-		 *
-		 * @return
-		 */
-		@Nullable
-		private synchronized Object resolve() {
-
-			if (resolved) {
-
-				if (LOGGER.isTraceEnabled()) {
-					LOGGER.trace("Accessing already resolved lazy loading property {}.{}",
-							property.getOwner() != null ? property.getOwner().getName() : "unknown", property.getName());
-				}
-				return result;
-			}
-
-			try {
-				if (LOGGER.isTraceEnabled()) {
-					LOGGER.trace("Resolving lazy loading property {}.{}",
-							property.getOwner() != null ? property.getOwner().getName() : "unknown", property.getName());
-				}
-
-				return callback.resolve(property);
-
-			} catch (RuntimeException ex) {
-
-				DataAccessException translatedException = this.exceptionTranslator.translateExceptionIfPossible(ex);
-
-				if (translatedException instanceof ClientSessionException) {
-					throw new LazyLoadingException("Unable to lazily resolve DBRef! Invalid session state.", ex);
-				}
-
-				throw new LazyLoadingException("Unable to lazily resolve DBRef!",
-						translatedException != null ? translatedException : ex);
-			}
-		}
-	}
-
 	/**
 	 * Customization hook for obtaining the {@link MongoCollection} for a given {@link DBRef}.
 	 *
@@ -497,7 +185,13 @@ private synchronized Object resolve() {
 	 */
 	protected MongoCollection<Document> getCollection(DBRef dbref) {
 
-		return (StringUtils.hasText(dbref.getDatabaseName()) ? mongoDbFactory.getDb(dbref.getDatabaseName())
-				: mongoDbFactory.getDb()).getCollection(dbref.getCollectionName(), Document.class);
+		return MongoDatabaseUtils.getDatabase(dbref.getDatabaseName(), mongoDbFactory)
+				.getCollection(dbref.getCollectionName(), Document.class);
+	}
+
+	protected MongoCollection<Document> getCollection(ReferenceCollection context) {
+
+		return MongoDatabaseUtils.getDatabase(context.getDatabase(), mongoDbFactory).getCollection(context.getCollection(),
+				Document.class);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java
index 9582101cb4..376e0dd8cd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
 /**
@@ -32,18 +33,18 @@ class DefaultDbRefResolverCallback implements DbRefResolverCallback {
 	private final Bson surroundingObject;
 	private final ObjectPath path;
 	private final ValueResolver resolver;
-	private final SpELExpressionEvaluator evaluator;
+	private final ValueExpressionEvaluator evaluator;
 
 	/**
 	 * Creates a new {@link DefaultDbRefResolverCallback} using the given {@link Document}, {@link ObjectPath},
-	 * {@link ValueResolver} and {@link SpELExpressionEvaluator}.
+	 * {@link ValueResolver} and {@link ValueExpressionEvaluator}.
 	 *
 	 * @param surroundingObject must not be {@literal null}.
 	 * @param path must not be {@literal null}.
 	 * @param evaluator must not be {@literal null}.
 	 * @param resolver must not be {@literal null}.
 	 */
-	public DefaultDbRefResolverCallback(Bson surroundingObject, ObjectPath path, SpELExpressionEvaluator evaluator,
+	DefaultDbRefResolverCallback(Bson surroundingObject, ObjectPath path, ValueExpressionEvaluator evaluator,
 			ValueResolver resolver) {
 
 		this.surroundingObject = surroundingObject;
@@ -52,12 +53,8 @@ public DefaultDbRefResolverCallback(Bson surroundingObject, ObjectPath path, SpE
 		this.evaluator = evaluator;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolverCallback#resolve(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
-	 */
 	@Override
-	public Object resolve(MongoPersistentProperty property) {
+	public @Nullable Object resolve(MongoPersistentProperty property) {
 		return resolver.getValueInternal(property, surroundingObject, evaluator, path);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java
index b166815615..f5db41f006 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.convert.DefaultTypeMapper;
 import org.springframework.data.convert.SimpleTypeInformationMapper;
@@ -32,9 +32,7 @@
 import org.springframework.data.mapping.Alias;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ObjectUtils;
 
 import com.mongodb.BasicDBList;
@@ -42,9 +40,7 @@
 
 /**
  * Default implementation of {@link MongoTypeMapper} allowing configuration of the key to lookup and store type
- * information in {@link Document}. The key defaults to {@link #DEFAULT_TYPE_KEY}. Actual type-to-{@link String}
- * conversion and back is done in {@link #getTypeString(TypeInformation)} or {@link #getTypeInformation(String)}
- * respectively.
+ * information in {@link Document}. The key defaults to {@link #DEFAULT_TYPE_KEY}.
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
@@ -55,9 +51,9 @@ public class DefaultMongoTypeMapper extends DefaultTypeMapper<Bson> implements M
 
 	public static final String DEFAULT_TYPE_KEY = "_class";
 	@SuppressWarnings("rawtypes") //
-	private static final TypeInformation<List> LIST_TYPE_INFO = ClassTypeInformation.from(List.class);
+	private static final TypeInformation<List> LIST_TYPE_INFO = TypeInformation.of(List.class);
 	@SuppressWarnings("rawtypes") //
-	private static final TypeInformation<Map> MAP_TYPE_INFO = ClassTypeInformation.from(Map.class);
+	private static final TypeInformation<Map> MAP_TYPE_INFO = TypeInformation.MAP;
 
 	private final TypeAliasAccessor<Bson> accessor;
 	private final @Nullable String typeKey;
@@ -111,14 +107,14 @@ public DefaultMongoTypeMapper(@Nullable String typeKey,
 	 * {@link TypeInformationMapper} to map type hints.
 	 *
 	 * @param typeKey name of the field to read and write type hints. Can be {@literal null} to disable type hints.
-	 * @param mappers
+	 * @param mappers must not be {@literal null}.
 	 */
 	public DefaultMongoTypeMapper(@Nullable String typeKey, List<? extends TypeInformationMapper> mappers) {
 		this(typeKey, new DocumentTypeAliasAccessor(typeKey), null, mappers);
 	}
 
 	private DefaultMongoTypeMapper(@Nullable String typeKey, TypeAliasAccessor<Bson> accessor,
-			MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext,
+			@Nullable MappingContext<? extends PersistentEntity<?, ?>, ?> mappingContext,
 			List<? extends TypeInformationMapper> mappers) {
 
 		super(accessor, mappingContext, mappers);
@@ -127,18 +123,10 @@ private DefaultMongoTypeMapper(@Nullable String typeKey, TypeAliasAccessor<Bson>
 		this.accessor = accessor;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#isTypeKey(java.lang.String)
-	 */
 	public boolean isTypeKey(String key) {
-		return typeKey == null ? false : typeKey.equals(key);
+		return typeKey != null && typeKey.equals(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#writeTypeRestrictions(java.util.Set)
-	 */
 	@Override
 	public void writeTypeRestrictions(Document result, @Nullable Set<Class<?>> restrictedTypes) {
 
@@ -150,7 +138,7 @@ public void writeTypeRestrictions(Document result, @Nullable Set<Class<?>> restr
 
 		for (Class<?> restrictedType : restrictedTypes) {
 
-			Alias typeAlias = getAliasFor(ClassTypeInformation.from(restrictedType));
+			Alias typeAlias = getAliasFor(TypeInformation.of(restrictedType));
 
 			if (!ObjectUtils.nullSafeEquals(Alias.NONE, typeAlias) && typeAlias.isPresent()) {
 				restrictedMappedTypes.add(typeAlias.getValue());
@@ -160,19 +148,11 @@ public void writeTypeRestrictions(Document result, @Nullable Set<Class<?>> restr
 		accessor.writeTypeTo(result, new Document("$in", restrictedMappedTypes));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoTypeMapper#getWriteTargetTypeFor(java.lang.Class)
-	 */
 	@Override
 	public Class<?> getWriteTargetTypeFor(Class<?> source) {
 		return writeTarget.apply(source);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.DefaultTypeMapper#getFallbackTypeFor(java.lang.Object)
-	 */
 	@Override
 	protected TypeInformation<?> getFallbackTypeFor(Bson source) {
 		return source instanceof BasicDBList ? LIST_TYPE_INFO : MAP_TYPE_INFO;
@@ -191,37 +171,30 @@ public DocumentTypeAliasAccessor(@Nullable String typeKey) {
 			this.typeKey = typeKey;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.convert.TypeAliasAccessor#readAliasFrom(java.lang.Object)
-		 */
+		@Override
 		public Alias readAliasFrom(Bson source) {
 
 			if (source instanceof List) {
 				return Alias.NONE;
 			}
 
-			if (source instanceof Document) {
-				return Alias.ofNullable(((Document) source).get(typeKey));
-			} else if (source instanceof DBObject) {
-				return Alias.ofNullable(((DBObject) source).get(typeKey));
+			if (source instanceof Document document) {
+				return Alias.ofNullable(document.get(typeKey));
+			} else if (source instanceof DBObject dbObject) {
+				return Alias.ofNullable(dbObject.get(typeKey));
 			}
 
 			throw new IllegalArgumentException("Cannot read alias from " + source.getClass());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.convert.TypeAliasAccessor#writeTypeTo(java.lang.Object, java.lang.Object)
-		 */
 		public void writeTypeTo(Bson sink, Object alias) {
 
 			if (typeKey != null) {
 
-				if (sink instanceof Document) {
-					((Document) sink).put(typeKey, alias);
-				} else if (sink instanceof DBObject) {
-					((DBObject) sink).put(typeKey, alias);
+				if (sink instanceof Document document) {
+					document.put(typeKey, alias);
+				} else if (sink instanceof DBObject dbObject) {
+					dbObject.put(typeKey, alias);
 				}
 			}
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultReferenceResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultReferenceResolver.java
new file mode 100644
index 0000000000..4df7c02f91
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DefaultReferenceResolver.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import static org.springframework.data.mongodb.core.convert.ReferenceLookupDelegate.*;
+
+import java.util.Collections;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.util.Assert;
+
+/**
+ * {@link ReferenceResolver} implementation that uses a given {@link ReferenceLookupDelegate} to load and convert entity
+ * associations expressed via a {@link MongoPersistentProperty persitent property}. Creates {@link LazyLoadingProxy
+ * proxies} for associations that should be lazily loaded.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Anton Buzdalkin
+ * @since 3.3
+ */
+public class DefaultReferenceResolver implements ReferenceResolver {
+
+	private final ReferenceLoader referenceLoader;
+	private final LazyLoadingProxyFactory proxyFactory;
+
+	private final LookupFunction collectionLookupFunction = (filter, ctx) -> getReferenceLoader().fetchMany(filter, ctx);
+	private final LookupFunction singleValueLookupFunction = (filter, ctx) -> {
+		Document target = getReferenceLoader().fetchOne(filter, ctx);
+		return target == null ? Collections.emptyList() : Collections.singleton(target);
+	};
+
+	/**
+	 * Create a new instance of {@link DefaultReferenceResolver}.
+	 *
+	 * @param referenceLoader must not be {@literal null}.
+	 * @param exceptionTranslator must not be {@literal null}.
+	 */
+	public DefaultReferenceResolver(ReferenceLoader referenceLoader, PersistenceExceptionTranslator exceptionTranslator) {
+
+		Assert.notNull(referenceLoader, "ReferenceLoader must not be null");
+		Assert.notNull(exceptionTranslator, "ExceptionTranslator must not be null");
+
+		this.referenceLoader = referenceLoader;
+		this.proxyFactory = new LazyLoadingProxyFactory(exceptionTranslator);
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	public @Nullable Object resolveReference(MongoPersistentProperty property, Object source,
+			ReferenceLookupDelegate referenceLookupDelegate, MongoEntityReader entityReader) {
+
+		LookupFunction lookupFunction = (property.isCollectionLike() || property.isMap()) ? collectionLookupFunction
+				: singleValueLookupFunction;
+
+		if (isLazyReference(property)) {
+			return createLazyLoadingProxy(property, source, referenceLookupDelegate, lookupFunction, entityReader);
+		}
+
+		return referenceLookupDelegate.readReference(property, source, lookupFunction, entityReader);
+	}
+
+	/**
+	 * Check if the association expressed by the given {@link MongoPersistentProperty property} should be resolved lazily.
+	 *
+	 * @param property
+	 * @return return {@literal true} if the defined association is lazy.
+	 * @see DBRef#lazy()
+	 * @see DocumentReference#lazy()
+	 */
+	@SuppressWarnings("NullAway")
+	protected boolean isLazyReference(MongoPersistentProperty property) {
+
+		if (property.isDocumentReference()) {
+			return property.getDocumentReference().lazy();
+		}
+
+		return property.getDBRef() != null && property.getDBRef().lazy();
+	}
+
+	/**
+	 * The {@link ReferenceLoader} executing the lookup.
+	 *
+	 * @return never {@literal null}.
+	 */
+	protected ReferenceLoader getReferenceLoader() {
+		return referenceLoader;
+	}
+
+	LazyLoadingProxyFactory getProxyFactory() {
+		return proxyFactory;
+	}
+
+	@SuppressWarnings("NullAway")
+	private Object createLazyLoadingProxy(MongoPersistentProperty property, Object source,
+			ReferenceLookupDelegate referenceLookupDelegate, LookupFunction lookupFunction, MongoEntityReader entityReader) {
+		return proxyFactory.createLazyLoadingProxy(property,
+				it -> referenceLookupDelegate.readReference(it, source, lookupFunction, entityReader),
+				source instanceof DocumentReferenceSource documentSource ? documentSource.getTargetSource() : source);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentAccessor.java
index 8ec2d42659..ff50dd5df3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,13 +21,13 @@
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.util.BsonUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
-import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 /**
@@ -50,10 +50,10 @@ class DocumentAccessor {
 	 */
 	public DocumentAccessor(Bson document) {
 
-		Assert.notNull(document, "Document must not be null!");
+		Assert.notNull(document, "Document must not be null");
 
 		if (!(document instanceof Document) && !(document instanceof DBObject)) {
-			Assert.isInstanceOf(Document.class, document, "Given Bson must be a Document or DBObject!");
+			Assert.isInstanceOf(Document.class, document, "Given Bson must be a Document or DBObject");
 		}
 
 		this.document = document;
@@ -67,25 +67,36 @@ Bson getDocument() {
 		return this.document;
 	}
 
+	/**
+	 * Copies all of the mappings from the given {@link Document} to the underlying target {@link Document}. These
+	 * mappings will replace any mappings that the target document had for any of the keys currently in the specified map.
+	 *
+	 * @param source
+	 */
+	public void putAll(Document source) {
+
+		Map<String, Object> target = BsonUtils.asMap(document);
+
+		target.putAll(source);
+	}
+
 	/**
 	 * Puts the given value into the backing {@link Document} based on the coordinates defined through the given
 	 * {@link MongoPersistentProperty}. By default this will be the plain field name. But field names might also consist
-	 * of path traversals so we might need to create intermediate {@link BasicDocument}s.
+	 * of path traversals so we might need to create intermediate {@link Document}s.
 	 *
 	 * @param prop must not be {@literal null}.
-	 * @param value
+	 * @param value can be {@literal null}.
 	 */
 	public void put(MongoPersistentProperty prop, @Nullable Object value) {
 
-		Assert.notNull(prop, "MongoPersistentProperty must not be null!");
-		String fieldName = prop.getFieldName();
+		Assert.notNull(prop, "MongoPersistentProperty must not be null");
 
-		if (!fieldName.contains(".")) {
-			BsonUtils.addToMap(document, fieldName, value);
+		if (value == null && !prop.writeNullValues()) {
 			return;
 		}
 
-		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
+		Iterator<String> parts = Arrays.asList(prop.getMongoField().getName().parts()).iterator();
 		Bson document = this.document;
 
 		while (parts.hasNext()) {
@@ -106,32 +117,10 @@ public void put(MongoPersistentProperty prop, @Nullable Object value) {
 	 * a path expression in the field name metadata.
 	 *
 	 * @param property must not be {@literal null}.
-	 * @return
+	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public Object get(MongoPersistentProperty property) {
-
-		String fieldName = property.getFieldName();
-		Map<String, Object> map = BsonUtils.asMap(document);
-
-		if (!fieldName.contains(".")) {
-			return map.get(fieldName);
-		}
-
-		Iterator<String> parts = Arrays.asList(fieldName.split("\\.")).iterator();
-		Map<String, Object> source = map;
-		Object result = null;
-
-		while (source != null && parts.hasNext()) {
-
-			result = source.get(parts.next());
-
-			if (parts.hasNext()) {
-				source = getAsMap(result);
-			}
-		}
-
-		return result;
+	public @Nullable Object get(MongoPersistentProperty property) {
+		return BsonUtils.resolveValue(document, getFieldName(property));
 	}
 
 	/**
@@ -141,8 +130,8 @@ public Object get(MongoPersistentProperty property) {
 	 * @param entity must not be {@literal null}.
 	 * @return
 	 */
-	public Object getRawId(MongoPersistentEntity<?> entity) {
-		return entity.hasIdProperty() ? get(entity.getRequiredIdProperty()) : BsonUtils.asMap(document).get("_id");
+	public @Nullable Object getRawId(MongoPersistentEntity<?> entity) {
+		return entity.hasIdProperty() ? get(entity.getRequiredIdProperty()) : BsonUtils.get(document, FieldName.ID.name());
 	}
 
 	/**
@@ -150,78 +139,18 @@ public Object getRawId(MongoPersistentEntity<?> entity) {
 	 * {@link MongoPersistentProperty}.
 	 *
 	 * @param property must not be {@literal null}.
-	 * @return
+	 * @return {@literal true} if no non {@literal null} value present.
 	 */
 	@SuppressWarnings("unchecked")
 	public boolean hasValue(MongoPersistentProperty property) {
 
-		Assert.notNull(property, "Property must not be null!");
+		Assert.notNull(property, "Property must not be null");
 
-		String fieldName = property.getFieldName();
-
-
-		if (this.document instanceof Document) {
-
-			if (((Document) this.document).containsKey(fieldName)) {
-				return true;
-			}
-		} else if (this.document instanceof DBObject) {
-			if (((DBObject) this.document).containsField(fieldName)) {
-				return true;
-			}
-		}
-
-		if (!fieldName.contains(".")) {
-			return false;
-		}
-
-		String[] parts = fieldName.split("\\.");
-		Map<String, Object> source;
-
-		if (this.document instanceof Document) {
-			source = ((Document) this.document);
-		} else {
-			source = ((DBObject) this.document).toMap();
-		}
-
-		Object result = null;
-
-		for (int i = 1; i < parts.length; i++) {
-
-			result = source.get(parts[i - 1]);
-			source = getAsMap(result);
-
-			if (source == null) {
-				return false;
-			}
-		}
-
-		return source.containsKey(parts[parts.length - 1]);
+		return BsonUtils.hasValue(document, getFieldName(property));
 	}
 
-	/**
-	 * Returns the given source object as map, i.e. {@link Document}s and maps as is or {@literal null} otherwise.
-	 *
-	 * @param source can be {@literal null}.
-	 * @return
-	 */
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private static Map<String, Object> getAsMap(Object source) {
-
-		if (source instanceof Document) {
-			return (Document) source;
-		}
-
-		if (source instanceof BasicDBObject) {
-			return (BasicDBObject) source;
-		}
-
-		if (source instanceof Map) {
-			return (Map<String, Object>) source;
-		}
-
-		return null;
+	FieldName getFieldName(MongoPersistentProperty prop) {
+		return prop.getMongoField().getName();
 	}
 
 	/**
@@ -236,8 +165,8 @@ private static Document getOrCreateNestedDocument(String key, Bson source) {
 
 		Object existing = BsonUtils.asMap(source).get(key);
 
-		if (existing instanceof Document) {
-			return (Document) existing;
+		if (existing instanceof Document document) {
+			return document;
 		}
 
 		Document nested = new Document();
@@ -245,4 +174,5 @@ private static Document getOrCreateNestedDocument(String key, Bson source) {
 
 		return nested;
 	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPointerFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPointerFactory.java
new file mode 100644
index 0000000000..e03d215088
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPointerFactory.java
@@ -0,0 +1,272 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.WeakHashMap;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.annotation.Reference;
+import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.mapping.PersistentPropertyPath;
+import org.springframework.data.mapping.PersistentPropertyPathAccessor;
+import org.springframework.data.mapping.PropertyPath;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.BeanWrapperPropertyAccessorFactory;
+import org.springframework.data.mongodb.core.mapping.DocumentPointer;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+
+/**
+ * Internal API to construct {@link DocumentPointer} for a given property. Considers {@link LazyLoadingProxy},
+ * registered {@link Object} to {@link DocumentPointer} {@link org.springframework.core.convert.converter.Converter},
+ * simple {@literal _id} lookups and cases where the {@link DocumentPointer} needs to be computed via a lookup query.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+class DocumentPointerFactory {
+
+	private final ConversionService conversionService;
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final Map<String, LinkageDocument> cache;
+
+	/**
+	 * A {@link Pattern} matching quoted and unquoted variants (with/out whitespaces) of
+	 * <code>{'_id' : ?#{#target} }</code>.
+	 */
+	private static final Pattern DEFAULT_LOOKUP_PATTERN = Pattern.compile("\\{\\s?" + // document start (whitespace opt)
+			"['\"]?_id['\"]?" + // followed by an optionally quoted _id. Like: _id, '_id' or "_id"
+			"?\\s?:\\s?" + // then a colon optionally wrapped inside whitespaces
+			"['\"]?\\?#\\{#target\\}['\"]?" + // leading to the potentially quoted ?#{#target} expression
+			"\\s*}"); // some optional whitespaces and document close
+
+	DocumentPointerFactory(ConversionService conversionService,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+		this.conversionService = conversionService;
+		this.mappingContext = mappingContext;
+		this.cache = new WeakHashMap<>();
+	}
+
+	@SuppressWarnings("NullAway")
+	DocumentPointer<?> computePointer(
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			MongoPersistentProperty property, Object value, Class<?> typeHint) {
+
+		if (value instanceof LazyLoadingProxy proxy) {
+			return proxy::getSource;
+		}
+
+		if (conversionService.canConvert(typeHint, DocumentPointer.class)) {
+			return conversionService.convert(value, DocumentPointer.class);
+		}
+
+		MongoPersistentEntity<?> persistentEntity = mappingContext
+				.getRequiredPersistentEntity(property.getAssociationTargetType());
+
+		if (usesDefaultLookup(property)) {
+
+			MongoPersistentProperty idProperty = persistentEntity.getRequiredIdProperty();
+			Object idValue = persistentEntity.getIdentifierAccessor(value).getIdentifier();
+
+			if (idProperty.hasExplicitWriteTarget()
+					&& conversionService.canConvert(idValue.getClass(), idProperty.getFieldType())) {
+				return () -> conversionService.convert(idValue, idProperty.getFieldType());
+			}
+
+			if (idValue instanceof String stringValue && ObjectId.isValid((String) idValue)) {
+				return () -> new ObjectId(stringValue);
+			}
+
+			return () -> idValue;
+		}
+
+		MongoPersistentEntity<?> valueEntity = mappingContext.getPersistentEntity(value.getClass());
+		PersistentPropertyAccessor<Object> propertyAccessor;
+		if (valueEntity == null) {
+			propertyAccessor = BeanWrapperPropertyAccessorFactory.INSTANCE.getPropertyAccessor(property.getOwner(), value);
+		} else {
+			propertyAccessor = valueEntity.getPropertyPathAccessor(value);
+		}
+
+		return cache.computeIfAbsent(property.getDocumentReference().lookup(), LinkageDocument::from)
+				.getDocumentPointer(mappingContext, persistentEntity, propertyAccessor);
+	}
+
+	@SuppressWarnings("NullAway")
+	private boolean usesDefaultLookup(MongoPersistentProperty property) {
+
+		if (property.isDocumentReference()) {
+			return DEFAULT_LOOKUP_PATTERN.matcher(property.getDocumentReference().lookup()).matches();
+		}
+
+		Reference atReference = property.findAnnotation(Reference.class);
+		if (atReference != null) {
+			return true;
+		}
+
+		throw new IllegalStateException(String.format("%s does not seem to be define Reference", property));
+	}
+
+	/**
+	 * Value object that computes a document pointer from a given lookup query by identifying SpEL expressions and
+	 * inverting it.
+	 *
+	 * <pre class="code">
+	 * // source
+	 * { 'firstname' : ?#{fn}, 'lastname' : '?#{ln} }
+	 *
+	 * // target
+	 * { 'fn' : ..., 'ln' : ... }
+	 * </pre>
+	 *
+	 * The actual pointer is the computed via
+	 * {@link #getDocumentPointer(MappingContext, MongoPersistentEntity, PersistentPropertyAccessor)} applying values from
+	 * the provided {@link PersistentPropertyAccessor} to the target document by looking at the keys of the expressions
+	 * from the source.
+	 */
+	static class LinkageDocument {
+
+		static final Pattern EXPRESSION_PATTERN = Pattern.compile("\\?#\\{#?(?<fieldName>[\\w\\d\\.\\-)]*)\\}");
+		static final Pattern PLACEHOLDER_PATTERN = Pattern.compile("###_(?<index>\\d*)_###");
+
+		private final String lookup;
+		private final org.bson.Document documentPointer;
+		private final Map<String, String> placeholderMap;
+		private final boolean isSimpleTargetPointer;
+
+		static LinkageDocument from(String lookup) {
+			return new LinkageDocument(lookup);
+		}
+
+		private LinkageDocument(String lookup) {
+
+			this.lookup = lookup;
+			this.placeholderMap = new LinkedHashMap<>();
+
+			int index = 0;
+			Matcher matcher = EXPRESSION_PATTERN.matcher(lookup);
+			String targetLookup = lookup;
+
+			while (matcher.find()) {
+
+				String expression = matcher.group();
+				String fieldName = matcher.group("fieldName").replace("target.", "");
+
+				String placeholder = placeholder(index);
+				placeholderMap.put(placeholder, fieldName);
+				targetLookup = targetLookup.replace(expression, "'" + placeholder + "'");
+				index++;
+			}
+
+			this.documentPointer = org.bson.Document.parse(targetLookup);
+			this.isSimpleTargetPointer = placeholderMap.size() == 1 && placeholderMap.containsValue("target")
+					&& lookup.contains("#target");
+		}
+
+		private String placeholder(int index) {
+			return "###_" + index + "_###";
+		}
+
+		private boolean isPlaceholder(String key) {
+			return PLACEHOLDER_PATTERN.matcher(key).matches();
+		}
+
+		DocumentPointer<Object> getDocumentPointer(
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+				MongoPersistentEntity<?> persistentEntity, PersistentPropertyAccessor<?> propertyAccessor) {
+			return () -> updatePlaceholders(documentPointer, new Document(), mappingContext, persistentEntity,
+					propertyAccessor);
+		}
+
+		Object updatePlaceholders(org.bson.Document source, org.bson.Document target,
+				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+				MongoPersistentEntity<?> persistentEntity, PersistentPropertyAccessor<?> propertyAccessor) {
+
+			for (Entry<String, Object> entry : source.entrySet()) {
+
+				if (entry.getKey().startsWith("$")) {
+					throw new InvalidDataAccessApiUsageException(String.format(
+							"Cannot derive document pointer from lookup '%s' using query operator (%s); Please consider registering a custom converter",
+							lookup, entry.getKey()));
+				}
+
+				if (entry.getValue() instanceof Document document) {
+
+					MongoPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(entry.getKey());
+					if (persistentProperty != null && persistentProperty.isEntity()) {
+
+						MongoPersistentEntity<?> nestedEntity = mappingContext.getRequiredPersistentEntity(persistentProperty.getType());
+						Object propertyValue = propertyAccessor.getProperty(persistentProperty);
+
+						if(propertyValue == null) {
+							target.put(entry.getKey(), propertyValue);
+						} else {
+							PersistentPropertyAccessor<?> nestedAccessor = nestedEntity.getPropertyAccessor(propertyValue);
+							target.put(entry.getKey(), updatePlaceholders(document, new Document(), mappingContext,
+								nestedEntity, nestedAccessor));
+						}
+					} else {
+						target.put(entry.getKey(), updatePlaceholders((Document) entry.getValue(), new Document(), mappingContext,
+								persistentEntity, propertyAccessor));
+					}
+					continue;
+				}
+
+				if (placeholderMap.containsKey(entry.getValue())) {
+
+					String attribute = placeholderMap.get(entry.getValue());
+					if (attribute.contains(".")) {
+						attribute = attribute.substring(attribute.lastIndexOf('.') + 1);
+					}
+
+					String fieldName = entry.getKey().equals(FieldName.ID.name()) ? "id" : entry.getKey();
+					if (!fieldName.contains(".")) {
+
+						Object targetValue = propertyAccessor.getProperty(persistentEntity.getRequiredPersistentProperty(fieldName));
+						target.put(attribute, targetValue);
+						continue;
+					}
+
+					PersistentPropertyPathAccessor<?> propertyPathAccessor = persistentEntity
+							.getPropertyPathAccessor(propertyAccessor.getBean());
+					PersistentPropertyPath<?> path = mappingContext
+							.getPersistentPropertyPath(PropertyPath.from(fieldName, persistentEntity.getTypeInformation()));
+					Object targetValue = propertyPathAccessor.getProperty(path);
+					target.put(attribute, targetValue);
+					continue;
+				}
+
+				target.put(entry.getKey(), entry.getValue());
+			}
+
+			if (target.size() == 1 && isSimpleTargetPointer) {
+				return target.values().iterator().next();
+			}
+
+			return target;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java
index 238601768e..a41e17c0ec 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentPropertyAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,11 +18,11 @@
 import java.util.Map;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.context.expression.MapAccessor;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.PropertyAccessor;
 import org.springframework.expression.TypedValue;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link PropertyAccessor} to allow entity based field access to {@link Document}s.
@@ -34,28 +34,16 @@ class DocumentPropertyAccessor extends MapAccessor {
 
 	static final MapAccessor INSTANCE = new DocumentPropertyAccessor();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.expression.MapAccessor#getSpecificTargetClasses()
-	 */
 	@Override
 	public Class<?>[] getSpecificTargetClasses() {
 		return new Class[] { Document.class };
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.expression.MapAccessor#canRead(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public boolean canRead(EvaluationContext context, @Nullable Object target, String name) {
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.expression.MapAccessor#read(org.springframework.expression.EvaluationContext, java.lang.Object, java.lang.String)
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public TypedValue read(EvaluationContext context, @Nullable Object target, String name) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentReferenceSource.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentReferenceSource.java
new file mode 100644
index 0000000000..b1e894efe9
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/DocumentReferenceSource.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
+
+/**
+ * The source object to resolve document references upon. Encapsulates the actual source and the reference specific
+ * values.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public class DocumentReferenceSource {
+
+	private final Object self;
+
+	private final @Nullable Object targetSource;
+
+	/**
+	 * Create a new instance of {@link DocumentReferenceSource}.
+	 *
+	 * @param self the entire wrapper object holding references. Must not be {@literal null}.
+	 * @param targetSource the reference value source.
+	 */
+	DocumentReferenceSource(Object self, @Nullable Object targetSource) {
+
+		this.self = self;
+		this.targetSource = targetSource;
+	}
+
+	/**
+	 * Get the outer document.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public Object getSelf() {
+		return self;
+	}
+
+	/**
+	 * Get the actual (property specific) reference value.
+	 *
+	 * @return can be {@literal null}.
+	 */
+	public @Nullable Object getTargetSource() {
+		return targetSource;
+	}
+
+	/**
+	 * Dereference a {@code targetSource} if it is a {@link DocumentReferenceSource} or return {@code source} otherwise.
+	 *
+	 * @param source
+	 * @return
+	 */
+	static @Nullable Object getTargetSource(@Nullable Object source) {
+		return source instanceof DocumentReferenceSource referenceSource ? referenceSource.getTargetSource() : source;
+	}
+
+	/**
+	 * Dereference a {@code self} object if it is a {@link DocumentReferenceSource} or return {@code self} otherwise.
+	 *
+	 * @param self
+	 * @return
+	 */
+	@Contract("null -> null")
+	static @Nullable Object getSelf(@Nullable Object self) {
+		return self instanceof DocumentReferenceSource referenceSource ? referenceSource.getSelf() : self;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java
index 788dde7b75..b595ab688f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/GeoConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,6 +24,8 @@
 import java.util.TreeMap;
 
 import org.bson.Document;
+
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
@@ -44,12 +46,11 @@
 import org.springframework.data.mongodb.core.geo.GeoJsonPolygon;
 import org.springframework.data.mongodb.core.geo.Sphere;
 import org.springframework.data.mongodb.core.query.GeoCommand;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
 
-import com.mongodb.BasicDBList;
 import com.mongodb.Function;
 
 /**
@@ -61,9 +62,9 @@
  * @author Thiago Diniz da Silveira
  * @since 1.5
  */
+@SuppressWarnings("ConstantConditions")
 abstract class GeoConverters {
 
-
 	private final static Map<String, Function<Document, GeoJson<?>>> converters;
 
 	static {
@@ -91,9 +92,8 @@ private GeoConverters() {}
 	/**
 	 * Returns the geo converters to be registered.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
-	@SuppressWarnings("unchecked")
 	public static Collection<? extends Object> getConvertersToRegister() {
 		return Arrays.asList( //
 				BoxToDocumentConverter.INSTANCE //
@@ -131,12 +131,9 @@ enum DocumentToPointConverter implements Converter<Document, Point> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Point convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Point convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
@@ -162,12 +159,9 @@ enum PointToDocumentConverter implements Converter<Point, Document> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Document convert(Point source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Document convert(@Nullable Point source) {
 			return source == null ? null : new Document("x", source.getX()).append("y", source.getY());
 		}
 	}
@@ -183,12 +177,9 @@ enum BoxToDocumentConverter implements Converter<Box, Document> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Document convert(Box source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Document convert(@Nullable Box source) {
 
 			if (source == null) {
 				return null;
@@ -212,12 +203,10 @@ enum DocumentToBoxConverter implements Converter<Document, Box> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Box convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		@SuppressWarnings("NullAway")
+		public @Nullable Box convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
@@ -240,12 +229,9 @@ enum CircleToDocumentConverter implements Converter<Circle, Document> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Document convert(Circle source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Document convert(@Nullable Circle source) {
 
 			if (source == null) {
 				return null;
@@ -266,16 +252,13 @@ public Document convert(Circle source) {
 	 * @since 1.5
 	 */
 	@ReadingConverter
-	static enum DocumentToCircleConverter implements Converter<Document, Circle> {
+	enum DocumentToCircleConverter implements Converter<Document, Circle> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Circle convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Circle convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
@@ -284,15 +267,15 @@ public Circle convert(Document source) {
 			Document center = (Document) source.get("center");
 			Number radius = (Number) source.get("radius");
 
-			Assert.notNull(center, "Center must not be null!");
-			Assert.notNull(radius, "Radius must not be null!");
+			Assert.notNull(center, "Center must not be null");
+			Assert.notNull(radius, "Radius must not be null");
 
-			Distance distance = new Distance(toPrimitiveDoubleValue(radius));
+			Distance distance = Distance.of(toPrimitiveDoubleValue(radius));
 
 			if (source.containsKey("metric")) {
 
 				String metricString = (String) source.get("metric");
-				Assert.notNull(metricString, "Metric must not be null!");
+				Assert.notNull(metricString, "Metric must not be null");
 
 				distance = distance.in(Metrics.valueOf(metricString));
 			}
@@ -307,16 +290,13 @@ public Circle convert(Document source) {
 	 * @author Thomas Darimont
 	 * @since 1.5
 	 */
-	static enum SphereToDocumentConverter implements Converter<Sphere, Document> {
+	enum SphereToDocumentConverter implements Converter<Sphere, Document> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Document convert(Sphere source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Document convert(@Nullable Sphere source) {
 
 			if (source == null) {
 				return null;
@@ -341,12 +321,9 @@ enum DocumentToSphereConverter implements Converter<Document, Sphere> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Sphere convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Sphere convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
@@ -355,15 +332,15 @@ public Sphere convert(Document source) {
 			Document center = (Document) source.get("center");
 			Number radius = (Number) source.get("radius");
 
-			Assert.notNull(center, "Center must not be null!");
-			Assert.notNull(radius, "Radius must not be null!");
+			Assert.notNull(center, "Center must not be null");
+			Assert.notNull(radius, "Radius must not be null");
 
-			Distance distance = new Distance(toPrimitiveDoubleValue(radius));
+			Distance distance = Distance.of(toPrimitiveDoubleValue(radius));
 
 			if (source.containsKey("metric")) {
 
 				String metricString = (String) source.get("metric");
-				Assert.notNull(metricString, "Metric must not be null!");
+				Assert.notNull(metricString, "Metric must not be null");
 
 				distance = distance.in(Metrics.valueOf(metricString));
 			}
@@ -382,12 +359,9 @@ enum PolygonToDocumentConverter implements Converter<Polygon, Document> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Document convert(Polygon source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Document convert(@Nullable Polygon source) {
 
 			if (source == null) {
 				return null;
@@ -417,24 +391,22 @@ enum DocumentToPolygonConverter implements Converter<Document, Polygon> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		@SuppressWarnings({ "unchecked" })
-		public Polygon convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Polygon convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			List<Document> points = (List<Document>) source.get("points");
-			List<Point> newPoints = new ArrayList<>(points.size());
+			Assert.notNull(points, "Points elements of polygon must not be null");
 
+			List<Point> newPoints = new ArrayList<>(points.size());
 			for (Document element : points) {
 
-				Assert.notNull(element, "Point elements of polygon must not be null!");
+				Assert.notNull(element, "Point elements of polygon must not contain null");
 				newPoints.add(DocumentToPointConverter.INSTANCE.convert(element));
 			}
 
@@ -452,51 +424,45 @@ enum GeoCommandToDocumentConverter implements Converter<GeoCommand, Document> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		@SuppressWarnings("rawtypes")
-		public Document convert(GeoCommand source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Document convert(@Nullable GeoCommand source) {
 
 			if (source == null) {
 				return null;
 			}
 
-			List argument = new ArrayList();
+			List<Object> argument = new ArrayList<>(2);
 
 			Shape shape = source.getShape();
 
-			if (shape instanceof GeoJson) {
-				return GeoJsonToDocumentConverter.INSTANCE.convert((GeoJson) shape);
+			if (shape instanceof GeoJson geoJson) {
+				return GeoJsonToDocumentConverter.INSTANCE.convert(geoJson);
 			}
 
-			if (shape instanceof Box) {
-
-				argument.add(toList(((Box) shape).getFirst()));
-				argument.add(toList(((Box) shape).getSecond()));
+			if (shape instanceof Box box) {
 
-			} else if (shape instanceof Circle) {
+				argument.add(toList(box.getFirst()));
+				argument.add(toList(box.getSecond()));
 
-				argument.add(toList(((Circle) shape).getCenter()));
-				argument.add(((Circle) shape).getRadius().getNormalizedValue());
+			} else if (shape instanceof Circle circle) {
 
-			} else if (shape instanceof Circle) {
+				argument.add(toList(circle.getCenter()));
+				argument.add(circle.getRadius().getNormalizedValue());
 
-				argument.add(toList(((Circle) shape).getCenter()));
-				argument.add(((Circle) shape).getRadius());
+			} else if (shape instanceof Polygon polygon) {
 
-			} else if (shape instanceof Polygon) {
-
-				for (Point point : ((Polygon) shape).getPoints()) {
+				List<Point> points = polygon.getPoints();
+				argument = new ArrayList<>(points.size());
+				for (Point point : points) {
 					argument.add(toList(point));
 				}
 
-			} else if (shape instanceof Sphere) {
+			} else if (shape instanceof Sphere sphere) {
 
-				argument.add(toList(((Sphere) shape).getCenter()));
-				argument.add(((Sphere) shape).getRadius().getNormalizedValue());
+				argument.add(toList(sphere.getCenter()));
+				argument.add(sphere.getRadius().getNormalizedValue());
 			}
 
 			return new Document(source.getCommand(), argument);
@@ -507,17 +473,13 @@ public Document convert(GeoCommand source) {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	@SuppressWarnings("rawtypes")
-	enum GeoJsonToDocumentConverter implements Converter<GeoJson, Document> {
+	enum GeoJsonToDocumentConverter implements Converter<GeoJson<?>, Document> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Document convert(GeoJson source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable Document convert(@Nullable GeoJson<?> source) {
 
 			if (source == null) {
 				return null;
@@ -525,42 +487,42 @@ public Document convert(GeoJson source) {
 
 			Document dbo = new Document("type", source.getType());
 
-			if (source instanceof GeoJsonGeometryCollection) {
+			if (source instanceof GeoJsonGeometryCollection collection) {
 
-				List dbl = new ArrayList();
+				List<Object> dbl = new ArrayList<>();
 
-				for (GeoJson geometry : ((GeoJsonGeometryCollection) source).getCoordinates()) {
+				for (GeoJson<?> geometry : collection.getCoordinates()) {
 					dbl.add(convert(geometry));
 				}
 
 				dbo.put("geometries", dbl);
 
 			} else {
-				dbo.put("coordinates", convertIfNecessarry(source.getCoordinates()));
+				dbo.put("coordinates", convertIfNecessary(source.getCoordinates()));
 			}
 
 			return dbo;
 		}
 
-		private Object convertIfNecessarry(Object candidate) {
+		private Object convertIfNecessary(Object candidate) {
 
-			if (candidate instanceof GeoJson) {
-				return convertIfNecessarry(((GeoJson) candidate).getCoordinates());
+			if (candidate instanceof GeoJson<?> geoJson) {
+				return convertIfNecessary(geoJson.getCoordinates());
 			}
 
-			if (candidate instanceof Iterable) {
+			if (candidate instanceof Iterable<?> iterable) {
 
-				List dbl = new ArrayList();
+				List<Object> dbl = new ArrayList<>();
 
-				for (Object element : (Iterable) candidate) {
-					dbl.add(convertIfNecessarry(element));
+				for (Object element : iterable) {
+					dbl.add(convertIfNecessary(element));
 				}
 
 				return dbl;
 			}
 
-			if (candidate instanceof Point) {
-				return toList((Point) candidate);
+			if (candidate instanceof Point point) {
+				return toList(point);
 			}
 
 			return candidate;
@@ -575,10 +537,6 @@ enum GeoJsonPointToDocumentConverter implements Converter<GeoJsonPoint, Document
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public Document convert(GeoJsonPoint source) {
 			return GeoJsonToDocumentConverter.INSTANCE.convert(source);
@@ -593,10 +551,6 @@ enum GeoJsonPolygonToDocumentConverter implements Converter<GeoJsonPolygon, Docu
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public Document convert(GeoJsonPolygon source) {
 			return GeoJsonToDocumentConverter.INSTANCE.convert(source);
@@ -611,22 +565,22 @@ enum DocumentToGeoJsonPointConverter implements Converter<Document, GeoJsonPoint
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		@SuppressWarnings("unchecked")
-		public GeoJsonPoint convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable GeoJsonPoint convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "Point"),
-					String.format("Cannot convert type '%s' to Point.", source.get("type")));
+					String.format("Cannot convert type '%s' to Point", source.get("type")));
 
-			List<Number> dbl = (List<Number>) source.get("coordinates");
+			if(!(source.get("coordinates") instanceof List<?> sourceCoordinates)) {
+				throw new IllegalArgumentException("Coordinates need to be present");
+			}
+			List<Number> dbl = (List<Number>) sourceCoordinates;
 			return new GeoJsonPoint(toPrimitiveDoubleValue(dbl.get(0)), toPrimitiveDoubleValue(dbl.get(1)));
 		}
 	}
@@ -639,21 +593,18 @@ enum DocumentToGeoJsonPolygonConverter implements Converter<Document, GeoJsonPol
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public GeoJsonPolygon convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable GeoJsonPolygon convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "Polygon"),
-					String.format("Cannot convert type '%s' to Polygon.", source.get("type")));
+					String.format("Cannot convert type '%s' to Polygon", source.get("type")));
 
-			return toGeoJsonPolygon((List) source.get("coordinates"));
+			return toGeoJsonPolygon((List<?>) source.get("coordinates"));
 		}
 	}
 
@@ -661,29 +612,27 @@ public GeoJsonPolygon convert(Document source) {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
-	static enum DocumentToGeoJsonMultiPolygonConverter implements Converter<Document, GeoJsonMultiPolygon> {
+	enum DocumentToGeoJsonMultiPolygonConverter implements Converter<Document, GeoJsonMultiPolygon> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public GeoJsonMultiPolygon convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable GeoJsonMultiPolygon convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "MultiPolygon"),
-					String.format("Cannot convert type '%s' to MultiPolygon.", source.get("type")));
+					String.format("Cannot convert type '%s' to MultiPolygon", source.get("type")));
 
-			List dbl = (List) source.get("coordinates");
-			List<GeoJsonPolygon> polygones = new ArrayList<>();
+			List<?> dbl = (List<?>) source.get("coordinates");
+			Assert.notNull(dbl, "Source needs to contain coordinates");
 
+			List<GeoJsonPolygon> polygones = new ArrayList<>(dbl.size());
 			for (Object polygon : dbl) {
-				polygones.add(toGeoJsonPolygon((List) polygon));
+				polygones.add(toGeoJsonPolygon((List<?>) polygon));
 			}
 
 			return new GeoJsonMultiPolygon(polygones);
@@ -698,21 +647,18 @@ enum DocumentToGeoJsonLineStringConverter implements Converter<Document, GeoJson
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public GeoJsonLineString convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable GeoJsonLineString convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "LineString"),
-					String.format("Cannot convert type '%s' to LineString.", source.get("type")));
+					String.format("Cannot convert type '%s' to LineString", source.get("type")));
 
-			List cords = (List) source.get("coordinates");
+			List<?> cords = (List<?>) source.get("coordinates");
 
 			return new GeoJsonLineString(toListOfPoint(cords));
 		}
@@ -726,21 +672,18 @@ enum DocumentToGeoJsonMultiPointConverter implements Converter<Document, GeoJson
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public GeoJsonMultiPoint convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable GeoJsonMultiPoint convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "MultiPoint"),
-					String.format("Cannot convert type '%s' to MultiPoint.", source.get("type")));
+					String.format("Cannot convert type '%s' to MultiPoint", source.get("type")));
 
-			List cords = (List) source.get("coordinates");
+			List<?> cords = (List<?>) source.get("coordinates");
 
 			return new GeoJsonMultiPoint(toListOfPoint(cords));
 		}
@@ -754,25 +697,25 @@ enum DocumentToGeoJsonMultiLineStringConverter implements Converter<Document, Ge
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public GeoJsonMultiLineString convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable GeoJsonMultiLineString convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "MultiLineString"),
-					String.format("Cannot convert type '%s' to MultiLineString.", source.get("type")));
+					String.format("Cannot convert type '%s' to MultiLineString", source.get("type")));
 
-			List<GeoJsonLineString> lines = new ArrayList<GeoJsonLineString>();
-			List cords = (List) source.get("coordinates");
+			if(!(source.get("coordinates") instanceof List<?> coordinates)) {
+				throw new IllegalArgumentException("coordinates need to be present");
+			}
+			
+			List<GeoJsonLineString> lines = new ArrayList<>(coordinates.size());
 
-			for (Object line : cords) {
-				lines.add(new GeoJsonLineString(toListOfPoint((List) line)));
+			for (Object line : coordinates) {
+				lines.add(new GeoJsonLineString(toListOfPoint((List<?>) line)));
 			}
 			return new GeoJsonMultiLineString(lines);
 		}
@@ -786,23 +729,23 @@ enum DocumentToGeoJsonGeometryCollectionConverter implements Converter<Document,
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@SuppressWarnings("rawtypes")
 		@Override
-		public GeoJsonGeometryCollection convert(Document source) {
+		@Contract("null -> null; !null -> !null")
+		public @Nullable GeoJsonGeometryCollection convert(@Nullable Document source) {
 
 			if (source == null) {
 				return null;
 			}
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(source.get("type"), "GeometryCollection"),
-					String.format("Cannot convert type '%s' to GeometryCollection.", source.get("type")));
+					String.format("Cannot convert type '%s' to GeometryCollection", source.get("type")));
 
-			List<GeoJson<?>> geometries = new ArrayList<>();
-			for (Object o : (List) source.get("geometries")) {
+			if(!(source.get("geometries") instanceof List<?> sourceGeometries)) {
+				throw new IllegalArgumentException("Geometries need to be present");
+			}
+			
+			List<GeoJson<?>> geometries = new ArrayList<>(sourceGeometries.size());
+			for (Object o : sourceGeometries) {
 				geometries.add(toGenericGeoJson((Document) o));
 			}
 
@@ -815,16 +758,19 @@ static List<Double> toList(Point point) {
 	}
 
 	/**
-	 * Converts a coordinate pairs nested in in {@link BasicDBList} into {@link GeoJsonPoint}s.
+	 * Converts a coordinate pairs nested in {@link List} into {@link GeoJsonPoint}s.
 	 *
-	 * @param listOfCoordinatePairs
-	 * @return
+	 * @param listOfCoordinatePairs must not be {@literal null}.
+	 * @return never {@literal null}.
 	 * @since 1.7
 	 */
 	@SuppressWarnings("unchecked")
-	static List<Point> toListOfPoint(List listOfCoordinatePairs) {
+	@Contract("null -> fail")
+	static List<Point> toListOfPoint(@Nullable List<?> listOfCoordinatePairs) {
+
+		Assert.notNull(listOfCoordinatePairs, "ListOfCoordinatePairs must not be null");
 
-		List<Point> points = new ArrayList<>();
+		List<Point> points = new ArrayList<>(listOfCoordinatePairs.size());
 
 		for (Object point : listOfCoordinatePairs) {
 
@@ -839,14 +785,19 @@ static List<Point> toListOfPoint(List listOfCoordinatePairs) {
 	}
 
 	/**
-	 * Converts a coordinate pairs nested in in {@link BasicDBList} into {@link GeoJsonPolygon}.
+	 * Converts a coordinate pairs nested in {@link List} into {@link GeoJsonPolygon}.
 	 *
-	 * @param dbList
-	 * @return
+	 * @param dbList must not be {@literal null}.
+	 * @return never {@literal null}.
 	 * @since 1.7
 	 */
-	static GeoJsonPolygon toGeoJsonPolygon(List dbList) {
-		return new GeoJsonPolygon(toListOfPoint((List) dbList.get(0)));
+	@Contract("null -> fail")
+	static GeoJsonPolygon toGeoJsonPolygon(@Nullable List<?> dbList) {
+
+		Assert.notNull(dbList, "DbList must not be null");
+
+		GeoJsonPolygon polygon = new GeoJsonPolygon(toListOfPoint((List<?>) dbList.get(0)));
+		return dbList.size() > 1 ? polygon.withInnerRing(toListOfPoint((List<?>) dbList.get(1))) : polygon;
 	}
 
 	/**
@@ -857,17 +808,11 @@ static GeoJsonPolygon toGeoJsonPolygon(List dbList) {
 	 * @author Christoph Strobl
 	 */
 	@ReadingConverter
-	enum DocumentToGeoJsonConverter implements Converter<Document, GeoJson> {
+	enum DocumentToGeoJsonConverter implements Converter<Document, GeoJson<?>> {
 		INSTANCE;
 
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
-		@Nullable
 		@Override
-		public GeoJson convert(Document source) {
+		public GeoJson<?> convert(Document source) {
 			return toGenericGeoJson(source);
 		}
 	}
@@ -876,22 +821,22 @@ private static GeoJson<?> toGenericGeoJson(Document source) {
 
 		String type = source.get("type", String.class);
 
-		if(type != null) {
+		if (type != null) {
 
 			Function<Document, GeoJson<?>> converter = converters.get(type);
 
-			if(converter != null){
+			if (converter != null) {
 				return converter.apply(source);
 			}
 		}
 
-		throw new IllegalArgumentException(
-				String.format("No converter found capable of converting GeoJson type %s.", type));
+		throw new IllegalArgumentException(String.format("No converter found capable of converting GeoJson type %s", type));
 	}
 
-	private static double toPrimitiveDoubleValue(Object value) {
+	@Contract("null -> fail")
+	private static double toPrimitiveDoubleValue(@Nullable Object value) {
 
-		Assert.isInstanceOf(Number.class, value, "Argument must be a Number.");
-		return NumberUtils.convertNumberToTargetClass((Number) value, Double.class).doubleValue();
+		Assert.isInstanceOf(Number.class, value, "Argument must be a Number");
+		return NumberUtils.convertNumberToTargetClass((Number) value, Double.class);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/JsonSchemaMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/JsonSchemaMapper.java
index 3f88d5e055..0afba67025 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/JsonSchemaMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/JsonSchemaMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/LazyLoadingProxy.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/LazyLoadingProxy.java
index ba189d0b94..6329d74d4f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/LazyLoadingProxy.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/LazyLoadingProxy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,18 +15,18 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.LazyLoadingInterceptor;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 import com.mongodb.DBRef;
 
 /**
- * Allows direct interaction with the underlying {@link LazyLoadingInterceptor}.
+ * Allows direct interaction with the underlying {@code LazyLoadingInterceptor}.
  *
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
  * @since 1.5
+ * @see LazyLoadingProxyFactory
  */
 public interface LazyLoadingProxy {
 
@@ -46,4 +46,14 @@ public interface LazyLoadingProxy {
 	 */
 	@Nullable
 	DBRef toDBRef();
+
+	/**
+	 * Returns the raw {@literal source} object that defines the reference.
+	 *
+	 * @return can be {@literal null}.
+	 * @since 3.3
+	 */
+	default @Nullable Object getSource() {
+		return toDBRef();
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/LazyLoadingProxyFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/LazyLoadingProxyFactory.java
new file mode 100644
index 0000000000..eff58e7bd4
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/LazyLoadingProxyFactory.java
@@ -0,0 +1,385 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import static org.springframework.util.ReflectionUtils.*;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+import java.util.function.Supplier;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.cglib.core.SpringNamingPolicy;
+import org.springframework.cglib.proxy.Callback;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.Factory;
+import org.springframework.cglib.proxy.MethodProxy;
+import org.springframework.dao.DataAccessException;
+import org.springframework.dao.support.PersistenceExceptionTranslator;
+import org.springframework.data.mongodb.ClientSessionException;
+import org.springframework.data.mongodb.LazyLoadingException;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.Lock;
+import org.springframework.data.util.Lock.AcquiredLock;
+import org.springframework.objenesis.SpringObjenesis;
+import org.springframework.util.ReflectionUtils;
+
+import com.mongodb.DBRef;
+
+/**
+ * {@link ProxyFactory} to create a proxy for {@link MongoPersistentProperty#getType()} to resolve a reference lazily.
+ * <strong>NOTE:</strong> This class is intended for internal usage only.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+public final class LazyLoadingProxyFactory {
+
+	private static final Log LOGGER = LogFactory.getLog(LazyLoadingProxyFactory.class);
+
+	private final SpringObjenesis objenesis;
+
+	private final PersistenceExceptionTranslator exceptionTranslator;
+
+	private LazyLoadingProxyFactory() {
+		this(ex -> null);
+	}
+
+	public LazyLoadingProxyFactory(PersistenceExceptionTranslator exceptionTranslator) {
+		this.exceptionTranslator = exceptionTranslator;
+		this.objenesis = new SpringObjenesis(null);
+	}
+
+	/**
+	 * Predict the proxy target type. This will advice the infrastructure to resolve as many pieces as possible in a
+	 * potential AOT scenario without necessarily resolving the entire object.
+	 *
+	 * @param propertyType the type to proxy
+	 * @param interceptor the interceptor to be added.
+	 * @return the proxy type.
+	 * @since 4.0
+	 */
+	public static Class<?> resolveProxyType(Class<?> propertyType, Supplier<LazyLoadingInterceptor> interceptor) {
+
+		LazyLoadingProxyFactory factory = new LazyLoadingProxyFactory();
+
+		if (!propertyType.isInterface()) {
+			return factory.getEnhancedTypeFor(propertyType);
+		}
+
+		return factory.prepareProxyFactory(propertyType, interceptor)
+				.getProxyClass(LazyLoadingProxy.class.getClassLoader());
+	}
+
+	/**
+	 * Create the {@link ProxyFactory} for the given type, already adding required additional interfaces.
+	 *
+	 * @param targetType the type to proxy.
+	 * @return the prepared {@link ProxyFactory}.
+	 * @since 4.0.5
+	 */
+	public static ProxyFactory prepareFactory(Class<?> targetType) {
+
+		ProxyFactory proxyFactory = new ProxyFactory();
+
+		for (Class<?> type : targetType.getInterfaces()) {
+			proxyFactory.addInterface(type);
+		}
+
+		proxyFactory.addInterface(LazyLoadingProxy.class);
+		proxyFactory.addInterface(targetType);
+
+		return proxyFactory;
+	}
+
+	private ProxyFactory prepareProxyFactory(Class<?> propertyType, Supplier<LazyLoadingInterceptor> interceptor) {
+
+		ProxyFactory proxyFactory = prepareFactory(propertyType);
+		proxyFactory.addAdvice(interceptor.get());
+
+		return proxyFactory;
+	}
+
+	public Object createLazyLoadingProxy(MongoPersistentProperty property, DbRefResolverCallback callback,
+			@Nullable Object source) {
+
+		Class<?> propertyType = property.getType();
+		LazyLoadingInterceptor interceptor = new LazyLoadingInterceptor(property, callback, source, exceptionTranslator);
+
+		if (!propertyType.isInterface()) {
+
+			Factory factory = (Factory) objenesis.newInstance(getEnhancedTypeFor(propertyType));
+			factory.setCallbacks(new Callback[] { interceptor });
+
+			return factory;
+		}
+
+		return prepareProxyFactory(propertyType,
+				() -> new LazyLoadingInterceptor(property, callback, source, exceptionTranslator))
+						.getProxy(LazyLoadingProxy.class.getClassLoader());
+	}
+
+	/**
+	 * Returns the CGLib enhanced type for the given source type.
+	 *
+	 * @param type
+	 * @return
+	 */
+	private Class<?> getEnhancedTypeFor(Class<?> type) {
+
+		Enhancer enhancer = new Enhancer();
+		enhancer.setSuperclass(type);
+		enhancer.setCallbackType(LazyLoadingInterceptor.class);
+		enhancer.setInterfaces(new Class[] { LazyLoadingProxy.class });
+		enhancer.setNamingPolicy(SpringNamingPolicy.INSTANCE);
+		enhancer.setAttemptLoad(true);
+
+		return enhancer.createClass();
+	}
+
+	@NullUnmarked
+	public static class LazyLoadingInterceptor
+			implements MethodInterceptor, org.springframework.cglib.proxy.MethodInterceptor, Serializable {
+
+		private static final Method INITIALIZE_METHOD, TO_DBREF_METHOD, FINALIZE_METHOD, GET_SOURCE_METHOD;
+
+		static {
+			try {
+				INITIALIZE_METHOD = LazyLoadingProxy.class.getMethod("getTarget");
+				TO_DBREF_METHOD = LazyLoadingProxy.class.getMethod("toDBRef");
+				FINALIZE_METHOD = Object.class.getDeclaredMethod("finalize");
+				GET_SOURCE_METHOD = LazyLoadingProxy.class.getMethod("getSource");
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+
+		private final ReadWriteLock rwLock = new ReentrantReadWriteLock();
+		private final Lock readLock = Lock.of(rwLock.readLock());
+		private final Lock writeLock = Lock.of(rwLock.writeLock());
+
+		private final @Nullable MongoPersistentProperty property;
+		private final @Nullable DbRefResolverCallback callback;
+		private final @Nullable Object source;
+		private final @Nullable PersistenceExceptionTranslator exceptionTranslator;
+		private volatile boolean resolved;
+		private @Nullable Object result;
+
+		/**
+		 * @return a {@link LazyLoadingInterceptor} that just continues with the invocation.
+		 * @since 4.0
+		 */
+		@SuppressWarnings("NullAway")
+		public static LazyLoadingInterceptor none() {
+
+			return new LazyLoadingInterceptor(null, null, null, null) {
+				@Override
+				public @Nullable Object invoke(MethodInvocation invocation) throws Throwable {
+					return intercept(invocation.getThis(), invocation.getMethod(), invocation.getArguments(), null);
+				}
+
+				@Override
+				public @Nullable Object intercept(Object o, Method method, @Nullable Object @Nullable[] args, @Nullable MethodProxy proxy) throws Throwable {
+
+					ReflectionUtils.makeAccessible(method);
+					return method.invoke(o, args);
+				}
+			};
+		}
+
+		public LazyLoadingInterceptor(@Nullable MongoPersistentProperty property, @Nullable DbRefResolverCallback callback, @Nullable Object source,
+			@Nullable PersistenceExceptionTranslator exceptionTranslator) {
+
+			this.property = property;
+			this.callback = callback;
+			this.source = source;
+			this.exceptionTranslator = exceptionTranslator;
+		}
+
+		@Override
+		public @Nullable Object invoke(MethodInvocation invocation) throws Throwable {
+			return intercept(invocation.getThis(), invocation.getMethod(), invocation.getArguments(), null);
+		}
+
+		@Override
+		public @Nullable Object intercept(Object o, Method method, @Nullable Object @Nullable[] args, @Nullable MethodProxy proxy) throws Throwable {
+
+			if (INITIALIZE_METHOD.equals(method)) {
+				return ensureResolved();
+			}
+
+			if (TO_DBREF_METHOD.equals(method)) {
+				return source instanceof DBRef ? source : null;
+			}
+
+			if (GET_SOURCE_METHOD.equals(method)) {
+				return source;
+			}
+
+			if (isObjectMethod(method) && Object.class.equals(method.getDeclaringClass())) {
+
+				if (ReflectionUtils.isToStringMethod(method)) {
+					return proxyToString(source);
+				}
+
+				if (ReflectionUtils.isEqualsMethod(method) && args != null) {
+					return proxyEquals(o, args[0]);
+				}
+
+				if (ReflectionUtils.isHashCodeMethod(method)) {
+					return proxyHashCode();
+				}
+
+				// DATAMONGO-1076 - finalize methods should not trigger proxy initialization
+				if (FINALIZE_METHOD.equals(method)) {
+					return null;
+				}
+			}
+
+			Object target = ensureResolved();
+
+			if (target == null) {
+				return null;
+			}
+
+			ReflectionUtils.makeAccessible(method);
+
+			return method.invoke(target, args);
+		}
+
+		@Nullable
+		private Object ensureResolved() {
+
+			if (!resolved) {
+				this.result = resolve();
+				this.resolved = true;
+			}
+
+			return this.result;
+		}
+
+		private String proxyToString(@Nullable Object source) {
+
+			StringBuilder description = new StringBuilder();
+			if (source != null) {
+				if (source instanceof DBRef dbRef) {
+					description.append(dbRef.getCollectionName());
+					description.append(":");
+					description.append(dbRef.getId());
+				} else {
+					description.append(source);
+				}
+			} else {
+				description.append(0);
+			}
+			description.append("$").append(LazyLoadingProxy.class.getSimpleName());
+
+			return description.toString();
+		}
+
+		private boolean proxyEquals(@Nullable Object proxy, Object that) {
+
+			if (!(that instanceof LazyLoadingProxy)) {
+				return false;
+			}
+
+			if (that == proxy) {
+				return true;
+			}
+
+			return proxyToString(proxy).equals(that.toString());
+		}
+
+		private int proxyHashCode() {
+			return proxyToString(source).hashCode();
+		}
+
+		/**
+		 * Callback method for serialization.
+		 *
+		 * @param out
+		 * @throws IOException
+		 */
+		private void writeObject(ObjectOutputStream out) throws IOException {
+
+			ensureResolved();
+			out.writeObject(this.result);
+		}
+
+		/**
+		 * Callback method for deserialization.
+		 *
+		 * @param in
+		 * @throws IOException
+		 */
+		private void readObject(ObjectInputStream in) throws IOException {
+
+			try {
+				this.resolved = true;
+				this.result = in.readObject();
+			} catch (ClassNotFoundException e) {
+				throw new LazyLoadingException("Could not deserialize result", e);
+			}
+		}
+
+		@SuppressWarnings("NullAway")
+		private @Nullable Object resolve() {
+
+			try (AcquiredLock l = readLock.lock()) {
+				if (resolved) {
+
+					if (LOGGER.isTraceEnabled()) {
+						LOGGER.trace(String.format("Accessing already resolved lazy loading property %s.%s",
+								property.getOwner() != null ? property.getOwner().getName() : "unknown", property.getName()));
+					}
+					return result;
+				}
+			}
+
+			if (LOGGER.isTraceEnabled()) {
+				LOGGER.trace(String.format("Resolving lazy loading property %s.%s",
+						property.getOwner() != null ? property.getOwner().getName() : "unknown", property.getName()));
+			}
+
+			try {
+				return writeLock.execute(() -> callback.resolve(property));
+			} catch (RuntimeException ex) {
+
+				DataAccessException translatedException =  exceptionTranslator != null ? exceptionTranslator.translateExceptionIfPossible(ex) : null;
+
+				if (translatedException instanceof ClientSessionException) {
+					throw new LazyLoadingException("Unable to lazily resolve DBRef; Invalid session state", ex);
+				}
+
+				throw new LazyLoadingException("Unable to lazily resolve DBRef",
+						translatedException != null ? translatedException : ex);
+			}
+		}
+
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
index 1721bd0d81..24c3c2f590 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MappingMongoConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,54 +25,83 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Set;
+import java.util.function.BiPredicate;
+import java.util.stream.Collectors;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
 import org.bson.codecs.Codec;
 import org.bson.codecs.DecoderContext;
+import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 import org.bson.json.JsonReader;
 import org.bson.types.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.CollectionFactory;
+import org.springframework.core.ResolvableType;
 import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.data.convert.EntityInstantiator;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.EnvironmentCapable;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.annotation.Reference;
+import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.convert.PropertyValueConversions;
+import org.springframework.data.convert.PropertyValueConverter;
 import org.springframework.data.convert.TypeMapper;
+import org.springframework.data.convert.ValueConversionContext;
 import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.InstanceCreatorMetadata;
 import org.springframework.data.mapping.MappingException;
+import org.springframework.data.mapping.Parameter;
+import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.PreferredConstructor;
-import org.springframework.data.mapping.PreferredConstructor.Parameter;
+import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.CachingValueExpressionEvaluatorFactory;
 import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
-import org.springframework.data.mapping.model.DefaultSpELExpressionEvaluator;
+import org.springframework.data.mapping.model.EntityInstantiator;
 import org.springframework.data.mapping.model.ParameterValueProvider;
 import org.springframework.data.mapping.model.PersistentEntityParameterValueProvider;
 import org.springframework.data.mapping.model.PropertyValueProvider;
 import org.springframework.data.mapping.model.SpELContext;
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
-import org.springframework.data.mapping.model.SpELExpressionParameterValueProvider;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.data.mapping.model.ValueExpressionParameterValueProvider;
 import org.springframework.data.mongodb.CodecRegistryProvider;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.DocumentPointer;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.PersistentPropertyTranslator;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
+import org.springframework.data.mongodb.core.mapping.Unwrapped.OnEmpty;
+import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
 import org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent;
 import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
 import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.util.Predicates;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.BasicDBList;
 import com.mongodb.BasicDBObject;
@@ -90,25 +119,59 @@
  * @author Christoph Strobl
  * @author Jordi Llach
  * @author Mark Paluch
+ * @author Roman Puchkovskiy
+ * @author Heesu Jung
+ * @author Divya Srivastava
+ * @author Julia Lee
  */
-public class MappingMongoConverter extends AbstractMongoConverter implements ApplicationContextAware, ValueResolver {
+public class MappingMongoConverter extends AbstractMongoConverter
+		implements ApplicationContextAware, EnvironmentCapable {
 
-	private static final String INCOMPATIBLE_TYPES = "Cannot convert %1$s of type %2$s into an instance of %3$s! Implement a custom Converter<%2$s, %3$s> and register it with the CustomConversions. Parent object was: %4$s";
-	private static final String INVALID_TYPE_TO_READ = "Expected to read Document %s into type %s but didn't find a PersistentEntity for the latter!";
+	private static final String INCOMPATIBLE_TYPES = "Cannot convert %1$s of type %2$s into an instance of %3$s; Implement a custom Converter<%2$s, %3$s> and register it with the CustomConversions; Parent object was: %4$s";
+	private static final String INVALID_TYPE_TO_READ = "Expected to read Document %s into type %s but didn't find a PersistentEntity for the latter";
 
-	protected static final Logger LOGGER = LoggerFactory.getLogger(MappingMongoConverter.class);
+	private static final BiPredicate<MongoPersistentEntity<?>, MongoPersistentProperty> PROPERTY_FILTER = (e,
+			property) -> {
+
+		if (e.isIdProperty(property)) {
+			return false;
+		}
+
+		if (e.isCreatorArgument(property)) {
+			return false;
+		}
+
+		if (!property.isReadable()) {
+			return false;
+		}
+		return true;
+	};
+
+	public static final TypeInformation<Bson> BSON = TypeInformation.of(Bson.class);
+
+	protected static final Log LOGGER = LogFactory.getLog(MappingMongoConverter.class);
 
 	protected final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	protected final QueryMapper idMapper;
 	protected final DbRefResolver dbRefResolver;
 	protected final DefaultDbRefProxyHandler dbRefProxyHandler;
+	protected final ReferenceLookupDelegate referenceLookupDelegate;
 
 	protected @Nullable ApplicationContext applicationContext;
-	protected MongoTypeMapper typeMapper;
+	protected @Nullable Environment environment;
+	protected @Nullable MongoTypeMapper typeMapper;
 	protected @Nullable String mapKeyDotReplacement = null;
 	protected @Nullable CodecRegistryProvider codecRegistryProvider;
 
+	private MongoTypeMapper defaultTypeMapper;
 	private SpELContext spELContext;
+	private @Nullable EntityCallbacks entityCallbacks;
+	private final SpelExpressionParser expressionParser = new SpelExpressionParser();
+	private final DocumentPointerFactory documentPointerFactory;
+	private final SpelAwareProxyProjectionFactory projectionFactory = new SpelAwareProxyProjectionFactory(
+			expressionParser);
+	private final CachingValueExpressionEvaluatorFactory expressionEvaluatorFactory = new CachingValueExpressionEvaluatorFactory(
+			expressionParser, this, o -> spELContext.getEvaluationContext(o));
 
 	/**
 	 * Creates a new {@link MappingMongoConverter} given the new {@link DbRefResolver} and {@link MappingContext}.
@@ -121,28 +184,50 @@ public MappingMongoConverter(DbRefResolver dbRefResolver,
 
 		super(new DefaultConversionService());
 
-		Assert.notNull(dbRefResolver, "DbRefResolver must not be null!");
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		Assert.notNull(dbRefResolver, "DbRefResolver must not be null");
+		Assert.notNull(mappingContext, "MappingContext must not be null");
 
 		this.dbRefResolver = dbRefResolver;
+
 		this.mappingContext = mappingContext;
-		this.typeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext,
+		this.defaultTypeMapper = new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext,
 				this::getWriteTarget);
 		this.idMapper = new QueryMapper(this);
 
 		this.spELContext = new SpELContext(DocumentPropertyAccessor.INSTANCE);
-		this.dbRefProxyHandler = new DefaultDbRefProxyHandler(spELContext, mappingContext, MappingMongoConverter.this);
+		this.dbRefProxyHandler = new DefaultDbRefProxyHandler(mappingContext, (prop, bson, evaluator, path) -> {
+
+			ConversionContext context = getConversionContext(path);
+			return MappingMongoConverter.this.getValueInternal(context, prop, bson, evaluator);
+		}, expressionEvaluatorFactory::create);
+
+		this.referenceLookupDelegate = new ReferenceLookupDelegate(mappingContext, spELContext);
+		this.documentPointerFactory = new DocumentPointerFactory(conversionService, mappingContext);
+	}
+
+	/**
+	 * Creates a new {@link ConversionContext} given {@link ObjectPath}.
+	 *
+	 * @param path the current {@link ObjectPath}, must not be {@literal null}.
+	 * @return the {@link ConversionContext}.
+	 */
+	protected ConversionContext getConversionContext(ObjectPath path) {
+
+		Assert.notNull(path, "ObjectPath must not be null");
+
+		return new DefaultConversionContext(this, conversions, path, this::readDocument, this::readCollectionOrArray,
+				this::readMap, this::readDBRef, this::getPotentiallyConvertedSimpleRead);
 	}
 
 	/**
-	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDbFactory} and {@link MappingContext}.
+	 * Creates a new {@link MappingMongoConverter} given the new {@link MongoDatabaseFactory} and {@link MappingContext}.
 	 *
 	 * @deprecated use the constructor taking a {@link DbRefResolver} instead.
 	 * @param mongoDbFactory must not be {@literal null}.
 	 * @param mappingContext must not be {@literal null}.
 	 */
 	@Deprecated
-	public MappingMongoConverter(MongoDbFactory mongoDbFactory,
+	public MappingMongoConverter(MongoDatabaseFactory mongoDbFactory,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 		this(new DefaultDbRefResolver(mongoDbFactory), mappingContext);
 		setCodecRegistryProvider(mongoDbFactory);
@@ -157,25 +242,32 @@ public MappingMongoConverter(MongoDbFactory mongoDbFactory,
 	 * @param typeMapper the typeMapper to set. Can be {@literal null}.
 	 */
 	public void setTypeMapper(@Nullable MongoTypeMapper typeMapper) {
-		this.typeMapper = typeMapper == null
-				? new DefaultMongoTypeMapper(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, mappingContext)
-				: typeMapper;
+		this.typeMapper = typeMapper;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoConverter#getTypeMapper()
-	 */
 	@Override
 	public MongoTypeMapper getTypeMapper() {
-		return this.typeMapper;
+		return this.typeMapper == null ? this.defaultTypeMapper : this.typeMapper;
+	}
+
+	@Override
+	public ProjectionFactory getProjectionFactory() {
+		return projectionFactory;
+	}
+
+	@Override
+	public CustomConversions getCustomConversions() {
+		return conversions;
 	}
 
 	/**
-	 * Configure the characters dots potentially contained in a {@link Map} shall be replaced with. By default we don't do
-	 * any translation but rather reject a {@link Map} with keys containing dots causing the conversion for the entire
+	 * Configure the characters dots potentially contained in a {@link Map} shall be replaced with. By default, we don't
+	 * do any translation but rather reject a {@link Map} with keys containing dots causing the conversion for the entire
 	 * object to fail. If further customization of the translation is needed, have a look at
 	 * {@link #potentiallyEscapeMapKey(String)} as well as {@link #potentiallyUnescapeMapKey(String)}.
+	 * <p>
+	 * {@code mapKeyDotReplacement} is used as-is during replacement operations without further processing (i.e. regex or
+	 * normalization).
 	 *
 	 * @param mapKeyDotReplacement the mapKeyDotReplacement to set. Can be {@literal null}.
 	 */
@@ -183,6 +275,17 @@ public void setMapKeyDotReplacement(@Nullable String mapKeyDotReplacement) {
 		this.mapKeyDotReplacement = mapKeyDotReplacement;
 	}
 
+	/**
+	 * If {@link #preserveMapKeys(boolean) preserve} is set to {@literal true} the conversion will treat map keys
+	 * containing dot ({@literal .}) characters as is.
+	 *
+	 * @since 4.2
+	 * @see #setMapKeyDotReplacement(String)
+	 */
+	public void preserveMapKeys(boolean preserve) {
+		setMapKeyDotReplacement(preserve ? "." : null);
+	}
+
 	/**
 	 * Configure a {@link CodecRegistryProvider} that provides native MongoDB {@link org.bson.codecs.Codec codecs} for
 	 * reading values.
@@ -194,145 +297,308 @@ public void setCodecRegistryProvider(@Nullable CodecRegistryProvider codecRegist
 		this.codecRegistryProvider = codecRegistryProvider;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.convert.EntityConverter#getMappingContext()
-	 */
+	@Override
 	public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
 		return mappingContext;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-	 */
+	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
 		this.applicationContext = applicationContext;
+		this.environment = applicationContext.getEnvironment();
 		this.spELContext = new SpELContext(this.spELContext, applicationContext);
+		this.projectionFactory.setBeanFactory(applicationContext);
+		if(applicationContext.getClassLoader() != null) {
+			this.projectionFactory.setBeanClassLoader(applicationContext.getClassLoader());
+		}
+
+		if (entityCallbacks == null) {
+			setEntityCallbacks(EntityCallbacks.create(applicationContext));
+		}
+
+		ClassLoader classLoader = applicationContext.getClassLoader();
+		if (this.defaultTypeMapper instanceof BeanClassLoaderAware beanClassLoaderAware && classLoader != null) {
+			beanClassLoaderAware.setBeanClassLoader(classLoader);
+		}
+	}
+
+	@Override
+	public Environment getEnvironment() {
+
+		if (environment == null) {
+			environment = new StandardEnvironment();
+		}
+		return environment;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.MongoReader#read(java.lang.Class, com.mongodb.Document)
+	/**
+	 * Set the {@link EntityCallbacks} instance to use when invoking
+	 * {@link org.springframework.data.mapping.callback.EntityCallback callbacks} like the {@link AfterConvertCallback}.
+	 * <br />
+	 * Overrides potentially existing {@link EntityCallbacks}.
+	 *
+	 * @param entityCallbacks must not be {@literal null}.
+	 * @throws IllegalArgumentException if the given instance is {@literal null}.
+	 * @since 3.0
 	 */
-	public <S extends Object> S read(Class<S> clazz, final Bson bson) {
-		return read(ClassTypeInformation.from(clazz), bson);
+	public void setEntityCallbacks(EntityCallbacks entityCallbacks) {
+
+		Assert.notNull(entityCallbacks, "EntityCallbacks must not be null");
+		this.entityCallbacks = entityCallbacks;
 	}
 
-	protected <S extends Object> S read(TypeInformation<S> type, Bson bson) {
-		return read(type, bson, ObjectPath.ROOT);
+	@Override
+	public <R> R project(EntityProjection<R, ?> projection, Bson bson) {
+
+		if (!projection.isProjection()) { // backed by real object
+
+			TypeInformation<?> typeToRead = projection.getMappedType().getType().isInterface() ? projection.getDomainType()
+					: projection.getMappedType();
+			return (R) read(typeToRead, bson);
+		}
+
+		ProjectingConversionContext context = new ProjectingConversionContext(this, conversions, ObjectPath.ROOT,
+				this::readCollectionOrArray, this::readMap, this::readDBRef, this::getPotentiallyConvertedSimpleRead,
+				projection);
+
+		return doReadProjection(context, bson, projection);
 	}
 
-	@Nullable
 	@SuppressWarnings("unchecked")
-	private <S extends Object> S read(TypeInformation<S> type, @Nullable Bson bson, ObjectPath path) {
+	private <R> R doReadProjection(ConversionContext context, Bson bson, EntityProjection<R, ?> projection) {
 
-		if (null == bson) {
-			return null;
+		MongoPersistentEntity<?> entity = getMappingContext().getRequiredPersistentEntity(projection.getActualDomainType());
+		TypeInformation<?> mappedType = projection.getActualMappedType();
+		MongoPersistentEntity<R> mappedEntity = (MongoPersistentEntity<R>) getMappingContext()
+				.getPersistentEntity(mappedType);
+		ValueExpressionEvaluator evaluator = expressionEvaluatorFactory.create(bson);
+
+		boolean isInterfaceProjection = mappedType.getType().isInterface();
+		if (isInterfaceProjection) {
+
+			PersistentPropertyTranslator propertyTranslator = PersistentPropertyTranslator.create(mappedEntity);
+			DocumentAccessor documentAccessor = new DocumentAccessor(bson);
+			PersistentPropertyAccessor<?> accessor = new MapPersistentPropertyAccessor();
+
+			PersistentPropertyAccessor<?> convertingAccessor = PropertyTranslatingPropertyAccessor
+					.create(new ConvertingPropertyAccessor<>(accessor, conversionService), propertyTranslator);
+			MongoDbPropertyValueProvider valueProvider = new MongoDbPropertyValueProvider(context, documentAccessor,
+					evaluator, spELContext);
+
+			readProperties(context, entity, convertingAccessor, documentAccessor, valueProvider, evaluator,
+					(mongoPersistentProperties, mongoPersistentProperty) -> true);
+			return (R) projectionFactory.createProjection(mappedType.getType(), accessor.getBean());
 		}
 
-		TypeInformation<? extends S> typeToUse = typeMapper.readType(bson, type);
-		Class<? extends S> rawType = typeToUse.getType();
+		// DTO projection
+		if (mappedEntity == null) {
+			throw new MappingException(String.format("No mapping metadata found for %s", mappedType.getType().getName()));
+		}
 
-		if (conversions.hasCustomReadTarget(bson.getClass(), rawType)) {
-			return conversionService.convert(bson, rawType);
+		// create target instance, merge metadata from underlying DTO type
+		PersistentPropertyTranslator propertyTranslator = PersistentPropertyTranslator.create(entity,
+				Predicates.negate(MongoPersistentProperty::hasExplicitFieldName));
+		DocumentAccessor documentAccessor = new DocumentAccessor(bson) {
+			@Override
+			FieldName getFieldName(MongoPersistentProperty prop) {
+				return propertyTranslator.translate(prop).getMongoField().getName();
+			}
+		};
+
+		InstanceCreatorMetadata<MongoPersistentProperty> instanceCreatorMetadata = mappedEntity
+				.getInstanceCreatorMetadata();
+		ParameterValueProvider<MongoPersistentProperty> provider = instanceCreatorMetadata != null
+				&& instanceCreatorMetadata.hasParameters()
+						? getParameterProvider(context, mappedEntity, documentAccessor, evaluator)
+						: NoOpParameterValueProvider.INSTANCE;
+
+		EntityInstantiator instantiator = instantiators.getInstantiatorFor(mappedEntity);
+		R instance = instantiator.createInstance(mappedEntity, provider);
+		PersistentPropertyAccessor<R> accessor = mappedEntity.getPropertyAccessor(instance);
+
+		populateProperties(context, mappedEntity, documentAccessor, evaluator, instance);
+
+		return accessor.getBean();
+	}
+
+	private Object doReadOrProject(ConversionContext context, @Nullable Bson source, TypeInformation<?> typeHint,
+			EntityProjection<?, ?> typeDescriptor) {
+
+		if (typeDescriptor.isProjection()) {
+			return doReadProjection(context, BsonUtils.asDocument(source), typeDescriptor);
 		}
 
-		if (DBObject.class.isAssignableFrom(rawType)) {
-			return (S) bson;
+		return readDocument(context, source, typeHint);
+	}
+
+	static class MapPersistentPropertyAccessor implements PersistentPropertyAccessor<Map<String, Object>> {
+
+		Map<String, Object> map = new LinkedHashMap<>();
+
+		@Override
+		public void setProperty(PersistentProperty<?> persistentProperty, @Nullable Object o) {
+			map.put(persistentProperty.getName(), o);
 		}
 
-		if (Document.class.isAssignableFrom(rawType)) {
-			return (S) bson;
+		@Override
+		public @Nullable Object getProperty(PersistentProperty<?> persistentProperty) {
+			return map.get(persistentProperty.getName());
+		}
+
+		@Override
+		public Map<String, Object> getBean() {
+			return map;
 		}
+	}
+
+	@Override
+	public <S extends Object> S read(Class<S> clazz, Bson bson) {
+		return read(TypeInformation.of(clazz), bson);
+	}
+
+	protected <S extends Object> S read(TypeInformation<S> type, Bson bson) {
+		return readDocument(getConversionContext(ObjectPath.ROOT), bson, type);
+	}
+
+	/**
+	 * Conversion method to materialize an object from a {@link Bson document}. Can be overridden by subclasses.
+	 *
+	 * @param context must not be {@literal null}
+	 * @param bson must not be {@literal null}
+	 * @param typeHint the {@link TypeInformation} to be used to unmarshall this {@link Document}.
+	 * @return the converted object, will never be {@literal null}.
+	 * @since 3.2
+	 */
+	@SuppressWarnings({"unchecked","NullAway"})
+	protected <S extends Object> S readDocument(ConversionContext context, @Nullable Bson bson,
+			TypeInformation<? extends S> typeHint) {
 
-		if (typeToUse.isCollectionLike() && bson instanceof List) {
-			return (S) readCollectionOrArray(typeToUse, (List<?>) bson, path);
+		if(bson == null) {
+			bson  = new Document();
 		}
 
-		if (typeToUse.isMap()) {
-			return (S) readMap(typeToUse, bson, path);
+		Document document = bson instanceof BasicDBObject dbObject ? new Document(dbObject) : (Document) bson;
+		TypeInformation<? extends S> typeToRead = getTypeMapper().readType(document, typeHint);
+		Class<? extends S> rawType = typeToRead.getType();
+
+		if (conversions.hasCustomReadTarget(bson.getClass(), rawType)) {
+			return doConvert(bson, rawType, typeHint.getType());
 		}
 
-		if (bson instanceof Collection) {
-			throw new MappingException(String.format(INCOMPATIBLE_TYPES, bson, BasicDBList.class, typeToUse.getType(), path));
+		if (Document.class.isAssignableFrom(rawType)) {
+			return (S) bson;
 		}
 
-		if (typeToUse.equals(ClassTypeInformation.OBJECT)) {
+		if (DBObject.class.isAssignableFrom(rawType)) {
+
+			if (bson instanceof DBObject) {
+				return (S) bson;
+			}
+
+			if (bson instanceof Document doc) {
+				return (S) new BasicDBObject(doc);
+			}
+
 			return (S) bson;
 		}
-		// Retrieve persistent entity info
 
-		Document target = bson instanceof BasicDBObject ? new Document((BasicDBObject) bson) : (Document) bson;
+		if (typeToRead.isMap()) {
+			return context.convert(bson, typeToRead);
+		}
+
+		if (BSON.isAssignableFrom(typeHint)) {
+			return (S) bson;
+		}
 
-		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(typeToUse);
+		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(typeToRead);
 
 		if (entity == null) {
 
 			if (codecRegistryProvider != null) {
 
 				Optional<? extends Codec<? extends S>> codec = codecRegistryProvider.getCodecFor(rawType);
-				if(codec.isPresent()) {
-					return codec.get().decode(new JsonReader(target.toJson()),
-							DecoderContext.builder().build());
+				if (codec.isPresent()) {
+					return codec.get().decode(new JsonReader(document.toJson()), DecoderContext.builder().build());
 				}
 			}
 
-			throw new MappingException(String.format(INVALID_TYPE_TO_READ, target, typeToUse.getType()));
+			throw new MappingException(String.format(INVALID_TYPE_TO_READ, document, rawType));
 		}
 
-		return read((MongoPersistentEntity<S>) entity, target, path);
+		return read(context, (MongoPersistentEntity<S>) entity, document);
 	}
 
-	private ParameterValueProvider<MongoPersistentProperty> getParameterProvider(MongoPersistentEntity<?> entity,
-			DocumentAccessor source, SpELExpressionEvaluator evaluator, ObjectPath path) {
+	private ParameterValueProvider<MongoPersistentProperty> getParameterProvider(ConversionContext context,
+			MongoPersistentEntity<?> entity, DocumentAccessor source, ValueExpressionEvaluator evaluator) {
 
-		AssociationAwareMongoDbPropertyValueProvider provider = new AssociationAwareMongoDbPropertyValueProvider(source,
-				evaluator, path);
+		AssociationAwareMongoDbPropertyValueProvider provider = new AssociationAwareMongoDbPropertyValueProvider(context,
+				source, evaluator);
 		PersistentEntityParameterValueProvider<MongoPersistentProperty> parameterProvider = new PersistentEntityParameterValueProvider<>(
-				entity, provider, path.getCurrentObject());
+				entity, provider, context.getPath().getCurrentObject());
+
+		return new ConverterAwareValueExpressionParameterValueProvider(context, evaluator, conversionService,
+				parameterProvider);
+	}
+
+	class EvaluatingDocumentAccessor extends DocumentAccessor implements ValueExpressionEvaluator {
+
+		/**
+		 * Creates a new {@link DocumentAccessor} for the given {@link Document}.
+		 *
+		 * @param document must be a {@link Document} effectively, must not be {@literal null}.
+		 */
+		public EvaluatingDocumentAccessor(Bson document) {
+			super(document);
+		}
 
-		return new ConverterAwareSpELExpressionParameterValueProvider(evaluator, conversionService, parameterProvider,
-				path);
+		@Override
+		public <T> @Nullable T evaluate(String expression) {
+			return expressionEvaluatorFactory.create(getDocument()).evaluate(expression);
+		}
 	}
 
-	private <S extends Object> S read(final MongoPersistentEntity<S> entity, final Document bson, final ObjectPath path) {
+	private <S> S read(ConversionContext context, MongoPersistentEntity<S> entity, Document bson) {
 
-		SpELExpressionEvaluator evaluator = new DefaultSpELExpressionEvaluator(bson, spELContext);
-		DocumentAccessor documentAccessor = new DocumentAccessor(bson);
+		S existing = context.findContextualEntity(entity, bson);
+		if (existing != null) {
+			return existing;
+		}
 
-		PreferredConstructor<S, MongoPersistentProperty> persistenceConstructor = entity.getPersistenceConstructor();
+		EvaluatingDocumentAccessor documentAccessor = new EvaluatingDocumentAccessor(bson);
+		InstanceCreatorMetadata<MongoPersistentProperty> instanceCreatorMetadata = entity.getInstanceCreatorMetadata();
 
-		ParameterValueProvider<MongoPersistentProperty> provider = persistenceConstructor != null
-				&& persistenceConstructor.hasParameters() ? getParameterProvider(entity, documentAccessor, evaluator, path)
+		ParameterValueProvider<MongoPersistentProperty> provider = instanceCreatorMetadata != null
+				&& instanceCreatorMetadata.hasParameters()
+						? getParameterProvider(context, entity, documentAccessor, documentAccessor)
 						: NoOpParameterValueProvider.INSTANCE;
 
 		EntityInstantiator instantiator = instantiators.getInstantiatorFor(entity);
 		S instance = instantiator.createInstance(entity, provider);
 
-		if (entity.requiresPropertyPopulation()) {
-			return populateProperties(entity, documentAccessor, path, evaluator, instance);
-		}
-
-		return instance;
+		return populateProperties(context, entity, documentAccessor, documentAccessor, instance);
 	}
 
-	private <S> S populateProperties(MongoPersistentEntity<S> entity, DocumentAccessor documentAccessor, ObjectPath path,
-			SpELExpressionEvaluator evaluator, S instance) {
+	private <S> S populateProperties(ConversionContext context, MongoPersistentEntity<S> entity,
+			DocumentAccessor documentAccessor, ValueExpressionEvaluator evaluator, S instance) {
+
+		if (!entity.requiresPropertyPopulation()) {
+			return instance;
+		}
 
 		PersistentPropertyAccessor<S> accessor = new ConvertingPropertyAccessor<>(entity.getPropertyAccessor(instance),
 				conversionService);
 
 		// Make sure id property is set before all other properties
 
-		Object rawId = readAndPopulateIdentifier(accessor, documentAccessor, entity, path, evaluator);
-		ObjectPath currentPath = path.push(accessor.getBean(), entity, rawId);
+		Object rawId = readAndPopulateIdentifier(context, accessor, documentAccessor, entity, evaluator);
+		ObjectPath currentPath = context.getPath().push(accessor.getBean(), entity, rawId);
+		ConversionContext contextToUse = context.withPath(currentPath);
 
-		MongoDbPropertyValueProvider valueProvider = new MongoDbPropertyValueProvider(documentAccessor, evaluator,
-				currentPath);
+		MongoDbPropertyValueProvider valueProvider = new MongoDbPropertyValueProvider(contextToUse, documentAccessor,
+				evaluator, spELContext);
 
-		readProperties(entity, accessor, documentAccessor, valueProvider, currentPath, evaluator);
+		readProperties(contextToUse, entity, accessor, documentAccessor, valueProvider, evaluator, PROPERTY_FILTER);
 
 		return accessor.getBean();
 	}
@@ -340,16 +606,9 @@ private <S> S populateProperties(MongoPersistentEntity<S> entity, DocumentAccess
 	/**
 	 * Reads the identifier from either the bean backing the {@link PersistentPropertyAccessor} or the source document in
 	 * case the identifier has not be populated yet. In this case the identifier is set on the bean for further reference.
-	 *
-	 * @param accessor must not be {@literal null}.
-	 * @param document must not be {@literal null}.
-	 * @param entity must not be {@literal null}.
-	 * @param path
-	 * @param evaluator
-	 * @return
 	 */
-	private Object readAndPopulateIdentifier(PersistentPropertyAccessor<?> accessor, DocumentAccessor document,
-			MongoPersistentEntity<?> entity, ObjectPath path, SpELExpressionEvaluator evaluator) {
+	private @Nullable Object readAndPopulateIdentifier(ConversionContext context, PersistentPropertyAccessor<?> accessor,
+			DocumentAccessor document, MongoPersistentEntity<?> entity, ValueExpressionEvaluator evaluator) {
 
 		Object rawId = document.getRawId(entity);
 
@@ -359,59 +618,65 @@ private Object readAndPopulateIdentifier(PersistentPropertyAccessor<?> accessor,
 
 		MongoPersistentProperty idProperty = entity.getRequiredIdProperty();
 
-		if (idProperty.isImmutable() && entity.isConstructorArgument(idProperty)) {
+		if (idProperty.isImmutable() && entity.isCreatorArgument(idProperty)) {
 			return rawId;
 		}
 
-		accessor.setProperty(idProperty, readIdValue(path, evaluator, idProperty, rawId));
+		accessor.setProperty(idProperty, readIdValue(context, evaluator, idProperty, rawId));
 
 		return rawId;
 	}
 
-	private Object readIdValue(ObjectPath path, SpELExpressionEvaluator evaluator, MongoPersistentProperty idProperty,
-			Object rawId) {
+	@Nullable
+	private Object readIdValue(ConversionContext context, ValueExpressionEvaluator evaluator,
+			MongoPersistentProperty idProperty, Object rawId) {
 
 		String expression = idProperty.getSpelExpression();
 		Object resolvedValue = expression != null ? evaluator.evaluate(expression) : rawId;
 
-		return resolvedValue != null ? readValue(resolvedValue, idProperty.getTypeInformation(), path) : null;
+		return resolvedValue != null
+				? readValue(context.forProperty(idProperty), resolvedValue, idProperty.getTypeInformation())
+				: null;
 	}
 
-	private void readProperties(MongoPersistentEntity<?> entity, PersistentPropertyAccessor<?> accessor,
-			DocumentAccessor documentAccessor, MongoDbPropertyValueProvider valueProvider, ObjectPath currentPath,
-			SpELExpressionEvaluator evaluator) {
+	private void readProperties(ConversionContext context, MongoPersistentEntity<?> entity,
+			PersistentPropertyAccessor<?> accessor, DocumentAccessor documentAccessor,
+			MongoDbPropertyValueProvider valueProvider, ValueExpressionEvaluator evaluator,
+			BiPredicate<MongoPersistentEntity<?>, MongoPersistentProperty> propertyFilter) {
 
 		DbRefResolverCallback callback = null;
 
 		for (MongoPersistentProperty prop : entity) {
 
-			if (prop.isAssociation() && !entity.isConstructorArgument(prop)) {
+			if (!propertyFilter.test(entity, prop)) {
+				continue;
+			}
+
+			ConversionContext propertyContext = context.forProperty(prop);
+
+			if (prop.isAssociation()) {
 
 				if (callback == null) {
-					callback = getDbRefResolverCallback(documentAccessor, currentPath, evaluator);
+					callback = getDbRefResolverCallback(propertyContext, documentAccessor, evaluator);
 				}
 
-				readAssociation(prop.getRequiredAssociation(), accessor, documentAccessor, dbRefProxyHandler, callback);
-				continue;
-			}
-
-			// We skip the id property since it was already set
+				Object value = readAssociation(prop.getRequiredAssociation(), documentAccessor, dbRefProxyHandler, callback,
+						propertyContext);
 
-			if (entity.isIdProperty(prop)) {
+				if (value != null) {
+					accessor.setProperty(prop, value);
+				}
 				continue;
 			}
 
-			if (entity.isConstructorArgument(prop) || !documentAccessor.hasValue(prop)) {
+			if (prop.isUnwrapped()) {
+
+				accessor.setProperty(prop,
+						readUnwrapped(propertyContext, documentAccessor, prop, mappingContext.getRequiredPersistentEntity(prop)));
 				continue;
 			}
 
-			if (prop.isAssociation()) {
-
-				if (callback == null) {
-					callback = getDbRefResolverCallback(documentAccessor, currentPath, evaluator);
-				}
-
-				readAssociation(prop.getRequiredAssociation(), accessor, documentAccessor, dbRefProxyHandler, callback);
+			if (!documentAccessor.hasValue(prop)) {
 				continue;
 			}
 
@@ -419,54 +684,160 @@ private void readProperties(MongoPersistentEntity<?> entity, PersistentPropertyA
 		}
 	}
 
-	private DbRefResolverCallback getDbRefResolverCallback(DocumentAccessor documentAccessor, ObjectPath currentPath,
-			SpELExpressionEvaluator evaluator) {
+	private DbRefResolverCallback getDbRefResolverCallback(ConversionContext context, DocumentAccessor documentAccessor,
+			ValueExpressionEvaluator evaluator) {
 
-		return new DefaultDbRefResolverCallback(documentAccessor.getDocument(), currentPath, evaluator,
-				MappingMongoConverter.this);
+		return new DefaultDbRefResolverCallback(documentAccessor.getDocument(), context.getPath(), evaluator,
+				(prop, bson, e, path) -> MappingMongoConverter.this.getValueInternal(context, prop, bson, e));
 	}
 
-	private void readAssociation(Association<MongoPersistentProperty> association, PersistentPropertyAccessor<?> accessor,
-			DocumentAccessor documentAccessor, DbRefProxyHandler handler, DbRefResolverCallback callback) {
+	private @Nullable Object readAssociation(Association<MongoPersistentProperty> association, DocumentAccessor documentAccessor,
+			DbRefProxyHandler handler, DbRefResolverCallback callback, ConversionContext context) {
 
 		MongoPersistentProperty property = association.getInverse();
 		Object value = documentAccessor.get(property);
 
+		if (property.isDocumentReference()
+				|| !property.isDbReference() && property.findAnnotation(Reference.class) != null) {
+
+			// quite unusual but sounds like worth having?
+
+			if (conversionService.canConvert(DocumentPointer.class, property.getActualType())) {
+
+				if (value == null) {
+					return null;
+				}
+
+				DocumentPointer<?> pointer = () -> value;
+
+				// collection like special treatment
+				return conversionService.convert(pointer, property.getActualType());
+			} else {
+
+				return dbRefResolver.resolveReference(property,
+						new DocumentReferenceSource(documentAccessor.getDocument(), documentAccessor.get(property)),
+						referenceLookupDelegate, context.forProperty(property)::convert);
+			}
+		}
+
 		if (value == null) {
-			return;
+			return null;
+		}
+
+		if (value instanceof DBRef dbref) {
+			return dbRefResolver.resolveDbRef(property, dbref, callback, handler);
 		}
 
-		DBRef dbref = value instanceof DBRef ? (DBRef) value : null;
-		accessor.setProperty(property, dbRefResolver.resolveDbRef(property, dbref, callback, handler));
+		/*
+		 * The value might be a pre resolved full document (eg. resulting from an aggregation $lookup).
+		 * In this case we try to map that object to the target type without an additional step ($dbref resolution server roundtrip)
+		 * in between.
+		 */
+		if (value instanceof Document document) {
+			if (property.isMap()) {
+				if (document.isEmpty() || peek(document.values()) instanceof DBRef) {
+					return dbRefResolver.resolveDbRef(property, null, callback, handler);
+				} else {
+					return readMap(context, document, property.getTypeInformation());
+				}
+			} else {
+				return read(property.getActualType(), document);
+			}
+		} else if (value instanceof Collection<?> collection && !collection.isEmpty()
+				&& peek(collection) instanceof Document) {
+			return readCollectionOrArray(context, collection, property.getTypeInformation());
+		} else {
+			return dbRefResolver.resolveDbRef(property, null, callback, handler);
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#toDBRef(java.lang.Object, org.springframework.data.mongodb.core.mapping.MongoPersistentProperty)
-	 */
+	@SuppressWarnings("NullAway")
+	private @Nullable Object readUnwrapped(ConversionContext context, DocumentAccessor documentAccessor,
+			MongoPersistentProperty prop, MongoPersistentEntity<?> unwrappedEntity) {
+
+		if (prop.findAnnotation(Unwrapped.class).onEmpty().equals(OnEmpty.USE_EMPTY)) {
+			return read(context, unwrappedEntity, (Document) documentAccessor.getDocument());
+		}
+
+		for (MongoPersistentProperty persistentProperty : unwrappedEntity) {
+			if (documentAccessor.hasValue(persistentProperty)) {
+				return read(context, unwrappedEntity, (Document) documentAccessor.getDocument());
+			}
+		}
+		return null;
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
 	public DBRef toDBRef(Object object, @Nullable MongoPersistentProperty referringProperty) {
 
 		org.springframework.data.mongodb.core.mapping.DBRef annotation;
 
 		if (referringProperty != null) {
 			annotation = referringProperty.getDBRef();
-			Assert.isTrue(annotation != null, "The referenced property has to be mapped with @DBRef!");
+			Assert.notNull(annotation, "The referenced property has to be mapped with @DBRef");
 		}
 
 		// DATAMONGO-913
-		if (object instanceof LazyLoadingProxy) {
-			return ((LazyLoadingProxy) object).toDBRef();
+		if (object instanceof LazyLoadingProxy proxy) {
+			return proxy.toDBRef();
 		}
 
 		return createDBRef(object, referringProperty);
 	}
 
+	@Override
+	@SuppressWarnings("NullAway")
+	public DocumentPointer toDocumentPointer(Object source, @Nullable MongoPersistentProperty referringProperty) {
+
+		if (source instanceof LazyLoadingProxy proxy) {
+			return proxy::getSource;
+		}
+
+		Assert.notNull(referringProperty, "Cannot create DocumentReference; The referringProperty must not be null");
+
+		if (referringProperty.isDbReference()) {
+			return () -> toDBRef(source, referringProperty);
+		}
+
+		if (referringProperty.isDocumentReference() || referringProperty.findAnnotation(Reference.class) != null) {
+			return createDocumentPointer(source, referringProperty);
+		}
+
+		throw new IllegalArgumentException("The referringProperty is neither a DBRef nor a document reference");
+	}
+
+	@SuppressWarnings("NullAway")
+	DocumentPointer<?> createDocumentPointer(Object source, @Nullable MongoPersistentProperty referringProperty) {
+
+		if (referringProperty == null) {
+			return () -> source;
+		}
+
+		if (source instanceof DocumentPointer<?> pointer) {
+			return pointer;
+		}
+
+		if (ClassUtils.isAssignableValue(referringProperty.getType(), source)
+				&& conversionService.canConvert(referringProperty.getType(), DocumentPointer.class)) {
+			return conversionService.convert(source, DocumentPointer.class);
+		}
+
+		if (ClassUtils.isAssignableValue(referringProperty.getAssociationTargetType(), source)) {
+			return documentPointerFactory.computePointer(mappingContext, referringProperty, source,
+					referringProperty.getActualType());
+		}
+
+		return () -> source;
+	}
+
 	/**
 	 * Root entry method into write conversion. Adds a type discriminator to the {@link Document}. Shouldn't be called for
 	 * nested conversions.
 	 *
-	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#write(java.lang.Object, com.mongodb.Document)
+	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#write(java.lang.Object, java.lang.Object)
 	 */
+	@Override
 	public void write(Object obj, Bson bson) {
 
 		if (null == obj) {
@@ -474,17 +845,15 @@ public void write(Object obj, Bson bson) {
 		}
 
 		Class<?> entityType = ClassUtils.getUserClass(obj.getClass());
-		TypeInformation<? extends Object> type = ClassTypeInformation.from(entityType);
+		TypeInformation<? extends Object> type = TypeInformation.of(entityType);
 
-		Object target = obj instanceof LazyLoadingProxy ? ((LazyLoadingProxy) obj).getTarget() : obj;
+		Object target = obj instanceof LazyLoadingProxy proxy ? proxy.getTarget() : obj;
 
 		writeInternal(target, bson, type);
-		if (asMap(bson).containsKey("_id") && asMap(bson).get("_id") == null) {
-			removeFromMap(bson, "_id");
-		}
+		BsonUtils.removeNullId(bson);
 
 		if (requiresTypeHint(entityType)) {
-			typeMapper.writeType(type, bson);
+			getTypeMapper().writeType(type, bson);
 		}
 	}
 
@@ -502,12 +871,8 @@ private boolean requiresTypeHint(Class<?> type) {
 
 	/**
 	 * Internal write conversion method which should be used for nested invocations.
-	 *
-	 * @param obj
-	 * @param bson
-	 * @param typeHint
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({"unchecked","NullAway"})
 	protected void writeInternal(@Nullable Object obj, Bson bson, @Nullable TypeInformation<?> typeHint) {
 
 		if (null == obj) {
@@ -518,18 +883,18 @@ protected void writeInternal(@Nullable Object obj, Bson bson, @Nullable TypeInfo
 		Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(entityType, Document.class);
 
 		if (customTarget.isPresent()) {
-			Document result = conversionService.convert(obj, Document.class);
-			addAllToMap(bson, result);
+			Document result = doConvert(obj, Document.class);
+			BsonUtils.addAllToMap(bson, result);
 			return;
 		}
 
 		if (Map.class.isAssignableFrom(entityType)) {
-			writeMapInternal((Map<Object, Object>) obj, bson, ClassTypeInformation.MAP);
+			writeMapInternal((Map<Object, Object>) obj, bson, TypeInformation.MAP);
 			return;
 		}
 
 		if (Collection.class.isAssignableFrom(entityType)) {
-			writeCollectionInternal((Collection<?>) obj, ClassTypeInformation.LIST, (Collection<?>) bson);
+			writeCollectionInternal((Collection<?>) obj, TypeInformation.LIST, (Collection<?>) bson);
 			return;
 		}
 
@@ -574,6 +939,7 @@ private void writeProperties(Bson bson, MongoPersistentEntity<?> entity, Persist
 				continue;
 			}
 			if (prop.isAssociation()) {
+
 				writeAssociation(prop.getRequiredAssociation(), accessor, dbObjectAccessor);
 				continue;
 			}
@@ -581,13 +947,16 @@ private void writeProperties(Bson bson, MongoPersistentEntity<?> entity, Persist
 			Object value = accessor.getProperty(prop);
 
 			if (value == null) {
-				continue;
-			}
 
-			if (!conversions.isSimpleType(value.getClass())) {
-				writePropertyInternal(value, dbObjectAccessor, prop);
+				if (conversions.hasValueConverter(prop)) {
+					dbObjectAccessor.put(prop, applyPropertyConversion(null, prop, accessor));
+				} else {
+					dbObjectAccessor.put(prop, null);
+				}
+			} else if (!conversions.isSimpleType(value.getClass())) {
+				writePropertyInternal(value, dbObjectAccessor, prop, accessor);
 			} else {
-				writeSimpleInternal(value, bson, prop);
+				writeSimpleInternal(value, bson, prop, accessor);
 			}
 		}
 	}
@@ -597,26 +966,50 @@ private void writeAssociation(Association<MongoPersistentProperty> association,
 
 		MongoPersistentProperty inverseProp = association.getInverse();
 
-		writePropertyInternal(accessor.getProperty(inverseProp), dbObjectAccessor, inverseProp);
+		Object value = accessor.getProperty(inverseProp);
+
+		if (value == null && !inverseProp.isUnwrapped() && inverseProp.writeNullValues()) {
+			dbObjectAccessor.put(inverseProp, null);
+			return;
+		}
+
+		writePropertyInternal(value, dbObjectAccessor, inverseProp, accessor);
 	}
 
 	@SuppressWarnings({ "unchecked" })
-	protected void writePropertyInternal(@Nullable Object obj, DocumentAccessor accessor, MongoPersistentProperty prop) {
+	void writePropertyInternal(@Nullable Object obj, DocumentAccessor accessor, MongoPersistentProperty prop,
+			PersistentPropertyAccessor<?> persistentPropertyAccessor) {
 
 		if (obj == null) {
 			return;
 		}
 
-		TypeInformation<?> valueType = ClassTypeInformation.from(obj.getClass());
+		TypeInformation<?> valueType = TypeInformation.of(obj.getClass());
 		TypeInformation<?> type = prop.getTypeInformation();
 
+		if (conversions.hasValueConverter(prop)) {
+			accessor.put(prop, applyPropertyConversion(obj, prop, persistentPropertyAccessor));
+			return;
+		}
+
+		if (prop.isUnwrapped()) {
+
+			Document target = new Document();
+			writeInternal(obj, target, mappingContext.getPersistentEntity(prop));
+
+			accessor.putAll(target);
+			return;
+		}
+
 		if (valueType.isCollectionLike()) {
-			List<Object> collectionInternal = createCollection(asCollection(obj), prop);
+
+			List<Object> collectionInternal = createCollection(BsonUtils.asCollection(obj), prop);
 			accessor.put(prop, collectionInternal);
 			return;
 		}
 
 		if (valueType.isMap()) {
+
 			Bson mapDbObj = createMap((Map<Object, Object>) obj, prop);
 			accessor.put(prop, mapDbObj);
 			return;
@@ -630,23 +1023,33 @@ protected void writePropertyInternal(@Nullable Object obj, DocumentAccessor acce
 			 * If we already have a LazyLoadingProxy, we use it's cached DBRef value instead of
 			 * unnecessarily initializing it only to convert it to a DBRef a few instructions later.
 			 */
-			if (obj instanceof LazyLoadingProxy) {
-				dbRefObj = ((LazyLoadingProxy) obj).toDBRef();
+			if (obj instanceof LazyLoadingProxy proxy) {
+				dbRefObj = proxy.toDBRef();
 			}
 
-			dbRefObj = dbRefObj != null ? dbRefObj : createDBRef(obj, prop);
-
-			if (null != dbRefObj) {
-				accessor.put(prop, dbRefObj);
+			if (obj != null && conversions.hasCustomWriteTarget(obj.getClass())) {
+				accessor.put(prop, doConvert(obj, conversions.getCustomWriteTarget(obj.getClass()).get()));
 				return;
 			}
+
+			dbRefObj = dbRefObj != null ? dbRefObj : createDBRef(obj, prop);
+
+			accessor.put(prop, dbRefObj);
+			return;
+		}
+
+		if (prop.isAssociation() && prop.isAnnotationPresent(Reference.class)) {
+
+			accessor.put(prop, new DocumentPointerFactory(conversionService, mappingContext)
+					.computePointer(mappingContext, prop, obj, valueType.getType()).getPointer());
+			return;
 		}
 
 		/*
 		 * If we have a LazyLoadingProxy we make sure it is initialized first.
 		 */
-		if (obj instanceof LazyLoadingProxy) {
-			obj = ((LazyLoadingProxy) obj).getTarget();
+		if (obj instanceof LazyLoadingProxy proxy) {
+			obj = proxy.getTarget();
 		}
 
 		// Lookup potential custom target type
@@ -654,7 +1057,7 @@ protected void writePropertyInternal(@Nullable Object obj, DocumentAccessor acce
 
 		if (basicTargetType.isPresent()) {
 
-			accessor.put(prop, conversionService.convert(obj, basicTargetType.get()));
+			accessor.put(prop, doConvert(obj, basicTargetType.get()));
 			return;
 		}
 
@@ -663,45 +1066,40 @@ protected void writePropertyInternal(@Nullable Object obj, DocumentAccessor acce
 				: mappingContext.getRequiredPersistentEntity(type);
 
 		Object existingValue = accessor.get(prop);
-		Document document = existingValue instanceof Document ? (Document) existingValue : new Document();
+		Document document = existingValue instanceof Document existingDocument ? existingDocument : new Document();
 
 		writeInternal(obj, document, entity);
-		addCustomTypeKeyIfNecessary(ClassTypeInformation.from(prop.getRawType()), obj, document);
+		addCustomTypeKeyIfNecessary(TypeInformation.of(prop.getRawType()), obj, document);
 		accessor.put(prop, document);
 	}
 
-	/**
-	 * Returns given object as {@link Collection}. Will return the {@link Collection} as is if the source is a
-	 * {@link Collection} already, will convert an array into a {@link Collection} or simply create a single element
-	 * collection for everything else.
-	 *
-	 * @param source
-	 * @return
-	 */
-	private static Collection<?> asCollection(Object source) {
-
-		if (source instanceof Collection) {
-			return (Collection<?>) source;
-		}
-
-		return source.getClass().isArray() ? CollectionUtils.arrayToList(source) : Collections.singleton(source);
-	}
-
 	/**
 	 * Writes the given {@link Collection} using the given {@link MongoPersistentProperty} information.
 	 *
 	 * @param collection must not be {@literal null}.
 	 * @param property must not be {@literal null}.
-	 * @return
 	 */
 	protected List<Object> createCollection(Collection<?> collection, MongoPersistentProperty property) {
 
 		if (!property.isDbReference()) {
 
+			if (property.isAssociation()) {
+
+				List<Object> targetCollection = collection.stream().map(it -> {
+					return documentPointerFactory.computePointer(mappingContext, property, it, property.getActualType())
+							.getPointer();
+				}).collect(Collectors.toList());
+
+				return writeCollectionInternal(targetCollection, TypeInformation.of(DocumentPointer.class),
+						new ArrayList<>(targetCollection.size()));
+			}
+
 			if (property.hasExplicitWriteTarget()) {
-				return writeCollectionInternal(collection, new TypeInformationWrapper<>(property), new ArrayList<>());
+				return writeCollectionInternal(collection, new FieldTypeInformation<>(property),
+						new ArrayList<>(collection.size()));
 			}
-			return writeCollectionInternal(collection, property.getTypeInformation(), new BasicDBList());
+
+			return writeCollectionInternal(collection, property.getTypeInformation(), new ArrayList<>(collection.size()));
 		}
 
 		List<Object> dbList = new ArrayList<>(collection.size());
@@ -724,14 +1122,13 @@ protected List<Object> createCollection(Collection<?> collection, MongoPersisten
 	 *
 	 * @param map must not {@literal null}.
 	 * @param property must not be {@literal null}.
-	 * @return
 	 */
 	protected Bson createMap(Map<Object, Object> map, MongoPersistentProperty property) {
 
-		Assert.notNull(map, "Given map must not be null!");
-		Assert.notNull(property, "PersistentProperty must not be null!");
+		Assert.notNull(map, "Given map must not be null");
+		Assert.notNull(property, "PersistentProperty must not be null");
 
-		if (!property.isDbReference()) {
+		if (!property.isAssociation()) {
 			return writeMapInternal(map, new Document(), property.getTypeInformation());
 		}
 
@@ -745,10 +1142,15 @@ protected Bson createMap(Map<Object, Object> map, MongoPersistentProperty proper
 			if (conversions.isSimpleType(key.getClass())) {
 
 				String simpleKey = prepareMapKey(key.toString());
-				document.put(simpleKey, value != null ? createDBRef(value, property) : null);
+				if (property.isDbReference()) {
+					document.put(simpleKey, value != null ? createDBRef(value, property) : null);
+				} else {
+					document.put(simpleKey, documentPointerFactory
+							.computePointer(mappingContext, property, value, property.getActualType()).getPointer());
+				}
 
 			} else {
-				throw new MappingException("Cannot use a complex object as a key value.");
+				throw new MappingException("Cannot use a complex object as a key value");
 			}
 		}
 
@@ -761,7 +1163,6 @@ protected Bson createMap(Map<Object, Object> map, MongoPersistentProperty proper
 	 * @param source the collection to create a {@link Collection} for, must not be {@literal null}.
 	 * @param type the {@link TypeInformation} to consider or {@literal null} if unknown.
 	 * @param sink the {@link Collection} to write to.
-	 * @return
 	 */
 	@SuppressWarnings("unchecked")
 	private List<Object> writeCollectionInternal(Collection<?> source, @Nullable TypeInformation<?> type,
@@ -783,7 +1184,9 @@ private List<Object> writeCollectionInternal(Collection<?> source, @Nullable Typ
 				collection.add(getPotentiallyConvertedSimpleWrite(element,
 						componentType != null ? componentType.getType() : Object.class));
 			} else if (element instanceof Collection || elementType.isArray()) {
-				collection.add(writeCollectionInternal(asCollection(element), componentType, new BasicDBList()));
+
+				Collection<?> objects = BsonUtils.asCollection(element);
+				collection.add(writeCollectionInternal(objects, componentType, new ArrayList<>(objects.size())));
 			} else {
 				Document document = new Document();
 				writeInternal(element, document, componentType);
@@ -800,7 +1203,6 @@ private List<Object> writeCollectionInternal(Collection<?> source, @Nullable Typ
 	 * @param obj must not be {@literal null}.
 	 * @param bson must not be {@literal null}.
 	 * @param propertyType must not be {@literal null}.
-	 * @return
 	 */
 	protected Bson writeMapInternal(Map<Object, Object> obj, Bson bson, TypeInformation<?> propertyType) {
 
@@ -815,17 +1217,17 @@ protected Bson writeMapInternal(Map<Object, Object> obj, Bson bson, TypeInformat
 				if (val == null || conversions.isSimpleType(val.getClass())) {
 					writeSimpleInternal(val, bson, simpleKey);
 				} else if (val instanceof Collection || val.getClass().isArray()) {
-					addToMap(bson, simpleKey,
-							writeCollectionInternal(asCollection(val), propertyType.getMapValueType(), new BasicDBList()));
+					BsonUtils.addToMap(bson, simpleKey,
+							writeCollectionInternal(BsonUtils.asCollection(val), propertyType.getMapValueType(), new ArrayList<>()));
 				} else {
 					Document document = new Document();
 					TypeInformation<?> valueTypeInfo = propertyType.isMap() ? propertyType.getMapValueType()
-							: ClassTypeInformation.OBJECT;
+							: TypeInformation.OBJECT;
 					writeInternal(val, document, valueTypeInfo);
-					addToMap(bson, simpleKey, document);
+					BsonUtils.addToMap(bson, simpleKey, document);
 				}
 			} else {
-				throw new MappingException("Cannot use a complex object as a key value.");
+				throw new MappingException("Cannot use a complex object as a key value");
 			}
 		}
 
@@ -837,11 +1239,10 @@ protected Bson writeMapInternal(Map<Object, Object> obj, Bson bson, TypeInformat
 	 * conversions and escape dots from the result as they're not supported as {@link Map} key in MongoDB.
 	 *
 	 * @param key must not be {@literal null}.
-	 * @return
 	 */
 	private String prepareMapKey(Object key) {
 
-		Assert.notNull(key, "Map key must not be null!");
+		Assert.notNull(key, "Map key must not be null");
 
 		String convertedKey = potentiallyConvertMapKey(key);
 		return potentiallyEscapeMapKey(convertedKey);
@@ -852,8 +1253,7 @@ private String prepareMapKey(Object key) {
 	 * conversion if none is configured.
 	 *
 	 * @see #setMapKeyDotReplacement(String)
-	 * @param source
-	 * @return
+	 * @param source must not be {@literal null}.
 	 */
 	protected String potentiallyEscapeMapKey(String source) {
 
@@ -863,24 +1263,24 @@ protected String potentiallyEscapeMapKey(String source) {
 
 		if (mapKeyDotReplacement == null) {
 			throw new MappingException(String.format(
-					"Map key %s contains dots but no replacement was configured! Make "
-							+ "sure map keys don't contain dots in the first place or configure an appropriate replacement!",
+					"Map key %s contains dots but no replacement was configured; Make"
+							+ " sure map keys don't contain dots in the first place or configure an appropriate replacement",
 					source));
 		}
 
-		return source.replaceAll("\\.", mapKeyDotReplacement);
+		return StringUtils.replace(source, ".", mapKeyDotReplacement);
 	}
 
 	/**
 	 * Returns a {@link String} representation of the given {@link Map} key
 	 *
 	 * @param key
-	 * @return
 	 */
+	@SuppressWarnings("NullAway")
 	private String potentiallyConvertMapKey(Object key) {
 
-		if (key instanceof String) {
-			return (String) key;
+		if (key instanceof String stringValue) {
+			return stringValue;
 		}
 
 		return conversions.hasCustomWriteTarget(key.getClass(), String.class)
@@ -892,58 +1292,83 @@ private String potentiallyConvertMapKey(Object key) {
 	 * Translates the map key replacements in the given key just read with a dot in case a map key replacement has been
 	 * configured.
 	 *
-	 * @param source
-	 * @return
+	 * @param source must not be {@literal null}.
 	 */
 	protected String potentiallyUnescapeMapKey(String source) {
-		return mapKeyDotReplacement == null ? source : source.replaceAll(mapKeyDotReplacement, "\\.");
+		return mapKeyDotReplacement == null ? source : StringUtils.replace(source, mapKeyDotReplacement, ".");
 	}
 
 	/**
 	 * Adds custom type information to the given {@link Document} if necessary. That is if the value is not the same as
 	 * the one given. This is usually the case if you store a subtype of the actual declared type of the property.
 	 *
-	 * @param type
+	 * @param type can be {@literal null}.
 	 * @param value must not be {@literal null}.
 	 * @param bson must not be {@literal null}.
 	 */
 	protected void addCustomTypeKeyIfNecessary(@Nullable TypeInformation<?> type, Object value, Bson bson) {
 
-		Class<?> reference = type != null ? type.getActualType().getType() : Object.class;
+		Class<?> reference = type != null ? type.getRequiredActualType().getType() : Object.class;
 		Class<?> valueType = ClassUtils.getUserClass(value.getClass());
 
 		boolean notTheSameClass = !valueType.equals(reference);
 		if (notTheSameClass) {
-			typeMapper.writeType(valueType, bson);
+			getTypeMapper().writeType(valueType, bson);
 		}
 	}
 
 	/**
 	 * Writes the given simple value to the given {@link Document}. Will store enum names for enum values.
 	 *
-	 * @param value
+	 * @param value can be {@literal null}.
 	 * @param bson must not be {@literal null}.
 	 * @param key must not be {@literal null}.
 	 */
-	private void writeSimpleInternal(Object value, Bson bson, String key) {
-		addToMap(bson, key, getPotentiallyConvertedSimpleWrite(value, Object.class));
+	private void writeSimpleInternal(@Nullable Object value, Bson bson, String key) {
+		BsonUtils.addToMap(bson, key, getPotentiallyConvertedSimpleWrite(value, Object.class));
 	}
 
-	private void writeSimpleInternal(Object value, Bson bson, MongoPersistentProperty property) {
+	private void writeSimpleInternal(@Nullable Object value, Bson bson, MongoPersistentProperty property,
+			PersistentPropertyAccessor<?> persistentPropertyAccessor) {
+
 		DocumentAccessor accessor = new DocumentAccessor(bson);
+
+		if (conversions.hasValueConverter(property)) {
+			accessor.put(property, applyPropertyConversion(value, property, persistentPropertyAccessor));
+			return;
+		}
+
 		accessor.put(property, getPotentiallyConvertedSimpleWrite(value,
 				property.hasExplicitWriteTarget() ? property.getFieldType() : Object.class));
 	}
 
+	@SuppressWarnings("unchecked")
+	private @Nullable Object applyPropertyConversion(@Nullable Object value, MongoPersistentProperty property,
+			PersistentPropertyAccessor<?> persistentPropertyAccessor) {
+		MongoConversionContext context = new MongoConversionContext(new PropertyValueProvider<>() {
+
+			@Override
+			public <T> @Nullable T getPropertyValue(MongoPersistentProperty property) {
+				return (T) persistentPropertyAccessor.getProperty(property);
+			}
+		}, property, this, spELContext);
+
+		PropertyValueConversions propertyValueConversions = conversions.getPropertyValueConversions();
+		if(propertyValueConversions == null) {
+			return value;
+		}
+
+		PropertyValueConverter<Object, Object, ValueConversionContext<MongoPersistentProperty>> valueConverter = propertyValueConversions.getValueConverter(property);
+		return value != null ? valueConverter.write(value, context) : valueConverter.writeNull(context);
+	}
+
 	/**
 	 * Checks whether we have a custom conversion registered for the given value into an arbitrary simple Mongo type.
 	 * Returns the converted value if so. If not, we perform special enum handling or simply return the value as is.
-	 *
-	 * @param value
-	 * @return
 	 */
-	@Nullable
-	private Object getPotentiallyConvertedSimpleWrite(@Nullable Object value, @Nullable Class<?> typeHint) {
+	@Contract("null, _-> null")
+	@SuppressWarnings("NullAway")
+	private @Nullable Object getPotentiallyConvertedSimpleWrite(@Nullable Object value, @Nullable Class<?> typeHint) {
 
 		if (value == null) {
 			return null;
@@ -952,14 +1377,14 @@ private Object getPotentiallyConvertedSimpleWrite(@Nullable Object value, @Nulla
 		if (typeHint != null && Object.class != typeHint) {
 
 			if (conversionService.canConvert(value.getClass(), typeHint)) {
-				value = conversionService.convert(value, typeHint);
+				value = doConvert(value, typeHint);
 			}
 		}
 
 		Optional<Class<?>> customTarget = conversions.getCustomWriteTarget(value.getClass());
 
 		if (customTarget.isPresent()) {
-			return conversionService.convert(value, customTarget.get());
+			return doConvert(value, customTarget.get());
 		}
 
 		if (ObjectUtils.isArray(value)) {
@@ -967,7 +1392,7 @@ private Object getPotentiallyConvertedSimpleWrite(@Nullable Object value, @Nulla
 			if (value instanceof byte[]) {
 				return value;
 			}
-			return asCollection(value);
+			return BsonUtils.asCollection(value);
 		}
 
 		return Enum.class.isAssignableFrom(value.getClass()) ? ((Enum<?>) value).name() : value;
@@ -975,37 +1400,48 @@ private Object getPotentiallyConvertedSimpleWrite(@Nullable Object value, @Nulla
 
 	/**
 	 * Checks whether we have a custom conversion for the given simple object. Converts the given value if so, applies
-	 * {@link Enum} handling or returns the value as is.
+	 * {@link Enum} handling or returns the value as is. Can be overridden by subclasses.
 	 *
-	 * @param value
-	 * @param target must not be {@literal null}.
-	 * @return
+	 * @since 3.2
 	 */
-	@Nullable
+	protected @Nullable Object getPotentiallyConvertedSimpleRead(@Nullable Object value, TypeInformation<?> target) {
+		return getPotentiallyConvertedSimpleRead(value, target.getType());
+	}
+
+	/**
+	 * Checks whether we have a custom conversion for the given simple object. Converts the given value if so, applies
+	 * {@link Enum} handling or returns the value as is.
+	 */
+	@Contract("null, _ -> null; _, null -> param1")
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	private Object getPotentiallyConvertedSimpleRead(@Nullable Object value, @Nullable Class<?> target) {
+	private @Nullable Object getPotentiallyConvertedSimpleRead(@Nullable Object value, @Nullable Class<?> target) {
 
-		if (value == null || target == null || ClassUtils.isAssignableValue(target, value)) {
+		if (target == null || value == null) {
 			return value;
 		}
 
 		if (conversions.hasCustomReadTarget(value.getClass(), target)) {
-			return conversionService.convert(value, target);
+			return doConvert(value, target);
+		}
+
+		if (ClassUtils.isAssignableValue(target, value)) {
+			return value;
 		}
 
 		if (Enum.class.isAssignableFrom(target)) {
 			return Enum.valueOf((Class<Enum>) target, value.toString());
 		}
 
-		return conversionService.convert(value, target);
+		return doConvert(value, target);
 	}
 
-	protected DBRef createDBRef(Object target, MongoPersistentProperty property) {
+	@SuppressWarnings("NullAway")
+	protected DBRef createDBRef(Object target, @Nullable MongoPersistentProperty property) {
 
-		Assert.notNull(target, "Target object must not be null!");
+		Assert.notNull(target, "Target object must not be null");
 
-		if (target instanceof DBRef) {
-			return (DBRef) target;
+		if (target instanceof DBRef dbRef) {
+			return dbRef;
 		}
 
 		MongoPersistentEntity<?> targetEntity = mappingContext.getPersistentEntity(target.getClass());
@@ -1025,7 +1461,7 @@ protected DBRef createDBRef(Object target, MongoPersistentProperty property) {
 					: entity.getPropertyAccessor(target).getProperty(idProperty);
 
 			if (null == id) {
-				throw new MappingException("Cannot create a reference to an object with a NULL id.");
+				throw new MappingException("Cannot create a reference to an object with a NULL id");
 			}
 
 			return dbRefResolver.createDbRef(property == null ? null : property.getDBRef(), entity,
@@ -1035,29 +1471,27 @@ protected DBRef createDBRef(Object target, MongoPersistentProperty property) {
 		throw new MappingException("No id property found on class " + entity.getType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.ValueResolver#getValueInternal(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, com.mongodb.Document, org.springframework.data.mapping.model.SpELExpressionEvaluator, java.lang.Object)
-	 */
-	@Override
-	public Object getValueInternal(MongoPersistentProperty prop, Bson bson, SpELExpressionEvaluator evaluator,
-			ObjectPath path) {
-		return new MongoDbPropertyValueProvider(bson, evaluator, path).getPropertyValue(prop);
+	private @Nullable Object getValueInternal(ConversionContext context, MongoPersistentProperty prop, Bson bson,
+			ValueExpressionEvaluator evaluator) {
+		return new MongoDbPropertyValueProvider(context, bson, evaluator).getPropertyValue(prop);
 	}
 
 	/**
-	 * Reads the given {@link BasicDBList} into a collection of the given {@link TypeInformation}.
+	 * Reads the given {@link Collection} into a collection of the given {@link TypeInformation}. Can be overridden by
+	 * subclasses.
 	 *
-	 * @param targetType must not be {@literal null}.
-	 * @param source must not be {@literal null}.
-	 * @param path must not be {@literal null}.
+	 * @param context must not be {@literal null}
+	 * @param source must not be {@literal null}
+	 * @param targetType the {@link Map} {@link TypeInformation} to be used to unmarshall this {@link Document}.
+	 * @since 3.2
 	 * @return the converted {@link Collection} or array, will never be {@literal null}.
 	 */
-	@SuppressWarnings("unchecked")
-	private Object readCollectionOrArray(TypeInformation<?> targetType, Collection<?> source, ObjectPath path) {
+	@SuppressWarnings({"unchecked","NullAway"})
+	protected @Nullable Object readCollectionOrArray(ConversionContext context, @Nullable Collection<?> source,
+			TypeInformation<?> targetType) {
 
-		Assert.notNull(targetType, "Target type must not be null!");
-		Assert.notNull(path, "Object path must not be null!");
+		Assert.notNull(targetType, "Target type must not be null");
+		Assert.notNull(source, "Source must not be null");
 
 		Class<?> collectionType = targetType.isSubTypeOf(Collection.class) //
 				? targetType.getType() //
@@ -1065,7 +1499,7 @@ private Object readCollectionOrArray(TypeInformation<?> targetType, Collection<?
 
 		TypeInformation<?> componentType = targetType.getComponentType() != null //
 				? targetType.getComponentType() //
-				: ClassTypeInformation.OBJECT;
+				: TypeInformation.OBJECT;
 		Class<?> rawComponentType = componentType.getType();
 
 		Collection<Object> items = targetType.getType().isArray() //
@@ -1078,170 +1512,71 @@ private Object readCollectionOrArray(TypeInformation<?> targetType, Collection<?
 
 		if (!DBRef.class.equals(rawComponentType) && isCollectionOfDbRefWhereBulkFetchIsPossible(source)) {
 
-			List<Object> objects = bulkReadAndConvertDBRefs((List<DBRef>) source, componentType, path, rawComponentType);
+			List<Object> objects = bulkReadAndConvertDBRefs(context, (List<DBRef>) source, componentType);
 			return getPotentiallyConvertedSimpleRead(objects, targetType.getType());
 		}
 
 		for (Object element : source) {
-
-			if (element instanceof DBRef) {
-				items.add(DBRef.class.equals(rawComponentType) ? element
-						: readAndConvertDBRef((DBRef) element, componentType, path, rawComponentType));
-			} else if (element instanceof Document) {
-				items.add(read(componentType, (Document) element, path));
-			} else if (element instanceof BasicDBObject) {
-				items.add(read(componentType, (BasicDBObject) element, path));
-			} else {
-
-				if (!Object.class.equals(rawComponentType) && element instanceof Collection) {
-					if (!rawComponentType.isArray() && !ClassUtils.isAssignable(Iterable.class, rawComponentType)) {
-						throw new MappingException(
-								String.format(INCOMPATIBLE_TYPES, element, element.getClass(), rawComponentType, path));
-					}
-				}
-				if (element instanceof List) {
-					items.add(readCollectionOrArray(componentType, (Collection<Object>) element, path));
-				} else {
-					items.add(getPotentiallyConvertedSimpleRead(element, rawComponentType));
-				}
-			}
+			items.add(element != null ? context.convert(element, componentType) : element);
 		}
 
 		return getPotentiallyConvertedSimpleRead(items, targetType.getType());
 	}
 
 	/**
-	 * Reads the given {@link Document} into a {@link Map}. will recursively resolve nested {@link Map}s as well.
+	 * Reads the given {@link Document} into a {@link Map}. will recursively resolve nested {@link Map}s as well. Can be
+	 * overridden by subclasses.
 	 *
-	 * @param type the {@link Map} {@link TypeInformation} to be used to unmarshall this {@link Document}.
+	 * @param context must not be {@literal null}
 	 * @param bson must not be {@literal null}
-	 * @param path must not be {@literal null}
-	 * @return
+	 * @param targetType the {@link Map} {@link TypeInformation} to be used to unmarshall this {@link Document}.
+	 * @return the converted {@link Map}, will never be {@literal null}.
+	 * @since 3.2
 	 */
-	@SuppressWarnings("unchecked")
-	protected Map<Object, Object> readMap(TypeInformation<?> type, Bson bson, ObjectPath path) {
+	protected @Nullable Map<Object, Object> readMap(ConversionContext context, @Nullable Bson bson, TypeInformation<?> targetType) {
 
-		Assert.notNull(bson, "Document must not be null!");
-		Assert.notNull(path, "Object path must not be null!");
+		Assert.notNull(bson, "Document must not be null");
+		Assert.notNull(targetType, "TypeInformation must not be null");
 
-		Class<?> mapType = typeMapper.readType(bson, type).getType();
+		Class<?> mapType = getTypeMapper().readType(bson, targetType).getType();
 
-		TypeInformation<?> keyType = type.getComponentType();
-		TypeInformation<?> valueType = type.getMapValueType();
+		TypeInformation<?> keyType = targetType.getComponentType();
+		TypeInformation<?> valueType = targetType.getMapValueType() == null ? TypeInformation.OBJECT
+				: targetType.getRequiredMapValueType();
 
-		Class<?> rawKeyType = keyType != null ? keyType.getType() : null;
-		Class<?> rawValueType = valueType != null ? valueType.getType() : null;
+		Class<?> rawKeyType = keyType != null ? keyType.getType() : Object.class;
+		Class<?> rawValueType = valueType.getType();
 
-		Map<String, Object> sourceMap = asMap(bson);
+		Map<String, Object> sourceMap = BsonUtils.asMap(bson);
 		Map<Object, Object> map = CollectionFactory.createMap(mapType, rawKeyType, sourceMap.keySet().size());
 
 		if (!DBRef.class.equals(rawValueType) && isCollectionOfDbRefWhereBulkFetchIsPossible(sourceMap.values())) {
-			bulkReadAndConvertDBRefMapIntoTarget(valueType, rawValueType, sourceMap, map);
+			bulkReadAndConvertDBRefMapIntoTarget(context, valueType, sourceMap, map);
 			return map;
 		}
 
-		for (Entry<String, Object> entry : sourceMap.entrySet()) {
+		sourceMap.forEach((k, v) -> {
 
-			if (typeMapper.isTypeKey(entry.getKey())) {
-				continue;
+			if (getTypeMapper().isTypeKey(k)) {
+				return;
 			}
 
-			Object key = potentiallyUnescapeMapKey(entry.getKey());
+			Object key = potentiallyUnescapeMapKey(k);
 
-			if (rawKeyType != null && !rawKeyType.isAssignableFrom(key.getClass())) {
-				key = conversionService.convert(key, rawKeyType);
+			if (!rawKeyType.isAssignableFrom(key.getClass())) {
+				key = doConvert(key, rawKeyType);
 			}
 
-			Object value = entry.getValue();
-			TypeInformation<?> defaultedValueType = valueType != null ? valueType : ClassTypeInformation.OBJECT;
-
-			if (value instanceof Document) {
-				map.put(key, read(defaultedValueType, (Document) value, path));
-			} else if (value instanceof BasicDBObject) {
-				map.put(key, read(defaultedValueType, (BasicDBObject) value, path));
-			} else if (value instanceof DBRef) {
-				map.put(key, DBRef.class.equals(rawValueType) ? value
-						: readAndConvertDBRef((DBRef) value, defaultedValueType, ObjectPath.ROOT, rawValueType));
-			} else if (value instanceof List) {
-				map.put(key, readCollectionOrArray(valueType != null ? valueType : ClassTypeInformation.LIST,
-						(List<Object>) value, path));
-			} else {
-				map.put(key, getPotentiallyConvertedSimpleRead(value, rawValueType));
-			}
-		}
+			map.put(key, v == null ? v : context.convert(v, valueType));
+		});
 
 		return map;
 	}
 
-	@SuppressWarnings("unchecked")
-	private static Map<String, Object> asMap(Bson bson) {
-
-		if (bson instanceof Document) {
-			return (Document) bson;
-		}
-
-		if (bson instanceof DBObject) {
-			return ((DBObject) bson).toMap();
-		}
-
-		throw new IllegalArgumentException(
-				String.format("Cannot read %s. as map. Given Bson must be a Document or DBObject!", bson.getClass()));
-	}
-
-	private static void addToMap(Bson bson, String key, @Nullable Object value) {
-
-		if (bson instanceof Document) {
-			((Document) bson).put(key, value);
-			return;
-		}
-		if (bson instanceof DBObject) {
-			((DBObject) bson).put(key, value);
-			return;
-		}
-		throw new IllegalArgumentException(String.format(
-				"Cannot add key/value pair to %s. as map. Given Bson must be a Document or DBObject!", bson.getClass()));
-	}
-
-	private static void addAllToMap(Bson bson, Map<String, ?> value) {
-
-		if (bson instanceof Document) {
-			((Document) bson).putAll(value);
-			return;
-		}
-
-		if (bson instanceof DBObject) {
-			((DBObject) bson).putAll(value);
-			return;
-		}
-
-		throw new IllegalArgumentException(
-				String.format("Cannot add all to %s. Given Bson must be a Document or DBObject.", bson.getClass()));
-	}
-
-	private static void removeFromMap(Bson bson, String key) {
-
-		if (bson instanceof Document) {
-			((Document) bson).remove(key);
-			return;
-		}
-
-		if (bson instanceof DBObject) {
-			((DBObject) bson).removeField(key);
-			return;
-		}
-
-		throw new IllegalArgumentException(
-				String.format("Cannot remove from %s. Given Bson must be a Document or DBObject.", bson.getClass()));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.MongoWriter#convertToMongoType(java.lang.Object, org.springframework.data.util.TypeInformation)
-	 */
 	@Nullable
 	@SuppressWarnings("unchecked")
 	@Override
-	public Object convertToMongoType(@Nullable Object obj, TypeInformation<?> typeInformation) {
+	public Object convertToMongoType(@Nullable Object obj, @Nullable TypeInformation<?> typeInformation) {
 
 		if (obj == null) {
 			return null;
@@ -1249,35 +1584,42 @@ public Object convertToMongoType(@Nullable Object obj, TypeInformation<?> typeIn
 
 		Optional<Class<?>> target = conversions.getCustomWriteTarget(obj.getClass());
 		if (target.isPresent()) {
-			return conversionService.convert(obj, target.get());
+			return doConvert(obj, target.get());
 		}
 
 		if (conversions.isSimpleType(obj.getClass())) {
-			// Doesn't need conversion
-			return getPotentiallyConvertedSimpleWrite(obj,
-					typeInformation != null ? typeInformation.getType() : Object.class);
+
+			Class<?> conversionTargetType;
+
+			if (typeInformation != null && conversions.isSimpleType(typeInformation.getType())) {
+				conversionTargetType = typeInformation.getType();
+			} else {
+				conversionTargetType = Object.class;
+			}
+
+			return getPotentiallyConvertedSimpleWrite(obj, conversionTargetType);
 		}
 
-		if (obj instanceof List) {
-			return maybeConvertList((List<Object>) obj, typeInformation);
+		if (obj instanceof List<?> list) {
+			return maybeConvertList(list, typeInformation);
 		}
 
-		if (obj instanceof Document) {
+		if (obj instanceof Document document) {
 
 			Document newValueDocument = new Document();
-			for (String vk : ((Document) obj).keySet()) {
-				Object o = ((Document) obj).get(vk);
+			for (String vk : document.keySet()) {
+				Object o = document.get(vk);
 				newValueDocument.put(vk, convertToMongoType(o, typeInformation));
 			}
 			return newValueDocument;
 		}
 
-		if (obj instanceof DBObject) {
+		if (obj instanceof DBObject dbObject) {
 
 			Document newValueDbo = new Document();
-			for (String vk : ((DBObject) obj).keySet()) {
+			for (String vk : dbObject.keySet()) {
 
-				Object o = ((DBObject) obj).get(vk);
+				Object o = dbObject.get(vk);
 				newValueDbo.put(vk, convertToMongoType(o, typeInformation));
 			}
 
@@ -1299,8 +1641,8 @@ public Object convertToMongoType(@Nullable Object obj, TypeInformation<?> typeIn
 			return maybeConvertList(Arrays.asList((Object[]) obj), typeInformation);
 		}
 
-		if (obj instanceof Collection) {
-			return maybeConvertList((Collection<?>) obj, typeInformation);
+		if (obj instanceof Collection<?> collection) {
+			return maybeConvertList(collection, typeInformation);
 		}
 
 		Document newDocument = new Document();
@@ -1317,7 +1659,15 @@ public Object convertToMongoType(@Nullable Object obj, TypeInformation<?> typeIn
 		return !obj.getClass().equals(typeInformation.getType()) ? newDocument : removeTypeInfo(newDocument, true);
 	}
 
-	public List<Object> maybeConvertList(Iterable<?> source, TypeInformation<?> typeInformation) {
+	@Override
+	public Object convertToMongoType(@Nullable Object obj, MongoPersistentEntity<?> entity) {
+		Document newDocument = new Document();
+		writeInternal(obj, newDocument, entity);
+		return newDocument;
+	}
+
+	// TODO: hide in 5.0
+	public List<Object> maybeConvertList(Iterable<?> source, @Nullable TypeInformation<?> typeInformation) {
 
 		List<Object> newDbl = new ArrayList<>();
 
@@ -1338,11 +1688,10 @@ public List<Object> maybeConvertList(Iterable<?> source, TypeInformation<?> type
 	@SuppressWarnings("unchecked")
 	private Object removeTypeInfo(Object object, boolean recursively) {
 
-		if (!(object instanceof Document)) {
+		if (!(object instanceof Document document)) {
 			return object;
 		}
 
-		Document document = (Document) object;
 		String keyToRemove = null;
 
 		for (String key : document.keySet()) {
@@ -1364,7 +1713,7 @@ private Object removeTypeInfo(Object object, boolean recursively) {
 				}
 			}
 
-			if (typeMapper.isTypeKey(key)) {
+			if (getTypeMapper().isTypeKey(key)) {
 
 				keyToRemove = key;
 
@@ -1381,203 +1730,50 @@ private Object removeTypeInfo(Object object, boolean recursively) {
 		return document;
 	}
 
-	/**
-	 * {@link PropertyValueProvider} to evaluate a SpEL expression if present on the property or simply accesses the field
-	 * of the configured source {@link Document}.
-	 *
-	 * @author Oliver Gierke
-	 * @author Mark Paluch
-	 * @author Christoph Strobl
-	 */
-	class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
-
-		final DocumentAccessor accessor;
-		final SpELExpressionEvaluator evaluator;
-		final ObjectPath path;
-
-		/**
-		 * Creates a new {@link MongoDbPropertyValueProvider} for the given source, {@link SpELExpressionEvaluator} and
-		 * {@link ObjectPath}.
-		 *
-		 * @param source must not be {@literal null}.
-		 * @param evaluator must not be {@literal null}.
-		 * @param path must not be {@literal null}.
-		 */
-		MongoDbPropertyValueProvider(Bson source, SpELExpressionEvaluator evaluator, ObjectPath path) {
-			this(new DocumentAccessor(source), evaluator, path);
-		}
-
-		/**
-		 * Creates a new {@link MongoDbPropertyValueProvider} for the given source, {@link SpELExpressionEvaluator} and
-		 * {@link ObjectPath}.
-		 *
-		 * @param accessor must not be {@literal null}.
-		 * @param evaluator must not be {@literal null}.
-		 * @param path must not be {@literal null}.
-		 */
-		MongoDbPropertyValueProvider(DocumentAccessor accessor, SpELExpressionEvaluator evaluator, ObjectPath path) {
-
-			Assert.notNull(accessor, "DocumentAccessor must no be null!");
-			Assert.notNull(evaluator, "SpELExpressionEvaluator must not be null!");
-			Assert.notNull(path, "ObjectPath must not be null!");
-
-			this.accessor = accessor;
-			this.evaluator = evaluator;
-			this.path = path;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
-		 */
-		@Nullable
-		public <T> T getPropertyValue(MongoPersistentProperty property) {
-
-			String expression = property.getSpelExpression();
-			Object value = expression != null ? evaluator.evaluate(expression) : accessor.get(property);
-
-			if (value == null) {
-				return null;
-			}
-
-			return readValue(value, property.getTypeInformation(), path);
-		}
-	}
-
-	/**
-	 * {@link PropertyValueProvider} that is aware of {@link MongoPersistentProperty#isAssociation()} and that delegates
-	 * resolution to {@link DbRefResolver}.
-	 *
-	 * @author Mark Paluch
-	 * @author Christoph Strobl
-	 * @since 2.1
-	 */
-	class AssociationAwareMongoDbPropertyValueProvider extends MongoDbPropertyValueProvider {
-
-		/**
-		 * Creates a new {@link AssociationAwareMongoDbPropertyValueProvider} for the given source,
-		 * {@link SpELExpressionEvaluator} and {@link ObjectPath}.
-		 *
-		 * @param source must not be {@literal null}.
-		 * @param evaluator must not be {@literal null}.
-		 * @param path must not be {@literal null}.
-		 */
-		AssociationAwareMongoDbPropertyValueProvider(DocumentAccessor source, SpELExpressionEvaluator evaluator,
-				ObjectPath path) {
-			super(source, evaluator, path);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.convert.PropertyValueProvider#getPropertyValue(org.springframework.data.mapping.PersistentProperty)
-		 */
-		@Nullable
-		@SuppressWarnings("unchecked")
-		public <T> T getPropertyValue(MongoPersistentProperty property) {
-
-			if (property.isDbReference() && property.getDBRef().lazy()) {
-
-				Object rawRefValue = accessor.get(property);
-				if (rawRefValue == null) {
-					return null;
-				}
-
-				DbRefResolverCallback callback = new DefaultDbRefResolverCallback(accessor.getDocument(), path, evaluator,
-						MappingMongoConverter.this);
-
-				DBRef dbref = rawRefValue instanceof DBRef ? (DBRef) rawRefValue : null;
-				return (T) dbRefResolver.resolveDbRef(property, dbref, callback, dbRefProxyHandler);
-			}
-
-			return super.getPropertyValue(property);
-		}
-	}
-
-	/**
-	 * Extension of {@link SpELExpressionParameterValueProvider} to recursively trigger value conversion on the raw
-	 * resolved SpEL value.
-	 *
-	 * @author Oliver Gierke
-	 */
-	private class ConverterAwareSpELExpressionParameterValueProvider
-			extends SpELExpressionParameterValueProvider<MongoPersistentProperty> {
-
-		private final ObjectPath path;
-
-		/**
-		 * Creates a new {@link ConverterAwareSpELExpressionParameterValueProvider}.
-		 *
-		 * @param evaluator must not be {@literal null}.
-		 * @param conversionService must not be {@literal null}.
-		 * @param delegate must not be {@literal null}.
-		 */
-		public ConverterAwareSpELExpressionParameterValueProvider(SpELExpressionEvaluator evaluator,
-				ConversionService conversionService, ParameterValueProvider<MongoPersistentProperty> delegate,
-				ObjectPath path) {
-
-			super(evaluator, conversionService, delegate);
-			this.path = path;
-		}
+	@SuppressWarnings("unchecked")
+	<T> @Nullable T readValue(ConversionContext context, @Nullable Object value, TypeInformation<?> type) {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mapping.model.SpELExpressionParameterValueProvider#potentiallyConvertSpelValue(java.lang.Object, org.springframework.data.mapping.PreferredConstructor.Parameter)
-		 */
-		@Override
-		protected <T> T potentiallyConvertSpelValue(Object object, Parameter<T, MongoPersistentProperty> parameter) {
-			return readValue(object, parameter.getType(), path);
+		if (value == null) {
+			return null;
 		}
-	}
 
-	@Nullable
-	@SuppressWarnings("unchecked")
-	<T> T readValue(Object value, TypeInformation<?> type, ObjectPath path) {
+		Assert.notNull(type, "TypeInformation must not be null");
 
 		Class<?> rawType = type.getType();
 
 		if (conversions.hasCustomReadTarget(value.getClass(), rawType)) {
-			return (T) conversionService.convert(value, rawType);
-		} else if (value instanceof DBRef) {
-			return potentiallyReadOrResolveDbRef((DBRef) value, type, path, rawType);
-		} else if (value instanceof List) {
-			return (T) readCollectionOrArray(type, (List<Object>) value, path);
-		} else if (value instanceof Document) {
-			return (T) read(type, (Document) value, path);
-		} else if (value instanceof DBObject) {
-			return (T) read(type, (BasicDBObject) value, path);
-		} else {
-			return (T) getPotentiallyConvertedSimpleRead(value, rawType);
+			return (T) doConvert(value, rawType);
+		} else if (value instanceof DBRef dbRef) {
+			return (T) readDBRef(context, dbRef, type);
 		}
+
+		return (T) context.convert(value, type);
 	}
 
-	@Nullable
-	@SuppressWarnings("unchecked")
-	private <T> T potentiallyReadOrResolveDbRef(@Nullable DBRef dbref, TypeInformation<?> type, ObjectPath path,
-			Class<?> rawType) {
+	private @Nullable Object readDBRef(ConversionContext context, @Nullable DBRef dbref, TypeInformation<?> type) {
 
-		if (rawType.equals(DBRef.class)) {
-			return (T) dbref;
+		if (type.getType().equals(DBRef.class)) {
+			return dbref;
 		}
 
-		T object = dbref == null ? null : path.getPathItem(dbref.getId(), dbref.getCollectionName(), (Class<T>) rawType);
-		return object != null ? object : readAndConvertDBRef(dbref, type, path, rawType);
-	}
+		ObjectPath path = context.getPath();
 
-	@Nullable
-	private <T> T readAndConvertDBRef(@Nullable DBRef dbref, TypeInformation<?> type, ObjectPath path,
-			final Class<?> rawType) {
+		Object object = dbref == null ? null : path.getPathItem(dbref.getId(), dbref.getCollectionName(), type.getType());
+		if (object != null) {
+			return object;
+		}
 
-		List<T> result = bulkReadAndConvertDBRefs(Collections.singletonList(dbref), type, path, rawType);
-		return CollectionUtils.isEmpty(result) ? null : result.iterator().next();
+		List<Object> result = bulkReadAndConvertDBRefs(context, Collections.singletonList(dbref), type);
+		return CollectionUtils.isEmpty(result) ? null : peek(result);
 	}
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	private void bulkReadAndConvertDBRefMapIntoTarget(TypeInformation<?> valueType, Class<?> rawValueType,
+	private void bulkReadAndConvertDBRefMapIntoTarget(ConversionContext context, TypeInformation<?> valueType,
 			Map<String, Object> sourceMap, Map<Object, Object> targetMap) {
 
 		LinkedHashMap<String, Object> referenceMap = new LinkedHashMap<>(sourceMap);
-		List<Object> convertedObjects = bulkReadAndConvertDBRefs((List<DBRef>) new ArrayList(referenceMap.values()),
-				valueType, ObjectPath.ROOT, rawValueType);
+		List<Object> convertedObjects = bulkReadAndConvertDBRefs(context.withPath(ObjectPath.ROOT),
+				(List<DBRef>) new ArrayList(referenceMap.values()), valueType);
 		int index = 0;
 
 		for (String key : referenceMap.keySet()) {
@@ -1587,37 +1783,39 @@ private void bulkReadAndConvertDBRefMapIntoTarget(TypeInformation<?> valueType,
 	}
 
 	@SuppressWarnings("unchecked")
-	private <T> List<T> bulkReadAndConvertDBRefs(List<DBRef> dbrefs, TypeInformation<?> type, ObjectPath path,
-			final Class<?> rawType) {
+	private <T> List<T> bulkReadAndConvertDBRefs(ConversionContext context, List<DBRef> dbrefs, TypeInformation<?> type) {
 
 		if (CollectionUtils.isEmpty(dbrefs)) {
 			return Collections.emptyList();
 		}
 
-		List<Document> referencedRawDocuments = dbrefs.size() == 1
-				? Collections.singletonList(readRef(dbrefs.iterator().next()))
+		List<Document> referencedRawDocuments = dbrefs.size() == 1 ? Collections.singletonList(readRef(peek(dbrefs)))
 				: bulkReadRefs(dbrefs);
-		String collectionName = dbrefs.iterator().next().getCollectionName();
+		String collectionName = peek(dbrefs).getCollectionName();
 
-		List<T> targeList = new ArrayList<>(dbrefs.size());
+		List<T> targetList = new ArrayList<>(dbrefs.size());
 
 		for (Document document : referencedRawDocuments) {
 
+			T target = null;
 			if (document != null) {
-				maybeEmitEvent(new AfterLoadEvent<>(document, (Class<T>) rawType, collectionName));
-			}
 
-			final T target = (T) read(type, document, path);
-			targeList.add(target);
+				maybeEmitEvent(new AfterLoadEvent<>(document, (Class<T>) type.getType(), collectionName));
+				target = (T) readDocument(context, document, type);
+			}
 
 			if (target != null) {
 				maybeEmitEvent(new AfterConvertEvent<>(document, target, collectionName));
+				target = maybeCallAfterConvert(target, document, collectionName);
 			}
+
+			targetList.add(target);
 		}
 
-		return targeList;
+		return targetList;
 	}
 
+	@SuppressWarnings("NullAway")
 	private void maybeEmitEvent(MongoMappingEvent<?> event) {
 
 		if (canPublishEvent()) {
@@ -1629,6 +1827,15 @@ private boolean canPublishEvent() {
 		return this.applicationContext != null;
 	}
 
+	protected <T> T maybeCallAfterConvert(T object, Document document, String collection) {
+
+		if (null != entityCallbacks) {
+			return entityCallbacks.callback(AfterConvertCallback.class, object, document, collection);
+		}
+
+		return object;
+	}
+
 	/**
 	 * Performs the fetch operation for the given {@link DBRef}.
 	 *
@@ -1662,19 +1869,25 @@ public Class<?> getWriteTarget(Class<?> source) {
 		return conversions.getCustomWriteTarget(source).orElse(source);
 	}
 
+	@Override
+	public CodecRegistry getCodecRegistry() {
+		return codecRegistryProvider != null ? codecRegistryProvider.getCodecRegistry() : super.getCodecRegistry();
+	}
+
 	/**
-	 * Create a new {@link MappingMongoConverter} using the given {@link MongoDbFactory} when loading {@link DBRef}.
+	 * Create a new {@link MappingMongoConverter} using the given {@link MongoDatabaseFactory} when loading {@link DBRef}.
 	 *
 	 * @return new instance of {@link MappingMongoConverter}. Never {@literal null}.
 	 * @since 2.1.6
 	 */
-	public MappingMongoConverter with(MongoDbFactory dbFactory) {
+	public MappingMongoConverter with(MongoDatabaseFactory dbFactory) {
 
 		MappingMongoConverter target = new MappingMongoConverter(new DefaultDbRefResolver(dbFactory), mappingContext);
 		target.applicationContext = applicationContext;
 		target.conversions = conversions;
 		target.spELContext = spELContext;
 		target.setInstantiators(instantiators);
+		target.defaultTypeMapper = defaultTypeMapper;
 		target.typeMapper = typeMapper;
 		target.setCodecRegistryProvider(dbFactory);
 		target.afterPropertiesSet();
@@ -1682,6 +1895,20 @@ public MappingMongoConverter with(MongoDbFactory dbFactory) {
 		return target;
 	}
 
+	private <T extends Object> @Nullable T doConvert(Object value, Class<? extends T> target) {
+		return doConvert(value, target, null);
+	}
+
+	@SuppressWarnings("ConstantConditions")
+	private <T extends Object> @Nullable T doConvert(Object value, Class<? extends T> target,
+			@Nullable Class<? extends T> fallback) {
+
+		if (conversionService.canConvert(value.getClass(), target) || fallback == null) {
+			return conversionService.convert(value, target);
+		}
+		return conversionService.convert(value, fallback);
+	}
+
 	/**
 	 * Returns whether the given {@link Iterable} contains {@link DBRef} instances all pointing to the same collection.
 	 *
@@ -1690,17 +1917,17 @@ public MappingMongoConverter with(MongoDbFactory dbFactory) {
 	 */
 	private static boolean isCollectionOfDbRefWhereBulkFetchIsPossible(Iterable<?> source) {
 
-		Assert.notNull(source, "Iterable of DBRefs must not be null!");
+		Assert.notNull(source, "Iterable of DBRefs must not be null");
 
 		Set<String> collectionsFound = new HashSet<>();
 
 		for (Object dbObjItem : source) {
 
-			if (!(dbObjItem instanceof DBRef)) {
+			if (!(dbObjItem instanceof DBRef dbRef)) {
 				return false;
 			}
 
-			collectionsFound.add(((DBRef) dbObjItem).getCollectionName());
+			collectionsFound.add(dbRef.getCollectionName());
 
 			if (collectionsFound.size() > 1) {
 				return false;
@@ -1710,36 +1937,212 @@ private static boolean isCollectionOfDbRefWhereBulkFetchIsPossible(Iterable<?> s
 		return true;
 	}
 
+	private static <T> T peek(Iterable<T> result) {
+		return result.iterator().next();
+	}
+
 	/**
-	 * Marker class used to indicate we have a non root document object here that might be used within an update - so we
-	 * need to preserve type hints for potential nested elements but need to remove it on top level.
+	 * {@link PropertyValueProvider} to evaluate a SpEL expression if present on the property or simply accesses the field
+	 * of the configured source {@link Document}.
 	 *
+	 * @author Oliver Gierke
+	 * @author Mark Paluch
 	 * @author Christoph Strobl
-	 * @since 1.8
 	 */
-	static class NestedDocument {
+	static class MongoDbPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
 
-	}
+		final ConversionContext context;
+		final DocumentAccessor accessor;
+		final ValueExpressionEvaluator evaluator;
+		final @Nullable SpELContext spELContext;
 
-	enum NoOpParameterValueProvider implements ParameterValueProvider<MongoPersistentProperty> {
+		/**
+		 * Creates a new {@link MongoDbPropertyValueProvider} for the given source, {@link ValueExpressionEvaluator} and
+		 * {@link ObjectPath}.
+		 *
+		 * @param context must not be {@literal null}.
+		 * @param source must not be {@literal null}.
+		 * @param evaluator must not be {@literal null}.
+		 */
+		MongoDbPropertyValueProvider(ConversionContext context, Bson source, ValueExpressionEvaluator evaluator) {
+			this(context, new DocumentAccessor(source), evaluator, null);
+		}
+
+		/**
+		 * Creates a new {@link MongoDbPropertyValueProvider} for the given source, {@link ValueExpressionEvaluator} and
+		 * {@link ObjectPath}.
+		 *
+		 * @param context must not be {@literal null}.
+		 * @param accessor must not be {@literal null}.
+		 * @param evaluator must not be {@literal null}.
+		 */
+		MongoDbPropertyValueProvider(ConversionContext context, DocumentAccessor accessor,
+				ValueExpressionEvaluator evaluator, @Nullable SpELContext spELContext) {
+
+			this.context = context;
+			this.accessor = accessor;
+			this.evaluator = evaluator;
+			this.spELContext = spELContext;
+		}
+
+		@Override
+		@SuppressWarnings({"unchecked", "NullAway"})
+		public <T> @Nullable T getPropertyValue(MongoPersistentProperty property) {
+
+			String expression = property.getSpelExpression();
+			Object value = expression != null ? evaluator.evaluate(expression) : accessor.get(property);
+
+			CustomConversions conversions = context.getCustomConversions();
+			if (conversions.hasValueConverter(property)) {
+				MongoConversionContext conversionContext = new MongoConversionContext(this, property,
+						context.getSourceConverter(), spELContext);
+				PropertyValueConverter<Object, Object, ValueConversionContext<MongoPersistentProperty>> valueConverter = conversions
+						.getPropertyValueConversions().getValueConverter(property);
+				return (T) (value != null ? valueConverter.read(value, conversionContext)
+						: valueConverter.readNull(conversionContext));
+			}
+
+			if (value == null) {
+				return null;
+			}
+
+			ConversionContext contextToUse = context.forProperty(property);
+
+			return (T) contextToUse.convert(value, property.getTypeInformation());
+		}
+
+		public MongoDbPropertyValueProvider withContext(ConversionContext context) {
+
+			return context == this.context ? this
+					: new MongoDbPropertyValueProvider(context, accessor, evaluator, spELContext);
+		}
+	}
+
+	/**
+	 * {@link PropertyValueProvider} that is aware of {@link MongoPersistentProperty#isAssociation()} and that delegates
+	 * resolution to {@link DbRefResolver}.
+	 *
+	 * @author Mark Paluch
+	 * @author Christoph Strobl
+	 * @since 2.1
+	 */
+	class AssociationAwareMongoDbPropertyValueProvider extends MongoDbPropertyValueProvider {
+
+		/**
+		 * Creates a new {@link AssociationAwareMongoDbPropertyValueProvider} for the given source,
+		 * {@link ValueExpressionEvaluator} and {@link ObjectPath}.
+		 *
+		 * @param source must not be {@literal null}.
+		 * @param evaluator must not be {@literal null}.
+		 */
+		AssociationAwareMongoDbPropertyValueProvider(ConversionContext context, DocumentAccessor source,
+				ValueExpressionEvaluator evaluator) {
+			super(context, source, evaluator, MappingMongoConverter.this.spELContext);
+		}
+
+		@Override
+		@Nullable
+		@SuppressWarnings("unchecked")
+		public <T> T getPropertyValue(MongoPersistentProperty property) {
+
+			ConversionContext propertyContext = context.forProperty(property);
+
+			if (property.isAssociation()) {
+
+				DbRefResolverCallback callback = new DefaultDbRefResolverCallback(accessor.getDocument(), context.getPath(),
+						evaluator, (prop, bson, evaluator, path) -> MappingMongoConverter.this.getValueInternal(context, prop, bson,
+								evaluator));
+
+				return (T) readAssociation(property.getRequiredAssociation(), accessor, dbRefProxyHandler, callback,
+						propertyContext);
+			}
+
+			if (property.isUnwrapped()) {
+
+				return (T) readUnwrapped(propertyContext, accessor, property,
+						mappingContext.getRequiredPersistentEntity(property));
+			}
+
+			if (!accessor.hasValue(property)) {
+				return null;
+			}
+
+			return super.getPropertyValue(property);
+		}
+	}
+
+	/**
+	 * Extension of {@link ValueExpressionParameterValueProvider} to recursively trigger value conversion on the raw
+	 * resolved SpEL value.
+	 *
+	 * @author Oliver Gierke
+	 */
+	private static class ConverterAwareValueExpressionParameterValueProvider
+			extends ValueExpressionParameterValueProvider<MongoPersistentProperty> {
+
+		private final ConversionContext context;
+
+		/**
+		 * Creates a new {@link ConverterAwareValueExpressionParameterValueProvider}.
+		 *
+		 * @param context must not be {@literal null}.
+		 * @param evaluator must not be {@literal null}.
+		 * @param conversionService must not be {@literal null}.
+		 * @param delegate must not be {@literal null}.
+		 */
+		public ConverterAwareValueExpressionParameterValueProvider(ConversionContext context,
+				ValueExpressionEvaluator evaluator, ConversionService conversionService,
+				ParameterValueProvider<MongoPersistentProperty> delegate) {
+
+			super(evaluator, conversionService, delegate);
+
+			Assert.notNull(context, "ConversionContext must no be null");
+
+			this.context = context;
+		}
+
+		@Override
+		protected <T> T potentiallyConvertExpressionValue(Object object, Parameter<T, MongoPersistentProperty> parameter) {
+			return context.convert(object, parameter.getType());
+		}
+	}
+
+	/**
+	 * Marker class used to indicate we have a non root document object here that might be used within an update - so we
+	 * need to preserve type hints for potential nested elements but need to remove it on top level.
+	 *
+	 * @author Christoph Strobl
+	 * @since 1.8
+	 */
+	static class NestedDocument {
+
+	}
+
+	enum NoOpParameterValueProvider implements ParameterValueProvider<MongoPersistentProperty> {
 
 		INSTANCE;
 
 		@Override
-		public <T> T getParameterValue(Parameter<T, MongoPersistentProperty> parameter) {
+		public <T> @Nullable T getParameterValue(Parameter<T, MongoPersistentProperty> parameter) {
 			return null;
 		}
 	}
 
-	private static class TypeInformationWrapper<S> implements TypeInformation<S> {
+	/**
+	 * {@link TypeInformation} considering {@link MongoPersistentProperty#getFieldType()} as type source.
+	 *
+	 * @param <S>
+	 */
+	private static class FieldTypeInformation<S> implements TypeInformation<S> {
 
-		private MongoPersistentProperty persistentProperty;
-		private TypeInformation<?> delegate;
+		private final MongoPersistentProperty persistentProperty;
+		private final TypeInformation<S> delegate;
 
-		public TypeInformationWrapper(MongoPersistentProperty property) {
+		@SuppressWarnings("unchecked")
+		public FieldTypeInformation(MongoPersistentProperty property) {
 
 			this.persistentProperty = property;
-			this.delegate = property.getTypeInformation();
+			this.delegate = (TypeInformation<S>) property.getTypeInformation();
 		}
 
 		@Override
@@ -1748,7 +2151,7 @@ public List<org.springframework.data.util.TypeInformation<?>> getParameterTypes(
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation<?> getProperty(String property) {
+		public org.springframework.data.util.@Nullable TypeInformation<?> getProperty(String property) {
 			return delegate.getProperty(property);
 		}
 
@@ -1759,7 +2162,7 @@ public boolean isCollectionLike() {
 
 		@Override
 		public org.springframework.data.util.TypeInformation<?> getComponentType() {
-			return ClassTypeInformation.from(persistentProperty.getFieldType());
+			return TypeInformation.of(persistentProperty.getFieldType());
 		}
 
 		@Override
@@ -1769,21 +2172,21 @@ public boolean isMap() {
 
 		@Override
 		public org.springframework.data.util.TypeInformation<?> getMapValueType() {
-			return ClassTypeInformation.from(persistentProperty.getFieldType());
+			return TypeInformation.of(persistentProperty.getFieldType());
 		}
 
 		@Override
-		public Class getType() {
+		public Class<S> getType() {
 			return delegate.getType();
 		}
 
 		@Override
-		public ClassTypeInformation<?> getRawTypeInformation() {
+		public TypeInformation<?> getRawTypeInformation() {
 			return delegate.getRawTypeInformation();
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation<?> getActualType() {
+		public org.springframework.data.util.@Nullable TypeInformation<?> getActualType() {
 			return delegate.getActualType();
 		}
 
@@ -1798,7 +2201,7 @@ public List<org.springframework.data.util.TypeInformation<?>> getParameterTypes(
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation<?> getSuperTypeInformation(Class superType) {
+		public org.springframework.data.util.@Nullable TypeInformation<?> getSuperTypeInformation(Class superType) {
 			return delegate.getSuperTypeInformation(superType);
 		}
 
@@ -1813,8 +2216,352 @@ public List<org.springframework.data.util.TypeInformation<?>> getTypeArguments()
 		}
 
 		@Override
-		public org.springframework.data.util.TypeInformation specialize(ClassTypeInformation type) {
+		public org.springframework.data.util.TypeInformation<? extends S> specialize(TypeInformation<?> type) {
 			return delegate.specialize(type);
 		}
+
+		@Override
+		public TypeDescriptor toTypeDescriptor() {
+			return delegate.toTypeDescriptor();
+		}
+
+		@Override
+		public ResolvableType toResolvableType() {
+			return delegate.toResolvableType();
+		}
 	}
+
+	/**
+	 * Conversion context defining an interface for graph-traversal-based conversion of documents. Entrypoint for
+	 * recursive conversion of {@link Document} and other types.
+	 *
+	 * @since 3.4.3
+	 */
+	protected interface ConversionContext {
+
+		/**
+		 * Converts a source object into {@link TypeInformation target}.
+		 *
+		 * @param source must not be {@literal null}.
+		 * @param typeHint must not be {@literal null}.
+		 * @return the converted object.
+		 */
+		default <S extends Object> S convert(Object source, TypeInformation<? extends S> typeHint) {
+			return convert(source, typeHint, this);
+		}
+
+		/**
+		 * Converts a source object into {@link TypeInformation target}.
+		 *
+		 * @param source must not be {@literal null}.
+		 * @param typeHint must not be {@literal null}.
+		 * @param context must not be {@literal null}.
+		 * @return the converted object.
+		 */
+		<S extends Object> S convert(Object source, TypeInformation<? extends S> typeHint, ConversionContext context);
+
+		/**
+		 * Create a new {@link ConversionContext} with {@link ObjectPath currentPath} applied.
+		 *
+		 * @param currentPath must not be {@literal null}.
+		 * @return a new {@link ConversionContext} with {@link ObjectPath currentPath} applied.
+		 */
+		ConversionContext withPath(ObjectPath currentPath);
+
+		/**
+		 * Obtain a {@link ConversionContext} for the given property {@code name}.
+		 *
+		 * @param name must not be {@literal null}.
+		 * @return the {@link ConversionContext} to be used for conversion of the given property.
+		 */
+		default ConversionContext forProperty(String name) {
+			return this;
+		}
+
+		/**
+		 * Obtain a {@link ConversionContext} for the given {@link MongoPersistentProperty}.
+		 *
+		 * @param property must not be {@literal null}.
+		 * @return the {@link ConversionContext} to be used for conversion of the given property.
+		 */
+		default ConversionContext forProperty(MongoPersistentProperty property) {
+
+			return property.isAssociation() ? new AssociationConversionContext(forProperty(property.getName()))
+					: forProperty(property.getName());
+		}
+
+		/**
+		 * Lookup a potentially existing entity instance of the given {@link MongoPersistentEntity} and {@link Document}
+		 *
+		 * @param entity
+		 * @param document
+		 * @return
+		 * @param <S>
+		 */
+		default <S> @Nullable S findContextualEntity(MongoPersistentEntity<S> entity, Document document) {
+			return null;
+		}
+
+		ObjectPath getPath();
+
+		CustomConversions getCustomConversions();
+
+		MongoConverter getSourceConverter();
+
+	}
+
+	/**
+	 * @since 3.4.3
+	 */
+	static class AssociationConversionContext implements ConversionContext {
+
+		private final ConversionContext delegate;
+
+		public AssociationConversionContext(ConversionContext delegate) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public <S> S convert(Object source, TypeInformation<? extends S> typeHint, ConversionContext context) {
+			return delegate.convert(source, typeHint, context);
+		}
+
+		@Override
+		public ConversionContext withPath(ObjectPath currentPath) {
+			return new AssociationConversionContext(delegate.withPath(currentPath));
+		}
+
+		@Override
+		public <S> @Nullable S findContextualEntity(MongoPersistentEntity<S> entity, Document document) {
+
+			Object identifier = document.get(BasicMongoPersistentProperty.ID_FIELD_NAME);
+
+			return identifier != null ? getPath().getPathItem(identifier, entity.getCollection(), entity.getType()) : null;
+		}
+
+		@Override
+		public ObjectPath getPath() {
+			return delegate.getPath();
+		}
+
+		@Override
+		public CustomConversions getCustomConversions() {
+			return delegate.getCustomConversions();
+		}
+
+		@Override
+		public MongoConverter getSourceConverter() {
+			return delegate.getSourceConverter();
+		}
+
+	}
+
+	/**
+	 * Conversion context holding references to simple {@link ValueConverter} and {@link ContainerValueConverter}.
+	 * Entrypoint for recursive conversion of {@link Document} and other types.
+	 *
+	 * @since 3.2
+	 */
+	protected static class DefaultConversionContext implements ConversionContext {
+
+		final MongoConverter sourceConverter;
+		final org.springframework.data.convert.CustomConversions conversions;
+		final ObjectPath path;
+		final ContainerValueConverter<Bson> documentConverter;
+		final ContainerValueConverter<Collection<?>> collectionConverter;
+		final ContainerValueConverter<@Nullable Bson> mapConverter;
+		final ContainerValueConverter<@Nullable DBRef> dbRefConverter;
+		final ValueConverter<@Nullable Object> elementConverter;
+
+		DefaultConversionContext(MongoConverter sourceConverter,
+				org.springframework.data.convert.CustomConversions customConversions, ObjectPath path,
+				ContainerValueConverter<@Nullable Bson> documentConverter, ContainerValueConverter<@Nullable Collection<?>> collectionConverter,
+				ContainerValueConverter<@Nullable Bson> mapConverter, ContainerValueConverter<@Nullable DBRef> dbRefConverter,
+				ValueConverter<@Nullable Object> elementConverter) {
+
+			this.sourceConverter = sourceConverter;
+			this.conversions = customConversions;
+			this.path = path;
+			this.documentConverter = documentConverter;
+			this.collectionConverter = collectionConverter;
+			this.mapConverter = mapConverter;
+			this.dbRefConverter = dbRefConverter;
+			this.elementConverter = elementConverter;
+		}
+
+		@Override
+		@SuppressWarnings({"unchecked", "NullAway"})
+		public <S extends Object> S convert(Object source, TypeInformation<? extends S> typeHint,
+				ConversionContext context) {
+
+			if (conversions.hasCustomReadTarget(source.getClass(), typeHint.getType())) {
+				return (S) elementConverter.convert(source, typeHint);
+			}
+
+			if (source instanceof Collection<?> collection) {
+
+				Class<?> rawType = typeHint.getType();
+				if (!Object.class.equals(rawType) && !String.class.equals(rawType)) {
+
+					if (!rawType.isArray() && !ClassUtils.isAssignable(Iterable.class, rawType)) {
+
+						throw new MappingException(
+								String.format(INCOMPATIBLE_TYPES, source, source.getClass(), rawType, getPath()));
+					}
+				}
+
+				if (typeHint.isCollectionLike() || typeHint.getType().isAssignableFrom(Collection.class)) {
+					return (S) collectionConverter.convert(context, collection, typeHint);
+				}
+			}
+
+			if (typeHint.isMap()) {
+
+				if (ClassUtils.isAssignable(Document.class, typeHint.getType())) {
+					return (S) documentConverter.convert(context, BsonUtils.asBson(source), typeHint);
+				}
+
+				if (BsonUtils.supportsBson(source)) {
+					return (S) mapConverter.convert(context, BsonUtils.asBson(source), typeHint);
+				}
+
+				throw new IllegalArgumentException(
+						String.format("Expected map like structure but found %s", source.getClass()));
+			}
+
+			if (source instanceof DBRef dbRef) {
+				return (S) dbRefConverter.convert(context, dbRef, typeHint);
+			}
+
+			if (BsonUtils.supportsBson(source)) {
+				return (S) documentConverter.convert(context, BsonUtils.asBson(source), typeHint);
+			}
+
+			return (S) elementConverter.convert(source, typeHint);
+		}
+
+		@Override
+		public CustomConversions getCustomConversions() {
+			return conversions;
+		}
+
+		@Override
+		public MongoConverter getSourceConverter() {
+			return sourceConverter;
+		}
+
+		@Override
+		public ConversionContext withPath(ObjectPath currentPath) {
+
+			Assert.notNull(currentPath, "ObjectPath must not be null");
+
+			return new DefaultConversionContext(sourceConverter, conversions, currentPath, documentConverter,
+					collectionConverter, mapConverter, dbRefConverter, elementConverter);
+		}
+
+		@Override
+		public ObjectPath getPath() {
+			return path;
+		}
+
+		/**
+		 * Converts a simple {@code source} value into {@link TypeInformation the target type}.
+		 *
+		 * @param <T>
+		 */
+		interface ValueConverter<T> {
+
+			@Nullable Object convert(@Nullable T source, TypeInformation<?> typeHint);
+
+		}
+
+		/**
+		 * Converts a container {@code source} value into {@link TypeInformation the target type}. Containers may
+		 * recursively apply conversions for entities, collections, maps, etc.
+		 *
+		 * @param <T>
+		 */
+		interface ContainerValueConverter<T> {
+
+			@Nullable Object convert(ConversionContext context, @Nullable T source, TypeInformation<?> typeHint);
+
+		}
+
+	}
+
+	/**
+	 * @since 3.4.3
+	 */
+	class ProjectingConversionContext extends DefaultConversionContext {
+
+		private final EntityProjection<?, ?> returnedTypeDescriptor;
+
+		ProjectingConversionContext(MongoConverter sourceConverter, CustomConversions customConversions, ObjectPath path,
+				ContainerValueConverter<Collection<?>> collectionConverter, ContainerValueConverter<Bson> mapConverter,
+				ContainerValueConverter<@Nullable DBRef> dbRefConverter, ValueConverter<@Nullable Object> elementConverter,
+				EntityProjection<?, ?> projection) {
+			super(sourceConverter, customConversions, path,
+					(context, source, typeHint) -> doReadOrProject(context, source, typeHint, projection),
+
+					collectionConverter, mapConverter, dbRefConverter, elementConverter);
+			this.returnedTypeDescriptor = projection;
+		}
+
+		@Override
+		public ConversionContext forProperty(String name) {
+
+			EntityProjection<?, ?> property = returnedTypeDescriptor.findProperty(name);
+			if (property == null) {
+				return new DefaultConversionContext(sourceConverter, conversions, path,
+						MappingMongoConverter.this::readDocument, collectionConverter, mapConverter, dbRefConverter,
+						elementConverter);
+			}
+
+			return new ProjectingConversionContext(sourceConverter, conversions, path, collectionConverter, mapConverter,
+					dbRefConverter, elementConverter, property);
+		}
+
+		@Override
+		public ConversionContext withPath(ObjectPath currentPath) {
+			return new ProjectingConversionContext(sourceConverter, conversions, currentPath, collectionConverter,
+					mapConverter, dbRefConverter, elementConverter, returnedTypeDescriptor);
+		}
+	}
+
+	private static class PropertyTranslatingPropertyAccessor<T> implements PersistentPropertyAccessor<T> {
+
+		private final PersistentPropertyAccessor<T> delegate;
+		private final PersistentPropertyTranslator propertyTranslator;
+
+		private PropertyTranslatingPropertyAccessor(PersistentPropertyAccessor<T> delegate,
+				PersistentPropertyTranslator propertyTranslator) {
+			this.delegate = delegate;
+			this.propertyTranslator = propertyTranslator;
+		}
+
+		static <T> PersistentPropertyAccessor<T> create(PersistentPropertyAccessor<T> delegate,
+				PersistentPropertyTranslator propertyTranslator) {
+			return new PropertyTranslatingPropertyAccessor<>(delegate, propertyTranslator);
+		}
+
+		@Override
+		public void setProperty(PersistentProperty<?> property, @Nullable Object value) {
+			delegate.setProperty(translate(property), value);
+		}
+
+		@Override
+		public @Nullable Object getProperty(PersistentProperty<?> property) {
+			return delegate.getProperty(translate(property));
+		}
+
+		@Override
+		public T getBean() {
+			return delegate.getBean();
+		}
+
+		private MongoPersistentProperty translate(PersistentProperty<?> property) {
+			return propertyTranslator.translate((MongoPersistentProperty) property);
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConversionContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConversionContext.java
new file mode 100644
index 0000000000..0cc687c815
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConversionContext.java
@@ -0,0 +1,170 @@
+/*
+ * Copyright 2022-2025 the original author 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.convert;
+
+import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.convert.ValueConversionContext;
+import org.springframework.data.mapping.model.PropertyValueProvider;
+import org.springframework.data.mapping.model.SpELContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.lang.CheckReturnValue;
+
+/**
+ * {@link ValueConversionContext} that allows to delegate read/write to an underlying {@link MongoConverter}.
+ *
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 3.4
+ */
+public class MongoConversionContext implements ValueConversionContext<MongoPersistentProperty> {
+
+	private final PropertyValueProvider<MongoPersistentProperty> accessor; // TODO: generics
+	private final MongoConverter mongoConverter;
+
+	@Nullable private final MongoPersistentProperty persistentProperty;
+	@Nullable private final SpELContext spELContext;
+	@Nullable private final OperatorContext operatorContext;
+
+	public MongoConversionContext(PropertyValueProvider<MongoPersistentProperty> accessor,
+			@Nullable MongoPersistentProperty persistentProperty, MongoConverter mongoConverter) {
+		this(accessor, persistentProperty, mongoConverter, null, null);
+	}
+
+	public MongoConversionContext(PropertyValueProvider<MongoPersistentProperty> accessor,
+			@Nullable MongoPersistentProperty persistentProperty, MongoConverter mongoConverter,
+			@Nullable SpELContext spELContext) {
+		this(accessor, persistentProperty, mongoConverter, spELContext, null);
+	}
+
+	public MongoConversionContext(PropertyValueProvider<MongoPersistentProperty> accessor,
+			@Nullable MongoPersistentProperty persistentProperty, MongoConverter mongoConverter,
+			@Nullable OperatorContext operatorContext) {
+		this(accessor, persistentProperty, mongoConverter, null, operatorContext);
+	}
+
+	public MongoConversionContext(PropertyValueProvider<MongoPersistentProperty> accessor,
+			@Nullable MongoPersistentProperty persistentProperty, MongoConverter mongoConverter,
+			@Nullable SpELContext spELContext, @Nullable OperatorContext operatorContext) {
+
+		this.accessor = accessor;
+		this.persistentProperty = persistentProperty;
+		this.mongoConverter = mongoConverter;
+		this.spELContext = spELContext;
+		this.operatorContext = operatorContext;
+	}
+
+	@Override
+	public MongoPersistentProperty getProperty() {
+
+		if (persistentProperty == null) {
+			throw new IllegalStateException("No underlying MongoPersistentProperty available");
+		}
+
+		return persistentProperty;
+	}
+
+	/**
+	 * @param operatorContext
+	 * @return new instance of {@link MongoConversionContext}.
+	 * @since 4.5
+	 */
+	@CheckReturnValue
+	public MongoConversionContext forOperator(@Nullable OperatorContext operatorContext) {
+		return new MongoConversionContext(accessor, persistentProperty, mongoConverter, spELContext, operatorContext);
+	}
+
+	@Nullable
+	public Object getValue(String propertyPath) {
+		return accessor.getPropertyValue(getProperty().getOwner().getRequiredPersistentProperty(propertyPath));
+	}
+
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> @Nullable T write(@Nullable Object value, TypeInformation<T> target) {
+		return (T) mongoConverter.convertToMongoType(value, target);
+	}
+
+	@Override
+	public <T> @Nullable T read(@Nullable Object value, TypeInformation<T> target) {
+		return value instanceof Bson bson ? mongoConverter.read(target.getType(), bson)
+				: ValueConversionContext.super.read(value, target);
+	}
+
+	@Nullable
+	public SpELContext getSpELContext() {
+		return spELContext;
+	}
+
+	@Nullable
+	public OperatorContext getOperatorContext() {
+		return operatorContext;
+	}
+
+	/**
+	 * The {@link OperatorContext} provides access to the actual conversion intent like a write operation or a query
+	 * operator such as {@literal $gte}.
+	 *
+	 * @since 4.5
+	 */
+	public interface OperatorContext {
+
+		/**
+		 * The operator the conversion is used in.
+		 *
+		 * @return {@literal write} for simple write operations during save, or a query operator.
+		 */
+		String operator();
+
+		/**
+		 * The context path the operator is used in.
+		 *
+		 * @return never {@literal null}.
+		 */
+		String path();
+
+		boolean isWriteOperation();
+
+	}
+
+	record WriteOperatorContext(String path) implements OperatorContext {
+
+		@Override
+		public String operator() {
+			return "write";
+		}
+
+		@Override
+		public boolean isWriteOperation() {
+			return true;
+		}
+	}
+
+	record QueryOperatorContext(String operator, String path) implements OperatorContext {
+
+		public QueryOperatorContext(@Nullable String operator, String path) {
+			this.operator = operator != null ? operator : "$eq";
+			this.path = path;
+		}
+
+		@Override
+		public boolean isWriteOperation() {
+			return false;
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java
index 8f51e42754..e147d64cc5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,18 +15,25 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import com.mongodb.MongoClientSettings;
 import org.bson.BsonValue;
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.ConversionException;
+import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.convert.EntityReader;
 import org.springframework.data.convert.TypeMapper;
+import org.springframework.data.mongodb.CodecRegistryProvider;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.util.BsonUtils;
-import org.springframework.lang.Nullable;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -39,19 +46,49 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Ryan Gibb
  */
 public interface MongoConverter
 		extends EntityConverter<MongoPersistentEntity<?>, MongoPersistentProperty, Object, Bson>, MongoWriter<Object>,
-		EntityReader<Object, Bson> {
+		EntityReader<Object, Bson>, CodecRegistryProvider {
 
 	/**
-	 * Returns thw {@link TypeMapper} being used to write type information into {@link Document}s created with that
+	 * Returns the {@link TypeMapper} being used to write type information into {@link Document}s created with that
 	 * converter.
 	 *
 	 * @return will never be {@literal null}.
 	 */
 	MongoTypeMapper getTypeMapper();
 
+	/**
+	 * Returns the {@link ProjectionFactory} for this converter.
+	 *
+	 * @return will never be {@literal null}.
+	 * @since 3.4
+	 */
+	ProjectionFactory getProjectionFactory();
+
+	/**
+	 * Returns the {@link CustomConversions} for this converter.
+	 *
+	 * @return will never be {@literal null}.
+	 * @since 3.4
+	 */
+	CustomConversions getCustomConversions();
+
+	/**
+	 * Apply a projection to {@link Bson} and return the projection return type {@code R}.
+	 * {@link EntityProjection#isProjection() Non-projecting} descriptors fall back to {@link #read(Class, Object) regular
+	 * object materialization}.
+	 *
+	 * @param descriptor the projection descriptor, must not be {@literal null}.
+	 * @param bson must not be {@literal null}.
+	 * @param <R>
+	 * @return a new instance of the projection return type {@code R}.
+	 * @since 3.4
+	 */
+	<R> R project(EntityProjection<R, ?> descriptor, Bson bson);
+
 	/**
 	 * Mapping function capable of converting values into a desired target type by eg. extracting the actual java type
 	 * from a given {@link BsonValue}.
@@ -64,50 +101,45 @@ public interface MongoConverter
 	 * @throws IllegalArgumentException if {@literal targetType} is {@literal null}.
 	 * @since 2.1
 	 */
-	@SuppressWarnings("unchecked")
-	@Nullable
-	default <S, T> T mapValueToTargetType(S source, Class<T> targetType, DbRefResolver dbRefResolver) {
+	@SuppressWarnings({"unchecked","NullAway"})
+	default <S, T> @Nullable T mapValueToTargetType(S source, Class<T> targetType, DbRefResolver dbRefResolver) {
 
-		Assert.notNull(targetType, "TargetType must not be null!");
-		Assert.notNull(dbRefResolver, "DbRefResolver must not be null!");
+		Assert.notNull(targetType, "TargetType must not be null");
+		Assert.notNull(dbRefResolver, "DbRefResolver must not be null");
 
 		if (targetType != Object.class && ClassUtils.isAssignable(targetType, source.getClass())) {
 			return (T) source;
 		}
 
-		if (source instanceof BsonValue) {
-
-			Object value = BsonUtils.toJavaType((BsonValue) source);
+		if (source instanceof BsonValue bson) {
 
-			if (value instanceof Document) {
+			Object value = BsonUtils.toJavaType(bson);
 
-				Document sourceDocument = (Document) value;
+			if (value instanceof Document document) {
 
-				if (sourceDocument.containsKey("$ref") && sourceDocument.containsKey("$id")) {
+				if (document.containsKey("$ref") && document.containsKey("$id")) {
 
-					Object id = sourceDocument.get("$id");
-					String collection = sourceDocument.getString("$ref");
+					Object id = document.get("$id");
+					String collection = document.getString("$ref");
 
 					MongoPersistentEntity<?> entity = getMappingContext().getPersistentEntity(targetType);
 					if (entity != null && entity.hasIdProperty()) {
 						id = convertId(id, entity.getIdProperty().getFieldType());
 					}
 
-					DBRef ref = sourceDocument.containsKey("$db") ? new DBRef(sourceDocument.getString("$db"), collection, id)
+					DBRef ref = document.containsKey("$db") ? new DBRef(document.getString("$db"), collection, id)
 							: new DBRef(collection, id);
 
-					sourceDocument = dbRefResolver.fetch(ref);
-					if (sourceDocument == null) {
+					document = dbRefResolver.fetch(ref);
+					if (document == null) {
 						return null;
 					}
 				}
 
-				return read(targetType, sourceDocument);
+				return read(targetType, document);
 			} else {
-				if (!ClassUtils.isAssignable(targetType, value.getClass())) {
-					if (getConversionService().canConvert(value.getClass(), targetType)) {
-						return getConversionService().convert(value, targetType);
-					}
+				if (!ClassUtils.isAssignable(targetType, value.getClass()) && getConversionService().canConvert(value.getClass(), targetType)) {
+					return getConversionService().convert(value, targetType);
 				}
 			}
 
@@ -119,16 +151,16 @@ default <S, T> T mapValueToTargetType(S source, Class<T> targetType, DbRefResolv
 	/**
 	 * Converts the given raw id value into either {@link ObjectId} or {@link String}.
 	 *
-	 * @param id
-	 * @param targetType
+	 * @param id can be {@literal null}.
+	 * @param targetType must not be {@literal null}.
 	 * @return {@literal null} if source {@literal id} is already {@literal null}.
 	 * @since 2.2
 	 */
 	@Nullable
 	default Object convertId(@Nullable Object id, Class<?> targetType) {
 
-		if (id == null) {
-			return null;
+		if (id == null || ClassUtils.isAssignableValue(targetType, id)) {
+			return id;
 		}
 
 		if (ClassUtils.isAssignable(ObjectId.class, targetType)) {
@@ -138,15 +170,24 @@ default Object convertId(@Nullable Object id, Class<?> targetType) {
 				if (ObjectId.isValid(id.toString())) {
 					return new ObjectId(id.toString());
 				}
+
+				// avoid ConversionException as convertToMongoType will return String anyways.
+				return id;
 			}
 		}
 
 		try {
 			return getConversionService().canConvert(id.getClass(), targetType)
 					? getConversionService().convert(id, targetType)
-					: convertToMongoType(id, null);
+					: convertToMongoType(id, (TypeInformation<?>) null);
 		} catch (ConversionException o_O) {
-			return convertToMongoType(id, null);
+			return convertToMongoType(id,(TypeInformation<?>)  null);
 		}
 	}
+
+	@Override
+	default CodecRegistry getCodecRegistry() {
+		return MongoClientSettings.getDefaultCodecRegistry();
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java
index 70d3673653..1fd45e1960 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoConverters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,15 +27,28 @@
 import java.util.Collection;
 import java.util.Currency;
 import java.util.List;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.bson.BinaryVector;
+import org.bson.BsonArray;
+import org.bson.BsonDouble;
+import org.bson.BsonReader;
 import org.bson.BsonTimestamp;
+import org.bson.BsonUndefined;
+import org.bson.BsonWriter;
 import org.bson.Document;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.convert.ConversionFailedException;
 import org.springframework.core.convert.TypeDescriptor;
 import org.springframework.core.convert.converter.ConditionalConverter;
@@ -43,13 +56,17 @@
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.core.mapping.MongoVector;
 import org.springframework.data.mongodb.core.query.Term;
 import org.springframework.data.mongodb.core.script.NamedMongoScript;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.StringUtils;
 
+import com.mongodb.MongoClientSettings;
+
 /**
  * Wrapper class to contain useful converters for the usage with Mongo.
  *
@@ -75,12 +92,10 @@ static Collection<Object> getConvertersToRegister() {
 
 		List<Object> converters = new ArrayList<>();
 
-		converters.add(BigDecimalToStringConverter.INSTANCE);
 		converters.add(BigDecimalToDecimal128Converter.INSTANCE);
-		converters.add(StringToBigDecimalConverter.INSTANCE);
 		converters.add(Decimal128ToBigDecimalConverter.INSTANCE);
-		converters.add(BigIntegerToStringConverter.INSTANCE);
-		converters.add(StringToBigIntegerConverter.INSTANCE);
+		converters.add(BigIntegerToDecimal128Converter.INSTANCE);
+
 		converters.add(URLToStringConverter.INSTANCE);
 		converters.add(StringToURLConverter.INSTANCE);
 		converters.add(DocumentToStringConverter.INSTANCE);
@@ -95,7 +110,13 @@ static Collection<Object> getConvertersToRegister() {
 		converters.add(IntegerToAtomicIntegerConverter.INSTANCE);
 		converters.add(BinaryToByteArrayConverter.INSTANCE);
 		converters.add(BsonTimestampToInstantConverter.INSTANCE);
+		converters.add(NumberToNumberConverterFactory.INSTANCE);
 
+		converters.add(VectorToBsonArrayConverter.INSTANCE);
+		converters.add(ListToVectorConverter.INSTANCE);
+		converters.add(BinaryVectorToMongoVectorConverter.INSTANCE);
+
+		converters.add(reading(BsonUndefined.class, Object.class, it -> null));
 		converters.add(reading(String.class, URI.class, URI::create).andWriting(URI::toString));
 
 		return converters;
@@ -122,7 +143,7 @@ public String convert(ObjectId id) {
 	enum StringToObjectIdConverter implements Converter<String, ObjectId> {
 		INSTANCE;
 
-		public ObjectId convert(String source) {
+		public @Nullable ObjectId convert(String source) {
 			return StringUtils.hasText(source) ? new ObjectId(source) : null;
 		}
 	}
@@ -172,10 +193,21 @@ public Decimal128 convert(BigDecimal source) {
 		}
 	}
 
+	/**
+	 * @since 5.0
+	 */
+	enum BigIntegerToDecimal128Converter implements Converter<BigInteger, Decimal128> {
+		INSTANCE;
+
+		public Decimal128 convert(BigInteger source) {
+			return new Decimal128(new BigDecimal(source));
+		}
+	}
+
 	enum StringToBigDecimalConverter implements Converter<String, BigDecimal> {
 		INSTANCE;
 
-		public BigDecimal convert(String source) {
+		public @Nullable BigDecimal convert(String source) {
 			return StringUtils.hasText(source) ? new BigDecimal(source) : null;
 		}
 	}
@@ -191,6 +223,7 @@ public BigDecimal convert(Decimal128 source) {
 		}
 	}
 
+	@WritingConverter
 	enum BigIntegerToStringConverter implements Converter<BigInteger, String> {
 		INSTANCE;
 
@@ -199,10 +232,11 @@ public String convert(BigInteger source) {
 		}
 	}
 
+	@ReadingConverter
 	enum StringToBigIntegerConverter implements Converter<String, BigInteger> {
 		INSTANCE;
 
-		public BigInteger convert(String source) {
+		public @Nullable BigInteger convert(String source) {
 			return StringUtils.hasText(source) ? new BigInteger(source) : null;
 		}
 	}
@@ -236,9 +270,27 @@ enum DocumentToStringConverter implements Converter<Document, String> {
 
 		INSTANCE;
 
+		private final Codec<Document> codec = CodecRegistries.fromRegistries(CodecRegistries.fromCodecs(new Codec<UUID>() {
+
+			@Override
+			public void encode(BsonWriter writer, UUID value, EncoderContext encoderContext) {
+				writer.writeString(value.toString());
+			}
+
+			@Override
+			public Class<UUID> getEncoderClass() {
+				return UUID.class;
+			}
+
+			@Override
+			public UUID decode(BsonReader reader, DecoderContext decoderContext) {
+				throw new IllegalStateException("decode not supported");
+			}
+		}), MongoClientSettings.getDefaultCodecRegistry()).get(Document.class);
+
 		@Override
 		public String convert(Document source) {
-			return source.toJson();
+			return source.toJson(codec);
 		}
 	}
 
@@ -261,20 +313,25 @@ public String convert(Term source) {
 	 * @author Christoph Strobl
 	 * @since 1.7
 	 */
+	@SuppressWarnings("NullAway")
 	enum DocumentToNamedMongoScriptConverter implements Converter<Document, NamedMongoScript> {
 
 		INSTANCE;
 
 		@Override
-		public NamedMongoScript convert(Document source) {
+		public @Nullable NamedMongoScript convert(Document source) {
 
-			if(source.isEmpty()) {
+			if (source.isEmpty()) {
 				return null;
 			}
 
-			String id = source.get("_id").toString();
+			String id = source.get(FieldName.ID.name()).toString();
+			Assert.notNull(id, "Script id must not be null");
+
 			Object rawValue = source.get("value");
 
+			Assert.isInstanceOf(Code.class, rawValue);
+
 			return new NamedMongoScript(id, ((Code) rawValue).getCode());
 		}
 	}
@@ -292,7 +349,7 @@ public Document convert(NamedMongoScript source) {
 
 			Document document = new Document();
 
-			document.put("_id", source.getName());
+			document.put(FieldName.ID.name(), source.getName());
 			document.put("value", new Code(source.getCode()));
 
 			return document;
@@ -310,10 +367,6 @@ enum CurrencyToStringConverter implements Converter<Currency, String> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public String convert(Currency source) {
 			return source.getCurrencyCode();
@@ -331,12 +384,8 @@ enum StringToCurrencyConverter implements Converter<String, Currency> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public Currency convert(String source) {
+		public @Nullable Currency convert(String source) {
 			return StringUtils.hasText(source) ? Currency.getInstance(source) : null;
 		}
 	}
@@ -354,19 +403,11 @@ enum NumberToNumberConverterFactory implements ConverterFactory<Number, Number>,
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.ConverterFactory#getConverter(java.lang.Class)
-		 */
 		@Override
 		public <T extends Number> Converter<Number, T> getConverter(Class<T> targetType) {
 			return new NumberToNumberConverter<T>(targetType);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.ConditionalConverter#matches(org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor)
-		 */
 		@Override
 		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return !sourceType.equals(targetType);
@@ -383,24 +424,20 @@ private final static class NumberToNumberConverter<T extends Number> implements
 			 */
 			public NumberToNumberConverter(Class<T> targetType) {
 
-				Assert.notNull(targetType, "Target type must not be null!");
+				Assert.notNull(targetType, "Target type must not be null");
 
 				this.targetType = targetType;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-			 */
 			@Override
 			public T convert(Number source) {
 
-				if (source instanceof AtomicInteger) {
-					return NumberUtils.convertNumberToTargetClass(((AtomicInteger) source).get(), this.targetType);
+				if (source instanceof AtomicInteger atomicInteger) {
+					return NumberUtils.convertNumberToTargetClass(atomicInteger.get(), this.targetType);
 				}
 
-				if (source instanceof AtomicLong) {
-					return NumberUtils.convertNumberToTargetClass(((AtomicLong) source).get(), this.targetType);
+				if (source instanceof AtomicLong atomicLong) {
+					return NumberUtils.convertNumberToTargetClass(atomicLong.get(), this.targetType);
 				}
 
 				return NumberUtils.convertNumberToTargetClass(source, this.targetType);
@@ -408,6 +445,94 @@ public T convert(Number source) {
 		}
 	}
 
+	@WritingConverter
+	enum VectorToBsonArrayConverter implements Converter<Vector, Object> {
+
+		INSTANCE;
+
+		@Override
+		public Object convert(Vector source) {
+
+			if (source instanceof MongoVector mv) {
+				return mv.getSource();
+			}
+
+			double[] doubleArray = source.toDoubleArray();
+
+			BsonArray array = new BsonArray(doubleArray.length);
+
+			for (double v : doubleArray) {
+				array.add(new BsonDouble(v));
+			}
+
+			return array;
+		}
+	}
+
+	@ReadingConverter
+	enum ListToVectorConverter implements Converter<List<Number>, Vector> {
+
+		INSTANCE;
+
+		@Override
+		public Vector convert(List<Number> source) {
+			return Vector.of(source);
+		}
+	}
+
+	@ReadingConverter
+	enum BinaryVectorToMongoVectorConverter implements Converter<BinaryVector, Vector> {
+
+		INSTANCE;
+
+		@Override
+		public Vector convert(BinaryVector source) {
+			return MongoVector.of(source);
+		}
+	}
+
+	@WritingConverter
+	enum ByteArrayConverterFactory implements ConverterFactory<byte[], Object>, ConditionalConverter {
+
+		INSTANCE;
+
+		@Override
+		public <T> Converter<byte[], T> getConverter(Class<T> targetType) {
+			return new ByteArrayConverter<>(targetType);
+		}
+
+		@Override
+		public boolean matches(TypeDescriptor sourceType, TypeDescriptor targetType) {
+			return targetType.getType() != Object.class && !sourceType.equals(targetType);
+		}
+
+		private final static class ByteArrayConverter<T> implements Converter<byte[], T> {
+
+			private final Class<T> targetType;
+
+			/**
+			 * Creates a new {@link ByteArrayConverter} for the given target type.
+			 *
+			 * @param targetType must not be {@literal null}.
+			 */
+			public ByteArrayConverter(Class<T> targetType) {
+
+				Assert.notNull(targetType, "Target type must not be null");
+
+				this.targetType = targetType;
+			}
+
+			@Override
+			public T convert(byte[] source) {
+
+				if (this.targetType == BinaryVector.class) {
+					return (T) BinaryVector.int8Vector(source);
+				}
+				return (T) source;
+			}
+		}
+	}
+
 	/**
 	 * {@link ConverterFactory} implementation converting {@link AtomicLong} into {@link Long}.
 	 *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java
index 3fefb585d4..8dccced380 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoCustomConversions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,26 +15,52 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
+import java.util.function.Consumer;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.TypeDescriptor;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.core.convert.converter.GenericConverter;
-import org.springframework.data.convert.JodaTimeConverters;
+import org.springframework.data.convert.ConverterBuilder;
+import org.springframework.data.convert.PropertyValueConversions;
+import org.springframework.data.convert.PropertyValueConverter;
+import org.springframework.data.convert.PropertyValueConverterFactory;
+import org.springframework.data.convert.PropertyValueConverterRegistrar;
+import org.springframework.data.convert.ReadingConverter;
+import org.springframework.data.convert.SimplePropertyValueConversions;
 import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.BigIntegerToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigIntegerConverter;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
 
 /**
  * Value object to capture custom conversion. {@link MongoCustomConversions} also act as factory for
  * {@link org.springframework.data.mapping.model.SimpleTypeHolder}
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 2.0
  * @see org.springframework.data.convert.CustomConversions
  * @see org.springframework.data.mapping.model.SimpleTypeHolder
@@ -51,7 +77,6 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus
 
 		converters.add(CustomToStringConverter.INSTANCE);
 		converters.addAll(MongoConverters.getConvertersToRegister());
-		converters.addAll(JodaTimeConverters.getConvertersToRegister());
 		converters.addAll(GeoConverters.getConvertersToRegister());
 
 		STORE_CONVERTERS = Collections.unmodifiableList(converters);
@@ -71,7 +96,33 @@ public class MongoCustomConversions extends org.springframework.data.convert.Cus
 	 * @param converters must not be {@literal null}.
 	 */
 	public MongoCustomConversions(List<?> converters) {
-		super(STORE_CONVERSIONS, converters);
+		this(MongoConverterConfigurationAdapter.from(converters));
+	}
+
+	/**
+	 * Create a new {@link MongoCustomConversions} given {@link MongoConverterConfigurationAdapter}.
+	 *
+	 * @param conversionConfiguration must not be {@literal null}.
+	 * @since 2.3
+	 */
+	protected MongoCustomConversions(MongoConverterConfigurationAdapter conversionConfiguration) {
+		super(conversionConfiguration.createConverterConfiguration());
+	}
+
+	/**
+	 * Functional style {@link org.springframework.data.convert.CustomConversions} creation giving users a convenient way
+	 * of configuring store specific capabilities by providing deferred hooks to what will be configured when creating the
+	 * {@link org.springframework.data.convert.CustomConversions#CustomConversions(ConverterConfiguration) instance}.
+	 *
+	 * @param configurer must not be {@literal null}.
+	 * @since 2.3
+	 */
+	public static MongoCustomConversions create(Consumer<MongoConverterConfigurationAdapter> configurer) {
+
+		MongoConverterConfigurationAdapter adapter = new MongoConverterConfigurationAdapter();
+		configurer.accept(adapter);
+
+		return new MongoCustomConversions(adapter);
 	}
 
 	@WritingConverter
@@ -79,10 +130,6 @@ private enum CustomToStringConverter implements GenericConverter {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.GenericConverter#getConvertibleTypes()
-		 */
 		public Set<ConvertiblePair> getConvertibleTypes() {
 
 			ConvertiblePair localeToString = new ConvertiblePair(Locale.class, String.class);
@@ -91,12 +138,333 @@ public Set<ConvertiblePair> getConvertibleTypes() {
 			return new HashSet<>(Arrays.asList(localeToString, booleanToString));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.GenericConverter#convert(java.lang.Object, org.springframework.core.convert.TypeDescriptor, org.springframework.core.convert.TypeDescriptor)
-		 */
-		public Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
+		public @Nullable Object convert(@Nullable Object source, TypeDescriptor sourceType, TypeDescriptor targetType) {
 			return source != null ? source.toString() : null;
 		}
 	}
+
+	/**
+	 * {@link MongoConverterConfigurationAdapter} encapsulates creation of
+	 * {@link org.springframework.data.convert.CustomConversions.ConverterConfiguration} with MongoDB specifics.
+	 *
+	 * @author Christoph Strobl
+	 * @since 2.3
+	 */
+	public static class MongoConverterConfigurationAdapter {
+
+		/**
+		 * List of {@literal java.time} types having different representation when rendered via the native
+		 * {@link org.bson.codecs.Codec} than the Spring Data {@link Converter}.
+		 */
+		private static final Set<Class<?>> JAVA_DRIVER_TIME_SIMPLE_TYPES = Set.of(LocalDate.class, LocalTime.class, LocalDateTime.class);
+
+		private boolean useNativeDriverJavaTimeCodecs = false;
+		private BigDecimalRepresentation bigDecimals = BigDecimalRepresentation.STRING;
+		private final List<Object> customConverters = new ArrayList<>();
+
+		private final PropertyValueConversions internalValueConversion = PropertyValueConversions.simple(it -> {});
+		private PropertyValueConversions propertyValueConversions = internalValueConversion;
+
+		/**
+		 * Create a {@link MongoConverterConfigurationAdapter} using the provided {@code converters} and our own codecs for
+		 * JSR-310 types.
+		 *
+		 * @param converters must not be {@literal null}.
+		 * @return
+		 */
+		public static MongoConverterConfigurationAdapter from(List<?> converters) {
+
+			Assert.notNull(converters, "Converters must not be null");
+
+			MongoConverterConfigurationAdapter converterConfigurationAdapter = new MongoConverterConfigurationAdapter();
+			converterConfigurationAdapter.useSpringDataJavaTimeCodecs();
+			converterConfigurationAdapter.registerConverters(converters);
+
+			return converterConfigurationAdapter;
+		}
+
+		/**
+		 * Add a custom {@link Converter} implementation.
+		 *
+		 * @param converter must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MongoConverterConfigurationAdapter registerConverter(Converter<?, ?> converter) {
+
+			Assert.notNull(converter, "Converter must not be null");
+			customConverters.add(converter);
+			return this;
+		}
+
+		/**
+		 * Add {@link Converter converters}, {@link ConverterFactory factories}, {@link ConverterBuilder.ConverterAware
+		 * converter-aware objects}, and {@link GenericConverter generic converters}.
+		 *
+		 * @param converters must not be {@literal null} nor contain {@literal null} values.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MongoConverterConfigurationAdapter registerConverters(Collection<?> converters) {
+
+			Assert.notNull(converters, "Converters must not be null");
+			Assert.noNullElements(converters, "Converters must not be null nor contain null values");
+
+			customConverters.addAll(converters);
+			return this;
+		}
+
+		/**
+		 * Add a custom {@link ConverterFactory} implementation.
+		 *
+		 * @param converterFactory must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MongoConverterConfigurationAdapter registerConverterFactory(ConverterFactory<?, ?> converterFactory) {
+
+			Assert.notNull(converterFactory, "ConverterFactory must not be null");
+			customConverters.add(converterFactory);
+			return this;
+		}
+
+		/**
+		 * Add a custom/default {@link PropertyValueConverterFactory} implementation used to serve
+		 * {@link PropertyValueConverter}.
+		 *
+		 * @param converterFactory must not be {@literal null}.
+		 * @return this.
+		 * @since 3.4
+		 */
+		@Contract("_ -> this")
+		public MongoConverterConfigurationAdapter registerPropertyValueConverterFactory(
+				PropertyValueConverterFactory converterFactory) {
+
+			Assert.state(valueConversions() instanceof SimplePropertyValueConversions,
+					"Configured PropertyValueConversions does not allow setting custom ConverterRegistry");
+
+			((SimplePropertyValueConversions) valueConversions()).setConverterFactory(converterFactory);
+			return this;
+		}
+
+		/**
+		 * Gateway to register property specific converters.
+		 *
+		 * @param configurationAdapter must not be {@literal null}.
+		 * @return this.
+		 * @since 3.4
+		 */
+		@Contract("_ -> this")
+		public MongoConverterConfigurationAdapter configurePropertyConversions(
+				Consumer<PropertyValueConverterRegistrar<MongoPersistentProperty>> configurationAdapter) {
+
+			Assert.state(valueConversions() instanceof SimplePropertyValueConversions,
+					"Configured PropertyValueConversions does not allow setting custom ConverterRegistry");
+
+			PropertyValueConverterRegistrar propertyValueConverterRegistrar = new PropertyValueConverterRegistrar();
+			configurationAdapter.accept(propertyValueConverterRegistrar);
+
+			((SimplePropertyValueConversions) valueConversions())
+					.setValueConverterRegistry(propertyValueConverterRegistrar.buildRegistry());
+			return this;
+		}
+
+		/**
+		 * Set whether to or not to use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
+		 * {@link org.bson.codecs.jsr310.LocalDateCodec LocalDate}, {@link org.bson.codecs.jsr310.LocalTimeCodec LocalTime}
+		 * and {@link org.bson.codecs.jsr310.LocalDateTimeCodec LocalDateTime} using a {@link ZoneOffset#UTC}.
+		 *
+		 * @param useNativeDriverJavaTimeCodecs
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public MongoConverterConfigurationAdapter useNativeDriverJavaTimeCodecs(boolean useNativeDriverJavaTimeCodecs) {
+
+			this.useNativeDriverJavaTimeCodecs = useNativeDriverJavaTimeCodecs;
+			return this;
+		}
+
+		/**
+		 * Use the native MongoDB Java Driver {@link org.bson.codecs.Codec codes} for
+		 * {@link org.bson.codecs.jsr310.LocalDateCodec LocalDate}, {@link org.bson.codecs.jsr310.LocalTimeCodec LocalTime}
+		 * and {@link org.bson.codecs.jsr310.LocalDateTimeCodec LocalDateTime} using a {@link ZoneOffset#UTC}.
+		 *
+		 * @return this.
+		 * @see #useNativeDriverJavaTimeCodecs(boolean)
+		 */
+		@Contract("-> this")
+		public MongoConverterConfigurationAdapter useNativeDriverJavaTimeCodecs() {
+			return useNativeDriverJavaTimeCodecs(true);
+		}
+
+		/**
+		 * Use SpringData {@link Converter Jsr310 converters} for
+		 * {@link org.springframework.data.convert.Jsr310Converters.LocalDateToDateConverter LocalDate},
+		 * {@link org.springframework.data.convert.Jsr310Converters.LocalTimeToDateConverter LocalTime} and
+		 * {@link org.springframework.data.convert.Jsr310Converters.LocalDateTimeToDateConverter LocalDateTime} using the
+		 * {@link ZoneId#systemDefault()}.
+		 *
+		 * @return this.
+		 * @see #useNativeDriverJavaTimeCodecs(boolean)
+		 */
+		@Contract("-> this")
+		public MongoConverterConfigurationAdapter useSpringDataJavaTimeCodecs() {
+			return useNativeDriverJavaTimeCodecs(false);
+		}
+
+		/**
+		 * Configures the representation to for {@link java.math.BigDecimal} and {@link java.math.BigInteger} values in
+		 * MongoDB. Defaults to {@link BigDecimalRepresentation#STRING}.
+		 *
+		 * @param representation the representation to use.
+		 * @return this.
+		 * @since 4.5
+		 */
+		public MongoConverterConfigurationAdapter bigDecimal(BigDecimalRepresentation representation) {
+
+			Assert.notNull(representation, "BigDecimalDataType must not be null");
+			this.bigDecimals = representation;
+			return this;
+		}
+		/**
+		 * Optionally set the {@link PropertyValueConversions} to be applied during mapping.
+		 * <p>
+		 * Use this method if {@link #configurePropertyConversions(Consumer)} and
+		 * {@link #registerPropertyValueConverterFactory(PropertyValueConverterFactory)} are not sufficient.
+		 *
+		 * @param valueConversions must not be {@literal null}.
+		 * @return this.
+		 * @since 3.4
+		 * @deprecated since 4.2. Use {@link #withPropertyValueConversions(PropertyValueConversions)} instead.
+		 */
+		@Deprecated(since = "4.2.0")
+		public MongoConverterConfigurationAdapter setPropertyValueConversions(PropertyValueConversions valueConversions) {
+			return withPropertyValueConversions(valueConversions);
+		}
+
+		/**
+		 * Optionally set the {@link PropertyValueConversions} to be applied during mapping.
+		 * <p>
+		 * Use this method if {@link #configurePropertyConversions(Consumer)} and
+		 * {@link #registerPropertyValueConverterFactory(PropertyValueConverterFactory)} are not sufficient.
+		 *
+		 * @param valueConversions must not be {@literal null}.
+		 * @return this.
+		 * @since 4.2
+		 */
+		public MongoConverterConfigurationAdapter withPropertyValueConversions(PropertyValueConversions valueConversions) {
+
+			Assert.notNull(valueConversions, "PropertyValueConversions must not be null");
+			this.propertyValueConversions = valueConversions;
+			return this;
+		}
+
+		PropertyValueConversions valueConversions() {
+
+			if (this.propertyValueConversions == null) {
+				this.propertyValueConversions = internalValueConversion;
+			}
+
+			return this.propertyValueConversions;
+		}
+
+		ConverterConfiguration createConverterConfiguration() {
+
+			if (hasDefaultPropertyValueConversions()
+					&& propertyValueConversions instanceof SimplePropertyValueConversions svc) {
+				svc.init();
+			}
+
+			List<Object> converters = new ArrayList<>(STORE_CONVERTERS.size() + 7);
+
+			if (bigDecimals == BigDecimalRepresentation.STRING) {
+
+				converters.add(BigDecimalToStringConverter.INSTANCE);
+				converters.add(StringToBigDecimalConverter.INSTANCE);
+				converters.add(BigIntegerToStringConverter.INSTANCE);
+				converters.add(StringToBigIntegerConverter.INSTANCE);
+			}
+
+			if (!useNativeDriverJavaTimeCodecs) {
+
+				converters.addAll(customConverters);
+				return new ConverterConfiguration(STORE_CONVERSIONS, converters, convertiblePair -> true,
+						this.propertyValueConversions);
+			}
+
+			/*
+			 * We need to have those converters using UTC as the default ones would go on with the systemDefault.
+			 */
+			converters.add(DateToUtcLocalDateConverter.INSTANCE);
+			converters.add(DateToUtcLocalTimeConverter.INSTANCE);
+			converters.add(DateToUtcLocalDateTimeConverter.INSTANCE);
+			converters.addAll(STORE_CONVERTERS);
+
+			StoreConversions storeConversions = StoreConversions
+					.of(new SimpleTypeHolder(JAVA_DRIVER_TIME_SIMPLE_TYPES, MongoSimpleTypes.HOLDER), converters);
+
+			return new ConverterConfiguration(storeConversions, this.customConverters, convertiblePair -> {
+
+				// Avoid default registrations
+
+				return !JAVA_DRIVER_TIME_SIMPLE_TYPES.contains(convertiblePair.getSourceType())
+						|| !Date.class.isAssignableFrom(convertiblePair.getTargetType());
+			}, this.propertyValueConversions);
+		}
+
+		@ReadingConverter
+		private enum DateToUtcLocalDateTimeConverter implements Converter<Date, LocalDateTime> {
+
+			INSTANCE;
+
+			@Override
+			public LocalDateTime convert(Date source) {
+				return LocalDateTime.ofInstant(Instant.ofEpochMilli(source.getTime()), ZoneId.of("UTC"));
+			}
+		}
+
+		@ReadingConverter
+		private enum DateToUtcLocalTimeConverter implements Converter<Date, LocalTime> {
+			INSTANCE;
+
+			@Override
+			public LocalTime convert(Date source) {
+				return DateToUtcLocalDateTimeConverter.INSTANCE.convert(source).toLocalTime();
+			}
+		}
+
+		@ReadingConverter
+		private enum DateToUtcLocalDateConverter implements Converter<Date, LocalDate> {
+			INSTANCE;
+
+			@Override
+			public LocalDate convert(Date source) {
+				return DateToUtcLocalDateTimeConverter.INSTANCE.convert(source).toLocalDate();
+			}
+		}
+
+		private boolean hasDefaultPropertyValueConversions() {
+			return propertyValueConversions == internalValueConversion;
+		}
+
+	}
+
+	/**
+	 * Strategy to represent {@link java.math.BigDecimal} and {@link java.math.BigInteger} values in MongoDB.
+	 *
+	 * @since 4.5
+	 */
+	public enum BigDecimalRepresentation {
+
+		/**
+		 * Store values as {@link Number#toString() String}. Using strings retains precision but does not support range
+		 * queries.
+		 */
+		STRING,
+
+		/**
+		 * Store numbers using {@link org.bson.types.Decimal128}. Requires MongoDB Server 3.4 or later.
+		 */
+		DECIMAL128
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoDatabaseFactoryReferenceLoader.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoDatabaseFactoryReferenceLoader.java
new file mode 100644
index 0000000000..05baa88c57
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoDatabaseFactoryReferenceLoader.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.Document;
+
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.MongoDatabaseUtils;
+import org.springframework.data.mongodb.core.convert.ReferenceResolver.ReferenceCollection;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.MongoCollection;
+
+/**
+ * {@link ReferenceLoader} implementation using a {@link MongoDatabaseFactory} to obtain raw {@link Document documents}
+ * for linked entities via a {@link ReferenceLoader.DocumentReferenceQuery}.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public class MongoDatabaseFactoryReferenceLoader implements ReferenceLoader {
+
+	private static final Log LOGGER = LogFactory.getLog(MongoDatabaseFactoryReferenceLoader.class);
+
+	private final MongoDatabaseFactory mongoDbFactory;
+
+	/**
+	 * @param mongoDbFactory must not be {@literal null}.
+	 */
+	public MongoDatabaseFactoryReferenceLoader(MongoDatabaseFactory mongoDbFactory) {
+
+		Assert.notNull(mongoDbFactory, "MongoDbFactory translator must not be null");
+
+		this.mongoDbFactory = mongoDbFactory;
+	}
+
+	@Override
+	public Iterable<Document> fetchMany(DocumentReferenceQuery referenceQuery, ReferenceCollection context) {
+
+		MongoCollection<Document> collection = getCollection(context);
+
+		if (LOGGER.isTraceEnabled()) {
+			LOGGER.trace(String.format("Bulk fetching %s from %s.%s", referenceQuery,
+					StringUtils.hasText(context.getDatabase()) ? context.getDatabase()
+							: collection.getNamespace().getDatabaseName(),
+					context.getCollection()));
+		}
+
+		return referenceQuery.apply(collection);
+	}
+
+	/**
+	 * Obtain the {@link MongoCollection} for a given {@link ReferenceCollection} from the underlying
+	 * {@link MongoDatabaseFactory}.
+	 *
+	 * @param context must not be {@literal null}.
+	 * @return the {@link MongoCollection} targeted by the {@link ReferenceCollection}.
+	 */
+	protected MongoCollection<Document> getCollection(ReferenceCollection context) {
+
+		return MongoDatabaseUtils.getDatabase(context.getDatabase(), mongoDbFactory).getCollection(context.getCollection(),
+				Document.class);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoExampleMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoExampleMapper.java
index 6afecba935..67f9d5ec46 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoExampleMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoExampleMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,18 +28,21 @@
 import java.util.regex.Pattern;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher.NullHandler;
 import org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer;
 import org.springframework.data.domain.ExampleMatcher.StringMatcher;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.MongoRegexCreator;
 import org.springframework.data.mongodb.core.query.MongoRegexCreator.MatchMode;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 import org.springframework.data.mongodb.core.query.UntypedExampleMatcher;
+import org.springframework.data.mongodb.util.DotPath;
 import org.springframework.data.support.ExampleMatcherAccessor;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
@@ -83,7 +86,7 @@ public MongoExampleMapper(MongoConverter converter) {
 	 */
 	public Document getMappedExample(Example<?> example) {
 
-		Assert.notNull(example, "Example must not be null!");
+		Assert.notNull(example, "Example must not be null");
 
 		return getMappedExample(example, mappingContext.getRequiredPersistentEntity(example.getProbeType()));
 	}
@@ -96,13 +99,17 @@ public Document getMappedExample(Example<?> example) {
 	 * @param entity must not be {@literal null}.
 	 * @return
 	 */
-	public Document getMappedExample(Example<?> example, MongoPersistentEntity<?> entity) {
+	@SuppressWarnings("NullAway")
+	public Document getMappedExample(Example<?> example, @Nullable MongoPersistentEntity<?> entity) {
 
-		Assert.notNull(example, "Example must not be null!");
-		Assert.notNull(entity, "MongoPersistentEntity must not be null!");
+		Assert.notNull(example, "Example must not be null");
 
 		Document reference = (Document) converter.convertToMongoType(example.getProbe());
 
+		if(entity != null) {
+			entity = mappingContext.getRequiredPersistentEntity(example.getProbeType());
+		}
+
 		if (entity.getIdProperty() != null && ClassUtils.isAssignable(entity.getType(), example.getProbeType())) {
 
 			Object identifier = entity.getIdentifierAccessor(example.getProbe()).getIdentifier();
@@ -134,7 +141,7 @@ private void applyPropertySpecs(String path, Document source, Class<?> probeType
 		while (iter.hasNext()) {
 
 			Map.Entry<String, Object> entry = iter.next();
-			String propertyPath = StringUtils.hasText(path) ? path + "." + entry.getKey() : entry.getKey();
+			String propertyPath = DotPath.from(path).append(entry.getKey()).toString();
 			String mappedPropertyPath = getMappedPropertyPath(propertyPath, probeType);
 
 			if (isEmptyIdProperty(entry)) {
@@ -176,8 +183,8 @@ private void applyPropertySpecs(String path, Document source, Class<?> probeType
 
 			if (entry.getValue() instanceof String) {
 				applyStringMatcher(entry, stringMatcher, ignoreCase);
-			} else if (entry.getValue() instanceof Document) {
-				applyPropertySpecs(propertyPath, (Document) entry.getValue(), probeType, exampleSpecAccessor);
+			} else if (entry.getValue() instanceof Document document) {
+				applyPropertySpecs(propertyPath, document, probeType, exampleSpecAccessor);
 			}
 		}
 	}
@@ -224,7 +231,7 @@ private String getMappedPropertyPath(String path, Class<?> probeType) {
 		return StringUtils.collectionToDelimitedString(resultParts, ".");
 	}
 
-	private Document updateTypeRestrictions(Document query, Example example) {
+	private Document updateTypeRestrictions(Document query, Example<?> example) {
 
 		Document result = new Document();
 
@@ -244,7 +251,7 @@ private Document updateTypeRestrictions(Document query, Example example) {
 		return result;
 	}
 
-	private boolean isTypeRestricting(Example example) {
+	private boolean isTypeRestricting(Example<?> example) {
 
 		if (example.getMatcher() instanceof UntypedExampleMatcher) {
 			return false;
@@ -277,7 +284,8 @@ private Set<Class<?>> getTypesToMatch(Example<?> example) {
 	}
 
 	private static boolean isEmptyIdProperty(Entry<String, Object> entry) {
-		return entry.getKey().equals("_id") && (entry.getValue() == null || entry.getValue().equals(Optional.empty()));
+		return entry.getKey().equals(FieldName.ID.name())
+				&& (entry.getValue() == null || entry.getValue().equals(Optional.empty()));
 	}
 
 	private static void applyStringMatcher(Map.Entry<String, Object> entry, StringMatcher stringMatcher,
@@ -323,20 +331,13 @@ private static Document orConcatenate(Document source) {
 	 */
 	private static MatchMode toMatchMode(StringMatcher matcher) {
 
-		switch (matcher) {
-			case CONTAINING:
-				return MatchMode.CONTAINING;
-			case STARTING:
-				return MatchMode.STARTING_WITH;
-			case ENDING:
-				return MatchMode.ENDING_WITH;
-			case EXACT:
-				return MatchMode.EXACT;
-			case REGEX:
-				return MatchMode.REGEX;
-			case DEFAULT:
-			default:
-				return MatchMode.DEFAULT;
-		}
+		return switch (matcher) {
+			case CONTAINING -> MatchMode.CONTAINING;
+			case STARTING -> MatchMode.STARTING_WITH;
+			case ENDING -> MatchMode.ENDING_WITH;
+			case EXACT -> MatchMode.EXACT;
+			case REGEX -> MatchMode.REGEX;
+			default -> MatchMode.DEFAULT;
+		};
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java
index dbe8669100..a5d329045e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,12 @@
 import java.util.stream.Collectors;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -54,22 +54,18 @@ public class MongoJsonSchemaMapper implements JsonSchemaMapper {
 	 */
 	public MongoJsonSchemaMapper(MongoConverter converter) {
 
-		Assert.notNull(converter, "Converter must not be null!");
+		Assert.notNull(converter, "Converter must not be null");
 
 		this.converter = converter;
 		this.mappingContext = converter.getMappingContext();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.JsonSchemaMapper#mapSchema(org.springframework.data.mongodb.core.schema.MongoJsonSchema, java.lang.Class)
-	 */
 	public Document mapSchema(Document jsonSchema, Class<?> type) {
 
-		Assert.notNull(jsonSchema, "Schema must not be null!");
-		Assert.notNull(type, "Type must not be null! Please consider Object.class.");
+		Assert.notNull(jsonSchema, "Schema must not be null");
+		Assert.notNull(type, "Type must not be null Please consider Object.class");
 		Assert.isTrue(jsonSchema.containsKey($JSON_SCHEMA),
-				() -> String.format("Document does not contain $jsonSchema field. Found %s.", jsonSchema));
+				() -> String.format("Document does not contain $jsonSchema field; Found: %s", jsonSchema));
 
 		if (Object.class.equals(type)) {
 			return new Document(jsonSchema);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoTypeMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoTypeMapper.java
index 5394c45c30..d9d49fb19a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoTypeMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoTypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoValueConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoValueConverter.java
new file mode 100644
index 0000000000..73c05b949b
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoValueConverter.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2022-2025 the original author 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.convert;
+
+import org.springframework.data.convert.PropertyValueConverter;
+
+/**
+ * MongoDB-specific {@link PropertyValueConverter} extension.
+ *
+ * @author Christoph Strobl
+ * @since 3.4
+ */
+public interface MongoValueConverter<S, T> extends PropertyValueConverter<S, T, MongoConversionContext> {}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java
index d8493c513e..8aeb576c67 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/MongoWriter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,12 @@
 package org.springframework.data.mongodb.core.convert;
 
 import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.convert.EntityWriter;
+import org.springframework.data.mongodb.core.mapping.DocumentPointer;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
 
 import com.mongodb.DBRef;
 
@@ -41,9 +43,8 @@ public interface MongoWriter<T> extends EntityWriter<T, Bson> {
 	 * @param obj can be {@literal null}.
 	 * @return
 	 */
-	@Nullable
-	default Object convertToMongoType(@Nullable Object obj) {
-		return convertToMongoType(obj, null);
+	default @Nullable Object convertToMongoType(@Nullable Object obj) {
+		return convertToMongoType(obj, (TypeInformation<?>) null);
 	}
 
 	/**
@@ -57,13 +58,30 @@ default Object convertToMongoType(@Nullable Object obj) {
 	@Nullable
 	Object convertToMongoType(@Nullable Object obj, @Nullable TypeInformation<?> typeInformation);
 
+	default @Nullable Object convertToMongoType(@Nullable Object obj, MongoPersistentEntity<?> entity) {
+		return convertToMongoType(obj, entity.getTypeInformation());
+	}
+
 	/**
 	 * Creates a {@link DBRef} to refer to the given object.
 	 *
 	 * @param object the object to create a {@link DBRef} to link to. The object's type has to carry an id attribute.
-	 * @param referingProperty the client-side property referring to the object which might carry additional metadata for
+	 * @param referringProperty the client-side property referring to the object which might carry additional metadata for
+	 *          the {@link DBRef} object to create. Can be {@literal null}.
+	 * @return will never be {@literal null}.
+	 */
+	DBRef toDBRef(Object object, @Nullable MongoPersistentProperty referringProperty);
+
+	/**
+	 * Creates a the {@link DocumentPointer} representing the link to another entity.
+	 *
+	 * @param source the object to create a document link to.
+	 * @param referringProperty the client-side property referring to the object which might carry additional metadata for
 	 *          the {@link DBRef} object to create. Can be {@literal null}.
 	 * @return will never be {@literal null}.
+	 * @since 3.3
 	 */
-	DBRef toDBRef(Object object, @Nullable MongoPersistentProperty referingProperty);
+	default DocumentPointer<?> toDocumentPointer(Object source, @Nullable MongoPersistentProperty referringProperty) {
+		return () -> toDBRef(source, referringProperty);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java
index dd3c20e0e5..68578f32b9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/NoOpDbRefResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,8 +18,8 @@
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
 
 import com.mongodb.DBRef;
 
@@ -35,38 +35,31 @@ public enum NoOpDbRefResolver implements DbRefResolver {
 
 	INSTANCE;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#resolveDbRef(org.springframework.data.mongodb.core.mapping.MongoPersistentProperty, org.springframework.data.mongodb.core.convert.DbRefResolverCallback, org.springframework.data.mongodb.core.convert.DbRefProxyHandler)
-	 */
 	@Override
-	@Nullable
-	public Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbRefResolverCallback callback,
+	public @Nullable Object resolveDbRef(MongoPersistentProperty property, @Nullable DBRef dbref, DbRefResolverCallback callback,
 			DbRefProxyHandler proxyHandler) {
 
 		return handle();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#fetch(com.mongodb.DBRef)
-	 */
 	@Override
-	@Nullable
-	public Document fetch(DBRef dbRef) {
+	public @Nullable Document fetch(DBRef dbRef) {
 		return handle();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.DbRefResolver#bulkFetch(java.util.List)
-	 */
 	@Override
 	public List<Document> bulkFetch(List<DBRef> dbRefs) {
 		return handle();
 	}
 
 	private <T> T handle() throws UnsupportedOperationException {
-		throw new UnsupportedOperationException("DBRef resolution is not supported!");
+		throw new UnsupportedOperationException("DBRef resolution is not supported");
+	}
+
+	@Nullable
+	@Override
+	public Object resolveReference(MongoPersistentProperty property, Object source,
+			ReferenceLookupDelegate referenceLookupDelegate, MongoEntityReader entityReader) {
+		return null;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java
index 672f5bd112..d5f034eb1d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ObjectPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,11 +17,10 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.util.Lazy;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
@@ -41,7 +40,7 @@
  * @author Christoph Strobl
  * @since 1.6
  */
-class ObjectPath {
+public class ObjectPath {
 
 	static final ObjectPath ROOT = new ObjectPath();
 
@@ -84,44 +83,12 @@ private ObjectPath(ObjectPath parent, Object object, @Nullable Object idValue, L
 	 */
 	ObjectPath push(Object object, MongoPersistentEntity<?> entity, @Nullable Object id) {
 
-		Assert.notNull(object, "Object must not be null!");
-		Assert.notNull(entity, "MongoPersistentEntity must not be null!");
+		Assert.notNull(object, "Object must not be null");
+		Assert.notNull(entity, "MongoPersistentEntity must not be null");
 
 		return new ObjectPath(this, object, id, Lazy.of(entity::getCollection));
 	}
 
-	/**
-	 * Returns the object with the given id and stored in the given collection if it's contained in the
-	 * {@link ObjectPath}.
-	 *
-	 * @param id must not be {@literal null}.
-	 * @param collection must not be {@literal null} or empty.
-	 * @return
-	 * @deprecated use {@link #getPathItem(Object, String, Class)}.
-	 */
-	@Nullable
-	@Deprecated
-	Object getPathItem(Object id, String collection) {
-
-		Assert.notNull(id, "Id must not be null!");
-		Assert.hasText(collection, "Collection name must not be null!");
-
-		for (ObjectPath current = this; current != null; current = current.parent) {
-
-			Object object = current.getObject();
-
-			if (object == null || current.getIdValue() == null) {
-				continue;
-			}
-
-			if (collection.equals(current.getCollection()) && id.equals(current.getIdValue())) {
-				return object;
-			}
-		}
-
-		return null;
-	}
-
 	/**
 	 * Get the object with given {@literal id}, stored in the {@literal collection} that is assignable to the given
 	 * {@literal type} or {@literal null} if no match found.
@@ -132,12 +99,11 @@ Object getPathItem(Object id, String collection) {
 	 * @return {@literal null} when no match found.
 	 * @since 2.0
 	 */
-	@Nullable
-	<T> T getPathItem(Object id, String collection, Class<T> type) {
+	<T> @Nullable T getPathItem(Object id, String collection, Class<T> type) {
 
-		Assert.notNull(id, "Id must not be null!");
-		Assert.hasText(collection, "Collection name must not be null!");
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(id, "Id must not be null");
+		Assert.hasText(collection, "Collection name must not be null");
+		Assert.notNull(type, "Type must not be null");
 
 		for (ObjectPath current = this; current != null; current = current.parent) {
 
@@ -166,13 +132,11 @@ Object getCurrentObject() {
 		return getObject();
 	}
 
-	@Nullable
-	private Object getObject() {
+	private @Nullable Object getObject() {
 		return object;
 	}
 
-	@Nullable
-	private Object getIdValue() {
+	private @Nullable Object getIdValue() {
 		return idValue;
 	}
 
@@ -180,10 +144,6 @@ private String getCollection() {
 		return collection.get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
index efb3368fca..11ed30aedd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/QueryMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.util.AbstractMap;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -28,14 +28,22 @@
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.BsonRegularExpression;
 import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
-
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.annotation.Reference;
+import org.springframework.data.convert.PropertyValueConverter;
+import org.springframework.data.convert.ValueConversionContext;
 import org.springframework.data.domain.Example;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.MappingException;
@@ -46,15 +54,22 @@
 import org.springframework.data.mapping.PropertyReferenceException;
 import org.springframework.data.mapping.context.InvalidPersistentPropertyPath;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.PropertyValueProvider;
+import org.springframework.data.mongodb.MongoExpression;
+import org.springframework.data.mongodb.core.aggregation.AggregationExpression;
+import org.springframework.data.mongodb.core.aggregation.RelaxedTypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter.NestedDocument;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext.OperatorContext;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext.QueryOperatorContext;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty.PropertyToFieldNameConverter;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.util.BsonUtils;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.mongodb.util.DotPath;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -73,12 +88,18 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author David Julia
+ * @author Divya Srivastava
+ * @author Gyungrai Wang
+ * @author Ross Lawley
  */
 public class QueryMapper {
 
-	private static final List<String> DEFAULT_ID_NAMES = Arrays.asList("id", "_id");
+	protected static final Log LOGGER = LogFactory.getLog(QueryMapper.class);
+
+	private static final List<String> DEFAULT_ID_NAMES = Arrays.asList("id", FieldName.ID.name());
 	private static final Document META_TEXT_SCORE = new Document("$meta", "textScore");
-	static final ClassTypeInformation<?> NESTED_DOCUMENT = ClassTypeInformation.from(NestedDocument.class);
+	static final TypeInformation<?> NESTED_DOCUMENT = TypeInformation.of(NestedDocument.class);
 
 	private enum MetaMapping {
 		FORCE, WHEN_PRESENT, IGNORE
@@ -97,7 +118,7 @@ private enum MetaMapping {
 	 */
 	public QueryMapper(MongoConverter converter) {
 
-		Assert.notNull(converter, "MongoConverter must not be null!");
+		Assert.notNull(converter, "MongoConverter must not be null");
 
 		this.conversionService = converter.getConversionService();
 		this.converter = converter;
@@ -118,7 +139,7 @@ public Document getMappedObject(Bson query, Optional<? extends MongoPersistentEn
 	 * @param entity can be {@literal null}.
 	 * @return
 	 */
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("NullAway")
 	public Document getMappedObject(Bson query, @Nullable MongoPersistentEntity<?> entity) {
 
 		if (isNestedKeyword(query)) {
@@ -150,9 +171,31 @@ public Document getMappedObject(Bson query, @Nullable MongoPersistentEntity<?> e
 			try {
 
 				Field field = createPropertyField(entity, key, mappingContext);
-				Entry<String, Object> entry = getMappedObjectForField(field, BsonUtils.get(query, key));
 
-				result.put(entry.getKey(), entry.getValue());
+				// TODO: move to dedicated method
+				if (field.getProperty() != null && field.getProperty().isUnwrapped()) {
+
+					Object theNestedObject = BsonUtils.get(query, key);
+					Document mappedValue = (Document) getMappedValue(field, theNestedObject);
+					if (!StringUtils.hasText(field.getMappedKey())) {
+						result.putAll(mappedValue);
+					} else {
+						result.put(field.getMappedKey(), mappedValue);
+					}
+				} else {
+
+					Entry<String, Object> entry = getMappedObjectForField(field, BsonUtils.get(query, key));
+
+					/*
+					 * Note to future self:
+					 * ----
+					 * This could be the place to plug in a query rewrite mechanism that allows to transform comparison
+					 * against field that has a dot in its name (like 'a.b') into an $expr so that { "a.b" : "some value" }
+					 * eventually becomes { $expr : { $eq : [ { $getField : "a.b" }, "some value" ] } }
+					 * ----
+					 */
+					result.put(entry.getKey(), entry.getValue());
+				}
 			} catch (InvalidPersistentPropertyPath invalidPathException) {
 
 				// in case the object has not already been mapped
@@ -177,15 +220,14 @@ public Document getMappedObject(Bson query, @Nullable MongoPersistentEntity<?> e
 	 */
 	public Document getMappedSort(Document sortObject, @Nullable MongoPersistentEntity<?> entity) {
 
-		Assert.notNull(sortObject, "SortObject must not be null!");
+		Assert.notNull(sortObject, "SortObject must not be null");
 
 		if (sortObject.isEmpty()) {
-			return new Document();
+			return BsonUtils.EMPTY_DOCUMENT;
 		}
 
-		Document mappedSort = getMappedObject(sortObject, entity);
-		mapMetaAttributes(mappedSort, entity, MetaMapping.WHEN_PRESENT);
-		return mappedSort;
+		Document mappedSort = mapFieldsToPropertyNames(sortObject, entity);
+		return mapMetaAttributes(mappedSort, entity, MetaMapping.WHEN_PRESENT);
 	}
 
 	/**
@@ -193,32 +235,111 @@ public Document getMappedSort(Document sortObject, @Nullable MongoPersistentEnti
 	 * Also converts and potentially adds missing property {@code $meta} representation.
 	 *
 	 * @param fieldsObject must not be {@literal null}.
-	 * @param entity can be {@litearl null}.
+	 * @param entity can be {@literal null}.
 	 * @return
 	 * @since 1.6
 	 */
 	public Document getMappedFields(Document fieldsObject, @Nullable MongoPersistentEntity<?> entity) {
 
-		Assert.notNull(fieldsObject, "FieldsObject must not be null!");
+		Assert.notNull(fieldsObject, "FieldsObject must not be null");
+
+		Document mappedFields = mapFieldsToPropertyNames(fieldsObject, entity);
+		return mapMetaAttributes(mappedFields, entity, MetaMapping.FORCE);
+	}
+
+	private Document mapFieldsToPropertyNames(Document fields, @Nullable MongoPersistentEntity<?> entity) {
+
+		if (fields.isEmpty()) {
+			return BsonUtils.EMPTY_DOCUMENT;
+		}
+
+		Document target = new Document();
+
+		BsonUtils.asMap(filterUnwrappedObjects(fields, entity)).forEach((k, v) -> {
+
+			Field field = createPropertyField(entity, k, mappingContext);
+			if (field.getProperty() != null && field.getProperty().isUnwrapped()) {
+				return;
+			}
+
+			target.put(field.getMappedKey(), v);
+		});
+
+		return target;
+	}
 
-		Document mappedFields = fieldsObject.isEmpty() ? new Document() : getMappedObject(fieldsObject, entity);
-		mapMetaAttributes(mappedFields, entity, MetaMapping.FORCE);
-		return mappedFields;
+	/**
+	 * Adds missing {@code $meta} representation if required.
+	 *
+	 * @param source must not be {@literal null}.
+	 * @param entity can be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 3.4
+	 */
+	public Document addMetaAttributes(Document source, @Nullable MongoPersistentEntity<?> entity) {
+		return mapMetaAttributes(source, entity, MetaMapping.FORCE);
 	}
 
-	private void mapMetaAttributes(Document source, @Nullable MongoPersistentEntity<?> entity, MetaMapping metaMapping) {
+	@SuppressWarnings("NullAway")
+	private Document mapMetaAttributes(Document source, @Nullable MongoPersistentEntity<?> entity,
+			MetaMapping metaMapping) {
 
 		if (entity == null) {
-			return;
+			return source;
 		}
 
 		if (entity.hasTextScoreProperty() && !MetaMapping.IGNORE.equals(metaMapping)) {
+
+			if (source == BsonUtils.EMPTY_DOCUMENT) {
+				source = new Document();
+			}
+
 			MongoPersistentProperty textScoreProperty = entity.getTextScoreProperty();
 			if (MetaMapping.FORCE.equals(metaMapping)
 					|| (MetaMapping.WHEN_PRESENT.equals(metaMapping) && source.containsKey(textScoreProperty.getFieldName()))) {
 				source.putAll(getMappedTextScoreField(textScoreProperty));
 			}
 		}
+
+		return source;
+	}
+
+	private Document filterUnwrappedObjects(Document fieldsObject, @Nullable MongoPersistentEntity<?> entity) {
+
+		if (fieldsObject.isEmpty() || entity == null) {
+			return fieldsObject;
+		}
+
+		Document target = new Document();
+
+		for (Entry<String, Object> field : fieldsObject.entrySet()) {
+
+			try {
+
+				PropertyPath path = PropertyPath.from(field.getKey(), entity.getTypeInformation());
+				PersistentPropertyPath<MongoPersistentProperty> persistentPropertyPath = mappingContext
+						.getPersistentPropertyPath(path);
+				MongoPersistentProperty property = mappingContext.getPersistentPropertyPath(path).getLeafProperty();
+
+				if (property.isUnwrapped() && property.isEntity()) {
+
+					MongoPersistentEntity<?> unwrappedEntity = mappingContext.getRequiredPersistentEntity(property);
+
+					for (MongoPersistentProperty unwrappedProperty : unwrappedEntity) {
+
+						DotPath dotPath = DotPath.from(persistentPropertyPath.toDotPath()).append(unwrappedProperty.getName());
+						target.put(dotPath.toString(), field.getValue());
+					}
+
+				} else {
+					target.put(field.getKey(), field.getValue());
+				}
+			} catch (RuntimeException e) {
+				target.put(field.getKey(), field.getValue());
+			}
+
+		}
+		return target;
 	}
 
 	private Document getMappedTextScoreField(MongoPersistentProperty property) {
@@ -232,11 +353,15 @@ private Document getMappedTextScoreField(MongoPersistentProperty property) {
 	 * @param rawValue
 	 * @return
 	 */
-	protected Entry<String, Object> getMappedObjectForField(Field field, Object rawValue) {
+	protected Entry<String, @Nullable Object> getMappedObjectForField(Field field, @Nullable Object rawValue) {
 
 		String key = field.getMappedKey();
 		Object value;
 
+		if (rawValue instanceof MongoExpression mongoExpression) {
+			return createMapEntry(key, getMappedObject(mongoExpression.toDocument(), field.getEntity()));
+		}
+
 		if (isNestedKeyword(rawValue) && !field.isIdField()) {
 			Keyword keyword = new Keyword((Document) rawValue);
 			value = getMappedKeyword(field, keyword);
@@ -260,7 +385,7 @@ protected Field createPropertyField(@Nullable MongoPersistentEntity<?> entity, S
 			return new Field(key);
 		}
 
-		if (Field.ID_KEY.equals(key)) {
+		if (FieldName.ID.name().equals(key)) {
 			return new MetadataBackedField(key, entity, mappingContext, entity.getIdProperty());
 		}
 
@@ -280,7 +405,8 @@ protected Document getMappedKeyword(Keyword keyword, @Nullable MongoPersistentEn
 		if (keyword.isOrOrNor() || (keyword.hasIterableValue() && !keyword.isGeometry())) {
 
 			Iterable<?> conditions = keyword.getValue();
-			List<Object> newConditions = new ArrayList<>();
+			List<Object> newConditions = conditions instanceof Collection<?> collection ? new ArrayList<>(collection.size())
+					: new ArrayList<>();
 
 			for (Object condition : conditions) {
 				newConditions.add(isDocument(condition) ? getMappedObject((Document) condition, entity)
@@ -291,7 +417,9 @@ protected Document getMappedKeyword(Keyword keyword, @Nullable MongoPersistentEn
 		}
 
 		if (keyword.isSample()) {
-			return exampleMapper.getMappedExample(keyword.getValue(), entity);
+
+			Example<?> example = keyword.getValue();
+			return exampleMapper.getMappedExample(example, entity != null ? entity : mappingContext.getRequiredPersistentEntity(example.getProbeType()));
 		}
 
 		if (keyword.isJsonSchema()) {
@@ -317,8 +445,8 @@ protected Document getMappedKeyword(Field property, Keyword keyword) {
 		Object convertedValue = needsAssociationConversion ? convertAssociation(value, property)
 				: getMappedValue(property.with(keyword.getKey()), value);
 
-		if (keyword.isSample() && convertedValue instanceof Document) {
-			return (Document) convertedValue;
+		if (keyword.isSample() && convertedValue instanceof Document document) {
+			return document;
 		}
 
 		return new Document(keyword.key, convertedValue);
@@ -329,61 +457,30 @@ protected Document getMappedKeyword(Field property, Keyword keyword) {
 	 * {@link MongoPersistentProperty}.
 	 *
 	 * @param documentField the key the value will be bound to eventually
-	 * @param value the source object to be mapped
+	 * @param sourceValue the source object to be mapped
 	 * @return
 	 */
 	@Nullable
-	@SuppressWarnings("unchecked")
-	protected Object getMappedValue(Field documentField, Object value) {
+	@SuppressWarnings("NullAway")
+	protected Object getMappedValue(Field documentField, @Nullable Object sourceValue) {
 
-		if (documentField.getProperty() != null && documentField.getProperty().hasExplicitWriteTarget()) {
-			if (conversionService.canConvert(value.getClass(), documentField.getProperty().getFieldType())) {
-				value = conversionService.convert(value, documentField.getProperty().getFieldType());
-			}
-		}
+		Object value = applyFieldTargetTypeHintToValue(documentField, sourceValue);
 
-		if (documentField.isIdField() && !documentField.isAssociation()) {
+		if (documentField.getProperty() != null
+				&& converter.getCustomConversions().hasValueConverter(documentField.getProperty())) {
 
-			if (isDBObject(value)) {
-				DBObject valueDbo = (DBObject) value;
-				Document resultDbo = new Document(valueDbo.toMap());
+			PropertyValueConverter<Object, Object, ValueConversionContext<MongoPersistentProperty>> valueConverter = converter
+					.getCustomConversions().getPropertyValueConversions().getValueConverter(documentField.getProperty());
 
-				if (valueDbo.containsField("$in") || valueDbo.containsField("$nin")) {
-					String inKey = valueDbo.containsField("$in") ? "$in" : "$nin";
-					List<Object> ids = new ArrayList<>();
-					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
-						ids.add(convertId(id, getIdTypeForField(documentField)));
-					}
-					resultDbo.put(inKey, ids);
-				} else if (valueDbo.containsField("$ne")) {
-					resultDbo.put("$ne", convertId(valueDbo.get("$ne"), getIdTypeForField(documentField)));
-				} else {
-					return getMappedObject(resultDbo, Optional.empty());
-				}
-				return resultDbo;
-			}
-
-			else if (isDocument(value)) {
-				Document valueDbo = (Document) value;
-				Document resultDbo = new Document(valueDbo);
+			return convertValue(documentField, sourceValue, value, valueConverter);
+		}
 
-				if (valueDbo.containsKey("$in") || valueDbo.containsKey("$nin")) {
-					String inKey = valueDbo.containsKey("$in") ? "$in" : "$nin";
-					List<Object> ids = new ArrayList<>();
-					for (Object id : (Iterable<?>) valueDbo.get(inKey)) {
-						ids.add(convertId(id, getIdTypeForField(documentField)));
-					}
-					resultDbo.put(inKey, ids);
-				} else if (valueDbo.containsKey("$ne")) {
-					resultDbo.put("$ne", convertId(valueDbo.get("$ne"), getIdTypeForField(documentField)));
-				} else {
-					return getMappedObject(resultDbo, Optional.empty());
-				}
-				return resultDbo;
+		if (documentField.isIdField() && !documentField.isAssociation()) {
+			return convertIdField(documentField, value);
+		}
 
-			} else {
-				return convertId(value, getIdTypeForField(documentField));
-			}
+		if (value == null) {
+			return null;
 		}
 
 		if (isNestedKeyword(value)) {
@@ -398,9 +495,11 @@ else if (isDocument(value)) {
 	}
 
 	private boolean isIdField(Field documentField) {
-		return documentField.getProperty() != null && documentField.getProperty().isIdProperty();
+		return documentField.getProperty() != null
+				&& documentField.getProperty().getOwner().isIdProperty(documentField.getProperty());
 	}
 
+	@SuppressWarnings("NullAway")
 	private Class<?> getIdTypeForField(Field documentField) {
 		return isIdField(documentField) ? documentField.getProperty().getFieldType() : ObjectId.class;
 	}
@@ -417,9 +516,9 @@ private Class<?> getIdTypeForField(Field documentField) {
 	 */
 	protected boolean isAssociationConversionNecessary(Field documentField, @Nullable Object value) {
 
-		Assert.notNull(documentField, "Document field must not be null!");
+		Assert.notNull(documentField, "Document field must not be null");
 
-		if (value == null) {
+		if (value == null || documentField.getProperty() == null) {
 			return false;
 		}
 
@@ -427,15 +526,19 @@ protected boolean isAssociationConversionNecessary(Field documentField, @Nullabl
 			return false;
 		}
 
-		Class<? extends Object> type = value.getClass();
+		Class<?> type = value.getClass();
 		MongoPersistentProperty property = documentField.getProperty();
 
 		if (property.getActualType().isAssignableFrom(type)) {
 			return true;
 		}
 
+		if (property.isDocumentReference()) {
+			return true;
+		}
+
 		MongoPersistentEntity<?> entity = documentField.getPropertyEntity();
-		return entity.hasIdProperty()
+		return entity != null && entity.hasIdProperty()
 				&& (type.equals(DBRef.class) || entity.getRequiredIdProperty().getActualType().isAssignableFrom(type));
 	}
 
@@ -447,11 +550,19 @@ protected boolean isAssociationConversionNecessary(Field documentField, @Nullabl
 	 * @return
 	 */
 	@Nullable
-	@SuppressWarnings("unchecked")
 	protected Object convertSimpleOrDocument(Object source, @Nullable MongoPersistentEntity<?> entity) {
 
-		if (source instanceof Example) {
-			return exampleMapper.getMappedExample((Example) source, entity);
+		if (source instanceof Example<?> example) {
+			return exampleMapper.getMappedExample(example, entity);
+		}
+
+		if (source instanceof AggregationExpression age) {
+			return entity == null ? age.toDocument() : //
+					age.toDocument(new RelaxedTypeBasedAggregationOperationContext(entity.getType(), this.mappingContext, this));
+		}
+
+		if (source instanceof MongoExpression exr) {
+			return exr.toDocument();
 		}
 
 		if (source instanceof List) {
@@ -462,10 +573,6 @@ protected Object convertSimpleOrDocument(Object source, @Nullable MongoPersisten
 			return getMappedObject((Document) source, entity);
 		}
 
-		if (source instanceof BasicDBList) {
-			return delegateConvertToMongoType(source, entity);
-		}
-
 		if (isDBObject(source)) {
 			return getMappedObject((BasicDBObject) source, entity);
 		}
@@ -474,20 +581,20 @@ protected Object convertSimpleOrDocument(Object source, @Nullable MongoPersisten
 			return source;
 		}
 
-		if (source instanceof Map) {
+		if (source instanceof Map<?, ?> sourceMap) {
 
-			Map<String, Object> map = new LinkedHashMap<>();
+			Map<String, Object> map = new LinkedHashMap<>(sourceMap.size(), 1F);
 
-			((Map<String, Object>) source).entrySet().forEach(it -> {
+			for (Entry<?, ?> entry : sourceMap.entrySet()) {
 
-				String key = ObjectUtils.nullSafeToString(converter.convertToMongoType(it.getKey()));
+				String key = ObjectUtils.nullSafeToString(converter.convertToMongoType(entry.getKey()));
 
-				if (it.getValue() instanceof Document) {
-					map.put(key, getMappedObject((Document) it.getValue(), entity));
+				if (entry.getValue() instanceof Document document) {
+					map.put(key, getMappedObject(document, entity));
 				} else {
-					map.put(key, delegateConvertToMongoType(it.getValue(), entity));
+					map.put(key, delegateConvertToMongoType(entry.getValue(), entity));
 				}
-			});
+			}
 
 			return map;
 		}
@@ -505,11 +612,21 @@ protected Object convertSimpleOrDocument(Object source, @Nullable MongoPersisten
 	 */
 	@Nullable
 	protected Object delegateConvertToMongoType(Object source, @Nullable MongoPersistentEntity<?> entity) {
+
+		if (entity != null && entity.isUnwrapped()) {
+			return converter.convertToMongoType(source, entity);
+		}
+
 		return converter.convertToMongoType(source, entity == null ? null : entity.getTypeInformation());
 	}
 
+	@Nullable
 	protected Object convertAssociation(Object source, Field field) {
-		return convertAssociation(source, field.getProperty());
+		Object value = convertAssociation(source, field.getProperty());
+		if (value != null && field.isIdField() && field.getFieldType() != value.getClass()) {
+			return convertId(value, field.getFieldType());
+		}
+		return value;
 	}
 
 	/**
@@ -526,11 +643,10 @@ protected Object convertAssociation(@Nullable Object source, @Nullable MongoPers
 			return source;
 		}
 
-		if (source instanceof DBRef) {
+		if (source instanceof DBRef ref) {
 
-			DBRef ref = (DBRef) source;
 			Object id = convertId(ref.getId(),
-					property != null && property.isIdProperty() ? property.getFieldType() : ObjectId.class);
+					property.getOwner().isIdProperty(property) ? property.getFieldType() : ObjectId.class);
 
 			if (StringUtils.hasText(ref.getDatabaseName())) {
 				return new DBRef(ref.getDatabaseName(), ref.getCollectionName(), id);
@@ -539,24 +655,118 @@ protected Object convertAssociation(@Nullable Object source, @Nullable MongoPers
 			}
 		}
 
-		if (source instanceof Iterable) {
+		if (source instanceof Iterable<?> iterable) {
 			BasicDBList result = new BasicDBList();
-			for (Object element : (Iterable<?>) source) {
-				result.add(createDbRefFor(element, property));
+			for (Object element : iterable) {
+				result.add(createReferenceFor(element, property));
 			}
 			return result;
 		}
 
-		if (property.isMap()) {
+		if (property.isMap() && source instanceof Document dbObject) {
 			Document result = new Document();
-			Document dbObject = (Document) source;
 			for (String key : dbObject.keySet()) {
-				result.put(key, createDbRefFor(dbObject.get(key), property));
+				result.put(key, createReferenceFor(dbObject.get(key), property));
 			}
 			return result;
 		}
 
-		return createDbRefFor(source, property);
+		return createReferenceFor(source, property);
+	}
+
+	private @Nullable Object convertValue(Field documentField, @Nullable Object sourceValue, @Nullable Object value,
+			PropertyValueConverter<Object, Object, ValueConversionContext<MongoPersistentProperty>> valueConverter) {
+
+		MongoPersistentProperty property = documentField.getProperty();
+
+		OperatorContext criteriaContext = new QueryOperatorContext(
+				isKeyword(documentField.name) ? documentField.name : "$eq", property != null ? property.getFieldName() : documentField.name);
+
+		MongoConversionContext conversionContext;
+		if (valueConverter instanceof MongoConversionContext mcc) {
+			conversionContext = mcc.forOperator(criteriaContext);
+		} else {
+			conversionContext = new MongoConversionContext(NoPropertyPropertyValueProvider.INSTANCE, property, converter,
+					criteriaContext);
+		}
+
+		return convertValueWithConversionContext(documentField, sourceValue, value, valueConverter, conversionContext);
+	}
+
+	@SuppressWarnings("NullAway")
+	protected @Nullable Object convertValueWithConversionContext(Field documentField, @Nullable Object sourceValue, @Nullable Object value,
+			PropertyValueConverter<Object, Object, ValueConversionContext<MongoPersistentProperty>> valueConverter,
+			MongoConversionContext conversionContext) {
+
+		MongoPersistentProperty property = documentField.getProperty();
+		/* might be an $in clause with multiple entries */
+		if (property != null && !property.isCollectionLike() && sourceValue instanceof Collection<?> collection) {
+
+			if (collection.isEmpty()) {
+				return collection;
+			}
+
+			List<Object> converted = new ArrayList<>(collection.size());
+			for (Object o : collection) {
+				converted.add(valueConverter.write(o, conversionContext));
+			}
+
+			return converted;
+		}
+
+		if (property != null && !property.isMap() && sourceValue instanceof Document document) {
+
+			return BsonUtils.mapValues(document, (key, val) -> {
+				if (isKeyword(key)) {
+					return convertValueWithConversionContext(documentField, val, val, valueConverter, conversionContext
+							.forOperator(new QueryOperatorContext(key, conversionContext.getOperatorContext().path())));
+				}
+				return val;
+			});
+		}
+
+		return value != null ? valueConverter.write(value, conversionContext) : value;
+	}
+
+	@Nullable
+	@SuppressWarnings({"unchecked", "NullAway"})
+	private Object convertIdField(Field documentField, Object source) {
+
+		Object value = source;
+		if (isDBObject(source)) {
+			DBObject valueDbo = (DBObject) source;
+			value = new Document(valueDbo.toMap());
+		}
+
+		if (!isDocument(value)) {
+			return convertId(value, getIdTypeForField(documentField));
+		}
+
+		Document valueDbo = (Document) value;
+		Document resultDbo = new Document(valueDbo);
+
+		for (Entry<String, Object> entry : valueDbo.entrySet()) {
+
+			String key = entry.getKey();
+			if ("$nin".equals(key) || "$in".equals(key) || "$all".equals(key)) {
+				List<Object> ids = new ArrayList<>();
+				for (Object id : (Iterable<?>) valueDbo.get(key)) {
+					ids.add(convertId(id, getIdTypeForField(documentField)));
+				}
+				resultDbo.put(key, ids);
+			} else if (isKeyword(key)) {
+				resultDbo.put(key, convertIdField(documentField, entry.getValue()));
+			} else {
+				if (documentField.getProperty() != null && documentField.getProperty().isEntity()) {
+					Field propertyField = createPropertyField(documentField.getPropertyEntity(), key, mappingContext);
+					resultDbo.put(key, getMappedValue(propertyField, entry.getValue()));
+				} else {
+					resultDbo.put(key, getMappedValue(documentField, entry.getValue()));
+				}
+			}
+		}
+
+		return resultDbo;
 	}
 
 	/**
@@ -599,14 +809,19 @@ protected final Entry<String, Object> createMapEntry(Field field, @Nullable Obje
 	 */
 	private Entry<String, Object> createMapEntry(String key, @Nullable Object value) {
 
-		Assert.hasText(key, "Key must not be null or empty!");
-		return Collections.singletonMap(key, value).entrySet().iterator().next();
+		Assert.hasText(key, "Key must not be null or empty");
+		return new AbstractMap.SimpleEntry<>(key, value);
 	}
 
-	private DBRef createDbRefFor(Object source, MongoPersistentProperty property) {
+	private Object createReferenceFor(Object source, MongoPersistentProperty property) {
+
+		if (source instanceof DBRef dbRef) {
+			return dbRef;
+		}
 
-		if (source instanceof DBRef) {
-			return (DBRef) source;
+		if (property != null && (property.isDocumentReference()
+				|| (!property.isDbReference() && property.findAnnotation(Reference.class) != null))) {
+			return converter.toDocumentPointer(source, property).getPointer();
 		}
 
 		return converter.toDBRef(source, property);
@@ -634,6 +849,11 @@ public Object convertId(@Nullable Object id) {
 	 */
 	@Nullable
 	public Object convertId(@Nullable Object id, Class<?> targetType) {
+
+		if (Quirks.skipConversion(id)) {
+			return id;
+		}
+
 		return converter.convertId(id, targetType);
 	}
 
@@ -643,19 +863,20 @@ public Object convertId(@Nullable Object id, Class<?> targetType) {
 	 * @param candidate
 	 * @return
 	 */
-	protected boolean isNestedKeyword(Object candidate) {
+	@Contract("null -> false")
+	protected boolean isNestedKeyword(@Nullable Object candidate) {
 
 		if (!(candidate instanceof Document)) {
 			return false;
 		}
 
-		Set<String> keys = BsonUtils.asMap((Bson) candidate).keySet();
+		Map<String, Object> map = BsonUtils.asMap((Bson) candidate);
 
-		if (keys.size() != 1) {
+		if (map.size() != 1) {
 			return false;
 		}
 
-		return isKeyword(keys.iterator().next().toString());
+		return isKeyword(map.entrySet().iterator().next().getKey());
 	}
 
 	/**
@@ -672,13 +893,49 @@ protected boolean isTypeKey(String key) {
 
 	/**
 	 * Returns whether the given {@link String} is a MongoDB keyword. The default implementation will check against the
-	 * set of registered keywords returned by {@link #getKeywords()}.
+	 * set of registered keywords.
 	 *
 	 * @param candidate
 	 * @return
 	 */
-	protected boolean isKeyword(String candidate) {
-		return candidate.startsWith("$");
+	protected boolean isKeyword(@Nullable String candidate) {
+		return candidate != null && candidate.startsWith("$");
+	}
+
+	/**
+	 * Convert the given field value into its desired
+	 * {@link org.springframework.data.mongodb.core.mapping.Field#targetType() target type} before applying further
+	 * conversions. In case of a {@link Collection} (used eg. for {@code $in} queries) the individual values will be
+	 * converted one by one.
+	 *
+	 * @param documentField the field and its metadata
+	 * @param value the actual value. Can be {@literal null}.
+	 * @return the potentially converted target value.
+	 */
+	@Nullable
+	private Object applyFieldTargetTypeHintToValue(Field documentField, @Nullable Object value) {
+
+		if (value == null || documentField.getProperty() == null || !documentField.getProperty().hasExplicitWriteTarget()
+				|| value instanceof Document || value instanceof DBObject || Quirks.skipConversion(value)) {
+			return value;
+		}
+
+		if (!conversionService.canConvert(value.getClass(), documentField.getProperty().getFieldType())) {
+			return value;
+		}
+
+		if (value instanceof Collection<?> source) {
+
+			Collection<Object> converted = new ArrayList<>(source.size());
+
+			for (Object o : source) {
+				converted.add(conversionService.convert(o, documentField.getProperty().getFieldType()));
+			}
+
+			return converted;
+		}
+
+		return conversionService.convert(value, documentField.getProperty().getFieldType());
 	}
 
 	/**
@@ -687,11 +944,10 @@ protected boolean isKeyword(String candidate) {
 	 * @author Oliver Gierke
 	 * @author Christoph Strobl
 	 */
+	@SuppressWarnings("NullAway")
 	static class Keyword {
 
-		private static final String N_OR_PATTERN = "\\$.*or";
-		private static final Set<String> NON_DBREF_CONVERTING_KEYWORDS = new HashSet<>(
-				Arrays.asList("$", "$size", "$slice", "$gt", "$lt"));
+		private static final Set<String> NON_DBREF_CONVERTING_KEYWORDS = Set.of("$", "$size", "$slice", "$gt", "$lt");
 
 		private final String key;
 		private final Object value;
@@ -703,11 +959,14 @@ public Keyword(Bson source, String key) {
 
 		public Keyword(Bson bson) {
 
-			Set<String> keys = BsonUtils.asMap(bson).keySet();
-			Assert.isTrue(keys.size() == 1, "Can only use a single value Document!");
+			Map<String, Object> map = BsonUtils.asMap(bson);
+			Assert.isTrue(map.size() == 1, "Can only use a single value Document");
 
-			this.key = keys.iterator().next();
-			this.value = BsonUtils.get(bson, key);
+			Set<Entry<String, Object>> entries = map.entrySet();
+			Entry<String, Object> entry = entries.iterator().next();
+
+			this.key = entry.getKey();
+			this.value = entry.getValue();
 		}
 
 		/**
@@ -720,7 +979,7 @@ public boolean isExists() {
 		}
 
 		public boolean isOrOrNor() {
-			return key.matches(N_OR_PATTERN);
+			return key.equalsIgnoreCase("$or") || key.equalsIgnoreCase("$nor");
 		}
 
 		/**
@@ -784,23 +1043,21 @@ protected static class Field {
 
 		protected static final Pattern POSITIONAL_OPERATOR = Pattern.compile("\\$\\[.*\\]");
 
-		private static final String ID_KEY = "_id";
-
 		protected final String name;
 
 		/**
-		 * Creates a new {@link DocumentField} without meta-information but the given name.
+		 * Creates a new {@link Field} without meta-information but the given name.
 		 *
 		 * @param name must not be {@literal null} or empty.
 		 */
 		public Field(String name) {
 
-			Assert.hasText(name, "Name must not be null!");
+			Assert.hasText(name, "Name must not be null");
 			this.name = name;
 		}
 
 		/**
-		 * Returns a new {@link DocumentField} with the given name.
+		 * Returns a new {@link Field} with the given name.
 		 *
 		 * @param name must not be {@literal null} or empty.
 		 * @return
@@ -815,7 +1072,7 @@ public Field with(String name) {
 		 * @return
 		 */
 		public boolean isIdField() {
-			return ID_KEY.equals(name);
+			return FieldName.ID.name().equals(name);
 		}
 
 		/**
@@ -840,6 +1097,11 @@ public MongoPersistentEntity<?> getPropertyEntity() {
 			return null;
 		}
 
+		@Nullable
+		MongoPersistentEntity<?> getEntity() {
+			return null;
+		}
+
 		/**
 		 * Returns whether the field represents an association.
 		 *
@@ -855,7 +1117,7 @@ public boolean isAssociation() {
 		 * @return
 		 */
 		public String getMappedKey() {
-			return isIdField() ? ID_KEY : name;
+			return isIdField() ? FieldName.ID.name() : name;
 		}
 
 		/**
@@ -883,7 +1145,11 @@ public boolean isMap() {
 		}
 
 		public TypeInformation<?> getTypeHint() {
-			return ClassTypeInformation.OBJECT;
+			return TypeInformation.OBJECT;
+		}
+
+		public Class<?> getFieldType() {
+			return Object.class;
 		}
 	}
 
@@ -893,9 +1159,11 @@ public TypeInformation<?> getTypeHint() {
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
 	 */
-	protected static class MetadataBackedField extends Field {
+	public static class MetadataBackedField extends Field {
 
-		private static final String INVALID_ASSOCIATION_REFERENCE = "Invalid path reference %s! Associations can only be pointed to directly or via their id property!";
+		private static final Pattern POSITIONAL_PARAMETER_PATTERN = Pattern.compile("\\.\\$(\\[.*?\\])?");
+		private static final Pattern NUMERIC_SEGMENT = Pattern.compile("\\d+");
+		private static final String INVALID_ASSOCIATION_REFERENCE = "Invalid path reference %s; Associations can only be pointed to directly or via their id property";
 
 		private final MongoPersistentEntity<?> entity;
 		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@@ -925,40 +1193,33 @@ public MetadataBackedField(String name, MongoPersistentEntity<?> entity,
 		 * @param context must not be {@literal null}.
 		 * @param property may be {@literal null}.
 		 */
+		@SuppressWarnings("NullAway")
 		public MetadataBackedField(String name, MongoPersistentEntity<?> entity,
 				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
 				@Nullable MongoPersistentProperty property) {
 
 			super(name);
 
-			Assert.notNull(entity, "MongoPersistentEntity must not be null!");
+			Assert.notNull(entity, "MongoPersistentEntity must not be null");
 
 			this.entity = entity;
 			this.mappingContext = context;
 
-			this.path = getPath(name);
+			this.path = getPath(removePlaceholders(POSITIONAL_PARAMETER_PATTERN, name), property);
 			this.property = path == null ? property : path.getLeafProperty();
 			this.association = findAssociation();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#with(java.lang.String)
-		 */
 		@Override
 		public MetadataBackedField with(String name) {
 			return new MetadataBackedField(name, entity, mappingContext, property);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isIdField()
-		 */
 		@Override
 		public boolean isIdField() {
 
 			if (property != null) {
-				return property.isIdProperty();
+				return property.getOwner().isIdProperty(property);
 			}
 
 			MongoPersistentProperty idProperty = entity.getIdProperty();
@@ -970,40 +1231,30 @@ public boolean isIdField() {
 			return DEFAULT_ID_NAMES.contains(name);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getProperty()
-		 */
 		@Override
 		public MongoPersistentProperty getProperty() {
 			return association == null ? property : association.getInverse();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getEntity()
-		 */
 		@Override
-		public MongoPersistentEntity<?> getPropertyEntity() {
+		public @Nullable MongoPersistentEntity<?> getPropertyEntity() {
 			MongoPersistentProperty property = getProperty();
 			return property == null ? null : mappingContext.getPersistentEntity(property);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#isAssociation()
-		 */
+		@Nullable
+		@Override
+		public MongoPersistentEntity<?> getEntity() {
+			return entity;
+		}
+
 		@Override
 		public boolean isAssociation() {
 			return association != null;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getAssociation()
-		 */
 		@Override
-		public Association<MongoPersistentProperty> getAssociation() {
+		public @Nullable Association<MongoPersistentProperty> getAssociation() {
 			return association;
 		}
 
@@ -1029,12 +1280,18 @@ private Association<MongoPersistentProperty> findAssociation() {
 			return null;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTargetKey()
-		 */
+		@Override
+		public Class<?> getFieldType() {
+			return property.getFieldType();
+		}
+
 		@Override
 		public String getMappedKey() {
+
+			if (getProperty() != null && getProperty().getMongoField().getName().isKey()) {
+				return getProperty().getFieldName();
+			}
+
 			return path == null ? name : path.toDotPath(isAssociation() ? getAssociationConverter() : getPropertyConverter());
 		}
 
@@ -1044,45 +1301,68 @@ protected PersistentPropertyPath<MongoPersistentProperty> getPath() {
 		}
 
 		/**
-		 * Returns the {@link PersistentPropertyPath} for the given <code>pathExpression</code>.
+		 * Returns the {@link PersistentPropertyPath} for the given {@code pathExpression}.
 		 *
 		 * @param pathExpression
 		 * @return
 		 */
 		@Nullable
-		private PersistentPropertyPath<MongoPersistentProperty> getPath(String pathExpression) {
+		private PersistentPropertyPath<MongoPersistentProperty> getPath(String pathExpression,
+				@Nullable MongoPersistentProperty sourceProperty) {
 
-			String rawPath = pathExpression.replaceAll("\\.\\d+", "") //
-					.replaceAll(POSITIONAL_OPERATOR.pattern(), "");
+			if (sourceProperty != null && sourceProperty.getOwner().equals(entity)) {
+				return mappingContext.getPersistentPropertyPath(
+						PropertyPath.from(Pattern.quote(sourceProperty.getName()), entity.getTypeInformation()));
+			}
+
+			String rawPath = resolvePath(pathExpression);
 
 			PropertyPath path = forName(rawPath);
 			if (path == null || isPathToJavaLangClassProperty(path)) {
 				return null;
 			}
 
-			try {
+			PersistentPropertyPath<MongoPersistentProperty> propertyPath = tryToResolvePersistentPropertyPath(path);
 
-				PersistentPropertyPath<MongoPersistentProperty> propertyPath = mappingContext.getPersistentPropertyPath(path);
+			if (propertyPath == null) {
 
-				Iterator<MongoPersistentProperty> iterator = propertyPath.iterator();
-				boolean associationDetected = false;
+				if (QueryMapper.LOGGER.isInfoEnabled()) {
 
-				while (iterator.hasNext()) {
+					String types = StringUtils.collectionToDelimitedString(
+							path.stream().map(it -> it.getType().getSimpleName()).collect(Collectors.toList()), " -> ");
+					QueryMapper.LOGGER.info(String.format(
+							"Could not map '%s'; Maybe a fragment in '%s' is considered a simple type; Mapper continues with %s",
+							path, types, pathExpression));
+				}
+				return null;
+			}
 
-					MongoPersistentProperty property = iterator.next();
+			Iterator<MongoPersistentProperty> iterator = propertyPath.iterator();
+			boolean associationDetected = false;
 
-					if (property.isAssociation()) {
-						associationDetected = true;
-						continue;
-					}
+			while (iterator.hasNext()) {
 
-					if (associationDetected && !property.isIdProperty()) {
-						throw new MappingException(String.format(INVALID_ASSOCIATION_REFERENCE, pathExpression));
-					}
+				MongoPersistentProperty property = iterator.next();
+
+				if (property.isAssociation()) {
+					associationDetected = true;
+					continue;
+				}
+
+				if (associationDetected && !property.getOwner().isIdProperty(property)) {
+					throw new MappingException(String.format(INVALID_ASSOCIATION_REFERENCE, pathExpression));
 				}
+			}
+
+			return propertyPath;
+		}
+
+		@Nullable
+		private PersistentPropertyPath<MongoPersistentProperty> tryToResolvePersistentPropertyPath(PropertyPath path) {
 
-				return propertyPath;
-			} catch (InvalidPersistentPropertyPath e) {
+			try {
+				return mappingContext.getPersistentPropertyPath(path);
+			} catch (MappingException e) {
 				return null;
 			}
 		}
@@ -1111,16 +1391,53 @@ private PropertyPath forName(String path) {
 					return forName(path.substring(0, path.length() - 3) + "id");
 				}
 
+				// Ok give it another try quoting
+				try {
+					return PropertyPath.from(Pattern.quote(path), entity.getTypeInformation());
+				} catch (PropertyReferenceException | InvalidPersistentPropertyPath ex) {
+
+				}
+
 				return null;
 			}
 		}
 
 		private boolean isPathToJavaLangClassProperty(PropertyPath path) {
 
-			if (path.getType().equals(Class.class) && path.getLeafProperty().getOwningType().getType().equals(Class.class)) {
-				return true;
+			return (path.getType() == Class.class || path.getType().equals(Object.class))
+					&& path.getLeafProperty().getType() == Class.class;
+		}
+
+		private static String resolvePath(String source) {
+
+			String[] segments = source.split("\\.");
+			if (segments.length == 1) {
+				return source;
 			}
-			return false;
+
+			List<String> path = new ArrayList<>(segments.length);
+
+			/* always start from a property, so we can skip the first segment.
+			   from there remove any position placeholder */
+			for (int i = 1; i < segments.length; i++) {
+				String segment = segments[i];
+				if (segment.startsWith("[") && segment.endsWith("]")) {
+					continue;
+				}
+				if (NUMERIC_SEGMENT.matcher(segment).matches()) {
+					continue;
+				}
+				path.add(segment);
+			}
+
+			// when property is followed only by placeholders eg. 'values.0.3.90'
+			// or when there is no difference in the number of segments
+			if (path.isEmpty() || segments.length == path.size() + 1) {
+				return source;
+			}
+
+			path.add(0, segments[0]);
+			return StringUtils.collectionToDelimitedString(path, ".");
 		}
 
 		/**
@@ -1130,7 +1447,7 @@ private boolean isPathToJavaLangClassProperty(PropertyPath path) {
 		 * @return
 		 */
 		protected Converter<MongoPersistentProperty, String> getPropertyConverter() {
-			return new PositionParameterRetainingPropertyKeyConverter(name);
+			return new PositionParameterRetainingPropertyKeyConverter(name, mappingContext);
 		}
 
 		/**
@@ -1140,8 +1457,17 @@ protected Converter<MongoPersistentProperty, String> getPropertyConverter() {
 		 * @return
 		 * @since 1.7
 		 */
+		@SuppressWarnings("NullAway")
 		protected Converter<MongoPersistentProperty, String> getAssociationConverter() {
-			return new AssociationConverter(getAssociation());
+			return new AssociationConverter(name, getAssociation());
+		}
+
+		protected MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
+			return mappingContext;
+		}
+
+		private static String removePlaceholders(Pattern pattern, String raw) {
+			return pattern.matcher(raw).replaceAll("");
 		}
 
 		/**
@@ -1152,24 +1478,17 @@ static class PositionParameterRetainingPropertyKeyConverter implements Converter
 
 			private final KeyMapper keyMapper;
 
-			public PositionParameterRetainingPropertyKeyConverter(String rawKey) {
-				this.keyMapper = new KeyMapper(rawKey);
+			public PositionParameterRetainingPropertyKeyConverter(String rawKey,
+					MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> ctx) {
+				this.keyMapper = new KeyMapper(rawKey, ctx);
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-			 */
 			@Override
 			public String convert(MongoPersistentProperty source) {
 				return keyMapper.mapPropertyName(source);
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.Field#getTypeHint()
-		 */
 		@Override
 		public TypeInformation<?> getTypeHint() {
 
@@ -1181,7 +1500,7 @@ public TypeInformation<?> getTypeHint() {
 
 			if (property.getActualType().isInterface()
 					|| java.lang.reflect.Modifier.isAbstract(property.getActualType().getModifiers())) {
-				return ClassTypeInformation.OBJECT;
+				return TypeInformation.OBJECT;
 			}
 
 			return NESTED_DOCUMENT;
@@ -1194,11 +1513,23 @@ public TypeInformation<?> getTypeHint() {
 		static class KeyMapper {
 
 			private final Iterator<String> iterator;
+			private int currentIndex;
+			private final List<String> pathParts;
+
+			public KeyMapper(String key,
+					MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+				this.pathParts = Arrays.asList(key.split("\\."));
+				this.iterator = pathParts.iterator();
+				this.currentIndex = 0;
+			}
 
-			public KeyMapper(String key) {
+			String nextToken() {
+				return pathParts.get(currentIndex + 1);
+			}
 
-				this.iterator = Arrays.asList(key.split("\\.")).iterator();
-				this.iterator.next();
+			boolean hasNexToken() {
+				return pathParts.size() > currentIndex + 1;
 			}
 
 			/**
@@ -1210,24 +1541,30 @@ public KeyMapper(String key) {
 			protected String mapPropertyName(MongoPersistentProperty property) {
 
 				StringBuilder mappedName = new StringBuilder(PropertyToFieldNameConverter.INSTANCE.convert(property));
-				boolean inspect = iterator.hasNext();
+				if (!hasNexToken()) {
+					return mappedName.toString();
+				}
 
-				while (inspect) {
+				String nextToken = nextToken();
+				if (isPositionalParameter(nextToken)) {
 
-					String partial = iterator.next();
-					boolean isPositional = (isPositionalParameter(partial) && (property.isMap() || property.isCollectionLike()));
+					mappedName.append(".").append(nextToken);
+					currentIndex += 2;
+					return mappedName.toString();
+				}
 
-					if (isPositional) {
-						mappedName.append(".").append(partial);
-					}
+				if (property.isMap()) {
 
-					inspect = isPositional && iterator.hasNext();
+					mappedName.append(".").append(nextToken);
+					currentIndex += 2;
+					return mappedName.toString();
 				}
 
+				currentIndex++;
 				return mappedName.toString();
 			}
 
-			private static boolean isPositionalParameter(String partial) {
+			static boolean isPositionalParameter(String partial) {
 
 				if ("$".equals(partial)) {
 					return true;
@@ -1255,6 +1592,7 @@ private static boolean isPositionalParameter(String partial) {
 	 */
 	protected static class AssociationConverter implements Converter<MongoPersistentProperty, String> {
 
+		private final String name;
 		private final MongoPersistentProperty property;
 		private boolean associationFound;
 
@@ -1263,18 +1601,15 @@ protected static class AssociationConverter implements Converter<MongoPersistent
 		 *
 		 * @param association must not be {@literal null}.
 		 */
-		public AssociationConverter(Association<MongoPersistentProperty> association) {
+		public AssociationConverter(String name, Association<MongoPersistentProperty> association) {
 
-			Assert.notNull(association, "Association must not be null!");
+			Assert.notNull(association, "Association must not be null");
 			this.property = association.getInverse();
+			this.name = name;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
-		public String convert(MongoPersistentProperty source) {
+		public @Nullable String convert(MongoPersistentProperty source) {
 
 			if (associationFound) {
 				return null;
@@ -1284,6 +1619,12 @@ public String convert(MongoPersistentProperty source) {
 				associationFound = true;
 			}
 
+			if (associationFound) {
+				if (name.endsWith("$") && property.isCollectionLike()) {
+					return source.getFieldName() + ".$";
+				}
+			}
+
 			return source.getFieldName();
 		}
 	}
@@ -1291,4 +1632,35 @@ public String convert(MongoPersistentProperty source) {
 	public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
 		return mappingContext;
 	}
+
+	public MongoConverter getConverter() {
+		return converter;
+	}
+
+	enum NoPropertyPropertyValueProvider implements PropertyValueProvider<MongoPersistentProperty> {
+
+		INSTANCE;
+
+		@Override
+		public <T> T getPropertyValue(MongoPersistentProperty property) {
+			throw new IllegalStateException("No enclosing property source available");
+		}
+	}
+
+	/*
+	 * Types that must not be converted.
+	 */
+	static class Quirks {
+
+		private static final Set<Class<?>> types = Set.of(Pattern.class, BsonRegularExpression.class);
+
+		static boolean skipConversion(@Nullable Object value) {
+
+			if (value == null) {
+				return false;
+			}
+
+			return types.contains(value.getClass());
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLoader.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLoader.java
new file mode 100644
index 0000000000..cd7d55311d
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLoader.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import java.util.Collections;
+import java.util.Iterator;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.convert.ReferenceResolver.ReferenceCollection;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+
+import com.mongodb.client.MongoCollection;
+
+/**
+ * The {@link ReferenceLoader} obtains raw {@link Document documents} for linked entities via a
+ * {@link ReferenceLoader.DocumentReferenceQuery}.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public interface ReferenceLoader {
+
+	/**
+	 * Obtain a single {@link Document} matching the given {@literal referenceQuery} in the {@literal context}.
+	 *
+	 * @param referenceQuery must not be {@literal null}.
+	 * @param context must not be {@literal null}.
+	 * @return the matching {@link Document} or {@literal null} if none found.
+	 */
+	default @Nullable Document fetchOne(DocumentReferenceQuery referenceQuery, ReferenceCollection context) {
+
+		Iterator<Document> it = fetchMany(referenceQuery, context).iterator();
+		return it.hasNext() ? it.next() : null;
+	}
+
+	/**
+	 * Obtain multiple {@link Document} matching the given {@literal referenceQuery} in the {@literal context}.
+	 *
+	 * @param referenceQuery must not be {@literal null}.
+	 * @param context must not be {@literal null}.
+	 * @return the matching {@link Document} or {@literal null} if none found.
+	 */
+	Iterable<Document> fetchMany(DocumentReferenceQuery referenceQuery, ReferenceCollection context);
+
+	/**
+	 * The {@link DocumentReferenceQuery} defines the criteria by which {@link Document documents} should be matched
+	 * applying potentially given order criteria.
+	 */
+	interface DocumentReferenceQuery {
+
+		/**
+		 * Get the query to obtain matching {@link Document documents}.
+		 *
+		 * @return never {@literal null}.
+		 */
+		Bson getQuery();
+
+		/**
+		 * Get the sort criteria for ordering results.
+		 *
+		 * @return an empty {@link Document} by default. Never {@literal null}.
+		 */
+		default Bson getSort() {
+			return new Document();
+		}
+
+		default Iterable<Document> apply(MongoCollection<Document> collection) {
+			return restoreOrder(collection.find(getQuery()).sort(getSort()));
+		}
+
+		/**
+		 * Restore the order of fetched documents.
+		 *
+		 * @param documents must not be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		default Iterable<Document> restoreOrder(Iterable<Document> documents) {
+			return documents;
+		}
+
+		static DocumentReferenceQuery forSingleDocument(Bson bson) {
+
+			return new DocumentReferenceQuery() {
+
+				@Override
+				public Bson getQuery() {
+					return bson;
+				}
+
+				@Override
+				public Iterable<Document> apply(MongoCollection<Document> collection) {
+
+					Document result = collection.find(getQuery()).sort(getSort()).limit(1).first();
+					return result != null ? Collections.singleton(result) : Collections.emptyList();
+				}
+			};
+		}
+
+		static DocumentReferenceQuery forManyDocuments(Bson bson) {
+
+			return new DocumentReferenceQuery() {
+
+				@Override
+				public Bson getQuery() {
+					return bson;
+				}
+
+				@Override
+				public Iterable<Document> apply(MongoCollection<Document> collection) {
+					return collection.find(getQuery()).sort(getSort());
+				}
+			};
+		}
+
+		/**
+		 * @return a {@link DocumentReferenceQuery} that will not match any documents.
+		 * @since 4.2.5
+		 */
+		static DocumentReferenceQuery forNoResult() {
+			return NoResultsFilter.INSTANCE;
+		}
+	}
+
+	/**
+	 * A dedicated {@link DocumentReferenceQuery} that will not match any documents.
+	 *
+	 * @since 4.2.5
+	 */
+	enum NoResultsFilter implements DocumentReferenceQuery {
+		INSTANCE;
+
+		private static final Document NO_RESULTS_PREDICATE = new Document(FieldName.ID.name(),
+				new Document("$exists", false));
+
+		@Override
+		public Bson getQuery() {
+			return NO_RESULTS_PREDICATE;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegate.java
new file mode 100644
index 0000000000..a0e5a6f2bb
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegate.java
@@ -0,0 +1,506 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.SpELContext;
+import org.springframework.data.mongodb.core.convert.ReferenceLoader.DocumentReferenceQuery;
+import org.springframework.data.mongodb.core.convert.ReferenceLoader.NoResultsFilter;
+import org.springframework.data.mongodb.core.convert.ReferenceResolver.MongoEntityReader;
+import org.springframework.data.mongodb.core.convert.ReferenceResolver.ReferenceCollection;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.mongodb.util.json.ParameterBindingContext;
+import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
+import org.springframework.data.mongodb.util.json.ValueProvider;
+import org.springframework.data.mongodb.util.spel.ExpressionUtils;
+import org.springframework.data.util.Streamable;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.DBRef;
+import com.mongodb.client.MongoCollection;
+
+/**
+ * A common delegate for {@link ReferenceResolver} implementations to resolve a reference to one/many target documents
+ * that are converted to entities.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Stefan Bildl
+ * @since 3.3
+ */
+public final class ReferenceLookupDelegate {
+
+	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private final SpELContext spELContext;
+	private final ParameterBindingDocumentCodec codec;
+
+	/**
+	 * Create a new {@link ReferenceLookupDelegate}.
+	 *
+	 * @param mappingContext must not be {@literal null}.
+	 * @param spELContext must not be {@literal null}.
+	 */
+	public ReferenceLookupDelegate(
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			SpELContext spELContext) {
+
+		Assert.notNull(mappingContext, "MappingContext must not be null");
+		Assert.notNull(spELContext, "SpELContext must not be null");
+
+		this.mappingContext = mappingContext;
+		this.spELContext = spELContext;
+		this.codec = new ParameterBindingDocumentCodec();
+	}
+
+	/**
+	 * Read the reference expressed by the given property.
+	 *
+	 * @param property the reference defining property. Must not be {@literal null}. THe
+	 * @param source the source value identifying to the referenced entity. Must not be {@literal null}.
+	 * @param lookupFunction to execute a lookup query. Must not be {@literal null}.
+	 * @param entityReader the callback to convert raw source values into actual domain types. Must not be
+	 *          {@literal null}.
+	 * @return can be {@literal null}.
+	 */
+	public @Nullable Object readReference(MongoPersistentProperty property, Object source, LookupFunction lookupFunction,
+			MongoEntityReader entityReader) {
+
+		Object value = source instanceof DocumentReferenceSource documentReferenceSource
+				? documentReferenceSource.getTargetSource()
+				: source;
+
+		Iterable<Document> result = retrieveRawDocuments(property, source, lookupFunction, value);
+
+		if (result == null) {
+			return null;
+		}
+
+		if (property.isCollectionLike()) {
+			return entityReader.read(result, property.getTypeInformation());
+		}
+
+		if (!result.iterator().hasNext()) {
+			return null;
+		}
+
+		Object resultValue = result.iterator().next();
+		return resultValue != null ? entityReader.read(resultValue, property.getTypeInformation()) : null;
+	}
+
+	@Nullable
+	private Iterable<Document> retrieveRawDocuments(MongoPersistentProperty property, Object source,
+			LookupFunction lookupFunction, @Nullable Object value) {
+
+		DocumentReferenceQuery filter = computeFilter(property, source, spELContext);
+		if (filter instanceof NoResultsFilter) {
+			return Collections.emptyList();
+		}
+
+		ReferenceCollection referenceCollection = computeReferenceContext(property, value, spELContext);
+		return lookupFunction.apply(filter, referenceCollection);
+	}
+
+	@SuppressWarnings("NullAway")
+	private ReferenceCollection computeReferenceContext(MongoPersistentProperty property, @Nullable Object value,
+			SpELContext spELContext) {
+
+		// Use the first value as a reference for others in case of collection like
+		if (value instanceof Iterable<?> iterable) {
+
+			Iterator<?> iterator = iterable.iterator();
+			value = iterator.hasNext() ? iterator.next() : new Document();
+		}
+
+		// handle DBRef value
+		if (value instanceof DBRef dbRef) {
+			return ReferenceCollection.fromDBRef(dbRef);
+		}
+
+		String collection = mappingContext.getRequiredPersistentEntity(property.getAssociationTargetType()).getCollection();
+
+		if (value instanceof Document documentPointer) {
+
+			if (property.isDocumentReference()) {
+
+				ParameterBindingContext bindingContext = bindingContext(property, value, spELContext);
+				DocumentReference documentReference = property.getDocumentReference();
+
+				String targetDatabase = parseValueOrGet(documentReference.db(), bindingContext,
+						() -> documentPointer.get("db", String.class));
+				String targetCollection = parseValueOrGet(documentReference.collection(), bindingContext,
+						() -> documentPointer.get("collection", collection));
+				return new ReferenceCollection(targetDatabase, targetCollection);
+			}
+
+			return new ReferenceCollection(documentPointer.getString("db"), documentPointer.get("collection", collection));
+		}
+
+		if (property.isDocumentReference()) {
+
+			ParameterBindingContext bindingContext = bindingContext(property, value, spELContext);
+			DocumentReference documentReference = property.getDocumentReference();
+
+			String targetDatabase = parseValueOrGet(documentReference.db(), bindingContext, () -> null);
+			String targetCollection = parseValueOrGet(documentReference.collection(), bindingContext, () -> collection);
+
+			return new ReferenceCollection(targetDatabase, targetCollection);
+		}
+
+		return new ReferenceCollection(null, collection);
+	}
+
+	/**
+	 * Use the given {@link ParameterBindingContext} to compute potential expressions against the value.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @param bindingContext must not be {@literal null}.
+	 * @param defaultValue
+	 * @param <T>
+	 * @return can be {@literal null}.
+	 */
+	@SuppressWarnings("unchecked")
+	private <T> T parseValueOrGet(String value, ParameterBindingContext bindingContext, Supplier<@Nullable T> defaultValue) {
+
+		if (!StringUtils.hasText(value)) {
+			return defaultValue.get();
+		}
+
+		// parameter binding requires a document, since we do not have one, construct it.
+		if (!BsonUtils.isJsonDocument(value) && value.contains("?#{")) {
+			String s = "{ 'target-value' : " + value + "}";
+			T evaluated = (T) codec.decode(s, bindingContext).get("target-value");
+			return evaluated != null ? evaluated : defaultValue.get();
+		}
+
+		if (BsonUtils.isJsonDocument(value)) {
+			return (T) codec.decode(value, bindingContext);
+		}
+
+		if (!value.startsWith("#") && ExpressionUtils.detectExpression(value) == null) {
+			return (T) value;
+		}
+
+		T evaluated = (T) bindingContext.evaluateExpression(value);
+		return evaluated != null ? evaluated : defaultValue.get();
+	}
+
+	ParameterBindingContext bindingContext(MongoPersistentProperty property, @Nullable Object source, SpELContext spELContext) {
+
+		ValueProvider valueProvider = valueProviderFor(DocumentReferenceSource.getTargetSource(source));
+
+		return new ParameterBindingContext(valueProvider, spELContext.getParser(),
+				() -> evaluationContextFor(property, source, spELContext));
+	}
+
+	ValueProvider valueProviderFor(@Nullable Object source) {
+
+		return index -> {
+			if (source instanceof Document document) {
+				return Streamable.of(document.values()).toList().get(index);
+			}
+			return source;
+		};
+	}
+
+	EvaluationContext evaluationContextFor(MongoPersistentProperty property, @Nullable Object source, SpELContext spELContext) {
+
+		Object target = source instanceof DocumentReferenceSource documentReferenceSource
+				? documentReferenceSource.getTargetSource()
+				: source;
+
+		if (target == null) {
+			target = new Document();
+		}
+
+		EvaluationContext ctx = spELContext.getEvaluationContext(target);
+		ctx.setVariable("target", target);
+		ctx.setVariable("self", DocumentReferenceSource.getSelf(source));
+		ctx.setVariable(property.getName(), target);
+
+		return ctx;
+	}
+
+	/**
+	 * Compute the query to retrieve linked documents.
+	 *
+	 * @param property must not be {@literal null}.
+	 * @param source must not be {@literal null}.
+	 * @param spELContext must not be {@literal null}.
+	 * @return never {@literal null}.
+	 */
+	@SuppressWarnings({"unchecked","NullAway"})
+	DocumentReferenceQuery computeFilter(MongoPersistentProperty property, Object source, SpELContext spELContext) {
+
+		DocumentReference documentReference = property.isDocumentReference() ? property.getDocumentReference()
+				: ReferenceEmulatingDocumentReference.INSTANCE;
+
+		String lookup = documentReference.lookup();
+
+		Object value = DocumentReferenceSource.getTargetSource(source);
+
+		Document sort = parseValueOrGet(documentReference.sort(), bindingContext(property, source, spELContext),
+				Document::new);
+
+		if (property.isCollectionLike() && (value instanceof Collection || value == null)) {
+
+			if (value == null) {
+				return new ListDocumentReferenceQuery(codec.decode(lookup, bindingContext(property, source, spELContext)),
+						sort);
+			}
+
+			Collection<Object> objects = (Collection<Object>) value;
+
+			// optimization: bypass query if the collection pointing to the references is empty
+			if (objects.isEmpty()) {
+				return DocumentReferenceQuery.forNoResult();
+			}
+
+			List<Document> ors = new ArrayList<>(objects.size());
+			for (Object entry : objects) {
+
+				Document decoded = codec.decode(lookup, bindingContext(property, entry, spELContext));
+				ors.add(decoded);
+			}
+
+			return new ListDocumentReferenceQuery(new Document("$or", ors), sort);
+		}
+
+		if (property.isMap() && value instanceof Map) {
+
+			if (ObjectUtils.isEmpty(value)) {
+				return DocumentReferenceQuery.forNoResult();
+			}
+
+			Set<Entry<Object, Object>> entries = ((Map<Object, Object>) value).entrySet();
+			Map<Object, Document> filterMap = new LinkedHashMap<>(entries.size());
+
+			for (Entry<Object, Object> entry : entries) {
+
+				Document decoded = codec.decode(lookup, bindingContext(property, entry.getValue(), spELContext));
+				filterMap.put(entry.getKey(), decoded);
+			}
+
+			return new MapDocumentReferenceQuery(new Document("$or", filterMap.values()), sort, filterMap);
+		}
+
+		return new SingleDocumentReferenceQuery(codec.decode(lookup, bindingContext(property, source, spELContext)), sort);
+	}
+
+	enum ReferenceEmulatingDocumentReference implements DocumentReference {
+
+		INSTANCE;
+
+		@Override
+		public Class<? extends Annotation> annotationType() {
+			return DocumentReference.class;
+		}
+
+		@Override
+		public String db() {
+			return "";
+		}
+
+		@Override
+		public String collection() {
+			return "";
+		}
+
+		@Override
+		public String lookup() {
+			return "{ '_id' : ?#{#target} }";
+		}
+
+		@Override
+		public String sort() {
+			return "";
+		}
+
+		@Override
+		public boolean lazy() {
+			return false;
+		}
+	}
+
+	/**
+	 * {@link DocumentReferenceQuery} implementation fetching a single {@link Document}.
+	 */
+	static class SingleDocumentReferenceQuery implements DocumentReferenceQuery {
+
+		private final Document query;
+		private final Document sort;
+
+		public SingleDocumentReferenceQuery(Document query, Document sort) {
+
+			this.query = query;
+			this.sort = sort;
+		}
+
+		@Override
+		public Bson getQuery() {
+			return query;
+		}
+
+		@Override
+		public Document getSort() {
+			return sort;
+		}
+
+		@Override
+		public Iterable<Document> apply(MongoCollection<Document> collection) {
+
+			Document result = collection.find(getQuery()).sort(getSort()).limit(1).first();
+			return result != null ? Collections.singleton(result) : Collections.emptyList();
+		}
+	}
+
+	/**
+	 * {@link DocumentReferenceQuery} implementation to retrieve linked {@link Document documents} stored inside a
+	 * {@link Map} structure. Restores the original map order by matching individual query documents against the actual
+	 * values.
+	 */
+	static class MapDocumentReferenceQuery implements DocumentReferenceQuery {
+
+		private final Document query;
+		private final Document sort;
+		private final Map<Object, Document> filterOrderMap;
+
+		public MapDocumentReferenceQuery(Document query, Document sort, Map<Object, Document> filterOrderMap) {
+
+			this.query = query;
+			this.sort = sort;
+			this.filterOrderMap = filterOrderMap;
+		}
+
+		@Override
+		public Bson getQuery() {
+			return query;
+		}
+
+		@Override
+		public Bson getSort() {
+			return sort;
+		}
+
+		@Override
+		public Iterable<Document> restoreOrder(Iterable<Document> documents) {
+
+			Map<String, Object> targetMap = new LinkedHashMap<>();
+			List<Document> collected = documents instanceof List<Document> list ? list : Streamable.of(documents).toList();
+
+			for (Entry<Object, Document> filterMapping : filterOrderMap.entrySet()) {
+
+				Optional<Document> first = collected.stream()
+						.filter(it -> it.entrySet().containsAll(filterMapping.getValue().entrySet())).findFirst();
+
+				targetMap.put(filterMapping.getKey().toString(), first.orElse(null));
+			}
+			return Collections.singleton(new Document(targetMap));
+		}
+	}
+
+	/**
+	 * {@link DocumentReferenceQuery} implementation to retrieve linked {@link Document documents} stored inside a
+	 * {@link Collection} like structure. Restores the original order by matching individual query documents against the
+	 * actual values.
+	 */
+	static class ListDocumentReferenceQuery implements DocumentReferenceQuery {
+
+		private final Document query;
+		private final Document sort;
+
+		public ListDocumentReferenceQuery(Document query, Document sort) {
+
+			this.query = query;
+			this.sort = sort;
+		}
+
+		@Override
+		public Iterable<Document> restoreOrder(Iterable<Document> documents) {
+
+			List<Document> target = documents instanceof List<Document> list ? list : Streamable.of(documents).toList();
+
+			if (!sort.isEmpty() || !query.containsKey("$or")) {
+				return target;
+			}
+
+			List<Document> ors = query.get("$or", List.class);
+			return target.stream().sorted((o1, o2) -> compareAgainstReferenceIndex(ors, o1, o2)).collect(Collectors.toList());
+		}
+
+		@Override
+		public Document getQuery() {
+			return query;
+		}
+
+		@Override
+		public Document getSort() {
+			return sort;
+		}
+
+		int compareAgainstReferenceIndex(List<Document> referenceList, Document document1, Document document2) {
+
+			for (Document document : referenceList) {
+
+				Set<Entry<String, Object>> entries = document.entrySet();
+				if (document1.entrySet().containsAll(entries)) {
+					return -1;
+				}
+				if (document2.entrySet().containsAll(entries)) {
+					return 1;
+				}
+			}
+			return referenceList.size();
+		}
+	}
+
+	/**
+	 * The function that can execute a given {@link DocumentReferenceQuery} within the {@link ReferenceCollection} to
+	 * obtain raw results.
+	 */
+	@FunctionalInterface
+	interface LookupFunction {
+
+		/**
+		 * @param referenceQuery never {@literal null}.
+		 * @param referenceCollection never {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		Iterable<Document> apply(DocumentReferenceQuery referenceQuery, ReferenceCollection referenceCollection);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceResolver.java
new file mode 100644
index 0000000000..0698b08bf8
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ReferenceResolver.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.util.Assert;
+
+import com.mongodb.DBRef;
+
+/**
+ * The {@link ReferenceResolver} allows to load and convert linked entities.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+@FunctionalInterface
+public interface ReferenceResolver {
+
+	/**
+	 * Resolve the association defined via the given property from a given source value. May return a
+	 * {@link LazyLoadingProxy proxy instance} in case of a lazy loading association. The resolved value is assignable to
+	 * {@link PersistentProperty#getType()}.
+	 *
+	 * @param property the association defining property.
+	 * @param source the association source value.
+	 * @param referenceLookupDelegate the lookup executing component.
+	 * @param entityReader conversion function capable of constructing entities from raw source.
+	 * @return can be {@literal null}.
+	 */
+	@Nullable
+	Object resolveReference(MongoPersistentProperty property, Object source,
+			ReferenceLookupDelegate referenceLookupDelegate, MongoEntityReader entityReader);
+
+	/**
+	 * {@link ReferenceCollection} is a value object that contains information about the target database and collection
+	 * name of an association.
+	 */
+	class ReferenceCollection {
+
+		private final @Nullable String database;
+		private final String collection;
+
+		/**
+		 * @param database can be {@literal null} to indicate the configured default
+		 *          {@link MongoDatabaseFactory#getMongoDatabase() database} should be used.
+		 * @param collection the target collection name. Must not be {@literal null}.
+		 */
+		public ReferenceCollection(@Nullable String database, String collection) {
+
+			Assert.hasText(collection, "Collection must not be empty or null");
+
+			this.database = database;
+			this.collection = collection;
+		}
+
+		/**
+		 * Create a new instance of {@link ReferenceCollection} from the given {@link DBRef}.
+		 *
+		 * @param dbRef must not be {@literal null}.
+		 * @return new instance of {@link ReferenceCollection}.
+		 */
+		public static ReferenceCollection fromDBRef(DBRef dbRef) {
+			return new ReferenceCollection(dbRef.getDatabaseName(), dbRef.getCollectionName());
+		}
+
+		/**
+		 * Get the target collection name.
+		 *
+		 * @return never {@literal null}.
+		 */
+		public String getCollection() {
+			return collection;
+		}
+
+		/**
+		 * Get the target database name. If {@literal null} the default database should be used.
+		 *
+		 * @return can be {@literal null}.
+		 */
+		public @Nullable String getDatabase() {
+			return database;
+		}
+	}
+
+	/**
+	 * Domain type conversion callback interface that allows to read the {@code source} object into a mapped object.
+	 */
+	@FunctionalInterface
+	interface MongoEntityReader {
+
+		/**
+		 * Read values from the given source into an object defined via the given {@link TypeInformation}.
+		 *
+		 * @param source never {@literal null}.
+		 * @param typeInformation information about the desired target type.
+		 * @return never {@literal null}.
+		 */
+		Object read(Object source, TypeInformation<?> typeInformation);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java
index 964fbcff8c..bff72427f7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,25 +15,30 @@
  */
 package org.springframework.data.mongodb.core.convert;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map.Entry;
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.PropertyValueConverter;
+import org.springframework.data.convert.ValueConversionContext;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext.WriteOperatorContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update.Modifier;
 import org.springframework.data.mongodb.core.query.Update.Modifiers;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
+import org.springframework.util.ObjectUtils;
 
 /**
  * A subclass of {@link QueryMapper} that retains type information on the mongo types.
@@ -58,10 +63,6 @@ public UpdateMapper(MongoConverter converter) {
 		this.converter = converter;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#getMappedObject(Bson, MongoPersistentEntity)
-	 */
 	@Override
 	public Document getMappedObject(Bson query, @Nullable MongoPersistentEntity<?> entity) {
 
@@ -131,17 +132,19 @@ public static boolean isUpdateObject(@Nullable Document updateObj) {
 	 *      org.springframework.data.mongodb.core.mapping.MongoPersistentEntity)
 	 */
 	@Override
-	protected Object delegateConvertToMongoType(Object source, @Nullable MongoPersistentEntity<?> entity) {
+	protected @Nullable Object delegateConvertToMongoType(Object source, @Nullable MongoPersistentEntity<?> entity) {
+
+		if (entity != null && entity.isUnwrapped()) {
+			return converter.convertToMongoType(source, entity);
+		}
+
 		return converter.convertToMongoType(source,
-				entity == null ? ClassTypeInformation.OBJECT : getTypeHintForEntity(source, entity));
+				entity == null ? TypeInformation.OBJECT : getTypeHintForEntity(source, entity));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#getMappedObjectForField(org.springframework.data.mongodb.core.convert.QueryMapper.Field, java.lang.Object)
-	 */
 	@Override
-	protected Entry<String, Object> getMappedObjectForField(Field field, Object rawValue) {
+	@SuppressWarnings("NullAway")
+	protected Entry<String, @Nullable Object> getMappedObjectForField(Field field, @Nullable Object rawValue) {
 
 		if (isDocument(rawValue)) {
 
@@ -161,33 +164,36 @@ protected Entry<String, Object> getMappedObjectForField(Field field, Object rawV
 		return super.getMappedObjectForField(field, rawValue);
 	}
 
+	protected @Nullable Object convertValueWithConversionContext(Field documentField, @Nullable Object sourceValue, @Nullable Object value,
+		PropertyValueConverter<Object, Object, ValueConversionContext<MongoPersistentProperty>> valueConverter,
+		MongoConversionContext conversionContext) {
+
+		return super.convertValueWithConversionContext(documentField, sourceValue, value, valueConverter, conversionContext.forOperator(new WriteOperatorContext(documentField.name)));
+	}
+
 	private Entry<String, Object> getMappedUpdateModifier(Field field, Object rawValue) {
-		Object value = null;
+		Object value;
 
-		if (rawValue instanceof Modifier) {
+		if (rawValue instanceof Modifier modifier) {
 
-			value = getMappedValue(field, (Modifier) rawValue);
+			value = getMappedValue(field, modifier);
 
-		} else if (rawValue instanceof Modifiers) {
+		} else if (rawValue instanceof Modifiers modifiers) {
 
 			Document modificationOperations = new Document();
 
-			for (Modifier modifier : ((Modifiers) rawValue).getModifiers()) {
+			for (Modifier modifier : modifiers.getModifiers()) {
 				modificationOperations.putAll(getMappedValue(field, modifier));
 			}
 
 			value = modificationOperations;
 		} else {
-			throw new IllegalArgumentException(String.format("Unable to map value of type '%s'!", rawValue.getClass()));
+			throw new IllegalArgumentException(String.format("Unable to map value of type '%s'", rawValue.getClass()));
 		}
 
 		return createMapEntry(field, value);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#isAssociationConversionNecessary(org.springframework.data.mongodb.core.convert.QueryMapper.Field, java.lang.Object)
-	 */
 	@Override
 	protected boolean isAssociationConversionNecessary(Field documentField, @Nullable Object value) {
 		return super.isAssociationConversionNecessary(documentField, value) || documentField.containsAssociation();
@@ -201,11 +207,12 @@ private boolean isQuery(@Nullable Object value) {
 		return value instanceof Query;
 	}
 
-	private Document getMappedValue(@Nullable Field field, Modifier modifier) {
+	private @Nullable Document getMappedValue(@Nullable Field field, Modifier modifier) {
 		return new Document(modifier.getKey(), getMappedModifier(field, modifier));
 	}
 
-	private Object getMappedModifier(@Nullable Field field, Modifier modifier) {
+	@SuppressWarnings("NullAway")
+	private @Nullable Object getMappedModifier(@Nullable Field field, Modifier modifier) {
 
 		Object value = modifier.getValue();
 
@@ -216,15 +223,25 @@ private Object getMappedModifier(@Nullable Field field, Modifier modifier) {
 					: getMappedSort(sortObject, field.getPropertyEntity());
 		}
 
-		TypeInformation<?> typeHint = field == null ? ClassTypeInformation.OBJECT : field.getTypeHint();
+		if (field != null && isAssociationConversionNecessary(field, value)) {
+			if (ObjectUtils.isArray(value) || value instanceof Collection) {
+				List<Object> targetPointers = new ArrayList<>();
+				for (Object val : converter.getConversionService().convert(value, List.class)) {
+					targetPointers.add(getMappedValue(field, val));
+				}
+				return targetPointers;
+			}
+			return super.getMappedValue(field, value);
+		}
 
+		TypeInformation<?> typeHint = field == null ? TypeInformation.OBJECT : field.getTypeHint();
 		return converter.convertToMongoType(value, typeHint);
 	}
 
 	private TypeInformation<?> getTypeHintForEntity(@Nullable Object source, MongoPersistentEntity<?> entity) {
 
 		TypeInformation<?> info = entity.getTypeInformation();
-		Class<?> type = info.getActualType().getType();
+		Class<?> type = info.getRequiredActualType().getType();
 
 		if (source == null || type.isInterface() || java.lang.reflect.Modifier.isAbstract(type.getModifiers())) {
 			return info;
@@ -241,12 +258,8 @@ private TypeInformation<?> getTypeHintForEntity(@Nullable Object source, MongoPe
 		return NESTED_DOCUMENT;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.convert.QueryMapper#createPropertyField(org.springframework.data.mongodb.core.mapping.MongoPersistentEntity, java.lang.String, org.springframework.data.mapping.context.MappingContext)
-	 */
 	@Override
-	protected Field createPropertyField(MongoPersistentEntity<?> entity, String key,
+	protected Field createPropertyField(@Nullable MongoPersistentEntity<?> entity, String key,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
 		return entity == null ? super.createPropertyField(entity, key, mappingContext)
@@ -272,6 +285,7 @@ private static Document getSortObject(Sort sort) {
 	 *
 	 * @author Thomas Darimont
 	 * @author Oliver Gierke
+	 * @author Christoph Strobl
 	 */
 	private static class MetadataBackedUpdateField extends MetadataBackedField {
 
@@ -289,35 +303,24 @@ private static class MetadataBackedUpdateField extends MetadataBackedField {
 		public MetadataBackedUpdateField(MongoPersistentEntity<?> entity, String key,
 				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
-			super(key.replaceAll("\\.\\$(\\[.*\\])?", ""), entity, mappingContext);
+			super(key, entity, mappingContext);
 			this.key = key;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getMappedKey()
-		 */
 		@Override
 		public String getMappedKey() {
 			return this.getPath() == null ? key : super.getMappedKey();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getPropertyConverter()
-		 */
 		@Override
 		protected Converter<MongoPersistentProperty, String> getPropertyConverter() {
-			return new PositionParameterRetainingPropertyKeyConverter(key);
+			return new PositionParameterRetainingPropertyKeyConverter(key, getMappingContext());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.convert.QueryMapper.MetadataBackedField#getAssociationConverter()
-		 */
 		@Override
+		@SuppressWarnings("NullAway")
 		protected Converter<MongoPersistentProperty, String> getAssociationConverter() {
-			return new UpdateAssociationConverter(getAssociation(), key);
+			return new UpdateAssociationConverter(getMappingContext(), getAssociation(), key);
 		}
 
 		/**
@@ -334,18 +337,16 @@ protected static class UpdateAssociationConverter extends AssociationConverter {
 			 *
 			 * @param association must not be {@literal null}.
 			 */
-			public UpdateAssociationConverter(Association<MongoPersistentProperty> association, String key) {
+			public UpdateAssociationConverter(
+					MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+					Association<MongoPersistentProperty> association, String key) {
 
-				super(association);
-				this.mapper = new KeyMapper(key);
+				super(key, association);
+				this.mapper = new KeyMapper(key, mappingContext);
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-			 */
 			@Override
-			public String convert(MongoPersistentProperty source) {
+			public @Nullable String convert(MongoPersistentProperty source) {
 				return super.convert(source) == null ? null : mapper.mapPropertyName(source);
 			}
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ValueResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ValueResolver.java
index 669e7b18fd..8eed053a09 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ValueResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/ValueResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.springframework.data.mapping.model.SpELExpressionEvaluator;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
 /**
@@ -25,19 +26,20 @@
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 interface ValueResolver {
 
 	/**
 	 * Resolves the value for the given {@link MongoPersistentProperty} within the given {@link Document} using the given
-	 * {@link SpELExpressionEvaluator} and {@link ObjectPath}.
+	 * {@link ValueExpressionEvaluator} and {@link ObjectPath}.
 	 *
 	 * @param prop
 	 * @param bson
 	 * @param evaluator
-	 * @param parent
+	 * @param path
 	 * @return
 	 */
-	Object getValueInternal(MongoPersistentProperty prop, Bson bson, SpELExpressionEvaluator evaluator,
-			ObjectPath path);
+	@Nullable
+	Object getValueInternal(MongoPersistentProperty prop, Bson bson, ValueExpressionEvaluator evaluator, ObjectPath path);
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/EncryptingConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/EncryptingConverter.java
new file mode 100644
index 0000000000..b31d8a2b7c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/EncryptingConverter.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2023-2025 the original author 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.convert.encryption;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext;
+import org.springframework.data.mongodb.core.convert.MongoValueConverter;
+import org.springframework.data.mongodb.core.encryption.EncryptionContext;
+
+/**
+ * A specialized {@link MongoValueConverter} for {@literal encrypting} and {@literal decrypting} properties.
+ *
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+public interface EncryptingConverter<S, T> extends MongoValueConverter<S, T> {
+
+	@Override
+	default @Nullable S read(Object value, MongoConversionContext context) {
+		return decrypt(value, buildEncryptionContext(context));
+	}
+
+	/**
+	 * Decrypt the given encrypted source value within the given {@link EncryptionContext context}.
+	 *
+	 * @param encryptedValue the encrypted source.
+	 * @param context the context to operate in.
+	 * @return never {@literal null}.
+	 */
+	@Nullable S decrypt(Object encryptedValue, EncryptionContext context);
+
+	@Override
+	default @Nullable T write(Object value, MongoConversionContext context) {
+		return encrypt(value, buildEncryptionContext(context));
+	}
+
+	/**
+	 * Encrypt the given raw source value within the given {@link EncryptionContext context}.
+	 *
+	 * @param value the encrypted source.
+	 * @param context the context to operate in.
+	 * @return never {@literal null}.
+	 */
+	T encrypt(@Nullable Object value, EncryptionContext context);
+
+	/**
+	 * Obtain the {@link EncryptionContext} for a given {@link MongoConversionContext value conversion context}.
+	 *
+	 * @param context the current MongoDB specific {@link org.springframework.data.convert.ValueConversionContext}.
+	 * @return the {@link EncryptionContext} to operate in.
+	 * @see org.springframework.data.convert.ValueConversionContext
+	 */
+	EncryptionContext buildEncryptionContext(MongoConversionContext context);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/ExplicitEncryptionContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/ExplicitEncryptionContext.java
new file mode 100644
index 0000000000..0431cf11dd
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/ExplicitEncryptionContext.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023-2025 the original author 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.convert.encryption;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext.OperatorContext;
+import org.springframework.data.mongodb.core.encryption.EncryptionContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.expression.EvaluationContext;
+
+/**
+ * Default {@link EncryptionContext} implementation.
+ * 
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.1
+ */
+class ExplicitEncryptionContext implements EncryptionContext {
+
+	private final MongoConversionContext conversionContext;
+
+	public ExplicitEncryptionContext(MongoConversionContext conversionContext) {
+		this.conversionContext = conversionContext;
+	}
+
+	@Override
+	public MongoPersistentProperty getProperty() {
+		return conversionContext.getProperty();
+	}
+
+	@Override
+	public @Nullable Object lookupValue(String path) {
+		return conversionContext.getValue(path);
+	}
+
+	@Override
+	public @Nullable Object convertToMongoType(Object value) {
+		return conversionContext.write(value);
+	}
+
+	@Override
+	public EvaluationContext getEvaluationContext(@Nullable Object source) {
+
+		if(conversionContext.getSpELContext() != null) {
+			return conversionContext.getSpELContext().getEvaluationContext(source);
+		}
+
+		throw new IllegalStateException("SpEL context not present");
+	}
+
+	@Override
+	public <T> @Nullable T read(@Nullable Object value, TypeInformation<T> target) {
+		return conversionContext.read(value, target);
+	}
+
+	@Override
+	public <T> @Nullable T write(@Nullable Object value, TypeInformation<T> target) {
+		return conversionContext.write(value, target);
+	}
+
+	@Override
+	@Nullable
+	public OperatorContext getOperatorContext() {
+		return conversionContext.getOperatorContext();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/MongoEncryptionConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/MongoEncryptionConverter.java
new file mode 100644
index 0000000000..ecab645fe5
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/MongoEncryptionConverter.java
@@ -0,0 +1,317 @@
+/*
+ * Copyright 2023-2025 the original author 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.convert.encryption;
+
+import static java.util.Arrays.*;
+import static java.util.Collections.*;
+import static org.springframework.data.mongodb.core.encryption.EncryptionOptions.*;
+
+import java.util.Collection;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.bson.types.Binary;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.core.CollectionFactory;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext.OperatorContext;
+import org.springframework.data.mongodb.core.encryption.Encryption;
+import org.springframework.data.mongodb.core.encryption.EncryptionContext;
+import org.springframework.data.mongodb.core.encryption.EncryptionKey;
+import org.springframework.data.mongodb.core.encryption.EncryptionKeyResolver;
+import org.springframework.data.mongodb.core.encryption.EncryptionOptions;
+import org.springframework.data.mongodb.core.mapping.Encrypted;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.mapping.Queryable;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Default implementation of {@link EncryptingConverter}. Properties used with this converter must be annotated with
+ * {@link Encrypted @Encrypted} to provide key and algorithm metadata.
+ *
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.1
+ */
+public class MongoEncryptionConverter implements EncryptingConverter<Object, Object> {
+
+	private static final Log LOGGER = LogFactory.getLog(MongoEncryptionConverter.class);
+	private static final List<String> RANGE_OPERATORS = asList("$gt", "$gte", "$lt", "$lte");
+	public static final String AND_OPERATOR = "$and";
+
+	private final Encryption<BsonValue, BsonBinary> encryption;
+	private final EncryptionKeyResolver keyResolver;
+
+	public MongoEncryptionConverter(Encryption<BsonValue, BsonBinary> encryption, EncryptionKeyResolver keyResolver) {
+
+		this.encryption = encryption;
+		this.keyResolver = keyResolver;
+	}
+
+	@Override
+	public @Nullable Object read(Object value, MongoConversionContext context) {
+
+		Object decrypted = EncryptingConverter.super.read(value, context);
+		return decrypted instanceof BsonValue bsonValue ? BsonUtils.toJavaType(bsonValue) : decrypted;
+	}
+
+	@Override
+	public @Nullable Object decrypt(Object encryptedValue, EncryptionContext context) {
+
+		Object decryptedValue = encryptedValue;
+		if (encryptedValue instanceof Binary || encryptedValue instanceof BsonBinary) {
+
+			if (LOGGER.isDebugEnabled()) {
+				LOGGER.debug(String.format("Decrypting %s.%s.", getProperty(context).getOwner().getName(),
+						getProperty(context).getName()));
+			}
+
+			decryptedValue = encryption.decrypt((BsonBinary) BsonUtils.simpleToBsonValue(encryptedValue));
+
+			// in case the driver has auto decryption (aka .bypassAutoEncryption(true)) active
+			// https://github.com/mongodb/mongo-java-driver/blob/master/driver-sync/src/examples/tour/ClientSideEncryptionExplicitEncryptionOnlyTour.java
+			if (encryptedValue == decryptedValue) {
+				return decryptedValue;
+			}
+		}
+
+		MongoPersistentProperty persistentProperty = getProperty(context);
+		if (getProperty(context).isCollectionLike() && decryptedValue instanceof Iterable<?> iterable) {
+
+			int size = iterable instanceof Collection<?> c ? c.size() : 10;
+
+			if (!persistentProperty.isEntity()) {
+				Collection<Object> collection = CollectionFactory.createCollection(persistentProperty.getType(), size);
+				iterable.forEach(it -> {
+					if (it instanceof BsonValue bsonValue) {
+						collection.add(BsonUtils.toJavaType(bsonValue));
+					} else {
+						collection.add(context.read(it, persistentProperty.getActualType()));
+					}
+				});
+
+				return collection;
+			} else {
+				Collection<Object> collection = CollectionFactory.createCollection(persistentProperty.getType(), size);
+				iterable.forEach(it -> {
+					if (it instanceof BsonValue bsonValue) {
+						collection.add(context.read(BsonUtils.toJavaType(bsonValue), persistentProperty.getActualType()));
+					} else {
+						collection.add(context.read(it, persistentProperty.getActualType()));
+					}
+				});
+				return collection;
+			}
+		}
+
+		if (!persistentProperty.isEntity() && persistentProperty.isMap()) {
+			if (persistentProperty.getType() != Document.class) {
+				if (decryptedValue instanceof BsonValue bsonValue) {
+					return new LinkedHashMap<>((Document) BsonUtils.toJavaType(bsonValue));
+				}
+				if (decryptedValue instanceof Document document) {
+					return new LinkedHashMap<>(document);
+				}
+				if (decryptedValue instanceof Map map) {
+					return map;
+				}
+			}
+		}
+
+		if (persistentProperty.isEntity() && decryptedValue instanceof BsonDocument bsonDocument) {
+			return context.read(BsonUtils.toJavaType(bsonDocument), persistentProperty.getTypeInformation().getType());
+		}
+
+		if (persistentProperty.isEntity() && decryptedValue instanceof Document document) {
+			return context.read(document, persistentProperty.getTypeInformation().getType());
+		}
+
+		return decryptedValue;
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	public Object encrypt(@Nullable Object value, EncryptionContext context) {
+
+		if (LOGGER.isDebugEnabled()) {
+			LOGGER.debug(String.format("Encrypting %s.%s.", getProperty(context).getOwner().getName(),
+					getProperty(context).getName()));
+		}
+
+		MongoPersistentProperty persistentProperty = getProperty(context);
+
+		Encrypted annotation = persistentProperty.findAnnotation(Encrypted.class);
+		if (annotation == null) {
+			annotation = persistentProperty.getOwner().findAnnotation(Encrypted.class);
+		}
+
+		if (annotation == null) {
+			throw new IllegalStateException(String.format("Property %s.%s is not annotated with @Encrypted",
+					persistentProperty.getOwner().getName(), persistentProperty.getName()));
+		}
+
+		String algorithm = annotation.algorithm();
+		EncryptionKey key = keyResolver.getKey(context);
+		OperatorContext operatorContext = context.getOperatorContext();
+
+		EncryptionOptions encryptionOptions = new EncryptionOptions(algorithm, key,
+				getEQOptions(persistentProperty, operatorContext));
+
+		if (operatorContext != null && !operatorContext.isWriteOperation() && encryptionOptions.queryableEncryptionOptions() != null
+				&& !encryptionOptions.queryableEncryptionOptions().getQueryType().equals("equality")) {
+			return encryptExpression(operatorContext, value, encryptionOptions);
+		} else {
+			return encryptValue(value, context, persistentProperty, encryptionOptions);
+		}
+	}
+
+	private static @Nullable QueryableEncryptionOptions getEQOptions(MongoPersistentProperty persistentProperty,
+			@Nullable OperatorContext operatorContext) {
+
+		Queryable queryableAnnotation = persistentProperty.findAnnotation(Queryable.class);
+		if (queryableAnnotation == null || !StringUtils.hasText(queryableAnnotation.queryType())) {
+			return null;
+		}
+
+		QueryableEncryptionOptions queryableEncryptionOptions = QueryableEncryptionOptions.none();
+
+		String queryAttributes = queryableAnnotation.queryAttributes();
+		if (!queryAttributes.isEmpty()) {
+			queryableEncryptionOptions = queryableEncryptionOptions.attributes(Document.parse(queryAttributes));
+		}
+
+		if (queryableAnnotation.contentionFactor() >= 0) {
+			queryableEncryptionOptions = queryableEncryptionOptions.contentionFactor(queryableAnnotation.contentionFactor());
+		}
+
+		boolean isPartOfARangeQuery = operatorContext != null && !operatorContext.isWriteOperation();
+		if (isPartOfARangeQuery) {
+			queryableEncryptionOptions = queryableEncryptionOptions.queryType(queryableAnnotation.queryType());
+		}
+		return queryableEncryptionOptions;
+	}
+
+	private BsonBinary encryptValue(Object value, EncryptionContext context, MongoPersistentProperty persistentProperty,
+			EncryptionOptions encryptionOptions) {
+
+		if (!persistentProperty.isEntity()) {
+
+			if (persistentProperty.isCollectionLike()) {
+				return encryption.encrypt(collectionLikeToBsonValue(value, persistentProperty, context), encryptionOptions);
+			}
+			if (persistentProperty.isMap()) {
+				Object convertedMap = context.write(value);
+				if (convertedMap instanceof Document document) {
+					return encryption.encrypt(document.toBsonDocument(), encryptionOptions);
+				}
+			}
+			return encryption.encrypt(BsonUtils.simpleToBsonValue(value), encryptionOptions);
+		}
+
+		if (persistentProperty.isCollectionLike()) {
+			return encryption.encrypt(collectionLikeToBsonValue(value, persistentProperty, context), encryptionOptions);
+		}
+
+		Object write = context.write(value);
+		if (write instanceof Document doc) {
+			return encryption.encrypt(doc.toBsonDocument(), encryptionOptions);
+		}
+		return encryption.encrypt(BsonUtils.simpleToBsonValue(write), encryptionOptions);
+	}
+
+	/**
+	 * Encrypts a range query expression.
+	 * <p>
+	 * The mongodb-crypt {@code encryptExpression} has strict formatting requirements so this method ensures these
+	 * requirements are met and then picks out and returns just the value for use with a range query.
+	 *
+	 * @param operatorContext field name and query operator.
+	 * @param value the value of the expression to be encrypted.
+	 * @param encryptionOptions the options.
+	 * @return the encrypted range value for use in a range query.
+	 */
+	private BsonValue encryptExpression(OperatorContext operatorContext, Object value,
+			EncryptionOptions encryptionOptions) {
+
+		BsonValue doc = BsonUtils.simpleToBsonValue(value);
+
+		String fieldName = operatorContext.path();
+		String queryOperator = operatorContext.operator();
+
+		if (!RANGE_OPERATORS.contains(queryOperator)) {
+			throw new AssertionError(String.format("Not a valid range query. Querying a range encrypted field but the "
+					+ "query operator '%s' for field path '%s' is not a range query.", queryOperator, fieldName));
+		}
+
+		BsonDocument encryptExpression = new BsonDocument(AND_OPERATOR,
+				new BsonArray(singletonList(new BsonDocument(fieldName, new BsonDocument(queryOperator, doc)))));
+
+		BsonDocument result = encryption.encryptExpression(encryptExpression, encryptionOptions);
+		return result.getArray(AND_OPERATOR).get(0).asDocument().getDocument(fieldName).getBinary(queryOperator);
+	}
+
+	private BsonValue collectionLikeToBsonValue(Object value, MongoPersistentProperty property,
+			EncryptionContext context) {
+
+		BsonArray bsonArray = new BsonArray();
+		boolean isEntity = property.isEntity();
+
+		if (value instanceof Collection<?> values) {
+			values.forEach(it -> {
+
+				if (isEntity) {
+					Document document = (Document) context.write(it, property.getTypeInformation());
+					bsonArray.add(document == null ? null : document.toBsonDocument());
+				} else {
+					bsonArray.add(BsonUtils.simpleToBsonValue(it));
+				}
+			});
+		} else if (ObjectUtils.isArray(value)) {
+
+			for (Object o : ObjectUtils.toObjectArray(value)) {
+
+				if (isEntity) {
+					Document document = (Document) context.write(o, property.getTypeInformation());
+					bsonArray.add(document == null ? null : document.toBsonDocument());
+				} else {
+					bsonArray.add(BsonUtils.simpleToBsonValue(o));
+				}
+			}
+		}
+
+		return bsonArray;
+	}
+
+	@Override
+	public EncryptionContext buildEncryptionContext(MongoConversionContext context) {
+		return new ExplicitEncryptionContext(context);
+	}
+
+	protected MongoPersistentProperty getProperty(EncryptionContext context) {
+		return context.getProperty();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/package-info.java
new file mode 100644
index 0000000000..a0e8ea27f7
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/encryption/package-info.java
@@ -0,0 +1,7 @@
+/**
+ * Converters integrating with
+ * <a href="https://www.mongodb.com/docs/manual/core/csfle/fundamentals/manual-encryption/">explicit encryption
+ * mechanism of Client-Side Field Level Encryption</a>.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.mongodb.core.convert.encryption;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java
index cfa07fa8f9..dbef5cbb90 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Spring Data MongoDB specific converter infrastructure.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.convert;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/Encryption.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/Encryption.java
new file mode 100644
index 0000000000..a80a72ed1f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/Encryption.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.bson.BsonDocument;
+
+/**
+ * Component responsible for encrypting and decrypting values.
+ *
+ * @param <P> plaintext type.
+ * @param <C> ciphertext type.
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.1
+ */
+public interface Encryption<P, C> {
+
+	/**
+	 * Encrypt the given value.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @param options must not be {@literal null}.
+	 * @return the encrypted value.
+	 */
+	C encrypt(P value, EncryptionOptions options);
+
+	/**
+	 * Decrypt the given value.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @return the decrypted value.
+	 */
+	P decrypt(C value);
+
+	/**
+	 * Encrypt the given expression.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @param options must not be {@literal null}.
+	 * @return the encrypted expression.
+	 * @since 4.5.0
+	 */
+	default BsonDocument encryptExpression(BsonDocument value, EncryptionOptions options) {
+		throw new UnsupportedOperationException("Unsupported encryption method");
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionContext.java
new file mode 100644
index 0000000000..45e83ed7ca
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionContext.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext.OperatorContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.expression.EvaluationContext;
+
+/**
+ * Context to encapsulate encryption for a specific {@link MongoPersistentProperty}.
+ *
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.1
+ */
+public interface EncryptionContext {
+
+	/**
+	 * Returns the {@link MongoPersistentProperty} to be handled.
+	 *
+	 * @return will never be {@literal null}.
+	 */
+	MongoPersistentProperty getProperty();
+
+	/**
+	 * Shortcut for converting a given {@literal value} into its store representation using the root
+	 * {@code ValueConversionContext}.
+	 *
+	 * @param value
+	 * @return
+	 */
+	@Nullable Object convertToMongoType(Object value);
+
+	/**
+	 * Reads the value as an instance of the {@link PersistentProperty#getTypeInformation() property type}.
+	 *
+	 * @param value {@link Object value} to be read; can be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws IllegalStateException if value cannot be read as an instance of {@link Class type}.
+	 */
+	default <T> @Nullable T read(@Nullable Object value) {
+		return (T) read(value, getProperty().getTypeInformation());
+	}
+
+	/**
+	 * Reads the value as an instance of {@link Class type}.
+	 *
+	 * @param value {@link Object value} to be read; can be {@literal null}.
+	 * @param target {@link Class type} of value to be read; must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws IllegalStateException if value cannot be read as an instance of {@link Class type}.
+	 */
+	default <T> @Nullable T read(@Nullable Object value, Class<T> target) {
+		return read(value, TypeInformation.of(target));
+	}
+
+	/**
+	 * Reads the value as an instance of {@link TypeInformation type}.
+	 *
+	 * @param value {@link Object value} to be read; can be {@literal null}.
+	 * @param target {@link TypeInformation type} of value to be read; must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws IllegalStateException if value cannot be read as an instance of {@link Class type}.
+	 */
+	<T> @Nullable T read(@Nullable Object value, TypeInformation<T> target);
+
+	/**
+	 * Write the value as an instance of the {@link PersistentProperty#getTypeInformation() property type}.
+	 *
+	 * @param value {@link Object value} to write; can be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws IllegalStateException if value cannot be written as an instance of the
+	 *           {@link PersistentProperty#getTypeInformation() property type}.
+	 * @see PersistentProperty#getTypeInformation()
+	 * @see #write(Object, TypeInformation)
+	 */
+	default <T> @Nullable T write(@Nullable Object value) {
+		return (T) write(value, getProperty().getTypeInformation());
+	}
+
+	/**
+	 * Write the value as an instance of {@link Class type}.
+	 *
+	 * @param value {@link Object value} to write; can be {@literal null}.
+	 * @param target {@link Class type} of value to be written; must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws IllegalStateException if value cannot be written as an instance of {@link Class type}.
+	 */
+	default <T> @Nullable T write(@Nullable Object value, Class<T> target) {
+		return write(value, TypeInformation.of(target));
+	}
+
+	/**
+	 * Write the value as an instance of given {@link TypeInformation type}.
+	 *
+	 * @param value {@link Object value} to write; can be {@literal null}.
+	 * @param target {@link TypeInformation type} of value to be written; must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @throws IllegalStateException if value cannot be written as an instance of {@link Class type}.
+	 */
+	<T> @Nullable T write(@Nullable Object value, TypeInformation<T> target);
+
+	/**
+	 * Lookup the value for a given path within the current context.
+	 *
+	 * @param path the path/property name to resolve the current value for.
+	 * @return can be {@literal null}.
+	 */
+	@Nullable
+	Object lookupValue(String path);
+
+	EvaluationContext getEvaluationContext(@Nullable Object source);
+
+	/**
+	 * The field name and field query operator
+	 *
+	 * @return can be {@literal null}.
+	 */
+	@Nullable
+	default OperatorContext getOperatorContext() {
+		return null;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionKey.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionKey.java
new file mode 100644
index 0000000000..d908a5ae26
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionKey.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.bson.BsonBinary;
+import org.springframework.util.Assert;
+
+/**
+ * The {@link EncryptionKey} represents a {@literal Data Encryption Key} reference that can be either direct via the
+ * {@link KeyId key id} or its {@link KeyAltName Key Alternative Name}.
+ *
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+public interface EncryptionKey {
+
+	/**
+	 * Create a new {@link EncryptionKey} that uses the keys id for reference.
+	 *
+	 * @param key must not be {@literal null}.
+	 * @return new instance of {@link EncryptionKey KeyId}.
+	 */
+	static EncryptionKey keyId(BsonBinary key) {
+
+		Assert.notNull(key, "KeyId must not be null");
+
+		return new KeyId(key);
+	}
+
+	/**
+	 * Create a new {@link EncryptionKey} that uses an {@literal Key Alternative Name} for reference.
+	 *
+	 * @param keyAltName must not be {@literal null} or empty.
+	 * @return new instance of {@link EncryptionKey KeyAltName}.
+	 */
+	static EncryptionKey keyAltName(String keyAltName) {
+
+		Assert.hasText(keyAltName, "Key Alternative Name must not be empty");
+
+		return new KeyAltName(keyAltName);
+	}
+
+	/**
+	 * @return the value that allows to reference a specific key.
+	 */
+	Object value();
+
+	/**
+	 * @return the {@link Type} of reference.
+	 */
+	Type type();
+
+	/**
+	 * The key reference type.
+	 */
+	enum Type {
+
+		/**
+		 * Key referenced via its {@literal id}.
+		 */
+		ID,
+
+		/**
+		 * Key referenced via an {@literal Key Alternative Name}.
+		 */
+		ALT
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyResolver.java
new file mode 100644
index 0000000000..a7ae7e3f3e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyResolver.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.bson.BsonBinary;
+import org.bson.types.Binary;
+import org.springframework.data.mongodb.core.mapping.Encrypted;
+import org.springframework.data.mongodb.core.mapping.ExplicitEncrypted;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.mongodb.util.encryption.EncryptionUtils;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+/**
+ * Interface to obtain a {@link EncryptionKey Data Encryption Key} that is valid in a given {@link EncryptionContext
+ * context}.
+ * <p>
+ * Use the {@link #annotated(EncryptionKeyResolver) based} variant which will first try to resolve a potential
+ * {@link ExplicitEncrypted#keyAltName() Key Alternate Name} from annotations before calling the fallback resolver.
+ *
+ * @author Christoph Strobl
+ * @since 4.1
+ * @see EncryptionKey
+ */
+@FunctionalInterface
+public interface EncryptionKeyResolver {
+
+	/**
+	 * Get the {@link EncryptionKey Data Encryption Key}.
+	 *
+	 * @param encryptionContext the current {@link EncryptionContext context}.
+	 * @return never {@literal null}.
+	 */
+	EncryptionKey getKey(EncryptionContext encryptionContext);
+
+	/**
+	 * Obtain an {@link EncryptionKeyResolver} that evaluates {@link ExplicitEncrypted#keyAltName()} and only calls the
+	 * fallback {@link EncryptionKeyResolver resolver} if no {@literal Key Alternate Name} is present.
+	 *
+	 * @param fallback must not be {@literal null}.
+	 * @return new instance of {@link EncryptionKeyResolver}.
+	 */
+	static EncryptionKeyResolver annotated(EncryptionKeyResolver fallback) {
+
+		Assert.notNull(fallback, "Fallback EncryptionKeyResolver must not be nul");
+
+		return ((encryptionContext) -> {
+
+			MongoPersistentProperty property = encryptionContext.getProperty();
+			ExplicitEncrypted annotation = property.findAnnotation(ExplicitEncrypted.class);
+			if (annotation == null || !StringUtils.hasText(annotation.keyAltName())) {
+
+				Encrypted encrypted = property.getOwner().findAnnotation(Encrypted.class);
+				if (encrypted == null) {
+					return fallback.getKey(encryptionContext);
+				}
+
+				Object o = EncryptionUtils.resolveKeyId(encrypted.keyId()[0],
+						() -> encryptionContext.getEvaluationContext(new Object()));
+				if (o instanceof BsonBinary binary) {
+					return EncryptionKey.keyId(binary);
+				}
+				if (o instanceof Binary binary) {
+					return EncryptionKey.keyId((BsonBinary) BsonUtils.simpleToBsonValue(binary));
+				}
+				if (o instanceof String string) {
+					return EncryptionKey.keyAltName(string);
+				}
+
+				throw new IllegalStateException(String.format("Cannot determine encryption key for %s.%s using key type %s",
+						property.getOwner().getName(), property.getName(), o == null ? "null" : o.getClass().getName()));
+			}
+
+			String keyAltName = annotation.keyAltName();
+			if (keyAltName.startsWith("/")) {
+				Object fieldValue = encryptionContext.lookupValue(keyAltName.replace("/", ""));
+				if (fieldValue == null) {
+					throw new IllegalStateException(String.format("Key Alternative Name for %s was null", keyAltName));
+				}
+				return new KeyAltName(fieldValue.toString());
+			} else {
+				return new KeyAltName(keyAltName);
+			}
+		});
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java
new file mode 100644
index 0000000000..7a3e8a2c76
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/EncryptionOptions.java
@@ -0,0 +1,235 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import java.util.Map;
+import java.util.Objects;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Options used to provide additional information when {@link Encryption encrypting} values. like the
+ * {@link #algorithm()} to be used.
+ * 
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.1
+ */
+public class EncryptionOptions {
+
+	private final String algorithm;
+	private final EncryptionKey key;
+	private final @Nullable QueryableEncryptionOptions queryableEncryptionOptions;
+
+	public EncryptionOptions(String algorithm, EncryptionKey key) {
+		this(algorithm, key, null);
+	}
+
+	public EncryptionOptions(String algorithm, EncryptionKey key,
+			@Nullable QueryableEncryptionOptions queryableEncryptionOptions) {
+
+		Assert.hasText(algorithm, "Algorithm must not be empty");
+		Assert.notNull(key, "EncryptionKey must not be empty");
+		Assert.notNull(key, "QueryableEncryptionOptions must not be empty");
+
+		this.key = key;
+		this.algorithm = algorithm;
+		this.queryableEncryptionOptions = queryableEncryptionOptions;
+	}
+
+	public EncryptionKey key() {
+		return key;
+	}
+
+	public String algorithm() {
+		return algorithm;
+	}
+
+	/**
+	 * @return {@literal null} if not set.
+	 * @since 4.5
+	 */
+	public @Nullable QueryableEncryptionOptions queryableEncryptionOptions() {
+		return queryableEncryptionOptions;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		EncryptionOptions that = (EncryptionOptions) o;
+
+		if (!ObjectUtils.nullSafeEquals(algorithm, that.algorithm)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(key, that.key)) {
+			return false;
+		}
+
+		return ObjectUtils.nullSafeEquals(queryableEncryptionOptions, that.queryableEncryptionOptions);
+	}
+
+	@Override
+	public int hashCode() {
+
+		int result = ObjectUtils.nullSafeHashCode(algorithm);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(key);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(queryableEncryptionOptions);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "EncryptionOptions{" + "algorithm='" + algorithm + '\'' + ", key=" + key + ", queryableEncryptionOptions='"
+				+ queryableEncryptionOptions + "'}";
+	}
+
+	/**
+	 * Options, like the {@link #getQueryType()}, to apply when encrypting queryable values.
+	 *
+	 * @author Ross Lawley
+	 * @author Christoph Strobl
+	 * @since 4.5
+	 */
+	public static class QueryableEncryptionOptions {
+
+		private static final QueryableEncryptionOptions NONE = new QueryableEncryptionOptions(null, null, Map.of());
+
+		private final @Nullable String queryType;
+		private final @Nullable Long contentionFactor;
+		private final Map<String, Object> attributes;
+
+		private QueryableEncryptionOptions(@Nullable String queryType, @Nullable Long contentionFactor,
+				Map<String, Object> attributes) {
+
+			this.queryType = queryType;
+			this.contentionFactor = contentionFactor;
+			this.attributes = attributes;
+		}
+
+		/**
+		 * Create an empty {@link QueryableEncryptionOptions}.
+		 *
+		 * @return unmodifiable {@link QueryableEncryptionOptions} instance.
+		 */
+		public static QueryableEncryptionOptions none() {
+			return NONE;
+		}
+
+		/**
+		 * Define the {@code queryType} to be used for queryable document encryption.
+		 *
+		 * @param queryType can be {@literal null}.
+		 * @return new instance of {@link QueryableEncryptionOptions}.
+		 */
+		public QueryableEncryptionOptions queryType(@Nullable String queryType) {
+			return new QueryableEncryptionOptions(queryType, contentionFactor, attributes);
+		}
+
+		/**
+		 * Define the {@code contentionFactor} to be used for queryable document encryption.
+		 *
+		 * @param contentionFactor can be {@literal null}.
+		 * @return new instance of {@link QueryableEncryptionOptions}.
+		 */
+		public QueryableEncryptionOptions contentionFactor(@Nullable Long contentionFactor) {
+			return new QueryableEncryptionOptions(queryType, contentionFactor, attributes);
+		}
+
+		/**
+		 * Define the {@code rangeOptions} to be used for queryable document encryption.
+		 *
+		 * @param attributes can be {@literal null}.
+		 * @return new instance of {@link QueryableEncryptionOptions}.
+		 */
+		public QueryableEncryptionOptions attributes(Map<String, Object> attributes) {
+			return new QueryableEncryptionOptions(queryType, contentionFactor, attributes);
+		}
+
+		/**
+		 * Get the {@code queryType} to apply.
+		 *
+		 * @return {@literal null} if not set.
+		 */
+		public @Nullable String getQueryType() {
+			return queryType;
+		}
+
+		/**
+		 * Get the {@code contentionFactor} to apply.
+		 *
+		 * @return {@literal null} if not set.
+		 */
+		public @Nullable Long getContentionFactor() {
+			return contentionFactor;
+		}
+
+		/**
+		 * Get the {@code rangeOptions} to apply.
+		 *
+		 * @return never {@literal null}.
+		 */
+		public Map<String, Object> getAttributes() {
+			return Map.copyOf(attributes);
+		}
+
+		/**
+		 * @return {@literal true} if no arguments set.
+		 */
+		boolean isEmpty() {
+			return getQueryType() == null && getContentionFactor() == null && getAttributes().isEmpty();
+		}
+
+		@Override
+		public String toString() {
+			return "QueryableEncryptionOptions{" + "queryType='" + queryType + '\'' + ", contentionFactor=" + contentionFactor
+					+ ", attributes=" + attributes + '}';
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			QueryableEncryptionOptions that = (QueryableEncryptionOptions) o;
+
+			if (!ObjectUtils.nullSafeEquals(queryType, that.queryType)) {
+				return false;
+			}
+
+			if (!ObjectUtils.nullSafeEquals(contentionFactor, that.contentionFactor)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(attributes, that.attributes);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(queryType, contentionFactor, attributes);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/KeyAltName.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/KeyAltName.java
new file mode 100644
index 0000000000..3f6afc4a8c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/KeyAltName.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.springframework.util.ObjectUtils;
+
+record KeyAltName(String value) implements EncryptionKey {
+
+	@Override
+	public Type type() {
+		return Type.ALT;
+	}
+
+	@Override
+	public String toString() {
+
+		if (value().length() <= 3) {
+			return "KeyAltName('***')";
+		}
+		return String.format("KeyAltName('%s***')", value.substring(0, 3));
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		KeyAltName that = (KeyAltName) o;
+		return ObjectUtils.nullSafeEquals(value, that.value);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(value);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/KeyId.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/KeyId.java
new file mode 100644
index 0000000000..b09a67bb0a
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/KeyId.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.springframework.util.ObjectUtils;
+
+record KeyId(BsonBinary value) implements EncryptionKey {
+
+	@Override
+	public Type type() {
+		return Type.ID;
+	}
+
+	@Override
+	public String toString() {
+
+		if (BsonBinarySubType.isUuid(value.getType())) {
+			String representation = value.asUuid().toString();
+			if (representation.length() > 6) {
+				return String.format("KeyId('%s***')", representation.substring(0, 6));
+			}
+		}
+		return "KeyId('***')";
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+
+		org.springframework.data.mongodb.core.encryption.KeyId that = (org.springframework.data.mongodb.core.encryption.KeyId) o;
+		return ObjectUtils.nullSafeEquals(value, that.value);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(value);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/MongoClientEncryption.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/MongoClientEncryption.java
new file mode 100644
index 0000000000..aee5dd7f8b
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/MongoClientEncryption.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import java.util.Map;
+import java.util.function.Supplier;
+
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.springframework.data.mongodb.core.encryption.EncryptionKey.Type;
+import org.springframework.data.mongodb.core.encryption.EncryptionOptions.QueryableEncryptionOptions;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.util.Assert;
+
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.client.model.vault.RangeOptions;
+import com.mongodb.client.vault.ClientEncryption;
+
+/**
+ * {@link ClientEncryption} based {@link Encryption} implementation.
+ *
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.1
+ */
+public class MongoClientEncryption implements Encryption<BsonValue, BsonBinary> {
+
+	private final Supplier<ClientEncryption> source;
+
+	MongoClientEncryption(Supplier<ClientEncryption> source) {
+		this.source = source;
+	}
+
+	/**
+	 * Create a new {@link MongoClientEncryption} instance for the given {@link ClientEncryption}.
+	 *
+	 * @param clientEncryption must not be {@literal null}.
+	 * @return new instance of {@link MongoClientEncryption}.
+	 */
+	public static MongoClientEncryption just(ClientEncryption clientEncryption) {
+
+		Assert.notNull(clientEncryption, "ClientEncryption must not be null");
+
+		return new MongoClientEncryption(() -> clientEncryption);
+	}
+
+	@Override
+	public BsonValue decrypt(BsonBinary value) {
+		return getClientEncryption().decrypt(value);
+	}
+
+	@Override
+	public BsonBinary encrypt(BsonValue value, EncryptionOptions options) {
+		return getClientEncryption().encrypt(value, createEncryptOptions(options));
+	}
+
+	@Override
+	public BsonDocument encryptExpression(BsonDocument value, EncryptionOptions options) {
+		return getClientEncryption().encryptExpression(value, createEncryptOptions(options));
+	}
+
+	public ClientEncryption getClientEncryption() {
+		return source.get();
+	}
+
+	private EncryptOptions createEncryptOptions(EncryptionOptions options) {
+
+		EncryptOptions encryptOptions = new EncryptOptions(options.algorithm());
+
+		if (Type.ALT.equals(options.key().type())) {
+			encryptOptions = encryptOptions.keyAltName(options.key().value().toString());
+		} else {
+			encryptOptions = encryptOptions.keyId((BsonBinary) options.key().value());
+		}
+
+		if (options.queryableEncryptionOptions() == null) {
+			return encryptOptions;
+		}
+
+		QueryableEncryptionOptions qeOptions = options.queryableEncryptionOptions();
+		if (qeOptions.getQueryType() != null) {
+			encryptOptions.queryType(qeOptions.getQueryType());
+		}
+		if (qeOptions.getContentionFactor() != null) {
+			encryptOptions.contentionFactor(qeOptions.getContentionFactor());
+		}
+		if (!qeOptions.getAttributes().isEmpty()) {
+			encryptOptions.rangeOptions(rangeOptions(qeOptions.getAttributes()));
+		}
+		return encryptOptions;
+	}
+
+	protected RangeOptions rangeOptions(Map<String, Object> attributes) {
+
+		RangeOptions encryptionRangeOptions = new RangeOptions();
+		if (attributes.isEmpty()) {
+			return encryptionRangeOptions;
+		}
+
+		if (attributes.containsKey("min")) {
+			encryptionRangeOptions.min(BsonUtils.simpleToBsonValue(attributes.get("min")));
+		}
+		if (attributes.containsKey("max")) {
+			encryptionRangeOptions.max(BsonUtils.simpleToBsonValue(attributes.get("max")));
+		}
+		if (attributes.containsKey("trimFactor")) {
+			Object trimFactor = attributes.get("trimFactor");
+			Assert.isInstanceOf(Integer.class, trimFactor, () -> String
+					.format("Expected to find a %s but it turned out to be %s.", Integer.class, trimFactor.getClass()));
+
+			encryptionRangeOptions.trimFactor((Integer) trimFactor);
+		}
+
+		if (attributes.containsKey("sparsity")) {
+			Object sparsity = attributes.get("sparsity");
+			Assert.isInstanceOf(Number.class, sparsity,
+					() -> String.format("Expected to find a %s but it turned out to be %s.", Long.class, sparsity.getClass()));
+			encryptionRangeOptions.sparsity(((Number) sparsity).longValue());
+		}
+
+		if (attributes.containsKey("precision")) {
+			Object precision = attributes.get("precision");
+			Assert.isInstanceOf(Number.class, precision, () -> String
+					.format("Expected to find a %s but it turned out to be %s.", Integer.class, precision.getClass()));
+			encryptionRangeOptions.precision(((Number) precision).intValue());
+		}
+		return encryptionRangeOptions;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/package-info.java
new file mode 100644
index 0000000000..90a3ab8720
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/encryption/package-info.java
@@ -0,0 +1,6 @@
+/**
+ * Infrastructure for <a href="https://www.mongodb.com/docs/manual/core/csfle/fundamentals/manual-encryption/">explicit
+ * encryption mechanism of Client-Side Field Level Encryption</a>.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.mongodb.core.encryption;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJson.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJson.java
index 4dd16aead9..88d3d46c48 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJson.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.core.geo;
 
 /**
- * Interface definition for structures defined in GeoJSON ({@link https://geojson.org/}) format.
+ * Interface definition for structures defined in <a href="https://geojson.org/">GeoJSON</a> format.
  *
  * @author Christoph Strobl
  * @since 1.7
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java
index 34f6dacb62..74f36e3198 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonGeometryCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,6 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -38,59 +39,41 @@ public class GeoJsonGeometryCollection implements GeoJson<Iterable<GeoJson<?>>>
 	/**
 	 * Creates a new {@link GeoJsonGeometryCollection} for the given {@link GeoJson} instances.
 	 *
-	 * @param geometries
+	 * @param geometries must not be {@literal null}.
 	 */
 	public GeoJsonGeometryCollection(List<GeoJson<?>> geometries) {
 
-		Assert.notNull(geometries, "Geometries must not be null!");
+		Assert.notNull(geometries, "Geometries must not be null");
 
 		this.geometries.addAll(geometries);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getType()
-	 */
 	@Override
 	public String getType() {
 		return TYPE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates()
-	 */
 	@Override
 	public Iterable<GeoJson<?>> getCoordinates() {
 		return Collections.unmodifiableList(this.geometries);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return ObjectUtils.nullSafeHashCode(this.geometries);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof GeoJsonGeometryCollection)) {
+		if (!(obj instanceof GeoJsonGeometryCollection other)) {
 			return false;
 		}
 
-		GeoJsonGeometryCollection other = (GeoJsonGeometryCollection) obj;
-
 		return ObjectUtils.nullSafeEquals(this.geometries, other.geometries);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java
index 5c39c6ad9a..942138fc76 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonLineString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,6 @@ public GeoJsonLineString(Point first, Point second, Point... others) {
 		super(first, second, others);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJsonMultiPoint#getType()
-	 */
 	@Override
 	public String getType() {
 		return TYPE;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java
index 514b056a02..5c458329ab 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,11 +20,12 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.geo.Point;
-import org.springframework.lang.Nullable;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
@@ -34,7 +35,10 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 
 /**
- * A Jackson {@link Module} to register custom {@link JsonSerializer} and {@link JsonDeserializer}s for GeoJSON types.
+ * A Jackson {@link Module} to register custom {@link JsonDeserializer}s for GeoJSON types.
+ * <br />
+ * Use {@link #geoJsonModule()} to obtain a {@link Module} containing both {@link JsonSerializer serializers} and
+ * {@link JsonDeserializer deserializers}.
  *
  * @author Christoph Strobl
  * @author Oliver Gierke
@@ -47,12 +51,87 @@ public class GeoJsonModule extends SimpleModule {
 
 	public GeoJsonModule() {
 
-		addDeserializer(GeoJsonPoint.class, new GeoJsonPointDeserializer());
-		addDeserializer(GeoJsonMultiPoint.class, new GeoJsonMultiPointDeserializer());
-		addDeserializer(GeoJsonLineString.class, new GeoJsonLineStringDeserializer());
-		addDeserializer(GeoJsonMultiLineString.class, new GeoJsonMultiLineStringDeserializer());
-		addDeserializer(GeoJsonPolygon.class, new GeoJsonPolygonDeserializer());
-		addDeserializer(GeoJsonMultiPolygon.class, new GeoJsonMultiPolygonDeserializer());
+		registerDeserializersIn(this);
+		// TODO: add serializers as of next major version (4.0).
+	}
+
+	/**
+	 * Obtain a {@link Module} containing {@link JsonDeserializer deserializers} for the following {@link GeoJson} types:
+	 * <ul>
+	 * <li>{@link GeoJsonPoint}</li>
+	 * <li>{@link GeoJsonMultiPoint}</li>
+	 * <li>{@link GeoJsonLineString}</li>
+	 * <li>{@link GeoJsonMultiLineString}</li>
+	 * <li>{@link GeoJsonPolygon}</li>
+	 * <li>{@link GeoJsonMultiPolygon}</li>
+	 * </ul>
+	 *
+	 * @return a {@link Module} containing {@link JsonDeserializer deserializers} for {@link GeoJson} types.
+	 * @since 3.2
+	 */
+	public static Module deserializers() {
+
+		SimpleModule module = new SimpleModule("Spring Data MongoDB GeoJson - Deserializers",
+				new Version(3, 2, 0, null, "org.springframework.data", "spring-data-mongodb-geojson"));
+		registerDeserializersIn(module);
+		return module;
+	}
+
+	/**
+	 * Obtain a {@link Module} containing {@link JsonSerializer serializers} for the following {@link GeoJson} types:
+	 * <ul>
+	 * <li>{@link GeoJsonPoint}</li>
+	 * <li>{@link GeoJsonMultiPoint}</li>
+	 * <li>{@link GeoJsonLineString}</li>
+	 * <li>{@link GeoJsonMultiLineString}</li>
+	 * <li>{@link GeoJsonPolygon}</li>
+	 * <li>{@link GeoJsonMultiPolygon}</li>
+	 * </ul>
+	 *
+	 * @return a {@link Module} containing {@link JsonSerializer serializers} for {@link GeoJson} types.
+	 * @since 3.2
+	 */
+	public static Module serializers() {
+
+		SimpleModule module = new SimpleModule("Spring Data MongoDB GeoJson - Serializers",
+				new Version(3, 2, 0, null, "org.springframework.data", "spring-data-mongodb-geojson"));
+		GeoJsonSerializersModule.registerSerializersIn(module);
+		return module;
+	}
+
+	/**
+	 * Obtain a {@link Module} containing {@link JsonSerializer serializers} and {@link JsonDeserializer deserializers}
+	 * for the following {@link GeoJson} types:
+	 * <ul>
+	 * <li>{@link GeoJsonPoint}</li>
+	 * <li>{@link GeoJsonMultiPoint}</li>
+	 * <li>{@link GeoJsonLineString}</li>
+	 * <li>{@link GeoJsonMultiLineString}</li>
+	 * <li>{@link GeoJsonPolygon}</li>
+	 * <li>{@link GeoJsonMultiPolygon}</li>
+	 * </ul>
+	 *
+	 * @return a {@link Module} containing {@link JsonSerializer serializers} and {@link JsonDeserializer deserializers}
+	 *         for {@link GeoJson} types.
+	 * @since 3.2
+	 */
+	public static Module geoJsonModule() {
+
+		SimpleModule module = new SimpleModule("Spring Data MongoDB GeoJson",
+				new Version(3, 2, 0, null, "org.springframework.data", "spring-data-mongodb-geojson"));
+		GeoJsonSerializersModule.registerSerializersIn(module);
+		registerDeserializersIn(module);
+		return module;
+	}
+
+	private static void registerDeserializersIn(SimpleModule module) {
+
+		module.addDeserializer(GeoJsonPoint.class, new GeoJsonPointDeserializer());
+		module.addDeserializer(GeoJsonMultiPoint.class, new GeoJsonMultiPointDeserializer());
+		module.addDeserializer(GeoJsonLineString.class, new GeoJsonLineStringDeserializer());
+		module.addDeserializer(GeoJsonMultiLineString.class, new GeoJsonMultiLineStringDeserializer());
+		module.addDeserializer(GeoJsonPolygon.class, new GeoJsonPolygonDeserializer());
+		module.addDeserializer(GeoJsonMultiPolygon.class, new GeoJsonMultiPolygonDeserializer());
 	}
 
 	/**
@@ -61,14 +140,8 @@ public GeoJsonModule() {
 	 */
 	private static abstract class GeoJsonDeserializer<T extends GeoJson<?>> extends JsonDeserializer<T> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see com.fasterxml.jackson.databind.JsonDeserializer#deserialize(com.fasterxml.jackson.core.JsonParser, com.fasterxml.jackson.databind.DeserializationContext)
-		 */
-		@Nullable
 		@Override
-		public T deserialize(@Nullable JsonParser jp, @Nullable DeserializationContext ctxt)
-				throws IOException, JsonProcessingException {
+		public @Nullable T deserialize(JsonParser jp, @Nullable DeserializationContext ctxt) throws IOException {
 
 			JsonNode node = jp.readValueAsTree();
 			JsonNode coordinates = node.get("coordinates");
@@ -85,18 +158,16 @@ public T deserialize(@Nullable JsonParser jp, @Nullable DeserializationContext c
 		 * @param coordinates
 		 * @return
 		 */
-		@Nullable
-		protected abstract T doDeserialize(ArrayNode coordinates);
+		protected abstract @Nullable T doDeserialize(ArrayNode coordinates);
 
 		/**
 		 * Get the {@link GeoJsonPoint} representation of given {@link ArrayNode} assuming {@code node.[0]} represents
 		 * {@literal x - coordinate} and {@code node.[1]} is {@literal y}.
 		 *
 		 * @param node can be {@literal null}.
-		 * @return {@literal null} when given a {@code null} value.
+		 * @return {@literal null} when given a {@literal null} value.
 		 */
-		@Nullable
-		protected GeoJsonPoint toGeoJsonPoint(@Nullable ArrayNode node) {
+		protected @Nullable GeoJsonPoint toGeoJsonPoint(@Nullable ArrayNode node) {
 
 			if (node == null) {
 				return null;
@@ -110,10 +181,9 @@ protected GeoJsonPoint toGeoJsonPoint(@Nullable ArrayNode node) {
 		 * {@literal x - coordinate} and {@code node.[1]} is {@literal y}.
 		 *
 		 * @param node can be {@literal null}.
-		 * @return {@literal null} when given a {@code null} value.
+		 * @return {@literal null} when given a {@literal null} value.
 		 */
-		@Nullable
-		protected Point toPoint(@Nullable ArrayNode node) {
+		protected @Nullable Point toPoint(@Nullable ArrayNode node) {
 
 			if (node == null) {
 				return null;
@@ -126,7 +196,7 @@ protected Point toPoint(@Nullable ArrayNode node) {
 		 * Get the points nested within given {@link ArrayNode}.
 		 *
 		 * @param node can be {@literal null}.
-		 * @return {@literal empty list} when given a {@code null} value.
+		 * @return {@literal empty list} when given a {@literal null} value.
 		 */
 		protected List<Point> toPoints(@Nullable ArrayNode node) {
 
@@ -134,7 +204,7 @@ protected List<Point> toPoints(@Nullable ArrayNode node) {
 				return Collections.emptyList();
 			}
 
-			List<Point> points = new ArrayList<Point>(node.size());
+			List<Point> points = new ArrayList<>(node.size());
 
 			for (JsonNode coordinatePair : node) {
 				if (coordinatePair.isArray()) {
@@ -145,7 +215,7 @@ protected List<Point> toPoints(@Nullable ArrayNode node) {
 		}
 
 		protected GeoJsonLineString toLineString(ArrayNode node) {
-			return new GeoJsonLineString(toPoints((ArrayNode) node));
+			return new GeoJsonLineString(toPoints(node));
 		}
 	}
 
@@ -163,13 +233,8 @@ protected GeoJsonLineString toLineString(ArrayNode node) {
 	 */
 	private static class GeoJsonPointDeserializer extends GeoJsonDeserializer<GeoJsonPoint> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode)
-		 */
-		@Nullable
 		@Override
-		protected GeoJsonPoint doDeserialize(ArrayNode coordinates) {
+		protected @Nullable GeoJsonPoint doDeserialize(ArrayNode coordinates) {
 			return toGeoJsonPoint(coordinates);
 		}
 	}
@@ -193,10 +258,6 @@ protected GeoJsonPoint doDeserialize(ArrayNode coordinates) {
 	 */
 	private static class GeoJsonLineStringDeserializer extends GeoJsonDeserializer<GeoJsonLineString> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode)
-		 */
 		@Override
 		protected GeoJsonLineString doDeserialize(ArrayNode coordinates) {
 			return new GeoJsonLineString(toPoints(coordinates));
@@ -222,10 +283,6 @@ protected GeoJsonLineString doDeserialize(ArrayNode coordinates) {
 	 */
 	private static class GeoJsonMultiPointDeserializer extends GeoJsonDeserializer<GeoJsonMultiPoint> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode)
-		 */
 		@Override
 		protected GeoJsonMultiPoint doDeserialize(ArrayNode coordinates) {
 			return new GeoJsonMultiPoint(toPoints(coordinates));
@@ -252,14 +309,10 @@ protected GeoJsonMultiPoint doDeserialize(ArrayNode coordinates) {
 	 */
 	private static class GeoJsonMultiLineStringDeserializer extends GeoJsonDeserializer<GeoJsonMultiLineString> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode)
-		 */
 		@Override
 		protected GeoJsonMultiLineString doDeserialize(ArrayNode coordinates) {
 
-			List<GeoJsonLineString> lines = new ArrayList<GeoJsonLineString>(coordinates.size());
+			List<GeoJsonLineString> lines = new ArrayList<>(coordinates.size());
 
 			for (JsonNode lineString : coordinates) {
 				if (lineString.isArray()) {
@@ -290,10 +343,6 @@ protected GeoJsonMultiLineString doDeserialize(ArrayNode coordinates) {
 	 */
 	private static class GeoJsonPolygonDeserializer extends GeoJsonDeserializer<GeoJsonPolygon> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode)
-		 */
 		@Nullable
 		@Override
 		protected GeoJsonPolygon doDeserialize(ArrayNode coordinates) {
@@ -329,14 +378,10 @@ protected GeoJsonPolygon doDeserialize(ArrayNode coordinates) {
 	 */
 	private static class GeoJsonMultiPolygonDeserializer extends GeoJsonDeserializer<GeoJsonMultiPolygon> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.geo.GeoJsonModule.GeoJsonDeserializer#doDeserialize(com.fasterxml.jackson.databind.node.ArrayNode)
-		 */
 		@Override
 		protected GeoJsonMultiPolygon doDeserialize(ArrayNode coordinates) {
 
-			List<GeoJsonPolygon> polygones = new ArrayList<GeoJsonPolygon>(coordinates.size());
+			List<GeoJsonPolygon> polygones = new ArrayList<>(coordinates.size());
 
 			for (JsonNode polygon : coordinates) {
 				for (JsonNode ring : polygon) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java
index 2d6835c760..833a1dd9f6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiLineString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,6 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Point;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -43,7 +44,7 @@ public class GeoJsonMultiLineString implements GeoJson<Iterable<GeoJsonLineStrin
 	 */
 	public GeoJsonMultiLineString(List<Point>... lines) {
 
-		Assert.notEmpty(lines, "Points for MultiLineString must not be null!");
+		Assert.notEmpty(lines, "Points for MultiLineString must not be null");
 
 		for (List<Point> line : lines) {
 			this.coordinates.add(new GeoJsonLineString(line));
@@ -57,53 +58,37 @@ public GeoJsonMultiLineString(List<Point>... lines) {
 	 */
 	public GeoJsonMultiLineString(List<GeoJsonLineString> lines) {
 
-		Assert.notNull(lines, "Lines for MultiLineString must not be null!");
+		Assert.notNull(lines, "Lines for MultiLineString must not be null");
 
 		this.coordinates.addAll(lines);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getType()
-	 */
 	@Override
 	public String getType() {
 		return TYPE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates()
-	 */
 	@Override
 	public Iterable<GeoJsonLineString> getCoordinates() {
 		return Collections.unmodifiableList(this.coordinates);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return ObjectUtils.nullSafeHashCode(this.coordinates);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof GeoJsonMultiLineString)) {
+		if (!(obj instanceof GeoJsonMultiLineString other)) {
 			return false;
 		}
 
-		return ObjectUtils.nullSafeEquals(this.coordinates, ((GeoJsonMultiLineString) obj).coordinates);
+		return ObjectUtils.nullSafeEquals(this.coordinates, other.coordinates);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java
index b3db0bb2fe..e30ed5d6ed 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Point;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -28,6 +29,7 @@
  * {@link GeoJsonMultiPoint} is defined as list of {@link Point}s.
  *
  * @author Christoph Strobl
+ * @author Ivan Volzhev
  * @since 1.7
  * @see <a href="https://geojson.org/geojson-spec.html#multipoint">https://geojson.org/geojson-spec.html#multipoint</a>
  */
@@ -37,17 +39,31 @@ public class GeoJsonMultiPoint implements GeoJson<Iterable<Point>> {
 
 	private final List<Point> points;
 
+	/**
+	 * Creates a new {@link GeoJsonMultiPoint} for the given {@link Point}.
+	 *
+	 * @param point must not be {@literal null}.
+	 * @since 3.2.5
+	 */
+	public GeoJsonMultiPoint(Point point) {
+
+		Assert.notNull(point, "Point must not be null");
+
+		this.points = new ArrayList<>();
+		this.points.add(point);
+	}
+
 	/**
 	 * Creates a new {@link GeoJsonMultiPoint} for the given {@link Point}s.
 	 *
-	 * @param points points must not be {@literal null} and have at least 2 entries.
+	 * @param points points must not be {@literal null} and not empty
 	 */
 	public GeoJsonMultiPoint(List<Point> points) {
 
-		Assert.notNull(points, "Points must not be null.");
-		Assert.isTrue(points.size() >= 2, "Minimum of 2 Points required.");
+		Assert.notNull(points, "Points must not be null");
+		Assert.notEmpty(points, "Points must contain at least one point");
 
-		this.points = new ArrayList<Point>(points);
+		this.points = new ArrayList<>(points);
 	}
 
 	/**
@@ -59,58 +75,42 @@ public GeoJsonMultiPoint(List<Point> points) {
 	 */
 	public GeoJsonMultiPoint(Point first, Point second, Point... others) {
 
-		Assert.notNull(first, "First point must not be null!");
-		Assert.notNull(second, "Second point must not be null!");
-		Assert.notNull(others, "Additional points must not be null!");
+		Assert.notNull(first, "First point must not be null");
+		Assert.notNull(second, "Second point must not be null");
+		Assert.notNull(others, "Additional points must not be null");
 
-		this.points = new ArrayList<Point>();
+		this.points = new ArrayList<>();
 		this.points.add(first);
 		this.points.add(second);
 		this.points.addAll(Arrays.asList(others));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getType()
-	 */
 	@Override
 	public String getType() {
 		return TYPE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates()
-	 */
 	@Override
 	public List<Point> getCoordinates() {
 		return Collections.unmodifiableList(this.points);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return ObjectUtils.nullSafeHashCode(this.points);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof GeoJsonMultiPoint)) {
+		if (!(obj instanceof GeoJsonMultiPoint other)) {
 			return false;
 		}
 
-		return ObjectUtils.nullSafeEquals(this.points, ((GeoJsonMultiPoint) obj).points);
+		return ObjectUtils.nullSafeEquals(this.points, other.points);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java
index 30e6c73d7a..a7e6306b49 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonMultiPolygon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,6 +19,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -41,53 +42,37 @@ public class GeoJsonMultiPolygon implements GeoJson<Iterable<GeoJsonPolygon>> {
 	 */
 	public GeoJsonMultiPolygon(List<GeoJsonPolygon> polygons) {
 
-		Assert.notNull(polygons, "Polygons for MultiPolygon must not be null!");
+		Assert.notNull(polygons, "Polygons for MultiPolygon must not be null");
 
 		this.coordinates.addAll(polygons);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getType()
-	 */
 	@Override
 	public String getType() {
 		return TYPE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates()
-	 */
 	@Override
 	public List<GeoJsonPolygon> getCoordinates() {
 		return Collections.unmodifiableList(this.coordinates);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return ObjectUtils.nullSafeHashCode(this.coordinates);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof GeoJsonMultiPolygon)) {
+		if (!(obj instanceof GeoJsonMultiPolygon other)) {
 			return false;
 		}
 
-		return ObjectUtils.nullSafeEquals(this.coordinates, ((GeoJsonMultiPolygon) obj).coordinates);
+		return ObjectUtils.nullSafeEquals(this.coordinates, other.coordinates);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java
index fbd9f9d140..7bd4e1203c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,8 @@
 import org.springframework.data.geo.Point;
 
 /**
- * {@link GeoJson} representation of {@link Point}.
+ * {@link GeoJson} representation of {@link Point}. Uses {@link Point#getX()} as {@literal longitude} and
+ * {@link Point#getY()} as {@literal latitude}.
  *
  * @author Christoph Strobl
  * @since 1.7
@@ -36,8 +37,8 @@ public class GeoJsonPoint extends Point implements GeoJson<List<Double>> {
 	/**
 	 * Creates {@link GeoJsonPoint} for given coordinates.
 	 *
-	 * @param x
-	 * @param y
+	 * @param x longitude between {@literal -180} and {@literal 180} (inclusive).
+	 * @param y latitude between {@literal -90} and {@literal 90} (inclusive).
 	 */
 	public GeoJsonPoint(double x, double y) {
 		super(x, y);
@@ -45,6 +46,8 @@ public GeoJsonPoint(double x, double y) {
 
 	/**
 	 * Creates {@link GeoJsonPoint} for given {@link Point}.
+	 * <p>
+	 * {@link Point#getX()} translates to {@literal longitude}, {@link Point#getY()} to {@literal latitude}.
 	 *
 	 * @param point must not be {@literal null}.
 	 */
@@ -52,21 +55,18 @@ public GeoJsonPoint(Point point) {
 		super(point);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getType()
-	 */
 	@Override
 	public String getType() {
 		return TYPE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates()
+	/**
+	 * Obtain the coordinates (x/longitude, y/latitude) array.
+	 *
+	 * @return the coordinates putting {@link #getX() x/longitude} first, and {@link #getY() y/latitude} second.
 	 */
 	@Override
 	public List<Double> getCoordinates() {
-		return Arrays.asList(Double.valueOf(getX()), Double.valueOf(getY()));
+		return Arrays.asList(getX(), getY());
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java
index 6d97ac8a28..990be290cd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonPolygon.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,9 +21,12 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Polygon;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * {@link GeoJson} representation of {@link Polygon}. Unlike {@link Polygon} the {@link GeoJsonPolygon} requires a
@@ -76,6 +79,7 @@ public GeoJsonPolygon(List<Point> points) {
 	 * @return new {@link GeoJsonPolygon}.
 	 * @since 1.10
 	 */
+	@Contract("_, _, _, _, _ -> new")
 	public GeoJsonPolygon withInnerRing(Point first, Point second, Point third, Point fourth, Point... others) {
 		return withInnerRing(asList(first, second, third, fourth, others));
 	}
@@ -86,6 +90,7 @@ public GeoJsonPolygon withInnerRing(Point first, Point second, Point third, Poin
 	 * @param points must not be {@literal null}.
 	 * @return new {@link GeoJsonPolygon}.
 	 */
+	@Contract("_ -> new")
 	public GeoJsonPolygon withInnerRing(List<Point> points) {
 		return withInnerRing(new GeoJsonLineString(points));
 	}
@@ -97,9 +102,10 @@ public GeoJsonPolygon withInnerRing(List<Point> points) {
 	 * @return new {@link GeoJsonPolygon}.
 	 * @since 1.10
 	 */
+	@Contract("_ -> new")
 	public GeoJsonPolygon withInnerRing(GeoJsonLineString lineString) {
 
-		Assert.notNull(lineString, "LineString must not be null!");
+		Assert.notNull(lineString, "LineString must not be null");
 
 		Iterator<GeoJsonLineString> it = this.coordinates.iterator();
 		GeoJsonPolygon polygon = new GeoJsonPolygon(it.next().getCoordinates());
@@ -112,19 +118,11 @@ public GeoJsonPolygon withInnerRing(GeoJsonLineString lineString) {
 		return polygon;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getType()
-	 */
 	@Override
 	public String getType() {
 		return TYPE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.geo.GeoJson#getCoordinates()
-	 */
 	@Override
 	public List<GeoJsonLineString> getCoordinates() {
 		return Collections.unmodifiableList(this.coordinates);
@@ -142,4 +140,28 @@ private static List<Point> asList(Point first, Point second, Point third, Point
 
 		return result;
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		if (!super.equals(o)) {
+			return false;
+		}
+
+		GeoJsonPolygon that = (GeoJsonPolygon) o;
+
+		return ObjectUtils.nullSafeEquals(this.coordinates, that.coordinates);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = super.hashCode();
+		result = 31 * result + ObjectUtils.nullSafeHashCode(coordinates);
+		return result;
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersModule.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersModule.java
new file mode 100644
index 0000000000..5b80720da9
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersModule.java
@@ -0,0 +1,309 @@
+/*
+ * Copyright 2021-2025 the original author 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.geo;
+
+import java.io.IOException;
+
+import org.springframework.data.geo.Point;
+
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.Module;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
+/**
+ * A Jackson {@link Module} to register custom {@link JsonSerializer}s for GeoJSON types.
+ *
+ * @author Bjorn Harvold
+ * @author Christoph Strobl
+ * @since 3.2
+ */
+class GeoJsonSerializersModule extends SimpleModule {
+
+	private static final long serialVersionUID = 1340494654898895610L;
+
+	GeoJsonSerializersModule() {
+		registerSerializersIn(this);
+	}
+
+
+	static void registerSerializersIn(SimpleModule module) {
+
+		module.addSerializer(GeoJsonPoint.class, new GeoJsonPointSerializer());
+		module.addSerializer(GeoJsonMultiPoint.class, new GeoJsonMultiPointSerializer());
+		module.addSerializer(GeoJsonLineString.class, new GeoJsonLineStringSerializer());
+		module.addSerializer(GeoJsonMultiLineString.class, new GeoJsonMultiLineStringSerializer());
+		module.addSerializer(GeoJsonPolygon.class, new GeoJsonPolygonSerializer());
+		module.addSerializer(GeoJsonMultiPolygon.class, new GeoJsonMultiPolygonSerializer());
+	}
+
+	/**
+	 * @param <T>
+	 * @author Christoph Strobl
+	 */
+	private static abstract class GeoJsonSerializer<T extends GeoJson<? extends Iterable>> extends JsonSerializer<T> {
+
+		@Override
+		public void serialize(T shape, JsonGenerator jsonGenerator, SerializerProvider serializers) throws IOException {
+
+			jsonGenerator.writeStartObject();
+			jsonGenerator.writeStringField("type", shape.getType());
+			jsonGenerator.writeArrayFieldStart("coordinates");
+
+			doSerialize(shape, jsonGenerator);
+
+			jsonGenerator.writeEndArray();
+			jsonGenerator.writeEndObject();
+		}
+
+		/**
+		 * Perform the actual serialization given the {@literal shape} as {@link GeoJson}.
+		 *
+		 * @param shape
+		 * @param jsonGenerator
+		 * @return
+		 */
+		protected abstract void doSerialize(T shape, JsonGenerator jsonGenerator) throws IOException;
+
+		/**
+		 * Write a {@link Point} as array. <br />
+		 * {@code [10.0, 20.0]}
+		 *
+		 * @param point
+		 * @param jsonGenerator
+		 * @throws IOException
+		 */
+		protected void writePoint(Point point, JsonGenerator jsonGenerator) throws IOException {
+
+			jsonGenerator.writeStartArray();
+			writeRawCoordinates(point, jsonGenerator);
+			jsonGenerator.writeEndArray();
+		}
+
+		/**
+		 * Write the {@link Point} coordinates. <br />
+		 * {@code 10.0, 20.0}
+		 *
+		 * @param point
+		 * @param jsonGenerator
+		 * @throws IOException
+		 */
+		protected void writeRawCoordinates(Point point, JsonGenerator jsonGenerator) throws IOException {
+
+			jsonGenerator.writeNumber(point.getX());
+			jsonGenerator.writeNumber(point.getY());
+		}
+
+		/**
+		 * Write an {@link Iterable} of {@link Point} as array. <br />
+		 * {@code [ [10.0, 20.0], [30.0, 40.0], [50.0, 60.0] ]}
+		 *
+		 * @param points
+		 * @param jsonGenerator
+		 * @throws IOException
+		 */
+		protected void writeLine(Iterable<Point> points, JsonGenerator jsonGenerator) throws IOException {
+
+			jsonGenerator.writeStartArray();
+			writeRawLine(points, jsonGenerator);
+			jsonGenerator.writeEndArray();
+		}
+
+		/**
+		 * Write an {@link Iterable} of {@link Point}. <br />
+		 * {@code [10.0, 20.0], [30.0, 40.0], [50.0, 60.0]}
+		 *
+		 * @param points
+		 * @param jsonGenerator
+		 * @throws IOException
+		 */
+		protected void writeRawLine(Iterable<Point> points, JsonGenerator jsonGenerator) throws IOException {
+
+			for (Point point : points) {
+				writePoint(point, jsonGenerator);
+			}
+		}
+	}
+
+	/**
+	 * {@link JsonSerializer} converting {@link GeoJsonPoint} to:
+	 *
+	 * <pre>
+	 * <code>
+	 * { "type": "Point", "coordinates": [10.0, 20.0] }
+	 * </code>
+	 * </pre>
+	 *
+	 * @author Bjorn Harvold
+	 * @author Christoph Strobl
+	 * @since 3.2
+	 */
+	static class GeoJsonPointSerializer extends GeoJsonSerializer<GeoJsonPoint> {
+
+		@Override
+		protected void doSerialize(GeoJsonPoint value, JsonGenerator jsonGenerator) throws IOException {
+			writeRawCoordinates(value, jsonGenerator);
+		}
+	}
+
+	/**
+	 * {@link JsonSerializer} converting {@link GeoJsonLineString} to:
+	 *
+	 * <pre>
+	 * <code>
+	 * {
+	 *   "type": "LineString",
+	 *   "coordinates": [
+	 *     [10.0, 20.0], [30.0, 40.0], [50.0, 60.0]
+	 *   ]
+	 * }
+	 * </code>
+	 * </pre>
+	 *
+	 * @author Bjorn Harvold
+	 * @author Christoph Strobl
+	 * @since 3.2
+	 */
+	static class GeoJsonLineStringSerializer extends GeoJsonSerializer<GeoJsonLineString> {
+
+		@Override
+		protected void doSerialize(GeoJsonLineString value, JsonGenerator jsonGenerator) throws IOException {
+			writeRawLine(value.getCoordinates(), jsonGenerator);
+		}
+	}
+
+	/**
+	 * {@link JsonSerializer} converting {@link GeoJsonMultiPoint} to:
+	 *
+	 * <pre>
+	 * <code>
+	 * {
+	 *   "type": "MultiPoint",
+	 *   "coordinates": [
+	 *     [10.0, 20.0], [30.0, 40.0], [50.0, 60.0]
+	 *   ]
+	 * }
+	 * </code>
+	 * </pre>
+	 *
+	 * @author Bjorn Harvold
+	 * @author Christoph Strobl
+	 * @since 3.2
+	 */
+	static class GeoJsonMultiPointSerializer extends GeoJsonSerializer<GeoJsonMultiPoint> {
+
+		@Override
+		protected void doSerialize(GeoJsonMultiPoint value, JsonGenerator jsonGenerator) throws IOException {
+			writeRawLine(value.getCoordinates(), jsonGenerator);
+		}
+	}
+
+	/**
+	 * {@link JsonSerializer} converting {@link GeoJsonMultiLineString} to:
+	 *
+	 * <pre>
+	 * <code>
+	 * {
+	 *   "type": "MultiLineString",
+	 *   "coordinates": [
+	 *     [ [10.0, 20.0], [30.0, 40.0] ],
+	 *     [ [50.0, 60.0] , [70.0, 80.0] ]
+	 *   ]
+	 * }
+	 * </code>
+	 * </pre>
+	 *
+	 * @author Bjorn Harvold
+	 * @author Christoph Strobl
+	 * @since 3.2
+	 */
+	static class GeoJsonMultiLineStringSerializer extends GeoJsonSerializer<GeoJsonMultiLineString> {
+
+		@Override
+		protected void doSerialize(GeoJsonMultiLineString value, JsonGenerator jsonGenerator) throws IOException {
+
+			for (GeoJsonLineString lineString : value.getCoordinates()) {
+				writeLine(lineString.getCoordinates(), jsonGenerator);
+			}
+		}
+	}
+
+	/**
+	 * {@link JsonSerializer} converting {@link GeoJsonPolygon} to:
+	 *
+	 * <pre>
+	 * <code>
+	 * {
+	 *   "type": "Polygon",
+	 *   "coordinates": [
+	 *     [ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0] ]
+	 *   ]
+	 * }
+	 * </code>
+	 * </pre>
+	 *
+	 * @author Bjorn Harvold
+	 * @author Christoph Strobl
+	 * @since 3.2
+	 */
+	static class GeoJsonPolygonSerializer extends GeoJsonSerializer<GeoJsonPolygon> {
+
+		@Override
+		protected void doSerialize(GeoJsonPolygon value, JsonGenerator jsonGenerator) throws IOException {
+
+			for (GeoJsonLineString lineString : value.getCoordinates()) {
+				writeLine(lineString.getCoordinates(), jsonGenerator);
+			}
+		}
+	}
+
+	/**
+	 * {@link JsonSerializer} converting {@link GeoJsonMultiPolygon} to:
+	 *
+	 * <pre>
+	 * <code>
+	 * {
+	 *   "type": "MultiPolygon",
+	 *   "coordinates": [
+	 *     [[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],
+	 *     [[[100.0, 0.0], [101.0, 0.0], [101.0, 1.0], [100.0, 1.0], [100.0, 0.0]],
+	 *     [[100.2, 0.2], [100.8, 0.2], [100.8, 0.8], [100.2, 0.8], [100.2, 0.2]]]
+	 *   ]
+	 * }
+	 * </code>
+	 * </pre>
+	 *
+	 * @author Bjorn Harvold
+	 * @author Christoph Strobl
+	 * @since 3.2
+	 */
+	static class GeoJsonMultiPolygonSerializer extends GeoJsonSerializer<GeoJsonMultiPolygon> {
+
+		@Override
+		protected void doSerialize(GeoJsonMultiPolygon value, JsonGenerator jsonGenerator) throws IOException {
+
+			for (GeoJsonPolygon polygon : value.getCoordinates()) {
+
+				jsonGenerator.writeStartArray();
+				for (GeoJsonLineString lineString : polygon.getCoordinates()) {
+					writeLine(lineString.getCoordinates(), jsonGenerator);
+				}
+				jsonGenerator.writeEndArray();
+			}
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java
index 79ad5073c2..d3ca840d6b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/Sphere.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;
@@ -44,12 +45,12 @@ public class Sphere implements Shape {
 	 * @param center must not be {@literal null}.
 	 * @param radius must not be {@literal null}.
 	 */
-	@PersistenceConstructor
+	@PersistenceCreator
 	public Sphere(Point center, Distance radius) {
 
-		Assert.notNull(center, "Center point must not be null!");
-		Assert.notNull(radius, "Radius must not be null!");
-		Assert.isTrue(radius.getValue() >= 0, "Radius must not be negative!");
+		Assert.notNull(center, "Center point must not be null");
+		Assert.notNull(radius, "Radius must not be null");
+		Assert.isTrue(radius.getValue() >= 0, "Radius must not be negative");
 
 		this.center = center;
 		this.radius = radius;
@@ -58,17 +59,17 @@ public Sphere(Point center, Distance radius) {
 	/**
 	 * Creates a Sphere around the given center {@link Point} with the given radius.
 	 *
-	 * @param center
+	 * @param center must not be {@literal null}.
 	 * @param radius
 	 */
 	public Sphere(Point center, double radius) {
-		this(center, new Distance(radius));
+		this(center, Distance.of(radius));
 	}
 
 	/**
 	 * Creates a Sphere from the given {@link Circle}.
 	 *
-	 * @param circle
+	 * @param circle must not be {@literal null}.
 	 */
 	public Sphere(Circle circle) {
 		this(circle.getCenter(), circle.getRadius());
@@ -86,44 +87,31 @@ public Point getCenter() {
 	/**
 	 * Returns the radius of the {@link Circle}.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public Distance getRadius() {
 		return radius;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return String.format("Sphere [center=%s, radius=%s]", center, radius);
 	}
 
-	/* (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (obj == null || !(obj instanceof Sphere)) {
+		if (!(obj instanceof Sphere other)) {
 			return false;
 		}
 
-		Sphere that = (Sphere) obj;
-
-		return this.center.equals(that.center) && this.radius.equals(that.radius);
+		return this.center.equals(other.center) && this.radius.equals(other.radius);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		int result = 17;
@@ -136,7 +124,7 @@ public int hashCode() {
 	 * Returns the {@link Shape} as a list of usually {@link Double} or {@link List}s of {@link Double}s. Wildcard bound
 	 * to allow implementations to return a more concrete element type.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public List<? extends Object> asList() {
 		return Arrays.asList(Arrays.asList(center.getX(), center.getY()), this.radius.getValue());
@@ -145,7 +133,7 @@ public List<? extends Object> asList() {
 	/**
 	 * Returns the command to be used to create the {@literal $within} criterion.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public String getCommand() {
 		return COMMAND;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java
index 6cc77f832b..e5adfb26f4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/geo/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Support for MongoDB geo-spatial queries.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.geo;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndex.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndex.java
index c28549decf..05cf13f66b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndex.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,12 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.mongodb.core.annotation.Collation;
+import org.springframework.data.mongodb.core.mapping.Document;
+
 /**
- * Mark a class to use compound indexes.
- * <p />
+ * Mark a class to use compound indexes. <br />
  * <p>
  * <b>NOTE: This annotation is repeatable according to Java 8 conventions using {@link CompoundIndexes#value()} as
  * container.</b>
@@ -46,7 +49,10 @@
  * @author Philipp Schneider
  * @author Johno Crawford
  * @author Christoph Strobl
+ * @author Dave Perryman
+ * @author Stefan Tirea
  */
+@Collation
 @Target({ ElementType.TYPE })
 @Documented
 @Repeatable(CompoundIndexes.class)
@@ -74,44 +80,27 @@
 	 * }
 	 * </pre>
 	 *
-	 * @return
+	 * @return empty String by default.
 	 */
 	String def() default "";
 
 	/**
-	 * It does not actually make sense to use that attribute as the direction has to be defined in the {@link #def()}
-	 * attribute actually.
-	 *
-	 * @return
-	 */
-	@Deprecated
-	IndexDirection direction() default IndexDirection.ASCENDING;
-
-	/**
-	 * @return
+	 * @return {@literal false} by default.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/index-unique/">https://docs.mongodb.org/manual/core/index-unique/</a>
 	 */
 	boolean unique() default false;
 
 	/**
-	 * If set to true index will skip over any document that is missing the indexed field.
+	 * If set to true index will skip over any document that is missing the indexed field. <br />
+	 * Must not be used with {@link #partialFilter()}.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/index-sparse/">https://docs.mongodb.org/manual/core/index-sparse/</a>
 	 */
 	boolean sparse() default false;
 
-	/**
-	 * @return
-	 * @see <a href=
-	 *      "https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping">https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping</a>
-	 * @deprecated since 2.1. No longer supported by MongoDB as of server version 3.0.
-	 */
-	@Deprecated
-	boolean dropDups() default false;
-
 	/**
 	 * Index name of the index to be created either as plain value or as
 	 * {@link org.springframework.expression.spel.standard.SpelExpression template expression}. <br />
@@ -148,7 +137,7 @@
 	 * db.hybrid.createIndex( { h1: 1, h2: 1 } , { name: "compound_index" } )
 	 * </pre>
 	 *
-	 * @return
+	 * @return empty String by default.
 	 */
 	String name() default "";
 
@@ -156,7 +145,7 @@
 	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
 	 * to {@literal false}.
 	 *
-	 * @return
+	 * @return {@literal false} by default
 	 * @since 1.5
 	 */
 	boolean useGeneratedName() default false;
@@ -164,10 +153,36 @@
 	/**
 	 * If {@literal true} the index will be created in the background.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/indexes/#background-construction">https://docs.mongodb.org/manual/core/indexes/#background-construction</a>
 	 */
 	boolean background() default false;
 
+	/**
+	 * Only index the documents in a collection that meet a specified {@link IndexFilter filter expression}. <br />
+	 * Must not be used with {@link #sparse() sparse = true}.
+	 *
+	 * @return empty by default.
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/core/index-partial/">https://docs.mongodb.com/manual/core/index-partial/</a>
+	 * @since 3.1
+	 */
+	String partialFilter() default "";
+
+	/**
+	 * The actual collation definition in JSON format or a
+	 * {@link org.springframework.expression.spel.standard.SpelExpression template expression} resolving to either a JSON
+	 * String or a {@link org.bson.Document}. The keys of the JSON document are configuration options for the collation
+	 * (language-specific rules for string comparison) to be applied on string properties being part of the index.
+	 * <p>
+	 * <strong>NOTE:</strong> Overrides {@link Document#collation()}.
+	 *
+	 * @return empty String by default.
+	 * @see <a href=
+	 *      "https://www.mongodb.com/docs/manual/reference/collation/">https://www.mongodb.com/docs/manual/reference/collation/</a>
+	 * @since 4.0
+	 */
+	@AliasFor(annotation = Collation.class, attribute = "value")
+	String collation() default "";
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java
index f68a61d5ce..62f4495408 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,14 +35,10 @@ public class CompoundIndexDefinition extends Index {
 	 */
 	public CompoundIndexDefinition(Document keys) {
 
-		Assert.notNull(keys, "Keys must not be null!");
+		Assert.notNull(keys, "Keys must not be null");
 		this.keys = keys;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.Index#getIndexKeys()
-	 */
 	@Override
 	public Document getIndexKeys() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexes.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexes.java
index 1d57079cba..d9195969d9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexes.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/CompoundIndexes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/DefaultSearchIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/DefaultSearchIndexOperations.java
new file mode 100644
index 0000000000..b4b7b8430a
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/DefaultSearchIndexOperations.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bson.BsonString;
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.model.SearchIndexModel;
+import com.mongodb.client.model.SearchIndexType;
+
+/**
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class DefaultSearchIndexOperations implements SearchIndexOperations {
+
+	private final MongoOperations mongoOperations;
+	private final String collectionName;
+	private final @Nullable TypeInformation<?> entityTypeInformation;
+
+	public DefaultSearchIndexOperations(MongoOperations mongoOperations, Class<?> type) {
+		this(mongoOperations, mongoOperations.getCollectionName(type), type);
+	}
+
+	public DefaultSearchIndexOperations(MongoOperations mongoOperations, String collectionName, @Nullable Class<?> type) {
+
+		this.collectionName = collectionName;
+
+		if (type != null) {
+
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext = mongoOperations
+					.getConverter().getMappingContext();
+			entityTypeInformation = mappingContext.getRequiredPersistentEntity(type).getTypeInformation();
+		} else {
+			entityTypeInformation = null;
+		}
+
+		this.mongoOperations = mongoOperations;
+	}
+
+	@Override
+	public String createIndex(SearchIndexDefinition indexDefinition) {
+
+		Document index = indexDefinition.getIndexDocument(entityTypeInformation,
+				mongoOperations.getConverter().getMappingContext());
+
+		mongoOperations.getCollection(collectionName)
+				.createSearchIndexes(List.of(new SearchIndexModel(indexDefinition.getName(),
+						index.get("definition", Document.class), SearchIndexType.of(new BsonString(indexDefinition.getType())))));
+
+		return indexDefinition.getName();
+	}
+
+	@Override
+	public void updateIndex(SearchIndexDefinition indexDefinition) {
+
+		Document indexDocument = indexDefinition.getIndexDocument(entityTypeInformation,
+				mongoOperations.getConverter().getMappingContext());
+
+		mongoOperations.getCollection(collectionName).updateSearchIndex(indexDefinition.getName(), indexDocument);
+	}
+
+	@Override
+	public boolean exists(String indexName) {
+		return getSearchIndex(indexName) != null;
+	}
+
+	@Override
+	public SearchIndexStatus status(String indexName) {
+
+		Document searchIndex = getSearchIndex(indexName);
+		return searchIndex != null ? SearchIndexStatus.valueOf(searchIndex.getString("status"))
+				: SearchIndexStatus.DOES_NOT_EXIST;
+	}
+
+	@Override
+	public void dropAllIndexes() {
+		getSearchIndexes(null).forEach(indexInfo -> dropIndex(indexInfo.getString("name")));
+	}
+
+	@Override
+	public void dropIndex(String indexName) {
+		mongoOperations.getCollection(collectionName).dropSearchIndex(indexName);
+	}
+
+	@Nullable
+	private Document getSearchIndex(String indexName) {
+
+		List<Document> indexes = getSearchIndexes(indexName);
+		return indexes.isEmpty() ? null : indexes.iterator().next();
+	}
+
+	private List<Document> getSearchIndexes(@Nullable String indexName) {
+
+		Document filter = StringUtils.hasText(indexName) ? new Document("name", indexName) : new Document();
+
+		return mongoOperations.getCollection(collectionName).aggregate(List.of(new Document("$listSearchIndexes", filter)))
+				.into(new ArrayList<>());
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/DurationStyle.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/DurationStyle.java
deleted file mode 100644
index c7f702691d..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/DurationStyle.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.time.Duration;
-import java.time.temporal.ChronoUnit;
-import java.util.function.Function;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Duration format styles.
- * <p/>
- * Fork of {@code org.springframework.boot.convert.DurationStyle}.
- *
- * @author Phillip Webb
- * @since 2.2
- */
-enum DurationStyle {
-
-	/**
-	 * Simple formatting, for example '1s'.
-	 */
-	SIMPLE("^([\\+\\-]?\\d+)([a-zA-Z]{0,2})$") {
-
-		@Override
-		public Duration parse(String value, @Nullable ChronoUnit unit) {
-			try {
-				Matcher matcher = matcher(value);
-				Assert.state(matcher.matches(), "Does not match simple duration pattern");
-				String suffix = matcher.group(2);
-				return (StringUtils.hasLength(suffix) ? Unit.fromSuffix(suffix) : Unit.fromChronoUnit(unit))
-						.parse(matcher.group(1));
-			} catch (Exception ex) {
-				throw new IllegalArgumentException("'" + value + "' is not a valid simple duration", ex);
-			}
-		}
-	},
-
-	/**
-	 * ISO-8601 formatting.
-	 */
-	ISO8601("^[\\+\\-]?P.*$") {
-
-		@Override
-		public Duration parse(String value, @Nullable ChronoUnit unit) {
-			try {
-				return Duration.parse(value);
-			} catch (Exception ex) {
-				throw new IllegalArgumentException("'" + value + "' is not a valid ISO-8601 duration", ex);
-			}
-		}
-	};
-
-	private final Pattern pattern;
-
-	DurationStyle(String pattern) {
-		this.pattern = Pattern.compile(pattern);
-	}
-
-	protected final boolean matches(String value) {
-		return this.pattern.matcher(value).matches();
-	}
-
-	protected final Matcher matcher(String value) {
-		return this.pattern.matcher(value);
-	}
-
-	/**
-	 * Parse the given value to a duration.
-	 *
-	 * @param value the value to parse
-	 * @return a duration
-	 */
-	public Duration parse(String value) {
-		return parse(value, null);
-	}
-
-	/**
-	 * Parse the given value to a duration.
-	 *
-	 * @param value the value to parse
-	 * @param unit the duration unit to use if the value doesn't specify one ({@code null} will default to ms)
-	 * @return a duration
-	 */
-	public abstract Duration parse(String value, @Nullable ChronoUnit unit);
-
-	/**
-	 * Detect the style then parse the value to return a duration.
-	 *
-	 * @param value the value to parse
-	 * @return the parsed duration
-	 * @throws IllegalStateException if the value is not a known style or cannot be parsed
-	 */
-	public static Duration detectAndParse(String value) {
-		return detectAndParse(value, null);
-	}
-
-	/**
-	 * Detect the style then parse the value to return a duration.
-	 *
-	 * @param value the value to parse
-	 * @param unit the duration unit to use if the value doesn't specify one ({@code null} will default to ms)
-	 * @return the parsed duration
-	 * @throws IllegalStateException if the value is not a known style or cannot be parsed
-	 */
-	public static Duration detectAndParse(String value, @Nullable ChronoUnit unit) {
-		return detect(value).parse(value, unit);
-	}
-
-	/**
-	 * Detect the style from the given source value.
-	 *
-	 * @param value the source value
-	 * @return the duration style
-	 * @throws IllegalStateException if the value is not a known style
-	 */
-	public static DurationStyle detect(String value) {
-		Assert.notNull(value, "Value must not be null");
-		for (DurationStyle candidate : values()) {
-			if (candidate.matches(value)) {
-				return candidate;
-			}
-		}
-		throw new IllegalArgumentException("'" + value + "' is not a valid duration");
-	}
-
-	/**
-	 * Units that we support.
-	 */
-	enum Unit {
-
-		/**
-		 * Milliseconds.
-		 */
-		MILLIS(ChronoUnit.MILLIS, "ms", Duration::toMillis),
-
-		/**
-		 * Seconds.
-		 */
-		SECONDS(ChronoUnit.SECONDS, "s", Duration::getSeconds),
-
-		/**
-		 * Minutes.
-		 */
-		MINUTES(ChronoUnit.MINUTES, "m", Duration::toMinutes),
-
-		/**
-		 * Hours.
-		 */
-		HOURS(ChronoUnit.HOURS, "h", Duration::toHours),
-
-		/**
-		 * Days.
-		 */
-		DAYS(ChronoUnit.DAYS, "d", Duration::toDays);
-
-		private final ChronoUnit chronoUnit;
-
-		private final String suffix;
-
-		private Function<Duration, Long> longValue;
-
-		Unit(ChronoUnit chronoUnit, String suffix, Function<Duration, Long> toUnit) {
-			this.chronoUnit = chronoUnit;
-			this.suffix = suffix;
-			this.longValue = toUnit;
-		}
-
-		public Duration parse(String value) {
-			return Duration.of(Long.valueOf(value), this.chronoUnit);
-		}
-
-		public long longValue(Duration value) {
-			return this.longValue.apply(value);
-		}
-
-		public static Unit fromChronoUnit(ChronoUnit chronoUnit) {
-			if (chronoUnit == null) {
-				return Unit.MILLIS;
-			}
-			for (Unit candidate : values()) {
-				if (candidate.chronoUnit == chronoUnit) {
-					return candidate;
-				}
-			}
-			throw new IllegalArgumentException("Unknown unit " + chronoUnit);
-		}
-
-		public static Unit fromSuffix(String suffix) {
-			for (Unit candidate : values()) {
-				if (candidate.suffix.equalsIgnoreCase(suffix)) {
-					return candidate;
-				}
-			}
-			throw new IllegalArgumentException("Unknown unit '" + suffix + "'");
-		}
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexType.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexType.java
index 64fa849cdc..073f18c40b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexType.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexed.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexed.java
index 506e1c7428..a39da5c946 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexed.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeoSpatialIndexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -72,7 +72,7 @@
 	 * </code>
 	 * </pre>
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String name() default "";
 
@@ -80,7 +80,7 @@
 	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
 	 * to {@literal false}.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 * @since 1.5
 	 */
 	boolean useGeneratedName() default false;
@@ -88,21 +88,21 @@
 	/**
 	 * Minimum value for indexed values.
 	 *
-	 * @return
+	 * @return {@literal -180} by default.
 	 */
 	int min() default -180;
 
 	/**
 	 * Maximum value for indexed values.
 	 *
-	 * @return
+	 * @return {@literal +180} by default.
 	 */
 	int max() default 180;
 
 	/**
 	 * Bits of precision for boundary calculations.
 	 *
-	 * @return
+	 * @return {@literal 26} by default.
 	 */
 	int bits() default 26;
 
@@ -110,23 +110,15 @@
 	 * The type of the geospatial index. Default is {@link GeoSpatialIndexType#GEO_2D}
 	 *
 	 * @since 1.4
-	 * @return
+	 * @return {@link GeoSpatialIndexType#GEO_2D} by default.
 	 */
 	GeoSpatialIndexType type() default GeoSpatialIndexType.GEO_2D;
 
-	/**
-	 * The bucket size for {@link GeoSpatialIndexType#GEO_HAYSTACK} indexes, in coordinate units.
-	 *
-	 * @since 1.4
-	 * @return
-	 */
-	double bucketSize() default 1.0;
-
 	/**
 	 * The name of the additional field to use for {@link GeoSpatialIndexType#GEO_HAYSTACK} indexes
 	 *
 	 * @since 1.4
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String additionalField() default "";
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java
index 7404dc7cbd..c1ce25776b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/GeospatialIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,8 +18,9 @@
 import java.util.Optional;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -40,7 +41,6 @@ public class GeospatialIndex implements IndexDefinition {
 	private @Nullable Integer max;
 	private @Nullable Integer bits;
 	private GeoSpatialIndexType type = GeoSpatialIndexType.GEO_2D;
-	private Double bucketSize = 1.0;
 	private @Nullable String additionalField;
 	private Optional<IndexFilter> filter = Optional.empty();
 	private Optional<Collation> collation = Optional.empty();
@@ -52,15 +52,16 @@ public class GeospatialIndex implements IndexDefinition {
 	 */
 	public GeospatialIndex(String field) {
 
-		Assert.hasText(field, "Field must have text!");
+		Assert.hasText(field, "Field must have text");
 
 		this.field = field;
 	}
 
 	/**
 	 * @param name must not be {@literal null} or empty.
-	 * @return
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex named(String name) {
 
 		this.name = name;
@@ -69,56 +70,52 @@ public GeospatialIndex named(String name) {
 
 	/**
 	 * @param min
-	 * @return
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex withMin(int min) {
-		this.min = Integer.valueOf(min);
+		this.min = min;
 		return this;
 	}
 
 	/**
 	 * @param max
-	 * @return
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex withMax(int max) {
-		this.max = Integer.valueOf(max);
+		this.max = max;
 		return this;
 	}
 
 	/**
 	 * @param bits
-	 * @return
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex withBits(int bits) {
-		this.bits = Integer.valueOf(bits);
+		this.bits = bits;
 		return this;
 	}
 
 	/**
 	 * @param type must not be {@literal null}.
-	 * @return
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex typed(GeoSpatialIndexType type) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 
 		this.type = type;
 		return this;
 	}
 
 	/**
-	 * @param bucketSize
-	 * @return
-	 */
-	public GeospatialIndex withBucketSize(double bucketSize) {
-		this.bucketSize = bucketSize;
-		return this;
-	}
-
-	/**
-	 * @param fieldName.
-	 * @return
+	 * @param fieldName
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex withAdditionalField(String fieldName) {
 		this.additionalField = fieldName;
 		return this;
@@ -128,11 +125,12 @@ public GeospatialIndex withAdditionalField(String fieldName) {
 	 * Only index the documents in a collection that meet a specified {@link IndexFilter filter expression}.
 	 *
 	 * @param filter can be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @see <a href=
 	 *      "https://docs.mongodb.com/manual/core/index-partial/">https://docs.mongodb.com/manual/core/index-partial/</a>
 	 * @since 1.10
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex partial(@Nullable IndexFilter filter) {
 
 		this.filter = Optional.ofNullable(filter);
@@ -146,45 +144,38 @@ public GeospatialIndex partial(@Nullable IndexFilter filter) {
 	 * index.
 	 *
 	 * @param collation can be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 2.0
 	 */
+	@Contract("_ -> this")
 	public GeospatialIndex collation(@Nullable Collation collation) {
 
 		this.collation = Optional.ofNullable(collation);
 		return this;
 	}
 
+	@Override
 	public Document getIndexKeys() {
 
 		Document document = new Document();
 
 		switch (type) {
-
-			case GEO_2D:
-				document.put(field, "2d");
-				break;
-
-			case GEO_2DSPHERE:
-				document.put(field, "2dsphere");
-				break;
-
-			case GEO_HAYSTACK:
+			case GEO_2D -> document.put(field, "2d");
+			case GEO_2DSPHERE -> document.put(field, "2dsphere");
+			case GEO_HAYSTACK -> {
 				document.put(field, "geoHaystack");
 				if (!StringUtils.hasText(additionalField)) {
-					throw new IllegalArgumentException("When defining geoHaystack index, an additionnal field must be defined");
+					throw new IllegalArgumentException("When defining geoHaystack index, an additional field must be defined");
 				}
 				document.put(additionalField, 1);
-				break;
-
-			default:
-				throw new IllegalArgumentException("Unsupported geospatial index " + type);
+			}
+			default -> throw new IllegalArgumentException("Unsupported geospatial index " + type);
 		}
 
 		return document;
 	}
 
-	@Nullable
+	@Override
 	public Document getIndexOptions() {
 
 		Document document = new Document();
@@ -208,12 +199,9 @@ public Document getIndexOptions() {
 				break;
 
 			case GEO_2DSPHERE:
-
 				break;
 
 			case GEO_HAYSTACK:
-
-				document.put("bucketSize", bucketSize);
 				break;
 		}
 
@@ -223,10 +211,6 @@ public Document getIndexOptions() {
 		return document;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return String.format("Geo index: %s - Options: %s", getIndexKeys(), getIndexOptions());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashIndexed.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashIndexed.java
index 3c68eff4a0..ce7a29cfc8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashIndexed.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashIndexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
  * <a href="https://docs.mongodb.com/manual/core/index-hashed/">Hashed Index</a>. If used on a simple property, the
  * index uses a hashing function to compute the hash of the value of the index field. Added to a property of complex
  * type the embedded document is collapsed and the hash computed for the entire object.
- * <p />
+ * <br />
  *
  * <pre class="code">
  * &#64;Document
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java
index 1a28bc1d60..4542834110 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/HashedIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ public class HashedIndex implements IndexDefinition {
 
 	private HashedIndex(String field) {
 
-		Assert.hasText(field, "Field must not be null nor empty!");
+		Assert.hasText(field, "Field must not be null nor empty");
 		this.field = field;
 	}
 
@@ -40,25 +40,17 @@ private HashedIndex(String field) {
 	 * Creates a new {@link HashedIndex} for the given field.
 	 *
 	 * @param field must not be {@literal null} nor empty.
-	 * @return
+	 * @return new instance of {@link HashedIndex}.
 	 */
 	public static HashedIndex hashed(String field) {
 		return new HashedIndex(field);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys()
-	 */
 	@Override
 	public Document getIndexKeys() {
 		return new Document(field, "hashed");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions()
-	 */
 	@Override
 	public Document getIndexOptions() {
 		return new Document();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java
index 3f7b1a4cd0..91195a40f4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Index.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,11 @@
 import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.index.IndexOptions.Unique;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -37,20 +39,11 @@
 @SuppressWarnings("deprecation")
 public class Index implements IndexDefinition {
 
-	/**
-	 * @deprecated since 2.1. No longer supported by MongoDB as of server version 3.0.
-	 */
-	@Deprecated
-	public enum Duplicates {
-		RETAIN
-	}
-
 	private final Map<String, Direction> fieldSpec = new LinkedHashMap<String, Direction>();
 	private @Nullable String name;
-	private boolean unique = false;
 	private boolean sparse = false;
 	private boolean background = false;
-	private long expire = -1;
+	private final IndexOptions options = IndexOptions.none();
 	private Optional<IndexFilter> filter = Optional.empty();
 	private Optional<Collation> collation = Optional.empty();
 
@@ -60,11 +53,13 @@ public Index(String key, Direction direction) {
 		fieldSpec.put(key, direction);
 	}
 
+	@Contract("_, _ -> this")
 	public Index on(String key, Direction direction) {
 		fieldSpec.put(key, direction);
 		return this;
 	}
 
+	@Contract("_ -> this")
 	public Index named(String name) {
 		this.name = name;
 		return this;
@@ -73,22 +68,25 @@ public Index named(String name) {
 	/**
 	 * Reject all documents that contain a duplicate value for the indexed field.
 	 *
-	 * @return
+	 * @return this.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/index-unique/">https://docs.mongodb.org/manual/core/index-unique/</a>
 	 */
+	@Contract("-> this")
 	public Index unique() {
-		this.unique = true;
+
+		this.options.setUnique(Unique.YES);
 		return this;
 	}
 
 	/**
 	 * Skip over any document that is missing the indexed field.
 	 *
-	 * @return
+	 * @return this.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/index-sparse/">https://docs.mongodb.org/manual/core/index-sparse/</a>
 	 */
+	@Contract("-> this")
 	public Index sparse() {
 		this.sparse = true;
 		return this;
@@ -97,22 +95,38 @@ public Index sparse() {
 	/**
 	 * Build the index in background (non blocking).
 	 *
-	 * @return
+	 * @return this.
 	 * @since 1.5
-	 */
+	 */@Contract("-> this")
 	public Index background() {
 
 		this.background = true;
 		return this;
 	}
 
+	/**
+	 * Hidden indexes are not visible to the query planner and cannot be used to support a query.
+	 *
+	 * @return this.
+	 * @see <a href=
+	 *      "https://www.mongodb.com/docs/manual/core/index-hidden/">https://www.mongodb.com/docs/manual/core/index-hidden/</a>
+	 * @since 4.1
+	 */
+	@Contract("-> this")
+	public Index hidden() {
+
+		options.setHidden(true);
+		return this;
+	}
+
 	/**
 	 * Specifies TTL in seconds.
 	 *
 	 * @param value
-	 * @return
+	 * @return this.
 	 * @since 1.5
 	 */
+	@Contract("_ -> this")
 	public Index expire(long value) {
 		return expire(value, TimeUnit.SECONDS);
 	}
@@ -125,9 +139,10 @@ public Index expire(long value) {
 	 * @throws IllegalArgumentException if given {@literal timeout} is {@literal null}.
 	 * @since 2.2
 	 */
+	@Contract("_ -> this")
 	public Index expire(Duration timeout) {
 
-		Assert.notNull(timeout, "Timeout must not be null!");
+		Assert.notNull(timeout, "Timeout must not be null");
 		return expire(timeout.getSeconds());
 	}
 
@@ -135,14 +150,15 @@ public Index expire(Duration timeout) {
 	 * Specifies TTL with given {@link TimeUnit}.
 	 *
 	 * @param value
-	 * @param unit
-	 * @return
+	 * @param unit must not be {@literal null}.
+	 * @return this.
 	 * @since 1.5
 	 */
+	@Contract("_, _ -> this")
 	public Index expire(long value, TimeUnit unit) {
 
-		Assert.notNull(unit, "TimeUnit for expiration must not be null.");
-		this.expire = unit.toSeconds(value);
+		Assert.notNull(unit, "TimeUnit for expiration must not be null");
+		options.setExpire(Duration.ofSeconds(unit.toSeconds(value)));
 		return this;
 	}
 
@@ -150,11 +166,12 @@ public Index expire(long value, TimeUnit unit) {
 	 * Only index the documents in a collection that meet a specified {@link IndexFilter filter expression}.
 	 *
 	 * @param filter can be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @see <a href=
 	 *      "https://docs.mongodb.com/manual/core/index-partial/">https://docs.mongodb.com/manual/core/index-partial/</a>
 	 * @since 1.10
 	 */
+	@Contract("_ -> this")
 	public Index partial(@Nullable IndexFilter filter) {
 
 		this.filter = Optional.ofNullable(filter);
@@ -168,19 +185,16 @@ public Index partial(@Nullable IndexFilter filter) {
 	 * index.
 	 *
 	 * @param collation can be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 2.0
 	 */
+	@Contract("_ -> this")
 	public Index collation(@Nullable Collation collation) {
 
 		this.collation = Optional.ofNullable(collation);
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys()
-	 */
 	public Document getIndexKeys() {
 
 		Document document = new Document();
@@ -198,18 +212,13 @@ public Document getIndexOptions() {
 		if (StringUtils.hasText(name)) {
 			document.put("name", name);
 		}
-		if (unique) {
-			document.put("unique", true);
-		}
 		if (sparse) {
 			document.put("sparse", true);
 		}
 		if (background) {
 			document.put("background", true);
 		}
-		if (expire >= 0) {
-			document.put("expireAfterSeconds", expire);
-		}
+		document.putAll(options.toDocument());
 
 		filter.ifPresent(val -> document.put("partialFilterExpression", val.getFilterObject()));
 		collation.ifPresent(val -> document.append("collation", val.toDocument()));
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDefinition.java
index d0e041bac6..663577f420 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,17 @@
  */
 public interface IndexDefinition {
 
+	/**
+	 * Get the {@link Document} containing properties covered by the index.
+	 *
+	 * @return never {@literal null}.
+	 */
 	Document getIndexKeys();
 
+	/**
+	 * Get the index properties such as {@literal unique},...
+	 *
+	 * @return never {@literal null}.
+	 */
 	Document getIndexOptions();
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDirection.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDirection.java
index 746c4833f6..65fcf85a36 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDirection.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexDirection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,5 +19,5 @@
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
 public enum IndexDirection {
-	ASCENDING, DESCENDING;
+	ASCENDING, DESCENDING
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java
index e41eb35a2c..2e7268699c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexField.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core.index;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -29,7 +29,22 @@
 public final class IndexField {
 
 	enum Type {
-		GEO, TEXT, DEFAULT, HASH;
+		GEO, TEXT, DEFAULT,
+
+		/**
+		 * @since 2.2
+		 */
+		HASH,
+
+		/**
+		 * @since 3.3
+		 */
+		WILDCARD,
+
+		/**
+		 * @since ?.?
+		 */
+		VECTOR
 	}
 
 	private final String key;
@@ -46,9 +61,9 @@ private IndexField(String key, @Nullable Direction direction, @Nullable Type typ
 		Assert.hasText(key, "Key must not be null or empty");
 
 		if (Type.GEO.equals(type) || Type.TEXT.equals(type)) {
-			Assert.isNull(direction, "Geo/Text indexes must not have a direction!");
+			Assert.isNull(direction, "Geo/Text indexes must not have a direction");
 		} else {
-			if (!Type.HASH.equals(type)) {
+			if (!(Type.HASH.equals(type) || Type.WILDCARD.equals(type) || Type.VECTOR.equals(type))) {
 				Assert.notNull(direction, "Default indexes require a direction");
 			}
 		}
@@ -61,11 +76,15 @@ private IndexField(String key, @Nullable Direction direction, @Nullable Type typ
 
 	public static IndexField create(String key, Direction order) {
 
-		Assert.notNull(order, "Direction must not be null!");
+		Assert.notNull(order, "Direction must not be null");
 
 		return new IndexField(key, order, Type.DEFAULT);
 	}
 
+	public static IndexField vector(String key) {
+		return new IndexField(key, null, Type.VECTOR);
+	}
+
 	/**
 	 * Creates a {@literal hashed} {@link IndexField} for the given key.
 	 *
@@ -77,11 +96,23 @@ static IndexField hashed(String key) {
 		return new IndexField(key, null, Type.HASH);
 	}
 
+	/**
+	 * Creates a {@literal wildcard} {@link IndexField} for the given key. The {@code key} must follow the
+	 * {@code fieldName.$**} notation.
+	 *
+	 * @param key must not be {@literal null} or empty.
+	 * @return new instance of {@link IndexField}.
+	 * @since 3.3
+	 */
+	static IndexField wildcard(String key) {
+		return new IndexField(key, null, Type.WILDCARD);
+	}
+
 	/**
 	 * Creates a geo {@link IndexField} for the given key.
 	 *
 	 * @param key must not be {@literal null} or empty.
-	 * @return
+	 * @return new instance of {@link IndexField}.
 	 */
 	public static IndexField geo(String key) {
 		return new IndexField(key, null, Type.GEO);
@@ -108,8 +139,7 @@ public String getKey() {
 	 *
 	 * @return the direction
 	 */
-	@Nullable
-	public Direction getDirection() {
+	public @Nullable Direction getDirection() {
 		return direction;
 	}
 
@@ -142,31 +172,31 @@ public boolean isHashed() {
 		return Type.HASH.equals(type);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
+	/**
+	 * Returns whether the {@link IndexField} is contains a {@literal wildcard} expression.
+	 *
+	 * @return {@literal true} if {@link IndexField} contains a wildcard {@literal $**}.
+	 * @since 3.3
 	 */
+	public boolean isWildcard() {
+		return Type.WILDCARD.equals(type);
+	}
+
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof IndexField)) {
+		if (!(obj instanceof IndexField other)) {
 			return false;
 		}
 
-		IndexField that = (IndexField) obj;
-
-		return this.key.equals(that.key) && ObjectUtils.nullSafeEquals(this.direction, that.direction)
-				&& this.type == that.type;
+		return this.key.equals(other.key) && ObjectUtils.nullSafeEquals(this.direction, other.direction)
+				&& this.type == other.type;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -178,10 +208,6 @@ public int hashCode() {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return String.format("IndexField [ key: %s, direction: %s, type: %s, weight: %s]", key, direction, type, weight);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexFilter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexFilter.java
index 3cd30a3d34..097075811b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexFilter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@ public interface IndexFilter {
 	/**
 	 * Get the raw (unmapped) filter expression.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	Document getFilterObject();
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexInfo.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexInfo.java
index 20468c5d31..e9817746c3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexInfo.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2025 the original author 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,13 +24,15 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.util.BsonUtils;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * Index information for a MongoDB index.
@@ -42,8 +44,8 @@
  */
 public class IndexInfo {
 
-	private static final Double ONE = Double.valueOf(1);
-	private static final Double MINUS_ONE = Double.valueOf(-1);
+	private static final Double ONE = 1.0;
+	private static final Double MINUS_ONE = (double) -1;
 	private static final Collection<String> TWO_D_IDENTIFIERS = Arrays.asList("2d", "2dsphere");
 
 	private final List<IndexField> indexFields;
@@ -52,9 +54,11 @@ public class IndexInfo {
 	private final boolean unique;
 	private final boolean sparse;
 	private final String language;
+	private final boolean hidden;
 	private @Nullable Duration expireAfter;
 	private @Nullable String partialFilterExpression;
 	private @Nullable Document collation;
+	private @Nullable Document wildcardProjection;
 
 	public IndexInfo(List<IndexField> indexFields, String name, boolean unique, boolean sparse, String language) {
 
@@ -63,18 +67,30 @@ public IndexInfo(List<IndexField> indexFields, String name, boolean unique, bool
 		this.unique = unique;
 		this.sparse = sparse;
 		this.language = language;
+		this.hidden = false;
+	}
+
+	public IndexInfo(List<IndexField> indexFields, String name, boolean unique, boolean sparse, String language,
+			boolean hidden) {
+
+		this.indexFields = Collections.unmodifiableList(indexFields);
+		this.name = name;
+		this.unique = unique;
+		this.sparse = sparse;
+		this.language = language;
+		this.hidden = hidden;
 	}
 
 	/**
 	 * Creates new {@link IndexInfo} parsing required properties from the given {@literal sourceDocument}.
 	 *
-	 * @param sourceDocument
-	 * @return
+	 * @param sourceDocument never {@literal null}.
+	 * @return new instance of {@link IndexInfo}.
 	 * @since 1.10
 	 */
 	public static IndexInfo indexInfoOf(Document sourceDocument) {
 
-		Document keyDbObject = (Document) sourceDocument.get("key");
+		Document keyDbObject = sourceDocument.get("key", new Document());
 		int numberOfElements = keyDbObject.keySet().size();
 
 		List<IndexField> indexFields = new ArrayList<IndexField>(numberOfElements);
@@ -90,18 +106,21 @@ public static IndexInfo indexInfoOf(Document sourceDocument) {
 			} else if ("text".equals(value)) {
 
 				Document weights = (Document) sourceDocument.get("weights");
-
-				for (String fieldName : weights.keySet()) {
-					indexFields.add(IndexField.text(fieldName, Float.valueOf(weights.get(fieldName).toString())));
+				if(weights != null) {
+					for (String fieldName : weights.keySet()) {
+						indexFields.add(IndexField.text(fieldName, Float.valueOf(weights.get(fieldName).toString())));
+					}
 				}
 
 			} else {
 
 				if (ObjectUtils.nullSafeEquals("hashed", value)) {
 					indexFields.add(IndexField.hashed(key));
+				} else if (key.endsWith("$**")) {
+					indexFields.add(IndexField.wildcard(key));
 				} else {
 
-					Double keyValue = new Double(value.toString());
+					Double keyValue = Double.valueOf(value.toString());
 
 					if (ONE.equals(keyValue)) {
 						indexFields.add(IndexField.create(key, ASC));
@@ -112,16 +131,17 @@ public static IndexInfo indexInfoOf(Document sourceDocument) {
 			}
 		}
 
-		String name = sourceDocument.get("name").toString();
+		String name = ObjectUtils.nullSafeToString(sourceDocument.get("name"));
 
-		boolean unique = sourceDocument.containsKey("unique") ? (Boolean) sourceDocument.get("unique") : false;
-		boolean sparse = sourceDocument.containsKey("sparse") ? (Boolean) sourceDocument.get("sparse") : false;
-		String language = sourceDocument.containsKey("default_language") ? (String) sourceDocument.get("default_language")
+		boolean unique = sourceDocument.get("unique", false);
+		boolean sparse = sourceDocument.get("sparse", false);
+		boolean hidden = sourceDocument.getBoolean("hidden", false);
+		String language = sourceDocument.containsKey("default_language") ? sourceDocument.getString("default_language")
 				: "";
 
 		String partialFilter = extractPartialFilterString(sourceDocument);
 
-		IndexInfo info = new IndexInfo(indexFields, name, unique, sparse, language);
+		IndexInfo info = new IndexInfo(indexFields, name, unique, sparse, language, hidden);
 		info.partialFilterExpression = partialFilter;
 		info.collation = sourceDocument.get("collation", Document.class);
 
@@ -131,16 +151,19 @@ public static IndexInfo indexInfoOf(Document sourceDocument) {
 			info.expireAfter = Duration.ofSeconds(NumberUtils.convertNumberToTargetClass(expireAfterSeconds, Long.class));
 		}
 
+		if (sourceDocument.containsKey("wildcardProjection")) {
+			info.wildcardProjection = sourceDocument.get("wildcardProjection", Document.class);
+		}
+
 		return info;
 	}
 
 	/**
-	 * @param sourceDocument
+	 * @param sourceDocument never {@literal null}.
 	 * @return the {@link String} representation of the partial filter {@link Document}.
 	 * @since 2.1.11
 	 */
-	@Nullable
-	private static String extractPartialFilterString(Document sourceDocument) {
+	private static @Nullable String extractPartialFilterString(Document sourceDocument) {
 
 		if (!sourceDocument.containsKey("partialFilterExpression")) {
 			return null;
@@ -166,15 +189,9 @@ public List<IndexField> getIndexFields() {
 	 */
 	public boolean isIndexForFields(Collection<String> keys) {
 
-		Assert.notNull(keys, "Collection of keys must not be null!");
+		Assert.notNull(keys, "Collection of keys must not be null");
 
-		List<String> indexKeys = new ArrayList<String>(indexFields.size());
-
-		for (IndexField field : indexFields) {
-			indexKeys.add(field.getKey());
-		}
-
-		return indexKeys.containsAll(keys);
+		return this.indexFields.stream().map(IndexField::getKey).collect(Collectors.toSet()).containsAll(keys);
 	}
 
 	public String getName() {
@@ -216,6 +233,16 @@ public Optional<Document> getCollation() {
 		return Optional.ofNullable(collation);
 	}
 
+	/**
+	 * Get {@literal wildcardProjection} information.
+	 *
+	 * @return {@link Optional#empty() empty} if not set.
+	 * @since 3.3
+	 */
+	public Optional<Document> getWildcardProjection() {
+		return Optional.ofNullable(wildcardProjection);
+	}
+
 	/**
 	 * Get the duration after which documents within the index expire.
 	 *
@@ -234,12 +261,24 @@ public boolean isHashed() {
 		return getIndexFields().stream().anyMatch(IndexField::isHashed);
 	}
 
+	/**
+	 * @return {@literal true} if a wildcard index field is present.
+	 * @since 3.3
+	 */
+	public boolean isWildcard() {
+		return getIndexFields().stream().anyMatch(IndexField::isWildcard);
+	}
+
+	public boolean isHidden() {
+		return hidden;
+	}
+
 	@Override
 	public String toString() {
 
 		return "IndexInfo [indexFields=" + indexFields + ", name=" + name + ", unique=" + unique + ", sparse=" + sparse
 				+ ", language=" + language + ", partialFilterExpression=" + partialFilterExpression + ", collation=" + collation
-				+ ", expireAfterSeconds=" + ObjectUtils.nullSafeToString(expireAfter) + "]";
+				+ ", expireAfterSeconds=" + ObjectUtils.nullSafeToString(expireAfter) + ", hidden=" + hidden + "]";
 	}
 
 	@Override
@@ -254,11 +293,12 @@ public int hashCode() {
 		result += 31 * ObjectUtils.nullSafeHashCode(partialFilterExpression);
 		result += 31 * ObjectUtils.nullSafeHashCode(collation);
 		result += 31 * ObjectUtils.nullSafeHashCode(expireAfter);
+		result += 31 * ObjectUtils.nullSafeHashCode(hidden);
 		return result;
 	}
 
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 		if (this == obj) {
 			return true;
 		}
@@ -301,6 +341,10 @@ public boolean equals(Object obj) {
 		if (!ObjectUtils.nullSafeEquals(expireAfter, other.expireAfter)) {
 			return false;
 		}
+		if (hidden != other.hidden) {
+			return false;
+		}
 		return true;
 	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperations.java
index 8695f08c53..88e6d7a815 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,9 +32,33 @@ public interface IndexOperations {
 	 * class. If not it will be created.
 	 *
 	 * @param indexDefinition must not be {@literal null}.
+	 * @return the index name.
+	 * @deprecated since 4.5, in favor of {@link #createIndex(IndexDefinition)}.
 	 */
+	@Deprecated(since = "4.5", forRemoval = true)
 	String ensureIndex(IndexDefinition indexDefinition);
 
+	/**
+	 * Create the index for the provided {@link IndexDefinition} exists for the collection indicated by the entity class.
+	 * If not it will be created.
+	 *
+	 * @param indexDefinition must not be {@literal null}.
+	 * @return the index name.
+	 * @since 4.5
+	 */
+	default String createIndex(IndexDefinition indexDefinition) {
+		return ensureIndex(indexDefinition);
+	}
+
+	/**
+	 * Alters the index with given {@literal name}.
+	 *
+	 * @param name name of index to change.
+	 * @param options index options.
+	 * @since 4.1
+	 */
+	void alterIndex(String name, IndexOptions options);
+
 	/**
 	 * Drops an index from this collection.
 	 *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsAdapter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsAdapter.java
index eed28488b8..613a3dc4f4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsAdapter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsAdapter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ public interface IndexOperationsAdapter extends IndexOperations {
 	 */
 	static IndexOperationsAdapter blocking(ReactiveIndexOperations reactiveIndexOperations) {
 
-		Assert.notNull(reactiveIndexOperations, "ReactiveIndexOperations must not be null!");
+		Assert.notNull(reactiveIndexOperations, "ReactiveIndexOperations must not be null");
 
 		return new IndexOperationsAdapter() {
 
@@ -50,6 +50,11 @@ public void dropIndex(String name) {
 				reactiveIndexOperations.dropIndex(name).block();
 			}
 
+			@Override
+			public void alterIndex(String name, IndexOptions options) {
+				reactiveIndexOperations.alterIndex(name, options);
+			}
+
 			@Override
 			public void dropAllIndexes() {
 				reactiveIndexOperations.dropAllIndexes().block();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsProvider.java
index 0ce8d175cb..aec1ba817d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsProvider.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOperationsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,10 @@
  */
 package org.springframework.data.mongodb.core.index;
 
+import org.jspecify.annotations.Nullable;
+
 /**
- * Provider interface to obtain {@link IndexOperations} by MongoDB collection name.
+ * Provider interface to obtain {@link IndexOperations} by MongoDB collection name or entity type.
  *
  * @author Mark Paluch
  * @author Jens Schauder
@@ -26,10 +28,23 @@
 public interface IndexOperationsProvider {
 
 	/**
-	 * Returns the operations that can be performed on indexes
+	 * Returns the operations that can be performed on indexes.
+	 *
+	 * @param collectionName name of the MongoDB collection, must not be {@literal null}.
+	 * @return index operations on the named collection
+	 */
+	default IndexOperations indexOps(String collectionName) {
+		return indexOps(collectionName, null);
+	}
+
+	/**
+	 * Returns the operations that can be performed on indexes.
 	 *
 	 * @param collectionName name of the MongoDB collection, must not be {@literal null}.
+	 * @param type the type used for field mapping. Can be {@literal null}.
 	 * @return index operations on the named collection
+	 * @since 3.2
 	 */
-	IndexOperations indexOps(String collectionName);
+	IndexOperations indexOps(String collectionName, @Nullable Class<?> type);
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOptions.java
new file mode 100644
index 0000000000..a390d1eb3e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexOptions.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import java.time.Duration;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Changeable properties of an index. Can be used for index creation and modification.
+ *
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+public class IndexOptions {
+
+	private @Nullable Duration expire;
+
+	private @Nullable Boolean hidden;
+
+	private @Nullable Unique unique;
+
+	public enum Unique {
+
+		NO,
+
+		/**
+		 * When unique is true the index rejects duplicate entries.
+		 */
+		YES,
+
+		/**
+		 * An existing index is not checked for pre-existing, duplicate index entries but inserting new duplicate entries
+		 * fails.
+		 */
+		PREPARE
+	}
+
+	/**
+	 * @return new empty instance of {@link IndexOptions}.
+	 */
+	public static IndexOptions none() {
+		return new IndexOptions();
+	}
+
+	/**
+	 * @return new instance of {@link IndexOptions} having the {@link Unique#YES} flag set.
+	 */
+	public static IndexOptions unique() {
+
+		IndexOptions options = new IndexOptions();
+		options.unique = Unique.YES;
+		return options;
+	}
+
+	/**
+	 * @return new instance of {@link IndexOptions} having the hidden flag set.
+	 */
+	public static IndexOptions hidden() {
+
+		IndexOptions options = new IndexOptions();
+		options.hidden = true;
+		return options;
+	}
+
+	/**
+	 * @return new instance of {@link IndexOptions} with given expiration.
+	 */
+	public static IndexOptions expireAfter(Duration duration) {
+
+		IndexOptions options = new IndexOptions();
+		options.expire = duration;
+		return options;
+	}
+
+	/**
+	 * @return the expiration time. A {@link Duration#isNegative() negative value} represents no expiration, {@literal null} if not set.
+	 */
+	@Nullable
+	public Duration getExpire() {
+		return expire;
+	}
+
+	/**
+	 * @param expire must not be {@literal null}.
+	 */
+	public void setExpire(Duration expire) {
+		this.expire = expire;
+	}
+
+	/**
+	 * @return {@literal true} if hidden, {@literal null} if not set.
+	 */
+	public @Nullable Boolean isHidden() {
+		return hidden;
+	}
+
+	/**
+	 * @param hidden
+	 */
+	public void setHidden(boolean hidden) {
+		this.hidden = hidden;
+	}
+
+	/**
+	 * @return the unique property value, {@literal null} if not set.
+	 */
+	public @Nullable Unique getUnique() {
+		return unique;
+	}
+
+	/**
+	 * @param unique must not be {@literal null}.
+	 */
+	public void setUnique(Unique unique) {
+		this.unique = unique;
+	}
+
+	/**
+	 * @return the store native representation
+	 */
+	public Document toDocument() {
+
+		Document document = new Document();
+		if(unique != null) {
+			switch (unique) {
+				case NO -> document.put("unique", false);
+				case YES -> document.put("unique", true);
+				case PREPARE -> document.put("prepareUnique", true);
+			}
+		}
+		if(hidden != null) {
+			document.put("hidden", hidden);
+		}
+
+		if (expire != null && !expire.isNegative()) {
+			document.put("expireAfterSeconds", expire.getSeconds());
+		}
+		return document;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexPredicate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexPredicate.java
index 89b6a90885..3bb3fdbd0f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexPredicate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexPredicate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.core.index;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -26,8 +26,7 @@ public abstract class IndexPredicate {
 	private IndexDirection direction = IndexDirection.ASCENDING;
 	private boolean unique = false;
 
-	@Nullable
-	public String getName() {
+	public @Nullable String getName() {
 		return name;
 	}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexResolver.java
index fdf418b9c8..8428941474 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/IndexResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,12 +19,21 @@
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 
 /**
  * {@link IndexResolver} finds those {@link IndexDefinition}s to be created for a given class.
+ * <p>
+ * The {@link IndexResolver} considers index annotations like {@link Indexed}, {@link GeoSpatialIndexed},
+ * {@link HashIndexed}, {@link TextIndexed} and {@link WildcardIndexed} on properties as well as {@link CompoundIndex}
+ * and {@link WildcardIndexed} on types.
+ * <p>
+ * Unless specified otherwise the index name will be created out of the keys/path involved in the index. <br />
+ * {@link TextIndexed} properties are collected into a single index that covers the detected fields. <br />
+ * {@link java.util.Map} like structures, unless annotated with {@link WildcardIndexed}, are skipped because the
+ * {@link java.util.Map.Entry#getKey() map key}, which cannot be resolved from static metadata, needs to be part of the
+ * index.
  *
  * @author Christoph Strobl
  * @author Thomas Darimont
@@ -43,7 +52,7 @@ public interface IndexResolver {
 	static IndexResolver create(
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
-		Assert.notNull(mappingContext, "MongoMappingContext must not be null!");
+		Assert.notNull(mappingContext, "MongoMappingContext must not be null");
 
 		return new MongoPersistentEntityIndexResolver(mappingContext);
 	}
@@ -52,7 +61,7 @@ static IndexResolver create(
 	 * Find and create {@link IndexDefinition}s for properties of given {@link TypeInformation}. {@link IndexDefinition}s
 	 * are created for properties and types with {@link Indexed}, {@link CompoundIndexes} or {@link GeoSpatialIndexed}.
 	 *
-	 * @param typeInformation
+	 * @param typeInformation must not be {@literal null}.
 	 * @return Empty {@link Iterable} in case no {@link IndexDefinition} could be resolved for type.
 	 */
 	Iterable<? extends IndexDefinition> resolveIndexFor(TypeInformation<?> typeInformation);
@@ -61,12 +70,12 @@ static IndexResolver create(
 	 * Find and create {@link IndexDefinition}s for properties of given {@link TypeInformation}. {@link IndexDefinition}s
 	 * are created for properties and types with {@link Indexed}, {@link CompoundIndexes} or {@link GeoSpatialIndexed}.
 	 *
-	 * @param entityType
+	 * @param entityType must not be {@literal null}.
 	 * @return Empty {@link Iterable} in case no {@link IndexDefinition} could be resolved for type.
 	 * @see 2.2
 	 */
 	default Iterable<? extends IndexDefinition> resolveIndexFor(Class<?> entityType) {
-		return resolveIndexFor(ClassTypeInformation.from(entityType));
+		return resolveIndexFor(TypeInformation.of(entityType));
 	}
 
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Indexed.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Indexed.java
index 5549260f66..0866556c10 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Indexed.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/Indexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,10 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.mongodb.core.annotation.Collation;
+import org.springframework.data.mongodb.core.mapping.Document;
+
 /**
  * Mark a field to be indexed using MongoDB's indexing feature.
  *
@@ -31,7 +35,9 @@
  * @author Christoph Strobl
  * @author Jordi Llach
  * @author Mark Paluch
+ * @author Stefan Tirea
  */
+@Collation
 @Target({ ElementType.ANNOTATION_TYPE, ElementType.FIELD })
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Indexed {
@@ -39,32 +45,29 @@
 	/**
 	 * If set to true reject all documents that contain a duplicate value for the indexed field.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/index-unique/">https://docs.mongodb.org/manual/core/index-unique/</a>
 	 */
 	boolean unique() default false;
 
+	/**
+	 * The index sort direction.
+	 *
+	 * @return {@link IndexDirection#ASCENDING} by default.
+	 */
 	IndexDirection direction() default IndexDirection.ASCENDING;
 
 	/**
-	 * If set to true index will skip over any document that is missing the indexed field.
+	 * If set to true index will skip over any document that is missing the indexed field. <br />
+	 * Must not be used with {@link #partialFilter()}.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/index-sparse/">https://docs.mongodb.org/manual/core/index-sparse/</a>
 	 */
 	boolean sparse() default false;
 
-	/**
-	 * @return
-	 * @see <a href=
-	 *      "https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping">https://docs.mongodb.org/manual/core/index-creation/#index-creation-duplicate-dropping</a>
-	 * @deprecated since 2.1. No longer supported by MongoDB as of server version 3.0.
-	 */
-	@Deprecated
-	boolean dropDups() default false;
-
 	/**
 	 * Index name either as plain value or as {@link org.springframework.expression.spel.standard.SpelExpression template
 	 * expression}. <br />
@@ -105,7 +108,7 @@
 	 * </code>
 	 * </pre>
 	 *
-	 * @return
+	 * @return empty String by default.
 	 */
 	String name() default "";
 
@@ -113,7 +116,7 @@
 	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
 	 * to {@literal false}.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 * @since 1.5
 	 */
 	boolean useGeneratedName() default false;
@@ -121,7 +124,7 @@
 	/**
 	 * If {@literal true} the index will be created in the background.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/core/indexes/#background-construction">https://docs.mongodb.org/manual/core/indexes/#background-construction</a>
 	 */
@@ -130,10 +133,12 @@
 	/**
 	 * Configures the number of seconds after which the collection should expire. Defaults to -1 for no expiry.
 	 *
-	 * @return
+	 * @return {@literal -1} by default.
 	 * @see <a href=
 	 *      "https://docs.mongodb.org/manual/tutorial/expire-data/">https://docs.mongodb.org/manual/tutorial/expire-data/</a>
+	 * @deprecated since 4.4 - Please use {@link #expireAfter()} instead.
 	 */
+	@Deprecated(since="4.4", forRemoval = true)
 	int expireAfterSeconds() default -1;
 
 	/**
@@ -151,13 +156,9 @@
 	 * Supports ISO-8601 style.
 	 *
 	 * <pre class="code">
-	 *
 	 * &#0064;Indexed(expireAfter = "10s") String expireAfterTenSeconds;
-	 *
 	 * &#0064;Indexed(expireAfter = "1d") String expireAfterOneDay;
-	 *
 	 * &#0064;Indexed(expireAfter = "P2D") String expireAfterTwoDays;
-	 *
 	 * &#0064;Indexed(expireAfter = "#{&#0064;mySpringBean.timeout}") String expireAfterTimeoutObtainedFromSpringBean;
 	 * </pre>
 	 *
@@ -165,4 +166,30 @@
 	 * @since 2.2
 	 */
 	String expireAfter() default "";
+
+	/**
+	 * Only index the documents in a collection that meet a specified {@link IndexFilter filter expression}. <br />
+	 * Must not be used with {@link #sparse() sparse = true}.
+	 *
+	 * @return empty by default.
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/core/index-partial/">https://docs.mongodb.com/manual/core/index-partial/</a>
+	 * @since 3.1
+	 */
+	String partialFilter() default "";
+
+	/**
+	 * The actual collation definition in JSON format or a
+	 * {@link org.springframework.expression.spel.standard.SpelExpression template expression} resolving to either a JSON
+	 * String or a {@link org.bson.Document}. The keys of the JSON document are configuration options for the collation
+	 * (language-specific rules for string comparison) applied to the indexed based on the field value.
+	 * <p>
+	 * <strong>NOTE:</strong> Overrides {@link Document#collation()}.
+	 *
+	 * @return empty by default.
+	 * @see <a href="https://www.mongodb.com/docs/manual/reference/collation/">https://www.mongodb.com/docs/manual/reference/collation/</a>
+	 * @since 4.0
+	 */
+	@AliasFor(annotation = Collation.class, attribute = "value")
+	String collation() default "";
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/JustOnceLogger.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/JustOnceLogger.java
deleted file mode 100644
index 6aba6dd01b..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/JustOnceLogger.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.index;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentSkipListSet;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author Christoph Strobl
- * @since 2.2
- */
-class JustOnceLogger {
-
-	private static final Map<String, Set<String>> KNOWN_LOGS = new ConcurrentHashMap<>();
-	private static final String AUTO_INDEX_CREATION_CONFIG_CHANGE;
-
-	static {
-		AUTO_INDEX_CREATION_CONFIG_CHANGE = "Automatic index creation will be disabled by default as of Spring Data MongoDB 3.x."
-				+ System.lineSeparator()
-				+ "\tPlease use 'MongoMappingContext#setAutoIndexCreation(boolean)' or override 'MongoConfigurationSupport#autoIndexCreation()' to be explicit."
-				+ System.lineSeparator()
-				+ "\tHowever, we recommend setting up indices manually in an application ready block. You may use index derivation there as well."
-				+ System.lineSeparator() + System.lineSeparator() //
-				+ "\t> -----------------------------------------------------------------------------------------"
-				+ System.lineSeparator() //
-				+ "\t> @EventListener(ApplicationReadyEvent.class)" + System.lineSeparator() //
-				+ "\t> public void initIndicesAfterStartup() {" + System.lineSeparator() //
-				+ "\t>" + System.lineSeparator() //
-				+ "\t>     IndexOperations indexOps = mongoTemplate.indexOps(DomainType.class);" + System.lineSeparator()//
-				+ "\t>" + System.lineSeparator() //
-				+ "\t>     IndexResolver resolver = new MongoPersistentEntityIndexResolver(mongoMappingContext);"
-				+ System.lineSeparator() //
-				+ "\t>     resolver.resolveIndexFor(DomainType.class).forEach(indexOps::ensureIndex);" + System.lineSeparator() //
-				+ "\t> }" + System.lineSeparator() //
-				+ "\t> -----------------------------------------------------------------------------------------"
-				+ System.lineSeparator();
-	}
-
-	static void logWarnIndexCreationConfigurationChange(String loggerName) {
-		warnOnce(loggerName, AUTO_INDEX_CREATION_CONFIG_CHANGE);
-	}
-
-	static void warnOnce(String loggerName, String message) {
-
-		Logger logger = LoggerFactory.getLogger(loggerName);
-		if (!logger.isWarnEnabled()) {
-			return;
-		}
-
-		if (!KNOWN_LOGS.containsKey(loggerName)) {
-
-			KNOWN_LOGS.put(loggerName, new ConcurrentSkipListSet<>(Collections.singleton(message)));
-			logger.warn(message);
-		} else {
-
-			Set<String> messages = KNOWN_LOGS.get(loggerName);
-			if (messages.contains(message)) {
-				return;
-			}
-
-			messages.add(message);
-			logger.warn(message);
-		}
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java
index 64d6e43257..940d676fdc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoMappingEventPublisher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,8 +21,6 @@
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.mapping.context.MappingContextEvent;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent;
 import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
 import org.springframework.util.Assert;
@@ -49,7 +47,7 @@ public class MongoMappingEventPublisher implements ApplicationEventPublisher {
 	 */
 	public MongoMappingEventPublisher(ApplicationListener<MappingContextEvent<?, ?>> indexCreator) {
 
-		Assert.notNull(indexCreator, "ApplicationListener must not be null!");
+		Assert.notNull(indexCreator, "ApplicationListener must not be null");
 
 		this.indexCreator = indexCreator;
 	}
@@ -61,25 +59,17 @@ public MongoMappingEventPublisher(ApplicationListener<MappingContextEvent<?, ?>>
 	 */
 	public MongoMappingEventPublisher(MongoPersistentEntityIndexCreator indexCreator) {
 
-		Assert.notNull(indexCreator, "MongoPersistentEntityIndexCreator must not be null!");
+		Assert.notNull(indexCreator, "MongoPersistentEntityIndexCreator must not be null");
 
 		this.indexCreator = indexCreator;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationEventPublisher#publishEvent(org.springframework.context.ApplicationEvent)
-	 */
 	@SuppressWarnings("unchecked")
 	public void publishEvent(ApplicationEvent event) {
-		if (event instanceof MappingContextEvent) {
-			indexCreator.onApplicationEvent((MappingContextEvent<MongoPersistentEntity<?>, MongoPersistentProperty>) event);
+		if (event instanceof MappingContextEvent<?,?> mappingContextEvent) {
+			indexCreator.onApplicationEvent(mappingContextEvent);
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationEventPublisher#publishEvent(java.lang.Object)
-	 */
 	public void publishEvent(Object event) {}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
index 9f9c2323b8..f1550d1501 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,21 +19,20 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 import org.springframework.context.ApplicationListener;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.MappingContextEvent;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.UncategorizedMongoDbException;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver.IndexDefinitionHolder;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.util.MongoDbErrorCodes;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -53,7 +52,7 @@
  */
 public class MongoPersistentEntityIndexCreator implements ApplicationListener<MappingContextEvent<?, ?>> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoPersistentEntityIndexCreator.class);
+	private static final Log LOGGER = LogFactory.getLog(MongoPersistentEntityIndexCreator.class);
 
 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final IndexOperationsProvider indexOperationsProvider;
@@ -62,7 +61,7 @@ public class MongoPersistentEntityIndexCreator implements ApplicationListener<Ma
 
 	/**
 	 * Creates a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
-	 * {@link MongoDbFactory}.
+	 * {@link MongoDatabaseFactory}.
 	 *
 	 * @param mappingContext must not be {@literal null}.
 	 * @param indexOperationsProvider must not be {@literal null}.
@@ -74,18 +73,18 @@ public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext,
 
 	/**
 	 * Creates a new {@link MongoPersistentEntityIndexCreator} for the given {@link MongoMappingContext} and
-	 * {@link MongoDbFactory}.
+	 * {@link MongoDatabaseFactory}.
 	 *
 	 * @param mappingContext must not be {@literal null}.
-	 * @param mongoDbFactory must not be {@literal null}.
+	 * @param indexOperationsProvider must not be {@literal null}.
 	 * @param indexResolver must not be {@literal null}.
 	 */
 	public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext,
 			IndexOperationsProvider indexOperationsProvider, IndexResolver indexResolver) {
 
-		Assert.notNull(mappingContext, "MongoMappingContext must not be null!");
-		Assert.notNull(indexOperationsProvider, "IndexOperationsProvider must not be null!");
-		Assert.notNull(indexResolver, "IndexResolver must not be null!");
+		Assert.notNull(mappingContext, "MongoMappingContext must not be null");
+		Assert.notNull(indexOperationsProvider, "IndexOperationsProvider must not be null");
+		Assert.notNull(indexResolver, "IndexResolver must not be null");
 
 		this.indexOperationsProvider = indexOperationsProvider;
 		this.mappingContext = mappingContext;
@@ -96,10 +95,6 @@ public MongoPersistentEntityIndexCreator(MongoMappingContext mappingContext,
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
-	 */
 	public void onApplicationEvent(MappingContextEvent<?, ?> event) {
 
 		if (!event.wasEmittedBy(mappingContext)) {
@@ -109,9 +104,9 @@ public void onApplicationEvent(MappingContextEvent<?, ?> event) {
 		PersistentEntity<?, ?> entity = event.getPersistentEntity();
 
 		// Double check type as Spring infrastructure does not consider nested generics
-		if (entity instanceof MongoPersistentEntity) {
+		if (entity instanceof MongoPersistentEntity<?> mongoPersistentEntity) {
 
-			checkForIndexes((MongoPersistentEntity<?>) entity);
+			checkForIndexes(mongoPersistentEntity);
 		}
 	}
 
@@ -124,7 +119,7 @@ private void checkForIndexes(final MongoPersistentEntity<?> entity) {
 			this.classesSeen.put(type, Boolean.TRUE);
 
 			if (LOGGER.isDebugEnabled()) {
-				LOGGER.debug("Analyzing class " + type + " for index information.");
+				LOGGER.debug("Analyzing class " + type + " for index information");
 			}
 
 			checkForAndCreateIndexes(entity);
@@ -139,10 +134,8 @@ private void checkForAndCreateIndexes(MongoPersistentEntity<?> entity) {
 
 			for (IndexDefinition indexDefinition : indexResolver.resolveIndexFor(entity.getTypeInformation())) {
 
-				JustOnceLogger.logWarnIndexCreationConfigurationChange(this.getClass().getName());
-
-				IndexDefinitionHolder indexToCreate = indexDefinition instanceof IndexDefinitionHolder
-						? (IndexDefinitionHolder) indexDefinition
+				IndexDefinitionHolder indexToCreate = indexDefinition instanceof IndexDefinitionHolder definitionHolder
+						? definitionHolder
 						: new IndexDefinitionHolder("", indexDefinition, collection);
 
 				createIndex(indexToCreate);
@@ -157,16 +150,16 @@ void createIndex(IndexDefinitionHolder indexDefinition) {
 			IndexOperations indexOperations = indexOperationsProvider.indexOps(indexDefinition.getCollection());
 			indexOperations.ensureIndex(indexDefinition);
 
-		} catch (UncategorizedMongoDbException ex) {
+		} catch (DataIntegrityViolationException ex) {
 
-			if (ex.getCause() instanceof MongoException
-					&& MongoDbErrorCodes.isDataIntegrityViolationCode(((MongoException) ex.getCause()).getCode())) {
+			if (ex.getCause() instanceof MongoException mongoException
+					&& MongoDbErrorCodes.isDataIntegrityViolationCode(mongoException.getCode())) {
 
 				IndexInfo existingIndex = fetchIndexInformation(indexDefinition);
-				String message = "Cannot create index for '%s' in collection '%s' with keys '%s' and options '%s'.";
+				String message = "Cannot create index for '%s' in collection '%s' with keys '%s' and options '%s'";
 
 				if (existingIndex != null) {
-					message += " Index already defined as '%s'.";
+					message += " Index already defined as '%s'";
 				}
 
 				throw new DataIntegrityViolationException(
@@ -189,8 +182,7 @@ public boolean isIndexCreatorFor(MappingContext<?, ?> context) {
 		return this.mappingContext.equals(context);
 	}
 
-	@Nullable
-	private IndexInfo fetchIndexInformation(@Nullable IndexDefinitionHolder indexDefinition) {
+	private @Nullable IndexInfo fetchIndexInformation(@Nullable IndexDefinitionHolder indexDefinition) {
 
 		if (indexDefinition == null) {
 			return null;
@@ -209,8 +201,10 @@ private IndexInfo fetchIndexInformation(@Nullable IndexDefinitionHolder indexDef
 					orElse(null);
 
 		} catch (Exception e) {
-			LOGGER.debug(
-					String.format("Failed to load index information for collection '%s'.", indexDefinition.getCollection()), e);
+			if(LOGGER.isDebugEnabled()) {
+				LOGGER.debug(
+						String.format("Failed to load index information for collection '%s'", indexDefinition.getCollection()), e);
+			}
 		}
 
 		return null;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java
index b0e997c43c..b7beaaa3e1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,7 @@
  */
 package org.springframework.data.mongodb.core.index;
 
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
+import java.lang.annotation.Annotation;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,13 +24,16 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
+import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mapping.Association;
@@ -51,14 +51,15 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.mongodb.util.DotPath;
+import org.springframework.data.mongodb.util.DurationUtil;
+import org.springframework.data.mongodb.util.spel.ExpressionUtils;
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.EvaluationContext;
-import org.springframework.expression.Expression;
-import org.springframework.expression.ParserContext;
-import org.springframework.expression.common.LiteralExpression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
@@ -74,11 +75,13 @@
  * @author Thomas Darimont
  * @author Martin Macko
  * @author Mark Paluch
+ * @author Dave Perryman
+ * @author Stefan Tirea
  * @since 1.5
  */
 public class MongoPersistentEntityIndexResolver implements IndexResolver {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(MongoPersistentEntityIndexResolver.class);
+	private static final Log LOGGER = LogFactory.getLog(MongoPersistentEntityIndexResolver.class);
 	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
 
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@@ -96,9 +99,6 @@ public MongoPersistentEntityIndexResolver(
 		this.mappingContext = mappingContext;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexResolver#resolveIndexForClass(org.springframework.data.util.TypeInformation)
-	 */
 	@Override
 	public Iterable<? extends IndexDefinitionHolder> resolveIndexFor(TypeInformation<?> typeInformation) {
 		return resolveIndexForEntity(mappingContext.getRequiredPersistentEntity(typeInformation));
@@ -110,19 +110,22 @@ public Iterable<? extends IndexDefinitionHolder> resolveIndexFor(TypeInformation
 	 * {@link GeospatialIndex}. The given {@literal root} has therefore to be annotated with {@link Document}.
 	 *
 	 * @param root must not be null.
-	 * @return List of {@link IndexDefinitionHolder}. Will never be {@code null}.
+	 * @return List of {@link IndexDefinitionHolder}. Will never be {@literal null}.
 	 * @throws IllegalArgumentException in case of missing {@link Document} annotation marking root entities.
 	 */
 	public List<IndexDefinitionHolder> resolveIndexForEntity(MongoPersistentEntity<?> root) {
 
-		Assert.notNull(root, "MongoPersistentEntity must not be null!");
+		Assert.notNull(root, "MongoPersistentEntity must not be null");
 		Document document = root.findAnnotation(Document.class);
 		Assert.notNull(document, () -> String
-				.format("Entity %s is not a collection root. Make sure to annotate it with @Document!", root.getName()));
+				.format("Entity %s is not a collection root; Make sure to annotate it with @Document", root.getName()));
+
+		verifyWildcardIndexedProjection(root);
 
 		List<IndexDefinitionHolder> indexInformation = new ArrayList<>();
 		String collection = root.getCollection();
 		indexInformation.addAll(potentiallyCreateCompoundIndexDefinitions("", collection, root));
+		indexInformation.addAll(potentiallyCreateWildcardIndexDefinitions("", collection, root));
 		indexInformation.addAll(potentiallyCreateTextIndexDefinition(root, collection));
 
 		root.doWithProperties((PropertyHandler<MongoPersistentProperty>) property -> this
@@ -133,13 +136,36 @@ public List<IndexDefinitionHolder> resolveIndexForEntity(MongoPersistentEntity<?
 		return indexInformation;
 	}
 
+	private void verifyWildcardIndexedProjection(MongoPersistentEntity<?> entity) {
+
+		entity.doWithAll(it -> {
+
+			if (it.isAnnotationPresent(WildcardIndexed.class)) {
+
+				WildcardIndexed indexed = it.getRequiredAnnotation(WildcardIndexed.class);
+
+				if (!ObjectUtils.isEmpty(indexed.wildcardProjection())) {
+
+					throw new MappingException(String.format(
+							"WildcardIndexed.wildcardProjection cannot be used on nested paths; Offending property: %s.%s",
+							entity.getName(), it.getName()));
+				}
+			}
+		});
+	}
+
 	private void potentiallyAddIndexForProperty(MongoPersistentEntity<?> root, MongoPersistentProperty persistentProperty,
 			List<IndexDefinitionHolder> indexes, CycleGuard guard) {
 
 		try {
+			if (isMapWithoutWildcardIndex(persistentProperty)) {
+				return;
+			}
+
 			if (persistentProperty.isEntity()) {
-				indexes.addAll(resolveIndexForClass(persistentProperty.getTypeInformation().getActualType(),
-						persistentProperty.getFieldName(), Path.of(persistentProperty), root.getCollection(), guard));
+				indexes.addAll(resolveIndexForEntity(mappingContext.getRequiredPersistentEntity(persistentProperty),
+						persistentProperty.isUnwrapped() ? "" : persistentProperty.getFieldName(), Path.of(persistentProperty),
+						root.getCollection(), guard));
 			}
 
 			List<IndexDefinitionHolder> indexDefinitions = createIndexDefinitionHolderForProperty(
@@ -148,7 +174,9 @@ private void potentiallyAddIndexForProperty(MongoPersistentEntity<?> root, Mongo
 				indexes.addAll(indexDefinitions);
 			}
 		} catch (CyclicPropertyReferenceException e) {
-			LOGGER.info(e.getMessage());
+			if (LOGGER.isInfoEnabled()) {
+				LOGGER.info(e.getMessage());
+			}
 		}
 	}
 
@@ -161,15 +189,20 @@ private void potentiallyAddIndexForProperty(MongoPersistentEntity<?> root, Mongo
 	 * @param collection
 	 * @param guard
 	 * @return List of {@link IndexDefinitionHolder} representing indexes for given type and its referenced property
-	 *         types. Will never be {@code null}.
+	 *         types. Will never be {@literal null}.
 	 */
-	private List<IndexDefinitionHolder> resolveIndexForClass(final TypeInformation<?> type, final String dotPath,
-			final Path path, final String collection, final CycleGuard guard) {
+	private List<IndexDefinitionHolder> resolveIndexForClass(TypeInformation<?> type, String dotPath, Path path,
+			String collection, CycleGuard guard) {
+
+		return resolveIndexForEntity(mappingContext.getRequiredPersistentEntity(type), dotPath, path, collection, guard);
+	}
 
-		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(type);
+	private List<IndexDefinitionHolder> resolveIndexForEntity(MongoPersistentEntity<?> entity, String dotPath, Path path,
+			String collection, CycleGuard guard) {
 
-		final List<IndexDefinitionHolder> indexInformation = new ArrayList<>();
+		List<IndexDefinitionHolder> indexInformation = new ArrayList<>();
 		indexInformation.addAll(potentiallyCreateCompoundIndexDefinitions(dotPath, collection, entity));
+		indexInformation.addAll(potentiallyCreateWildcardIndexDefinitions(dotPath, collection, entity));
 
 		entity.doWithProperties((PropertyHandler<MongoPersistentProperty>) property -> this
 				.guardAndPotentiallyAddIndexForProperty(property, dotPath, path, collection, indexInformation, guard));
@@ -182,22 +215,30 @@ private List<IndexDefinitionHolder> resolveIndexForClass(final TypeInformation<?
 	private void guardAndPotentiallyAddIndexForProperty(MongoPersistentProperty persistentProperty, String dotPath,
 			Path path, String collection, List<IndexDefinitionHolder> indexes, CycleGuard guard) {
 
-		String propertyDotPath = (StringUtils.hasText(dotPath) ? dotPath + "." : "") + persistentProperty.getFieldName();
+		DotPath propertyDotPath = DotPath.from(dotPath);
+
+		if (!persistentProperty.isUnwrapped()) {
+			propertyDotPath = propertyDotPath.append(persistentProperty.getFieldName());
+		}
 
 		Path propertyPath = path.append(persistentProperty);
 		guard.protect(persistentProperty, propertyPath);
 
+		if (isMapWithoutWildcardIndex(persistentProperty)) {
+			return;
+		}
+
 		if (persistentProperty.isEntity()) {
 			try {
-				indexes.addAll(resolveIndexForClass(persistentProperty.getTypeInformation().getActualType(), propertyDotPath,
-						propertyPath, collection, guard));
+				indexes.addAll(resolveIndexForEntity(mappingContext.getRequiredPersistentEntity(persistentProperty),
+						propertyDotPath.toString(), propertyPath, collection, guard));
 			} catch (CyclicPropertyReferenceException e) {
 				LOGGER.info(e.getMessage());
 			}
 		}
 
-		List<IndexDefinitionHolder> indexDefinitions = createIndexDefinitionHolderForProperty(propertyDotPath, collection,
-				persistentProperty);
+		List<IndexDefinitionHolder> indexDefinitions = createIndexDefinitionHolderForProperty(propertyDotPath.toString(),
+				collection, persistentProperty);
 
 		if (!indexDefinitions.isEmpty()) {
 			indexes.addAll(indexDefinitions);
@@ -209,6 +250,13 @@ private List<IndexDefinitionHolder> createIndexDefinitionHolderForProperty(Strin
 
 		List<IndexDefinitionHolder> indices = new ArrayList<>(2);
 
+		if (persistentProperty.isUnwrapped() && (persistentProperty.isAnnotationPresent(Indexed.class)
+				|| persistentProperty.isAnnotationPresent(HashIndexed.class)
+				|| persistentProperty.isAnnotationPresent(GeoSpatialIndexed.class))) {
+			throw new InvalidDataAccessApiUsageException(
+					String.format("Index annotation not allowed on unwrapped object for path '%s'", dotPath));
+		}
+
 		if (persistentProperty.isAnnotationPresent(Indexed.class)) {
 			indices.add(createIndexDefinition(dotPath, collection, persistentProperty));
 		} else if (persistentProperty.isAnnotationPresent(GeoSpatialIndexed.class)) {
@@ -218,6 +266,11 @@ private List<IndexDefinitionHolder> createIndexDefinitionHolderForProperty(Strin
 		if (persistentProperty.isAnnotationPresent(HashIndexed.class)) {
 			indices.add(createHashedIndexDefinition(dotPath, collection, persistentProperty));
 		}
+		if (persistentProperty.isAnnotationPresent(WildcardIndexed.class)) {
+			indices.add(createWildcardIndexDefinition(dotPath, collection,
+					persistentProperty.getRequiredAnnotation(WildcardIndexed.class),
+					mappingContext.getPersistentEntity(persistentProperty)));
+		}
 
 		return indices;
 	}
@@ -232,6 +285,18 @@ private List<IndexDefinitionHolder> potentiallyCreateCompoundIndexDefinitions(St
 		return createCompoundIndexDefinitions(dotPath, collection, entity);
 	}
 
+	private List<IndexDefinitionHolder> potentiallyCreateWildcardIndexDefinitions(String dotPath, String collection,
+			MongoPersistentEntity<?> entity) {
+
+		if (!entity.isAnnotationPresent(WildcardIndexed.class)) {
+			return Collections.emptyList();
+		}
+
+		return Collections.singletonList(new IndexDefinitionHolder(dotPath,
+				createWildcardIndexDefinition(dotPath, collection, entity.getRequiredAnnotation(WildcardIndexed.class), entity),
+				collection));
+	}
+
 	private Collection<? extends IndexDefinitionHolder> potentiallyCreateTextIndexDefinition(
 			MongoPersistentEntity<?> root, String collection) {
 
@@ -257,7 +322,7 @@ private Collection<? extends IndexDefinitionHolder> potentiallyCreateTextIndexDe
 		}
 
 		try {
-			appendTextIndexInformation("", Path.empty(), indexDefinitionBuilder, root,
+			appendTextIndexInformation(DotPath.empty(), Path.empty(), indexDefinitionBuilder, root,
 					new TextIndexIncludeOptions(IncludeStrategy.DEFAULT), new CycleGuard());
 		} catch (CyclicPropertyReferenceException e) {
 			LOGGER.info(e.getMessage());
@@ -278,9 +343,8 @@ private Collection<? extends IndexDefinitionHolder> potentiallyCreateTextIndexDe
 
 	}
 
-	private void appendTextIndexInformation(final String dotPath, final Path path,
-			final TextIndexDefinitionBuilder indexDefinitionBuilder, final MongoPersistentEntity<?> entity,
-			final TextIndexIncludeOptions includeOptions, final CycleGuard guard) {
+	private void appendTextIndexInformation(DotPath dotPath, Path path, TextIndexDefinitionBuilder indexDefinitionBuilder,
+			MongoPersistentEntity<?> entity, TextIndexIncludeOptions includeOptions, CycleGuard guard) {
 
 		entity.doWithProperties(new PropertyHandler<MongoPersistentProperty>() {
 
@@ -289,16 +353,19 @@ public void doWithPersistentProperty(MongoPersistentProperty persistentProperty)
 
 				guard.protect(persistentProperty, path);
 
-				if (persistentProperty.isExplicitLanguageProperty() && !StringUtils.hasText(dotPath)) {
+				if (persistentProperty.isExplicitLanguageProperty() && dotPath.isEmpty()) {
 					indexDefinitionBuilder.withLanguageOverride(persistentProperty.getFieldName());
 				}
 
+				if (persistentProperty.isMap()) {
+					return;
+				}
+
 				TextIndexed indexed = persistentProperty.findAnnotation(TextIndexed.class);
 
 				if (includeOptions.isForce() || indexed != null || persistentProperty.isEntity()) {
 
-					String propertyDotPath = (StringUtils.hasText(dotPath) ? dotPath + "." : "")
-							+ persistentProperty.getFieldName();
+					DotPath propertyDotPath = dotPath.append(persistentProperty.getFieldName());
 
 					Path propertyPath = path.append(persistentProperty);
 
@@ -311,20 +378,20 @@ public void doWithPersistentProperty(MongoPersistentProperty persistentProperty)
 						TextIndexIncludeOptions optionsForNestedType = includeOptions;
 						if (!IncludeStrategy.FORCE.equals(includeOptions.getStrategy()) && indexed != null) {
 							optionsForNestedType = new TextIndexIncludeOptions(IncludeStrategy.FORCE,
-									new TextIndexedFieldSpec(propertyDotPath, weight));
+									new TextIndexedFieldSpec(propertyDotPath.toString(), weight));
 						}
 
 						try {
 							appendTextIndexInformation(propertyDotPath, propertyPath, indexDefinitionBuilder,
-									mappingContext.getPersistentEntity(persistentProperty.getActualType()), optionsForNestedType, guard);
+									mappingContext.getRequiredPersistentEntity(persistentProperty.getActualType()), optionsForNestedType, guard);
 						} catch (CyclicPropertyReferenceException e) {
 							LOGGER.info(e.getMessage());
 						} catch (InvalidDataAccessApiUsageException e) {
-							LOGGER.info(String.format("Potentially invalid index structure discovered. Breaking operation for %s.",
+							LOGGER.info(String.format("Potentially invalid index structure discovered; Breaking operation for %s",
 									entity.getName()), e);
 						}
 					} else if (includeOptions.isForce() || indexed != null) {
-						indexDefinitionBuilder.onField(propertyDotPath, weight);
+						indexDefinitionBuilder.onField(propertyDotPath.toString(), weight);
 					}
 				}
 
@@ -385,6 +452,32 @@ protected IndexDefinitionHolder createCompoundIndexDefinition(String dotPath, St
 			indexDefinition.background();
 		}
 
+		if (StringUtils.hasText(index.partialFilter())) {
+			indexDefinition.partial(evaluatePartialFilter(index.partialFilter(), entity));
+		}
+
+		indexDefinition.collation(resolveCollation(index, entity));
+		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
+	}
+
+	protected IndexDefinitionHolder createWildcardIndexDefinition(String dotPath, String collection,
+			WildcardIndexed index, @Nullable MongoPersistentEntity<?> entity) {
+
+		WildcardIndex indexDefinition = new WildcardIndex(dotPath);
+
+		if (StringUtils.hasText(index.wildcardProjection()) && ObjectUtils.isEmpty(dotPath)) {
+			indexDefinition.wildcardProjection(evaluateWildcardProjection(index.wildcardProjection(), entity));
+		}
+
+		if (!index.useGeneratedName()) {
+			indexDefinition.named(pathAwareIndexName(index.name(), dotPath, entity, null));
+		}
+
+		if (StringUtils.hasText(index.partialFilter())) {
+			indexDefinition.partial(evaluatePartialFilter(index.partialFilter(), entity));
+		}
+
+		indexDefinition.collation(resolveCollation(index, entity));
 		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
 	}
 
@@ -392,16 +485,16 @@ private org.bson.Document resolveCompoundIndexKeyFromStringDefinition(String dot
 			PersistentEntity<?, ?> entity) {
 
 		if (!StringUtils.hasText(dotPath) && !StringUtils.hasText(keyDefinitionString)) {
-			throw new InvalidDataAccessApiUsageException("Cannot create index on root level for empty keys.");
+			throw new InvalidDataAccessApiUsageException("Cannot create index on root level for empty keys");
 		}
 
 		if (!StringUtils.hasText(keyDefinitionString)) {
 			return new org.bson.Document(dotPath, 1);
 		}
 
-		Object keyDefToUse = evaluate(keyDefinitionString, getEvaluationContextForProperty(entity));
+		Object keyDefToUse = ExpressionUtils.evaluate(keyDefinitionString, () -> getEvaluationContextForProperty(entity));
 
-		org.bson.Document dbo = (keyDefToUse instanceof org.bson.Document) ? (org.bson.Document) keyDefToUse
+		org.bson.Document dbo = (keyDefToUse instanceof org.bson.Document document) ? document
 				: org.bson.Document.parse(ObjectUtils.nullSafeToString(keyDefToUse));
 
 		if (!StringUtils.hasText(dotPath)) {
@@ -425,8 +518,7 @@ private org.bson.Document resolveCompoundIndexKeyFromStringDefinition(String dot
 	 * @param persistentProperty
 	 * @return
 	 */
-	@Nullable
-	protected IndexDefinitionHolder createIndexDefinition(String dotPath, String collection,
+	protected @Nullable IndexDefinitionHolder createIndexDefinition(String dotPath, String collection,
 			MongoPersistentProperty persistentProperty) {
 
 		Indexed index = persistentProperty.findAnnotation(Indexed.class);
@@ -463,20 +555,66 @@ protected IndexDefinitionHolder createIndexDefinition(String dotPath, String col
 
 			if (index.expireAfterSeconds() >= 0) {
 				throw new IllegalStateException(String.format(
-						"@Indexed already defines an expiration timeout of %s seconds via Indexed#expireAfterSeconds. Please make to use either expireAfterSeconds or expireAfter.",
+						"@Indexed already defines an expiration timeout of %s seconds via Indexed#expireAfterSeconds; Please make to use either expireAfterSeconds or expireAfter",
 						index.expireAfterSeconds()));
 			}
 
 			Duration timeout = computeIndexTimeout(index.expireAfter(),
-					getEvaluationContextForProperty(persistentProperty.getOwner()));
-			if (!timeout.isZero() && !timeout.isNegative()) {
+					() -> getEvaluationContextForProperty(persistentProperty.getOwner()));
+			if (!timeout.isNegative()) {
 				indexDefinition.expire(timeout);
 			}
 		}
 
+		if (StringUtils.hasText(index.partialFilter())) {
+			indexDefinition.partial(evaluatePartialFilter(index.partialFilter(), persistentProperty.getOwner()));
+		}
+
+		indexDefinition.collation(resolveCollation(index, persistentProperty.getOwner()));
 		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
 	}
 
+	private PartialIndexFilter evaluatePartialFilter(String filterExpression, @Nullable PersistentEntity<?, ?> entity) {
+
+		Object result = ExpressionUtils.evaluate(filterExpression, () -> getEvaluationContextForProperty(entity));
+
+		if (result instanceof org.bson.Document document) {
+			return PartialIndexFilter.of(document);
+		}
+
+		return PartialIndexFilter.of(BsonUtils.parse(filterExpression, null));
+	}
+
+	private org.bson.Document evaluateWildcardProjection(String projectionExpression, @Nullable PersistentEntity<?, ?> entity) {
+
+		Object result = ExpressionUtils.evaluate(projectionExpression, () -> getEvaluationContextForProperty(entity));
+
+		if (result instanceof org.bson.Document document) {
+			return document;
+		}
+
+		return BsonUtils.parse(projectionExpression, null);
+	}
+
+	private Collation evaluateCollation(String collationExpression, @Nullable PersistentEntity<?, ?> entity) {
+
+		Object result = ExpressionUtils.evaluate(collationExpression, () -> getEvaluationContextForProperty(entity));
+		if (result instanceof org.bson.Document document) {
+			return Collation.from(document);
+		}
+		if (result instanceof Collation collation) {
+			return collation;
+		}
+		if (result instanceof String stringValue) {
+			return Collation.parse(stringValue);
+		}
+		if (result instanceof Map) {
+			return Collation.from(new org.bson.Document((Map<String, ?>) result));
+		}
+		throw new IllegalStateException("Cannot parse collation " + result);
+
+	}
+
 	/**
 	 * Creates {@link HashedIndex} wrapped in {@link IndexDefinitionHolder} out of {@link HashIndexed} for a given
 	 * {@link MongoPersistentProperty}.
@@ -551,8 +689,7 @@ public void setEvaluationContextProvider(EvaluationContextProvider evaluationCon
 	 * @param persistentProperty
 	 * @return
 	 */
-	@Nullable
-	protected IndexDefinitionHolder createGeoSpatialIndexDefinition(String dotPath, String collection,
+	protected @Nullable IndexDefinitionHolder createGeoSpatialIndexDefinition(String dotPath, String collection,
 			MongoPersistentProperty persistentProperty) {
 
 		GeoSpatialIndexed index = persistentProperty.findAnnotation(GeoSpatialIndexed.class);
@@ -570,7 +707,7 @@ protected IndexDefinitionHolder createGeoSpatialIndexDefinition(String dotPath,
 					.named(pathAwareIndexName(index.name(), dotPath, persistentProperty.getOwner(), persistentProperty));
 		}
 
-		indexDefinition.typed(index.type()).withBucketSize(index.bucketSize()).withAdditionalField(index.additionalField());
+		indexDefinition.typed(index.type()).withAdditionalField(index.additionalField());
 
 		return new IndexDefinitionHolder(dotPath, indexDefinition, collection);
 	}
@@ -581,7 +718,7 @@ private String pathAwareIndexName(String indexName, String dotPath, @Nullable Pe
 		String nameToUse = "";
 		if (StringUtils.hasText(indexName)) {
 
-			Object result = evaluate(indexName, getEvaluationContextForProperty(entity));
+			Object result = ExpressionUtils.evaluate(indexName, () -> getEvaluationContextForProperty(entity));
 
 			if (result != null) {
 				nameToUse = ObjectUtils.nullSafeToString(result);
@@ -616,16 +753,16 @@ private void resolveAndAddIndexesForAssociation(Association<MongoPersistentPrope
 
 		MongoPersistentProperty property = association.getInverse();
 
-		String propertyDotPath = (StringUtils.hasText(path) ? path + "." : "") + property.getFieldName();
+		DotPath propertyDotPath = DotPath.from(path).append(property.getFieldName());
 
 		if (property.isAnnotationPresent(GeoSpatialIndexed.class) || property.isAnnotationPresent(TextIndexed.class)) {
 			throw new MappingException(
-					String.format("Cannot create geospatial-/text- index on DBRef in collection '%s' for path '%s'.", collection,
+					String.format("Cannot create geospatial-/text- index on DBRef in collection '%s' for path '%s'", collection,
 							propertyDotPath));
 		}
 
-		List<IndexDefinitionHolder> indexDefinitions = createIndexDefinitionHolderForProperty(propertyDotPath, collection,
-				property);
+		List<IndexDefinitionHolder> indexDefinitions = createIndexDefinitionHolderForProperty(propertyDotPath.toString(),
+				collection, property);
 
 		if (!indexDefinitions.isEmpty()) {
 			indexes.addAll(indexDefinitions);
@@ -642,36 +779,32 @@ private void resolveAndAddIndexesForAssociation(Association<MongoPersistentPrope
 	 * @since 2.2
 	 * @throws IllegalArgumentException for invalid duration values.
 	 */
-	private static Duration computeIndexTimeout(String timeoutValue, EvaluationContext evaluationContext) {
-
-		Object evaluatedTimeout = evaluate(timeoutValue, evaluationContext);
-
-		if (evaluatedTimeout == null) {
-			return Duration.ZERO;
-		}
-
-		if (evaluatedTimeout instanceof Duration) {
-			return (Duration) evaluatedTimeout;
-		}
-
-		String val = evaluatedTimeout.toString();
-
-		if (val == null) {
-			return Duration.ZERO;
-		}
-
-		return DurationStyle.detectAndParse(val);
+	private static Duration computeIndexTimeout(String timeoutValue, Supplier<EvaluationContext> evaluationContext) {
+		return DurationUtil.evaluate(timeoutValue, evaluationContext);
 	}
 
-	@Nullable
-	private static Object evaluate(String value, EvaluationContext evaluationContext) {
+	/**
+	 * Resolve the "collation" attribute from a given {@link Annotation} if present.
+	 *
+	 * @param annotation
+	 * @param entity
+	 * @return the collation present on either the annotation or the entity as a fallback. Might be {@literal null}.
+	 * @since 4.0
+	 */
+	private @Nullable Collation resolveCollation(Annotation annotation, @Nullable PersistentEntity<?, ?> entity) {
+		return MergedAnnotation.from(annotation).getValue("collation", String.class).filter(StringUtils::hasText)
+				.map(it -> evaluateCollation(it, entity)).orElseGet(() -> {
 
-		Expression expression = PARSER.parseExpression(value, ParserContext.TEMPLATE_EXPRESSION);
-		if (expression instanceof LiteralExpression) {
-			return value;
-		}
+					if (entity instanceof MongoPersistentEntity<?> mongoPersistentEntity
+							&& mongoPersistentEntity.hasCollation()) {
+						return mongoPersistentEntity.getCollation();
+					}
+					return null;
+				});
+	}
 
-		return expression.getValue(evaluationContext, Object.class);
+	private static boolean isMapWithoutWildcardIndex(MongoPersistentProperty property) {
+		return property.isMap() && !property.isAnnotationPresent(WildcardIndexed.class);
 	}
 
 	/**
@@ -733,8 +866,6 @@ private String createMapKey(MongoPersistentProperty property) {
 		 * @author Christoph Strobl
 		 * @author Mark Paluch
 		 */
-		@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-		@EqualsAndHashCode
 		static class Path {
 
 			private static final Path EMPTY = new Path(Collections.emptyList(), false);
@@ -742,6 +873,11 @@ static class Path {
 			private final List<PersistentProperty<?>> elements;
 			private final boolean cycle;
 
+			private Path(List<PersistentProperty<?>> elements, boolean cycle) {
+				this.elements = elements;
+				this.cycle = cycle;
+			}
+
 			/**
 			 * @return an empty {@link Path}.
 			 * @since 1.10.8
@@ -785,10 +921,6 @@ public boolean isCycle() {
 				return cycle;
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see java.lang.Object#toString()
-			 */
 			@Override
 			public String toString() {
 				return this.elements.isEmpty() ? "(empty)" : toPath(this.elements.iterator());
@@ -843,6 +975,28 @@ private static String toPath(Iterator<PersistentProperty<?>> iterator) {
 
 				return builder.toString();
 			}
+
+			@Override
+			public boolean equals(@Nullable Object o) {
+				if (this == o)
+					return true;
+				if (o == null || getClass() != o.getClass())
+					return false;
+
+				Path that = (Path) o;
+
+				if (this.cycle != that.cycle) {
+					return false;
+				}
+				return ObjectUtils.nullSafeEquals(this.elements, that.elements);
+			}
+
+			@Override
+			public int hashCode() {
+				int result = ObjectUtils.nullSafeHashCode(elements);
+				result = 31 * result + (cycle ? 1 : 0);
+				return result;
+			}
 		}
 	}
 
@@ -865,10 +1019,6 @@ public CyclicPropertyReferenceException(String propertyName, @Nullable Class<?>
 			this.dotPath = dotPath;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Throwable#getMessage()
-		 */
 		@Override
 		public String getMessage() {
 			return String.format("Found cycle for field '%s' in type '%s' for path '%s'", propertyName,
@@ -923,23 +1073,20 @@ public IndexDefinition getIndexDefinition() {
 			return indexDefinition;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys()
-		 */
 		@Override
 		public org.bson.Document getIndexKeys() {
 			return indexDefinition.getIndexKeys();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions()
-		 */
 		@Override
 		public org.bson.Document getIndexOptions() {
 			return indexDefinition.getIndexOptions();
 		}
+
+		@Override
+		public String toString() {
+			return "IndexDefinitionHolder{" + "indexKeys=" + getIndexKeys() + '}';
+		}
 	}
 
 	/**
@@ -949,7 +1096,7 @@ public org.bson.Document getIndexOptions() {
 	static class TextIndexIncludeOptions {
 
 		enum IncludeStrategy {
-			FORCE, DEFAULT;
+			FORCE, DEFAULT
 		}
 
 		private final IncludeStrategy strategy;
@@ -969,8 +1116,7 @@ public IncludeStrategy getStrategy() {
 			return strategy;
 		}
 
-		@Nullable
-		public TextIndexedFieldSpec getParentFieldSpec() {
+		public @Nullable TextIndexedFieldSpec getParentFieldSpec() {
 			return parentFieldSpec;
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java
index 596cdd8159..8b835f72c5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/PartialIndexFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,29 +16,29 @@
 package org.springframework.data.mongodb.core.index;
 
 import org.bson.Document;
-
-import lombok.AccessLevel;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
-
-import com.mongodb.DBObject;
+import org.springframework.util.Assert;
 
 /**
- * {@link IndexFilter} implementation for usage with plain {@link DBObject} as well as {@link CriteriaDefinition} filter
+ * {@link IndexFilter} implementation for usage with plain {@link Document} as well as {@link CriteriaDefinition} filter
  * expressions.
  *
  * @author Christoph Strobl
  * @since 1.10
  */
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class PartialIndexFilter implements IndexFilter {
 
-	private final @NonNull Object filterExpression;
+	private final Object filterExpression;
+
+	private PartialIndexFilter(Object filterExpression) {
+
+		Assert.notNull(filterExpression, "FilterExpression must not be null");
+
+		this.filterExpression = filterExpression;
+	}
 
 	/**
-	 * Create new {@link PartialIndexFilter} for given {@link DBObject filter expression}.
+	 * Create new {@link PartialIndexFilter} for given {@link Document filter expression}.
 	 *
 	 * @param where must not be {@literal null}.
 	 * @return
@@ -57,21 +57,17 @@ public static PartialIndexFilter of(CriteriaDefinition where) {
 		return new PartialIndexFilter(where);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexFilter#getFilterObject()
-	 */
 	public Document getFilterObject() {
 
-		if (filterExpression instanceof Document) {
-			return (Document) filterExpression;
+		if (filterExpression instanceof Document document) {
+			return document;
 		}
 
-		if (filterExpression instanceof CriteriaDefinition) {
-			return ((CriteriaDefinition) filterExpression).getCriteriaObject();
+		if (filterExpression instanceof CriteriaDefinition criteriaDefinition) {
+			return criteriaDefinition.getCriteriaObject();
 		}
 
 		throw new IllegalArgumentException(
-				String.format("Unknown type %s used as filter expression.", filterExpression.getClass()));
+				String.format("Unknown type %s used as filter expression", filterExpression.getClass()));
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperations.java
index 37defd769c..15b110c08a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,9 +32,33 @@ public interface ReactiveIndexOperations {
 	 * class. If not it will be created.
 	 *
 	 * @param indexDefinition must not be {@literal null}.
+	 * @return a {@link Mono} emitting the name of the index on completion.
+	 * @deprecated since 4.5, in favor of {@link #createIndex(IndexDefinition)}.
 	 */
+	@Deprecated(since = "4.5", forRemoval = true)
 	Mono<String> ensureIndex(IndexDefinition indexDefinition);
 
+	/**
+	 * Create the index for the provided {@link IndexDefinition} exists for the collection indicated by the entity class.
+	 * If not it will be created.
+	 *
+	 * @param indexDefinition must not be {@literal null}.
+	 * @return the index name.
+	 * @since 4.5
+	 */
+	default Mono<String> createIndex(IndexDefinition indexDefinition) {
+		return ensureIndex(indexDefinition);
+	}
+
+	/**
+	 * Alters the index with given {@literal name}.
+	 *
+	 * @param name name of index to change.
+	 * @param options index options.
+	 * @since 4.1
+	 */
+	Mono<Void> alterIndex(String name, IndexOptions options);
+
 	/**
 	 * Drops an index from this collection.
 	 *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperationsProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperationsProvider.java
index af7c935f25..70dcfa0fbb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperationsProvider.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveIndexOperationsProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreator.java
index 29cdf656dc..0d818e19d9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
@@ -47,7 +48,7 @@
  */
 public class ReactiveMongoPersistentEntityIndexCreator {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveMongoPersistentEntityIndexCreator.class);
+	private static final Log LOGGER = LogFactory.getLog(ReactiveMongoPersistentEntityIndexCreator.class);
 
 	private final Map<Class<?>, Boolean> classesSeen = new ConcurrentHashMap<Class<?>, Boolean>();
 	private final MongoMappingContext mappingContext;
@@ -77,9 +78,9 @@ public ReactiveMongoPersistentEntityIndexCreator(MongoMappingContext mappingCont
 	public ReactiveMongoPersistentEntityIndexCreator(MongoMappingContext mappingContext,
 			ReactiveIndexOperationsProvider operationsProvider, IndexResolver indexResolver) {
 
-		Assert.notNull(mappingContext, "MongoMappingContext must not be null!");
-		Assert.notNull(operationsProvider, "ReactiveIndexOperations must not be null!");
-		Assert.notNull(indexResolver, "IndexResolver must not be null!");
+		Assert.notNull(mappingContext, "MongoMappingContext must not be null");
+		Assert.notNull(operationsProvider, "ReactiveIndexOperations must not be null");
+		Assert.notNull(indexResolver, "IndexResolver must not be null");
 
 		this.mappingContext = mappingContext;
 		this.operationsProvider = operationsProvider;
@@ -110,7 +111,7 @@ public Mono<Void> checkForIndexes(MongoPersistentEntity<?> entity) {
 			if (this.classesSeen.put(type, Boolean.TRUE) == null) {
 
 				if (LOGGER.isDebugEnabled()) {
-					LOGGER.debug("Analyzing class " + type + " for index information.");
+					LOGGER.debug("Analyzing class " + type + " for index information");
 				}
 
 				return checkForAndCreateIndexes(entity);
@@ -129,8 +130,8 @@ private Mono<Void> checkForAndCreateIndexes(MongoPersistentEntity<?> entity) {
 			String collection = entity.getCollection();
 			for (IndexDefinition indexDefinition : indexResolver.resolveIndexFor(entity.getTypeInformation())) {
 
-				IndexDefinitionHolder indexToCreate = indexDefinition instanceof IndexDefinitionHolder
-						? (IndexDefinitionHolder) indexDefinition
+				IndexDefinitionHolder indexToCreate = indexDefinition instanceof IndexDefinitionHolder definitionHolder
+						? definitionHolder
 						: new IndexDefinitionHolder("", indexDefinition, collection);
 
 				publishers.add(createIndex(indexToCreate));
@@ -142,8 +143,6 @@ private Mono<Void> checkForAndCreateIndexes(MongoPersistentEntity<?> entity) {
 
 	Mono<String> createIndex(IndexDefinitionHolder indexDefinition) {
 
-		JustOnceLogger.logWarnIndexCreationConfigurationChange(this.getClass().getName());
-
 		return operationsProvider.indexOps(indexDefinition.getCollection()).ensureIndex(indexDefinition) //
 				.onErrorResume(ReactiveMongoPersistentEntityIndexCreator::isDataIntegrityViolation,
 						e -> translateException(e, indexDefinition));
@@ -155,14 +154,14 @@ private Mono<? extends String> translateException(Throwable e, IndexDefinitionHo
 		Mono<IndexInfo> existingIndex = fetchIndexInformation(indexDefinition);
 
 		Mono<String> defaultError = Mono.error(new DataIntegrityViolationException(
-				String.format("Cannot create index for '%s' in collection '%s' with keys '%s' and options '%s'.",
+				String.format("Cannot create index for '%s' in collection '%s' with keys '%s' and options '%s'",
 						indexDefinition.getPath(), indexDefinition.getCollection(), indexDefinition.getIndexKeys(),
 						indexDefinition.getIndexOptions()),
 				e.getCause()));
 
 		return existingIndex.flatMap(it -> {
 			return Mono.<String> error(new DataIntegrityViolationException(
-					String.format("Index already defined as '%s'.", indexDefinition.getPath()), e.getCause()));
+					String.format("Index already defined as '%s'", indexDefinition.getPath()), e.getCause()));
 		}).switchIfEmpty(defaultError);
 	}
 
@@ -176,9 +175,11 @@ private Mono<IndexInfo> fetchIndexInformation(IndexDefinitionHolder indexDefinit
 				.filter(indexInfo -> ObjectUtils.nullSafeEquals(indexNameToLookUp, indexInfo.getName())) //
 				.next() //
 				.doOnError(e -> {
-					LOGGER.debug(
-							String.format("Failed to load index information for collection '%s'.", indexDefinition.getCollection()),
-							e);
+					if(LOGGER.isDebugEnabled()) {
+						LOGGER.debug(
+								String.format("Failed to load index information for collection '%s'", indexDefinition.getCollection()),
+								e);
+					}
 				});
 	}
 
@@ -186,8 +187,8 @@ private static boolean isDataIntegrityViolation(Throwable t) {
 
 		if (t instanceof UncategorizedMongoDbException) {
 
-			return t.getCause() instanceof MongoException
-					&& MongoDbErrorCodes.isDataIntegrityViolationCode(((MongoException) t.getCause()).getCode());
+			return t.getCause() instanceof MongoException mongoException
+					&& MongoDbErrorCodes.isDataIntegrityViolationCode(mongoException.getCode());
 		}
 
 		return false;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexDefinition.java
new file mode 100644
index 0000000000..e3ea12baa9
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexDefinition.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+
+/**
+ * Definition for an Atlas Search Index (Search Index or Vector Index).
+ *
+ * @author Marcin Grzejszczak
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public interface SearchIndexDefinition {
+
+	/**
+	 * @return the name of the index.
+	 */
+	String getName();
+
+	/**
+	 * @return the type of the index. Typically, {@code search} or {@code vectorSearch}.
+	 */
+	String getType();
+
+	/**
+	 * Returns the index document for this index without any potential entity context resolving field name mappings. The
+	 * resulting document contains the index name, type and {@link #getDefinition(TypeInformation, MappingContext)
+	 * definition}.
+	 *
+	 * @return never {@literal null}.
+	 */
+	default Document getRawIndexDocument() {
+		return getIndexDocument(null, null);
+	}
+
+	/**
+	 * Returns the index document for this index in the context of a potential entity to resolve field name mappings. The
+	 * resulting document contains the index name, type and {@link #getDefinition(TypeInformation, MappingContext)
+	 * definition}.
+	 *
+	 * @param entity can be {@literal null}.
+	 * @param mappingContext
+	 * @return never {@literal null}.
+	 */
+	default Document getIndexDocument(@Nullable TypeInformation<?> entity,
+			@Nullable MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+		Document document = new Document();
+		document.put("name", getName());
+		document.put("type", getType());
+		document.put("definition", getDefinition(entity, mappingContext));
+
+		return document;
+	}
+
+	/**
+	 * Returns the actual index definition for this index in the context of a potential entity to resolve field name
+	 * mappings. Entity and context can be {@literal null} to create a generic index definition without applying field
+	 * name mapping.
+	 *
+	 * @param entity can be {@literal null}.
+	 * @param mappingContext can be {@literal null}.
+	 * @return never {@literal null}.
+	 */
+	Document getDefinition(@Nullable TypeInformation<?> entity,
+			@Nullable MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext);
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexInfo.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexInfo.java
new file mode 100644
index 0000000000..6da94dd130
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexInfo.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import java.util.function.Supplier;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.Lazy;
+import org.springframework.data.util.TypeInformation;
+
+/**
+ * Index information for a MongoDB Search Index.
+ *
+ * @author Christoph Strobl
+ * @since 4.5
+ */
+public class SearchIndexInfo {
+
+	private final @Nullable Object id;
+	private final SearchIndexStatus status;
+	private final Lazy<SearchIndexDefinition> indexDefinition;
+
+	SearchIndexInfo(@Nullable Object id, SearchIndexStatus status, Supplier<SearchIndexDefinition> indexDefinition) {
+		this.id = id;
+		this.status = status;
+		this.indexDefinition = Lazy.of(indexDefinition);
+	}
+
+	/**
+	 * Parse a BSON document describing an index into a {@link SearchIndexInfo}.
+	 *
+	 * @param source BSON document describing the index.
+	 * @return a new {@link SearchIndexInfo} instance.
+	 */
+	public static SearchIndexInfo parse(String source) {
+		return of(Document.parse(source));
+	}
+
+	/**
+	 * Create an index from its BSON {@link Document} representation into a {@link SearchIndexInfo}.
+	 *
+	 * @param indexDocument BSON document describing the index.
+	 * @return a new {@link SearchIndexInfo} instance.
+	 */
+	public static SearchIndexInfo of(Document indexDocument) {
+
+		Object id = indexDocument.get("id");
+		SearchIndexStatus status = SearchIndexStatus
+				.valueOf(indexDocument.get("status", SearchIndexStatus.DOES_NOT_EXIST.name()));
+
+		return new SearchIndexInfo(id, status, () -> readIndexDefinition(indexDocument));
+	}
+
+	/**
+	 * The id of the index. Can be {@literal null}, eg. for an index not yet created.
+	 *
+	 * @return can be {@literal null}.
+	 */
+	@Nullable
+	public Object getId() {
+		return id;
+	}
+
+	/**
+	 * @return the current status of the index.
+	 */
+	public SearchIndexStatus getStatus() {
+		return status;
+	}
+
+	/**
+	 * @return the current index definition.
+	 */
+	public SearchIndexDefinition getIndexDefinition() {
+		return indexDefinition.get();
+	}
+
+	private static SearchIndexDefinition readIndexDefinition(Document document) {
+
+		String type = document.get("type", "search");
+		if (type.equals("vectorSearch")) {
+			return VectorIndex.of(document);
+		}
+
+		return new SearchIndexDefinition() {
+
+			@Override
+			public String getName() {
+				return document.getString("name");
+			}
+
+			@Override
+			public String getType() {
+				return type;
+			}
+
+			@Override
+			public Document getDefinition(@Nullable TypeInformation<?> entity,
+					@Nullable MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+				if (document.containsKey("latestDefinition")) {
+					return document.get("latestDefinition", new Document());
+				}
+				return document.get("definition", new Document());
+			}
+
+			@Override
+			public String toString() {
+				return getDefinition(null, null).toJson();
+			}
+		};
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexOperations.java
new file mode 100644
index 0000000000..ee3f59cf95
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexOperations.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import org.springframework.dao.DataAccessException;
+
+/**
+ * Search Index operations on a collection for Atlas Search.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 4.5
+ * @see VectorIndex
+ */
+public interface SearchIndexOperations {
+
+	/**
+	 * Create the index for the given {@link SearchIndexDefinition} in the collection indicated by the entity class.
+	 *
+	 * @param indexDefinition must not be {@literal null}.
+	 * @return the index name.
+	 */
+	String createIndex(SearchIndexDefinition indexDefinition);
+
+	/**
+	 * Alters the search index matching the index {@link SearchIndexDefinition#getName() name}.
+	 * <p>
+	 * Atlas Search might not support updating indices which raises a {@link DataAccessException}.
+	 *
+	 * @param indexDefinition the index definition.
+	 */
+	void updateIndex(SearchIndexDefinition indexDefinition);
+
+	/**
+	 * Check whether an index with the given {@code indexName} exists for the collection indicated by the entity class. To
+	 * ensure an existing index is queryable it is recommended to check its {@link #status(String) status}.
+	 *
+	 * @param indexName name of index to check for presence.
+	 * @return {@literal true} if the index exists; {@literal false} otherwise.
+	 */
+	boolean exists(String indexName);
+
+	/**
+	 * Check the actual {@link SearchIndexStatus status} of an index.
+	 *
+	 * @param indexName name of index to get the status for.
+	 * @return the current status of the index or {@link SearchIndexStatus#DOES_NOT_EXIST} if the index cannot be found.
+	 */
+	SearchIndexStatus status(String indexName);
+
+	/**
+	 * Drops an index from the collection indicated by the entity class.
+	 *
+	 * @param indexName name of index to drop.
+	 */
+	void dropIndex(String indexName);
+
+	/**
+	 * Drops all search indices from the collection indicated by the entity class.
+	 */
+	void dropAllIndexes();
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexOperationsProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexOperationsProvider.java
new file mode 100644
index 0000000000..ee87c8d61e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexOperationsProvider.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+/**
+ * Provider interface to obtain {@link SearchIndexOperations} by MongoDB collection name or entity type.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public interface SearchIndexOperationsProvider {
+
+	/**
+	 * Returns the operations that can be performed on search indexes.
+	 *
+	 * @param collectionName name of the MongoDB collection, must not be {@literal null}.
+	 * @return index operations on the named collection
+	 */
+	SearchIndexOperations searchIndexOps(String collectionName);
+
+	/**
+	 * Returns the operations that can be performed on search indexes.
+	 *
+	 * @param type the type used for field mapping.
+	 * @return index operations on the named collection
+	 */
+	SearchIndexOperations searchIndexOps(Class<?> type);
+
+	/**
+	 * Returns the operations that can be performed on search indexes.
+	 *
+	 * @param collectionName name of the MongoDB collection, must not be {@literal null}.
+	 * @param type the type used for field mapping. Can be {@literal null}.
+	 * @return index operations on the named collection
+	 */
+	SearchIndexOperations searchIndexOps(Class<?> type, String collectionName);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexStatus.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexStatus.java
new file mode 100644
index 0000000000..91143d73c6
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/SearchIndexStatus.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025. the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+/**
+ * Representation of different conditions a search index can be in.
+ *
+ * @author Christoph Strobl
+ * @since 4.5
+ */
+public enum SearchIndexStatus {
+
+	/** building or re-building the index - might be queryable */
+	BUILDING,
+
+	/** nothing to be seen here - not queryable */
+	DOES_NOT_EXIST,
+
+	/** will cease to exist - no longer queryable */
+	DELETING,
+
+	/** well, this one is broken - not queryable */
+	FAILED,
+
+	/** busy with other things, check back later - not queryable */
+	PENDING,
+
+	/** ask me anything - queryable */
+	READY,
+
+	/** ask me anything about outdated data - still queryable */
+	STALE
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java
index 59d55dd4a0..0b473388fb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,9 +20,10 @@
 import java.util.Set;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -88,10 +89,6 @@ public boolean hasFieldSpec() {
 		return !fieldSpecs.isEmpty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexKeys()
-	 */
 	@Override
 	public Document getIndexKeys() {
 
@@ -103,10 +100,6 @@ public Document getIndexKeys() {
 		return keys;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.index.IndexDefinition#getIndexOptions()
-	 */
 	@Override
 	public Document getIndexOptions() {
 
@@ -169,7 +162,7 @@ public TextIndexedFieldSpec(String fieldname) {
 		 */
 		public TextIndexedFieldSpec(String fieldname, @Nullable Float weight) {
 
-			Assert.hasText(fieldname, "Text index field cannot be blank.");
+			Assert.hasText(fieldname, "Text index field cannot be blank");
 			this.fieldname = fieldname;
 			this.weight = weight != null ? weight : 1.0F;
 		}
@@ -205,7 +198,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (this == obj) {
 				return true;
@@ -213,12 +206,10 @@ public boolean equals(Object obj) {
 			if (obj == null) {
 				return false;
 			}
-			if (!(obj instanceof TextIndexedFieldSpec)) {
+			if (!(obj instanceof TextIndexedFieldSpec other)) {
 				return false;
 			}
 
-			TextIndexedFieldSpec other = (TextIndexedFieldSpec) obj;
-
 			return ObjectUtils.nullSafeEquals(this.fieldname, other.fieldname);
 		}
 
@@ -245,6 +236,7 @@ public TextIndexDefinitionBuilder() {
 		 * @param name
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public TextIndexDefinitionBuilder named(String name) {
 			this.instance.name = name;
 			return this;
@@ -252,14 +244,15 @@ public TextIndexDefinitionBuilder named(String name) {
 
 		/**
 		 * Define the index to span all fields using wildcard. <br/>
-		 * <strong>NOTE</strong> {@link TextIndexDefinition} cannot contain any other fields when defined with wildcard.
+		 * <strong>NOTE:</strong> {@link TextIndexDefinition} cannot contain any other fields when defined with wildcard.
 		 *
 		 * @return
 		 */
+		@Contract("-> this")
 		public TextIndexDefinitionBuilder onAllFields() {
 
 			if (!instance.fieldSpecs.isEmpty()) {
-				throw new InvalidDataAccessApiUsageException("Cannot add wildcard fieldspect to non empty.");
+				throw new InvalidDataAccessApiUsageException("Cannot add wildcard fieldspect to non empty");
 			}
 
 			this.instance.fieldSpecs.add(ALL_FIELDS);
@@ -272,6 +265,7 @@ public TextIndexDefinitionBuilder onAllFields() {
 		 * @param fieldnames
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public TextIndexDefinitionBuilder onFields(String... fieldnames) {
 
 			for (String fieldname : fieldnames) {
@@ -286,6 +280,7 @@ public TextIndexDefinitionBuilder onFields(String... fieldnames) {
 		 * @param fieldname
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public TextIndexDefinitionBuilder onField(String fieldname) {
 			return onField(fieldname, 1F);
 		}
@@ -296,11 +291,12 @@ public TextIndexDefinitionBuilder onField(String fieldname) {
 		 * @param fieldname
 		 * @return
 		 */
+		@Contract("_, _ -> this")
 		public TextIndexDefinitionBuilder onField(String fieldname, Float weight) {
 
 			if (this.instance.fieldSpecs.contains(ALL_FIELDS)) {
 				throw new InvalidDataAccessApiUsageException(
-						String.format("Cannot add %s to field spec for all fields.", fieldname));
+						String.format("Cannot add %s to field spec for all fields", fieldname));
 			}
 
 			this.instance.fieldSpecs.add(new TextIndexedFieldSpec(fieldname, weight));
@@ -315,6 +311,7 @@ public TextIndexDefinitionBuilder onField(String fieldname, Float weight) {
 		 * @see <a href=
 		 *      "https://docs.mongodb.org/manual/tutorial/specify-language-for-text-index/#specify-default-language-text-index">https://docs.mongodb.org/manual/tutorial/specify-language-for-text-index/#specify-default-language-text-index</a>
 		 */
+		@Contract("_ -> this")
 		public TextIndexDefinitionBuilder withDefaultLanguage(String language) {
 
 			this.instance.defaultLanguage = language;
@@ -327,11 +324,12 @@ public TextIndexDefinitionBuilder withDefaultLanguage(String language) {
 		 * @param fieldname
 		 * @return
 		 */
+		@Contract("_ -> this")
 		public TextIndexDefinitionBuilder withLanguageOverride(String fieldname) {
 
 			if (StringUtils.hasText(this.instance.languageOverride)) {
 				throw new InvalidDataAccessApiUsageException(
-						String.format("Cannot set language override on %s as it is already defined on %s.", fieldname,
+						String.format("Cannot set language override on %s as it is already defined on %s", fieldname,
 								this.instance.languageOverride));
 			}
 
@@ -348,6 +346,7 @@ public TextIndexDefinitionBuilder withLanguageOverride(String fieldname) {
 		 *      "https://docs.mongodb.com/manual/core/index-partial/">https://docs.mongodb.com/manual/core/index-partial/</a>
 		 * @since 1.10
 		 */
+		@Contract("_ -> this")
 		public TextIndexDefinitionBuilder partial(@Nullable IndexFilter filter) {
 
 			this.instance.filter = filter;
@@ -359,12 +358,14 @@ public TextIndexDefinitionBuilder partial(@Nullable IndexFilter filter) {
 		 *
 		 * @since 2.2
 		 */
+		@Contract("-> this")
 		public TextIndexDefinitionBuilder withSimpleCollation() {
 
 			this.instance.collation = Collation.simple();
 			return this;
 		}
 
+		@Contract("-> new")
 		public TextIndexDefinition build() {
 			return this.instance;
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexed.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexed.java
index 9cba42c945..61fc4c05f3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexed.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/TextIndexed.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/VectorIndex.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/VectorIndex.java
new file mode 100644
index 0000000000..aa8daa8c39
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/VectorIndex.java
@@ -0,0 +1,351 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link SearchIndexDefinition} for creating MongoDB
+ * <a href="https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-overview/">Vector Index</a> required to
+ * run {@code $vectorSearch} queries.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class VectorIndex implements SearchIndexDefinition {
+
+	private final String name;
+	private final List<SearchField> fields = new ArrayList<>();
+
+	/**
+	 * Create a new {@link VectorIndex} instance.
+	 *
+	 * @param name The name of the index.
+	 */
+	public VectorIndex(String name) {
+		this.name = name;
+	}
+
+	/**
+	 * Add a filter field.
+	 *
+	 * @param path dot notation to field/property used for filtering.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public VectorIndex addFilter(String path) {
+
+		Assert.hasText(path, "Path must not be null or empty");
+
+		return addField(new VectorFilterField(path, "filter"));
+	}
+
+	/**
+	 * Add a vector field and accept a {@link VectorFieldBuilder} customizer.
+	 *
+	 * @param path dot notation to field/property used for filtering.
+	 * @param customizer customizer function.
+	 * @return this.
+	 */
+	@Contract("_, _ -> this")
+	public VectorIndex addVector(String path, Consumer<VectorFieldBuilder> customizer) {
+
+		Assert.hasText(path, "Path must not be null or empty");
+
+		VectorFieldBuilder builder = new VectorFieldBuilder(path, "vector");
+		customizer.accept(builder);
+		return addField(builder.build());
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public String getType() {
+		return "vectorSearch";
+	}
+
+	@Override
+	public Document getDefinition(@Nullable TypeInformation<?> entity,
+			@Nullable MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+		MongoPersistentEntity<?> persistentEntity = entity != null
+				? (mappingContext != null ? mappingContext.getPersistentEntity(entity) : null)
+				: null;
+
+		Document definition = new Document();
+		List<Document> fields = new ArrayList<>();
+		definition.put("fields", fields);
+
+		for (SearchField field : this.fields) {
+
+			Document filter = new Document("type", field.type());
+			filter.put("path", resolvePath(field.path(), persistentEntity, mappingContext));
+
+			if (field instanceof VectorIndexField vif) {
+
+				filter.put("numDimensions", vif.dimensions());
+				filter.put("similarity", vif.similarity());
+				if (StringUtils.hasText(vif.quantization)) {
+					filter.put("quantization", vif.quantization());
+				}
+			}
+			fields.add(filter);
+		}
+
+		return definition;
+	}
+
+	@Contract("_ -> this")
+	private VectorIndex addField(SearchField filterField) {
+
+		fields.add(filterField);
+		return this;
+	}
+
+	@Override
+	public String toString() {
+		return "VectorIndex{" + "name='" + name + '\'' + ", fields=" + fields + ", type='" + getType() + '\'' + '}';
+	}
+
+	/**
+	 * Parse the {@link Document} into a {@link VectorIndex}.
+	 */
+	static VectorIndex of(Document document) {
+
+		VectorIndex index = new VectorIndex(document.getString("name"));
+
+		String definitionKey = document.containsKey("latestDefinition") ? "latestDefinition" : "definition";
+		Document definition = document.get(definitionKey, Document.class);
+
+		for (Object entry : definition.get("fields", List.class)) {
+			if (entry instanceof Document field) {
+				Object fieldType = field.get("type");
+				if (ObjectUtils.nullSafeEquals(fieldType, "vector")) {
+					index.addField(new VectorIndexField(field.getString("path"), "vector", field.getInteger("numDimensions"),
+							field.getString("similarity"), field.getString("quantization")));
+				} else {
+					index.addField(new VectorFilterField(field.getString("path"), "filter"));
+				}
+			}
+		}
+
+		return index;
+	}
+
+	private String resolvePath(String path, @Nullable MongoPersistentEntity<?> persistentEntity,
+			@Nullable MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+
+		if (persistentEntity == null || mappingContext == null) {
+			return path;
+		}
+
+		QueryMapper.MetadataBackedField mbf = new QueryMapper.MetadataBackedField(path, persistentEntity, mappingContext);
+
+		return mbf.getMappedKey();
+	}
+
+	interface SearchField {
+
+		String path();
+
+		String type();
+	}
+
+	record VectorFilterField(String path, String type) implements SearchField {
+	}
+
+	record VectorIndexField(String path, String type, int dimensions, @Nullable String similarity,
+			@Nullable String quantization) implements SearchField {
+	}
+
+	/**
+	 * Builder to create a vector field
+	 */
+	public static class VectorFieldBuilder {
+
+		private final String path;
+		private final String type;
+
+		private int dimensions;
+		private @Nullable String similarity;
+		private @Nullable String quantization;
+
+		VectorFieldBuilder(String path, String type) {
+
+			this.path = path;
+			this.type = type;
+		}
+
+		/**
+		 * Number of vector dimensions enforced at index- & query-time.
+		 *
+		 * @param dimensions value between {@code 0} and {@code 4096}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public VectorFieldBuilder dimensions(int dimensions) {
+			this.dimensions = dimensions;
+			return this;
+		}
+
+		/**
+		 * Use similarity based on the angle between vectors.
+		 *
+		 * @return new instance of {@link VectorIndex}.
+		 */
+		@Contract(" -> this")
+		public VectorFieldBuilder cosine() {
+			return similarity(SimilarityFunction.COSINE);
+		}
+
+		/**
+		 * Use similarity based the distance between vector ends.
+		 */
+		@Contract(" -> this")
+		public VectorFieldBuilder euclidean() {
+			return similarity(SimilarityFunction.EUCLIDEAN);
+		}
+
+		/**
+		 * Use similarity based on both angle and magnitude of the vectors.
+		 *
+		 * @return new instance of {@link VectorIndex}.
+		 */
+		@Contract(" -> this")
+		public VectorFieldBuilder dotProduct() {
+			return similarity(SimilarityFunction.DOT_PRODUCT);
+		}
+
+		/**
+		 * Similarity function used.
+		 *
+		 * @param similarity should be one of {@literal euclidean | cosine | dotProduct}.
+		 * @return this.
+		 * @see SimilarityFunction
+		 * @see #similarity(SimilarityFunction)
+		 */
+		@Contract("_ -> this")
+		public VectorFieldBuilder similarity(String similarity) {
+
+			this.similarity = similarity;
+			return this;
+		}
+
+		/**
+		 * Similarity function used.
+		 *
+		 * @param similarity must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public VectorFieldBuilder similarity(SimilarityFunction similarity) {
+
+			return similarity(similarity.getFunctionName());
+		}
+
+		/**
+		 * Quantization used.
+		 *
+		 * @param quantization should be one of {@literal none | scalar | binary}.
+		 * @return this.
+		 * @see Quantization
+		 * @see #quantization(Quantization)
+		 */
+		public VectorFieldBuilder quantization(String quantization) {
+
+			this.quantization = quantization;
+			return this;
+		}
+
+		/**
+		 * Quantization used.
+		 *
+		 * @param quantization must not be {@literal null}.
+		 * @return this.
+		 */
+		public VectorFieldBuilder quantization(Quantization quantization) {
+			return quantization(quantization.getQuantizationName());
+		}
+
+		VectorIndexField build() {
+			return new VectorIndexField(this.path, this.type, this.dimensions, this.similarity, this.quantization);
+		}
+	}
+
+	/**
+	 * Similarity function used to calculate vector distance.
+	 */
+	public enum SimilarityFunction {
+
+		DOT_PRODUCT("dotProduct"), COSINE("cosine"), EUCLIDEAN("euclidean");
+
+		final String functionName;
+
+		SimilarityFunction(String functionName) {
+			this.functionName = functionName;
+		}
+
+		public String getFunctionName() {
+			return functionName;
+		}
+	}
+
+	/**
+	 * Vector quantization. Quantization reduce vector sizes while preserving performance.
+	 */
+	public enum Quantization {
+
+		NONE("none"),
+
+		/**
+		 * Converting a float point into an integer.
+		 */
+		SCALAR("scalar"),
+
+		/**
+		 * Converting a float point into a single bit.
+		 */
+		BINARY("binary");
+
+		final String quantizationName;
+
+		Quantization(String quantizationName) {
+			this.quantizationName = quantizationName;
+		}
+
+		public String getQuantizationName() {
+			return quantizationName;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/WildcardIndex.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/WildcardIndex.java
new file mode 100644
index 0000000000..ff0a92ada1
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/WildcardIndex.java
@@ -0,0 +1,209 @@
+/*
+ * Copyright 2021-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import java.time.Duration;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.lang.Contract;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link WildcardIndex} is a specific {@link Index} that can be used to include all fields into an index based on the
+ * {@code $**" : 1} pattern on a root object (the one typically carrying the
+ * {@link org.springframework.data.mongodb.core.mapping.Document} annotation). On those it is possible to use
+ * {@link #wildcardProjectionInclude(String...)} and {@link #wildcardProjectionExclude(String...)} to define specific
+ * paths for in-/exclusion.
+ * <br />
+ * It can also be used to define an index on a specific field path and its subfields, e.g.
+ * {@code "path.to.field.$**" : 1}. <br />
+ * Note that {@literal wildcardProjections} are not allowed in this case.
+ * <br />
+ * <strong>LIMITATIONS</strong><br />
+ * <ul>
+ * <li>{@link #unique() Unique} and {@link #expire(long) ttl} options are not supported.</li>
+ * <li>Keys used for sharding must not be included</li>
+ * <li>Cannot be used to generate any type of geo index.</li>
+ * </ul>
+ *
+ * @author Christoph Strobl
+ * @see <a href= "https://docs.mongodb.com/manual/core/index-wildcard/">MongoDB Reference Documentation: Wildcard
+ *      Indexes/</a>
+ * @since 3.3
+ */
+public class WildcardIndex extends Index {
+
+	private @Nullable String fieldName;
+	private final Map<String, Object> wildcardProjection = new LinkedHashMap<>();
+
+	/**
+	 * Create a new instance of {@link WildcardIndex} using {@code $**}.
+	 */
+	public WildcardIndex() {}
+
+	/**
+	 * Create a new instance of {@link WildcardIndex} for the given {@literal path}. If no {@literal path} is provided the
+	 * index will be considered a root one using {@code $**}. <br />
+	 * <strong>NOTE:</strong> {@link #wildcardProjectionInclude(String...)}, {@link #wildcardProjectionExclude(String...)}
+	 * can only be used for top level index definitions having an {@literal empty} or {@literal null} path.
+	 *
+	 * @param path can be {@literal null}. If {@literal null} all fields will be indexed.
+	 */
+	public WildcardIndex(@Nullable String path) {
+		this.fieldName = path;
+	}
+
+	/**
+	 * Include the {@code _id} field in {@literal wildcardProjection}.
+	 *
+	 * @return this.
+	 */
+	@Contract("-> this")
+	public WildcardIndex includeId() {
+
+		wildcardProjection.put(FieldName.ID.name(), 1);
+		return this;
+	}
+
+	/**
+	 * Set the index name to use.
+	 *
+	 * @param name
+	 * @return this.
+	 */
+	@Override
+	@Contract("_ -> this")
+	public WildcardIndex named(String name) {
+
+		super.named(name);
+		return this;
+	}
+
+	/**
+	 * Unique option is not supported.
+	 *
+	 * @throws UnsupportedOperationException not supported for wildcard indexes.
+	 */
+	@Override
+	@Contract("-> fail")
+	public Index unique() {
+		throw new UnsupportedOperationException("Wildcard Index does not support 'unique'");
+	}
+
+	/**
+	 * ttl option is not supported.
+	 *
+	 * @throws UnsupportedOperationException not supported for wildcard indexes.
+	 */
+	@Override
+	@Contract("-> fail")
+	public Index expire(long seconds) {
+		throw new UnsupportedOperationException("Wildcard Index does not support 'ttl'");
+	}
+
+	/**
+	 * ttl option is not supported.
+	 *
+	 * @throws UnsupportedOperationException not supported for wildcard indexes.
+	 */
+	@Override
+	@Contract("_, _ -> fail")
+	public Index expire(long value, TimeUnit timeUnit) {
+		throw new UnsupportedOperationException("Wildcard Index does not support 'ttl'");
+	}
+
+	/**
+	 * ttl option is not supported.
+	 *
+	 * @throws UnsupportedOperationException not supported for wildcard indexes.
+	 */
+	@Override
+	@Contract("_ -> fail")
+	public Index expire(Duration duration) {
+		throw new UnsupportedOperationException("Wildcard Index does not support 'ttl'");
+	}
+
+	/**
+	 * Add fields to be included from indexing via {@code wildcardProjection}. <br />
+	 * This option is only allowed on {@link WildcardIndex#WildcardIndex() top level} wildcard indexes.
+	 *
+	 * @param paths must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public WildcardIndex wildcardProjectionInclude(String... paths) {
+
+		for (String path : paths) {
+			wildcardProjection.put(path, 1);
+		}
+		return this;
+	}
+
+	/**
+	 * Add fields to be excluded from indexing via {@code wildcardProjection}. <br />
+	 * This option is only allowed on {@link WildcardIndex#WildcardIndex() top level} wildcard indexes.
+	 *
+	 * @param paths must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public WildcardIndex wildcardProjectionExclude(String... paths) {
+
+		for (String path : paths) {
+			wildcardProjection.put(path, 0);
+		}
+		return this;
+	}
+
+	/**
+	 * Set the fields to be in-/excluded from indexing via {@code wildcardProjection}. <br />
+	 * This option is only allowed on {@link WildcardIndex#WildcardIndex() top level} wildcard indexes.
+	 *
+	 * @param includeExclude must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public WildcardIndex wildcardProjection(Map<String, Object> includeExclude) {
+
+		wildcardProjection.putAll(includeExclude);
+		return this;
+	}
+
+	private String getTargetFieldName() {
+		return StringUtils.hasText(fieldName) ? (fieldName + ".$**") : "$**";
+	}
+
+	@Override
+	public Document getIndexKeys() {
+		return new Document(getTargetFieldName(), 1);
+	}
+
+	@Override
+	public Document getIndexOptions() {
+
+		Document options = new Document(super.getIndexOptions());
+		if (!CollectionUtils.isEmpty(wildcardProjection)) {
+			options.put("wildcardProjection", new Document(wildcardProjection));
+		}
+		return options;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/WildcardIndexed.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/WildcardIndexed.java
new file mode 100644
index 0000000000..e7eaf3bf15
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/WildcardIndexed.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2021-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.mongodb.core.annotation.Collation;
+
+/**
+ * Annotation for an entity or property that should be used as key for a
+ * <a href="https://docs.mongodb.com/manual/core/index-wildcard/">Wildcard Index</a>. <br />
+ * If placed on a {@link ElementType#TYPE type} that is a root level domain entity (one having an
+ * {@link org.springframework.data.mongodb.core.mapping.Document} annotation) will advise the index creator to create a
+ * wildcard index for it.
+ *
+ * <pre class="code">
+ *
+ * &#64;Document
+ * &#64;WildcardIndexed
+ * public class Product {
+ *     ...
+ * }
+ *
+ * db.product.createIndex({ "$**" : 1 } , {})
+ * </pre>
+ *
+ * {@literal wildcardProjection} can be used to specify keys to in-/exclude in the index.
+ *
+ * <pre class="code">
+ *
+ * &#64;Document
+ * &#64;WildcardIndexed(wildcardProjection = "{ 'userMetadata.age' : 0 }")
+ * public class User {
+ *     private &#64;Id String id;
+ *     private UserMetadata userMetadata;
+ * }
+ *
+ *
+ * db.user.createIndex(
+ *   { "$**" : 1 },
+ *   { "wildcardProjection" :
+ *     { "userMetadata.age" : 0 }
+ *   }
+ * )
+ * </pre>
+ *
+ * Wildcard indexes can also be expressed by adding the annotation directly to the field. Please note that
+ * {@literal wildcardProjection} is not allowed on nested paths.
+ *
+ * <pre class="code">
+ * &#64;Document
+ * public class User {
+ *
+ *     private &#64;Id String id;
+ *
+ *     &#64;WildcardIndexed
+ *     private UserMetadata userMetadata;
+ * }
+ *
+ *
+ * db.user.createIndex({ "userMetadata.$**" : 1 }, {})
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+@Collation
+@Documented
+@Target({ ElementType.TYPE, ElementType.FIELD })
+@Retention(RetentionPolicy.RUNTIME)
+public @interface WildcardIndexed {
+
+	/**
+	 * Index name either as plain value or as {@link org.springframework.expression.spel.standard.SpelExpression template
+	 * expression}. <br />
+	 * <br />
+	 * The name will only be applied as is when defined on root level. For usage on nested or embedded structures the
+	 * provided name will be prefixed with the path leading to the entity.
+	 *
+	 * @return empty by default.
+	 */
+	String name() default "";
+
+	/**
+	 * If set to {@literal true} then MongoDB will ignore the given index name and instead generate a new name. Defaults
+	 * to {@literal false}.
+	 *
+	 * @return {@literal false} by default.
+	 */
+	boolean useGeneratedName() default false;
+
+	/**
+	 * Only index the documents in a collection that meet a specified {@link IndexFilter filter expression}. <br />
+	 *
+	 * @return empty by default.
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/core/index-partial/">https://docs.mongodb.com/manual/core/index-partial/</a>
+	 */
+	String partialFilter() default "";
+
+	/**
+	 * Explicitly specify sub fields to be in-/excluded as a {@link org.bson.Document#parse(String) prasable} String.
+	 * <br />
+	 * <strong>NOTE:</strong> Can only be applied on root level documents.
+	 *
+	 * @return empty by default.
+	 */
+	String wildcardProjection() default "";
+
+	/**
+	 * Defines the collation to apply.
+	 *
+	 * @return an empty {@link String} by default.
+	 */
+	@AliasFor(annotation = Collation.class, attribute = "value")
+	String collation() default "";
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java
index c49f501d8d..8524ee62f7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/index/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Support for MongoDB document indexing.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.index;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
index 3f41090396..e865009319 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,26 +17,36 @@
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.expression.ValueEvaluationContext;
+import org.springframework.data.expression.ValueExpression;
+import org.springframework.data.expression.ValueExpressionParser;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.AssociationHandler;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PropertyHandler;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
 import org.springframework.data.mongodb.MongoCollectionUtils;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.util.encryption.EncryptionUtils;
+import org.springframework.data.spel.ExpressionDependencies;
+import org.springframework.data.util.Lazy;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
-import org.springframework.expression.ParserContext;
-import org.springframework.expression.common.LiteralExpression;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -52,16 +62,18 @@
 public class BasicMongoPersistentEntity<T> extends BasicPersistentEntity<T, MongoPersistentProperty>
 		implements MongoPersistentEntity<T> {
 
-	private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected! Both %s and %s map to the same field name %s! Disambiguate using @Field annotation!";
-	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
+	private static final String AMBIGUOUS_FIELD_MAPPING = "Ambiguous field mapping detected; Both %s and %s map to the same field name %s; Disambiguate using @Field annotation";
+	private static final ValueExpressionParser PARSER = ValueExpressionParser.create(SpelExpressionParser::new);
 
 	private final String collection;
 	private final String language;
 
-	private final @Nullable Expression expression;
+	private final @Nullable ValueExpression expression;
 
 	private final @Nullable String collation;
-	private final @Nullable Expression collationExpression;
+	private final @Nullable ValueExpression collationExpression;
+
+	private final ShardKey shardKey;
 
 	/**
 	 * Creates a new {@link BasicMongoPersistentEntity} with the given {@link TypeInformation}. Will default the
@@ -92,67 +104,69 @@ public BasicMongoPersistentEntity(TypeInformation<T> typeInformation) {
 			this.collation = null;
 			this.collationExpression = null;
 		}
+
+		this.shardKey = detectShardKey();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollection()
-	 */
+	private ShardKey detectShardKey() {
+
+		if (!isAnnotationPresent(Sharded.class)) {
+			return ShardKey.none();
+		}
+
+		Sharded sharded = getRequiredAnnotation(Sharded.class);
+
+		String[] keyProperties = sharded.shardKey();
+		if (ObjectUtils.isEmpty(keyProperties)) {
+			keyProperties = new String[] { FieldName.ID.name() };
+		}
+
+		ShardKey shardKey = ShardingStrategy.HASH.equals(sharded.shardingStrategy()) ? ShardKey.hash(keyProperties)
+				: ShardKey.range(keyProperties);
+
+		return sharded.immutableKey() ? ShardKey.immutable(shardKey) : shardKey;
+	}
+
+	@Override
 	public String getCollection() {
 
 		return expression == null //
 				? collection //
-				: expression.getValue(getEvaluationContext(null), String.class);
+				: ObjectUtils.nullSafeToString(expression.evaluate(getValueEvaluationContext(null)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getLanguage()
-	 */
 	@Override
 	public String getLanguage() {
 		return this.language;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getTextScoreProperty()
-	 */
-	@Nullable
 	@Override
-	public MongoPersistentProperty getTextScoreProperty() {
+	public @Nullable MongoPersistentProperty getTextScoreProperty() {
 		return getPersistentProperty(TextScore.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#hasTextScoreProperty()
-	 */
 	@Override
 	public boolean hasTextScoreProperty() {
 		return getTextScoreProperty() != null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentEntity#getCollation()
-	 */
 	@Override
-	public org.springframework.data.mongodb.core.query.Collation getCollation() {
+	public @Nullable Collation getCollation() {
 
-		Object collationValue = collationExpression != null ? expression.getValue(getEvaluationContext(null), String.class)
+		Object collationValue = collationExpression != null
+				? collationExpression.evaluate(getValueEvaluationContext(null))
 				: this.collation;
 
 		if (collationValue == null) {
 			return null;
 		}
 
-		if (collationValue instanceof org.bson.Document) {
-			return org.springframework.data.mongodb.core.query.Collation.from((org.bson.Document) collationValue);
+		if (collationValue instanceof org.bson.Document document) {
+			return org.springframework.data.mongodb.core.query.Collation.from(document);
 		}
 
-		if (collationValue instanceof org.springframework.data.mongodb.core.query.Collation) {
-			return org.springframework.data.mongodb.core.query.Collation.class.cast(collationValue);
+		if (collationValue instanceof org.springframework.data.mongodb.core.query.Collation collation) {
+			return collation;
 		}
 
 		return StringUtils.hasText(collationValue.toString())
@@ -160,10 +174,11 @@ public org.springframework.data.mongodb.core.query.Collation getCollation() {
 				: null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.BasicPersistentEntity#verify()
-	 */
+	@Override
+	public ShardKey getShardKey() {
+		return shardKey;
+	}
+
 	@Override
 	public void verify() {
 
@@ -173,15 +188,26 @@ public void verify() {
 		verifyFieldTypes();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.BasicPersistentEntity#getEvaluationContext(java.lang.Object)
-	 */
 	@Override
-	public EvaluationContext getEvaluationContext(Object rootObject) {
+	public EvaluationContext getEvaluationContext(@Nullable Object rootObject) {
 		return super.getEvaluationContext(rootObject);
 	}
 
+	@Override
+	public EvaluationContext getEvaluationContext(@Nullable Object rootObject, ExpressionDependencies dependencies) {
+		return super.getEvaluationContext(rootObject, dependencies);
+	}
+
+	@Override
+	public ValueEvaluationContext getValueEvaluationContext(@Nullable Object rootObject) {
+		return super.getValueEvaluationContext(rootObject);
+	}
+
+	@Override
+	public ValueEvaluationContext getValueEvaluationContext(@Nullable Object rootObject, ExpressionDependencies dependencies) {
+		return super.getValueEvaluationContext(rootObject, dependencies);
+	}
+
 	private void verifyFieldUniqueness() {
 
 		AssertFieldNameUniquenessHandler handler = new AssertFieldNameUniquenessHandler();
@@ -199,14 +225,10 @@ private void verifyFieldTypes() {
 	 *
 	 * @author Oliver Gierke
 	 */
-	static enum MongoPersistentPropertyComparator implements Comparator<MongoPersistentProperty> {
+	enum MongoPersistentPropertyComparator implements Comparator<MongoPersistentProperty> {
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-		 */
 		public int compare(@Nullable MongoPersistentProperty o1, @Nullable MongoPersistentProperty o2) {
 
 			if (o1 != null && o1.getFieldOrder() == Integer.MAX_VALUE) {
@@ -221,7 +243,11 @@ public int compare(@Nullable MongoPersistentProperty o1, @Nullable MongoPersiste
 				return -1;
 			}
 
-			return o1.getFieldOrder() - o2.getFieldOrder();
+			if(o1 != null && o2 != null) {
+				return o1.getFieldOrder() - o2.getFieldOrder();
+			}
+
+			return o1 != null ? o1.getFieldOrder() : -1;
 		}
 	}
 
@@ -232,12 +258,12 @@ public int compare(@Nullable MongoPersistentProperty o1, @Nullable MongoPersiste
 	 * ambiguity a @see {@link MappingException} is thrown.
 	 *
 	 * @param property - the new id property candidate
-	 * @return
+	 * @return can be {@literal null}.
 	 */
 	@Override
-	protected MongoPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNull(MongoPersistentProperty property) {
+	protected @Nullable MongoPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNull(MongoPersistentProperty property) {
 
-		Assert.notNull(property, "MongoPersistentProperty must not be null!");
+		Assert.notNull(property, "MongoPersistentProperty must not be null");
 
 		if (!property.isIdProperty()) {
 			return null;
@@ -246,8 +272,8 @@ protected MongoPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNul
 		MongoPersistentProperty currentIdProperty = getIdProperty();
 
 		boolean currentIdPropertyIsSet = currentIdProperty != null;
-		@SuppressWarnings("null")
-		boolean currentIdPropertyIsExplicit = currentIdPropertyIsSet ? currentIdProperty.isExplicitIdProperty() : false;
+		@SuppressWarnings("NullAway")
+		boolean currentIdPropertyIsExplicit = currentIdPropertyIsSet && currentIdProperty.isExplicitIdProperty();
 		boolean newIdPropertyIsExplicit = property.isExplicitIdProperty();
 
 		if (!currentIdPropertyIsSet) {
@@ -255,13 +281,13 @@ protected MongoPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNul
 
 		}
 
-		@SuppressWarnings("null")
+		@SuppressWarnings("NullAway")
 		Field currentIdPropertyField = currentIdProperty.getField();
 
 		if (newIdPropertyIsExplicit && currentIdPropertyIsExplicit) {
 			throw new MappingException(
 					String.format("Attempt to add explicit id property %s but already have an property %s registered "
-							+ "as explicit id. Check your mapping configuration!", property.getField(), currentIdPropertyField));
+							+ "as explicit id; Check your mapping configuration", property.getField(), currentIdPropertyField));
 
 		} else if (newIdPropertyIsExplicit && !currentIdPropertyIsExplicit) {
 			// explicit id property takes precedence over implicit id property
@@ -273,28 +299,27 @@ protected MongoPersistentProperty returnPropertyIfBetterIdPropertyCandidateOrNul
 		} else {
 			throw new MappingException(
 					String.format("Attempt to add id property %s but already have an property %s registered "
-							+ "as id. Check your mapping configuration!", property.getField(), currentIdPropertyField));
+							+ "as id; Check your mapping configuration", property.getField(), currentIdPropertyField));
 		}
 
 		return null;
 	}
 
 	/**
-	 * Returns a SpEL {@link Expression} if the given {@link String} is actually an expression that does not evaluate to a
-	 * {@link LiteralExpression} (indicating that no subsequent evaluation is necessary).
+	 * Returns a Value {@link Expression} if the given {@link String} is actually an expression that does not evaluate to
+	 * a literal expression (indicating that no subsequent evaluation is necessary).
 	 *
 	 * @param potentialExpression can be {@literal null}
-	 * @return
+	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	private static Expression detectExpression(@Nullable String potentialExpression) {
+	private static @Nullable ValueExpression detectExpression(@Nullable String potentialExpression) {
 
 		if (!StringUtils.hasText(potentialExpression)) {
 			return null;
 		}
 
-		Expression expression = PARSER.parseExpression(potentialExpression, ParserContext.TEMPLATE_EXPRESSION);
-		return expression instanceof LiteralExpression ? null : expression;
+		ValueExpression expression = PARSER.parse(potentialExpression);
+		return expression.isLiteral() ? null : expression;
 	}
 
 	/**
@@ -322,24 +347,45 @@ private void assertUniqueness(MongoPersistentProperty property) {
 			MongoPersistentProperty existingProperty = properties.get(fieldName);
 
 			if (existingProperty != null) {
-				throw new MappingException(
-						String.format(AMBIGUOUS_FIELD_MAPPING, property.toString(), existingProperty.toString(), fieldName));
+				throw new MappingException(String.format(AMBIGUOUS_FIELD_MAPPING, property, existingProperty, fieldName));
 			}
 
 			properties.put(fieldName, property);
 		}
 	}
 
+	@Override
+	public @Nullable Collection<Object> getEncryptionKeyIds() {
+
+		Encrypted encrypted = findAnnotation(Encrypted.class);
+		if (encrypted == null) {
+			return null;
+		}
+
+		if (ObjectUtils.isEmpty(encrypted.keyId())) {
+			return Collections.emptySet();
+		}
+
+		Lazy<EvaluationContext> evaluationContext = Lazy.of(() -> {
+
+			EvaluationContext ctx = getEvaluationContext(null);
+			ctx.setVariable("target", getType().getSimpleName());
+			return ctx;
+		});
+
+		List<Object> target = new ArrayList<>();
+		for (String keyId : encrypted.keyId()) {
+			target.add(EncryptionUtils.resolveKeyId(keyId, evaluationContext));
+		}
+		return target;
+	}
+
 	/**
 	 * @author Christoph Strobl
 	 * @since 1.6
 	 */
 	private static class PropertyTypeAssertionHandler implements PropertyHandler<MongoPersistentProperty> {
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mapping.PropertyHandler#doWithPersistentProperty(org.springframework.data.mapping.PersistentProperty)
-		 */
 		@Override
 		public void doWithPersistentProperty(MongoPersistentProperty persistentProperty) {
 
@@ -362,13 +408,14 @@ private static void potentiallyAssertTextScoreType(MongoPersistentProperty persi
 			}
 		}
 
+		@SuppressWarnings("NullAway")
 		private static void potentiallyAssertDBRefTargetType(MongoPersistentProperty persistentProperty) {
 
 			if (persistentProperty.isDbReference() && persistentProperty.getDBRef().lazy()) {
 				if (persistentProperty.isArray() || Modifier.isFinal(persistentProperty.getActualType().getModifiers())) {
-					throw new MappingException(String.format(
-							"Invalid lazy DBRef property for %s. Found %s which must not be an array nor a final class.",
-							persistentProperty.getField(), persistentProperty.getActualType()));
+					throw new MappingException(
+							String.format("Invalid lazy DBRef property for %s; Found %s which must not be an array nor a final class",
+									persistentProperty.getField(), persistentProperty.getActualType()));
 				}
 			}
 		}
@@ -382,7 +429,7 @@ private static void assertPropertyType(MongoPersistentProperty persistentPropert
 			}
 
 			throw new MappingException(
-					String.format("Missmatching types for %s. Found %s expected one of %s.", persistentProperty.getField(),
+					String.format("Mismatching types for %s; Found %s expected one of %s", persistentProperty.getField(),
 							persistentProperty.getActualType(), StringUtils.arrayToCommaDelimitedString(validMatches)));
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java
index 2acc48cf7a..027a570fa3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,17 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
-import java.math.BigInteger;
-import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.Set;
 
-import org.bson.types.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.annotation.Id;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.expression.ValueEvaluationContext;
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
@@ -30,7 +33,13 @@
 import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.mapping.FieldName.Type;
+import org.springframework.data.mongodb.core.mapping.MongoField.MongoFieldBuilder;
+import org.springframework.data.mongodb.util.encryption.EncryptionUtils;
+import org.springframework.data.util.Lazy;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -41,36 +50,26 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Divya Srivastava
  */
 public class BasicMongoPersistentProperty extends AnnotationBasedPersistentProperty<MongoPersistentProperty>
 		implements MongoPersistentProperty {
 
-	private static final Logger LOG = LoggerFactory.getLogger(BasicMongoPersistentProperty.class);
+	private static final Log LOG = LogFactory.getLog(BasicMongoPersistentProperty.class);
 
-	private static final String ID_FIELD_NAME = "_id";
+	public static final String ID_FIELD_NAME = FieldName.ID.name();
 	private static final String LANGUAGE_FIELD_NAME = "language";
-	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
-	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
-
-	static {
-
-		SUPPORTED_ID_TYPES.add(ObjectId.class);
-		SUPPORTED_ID_TYPES.add(String.class);
-		SUPPORTED_ID_TYPES.add(BigInteger.class);
-
-		SUPPORTED_ID_PROPERTY_NAMES.add("id");
-		SUPPORTED_ID_PROPERTY_NAMES.add("_id");
-	}
+	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = Set.of("id", ID_FIELD_NAME);
 
 	private final FieldNamingStrategy fieldNamingStrategy;
 
 	/**
 	 * Creates a new {@link BasicMongoPersistentProperty}.
 	 *
-	 * @param property
-	 * @param owner
-	 * @param simpleTypeHolder
-	 * @param fieldNamingStrategy
+	 * @param property the source property.
+	 * @param owner the owing entity.
+	 * @param simpleTypeHolder must not be {@literal null}.
+	 * @param fieldNamingStrategy can be {@literal null}.
 	 */
 	public BasicMongoPersistentProperty(Property property, MongoPersistentEntity<?> owner,
 			SimpleTypeHolder simpleTypeHolder, @Nullable FieldNamingStrategy fieldNamingStrategy) {
@@ -78,17 +77,12 @@ public BasicMongoPersistentProperty(Property property, MongoPersistentEntity<?>
 		super(property, owner, simpleTypeHolder);
 		this.fieldNamingStrategy = fieldNamingStrategy == null ? PropertyNameFieldNamingStrategy.INSTANCE
 				: fieldNamingStrategy;
-
-		if (isIdProperty() && getFieldName() != ID_FIELD_NAME) {
-			LOG.warn("Customizing field name for id property not allowed! Custom name will not be considered!");
-		}
 	}
 
 	/**
 	 * Also considers fields as id that are of supported id type and name.
 	 *
 	 * @see #SUPPORTED_ID_PROPERTY_NAMES
-	 * @see #SUPPORTED_ID_TYPES
 	 */
 	@Override
 	public boolean isIdProperty() {
@@ -102,13 +96,9 @@ public boolean isIdProperty() {
 		return SUPPORTED_ID_PROPERTY_NAMES.contains(getName()) && !hasExplicitFieldName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isExplicitIdProperty()
-	 */
 	@Override
 	public boolean isExplicitIdProperty() {
-		return isAnnotationPresent(Id.class);
+		return super.isIdProperty();
 	}
 
 	/**
@@ -116,43 +106,17 @@ public boolean isExplicitIdProperty() {
 	 *
 	 * @return
 	 */
+	@Override
 	public String getFieldName() {
-
-		if (isIdProperty()) {
-
-			if (getOwner().getIdProperty() == null) {
-				return ID_FIELD_NAME;
-			}
-
-			if (getOwner().isIdProperty(this)) {
-				return ID_FIELD_NAME;
-			}
-		}
-
-		if (hasExplicitFieldName()) {
-			return getAnnotatedFieldName();
-		}
-
-		String fieldName = fieldNamingStrategy.getFieldName(this);
-
-		if (!StringUtils.hasText(fieldName)) {
-			throw new MappingException(String.format("Invalid (null or empty) field name returned for property %s by %s!",
-					this, fieldNamingStrategy.getClass()));
-		}
-
-		return fieldName;
+		return getMongoField().getName().name();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getFieldType()
-	 */
 	@Override
 	public Class<?> getFieldType() {
 
 		Field fieldAnnotation = findAnnotation(Field.class);
 
-		if (!isIdProperty()) {
+		if (!getOwner().isIdProperty(this)) {
 
 			if (fieldAnnotation == null || fieldAnnotation.targetType() == FieldType.IMPLICIT) {
 				return getType();
@@ -165,8 +129,13 @@ public Class<?> getFieldType() {
 			return FieldType.OBJECT_ID.getJavaClass();
 		}
 
-		FieldType fieldType = fieldAnnotation.targetType();
+		FieldType fieldType = getMongoField().getFieldType();
 		if (fieldType == FieldType.IMPLICIT) {
+
+			if (isEntity()) {
+				return org.bson.Document.class;
+			}
+
 			return getType();
 		}
 
@@ -178,12 +147,12 @@ public Class<?> getFieldType() {
 	 *         {@link org.springframework.data.mongodb.core.mapping.Field#value()} present.
 	 * @since 1.7
 	 */
-	protected boolean hasExplicitFieldName() {
+	@Override
+	public boolean hasExplicitFieldName() {
 		return StringUtils.hasText(getAnnotatedFieldName());
 	}
 
-	@Nullable
-	private String getAnnotatedFieldName() {
+	private @Nullable String getAnnotatedFieldName() {
 
 		org.springframework.data.mongodb.core.mapping.Field annotation = findAnnotation(
 				org.springframework.data.mongodb.core.mapping.Field.class);
@@ -191,68 +160,193 @@ private String getAnnotatedFieldName() {
 		return annotation != null ? annotation.value() : null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getFieldOrder()
-	 */
+	@Override
 	public int getFieldOrder() {
+		return getMongoField().getOrder();
+	}
+
+	@Override
+	public boolean writeNullValues() {
 
 		org.springframework.data.mongodb.core.mapping.Field annotation = findAnnotation(
 				org.springframework.data.mongodb.core.mapping.Field.class);
 
-		return annotation != null ? annotation.order() : Integer.MAX_VALUE;
+		return annotation != null && annotation.write() == Field.Write.ALWAYS;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation()
-	 */
 	@Override
 	protected Association<MongoPersistentProperty> createAssociation() {
-		return new Association<MongoPersistentProperty>(this, null);
+		return new Association<>(this, null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isDbReference()
-	 */
+	@Override
 	public boolean isDbReference() {
 		return isAnnotationPresent(DBRef.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#getDBRef()
-	 */
+	@Override
+	public boolean isDocumentReference() {
+		return isAnnotationPresent(DocumentReference.class);
+	}
+
+	@Override
 	@Nullable
 	public DBRef getDBRef() {
 		return findAnnotation(DBRef.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isLanguageProperty()
-	 */
+	@Override
+	public @Nullable DocumentReference getDocumentReference() {
+		return findAnnotation(DocumentReference.class);
+	}
+
 	@Override
 	public boolean isLanguageProperty() {
 		return getFieldName().equals(LANGUAGE_FIELD_NAME) || isExplicitLanguageProperty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isExplicitLanguageProperty()
-	 */
 	@Override
 	public boolean isExplicitLanguageProperty() {
 		return isAnnotationPresent(Language.class);
-	};
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.MongoPersistentProperty#isTextScoreProperty()
-	 */
 	@Override
 	public boolean isTextScoreProperty() {
 		return isAnnotationPresent(TextScore.class);
 	}
+
+	/**
+	 * Obtain the {@link EvaluationContext} for a specific root object.
+	 *
+	 * @param rootObject can be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 3.3
+	 */
+	public EvaluationContext getEvaluationContext(@Nullable Object rootObject) {
+
+		if (getOwner() instanceof BasicMongoPersistentEntity mongoPersistentEntity) {
+			return mongoPersistentEntity.getEvaluationContext(rootObject);
+		}
+		return rootObject != null ? new StandardEvaluationContext(rootObject) : new StandardEvaluationContext();
+	}
+
+	/**
+	 * Obtain the {@link EvaluationContext} for a specific root object.
+	 *
+	 * @param rootObject can be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 3.3
+	 */
+	public ValueEvaluationContext getValueEvaluationContext(@Nullable Object rootObject) {
+
+		if (getOwner() instanceof BasicMongoPersistentEntity mongoPersistentEntity) {
+			return mongoPersistentEntity.getValueEvaluationContext(rootObject);
+		}
+
+		StandardEvaluationContext standardEvaluationContext = rootObject != null ? new StandardEvaluationContext(rootObject)
+				: new StandardEvaluationContext();
+
+		return ValueEvaluationContext.of(new StandardEnvironment(), standardEvaluationContext);
+	}
+
+	@Override
+	public MongoField getMongoField() {
+		return doGetMongoField();
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	public Collection<Object> getEncryptionKeyIds() {
+
+		Encrypted encrypted = findAnnotation(Encrypted.class);
+		if (encrypted == null) {
+			return null;
+		}
+
+		if (ObjectUtils.isEmpty(encrypted.keyId())) {
+			return Collections.emptySet();
+		}
+
+		Lazy<EvaluationContext> evaluationContext = Lazy.of(() -> {
+			EvaluationContext ctx = getEvaluationContext(null);
+			ctx.setVariable("target", getOwner().getType().getSimpleName() + "." + getName());
+			return ctx;
+		});
+
+		List<Object> target = new ArrayList<>();
+		for (String keyId : encrypted.keyId()) {
+			target.add(EncryptionUtils.resolveKeyId(keyId, evaluationContext));
+		}
+		return target;
+	}
+
+	@SuppressWarnings("NullAway")
+	protected MongoField doGetMongoField() {
+
+		MongoFieldBuilder builder = MongoField.builder();
+		if (isAnnotationPresent(Field.class) && Type.KEY.equals(findAnnotation(Field.class).nameType())) {
+			builder.name(doGetFieldName());
+		} else {
+			builder.path(doGetFieldName());
+		}
+		builder.fieldType(doGetFieldType());
+		builder.order(doGetFieldOrder());
+		return builder.build();
+	}
+
+	@SuppressWarnings("NullAway")
+	private String doGetFieldName() {
+
+		if (isIdProperty()) {
+
+			if (getOwner().getIdProperty() == null) {
+				return ID_FIELD_NAME;
+			}
+
+			if (getOwner().isIdProperty(this)) {
+				return ID_FIELD_NAME;
+			}
+		}
+
+		if (hasExplicitFieldName()) {
+			return getAnnotatedFieldName();
+		}
+
+		String fieldName = fieldNamingStrategy.getFieldName(this);
+
+		if (!StringUtils.hasText(fieldName)) {
+			throw new MappingException(String.format("Invalid (null or empty) field name returned for property %s by %s",
+					this, fieldNamingStrategy.getClass()));
+		}
+
+		return fieldName;
+	}
+
+	private FieldType doGetFieldType() {
+
+		Field fieldAnnotation = findAnnotation(Field.class);
+		return fieldAnnotation != null ? fieldAnnotation.targetType() : FieldType.IMPLICIT;
+	}
+
+	private int doGetFieldOrder() {
+
+		Field annotation = findAnnotation(Field.class);
+		return annotation != null ? annotation.order() : Integer.MAX_VALUE;
+	}
+
+	protected void validate() {
+
+		if (isIdProperty() && hasExplicitFieldName()) {
+
+			String annotatedName = getAnnotatedFieldName();
+			if (!ID_FIELD_NAME.equals(annotatedName)) {
+				if (LOG.isWarnEnabled()) {
+					LOG.warn(String.format(
+							"Customizing field name for id property '%s.%s' is not allowed; Custom name ('%s') will not be considered",
+							getOwner().getName(), getName(), annotatedName));
+				}
+			}
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
index c6cf2b4122..eb8d08db64 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/CachingMongoPersistentProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,144 +15,134 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.model.FieldNamingStrategy;
 import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.lang.Nullable;
+import org.springframework.data.util.Lazy;
 
 /**
  * {@link MongoPersistentProperty} caching access to {@link #isIdProperty()} and {@link #getFieldName()}.
  *
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Christoph Strobl
  */
 public class CachingMongoPersistentProperty extends BasicMongoPersistentProperty {
 
-	private @Nullable Boolean isIdProperty;
-	private @Nullable Boolean isAssociation;
-	private @Nullable boolean dbRefResolved;
-	private @Nullable DBRef dbref;
-	private @Nullable String fieldName;
-	private @Nullable Class<?> fieldType;
-	private @Nullable Boolean usePropertyAccess;
-	private @Nullable Boolean isTransient;
+	private final Lazy<Boolean> isEntity = Lazy.of(super::isEntity);
+	private final Lazy<Boolean> isUnwrapped = Lazy.of(super::isUnwrapped);
+	private final Lazy<Boolean> isIdProperty = Lazy.of(super::isIdProperty);
+	private final Lazy<Boolean> isAssociation = Lazy.of(super::isAssociation);
+	private final Lazy<DBRef> dbref = Lazy.of(super::getDBRef);
+	private final Lazy<String> fieldName = Lazy.of(super::getFieldName);
+	private final Lazy<Boolean> hasExplicitFieldName = Lazy.of(super::hasExplicitFieldName);
+	private final Lazy<Boolean> writeNullValues = Lazy.of(super::writeNullValues);
+	private final Lazy<Class<?>> fieldType = Lazy.of(super::getFieldType);
+	private final Lazy<Boolean> usePropertyAccess = Lazy.of(super::usePropertyAccess);
+	private final Lazy<Boolean> isTransient = Lazy.of(super::isTransient);
+	private final Lazy<MongoField> mongoField = Lazy.of(super::getMongoField);
+	private final Lazy<Boolean> isTextScoreProperty = Lazy.of(super::isTextScoreProperty);
+	private final Lazy<Boolean> isLanguageProperty = Lazy.of(super::isLanguageProperty);
+	private final Lazy<Boolean> isExplicitLanguageProperty = Lazy.of(super::isExplicitLanguageProperty);
+	private final Lazy<DocumentReference> documentReference = Lazy.of(super::getDocumentReference);
 
 	/**
 	 * Creates a new {@link CachingMongoPersistentProperty}.
 	 *
-	 * @param property
-	 * @param owner
-	 * @param simpleTypeHolder
-	 * @param fieldNamingStrategy
+	 * @param property must not be {@literal null}.
+	 * @param owner must not be {@literal null}.
+	 * @param simpleTypeHolder must not be {@literal null}.
+	 * @param fieldNamingStrategy can be {@literal null}.
 	 */
 	public CachingMongoPersistentProperty(Property property, MongoPersistentEntity<?> owner,
-			SimpleTypeHolder simpleTypeHolder, FieldNamingStrategy fieldNamingStrategy) {
+			SimpleTypeHolder simpleTypeHolder, @Nullable FieldNamingStrategy fieldNamingStrategy) {
 		super(property, owner, simpleTypeHolder, fieldNamingStrategy);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#isIdProperty()
-	 */
 	@Override
-	public boolean isIdProperty() {
+	public boolean isEntity() {
+		return isEntity.get();
+	}
 
-		if (this.isIdProperty == null) {
-			this.isIdProperty = super.isIdProperty();
-		}
+	@Override
+	public boolean isUnwrapped() {
+		return isUnwrapped.get();
+	}
 
-		return this.isIdProperty;
+	@Override
+	public boolean isIdProperty() {
+		return isIdProperty.get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#isAssociation()
-	 */
 	@Override
 	public boolean isAssociation() {
-		if (this.isAssociation == null) {
-			this.isAssociation = super.isAssociation();
-		}
-		return this.isAssociation;
+		return isAssociation.get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#getFieldName()
-	 */
 	@Override
-	public String getFieldName() {
+	public boolean hasExplicitFieldName() {
+		return hasExplicitFieldName.get();
+	}
 
-		if (this.fieldName == null) {
-			this.fieldName = super.getFieldName();
-		}
+	@Override
+	public String getFieldName() {
+		return fieldName.get();
+	}
 
-		return this.fieldName;
+	@Override
+	public boolean writeNullValues() {
+		return writeNullValues.get();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#getFieldType()
-	 */
 	@Override
 	public Class<?> getFieldType() {
-
-		if (this.fieldType == null) {
-			this.fieldType = super.getFieldType();
-		}
-
-		return this.fieldType;
+		return fieldType.get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#usePropertyAccess()
-	 */
 	@Override
 	public boolean usePropertyAccess() {
-
-		if (this.usePropertyAccess == null) {
-			this.usePropertyAccess = super.usePropertyAccess();
-		}
-
-		return this.usePropertyAccess;
+		return usePropertyAccess.get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#isTransient()
-	 */
 	@Override
 	public boolean isTransient() {
+		return isTransient.get();
+	}
 
-		if (this.isTransient == null) {
-			this.isTransient = super.isTransient();
-		}
-
-		return this.isTransient;
+	@Override
+	public boolean isTextScoreProperty() {
+		return isTextScoreProperty.get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#isDbReference()
-	 */
 	@Override
 	public boolean isDbReference() {
 		return getDBRef() != null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.BasicMongoPersistentProperty#getDBRef()
-	 */
 	@Override
-	public DBRef getDBRef() {
+	public @Nullable DBRef getDBRef() {
+		return dbref.getNullable();
+	}
 
-		if (!dbRefResolved) {
-			this.dbref = super.getDBRef();
-			this.dbRefResolved = true;
-		}
+	@Override
+	public @Nullable DocumentReference getDocumentReference() {
+		return documentReference.getNullable();
+	}
 
-		return this.dbref;
+	@Override
+	public boolean isLanguageProperty() {
+		return isLanguageProperty.get();
+	}
+
+	@Override
+	public boolean isExplicitLanguageProperty() {
+		return isExplicitLanguageProperty.get();
 	}
+
+	@Override
+	public MongoField getMongoField() {
+		return mongoField.get();
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DBRef.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DBRef.java
index 1ca71e7fd5..7a861829a4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DBRef.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DBRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,14 +39,14 @@
 	/**
 	 * The database the referred entity resides in.
 	 *
-	 * @return
+	 * @return empty String by default.
 	 */
 	String db() default "";
 
 	/**
 	 * Controls whether the referenced entity should be loaded lazily. This defaults to {@literal false}.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 */
 	boolean lazy() default false;
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Document.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Document.java
index eb9a6d5190..ef4980fab6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Document.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Document.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.annotation.Persistent;
+import org.springframework.data.mongodb.core.annotation.Collation;
 
 /**
  * Identifies a domain object to be persisted to MongoDB.
@@ -32,6 +33,7 @@
  * @author Christoph Strobl
  */
 @Persistent
+@Collation
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE })
@@ -60,7 +62,7 @@
 	/**
 	 * Defines the default language to be used with this document.
 	 *
-	 * @return
+	 * @return an empty String by default.
 	 * @since 1.6
 	 */
 	String language() default "";
@@ -71,6 +73,7 @@
 	 * @return an empty {@link String} by default.
 	 * @since 2.2
 	 */
+	@AliasFor(annotation = Collation.class, attribute = "value")
 	String collation() default "";
 
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DocumentPointer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DocumentPointer.java
new file mode 100644
index 0000000000..90da5dd87d
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DocumentPointer.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+/**
+ * A custom pointer to a linked document to be used along with {@link DocumentReference} for storing the linkage value.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+@FunctionalInterface
+public interface DocumentPointer<T> {
+
+	/**
+	 * The actual pointer value. This can be any simple type, like a {@link String} or {@link org.bson.types.ObjectId} or
+	 * a {@link org.bson.Document} holding more information like the target collection, multiple fields forming the key,
+	 * etc.
+	 *
+	 * @return the value stored in MongoDB and used for constructing the {@link DocumentReference#lookup() lookup query}.
+	 */
+	T getPointer();
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DocumentReference.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DocumentReference.java
new file mode 100644
index 0000000000..5b8a74f40e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/DocumentReference.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.data.annotation.Reference;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+
+/**
+ * A {@link DocumentReference} allows referencing entities in MongoDB using a flexible schema. While the goal is the
+ * same as when using {@link DBRef}, the store representation is different. The reference can be anything, a single
+ * value, an entire {@link org.bson.Document}, basically everything that can be stored in MongoDB. By default, the
+ * mapping layer will use the referenced entities {@literal id} value for storage and retrieval.
+ *
+ * <pre class="code">
+ * public class Account {
+ *   private String id;
+ *   private Float total;
+ * }
+ *
+ * public class Person {
+ *   private String id;
+ *   &#64;DocumentReference
+ *   private List&lt;Account&gt; accounts;
+ * }
+ *
+ * Account account = ...
+ *
+ * mongoTemplate.insert(account);
+ *
+ * template.update(Person.class)
+ *   .matching(where("id").is(...))
+ *   .apply(new Update().push("accounts").value(account))
+ *   .first();
+ * </pre>
+ *
+ * {@link #lookup()} allows defining a query filter that is independent from the {@literal _id} field and in combination
+ * with {@link org.springframework.data.convert.WritingConverter writing converters} offers a flexible way of defining
+ * references between entities.
+ *
+ * <pre class="code">
+ * public class Book {
+ * 	private ObjectId id;
+ * 	private String title;
+ *
+ * 	&#64;Field("publisher_ac") &#64;DocumentReference(lookup = "{ 'acronym' : ?#{#target} }") private Publisher publisher;
+ * }
+ *
+ * public class Publisher {
+ *
+ * 	private ObjectId id;
+ * 	private String acronym;
+ * 	private String name;
+ *
+ * 	&#64;DocumentReference(lazy = true) private List&lt;Book&gt; books;
+ * }
+ *
+ * &#64;WritingConverter
+ * public class PublisherReferenceConverter implements Converter&lt;Publisher, DocumentPointer&lt;String&gt;&gt; {
+ *
+ * 	public DocumentPointer&lt;String&gt; convert(Publisher source) {
+ * 		return () -> source.getAcronym();
+ * 	}
+ * }
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ * @see <a href="https://docs.mongodb.com/manual/reference/database-references/#std-label-document-references">MongoDB
+ *      Reference Documentation</a>
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD })
+@Reference
+public @interface DocumentReference {
+
+	/**
+	 * The database the referenced entity resides in. Uses the default database provided by
+	 * {@link org.springframework.data.mongodb.MongoDatabaseFactory} if empty.
+	 *
+	 * @see MongoDatabaseFactory#getMongoDatabase()
+	 * @see MongoDatabaseFactory#getMongoDatabase(String)
+	 */
+	String db() default "";
+
+	/**
+	 * The collection the referenced entity resides in. Defaults to the collection of the referenced entity type.
+	 *
+	 * @see MongoPersistentEntity#getCollection()
+	 */
+	String collection() default "";
+
+	/**
+	 * The single document lookup query. In case of an {@link java.util.Collection} or {@link java.util.Map} property the
+	 * individual lookups are combined via an {@code $or} operator. {@code target} points to the source value (or
+	 * document) stored at the reference property. Properties of {@code target} can be used to define the reference query.
+	 *
+	 * @return an {@literal _id} based lookup.
+	 */
+	String lookup() default "{ '_id' : ?#{#target} }";
+
+	/**
+	 * A specific sort.
+	 */
+	String sort() default "";
+
+	/**
+	 * Controls whether the referenced entity should be loaded lazily. This defaults to {@literal false}.
+	 *
+	 * @return {@literal false} by default.
+	 */
+	boolean lazy() default false;
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Encrypted.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Encrypted.java
new file mode 100644
index 0000000000..3e169026a9
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Encrypted.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * {@link Encrypted} provides data required for MongoDB Client Side Field Level Encryption that is applied during schema
+ * resolution. It can be applied on top level (typically those types annotated with {@link Document} to provide the
+ * {@literal encryptMetadata}.
+ *
+ * <pre class="code">
+ * &#64;Document
+ * &#64;Encrypted(keyId = "4fPYFM9qSgyRAjgQ2u+IMQ==")
+ * public class Patient {
+ * 	 private ObjectId id;
+ * 	 private String name;
+ *
+ * 	 &#64;Field("publisher_ac")
+ * 	 &#64;DocumentReference(lookup = "{ 'acronym' : ?#{#target} }") private Publisher publisher;
+ * }
+ *
+ * "encryptMetadata": {
+ *    "keyId": [
+ *      {
+ *        "$binary": {
+ *          "base64": "4fPYFM9qSgyRAjgQ2u+IMQ==",
+ *          "subType": "04"
+ *        }
+ *      }
+ *    ]
+ *  }
+ * </pre>
+ * 
+ * <br />
+ * On property level it is used for deriving field specific {@literal encrypt} settings.
+ *
+ * <pre class="code">
+ * public class Patient {
+ * 	 private ObjectId id;
+ * 	 private String name;
+ *
+ * 	 &#64;Encrypted(keyId = "4fPYFM9qSgyRAjgQ2u+IMQ==", algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+ * 	 private String ssn;
+ * }
+ *
+ * "ssn" : {
+ *   "encrypt": {
+ *      "keyId": [
+ *        {
+ *          "$binary": {
+ *            "base64": "4fPYFM9qSgyRAjgQ2u+IMQ==",
+ *            "subType": "04"
+ *          }
+ *        }
+ *      ],
+ *      "algorithm" : "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic",
+ *      "bsonType" : "string"
+ *    }
+ *  }
+ * </pre>
+ * 
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.FIELD })
+public @interface Encrypted {
+
+	/**
+	 * Get the {@code keyId} to use. The value must resolve to either the UUID representation of the key or a base64
+	 * encoded value representing the UUID value.
+	 * <br />
+	 * On {@link ElementType#TYPE} level the {@link #keyId()} can be left empty if explicitly set for fields. <br />
+	 * On {@link ElementType#FIELD} level the {@link #keyId()} can be left empty if inherited from
+	 * {@literal encryptMetadata}.
+	 *
+	 * @return the key id to use. May contain a parsable {@link org.springframework.expression.Expression expression}. In
+	 *         this case the {@code #target} variable will hold the target element name.
+	 */
+	String[] keyId() default {};
+
+	/**
+	 * Set the algorithm to use.
+	 * <br />
+	 * On {@link ElementType#TYPE} level the {@link #algorithm()} can be left empty if explicitly set for fields. <br />
+	 * On {@link ElementType#FIELD} level the {@link #algorithm()} can be left empty if inherited from
+	 * {@literal encryptMetadata}.
+	 *
+	 * @return the encryption algorithm.
+	 * @see org.springframework.data.mongodb.core.EncryptionAlgorithms
+	 */
+	String algorithm() default "";
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ExplicitEncrypted.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ExplicitEncrypted.java
new file mode 100644
index 0000000000..37d1019f62
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ExplicitEncrypted.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2023-2025 the original author 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.mapping;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.convert.PropertyValueConverter;
+import org.springframework.data.convert.ValueConverter;
+import org.springframework.data.mongodb.core.convert.encryption.EncryptingConverter;
+import org.springframework.data.mongodb.core.convert.encryption.MongoEncryptionConverter;
+
+/**
+ * {@link ExplicitEncrypted} is a {@link ElementType#FIELD field} level {@link ValueConverter} annotation that indicates
+ * the target element is subject to encryption during the mapping process, in which a given domain type is converted
+ * into the store specific format.
+ * <p>
+ * The {@link #value()} attribute, defines the bean type to look up within the
+ * {@link org.springframework.context.ApplicationContext} to obtain the {@link EncryptingConverter} responsible for the
+ * actual {@literal en-/decryption} while {@link #algorithm()} and {@link #keyAltName()} can be used to define aspects
+ * of the encryption process.
+ *
+ * <pre class="code">
+ * public class Patient {
+ * 	private ObjectId id;
+ * 	private String name;
+ *
+ * 	&#64;ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random, keyAltName = "secred-key-alternative-name") //
+ * 	private String ssn;
+ * }
+ * </pre>
+ *
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.1
+ * @see ValueConverter
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Encrypted
+@ValueConverter
+public @interface ExplicitEncrypted {
+
+	/**
+	 * Define the algorithm to use.
+	 * <p>
+	 * A {@literal Deterministic} algorithm ensures that a given input value always encrypts to the same output while a
+	 * {@literal randomized} one will produce different results every time.  A {@literal range} algorithm allows for
+	 * the value to be queried whilst encrypted.
+	 * <p>
+	 * Please make sure to use an algorithm that is in line with MongoDB's encryption rules for simple types, complex
+	 * objects and arrays as well as the query limitations that come with each of them.
+	 *
+	 * @return the string representation of the encryption algorithm to use.
+	 * @see org.springframework.data.mongodb.core.EncryptionAlgorithms
+	 */
+	@AliasFor(annotation = Encrypted.class, value = "algorithm")
+	String algorithm() default "";
+
+	/**
+	 * Set the {@literal Key Alternate Name} that references the {@literal Data Encryption Key} to be used.
+	 * <p>
+	 * An empty String indicates that no alternative key name was configured.
+	 * <p>
+	 * It is possible to use the {@literal "/"} character as a prefix to access a particular field value in the same
+	 * domain type. In this case {@code "/name"} references the value of the {@literal name} field. Please note that
+	 * update operations will require the full object to resolve those values.
+	 *
+	 * @return the {@literal Key Alternate Name} if set or an empty {@link String}.
+	 */
+	String keyAltName() default "";
+
+	/**
+	 * The {@link EncryptingConverter} type handling the {@literal en-/decryption} of the annotated property.
+	 *
+	 * @return the configured {@link EncryptingConverter}. A {@link MongoEncryptionConverter} by default.
+	 */
+	@AliasFor(annotation = ValueConverter.class, value = "value")
+	Class<? extends PropertyValueConverter> value() default MongoEncryptionConverter.class;
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Field.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Field.java
index c91e58bb2b..68ff4bb976 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Field.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,14 @@
 import java.lang.annotation.Target;
 
 import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.mongodb.core.mapping.FieldName.Type;
 
 /**
  * Annotation to define custom metadata for document fields.
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Divya Srivastava
  */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
@@ -38,12 +40,15 @@
 	 * The key to be used to store the field inside the document. Alias for {@link #name()}.
 	 *
 	 * @return an empty {@link String} by default.
+	 * @see #name()
 	 */
 	@AliasFor("name")
 	String value() default "";
 
 	/**
-	 * The key to be used to store the field inside the document. Alias for {@link #value()}.
+	 * The key to be used to store the field inside the document. Alias for {@link #value()}. The name may contain MongoDB
+	 * special characters like dot ({@literal .}). In this case the name is by default treated as a {@link Type#PATH
+	 * path}. To preserve dots within the name set the {@link #nameType()} attribute to {@link Type#KEY}.
 	 *
 	 * @return an empty {@link String} by default.
 	 * @since 2.2
@@ -51,6 +56,15 @@
 	@AliasFor("value")
 	String name() default "";
 
+	/**
+	 * The used {@link Type type} has impact on how a given {@link #name()} is treated if it contains dot ({@literal .})
+	 * characters.
+	 *
+	 * @return {@link Type#PATH} by default.
+	 * @since 4.2
+	 */
+	Type nameType() default Type.PATH;
+
 	/**
 	 * The order in which various fields shall be stored. Has to be a positive integer.
 	 *
@@ -65,4 +79,33 @@
 	 * @since 2.2
 	 */
 	FieldType targetType() default FieldType.IMPLICIT;
+
+	/**
+	 * Write rules when to include a property value upon conversion. If set to {@link Write#NON_NULL} (default)
+	 * {@literal null} values are not written to the target {@code Document}. Setting the value to {@link Write#ALWAYS}
+	 * explicitly adds an entry for the given field holding {@literal null} as a value {@code 'fieldName' : null }. <br />
+	 * <strong>NOTE:</strong> Setting the value to {@link Write#ALWAYS} may lead to increased document size.
+	 *
+	 * @return {@link Write#NON_NULL} by default.
+	 * @since 3.3
+	 */
+	Write write() default Write.NON_NULL;
+
+	/**
+	 * Enumeration of write strategies to define when a property is included for write conversion.
+	 *
+	 * @since 3.3
+	 */
+	enum Write {
+
+		/**
+		 * Value that indicates that property is to be always included, independent of value of the property.
+		 */
+		ALWAYS,
+
+		/**
+		 * Value that indicates that only properties with non-{@literal null} values are to be included.
+		 */
+		NON_NULL
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/FieldName.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/FieldName.java
new file mode 100644
index 0000000000..2efb50a42f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/FieldName.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2023-2025 the original author 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.mapping;
+
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Value Object representing a field name that should be used to read/write fields within the MongoDB document.
+ * {@link FieldName Field names} field names may contain special characters (such as dot ({@literal .})) but may be
+ * treated differently depending on their {@link Type type}.
+ *
+ * @author Christoph Strobl
+ * @since 4.2
+ */
+public record FieldName(String name, Type type, String[] parts) {
+
+	public FieldName(String name, Type type) {
+		this(name, type, name.split("\\."));
+	}
+
+	private static final String ID_KEY = "_id";
+
+	public static final FieldName ID = new FieldName(ID_KEY, Type.KEY);
+
+	/**
+	 * Create a new {@link FieldName} that treats the given {@literal value} as is.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @return new instance of {@link FieldName}.
+	 */
+	public static FieldName name(String value) {
+		return new FieldName(value, Type.KEY);
+	}
+
+	/**
+	 * Create a new {@link FieldName} that treats the given {@literal value} as a path. If the {@literal value} contains
+	 * dot ({@literal .}) characters, they are considered deliminators in a path.
+	 *
+	 * @param value must not be {@literal null}.
+	 * @return new instance of {@link FieldName}.
+	 */
+	public static FieldName path(String value) {
+		return new FieldName(value, Type.PATH);
+	}
+
+	/**
+	 * Get the parts the field name consists of. If the {@link FieldName} is a {@link Type#KEY} or a {@link Type#PATH}
+	 * that does not contain dot ({@literal .}) characters an array containing a single element is returned. Otherwise the
+	 * {@link #name()} is split into segments using dot ({@literal .}) as a separator.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public String[] parts() {
+
+		if (isKey()) {
+			return new String[] { name };
+		}
+
+		return parts;
+	}
+
+	/**
+	 * @param type return true if the given {@link Type} is equal to {@link #type()}.
+	 * @return {@literal true} if values are equal.
+	 */
+	public boolean isOfType(Type type) {
+		return ObjectUtils.nullSafeEquals(type(), type);
+	}
+
+	/**
+	 * @return whether the field name represents a key (i.e. as-is name).
+	 */
+	public boolean isKey() {
+		return isOfType(Type.KEY);
+	}
+
+	/**
+	 * @return whether the field name represents a path (i.e. dot-path).
+	 */
+	public boolean isPath() {
+		return isOfType(Type.PATH);
+	}
+
+	@Override
+	public String toString() {
+		return "FieldName{%s=%s}".formatted(isKey() ? "key" : "path", name);
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		FieldName fieldName = (FieldName) o;
+		return ObjectUtils.nullSafeEquals(name, fieldName.name) && type == fieldName.type;
+	}
+
+	@Override
+	public int hashCode() {
+
+		int hashCode = ObjectUtils.nullSafeHashCode(name);
+		return 31 * hashCode + ObjectUtils.nullSafeHashCode(type);
+	}
+
+	/**
+	 * The {@link FieldName.Type type} defines how to treat a {@link FieldName} that contains special characters.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.2
+	 */
+	public enum Type {
+
+		/**
+		 * Dot ({@literal .}) characters are treated as separators for segments in a path.
+		 */
+		PATH,
+
+		/**
+		 * Values are used as is.
+		 */
+		KEY
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/FieldType.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/FieldType.java
index f550e8a588..7fc4199dd9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/FieldType.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/FieldType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
  * Enumeration of field value types that can be used to represent a {@link org.bson.Document} field value. This
  * enumeration contains a subset of {@link org.bson.BsonType} that is supported by the mapping and conversion
  * components.
- * <p/>
+ * <br />
  * Bson types are identified by a {@code byte} {@link #getBsonType() value}. This enumeration typically returns the
  * according bson type value except for {@link #IMPLICIT} which is a marker to derive the field type from a property.
  *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Language.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Language.java
index e51ac32d9f..db8cd1790d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Language.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Language.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoField.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoField.java
new file mode 100644
index 0000000000..881d741ee4
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoField.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2023-2025 the original author 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.mapping;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.mapping.FieldName.Type;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Value Object for representing a field to read/write within a MongoDB {@link org.bson.Document}.
+ *
+ * @author Christoph Strobl
+ * @since 4.2
+ */
+public class MongoField {
+
+	private final FieldName name;
+	private final FieldType fieldType;
+	private final int order;
+
+	protected MongoField(FieldName name, Class<?> targetFieldType, int fieldOrder) {
+		this(name, FieldType.valueOf(targetFieldType.getSimpleName()), fieldOrder);
+	}
+
+	protected MongoField(FieldName name, FieldType fieldType, int fieldOrder) {
+
+		this.name = name;
+		this.fieldType = fieldType;
+		this.order = fieldOrder;
+	}
+
+	/**
+	 * Create a new {@link MongoField} with given {@literal name}.
+	 *
+	 * @param name the name to be used as is (with all its potentially special characters).
+	 * @return new instance of {@link MongoField}.
+	 */
+	public static MongoField fromKey(String name) {
+		return builder().name(name).build();
+	}
+
+	/**
+	 * Create a new {@link MongoField} with given {@literal name}.
+	 *
+	 * @param name the name to be used path expression.
+	 * @return new instance of {@link MongoField}.
+	 */
+	public static MongoField fromPath(String name) {
+		return builder().path(name).build();
+	}
+
+	/**
+	 * @return new instance of {@link MongoFieldBuilder}.
+	 */
+	public static MongoFieldBuilder builder() {
+		return new MongoFieldBuilder();
+	}
+
+	/**
+	 * @return never {@literal null}.
+	 */
+	public FieldName getName() {
+		return name;
+	}
+
+	/**
+	 * Get the position of the field within the target document.
+	 *
+	 * @return {@link Integer#MAX_VALUE} if undefined.
+	 */
+	public int getOrder() {
+		return order;
+	}
+
+	/**
+	 * @param prefix a prefix to the current name.
+	 * @return new instance of {@link MongoField} with prefix appended to current field name.
+	 */
+	MongoField withPrefix(String prefix) {
+		return new MongoField(new FieldName(prefix + name.name(), name.type()), fieldType, order);
+	}
+
+	/**
+	 * Get the fields target type if defined.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public FieldType getFieldType() {
+		return fieldType;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		MongoField that = (MongoField) o;
+
+		if (order != that.order)
+			return false;
+		if (!ObjectUtils.nullSafeEquals(name, that.name)) {
+			return false;
+		}
+		return fieldType == that.fieldType;
+	}
+
+	@Override
+	public int hashCode() {
+
+		int result = ObjectUtils.nullSafeHashCode(name);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(fieldType);
+		result = 31 * result + order;
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return name.toString();
+	}
+
+	/**
+	 * Builder for {@link MongoField}.
+	 */
+	public static class MongoFieldBuilder {
+
+		private @Nullable String name;
+		private Type nameType = Type.PATH;
+		private FieldType type = FieldType.IMPLICIT;
+		private int order = Integer.MAX_VALUE;
+
+		/**
+		 * Configure the field type.
+		 *
+		 * @param fieldType
+		 * @return
+		 */
+		@Contract("_ -> this")
+		public MongoFieldBuilder fieldType(FieldType fieldType) {
+
+			this.type = fieldType;
+			return this;
+		}
+
+		/**
+		 * Configure the field name as key. Key field names are used as-is without applying path segmentation splitting
+		 * rules.
+		 *
+		 * @param fieldName
+		 * @return
+		 */
+		@Contract("_ -> this")
+		public MongoFieldBuilder name(String fieldName) {
+
+			Assert.hasText(fieldName, "Field name must not be empty");
+
+			this.name = fieldName;
+			this.nameType = Type.KEY;
+			return this;
+		}
+
+		/**
+		 * Configure the field name as path. Path field names are applied as paths potentially pointing into subdocuments.
+		 *
+		 * @param path
+		 * @return
+		 */
+		@Contract("_ -> this")
+		public MongoFieldBuilder path(String path) {
+
+			Assert.hasText(path, "Field path (name) must not be empty");
+
+			this.name = path;
+			this.nameType = Type.PATH;
+			return this;
+		}
+
+		/**
+		 * Configure the field order, defaulting to {@link Integer#MAX_VALUE} (undefined).
+		 *
+		 * @param order
+		 * @return
+		 */
+		@Contract("_ -> this")
+		public MongoFieldBuilder order(int order) {
+
+			this.order = order;
+			return this;
+		}
+
+		/**
+		 * Build a new {@link MongoField}.
+		 *
+		 * @return a new {@link MongoField}.
+		 */
+		@Contract("-> new")
+		public MongoField build() {
+
+			Assert.notNull(name, "Name of Field must not be null");
+			return new MongoField(new FieldName(name, nameType), type, order);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoId.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoId.java
index 6b52b0d98f..6e1eb40324 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoId.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
index 434201ab28..4540493124 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoMappingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,6 +17,7 @@
 
 import java.util.AbstractMap;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -26,8 +27,8 @@
 import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
+import org.springframework.data.util.NullableWrapperConverters;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
 
 /**
  * Default implementation of a {@link MappingContext} for MongoDB using {@link BasicMongoPersistentEntity} and
@@ -35,15 +36,17 @@
  *
  * @author Jon Brisbin
  * @author Oliver Gierke
+ * @author Christoph Strobl
  */
-public class MongoMappingContext extends AbstractMappingContext<BasicMongoPersistentEntity<?>, MongoPersistentProperty>
+public class MongoMappingContext extends AbstractMappingContext<MongoPersistentEntity<?>, MongoPersistentProperty>
 		implements ApplicationContextAware {
 
 	private static final FieldNamingStrategy DEFAULT_NAMING_STRATEGY = PropertyNameFieldNamingStrategy.INSTANCE;
 
 	private FieldNamingStrategy fieldNamingStrategy = DEFAULT_NAMING_STRATEGY;
-	private @Nullable ApplicationContext context;
-	private boolean autoIndexCreation = true;
+	private boolean autoIndexCreation = false;
+
+	private @Nullable ApplicationContext applicationContext;
 
 	/**
 	 * Creates a new {@link MongoMappingContext}.
@@ -63,52 +66,44 @@ public void setFieldNamingStrategy(@Nullable FieldNamingStrategy fieldNamingStra
 		this.fieldNamingStrategy = fieldNamingStrategy == null ? DEFAULT_NAMING_STRATEGY : fieldNamingStrategy;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.context.AbstractMappingContext#shouldCreatePersistentEntityFor(org.springframework.data.util.TypeInformation)
-	 */
 	@Override
 	protected boolean shouldCreatePersistentEntityFor(TypeInformation<?> type) {
+
+		if (NullableWrapperConverters.supports(type.getType())) {
+			return false;
+		}
+
 		return !MongoSimpleTypes.HOLDER.isSimpleType(type.getType()) && !AbstractMap.class.isAssignableFrom(type.getType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.AbstractMappingContext#createPersistentProperty(java.lang.reflect.Field, java.beans.PropertyDescriptor, org.springframework.data.mapping.MutablePersistentEntity, org.springframework.data.mapping.SimpleTypeHolder)
-	 */
 	@Override
-	public MongoPersistentProperty createPersistentProperty(Property property, BasicMongoPersistentEntity<?> owner,
+	public MongoPersistentProperty createPersistentProperty(Property property, MongoPersistentEntity<?> owner,
 			SimpleTypeHolder simpleTypeHolder) {
-		return new CachingMongoPersistentProperty(property, owner, simpleTypeHolder, fieldNamingStrategy);
+
+		CachingMongoPersistentProperty cachingMongoPersistentProperty = new CachingMongoPersistentProperty(property, owner, simpleTypeHolder, fieldNamingStrategy);
+		cachingMongoPersistentProperty.validate();
+		return cachingMongoPersistentProperty;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.BasicMappingContext#createPersistentEntity(org.springframework.data.util.TypeInformation, org.springframework.data.mapping.model.MappingContext)
-	 */
 	@Override
 	protected <T> BasicMongoPersistentEntity<T> createPersistentEntity(TypeInformation<T> typeInformation) {
-		return new BasicMongoPersistentEntity<T>(typeInformation);
+		return new BasicMongoPersistentEntity<>(typeInformation);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationContextAware#setApplicationContext(org.springframework.context.ApplicationContext)
-	 */
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 
+		this.applicationContext = applicationContext;
 		super.setApplicationContext(applicationContext);
-
-		this.context = applicationContext;
 	}
 
 	/**
 	 * Returns whether auto-index creation is enabled or disabled. <br />
-	 * <strong>NOTE:</strong>Index creation should happen at a well-defined time that is ideally controlled by the
+	 * <strong>NOTE:</strong> Index creation should happen at a well-defined time that is ideally controlled by the
 	 * application itself.
 	 *
-	 * @return {@literal true} when auto-index creation is enabled; {@literal false} otherwise.
+	 * @return {@literal true} when auto-index creation is enabled; {@literal false} otherwise. <br />
+	 *         <strong>INFO:</strong> As of 3.x the default will is set to {@literal false} was {@literal true} in 2.x.
 	 * @since 2.2
 	 * @see org.springframework.data.mongodb.core.index.Indexed
 	 */
@@ -121,11 +116,24 @@ public boolean isAutoIndexCreation() {
 	 * <strong>NOTE:</strong>Index creation should happen at a well-defined time that is ideally controlled by the
 	 * application itself.
 	 *
-	 * @param autoCreateIndexes set to {@literal false} to disable auto-index creation.
+	 * @param autoCreateIndexes set to {@literal true} to enable auto-index creation.
 	 * @since 2.2
 	 * @see org.springframework.data.mongodb.core.index.Indexed
 	 */
 	public void setAutoIndexCreation(boolean autoCreateIndexes) {
 		this.autoIndexCreation = autoCreateIndexes;
 	}
+
+	@Override
+	public @Nullable MongoPersistentEntity<?> getPersistentEntity(MongoPersistentProperty persistentProperty) {
+
+		MongoPersistentEntity<?> entity = super.getPersistentEntity(persistentProperty);
+
+		if (entity == null || !persistentProperty.isUnwrapped()) {
+			return entity;
+		}
+
+		return new UnwrappedMongoPersistentEntity<>(entity, new UnwrapEntityContext(persistentProperty));
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntity.java
index 35fcf1ef4b..f1d67e4ae8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntity.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,12 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
+import java.util.Collection;
+
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mapping.model.MutablePersistentEntity;
+import org.springframework.data.mongodb.core.query.Collation;
 
 /**
  * MongoDB specific {@link PersistentEntity} abstraction.
@@ -24,7 +28,7 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-public interface MongoPersistentEntity<T> extends PersistentEntity<T, MongoPersistentProperty> {
+public interface MongoPersistentEntity<T> extends MutablePersistentEntity<T, MongoPersistentProperty> {
 
 	/**
 	 * Returns the collection the entity shall be persisted to.
@@ -65,16 +69,46 @@ public interface MongoPersistentEntity<T> extends PersistentEntity<T, MongoPersi
 	 * @return {@literal null} if not set.
 	 * @since 2.2
 	 */
-	@Nullable
-	org.springframework.data.mongodb.core.query.Collation getCollation();
+	@Nullable Collation getCollation();
 
 	/**
 	 * @return {@literal true} if the entity is annotated with
-	 *         {@link org.springframework.data.mongodb.core.mapping.Collation}.
+	 *         {@link org.springframework.data.mongodb.core.query.Collation}.
 	 * @since 2.2
 	 */
 	default boolean hasCollation() {
 		return getCollation() != null;
 	}
 
+	/**
+	 * Get the entities shard key if defined.
+	 *
+	 * @return {@link ShardKey#none()} if not not set.
+	 * @since 3.0
+	 */
+	ShardKey getShardKey();
+
+	/**
+	 * @return {@literal true} if the {@link #getShardKey() shard key} is sharded.
+	 * @since 3.0
+	 */
+	default boolean isSharded() {
+		return getShardKey().isSharded();
+	}
+
+	/**
+	 * @return {@literal true} if the entity should be unwrapped.
+	 * @since 3.2
+	 */
+	default boolean isUnwrapped() {
+		return false;
+	}
+
+	/**
+	 * @return the resolved encryption keyIds if applicable. An empty {@link Collection} if no keyIds specified.
+	 *         {@literal null} no {@link Encrypted} annotation found.
+	 * @since 3.3
+	 */
+	@Nullable
+	Collection<Object> getEncryptionKeyIds();
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java
index 706e0277ca..cdbf940720 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoPersistentProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,11 +15,14 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
+import java.util.Collection;
+
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.lang.Nullable;
 
 /**
  * MongoDB specific {@link org.springframework.data.mapping.PersistentProperty} extension.
@@ -28,6 +31,7 @@
  * @author Patryk Wasik
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Divya Srivastava
  */
 public interface MongoPersistentProperty extends PersistentProperty<MongoPersistentProperty> {
 
@@ -38,6 +42,13 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	 */
 	String getFieldName();
 
+	/**
+	 * Returns whether the property uses an annotated field name through {@link Field}.
+	 *
+	 * @return
+	 */
+	boolean hasExplicitFieldName();
+
 	/**
 	 * Returns the {@link Class Java FieldType} of the field a property is persisted to.
 	 *
@@ -54,6 +65,15 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	 */
 	int getFieldOrder();
 
+	/**
+	 * Returns whether the property should be written to the database if its value is {@literal null}.
+	 *
+	 * @return
+	 * @since 3.3
+	 * @see Field.Write
+	 */
+	boolean writeNullValues();
+
 	/**
 	 * Returns whether the property is a {@link com.mongodb.DBRef}. If this returns {@literal true} you can expect
 	 * {@link #getDBRef()} to return an non-{@literal null} value.
@@ -62,6 +82,15 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	 */
 	boolean isDbReference();
 
+	/**
+	 * Returns whether the property is a {@link DocumentReference}. If this returns {@literal true} you can expect
+	 * {@link #getDocumentReference()} to return an non-{@literal null} value.
+	 *
+	 * @return
+	 * @since 3.3
+	 */
+	boolean isDocumentReference();
+
 	/**
 	 * Returns whether the property is explicitly marked as an identifier property of the owning {@link PersistentEntity}.
 	 * A property is an explicit id property if it is annotated with @see {@link Id}.
@@ -105,6 +134,16 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	@Nullable
 	DBRef getDBRef();
 
+	/**
+	 * Returns the {@link DocumentReference} if the property is a reference.
+	 *
+	 * @see #isDocumentReference()
+	 * @return {@literal null} if not present.
+	 * @since 3.3
+	 */
+	@Nullable
+	DocumentReference getDocumentReference();
+
 	/**
 	 * Returns whether property access shall be used for reading the property value. This means it will use the getter
 	 * instead of field access.
@@ -120,9 +159,30 @@ public interface MongoPersistentProperty extends PersistentProperty<MongoPersist
 	default boolean hasExplicitWriteTarget() {
 
 		Field field = findAnnotation(Field.class);
-		return field != null ? !FieldType.IMPLICIT.equals(field.targetType()) : false;
+		return field != null && !FieldType.IMPLICIT.equals(field.targetType());
 	}
 
+	/**
+	 * @return {@literal true} if the property should be unwrapped.
+	 * @since 3.2
+	 */
+	default boolean isUnwrapped() {
+		return isEntity() && isAnnotationPresent(Unwrapped.class);
+	}
+
+	/**
+	 * @return the resolved encryption keyIds if applicable. An empty {@link Collection} if no keyIds specified.
+	 *         {@literal null} no {@link Encrypted} annotation found.
+	 * @since 3.3
+	 */
+	Collection<Object> getEncryptionKeyIds();
+
+	/**
+	 * @return the {@link MongoField} representing the raw field to read/write in a MongoDB document.
+	 * @since 4.2
+	 */
+	MongoField getMongoField();
+
 	/**
 	 * Simple {@link Converter} implementation to transform a {@link MongoPersistentProperty} into its field name.
 	 *
@@ -132,12 +192,13 @@ enum PropertyToFieldNameConverter implements Converter<MongoPersistentProperty,
 
 		INSTANCE;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
+		@NonNull
+		@Override
 		public String convert(MongoPersistentProperty source) {
-			return source.getFieldName();
+			if (!source.isUnwrapped()) {
+				return source.getFieldName();
+			}
+			return "";
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoSimpleTypes.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoSimpleTypes.java
index 39163775de..6b4d9b9e9b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoSimpleTypes.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoSimpleTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import java.math.BigInteger;
-import java.util.Collections;
-import java.util.HashSet;
+import java.time.Instant;
 import java.util.Set;
 import java.util.UUID;
 import java.util.regex.Pattern;
@@ -30,6 +29,7 @@
 import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 import org.bson.types.Symbol;
+
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 import com.mongodb.DBRef;
@@ -47,66 +47,30 @@
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
 public abstract class MongoSimpleTypes {
 
-	public static final Set<Class<?>> AUTOGENERATED_ID_TYPES;
-
-	static {
-		Set<Class<?>> classes = new HashSet<>();
-		classes.add(ObjectId.class);
-		classes.add(String.class);
-		classes.add(BigInteger.class);
-		AUTOGENERATED_ID_TYPES = Collections.unmodifiableSet(classes);
-
-		Set<Class<?>> simpleTypes = new HashSet<>();
-		simpleTypes.add(Binary.class);
-		simpleTypes.add(DBRef.class);
-		simpleTypes.add(Decimal128.class);
-		simpleTypes.add(org.bson.Document.class);
-		simpleTypes.add(Code.class);
-		simpleTypes.add(CodeWScope.class);
-		simpleTypes.add(CodeWithScope.class);
-		simpleTypes.add(ObjectId.class);
-		simpleTypes.add(Pattern.class);
-		simpleTypes.add(Symbol.class);
-		simpleTypes.add(UUID.class);
-
-		simpleTypes.add(BsonBinary.class);
-		simpleTypes.add(BsonBoolean.class);
-		simpleTypes.add(BsonDateTime.class);
-		simpleTypes.add(BsonDbPointer.class);
-		simpleTypes.add(BsonDecimal128.class);
-		simpleTypes.add(BsonDocument.class);
-		simpleTypes.add(BsonDouble.class);
-		simpleTypes.add(BsonInt32.class);
-		simpleTypes.add(BsonInt64.class);
-		simpleTypes.add(BsonJavaScript.class);
-		simpleTypes.add(BsonJavaScriptWithScope.class);
-		simpleTypes.add(BsonObjectId.class);
-		simpleTypes.add(BsonRegularExpression.class);
-		simpleTypes.add(BsonString.class);
-		simpleTypes.add(BsonTimestamp.class);
-
-		simpleTypes.add(Geometry.class);
-		simpleTypes.add(GeometryCollection.class);
-		simpleTypes.add(LineString.class);
-		simpleTypes.add(MultiLineString.class);
-		simpleTypes.add(MultiPoint.class);
-		simpleTypes.add(MultiPolygon.class);
-		simpleTypes.add(Point.class);
-		simpleTypes.add(Polygon.class);
-
-		MONGO_SIMPLE_TYPES = Collections.unmodifiableSet(simpleTypes);
-	}
-
-	private static final Set<Class<?>> MONGO_SIMPLE_TYPES;
+	public static final Set<Class<?>> AUTOGENERATED_ID_TYPES = Set.of(ObjectId.class, String.class, BigInteger.class);
+	private static final Set<Class<?>> MONGO_SIMPLE_TYPES = Set.of(Binary.class, DBRef.class, Decimal128.class,
+			org.bson.Document.class, Code.class, CodeWScope.class, CodeWithScope.class, ObjectId.class, Pattern.class,
+			Symbol.class, UUID.class, Instant.class, BinaryVector.class, BsonValue.class, BsonNumber.class, BsonType.class,
+			BsonArray.class, BsonSymbol.class, BsonUndefined.class, BsonMinKey.class, BsonMaxKey.class, BsonNull.class,
+			BsonBinary.class, BsonBoolean.class, BsonDateTime.class, BsonDbPointer.class, BsonDecimal128.class,
+			BsonDocument.class, BsonDouble.class, BsonInt32.class, BsonInt64.class, BsonJavaScript.class,
+			BsonJavaScriptWithScope.class, BsonObjectId.class, BsonRegularExpression.class, BsonString.class,
+			BsonTimestamp.class, Geometry.class, GeometryCollection.class, LineString.class, MultiLineString.class,
+			MultiPoint.class, MultiPolygon.class, Point.class, Polygon.class);
 
 	public static final SimpleTypeHolder HOLDER = new SimpleTypeHolder(MONGO_SIMPLE_TYPES, true) {
 
 		@Override
 		public boolean isSimpleType(Class<?> type) {
 
+			if (type.isEnum()) {
+				return true;
+			}
+
 			if (type.getName().startsWith("java.time")) {
 				return false;
 			}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoVector.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoVector.java
new file mode 100644
index 0000000000..f7e0d1ee3f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/MongoVector.java
@@ -0,0 +1,220 @@
+/*
+ * Copyright 2025 the original author 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.mapping;
+
+import org.bson.BinaryVector;
+import org.bson.Float32BinaryVector;
+import org.bson.Int8BinaryVector;
+import org.bson.PackedBitBinaryVector;
+
+import org.springframework.data.domain.Vector;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * MongoDB-specific extension to {@link Vector} based on Mongo's {@link BinaryVector}. Note that only {@code float32}
+ * and {@code int8} variants can be represented as floating-point numbers. {@code int1} throws
+ * {@link UnsupportedOperationException} when calling {@link #toFloatArray()} and {@link #toDoubleArray()}.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class MongoVector implements Vector {
+
+	private final BinaryVector v;
+
+	MongoVector(BinaryVector v) {
+		this.v = v;
+	}
+
+	/**
+	 * Creates a new binary {@link MongoVector} using the given {@link BinaryVector}.
+	 *
+	 * @param v binary vector representation.
+	 * @return the {@link MongoVector} wrapping {@link BinaryVector}.
+	 */
+	public static MongoVector of(BinaryVector v) {
+		return new MongoVector(v);
+	}
+
+	/**
+	 * Creates a new binary {@link MongoVector} using the given {@code data}.
+	 * <p>
+	 * A {@link BinaryVector.DataType#INT8} vector is a vector of 8-bit signed integers where each byte in the vector
+	 * represents an element of a vector, with values in the range {@code [-128, 127]}.
+	 * <p>
+	 * NOTE: The byte array is not copied; changes to the provided array will be referenced in the created
+	 * {@code MongoVector} instance.
+	 *
+	 * @param data the byte array representing the {@link BinaryVector.DataType#INT8} vector data.
+	 * @return the {@link MongoVector} containing the given vector values to be represented as binary {@code int8}.
+	 */
+	public static MongoVector ofInt8(byte[] data) {
+		return of(BinaryVector.int8Vector(data));
+	}
+
+	/**
+	 * Creates a new binary {@link MongoVector} using the given {@code data}.
+	 * <p>
+	 * A {@link BinaryVector.DataType#FLOAT32} vector is a vector of floating-point numbers, where each element in the
+	 * vector is a {@code float}.
+	 * <p>
+	 * NOTE: The float array is not copied; changes to the provided array will be referenced in the created
+	 * {@code MongoVector} instance.
+	 *
+	 * @param data the float array representing the {@link BinaryVector.DataType#FLOAT32} vector data.
+	 * @return the {@link MongoVector} containing the given vector values to be represented as binary {@code float32}.
+	 */
+	public static MongoVector ofFloat(float... data) {
+		return of(BinaryVector.floatVector(data));
+	}
+
+	/**
+	 * Creates a new binary {@link MongoVector} from the given {@link Vector}.
+	 * <p>
+	 * A {@link BinaryVector.DataType#FLOAT32} vector is a vector of floating-point numbers, where each element in the
+	 * vector is a {@code float}. The given {@link Vector} must be able to return a {@link Vector#toFloatArray() float}
+	 * array.
+	 * <p>
+	 * NOTE: The float array is not copied; changes to the provided array will be referenced in the created
+	 * {@code MongoVector} instance.
+	 *
+	 * @param v the
+	 * @return the {@link MongoVector} using vector values from the given {@link Vector} to be represented as binary
+	 *         float32.
+	 */
+	public static MongoVector fromFloat(Vector v) {
+		return of(BinaryVector.floatVector(v.toFloatArray()));
+	}
+
+	@Override
+	public Class<? extends Number> getType() {
+
+		if (v instanceof Float32BinaryVector) {
+			return Float.class;
+		}
+
+		if (v instanceof Int8BinaryVector) {
+			return Byte.class;
+		}
+
+		if (v instanceof PackedBitBinaryVector) {
+			return Byte.class;
+		}
+
+		return Number.class;
+	}
+
+	@Override
+	public BinaryVector getSource() {
+		return v;
+	}
+
+	@Override
+	public int size() {
+
+		if (v instanceof Float32BinaryVector f) {
+			return f.getData().length;
+		}
+
+		if (v instanceof Int8BinaryVector i) {
+			return i.getData().length;
+		}
+
+		if (v instanceof PackedBitBinaryVector p) {
+			return p.getData().length;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @throws UnsupportedOperationException if the underlying data type is {@code int1} {@link PackedBitBinaryVector}.
+	 */
+	@Override
+	public float[] toFloatArray() {
+
+		if (v instanceof Float32BinaryVector f) {
+
+			float[] result = new float[f.getData().length];
+			System.arraycopy(f.getData(), 0, result, 0, result.length);
+			return result;
+		}
+
+		if (v instanceof Int8BinaryVector i) {
+
+			byte[] data = i.getData();
+			float[] result = new float[data.length];
+			for (int j = 0; j < data.length; j++) {
+				result[j] = data[j];
+			}
+			return result;
+		}
+
+		throw new UnsupportedOperationException("Cannot return float array for " + v.getClass());
+	}
+
+	/**
+	 * {@inheritDoc}
+	 *
+	 * @throws UnsupportedOperationException if the underlying data type is {@code int1} {@link PackedBitBinaryVector}.
+	 */
+	@Override
+	public double[] toDoubleArray() {
+
+		if (v instanceof Float32BinaryVector f) {
+
+			float[] data = f.getData();
+			double[] result = new double[data.length];
+			for (int i = 0; i < data.length; i++) {
+				result[i] = data[i];
+			}
+
+			return result;
+		}
+
+		if (v instanceof Int8BinaryVector i) {
+
+			byte[] data = i.getData();
+			double[] result = new double[data.length];
+			for (int j = 0; j < data.length; j++) {
+				result[j] = data[j];
+			}
+			return result;
+		}
+
+		throw new UnsupportedOperationException("Cannot return double array for " + v.getClass());
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (!(o instanceof MongoVector that)) {
+			return false;
+		}
+		return ObjectUtils.nullSafeEquals(v, that.v);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(v);
+	}
+
+	@Override
+	public String toString() {
+		return "MV[" + v + "]";
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/PersistentPropertyTranslator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/PersistentPropertyTranslator.java
new file mode 100644
index 0000000000..01bb7792fa
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/PersistentPropertyTranslator.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import java.util.function.Predicate;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.util.Predicates;
+
+/**
+ * Utility to translate a {@link MongoPersistentProperty} into a corresponding property from a different
+ * {@link MongoPersistentEntity} by looking it up by name.
+ * <p>
+ * Mainly used within the framework.
+ *
+ * @author Mark Paluch
+ * @since 3.4
+ */
+public class PersistentPropertyTranslator {
+
+	/**
+	 * Translate a {@link MongoPersistentProperty} into a corresponding property from a different
+	 * {@link MongoPersistentEntity}.
+	 *
+	 * @param property must not be {@literal null}.
+	 * @return the translated property. Can be the original {@code property}.
+	 */
+	public MongoPersistentProperty translate(MongoPersistentProperty property) {
+		return property;
+	}
+
+	/**
+	 * Create a new {@link PersistentPropertyTranslator}.
+	 *
+	 * @param targetEntity must not be {@literal null}.
+	 * @return the property translator to use.
+	 */
+	public static PersistentPropertyTranslator create(@Nullable MongoPersistentEntity<?> targetEntity) {
+		return create(targetEntity, Predicates.isTrue());
+	}
+
+	/**
+	 * Create a new {@link PersistentPropertyTranslator} accepting a {@link Predicate filter predicate} whether the
+	 * translation should happen at all.
+	 *
+	 * @param targetEntity must not be {@literal null}.
+	 * @param translationFilter must not be {@literal null}.
+	 * @return the property translator to use.
+	 */
+	public static PersistentPropertyTranslator create(@Nullable MongoPersistentEntity<?> targetEntity,
+			Predicate<MongoPersistentProperty> translationFilter) {
+		return targetEntity != null ? new EntityPropertyTranslator(targetEntity, translationFilter)
+				: new PersistentPropertyTranslator();
+	}
+
+	private static class EntityPropertyTranslator extends PersistentPropertyTranslator {
+
+		private final MongoPersistentEntity<?> targetEntity;
+		private final Predicate<MongoPersistentProperty> translationFilter;
+
+		EntityPropertyTranslator(MongoPersistentEntity<?> targetEntity,
+				Predicate<MongoPersistentProperty> translationFilter) {
+			this.targetEntity = targetEntity;
+			this.translationFilter = translationFilter;
+		}
+
+		@Override
+		public MongoPersistentProperty translate(MongoPersistentProperty property) {
+
+			if (!translationFilter.test(property)) {
+				return property;
+			}
+
+			MongoPersistentProperty targetProperty = targetEntity.getPersistentProperty(property.getName());
+			return targetProperty != null ? targetProperty : property;
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Queryable.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Queryable.java
new file mode 100644
index 0000000000..a0c67f7187
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Queryable.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2025 the original author 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.mapping;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Christoph Strobl
+ * @since 4.5
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.FIELD, ElementType.ANNOTATION_TYPE })
+public @interface Queryable {
+
+	/**
+	 * @return empty {@link String} if not set.
+	 */
+	String queryType() default "";
+
+	/**
+	 * @return empty {@link String} if not set.
+	 */
+	String queryAttributes() default "";
+
+	/**
+	 * Set the contention factor
+	 *
+	 * @return the contention factor
+	 */
+	long contentionFactor() default -1;
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/RangeEncrypted.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/RangeEncrypted.java
new file mode 100644
index 0000000000..8b2eccb6ca
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/RangeEncrypted.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2025 the original author 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.mapping;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * @author Christoph Strobl
+ * @author Ross Lawley
+ * @since 4.5
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Encrypted(algorithm = "Range")
+@Queryable(queryType = "range")
+public @interface RangeEncrypted {
+
+	/**
+	 * Set the contention factor.
+	 *
+	 * @return the contention factor
+	 */
+	@AliasFor(annotation = Queryable.class, value = "contentionFactor")
+	long contentionFactor() default -1;
+
+	/**
+	 * Set the {@literal range} options.
+	 * <p>
+	 * Should be valid extended {@link org.bson.Document#parse(String) JSON} representing the range options and including
+	 * the following values: {@code min}, {@code max}, {@code trimFactor} and {@code sparsity}.
+	 * <p>
+	 * Please note that values are data type sensitive and may require proper identification via eg. {@code $numberLong}.
+	 *
+	 * @return the {@link org.bson.Document#parse(String) JSON} representation of range options.
+	 */
+	@AliasFor(annotation = Queryable.class, value = "queryAttributes")
+	String rangeOptions() default "";
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ShardKey.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ShardKey.java
new file mode 100644
index 0000000000..1976cc35f3
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ShardKey.java
@@ -0,0 +1,148 @@
+/*
+ * Copyright 2020-2025 the original author 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.mapping;
+
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Value object representing an entities <a href="https://docs.mongodb.com/manual/core/sharding-shard-key/">Shard
+ * Key</a> used to distribute documents across a sharded MongoDB cluster.
+ * <br />
+ * {@link ShardKey#isImmutable() Immutable} shard keys indicates a fixed value that is not updated (see
+ * <a href="https://docs.mongodb.com/manual/core/sharding-shard-key/#change-a-document-s-shard-key-value">MongoDB
+ * Reference: Change a Document's Shard Key Value</a>), which allows to skip server round trips in cases where a
+ * potential shard key change might have occurred.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.0
+ */
+public class ShardKey {
+
+	private static final ShardKey NONE = new ShardKey(Collections.emptyList(), null, true);
+
+	private final List<String> propertyNames;
+	private final @Nullable ShardingStrategy shardingStrategy;
+	private final boolean immutable;
+
+	private ShardKey(List<String> propertyNames, @Nullable ShardingStrategy shardingStrategy, boolean immutable) {
+
+		this.propertyNames = propertyNames;
+		this.shardingStrategy = shardingStrategy;
+		this.immutable = immutable;
+	}
+
+	/**
+	 * @return the number of properties used to form the shard key.
+	 */
+	public int size() {
+		return propertyNames.size();
+	}
+
+	/**
+	 * @return the unmodifiable collection of property names forming the shard key.
+	 */
+	public Collection<String> getPropertyNames() {
+		return propertyNames;
+	}
+
+	/**
+	 * @return {@literal true} if the shard key of an document does not change.
+	 * @see <a href="https://docs.mongodb.com/manual/core/sharding-shard-key/#change-a-document-s-shard-key-value">MongoDB
+	 *      Reference: Change a Document's Shard Key Value</a>
+	 */
+	public boolean isImmutable() {
+		return immutable;
+	}
+
+	/**
+	 * Return whether the shard key represents a sharded key. Return {@literal false} if the key is not sharded.
+	 *
+	 * @return {@literal true} if the key is sharded; {@literal false} otherwise.
+	 */
+	public boolean isSharded() {
+		return !propertyNames.isEmpty();
+	}
+
+	/**
+	 * Get the raw MongoDB representation of the {@link ShardKey}.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public Document getDocument() {
+
+		Document doc = new Document();
+		for (String field : propertyNames) {
+			doc.append(field, shardingValue());
+		}
+		return doc;
+	}
+
+	private Object shardingValue() {
+		return ObjectUtils.nullSafeEquals(ShardingStrategy.HASH, shardingStrategy) ? "hash" : 1;
+	}
+
+	/**
+	 * {@link ShardKey} indicating no shard key has been defined.
+	 *
+	 * @return {@link #NONE}
+	 */
+	public static ShardKey none() {
+		return NONE;
+	}
+
+	/**
+	 * Create a new {@link ShardingStrategy#RANGE} shard key.
+	 *
+	 * @param propertyNames must not be {@literal null}.
+	 * @return new instance of {@link ShardKey}.
+	 */
+	public static ShardKey range(String... propertyNames) {
+		return new ShardKey(Arrays.asList(propertyNames), ShardingStrategy.RANGE, false);
+	}
+
+	/**
+	 * Create a new {@link ShardingStrategy#RANGE} shard key.
+	 *
+	 * @param propertyNames must not be {@literal null}.
+	 * @return new instance of {@link ShardKey}.
+	 */
+	public static ShardKey hash(String... propertyNames) {
+		return new ShardKey(Arrays.asList(propertyNames), ShardingStrategy.HASH, false);
+	}
+
+	/**
+	 * Turn the given {@link ShardKey} into an {@link #isImmutable() immutable} one.
+	 *
+	 * @param shardKey must not be {@literal null}.
+	 * @return new instance of {@link ShardKey} if the given shard key is not already immutable.
+	 */
+	public static ShardKey immutable(ShardKey shardKey) {
+
+		if (shardKey.isImmutable()) {
+			return shardKey;
+		}
+
+		return new ShardKey(shardKey.propertyNames, shardKey.shardingStrategy, true);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Sharded.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Sharded.java
new file mode 100644
index 0000000000..da537f7948
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Sharded.java
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2020-2025 the original author 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.mapping;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.annotation.Persistent;
+
+/**
+ * The {@link Sharded} annotation provides meta information about the actual distribution of data. The
+ * {@link #shardKey()} is used to distribute documents across shards. <br />
+ * Please see the <a href="https://docs.mongodb.com/manual/sharding/">MongoDB Documentation</a> for more information
+ * about requirements and limitations of sharding.
+ * <br />
+ * Spring Data adds the shard key to filter queries used for
+ * {@link com.mongodb.client.MongoCollection#replaceOne(org.bson.conversions.Bson, Object)} operations triggered by
+ * {@code save} operations on {@link org.springframework.data.mongodb.core.MongoOperations} and
+ * {@link org.springframework.data.mongodb.core.ReactiveMongoOperations} as well as {@code update/upsert} operations
+ * replacing/upserting a single existing document as long as the given
+ * {@link org.springframework.data.mongodb.core.query.UpdateDefinition} holds a full copy of the entity.
+ * <br />
+ * All other operations that require the presence of the {@literal shard key} in the filter query need to provide the
+ * information via the {@link org.springframework.data.mongodb.core.query.Query} parameter when invoking the method.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.0
+ */
+@Persistent
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.ANNOTATION_TYPE })
+public @interface Sharded {
+
+	/**
+	 * Alias for {@link #shardKey()}.
+	 *
+	 * @return {@literal _id} by default.
+	 * @see #shardKey()
+	 */
+	@AliasFor("shardKey")
+	String[] value() default {};
+
+	/**
+	 * The shard key determines the distribution of the collection's documents among the cluster's shards. The shard key
+	 * is either a single or multiple indexed properties that exist in every document in the collection.
+	 * <br />
+	 * By default the {@literal id} property is used for sharding. <br />
+	 * <strong>NOTE:</strong> Required indexes are not created automatically. Create these either externally, via
+	 * {@link org.springframework.data.mongodb.core.index.IndexOperations#ensureIndex(org.springframework.data.mongodb.core.index.IndexDefinition)}
+	 * or by annotating your domain model with {@link org.springframework.data.mongodb.core.index.Indexed}/
+	 * {@link org.springframework.data.mongodb.core.index.CompoundIndex} along with enabled
+	 * {@link org.springframework.data.mongodb.config.MongoConfigurationSupport#autoIndexCreation() auto index creation}.
+	 *
+	 * @return an empty key by default. Which indicates to use the entities {@literal id} property.
+	 */
+	@AliasFor("value")
+	String[] shardKey() default {};
+
+	/**
+	 * The sharding strategy to use for distributing data across sharded clusters.
+	 *
+	 * @return {@link ShardingStrategy#RANGE} by default
+	 */
+	ShardingStrategy shardingStrategy() default ShardingStrategy.RANGE;
+
+	/**
+	 * As of MongoDB 4.2 it is possible to change the shard key using update. Using immutable shard keys avoids server
+	 * round trips to obtain an entities actual shard key from the database.
+	 *
+	 * @return {@literal false} by default.
+	 * @see <a href="https://docs.mongodb.com/manual/core/sharding-shard-key/#change-a-document-s-shard-key-value">MongoDB
+	 *      Reference: Change a Document's Shard Key Value</a>
+	 */
+	boolean immutableKey() default false;
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ShardingStrategy.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ShardingStrategy.java
new file mode 100644
index 0000000000..6fefbf6913
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/ShardingStrategy.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2020-2025 the original author 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.mapping;
+
+/**
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public enum ShardingStrategy {
+
+	/**
+	 * Ranged sharding involves dividing data into ranges based on the shard key values. Each chunk is then assigned a
+	 * range based on the shard key values.
+	 */
+	RANGE,
+
+	/**
+	 * Hashed Sharding involves computing a hash of the shard key field’s value. Each chunk is then assigned a range based
+	 * on the hashed shard key values.
+	 */
+	HASH
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TextScore.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TextScore.java
index 38d4e7859c..349cc191f9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TextScore.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TextScore.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,11 @@
 /**
  * {@link TextScore} marks the property to be considered as the on server calculated {@literal textScore} when doing
  * full text search. <br />
- * <b>NOTE</b> Property will not be written when saving entity.
+ * <b>NOTE</b> Property will not be written when saving entity and may be {@literal null} if the document is retrieved
+ * by a regular (i.e. {@literal $text}) query.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 1.6
  */
 @ReadOnlyProperty
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TimeSeries.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TimeSeries.java
new file mode 100644
index 0000000000..efe0cd8703
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/TimeSeries.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.mongodb.core.timeseries.Granularity;
+
+/**
+ * Identifies a domain object to be persisted to a MongoDB Time Series collection.
+ *
+ * @author Christoph Strobl
+ * @author Ben Foster
+ * @since 3.3
+ * @see <a href="https://docs.mongodb.com/manual/core/timeseries-collections">https://docs.mongodb.com/manual/core/timeseries-collections</a>
+ */
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+@Document
+public @interface TimeSeries {
+
+	/**
+	 * The collection the document representing the entity is supposed to be stored in. If not configured, a default
+	 * collection name will be derived from the type's name. The attribute supports SpEL expressions to dynamically
+	 * calculate the collection based on a per operation basis.
+	 *
+	 * @return the name of the collection to be used.
+	 * @see Document#collection()
+	 */
+	@AliasFor(annotation = Document.class, attribute = "collection")
+	String collection() default "";
+
+	/**
+	 * Name of the property which contains the date in each time series document. <br />
+	 * Translation of property names to {@link Field#name() annotated fieldnames} will be considered during the mapping
+	 * process.
+	 *
+	 * @return never {@literal null}.
+	 */
+	String timeField();
+
+	/**
+	 * The name of the field which contains metadata in each time series document. Should not be the {@literal id} nor
+	 * {@link #timeField()} nor point to an {@literal array} or {@link java.util.Collection}. <br />
+	 * Translation of property names to {@link Field#name() annotated fieldnames} will be considered during the mapping
+	 * process.
+	 *
+	 * @return empty {@link String} by default.
+	 */
+	String metaField() default "";
+
+	/**
+	 * Select the {@link Granularity granularity} parameter to define how data in the time series collection is organized.
+	 *
+	 * @return {@link Granularity#DEFAULT server default} by default.
+	 */
+	Granularity granularity() default Granularity.DEFAULT;
+
+	/**
+	 * Defines the collation to apply when executing a query or creating indexes.
+	 *
+	 * @return an empty {@link String} by default.
+	 * @see Document#collation()
+	 */
+	@AliasFor(annotation = Document.class, attribute = "collation")
+	String collation() default "";
+
+	/**
+	 * Configure the timeout after which the document should expire.
+	 * Defaults to an empty {@link String} for no expiry. Accepts numeric values followed by their unit of measure:
+	 * <ul>
+	 * <li><b>d</b>: Days</li>
+	 * <li><b>h</b>: Hours</li>
+	 * <li><b>m</b>: Minutes</li>
+	 * <li><b>s</b>: Seconds</li>
+	 * <li>Alternatively: A Spring {@literal template expression}. The expression can result in a
+	 * {@link java.time.Duration} or a valid expiration {@link String} according to the already mentioned
+	 * conventions.</li>
+	 * </ul>
+	 * Supports ISO-8601 style.
+	 *
+	 * <pre class="code">
+	 * &#0064;TimeSeries(expireAfter = "10s") String expireAfterTenSeconds;
+	 * &#0064;TimeSeries(expireAfter = "1d") String expireAfterOneDay;
+	 * &#0064;TimeSeries(expireAfter = "P2D") String expireAfterTwoDays;
+	 * &#0064;TimeSeries(expireAfter = "#{&#0064;mySpringBean.timeout}") String expireAfterTimeoutObtainedFromSpringBean;
+	 * &#0064;TimeSeries(expireAfter = "&#36;{my.property.timeout}") String expireAfterTimeoutObtainedFromProperty;
+	 * </pre>
+	 *
+	 * @return empty by default.
+	 * @since 4.4
+	 */
+	String expireAfter() default "";
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrapEntityContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrapEntityContext.java
new file mode 100644
index 0000000000..9b42a0d37e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrapEntityContext.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * @author Christoph Strobl
+ * @author Rogério Meneguelli Gatto
+ * @since 3.2
+ */
+class UnwrapEntityContext {
+
+	private final MongoPersistentProperty property;
+
+	public UnwrapEntityContext(MongoPersistentProperty property) {
+		this.property = property;
+	}
+
+	public MongoPersistentProperty getProperty() {
+		return property;
+	}
+
+	@Override
+	public boolean equals(@Nullable Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == null || getClass() != obj.getClass()) {
+			return false;
+		}
+
+		UnwrapEntityContext that = (UnwrapEntityContext) obj;
+		return ObjectUtils.nullSafeEquals(property, that.property);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(property);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Unwrapped.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Unwrapped.java
new file mode 100644
index 0000000000..10a0639fb6
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/Unwrapped.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.annotation.meta.When;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * The annotation to configure a value object as flattened out in the target document.
+ * <br />
+ * Depending on the {@link OnEmpty value} of {@link #onEmpty()} the property is set to {@literal null} or an empty
+ * instance in the case all unwrapped values are {@literal null} when reading from the result set.
+ *
+ * @author Christoph Strobl
+ * @since 3.2
+ */
+@Documented
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = { ElementType.ANNOTATION_TYPE, ElementType.FIELD, ElementType.METHOD })
+public @interface Unwrapped {
+
+	/**
+	 * Set the load strategy for the unwrapped object if all contained fields yield {@literal null} values.
+	 * <br />
+	 * {@link Nullable @Unwrapped.Nullable} and {@link Empty @Unwrapped.Empty} offer shortcuts for this.
+	 *
+	 * @return never {@link} null.
+	 */
+	OnEmpty onEmpty();
+
+	/**
+	 * @return prefix for columns in the unwrapped value object. An empty {@link String} by default.
+	 */
+	String prefix() default "";
+
+	/**
+	 * Load strategy to be used {@link Unwrapped#onEmpty()}.
+	 *
+	 * @author Christoph Strobl
+	 */
+	enum OnEmpty {
+		USE_NULL, USE_EMPTY
+	}
+
+	/**
+	 * Shortcut for a nullable unwrapped property.
+	 *
+	 * <pre class="code">
+	 * &#64;Unwrapped.Nullable private Address address;
+	 * </pre>
+	 *
+	 * as alternative to the more verbose
+	 *
+	 * <pre class="code">
+	 * &#64;Unwrapped(onEmpty = USE_NULL) &#64;javax.annotation.Nonnull(when = When.MAYBE) private Address address;
+	 * </pre>
+	 *
+	 * @author Christoph Strobl
+	 * @see Unwrapped#onEmpty()
+	 */
+	@Unwrapped(onEmpty = OnEmpty.USE_NULL)
+	@Documented
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target({ ElementType.FIELD, ElementType.METHOD })
+	@javax.annotation.Nonnull(when = When.MAYBE)
+	@interface Nullable {
+
+		/**
+		 * @return prefix for columns in the unwrapped value object. An empty {@link String} by default.
+		 */
+		@AliasFor(annotation = Unwrapped.class, attribute = "prefix")
+		String prefix() default "";
+
+		/**
+		 * @return value for columns in the unwrapped value object. An empty {@link String} by default.
+		 */
+		@AliasFor(annotation = Unwrapped.class, attribute = "prefix")
+		String value() default "";
+	}
+
+	/**
+	 * Shortcut for an empty unwrapped property.
+	 *
+	 * <pre class="code">
+	 * &#64;Unwrapped.Empty private Address address;
+	 * </pre>
+	 *
+	 * as alternative to the more verbose
+	 *
+	 * <pre class="code">
+	 * &#64;Unwrapped(onEmpty = USE_EMPTY) &#64;javax.annotation.Nonnull(when = When.NEVER) private Address address;
+	 * </pre>
+	 *
+	 * @author Christoph Strobl
+	 * @see Unwrapped#onEmpty()
+	 */
+	@Unwrapped(onEmpty = OnEmpty.USE_EMPTY)
+	@Documented
+	@Retention(RetentionPolicy.RUNTIME)
+	@Target({ ElementType.FIELD, ElementType.METHOD })
+	@javax.annotation.Nonnull(when = When.NEVER)
+	@interface Empty {
+
+		/**
+		 * @return prefix for columns in the unwrapped value object. An empty {@link String} by default.
+		 */
+		@AliasFor(annotation = Unwrapped.class, attribute = "prefix")
+		String prefix() default "";
+
+		/**
+		 * @return value for columns in the unwrapped value object. An empty {@link String} by default.
+		 */
+		@AliasFor(annotation = Unwrapped.class, attribute = "prefix")
+		String value() default "";
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentEntity.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentEntity.java
new file mode 100644
index 0000000000..5c404a9d12
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentEntity.java
@@ -0,0 +1,334 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import java.lang.annotation.Annotation;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Spliterator;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.core.env.Environment;
+import org.springframework.data.mapping.*;
+import org.springframework.data.mapping.model.PersistentPropertyAccessorFactory;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.spel.EvaluationContextProvider;
+import org.springframework.data.util.Streamable;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.lang.Contract;
+
+/**
+ * Unwrapped variant of {@link MongoPersistentEntity}.
+ *
+ * @author Christoph Strobl
+ * @since 3.2
+ * @see Unwrapped
+ */
+class UnwrappedMongoPersistentEntity<T> implements MongoPersistentEntity<T> {
+
+	private final UnwrapEntityContext context;
+	private final MongoPersistentEntity<T> delegate;
+
+	public UnwrappedMongoPersistentEntity(MongoPersistentEntity<T> delegate, UnwrapEntityContext context) {
+
+		this.context = context;
+		this.delegate = delegate;
+	}
+
+	@Override
+	public String getCollection() {
+		return delegate.getCollection();
+	}
+
+	@Override
+	public String getLanguage() {
+		return delegate.getLanguage();
+	}
+
+	@Override
+	public @Nullable MongoPersistentProperty getTextScoreProperty() {
+		return delegate.getTextScoreProperty();
+	}
+
+	@Override
+	public boolean hasTextScoreProperty() {
+		return delegate.hasTextScoreProperty();
+	}
+
+	@Override
+	public @Nullable Collation getCollation() {
+		return delegate.getCollation();
+	}
+
+	@Override
+	public boolean hasCollation() {
+		return delegate.hasCollation();
+	}
+
+	@Override
+	public ShardKey getShardKey() {
+		return delegate.getShardKey();
+	}
+
+	@Override
+	public boolean isSharded() {
+		return delegate.isSharded();
+	}
+
+	@Override
+	public String getName() {
+		return delegate.getName();
+	}
+
+	@Nullable
+	@Override
+	public InstanceCreatorMetadata<MongoPersistentProperty> getInstanceCreatorMetadata() {
+		return delegate.getInstanceCreatorMetadata();
+	}
+
+	@Override
+	public boolean isCreatorArgument(PersistentProperty<?> property) {
+		return delegate.isCreatorArgument(property);
+	}
+
+	@Override
+	public boolean isIdProperty(PersistentProperty<?> property) {
+		return delegate.isIdProperty(property);
+	}
+
+	@Override
+	public boolean isVersionProperty(PersistentProperty<?> property) {
+		return delegate.isVersionProperty(property);
+	}
+
+	@Override
+	public @Nullable MongoPersistentProperty getIdProperty() {
+		return delegate.getIdProperty();
+	}
+
+	@Override
+	public MongoPersistentProperty getRequiredIdProperty() {
+		return delegate.getRequiredIdProperty();
+	}
+
+	@Override
+	public @Nullable MongoPersistentProperty getVersionProperty() {
+		return delegate.getVersionProperty();
+	}
+
+	@Override
+	public MongoPersistentProperty getRequiredVersionProperty() {
+		return delegate.getRequiredVersionProperty();
+	}
+
+	@Override
+	public @Nullable MongoPersistentProperty getPersistentProperty(String name) {
+		return wrap(delegate.getPersistentProperty(name));
+	}
+
+	@Override
+	public MongoPersistentProperty getRequiredPersistentProperty(String name) {
+
+		MongoPersistentProperty persistentProperty = getPersistentProperty(name);
+		if (persistentProperty != null) {
+			return persistentProperty;
+		}
+
+		throw new IllegalStateException(String.format("Required property %s not found for %s", name, getType()));
+	}
+
+	@Override
+	public @Nullable MongoPersistentProperty getPersistentProperty(Class<? extends Annotation> annotationType) {
+		return wrap(delegate.getPersistentProperty(annotationType));
+	}
+
+	@Override
+	public Iterable<MongoPersistentProperty> getPersistentProperties(Class<? extends Annotation> annotationType) {
+		return Streamable.of(delegate.getPersistentProperties(annotationType)).stream().map(this::wrap)
+				.collect(Collectors.toList());
+	}
+
+	@Override
+	public boolean hasIdProperty() {
+		return delegate.hasIdProperty();
+	}
+
+	@Override
+	public boolean hasVersionProperty() {
+		return delegate.hasVersionProperty();
+	}
+
+	@Override
+	public Class<T> getType() {
+		return delegate.getType();
+	}
+
+	@Override
+	public Alias getTypeAlias() {
+		return delegate.getTypeAlias();
+	}
+
+	@Override
+	public TypeInformation<T> getTypeInformation() {
+		return delegate.getTypeInformation();
+	}
+
+	@Override
+	public void doWithProperties(PropertyHandler<MongoPersistentProperty> handler) {
+
+		delegate.doWithProperties((PropertyHandler<MongoPersistentProperty>) property -> {
+			handler.doWithPersistentProperty(wrap(property));
+		});
+	}
+
+	@Override
+	public void doWithProperties(SimplePropertyHandler handler) {
+
+		delegate.doWithProperties((SimplePropertyHandler) property -> {
+			if (property instanceof MongoPersistentProperty mongoPersistentProperty) {
+				handler.doWithPersistentProperty(wrap(mongoPersistentProperty));
+			} else {
+				handler.doWithPersistentProperty(property);
+			}
+		});
+	}
+
+	@Override
+	public void doWithAssociations(AssociationHandler<MongoPersistentProperty> handler) {
+		delegate.doWithAssociations(handler);
+	}
+
+	@Override
+	public void doWithAssociations(SimpleAssociationHandler handler) {
+		delegate.doWithAssociations(handler);
+	}
+
+	@Override
+	public <A extends Annotation> @Nullable A findAnnotation(Class<A> annotationType) {
+		return delegate.findAnnotation(annotationType);
+	}
+
+	@Override
+	public <A extends Annotation> A getRequiredAnnotation(Class<A> annotationType) throws IllegalStateException {
+		return delegate.getRequiredAnnotation(annotationType);
+	}
+
+	@Override
+	public <A extends Annotation> boolean isAnnotationPresent(Class<A> annotationType) {
+		return delegate.isAnnotationPresent(annotationType);
+	}
+
+	@Override
+	public <B> PersistentPropertyAccessor<B> getPropertyAccessor(B bean) {
+		return delegate.getPropertyAccessor(bean);
+	}
+
+	@Override
+	public <B> PersistentPropertyPathAccessor<B> getPropertyPathAccessor(B bean) {
+		return delegate.getPropertyPathAccessor(bean);
+	}
+
+	@Override
+	public IdentifierAccessor getIdentifierAccessor(Object bean) {
+		return delegate.getIdentifierAccessor(bean);
+	}
+
+	@Override
+	public boolean isNew(Object bean) {
+		return delegate.isNew(bean);
+	}
+
+	@Override
+	public boolean isImmutable() {
+		return delegate.isImmutable();
+	}
+
+	@Override
+	public boolean requiresPropertyPopulation() {
+		return delegate.requiresPropertyPopulation();
+	}
+
+	@Override
+	public Iterator<MongoPersistentProperty> iterator() {
+
+		List<MongoPersistentProperty> target = new ArrayList<>();
+		delegate.iterator().forEachRemaining(it -> target.add(wrap(it)));
+		return target.iterator();
+	}
+
+	@Override
+	public void forEach(Consumer<? super MongoPersistentProperty> action) {
+		delegate.forEach(it -> action.accept(wrap(it)));
+	}
+
+	@Override
+	public Spliterator<MongoPersistentProperty> spliterator() {
+		return delegate.spliterator();
+	}
+
+	@Contract("null -> null; !null -> !null")
+	private @Nullable MongoPersistentProperty wrap(@Nullable MongoPersistentProperty source) {
+
+		if (source == null) {
+			return source;
+		}
+		return new UnwrappedMongoPersistentProperty(source, context);
+	}
+
+	@Override
+	public void addPersistentProperty(MongoPersistentProperty property) {
+
+	}
+
+	@Override
+	public void addAssociation(Association<MongoPersistentProperty> association) {
+
+	}
+
+	@Override
+	public void verify() throws MappingException {
+
+	}
+
+	@Override
+	public void setPersistentPropertyAccessorFactory(PersistentPropertyAccessorFactory factory) {
+
+	}
+
+	@Override
+	public void setEvaluationContextProvider(EvaluationContextProvider provider) {
+
+	}
+
+	@Override
+	public void setEnvironment(Environment environment) {
+
+	}
+
+	@Override
+	public boolean isUnwrapped() {
+		return context.getProperty().isUnwrapped();
+	}
+
+	@Override
+	public @Nullable Collection<Object> getEncryptionKeyIds() {
+		return delegate.getEncryptionKeyIds();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentProperty.java
new file mode 100644
index 0000000000..ac7f24a555
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/UnwrappedMongoPersistentProperty.java
@@ -0,0 +1,377 @@
+/*
+ * Copyright 2021-2025 the original author 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.mapping;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Collection;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.Association;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentPropertyAccessor;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Unwrapped variant of {@link MongoPersistentProperty}.
+ *
+ * @author Christoph Strobl
+ * @author Rogério Meneguelli Gatto
+ * @since 3.2
+ * @see Unwrapped
+ */
+class UnwrappedMongoPersistentProperty implements MongoPersistentProperty {
+
+	private final MongoPersistentProperty delegate;
+	private final UnwrapEntityContext context;
+
+	public UnwrappedMongoPersistentProperty(MongoPersistentProperty delegate, UnwrapEntityContext context) {
+
+		this.delegate = delegate;
+		this.context = context;
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	public String getFieldName() {
+
+		if (!context.getProperty().isUnwrapped()) {
+			return delegate.getFieldName();
+		}
+
+		return context.getProperty().findAnnotation(Unwrapped.class).prefix() + delegate.getFieldName();
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	public boolean hasExplicitFieldName() {
+		return delegate.hasExplicitFieldName()
+				|| !ObjectUtils.isEmpty(context.getProperty().findAnnotation(Unwrapped.class).prefix());
+	}
+
+	@Override
+	public Class<?> getFieldType() {
+		return delegate.getFieldType();
+	}
+
+	@Override
+	public int getFieldOrder() {
+		return delegate.getFieldOrder();
+	}
+
+	@Override
+	public boolean writeNullValues() {
+		return delegate.writeNullValues();
+	}
+
+	@Override
+	public boolean isDbReference() {
+		return delegate.isDbReference();
+	}
+
+	@Override
+	public boolean isDocumentReference() {
+		return delegate.isDocumentReference();
+	}
+
+	@Override
+	public boolean isExplicitIdProperty() {
+		return delegate.isExplicitIdProperty();
+	}
+
+	@Override
+	public boolean isLanguageProperty() {
+		return delegate.isLanguageProperty();
+	}
+
+	@Override
+	public boolean isExplicitLanguageProperty() {
+		return delegate.isExplicitLanguageProperty();
+	}
+
+	@Override
+	public boolean isTextScoreProperty() {
+		return delegate.isTextScoreProperty();
+	}
+
+	@Override
+	public @Nullable DBRef getDBRef() {
+		return delegate.getDBRef();
+	}
+
+	@Override
+	public @Nullable DocumentReference getDocumentReference() {
+		return delegate.getDocumentReference();
+	}
+
+	@Override
+	public boolean usePropertyAccess() {
+		return delegate.usePropertyAccess();
+	}
+
+	@Override
+	public boolean hasExplicitWriteTarget() {
+		return delegate.hasExplicitWriteTarget();
+	}
+
+	@Override
+	public PersistentEntity<?, MongoPersistentProperty> getOwner() {
+		return delegate.getOwner();
+	}
+
+	@Override
+	public String getName() {
+		return delegate.getName();
+	}
+
+	@Override
+	public Class<?> getType() {
+		return delegate.getType();
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	public MongoField getMongoField() {
+
+		if (!context.getProperty().isUnwrapped()) {
+			return delegate.getMongoField();
+		}
+
+		return delegate.getMongoField().withPrefix(context.getProperty().findAnnotation(Unwrapped.class).prefix());
+	}
+
+	@Override
+	public TypeInformation<?> getTypeInformation() {
+		return delegate.getTypeInformation();
+	}
+
+	@Override
+	public Iterable<? extends TypeInformation<?>> getPersistentEntityTypeInformation() {
+		return delegate.getPersistentEntityTypeInformation();
+	}
+
+	@Override
+	public @Nullable Method getGetter() {
+		return delegate.getGetter();
+	}
+
+	@Override
+	public Method getRequiredGetter() {
+		return delegate.getRequiredGetter();
+	}
+
+	@Override
+	public @Nullable Method getSetter() {
+		return delegate.getSetter();
+	}
+
+	@Override
+	public Method getRequiredSetter() {
+		return delegate.getRequiredSetter();
+	}
+
+	@Override
+	public @Nullable Method getWither() {
+		return delegate.getWither();
+	}
+
+	@Override
+	public Method getRequiredWither() {
+		return delegate.getRequiredWither();
+	}
+
+	@Override
+	public @Nullable Field getField() {
+		return delegate.getField();
+	}
+
+	@Override
+	public Field getRequiredField() {
+		return delegate.getRequiredField();
+	}
+
+	@Override
+	public @Nullable String getSpelExpression() {
+		return delegate.getSpelExpression();
+	}
+
+	@Override
+	public @Nullable Association<MongoPersistentProperty> getAssociation() {
+		return delegate.getAssociation();
+	}
+
+	@Override
+	public Association<MongoPersistentProperty> getRequiredAssociation() {
+		return delegate.getRequiredAssociation();
+	}
+
+	@Override
+	public boolean isEntity() {
+		return delegate.isEntity();
+	}
+
+	@Override
+	public boolean isIdProperty() {
+		return delegate.isIdProperty();
+	}
+
+	@Override
+	public boolean isVersionProperty() {
+		return delegate.isVersionProperty();
+	}
+
+	@Override
+	public boolean isCollectionLike() {
+		return delegate.isCollectionLike();
+	}
+
+	@Override
+	public boolean isMap() {
+		return delegate.isMap();
+	}
+
+	@Override
+	public boolean isArray() {
+		return delegate.isArray();
+	}
+
+	@Override
+	public boolean isTransient() {
+		return delegate.isTransient();
+	}
+
+	@Override
+	public boolean isWritable() {
+		return delegate.isWritable();
+	}
+
+	@Override
+	public boolean isReadable() {
+		return delegate.isReadable();
+	}
+
+	@Override
+	public boolean isImmutable() {
+		return delegate.isImmutable();
+	}
+
+	@Override
+	public boolean isAssociation() {
+		return delegate.isAssociation();
+	}
+
+	@Override
+	public boolean isUnwrapped() {
+		return delegate.isUnwrapped();
+	}
+
+	@Override
+	public Collection<Object> getEncryptionKeyIds() {
+		return delegate.getEncryptionKeyIds();
+	}
+
+	@Override
+	public @Nullable Class<?> getComponentType() {
+		return delegate.getComponentType();
+	}
+
+	@Override
+	public Class<?> getRawType() {
+		return delegate.getRawType();
+	}
+
+	@Override
+	public @Nullable Class<?> getMapValueType() {
+		return delegate.getMapValueType();
+	}
+
+	@Override
+	public Class<?> getActualType() {
+		return delegate.getActualType();
+	}
+
+	@Override
+	public <A extends Annotation> @Nullable A findAnnotation(Class<A> annotationType) {
+		return delegate.findAnnotation(annotationType);
+	}
+
+	@Override
+	public <A extends Annotation> A getRequiredAnnotation(Class<A> annotationType) throws IllegalStateException {
+		return delegate.getRequiredAnnotation(annotationType);
+	}
+
+	@Override
+	public <A extends Annotation> @Nullable A findPropertyOrOwnerAnnotation(Class<A> annotationType) {
+		return delegate.findPropertyOrOwnerAnnotation(annotationType);
+	}
+
+	@Override
+	public boolean isAnnotationPresent(Class<? extends Annotation> annotationType) {
+		return delegate.isAnnotationPresent(annotationType);
+	}
+
+	@Override
+	public boolean hasActualTypeAnnotation(Class<? extends Annotation> annotationType) {
+		return delegate.hasActualTypeAnnotation(annotationType);
+	}
+
+	@Override
+	public @Nullable Class<?> getAssociationTargetType() {
+		return delegate.getAssociationTargetType();
+	}
+
+	@Override
+	public @Nullable TypeInformation<?> getAssociationTargetTypeInformation() {
+		return delegate.getAssociationTargetTypeInformation();
+	}
+
+	@Override
+	public <T> PersistentPropertyAccessor<T> getAccessorForOwner(T owner) {
+		return delegate.getAccessorForOwner(owner);
+	}
+
+	@Override
+	public boolean equals(@Nullable Object obj) {
+
+		if (this == obj) {
+			return true;
+		}
+
+		if (obj == delegate) {
+			return true;
+		}
+
+		if (obj == null || getClass() != obj.getClass()) {
+			return false;
+		}
+
+		UnwrappedMongoPersistentProperty that = (UnwrappedMongoPersistentProperty) obj;
+		if (!ObjectUtils.nullSafeEquals(delegate, that.delegate)) {
+			return false;
+		}
+		return ObjectUtils.nullSafeEquals(context, that.context);
+	}
+
+	@Override
+	public int hashCode() {
+
+		int result = ObjectUtils.nullSafeHashCode(delegate);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(context);
+		return result;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractDeleteEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractDeleteEvent.java
index d057ff1a66..a8e2c93773 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractDeleteEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractDeleteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.core.mapping.event;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Base class for delete events.
@@ -47,10 +47,9 @@ public AbstractDeleteEvent(Document document, @Nullable Class<T> type, String co
 	/**
 	 * Returns the type for which the {@link AbstractDeleteEvent} shall be invoked for.
 	 *
-	 * @return
+	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	public Class<T> getType() {
+	public @Nullable Class<T> getType() {
 		return type;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java
index 0f4c0097be..4e1de58c7a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,12 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationListener;
 import org.springframework.core.GenericTypeResolver;
+import org.springframework.data.mongodb.core.query.SerializationUtils;
 
 /**
  * Base class to implement domain class specific {@link ApplicationListener}s.
@@ -30,7 +32,7 @@
  */
 public abstract class AbstractMongoEventListener<E> implements ApplicationListener<MongoMappingEvent<?>> {
 
-	private static final Logger LOG = LoggerFactory.getLogger(AbstractMongoEventListener.class);
+	private static final Log LOG = LogFactory.getLog(AbstractMongoEventListener.class);
 	private final Class<?> domainClass;
 
 	/**
@@ -41,16 +43,11 @@ public AbstractMongoEventListener() {
 		this.domainClass = typeArgument == null ? Object.class : typeArgument;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
-	 */
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void onApplicationEvent(MongoMappingEvent<?> event) {
 
-		if (event instanceof AfterLoadEvent) {
-			AfterLoadEvent<?> afterLoadEvent = (AfterLoadEvent<?>) event;
+		if (event instanceof AfterLoadEvent<?> afterLoadEvent) {
 
 			if (domainClass.isAssignableFrom(afterLoadEvent.getType())) {
 				onAfterLoad((AfterLoadEvent<E>) event);
@@ -59,16 +56,16 @@ public void onApplicationEvent(MongoMappingEvent<?> event) {
 			return;
 		}
 
-		if (event instanceof AbstractDeleteEvent) {
+		if (event instanceof AbstractDeleteEvent deleteEvent) {
 
-			Class<?> eventDomainType = ((AbstractDeleteEvent) event).getType();
+			Class<?> eventDomainType = deleteEvent.getType();
 
 			if (eventDomainType != null && domainClass.isAssignableFrom(eventDomainType)) {
-				if (event instanceof BeforeDeleteEvent) {
-					onBeforeDelete((BeforeDeleteEvent<E>) event);
+				if (event instanceof BeforeDeleteEvent beforeDeleteEvent) {
+					onBeforeDelete(beforeDeleteEvent);
 				}
-				if (event instanceof AfterDeleteEvent) {
-					onAfterDelete((AfterDeleteEvent<E>) event);
+				if (event instanceof AfterDeleteEvent afterDeleteEvent) {
+					onAfterDelete(afterDeleteEvent);
 				}
 			}
 
@@ -83,14 +80,14 @@ public void onApplicationEvent(MongoMappingEvent<?> event) {
 			return;
 		}
 
-		if (event instanceof BeforeConvertEvent) {
-			onBeforeConvert((BeforeConvertEvent<E>) event);
-		} else if (event instanceof BeforeSaveEvent) {
-			onBeforeSave((BeforeSaveEvent<E>) event);
-		} else if (event instanceof AfterSaveEvent) {
-			onAfterSave((AfterSaveEvent<E>) event);
-		} else if (event instanceof AfterConvertEvent) {
-			onAfterConvert((AfterConvertEvent<E>) event);
+		if (event instanceof BeforeConvertEvent beforeConvertEvent) {
+			onBeforeConvert(beforeConvertEvent);
+		} else if (event instanceof BeforeSaveEvent beforeSaveEvent) {
+			onBeforeSave(beforeSaveEvent);
+		} else if (event instanceof AfterSaveEvent afterSaveEvent) {
+			onAfterSave(afterSaveEvent);
+		} else if (event instanceof AfterConvertEvent afterConvertEvent) {
+			onAfterConvert(afterConvertEvent);
 		}
 	}
 
@@ -103,7 +100,7 @@ public void onApplicationEvent(MongoMappingEvent<?> event) {
 	public void onBeforeConvert(BeforeConvertEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onBeforeConvert({})", event.getSource());
+			LOG.debug(String.format("onBeforeConvert(%s)", SerializationUtils.serializeToJsonSafely(event.getSource())));
 		}
 	}
 
@@ -116,7 +113,7 @@ public void onBeforeConvert(BeforeConvertEvent<E> event) {
 	public void onBeforeSave(BeforeSaveEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onBeforeSave({}, {})", event.getSource(), event.getDocument());
+			LOG.debug(String.format("onBeforeSave(%s, %s)", SerializationUtils.serializeToJsonSafely(event.getSource()), SerializationUtils.serializeToJsonSafely(event.getDocument())));
 		}
 	}
 
@@ -129,7 +126,7 @@ public void onBeforeSave(BeforeSaveEvent<E> event) {
 	public void onAfterSave(AfterSaveEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterSave({}, {})", event.getSource(), event.getDocument());
+			LOG.debug(String.format("onAfterSave(%s, %s)", SerializationUtils.serializeToJsonSafely(event.getSource()), SerializationUtils.serializeToJsonSafely(event.getDocument())));
 		}
 	}
 
@@ -142,7 +139,7 @@ public void onAfterSave(AfterSaveEvent<E> event) {
 	public void onAfterLoad(AfterLoadEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterLoad({})", event.getDocument());
+			LOG.debug(String.format("onAfterLoad(%s)", SerializationUtils.serializeToJsonSafely(event.getDocument())));
 		}
 	}
 
@@ -155,7 +152,7 @@ public void onAfterLoad(AfterLoadEvent<E> event) {
 	public void onAfterConvert(AfterConvertEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterConvert({}, {})", event.getDocument(), event.getSource());
+			LOG.debug(String.format("onAfterConvert(%s, %s)", SerializationUtils.serializeToJsonSafely(event.getDocument()), SerializationUtils.serializeToJsonSafely(event.getSource())));
 		}
 	}
 
@@ -168,7 +165,7 @@ public void onAfterConvert(AfterConvertEvent<E> event) {
 	public void onAfterDelete(AfterDeleteEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onAfterDelete({})", event.getDocument());
+			LOG.debug(String.format("onAfterDelete(%s)", SerializationUtils.serializeToJsonSafely(event.getDocument())));
 		}
 	}
 
@@ -181,7 +178,7 @@ public void onAfterDelete(AfterDeleteEvent<E> event) {
 	public void onBeforeDelete(BeforeDeleteEvent<E> event) {
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug("onBeforeDelete({})", event.getDocument());
+			LOG.debug(String.format("onBeforeDelete(%s)", SerializationUtils.serializeToJsonSafely(event.getDocument())));
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterConvertCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterConvertCallback.java
new file mode 100644
index 0000000000..be6d6fb5e4
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterConvertCallback.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020-2025 the original author 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.mapping.event;
+
+import org.bson.Document;
+import org.springframework.data.mapping.callback.EntityCallback;
+
+/**
+ * Callback being invoked after a domain object is materialized from a {@link Document} when reading results.
+ *
+ * @author Roman Puchkovskiy
+ * @author Mark Paluch
+ * @since 3.0
+ * @see org.springframework.data.mapping.callback.EntityCallbacks
+ */
+@FunctionalInterface
+public interface AfterConvertCallback<T> extends EntityCallback<T> {
+
+	/**
+	 * Entity callback method invoked after a domain object is materialized from a {@link Document}. Can return either the
+	 * same or a modified instance of the domain object.
+	 *
+	 * @param entity the domain object (the result of the conversion).
+	 * @param document must not be {@literal null}.
+	 * @param collection name of the collection.
+	 * @return the domain object that is the result of reading it from the {@link Document}.
+	 */
+	T onAfterConvert(T entity, Document document, String collection);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterConvertEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterConvertEvent.java
index 4155f5ba35..9421e9184a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterConvertEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterConvertEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterDeleteEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterDeleteEvent.java
index 95df315e94..10f4cdbbb7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterDeleteEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterDeleteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,11 @@
 package org.springframework.data.mongodb.core.mapping.event;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Event being thrown after a single or a set of documents has/have been deleted. The {@link Document} held in the event
- * will be the query document <em>after</am> it has been mapped onto the domain type handled.
+ * will be the query document <em>after</em> it has been mapped onto the domain type handled.
  *
  * @author Martin Baumgartner
  * @author Christoph Strobl
@@ -33,7 +33,7 @@ public class AfterDeleteEvent<T> extends AbstractDeleteEvent<T> {
 	/**
 	 * Creates a new {@link AfterDeleteEvent} for the given {@link Document}, type and collectionName.
 	 *
-	 * @param dbo must not be {@literal null}.
+	 * @param document must not be {@literal null}.
 	 * @param type may be {@literal null}.
 	 * @param collectionName must not be {@literal null}.
 	 * @since 1.8
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterLoadEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterLoadEvent.java
index 1c5f8cdbed..bd808bfecf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterLoadEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterLoadEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,14 +44,14 @@ public AfterLoadEvent(Document document, Class<T> type, String collectionName) {
 
 		super(document, document, collectionName);
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 		this.type = type;
 	}
 
 	/**
 	 * Returns the type for which the {@link AfterLoadEvent} shall be invoked for.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public Class<T> getType() {
 		return type;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveCallback.java
new file mode 100644
index 0000000000..3489cfce03
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveCallback.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2020-2025 the original author 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.mapping.event;
+
+import org.bson.Document;
+import org.springframework.data.mapping.callback.EntityCallback;
+
+/**
+ * Entity callback triggered after save of a {@link Document}.
+ *
+ * @author Roman Puchkovskiy
+ * @since 3.0
+ */
+@FunctionalInterface
+public interface AfterSaveCallback<T> extends EntityCallback<T> {
+
+	/**
+	 * Entity callback method invoked after a domain object is saved. Can return either the same or a modified instance of
+	 * the domain object.
+	 *
+	 * @param entity the domain object that was saved.
+	 * @param document {@link Document} representing the {@code entity}.
+	 * @param collection name of the collection.
+	 * @return the domain object that was persisted.
+	 */
+	T onAfterSave(T entity, Document document, String collection);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveEvent.java
index 95318b560c..a2786ff011 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java
index 30d9ffac59..df5ecc1e92 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,23 +41,15 @@ public class AuditingEntityCallback implements BeforeConvertCallback<Object>, Or
 	 */
 	public AuditingEntityCallback(ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory) {
 
-		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null!");
+		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null");
 		this.auditingHandlerFactory = auditingHandlerFactory;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback#onBeforeConvert(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Object onBeforeConvert(Object entity, String collection) {
 		return auditingHandlerFactory.getObject().markAudited(entity);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.Ordered#getOrder()
-	 */
 	@Override
 	public int getOrder() {
 		return 100;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java
deleted file mode 100644
index 85a220a5c9..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListener.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.mapping.event;
-
-import org.springframework.beans.factory.ObjectFactory;
-import org.springframework.context.ApplicationListener;
-import org.springframework.core.Ordered;
-import org.springframework.data.auditing.AuditingHandler;
-import org.springframework.data.auditing.IsNewAwareAuditingHandler;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.util.Assert;
-
-/**
- * Event listener to populate auditing related fields on an entity about to be saved.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @deprecated since 2.2, use {@link AuditingEntityCallback}.
- */
-@Deprecated
-public class AuditingEventListener implements ApplicationListener<BeforeConvertEvent<Object>>, Ordered {
-
-	private final ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory;
-
-	/**
-	 * Creates a new {@link AuditingEventListener} using the given {@link MappingContext} and {@link AuditingHandler}
-	 * provided by the given {@link ObjectFactory}.
-	 *
-	 * @param auditingHandlerFactory must not be {@literal null}.
-	 */
-	public AuditingEventListener(ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory) {
-
-		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null!");
-		this.auditingHandlerFactory = auditingHandlerFactory;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.ApplicationListener#onApplicationEvent(org.springframework.context.ApplicationEvent)
-	 */
-	@Override
-	public void onApplicationEvent(BeforeConvertEvent<Object> event) {
-		event.mapSource(it -> auditingHandlerFactory.getObject().markAudited(it));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.Ordered#getOrder()
-	 */
-	@Override
-	public int getOrder() {
-		return 100;
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeanValidationDelegate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeanValidationDelegate.java
new file mode 100644
index 0000000000..91107834f3
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeanValidationDelegate.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2025 the original author 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.mapping.event;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
+
+import java.util.Set;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.util.Assert;
+
+/**
+ * Delegate to handle common calls to Bean {@link Validator Validation}.
+ *
+ * @author Mark Paluch
+ * @since 4.5
+ */
+class BeanValidationDelegate {
+
+	private static final Log LOG = LogFactory.getLog(BeanValidationDelegate.class);
+
+	private final Validator validator;
+
+	/**
+	 * Creates a new {@link BeanValidationDelegate} using the given {@link Validator}.
+	 *
+	 * @param validator must not be {@literal null}.
+	 */
+	public BeanValidationDelegate(Validator validator) {
+		Assert.notNull(validator, "Validator must not be null");
+		this.validator = validator;
+	}
+
+	/**
+	 * Validate the given object.
+	 *
+	 * @param object
+	 * @return set of constraint violations.
+	 */
+	public Set<ConstraintViolation<Object>> validate(Object object) {
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug(String.format("Validating object: %s", object));
+		}
+
+		Set<ConstraintViolation<Object>> violations = validator.validate(object);
+
+		if (!violations.isEmpty()) {
+			if (LOG.isDebugEnabled()) {
+				LOG.info(String.format("During object: %s validation violations found: %s", object, violations));
+			}
+		}
+
+		return violations;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertCallback.java
index c942d1c308..3315a1d360 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
  *
  * @author Mark Paluch
  * @since 2.2
+ * @see org.springframework.data.mapping.callback.EntityCallbacks
  */
 @FunctionalInterface
 public interface BeforeConvertCallback<T> extends EntityCallback<T> {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertEvent.java
index 854fc4864b..33d992d9ab 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeConvertEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeDeleteEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeDeleteEvent.java
index 78ec028496..c826cadb4e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeDeleteEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeDeleteEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.core.mapping.event;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * Event being thrown before a document is deleted. The {@link Document} held in the event will represent the query
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveCallback.java
index feadc0a118..27ea5dce69 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,6 +24,7 @@
  * @author Mark Paluch
  * @author Michael J. Simons
  * @since 2.2
+ * @see org.springframework.data.mapping.callback.EntityCallbacks
  */
 @FunctionalInterface
 public interface BeforeSaveCallback<T> extends EntityCallback<T> {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveEvent.java
index cc376bd214..2aa3317f9e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/BeforeSaveEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java
index d035daba37..c36e33e777 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,9 @@
 
 import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.context.ApplicationListener;
 
 /**
@@ -31,68 +32,54 @@
  */
 public class LoggingEventListener extends AbstractMongoEventListener<Object> {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(LoggingEventListener.class);
+	private static final Log LOGGER = LogFactory.getLog(LoggingEventListener.class);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeConvert(org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent)
-	 */
 	@Override
 	public void onBeforeConvert(BeforeConvertEvent<Object> event) {
-		LOGGER.info("onBeforeConvert: {}", event.getSource());
+		if(LOGGER.isInfoEnabled()) {
+			LOGGER.info(String.format("onBeforeConvert: %s", event.getSource()));
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent)
-	 */
 	@Override
 	public void onBeforeSave(BeforeSaveEvent<Object> event) {
-		LOGGER.info("onBeforeSave: {}, {}", event.getSource(), serializeToJsonSafely(event.getDocument()));
+		if(LOGGER.isInfoEnabled()) {
+			LOGGER.info(String.format("onBeforeSave: %s, %s", event.getSource(), serializeToJsonSafely(event.getDocument())));
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterSave(org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent)
-	 */
 	@Override
 	public void onAfterSave(AfterSaveEvent<Object> event) {
-		LOGGER.info("onAfterSave: {}, {}", event.getSource(), serializeToJsonSafely(event.getDocument()));
+		if(LOGGER.isInfoEnabled()) {
+			LOGGER.info(String.format("onAfterSave: %s, %s", event.getSource(), serializeToJsonSafely(event.getDocument())));
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterLoad(org.springframework.data.mongodb.core.mapping.event.AfterLoadEvent)
-	 */
 	@Override
 	public void onAfterLoad(AfterLoadEvent<Object> event) {
-		LOGGER.info("onAfterLoad: {}", serializeToJsonSafely(event.getDocument()));
+		if(LOGGER.isInfoEnabled()) {
+			LOGGER.info(String.format("onAfterLoad: %s", serializeToJsonSafely(event.getDocument())));
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterConvert(org.springframework.data.mongodb.core.mapping.event.AfterConvertEvent)
-	 */
 	@Override
 	public void onAfterConvert(AfterConvertEvent<Object> event) {
-		LOGGER.info("onAfterConvert: {}, {}", serializeToJsonSafely(event.getDocument()), event.getSource());
+		if(LOGGER.isInfoEnabled()) {
+			LOGGER.info(String.format("onAfterConvert: %s, %s", serializeToJsonSafely(event.getDocument()), event.getSource()));
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onAfterDelete(org.springframework.data.mongodb.core.mapping.event.AfterDeleteEvent)
-	 */
 	@Override
 	public void onAfterDelete(AfterDeleteEvent<Object> event) {
-		LOGGER.info("onAfterDelete: {}", serializeToJsonSafely(event.getDocument()));
+		if(LOGGER.isInfoEnabled()) {
+			LOGGER.info(String.format("onAfterDelete: %s", serializeToJsonSafely(event.getDocument())));
+		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeDelete(org.springframework.data.mongodb.core.mapping.event.BeforeDeleteEvent)
-	 */
 	@Override
 	public void onBeforeDelete(BeforeDeleteEvent<Object> event) {
-		LOGGER.info("onBeforeDelete: {}", serializeToJsonSafely(event.getDocument()));
+		if(LOGGER.isInfoEnabled()) {
+			LOGGER.info(String.format("onBeforeDelete: %s", serializeToJsonSafely(event.getDocument())));
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java
index 4fbfaa8879..bec1986720 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/MongoMappingEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,8 +18,8 @@
 import java.util.function.Function;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.context.ApplicationEvent;
-import org.springframework.lang.Nullable;
 
 /**
  * Base {@link ApplicationEvent} triggered by Spring Data MongoDB.
@@ -65,10 +65,6 @@ public MongoMappingEvent(T source, @Nullable Document document, @Nullable String
 		return collectionName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.util.EventObject#getSource()
-	 */
 	@SuppressWarnings({ "unchecked" })
 	@Override
 	public T getSource() {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAfterConvertCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAfterConvertCallback.java
new file mode 100644
index 0000000000..5dc1f7c69f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAfterConvertCallback.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020-2025 the original author 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.mapping.event;
+
+import org.bson.Document;
+import org.reactivestreams.Publisher;
+
+import org.springframework.data.mapping.callback.EntityCallback;
+
+/**
+ * Callback being invoked after a domain object is materialized from a {@link Document} when reading results.
+ *
+ * @author Roman Puchkovskiy
+ * @author Mark Paluch
+ * @since 3.0
+ * @see org.springframework.data.mapping.callback.ReactiveEntityCallbacks
+ */
+@FunctionalInterface
+public interface ReactiveAfterConvertCallback<T> extends EntityCallback<T> {
+
+	/**
+	 * Entity callback method invoked after a domain object is materialized from a {@link Document}. Can return either the
+	 * same or a modified instance of the domain object.
+	 *
+	 * @param entity the domain object (the result of the conversion).
+	 * @param document must not be {@literal null}.
+	 * @param collection name of the collection.
+	 * @return a {@link Publisher} emitting the domain object that is the result of reading it from the {@link Document}.
+	 */
+	Publisher<T> onAfterConvert(T entity, Document document, String collection);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAfterSaveCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAfterSaveCallback.java
new file mode 100644
index 0000000000..4e8302d84c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAfterSaveCallback.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2020-2025 the original author 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.mapping.event;
+
+import org.bson.Document;
+import org.reactivestreams.Publisher;
+
+import org.springframework.data.mapping.callback.EntityCallback;
+import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
+
+/**
+ * Entity callback triggered after save of a {@link Document}.
+ *
+ * @author Roman Puchkovskiy
+ * @since 3.0
+ * @see ReactiveEntityCallbacks
+ */
+@FunctionalInterface
+public interface ReactiveAfterSaveCallback<T> extends EntityCallback<T> {
+
+	/**
+	 * Entity callback method invoked after a domain object is saved. Can return either the same or a modified instance of
+	 * the domain object.
+	 *
+	 * @param entity the domain object that was saved.
+	 * @param document {@link Document} representing the {@code entity}.
+	 * @param collection name of the collection.
+	 * @return a {@link Publisher} emitting the domain object to be returned to the caller.
+	 */
+	Publisher<T> onAfterSave(T entity, Document document, String collection);
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java
index 0a4ababd93..62fe054145 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveAuditingEntityCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,12 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import reactor.core.publisher.Mono;
-
 import org.reactivestreams.Publisher;
+
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.core.Ordered;
 import org.springframework.data.auditing.AuditingHandler;
-import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.auditing.ReactiveIsNewAwareAuditingHandler;
 import org.springframework.data.mapping.callback.EntityCallback;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.util.Assert;
@@ -34,7 +33,7 @@
  */
 public class ReactiveAuditingEntityCallback implements ReactiveBeforeConvertCallback<Object>, Ordered {
 
-	private final ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory;
+	private final ObjectFactory<ReactiveIsNewAwareAuditingHandler> auditingHandlerFactory;
 
 	/**
 	 * Creates a new {@link ReactiveAuditingEntityCallback} using the given {@link MappingContext} and
@@ -42,25 +41,17 @@ public class ReactiveAuditingEntityCallback implements ReactiveBeforeConvertCall
 	 *
 	 * @param auditingHandlerFactory must not be {@literal null}.
 	 */
-	public ReactiveAuditingEntityCallback(ObjectFactory<IsNewAwareAuditingHandler> auditingHandlerFactory) {
+	public ReactiveAuditingEntityCallback(ObjectFactory<ReactiveIsNewAwareAuditingHandler> auditingHandlerFactory) {
 
-		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null!");
+		Assert.notNull(auditingHandlerFactory, "IsNewAwareAuditingHandler must not be null");
 		this.auditingHandlerFactory = auditingHandlerFactory;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback#onBeforeConvert(java.lang.Object, java.lang.String)
-	 */
 	@Override
 	public Publisher<Object> onBeforeConvert(Object entity, String collection) {
-		return Mono.just(auditingHandlerFactory.getObject().markAudited(entity));
+		return auditingHandlerFactory.getObject().markAudited(entity);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.Ordered#getOrder()
-	 */
 	@Override
 	public int getOrder() {
 		return 100;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeConvertCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeConvertCallback.java
index ba9a086d59..842c734744 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeConvertCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeConvertCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,14 +18,13 @@
 import org.reactivestreams.Publisher;
 
 import org.springframework.data.mapping.callback.EntityCallback;
-import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
 
 /**
  * Callback being invoked before a domain object is converted to be persisted.
  *
  * @author Mark Paluch
  * @since 2.2
- * @see ReactiveEntityCallbacks
+ * @see org.springframework.data.mapping.callback.ReactiveEntityCallbacks
  */
 @FunctionalInterface
 public interface ReactiveBeforeConvertCallback<T> extends EntityCallback<T> {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeSaveCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeSaveCallback.java
index fbd37c8661..e353cb8ecf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeSaveCallback.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveBeforeSaveCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,14 +19,13 @@
 import org.reactivestreams.Publisher;
 
 import org.springframework.data.mapping.callback.EntityCallback;
-import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
 
 /**
  * Entity callback triggered before save of a document.
  *
  * @author Mark Paluch
  * @since 2.2
- * @see ReactiveEntityCallbacks
+ * @see org.springframework.data.mapping.callback.ReactiveEntityCallbacks
  */
 @FunctionalInterface
 public interface ReactiveBeforeSaveCallback<T> extends EntityCallback<T> {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveValidatingEntityCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveValidatingEntityCallback.java
new file mode 100644
index 0000000000..7011da90b4
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ReactiveValidatingEntityCallback.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2025 the original author 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.mapping.event;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
+import reactor.core.publisher.Mono;
+
+import java.util.Set;
+
+import org.bson.Document;
+
+import org.springframework.core.Ordered;
+
+/**
+ * Reactive variant of JSR-303 dependant entities validator.
+ * <p>
+ * When it is registered as Spring component its automatically invoked after object to {@link Document} conversion and
+ * before entities are saved to the database.
+ *
+ * @author Mark Paluch
+ * @author Rene Felgenträger
+ * @since 4.5
+ */
+public class ReactiveValidatingEntityCallback implements ReactiveBeforeSaveCallback<Object>, Ordered {
+
+	private final BeanValidationDelegate delegate;
+
+	/**
+	 * Creates a new {@link ReactiveValidatingEntityCallback} using the given {@link Validator}.
+	 *
+	 * @param validator must not be {@literal null}.
+	 */
+	public ReactiveValidatingEntityCallback(Validator validator) {
+		this.delegate = new BeanValidationDelegate(validator);
+	}
+
+	@Override
+	public Mono<Object> onBeforeSave(Object entity, Document document, String collection) {
+
+		Set<ConstraintViolation<Object>> violations = delegate.validate(entity);
+
+		if (!violations.isEmpty()) {
+			return Mono.error(new ConstraintViolationException(violations));
+		}
+
+		return Mono.just(entity);
+	}
+
+	@Override
+	public int getOrder() {
+		return 100;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingEntityCallback.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingEntityCallback.java
new file mode 100644
index 0000000000..260652616e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingEntityCallback.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2025 the original author 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.mapping.event;
+
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
+
+import java.util.Set;
+
+import org.bson.Document;
+
+import org.springframework.core.Ordered;
+
+/**
+ * JSR-303 dependant entities validator.
+ * <p>
+ * When it is registered as Spring component its automatically invoked after object to {@link Document} conversion and
+ * before entities are saved to the database.
+ *
+ * @author Rene Felgenträger
+ * @author Mark Paluch
+ * @since 4.5
+ */
+public class ValidatingEntityCallback implements BeforeSaveCallback<Object>, Ordered {
+
+	private final BeanValidationDelegate delegate;
+
+	/**
+	 * Creates a new {@link ValidatingEntityCallback} using the given {@link Validator}.
+	 *
+	 * @param validator must not be {@literal null}.
+	 */
+	public ValidatingEntityCallback(Validator validator) {
+		this.delegate = new BeanValidationDelegate(validator);
+	}
+
+	@Override
+	public Object onBeforeSave(Object entity, Document document, String collection) {
+
+		Set<ConstraintViolation<Object>> violations = delegate.validate(entity);
+
+		if (!violations.isEmpty()) {
+			throw new ConstraintViolationException(violations);
+		}
+
+		return entity;
+	}
+
+	@Override
+	public int getOrder() {
+		return 100;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java
index 20fecd848c..1854c486f8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,28 +15,30 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import java.util.Set;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validator;
 
-import javax.validation.ConstraintViolationException;
-import javax.validation.Validator;
+import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
+import org.bson.Document;
 
 /**
- * javax.validation dependant entities validator. When it is registered as Spring component its automatically invoked
- * before entities are saved in database.
+ * JSR-303 dependant entities validator.
+ * <p>
+ * When it is registered as Spring component its automatically invoked after object to {@link Document} conversion and
+ * before entities are saved to the database.
  *
  * @author Maciej Walkowiak
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @deprecated since 4.5, use {@link ValidatingEntityCallback} respectively {@link ReactiveValidatingEntityCallback}
+ *             instead to ensure ordering and interruption of saving when encountering validation constraint violations.
  */
+@Deprecated(since = "4.5")
 public class ValidatingMongoEventListener extends AbstractMongoEventListener<Object> {
 
-	private static final Logger LOG = LoggerFactory.getLogger(ValidatingMongoEventListener.class);
-
-	private final Validator validator;
+	private final BeanValidationDelegate delegate;
 
 	/**
 	 * Creates a new {@link ValidatingMongoEventListener} using the given {@link Validator}.
@@ -44,26 +46,17 @@ public class ValidatingMongoEventListener extends AbstractMongoEventListener<Obj
 	 * @param validator must not be {@literal null}.
 	 */
 	public ValidatingMongoEventListener(Validator validator) {
-
-		Assert.notNull(validator, "Validator must not be null!");
-		this.validator = validator;
+		this.delegate = new BeanValidationDelegate(validator);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent)
-	 */
-	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public void onBeforeSave(BeforeSaveEvent<Object> event) {
 
-		LOG.debug("Validating object: {}", event.getSource());
-		Set violations = validator.validate(event.getSource());
+		Set<ConstraintViolation<Object>> violations = delegate.validate(event.getSource());
 
 		if (!violations.isEmpty()) {
-
-			LOG.info("During object: {} validation violations found: {}", event.getSource(), violations);
 			throw new ConstraintViolationException(violations);
 		}
 	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java
index 0cc9d071a3..71ed503b20 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/event/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Mapping event callback infrastructure for the MongoDB document-to-object mapping subsystem.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.mapping.event;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java
index 0a513f1a18..f5c917d7d7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapping/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Infrastructure for the MongoDB document-to-object mapping subsystem.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.mapping;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/GroupBy.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/GroupBy.java
deleted file mode 100644
index 0520a14eaf..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/GroupBy.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright 2010-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.mapreduce;
-
-import java.util.Optional;
-
-import org.bson.Document;
-import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
-
-/**
- * Collects the parameters required to perform a group operation on a collection. The query condition and the input
- * collection are specified on the group method as method arguments to be consistent with other operations, e.g.
- * map-reduce.
- *
- * @author Mark Pollack
- * @author Christoph Strobl
- * @author Mark Paluch
- * @deprecated since 2.2. The {@code group} command has been removed in MongoDB Server 4.2.0.
- */
-@Deprecated
-public class GroupBy {
-
-	private @Nullable Document initialDocument;
-	private @Nullable String reduce;
-
-	private Optional<Document> keys = Optional.empty();
-	private Optional<String> keyFunction = Optional.empty();
-	private Optional<String> initial = Optional.empty();
-	private Optional<String> finalize = Optional.empty();
-	private Optional<Collation> collation = Optional.empty();
-
-	public GroupBy(String... keys) {
-
-		Document document = new Document();
-		for (String key : keys) {
-			document.put(key, 1);
-		}
-
-		this.keys = Optional.of(document);
-	}
-
-	// NOTE GroupByCommand does not handle keyfunction.
-
-	public GroupBy(@Nullable String key, boolean isKeyFunction) {
-
-		Document document = new Document();
-		if (isKeyFunction) {
-			keyFunction = Optional.ofNullable(key);
-		} else {
-			document.put(key, 1);
-			keys = Optional.of(document);
-		}
-	}
-
-	/**
-	 * Create new {@link GroupBy} with the field to group.
-	 *
-	 * @param key
-	 * @return
-	 */
-	public static GroupBy keyFunction(String key) {
-		return new GroupBy(key, true);
-	}
-
-	/**
-	 * Create new {@link GroupBy} with the fields to group.
-	 *
-	 * @param keys
-	 * @return
-	 */
-	public static GroupBy key(String... keys) {
-		return new GroupBy(keys);
-	}
-
-	/**
-	 * Define the aggregation result document.
-	 *
-	 * @param initialDocument can be {@literal null}.
-	 * @return
-	 */
-	public GroupBy initialDocument(@Nullable String initialDocument) {
-
-		initial = Optional.ofNullable(initialDocument);
-		return this;
-	}
-
-	/**
-	 * Define the aggregation result document.
-	 *
-	 * @param initialDocument can be {@literal null}.
-	 * @return
-	 */
-	public GroupBy initialDocument(@Nullable Document initialDocument) {
-
-		this.initialDocument = initialDocument;
-		return this;
-	}
-
-	/**
-	 * Define the aggregation function that operates on the documents during the grouping operation
-	 *
-	 * @param reduceFunction
-	 * @return
-	 */
-	public GroupBy reduceFunction(String reduceFunction) {
-
-		reduce = reduceFunction;
-		return this;
-	}
-
-	/**
-	 * Define the function that runs each item in the result set before db.collection.group() returns the final value.
-	 *
-	 * @param finalizeFunction
-	 * @return
-	 */
-	public GroupBy finalizeFunction(@Nullable String finalizeFunction) {
-
-		finalize = Optional.ofNullable(finalizeFunction);
-		return this;
-	}
-
-	/**
-	 * Define the Collation specifying language-specific rules for string comparison.
-	 *
-	 * @param collation can be {@literal null}.
-	 * @return
-	 * @since 2.0
-	 */
-	public GroupBy collation(@Nullable Collation collation) {
-
-		this.collation = Optional.ofNullable(collation);
-		return this;
-	}
-
-	/**
-	 * Get the {@link Document} representation of the {@link GroupBy}.
-	 *
-	 * @return
-	 */
-	public Document getGroupByObject() {
-
-		Document document = new Document();
-
-		keys.ifPresent(val -> document.append("key", val));
-		keyFunction.ifPresent(val -> document.append("$keyf", val));
-
-		document.put("$reduce", reduce);
-		document.put("initial", initialDocument);
-
-		initial.ifPresent(val -> document.append("initial", val));
-		finalize.ifPresent(val -> document.append("finalize", val));
-		collation.ifPresent(val -> document.append("collation", val.toDocument()));
-
-		return document;
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/GroupByResults.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/GroupByResults.java
deleted file mode 100644
index e81a44f42d..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/GroupByResults.java
+++ /dev/null
@@ -1,103 +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.core.mapreduce;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.bson.Document;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-/**
- * Collects the results of executing a group operation.
- *
- * @author Mark Pollack
- * @author Christoph Strobl
- * @author Mark Paluch
- * @param <T> The class in which the results are mapped onto, accessible via an {@link Iterator}.
- * @deprecated since 2.2. The {@code group} command has been removed in MongoDB Server 4.2.0.
- */
-@Deprecated
-public class GroupByResults<T> implements Iterable<T> {
-
-	private final List<T> mappedResults;
-	private final Document rawResults;
-
-	private double count;
-	private int keys;
-	private @Nullable String serverUsed;
-
-	public GroupByResults(List<T> mappedResults, Document rawResults) {
-
-		Assert.notNull(mappedResults, "List of mapped results must not be null!");
-		Assert.notNull(rawResults, "Raw results must not be null!");
-
-		this.mappedResults = mappedResults;
-		this.rawResults = rawResults;
-
-		parseKeys();
-		parseCount();
-		parseServerUsed();
-	}
-
-	public double getCount() {
-		return count;
-	}
-
-	public int getKeys() {
-		return keys;
-	}
-
-	@Nullable
-	public String getServerUsed() {
-		return serverUsed;
-	}
-
-	public Iterator<T> iterator() {
-		return mappedResults.iterator();
-	}
-
-	public Document getRawResults() {
-		return rawResults;
-	}
-
-	private void parseCount() {
-
-		Object object = rawResults.get("count");
-		if (object instanceof Number) {
-			count = ((Number) object).doubleValue();
-		}
-
-	}
-
-	private void parseKeys() {
-
-		Object object = rawResults.get("keys");
-		if (object instanceof Number) {
-			keys = ((Number) object).intValue();
-		}
-	}
-
-	private void parseServerUsed() {
-
-		// "serverUsed" : "127.0.0.1:27017"
-		Object object = rawResults.get("serverUsed");
-		if (object instanceof String) {
-			serverUsed = (String) object;
-		}
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java
index 02bb4b04ca..ed9c148a1c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCounts.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,16 @@
  */
 package org.springframework.data.mongodb.core.mapreduce;
 
+import org.jspecify.annotations.Nullable;
+
 /**
  * Value object to encapsulate results of a map-reduce count.
  *
  * @author Mark Pollack
  * @author Oliver Gierke
+ * @deprecated since 3.4 in favor of {@link org.springframework.data.mongodb.core.aggregation}.
  */
+@Deprecated
 public class MapReduceCounts {
 
 	public static final MapReduceCounts NONE = new MapReduceCounts(-1, -1, -1);
@@ -55,20 +59,12 @@ public long getOutputCount() {
 		return outputCount;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return "MapReduceCounts [inputCount=" + inputCount + ", emitCount=" + emitCount + ", outputCount=" + outputCount
 				+ "]";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -82,12 +78,8 @@ public int hashCode() {
 		return Long.valueOf(result).intValue();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 		if (this == obj) {
 			return true;
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptions.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptions.java
index 39e89f9404..2b8c9d1eb3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptions.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,32 +20,32 @@
 import java.util.Optional;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
 
-import com.mongodb.MapReduceCommand;
-import com.mongodb.MapReduceCommand.OutputType;
 import com.mongodb.client.model.MapReduceAction;
+import org.springframework.lang.Contract;
 
 /**
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @deprecated since 3.4 in favor of {@link org.springframework.data.mongodb.core.aggregation}.
  */
+@Deprecated
 public class MapReduceOptions {
 
 	private @Nullable String outputCollection;
 
 	private Optional<String> outputDatabase = Optional.empty();
-	private MapReduceCommand.OutputType outputType = MapReduceCommand.OutputType.REPLACE;
+	private @Nullable MapReduceAction mapReduceAction = MapReduceAction.REPLACE;
 	private Map<String, Object> scopeVariables = new HashMap<>();
 	private Map<String, Object> extraOptions = new HashMap<>();
 	private @Nullable Boolean jsMode;
 	private Boolean verbose = Boolean.TRUE;
 	private @Nullable Integer limit;
 
-	private Optional<Boolean> outputSharded = Optional.empty();
 	private Optional<String> finalizeFunction = Optional.empty();
 	private Optional<Collation> collation = Optional.empty();
 
@@ -65,6 +65,7 @@ public static MapReduceOptions options() {
 	 * @param limit Limit the number of objects to process
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions limit(int limit) {
 
 		this.limit = limit;
@@ -78,6 +79,7 @@ public MapReduceOptions limit(int limit) {
 	 * @param collectionName The name of the collection where the results of the map-reduce operation will be stored.
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions outputCollection(String collectionName) {
 
 		this.outputCollection = collectionName;
@@ -91,6 +93,7 @@ public MapReduceOptions outputCollection(String collectionName) {
 	 * @param outputDatabase The name of the database where the results of the map-reduce operation will be stored.
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions outputDatabase(@Nullable String outputDatabase) {
 
 		this.outputDatabase = Optional.ofNullable(outputDatabase);
@@ -102,23 +105,28 @@ public MapReduceOptions outputDatabase(@Nullable String outputDatabase) {
 	 * results of the map-reduce will be returned within the result object. Note that this option is possible only when
 	 * the result set fits within the 16MB limit of a single document.
 	 *
-	 * @return MapReduceOptions so that methods can be chained in a fluent API style
+	 * @return this.
+	 * @since 3.0
 	 */
-	public MapReduceOptions outputTypeInline() {
+	@Contract("-> this")
+	public MapReduceOptions actionInline() {
 
-		this.outputType = MapReduceCommand.OutputType.INLINE;
+		this.mapReduceAction = null;
 		return this;
 	}
 
+
 	/**
 	 * This option will merge new data into the old output collection. In other words, if the same key exists in both the
 	 * result set and the old collection, the new key will overwrite the old one.
 	 *
-	 * @return MapReduceOptions so that methods can be chained in a fluent API style
+	 * @return this.
+	 * @since 3.0
 	 */
-	public MapReduceOptions outputTypeMerge() {
+	@Contract("-> this")
+	public MapReduceOptions actionMerge() {
 
-		this.outputType = MapReduceCommand.OutputType.MERGE;
+		this.mapReduceAction = MapReduceAction.MERGE;
 		return this;
 	}
 
@@ -127,35 +135,27 @@ public MapReduceOptions outputTypeMerge() {
 	 * specified reduce function) will be performed on the two values and the result will be written to the output
 	 * collection. If a finalize function was provided, this will be run after the reduce as well.
 	 *
-	 * @return
+	 * @return this.
+	 * @since 3.0
 	 */
-	public MapReduceOptions outputTypeReduce() {
-		this.outputType = MapReduceCommand.OutputType.REDUCE;
-		return this;
-	}
+	@Contract("-> this")
+	public MapReduceOptions actionReduce() {
 
-	/**
-	 * The output will be inserted into a collection which will atomically replace any existing collection with the same
-	 * name. Note, the default is MapReduceCommand.OutputType.REPLACE
-	 *
-	 * @return MapReduceOptions so that methods can be chained in a fluent API style
-	 */
-	public MapReduceOptions outputTypeReplace() {
-
-		this.outputType = MapReduceCommand.OutputType.REPLACE;
+		this.mapReduceAction = MapReduceAction.REDUCE;
 		return this;
 	}
 
 	/**
-	 * If true and combined with an output mode that writes to a collection, the output collection will be sharded using
-	 * the _id field. For MongoDB 1.9+
+	 * The output will be inserted into a collection which will atomically replace any existing collection with the same
+	 * name. Note, the default is {@link MapReduceAction#REPLACE}.
 	 *
-	 * @param outputShared if true, output will be sharded based on _id key.
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
+	 * @since 3.0
 	 */
-	public MapReduceOptions outputSharded(boolean outputShared) {
+	@Contract("-> this")
+	public MapReduceOptions actionReplace() {
 
-		this.outputSharded = Optional.of(outputShared);
+		this.mapReduceAction = MapReduceAction.REPLACE;
 		return this;
 	}
 
@@ -165,6 +165,7 @@ public MapReduceOptions outputSharded(boolean outputShared) {
 	 * @param finalizeFunction The finalize function. Can be a JSON string or a Spring Resource URL
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions finalizeFunction(@Nullable String finalizeFunction) {
 
 		this.finalizeFunction = Optional.ofNullable(finalizeFunction);
@@ -178,6 +179,7 @@ public MapReduceOptions finalizeFunction(@Nullable String finalizeFunction) {
 	 * @param scopeVariables variables that can be accessed from map, reduce, and finalize scripts
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions scopeVariables(Map<String, Object> scopeVariables) {
 
 		this.scopeVariables = scopeVariables;
@@ -191,6 +193,7 @@ public MapReduceOptions scopeVariables(Map<String, Object> scopeVariables) {
 	 * @param javaScriptMode if true, have the execution of map-reduce stay in JavaScript
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions javaScriptMode(boolean javaScriptMode) {
 
 		this.jsMode = javaScriptMode;
@@ -202,29 +205,13 @@ public MapReduceOptions javaScriptMode(boolean javaScriptMode) {
 	 *
 	 * @return MapReduceOptions so that methods can be chained in a fluent API style
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions verbose(boolean verbose) {
 
 		this.verbose = verbose;
 		return this;
 	}
 
-	/**
-	 * Add additional extra options that may not have a method on this class. This method will help if you use a version
-	 * of this client library with a server version that has added additional map-reduce options that do not yet have an
-	 * method for use in setting them. options
-	 *
-	 * @param key The key option
-	 * @param value The value of the option
-	 * @return MapReduceOptions so that methods can be chained in a fluent API style
-	 * @deprecated since 1.7.
-	 */
-	@Deprecated
-	public MapReduceOptions extraOption(String key, Object value) {
-
-		extraOptions.put(key, value);
-		return this;
-	}
-
 	/**
 	 * Define the Collation specifying language-specific rules for string comparison.
 	 *
@@ -232,32 +219,22 @@ public MapReduceOptions extraOption(String key, Object value) {
 	 * @return
 	 * @since 2.0
 	 */
+	@Contract("_ -> this")
 	public MapReduceOptions collation(@Nullable Collation collation) {
 
 		this.collation = Optional.ofNullable(collation);
 		return this;
 	}
 
-	/**
-	 * @return
-	 * @deprecated since 1.7
-	 */
-	@Deprecated
-	public Map<String, Object> getExtraOptions() {
-		return extraOptions;
-	}
-
 	public Optional<String> getFinalizeFunction() {
 		return this.finalizeFunction;
 	}
 
-	@Nullable
-	public Boolean getJavaScriptMode() {
+	public @Nullable Boolean getJavaScriptMode() {
 		return this.jsMode;
 	}
 
-	@Nullable
-	public String getOutputCollection() {
+	public @Nullable String getOutputCollection() {
 		return this.outputCollection;
 	}
 
@@ -265,14 +242,6 @@ public Optional<String> getOutputDatabase() {
 		return this.outputDatabase;
 	}
 
-	public Optional<Boolean> getOutputSharded() {
-		return this.outputSharded;
-	}
-
-	public MapReduceCommand.OutputType getOutputType() {
-		return this.outputType;
-	}
-
 	public Map<String, Object> getScopeVariables() {
 		return this.scopeVariables;
 	}
@@ -298,34 +267,21 @@ public Optional<Collation> getCollation() {
 	}
 
 	/**
-	 * Return the {@link MapReduceAction} derived from {@link com.mongodb.MapReduceCommand.OutputType}.
+	 * Return the {@link MapReduceAction}.
 	 *
 	 * @return the mapped action or {@literal null} if the action maps to inline output.
 	 * @since 2.0.10
 	 */
-	@Nullable
-	public MapReduceAction getMapReduceAction() {
-
-		switch (outputType) {
-			case MERGE:
-				return MapReduceAction.MERGE;
-			case REDUCE:
-				return MapReduceAction.REDUCE;
-			case REPLACE:
-				return MapReduceAction.REPLACE;
-			case INLINE:
-				return null;
-			default:
-				throw new IllegalStateException(String.format("Unknown output type %s for map reduce command.", outputType));
-		}
+	public @Nullable MapReduceAction getMapReduceAction() {
+		return mapReduceAction;
 	}
 
 	/**
-	 * @return {@literal true} if {@link OutputType#INLINE} is used.
+	 * @return {@literal true} if {@literal inline} output is used.
 	 * @since 2.0.10
 	 */
 	public boolean usesInlineOutput() {
-		return OutputType.INLINE.equals(outputType);
+		return null == mapReduceAction;
 	}
 
 	public Document getOptionsObject() {
@@ -361,23 +317,17 @@ protected Document createOutObject() {
 
 		Document out = new Document();
 
-		switch (getOutputType()) {
-			case INLINE:
-				out.put("inline", 1);
-				break;
-			case REPLACE:
-				out.put("replace", outputCollection);
-				break;
-			case MERGE:
-				out.put("merge", outputCollection);
-				break;
-			case REDUCE:
-				out.put("reduce", outputCollection);
-				break;
+		if (getMapReduceAction() == null) {
+			out.put("inline", 1);
+		} else {
+			switch (getMapReduceAction()) {
+				case REPLACE -> out.put("replace", outputCollection);
+				case MERGE -> out.put("merge", outputCollection);
+				case REDUCE -> out.put("reduce", outputCollection);
+			}
 		}
 
 		outputDatabase.ifPresent(val -> out.append("db", val));
-		outputSharded.ifPresent(val -> out.append("sharded", val));
 
 		return out;
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java
index df661ffc4c..1d4f644bd1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResults.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,11 +19,9 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
-import com.mongodb.MapReduceOutput;
-
 /**
  * Collects the results of performing a MapReduce operations.
  *
@@ -32,7 +30,9 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @param <T> The class in which the results are mapped onto, accessible via an iterator.
+ * @deprecated since 3.4 in favor of {@link org.springframework.data.mongodb.core.aggregation}.
  */
+@Deprecated
 public class MapReduceResults<T> implements Iterable<T> {
 
 	private final List<T> mappedResults;
@@ -46,13 +46,11 @@ public class MapReduceResults<T> implements Iterable<T> {
 	 *
 	 * @param mappedResults must not be {@literal null}.
 	 * @param rawResults must not be {@literal null}.
-	 * @deprecated since 1.7. Please use {@link #MapReduceResults(List, MapReduceOutput)}
 	 */
-	@Deprecated
 	public MapReduceResults(List<T> mappedResults, Document rawResults) {
 
-		Assert.notNull(mappedResults, "List of mapped results must not be null!");
-		Assert.notNull(rawResults, "Raw results must not be null!");
+		Assert.notNull(mappedResults, "List of mapped results must not be null");
+		Assert.notNull(rawResults, "Raw results must not be null");
 
 		this.mappedResults = mappedResults;
 		this.rawResults = rawResults;
@@ -61,29 +59,6 @@ public MapReduceResults(List<T> mappedResults, Document rawResults) {
 		this.outputCollection = parseOutputCollection(rawResults);
 	}
 
-	/**
-	 * Creates a new {@link MapReduceResults} from the given mapped results and the {@link MapReduceOutput}.
-	 *
-	 * @param mappedResults must not be {@literal null}.
-	 * @param mapReduceOutput must not be {@literal null}.
-	 * @since 1.7
-	 */
-	public MapReduceResults(List<T> mappedResults, MapReduceOutput mapReduceOutput) {
-
-		Assert.notNull(mappedResults, "MappedResults must not be null!");
-		Assert.notNull(mapReduceOutput, "MapReduceOutput must not be null!");
-
-		this.mappedResults = mappedResults;
-		this.rawResults = null;
-		this.mapReduceTiming = parseTiming(mapReduceOutput);
-		this.mapReduceCounts = parseCounts(mapReduceOutput);
-		this.outputCollection = parseOutputCollection(mapReduceOutput);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	public Iterator<T> iterator() {
 		return mappedResults.iterator();
 	}
@@ -96,12 +71,11 @@ public MapReduceCounts getCounts() {
 		return mapReduceCounts;
 	}
 
-	@Nullable
-	public String getOutputCollection() {
+	public @Nullable String getOutputCollection() {
 		return outputCollection;
 	}
 
-	public Document getRawResults() {
+	public @Nullable Document getRawResults() {
 		return rawResults;
 	}
 
@@ -171,20 +145,8 @@ private static String parseOutputCollection(Document rawResults) {
 			return null;
 		}
 
-		return resultField instanceof Document ? ((Document) resultField).get("collection").toString()
+		return resultField instanceof Document document && document.containsKey("collection")
+				? document.get("collection").toString()
 				: resultField.toString();
 	}
-
-	private static MapReduceCounts parseCounts(final MapReduceOutput mapReduceOutput) {
-		return new MapReduceCounts(mapReduceOutput.getInputCount(), mapReduceOutput.getEmitCount(),
-				mapReduceOutput.getOutputCount());
-	}
-
-	private static String parseOutputCollection(final MapReduceOutput mapReduceOutput) {
-		return mapReduceOutput.getCollectionName();
-	}
-
-	private static MapReduceTiming parseTiming(MapReduceOutput mapReduceOutput) {
-		return new MapReduceTiming(-1, -1, mapReduceOutput.getDuration());
-	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java
index f98dc48531..d99f6d9237 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTiming.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,12 @@
  */
 package org.springframework.data.mongodb.core.mapreduce;
 
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @deprecated since 3.4 in favor of {@link org.springframework.data.mongodb.core.aggregation}.
+ */
+@Deprecated
 public class MapReduceTiming {
 
 	private long mapTime, emitLoopTime, totalTime;
@@ -38,19 +44,11 @@ public long getTotalTime() {
 		return totalTime;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return "MapReduceTiming [mapTime=" + mapTime + ", emitLoopTime=" + emitLoopTime + ", totalTime=" + totalTime + "]";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -64,24 +62,17 @@ public int hashCode() {
 		return result;
 	}
 
-	/*
-	 *
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof MapReduceTiming)) {
+		if (!(obj instanceof MapReduceTiming that)) {
 			return false;
 		}
 
-		MapReduceTiming that = (MapReduceTiming) obj;
-
 		return this.emitLoopTime == that.emitLoopTime && //
 				this.mapTime == that.mapTime && //
 				this.totalTime == that.totalTime;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java
index 54781e78c0..c5f5840e6b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/mapreduce/package-info.java
@@ -1,6 +1,8 @@
 /**
  * Support for MongoDB map-reduce operations.
+ * @deprecated since MongoDB server version 5.0
  */
-@org.springframework.lang.NonNullApi
+@Deprecated
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.mapreduce;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Cancelable.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Cancelable.java
index 77c1ff421d..172ecbbe74 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Cancelable.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Cancelable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ public interface Cancelable {
 	/**
 	 * Abort and free resources.
 	 *
-	 * @throws DataAccessResourceFailureException
+	 * @throws DataAccessResourceFailureException if operation cannot be canceled.
 	 */
 	void cancel() throws DataAccessResourceFailureException;
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java
index 8265aa13f8..e1da0b33ce 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,32 +15,35 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
+import java.time.Duration;
 import java.time.Instant;
 
 import org.bson.BsonValue;
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.ChangeStreamOptions;
 import org.springframework.data.mongodb.core.ChangeStreamOptions.ChangeStreamOptionsBuilder;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest.ChangeStreamRequestOptions;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
 
 /**
  * {@link SubscriptionRequest} implementation to be used for listening to
  * <a href="https://docs.mongodb.com/manual/changeStreams/">Change Streams</a> via a {@link MessageListenerContainer}
  * using the synchronous MongoDB Java driver.
- * <p/>
+ * <br />
  * The most trivial use case is subscribing to all events of a specific {@link com.mongodb.client.MongoCollection
  * collection}
  *
  * <pre>
  * <code>
- *     ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(System.out::println, () -> "collection-name");
+ *     ChangeStreamRequest&lt;Document&gt; request = new ChangeStreamRequest&lt;&gt;(System.out::println, () -> "collection-name");
  * </code>
  * </pre>
  *
@@ -49,7 +52,7 @@
  *
  * <pre>
  * <code>
- *     ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(System.out::println, RequestOptions.justDatabase("test"));
+ *     ChangeStreamRequest&lt;Document&gt; request = new ChangeStreamRequest&lt;&gt;(System.out::println, RequestOptions.justDatabase("test"));
  * </code>
  * </pre>
  *
@@ -62,7 +65,7 @@
  *         .returnFullDocumentOnUpdate()
  *         .build();
  *
- *     ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(System.out::println, new ChangeStreamRequestOptions("collection-name", options));
+ *     ChangeStreamRequest&lt;Document&gt; request = new ChangeStreamRequest&lt;&gt;(System.out::println, new ChangeStreamRequestOptions("collection-name", options));
  * </code>
  * </pre>
  *
@@ -71,7 +74,7 @@
  *
  * <pre>
  * <code>
- *     ChangeStreamRequest<Document> request = ChangeStreamRequest.builder()
+ *     ChangeStreamRequest&lt;Document&gt; request = ChangeStreamRequest.builder()
  *         .collection("collection-name")
  *         .publishTo(System.out::println)
  *         .filter(newAggregation(match(where("age").is(7))))
@@ -89,6 +92,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Myroslav Kosinskyi
  * @since 2.1
  */
 public class ChangeStreamRequest<T>
@@ -107,28 +111,20 @@ public class ChangeStreamRequest<T>
 	public ChangeStreamRequest(MessageListener<ChangeStreamDocument<Document>, ? super T> messageListener,
 			RequestOptions options) {
 
-		Assert.notNull(messageListener, "MessageListener must not be null!");
-		Assert.notNull(options, "Options must not be null!");
+		Assert.notNull(messageListener, "MessageListener must not be null");
+		Assert.notNull(options, "Options must not be null");
 
-		this.options = options instanceof ChangeStreamRequestOptions ? (ChangeStreamRequestOptions) options
-				: ChangeStreamRequestOptions.of(options);
+		this.options = options instanceof ChangeStreamRequestOptions changeStreamRequestOptions ?
+				changeStreamRequestOptions : ChangeStreamRequestOptions.of(options);
 
 		this.messageListener = messageListener;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getMessageListener()
-	 */
 	@Override
 	public MessageListener<ChangeStreamDocument<Document>, ? super T> getMessageListener() {
 		return messageListener;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getRequestOptions()
-	 */
 	@Override
 	public ChangeStreamRequestOptions getRequestOptions() {
 		return options;
@@ -136,7 +132,7 @@ public ChangeStreamRequestOptions getRequestOptions() {
 
 	/**
 	 * Obtain a shiny new {@link ChangeStreamRequestBuilder} and start defining your {@link ChangeStreamRequest} in this
-	 * fancy fluent way. Just don't forget to call {@link ChangeStreamRequestBuilder#build() build()} when your're done.
+	 * fancy fluent way. Just don't forget to call {@link ChangeStreamRequestBuilder#build() build()} when done.
 	 *
 	 * @return new instance of {@link ChangeStreamRequest}.
 	 */
@@ -146,7 +142,7 @@ public static ChangeStreamRequestBuilder builder() {
 
 	/**
 	 * Obtain a shiny new {@link ChangeStreamRequestBuilder} and start defining your {@link ChangeStreamRequest} in this
-	 * fancy fluent way. Just don't forget to call {@link ChangeStreamRequestBuilder#build() build()} when your're done.
+	 * fancy fluent way. Just don't forget to call {@link ChangeStreamRequestBuilder#build() build()} when done.
 	 *
 	 * @return new instance of {@link ChangeStreamRequest}.
 	 */
@@ -167,27 +163,44 @@ public static class ChangeStreamRequestOptions implements SubscriptionRequest.Re
 
 		private final @Nullable String databaseName;
 		private final @Nullable String collectionName;
+		private final @Nullable Duration maxAwaitTime;
 		private final ChangeStreamOptions options;
 
 		/**
 		 * Create new {@link ChangeStreamRequestOptions}.
 		 *
+		 * @param databaseName can be {@literal null}.
 		 * @param collectionName can be {@literal null}.
 		 * @param options must not be {@literal null}.
 		 */
 		public ChangeStreamRequestOptions(@Nullable String databaseName, @Nullable String collectionName,
 				ChangeStreamOptions options) {
+			this(databaseName, collectionName, null, options);
+		}
 
-			Assert.notNull(options, "Options must not be null!");
+		/**
+		 * Create new {@link ChangeStreamRequestOptions}.
+		 *
+		 * @param databaseName can be {@literal null}.
+		 * @param collectionName can be {@literal null}.
+		 * @param maxAwaitTime can be {@literal null}.
+		 * @param options must not be {@literal null}.
+		 * @since 3.0
+		 */
+		public ChangeStreamRequestOptions(@Nullable String databaseName, @Nullable String collectionName,
+				@Nullable Duration maxAwaitTime, ChangeStreamOptions options) {
+
+			Assert.notNull(options, "Options must not be null");
 
 			this.collectionName = collectionName;
 			this.databaseName = databaseName;
+			this.maxAwaitTime = maxAwaitTime;
 			this.options = options;
 		}
 
 		public static ChangeStreamRequestOptions of(RequestOptions options) {
 
-			Assert.notNull(options, "Options must not be null!");
+			Assert.notNull(options, "Options must not be null");
 
 			return new ChangeStreamRequestOptions(options.getDatabaseName(), options.getCollectionName(),
 					ChangeStreamOptions.builder().build());
@@ -202,23 +215,20 @@ public ChangeStreamOptions getChangeStreamOptions() {
 			return options;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.monitor.SubscriptionRequest.RequestOptions#getCollectionName()
-		 */
 		@Override
-		public String getCollectionName() {
+		public @Nullable String getCollectionName() {
 			return collectionName;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.monitor.SubscriptionRequest.RequestOptions#getDatabaseName()
-		 */
 		@Override
-		public String getDatabaseName() {
+		public @Nullable String getDatabaseName() {
 			return databaseName;
 		}
+
+		@Override
+		public Duration maxAwaitTime() {
+			return maxAwaitTime != null ? maxAwaitTime : RequestOptions.super.maxAwaitTime();
+		}
 	}
 
 	/**
@@ -232,8 +242,9 @@ public static class ChangeStreamRequestBuilder<T> {
 
 		private @Nullable String databaseName;
 		private @Nullable String collectionName;
+		private @Nullable Duration maxAwaitTime;
 		private @Nullable MessageListener<ChangeStreamDocument<Document>, ? super T> listener;
-		private ChangeStreamOptionsBuilder delegate = ChangeStreamOptions.builder();
+		private final ChangeStreamOptionsBuilder delegate = ChangeStreamOptions.builder();
 
 		private ChangeStreamRequestBuilder() {}
 
@@ -243,9 +254,10 @@ private ChangeStreamRequestBuilder() {}
 		 * @param databaseName must not be {@literal null} nor empty.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> database(String databaseName) {
 
-			Assert.hasText(databaseName, "DatabaseName must not be null!");
+			Assert.hasText(databaseName, "DatabaseName must not be null");
 
 			this.databaseName = databaseName;
 			return this;
@@ -257,9 +269,10 @@ public ChangeStreamRequestBuilder<T> database(String databaseName) {
 		 * @param collectionName must not be {@literal null} nor empty.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> collection(String collectionName) {
 
-			Assert.hasText(collectionName, "CollectionName must not be null!");
+			Assert.hasText(collectionName, "CollectionName must not be null");
 
 			this.collectionName = collectionName;
 			return this;
@@ -271,10 +284,11 @@ public ChangeStreamRequestBuilder<T> collection(String collectionName) {
 		 * @param messageListener must not be {@literal null}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> publishTo(
 				MessageListener<ChangeStreamDocument<Document>, ? super T> messageListener) {
 
-			Assert.notNull(messageListener, "MessageListener must not be null!");
+			Assert.notNull(messageListener, "MessageListener must not be null");
 
 			this.listener = messageListener;
 			return this;
@@ -282,13 +296,13 @@ public ChangeStreamRequestBuilder<T> publishTo(
 
 		/**
 		 * Set the filter to apply.
-		 * <p/>
+		 * <br />
 		 * Fields on aggregation expression root level are prefixed to map to fields contained in
 		 * {@link ChangeStreamDocument#getFullDocument() fullDocument}. However {@literal operationType}, {@literal ns},
 		 * {@literal documentKey} and {@literal fullDocument} are reserved words that will be omitted, and therefore taken
 		 * as given, during the mapping procedure. You may want to have a look at the
 		 * <a href="https://docs.mongodb.com/manual/reference/change-events/">structure of Change Events</a>.
-		 * <p/>
+		 * <br />
 		 * Use {@link org.springframework.data.mongodb.core.aggregation.TypedAggregation} to ensure filter expressions are
 		 * mapped to domain type fields.
 		 *
@@ -298,9 +312,10 @@ public ChangeStreamRequestBuilder<T> publishTo(
 		 * @see ChangeStreamOptions#getFilter()
 		 * @see ChangeStreamOptionsBuilder#filter(Aggregation)
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> filter(Aggregation aggregation) {
 
-			Assert.notNull(aggregation, "Aggregation must not be null!");
+			Assert.notNull(aggregation, "Aggregation must not be null");
 
 			this.delegate.filter(aggregation);
 			return this;
@@ -313,10 +328,11 @@ public ChangeStreamRequestBuilder<T> filter(Aggregation aggregation) {
 		 * @return this.
 		 * @see ChangeStreamOptions#getFilter()
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> filter(Document... pipeline) {
 
-			Assert.notNull(pipeline, "Aggregation pipeline must not be null!");
-			Assert.noNullElements(pipeline, "Aggregation pipeline must not contain null elements!");
+			Assert.notNull(pipeline, "Aggregation pipeline must not be null");
+			Assert.noNullElements(pipeline, "Aggregation pipeline must not contain null elements");
 
 			this.delegate.filter(pipeline);
 			return this;
@@ -330,9 +346,10 @@ public ChangeStreamRequestBuilder<T> filter(Document... pipeline) {
 		 * @see ChangeStreamOptions#getCollation()
 		 * @see ChangeStreamOptionsBuilder#collation(Collation)
 		 */
-		public ChangeStreamRequestBuilder collation(Collation collation) {
+		@Contract("_ -> this")
+		public ChangeStreamRequestBuilder<T> collation(Collation collation) {
 
-			Assert.notNull(collation, "Collation must not be null!");
+			Assert.notNull(collation, "Collation must not be null");
 
 			this.delegate.collation(collation);
 			return this;
@@ -347,9 +364,10 @@ public ChangeStreamRequestBuilder collation(Collation collation) {
 		 * @see ChangeStreamOptions#getResumeToken()
 		 * @see ChangeStreamOptionsBuilder#resumeToken(org.bson.BsonValue)
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> resumeToken(BsonValue resumeToken) {
 
-			Assert.notNull(resumeToken, "Resume token not be null!");
+			Assert.notNull(resumeToken, "Resume token not be null");
 
 			this.delegate.resumeToken(resumeToken);
 			return this;
@@ -363,9 +381,10 @@ public ChangeStreamRequestBuilder<T> resumeToken(BsonValue resumeToken) {
 		 * @see ChangeStreamOptions#getResumeTimestamp()
 		 * @see ChangeStreamOptionsBuilder#resumeAt(java.time.Instant)
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> resumeAt(Instant clusterTime) {
 
-			Assert.notNull(clusterTime, "ClusterTime must not be null!");
+			Assert.notNull(clusterTime, "ClusterTime must not be null");
 
 			this.delegate.resumeAt(clusterTime);
 			return this;
@@ -378,9 +397,10 @@ public ChangeStreamRequestBuilder<T> resumeAt(Instant clusterTime) {
 		 * @return this.
 		 * @since 2.2
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> resumeAfter(BsonValue resumeToken) {
 
-			Assert.notNull(resumeToken, "ResumeToken must not be null!");
+			Assert.notNull(resumeToken, "ResumeToken must not be null");
 			this.delegate.resumeAfter(resumeToken);
 
 			return this;
@@ -393,9 +413,10 @@ public ChangeStreamRequestBuilder<T> resumeAfter(BsonValue resumeToken) {
 		 * @return this.
 		 * @since 2.2
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> startAfter(BsonValue resumeToken) {
 
-			Assert.notNull(resumeToken, "ResumeToken must not be null!");
+			Assert.notNull(resumeToken, "ResumeToken must not be null");
 			this.delegate.startAfter(resumeToken);
 
 			return this;
@@ -405,27 +426,60 @@ public ChangeStreamRequestBuilder<T> startAfter(BsonValue resumeToken) {
 		 * Set the {@link FullDocument} lookup to {@link FullDocument#UPDATE_LOOKUP}.
 		 *
 		 * @return this.
-		 * @see #fullDocumentLookup(FullDocument)
 		 * @see ChangeStreamOptions#getFullDocumentLookup()
 		 * @see ChangeStreamOptionsBuilder#fullDocumentLookup(FullDocument)
 		 */
+		@Contract("_ -> this")
 		public ChangeStreamRequestBuilder<T> fullDocumentLookup(FullDocument lookup) {
 
-			Assert.notNull(lookup, "FullDocument not be null!");
+			Assert.notNull(lookup, "FullDocument not be null");
 
 			this.delegate.fullDocumentLookup(lookup);
 			return this;
 		}
 
+		/**
+		 * Set the {@link FullDocumentBeforeChange} lookup to the given value.
+		 *
+		 * @return this.
+		 * @since 4.0
+		 * @see ChangeStreamOptions#getFullDocumentBeforeChangeLookup()
+		 * @see ChangeStreamOptionsBuilder#fullDocumentBeforeChangeLookup(FullDocumentBeforeChange)
+		 */
+		@Contract("_ -> this")
+		public ChangeStreamRequestBuilder<T> fullDocumentBeforeChangeLookup(FullDocumentBeforeChange lookup) {
+
+			Assert.notNull(lookup, "FullDocumentBeforeChange not be null");
+
+			this.delegate.fullDocumentBeforeChangeLookup(lookup);
+			return this;
+		}
+
+		/**
+		 * Set the cursors maximum wait time on the server (for a new Document to be emitted).
+		 *
+		 * @param timeout must not be {@literal null}.
+		 * @since 3.0
+		 */
+		@Contract("_ -> this")
+		public ChangeStreamRequestBuilder<T> maxAwaitTime(Duration timeout) {
+
+			Assert.notNull(timeout, "timeout not be null");
+
+			this.maxAwaitTime = timeout;
+			return this;
+		}
+
 		/**
 		 * @return the build {@link ChangeStreamRequest}.
 		 */
+		@Contract("-> new")
 		public ChangeStreamRequest<T> build() {
 
-			Assert.notNull(listener, "MessageListener must not be null!");
+			Assert.notNull(listener, "MessageListener must not be null");
 
 			return new ChangeStreamRequest<>(listener,
-					new ChangeStreamRequestOptions(databaseName, collectionName, delegate.build()));
+					new ChangeStreamRequestOptions(databaseName, collectionName, maxAwaitTime, delegate.build()));
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java
index 14c79a9e6d..cc4d3f0bdb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,19 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
-import lombok.AllArgsConstructor;
-
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import org.bson.BsonDocument;
 import org.bson.BsonTimestamp;
 import org.bson.BsonValue;
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.ChangeStreamEvent;
 import org.springframework.data.mongodb.core.ChangeStreamOptions;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -38,10 +38,8 @@
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
-import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest.ChangeStreamRequestOptions;
 import org.springframework.data.mongodb.core.messaging.Message.MessageProperties;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ErrorHandler;
 import org.springframework.util.StringUtils;
@@ -53,17 +51,19 @@
 import com.mongodb.client.model.Collation;
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
 
 /**
  * {@link Task} implementation for obtaining {@link ChangeStreamDocument ChangeStreamDocuments} from MongoDB.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Myroslav Kosinskyi
  * @since 2.1
  */
 class ChangeStreamTask extends CursorReadingTask<ChangeStreamDocument<Document>, Object> {
 
-	private final Set<String> blacklist = new HashSet<>(
+	private final Set<String> denylist = new HashSet<>(
 			Arrays.asList("operationType", "fullDocument", "documentKey", "updateDescription", "ns"));
 
 	private final QueryMapper queryMapper;
@@ -78,10 +78,6 @@ class ChangeStreamTask extends CursorReadingTask<ChangeStreamDocument<Document>,
 		mongoConverter = template.getConverter();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.CursorReadingTask#initCursor(org.springframework.data.mongodb.core.MongoTemplate, org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions, java.lang.Class)
-	 */
 	@Override
 	protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate template, RequestOptions options,
 			Class<?> targetType) {
@@ -91,19 +87,20 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
 		Collation collation = null;
 		FullDocument fullDocument = ClassUtils.isAssignable(Document.class, targetType) ? FullDocument.DEFAULT
 				: FullDocument.UPDATE_LOOKUP;
+		FullDocumentBeforeChange fullDocumentBeforeChange = null;
 		BsonTimestamp startAt = null;
 		boolean resumeAfter = true;
 
-		if (options instanceof ChangeStreamRequest.ChangeStreamRequestOptions) {
+		if (options instanceof ChangeStreamRequest.ChangeStreamRequestOptions requestOptions) {
 
-			ChangeStreamOptions changeStreamOptions = ((ChangeStreamRequestOptions) options).getChangeStreamOptions();
+			ChangeStreamOptions changeStreamOptions = requestOptions.getChangeStreamOptions();
 			filter = prepareFilter(template, changeStreamOptions);
 
 			if (changeStreamOptions.getFilter().isPresent()) {
 
 				Object val = changeStreamOptions.getFilter().get();
-				if (val instanceof Aggregation) {
-					collation = ((Aggregation) val).getOptions().getCollation()
+				if (val instanceof Aggregation aggregation) {
+					collation = aggregation.getOptions().getCollation()
 							.map(org.springframework.data.mongodb.core.query.Collation::toMongoCollation).orElse(null);
 				}
 			}
@@ -118,11 +115,13 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
 					.orElseGet(() -> ClassUtils.isAssignable(Document.class, targetType) ? FullDocument.DEFAULT
 							: FullDocument.UPDATE_LOOKUP);
 
+			fullDocumentBeforeChange = changeStreamOptions.getFullDocumentBeforeChangeLookup().orElse(null);
+
 			startAt = changeStreamOptions.getResumeBsonTimestamp().orElse(null);
 		}
 
 		MongoDatabase db = StringUtils.hasText(options.getDatabaseName())
-				? template.getMongoDbFactory().getDb(options.getDatabaseName())
+				? template.getMongoDatabaseFactory().getMongoDatabase(options.getDatabaseName())
 				: template.getDb();
 
 		ChangeStreamIterable<Document> iterable;
@@ -135,6 +134,10 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
 			iterable = filter.isEmpty() ? db.watch(Document.class) : db.watch(filter, Document.class);
 		}
 
+		if (!options.maxAwaitTime().isZero()) {
+			iterable = iterable.maxAwaitTime(options.maxAwaitTime().toMillis(), TimeUnit.MILLISECONDS);
+		}
+
 		if (!resumeToken.isEmpty()) {
 
 			if (resumeAfter) {
@@ -145,7 +148,7 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
 		}
 
 		if (startAt != null) {
-			iterable.startAtOperationTime(startAt);
+			iterable = iterable.startAtOperationTime(startAt);
 		}
 
 		if (collation != null) {
@@ -153,6 +156,9 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
 		}
 
 		iterable = iterable.fullDocument(fullDocument);
+		if(fullDocumentBeforeChange != null) {
+			iterable = iterable.fullDocumentBeforeChange(fullDocumentBeforeChange);
+		}
 
 		return iterable.iterator();
 	}
@@ -166,14 +172,13 @@ List<Document> prepareFilter(MongoTemplate template, ChangeStreamOptions options
 
 		Object filter = options.getFilter().orElse(null);
 
-		if (filter instanceof Aggregation) {
-			Aggregation agg = (Aggregation) filter;
-			AggregationOperationContext context = agg instanceof TypedAggregation
-					? new TypeBasedAggregationOperationContext(((TypedAggregation<?>) agg).getInputType(),
+		if (filter instanceof Aggregation aggregation) {
+			AggregationOperationContext context = aggregation instanceof TypedAggregation<?> typedAggregation
+					? new TypeBasedAggregationOperationContext(typedAggregation.getInputType(),
 							template.getConverter().getMappingContext(), queryMapper)
 					: Aggregation.DEFAULT_CONTEXT;
 
-			return agg.toPipeline(new PrefixingDelegatingAggregationOperationContext(context, "fullDocument", blacklist));
+			return aggregation.toPipeline(new PrefixingDelegatingAggregationOperationContext(context, "fullDocument", denylist));
 		}
 
 		if (filter instanceof List) {
@@ -184,10 +189,6 @@ List<Document> prepareFilter(MongoTemplate template, ChangeStreamOptions options
 				"ChangeStreamRequestOptions.filter mut be either an Aggregation or a plain list of Documents");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.CursorReadingTask#createMessage(java.lang.Object, java.lang.Class, org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions)
-	 */
 	@Override
 	protected Message<ChangeStreamDocument<Document>, Object> createMessage(ChangeStreamDocument<Document> source,
 			Class<Object> targetType, RequestOptions options) {
@@ -212,36 +213,32 @@ MongoNamespace createNamespaceFromOptions(RequestOptions options) {
 	 *
 	 * @since 2.1
 	 */
-	@AllArgsConstructor
 	static class ChangeStreamEventMessage<T> implements Message<ChangeStreamDocument<Document>, T> {
 
 		private final ChangeStreamEvent<T> delegate;
 		private final MessageProperties messageProperties;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.messaging.Message#getRaw()
-		 */
-		@Nullable
+		ChangeStreamEventMessage(ChangeStreamEvent<T> delegate, MessageProperties messageProperties) {
+
+			this.delegate = delegate;
+			this.messageProperties = messageProperties;
+		}
+
 		@Override
-		public ChangeStreamDocument<Document> getRaw() {
+		public @Nullable ChangeStreamDocument<Document> getRaw() {
 			return delegate.getRaw();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.messaging.Message#getBody()
-		 */
-		@Nullable
 		@Override
-		public T getBody() {
+		public @Nullable T getBody() {
 			return delegate.getBody();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.messaging.Message#getProperties()
-		 */
+		@Override
+		public @Nullable T getBodyBeforeChange() {
+			return delegate.getBodyBeforeChange();
+		}
+
 		@Override
 		public MessageProperties getProperties() {
 			return this.messageProperties;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java
index c87f0ffa92..662960284d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/CursorReadingTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,15 @@
 import java.time.Duration;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.messaging.Message.MessageProperties;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
-import org.springframework.lang.Nullable;
+import org.springframework.data.util.Lock;
 import org.springframework.util.Assert;
 import org.springframework.util.ErrorHandler;
 
@@ -39,7 +41,7 @@
  */
 abstract class CursorReadingTask<T, R> implements Task {
 
-	private final Object lifecycleMonitor = new Object();
+	private final Lock lock = Lock.of(new ReentrantLock());
 
 	private final MongoTemplate template;
 	private final SubscriptionRequest<T, R, RequestOptions> request;
@@ -49,7 +51,7 @@ abstract class CursorReadingTask<T, R> implements Task {
 
 	private State state = State.CREATED;
 
-	private MongoCursor<T> cursor;
+	private @Nullable MongoCursor<T> cursor;
 
 	/**
 	 * @param template must not be {@literal null}.
@@ -66,10 +68,6 @@ abstract class CursorReadingTask<T, R> implements Task {
 		this.errorHandler = errorHandler;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Runnable
-	 */
 	@Override
 	public void run() {
 
@@ -90,19 +88,14 @@ public void run() {
 					}
 				} catch (InterruptedException e) {
 
-					synchronized (lifecycleMonitor) {
-						state = State.CANCELLED;
-					}
+					lock.executeWithoutResult(() -> state = State.CANCELLED);
 					Thread.currentThread().interrupt();
 					break;
 				}
 			}
 		} catch (RuntimeException e) {
 
-			synchronized (lifecycleMonitor) {
-				state = State.CANCELLED;
-			}
-
+			lock.executeWithoutResult(() -> state = State.CANCELLED);
 			errorHandler.handleError(e);
 		}
 	}
@@ -116,32 +109,33 @@ public void run() {
 	 * is immediately {@link MongoCursor#close() closed} and a new {@link MongoCursor} is requested until a valid one is
 	 * retrieved or the {@link #state} changes.
 	 */
+	@SuppressWarnings("NullAway")
 	private void start() {
 
-		synchronized (lifecycleMonitor) {
+		lock.executeWithoutResult(() -> {
 			if (!State.RUNNING.equals(state)) {
 				state = State.STARTING;
 			}
-		}
+		});
 
 		do {
 
-			boolean valid = false;
-
-			synchronized (lifecycleMonitor) {
+			boolean valid = lock.execute(() -> {
 
-				if (State.STARTING.equals(state)) {
+				if (!State.STARTING.equals(state)) {
+					return false;
+				}
 
-					MongoCursor<T> cursor = execute(() -> initCursor(template, request.getRequestOptions(), targetType));
-					valid = isValidCursor(cursor);
-					if (valid) {
-						this.cursor = cursor;
-						state = State.RUNNING;
-					} else if (cursor != null) {
-						cursor.close();
-					}
+				MongoCursor<T> cursor = execute(() -> initCursor(template, request.getRequestOptions(), targetType));
+				boolean isValid = isValidCursor(cursor);
+				if (isValid) {
+					this.cursor = cursor;
+					state = State.RUNNING;
+				} else if (cursor != null) {
+					cursor.close();
 				}
-			}
+				return isValid;
+			});
 
 			if (!valid) {
 
@@ -149,9 +143,7 @@ private void start() {
 					Thread.sleep(100);
 				} catch (InterruptedException e) {
 
-					synchronized (lifecycleMonitor) {
-						state = State.CANCELLED;
-					}
+					lock.executeWithoutResult(() -> state = State.CANCELLED);
 					Thread.currentThread().interrupt();
 				}
 			}
@@ -164,14 +156,10 @@ private void start() {
 
 	protected abstract MongoCursor<T> initCursor(MongoTemplate template, RequestOptions options, Class<?> targetType);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Cancelable#cancel()
-	 */
 	@Override
 	public void cancel() throws DataAccessResourceFailureException {
 
-		synchronized (lifecycleMonitor) {
+		lock.executeWithoutResult(() -> {
 
 			if (State.RUNNING.equals(state) || State.STARTING.equals(state)) {
 				this.state = State.CANCELLED;
@@ -179,43 +167,29 @@ public void cancel() throws DataAccessResourceFailureException {
 					cursor.close();
 				}
 			}
-		}
+		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.scheduling.SchedulingAwareRunnable#isLongLived()
-	 */
 	@Override
 	public boolean isLongLived() {
 		return true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Task#getState()
-	 */
 	@Override
 	public State getState() {
-
-		synchronized (lifecycleMonitor) {
-			return state;
-		}
+		return lock.execute(() -> state);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Task#awaitStart(java.time.Duration)
-	 */
 	@Override
 	public boolean awaitStart(Duration timeout) throws InterruptedException {
 
-		Assert.notNull(timeout, "Timeout must not be null!");
-		Assert.isTrue(!timeout.isNegative(), "Timeout must not be negative!");
+		Assert.notNull(timeout, "Timeout must not be null");
+		Assert.isTrue(!timeout.isNegative(), "Timeout must not be negative");
 
 		return awaitStart.await(timeout.toNanos(), TimeUnit.NANOSECONDS);
 	}
 
+	@SuppressWarnings("NullAway")
 	protected Message<T, R> createMessage(T source, Class<R> targetType, RequestOptions options) {
 
 		SimpleMessage<T, T> message = new SimpleMessage<>(source, source, MessageProperties.builder()
@@ -237,16 +211,14 @@ private void emitMessage(Message<T, R> message) {
 		}
 	}
 
-	@Nullable
-	private T getNext() {
+	private @Nullable T getNext() {
 
-		synchronized (lifecycleMonitor) {
-			if (State.RUNNING.equals(state)) {
+		return lock.execute(() -> {
+			if (cursor != null && State.RUNNING.equals(state)) {
 				return cursor.tryNext();
 			}
-		}
-
-		throw new IllegalStateException(String.format("Cursor %s is not longer open.", cursor));
+			throw new IllegalStateException(String.format("Cursor %s is not longer open", cursor));
+		});
 	}
 
 	private static boolean isValidCursor(@Nullable MongoCursor<?> cursor) {
@@ -255,11 +227,7 @@ private static boolean isValidCursor(@Nullable MongoCursor<?> cursor) {
 			return false;
 		}
 
-		if (cursor.getServerCursor() == null || cursor.getServerCursor().getId() == 0) {
-			return false;
-		}
-
-		return true;
+		return cursor.getServerCursor() != null && cursor.getServerCursor().getId() != 0;
 	}
 
 	/**
@@ -268,12 +236,11 @@ private static boolean isValidCursor(@Nullable MongoCursor<?> cursor) {
 	 * exception.
 	 *
 	 * @param callback must not be {@literal null}.
-	 * @param <T>
+	 * @param <V>
 	 * @return can be {@literal null}.
 	 * @throws RuntimeException The potentially translated exception.
 	 */
-	@Nullable
-	private <V> V execute(Supplier<V> callback) {
+	private <V> @Nullable V execute(Supplier<V> callback) {
 
 		try {
 			return callback.get();
@@ -283,4 +250,5 @@ private <V> V execute(Supplier<V> callback) {
 			throw translated != null ? translated : e;
 		}
 	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java
index a9292c8e00..1b24e67e07 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,31 +15,30 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
 import java.time.Duration;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.Executor;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
-import org.springframework.lang.Nullable;
+import org.springframework.data.util.Lock;
 import org.springframework.util.Assert;
 import org.springframework.util.ErrorHandler;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Simple {@link Executor} based {@link MessageListenerContainer} implementation for running {@link Task tasks} like
  * listening to MongoDB <a href="https://docs.mongodb.com/manual/changeStreams/">Change Streams</a> and tailable
- * cursors.
- * <p />
+ * cursors. <br />
  * This message container creates long-running tasks that are executed on {@link Executor}.
  *
  * @author Christoph Strobl
@@ -52,9 +51,16 @@ public class DefaultMessageListenerContainer implements MessageListenerContainer
 	private final TaskFactory taskFactory;
 	private final Optional<ErrorHandler> errorHandler;
 
-	private final Object lifecycleMonitor = new Object();
 	private final Map<SubscriptionRequest, Subscription> subscriptions = new LinkedHashMap<>();
 
+	private final ReadWriteLock lifecycleMonitor = new ReentrantReadWriteLock();
+	private final Lock lifecycleRead = Lock.of(lifecycleMonitor.readLock());
+	private final Lock lifecycleWrite = Lock.of(lifecycleMonitor.writeLock());
+
+	private final ReadWriteLock subscriptionMonitor = new ReentrantReadWriteLock();
+	private final Lock subscriptionRead = Lock.of(subscriptionMonitor.readLock());
+	private final Lock subscriptionWrite = Lock.of(subscriptionMonitor.writeLock());
+
 	private boolean running = false;
 
 	/**
@@ -89,27 +95,19 @@ public DefaultMessageListenerContainer(MongoTemplate template, Executor taskExec
 	public DefaultMessageListenerContainer(MongoTemplate template, Executor taskExecutor,
 			@Nullable ErrorHandler errorHandler) {
 
-		Assert.notNull(template, "Template must not be null!");
-		Assert.notNull(taskExecutor, "TaskExecutor must not be null!");
+		Assert.notNull(template, "Template must not be null");
+		Assert.notNull(taskExecutor, "TaskExecutor must not be null");
 
 		this.taskExecutor = taskExecutor;
 		this.taskFactory = new TaskFactory(template);
 		this.errorHandler = Optional.ofNullable(errorHandler);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.SmartLifecycle#isAutoStartup()
-	 */
 	@Override
 	public boolean isAutoStartup() {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.SmartLifecycle#stop(java.lang.Runnable)
-	 */
 	@Override
 	public void stop(Runnable callback) {
 
@@ -117,73 +115,43 @@ public void stop(Runnable callback) {
 		callback.run();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Lifecycle#start()
-	 */
 	@Override
 	public void start() {
 
-		synchronized (lifecycleMonitor) {
+		lifecycleWrite.executeWithoutResult(() -> {
+			if (!this.running) {
+				subscriptions.values().stream() //
+						.filter(it -> !it.isActive()) //
+						.filter(TaskSubscription.class::isInstance) //
+						.map(TaskSubscription.class::cast) //
+						.map(TaskSubscription::getTask) //
+						.forEach(taskExecutor::execute);
 
-			if (this.running) {
-				return;
+				running = true;
 			}
-
-			subscriptions.values().stream() //
-					.filter(it -> !it.isActive()) //
-					.filter(it -> it instanceof TaskSubscription) //
-					.map(TaskSubscription.class::cast) //
-					.map(TaskSubscription::getTask) //
-					.forEach(taskExecutor::execute);
-
-			running = true;
-		}
+		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Lifecycle#stop()
-	 */
 	@Override
 	public void stop() {
-
-		synchronized (lifecycleMonitor) {
-
+		lifecycleWrite.executeWithoutResult(() -> {
 			if (this.running) {
-
 				subscriptions.values().forEach(Cancelable::cancel);
-
 				running = false;
 			}
-		}
+		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Lifecycle#isRunning()
-	 */
 	@Override
 	public boolean isRunning() {
-
-		synchronized (this.lifecycleMonitor) {
-			return running;
-		}
+		return lifecycleRead.execute(() -> running);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.context.Phased#getPhase()
-	 */
 	@Override
 	public int getPhase() {
 		return Integer.MAX_VALUE;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#register(org.springframework.data.mongodb.monitor.SubscriptionRequest, java.lang.Class)
-	 */
 	@Override
 	public <S, T> Subscription register(SubscriptionRequest<S, ? super T, ? extends RequestOptions> request,
 			Class<T> bodyType) {
@@ -192,10 +160,6 @@ public <S, T> Subscription register(SubscriptionRequest<S, ? super T, ? extends
 				() -> new DecoratingLoggingErrorHandler((exception) -> lookup(request).ifPresent(Subscription::cancel))));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#register(org.springframework.data.mongodb.monitor.SubscriptionRequest, java.lang.Class, org.springframework.util.ErrorHandler)
-	 */
 	@Override
 	public <S, T> Subscription register(SubscriptionRequest<S, ? super T, ? extends RequestOptions> request,
 			Class<T> bodyType, ErrorHandler errorHandler) {
@@ -203,46 +167,32 @@ public <S, T> Subscription register(SubscriptionRequest<S, ? super T, ? extends
 		return register(request, taskFactory.forRequest(request, bodyType, errorHandler));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#lookup(org.springframework.data.mongodb.monitor.SubscriptionRequest)
-	 */
 	@Override
 	public Optional<Subscription> lookup(SubscriptionRequest<?, ?, ?> request) {
-
-		synchronized (lifecycleMonitor) {
-			return Optional.ofNullable(subscriptions.get(request));
-		}
+		return subscriptionRead.execute(() -> Optional.ofNullable(subscriptions.get(request)));
 	}
 
 	public Subscription register(SubscriptionRequest request, Task task) {
 
-		Subscription subscription = new TaskSubscription(task);
-
-		synchronized (lifecycleMonitor) {
-
+		return subscriptionWrite.execute(() -> {
 			if (subscriptions.containsKey(request)) {
 				return subscriptions.get(request);
 			}
 
+			Subscription subscription = new TaskSubscription(task);
 			this.subscriptions.put(request, subscription);
 
-			if (this.running) {
+			if (this.isRunning()) {
 				taskExecutor.execute(task);
 			}
-		}
+			return subscription;
+		});
 
-		return subscription;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.MessageListenerContainer#remove(org.springframework.data.mongodb.monitor.Subscription)
-	 */
 	@Override
 	public void remove(Subscription subscription) {
-
-		synchronized (lifecycleMonitor) {
+		subscriptionWrite.executeWithoutResult(() -> {
 
 			if (subscriptions.containsValue(subscription)) {
 
@@ -252,14 +202,13 @@ public void remove(Subscription subscription) {
 
 				subscriptions.values().remove(subscription);
 			}
-		}
+		});
 	}
 
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	@EqualsAndHashCode
 	static class TaskSubscription implements Subscription {
 
 		private final Task task;
@@ -286,24 +235,44 @@ public boolean await(Duration timeout) throws InterruptedException {
 		public void cancel() throws DataAccessResourceFailureException {
 			task.cancel();
 		}
+
+		@Override
+		public boolean equals(@Nullable Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+
+			TaskSubscription that = (TaskSubscription) o;
+
+			return ObjectUtils.nullSafeEquals(this.task, that.task);
+		}
+
+		@Override
+		public int hashCode() {
+			return ObjectUtils.nullSafeHashCode(task);
+		}
 	}
 
 	/**
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 	private static class DecoratingLoggingErrorHandler implements ErrorHandler {
 
 		private final Log logger = LogFactory.getLog(DecoratingLoggingErrorHandler.class);
 
 		private final ErrorHandler delegate;
 
+		DecoratingLoggingErrorHandler(ErrorHandler delegate) {
+			this.delegate = delegate;
+		}
+
 		@Override
 		public void handleError(Throwable t) {
 
 			if (logger.isErrorEnabled()) {
-				logger.error("Unexpected error occurred while listening to MongoDB.", t);
+				logger.error("Unexpected error occurred while listening to MongoDB", t);
 			}
 
 			delegate.handleError(t);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java
index 1f52821cef..f9a9c4131d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/LazyMappingDelegatingMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,8 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
-import lombok.ToString;
-
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.util.ClassUtils;
 
@@ -26,7 +25,6 @@
  * @author Mark Paluch
  * @since 2.1
  */
-@ToString(of = { "delegate", "targetType" })
 class LazyMappingDelegatingMessage<S, T> implements Message<S, T> {
 
 	private final Message<S, ?> delegate;
@@ -40,21 +38,13 @@ class LazyMappingDelegatingMessage<S, T> implements Message<S, T> {
 		this.converter = converter;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Message#getRaw()
-	 */
 	@Override
-	public S getRaw() {
+	public @Nullable S getRaw() {
 		return delegate.getRaw();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Message#getBody()
-	 */
 	@Override
-	public T getBody() {
+	public @Nullable T getBody() {
 
 		if (delegate.getBody() == null || targetType.equals(delegate.getBody().getClass())) {
 			return targetType.cast(delegate.getBody());
@@ -74,12 +64,12 @@ public T getBody() {
 				String.format("No converter found capable of converting %s to %s", messageBody.getClass(), targetType));
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Message#getProperties()
-	 */
 	@Override
 	public MessageProperties getProperties() {
 		return delegate.getProperties();
 	}
+
+	public String toString() {
+		return "LazyMappingDelegatingMessage(delegate=" + this.delegate + ", targetType=" + this.targetType + ")";
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Message.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Message.java
index 6636a44620..e7aa5b036d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Message.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Message.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,11 +15,10 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * General message abstraction for any type of Event / Message published by MongoDB server to the client. This might be
@@ -33,6 +32,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Myroslav Kosinskyi
  * @see MessageProperties
  * @since 2.1
  */
@@ -54,6 +54,16 @@ public interface Message<S, T> {
 	@Nullable
 	T getBody();
 
+	/**
+	 * The converted message body before change if available.
+	 *
+	 * @return can be {@literal null}.
+	 * @since 4.0
+	 */
+	default @Nullable T getBodyBeforeChange() {
+		return null;
+	}
+
 	/**
 	 * {@link MessageProperties} containing information about the {@link Message} origin and other metadata.
 	 *
@@ -65,8 +75,6 @@ public interface Message<S, T> {
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	@ToString
-	@EqualsAndHashCode
 	class MessageProperties {
 
 		private static final MessageProperties EMPTY = new MessageProperties();
@@ -77,20 +85,18 @@ class MessageProperties {
 		/**
 		 * The database name the message originates from.
 		 *
-		 * @return
+		 * @return can be {@literal null}.
 		 */
-		@Nullable
-		public String getDatabaseName() {
+		public @Nullable String getDatabaseName() {
 			return databaseName;
 		}
 
 		/**
 		 * The collection name the message originates from.
 		 *
-		 * @return
+		 * @return can be {@literal null}.
 		 */
-		@Nullable
-		public String getCollectionName() {
+		public @Nullable String getCollectionName() {
 			return collectionName;
 		}
 
@@ -103,7 +109,7 @@ public static MessageProperties empty() {
 
 		/**
 		 * Obtain a shiny new {@link MessagePropertiesBuilder} and start defining options in this fancy fluent way. Just
-		 * don't forget to call {@link MessagePropertiesBuilder#build() build()} when your're done.
+		 * don't forget to call {@link MessagePropertiesBuilder#build() build()} when done.
 		 *
 		 * @return new instance of {@link MessagePropertiesBuilder}.
 		 */
@@ -111,6 +117,34 @@ public static MessagePropertiesBuilder builder() {
 			return new MessagePropertiesBuilder();
 		}
 
+		@Override
+		public boolean equals(@Nullable Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+
+			MessageProperties that = (MessageProperties) o;
+
+			if (!ObjectUtils.nullSafeEquals(this.databaseName, that.databaseName)) {
+				return false;
+			}
+
+			return ObjectUtils.nullSafeEquals(this.collectionName, that.collectionName);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(databaseName);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(collectionName);
+			return result;
+		}
+
+		public String toString() {
+			return "Message.MessageProperties(databaseName=" + this.getDatabaseName() + ", collectionName="
+					+ this.getCollectionName() + ")";
+		}
+
 		/**
 		 * Builder for {@link MessageProperties}.
 		 *
@@ -126,9 +160,10 @@ public static class MessagePropertiesBuilder {
 			 * @param dbName must not be {@literal null}.
 			 * @return this.
 			 */
+			@Contract("_ -> this")
 			public MessagePropertiesBuilder databaseName(String dbName) {
 
-				Assert.notNull(dbName, "Database name must not be null!");
+				Assert.notNull(dbName, "Database name must not be null");
 
 				this.databaseName = dbName;
 				return this;
@@ -138,9 +173,10 @@ public MessagePropertiesBuilder databaseName(String dbName) {
 			 * @param collectionName must not be {@literal null}.
 			 * @return this
 			 */
+			@Contract("_ -> this")
 			public MessagePropertiesBuilder collectionName(String collectionName) {
 
-				Assert.notNull(collectionName, "Collection name must not be null!");
+				Assert.notNull(collectionName, "Collection name must not be null");
 
 				this.collectionName = collectionName;
 				return this;
@@ -149,6 +185,7 @@ public MessagePropertiesBuilder collectionName(String collectionName) {
 			/**
 			 * @return the built {@link MessageProperties}.
 			 */
+			@Contract("-> new")
 			public MessageProperties build() {
 
 				MessageProperties properties = new MessageProperties();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListener.java
index 8587563ffa..e23b6f39dc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListenerContainer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListenerContainer.java
index 0c6492a773..5d244fb171 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListenerContainer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/MessageListenerContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,8 +50,8 @@ static MessageListenerContainer create(MongoTemplate template) {
 	 * <code>
 	 *     MessageListenerContainer container = ...
 	 *
-	 *     MessageListener<ChangeStreamDocument<Document>, Object> messageListener = (message) -> message....
-	 *     ChangeStreamRequest<Object> request = new ChangeStreamRequest<>(messageListener, () -> "collection-name");
+	 *     MessageListener&lt;ChangeStreamDocument&lt;Document&gt;, Object&gt; messageListener = (message) -&gt; message....
+	 *     ChangeStreamRequest&lt;Object&gt; request = new ChangeStreamRequest&lt;&gt;(messageListener, () -&gt; "collection-name");
 	 *
 	 *     Subscription subscription = container.register(request);
 	 * </code>
@@ -75,8 +75,8 @@ default <T> Subscription register(SubscriptionRequest<T, Object, ? extends Reque
 	 * <code>
 	 *     MessageListenerContainer container = ...
 	 *
-	 *     MessageListener<ChangeStreamDocument<Document>, Document> messageListener = (message) -> message.getBody().toJson();
-	 *     ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(messageListener, () -> "collection-name");
+	 *     MessageListener&lt;ChangeStreamDocument&lt;Document&gt;, Document&gt; messageListener = (message) -&gt; message.getBody().toJson();
+	 *     ChangeStreamRequest&lt;Document&gt; request = new ChangeStreamRequest&lt;&gt;(messageListener, () -&gt; "collection-name");
 	 *
 	 *     Subscription subscription = container.register(request, Document.class);
 	 * </code>
@@ -84,17 +84,17 @@ default <T> Subscription register(SubscriptionRequest<T, Object, ? extends Reque
 	 *
 	 * On {@link MessageListenerContainer#stop()} all {@link Subscription subscriptions} are cancelled prior to shutting
 	 * down the container itself.
-	 * <p />
+	 * <br />
 	 * Registering the very same {@link SubscriptionRequest} more than once simply returns the already existing
 	 * {@link Subscription}.
-	 * <p />
+	 * <br />
 	 * Unless a {@link Subscription} is {@link #remove(Subscription) removed} form the container, the {@link Subscription}
 	 * is restarted once the container itself is restarted.
-	 * <p />
+	 * <br />
 	 * Errors during {@link Message} retrieval lead to {@link Subscription#cancel() cannelation} of the underlying task.
 	 *
 	 * @param request must not be {@literal null}.
-	 * @param type the exact target or a more concrete type of the {@link Message#getBody()}.
+	 * @param bodyType the exact target or a more concrete type of the {@link Message#getBody()}.
 	 * @return never {@literal null}.
 	 */
 	<S, T> Subscription register(SubscriptionRequest<S, ? super T, ? extends RequestOptions> request, Class<T> bodyType);
@@ -108,8 +108,8 @@ default <T> Subscription register(SubscriptionRequest<T, Object, ? extends Reque
 	 * <code>
 	 *     MessageListenerContainer container = ...
 	 *
-	 *     MessageListener<ChangeStreamDocument<Document>, Document> messageListener = (message) -> message.getBody().toJson();
-	 *     ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(messageListener, () -> "collection-name");
+	 *     MessageListener&lt;ChangeStreamDocument&lt;Document&gt;, Document&gt; messageListener = (message) -&gt; message.getBody().toJson();
+	 *     ChangeStreamRequest&lt;Document&gt; request = new ChangeStreamRequest&lt;&gt;(messageListener, () -&gt; "collection-name");
 	 *
 	 *     Subscription subscription = container.register(request, Document.class);
 	 * </code>
@@ -117,17 +117,17 @@ default <T> Subscription register(SubscriptionRequest<T, Object, ? extends Reque
 	 *
 	 * On {@link MessageListenerContainer#stop()} all {@link Subscription subscriptions} are cancelled prior to shutting
 	 * down the container itself.
-	 * <p />
+	 * <br />
 	 * Registering the very same {@link SubscriptionRequest} more than once simply returns the already existing
 	 * {@link Subscription}.
-	 * <p />
+	 * <br />
 	 * Unless a {@link Subscription} is {@link #remove(Subscription) removed} form the container, the {@link Subscription}
 	 * is restarted once the container itself is restarted.
-	 * <p />
+	 * <br />
 	 * Errors during {@link Message} retrieval are delegated to the given {@link ErrorHandler}.
 	 *
 	 * @param request must not be {@literal null}.
-	 * @param type the exact target or a more concrete type of the {@link Message#getBody()}. Must not be {@literal null}.
+	 * @param bodyType the exact target or a more concrete type of the {@link Message#getBody()}. Must not be {@literal null}.
 	 * @param errorHandler the callback to invoke when retrieving the {@link Message} from the data source fails for some
 	 *          reason.
 	 * @return never {@literal null}.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java
index 636ee804de..acb7bfd8a2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SimpleMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,11 +15,9 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Trivial {@link Message} implementation.
@@ -27,8 +25,6 @@
  * @author Christoph Strobl
  * @since 2.1
  */
-@EqualsAndHashCode
-@ToString
 class SimpleMessage<S, T> implements Message<S, T> {
 
 	private @Nullable final S raw;
@@ -42,37 +38,56 @@ class SimpleMessage<S, T> implements Message<S, T> {
 	 */
 	SimpleMessage(@Nullable S raw, @Nullable T body, MessageProperties properties) {
 
-		Assert.notNull(properties, "Properties must not be null! Use MessageProperties.empty() instead.");
+		Assert.notNull(properties, "Properties must not be null Use MessageProperties.empty() instead");
 
 		this.raw = raw;
 		this.body = body;
 		this.properties = properties;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Message#getRaw()
-	 */
 	@Override
-	public S getRaw() {
+	public @Nullable S getRaw() {
 		return raw;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Message#getBody()
-	 */
 	@Override
-	public T getBody() {
+	public @Nullable T getBody() {
 		return body;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.Message#getProperties()
-	 */
 	@Override
 	public MessageProperties getProperties() {
 		return properties;
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		SimpleMessage<?, ?> that = (SimpleMessage<?, ?>) o;
+
+		if (!ObjectUtils.nullSafeEquals(this.raw, that.raw)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(this.body, that.body)) {
+			return false;
+		}
+		return ObjectUtils.nullSafeEquals(this.properties, that.properties);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = ObjectUtils.nullSafeHashCode(raw);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(body);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(properties);
+		return result;
+	}
+
+	public String toString() {
+		return "SimpleMessage(raw=" + this.getRaw() + ", body=" + this.getBody() + ", properties=" + this.getProperties()
+				+ ")";
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Subscription.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Subscription.java
index e24a108956..5e928fe49d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Subscription.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Subscription.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,10 +19,10 @@
 
 /**
  * The {@link Subscription} is the link between the {@link SubscriptionRequest} and the actual running {@link Task}.
- * <p />
+ * <br />
  * Due to the asynchronous nature of the {@link Task} execution a {@link Subscription} might not immediately become
  * active. {@link #isActive()} provides an answer if the underlying {@link Task} is already running.
- * <p />
+ * <br />
  *
  * @author Christoph Strobl
  * @author Mark Paluch
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SubscriptionRequest.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SubscriptionRequest.java
index 8ee910e118..7b914f16f5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SubscriptionRequest.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/SubscriptionRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,11 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
-import org.springframework.data.mongodb.MongoDbFactory;
+import java.time.Duration;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -57,10 +59,9 @@ interface RequestOptions {
 		 * Get the database name of the db.
 		 *
 		 * @return the name of the database to subscribe to. Can be {@literal null} in which case the default
-		 *         {@link MongoDbFactory#getDb() database} is used.
+		 *         {@link MongoDatabaseFactory#getMongoDatabase() database} is used.
 		 */
-		@Nullable
-		default String getDatabaseName() {
+		default @Nullable String getDatabaseName() {
 			return null;
 		}
 
@@ -72,6 +73,16 @@ default String getDatabaseName() {
 		@Nullable
 		String getCollectionName();
 
+		/**
+		 * Get the maximum wait time (the time till the next Document is emitted) to apply when reading from the collection.
+		 *
+		 * @return never {@literal null}. {@link Duration#ZERO} by default.
+		 * @since 3.0
+		 */
+		default Duration maxAwaitTime() {
+			return Duration.ZERO;
+		}
+
 		/**
 		 * Create empty options.
 		 *
@@ -89,12 +100,12 @@ static RequestOptions none() {
 		 */
 		static RequestOptions justDatabase(String database) {
 
-			Assert.notNull(database, "Database must not be null!");
+			Assert.notNull(database, "Database must not be null");
 
 			return new RequestOptions() {
 
 				@Override
-				public String getCollectionName() {
+				public @Nullable String getCollectionName() {
 					return null;
 				}
 
@@ -113,7 +124,7 @@ public String getDatabaseName() {
 		 */
 		static RequestOptions justCollection(String collection) {
 
-			Assert.notNull(collection, "Collection must not be null!");
+			Assert.notNull(collection, "Collection must not be null");
 			return () -> collection;
 		}
 
@@ -126,8 +137,8 @@ static RequestOptions justCollection(String collection) {
 		 */
 		static RequestOptions of(String database, String collection) {
 
-			Assert.notNull(database, "Database must not be null!");
-			Assert.notNull(collection, "Collection must not be null!");
+			Assert.notNull(database, "Database must not be null");
+			Assert.notNull(collection, "Collection must not be null");
 
 			return new RequestOptions() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java
index c81bad6c16..92e23ff847 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,23 +18,24 @@
 import java.util.Optional;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
 import org.springframework.data.mongodb.core.messaging.TailableCursorRequest.TailableCursorRequestOptions.TailableCursorRequestOptionsBuilder;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
  * {@link SubscriptionRequest} implementation to be used to listen to query results in a
  * <a href="https://docs.mongodb.com/manual/core/capped-collections/">Capped Collection</a> using a
  * <a href="https://docs.mongodb.com/manual/core/tailable-cursors/">Tailable Cursor</a>.
- * <p />
+ * <br />
  * The most trivial use case is subscribing to all events of a specific {@link com.mongodb.client.MongoCollection
  * collection}.
  *
  * <pre>
  * <code>
- *     TailableCursorRequest<Document> request = new TailableCursorRequest<>(System.out::println, () -> "collection-name");
+ *     TailableCursorRequest&lt;Document&gt; request = new TailableCursorRequest&lt;&gt;(System.out::println, () -> "collection-name");
  * </code>
  * </pre>
  *
@@ -43,7 +44,7 @@
  *
  * <pre>
  *   <code>
- *       TailableCursorRequest<Document> request = TailableCursorRequest.builder()
+ *       TailableCursorRequest&lt;Document&gt; request = TailableCursorRequest.builder()
  *           .collection("collection-name")
  *           .publishTo(System.out::println)
  *           .build();
@@ -68,27 +69,19 @@ public class TailableCursorRequest<T> implements SubscriptionRequest<Document, T
 	 */
 	public TailableCursorRequest(MessageListener<Document, ? super T> messageListener, RequestOptions options) {
 
-		Assert.notNull(messageListener, "MessageListener must not be null!");
-		Assert.notNull(options, "Options must not be null!");
+		Assert.notNull(messageListener, "MessageListener must not be null");
+		Assert.notNull(options, "Options must not be null");
 
 		this.messageListener = messageListener;
-		this.options = options instanceof TailableCursorRequestOptions ? (TailableCursorRequestOptions) options
-				: TailableCursorRequestOptions.of(options);
+		this.options = options instanceof TailableCursorRequestOptions tailableCursorRequestOptions ?
+				tailableCursorRequestOptions : TailableCursorRequestOptions.of(options);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getMessageListener()
-	 */
 	@Override
 	public MessageListener<Document, ? super T> getMessageListener() {
 		return messageListener;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.monitor.SubscriptionRequest#getRequestOptions()
-	 */
 	@Override
 	public TailableCursorRequestOptions getRequestOptions() {
 		return options;
@@ -96,7 +89,7 @@ public TailableCursorRequestOptions getRequestOptions() {
 
 	/**
 	 * Obtain a shiny new {@link TailableCursorRequestBuilder} and start defining options in this fancy fluent way. Just
-	 * don't forget to call {@link TailableCursorRequestBuilder#build() build()} when your're done.
+	 * don't forget to call {@link TailableCursorRequestBuilder#build() build()} when done.
 	 *
 	 * @return new instance of {@link TailableCursorRequestBuilder}.
 	 */
@@ -106,7 +99,7 @@ public static TailableCursorRequestBuilder builder() {
 
 	/**
 	 * Obtain a shiny new {@link TailableCursorRequestBuilder} and start defining options in this fancy fluent way. Just
-	 * don't forget to call {@link TailableCursorRequestBuilder#build() build()} when your're done.
+	 * don't forget to call {@link TailableCursorRequestBuilder#build() build()} when done.
 	 *
 	 * @return new instance of {@link TailableCursorRequestBuilder}.
 	 */
@@ -129,13 +122,14 @@ public static class TailableCursorRequestOptions implements SubscriptionRequest.
 
 		TailableCursorRequestOptions() {}
 
+		@SuppressWarnings("NullAway")
 		public static TailableCursorRequestOptions of(RequestOptions options) {
 			return builder().collection(options.getCollectionName()).build();
 		}
 
 		/**
 		 * Obtain a shiny new {@link TailableCursorRequestOptionsBuilder} and start defining options in this fancy fluent
-		 * way. Just don't forget to call {@link TailableCursorRequestOptionsBuilder#build() build()} when your're done.
+		 * way. Just don't forget to call {@link TailableCursorRequestOptionsBuilder#build() build()} when done.
 		 *
 		 * @return new instance of {@link TailableCursorRequestOptionsBuilder}.
 		 */
@@ -144,7 +138,7 @@ public static TailableCursorRequestOptionsBuilder builder() {
 		}
 
 		@Override
-		public String getCollectionName() {
+		public @Nullable String getCollectionName() {
 			return collectionName;
 		}
 
@@ -171,9 +165,10 @@ private TailableCursorRequestOptionsBuilder() {}
 			 * @param collection must not be {@literal null} nor {@literal empty}.
 			 * @return this.
 			 */
+			@Contract("_ -> this")
 			public TailableCursorRequestOptionsBuilder collection(String collection) {
 
-				Assert.hasText(collection, "Collection must not be null nor empty!");
+				Assert.hasText(collection, "Collection must not be null nor empty");
 
 				this.collectionName = collection;
 				return this;
@@ -185,9 +180,10 @@ public TailableCursorRequestOptionsBuilder collection(String collection) {
 			 * @param filter the {@link Query } to apply for filtering events. Must not be {@literal null}.
 			 * @return this.
 			 */
+			@Contract("_ -> this")
 			public TailableCursorRequestOptionsBuilder filter(Query filter) {
 
-				Assert.notNull(filter, "Filter must not be null!");
+				Assert.notNull(filter, "Filter must not be null");
 
 				this.query = filter;
 				return this;
@@ -196,6 +192,7 @@ public TailableCursorRequestOptionsBuilder filter(Query filter) {
 			/**
 			 * @return the built {@link TailableCursorRequestOptions}.
 			 */
+			@Contract("-> new")
 			public TailableCursorRequestOptions build() {
 
 				TailableCursorRequestOptions options = new TailableCursorRequestOptions();
@@ -228,9 +225,10 @@ private TailableCursorRequestBuilder() {}
 		 * @param collectionName must not be {@literal null} nor empty.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public TailableCursorRequestBuilder<T> collection(String collectionName) {
 
-			Assert.hasText(collectionName, "CollectionName must not be null!");
+			Assert.hasText(collectionName, "CollectionName must not be null");
 
 			delegate.collection(collectionName);
 			return this;
@@ -242,9 +240,10 @@ public TailableCursorRequestBuilder<T> collection(String collectionName) {
 		 * @param messageListener must not be {@literal null}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public TailableCursorRequestBuilder<T> publishTo(MessageListener<Document, ? super T> messageListener) {
 
-			Assert.notNull(messageListener, "MessageListener must not be null!");
+			Assert.notNull(messageListener, "MessageListener must not be null");
 
 			this.listener = messageListener;
 			return this;
@@ -256,9 +255,10 @@ public TailableCursorRequestBuilder<T> publishTo(MessageListener<Document, ? sup
 		 * @param filter the {@link Query } to apply for filtering events. Must not be {@literal null}.
 		 * @return this.
 		 */
+		@Contract("_ -> this")
 		public TailableCursorRequestBuilder<T> filter(Query filter) {
 
-			Assert.notNull(filter, "Filter must not be null!");
+			Assert.notNull(filter, "Filter must not be null");
 
 			delegate.filter(filter);
 			return this;
@@ -267,9 +267,10 @@ public TailableCursorRequestBuilder<T> filter(Query filter) {
 		/**
 		 * @return the build {@link ChangeStreamRequest}.
 		 */
+		@Contract("_ -> new")
 		public TailableCursorRequest<T> build() {
 
-			Assert.notNull(listener, "MessageListener must not be null!");
+			Assert.notNull(listener, "MessageListener must not be null");
 
 			return new TailableCursorRequest<>(listener, delegate.build());
 		}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java
index 7eecc79fdb..43bd7bd55d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TailableCursorTask.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,11 +15,12 @@
  */
 package org.springframework.data.mongodb.core.messaging;
 
+import java.util.concurrent.TimeUnit;
+
 import org.bson.Document;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
-import org.springframework.data.mongodb.core.messaging.TailableCursorRequest.TailableCursorRequestOptions;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.util.ErrorHandler;
 
@@ -43,19 +44,14 @@ public TailableCursorTask(MongoTemplate template, TailableCursorRequest<?> reque
 		queryMapper = new QueryMapper(template.getConverter());
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.messaging.CursorReadingTask#initCursor(org.springframework.data.mongodb.core.MongoTemplate, org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions, java.lang.Class)
-	 */
 	@Override
 	protected MongoCursor<Document> initCursor(MongoTemplate template, RequestOptions options, Class<?> targetType) {
 
 		Document filter = new Document();
 		Collation collation = null;
 
-		if (options instanceof TailableCursorRequest.TailableCursorRequestOptions) {
+		if (options instanceof TailableCursorRequest.TailableCursorRequestOptions requestOptions) {
 
-			TailableCursorRequestOptions requestOptions = (TailableCursorRequestOptions) options;
 			if (requestOptions.getQuery().isPresent()) {
 
 				Query query = requestOptions.getQuery().get();
@@ -75,6 +71,10 @@ protected MongoCursor<Document> initCursor(MongoTemplate template, RequestOption
 			iterable = iterable.collation(collation);
 		}
 
+		if (!options.maxAwaitTime().isZero()) {
+			iterable = iterable.maxAwaitTime(options.maxAwaitTime().toMillis(), TimeUnit.MILLISECONDS);
+		}
+
 		return iterable.iterator();
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Task.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Task.java
index c61d0decca..e8b9c018b1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Task.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/Task.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,6 +57,6 @@ default boolean isActive() {
 	 * @since 2.1
 	 */
 	enum State {
-		CREATED, STARTING, RUNNING, CANCELLED;
+		CREATED, STARTING, RUNNING, CANCELLED
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TaskFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TaskFactory.java
index 9d6b1782ab..0bfaa1c574 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TaskFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/TaskFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,16 +28,16 @@
  */
 class TaskFactory {
 
-	private final MongoTemplate tempate;
+	private final MongoTemplate template;
 
 	/**
 	 * @param template must not be {@literal null}.
 	 */
 	TaskFactory(MongoTemplate template) {
 
-		Assert.notNull(template, "Template must not be null!");
+		Assert.notNull(template, "Template must not be null");
 
-		this.tempate = template;
+		this.template = template;
 	}
 
 	/**
@@ -52,16 +52,16 @@ class TaskFactory {
 	<S, T> Task forRequest(SubscriptionRequest<S, ? super T, ? extends RequestOptions> request, Class<T> targetType,
 			ErrorHandler errorHandler) {
 
-		Assert.notNull(request, "Request must not be null!");
-		Assert.notNull(targetType, "TargetType must not be null!");
+		Assert.notNull(request, "Request must not be null");
+		Assert.notNull(targetType, "TargetType must not be null");
 
-		if (request instanceof ChangeStreamRequest) {
-			return new ChangeStreamTask(tempate, (ChangeStreamRequest) request, targetType, errorHandler);
-		} else if (request instanceof TailableCursorRequest) {
-			return new TailableCursorTask(tempate, (TailableCursorRequest) request, targetType, errorHandler);
+		if (request instanceof ChangeStreamRequest changeStreamRequest) {
+			return new ChangeStreamTask(template, changeStreamRequest, targetType, errorHandler);
+		} else if (request instanceof TailableCursorRequest tailableCursorRequest) {
+			return new TailableCursorTask(template, tailableCursorRequest, targetType, errorHandler);
 		}
 
 		throw new IllegalArgumentException(
-				"oh wow - seems you're using some fancy new feature we do not support. Please be so kind and leave us a note in the issue tracker so we can get this fixed.\nThank you!");
+				"oh wow - seems you're using some fancy new feature we do not support; Please be so kind and leave us a note in the issue tracker so we can get this fixed\nThank you");
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/package-info.java
index 35be8f2ef8..aa879cc3c3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/package-info.java
@@ -2,5 +2,5 @@
  * MongoDB specific messaging support for listening to eg.
  * <a href="https://docs.mongodb.com/manual/changeStreams/">Change Streams</a>.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.messaging;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/package-info.java
index e2f9169d0d..cae1d3df48 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/package-info.java
@@ -1,6 +1,6 @@
 /**
  * MongoDB core support.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java
index 65f23e3037..fd81030275 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,8 @@
 import static org.springframework.util.ObjectUtils.*;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
 /**
@@ -73,7 +74,7 @@ public BasicQuery(@Nullable String query, @Nullable String fields) {
 	 *
 	 * @param queryObject must not be {@literal null}.
 	 * @param fieldsObject must not be {@literal null}.
-	 * @throws IllegalArgumentException when {@code sortObject} or {@code fieldsObject} is {@literal null}.
+	 * @throws IllegalArgumentException when {@code queryObject} or {@code fieldsObject} is {@literal null}.
 	 */
 	public BasicQuery(Document queryObject, Document fieldsObject) {
 
@@ -85,11 +86,24 @@ public BasicQuery(Document queryObject, Document fieldsObject) {
 		this.sortObject = new Document();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#addCriteria(org.springframework.data.mongodb.core.query.CriteriaDefinition)
+	/**
+	 * Create a BasicQuery given a {@link Query}. The resulting query is a copy of {@link Query}.
+	 *
+	 * @param query the query to copy.
+	 * @since 4.4
 	 */
+	@SuppressWarnings("NullAway")
+	public BasicQuery(Query query) {
+
+		super(query);
+		this.queryObject = query.getQueryObject();
+		this.setFieldsObject(query.getFieldsObject());
+		this.setSortObject(query.getSortObject());
+		this.setMeta(query.getMeta());
+	}
+
 	@Override
+	@Contract("_ -> this")
 	public Query addCriteria(CriteriaDefinition criteria) {
 
 		this.queryObject.putAll(criteria.getCriteriaObject());
@@ -97,19 +111,11 @@ public Query addCriteria(CriteriaDefinition criteria) {
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#getQueryObject()
-	 */
 	@Override
 	public Document getQueryObject() {
 		return this.queryObject;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#getFieldsObject()
-	 */
 	@Override
 	public Document getFieldsObject() {
 
@@ -119,10 +125,6 @@ public Document getFieldsObject() {
 		return combinedFieldsObject;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#getSortObject()
-	 */
 	@Override
 	public Document getSortObject() {
 
@@ -148,10 +150,6 @@ public void setSortObject(Document sortObject) {
 		this.sortObject = sortObject;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#isSorted()
-	 */
 	@Override
 	public boolean isSorted() {
 		return super.isSorted() || !sortObject.isEmpty();
@@ -164,40 +162,30 @@ public boolean isSorted() {
 	 * @throws IllegalArgumentException when {@code fieldsObject} is {@literal null}.
 	 * @since 1.6
 	 */
-	protected void setFieldsObject(Document fieldsObject) {
+	public void setFieldsObject(Document fieldsObject) {
 
-		Assert.notNull(sortObject, "Field document must not be null");
+		Assert.notNull(fieldsObject, "Field document must not be null");
 
 		this.fieldsObject = fieldsObject;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
 
 		if (this == o) {
 			return true;
 		}
 
-		if (!(o instanceof BasicQuery)) {
+		if (!(o instanceof BasicQuery that)) {
 			return false;
 		}
 
-		BasicQuery that = (BasicQuery) o;
-
 		return querySettingsEquals(that) && //
 				nullSafeEquals(fieldsObject, that.fieldsObject) && //
 				nullSafeEquals(queryObject, that.queryObject) && //
 				nullSafeEquals(sortObject, that.sortObject);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicUpdate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicUpdate.java
index 1f33041450..3d89f1e1b7 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicUpdate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/BasicUpdate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,17 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
+import org.springframework.util.ClassUtils;
 
 /**
  * @author Thomas Risberg
@@ -29,85 +36,126 @@
  */
 public class BasicUpdate extends Update {
 
-	private Document updateObject;
+	private final Document updateObject;
 
 	public BasicUpdate(String updateString) {
-		super();
-		this.updateObject = Document.parse(updateString);
+		this(Document.parse(updateString));
 	}
 
 	public BasicUpdate(Document updateObject) {
-		super();
 		this.updateObject = updateObject;
 	}
 
 	@Override
-	public Update set(String key, Object value) {
-		updateObject.put("$set", Collections.singletonMap(key, value));
+	@Contract("_, _ -> this")
+	public Update set(String key, @Nullable Object value) {
+		setOperationValue("$set", key, value);
 		return this;
 	}
 
 	@Override
+	@Contract("_ -> this")
 	public Update unset(String key) {
-		updateObject.put("$unset", Collections.singletonMap(key, 1));
+		setOperationValue("$unset", key, 1);
 		return this;
 	}
 
 	@Override
+	@Contract("_, _ -> this")
 	public Update inc(String key, Number inc) {
-		updateObject.put("$inc", Collections.singletonMap(key, inc));
+		setOperationValue("$inc", key, inc);
 		return this;
 	}
 
 	@Override
-	public Update push(String key, Object value) {
-		updateObject.put("$push", Collections.singletonMap(key, value));
+	@Contract("_, _ -> this")
+	public Update push(String key, @Nullable Object value) {
+		setOperationValue("$push", key, value);
 		return this;
 	}
 
 	@Override
-	public Update pushAll(String key, Object[] values) {
-		Document keyValue = new Document();
-		keyValue.put(key, values);
-		updateObject.put("$pushAll", keyValue);
-		return this;
-	}
-
-	@Override
-	public Update addToSet(String key, Object value) {
-		updateObject.put("$addToSet", Collections.singletonMap(key, value));
+	@Contract("_, _ -> this")
+	public Update addToSet(String key, @Nullable Object value) {
+		setOperationValue("$addToSet", key, value);
 		return this;
 	}
 
 	@Override
+	@Contract("_, _ -> this")
 	public Update pop(String key, Position pos) {
-		updateObject.put("$pop", Collections.singletonMap(key, (pos == Position.FIRST ? -1 : 1)));
+		setOperationValue("$pop", key, (pos == Position.FIRST ? -1 : 1));
 		return this;
 	}
 
 	@Override
-	public Update pull(String key, Object value) {
-		updateObject.put("$pull", Collections.singletonMap(key, value));
+	@Contract("_, _ -> this")
+	public Update pull(String key, @Nullable Object value) {
+		setOperationValue("$pull", key, value);
 		return this;
 	}
 
 	@Override
+	@Contract("_, _ -> this")
 	public Update pullAll(String key, Object[] values) {
-		Document keyValue = new Document();
-		keyValue.put(key, Arrays.copyOf(values, values.length));
-		updateObject.put("$pullAll", keyValue);
+		setOperationValue("$pullAll", key, List.of(values), (o, o2) -> {
+
+			if (o instanceof List<?> prev && o2 instanceof List<?> currentValue) {
+				List<Object> merged = new ArrayList<>(prev.size() + currentValue.size());
+				merged.addAll(prev);
+				merged.addAll(currentValue);
+				return merged;
+			}
+
+			return o2;
+		});
 		return this;
 	}
 
 	@Override
+	@Contract("_, _ -> this")
 	public Update rename(String oldName, String newName) {
-		updateObject.put("$rename", Collections.singletonMap(oldName, newName));
+		setOperationValue("$rename", oldName, newName);
 		return this;
 	}
 
+	@Override
+	public boolean modifies(String key) {
+		return super.modifies(key) || Update.fromDocument(getUpdateObject()).modifies(key);
+	}
+
 	@Override
 	public Document getUpdateObject() {
 		return updateObject;
 	}
 
+	void setOperationValue(String operator, String key, @Nullable Object value) {
+		setOperationValue(operator, key, value, (o, o2) -> o2);
+	}
+
+	void setOperationValue(String operator, String key, @Nullable Object value,
+			BiFunction<Object, Object, Object> mergeFunction) {
+
+		if (!updateObject.containsKey(operator)) {
+			updateObject.put(operator, Collections.singletonMap(key, value));
+		} else {
+			Object o = updateObject.get(operator);
+			if (o instanceof Map<?, ?> existing) {
+				Map<Object, Object> target = new LinkedHashMap<>(existing);
+
+				if (target.containsKey(key)) {
+					target.put(key, mergeFunction.apply(target.get(key), value));
+				} else {
+					target.put(key, value);
+				}
+				updateObject.put(operator, target);
+			} else {
+				throw new IllegalStateException(
+						"Cannot add ['%s' : { '%s' : ... }]. Operator already exists with value of type [%s] which is not suitable for appending"
+								.formatted(operator, key,
+										o != null ? ClassUtils.getShortName(o.getClass()) : "null"));
+			}
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Collation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Collation.java
index c7a9a51fe4..217e669883 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Collation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Collation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,13 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import lombok.AccessLevel;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 import java.util.Locale;
 import java.util.Optional;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -38,7 +35,7 @@
  * Central abstraction for MongoDB collation support. <br />
  * Allows fluent creation of a collation {@link Document} that can be used for creating collections & indexes as well as
  * querying data.
- * <p/>
+ * <br />
  * <strong>NOTE:</strong> Please keep in mind that queries will only make use of an index with collation settings if the
  * query itself specifies the same collation.
  *
@@ -63,7 +60,7 @@ public class Collation {
 
 	private Collation(CollationLocale locale) {
 
-		Assert.notNull(locale, "ICULocale must not be null!");
+		Assert.notNull(locale, "ICULocale must not be null");
 		this.locale = locale;
 	}
 
@@ -81,11 +78,11 @@ public static Collation simple() {
 	 * {@link java.util.Locale#getVariant()}.
 	 *
 	 * @param locale must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Collation}.
 	 */
 	public static Collation of(Locale locale) {
 
-		Assert.notNull(locale, "Locale must not be null!");
+		Assert.notNull(locale, "Locale must not be null");
 
 		String format;
 
@@ -102,7 +99,7 @@ public static Collation of(Locale locale) {
 	 * Create new {@link Collation} with locale set to the given ICU language.
 	 *
 	 * @param language must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Collation}.
 	 */
 	public static Collation of(String language) {
 		return of(CollationLocale.of(language));
@@ -112,7 +109,7 @@ public static Collation of(String language) {
 	 * Create new {@link Collation} with locale set to the given {@link CollationLocale}.
 	 *
 	 * @param locale must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Collation}.
 	 */
 	public static Collation of(CollationLocale locale) {
 		return new Collation(locale);
@@ -129,9 +126,9 @@ public static Collation of(CollationLocale locale) {
 	 */
 	public static Collation parse(String collation) {
 
-		Assert.notNull(collation, "Collation must not be null!");
+		Assert.notNull(collation, "Collation must not be null");
 
-		return StringUtils.trimLeadingWhitespace(collation).startsWith("{") ? from(Document.parse(collation))
+		return collation.stripLeading().startsWith("{") ? from(Document.parse(collation))
 				: of(collation);
 	}
 
@@ -139,13 +136,13 @@ public static Collation parse(String collation) {
 	 * Create new {@link Collation} from values in {@link Document}.
 	 *
 	 * @param source must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Collation}.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/collation/#collation-document">MongoDB Reference -
 	 *      Collation Document</a>
 	 */
 	public static Collation from(Document source) {
 
-		Assert.notNull(source, "Source must not be null!");
+		Assert.notNull(source, "Source must not be null");
 
 		Collation collation = Collation.of(source.getString("locale"));
 		if (source.containsKey("strength")) {
@@ -181,9 +178,10 @@ public static Collation from(Document source) {
 	/**
 	 * Set the level of comparison to perform.
 	 *
-	 * @param strength
+	 * @param strength comparison level.
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation strength(int strength) {
 
 		ComparisonLevel current = this.strength.orElseGet(() -> new ICUComparisonLevel(strength));
@@ -196,6 +194,7 @@ public Collation strength(int strength) {
 	 * @param comparisonLevel must not be {@literal null}.
 	 * @return new {@link Collation}
 	 */
+	@Contract("_ -> new")
 	public Collation strength(ComparisonLevel comparisonLevel) {
 
 		Collation newInstance = copy();
@@ -206,9 +205,10 @@ public Collation strength(ComparisonLevel comparisonLevel) {
 	/**
 	 * Set whether to include {@code caseLevel} comparison. <br />
 	 *
-	 * @param caseLevel
+	 * @param caseLevel use {@literal true} to enable {@code caseLevel} comparison.
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation caseLevel(boolean caseLevel) {
 
 		ComparisonLevel strengthValue = strength.orElseGet(ComparisonLevel::primary);
@@ -220,8 +220,9 @@ public Collation caseLevel(boolean caseLevel) {
 	 * Set the flag that determines sort order of case differences during tertiary level comparisons.
 	 *
 	 * @param caseFirst must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation caseFirst(String caseFirst) {
 		return caseFirst(new CaseFirst(caseFirst));
 	}
@@ -229,9 +230,10 @@ public Collation caseFirst(String caseFirst) {
 	/**
 	 * Set the flag that determines sort order of case differences during tertiary level comparisons.
 	 *
-	 * @param caseFirst must not be {@literal null}.
-	 * @return
+	 * @param sort must not be {@literal null}.
+	 * @return new instance of {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation caseFirst(CaseFirst sort) {
 
 		ComparisonLevel strengthValue = strength.orElseGet(ComparisonLevel::tertiary);
@@ -243,6 +245,7 @@ public Collation caseFirst(CaseFirst sort) {
 	 *
 	 * @return new {@link Collation}.
 	 */
+	@Contract("-> new")
 	public Collation numericOrderingEnabled() {
 		return numericOrdering(true);
 	}
@@ -252,6 +255,7 @@ public Collation numericOrderingEnabled() {
 	 *
 	 * @return new {@link Collation}.
 	 */
+	@Contract("-> new")
 	public Collation numericOrderingDisabled() {
 		return numericOrdering(false);
 	}
@@ -261,6 +265,7 @@ public Collation numericOrderingDisabled() {
 	 *
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation numericOrdering(boolean flag) {
 
 		Collation newInstance = copy();
@@ -275,6 +280,7 @@ public Collation numericOrdering(boolean flag) {
 	 * @param alternate must not be {@literal null}.
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation alternate(String alternate) {
 
 		Alternate instance = this.alternate.orElseGet(() -> new Alternate(alternate, Optional.empty()));
@@ -288,6 +294,7 @@ public Collation alternate(String alternate) {
 	 * @param alternate must not be {@literal null}.
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation alternate(Alternate alternate) {
 
 		Collation newInstance = copy();
@@ -300,6 +307,7 @@ public Collation alternate(Alternate alternate) {
 	 *
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation backwardDiacriticSort() {
 		return backwards(true);
 	}
@@ -309,6 +317,7 @@ public Collation backwardDiacriticSort() {
 	 *
 	 * @return new {@link Collation}.
 	 */
+	@Contract("-> new")
 	public Collation forwardDiacriticSort() {
 		return backwards(false);
 	}
@@ -319,6 +328,7 @@ public Collation forwardDiacriticSort() {
 	 * @param backwards must not be {@literal null}.
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation backwards(boolean backwards) {
 
 		Collation newInstance = copy();
@@ -331,6 +341,7 @@ public Collation backwards(boolean backwards) {
 	 *
 	 * @return new {@link Collation}.
 	 */
+	@Contract("-> new")
 	public Collation normalizationEnabled() {
 		return normalization(true);
 	}
@@ -340,6 +351,7 @@ public Collation normalizationEnabled() {
 	 *
 	 * @return new {@link Collation}.
 	 */
+	@Contract("-> new")
 	public Collation normalizationDisabled() {
 		return normalization(false);
 	}
@@ -350,6 +362,7 @@ public Collation normalizationDisabled() {
 	 * @param normalization must not be {@literal null}.
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation normalization(boolean normalization) {
 
 		Collation newInstance = copy();
@@ -363,6 +376,7 @@ public Collation normalization(boolean normalization) {
 	 * @param maxVariable must not be {@literal null}.
 	 * @return new {@link Collation}.
 	 */
+	@Contract("_ -> new")
 	public Collation maxVariable(String maxVariable) {
 
 		Alternate alternateValue = alternate.orElseGet(Alternate::shifted);
@@ -372,8 +386,9 @@ public Collation maxVariable(String maxVariable) {
 	/**
 	 * Get the {@link Document} representation of the {@link Collation}.
 	 *
-	 * @return
+	 * @return the native MongoDB {@link Document} representation of the {@link Collation}.
 	 */
+	@SuppressWarnings("NullAway")
 	public Document toDocument() {
 		return map(toMongoDocumentConverter());
 	}
@@ -381,20 +396,20 @@ public Document toDocument() {
 	/**
 	 * Get the {@link com.mongodb.client.model.Collation} representation of the {@link Collation}.
 	 *
-	 * @return
+	 * @return he native MongoDB representation of the {@link Collation}.
 	 */
-	public com.mongodb.client.model.Collation toMongoCollation() {
+	public com.mongodb.client.model.@Nullable Collation toMongoCollation() {
 		return map(toMongoCollationConverter());
 	}
 
 	/**
 	 * Transform {@code this} {@link Collation} by applying a {@link Converter}.
 	 *
-	 * @param mapper
+	 * @param mapper must not be {@literal null}.
 	 * @param <R>
-	 * @return
+	 * @return the converted result.
 	 */
-	public <R> R map(Converter<? super Collation, ? extends R> mapper) {
+	public <R> @Nullable R map(Converter<? super Collation, ? extends R> mapper) {
 		return mapper.convert(this);
 	}
 
@@ -404,7 +419,7 @@ public String toString() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
+	public boolean equals(@Nullable Object o) {
 
 		if (this == o) {
 			return true;
@@ -515,8 +530,6 @@ default Optional<Boolean> getCaseLevel() {
 	 *
 	 * @since 2.0
 	 */
-	@AllArgsConstructor(access = AccessLevel.PACKAGE)
-	@Getter
 	static class ICUComparisonLevel implements ComparisonLevel {
 
 		private final int level;
@@ -526,6 +539,24 @@ static class ICUComparisonLevel implements ComparisonLevel {
 		ICUComparisonLevel(int level) {
 			this(level, Optional.empty(), Optional.empty());
 		}
+
+		ICUComparisonLevel(int level, Optional<CaseFirst> caseFirst, Optional<Boolean> caseLevel) {
+			this.level = level;
+			this.caseFirst = caseFirst;
+			this.caseLevel = caseLevel;
+		}
+
+		public int getLevel() {
+			return this.level;
+		}
+
+		public Optional<CaseFirst> getCaseFirst() {
+			return this.caseFirst;
+		}
+
+		public Optional<Boolean> getCaseLevel() {
+			return this.caseLevel;
+		}
 	}
 
 	/**
@@ -642,7 +673,7 @@ private TertiaryICUComparisonLevel(CaseFirst caseFirst) {
 		 */
 		public ComparisonLevel caseFirst(CaseFirst caseFirst) {
 
-			Assert.notNull(caseFirst, "CaseFirst must not be null!");
+			Assert.notNull(caseFirst, "CaseFirst must not be null");
 			return new TertiaryICUComparisonLevel(caseFirst);
 		}
 	}
@@ -650,7 +681,6 @@ public ComparisonLevel caseFirst(CaseFirst caseFirst) {
 	/**
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 	public static class CaseFirst {
 
 		private static final CaseFirst UPPER = new CaseFirst("upper");
@@ -659,6 +689,10 @@ public static class CaseFirst {
 
 		private final String state;
 
+		private CaseFirst(String state) {
+			this.state = state;
+		}
+
 		/**
 		 * Sort uppercase before lowercase.
 		 *
@@ -690,7 +724,6 @@ public static CaseFirst off() {
 	/**
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 	public static class Alternate {
 
 		private static final Alternate NON_IGNORABLE = new Alternate("non-ignorable", Optional.empty());
@@ -698,6 +731,11 @@ public static class Alternate {
 		final String alternate;
 		final Optional<String> maxVariable;
 
+		Alternate(String alternate, Optional<String> maxVariable) {
+			this.alternate = alternate;
+			this.maxVariable = maxVariable;
+		}
+
 		/**
 		 * Consider Whitespace and punctuation as base characters.
 		 *
@@ -761,21 +799,26 @@ public Alternate space() {
 	 * @see <a href="http://site.icu-project.org">ICU - International Components for Unicode</a>
 	 * @since 2.0
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 	public static class CollationLocale {
 
 		private final String language;
 		private final Optional<String> variant;
 
+		private CollationLocale(String language, Optional<String> variant) {
+
+			this.language = language;
+			this.variant = variant;
+		}
+
 		/**
 		 * Create new {@link CollationLocale} for given language.
 		 *
 		 * @param language must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link CollationLocale}.
 		 */
 		public static CollationLocale of(String language) {
 
-			Assert.notNull(language, "Code must not be null!");
+			Assert.notNull(language, "Code must not be null");
 			return new CollationLocale(language, Optional.empty());
 		}
 
@@ -787,14 +830,14 @@ public static CollationLocale of(String language) {
 		 */
 		public CollationLocale variant(String variant) {
 
-			Assert.notNull(variant, "Variant must not be null!");
+			Assert.notNull(variant, "Variant must not be null");
 			return new CollationLocale(language, Optional.of(variant));
 		}
 
 		/**
 		 * Get the string representation.
 		 *
-		 * @return
+		 * @return the collation {@link String} in Mongo ICU format.
 		 */
 		public String asString() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
index 7d57f16f54..833f1a176b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Criteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,30 +19,36 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collection;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import org.bson.BsonRegularExpression;
+import org.bson.BsonType;
 import org.bson.Document;
 import org.bson.types.Binary;
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.data.domain.Example;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Shape;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.MongoExpression;
 import org.springframework.data.mongodb.core.geo.GeoJson;
 import org.springframework.data.mongodb.core.geo.Sphere;
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
 import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.util.RegexFlags;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
-import org.springframework.util.Base64Utils;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -51,7 +57,7 @@
 
 /**
  * Central class for creating queries. It follows a fluent API style so that you can easily chain together multiple
- * criteria. Static import of the 'Criteria.where' method will improve readability.
+ * criteria. Static import of the {@link Criteria#where Criteria.where} method improves readability.
  *
  * @author Thomas Risberg
  * @author Oliver Gierke
@@ -59,6 +65,9 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Andreas Zink
+ * @author Ziemowit Stolarczyk
+ * @author Clément Petit
+ * @author James McNee
  */
 public class Criteria implements CriteriaDefinition {
 
@@ -67,23 +76,9 @@ public class Criteria implements CriteriaDefinition {
 	 */
 	private static final Object NOT_SET = new Object();
 
-	private static final int[] FLAG_LOOKUP = new int[Character.MAX_VALUE];
-
-	static {
-		FLAG_LOOKUP['g'] = 256;
-		FLAG_LOOKUP['i'] = Pattern.CASE_INSENSITIVE;
-		FLAG_LOOKUP['m'] = Pattern.MULTILINE;
-		FLAG_LOOKUP['s'] = Pattern.DOTALL;
-		FLAG_LOOKUP['c'] = Pattern.CANON_EQ;
-		FLAG_LOOKUP['x'] = Pattern.COMMENTS;
-		FLAG_LOOKUP['d'] = Pattern.UNIX_LINES;
-		FLAG_LOOKUP['t'] = Pattern.LITERAL;
-		FLAG_LOOKUP['u'] = Pattern.UNICODE_CASE;
-	}
-
 	private @Nullable String key;
-	private List<Criteria> criteriaChain;
-	private LinkedHashMap<String, Object> criteria = new LinkedHashMap<String, Object>();
+	private final List<Criteria> criteriaChain;
+	private final LinkedHashMap<String, @Nullable Object> criteria = new LinkedHashMap<String, Object>();
 	private @Nullable Object isValue = NOT_SET;
 
 	public Criteria() {
@@ -105,8 +100,8 @@ protected Criteria(List<Criteria> criteriaChain, String key) {
 	/**
 	 * Static factory method to create a Criteria using the provided key
 	 *
-	 * @param key
-	 * @return
+	 * @param key the property or field name.
+	 * @return new instance of {@link Criteria}.
 	 */
 	public static Criteria where(String key) {
 		return new Criteria(key);
@@ -116,7 +111,7 @@ public static Criteria where(String key) {
 	 * Static factory method to create a {@link Criteria} matching an example object.
 	 *
 	 * @param example must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Criteria}.
 	 * @see Criteria#alike(Example)
 	 * @since 1.8
 	 */
@@ -125,10 +120,15 @@ public static Criteria byExample(Object example) {
 	}
 
 	/**
-	 * Static factory method to create a {@link Criteria} matching an example object.
+	 * Static factory method to create a {@link Criteria} matching an example object. <br />
+	 * By default, the {@link Example} uses typed matching restricting it to probe assignable types. For example, when
+	 * sticking with the default type key ({@code _class}), the query has restrictions such as
+	 * <code>_class : &#123; $in : [com.acme.Person] &#125; </code>. <br />
+	 * To avoid the above-mentioned type restriction use an {@link UntypedExampleMatcher} with
+	 * {@link Example#of(Object, org.springframework.data.domain.ExampleMatcher)}.
 	 *
 	 * @param example must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Criteria}.
 	 * @see Criteria#alike(Example)
 	 * @since 1.8
 	 */
@@ -150,11 +150,43 @@ public static Criteria matchingDocumentStructure(MongoJsonSchema schema) {
 		return new Criteria().andDocumentStructureMatches(schema);
 	}
 
+	/**
+	 * Static factory method to create a {@link Criteria} matching a documents against the given {@link MongoExpression
+	 * expression}.
+	 * <p>
+	 * The {@link MongoExpression expression} can be either something that directly renders to the store native
+	 * representation like
+	 *
+	 * <pre class="code">
+	 * expr(() -> Document.parse("{ $gt : [ '$spent', '$budget'] }")))
+	 * </pre>
+	 *
+	 * or an {@link org.springframework.data.mongodb.core.aggregation.AggregationExpression} which will be subject to
+	 * context (domain type) specific field mapping.
+	 *
+	 * <pre class="code">
+	 * expr(valueOf("amountSpent").greaterThan("budget"))
+	 * </pre>
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link Criteria}.
+	 * @since 4.1
+	 */
+	public static Criteria expr(MongoExpression expression) {
+
+		Assert.notNull(expression, "Expression must not be null");
+
+		Criteria criteria = new Criteria();
+		criteria.criteria.put("$expr", expression);
+		return criteria;
+	}
+
 	/**
 	 * Static factory method to create a Criteria using the provided key
 	 *
-	 * @return
+	 * @return new instance of {@link Criteria}.
 	 */
+	@Contract("_ -> new")
 	public Criteria and(String key) {
 		return new Criteria(this.criteriaChain, key);
 	}
@@ -162,21 +194,58 @@ public Criteria and(String key) {
 	/**
 	 * Creates a criterion using equality
 	 *
-	 * @param o
-	 * @return
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 */
-	public Criteria is(@Nullable Object o) {
+	@Contract("_ -> this")
+	public Criteria is(@Nullable Object value) {
 
-		if (!isValue.equals(NOT_SET)) {
+		if (!NOT_SET.equals(isValue)) {
 			throw new InvalidMongoDbApiUsageException(
-					"Multiple 'is' values declared. You need to use 'and' with multiple criteria");
+					"Multiple 'is' values declared; You need to use 'and' with multiple criteria");
 		}
 
 		if (lastOperatorWasNot()) {
-			throw new InvalidMongoDbApiUsageException("Invalid query: 'not' can't be used with 'is' - use 'ne' instead.");
+			throw new InvalidMongoDbApiUsageException("Invalid query: 'not' can't be used with 'is' - use 'ne' instead");
 		}
 
-		this.isValue = o;
+		this.isValue = value;
+		return this;
+	}
+
+	/**
+	 * Creates a criterion using {@literal null} equality comparison which matches documents that either contain the item
+	 * field whose value is {@literal null} or that do not contain the item field. <br />
+	 * Use {@link #isNullValue()} to only query for documents that contain the field whose value is equal to
+	 * {@link org.bson.BsonType#NULL}. <br />
+	 * Use {@link #exists(boolean)} to query for documents that do (not) contain the field.
+	 *
+	 * @return this.
+	 * @see <a href="https://docs.mongodb.com/manual/tutorial/query-for-null-fields/#equality-filter">Query for Null or
+	 *      Missing Fields: Equality Filter</a>
+	 * @since 3.3
+	 */
+	@Contract("-> this")
+	public Criteria isNull() {
+		return is(null);
+	}
+
+	/**
+	 * Creates a criterion using a {@link org.bson.BsonType} comparison which matches only documents that contain the item
+	 * field whose value is equal to {@link org.bson.BsonType#NULL}. <br />
+	 * Use {@link #isNull()} to query for documents that contain the field with a {@literal null} value or do not contain
+	 * the field at all. <br />
+	 * Use {@link #exists(boolean)} to query for documents that do (not) contain the field.
+	 *
+	 * @return this.
+	 * @see <a href="https://docs.mongodb.com/manual/tutorial/query-for-null-fields/#type-check">Query for Null or Missing
+	 *      Fields: Type Check</a>
+	 * @since 3.3
+	 */
+	@Contract("-> this")
+	public Criteria isNullValue() {
+
+		criteria.put("$type", BsonType.NULL.getValue());
 		return this;
 	}
 
@@ -187,124 +256,145 @@ private boolean lastOperatorWasNot() {
 	/**
 	 * Creates a criterion using the {@literal $ne} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/ne/">MongoDB Query operator: $ne</a>
 	 */
-	public Criteria ne(@Nullable Object o) {
-		criteria.put("$ne", o);
+	@Contract("_ -> this")
+	public Criteria ne(@Nullable Object value) {
+		criteria.put("$ne", value);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $lt} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param value must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/lt/">MongoDB Query operator: $lt</a>
 	 */
-	public Criteria lt(Object o) {
-		criteria.put("$lt", o);
+	@Contract("_ -> this")
+	public Criteria lt(Object value) {
+		criteria.put("$lt", value);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $lte} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param value must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/lte/">MongoDB Query operator: $lte</a>
 	 */
-	public Criteria lte(Object o) {
-		criteria.put("$lte", o);
+	@Contract("_ -> this")
+	public Criteria lte(Object value) {
+		criteria.put("$lte", value);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $gt} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param value must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/gt/">MongoDB Query operator: $gt</a>
 	 */
-	public Criteria gt(Object o) {
-		criteria.put("$gt", o);
+	@Contract("_ -> this")
+	public Criteria gt(Object value) {
+		criteria.put("$gt", value);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $gte} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/gte/">MongoDB Query operator: $gte</a>
 	 */
-	public Criteria gte(Object o) {
-		criteria.put("$gte", o);
+	@Contract("_ -> this")
+	public Criteria gte(Object value) {
+		criteria.put("$gte", value);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $in} operator.
 	 *
-	 * @param o the values to match against
-	 * @return
+	 * @param values the values to match against
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/in/">MongoDB Query operator: $in</a>
 	 */
-	public Criteria in(Object... o) {
-		if (o.length > 1 && o[1] instanceof Collection) {
+	@Contract("_ -> this")
+	public Criteria in(@Nullable Object ... values) {
+		if (values.length > 1 && values[1] instanceof Collection) {
 			throw new InvalidMongoDbApiUsageException(
-					"You can only pass in one argument of type " + o[1].getClass().getName());
+					"You can only pass in one argument of type " + values[1].getClass().getName());
 		}
-		criteria.put("$in", Arrays.asList(o));
-		return this;
+		return this.in(Arrays.asList(values));
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $in} operator.
 	 *
-	 * @param c the collection containing the values to match against
-	 * @return
+	 * @param values the collection containing the values to match against
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/in/">MongoDB Query operator: $in</a>
 	 */
-	public Criteria in(Collection<?> c) {
-		criteria.put("$in", c);
+	@Contract("_ -> this")
+	public Criteria in(Collection<?> values) {
+
+		ArrayList<?> objects = new ArrayList<>(values);
+		if (objects.size() == 1 && CollectionUtils.firstElement(objects) instanceof Placeholder placeholder) {
+			criteria.put("$in", placeholder);
+		} else {
+			criteria.put("$in", objects);
+		}
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $nin} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param values
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/nin/">MongoDB Query operator: $nin</a>
 	 */
-	public Criteria nin(Object... o) {
-		return nin(Arrays.asList(o));
+	@Contract("_ -> this")
+	public Criteria nin(Object... values) {
+		return nin(Arrays.asList(values));
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $nin} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param values must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/nin/">MongoDB Query operator: $nin</a>
 	 */
-	public Criteria nin(Collection<?> o) {
-		criteria.put("$nin", o);
+	@Contract("_ -> this")
+	public Criteria nin(Collection<?> values) {
+
+		ArrayList<?> objects = new ArrayList<>(values);
+		if (objects.size() == 1 && CollectionUtils.firstElement(objects) instanceof Placeholder placeholder) {
+			criteria.put("$nin", placeholder);
+		} else {
+			criteria.put("$nin", objects);
+		}
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $mod} operator.
 	 *
-	 * @param value
-	 * @param remainder
-	 * @return
+	 * @param value must not be {@literal null}.
+	 * @param remainder must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/mod/">MongoDB Query operator: $mod</a>
 	 */
+	@Contract("_, _ -> this")
 	public Criteria mod(Number value, Number remainder) {
-		List<Object> l = new ArrayList<Object>();
+		List<Object> l = new ArrayList<>(2);
 		l.add(value);
 		l.add(remainder);
 		criteria.put("$mod", l);
@@ -314,59 +404,84 @@ public Criteria mod(Number value, Number remainder) {
 	/**
 	 * Creates a criterion using the {@literal $all} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param values must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/all/">MongoDB Query operator: $all</a>
 	 */
-	public Criteria all(Object... o) {
-		return all(Arrays.asList(o));
+	@Contract("_ -> this")
+	public Criteria all(Object... values) {
+		return all(Arrays.asList(values));
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $all} operator.
 	 *
-	 * @param o
-	 * @return
+	 * @param values must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/all/">MongoDB Query operator: $all</a>
 	 */
-	public Criteria all(Collection<?> o) {
-		criteria.put("$all", o);
+	@Contract("_ -> this")
+	public Criteria all(Collection<?> values) {
+		criteria.put("$all", values);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $size} operator.
 	 *
-	 * @param s
-	 * @return
+	 * @param size
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/size/">MongoDB Query operator: $size</a>
 	 */
-	public Criteria size(int s) {
-		criteria.put("$size", s);
+	@Contract("_ -> this")
+	public Criteria size(int size) {
+		criteria.put("$size", size);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $exists} operator.
 	 *
-	 * @param b
-	 * @return
+	 * @param value
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/exists/">MongoDB Query operator: $exists</a>
 	 */
-	public Criteria exists(boolean b) {
-		criteria.put("$exists", b);
+	@Contract("_ -> this")
+	public Criteria exists(boolean value) {
+		criteria.put("$exists", value);
+		return this;
+	}
+
+	/**
+	 * Creates a criterion using the {@literal $sampleRate} operator.
+	 *
+	 * @param sampleRate sample rate to determine number of documents to be randomly selected from the input. Must be
+	 *          between {@code 0} and {@code 1}.
+	 * @return this.
+	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/aggregation/sampleRate/">MongoDB Query operator:
+	 *      $sampleRate</a>
+	 * @since 3.3
+	 */
+	@Contract("_ -> this")
+	public Criteria sampleRate(double sampleRate) {
+
+		Assert.isTrue(sampleRate >= 0, "The sample rate must be greater than zero");
+		Assert.isTrue(sampleRate <= 1, "The sample rate must not be greater than one");
+
+		criteria.put("$sampleRate", sampleRate);
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $type} operator.
 	 *
-	 * @param t
-	 * @return
+	 * @param typeNumber
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/type/">MongoDB Query operator: $type</a>
 	 */
-	public Criteria type(int t) {
-		criteria.put("$type", t);
+	@Contract("_ -> this")
+	public Criteria type(int typeNumber) {
+		criteria.put("$type", typeNumber);
 		return this;
 	}
 
@@ -374,25 +489,43 @@ public Criteria type(int t) {
 	 * Creates a criterion using the {@literal $type} operator.
 	 *
 	 * @param types must not be {@literal null}.
-	 * @return this
+	 * @return this.
 	 * @since 2.1
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/type/">MongoDB Query operator: $type</a>
 	 */
+	@Contract("_ -> this")
 	public Criteria type(Type... types) {
 
-		Assert.notNull(types, "Types must not be null!");
-		Assert.noNullElements(types, "Types must not contain null.");
+		Assert.notNull(types, "Types must not be null");
+		Assert.noNullElements(types, "Types must not contain null");
 
-		criteria.put("$type", Arrays.asList(types).stream().map(Type::value).collect(Collectors.toList()));
+		return type(Arrays.asList(types));
+	}
+
+	/**
+	 * Creates a criterion using the {@literal $type} operator.
+	 *
+	 * @param types must not be {@literal null}.
+	 * @return this.
+	 * @since 3.2
+	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/type/">MongoDB Query operator: $type</a>
+	 */
+	@Contract("_ -> this")
+	public Criteria type(Collection<Type> types) {
+
+		Assert.notNull(types, "Types must not be null");
+
+		criteria.put("$type", types.stream().map(Type::toBsonType).map(Type::value).collect(Collectors.toList()));
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the {@literal $not} meta operator which affects the clause directly following
 	 *
-	 * @return
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/not/">MongoDB Query operator: $not</a>
 	 */
+	@Contract("-> this")
 	public Criteria not() {
 		return not(null);
 	}
@@ -400,10 +533,11 @@ public Criteria not() {
 	/**
 	 * Creates a criterion using the {@literal $not} operator.
 	 *
-	 * @param value
-	 * @return
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/not/">MongoDB Query operator: $not</a>
 	 */
+	@Contract("_ -> this")
 	private Criteria not(@Nullable Object value) {
 		criteria.put("$not", value);
 		return this;
@@ -412,35 +546,38 @@ private Criteria not(@Nullable Object value) {
 	/**
 	 * Creates a criterion using a {@literal $regex} operator.
 	 *
-	 * @param re
-	 * @return
+	 * @param regex must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/regex/">MongoDB Query operator: $regex</a>
 	 */
-	public Criteria regex(String re) {
-		return regex(re, null);
+	@Contract("_ -> this")
+	public Criteria regex(String regex) {
+		return regex(regex, null);
 	}
 
 	/**
 	 * Creates a criterion using a {@literal $regex} and {@literal $options} operator.
 	 *
-	 * @param re
-	 * @param options
-	 * @return
+	 * @param regex must not be {@literal null}.
+	 * @param options can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/regex/">MongoDB Query operator: $regex</a>
 	 */
-	public Criteria regex(String re, @Nullable String options) {
-		return regex(toPattern(re, options));
+	@Contract("_, _ -> this")
+	public Criteria regex(String regex, @Nullable String options) {
+		return regex(toPattern(regex, options));
 	}
 
 	/**
 	 * Syntactical sugar for {@link #is(Object)} making obvious that we create a regex predicate.
 	 *
-	 * @param pattern
-	 * @return
+	 * @param pattern must not be {@literal null}.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Criteria regex(Pattern pattern) {
 
-		Assert.notNull(pattern, "Pattern must not be null!");
+		Assert.notNull(pattern, "Pattern must not be null");
 
 		if (lastOperatorWasNot()) {
 			return not(pattern);
@@ -450,6 +587,13 @@ public Criteria regex(Pattern pattern) {
 		return this;
 	}
 
+	/**
+	 * Use a MongoDB native {@link BsonRegularExpression}.
+	 *
+	 * @param regex must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
 	public Criteria regex(BsonRegularExpression regex) {
 
 		if (lastOperatorWasNot()) {
@@ -462,9 +606,9 @@ public Criteria regex(BsonRegularExpression regex) {
 
 	private Pattern toPattern(String regex, @Nullable String options) {
 
-		Assert.notNull(regex, "Regex string must not be null!");
+		Assert.notNull(regex, "Regex string must not be null");
 
-		return Pattern.compile(regex, regexFlags(options));
+		return Pattern.compile(regex, RegexFlags.toRegexFlags(options));
 	}
 
 	/**
@@ -472,15 +616,16 @@ private Pattern toPattern(String regex, @Nullable String options) {
 	 * Mongo 2.4 and higher.
 	 *
 	 * @param circle must not be {@literal null}
-	 * @return
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/geoWithin/">MongoDB Query operator:
 	 *      $geoWithin</a>
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/centerSphere/">MongoDB Query operator:
 	 *      $centerSphere</a>
 	 */
+	@Contract("_ -> this")
 	public Criteria withinSphere(Circle circle) {
 
-		Assert.notNull(circle, "Circle must not be null!");
+		Assert.notNull(circle, "Circle must not be null");
 
 		criteria.put("$geoWithin", new GeoCommand(new Sphere(circle)));
 		return this;
@@ -489,14 +634,15 @@ public Criteria withinSphere(Circle circle) {
 	/**
 	 * Creates a geospatial criterion using a {@literal $geoWithin} operation.
 	 *
-	 * @param shape
-	 * @return
+	 * @param shape must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/geoWithin/">MongoDB Query operator:
 	 *      $geoWithin</a>
 	 */
+	@Contract("_ -> this")
 	public Criteria within(Shape shape) {
 
-		Assert.notNull(shape, "Shape must not be null!");
+		Assert.notNull(shape, "Shape must not be null");
 
 		criteria.put("$geoWithin", new GeoCommand(shape));
 		return this;
@@ -506,12 +652,13 @@ public Criteria within(Shape shape) {
 	 * Creates a geospatial criterion using a {@literal $near} operation.
 	 *
 	 * @param point must not be {@literal null}
-	 * @return
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/near/">MongoDB Query operator: $near</a>
 	 */
+	@Contract("_ -> this")
 	public Criteria near(Point point) {
 
-		Assert.notNull(point, "Point must not be null!");
+		Assert.notNull(point, "Point must not be null");
 
 		criteria.put("$near", point);
 		return this;
@@ -522,13 +669,14 @@ public Criteria near(Point point) {
 	 * higher.
 	 *
 	 * @param point must not be {@literal null}
-	 * @return
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/nearSphere/">MongoDB Query operator:
 	 *      $nearSphere</a>
 	 */
+	@Contract("_ -> this")
 	public Criteria nearSphere(Point point) {
 
-		Assert.notNull(point, "Point must not be null!");
+		Assert.notNull(point, "Point must not be null");
 
 		criteria.put("$nearSphere", point);
 		return this;
@@ -539,25 +687,31 @@ public Criteria nearSphere(Point point) {
 	 * structure and the documents one. Requires MongoDB 2.4 or better.
 	 *
 	 * @param geoJson must not be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 1.8
 	 */
 	@SuppressWarnings("rawtypes")
+	@Contract("_ -> this")
 	public Criteria intersects(GeoJson geoJson) {
 
-		Assert.notNull(geoJson, "GeoJson must not be null!");
+		Assert.notNull(geoJson, "GeoJson must not be null");
 		criteria.put("$geoIntersects", geoJson);
 		return this;
 	}
 
 	/**
-	 * Creates a geo-spatial criterion using a {@literal $maxDistance} operation, for use with $near
+	 * Creates a geo-spatial criterion using a {@literal $maxDistance} operation, for use with {@literal $near} or
+	 * {@literal $nearSphere}.
+	 * <p>
+	 * <strong>NOTE:</strong> The unit of measure for distance may depends on the used coordinate representation (legacy
+	 * vs. geoJson) as well as the target operation.
 	 *
-	 * @param maxDistance
-	 * @return
+	 * @param maxDistance radians or meters
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/maxDistance/">MongoDB Query operator:
 	 *      $maxDistance</a>
 	 */
+	@Contract("_ -> this")
 	public Criteria maxDistance(double maxDistance) {
 
 		if (createNearCriteriaForCommand("$near", "$maxDistance", maxDistance)
@@ -572,11 +726,15 @@ public Criteria maxDistance(double maxDistance) {
 	/**
 	 * Creates a geospatial criterion using a {@literal $minDistance} operation, for use with {@literal $near} or
 	 * {@literal $nearSphere}.
+	 * <p>
+	 * <strong>NOTE:</strong> The unit of measure for distance may depends on the used coordinate representation (legacy
+	 * vs. geoJson) as well as the target operation.
 	 *
-	 * @param minDistance
-	 * @return
+	 * @param minDistance radians or meters
+	 * @return this.
 	 * @since 1.7
 	 */
+	@Contract("_ -> this")
 	public Criteria minDistance(double minDistance) {
 
 		if (createNearCriteriaForCommand("$near", "$minDistance", minDistance)
@@ -591,27 +749,36 @@ public Criteria minDistance(double minDistance) {
 	/**
 	 * Creates a criterion using the {@literal $elemMatch} operator
 	 *
-	 * @param c
-	 * @return
+	 * @param criteria must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/elemMatch/">MongoDB Query operator:
 	 *      $elemMatch</a>
 	 */
-	public Criteria elemMatch(Criteria c) {
-		criteria.put("$elemMatch", c.getCriteriaObject());
+	@Contract("_ -> this")
+	public Criteria elemMatch(Criteria criteria) {
+		this.criteria.put("$elemMatch", criteria.getCriteriaObject());
 		return this;
 	}
 
 	/**
 	 * Creates a criterion using the given object as a pattern.
 	 *
-	 * @param sample
-	 * @return
+	 * @param sample must not be {@literal null}.
+	 * @return this.
 	 * @since 1.8
 	 */
+	@Contract("_ -> this")
 	public Criteria alike(Example<?> sample) {
 
-		criteria.put("$example", sample);
-		return this;
+		if (StringUtils.hasText(this.getKey())) {
+
+			criteria.put("$example", sample);
+			return this;
+		}
+
+		Criteria exampleCriteria = new Criteria();
+		exampleCriteria.criteria.put("$example", sample);
+		return registerCriteriaChainElement(exampleCriteria);
 	}
 
 	/**
@@ -628,9 +795,10 @@ public Criteria alike(Example<?> sample) {
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/query/jsonSchema/">MongoDB Query operator:
 	 *      $jsonSchema</a>
 	 */
+	@Contract("_ -> this")
 	public Criteria andDocumentStructureMatches(MongoJsonSchema schema) {
 
-		Assert.notNull(schema, "Schema must not be null!");
+		Assert.notNull(schema, "Schema must not be null");
 
 		Criteria schemaCriteria = new Criteria();
 		schemaCriteria.criteria.putAll(schema.toDocument());
@@ -651,47 +819,127 @@ public BitwiseCriteriaOperators bits() {
 	}
 
 	/**
-	 * Creates an 'or' criteria using the $or operator for all of the provided criteria
-	 * <p>
-	 * Note that mongodb doesn't support an $or operator to be wrapped in a $not operator.
+	 * Creates a criteria using the {@code $or} operator for all provided criteria.
 	 * <p>
+	 * Note that MongoDB doesn't support an {@code $nor} operator to be wrapped in a {@code $not} operator.
 	 *
-	 * @throws IllegalArgumentException if {@link #orOperator(Criteria...)} follows a not() call directly.
-	 * @param criteria
+	 * @throws IllegalArgumentException if this method follows a {@link #not()} call directly.
+	 * @param criteria must not be {@literal null}.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Criteria orOperator(Criteria... criteria) {
+
+		Assert.notNull(criteria, "Criteria must not be null");
+
+		return orOperator(Arrays.asList(criteria));
+	}
+
+	/**
+	 * Creates a criteria using the {@code $or} operator for all of the provided criteria.
+	 * <p>
+	 * Note that MongoDB doesn't support an {@code $nor} operator to be wrapped in a {@code $not} operator.
+	 *
+	 * @throws IllegalArgumentException if this method follows a {@link #not()} call directly.
+	 * @param criteria must not be {@literal null}.
+	 * @return this.
+	 * @since 3.2
+	 */
+	@Contract("_ -> this")
+	public Criteria orOperator(Collection<Criteria> criteria) {
+
+		Assert.notNull(criteria, "Criteria must not be null");
+
 		BasicDBList bsonList = createCriteriaList(criteria);
 		return registerCriteriaChainElement(new Criteria("$or").is(bsonList));
 	}
 
 	/**
-	 * Creates a 'nor' criteria using the $nor operator for all of the provided criteria.
-	 * <p>
-	 * Note that mongodb doesn't support an $nor operator to be wrapped in a $not operator.
+	 * Creates a criteria using the {@code $nor} operator for all of the provided criteria.
 	 * <p>
+	 * Note that MongoDB doesn't support an {@code $nor} operator to be wrapped in a {@code $not} operator.
 	 *
-	 * @throws IllegalArgumentException if {@link #norOperator(Criteria...)} follows a not() call directly.
-	 * @param criteria
+	 * @throws IllegalArgumentException if this method follows a {@link #not()} call directly.
+	 * @param criteria must not be {@literal null}.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Criteria norOperator(Criteria... criteria) {
+
+		Assert.notNull(criteria, "Criteria must not be null");
+
+		return norOperator(Arrays.asList(criteria));
+	}
+
+	/**
+	 * Creates a criteria using the {@code $nor} operator for all of the provided criteria.
+	 * <p>
+	 * Note that MongoDB doesn't support an {@code $nor} operator to be wrapped in a {@code $not} operator.
+	 *
+	 * @throws IllegalArgumentException if this method follows a {@link #not()} call directly.
+	 * @param criteria must not be {@literal null}.
+	 * @return this.
+	 * @since 3.2
+	 */
+	@Contract("_ -> this")
+	public Criteria norOperator(Collection<Criteria> criteria) {
+
+		Assert.notNull(criteria, "Criteria must not be null");
+
 		BasicDBList bsonList = createCriteriaList(criteria);
 		return registerCriteriaChainElement(new Criteria("$nor").is(bsonList));
 	}
 
 	/**
-	 * Creates an 'and' criteria using the $and operator for all of the provided criteria.
-	 * <p>
-	 * Note that mongodb doesn't support an $and operator to be wrapped in a $not operator.
+	 * Creates a criteria using the {@code $and} operator for all of the provided criteria.
 	 * <p>
+	 * Note that MongoDB doesn't support an {@code $and} operator to be wrapped in a {@code $not} operator.
 	 *
-	 * @throws IllegalArgumentException if {@link #andOperator(Criteria...)} follows a not() call directly.
-	 * @param criteria
+	 * @throws IllegalArgumentException if this method follows a {@link #not()} call directly.
+	 * @param criteria must not be {@literal null}.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Criteria andOperator(Criteria... criteria) {
+
+		Assert.notNull(criteria, "Criteria must not be null");
+
+		return andOperator(Arrays.asList(criteria));
+	}
+
+	/**
+	 * Creates a criteria using the {@code $and} operator for all of the provided criteria.
+	 * <p>
+	 * Note that MongoDB doesn't support an {@code $and} operator to be wrapped in a {@code $not} operator.
+	 *
+	 * @throws IllegalArgumentException if this method follows a {@link #not()} call directly.
+	 * @param criteria must not be {@literal null}.
+	 * @return this.
+	 * @since 3.2
+	 */
+	@Contract("_ -> this")
+	public Criteria andOperator(Collection<Criteria> criteria) {
+
+		Assert.notNull(criteria, "Criteria must not be null");
+
 		BasicDBList bsonList = createCriteriaList(criteria);
 		return registerCriteriaChainElement(new Criteria("$and").is(bsonList));
 	}
 
+	/**
+	 * Creates a criterion using the given {@literal operator}.
+	 *
+	 * @param operator the native MongoDB operator.
+	 * @param value the operator value
+	 * @return this
+	 * @since 5.0
+	 */
+	@Contract("_, _ -> this")
+	public Criteria raw(String operator, Object value) {
+		criteria.put(operator, value);
+		return this;
+	}
+
 	private Criteria registerCriteriaChainElement(Criteria criteria) {
 
 		if (lastOperatorWasNot()) {
@@ -707,15 +955,11 @@ private Criteria registerCriteriaChainElement(Criteria criteria) {
 	 * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getKey()
 	 */
 	@Override
-	@Nullable
-	public String getKey() {
+	public @Nullable String getKey() {
 		return this.key;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getCriteriaObject()
-	 */
+	@Override
 	public Document getCriteriaObject() {
 
 		if (this.criteriaChain.size() == 1) {
@@ -727,7 +971,8 @@ public Document getCriteriaObject() {
 			for (Criteria c : this.criteriaChain) {
 				Document document = c.getSingleCriteriaObject();
 				for (String k : document.keySet()) {
-					setValue(criteriaObject, k, document.get(k));
+					Object o = document.get(k);
+					setValue(criteriaObject, k, o);
 				}
 			}
 			return criteriaObject;
@@ -772,8 +1017,16 @@ protected Document getSingleCriteriaObject() {
 		Document queryCriteria = new Document();
 
 		if (!NOT_SET.equals(isValue)) {
-			queryCriteria.put(this.key, this.isValue);
-			queryCriteria.putAll(document);
+			if (document.isEmpty()) {
+				queryCriteria.put(this.key, this.isValue);
+			} else {
+				if (isValue instanceof Pattern || isValue instanceof BsonRegularExpression) {
+					document.put("$regex", isValue);
+				} else {
+					document.put("$eq", isValue);
+				}
+				queryCriteria.put(this.key, document);
+			}
 		} else {
 			queryCriteria.put(this.key, document);
 		}
@@ -781,7 +1034,7 @@ protected Document getSingleCriteriaObject() {
 		return queryCriteria;
 	}
 
-	private BasicDBList createCriteriaList(Criteria[] criteria) {
+	private BasicDBList createCriteriaList(Collection<Criteria> criteria) {
 		BasicDBList bsonList = new BasicDBList();
 		for (Criteria c : criteria) {
 			bsonList.add(c.getCriteriaObject());
@@ -790,13 +1043,15 @@ private BasicDBList createCriteriaList(Criteria[] criteria) {
 	}
 
 	private void setValue(Document document, String key, Object value) {
+
 		Object existing = document.get(key);
+
 		if (existing == null) {
 			document.put(key, value);
 		} else {
-			throw new InvalidMongoDbApiUsageException("Due to limitations of the com.mongodb.BasicDocument, "
-					+ "you can't add a second '" + key + "' expression specified as '" + key + " : " + value + "'. "
-					+ "Criteria already contains '" + key + " : " + existing + "'.");
+			throw new InvalidMongoDbApiUsageException("Due to limitations of the org.bson.Document, "
+					+ "you can't add a second '" + key + "' expression specified as '" + key + " : " + value + "';"
+					+ " Criteria already contains '" + key + " : " + existing + "'");
 		}
 	}
 
@@ -808,9 +1063,9 @@ private boolean createNearCriteriaForCommand(String command, String operation, d
 
 		Object existingNearOperationValue = criteria.get(command);
 
-		if (existingNearOperationValue instanceof Document) {
+		if (existingNearOperationValue instanceof Document document) {
 
-			((Document) existingNearOperationValue).put(operation, maxDistance);
+			document.put(operation, maxDistance);
 
 			return true;
 
@@ -825,12 +1080,8 @@ private boolean createNearCriteriaForCommand(String command, String operation, d
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
@@ -875,32 +1126,69 @@ private boolean simpleCriteriaEquals(Criteria left, Criteria right) {
 	 * @param right
 	 * @return
 	 */
-	private boolean isEqual(Object left, Object right) {
+	private boolean isEqual(@Nullable Object left, @Nullable Object right) {
 
 		if (left == null) {
 			return right == null;
 		}
 
-		if (Pattern.class.isInstance(left)) {
+		if (left instanceof Pattern leftPattern) {
 
-			if (!Pattern.class.isInstance(right)) {
+			if (!(right instanceof Pattern rightPattern)) {
 				return false;
 			}
 
-			Pattern leftPattern = (Pattern) left;
-			Pattern rightPattern = (Pattern) right;
-
 			return leftPattern.pattern().equals(rightPattern.pattern()) //
 					&& leftPattern.flags() == rightPattern.flags();
 		}
 
+		if (left instanceof Document leftDocument) {
+
+			if (!(right instanceof Document rightDocument)) {
+				return false;
+			}
+
+			Iterator<Entry<String, Object>> leftIterator = leftDocument.entrySet().iterator();
+			Iterator<Entry<String, Object>> rightIterator = rightDocument.entrySet().iterator();
+
+			while (leftIterator.hasNext() && rightIterator.hasNext()) {
+
+				Map.Entry<String, Object> leftEntry = leftIterator.next();
+				Map.Entry<String, Object> rightEntry = rightIterator.next();
+
+				if (!isEqual(leftEntry.getKey(), rightEntry.getKey())
+						|| !isEqual(leftEntry.getValue(), rightEntry.getValue())) {
+					return false;
+				}
+			}
+
+			return !leftIterator.hasNext() && !rightIterator.hasNext();
+		}
+
+		if (Collection.class.isAssignableFrom(left.getClass())) {
+
+			if (right == null || !Collection.class.isAssignableFrom(right.getClass())) {
+				return false;
+			}
+
+			Collection<?> leftCollection = (Collection<?>) left;
+			Collection<?> rightCollection = (Collection<?>) right;
+			Iterator<?> leftIterator = leftCollection.iterator();
+			Iterator<?> rightIterator = rightCollection.iterator();
+
+			while (leftIterator.hasNext() && rightIterator.hasNext()) {
+
+				if (!isEqual(leftIterator.next(), rightIterator.next())) {
+					return false;
+				}
+			}
+
+			return !leftIterator.hasNext() && !rightIterator.hasNext();
+		}
+
 		return ObjectUtils.nullSafeEquals(left, right);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -915,48 +1203,7 @@ public int hashCode() {
 
 	private static boolean requiresGeoJsonFormat(Object value) {
 		return value instanceof GeoJson
-				|| (value instanceof GeoCommand && ((GeoCommand) value).getShape() instanceof GeoJson);
-	}
-
-	/**
-	 * Lookup the MongoDB specific flags for a given regex option string.
-	 *
-	 * @param s the Regex option/flag to look up. Can be {@literal null}.
-	 * @return zero if given {@link String} is {@literal null} or empty.
-	 * @since 2.2
-	 */
-	private static int regexFlags(@Nullable String s) {
-
-		int flags = 0;
-
-		if (s == null) {
-			return flags;
-		}
-
-		for (final char f : s.toLowerCase().toCharArray()) {
-			flags |= regexFlag(f);
-		}
-
-		return flags;
-	}
-
-	/**
-	 * Lookup the MongoDB specific flags for a given character.
-	 *
-	 * @param c the Regex option/flag to look up.
-	 * @return
-	 * @throws IllegalArgumentException for unknown flags
-	 * @since 2.2
-	 */
-	private static int regexFlag(char c) {
-
-		int flag = FLAG_LOOKUP[c];
-
-		if (flag == 0) {
-			throw new IllegalArgumentException(String.format("Unrecognized flag [%c]", c));
-		}
-
-		return flag;
+				|| (value instanceof GeoCommand geoCommand && geoCommand.getShape() instanceof GeoJson);
 	}
 
 	/**
@@ -1147,109 +1394,61 @@ private static class BitwiseCriteriaOperatorsImpl implements BitwiseCriteriaOper
 			this.target = target;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allClear(int)
-		 */
 		@Override
 		public Criteria allClear(int numericBitmask) {
 			return numericBitmask("$bitsAllClear", numericBitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allClear(java.lang.String)
-		 */
 		@Override
 		public Criteria allClear(String bitmask) {
 			return stringBitmask("$bitsAllClear", bitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allClear(java.util.List)
-		 */
 		@Override
 		public Criteria allClear(List<Integer> positions) {
 			return positions("$bitsAllClear", positions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allSet(int)
-		 */
 		@Override
 		public Criteria allSet(int numericBitmask) {
 			return numericBitmask("$bitsAllSet", numericBitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allSet(java.lang.String)
-		 */
 		@Override
 		public Criteria allSet(String bitmask) {
 			return stringBitmask("$bitsAllSet", bitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#allSet(java.util.List)
-		 */
 		@Override
 		public Criteria allSet(List<Integer> positions) {
 			return positions("$bitsAllSet", positions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anyClear(int)
-		 */
 		@Override
 		public Criteria anyClear(int numericBitmask) {
 			return numericBitmask("$bitsAnyClear", numericBitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anyClear(java.lang.String)
-		 */
 		@Override
 		public Criteria anyClear(String bitmask) {
 			return stringBitmask("$bitsAnyClear", bitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anyClear(java.util.List)
-		 */
 		@Override
 		public Criteria anyClear(List<Integer> positions) {
 			return positions("$bitsAnyClear", positions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anySet(int)
-		 */
 		@Override
 		public Criteria anySet(int numericBitmask) {
 			return numericBitmask("$bitsAnySet", numericBitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anySet(java.lang.String)
-		 */
 		@Override
 		public Criteria anySet(String bitmask) {
 			return stringBitmask("$bitsAnySet", bitmask);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.BitwiseCriteriaOperators#anySet(java.util.Collection)
-		 */
 		@Override
 		public Criteria anySet(List<Integer> positions) {
 			return positions("$bitsAnySet", positions);
@@ -1257,8 +1456,8 @@ public Criteria anySet(List<Integer> positions) {
 
 		private Criteria positions(String operator, List<Integer> positions) {
 
-			Assert.notNull(positions, "Positions must not be null!");
-			Assert.noNullElements(positions.toArray(), "Positions must not contain null values.");
+			Assert.notNull(positions, "Positions must not be null");
+			Assert.noNullElements(positions.toArray(), "Positions must not contain null values");
 
 			target.criteria.put(operator, positions);
 			return target;
@@ -1266,9 +1465,9 @@ private Criteria positions(String operator, List<Integer> positions) {
 
 		private Criteria stringBitmask(String operator, String bitmask) {
 
-			Assert.hasText(bitmask, "Bitmask must not be null!");
+			Assert.hasText(bitmask, "Bitmask must not be null");
 
-			target.criteria.put(operator, new Binary(Base64Utils.decodeFromString(bitmask)));
+			target.criteria.put(operator, new Binary(Base64.getDecoder().decode(bitmask)));
 			return target;
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/CriteriaDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/CriteriaDefinition.java
index c164d39c01..7777e5f554 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/CriteriaDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/CriteriaDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.core.query;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Oliver Gierke
@@ -40,4 +40,41 @@ public interface CriteriaDefinition {
 	@Nullable
 	String getKey();
 
+	/**
+	 * A placeholder expression used when rending queries to JSON.
+	 *
+	 * @since 5.0
+	 * @author Christoph Strobl
+	 */
+	class Placeholder {
+
+		private final Object expression;
+
+		/**
+		 * Create a new placeholder for index bindable parameter.
+		 * 
+		 * @param position the index of the parameter to bind.
+		 * @return new instance of {@link Placeholder}.
+		 */
+		public static Placeholder indexed(int position) {
+			return new Placeholder("?%s".formatted(position));
+		}
+
+		public static Placeholder placeholder(String expression) {
+			return new Placeholder(expression);
+		}
+
+		Placeholder(Object value) {
+			this.expression = value;
+		}
+
+		public Object getValue() {
+			return expression;
+		}
+
+		@Override
+		public String toString() {
+			return getValue().toString();
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Field.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Field.java
index 45b2d9544d..9775fefdb0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Field.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Field.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,54 +15,220 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import lombok.EqualsAndHashCode;
-
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Map.Entry;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.MongoExpression;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
+ * Field projection.
+ *
  * @author Thomas Risberg
  * @author Oliver Gierke
  * @author Patryk Wasik
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Owen Q
+ * @author Kirill Egorov
  */
-@EqualsAndHashCode
 public class Field {
 
-	private final Map<String, Integer> criteria = new HashMap<String, Integer>();
-	private final Map<String, Object> slices = new HashMap<String, Object>();
-	private final Map<String, Criteria> elemMatchs = new HashMap<String, Criteria>();
+	private final Map<String, Object> criteria = new HashMap<>();
+	private final Map<String, Object> slices = new HashMap<>();
+	private final Map<String, Criteria> elemMatches = new HashMap<>();
 	private @Nullable String positionKey;
 	private int positionValue;
 
-	public Field include(String key) {
-		criteria.put(key, Integer.valueOf(1));
+	/**
+	 * Include a single {@code field} to be returned by the query operation.
+	 *
+	 * @param field the document field name to be included.
+	 * @return {@code this} field projection instance.
+	 */
+	@Contract("_ -> this")
+	public Field include(String field) {
+
+		Assert.notNull(field, "Key must not be null");
+
+		criteria.put(field, 1);
+
 		return this;
 	}
 
-	public Field exclude(String key) {
-		criteria.put(key, Integer.valueOf(0));
+	/**
+	 * Project a given {@link MongoExpression} to a {@link FieldProjectionExpression#as(String) field} included in the
+	 * result.
+	 *
+	 * <pre class="code">
+	 *
+	 * // { 'name' : { '$toUpper' : '$name' } }
+	 *
+	 * // native MongoDB expression
+	 * .project(MongoExpression.expressionFromString("'$toUpper' : '$name'")).as("name");
+	 *
+	 * // Aggregation Framework expression
+	 * .project(StringOperators.valueOf("name").toUpper()).as("name");
+	 *
+	 * // Aggregation Framework SpEL expression
+	 * .project(AggregationSpELExpression.expressionOf("toUpper(name)")).as("name");
+	 * </pre>
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @return new instance of {@link FieldProjectionExpression}. Define the target field name through
+	 *         {@link FieldProjectionExpression#as(String) as(String)}.
+	 * @since 3.2
+	 */
+	public FieldProjectionExpression project(MongoExpression expression) {
+		return field -> Field.this.projectAs(expression, field);
+	}
+
+	/**
+	 * Project a given {@link MongoExpression} to a {@link FieldProjectionExpression#as(String) field} included in the
+	 * result.
+	 *
+	 * <pre class="code">
+	 *
+	 * // { 'name' : { '$toUpper' : '$name' } }
+	 *
+	 * // native MongoDB expression
+	 * .projectAs(MongoExpression.expressionFromString("'$toUpper' : '$name'"), "name");
+	 *
+	 * // Aggregation Framework expression
+	 * .projectAs(StringOperators.valueOf("name").toUpper(), "name");
+	 *
+	 * // Aggregation Framework SpEL expression
+	 * .projectAs(AggregationSpELExpression.expressionOf("toUpper(name)"), "name");
+	 * </pre>
+	 *
+	 * @param expression must not be {@literal null}.
+	 * @param field the field name used in the result.
+	 * @return new instance of {@link FieldProjectionExpression}.
+	 * @since 3.2
+	 */
+	@Contract("_, _ -> this")
+	public Field projectAs(MongoExpression expression, String field) {
+
+		criteria.put(field, expression);
 		return this;
 	}
 
-	public Field slice(String key, int size) {
-		slices.put(key, Integer.valueOf(size));
+	/**
+	 * Include one or more {@code fields} to be returned by the query operation.
+	 *
+	 * @param fields the document field names to be included.
+	 * @return {@code this} field projection instance.
+	 * @since 3.1
+	 */
+	@Contract("_ -> this")
+	public Field include(String... fields) {
+		return include(Arrays.asList(fields));
+	}
+
+	/**
+	 * Include one or more {@code fields} to be returned by the query operation.
+	 *
+	 * @param fields the document field names to be included.
+	 * @return {@code this} field projection instance.
+	 * @since 4.4
+	 */
+	@Contract("_ -> this")
+	public Field include(Collection<String> fields) {
+
+		Assert.notNull(fields, "Keys must not be null");
+
+		fields.forEach(this::include);
 		return this;
 	}
 
-	public Field slice(String key, int offset, int size) {
-		slices.put(key, new Integer[] { Integer.valueOf(offset), Integer.valueOf(size) });
+	/**
+	 * Exclude a single {@code field} from being returned by the query operation.
+	 *
+	 * @param field the document field name to be excluded.
+	 * @return {@code this} field projection instance.
+	 */
+	@Contract("_ -> this")
+	public Field exclude(String field) {
+
+		Assert.notNull(field, "Key must not be null");
+
+		criteria.put(field, 0);
+
 		return this;
 	}
 
-	public Field elemMatch(String key, Criteria elemMatchCriteria) {
-		elemMatchs.put(key, elemMatchCriteria);
+	/**
+	 * Exclude one or more {@code fields} from being returned by the query operation.
+	 *
+	 * @param fields the document field names to be excluded.
+	 * @return {@code this} field projection instance.
+	 * @since 3.1
+	 */
+	@Contract("_ -> this")
+	public Field exclude(String... fields) {
+		return exclude(Arrays.asList(fields));
+	}
+
+	/**
+	 * Exclude one or more {@code fields} from being returned by the query operation.
+	 *
+	 * @param fields the document field names to be excluded.
+	 * @return {@code this} field projection instance.
+	 * @since 4.4
+	 */
+	@Contract("_ -> this")
+	public Field exclude(Collection<String> fields) {
+
+		Assert.notNull(fields, "Keys must not be null");
+
+		fields.forEach(this::exclude);
+		return this;
+	}
+
+	/**
+	 * Project a {@code $slice} of the array {@code field} using the first {@code size} elements.
+	 *
+	 * @param field the document field name to project, must be an array field.
+	 * @param size the number of elements to include.
+	 * @return {@code this} field projection instance.
+	 */
+	@Contract("_, _ -> this")
+	public Field slice(String field, int size) {
+
+		Assert.notNull(field, "Key must not be null");
+
+		slices.put(field, size);
+
+		return this;
+	}
+
+	/**
+	 * Project a {@code $slice} of the array {@code field} using the first {@code size} elements starting at
+	 * {@code offset}.
+	 *
+	 * @param field the document field name to project, must be an array field.
+	 * @param offset the offset to start at.
+	 * @param size the number of elements to include.
+	 * @return {@code this} field projection instance.
+	 */
+	@Contract("_, _, _ -> this")
+	public Field slice(String field, int offset, int size) {
+
+		slices.put(field, Arrays.asList(offset, size));
+		return this;
+	}
+
+	@Contract("_, _ -> this")
+	public Field elemMatch(String field, Criteria elemMatchCriteria) {
+
+		elemMatches.put(field, elemMatchCriteria);
 		return this;
 	}
 
@@ -72,11 +238,12 @@ public Field elemMatch(String key, Criteria elemMatchCriteria) {
 	 *
 	 * @param field query array field, must not be {@literal null} or empty.
 	 * @param value
-	 * @return
+	 * @return {@code this} field projection instance.
 	 */
+	@Contract("_, _ -> this")
 	public Field position(String field, int value) {
 
-		Assert.hasText(field, "DocumentField must not be null or empty!");
+		Assert.hasText(field, "DocumentField must not be null or empty");
 
 		positionKey = field;
 		positionValue = value;
@@ -86,14 +253,13 @@ public Field position(String field, int value) {
 
 	public Document getFieldsObject() {
 
-		@SuppressWarnings({ "unchecked", "rawtypes" })
-		Document document = new Document((Map) criteria);
+		Document document = new Document(criteria);
 
 		for (Entry<String, Object> entry : slices.entrySet()) {
 			document.put(entry.getKey(), new Document("$slice", entry.getValue()));
 		}
 
-		for (Entry<String, Criteria> entry : elemMatchs.entrySet()) {
+		for (Entry<String, Criteria> entry : elemMatches.entrySet()) {
 			document.put(entry.getKey(), new Document("$elemMatch", entry.getValue().getCriteriaObject()));
 		}
 
@@ -103,4 +269,57 @@ public Document getFieldsObject() {
 
 		return document;
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		Field field = (Field) o;
+
+		if (positionValue != field.positionValue) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(criteria, field.criteria)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(slices, field.slices)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(elemMatches, field.elemMatches)) {
+			return false;
+		}
+		return ObjectUtils.nullSafeEquals(positionKey, field.positionKey);
+	}
+
+	@Override
+	public int hashCode() {
+
+		int result = ObjectUtils.nullSafeHashCode(criteria);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(slices);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(elemMatches);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(positionKey);
+		result = 31 * result + positionValue;
+		return result;
+	}
+
+	/**
+	 * Intermediate builder part for projecting a {@link MongoExpression} to a result field.
+	 *
+	 * @since 3.2
+	 * @author Christoph Strobl
+	 */
+	public interface FieldProjectionExpression {
+
+		/**
+		 * Set the name to be used in the result and return a {@link Field}.
+		 *
+		 * @param name must not be {@literal null}.
+		 * @return the calling instance {@link Field}.
+		 */
+		Field as(String name);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java
index afcff140c5..19ecd94e23 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/GeoCommand.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,6 +17,7 @@
 
 import static org.springframework.util.ObjectUtils.*;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Polygon;
@@ -43,7 +44,7 @@ public final class GeoCommand {
 	 */
 	public GeoCommand(Shape shape) {
 
-		Assert.notNull(shape, "Shape must not be null!");
+		Assert.notNull(shape, "Shape must not be null");
 
 		this.shape = shape;
 		this.command = getCommand(shape);
@@ -67,11 +68,12 @@ public String getCommand() {
 	 * Returns the MongoDB command for the given {@link Shape}.
 	 *
 	 * @param shape must not be {@literal null}.
-	 * @return
+	 * @return never {@literal null}.
+	 * @throws IllegalArgumentException for unknown {@link Shape}.
 	 */
 	private String getCommand(Shape shape) {
 
-		Assert.notNull(shape, "Shape must not be null!");
+		Assert.notNull(shape, "Shape must not be null");
 
 		if (shape instanceof Box) {
 			return "$box";
@@ -86,10 +88,6 @@ private String getCommand(Shape shape) {
 		throw new IllegalArgumentException("Unknown shape: " + shape);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -101,23 +99,17 @@ public int hashCode() {
 		return result;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof GeoCommand)) {
+		if (!(obj instanceof GeoCommand other)) {
 			return false;
 		}
 
-		GeoCommand that = (GeoCommand) obj;
-
-		return nullSafeEquals(this.command, that.command) && nullSafeEquals(this.shape, that.shape);
+		return nullSafeEquals(this.command, other.command) && nullSafeEquals(this.shape, other.shape);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java
index 1a5a73cf31..5ec4af3989 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Meta.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,8 @@
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -42,16 +41,17 @@ public class Meta {
 	private enum MetaKey {
 		MAX_TIME_MS("$maxTimeMS"), MAX_SCAN("$maxScan"), COMMENT("$comment"), SNAPSHOT("$snapshot");
 
-		private String key;
+		private final String key;
 
 		MetaKey(String key) {
 			this.key = key;
 		}
 	}
 
-	private final Map<String, Object> values = new LinkedHashMap<>(2);
-	private final Set<CursorOption> flags = new LinkedHashSet<>();
-	private Integer cursorBatchSize;
+	private Map<String, Object> values = Collections.emptyMap();
+	private Set<CursorOption> flags = Collections.emptySet();
+	private @Nullable Integer cursorBatchSize;
+	private @Nullable Boolean allowDiskUse;
 
 	public Meta() {}
 
@@ -62,38 +62,60 @@ public Meta() {}
 	 * @param source
 	 */
 	Meta(Meta source) {
-		this.values.putAll(source.values);
-		this.flags.addAll(source.flags);
+
+		this.values = new LinkedHashMap<>(source.values);
+		this.flags = new LinkedHashSet<>(source.flags);
 		this.cursorBatchSize = source.cursorBatchSize;
+		this.allowDiskUse = source.allowDiskUse;
+	}
+
+	/**
+	 * Return whether the maximum time limit for processing operations is set.
+	 *
+	 * @return {@code true} if set; {@code false} otherwise.
+	 * @since 4.0.6
+	 */
+	public boolean hasMaxTime() {
+
+		Long maxTimeMsec = getMaxTimeMsec();
+
+		return maxTimeMsec != null && maxTimeMsec > 0;
 	}
 
 	/**
 	 * @return {@literal null} if not set.
 	 */
-	@Nullable
-	public Long getMaxTimeMsec() {
+	public @Nullable Long getMaxTimeMsec() {
 		return getValue(MetaKey.MAX_TIME_MS.key);
 	}
 
 	/**
-	 * Set the maximum time limit in milliseconds for processing operations.
+	 * Returns the required maximum time limit in milliseconds or throws {@link IllegalStateException} if the maximum time
+	 * limit is not set.
 	 *
-	 * @param maxTimeMsec
+	 * @return the maximum time limit in milliseconds for processing operations.
+	 * @throws IllegalStateException if the maximum time limit is not set
+	 * @see #hasMaxTime()
+	 * @since 4.0.6
 	 */
-	public void setMaxTimeMsec(long maxTimeMsec) {
-		setMaxTime(Duration.ofMillis(maxTimeMsec));
+	public Long getRequiredMaxTimeMsec() {
+
+		Long maxTimeMsec = getMaxTimeMsec();
+
+		if (maxTimeMsec == null) {
+			throw new IllegalStateException("Maximum time limit in milliseconds not set");
+		}
+
+		return maxTimeMsec;
 	}
 
 	/**
-	 * Set the maximum time limit for processing operations.
+	 * Set the maximum time limit in milliseconds for processing operations.
 	 *
-	 * @param timeout
-	 * @param timeUnit
-	 * @deprecated since 2.1. Use {@link #setMaxTime(Duration)} instead.
+	 * @param maxTimeMsec
 	 */
-	@Deprecated
-	public void setMaxTime(long timeout, @Nullable TimeUnit timeUnit) {
-		setValue(MetaKey.MAX_TIME_MS.key, (timeUnit != null ? timeUnit : TimeUnit.MILLISECONDS).toMillis(timeout));
+	public void setMaxTimeMsec(long maxTimeMsec) {
+		setMaxTime(Duration.ofMillis(maxTimeMsec));
 	}
 
 	/**
@@ -104,38 +126,18 @@ public void setMaxTime(long timeout, @Nullable TimeUnit timeUnit) {
 	 */
 	public void setMaxTime(Duration timeout) {
 
-		Assert.notNull(timeout, "Timeout must not be null!");
+		Assert.notNull(timeout, "Timeout must not be null");
 		setValue(MetaKey.MAX_TIME_MS.key, timeout.toMillis());
 	}
 
 	/**
-	 * @return {@literal null} if not set.
-	 * @deprecated since 2.2. {@code $maxScan} has been removed without replacement in MongoDB 4.2.
-	 */
-	@Nullable
-	@Deprecated
-	public Long getMaxScan() {
-		return getValue(MetaKey.MAX_SCAN.key);
-	}
-
-	/**
-	 * Only scan the specified number of documents.
-	 *
-	 * @param maxScan
-	 * @deprecated since 2.1. {@code $maxScan} has been removed without replacement in MongoDB 4.2.
-	 */
-	@Deprecated
-	public void setMaxScan(long maxScan) {
-		setValue(MetaKey.MAX_SCAN.key, maxScan);
-	}
-
-	/**
-	 * Add a comment to the query that is propagated to the profile log.
+	 * Return whether the comment is set.
 	 *
-	 * @param comment
+	 * @return {@code true} if set; {@code false} otherwise.
+	 * @since 4.0.6
 	 */
-	public void setComment(String comment) {
-		setValue(MetaKey.COMMENT.key, comment);
+	public boolean hasComment() {
+		return StringUtils.hasText(getComment());
 	}
 
 	/**
@@ -147,29 +149,38 @@ public String getComment() {
 	}
 
 	/**
-	 * Using snapshot prevents the cursor from returning a document more than once.
+	 * Returns the required comment or throws {@link IllegalStateException} if the comment is not set.
 	 *
-	 * @param useSnapshot
-	 * @deprecated since 2.1 due to deprecation as of MongoDB 3.6
+	 * @return the comment.
+	 * @throws IllegalStateException if the comment is not set
+	 * @see #hasComment()
+	 * @since 4.0.6
 	 */
-	@Deprecated
-	public void setSnapshot(boolean useSnapshot) {
-		setValue(MetaKey.SNAPSHOT.key, useSnapshot);
+	public String getRequiredComment() {
+
+		String comment = getComment();
+
+		if (comment == null) {
+			throw new IllegalStateException("Comment not set");
+		}
+
+		return comment;
 	}
 
 	/**
-	 * @return {@literal null} if not set.
+	 * Add a comment to the query that is propagated to the profile log.
+	 *
+	 * @param comment
 	 */
-	public boolean getSnapshot() {
-		return getValue(MetaKey.SNAPSHOT.key, false);
+	public void setComment(String comment) {
+		setValue(MetaKey.COMMENT.key, comment);
 	}
 
 	/**
 	 * @return {@literal null} if not set.
 	 * @since 2.1
 	 */
-	@Nullable
-	public Integer getCursorBatchSize() {
+	public @Nullable Integer getCursorBatchSize() {
 		return cursorBatchSize;
 	}
 
@@ -186,7 +197,7 @@ public void setCursorBatchSize(int cursorBatchSize) {
 	}
 
 	/**
-	 * Add {@link CursorOption} influencing behavior of the {@link com.mongodb.DBCursor}.
+	 * Add {@link CursorOption} influencing behavior of the {@link com.mongodb.client.FindIterable}.
 	 *
 	 * @param option must not be {@literal null}.
 	 * @return
@@ -194,7 +205,12 @@ public void setCursorBatchSize(int cursorBatchSize) {
 	 */
 	public boolean addFlag(CursorOption option) {
 
-		Assert.notNull(option, "CursorOption must not be null!");
+		Assert.notNull(option, "CursorOption must not be null");
+
+		if (this.flags == Collections.EMPTY_SET) {
+			this.flags = new LinkedHashSet<>(2);
+		}
+
 		return this.flags.add(option);
 	}
 
@@ -206,11 +222,36 @@ public Set<CursorOption> getFlags() {
 		return flags;
 	}
 
+	/**
+	 * When set to {@literal true}, aggregation stages can write data to disk.
+	 *
+	 * @return {@literal null} if not set.
+	 * @since 3.0
+	 */
+	@Nullable
+	public Boolean getAllowDiskUse() {
+		return allowDiskUse;
+	}
+
+	/**
+	 * Enables writing to temporary files for aggregation stages and queries. When set to {@literal true}, aggregation
+	 * stages can write data to the {@code _tmp} subdirectory in the {@code dbPath} directory.
+	 * <p>
+	 * Starting in MongoDB 4.2, the profiler log messages and diagnostic log messages includes a {@code usedDisk}
+	 * indicator if any aggregation stage wrote data to temporary files due to memory restrictions.
+	 *
+	 * @param allowDiskUse use {@literal null} for server defaults.
+	 * @since 3.0
+	 */
+	public void setAllowDiskUse(@Nullable Boolean allowDiskUse) {
+		this.allowDiskUse = allowDiskUse;
+	}
+
 	/**
 	 * @return
 	 */
 	public boolean hasValues() {
-		return !this.values.isEmpty() || !this.flags.isEmpty() || this.cursorBatchSize != null;
+		return !this.values.isEmpty() || !this.flags.isEmpty() || this.cursorBatchSize != null || this.allowDiskUse != null;
 	}
 
 	/**
@@ -230,17 +271,20 @@ public Iterable<Entry<String, Object>> values() {
 	 */
 	void setValue(String key, @Nullable Object value) {
 
-		Assert.hasText(key, "Meta key must not be 'null' or blank.");
+		Assert.hasText(key, "Meta key must not be 'null' or blank");
+
+		if (values == Collections.EMPTY_MAP) {
+			values = new LinkedHashMap<>(2);
+		}
 
-		if (value == null || (value instanceof String && !StringUtils.hasText((String) value))) {
+		if (value == null || (value instanceof String stringValue && !StringUtils.hasText(stringValue))) {
 			this.values.remove(key);
 		}
 		this.values.put(key, value);
 	}
 
-	@Nullable
 	@SuppressWarnings("unchecked")
-	private <T> T getValue(String key) {
+	private <T> @Nullable T getValue(String key) {
 		return (T) this.values.get(key);
 	}
 
@@ -250,10 +294,6 @@ private <T> T getValue(String key, T defaultValue) {
 		return value != null ? value : defaultValue;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -262,22 +302,17 @@ public int hashCode() {
 		return hash;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
 		}
 
-		if (!(obj instanceof Meta)) {
+		if (!(obj instanceof Meta other)) {
 			return false;
 		}
 
-		Meta other = (Meta) obj;
 		if (!ObjectUtils.nullSafeEquals(this.values, other.values)) {
 			return false;
 		}
@@ -300,8 +335,12 @@ public enum CursorOption {
 		 */
 		EXHAUST,
 
-		/** Allows querying of a replica slave. */
-		SLAVE_OK,
+		/**
+		 * Allows querying of a replica.
+		 *
+		 * @since 3.0.2
+		 */
+		SECONDARY_READS,
 
 		/**
 		 * Sets the cursor to return partial data from a query against a sharded cluster in which some shards do not respond
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MetricConversion.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MetricConversion.java
index f78bb850d6..5625de5e93 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MetricConversion.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MetricConversion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2025 the original author 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,16 +17,20 @@
 package org.springframework.data.mongodb.core.query;
 
 import java.math.BigDecimal;
+import java.math.MathContext;
 import java.math.RoundingMode;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metric;
 import org.springframework.data.geo.Metrics;
+import org.springframework.util.Assert;
 
 /**
  * {@link Metric} and {@link Distance} conversions using the metric system.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
  * @since 2.2
  */
 public class MetricConversion {
@@ -61,6 +65,28 @@ public static double getDistanceInMeters(Distance distance) {
 				.doubleValue();
 	}
 
+	/**
+	 * Return {@code distance} in radians (on an earth like sphere).
+	 *
+	 * @param distance must not be {@literal null}.
+	 * @return distance in radians.
+	 * @since 3.4.4
+	 */
+	public static double toRadians(Distance distance) {
+		return metersToRadians(getDistanceInMeters(distance));
+	}
+
+	/**
+	 * Return {@code distance} in radians (on an earth like sphere).
+	 *
+	 * @param meters
+	 * @return distance in radians.
+	 * @since 3.4.4
+	 */
+	public static double metersToRadians(double meters) {
+		return BigDecimal.valueOf(meters).divide(METERS_MULTIPLIER, MathContext.DECIMAL64).doubleValue();
+	}
+
 	/**
 	 * Return {@code metric} to meters multiplier.
 	 *
@@ -87,16 +113,16 @@ private static class ConversionMultiplier {
 
 		ConversionMultiplier(Number source, Number target) {
 
-			if (source instanceof BigDecimal) {
-				this.source = (BigDecimal) source;
+			if (source instanceof BigDecimal bigDecimal) {
+				this.source = bigDecimal;
 			} else {
-				this.source = new BigDecimal(source.doubleValue());
+				this.source = BigDecimal.valueOf(source.doubleValue());
 			}
 
-			if (target instanceof BigDecimal) {
-				this.target = (BigDecimal) target;
+			if (target instanceof BigDecimal bigDecimal) {
+				this.target = bigDecimal;
 			} else {
-				this.target = new BigDecimal(target.doubleValue());
+				this.target = BigDecimal.valueOf(target.doubleValue());
 			}
 		}
 
@@ -127,8 +153,8 @@ static ConversionMultiplierBuilder builder() {
 	 */
 	private static class ConversionMultiplierBuilder {
 
-		private Number from;
-		private Number to;
+		private @Nullable Number from;
+		private @Nullable Number to;
 
 		ConversionMultiplierBuilder() {}
 
@@ -153,6 +179,9 @@ ConversionMultiplierBuilder to(Metric to) {
 		}
 
 		ConversionMultiplier build() {
+
+			Assert.notNull(from, "[From] must be set first");
+			Assert.notNull(to, "[To] must be set first");
 			return new ConversionMultiplier(this.from, this.to);
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MongoRegexCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MongoRegexCreator.java
index 5901375110..b37c088981 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MongoRegexCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/MongoRegexCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 
 import java.util.regex.Pattern;
 
-import org.springframework.lang.Nullable;
+import org.bson.BsonRegularExpression;
+import org.jspecify.annotations.Nullable;
 
 /**
  * @author Christoph Strobl
@@ -67,7 +68,7 @@ public enum MatchMode {
 		 */
 		REGEX,
 
-		LIKE;
+		LIKE
 	}
 
 	private static final Pattern PUNCTATION_PATTERN = Pattern.compile("\\p{Punct}");
@@ -79,8 +80,7 @@ public enum MatchMode {
 	 * @param matcherType the type of matching to perform
 	 * @return {@literal source} when {@literal source} or {@literal matcherType} is {@literal null}.
 	 */
-	@Nullable
-	public String toRegularExpression(@Nullable String source, @Nullable MatchMode matcherType) {
+	public @Nullable String toRegularExpression(@Nullable String source, @Nullable MatchMode matcherType) {
 
 		if (matcherType == null || source == null) {
 			return source;
@@ -88,18 +88,24 @@ public String toRegularExpression(@Nullable String source, @Nullable MatchMode m
 
 		String regex = prepareAndEscapeStringBeforeApplyingLikeRegex(source, matcherType);
 
-		switch (matcherType) {
-			case STARTING_WITH:
-				return String.format("^%s", regex);
-			case ENDING_WITH:
-				return String.format("%s$", regex);
-			case CONTAINING:
-				return String.format(".*%s.*", regex);
-			case EXACT:
-				return String.format("^%s$", regex);
-			default:
-				return regex;
-		}
+		return switch (matcherType) {
+			case STARTING_WITH -> String.format("^%s", regex);
+			case ENDING_WITH -> String.format("%s$", regex);
+			case CONTAINING -> String.format(".*%s.*", regex);
+			case EXACT -> String.format("^%s$", regex);
+			default -> regex;
+		};
+	}
+
+	/**
+	 * @param source
+	 * @return
+	 * @since 2.2.14
+	 * @deprecated since 4.1.1
+	 */
+	@Deprecated(since = "4.1.1", forRemoval = true)
+	public Object toCaseInsensitiveMatch(Object source) {
+		return source instanceof String stringValue ? new BsonRegularExpression(Pattern.quote(stringValue), "i") : source;
 	}
 
 	private String prepareAndEscapeStringBeforeApplyingLikeRegex(String source, MatchMode matcherType) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/NearQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/NearQuery.java
index 4a9a309c6a..88d7dc5c1d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/NearQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/NearQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,24 @@
 import java.util.Arrays;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.CustomMetric;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metric;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.ReadConcernAware;
+import org.springframework.data.mongodb.core.ReadPreferenceAware;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+
 /**
  * Builder class to build near-queries. <br />
  * MongoDB {@code $geoNear} operator allows usage of a {@literal GeoJSON Point} or legacy coordinate pair. Though
@@ -40,10 +47,10 @@
  * actual type within the document is of no concern at this point.<br />
  * To avoid a serious headache make sure to set the {@link Metric} to the desired unit of measure which ensures the
  * distance to be calculated correctly.<br />
- * <p />
+ * <br />
  * In other words: <br />
  * Assume you've got 5 Documents like the ones below <br />
- * 
+ *
  * <pre>
  *     <code>
  * {
@@ -73,10 +80,10 @@
  * }
  *      </code>
  * </pre>
- * 
+ *
  * Fetching all Documents within a 400 Meter radius from {@code [-73.99171, 40.738868] } would look like this using
  * {@literal GeoJSON}:
- * 
+ *
  * <pre>
  *     <code>
  * {
@@ -92,9 +99,9 @@
  *
  *     </code>
  * </pre>
- * 
+ *
  * resulting in the following 3 Documents.
- * 
+ *
  * <pre>
  *     <code>
  * {
@@ -117,11 +124,11 @@
  * }
  *     </code>
  * </pre>
- * 
+ *
  * Using legacy coordinate pairs one operates upon radians as discussed before. Assume we use {@link Metrics#KILOMETERS}
  * when constructing the geoNear command. The {@link Metric} will make sure the distance multiplier is set correctly, so
  * the command is rendered like
- * 
+ *
  * <pre>
  *     <code>
  * {
@@ -137,12 +144,12 @@
  * }
  *     </code>
  * </pre>
- * 
+ *
  * Please note the calculated distance now uses {@literal Kilometers} instead of {@literal Meters} as unit of measure,
  * so we need to take it times 1000 to match up to {@literal Meters} as in the {@literal GeoJSON} variant. <br />
  * Still as we've been requesting the {@link Distance} in {@link Metrics#KILOMETERS} the {@link Distance#getValue()}
  * reflects exactly this.
- * 
+ *
  * <pre>
  *     <code>
  * {
@@ -171,7 +178,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public final class NearQuery {
+public final class NearQuery implements ReadConcernAware, ReadPreferenceAware {
 
 	private final Point point;
 	private @Nullable Query query;
@@ -181,6 +188,8 @@ public final class NearQuery {
 	private boolean spherical;
 	private @Nullable Long limit;
 	private @Nullable Long skip;
+	private @Nullable ReadConcern readConcern;
+	private @Nullable ReadPreference readPreference;
 
 	/**
 	 * Creates a new {@link NearQuery}.
@@ -190,8 +199,8 @@ public final class NearQuery {
 	 */
 	private NearQuery(Point point, Metric metric) {
 
-		Assert.notNull(point, "Point must not be null!");
-		Assert.notNull(metric, "Metric must not be null!");
+		Assert.notNull(point, "Point must not be null");
+		Assert.notNull(metric, "Metric must not be null");
 
 		this.point = point;
 		this.spherical = false;
@@ -225,7 +234,7 @@ public static NearQuery near(double x, double y, Metric metric) {
 
 	/**
 	 * Creates a new {@link NearQuery} starting at the given {@link Point}. <br />
-	 * <strong>NOTE</strong> There is a difference in using {@link Point} versus {@link GeoJsonPoint}. {@link Point}
+	 * <strong>NOTE:</strong> There is a difference in using {@link Point} versus {@link GeoJsonPoint}. {@link Point}
 	 * values are rendered as coordinate pairs in the legacy format and operate upon radians, whereas the
 	 * {@link GeoJsonPoint} uses according to its specification {@literal meters} as unit of measure. This may lead to
 	 * different results when using a {@link Metrics#NEUTRAL neutral Metric}.
@@ -241,7 +250,7 @@ public static NearQuery near(Point point) {
 	 * Creates a {@link NearQuery} starting near the given {@link Point} using the given {@link Metric} to adapt given
 	 * values to further configuration. E.g. setting a {@link #maxDistance(double)} will be interpreted as a value of the
 	 * initially set {@link Metric}. <br />
-	 * <strong>NOTE</strong> There is a difference in using {@link Point} versus {@link GeoJsonPoint}. {@link Point}
+	 * <strong>NOTE:</strong> There is a difference in using {@link Point} versus {@link GeoJsonPoint}. {@link Point}
 	 * values are rendered as coordinate pairs in the legacy format and operate upon radians, whereas the
 	 * {@link GeoJsonPoint} uses according to its specification {@literal meters} as unit of measure. This may lead to
 	 * different results when using a {@link Metrics#NEUTRAL neutral Metric}.
@@ -264,18 +273,6 @@ public Metric getMetric() {
 		return metric;
 	}
 
-	/**
-	 * Configures the maximum number of results to return.
-	 *
-	 * @param num
-	 * @return
-	 * @deprecated since 2.2. Please use {@link #limit(long)} instead.
-	 */
-	@Deprecated
-	public NearQuery num(long num) {
-		return limit(num);
-	}
-
 	/**
 	 * Configures the maximum number of results to return.
 	 *
@@ -283,6 +280,7 @@ public NearQuery num(long num) {
 	 * @return
 	 * @since 2.2
 	 */
+	@Contract("_ -> this")
 	public NearQuery limit(long limit) {
 		this.limit = limit;
 		return this;
@@ -294,6 +292,7 @@ public NearQuery limit(long limit) {
 	 * @param skip
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery skip(long skip) {
 		this.skip = skip;
 		return this;
@@ -305,9 +304,10 @@ public NearQuery skip(long skip) {
 	 * @param pageable must not be {@literal null}
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery with(Pageable pageable) {
 
-		Assert.notNull(pageable, "Pageable must not be 'null'.");
+		Assert.notNull(pageable, "Pageable must not be 'null'");
 		if (pageable.isPaged()) {
 			this.skip = pageable.getOffset();
 			this.limit = (long) pageable.getPageSize();
@@ -328,8 +328,9 @@ public NearQuery with(Pageable pageable) {
 	 * @param maxDistance
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery maxDistance(double maxDistance) {
-		return maxDistance(new Distance(maxDistance, getMetric()));
+		return maxDistance(Distance.of(maxDistance, getMetric()));
 	}
 
 	/**
@@ -340,11 +341,12 @@ public NearQuery maxDistance(double maxDistance) {
 	 * @param metric must not be {@literal null}.
 	 * @return
 	 */
+	@Contract("_, _ -> this")
 	public NearQuery maxDistance(double maxDistance, Metric metric) {
 
-		Assert.notNull(metric, "Metric must not be null!");
+		Assert.notNull(metric, "Metric must not be null");
 
-		return maxDistance(new Distance(maxDistance, metric));
+		return maxDistance(Distance.of(maxDistance, metric));
 	}
 
 	/**
@@ -354,9 +356,10 @@ public NearQuery maxDistance(double maxDistance, Metric metric) {
 	 * @param distance must not be {@literal null}.
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery maxDistance(Distance distance) {
 
-		Assert.notNull(distance, "Distance must not be null!");
+		Assert.notNull(distance, "Distance must not be null");
 
 		if (distance.getMetric() != Metrics.NEUTRAL) {
 			this.spherical(true);
@@ -384,8 +387,9 @@ public NearQuery maxDistance(Distance distance) {
 	 * @return
 	 * @since 1.7
 	 */
+	@Contract("_ -> this")
 	public NearQuery minDistance(double minDistance) {
-		return minDistance(new Distance(minDistance, getMetric()));
+		return minDistance(Distance.of(minDistance, getMetric()));
 	}
 
 	/**
@@ -397,11 +401,12 @@ public NearQuery minDistance(double minDistance) {
 	 * @return
 	 * @since 1.7
 	 */
+	@Contract("_, _ -> this")
 	public NearQuery minDistance(double minDistance, Metric metric) {
 
-		Assert.notNull(metric, "Metric must not be null!");
+		Assert.notNull(metric, "Metric must not be null");
 
-		return minDistance(new Distance(minDistance, metric));
+		return minDistance(Distance.of(minDistance, metric));
 	}
 
 	/**
@@ -412,9 +417,10 @@ public NearQuery minDistance(double minDistance, Metric metric) {
 	 * @return
 	 * @since 1.7
 	 */
+	@Contract("_ -> this")
 	public NearQuery minDistance(Distance distance) {
 
-		Assert.notNull(distance, "Distance must not be null!");
+		Assert.notNull(distance, "Distance must not be null");
 
 		if (distance.getMetric() != Metrics.NEUTRAL) {
 			this.spherical(true);
@@ -433,8 +439,7 @@ public NearQuery minDistance(Distance distance) {
 	 *
 	 * @return
 	 */
-	@Nullable
-	public Distance getMaxDistance() {
+	public @Nullable Distance getMaxDistance() {
 		return this.maxDistance;
 	}
 
@@ -444,8 +449,7 @@ public Distance getMaxDistance() {
 	 * @return
 	 * @since 1.7
 	 */
-	@Nullable
-	public Distance getMinDistance() {
+	public @Nullable Distance getMinDistance() {
 		return this.minDistance;
 	}
 
@@ -455,6 +459,7 @@ public Distance getMinDistance() {
 	 * @param distanceMultiplier
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery distanceMultiplier(double distanceMultiplier) {
 
 		this.metric = new CustomMetric(distanceMultiplier);
@@ -467,6 +472,7 @@ public NearQuery distanceMultiplier(double distanceMultiplier) {
 	 * @param spherical
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery spherical(boolean spherical) {
 		this.spherical = spherical;
 		return this;
@@ -487,6 +493,7 @@ public boolean isSpherical() {
 	 *
 	 * @return
 	 */
+	@Contract("-> this")
 	public NearQuery inKilometers() {
 		return adaptMetric(Metrics.KILOMETERS);
 	}
@@ -497,6 +504,7 @@ public NearQuery inKilometers() {
 	 *
 	 * @return
 	 */
+	@Contract("-> this")
 	public NearQuery inMiles() {
 		return adaptMetric(Metrics.MILES);
 	}
@@ -509,6 +517,7 @@ public NearQuery inMiles() {
 	 *          passed.
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery in(@Nullable Metric metric) {
 		return adaptMetric(metric == null ? Metrics.NEUTRAL : metric);
 	}
@@ -519,6 +528,7 @@ public NearQuery in(@Nullable Metric metric) {
 	 *
 	 * @param metric
 	 */
+	@Contract("_ -> this")
 	private NearQuery adaptMetric(Metric metric) {
 
 		if (metric != Metrics.NEUTRAL) {
@@ -535,9 +545,10 @@ private NearQuery adaptMetric(Metric metric) {
 	 * @param query must not be {@literal null}.
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public NearQuery query(Query query) {
 
-		Assert.notNull(query, "Cannot apply 'null' query on NearQuery.");
+		Assert.notNull(query, "Cannot apply 'null' query on NearQuery");
 
 		this.query = query;
 		this.skip = query.getSkip();
@@ -551,22 +562,88 @@ public NearQuery query(Query query) {
 	/**
 	 * @return the number of elements to skip.
 	 */
-	@Nullable
-	public Long getSkip() {
+	public @Nullable Long getSkip() {
 		return skip;
 	}
 
 	/**
 	 * Get the {@link Collation} to use along with the {@link #query(Query)}.
-	 * 
+	 *
 	 * @return the {@link Collation} if set. {@literal null} otherwise.
 	 * @since 2.2
 	 */
-	@Nullable
-	public Collation getCollation() {
+	public @Nullable Collation getCollation() {
 		return query != null ? query.getCollation().orElse(null) : null;
 	}
 
+	/**
+	 * Configures the query to use the given {@link ReadConcern} unless the underlying {@link #query(Query)}
+	 * {@link Query#hasReadConcern() specifies} another one.
+	 *
+	 * @param readConcern must not be {@literal null}.
+	 * @return this.
+	 * @since 4.1
+	 */
+	@Contract("_ -> this")
+	public NearQuery withReadConcern(ReadConcern readConcern) {
+
+		Assert.notNull(readConcern, "ReadConcern must not be null");
+		this.readConcern = readConcern;
+		return this;
+	}
+
+	/**
+	 * Configures the query to use the given {@link ReadPreference} unless the underlying {@link #query(Query)}
+	 * {@link Query#hasReadPreference() specifies} another one.
+	 *
+	 * @param readPreference must not be {@literal null}.
+	 * @return this.
+	 * @since 4.1
+	 */
+	@Contract("_ -> this")
+	public NearQuery withReadPreference(ReadPreference readPreference) {
+
+		Assert.notNull(readPreference, "ReadPreference must not be null");
+		this.readPreference = readPreference;
+		return this;
+	}
+
+	/**
+	 * Get the {@link ReadConcern} to use. Will return the underlying {@link #query(Query) queries}
+	 * {@link Query#getReadConcern() ReadConcern} if present or the one defined on the {@link NearQuery#readConcern}
+	 * itself.
+	 *
+	 * @return can be {@literal null} if none set.
+	 * @since 4.1
+	 * @see ReadConcernAware
+	 */
+	@Override
+	public @Nullable ReadConcern getReadConcern() {
+
+		if (query != null && query.hasReadConcern()) {
+			return query.getReadConcern();
+		}
+		return readConcern;
+	}
+
+	/**
+	 * Get the {@link ReadPreference} to use. Will return the underlying {@link #query(Query) queries}
+	 * {@link Query#getReadPreference() ReadPreference} if present or the one defined on the
+	 * {@link NearQuery#readPreference} itself.
+	 *
+	 * @return can be {@literal null} if none set.
+	 * @since 4.1
+	 * @see ReadPreferenceAware
+	 */
+	@Override
+	public @Nullable ReadPreference getReadPreference() {
+
+		if (query != null && query.hasReadPreference()) {
+			return query.getReadPreference();
+		}
+		return readPreference;
+	}
+
 	/**
 	 * Returns the {@link Document} built by the {@link NearQuery}.
 	 *
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
index 2d47d39aba..47ce615fe3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,29 +15,41 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.springframework.data.mongodb.core.query.SerializationUtils.*;
-import static org.springframework.util.ObjectUtils.*;
+import static org.springframework.data.mongodb.core.query.SerializationUtils.serializeToJsonSafely;
+import static org.springframework.util.ObjectUtils.nullSafeEquals;
+import static org.springframework.util.ObjectUtils.nullSafeHashCode;
 
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.OffsetScrollPosition;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.core.ReadConcernAware;
+import org.springframework.data.mongodb.core.ReadPreferenceAware;
+import org.springframework.data.mongodb.core.query.Meta.CursorOption;
 import org.springframework.data.mongodb.util.BsonUtils;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+
 /**
  * MongoDB Query object representing criteria, projection, sorting and query hints.
  *
@@ -46,28 +58,48 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Anton Barkan
  */
-public class Query {
+public class Query implements ReadConcernAware, ReadPreferenceAware {
 
 	private static final String RESTRICTED_TYPES_KEY = "_$RESTRICTED_TYPES";
 
-	private final Set<Class<?>> restrictedTypes = new HashSet<>();
+	private Set<Class<?>> restrictedTypes = Collections.emptySet();
 	private final Map<String, CriteriaDefinition> criteria = new LinkedHashMap<>();
 	private @Nullable Field fieldSpec = null;
 	private Sort sort = Sort.unsorted();
 	private long skip;
-	private int limit;
+	private Limit limit = Limit.unlimited();
+
+	private @Nullable KeysetScrollPosition keysetScrollPosition;
+	private @Nullable ReadConcern readConcern;
+	private @Nullable ReadPreference readPreference;
+
 	private @Nullable String hint;
 
 	private Meta meta = new Meta();
 
 	private Optional<Collation> collation = Optional.empty();
 
+	Query(Query query) {
+		this.restrictedTypes = query.restrictedTypes;
+		this.fieldSpec = query.fieldSpec;
+		this.sort = query.sort;
+		this.limit = query.limit;
+		this.skip = query.skip;
+		this.keysetScrollPosition = query.keysetScrollPosition;
+		this.readConcern = query.readConcern;
+		this.readPreference = query.readPreference;
+		this.hint = query.hint;
+		this.meta = query.meta;
+		this.collation = query.collation;
+	}
+
 	/**
 	 * Static factory method to create a {@link Query} using the provided {@link CriteriaDefinition}.
 	 *
 	 * @param criteriaDefinition must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link Query}.
 	 * @since 1.6
 	 */
 	public static Query query(CriteriaDefinition criteriaDefinition) {
@@ -90,11 +122,14 @@ public Query(CriteriaDefinition criteriaDefinition) {
 	 * Adds the given {@link CriteriaDefinition} to the current {@link Query}.
 	 *
 	 * @param criteriaDefinition must not be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 1.6
 	 */
+	@Contract("_ -> this")
 	public Query addCriteria(CriteriaDefinition criteriaDefinition) {
 
+		Assert.notNull(criteriaDefinition, "CriteriaDefinition must not be null");
+
 		CriteriaDefinition existing = this.criteria.get(criteriaDefinition.getKey());
 		String key = criteriaDefinition.getKey();
 
@@ -102,8 +137,8 @@ public Query addCriteria(CriteriaDefinition criteriaDefinition) {
 			this.criteria.put(key, criteriaDefinition);
 		} else {
 			throw new InvalidMongoDbApiUsageException(
-					String.format("Due to limitations of the com.mongodb.BasicDocument, you can't add a second '%s' criteria. "
-							+ "Query already contains '%s'", key, serializeToJsonSafely(existing.getCriteriaObject())));
+					String.format("Due to limitations of the com.mongodb.BasicDocument, you can't add a second '%s' criteria;"
+							+ " Query already contains '%s'", key, serializeToJsonSafely(existing.getCriteriaObject())));
 		}
 
 		return this;
@@ -119,53 +154,134 @@ public Field fields() {
 	}
 
 	/**
-	 * Set number of documents to skip before returning results.
+	 * Set number of documents to skip before returning results. Use {@literal zero} or a {@literal negative} value to
+	 * avoid skipping.
 	 *
-	 * @param skip
-	 * @return
+	 * @param skip number of documents to skip. Use {@literal zero} or a {@literal negative} value to avoid skipping.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Query skip(long skip) {
 		this.skip = skip;
 		return this;
 	}
 
 	/**
-	 * Limit the number of returned documents to {@code limit}.
+	 * Limit the number of returned documents to {@code limit}. A {@literal zero} or {@literal negative} value is
+	 * considered as unlimited.
 	 *
-	 * @param limit
-	 * @return
+	 * @param limit number of documents to return. Use {@literal zero} or {@literal negative} for unlimited.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Query limit(int limit) {
-		this.limit = limit;
+		this.limit = limit > 0 ? Limit.of(limit) : Limit.unlimited();
 		return this;
 	}
 
 	/**
-	 * Configures the query to use the given hint when being executed. {@code hint} is parsed as {@link Document}.
+	 * Limit the number of returned documents to {@link Limit}.
+	 *
+	 * @param limit number of documents to return.
+	 * @return this.
+	 * @since 4.2
+	 */
+	@Contract("_ -> this")
+	public Query limit(Limit limit) {
+
+		Assert.notNull(limit, "Limit must not be null");
+
+		if (limit.isUnlimited()) {
+			this.limit = limit;
+			return this;
+		}
+
+		// retain zero/negative semantics for unlimited.
+		return limit(limit.max());
+	}
+
+	/**
+	 * Configures the query to use the given hint when being executed. The {@code hint} can either be an index name or a
+	 * json {@link Document} representation.
 	 *
 	 * @param hint must not be {@literal null} or empty.
-	 * @return
+	 * @return this.
 	 * @see Document#parse(String)
-	 * @deprecated since 2.2, use {@link #withHint(Document)}
 	 */
-	@Deprecated
+	@Contract("_ -> this")
 	public Query withHint(String hint) {
 
-		Assert.hasText(hint, "Hint must not be empty or null!");
+		Assert.hasText(hint, "Hint must not be empty or null");
 		this.hint = hint;
 		return this;
 	}
 
+	/**
+	 * Configures the query to use the given {@link ReadConcern} when being executed.
+	 *
+	 * @param readConcern must not be {@literal null}.
+	 * @return this.
+	 * @since 3.1
+	 */
+	@Contract("_ -> this")
+	public Query withReadConcern(ReadConcern readConcern) {
+
+		Assert.notNull(readConcern, "ReadConcern must not be null");
+		this.readConcern = readConcern;
+		return this;
+	}
+
+	/**
+	 * Configures the query to use the given {@link ReadPreference} when being executed.
+	 *
+	 * @param readPreference must not be {@literal null}.
+	 * @return this.
+	 * @since 4.1
+	 */
+	@Contract("_ -> this")
+	public Query withReadPreference(ReadPreference readPreference) {
+
+		Assert.notNull(readPreference, "ReadPreference must not be null");
+		this.readPreference = readPreference;
+		return this;
+	}
+
+	@Override
+	public boolean hasReadConcern() {
+		return this.readConcern != null;
+	}
+
+	@Override
+	public @Nullable ReadConcern getReadConcern() {
+		return this.readConcern;
+	}
+
+	@Override
+	public boolean hasReadPreference() {
+		return this.readPreference != null || getMeta().getFlags().contains(CursorOption.SECONDARY_READS);
+	}
+
+	@Override
+	public @Nullable ReadPreference getReadPreference() {
+
+		if (readPreference == null) {
+			return getMeta().getFlags().contains(CursorOption.SECONDARY_READS) ? ReadPreference.primaryPreferred() : null;
+		}
+
+		return this.readPreference;
+	}
+
 	/**
 	 * Configures the query to use the given {@link Document hint} when being executed.
 	 *
 	 * @param hint must not be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 2.2
 	 */
+	@Contract("_ -> this")
 	public Query withHint(Document hint) {
 
-		Assert.notNull(hint, "Hint must not be null!");
+		Assert.notNull(hint, "Hint must not be null");
 		this.hint = hint.toJson();
 		return this;
 	}
@@ -174,30 +290,93 @@ public Query withHint(Document hint) {
 	 * Sets the given pagination information on the {@link Query} instance. Will transparently set {@code skip} and
 	 * {@code limit} as well as applying the {@link Sort} instance defined with the {@link Pageable}.
 	 *
-	 * @param pageable
-	 * @return
+	 * @param pageable must not be {@literal null}.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Query with(Pageable pageable) {
 
-		if (pageable.isUnpaged()) {
-			return this;
+		if (pageable.isPaged()) {
+			this.limit = pageable.toLimit();
+			this.skip = pageable.getOffset();
 		}
 
-		this.limit = pageable.getPageSize();
-		this.skip = pageable.getOffset();
-
 		return with(pageable.getSort());
 	}
 
+	/**
+	 * Sets the given cursor position on the {@link Query} instance. Will transparently set {@code skip}.
+	 *
+	 * @param position must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public Query with(ScrollPosition position) {
+
+		Assert.notNull(position, "ScrollPosition must not be null");
+
+		if (position instanceof OffsetScrollPosition offset) {
+			return with(offset);
+		}
+
+		if (position instanceof KeysetScrollPosition keyset) {
+			return with(keyset);
+		}
+
+		throw new IllegalArgumentException(String.format("ScrollPosition %s not supported", position));
+	}
+
+	/**
+	 * Sets the given cursor position on the {@link Query} instance. Will transparently set {@code skip}.
+	 *
+	 * @param position must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public Query with(OffsetScrollPosition position) {
+
+		Assert.notNull(position, "ScrollPosition must not be null");
+
+		this.skip = position.isInitial() ? 0 : position.getOffset() + 1;
+		this.keysetScrollPosition = null;
+		return this;
+	}
+
+	/**
+	 * Sets the given cursor position on the {@link Query} instance. Will transparently reset {@code skip}.
+	 *
+	 * @param position must not be {@literal null}.
+	 * @return this.
+	 */
+	@Contract("_ -> this")
+	public Query with(KeysetScrollPosition position) {
+
+		Assert.notNull(position, "ScrollPosition must not be null");
+
+		this.skip = 0;
+		this.keysetScrollPosition = position;
+
+		return this;
+	}
+
+	public boolean hasKeyset() {
+		return keysetScrollPosition != null;
+	}
+
+	public @Nullable KeysetScrollPosition getKeyset() {
+		return keysetScrollPosition;
+	}
+
 	/**
 	 * Adds a {@link Sort} to the {@link Query} instance.
 	 *
-	 * @param sort
-	 * @return
+	 * @param sort must not be {@literal null}.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public Query with(Sort sort) {
 
-		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(sort, "Sort must not be null");
 
 		if (sort.isUnsorted()) {
 			return this;
@@ -205,8 +384,8 @@ public Query with(Sort sort) {
 
 		sort.stream().filter(Order::isIgnoreCase).findFirst().ifPresent(it -> {
 
-			throw new IllegalArgumentException(String.format("Given sort contained an Order for %s with ignore case! "
-					+ "MongoDB does not support sorting ignoring case currently!", it.getProperty()));
+			throw new IllegalArgumentException(String.format("Given sort contained an Order for %s with ignore case;"
+					+ " MongoDB does not support sorting ignoring case currently", it.getProperty()));
 		});
 
 		this.sort = this.sort.and(sort);
@@ -226,15 +405,23 @@ public Set<Class<?>> getRestrictedTypes() {
 	 *
 	 * @param type may not be {@literal null}
 	 * @param additionalTypes may not be {@literal null}
-	 * @return
+	 * @return this.
 	 */
+	@Contract("_, _ -> this")
 	public Query restrict(Class<?> type, Class<?>... additionalTypes) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 		Assert.notNull(additionalTypes, "AdditionalTypes must not be null");
 
+		if (restrictedTypes == Collections.EMPTY_SET) {
+			restrictedTypes = new HashSet<>(1 + additionalTypes.length);
+		}
+
 		restrictedTypes.add(type);
-		restrictedTypes.addAll(Arrays.asList(additionalTypes));
+
+		if (additionalTypes.length > 0) {
+			restrictedTypes.addAll(Arrays.asList(additionalTypes));
+		}
 
 		return this;
 	}
@@ -244,6 +431,17 @@ public Query restrict(Class<?> type, Class<?>... additionalTypes) {
 	 */
 	public Document getQueryObject() {
 
+		if (criteria.isEmpty() && restrictedTypes.isEmpty()) {
+			return BsonUtils.EMPTY_DOCUMENT;
+		}
+
+		if (criteria.size() == 1 && restrictedTypes.isEmpty()) {
+
+			for (CriteriaDefinition definition : criteria.values()) {
+				return definition.getCriteriaObject();
+			}
+		}
+
 		Document document = new Document();
 
 		for (CriteriaDefinition definition : criteria.values()) {
@@ -261,7 +459,7 @@ public Document getQueryObject() {
 	 * @return the field {@link Document}.
 	 */
 	public Document getFieldsObject() {
-		return this.fieldSpec == null ? new Document() : fieldSpec.getFieldsObject();
+		return this.fieldSpec == null ? BsonUtils.EMPTY_DOCUMENT : fieldSpec.getFieldsObject();
 	}
 
 	/**
@@ -270,13 +468,12 @@ public Document getFieldsObject() {
 	public Document getSortObject() {
 
 		if (this.sort.isUnsorted()) {
-			return new Document();
+			return BsonUtils.EMPTY_DOCUMENT;
 		}
 
 		Document document = new Document();
 
-		this.sort.stream()//
-				.forEach(order -> document.put(order.getProperty(), order.isAscending() ? 1 : -1));
+		this.sort.forEach(order -> document.put(order.getProperty(), order.isAscending() ? 1 : -1));
 
 		return document;
 	}
@@ -293,29 +490,39 @@ public boolean isSorted() {
 	}
 
 	/**
-	 * Get the number of documents to skip.
+	 * Get the number of documents to skip. {@literal Zero} or a {@literal negative} value indicates no skip.
 	 *
-	 * @return
+	 * @return number of documents to skip
 	 */
 	public long getSkip() {
 		return this.skip;
 	}
 
 	/**
-	 * Get the maximum number of documents to be return.
+	 * Returns whether the query is {@link #limit(int) limited}.
 	 *
-	 * @return
+	 * @return {@code true} if the query is limited; {@code false} otherwise.
+	 * @since 4.1
+	 */
+	public boolean isLimited() {
+		return this.limit.isLimited();
+	}
+
+	/**
+	 * Get the maximum number of documents to be return. {@literal Zero} or a {@literal negative} value indicates no
+	 * limit.
+	 *
+	 * @return number of documents to return.
+	 * @see #isLimited()
 	 */
 	public int getLimit() {
-		return this.limit;
+		return limit.isUnlimited() ? 0 : this.limit.max();
 	}
 
 	/**
-	 * @return
-	 * @deprecated since 2.2. Return type to be changed to {@link Document}.
+	 * @return can be {@literal null}.
 	 */
 	@Nullable
-	@Deprecated
 	public String getHint() {
 		return hint;
 	}
@@ -326,6 +533,7 @@ public String getHint() {
 	 * @see Meta#setMaxTimeMsec(long)
 	 * @since 1.6
 	 */
+	@Contract("_ -> this")
 	public Query maxTimeMsec(long maxTimeMsec) {
 
 		meta.setMaxTimeMsec(maxTimeMsec);
@@ -333,54 +541,27 @@ public Query maxTimeMsec(long maxTimeMsec) {
 	}
 
 	/**
-	 * @param timeout
-	 * @param timeUnit
-	 * @return this.
-	 * @see Meta#setMaxTime(long, TimeUnit)
-	 * @since 1.6
-	 * @deprecated since 2.1. Use {@link #maxTime(Duration)} instead.
-	 */
-	@Deprecated
-	public Query maxTime(long timeout, TimeUnit timeUnit) {
-
-		meta.setMaxTime(timeout, timeUnit);
-		return this;
-	}
-
-	/**
-	 * @param timeout
+	 * @param timeout must not be {@literal null}.
 	 * @return this.
 	 * @see Meta#setMaxTime(Duration)
 	 * @since 2.1
 	 */
+	@Contract("_ -> this")
 	public Query maxTime(Duration timeout) {
 
 		meta.setMaxTime(timeout);
 		return this;
 	}
 
-	/**
-	 * @param maxScan
-	 * @return this.
-	 * @see Meta#setMaxScan(long)
-	 * @since 1.6
-	 * @deprecated since 2.1 due to deprecation in MongoDB 4.0.
-	 */
-	@Deprecated
-	public Query maxScan(long maxScan) {
-
-		meta.setMaxScan(maxScan);
-		return this;
-	}
-
 	/**
 	 * Add a comment to the query that is propagated to the profile log.
 	 *
-	 * @param comment
+	 * @param comment must not be {@literal null}.
 	 * @return this.
 	 * @see Meta#setComment(String)
 	 * @since 1.6
 	 */
+	@Contract("_ -> this")
 	public Query comment(String comment) {
 
 		meta.setComment(comment);
@@ -388,15 +569,21 @@ public Query comment(String comment) {
 	}
 
 	/**
+	 * Enables writing to temporary files for aggregation stages and queries. When set to {@literal true}, aggregation
+	 * stages can write data to the {@code _tmp} subdirectory in the {@code dbPath} directory.
+	 * <p>
+	 * Starting in MongoDB 4.2, the profiler log messages and diagnostic log messages includes a {@code usedDisk}
+	 * indicator if any aggregation stage wrote data to temporary files due to memory restrictions.
+	 *
+	 * @param allowDiskUse
 	 * @return this.
-	 * @see Meta#setSnapshot(boolean)
-	 * @since 1.6
-	 * @deprecated since 2.1 due to deprecation as of MongoDB 3.6
+	 * @see Meta#setAllowDiskUse(Boolean)
+	 * @since 3.2
 	 */
-	@Deprecated
-	public Query useSnapshot() {
+	@Contract("_ -> this")
+	public Query allowDiskUse(boolean allowDiskUse) {
 
-		meta.setSnapshot(true);
+		meta.setAllowDiskUse(allowDiskUse);
 		return this;
 	}
 
@@ -410,6 +597,7 @@ public Query useSnapshot() {
 	 * @see Meta#setCursorBatchSize(int)
 	 * @since 2.1
 	 */
+	@Contract("_ -> this")
 	public Query cursorBatchSize(int batchSize) {
 
 		meta.setCursorBatchSize(batchSize);
@@ -421,6 +609,7 @@ public Query cursorBatchSize(int batchSize) {
 	 * @see org.springframework.data.mongodb.core.query.Meta.CursorOption#NO_TIMEOUT
 	 * @since 1.10
 	 */
+	@Contract("-> this")
 	public Query noCursorTimeout() {
 
 		meta.addFlag(Meta.CursorOption.NO_TIMEOUT);
@@ -432,6 +621,7 @@ public Query noCursorTimeout() {
 	 * @see org.springframework.data.mongodb.core.query.Meta.CursorOption#EXHAUST
 	 * @since 1.10
 	 */
+	@Contract("-> this")
 	public Query exhaust() {
 
 		meta.addFlag(Meta.CursorOption.EXHAUST);
@@ -439,15 +629,16 @@ public Query exhaust() {
 	}
 
 	/**
-	 * Allows querying of a replica slave.
+	 * Allows querying of a replica.
 	 *
 	 * @return this.
-	 * @see org.springframework.data.mongodb.core.query.Meta.CursorOption#SLAVE_OK
-	 * @since 1.10
+	 * @see org.springframework.data.mongodb.core.query.Meta.CursorOption#SECONDARY_READS
+	 * @since 3.0.2
 	 */
-	public Query slaveOk() {
+	@Contract("-> this")
+	public Query allowSecondaryReads() {
 
-		meta.addFlag(Meta.CursorOption.SLAVE_OK);
+		meta.addFlag(Meta.CursorOption.SECONDARY_READS);
 		return this;
 	}
 
@@ -456,6 +647,7 @@ public Query slaveOk() {
 	 * @see org.springframework.data.mongodb.core.query.Meta.CursorOption#PARTIAL
 	 * @since 1.10
 	 */
+	@Contract("-> this")
 	public Query partialResults() {
 
 		meta.addFlag(Meta.CursorOption.PARTIAL);
@@ -476,7 +668,7 @@ public Meta getMeta() {
 	 */
 	public void setMeta(Meta meta) {
 
-		Assert.notNull(meta, "Query meta might be empty but must not be null.");
+		Assert.notNull(meta, "Query meta might be empty but must not be null");
 		this.meta = meta;
 	}
 
@@ -484,9 +676,10 @@ public void setMeta(Meta meta) {
 	 * Set the {@link Collation} applying language-specific rules for string comparison.
 	 *
 	 * @param collation can be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 2.0
 	 */
+	@Contract("_ -> this")
 	public Query collation(@Nullable Collation collation) {
 
 		this.collation = Optional.ofNullable(collation);
@@ -496,7 +689,7 @@ public Query collation(@Nullable Collation collation) {
 	/**
 	 * Get the {@link Collation} defining language-specific rules for string comparison.
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 * @since 2.0
 	 */
 	public Optional<Collation> getCollation() {
@@ -518,7 +711,7 @@ protected List<CriteriaDefinition> getCriteria() {
 	 */
 	public static Query of(Query source) {
 
-		Assert.notNull(source, "Source must not be null!");
+		Assert.notNull(source, "Source must not be null");
 
 		Document sourceFields = source.getFieldsObject();
 		Document sourceSort = source.getSortObject();
@@ -547,13 +740,12 @@ public boolean isSorted() {
 			}
 		};
 
-		target.criteria.putAll(source.criteria);
-		target.skip = source.skip;
-		target.limit = source.limit;
-		target.sort = Sort.unsorted().and(source.sort);
-		target.hint = source.hint;
-		target.collation = source.collation;
-		target.restrictedTypes.addAll(source.restrictedTypes);
+		target.skip = source.getSkip();
+
+		target.limit = source.isLimited() ? Limit.of(source.getLimit()) : Limit.unlimited();
+		target.hint = source.getHint();
+		target.collation = source.getCollation();
+		target.restrictedTypes = new HashSet<>(source.getRestrictedTypes());
 
 		if (source.getMeta().hasValues()) {
 			target.setMeta(new Meta(source.getMeta()));
@@ -562,22 +754,14 @@ public boolean isSorted() {
 		return target;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return String.format("Query: %s, Fields: %s, Sort: %s", serializeToJsonSafely(getQueryObject()),
 				serializeToJsonSafely(getFieldsObject()), serializeToJsonSafely(getSortObject()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
@@ -603,7 +787,7 @@ protected boolean querySettingsEquals(Query that) {
 		boolean sortEqual = this.sort.equals(that.sort);
 		boolean hintEqual = nullSafeEquals(this.hint, that.hint);
 		boolean skipEqual = this.skip == that.skip;
-		boolean limitEqual = this.limit == that.limit;
+		boolean limitEqual = nullSafeEquals(this.limit, that.limit);
 		boolean metaEqual = nullSafeEquals(this.meta, that.meta);
 		boolean collationEqual = nullSafeEquals(this.collation.orElse(null), that.collation.orElse(null));
 
@@ -611,10 +795,6 @@ protected boolean querySettingsEquals(Query that) {
 				&& collationEqual;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 
@@ -625,7 +805,7 @@ public int hashCode() {
 		result += 31 * nullSafeHashCode(sort);
 		result += 31 * nullSafeHashCode(hint);
 		result += 31 * skip;
-		result += 31 * limit;
+		result += 31 * limit.hashCode();
 		result += 31 * nullSafeHashCode(meta);
 		result += 31 * nullSafeHashCode(collation.orElse(null));
 
@@ -644,4 +824,5 @@ public int hashCode() {
 	public static boolean isRestrictedTypeKey(String key) {
 		return RESTRICTED_TYPES_KEY.equals(key);
 	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
index b02385a071..29f8adb2c6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/SerializationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,9 +23,9 @@
 import java.util.Map;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -77,9 +77,8 @@ public static Map<String, Object> flattenMap(@Nullable Document source) {
 
 	private static void toFlatMap(String currentPath, Object source, Map<String, Object> map) {
 
-		if (source instanceof Document) {
+		if (source instanceof Document document) {
 
-			Document document = (Document) source;
 			Iterator<Map.Entry<String, Object>> it = document.entrySet().iterator();
 			String pathPrefix = currentPath.isEmpty() ? "" : currentPath + '.';
 
@@ -111,26 +110,26 @@ private static void toFlatMap(String currentPath, Object source, Map<String, Obj
 	 * @param value
 	 * @return the serialized value or {@literal null}.
 	 */
-	@Nullable
-	public static String serializeToJsonSafely(@Nullable Object value) {
+	@Contract("null -> null; !null -> !null")
+	public static @Nullable String serializeToJsonSafely(@Nullable Object value) {
 
 		if (value == null) {
 			return null;
 		}
 
 		try {
-			String json = value instanceof Document ? ((Document) value).toJson() : serializeValue(value);
+			String json = value instanceof Document document ? document.toJson() : serializeValue(value);
 			return json.replaceAll("\":", "\" :").replaceAll("\\{\"", "{ \"");
 		} catch (Exception e) {
 
-			if (value instanceof Collection) {
-				return toString((Collection<?>) value);
-			} else if (value instanceof Map) {
-				return toString((Map<?, ?>) value);
+			if (value instanceof Collection<?> collection) {
+				return toString(collection);
+			} else if (value instanceof Map<?,?> map) {
+				return toString(map);
 			} else if (ObjectUtils.isArray(value)) {
 				return toString(Arrays.asList(ObjectUtils.toObjectArray(value)));
 			} else {
-				return String.format("{ \"$java\" : %s }", value.toString());
+				return String.format("{ \"$java\" : %s }", value);
 			}
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java
index d1c432a07d..cc87434178 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Term.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,9 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
+import org.springframework.util.ObjectUtils;
 
 /**
  * A {@link Term} defines one or multiple words {@link Type#WORD} or phrases {@link Type#PHRASE} to be used in the
@@ -28,7 +30,7 @@
 public class Term {
 
 	public enum Type {
-		WORD, PHRASE;
+		WORD, PHRASE
 	}
 
 	private final Type type;
@@ -60,6 +62,7 @@ public Term(String raw, @Nullable Type type) {
 	 *
 	 * @return
 	 */
+	@Contract("-> this")
 	public Term negate() {
 		this.negated = true;
 		return this;
@@ -90,6 +93,33 @@ public String getFormatted() {
 		return negated ? negateRaw(formatted) : formatted;
 	}
 
+	@Override
+	public boolean equals(@Nullable Object o) {
+
+		if (this == o) {
+			return true;
+		}
+
+		if (!(o instanceof Term other)) {
+			return false;
+		}
+
+		return ObjectUtils.nullSafeEquals(negated, other.negated) && ObjectUtils.nullSafeEquals(type, other.type)
+				&& ObjectUtils.nullSafeEquals(raw, other.raw);
+	}
+
+	@Override
+	public int hashCode() {
+
+		int result = 17;
+
+		result += ObjectUtils.nullSafeHashCode(type);
+		result += ObjectUtils.nullSafeHashCode(raw);
+		result += ObjectUtils.nullSafeHashCode(negated);
+
+		return result;
+	}
+
 	@Override
 	public String toString() {
 		return getFormatted();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java
index 5afd061470..5cedc2e476 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,10 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -34,7 +36,7 @@
 public class TextCriteria implements CriteriaDefinition {
 
 	private final List<Term> terms;
-	private @Nullable String language;
+	private final @Nullable String language;
 	private @Nullable Boolean caseSensitive;
 	private @Nullable Boolean diacriticSensitive;
 
@@ -51,7 +53,7 @@ public TextCriteria() {
 	private TextCriteria(@Nullable String language) {
 
 		this.language = language;
-		this.terms = new ArrayList<Term>();
+		this.terms = new ArrayList<>();
 	}
 
 	/**
@@ -70,9 +72,10 @@ public static TextCriteria forDefaultLanguage() {
 	 * @param language
 	 * @return
 	 */
-	public static TextCriteria forLanguage(String language) {
+	@Contract("null -> fail")
+	public static TextCriteria forLanguage(@Nullable String language) {
 
-		Assert.hasText(language, "Language must not be null or empty!");
+		Assert.hasText(language, "Language must not be null or empty");
 		return new TextCriteria(language);
 	}
 
@@ -82,6 +85,7 @@ public static TextCriteria forLanguage(String language) {
 	 * @param words the words to match.
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public TextCriteria matchingAny(String... words) {
 
 		for (String word : words) {
@@ -96,9 +100,10 @@ public TextCriteria matchingAny(String... words) {
 	 *
 	 * @param term must not be {@literal null}.
 	 */
+	@Contract("_ -> this")
 	public TextCriteria matching(Term term) {
 
-		Assert.notNull(term, "Term to add must not be null.");
+		Assert.notNull(term, "Term to add must not be null");
 
 		this.terms.add(term);
 		return this;
@@ -108,6 +113,7 @@ public TextCriteria matching(Term term) {
 	 * @param term
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public TextCriteria matching(String term) {
 
 		if (StringUtils.hasText(term)) {
@@ -120,6 +126,7 @@ public TextCriteria matching(String term) {
 	 * @param term
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public TextCriteria notMatching(String term) {
 
 		if (StringUtils.hasText(term)) {
@@ -132,6 +139,7 @@ public TextCriteria notMatching(String term) {
 	 * @param words
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public TextCriteria notMatchingAny(String... words) {
 
 		for (String word : words) {
@@ -146,6 +154,7 @@ public TextCriteria notMatchingAny(String... words) {
 	 * @param phrase
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public TextCriteria notMatchingPhrase(String phrase) {
 
 		if (StringUtils.hasText(phrase)) {
@@ -160,6 +169,7 @@ public TextCriteria notMatchingPhrase(String phrase) {
 	 * @param phrase
 	 * @return
 	 */
+	@Contract("_ -> this")
 	public TextCriteria matchingPhrase(String phrase) {
 
 		if (StringUtils.hasText(phrase)) {
@@ -175,6 +185,7 @@ public TextCriteria matchingPhrase(String phrase) {
 	 * @return never {@literal null}.
 	 * @since 1.10
 	 */
+	@Contract("_ -> this")
 	public TextCriteria caseSensitive(boolean caseSensitive) {
 
 		this.caseSensitive = caseSensitive;
@@ -188,25 +199,18 @@ public TextCriteria caseSensitive(boolean caseSensitive) {
 	 * @return never {@literal null}.
 	 * @since 1.10
 	 */
+	@Contract("_ -> this")
 	public TextCriteria diacriticSensitive(boolean diacriticSensitive) {
 
 		this.diacriticSensitive = diacriticSensitive;
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getKey()
-	 */
 	@Override
 	public String getKey() {
 		return "$text";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.CriteriaDefinition#getCriteriaObject()
-	 */
 	@Override
 	public Document getCriteriaObject() {
 
@@ -231,9 +235,37 @@ public Document getCriteriaObject() {
 		return new Document("$text", document);
 	}
 
+	@Override
+	public boolean equals(@Nullable Object o) {
+
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof TextCriteria that)) {
+			return false;
+		}
+
+		return ObjectUtils.nullSafeEquals(terms, that.terms) && ObjectUtils.nullSafeEquals(language, that.language)
+				&& ObjectUtils.nullSafeEquals(caseSensitive, that.caseSensitive)
+				&& ObjectUtils.nullSafeEquals(diacriticSensitive, that.diacriticSensitive);
+	}
+
+	@Override
+	public int hashCode() {
+
+		int result = 17;
+
+		result += ObjectUtils.nullSafeHashCode(terms);
+		result += ObjectUtils.nullSafeHashCode(language);
+		result += ObjectUtils.nullSafeHashCode(caseSensitive);
+		result += ObjectUtils.nullSafeHashCode(diacriticSensitive);
+
+		return result;
+	}
+
 	private String join(Iterable<Term> terms) {
 
-		List<String> result = new ArrayList<String>();
+		List<String> result = new ArrayList<>();
 
 		for (Term term : terms) {
 			if (term != null) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java
index 8eeb787509..a9f82a857f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/TextQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,12 @@
 package org.springframework.data.mongodb.core.query;
 
 import java.util.Locale;
+import java.util.Map.Entry;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.lang.Contract;
 
 /**
  * {@link Query} implementation to be used to for performing full text searches.
@@ -35,6 +38,7 @@ public class TextQuery extends Query {
 	private String scoreFieldName = DEFAULT_SCORE_FIELD_FIELDNAME;
 	private boolean includeScore = false;
 	private boolean sortByScore = false;
+	private int sortByScoreIndex = 0;
 
 	/**
 	 * Creates new {@link TextQuery} using the the given {@code wordsAndPhrases} with {@link TextCriteria}
@@ -65,17 +69,17 @@ public TextQuery(String wordsAndPhrases, @Nullable String language) {
 	 * For a full list of supported languages see the mongdodb reference manual for
 	 * <a href="https://docs.mongodb.org/manual/reference/text-search-languages/">Text Search Languages</a>.
 	 *
-	 * @param wordsAndPhrases
-	 * @param locale
+	 * @param wordsAndPhrases must not be {@literal null}.
+	 * @param locale can be {@literal null}.
 	 */
 	public TextQuery(String wordsAndPhrases, @Nullable Locale locale) {
-		this(wordsAndPhrases, locale != null ? locale.getLanguage() : (String) null);
+		this(wordsAndPhrases, locale != null ? locale.getLanguage() : null);
 	}
 
 	/**
 	 * Creates new {@link TextQuery} for given {@link TextCriteria}.
 	 *
-	 * @param criteria.
+	 * @param criteria must not be {@literal null}.
 	 */
 	public TextQuery(TextCriteria criteria) {
 		super(criteria);
@@ -84,8 +88,8 @@ public TextQuery(TextCriteria criteria) {
 	/**
 	 * Creates new {@link TextQuery} searching for given {@link TextCriteria}.
 	 *
-	 * @param criteria
-	 * @return
+	 * @param criteria must not be {@literal null}.
+	 * @return new instance of {@link TextQuery}.
 	 */
 	public static TextQuery queryText(TextCriteria criteria) {
 		return new TextQuery(criteria);
@@ -95,10 +99,12 @@ public static TextQuery queryText(TextCriteria criteria) {
 	 * Add sorting by text score. Will also add text score to returned fields.
 	 *
 	 * @see TextQuery#includeScore()
-	 * @return
+	 * @return this.
 	 */
+	@Contract("-> this")
 	public TextQuery sortByScore() {
 
+		this.sortByScoreIndex = getSortObject().size();
 		this.includeScore();
 		this.sortByScore = true;
 		return this;
@@ -107,8 +113,9 @@ public TextQuery sortByScore() {
 	/**
 	 * Add field {@literal score} holding the documents textScore to the returned fields.
 	 *
-	 * @return
+	 * @return this.
 	 */
+	@Contract("-> this")
 	public TextQuery includeScore() {
 
 		this.includeScore = true;
@@ -118,9 +125,10 @@ public TextQuery includeScore() {
 	/**
 	 * Include text search document score in returned fields using the given fieldname.
 	 *
-	 * @param fieldname
-	 * @return
+	 * @param fieldname must not be {@literal null}.
+	 * @return this.
 	 */
+	@Contract("_ -> this")
 	public TextQuery includeScore(String fieldname) {
 
 		setScoreFieldName(fieldname);
@@ -131,7 +139,7 @@ public TextQuery includeScore(String fieldname) {
 	/**
 	 * Set the fieldname used for scoring.
 	 *
-	 * @param fieldName
+	 * @param fieldName must not be {@literal null}.
 	 */
 	public void setScoreFieldName(String fieldName) {
 		this.scoreFieldName = fieldName;
@@ -140,16 +148,12 @@ public void setScoreFieldName(String fieldName) {
 	/**
 	 * Get the fieldname used for scoring
 	 *
-	 * @return
+	 * @return never {@literal null}.
 	 */
 	public String getScoreFieldName() {
 		return scoreFieldName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#getFieldsObject()
-	 */
 	@Override
 	public Document getFieldsObject() {
 
@@ -157,34 +161,56 @@ public Document getFieldsObject() {
 			return super.getFieldsObject();
 		}
 
-		Document fields = super.getFieldsObject();
+		Document fields = BsonUtils.asMutableDocument(super.getFieldsObject());
 
 		fields.put(getScoreFieldName(), META_TEXT_SCORE);
 		return fields;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#getSortObject()
-	 */
 	@Override
 	public Document getSortObject() {
 
-		Document sort = new Document();
-
 		if (this.sortByScore) {
-			sort.put(getScoreFieldName(), META_TEXT_SCORE);
+
+			int sortByScoreIndex = this.sortByScoreIndex;
+
+			return sortByScoreIndex != 0 ? sortByScoreAtPosition(super.getSortObject(), sortByScoreIndex)
+					: sortByScoreAtPositionZero();
 		}
 
+		return super.getSortObject();
+	}
+
+	private Document sortByScoreAtPositionZero() {
+
+		Document sort = new Document();
+
+		sort.put(getScoreFieldName(), META_TEXT_SCORE);
 		sort.putAll(super.getSortObject());
 
 		return sort;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.Query#isSorted()
-	 */
+	private Document sortByScoreAtPosition(Document source, int sortByScoreIndex) {
+
+		Document target = new Document();
+		int index = 0;
+
+		for (Entry<String, Object> entry : source.entrySet()) {
+			if (index == sortByScoreIndex) {
+				target.put(getScoreFieldName(), META_TEXT_SCORE);
+			}
+			target.put(entry.getKey(), entry.getValue());
+			index++;
+		}
+
+		if (index == sortByScoreIndex) {
+			target.put(getScoreFieldName(), META_TEXT_SCORE);
+		}
+
+		return target;
+	}
+
 	@Override
 	public boolean isSorted() {
 		return super.isSorted() || sortByScore;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java
index 141da14a7d..c02425214d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcher.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,11 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.ExampleMatcher;
+import org.springframework.util.ObjectUtils;
 
 /**
  * {@link ExampleMatcher} implementation for query by example (QBE). Unlike plain {@link ExampleMatcher} this untyped
@@ -33,195 +30,122 @@
  * @author Mark Paluch
  * @since 2.0
  */
-@EqualsAndHashCode
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
 public class UntypedExampleMatcher implements ExampleMatcher {
 
-	private final @NonNull ExampleMatcher delegate;
+	private final ExampleMatcher delegate;
+
+	private UntypedExampleMatcher(ExampleMatcher delegate) {
+		this.delegate = delegate;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#matching()
-	 */
 	public static UntypedExampleMatcher matching() {
 		return new UntypedExampleMatcher(ExampleMatcher.matching());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#matchingAny()
-	 */
 	public static UntypedExampleMatcher matchingAny() {
 		return new UntypedExampleMatcher(ExampleMatcher.matchingAny());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#matchingAll()
-	 */
 	public static UntypedExampleMatcher matchingAll() {
 		return new UntypedExampleMatcher(ExampleMatcher.matchingAll());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withIgnorePaths(java.lang.String...)
-	 */
 	public UntypedExampleMatcher withIgnorePaths(String... ignoredPaths) {
 		return new UntypedExampleMatcher(delegate.withIgnorePaths(ignoredPaths));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withStringMatcher(java.lang.String)
-	 */
 	public UntypedExampleMatcher withStringMatcher(StringMatcher defaultStringMatcher) {
 		return new UntypedExampleMatcher(delegate.withStringMatcher(defaultStringMatcher));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase()
-	 */
 	public UntypedExampleMatcher withIgnoreCase() {
 		return new UntypedExampleMatcher(delegate.withIgnoreCase());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase(boolean)
-	 */
 	public UntypedExampleMatcher withIgnoreCase(boolean defaultIgnoreCase) {
 		return new UntypedExampleMatcher(delegate.withIgnoreCase(defaultIgnoreCase));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withMatcher(java.lang.String, org.springframework.data.domain.ExampleMatcher.MatcherConfigurer)
-	 */
 	public UntypedExampleMatcher withMatcher(String propertyPath,
 			MatcherConfigurer<GenericPropertyMatcher> matcherConfigurer) {
 		return new UntypedExampleMatcher(delegate.withMatcher(propertyPath, matcherConfigurer));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withMatcher(java.lang.String, org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher)
-	 */
 	public UntypedExampleMatcher withMatcher(String propertyPath, GenericPropertyMatcher genericPropertyMatcher) {
 		return new UntypedExampleMatcher(delegate.withMatcher(propertyPath, genericPropertyMatcher));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withTransformer(java.lang.String, org.springframework.data.domain.ExampleMatcher.PropertyValueTransformer)
-	 */
 	public UntypedExampleMatcher withTransformer(String propertyPath, PropertyValueTransformer propertyValueTransformer) {
 		return new UntypedExampleMatcher(delegate.withTransformer(propertyPath, propertyValueTransformer));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withIgnoreCase(java.lang.String...)
-	 */
 	public UntypedExampleMatcher withIgnoreCase(String... propertyPaths) {
 		return new UntypedExampleMatcher(delegate.withIgnoreCase(propertyPaths));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withIncludeNullValues()
-	 */
 	public UntypedExampleMatcher withIncludeNullValues() {
 		return new UntypedExampleMatcher(delegate.withIncludeNullValues());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withIgnoreNullValues()
-	 */
 	public UntypedExampleMatcher withIgnoreNullValues() {
 		return new UntypedExampleMatcher(delegate.withIgnoreNullValues());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#withNullHandler(org.springframework.data.domain.ExampleMatcher.NullHandler)
-	 */
 	public UntypedExampleMatcher withNullHandler(NullHandler nullHandler) {
 		return new UntypedExampleMatcher(delegate.withNullHandler(nullHandler));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#getNullHandler()
-	 */
 	public NullHandler getNullHandler() {
 		return delegate.getNullHandler();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#getDefaultStringMatcher()
-	 */
 	public StringMatcher getDefaultStringMatcher() {
 		return delegate.getDefaultStringMatcher();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#isIgnoreCaseEnabled()
-	 */
 	public boolean isIgnoreCaseEnabled() {
 		return delegate.isIgnoreCaseEnabled();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#isIgnoredPath()
-	 */
 	public boolean isIgnoredPath(String path) {
 		return delegate.isIgnoredPath(path);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#getIgnoredPaths()
-	 */
 	public Set<String> getIgnoredPaths() {
 		return delegate.getIgnoredPaths();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#getPropertySpecifiers()
-	 */
 	public PropertySpecifiers getPropertySpecifiers() {
 		return delegate.getPropertySpecifiers();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#isAllMatching()
-	 */
 	public boolean isAllMatching() {
 		return delegate.isAllMatching();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#isAnyMatching()
-	 */
 	public boolean isAnyMatching() {
 		return delegate.isAnyMatching();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.domain.ExampleMatcher#getMatchMode()
-	 */
 	public MatchMode getMatchMode() {
 		return delegate.getMatchMode();
 	}
 
+	@Override
+	public boolean equals(@Nullable Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		UntypedExampleMatcher that = (UntypedExampleMatcher) o;
+
+		return ObjectUtils.nullSafeEquals(delegate, that.delegate);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(delegate);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java
index b8c1cb6f83..78a42661ff 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,12 +27,12 @@
 import java.util.Set;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -57,18 +57,18 @@ public enum Position {
 	}
 
 	private boolean isolated = false;
-	private Set<String> keysToUpdate = new HashSet<>();
-	private Map<String, Object> modifierOps = new LinkedHashMap<>();
-	private Map<String, PushOperatorBuilder> pushCommandBuilders = new LinkedHashMap<>(1);
-	private List<ArrayFilter> arrayFilters = new ArrayList<>();
+	private final Set<String> keysToUpdate = new HashSet<>();
+	private final Map<String, Object> modifierOps = new LinkedHashMap<>();
+	private Map<String, PushOperatorBuilder> pushCommandBuilders = Collections.emptyMap();
+	private List<ArrayFilter> arrayFilters = Collections.emptyList();
 
 	/**
 	 * Static factory method to create an Update using the provided key
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field to update.
+	 * @return new instance of {@link Update}.
 	 */
-	public static Update update(String key, Object value) {
+	public static Update update(String key, @Nullable Object value) {
 		return new Update().set(key, value);
 	}
 
@@ -81,7 +81,7 @@ public static Update update(String key, Object value) {
 	 *
 	 * @param object the source {@link Document} to create the update from.
 	 * @param exclude the fields to exclude.
-	 * @return
+	 * @return new instance of {@link Update}.
 	 */
 	public static Update fromDocument(Document object, String... exclude) {
 
@@ -96,8 +96,8 @@ public static Update fromDocument(Document object, String... exclude) {
 
 			Object value = object.get(key);
 			update.modifierOps.put(key, value);
-			if (isKeyword(key) && value instanceof Document) {
-				update.keysToUpdate.addAll(((Document) value).keySet());
+			if (isKeyword(key) && value instanceof Document document) {
+				update.keysToUpdate.addAll(document.keySet());
 			} else {
 				update.keysToUpdate.add(key);
 			}
@@ -109,12 +109,14 @@ public static Update fromDocument(Document object, String... exclude) {
 	/**
 	 * Update using the {@literal $set} update modifier
 	 *
-	 * @param key
-	 * @param value
-	 * @return
+	 * @param key the field name.
+	 * @param value can be {@literal null}. In this case the property remains in the db with a {@literal null} value. To
+	 *          remove it use {@link #unset(String)}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.com/manual/reference/operator/update/set/">MongoDB Update operator: $set</a>
 	 */
-	public Update set(String key, Object value) {
+	@Contract("_, _ -> this")
+	public Update set(String key, @Nullable Object value) {
 		addMultiFieldOperation("$set", key, value);
 		return this;
 	}
@@ -122,13 +124,14 @@ public Update set(String key, Object value) {
 	/**
 	 * Update using the {@literal $setOnInsert} update modifier
 	 *
-	 * @param key
-	 * @param value
-	 * @return
+	 * @param key the field name.
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/setOnInsert/">MongoDB Update operator:
 	 *      $setOnInsert</a>
 	 */
-	public Update setOnInsert(String key, Object value) {
+	@Contract("_, _ -> this")
+	public Update setOnInsert(String key, @Nullable Object value) {
 		addMultiFieldOperation("$setOnInsert", key, value);
 		return this;
 	}
@@ -136,10 +139,11 @@ public Update setOnInsert(String key, Object value) {
 	/**
 	 * Update using the {@literal $unset} update modifier
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field name.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/unset/">MongoDB Update operator: $unset</a>
 	 */
+	@Contract("_ -> this")
 	public Update unset(String key) {
 		addMultiFieldOperation("$unset", key, 1);
 		return this;
@@ -148,21 +152,19 @@ public Update unset(String key) {
 	/**
 	 * Update using the {@literal $inc} update modifier
 	 *
-	 * @param key
-	 * @param inc
-	 * @return
+	 * @param key the field name.
+	 * @param inc must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/inc/">MongoDB Update operator: $inc</a>
 	 */
+	@Contract("_, _ -> this")
 	public Update inc(String key, Number inc) {
 		addMultiFieldOperation("$inc", key, inc);
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#inc()
-	 */
 	@Override
+	@Contract("_ -> this")
 	public void inc(String key) {
 		inc(key, 1L);
 	}
@@ -170,12 +172,13 @@ public void inc(String key) {
 	/**
 	 * Update using the {@literal $push} update modifier
 	 *
-	 * @param key
-	 * @param value
-	 * @return
+	 * @param key the field name.
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/push/">MongoDB Update operator: $push</a>
 	 */
-	public Update push(String key, Object value) {
+	@Contract("_, _ -> this")
+	public Update push(String key, @Nullable Object value) {
 		addMultiFieldOperation("$push", key, value);
 		return this;
 	}
@@ -185,7 +188,7 @@ public Update push(String key, Object value) {
 	 * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values as well as using
 	 * {@code $position}.
 	 *
-	 * @param key
+	 * @param key the field name.
 	 * @return {@link PushOperatorBuilder} for given key
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/push/">MongoDB Update operator: $push</a>
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/each/">MongoDB Update operator: $each</a>
@@ -193,38 +196,25 @@ public Update push(String key, Object value) {
 	public PushOperatorBuilder push(String key) {
 
 		if (!pushCommandBuilders.containsKey(key)) {
+
+			if (pushCommandBuilders == Collections.EMPTY_MAP) {
+				pushCommandBuilders = new LinkedHashMap<>(1);
+			}
+
 			pushCommandBuilders.put(key, new PushOperatorBuilder(key));
 		}
 		return pushCommandBuilders.get(key);
 	}
 
-	/**
-	 * Update using the {@code $pushAll} update modifier. <br>
-	 * <b>Note</b>: In MongoDB 2.4 the usage of {@code $pushAll} has been deprecated in favor of {@code $push $each}.
-	 * <b>Important:</b> As of MongoDB 3.6 {@code $pushAll} is not longer supported. Use {@code $push $each} instead.
-	 * {@link #push(String)}) returns a builder that can be used to populate the {@code $each} object.
-	 *
-	 * @param key
-	 * @param values
-	 * @return
-	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/pushAll/">MongoDB Update operator:
-	 *      $pushAll</a>
-	 * @deprecated as of MongoDB 2.4. Removed in MongoDB 3.6. Use {@link #push(String) $push $each} instead.
-	 */
-	@Deprecated
-	public Update pushAll(String key, Object[] values) {
-		addMultiFieldOperation("$pushAll", key, Arrays.asList(values));
-		return this;
-	}
-
 	/**
 	 * Update using {@code $addToSet} modifier. <br/>
 	 * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field name.
+	 * @return new instance of {@link AddToSetBuilder}.
 	 * @since 1.5
 	 */
+	@Contract("_ -> new")
 	public AddToSetBuilder addToSet(String key) {
 		return new AddToSetBuilder(key);
 	}
@@ -232,13 +222,14 @@ public AddToSetBuilder addToSet(String key) {
 	/**
 	 * Update using the {@literal $addToSet} update modifier
 	 *
-	 * @param key
-	 * @param value
-	 * @return
+	 * @param key the field name.
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/addToSet/">MongoDB Update operator:
 	 *      $addToSet</a>
 	 */
-	public Update addToSet(String key, Object value) {
+	@Contract("_, _ -> this")
+	public Update addToSet(String key, @Nullable Object value) {
 		addMultiFieldOperation("$addToSet", key, value);
 		return this;
 	}
@@ -246,11 +237,12 @@ public Update addToSet(String key, Object value) {
 	/**
 	 * Update using the {@literal $pop} update modifier
 	 *
-	 * @param key
-	 * @param pos
-	 * @return
+	 * @param key the field name.
+	 * @param pos must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/pop/">MongoDB Update operator: $pop</a>
 	 */
+	@Contract("_, _ -> this")
 	public Update pop(String key, Position pos) {
 		addMultiFieldOperation("$pop", key, pos == Position.FIRST ? -1 : 1);
 		return this;
@@ -259,12 +251,13 @@ public Update pop(String key, Position pos) {
 	/**
 	 * Update using the {@literal $pull} update modifier
 	 *
-	 * @param key
-	 * @param value
-	 * @return
+	 * @param key the field name.
+	 * @param value can be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/pull/">MongoDB Update operator: $pull</a>
 	 */
-	public Update pull(String key, Object value) {
+	@Contract("_, _ -> this")
+	public Update pull(String key, @Nullable Object value) {
 		addMultiFieldOperation("$pull", key, value);
 		return this;
 	}
@@ -272,12 +265,13 @@ public Update pull(String key, Object value) {
 	/**
 	 * Update using the {@literal $pullAll} update modifier
 	 *
-	 * @param key
-	 * @param values
-	 * @return
+	 * @param key the field name.
+	 * @param values must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/pullAll/">MongoDB Update operator:
 	 *      $pullAll</a>
 	 */
+	@Contract("_, _ -> this")
 	public Update pullAll(String key, Object[] values) {
 		addMultiFieldOperation("$pullAll", key, Arrays.asList(values));
 		return this;
@@ -286,12 +280,13 @@ public Update pullAll(String key, Object[] values) {
 	/**
 	 * Update using the {@literal $rename} update modifier
 	 *
-	 * @param oldName
-	 * @param newName
-	 * @return
+	 * @param oldName must not be {@literal null}.
+	 * @param newName must not be {@literal null}.
+	 * @return this.
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/rename/">MongoDB Update operator:
 	 *      $rename</a>
 	 */
+	@Contract("_, _ -> this")
 	public Update rename(String oldName, String newName) {
 		addMultiFieldOperation("$rename", oldName, newName);
 		return this;
@@ -300,12 +295,13 @@ public Update rename(String oldName, String newName) {
 	/**
 	 * Update given key to current date using {@literal $currentDate} modifier.
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field name.
+	 * @return this.
 	 * @since 1.6
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/currentDate/">MongoDB Update operator:
 	 *      $currentDate</a>
 	 */
+	@Contract("_ -> this")
 	public Update currentDate(String key) {
 
 		addMultiFieldOperation("$currentDate", key, true);
@@ -315,12 +311,13 @@ public Update currentDate(String key) {
 	/**
 	 * Update given key to current date using {@literal $currentDate : &#123; $type : "timestamp" &#125;} modifier.
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field name.
+	 * @return this.
 	 * @since 1.6
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/currentDate/">MongoDB Update operator:
 	 *      $currentDate</a>
 	 */
+	@Contract("_ -> this")
 	public Update currentTimestamp(String key) {
 
 		addMultiFieldOperation("$currentDate", key, new Document("$type", "timestamp"));
@@ -332,13 +329,14 @@ public Update currentTimestamp(String key) {
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param multiplier must not be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 1.7
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/mul/">MongoDB Update operator: $mul</a>
 	 */
+	@Contract("_, _ -> this")
 	public Update multiply(String key, Number multiplier) {
 
-		Assert.notNull(multiplier, "Multiplier must not be null.");
+		Assert.notNull(multiplier, "Multiplier must not be null");
 		addMultiFieldOperation("$mul", key, multiplier.doubleValue());
 		return this;
 	}
@@ -348,14 +346,15 @@ public Update multiply(String key, Number multiplier) {
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param value must not be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 1.10
 	 * @see <a href="https://docs.mongodb.com/manual/reference/bson-type-comparison-order/">Comparison/Sort Order</a>
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/max/">MongoDB Update operator: $max</a>
 	 */
+	@Contract("_, _ -> this")
 	public Update max(String key, Object value) {
 
-		Assert.notNull(value, "Value for max operation must not be null.");
+		Assert.notNull(value, "Value for max operation must not be null");
 		addMultiFieldOperation("$max", key, value);
 		return this;
 	}
@@ -365,14 +364,15 @@ public Update max(String key, Object value) {
 	 *
 	 * @param key must not be {@literal null}.
 	 * @param value must not be {@literal null}.
-	 * @return
+	 * @return this.
 	 * @since 1.10
 	 * @see <a href="https://docs.mongodb.com/manual/reference/bson-type-comparison-order/">Comparison/Sort Order</a>
 	 * @see <a href="https://docs.mongodb.org/manual/reference/operator/update/min/">MongoDB Update operator: $min</a>
 	 */
+	@Contract("_, _ -> this")
 	public Update min(String key, Object value) {
 
-		Assert.notNull(value, "Value for min operation must not be null.");
+		Assert.notNull(value, "Value for min operation must not be null");
 		addMultiFieldOperation("$min", key, value);
 		return this;
 	}
@@ -380,10 +380,11 @@ public Update min(String key, Object value) {
 	/**
 	 * The operator supports bitwise {@code and}, bitwise {@code or}, and bitwise {@code xor} operations.
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field name.
+	 * @return this.
 	 * @since 1.7
 	 */
+	@Contract("_ -> new")
 	public BitwiseOperatorBuilder bitwise(String key) {
 		return new BitwiseOperatorBuilder(this, key);
 	}
@@ -391,11 +392,12 @@ public BitwiseOperatorBuilder bitwise(String key) {
 	/**
 	 * Prevents a write operation that affects <strong>multiple</strong> documents from yielding to other reads or writes
 	 * once the first document is written. <br />
-	 * Use with {@link org.springframework.data.mongodb.core.MongoOperations#updateMulti(Query, Update, Class)}.
+	 * Use with {@link org.springframework.data.mongodb.core.MongoOperations#updateMulti(Query, UpdateDefinition, Class)}.
 	 *
-	 * @return never {@literal null}.
+	 * @return this.
 	 * @since 2.0
 	 */
+	@Contract("-> this")
 	public Update isolated() {
 
 		isolated = true;
@@ -410,84 +412,71 @@ public Update isolated() {
 	 * @return this.
 	 * @since 2.2
 	 */
+	@Contract("_ -> this")
 	public Update filterArray(CriteriaDefinition criteria) {
 
+		if (arrayFilters == Collections.EMPTY_LIST) {
+			this.arrayFilters = new ArrayList<>();
+		}
+
 		this.arrayFilters.add(criteria::getCriteriaObject);
 		return this;
 	}
 
 	/**
 	 * Filter elements in an array that match the given criteria for update. {@code expression} is used directly with the
-	 * driver without further further type or field mapping.
+	 * driver without further type or field mapping.
 	 *
 	 * @param identifier the positional operator identifier filter criteria name.
 	 * @param expression the positional operator filter expression.
 	 * @return this.
 	 * @since 2.2
 	 */
+	@Contract("_, _ -> this")
 	public Update filterArray(String identifier, Object expression) {
 
+		if (arrayFilters == Collections.EMPTY_LIST) {
+			this.arrayFilters = new ArrayList<>();
+		}
+
 		this.arrayFilters.add(() -> new Document(identifier, expression));
 		return this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#isIsolated()
-	 */
+	@Override
 	public Boolean isIsolated() {
 		return isolated;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getUpdateObject()
-	 */
+	@Override
 	public Document getUpdateObject() {
 		return new Document(modifierOps);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.query.UpdateDefinition#getArrayFilters()
-	 */
+	@Override
 	public List<ArrayFilter> getArrayFilters() {
 		return Collections.unmodifiableList(this.arrayFilters);
 	}
 
-	/**
-	 * This method is not called anymore rather override {@link #addMultiFieldOperation(String, String, Object)}.
-	 *
-	 * @param operator
-	 * @param key
-	 * @param value
-	 * @deprectaed Use {@link #addMultiFieldOperation(String, String, Object)} instead.
-	 */
-	@Deprecated
-	protected void addFieldOperation(String operator, String key, Object value) {
-
-		Assert.hasText(key, "Key/Path for update must not be null or blank.");
-
-		modifierOps.put(operator, new Document(key, value));
-		this.keysToUpdate.add(key);
+	@Override
+	public boolean hasArrayFilters() {
+		return !this.arrayFilters.isEmpty();
 	}
 
-	protected void addMultiFieldOperation(String operator, String key, Object value) {
+	protected void addMultiFieldOperation(String operator, String key, @Nullable Object value) {
 
-		Assert.hasText(key, "Key/Path for update must not be null or blank.");
+		Assert.hasText(key, "Key/Path for update must not be null or blank");
 		Object existingValue = this.modifierOps.get(operator);
 		Document keyValueMap;
 
 		if (existingValue == null) {
 			keyValueMap = new Document();
 			this.modifierOps.put(operator, keyValueMap);
+		} else if (existingValue instanceof Document document) {
+			keyValueMap = document;
 		} else {
-			if (existingValue instanceof Document) {
-				keyValueMap = (Document) existingValue;
-			} else {
-				throw new InvalidDataAccessApiUsageException(
-						"Modifier Operations should be a LinkedHashMap but was " + existingValue.getClass());
-			}
+			throw new InvalidDataAccessApiUsageException(
+					"Modifier Operations should be a LinkedHashMap but was " + existingValue.getClass());
 		}
 
 		keyValueMap.put(key, value);
@@ -497,9 +486,10 @@ protected void addMultiFieldOperation(String operator, String key, Object value)
 	/**
 	 * Determine if a given {@code key} will be touched on execution.
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field name.
+	 * @return {@literal true} if given field is updated.
 	 */
+	@Override
 	public boolean modifies(String key) {
 		return this.keysToUpdate.contains(key);
 	}
@@ -507,28 +497,20 @@ public boolean modifies(String key) {
 	/**
 	 * Inspects given {@code key} for '$'.
 	 *
-	 * @param key
-	 * @return
+	 * @param key the field name.
+	 * @return {@literal true} if given key is prefixed.
 	 */
 	private static boolean isKeyword(String key) {
 		return StringUtils.startsWithIgnoreCase(key, "$");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#hashCode()
-	 */
 	@Override
 	public int hashCode() {
 		return Objects.hash(getUpdateObject(), isolated);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#equals(java.lang.Object)
-	 */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
@@ -546,10 +528,6 @@ public boolean equals(Object obj) {
 		return Objects.equals(this.getUpdateObject(), that.getUpdateObject());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 
@@ -570,7 +548,7 @@ public String toString() {
 	 */
 	public static class Modifiers {
 
-		private Map<String, Modifier> modifiers;
+		private final Map<String, Modifier> modifiers;
 
 		public Modifiers() {
 			this.modifiers = new LinkedHashMap<>(1);
@@ -592,21 +570,13 @@ public boolean isEmpty() {
 			return modifiers.isEmpty();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			return Objects.hashCode(modifiers);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (this == obj) {
 				return true;
@@ -661,21 +631,13 @@ default String toJsonString() {
 	 */
 	private static abstract class AbstractModifier implements Modifier {
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			return ObjectUtils.nullSafeHashCode(getKey()) + ObjectUtils.nullSafeHashCode(getValue());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
-		public boolean equals(Object that) {
+		public boolean equals(@Nullable Object that) {
 
 			if (this == that) {
 				return true;
@@ -692,10 +654,6 @@ public boolean equals(Object that) {
 			return Objects.deepEquals(getValue(), ((Modifier) that).getValue());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return toJsonString();
@@ -722,26 +680,18 @@ private Object[] extractValues(Object[] values) {
 				return values;
 			}
 
-			if (values.length == 1 && values[0] instanceof Collection) {
-				return ((Collection<?>) values[0]).toArray();
+			if (values.length == 1 && values[0] instanceof Collection<?> collection) {
+				return collection.toArray();
 			}
 
 			return Arrays.copyOf(values, values.length);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getKey()
-		 */
 		@Override
 		public String getKey() {
 			return "$each";
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getValue()
-		 */
 		@Override
 		public Object getValue() {
 			return this.values;
@@ -781,25 +731,17 @@ public Object getValue() {
 	 */
 	private static class Slice extends AbstractModifier {
 
-		private int count;
+		private final int count;
 
 		Slice(int count) {
 			this.count = count;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getKey()
-		 */
 		@Override
 		public String getKey() {
 			return "$slice";
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getValue()
-		 */
 		@Override
 		public Object getValue() {
 			return this.count;
@@ -824,7 +766,7 @@ private static class SortModifier extends AbstractModifier {
 		 */
 		SortModifier(Direction direction) {
 
-			Assert.notNull(direction, "Direction must not be null!");
+			Assert.notNull(direction, "Direction must not be null");
 			this.sort = direction.isAscending() ? 1 : -1;
 		}
 
@@ -835,32 +777,24 @@ private static class SortModifier extends AbstractModifier {
 		 */
 		SortModifier(Sort sort) {
 
-			Assert.notNull(sort, "Sort must not be null!");
+			Assert.notNull(sort, "Sort must not be null");
 
 			for (Order order : sort) {
 
 				if (order.isIgnoreCase()) {
-					throw new IllegalArgumentException(String.format("Given sort contained an Order for %s with ignore case! "
-							+ "MongoDB does not support sorting ignoring case currently!", order.getProperty()));
+					throw new IllegalArgumentException(String.format("Given sort contained an Order for %s with ignore case;"
+							+ " MongoDB does not support sorting ignoring case currently", order.getProperty()));
 				}
 			}
 
 			this.sort = sort;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getKey()
-		 */
 		@Override
 		public String getKey() {
 			return "$sort";
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.query.Update.Modifier#getValue()
-		 */
 		@Override
 		public Object getValue() {
 			return this.sort;
@@ -907,6 +841,7 @@ public Update each(Object... values) {
 		 * @return never {@literal null}.
 		 * @since 1.10
 		 */
+		@Contract("_ -> this")
 		public PushOperatorBuilder slice(int count) {
 
 			this.modifiers.addModifier(new Slice(count));
@@ -921,9 +856,10 @@ public PushOperatorBuilder slice(int count) {
 		 * @return never {@literal null}.
 		 * @since 1.10
 		 */
+		@Contract("_ -> this")
 		public PushOperatorBuilder sort(Direction direction) {
 
-			Assert.notNull(direction, "Direction must not be null.");
+			Assert.notNull(direction, "Direction must not be null");
 			this.modifiers.addModifier(new SortModifier(direction));
 			return this;
 		}
@@ -936,9 +872,10 @@ public PushOperatorBuilder sort(Direction direction) {
 		 * @return never {@literal null}.
 		 * @since 1.10
 		 */
+		@Contract("_ -> this")
 		public PushOperatorBuilder sort(Sort sort) {
 
-			Assert.notNull(sort, "Sort must not be null.");
+			Assert.notNull(sort, "Sort must not be null");
 			this.modifiers.addModifier(new SortModifier(sort));
 			return this;
 		}
@@ -951,6 +888,7 @@ public PushOperatorBuilder sort(Sort sort) {
 		 * @return never {@literal null}.
 		 * @since 1.7
 		 */
+		@Contract("_ -> this")
 		public PushOperatorBuilder atPosition(int position) {
 
 			this.modifiers.addModifier(new PositionModifier(position));
@@ -964,6 +902,7 @@ public PushOperatorBuilder atPosition(int position) {
 		 * @return never {@literal null}.
 		 * @since 1.7
 		 */
+		@Contract("_ -> this")
 		public PushOperatorBuilder atPosition(@Nullable Position position) {
 
 			if (position == null || Position.LAST.equals(position)) {
@@ -991,21 +930,13 @@ public Update value(Object value) {
 			return Update.this.push(key, this.modifiers);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#hashCode()
-		 */
 		@Override
 		public int hashCode() {
 			return Objects.hash(getOuterType(), key, modifiers);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#equals(java.lang.Object)
-		 */
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (this == obj) {
 				return true;
@@ -1046,8 +977,8 @@ public AddToSetBuilder(String key) {
 		/**
 		 * Propagates {@code $each} to {@code $addToSet}
 		 *
-		 * @param values
-		 * @return
+		 * @param values must not be {@literal null}.
+		 * @return never {@literal null}.
 		 */
 		public Update each(Object... values) {
 			return Update.this.addToSet(this.key, new Each(values));
@@ -1056,8 +987,8 @@ public Update each(Object... values) {
 		/**
 		 * Propagates {@link #value(Object)} to {@code $addToSet}
 		 *
-		 * @param values
-		 * @return
+		 * @param value
+		 * @return never {@literal null}.
 		 */
 		public Update value(Object value) {
 			return Update.this.addToSet(this.key, value);
@@ -1080,7 +1011,7 @@ private enum BitwiseOperator {
 			@Override
 			public String toString() {
 				return super.toString().toLowerCase();
-			};
+			}
 		}
 
 		/**
@@ -1091,8 +1022,8 @@ public String toString() {
 		 */
 		protected BitwiseOperatorBuilder(Update reference, String key) {
 
-			Assert.notNull(reference, "Reference must not be null!");
-			Assert.notNull(key, "Key must not be null!");
+			Assert.notNull(reference, "Reference must not be null");
+			Assert.notNull(key, "Key must not be null");
 
 			this.reference = reference;
 			this.key = key;
@@ -1102,7 +1033,7 @@ protected BitwiseOperatorBuilder(Update reference, String key) {
 		 * Updates to the result of a bitwise and operation between the current value and the given one.
 		 *
 		 * @param value
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public Update and(long value) {
 
@@ -1114,7 +1045,7 @@ public Update and(long value) {
 		 * Updates to the result of a bitwise or operation between the current value and the given one.
 		 *
 		 * @param value
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public Update or(long value) {
 
@@ -1126,7 +1057,7 @@ public Update or(long value) {
 		 * Updates to the result of a bitwise xor operation between the current value and the given one.
 		 *
 		 * @param value
-		 * @return
+		 * @return never {@literal null}.
 		 */
 		public Update xor(long value) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java
index 32784f4431..5aafffeb82 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/UpdateDefinition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/package-info.java
index d3f67790a1..7c6889e45b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/package-info.java
@@ -1,6 +1,6 @@
 /**
  * MongoDB specific query and update support.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.query;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java
index 40aa5c7948..da77a0199f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DefaultMongoJsonSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.springframework.data.mongodb.core.schema;
 
-import lombok.AllArgsConstructor;
-import lombok.NonNull;
-
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 /**
  * Value object representing a MongoDB-specific JSON schema which is the default {@link MongoJsonSchema} implementation.
@@ -27,17 +27,43 @@
  * @author Mark Paluch
  * @since 2.1
  */
-@AllArgsConstructor
 class DefaultMongoJsonSchema implements MongoJsonSchema {
 
-	private final @NonNull JsonSchemaObject root;
+	private final JsonSchemaObject root;
+
+	private final @Nullable Document encryptionMetadata;
+
+	DefaultMongoJsonSchema(JsonSchemaObject root) {
+		this(root, null);
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.schema.MongoJsonSchema#toDocument()
+	/**
+	 * Create new instance of {@link DefaultMongoJsonSchema}.
+	 *
+	 * @param root the schema root element.
+	 * @param encryptionMetadata can be {@literal null}.
+	 * @since 3.3
 	 */
+	DefaultMongoJsonSchema(JsonSchemaObject root, @Nullable Document encryptionMetadata) {
+
+		Assert.notNull(root, "Root schema object must not be null");
+
+		this.root = root;
+		this.encryptionMetadata = encryptionMetadata;
+	}
+
 	@Override
-	public Document toDocument() {
-		return new Document("$jsonSchema", root.toDocument());
+	public Document schemaDocument() {
+
+		Document schemaDocument = new Document();
+
+		// we want this to be the first element rendered, so it reads nice when printed to json
+		if (!CollectionUtils.isEmpty(encryptionMetadata)) {
+			schemaDocument.append("encryptMetadata", encryptionMetadata);
+		}
+
+		schemaDocument.putAll(root.toDocument());
+
+		return schemaDocument;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java
index dc52924f8c..0407bac272 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/DocumentJsonSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,8 @@
  */
 package org.springframework.data.mongodb.core.schema;
 
-import lombok.AllArgsConstructor;
-import lombok.NonNull;
-
 import org.bson.Document;
+import org.springframework.util.Assert;
 
 /**
  * JSON schema backed by a {@link org.bson.Document} object.
@@ -26,17 +24,18 @@
  * @author Mark Paluch
  * @since 2.1
  */
-@AllArgsConstructor
 class DocumentJsonSchema implements MongoJsonSchema {
 
-	private final @NonNull Document document;
+	private final Document document;
+
+	DocumentJsonSchema(Document document) {
+
+		Assert.notNull(document, "Document must not be null");
+		this.document = document;
+	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.schema.MongoJsonSchema#toDocument()
-	 */
 	@Override
-	public Document toDocument() {
-		return new Document("$jsonSchema", new Document(document));
+	public Document schemaDocument() {
+		return new Document(document);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java
index 3b46d6b5fe..503d591d99 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/IdentifiableJsonSchemaProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@
 import java.util.UUID;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.mongodb.core.EncryptionAlgorithms;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.ArrayJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.BooleanJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.DateJsonSchemaObject;
@@ -33,9 +34,10 @@
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.ObjectJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.StringJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.TimestampJsonSchemaObject;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 /**
  * {@link JsonSchemaProperty} implementation.
@@ -57,35 +59,23 @@ public class IdentifiableJsonSchemaProperty<T extends JsonSchemaObject> implemen
 	 */
 	IdentifiableJsonSchemaProperty(String identifier, T jsonSchemaObject) {
 
-		Assert.notNull(identifier, "Identifier must not be null!");
-		Assert.notNull(jsonSchemaObject, "JsonSchemaObject must not be null!");
+		Assert.notNull(identifier, "Identifier must not be null");
+		Assert.notNull(jsonSchemaObject, "JsonSchemaObject must not be null");
 
 		this.identifier = identifier;
 		this.jsonSchemaObjectDelegate = jsonSchemaObject;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#getIdentifier()
-	 */
 	@Override
 	public String getIdentifier() {
 		return identifier;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument()
-	 */
 	@Override
 	public Document toDocument() {
 		return new Document(identifier, jsonSchemaObjectDelegate.toDocument());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes()
-	 */
 	@Override
 	public Set<Type> getTypes() {
 		return jsonSchemaObjectDelegate.getTypes();
@@ -108,6 +98,7 @@ public static class UntypedJsonSchemaProperty extends IdentifiableJsonSchemaProp
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty possibleValues(Object... possibleValues) {
 			return possibleValues(Arrays.asList(possibleValues));
 		}
@@ -117,6 +108,7 @@ public UntypedJsonSchemaProperty possibleValues(Object... possibleValues) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 			return allOf(new LinkedHashSet<>(Arrays.asList(allOf)));
 		}
@@ -126,6 +118,7 @@ public UntypedJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 			return anyOf(new LinkedHashSet<>(Arrays.asList(anyOf)));
 		}
@@ -135,6 +128,7 @@ public UntypedJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 			return oneOf(new LinkedHashSet<>(Arrays.asList(oneOf)));
 		}
@@ -144,6 +138,7 @@ public UntypedJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty possibleValues(Collection<Object> possibleValues) {
 			return new UntypedJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.possibleValues(possibleValues));
 		}
@@ -153,6 +148,7 @@ public UntypedJsonSchemaProperty possibleValues(Collection<Object> possibleValue
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 			return new UntypedJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.allOf(allOf));
 		}
@@ -162,6 +158,7 @@ public UntypedJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new UntypedJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.anyOf(anyOf));
 		}
@@ -171,6 +168,7 @@ public UntypedJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new UntypedJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.oneOf(oneOf));
 		}
@@ -180,6 +178,7 @@ public UntypedJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#notMatch(JsonSchemaObject)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 			return new UntypedJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.notMatch(notMatch));
 		}
@@ -189,6 +188,7 @@ public UntypedJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty description(String description) {
 			return new UntypedJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -197,6 +197,7 @@ public UntypedJsonSchemaProperty description(String description) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#generateDescription()
 		 */
+		@Contract("_ -> new")
 		public UntypedJsonSchemaProperty generatedDescription() {
 			return new UntypedJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.generatedDescription());
 		}
@@ -224,6 +225,7 @@ public static class StringJsonSchemaProperty extends IdentifiableJsonSchemaPrope
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#minLength(int)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty minLength(int length) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.minLength(length));
 		}
@@ -233,6 +235,7 @@ public StringJsonSchemaProperty minLength(int length) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#maxLength(int)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty maxLength(int length) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.maxLength(length));
 		}
@@ -242,6 +245,7 @@ public StringJsonSchemaProperty maxLength(int length) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#matching(String)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty matching(String pattern) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.matching(pattern));
 		}
@@ -251,6 +255,7 @@ public StringJsonSchemaProperty matching(String pattern) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty possibleValues(String... possibleValues) {
 			return possibleValues(Arrays.asList(possibleValues));
 		}
@@ -260,6 +265,7 @@ public StringJsonSchemaProperty possibleValues(String... possibleValues) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 			return allOf(new LinkedHashSet<>(Arrays.asList(allOf)));
 		}
@@ -269,6 +275,7 @@ public StringJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 			return anyOf(new LinkedHashSet<>(Arrays.asList(anyOf)));
 		}
@@ -278,6 +285,7 @@ public StringJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 			return oneOf(new LinkedHashSet<>(Arrays.asList(oneOf)));
 		}
@@ -287,6 +295,7 @@ public StringJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty possibleValues(Collection<String> possibleValues) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.possibleValues(possibleValues));
 		}
@@ -296,6 +305,7 @@ public StringJsonSchemaProperty possibleValues(Collection<String> possibleValues
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.allOf(allOf));
 		}
@@ -305,6 +315,7 @@ public StringJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.anyOf(anyOf));
 		}
@@ -314,6 +325,7 @@ public StringJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.oneOf(oneOf));
 		}
@@ -323,6 +335,7 @@ public StringJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#notMatch(JsonSchemaObject)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.notMatch(notMatch));
 		}
@@ -332,6 +345,7 @@ public StringJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty description(String description) {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -340,6 +354,7 @@ public StringJsonSchemaProperty description(String description) {
 		 * @return new instance of {@link StringJsonSchemaProperty}.
 		 * @see StringJsonSchemaObject#generateDescription()
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaProperty generatedDescription() {
 			return new StringJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.generatedDescription());
 		}
@@ -365,8 +380,8 @@ public static class ObjectJsonSchemaProperty extends IdentifiableJsonSchemaPrope
 		/**
 		 * @param range must not be {@literal null}.
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
-		 * @see ObjectJsonSchemaObject#propertiesCount
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty propertiesCount(Range<Integer> range) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.propertiesCount(range));
 		}
@@ -376,6 +391,7 @@ public ObjectJsonSchemaProperty propertiesCount(Range<Integer> range) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#minProperties(int)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty minProperties(int count) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.minProperties(count));
 		}
@@ -385,6 +401,7 @@ public ObjectJsonSchemaProperty minProperties(int count) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#maxProperties(int)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty maxProperties(int count) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.maxProperties(count));
 		}
@@ -394,6 +411,7 @@ public ObjectJsonSchemaProperty maxProperties(int count) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#required(String...)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty required(String... properties) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.required(properties));
 		}
@@ -403,6 +421,7 @@ public ObjectJsonSchemaProperty required(String... properties) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#additionalProperties(boolean)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty additionalProperties(boolean additionalPropertiesAllowed) {
 			return new ObjectJsonSchemaProperty(identifier,
 					jsonSchemaObjectDelegate.additionalProperties(additionalPropertiesAllowed));
@@ -413,6 +432,7 @@ public ObjectJsonSchemaProperty additionalProperties(boolean additionalPropertie
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#additionalProperties(ObjectJsonSchemaObject)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty additionalProperties(ObjectJsonSchemaObject additionalProperties) {
 			return new ObjectJsonSchemaProperty(identifier,
 					jsonSchemaObjectDelegate.additionalProperties(additionalProperties));
@@ -423,6 +443,7 @@ public ObjectJsonSchemaProperty additionalProperties(ObjectJsonSchemaObject addi
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#properties(JsonSchemaProperty...)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty properties(JsonSchemaProperty... properties) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.properties(properties));
 		}
@@ -432,6 +453,7 @@ public ObjectJsonSchemaProperty properties(JsonSchemaProperty... properties) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty possibleValues(Object... possibleValues) {
 			return possibleValues(Arrays.asList(possibleValues));
 		}
@@ -441,6 +463,7 @@ public ObjectJsonSchemaProperty possibleValues(Object... possibleValues) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 			return allOf(new LinkedHashSet<>(Arrays.asList(allOf)));
 		}
@@ -450,6 +473,7 @@ public ObjectJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 			return anyOf(new LinkedHashSet<>(Arrays.asList(anyOf)));
 		}
@@ -459,6 +483,7 @@ public ObjectJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 			return oneOf(new LinkedHashSet<>(Arrays.asList(oneOf)));
 		}
@@ -468,6 +493,7 @@ public ObjectJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty possibleValues(Collection<Object> possibleValues) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.possibleValues(possibleValues));
 		}
@@ -477,6 +503,7 @@ public ObjectJsonSchemaProperty possibleValues(Collection<Object> possibleValues
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.allOf(allOf));
 		}
@@ -486,6 +513,7 @@ public ObjectJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.anyOf(anyOf));
 		}
@@ -495,6 +523,7 @@ public ObjectJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.oneOf(oneOf));
 		}
@@ -504,6 +533,7 @@ public ObjectJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#notMatch(JsonSchemaObject)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.notMatch(notMatch));
 		}
@@ -513,6 +543,7 @@ public ObjectJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty description(String description) {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -521,9 +552,14 @@ public ObjectJsonSchemaProperty description(String description) {
 		 * @return new instance of {@link ObjectJsonSchemaProperty}.
 		 * @see ObjectJsonSchemaObject#generateDescription()
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaProperty generatedDescription() {
 			return new ObjectJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.generatedDescription());
 		}
+
+		public List<JsonSchemaProperty> getProperties() {
+			return jsonSchemaObjectDelegate.getProperties();
+		}
 	}
 
 	/**
@@ -548,6 +584,7 @@ public NumericJsonSchemaProperty(String identifier, NumericJsonSchemaObject sche
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#multipleOf
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty multipleOf(Number value) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.multipleOf(value));
 		}
@@ -557,6 +594,7 @@ public NumericJsonSchemaProperty multipleOf(Number value) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#within(Range)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty within(Range<? extends Number> range) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.within(range));
 		}
@@ -566,6 +604,7 @@ public NumericJsonSchemaProperty within(Range<? extends Number> range) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#gt(Number)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty gt(Number min) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.gt(min));
 		}
@@ -575,6 +614,7 @@ public NumericJsonSchemaProperty gt(Number min) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#gte(Number)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty gte(Number min) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.gte(min));
 		}
@@ -584,6 +624,7 @@ public NumericJsonSchemaProperty gte(Number min) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#lt(Number)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty lt(Number max) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.lt(max));
 		}
@@ -593,6 +634,7 @@ public NumericJsonSchemaProperty lt(Number max) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#lte(Number)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty lte(Number max) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.lte(max));
 		}
@@ -602,6 +644,7 @@ public NumericJsonSchemaProperty lte(Number max) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty possibleValues(Number... possibleValues) {
 			return possibleValues(new LinkedHashSet<>(Arrays.asList(possibleValues)));
 		}
@@ -611,6 +654,7 @@ public NumericJsonSchemaProperty possibleValues(Number... possibleValues) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 			return allOf(Arrays.asList(allOf));
 		}
@@ -620,6 +664,7 @@ public NumericJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 			return anyOf(new LinkedHashSet<>(Arrays.asList(anyOf)));
 		}
@@ -629,6 +674,7 @@ public NumericJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 			return oneOf(new LinkedHashSet<>(Arrays.asList(oneOf)));
 		}
@@ -638,6 +684,7 @@ public NumericJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty possibleValues(Collection<Number> possibleValues) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.possibleValues(possibleValues));
 		}
@@ -647,6 +694,7 @@ public NumericJsonSchemaProperty possibleValues(Collection<Number> possibleValue
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.allOf(allOf));
 		}
@@ -656,6 +704,7 @@ public NumericJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.anyOf(anyOf));
 		}
@@ -665,6 +714,7 @@ public NumericJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.oneOf(oneOf));
 		}
@@ -674,6 +724,7 @@ public NumericJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#notMatch(JsonSchemaObject)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.notMatch(notMatch));
 		}
@@ -683,6 +734,7 @@ public NumericJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see NumericJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaProperty description(String description) {
 			return new NumericJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -718,6 +770,7 @@ public ArrayJsonSchemaProperty(String identifier, ArrayJsonSchemaObject schemaOb
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#uniqueItems(boolean)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty uniqueItems(boolean uniqueItems) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.uniqueItems(uniqueItems));
 		}
@@ -727,6 +780,7 @@ public ArrayJsonSchemaProperty uniqueItems(boolean uniqueItems) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#range(Range)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty range(Range<Integer> range) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.range(range));
 		}
@@ -736,6 +790,7 @@ public ArrayJsonSchemaProperty range(Range<Integer> range) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#minItems(int)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty minItems(int count) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.minItems(count));
 		}
@@ -745,6 +800,7 @@ public ArrayJsonSchemaProperty minItems(int count) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#maxItems(int)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty maxItems(int count) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.maxItems(count));
 		}
@@ -754,6 +810,7 @@ public ArrayJsonSchemaProperty maxItems(int count) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#items(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty items(JsonSchemaObject... items) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.items(Arrays.asList(items)));
 		}
@@ -763,6 +820,7 @@ public ArrayJsonSchemaProperty items(JsonSchemaObject... items) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#items(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty items(Collection<JsonSchemaObject> items) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.items(items));
 		}
@@ -772,6 +830,7 @@ public ArrayJsonSchemaProperty items(Collection<JsonSchemaObject> items) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#additionalItems(boolean)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty additionalItems(boolean additionalItemsAllowed) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.additionalItems(additionalItemsAllowed));
 		}
@@ -781,6 +840,7 @@ public ArrayJsonSchemaProperty additionalItems(boolean additionalItemsAllowed) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty possibleValues(Object... possibleValues) {
 			return possibleValues(new LinkedHashSet<>(Arrays.asList(possibleValues)));
 		}
@@ -790,6 +850,7 @@ public ArrayJsonSchemaProperty possibleValues(Object... possibleValues) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 			return allOf(new LinkedHashSet<>(Arrays.asList(allOf)));
 		}
@@ -799,6 +860,7 @@ public ArrayJsonSchemaProperty allOf(JsonSchemaObject... allOf) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 			return anyOf(new LinkedHashSet<>(Arrays.asList(anyOf)));
 		}
@@ -808,6 +870,7 @@ public ArrayJsonSchemaProperty anyOf(JsonSchemaObject... anyOf) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 			return oneOf(new LinkedHashSet<>(Arrays.asList(oneOf)));
 		}
@@ -817,6 +880,7 @@ public ArrayJsonSchemaProperty oneOf(JsonSchemaObject... oneOf) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty possibleValues(Collection<Object> possibleValues) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.possibleValues(possibleValues));
 		}
@@ -826,6 +890,7 @@ public ArrayJsonSchemaProperty possibleValues(Collection<Object> possibleValues)
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.allOf(allOf));
 		}
@@ -835,6 +900,7 @@ public ArrayJsonSchemaProperty allOf(Collection<JsonSchemaObject> allOf) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.anyOf(anyOf));
 		}
@@ -844,6 +910,7 @@ public ArrayJsonSchemaProperty anyOf(Collection<JsonSchemaObject> anyOf) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.oneOf(oneOf));
 		}
@@ -853,6 +920,7 @@ public ArrayJsonSchemaProperty oneOf(Collection<JsonSchemaObject> oneOf) {
 		 * @return new instance of {@link ArrayJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#notMatch(JsonSchemaObject)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.notMatch(notMatch));
 		}
@@ -862,6 +930,7 @@ public ArrayJsonSchemaProperty notMatch(JsonSchemaObject notMatch) {
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see ArrayJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaProperty description(String description) {
 			return new ArrayJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -892,6 +961,7 @@ public static class BooleanJsonSchemaProperty extends IdentifiableJsonSchemaProp
 		 * @return new instance of {@link NumericJsonSchemaProperty}.
 		 * @see BooleanJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> new")
 		public BooleanJsonSchemaProperty description(String description) {
 			return new BooleanJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -922,6 +992,7 @@ public static class NullJsonSchemaProperty extends IdentifiableJsonSchemaPropert
 		 * @return new instance of {@link NullJsonSchemaProperty}.
 		 * @see NullJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> new")
 		public NullJsonSchemaProperty description(String description) {
 			return new NullJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -952,6 +1023,7 @@ public static class DateJsonSchemaProperty extends IdentifiableJsonSchemaPropert
 		 * @return new instance of {@link DateJsonSchemaProperty}.
 		 * @see DateJsonSchemaProperty#description(String)
 		 */
+		@Contract("_ -> new")
 		public DateJsonSchemaProperty description(String description) {
 			return new DateJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -982,6 +1054,7 @@ public static class TimestampJsonSchemaProperty extends IdentifiableJsonSchemaPr
 		 * @return new instance of {@link TimestampJsonSchemaProperty}.
 		 * @see TimestampJsonSchemaProperty#description(String)
 		 */
+		@Contract("_ -> new")
 		public TimestampJsonSchemaProperty description(String description) {
 			return new TimestampJsonSchemaProperty(identifier, jsonSchemaObjectDelegate.description(description));
 		}
@@ -1013,37 +1086,21 @@ public static class RequiredJsonSchemaProperty implements JsonSchemaProperty {
 			this.required = required;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#getIdentifier()
-		 */
 		@Override
 		public String getIdentifier() {
 			return delegate.getIdentifier();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes()
-		 */
 		@Override
 		public Set<Type> getTypes() {
 			return delegate.getTypes();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument()
-		 */
 		@Override
 		public Document toDocument() {
 			return delegate.toDocument();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#isRequired()
-		 */
 		@Override
 		public boolean isRequired() {
 			return required;
@@ -1060,8 +1117,8 @@ public static class EncryptedJsonSchemaProperty implements JsonSchemaProperty {
 
 		private final JsonSchemaProperty targetProperty;
 		private final @Nullable String algorithm;
-		private final @Nullable String keyId;
-		private final @Nullable List<UUID> keyIds;
+		private final @Nullable Object keyId;
+		private final @Nullable List<?> keyIds;
 
 		/**
 		 * Create new instance of {@link EncryptedJsonSchemaProperty} wrapping the given {@link JsonSchemaProperty target}.
@@ -1072,10 +1129,10 @@ public EncryptedJsonSchemaProperty(JsonSchemaProperty target) {
 			this(target, null, null, null);
 		}
 
-		private EncryptedJsonSchemaProperty(JsonSchemaProperty target, @Nullable String algorithm, @Nullable String keyId,
-				@Nullable List<UUID> keyIds) {
+		private EncryptedJsonSchemaProperty(JsonSchemaProperty target, @Nullable String algorithm, @Nullable Object keyId,
+				@Nullable List<?> keyIds) {
 
-			Assert.notNull(target, "Target must not be null!");
+			Assert.notNull(target, "Target must not be null");
 			this.targetProperty = target;
 			this.algorithm = algorithm;
 			this.keyId = keyId;
@@ -1092,13 +1149,26 @@ public static EncryptedJsonSchemaProperty encrypted(JsonSchemaProperty target) {
 			return new EncryptedJsonSchemaProperty(target);
 		}
 
+		/**
+		 * Create new instance of {@link EncryptedJsonSchemaProperty} with {@literal Range} encryption, wrapping the given
+		 * {@link JsonSchemaProperty target}.
+		 *
+		 * @param target must not be {@literal null}.
+		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
+		 * @since 4.5
+		 */
+		public static EncryptedJsonSchemaProperty rangeEncrypted(JsonSchemaProperty target) {
+			return new EncryptedJsonSchemaProperty(target).algorithm(EncryptionAlgorithms.RANGE);
+		}
+
 		/**
 		 * Use {@literal AEAD_AES_256_CBC_HMAC_SHA_512-Random} algorithm.
 		 *
 		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
 		 */
+		@Contract("-> new")
 		public EncryptedJsonSchemaProperty aead_aes_256_cbc_hmac_sha_512_random() {
-			return algorithm("AEAD_AES_256_CBC_HMAC_SHA_512-Random");
+			return algorithm(EncryptionAlgorithms.AEAD_AES_256_CBC_HMAC_SHA_512_Random);
 		}
 
 		/**
@@ -1106,8 +1176,9 @@ public EncryptedJsonSchemaProperty aead_aes_256_cbc_hmac_sha_512_random() {
 		 *
 		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
 		 */
+		@Contract("-> new")
 		public EncryptedJsonSchemaProperty aead_aes_256_cbc_hmac_sha_512_deterministic() {
-			return algorithm("AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic");
+			return algorithm(EncryptionAlgorithms.AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic);
 		}
 
 		/**
@@ -1115,30 +1186,47 @@ public EncryptedJsonSchemaProperty aead_aes_256_cbc_hmac_sha_512_deterministic()
 		 *
 		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
 		 */
+		@Contract("_ -> new")
 		public EncryptedJsonSchemaProperty algorithm(String algorithm) {
 			return new EncryptedJsonSchemaProperty(targetProperty, algorithm, keyId, keyIds);
 		}
 
 		/**
-		 * @param key
-		 * @return
+		 * @param keyId must not be {@literal null}.
+		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
 		 */
+		@Contract("_ -> new")
 		public EncryptedJsonSchemaProperty keyId(String keyId) {
 			return new EncryptedJsonSchemaProperty(targetProperty, algorithm, keyId, null);
 		}
 
 		/**
-		 * @param keyId
-		 * @return
+		 * @param keyId must not be {@literal null}.
+		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
+		 * @since 4.5
 		 */
+		public EncryptedJsonSchemaProperty keyId(Object keyId) {
+			return new EncryptedJsonSchemaProperty(targetProperty, algorithm, keyId, null);
+		}
+
+		/**
+		 * @param keyId must not be {@literal null}.
+		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
+		 */
+		@Contract("_ -> new")
 		public EncryptedJsonSchemaProperty keys(UUID... keyId) {
 			return new EncryptedJsonSchemaProperty(targetProperty, algorithm, null, Arrays.asList(keyId));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument()
+		/**
+		 * @param keyId must not be {@literal null}.
+		 * @return new instance of {@link EncryptedJsonSchemaProperty}.
 		 */
+		@Contract("_ -> new")
+		public EncryptedJsonSchemaProperty keys(Object... keyId) {
+			return new EncryptedJsonSchemaProperty(targetProperty, algorithm, null, Arrays.asList(keyId));
+		}
+
 		@Override
 		public Document toDocument() {
 
@@ -1160,33 +1248,27 @@ public Document toDocument() {
 				enc.append("bsonType", type.toBsonType().value()); // TODO: no samples with type -> is it bson type all the way?
 			}
 
-			enc.append("algorithm", algorithm);
+			if (StringUtils.hasText(algorithm)) {
+				enc.append("algorithm", algorithm);
+			}
 
 			propertySpecification.append("encrypt", enc);
 
 			return doc;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaProperty#getIdentifier()
-		 */
 		@Override
 		public String getIdentifier() {
 			return targetProperty.getIdentifier();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes()
-		 */
 		@Override
 		public Set<Type> getTypes() {
 			return targetProperty.getTypes();
 		}
 
-		@Nullable
-		private Type extractPropertyType(Document source) {
+
+		private @Nullable Type extractPropertyType(Document source) {
 
 			if (source.containsKey("type")) {
 				return Type.of(source.get("type", String.class));
@@ -1197,5 +1279,71 @@ private Type extractPropertyType(Document source) {
 
 			return null;
 		}
+
+		public @Nullable Object getKeyId() {
+			if (keyId != null) {
+				return keyId;
+			}
+			if (keyIds != null && keyIds.size() == 1) {
+				return keyIds.iterator().next();
+			}
+			return null;
+		}
+	}
+
+	/**
+	 * {@link JsonSchemaProperty} implementation typically wrapping an {@link EncryptedJsonSchemaProperty encrypted
+	 * property} to mark it as queryable.
+	 *
+	 * @author Christoph Strobl
+	 * @since 4.5
+	 */
+	public static class QueryableJsonSchemaProperty implements JsonSchemaProperty {
+
+		private final JsonSchemaProperty targetProperty;
+		private final QueryCharacteristics characteristics;
+
+		public QueryableJsonSchemaProperty(JsonSchemaProperty target, QueryCharacteristics characteristics) {
+			this.targetProperty = target;
+			this.characteristics = characteristics;
+		}
+
+		@Override
+		public Document toDocument() {
+
+			Document doc = targetProperty.toDocument();
+			Document propertySpecification = doc.get(targetProperty.getIdentifier(), Document.class);
+
+			if (propertySpecification.containsKey("encrypt")) {
+				Document encrypt = propertySpecification.get("encrypt", Document.class);
+				List<Document> queries = characteristics.getCharacteristics().stream().map(QueryCharacteristic::toDocument)
+						.toList();
+				encrypt.append("queries", queries);
+			}
+
+			return doc;
+		}
+
+		@Override
+		public String getIdentifier() {
+			return targetProperty.getIdentifier();
+		}
+
+		@Override
+		public Set<Type> getTypes() {
+			return targetProperty.getTypes();
+		}
+
+		boolean isEncrypted() {
+			return targetProperty instanceof EncryptedJsonSchemaProperty;
+		}
+
+		public JsonSchemaProperty getTargetProperty() {
+			return targetProperty;
+		}
+
+		public QueryCharacteristics getCharacteristics() {
+			return characteristics;
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java
index 5f0421272c..24a40efa5b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
  */
 package org.springframework.data.mongodb.core.schema;
 
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
 import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.Collection;
@@ -34,6 +31,7 @@
 import org.bson.types.Code;
 import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.ArrayJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.BooleanJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.DateJsonSchemaObject;
@@ -42,13 +40,13 @@
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.ObjectJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.StringJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.TimestampJsonSchemaObject;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Interface that can be implemented by objects that know how to serialize themselves to JSON schema using
  * {@link #toDocument()}.
- * <p/>
+ * <br />
  * This class also declares factory methods for type-specific {@link JsonSchemaObject schema objects} such as
  * {@link #string()} or {@link #object()}. For example:
  *
@@ -267,7 +265,7 @@ static TypedJsonSchemaObject of(@Nullable Class<?> type) {
 			return of(Type.numberType());
 		}
 
-		throw new IllegalArgumentException(String.format("No JSON schema type found for %s.", type));
+		throw new IllegalArgumentException(String.format("No JSON schema type found for %s", type));
 	}
 
 	/**
@@ -431,7 +429,7 @@ static Type jsonTypeOf(String name) {
 
 		/**
 		 * Create a {@link Type} with its default {@link Type#representation() representation} via the name.
-		 * 
+		 *
 		 * @param name must not be {@literal null}.
 		 * @return the matching type instance.
 		 * @since 2.2
@@ -476,7 +474,7 @@ static Set<Type> bsonTypes() {
 
 		/**
 		 * Get the {@literal bsonType} representation of the given type.
-		 * 
+		 *
 		 * @return never {@literal null}.
 		 * @since 2.2
 		 */
@@ -500,58 +498,81 @@ default Type toBsonType() {
 		 * @author Christpoh Strobl
 		 * @since 2.1
 		 */
-		@RequiredArgsConstructor
-		@EqualsAndHashCode
 		class JsonType implements Type {
 
 			private final String name;
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#representation()
-			 */
+			public JsonType(String name) {
+				this.name = name;
+			}
+
 			@Override
 			public String representation() {
 				return "type";
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#value()
-			 */
 			@Override
 			public String value() {
 				return name;
 			}
+
+			@Override
+			public boolean equals(@Nullable Object o) {
+				if (this == o)
+					return true;
+				if (o == null || getClass() != o.getClass())
+					return false;
+
+				JsonType jsonType = (JsonType) o;
+
+				return ObjectUtils.nullSafeEquals(name, jsonType.name);
+			}
+
+			@Override
+			public int hashCode() {
+				return ObjectUtils.nullSafeHashCode(name);
+			}
 		}
 
 		/**
 		 * @author Christpoh Strobl
 		 * @since 2.1
 		 */
-		@RequiredArgsConstructor
-		@EqualsAndHashCode
 		class BsonType implements Type {
 
 			private final String name;
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#representation()
-			 */
+			BsonType(String name) {
+				this.name = name;
+			}
+
 			@Override
 			public String representation() {
 				return "bsonType";
 			}
 
-			/*
-			 * (non-Javadoc)
-			 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type#value()
-			 */
 			@Override
 			public String value() {
 				return name;
 			}
+
+			@Override
+			public boolean equals(@Nullable Object o) {
+
+				if (this == o)
+					return true;
+				if (o == null || getClass() != o.getClass())
+					return false;
+
+				BsonType bsonType = (BsonType) o;
+
+				return ObjectUtils.nullSafeEquals(name, bsonType.name);
+			}
+
+			@Override
+			public int hashCode() {
+				return ObjectUtils.nullSafeHashCode(name);
+			}
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaProperty.java
index 3bd149c53a..20d735ee03 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaProperty.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/JsonSchemaProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,24 @@
  */
 package org.springframework.data.mongodb.core.schema;
 
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
+import java.util.Collection;
+import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.ArrayJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.BooleanJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.DateJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.EncryptedJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.NullJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.NumericJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.ObjectJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.QueryableJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.RequiredJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.StringJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.TimestampJsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.UntypedJsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.NumericJsonSchemaObject;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.ObjectJsonSchemaObject;
-import org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.*;
-import org.springframework.lang.Nullable;
 
 /**
  * A {@literal property} or {@literal patternProperty} within a {@link JsonSchemaObject} of {@code type : 'object'}.
@@ -70,6 +81,18 @@ static EncryptedJsonSchemaProperty encrypted(JsonSchemaProperty property) {
 		return EncryptedJsonSchemaProperty.encrypted(property);
 	}
 
+	/**
+	 * Turns the given target property into a {@link QueryableJsonSchemaProperty queryable} one, eg. for {@literal range}
+	 * encrypted properties.
+	 * 
+	 * @param property the queryable property. Must not be {@literal null}.
+	 * @param queries predefined query characteristics.
+	 * @since 4.5
+	 */
+	static QueryableJsonSchemaProperty queryable(JsonSchemaProperty property, List<QueryCharacteristic> queries) {
+		return new QueryableJsonSchemaProperty(property, new QueryCharacteristics(queries));
+	}
+
 	/**
 	 * Creates a new {@link StringJsonSchemaProperty} with given {@literal identifier} of {@code type : 'string'}.
 	 *
@@ -218,8 +241,8 @@ static TimestampJsonSchemaProperty timestamp(String identifier) {
 	/**
 	 * Obtain a builder to create a {@link JsonSchemaProperty}.
 	 *
-	 * @param identifier
-	 * @return
+	 * @param identifier must not be {@literal null}.
+	 * @return new instance of {@link JsonSchemaPropertyBuilder}.
 	 */
 	static JsonSchemaPropertyBuilder named(String identifier) {
 		return new JsonSchemaPropertyBuilder(identifier);
@@ -236,19 +259,33 @@ static JsonSchemaProperty required(JsonSchemaProperty property) {
 		return new RequiredJsonSchemaProperty(property, true);
 	}
 
+	/**
+	 * Merges multiple {@link JsonSchemaProperty} with potentially different attributes into one.
+	 *
+	 * @param properties must not be {@literal null}.
+	 * @return new instance of {@link JsonSchemaProperty}.
+	 * @since 3.4
+	 */
+	static JsonSchemaProperty merged(Collection<JsonSchemaProperty> properties) {
+		return new MergedJsonSchemaProperty(properties);
+	}
+
 	/**
 	 * Builder for {@link IdentifiableJsonSchemaProperty}.
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 	class JsonSchemaPropertyBuilder {
 
 		private final String identifier;
 
+		JsonSchemaPropertyBuilder(String identifier) {
+			this.identifier = identifier;
+		}
+
 		/**
 		 * Configure a {@link Type} for the property.
 		 *
 		 * @param type must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IdentifiableJsonSchemaProperty}.
 		 */
 		public IdentifiableJsonSchemaProperty<TypedJsonSchemaObject> ofType(Type type) {
 			return new IdentifiableJsonSchemaProperty<>(identifier, TypedJsonSchemaObject.of(type));
@@ -269,7 +306,7 @@ public IdentifiableJsonSchemaProperty<TypedJsonSchemaObject> ofType(@Nullable Cl
 		 * Configure a {@link TypedJsonSchemaObject} for the property.
 		 *
 		 * @param schemaObject must not be {@literal null}.
-		 * @return
+		 * @return new instance of {@link IdentifiableJsonSchemaProperty}.
 		 */
 		public IdentifiableJsonSchemaProperty<TypedJsonSchemaObject> with(TypedJsonSchemaObject schemaObject) {
 			return new IdentifiableJsonSchemaProperty<>(identifier, schemaObject);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MergedJsonSchema.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MergedJsonSchema.java
new file mode 100644
index 0000000000..a6fc3ab8bd
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MergedJsonSchema.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2022-2025 the original author 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.schema;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
+import java.util.stream.Collectors;
+
+import org.bson.Document;
+
+/**
+ * {@link MongoJsonSchema} implementation that is capable of merging properties from different schemas into a single
+ * one.
+ *
+ * @author Christoph Strobl
+ * @since 3.4
+ */
+class MergedJsonSchema implements MongoJsonSchema {
+
+	private final List<MongoJsonSchema> schemaList;
+	private final BiFunction<Map<String, Object>, Map<String, Object>, Document> mergeFunction;
+
+	MergedJsonSchema(List<MongoJsonSchema> schemaList, ConflictResolutionFunction conflictResolutionFunction) {
+		this(schemaList, new TypeUnifyingMergeFunction(conflictResolutionFunction));
+	}
+
+	MergedJsonSchema(List<MongoJsonSchema> schemaList,
+			BiFunction<Map<String, Object>, Map<String, Object>, Document> mergeFunction) {
+
+		this.schemaList = new ArrayList<>(schemaList);
+		this.mergeFunction = mergeFunction;
+	}
+
+	@Override
+	public MongoJsonSchema mergeWith(Collection<MongoJsonSchema> sources) {
+
+		schemaList.addAll(sources);
+		return this;
+	}
+
+	@Override
+	public Document schemaDocument() {
+
+		Document targetSchema = new Document();
+		for (MongoJsonSchema schema : schemaList) {
+			targetSchema = mergeFunction.apply(targetSchema, schema.schemaDocument());
+		}
+
+		return targetSchema;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MergedJsonSchemaProperty.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MergedJsonSchemaProperty.java
new file mode 100644
index 0000000000..856ab772ee
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MergedJsonSchemaProperty.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2022-2025 the original author 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.schema;
+
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+import org.bson.Document;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema.ConflictResolutionFunction;
+
+/**
+ * {@link JsonSchemaProperty} implementation that is capable of combining multiple properties with different values into
+ * a single one.
+ *
+ * @author Christoph Strobl
+ * @since 3.4
+ */
+class MergedJsonSchemaProperty implements JsonSchemaProperty {
+
+	private final Iterable<JsonSchemaProperty> properties;
+	private final BiFunction<Map<String, Object>, Map<String, Object>, Document> mergeFunction;
+
+	MergedJsonSchemaProperty(Iterable<JsonSchemaProperty> properties) {
+		this(properties, (k, a, b) -> {
+			throw new IllegalStateException(
+					String.format("Error resolving conflict for '%s'; No conflict resolution function defined", k));
+		});
+	}
+
+	MergedJsonSchemaProperty(Iterable<JsonSchemaProperty> properties,
+			ConflictResolutionFunction conflictResolutionFunction) {
+		this(properties, new TypeUnifyingMergeFunction(conflictResolutionFunction));
+	}
+
+	MergedJsonSchemaProperty(Iterable<JsonSchemaProperty> properties,
+			BiFunction<Map<String, Object>, Map<String, Object>, Document> mergeFunction) {
+
+		this.properties = properties;
+		this.mergeFunction = mergeFunction;
+	}
+
+	@Override
+	public Set<Type> getTypes() {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public Document toDocument() {
+
+		Document document = new Document();
+
+		for (JsonSchemaProperty property : properties) {
+			document = mergeFunction.apply(document, property.toDocument());
+		}
+		return document;
+	}
+
+	@Override
+	public String getIdentifier() {
+		return properties.iterator().next().getIdentifier();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MongoJsonSchema.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MongoJsonSchema.java
index f439c94960..87c46d63dc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MongoJsonSchema.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/MongoJsonSchema.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,11 +15,18 @@
  */
 package org.springframework.data.mongodb.core.schema;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject.ObjectJsonSchemaObject;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
 
 /**
  * Interface defining MongoDB-specific JSON schema object. New objects can be built with {@link #builder()}, for
@@ -62,19 +69,31 @@
 public interface MongoJsonSchema {
 
 	/**
-	 * Create the {@link Document} containing the specified {@code $jsonSchema}. <br />
+	 * Create the {@code $jsonSchema} {@link Document} containing the specified {@link #schemaDocument()}. <br />
 	 * Property and field names need to be mapped to the domain type ones by running the {@link Document} through a
 	 * {@link org.springframework.data.mongodb.core.convert.JsonSchemaMapper} to apply field name customization.
 	 *
 	 * @return never {@literal null}.
 	 */
-	Document toDocument();
+	default Document toDocument() {
+		return new Document("$jsonSchema", schemaDocument());
+	}
+
+	/**
+	 * Create the {@link Document} defining the schema. <br />
+	 * Property and field names need to be mapped to the domain type property by running the {@link Document} through a
+	 * {@link org.springframework.data.mongodb.core.convert.JsonSchemaMapper} to apply field name customization.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.3
+	 */
+	Document schemaDocument();
 
 	/**
 	 * Create a new {@link MongoJsonSchema} for a given root object.
 	 *
 	 * @param root must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link MongoJsonSchema}.
 	 */
 	static MongoJsonSchema of(JsonSchemaObject root) {
 		return new DefaultMongoJsonSchema(root);
@@ -84,12 +103,78 @@ static MongoJsonSchema of(JsonSchemaObject root) {
 	 * Create a new {@link MongoJsonSchema} for a given root {@link Document} containing the schema definition.
 	 *
 	 * @param document must not be {@literal null}.
-	 * @return
+	 * @return new instance of {@link MongoJsonSchema}.
 	 */
 	static MongoJsonSchema of(Document document) {
 		return new DocumentJsonSchema(document);
 	}
 
+	/**
+	 * Create a new {@link MongoJsonSchema} merging properties from the given sources.
+	 *
+	 * @param sources must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchema}.
+	 * @since 3.4
+	 */
+	static MongoJsonSchema merge(MongoJsonSchema... sources) {
+		return merge((path, left, right) -> {
+			throw new IllegalStateException(String.format("Cannot merge schema for path '%s' holding values '%s' and '%s'",
+					path.dotPath(), left, right));
+		}, sources);
+	}
+
+	/**
+	 * Create a new {@link MongoJsonSchema} merging properties from the given sources.
+	 *
+	 * @param sources must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchema}.
+	 * @since 3.4
+	 */
+	static MongoJsonSchema merge(ConflictResolutionFunction mergeFunction, MongoJsonSchema... sources) {
+		return new MergedJsonSchema(Arrays.asList(sources), mergeFunction);
+	}
+
+	/**
+	 * Create a new {@link MongoJsonSchema} merging properties from the given sources.
+	 *
+	 * @param sources must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchema}.
+	 * @since 3.4
+	 */
+	default MongoJsonSchema mergeWith(MongoJsonSchema... sources) {
+		return mergeWith(Arrays.asList(sources));
+	}
+
+	/**
+	 * Create a new {@link MongoJsonSchema} merging properties from the given sources.
+	 *
+	 * @param sources must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchema}.
+	 * @since 3.4
+	 */
+	default MongoJsonSchema mergeWith(Collection<MongoJsonSchema> sources) {
+		return mergeWith(sources, (path, left, right) -> {
+			throw new IllegalStateException(String.format("Cannot merge schema for path '%s' holding values '%s' and '%s'",
+					path.dotPath(), left, right));
+		});
+	}
+
+	/**
+	 * Create a new {@link MongoJsonSchema} merging properties from the given sources.
+	 *
+	 * @param sources must not be {@literal null}.
+	 * @return new instance of {@link MongoJsonSchema}.
+	 * @since 3.4
+	 */
+	default MongoJsonSchema mergeWith(Collection<MongoJsonSchema> sources,
+			ConflictResolutionFunction conflictResolutionFunction) {
+
+		List<MongoJsonSchema> schemaList = new ArrayList<>(sources.size() + 1);
+		schemaList.add(this);
+		schemaList.addAll(new ArrayList<>(sources));
+		return new MergedJsonSchema(schemaList, conflictResolutionFunction);
+	}
+
 	/**
 	 * Obtain a new {@link MongoJsonSchemaBuilder} to fluently define the schema.
 	 *
@@ -99,6 +184,125 @@ static MongoJsonSchemaBuilder builder() {
 		return new MongoJsonSchemaBuilder();
 	}
 
+	/**
+	 * A resolution function that is called on conflicting paths when trying to merge properties with different values
+	 * into a single value.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.4
+	 */
+	@FunctionalInterface
+	interface ConflictResolutionFunction {
+
+		/**
+		 * Resolve the conflict for two values under the same {@code path}.
+		 *
+		 * @param path the {@link Path} leading to the conflict.
+		 * @param left can be {@literal null}.
+		 * @param right can be {@literal null}.
+		 * @return never {@literal null}.
+		 */
+		Resolution resolveConflict(Path path, @Nullable Object left, @Nullable Object right);
+
+		/**
+		 * @author Christoph Strobl
+		 * @since 3.4
+		 */
+		interface Path {
+
+			/**
+			 * @return the name of the currently processed element
+			 */
+			@Nullable String currentElement();
+
+			/**
+			 * @return the path leading to the currently processed element in dot {@literal '.'} notation.
+			 */
+			String dotPath();
+		}
+
+		/**
+		 * The result after processing a conflict when merging schemas. May indicate to {@link #SKIP skip} the entry
+		 * entirely.
+		 *
+		 * @author Christoph Strobl
+		 * @since 3.4
+		 */
+		interface Resolution extends Map.Entry<String, Object> {
+
+			@Override
+			default Object setValue(Object value) {
+				throw new IllegalStateException("Cannot set value result; Maybe you missed to override the method");
+			}
+
+			/**
+			 * Resolution
+			 */
+			Resolution SKIP = new Resolution() {
+
+				@Override
+				public String getKey() {
+					throw new IllegalStateException("No key for skipped result");
+				}
+
+				@Override
+				public Object getValue() {
+					throw new IllegalStateException("No value for skipped result");
+				}
+
+				@Override
+				public Object setValue(Object value) {
+					throw new IllegalStateException("Cannot set value on skipped result");
+				}
+			};
+
+			/**
+			 * Obtain a {@link Resolution} that will skip the entry and proceed computation.
+			 *
+			 * @return never {@literal null}.
+			 */
+			static Resolution skip() {
+				return SKIP;
+			}
+
+			/**
+			 * Construct a resolution for a {@link Path} using the given {@code value}.
+			 *
+			 * @param path the conflicting path.
+			 * @param value the value to apply.
+			 * @return
+			 */
+			static Resolution ofValue(Path path, Object value) {
+
+				Assert.notNull(path, "Path must not be null");
+
+				return ofValue(path.currentElement(), value);
+			}
+
+			/**
+			 * Construct a resolution from a {@code key} and {@code value}.
+			 *
+			 * @param key name of the path segment, typically {@link Path#currentElement()}
+			 * @param value the value to apply.
+			 * @return
+			 */
+			static Resolution ofValue(@Nullable String key, Object value) {
+
+				return new Resolution() {
+					@Override
+					public @Nullable String getKey() {
+						return key;
+					}
+
+					@Override
+					public Object getValue() {
+						return value;
+					}
+				};
+			}
+		}
+	}
+
 	/**
 	 * {@link MongoJsonSchemaBuilder} provides a fluent API for defining a {@link MongoJsonSchema}.
 	 *
@@ -108,6 +312,8 @@ class MongoJsonSchemaBuilder {
 
 		private ObjectJsonSchemaObject root;
 
+		private @Nullable Document encryptionMetadata;
+
 		MongoJsonSchemaBuilder() {
 			root = new ObjectJsonSchemaObject();
 		}
@@ -117,6 +323,7 @@ class MongoJsonSchemaBuilder {
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#minProperties(int)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder minProperties(int count) {
 
 			root = root.minProperties(count);
@@ -128,6 +335,7 @@ public MongoJsonSchemaBuilder minProperties(int count) {
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#maxProperties(int)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder maxProperties(int count) {
 
 			root = root.maxProperties(count);
@@ -135,10 +343,11 @@ public MongoJsonSchemaBuilder maxProperties(int count) {
 		}
 
 		/**
-		 * @param properties
+		 * @param properties must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#required(String...)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder required(String... properties) {
 
 			root = root.required(properties);
@@ -150,6 +359,7 @@ public MongoJsonSchemaBuilder required(String... properties) {
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#additionalProperties(boolean)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder additionalProperties(boolean additionalPropertiesAllowed) {
 
 			root = root.additionalProperties(additionalPropertiesAllowed);
@@ -157,10 +367,11 @@ public MongoJsonSchemaBuilder additionalProperties(boolean additionalPropertiesA
 		}
 
 		/**
-		 * @param schema
+		 * @param schema must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#additionalProperties(ObjectJsonSchemaObject)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder additionalProperties(ObjectJsonSchemaObject schema) {
 
 			root = root.additionalProperties(schema);
@@ -168,10 +379,11 @@ public MongoJsonSchemaBuilder additionalProperties(ObjectJsonSchemaObject schema
 		}
 
 		/**
-		 * @param properties
+		 * @param properties must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#properties(JsonSchemaProperty...)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder properties(JsonSchemaProperty... properties) {
 
 			root = root.properties(properties);
@@ -179,10 +391,11 @@ public MongoJsonSchemaBuilder properties(JsonSchemaProperty... properties) {
 		}
 
 		/**
-		 * @param properties
+		 * @param properties must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#patternProperties(JsonSchemaProperty...)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder patternProperties(JsonSchemaProperty... properties) {
 
 			root = root.patternProperties(properties);
@@ -190,10 +403,11 @@ public MongoJsonSchemaBuilder patternProperties(JsonSchemaProperty... properties
 		}
 
 		/**
-		 * @param property
+		 * @param property must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#property(JsonSchemaProperty)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder property(JsonSchemaProperty property) {
 
 			root = root.property(property);
@@ -201,10 +415,11 @@ public MongoJsonSchemaBuilder property(JsonSchemaProperty property) {
 		}
 
 		/**
-		 * @param possibleValues
+		 * @param possibleValues must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see ObjectJsonSchemaObject#possibleValues(Collection)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder possibleValues(Set<Object> possibleValues) {
 
 			root = root.possibleValues(possibleValues);
@@ -212,10 +427,11 @@ public MongoJsonSchemaBuilder possibleValues(Set<Object> possibleValues) {
 		}
 
 		/**
-		 * @param allOf
+		 * @param allOf must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see UntypedJsonSchemaObject#allOf(Collection)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder allOf(Set<JsonSchemaObject> allOf) {
 
 			root = root.allOf(allOf);
@@ -223,10 +439,11 @@ public MongoJsonSchemaBuilder allOf(Set<JsonSchemaObject> allOf) {
 		}
 
 		/**
-		 * @param anyOf
+		 * @param anyOf must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see UntypedJsonSchemaObject#anyOf(Collection)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder anyOf(Set<JsonSchemaObject> anyOf) {
 
 			root = root.anyOf(anyOf);
@@ -234,10 +451,11 @@ public MongoJsonSchemaBuilder anyOf(Set<JsonSchemaObject> anyOf) {
 		}
 
 		/**
-		 * @param oneOf
+		 * @param oneOf must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see UntypedJsonSchemaObject#oneOf(Collection)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder oneOf(Set<JsonSchemaObject> oneOf) {
 
 			root = root.oneOf(oneOf);
@@ -245,10 +463,11 @@ public MongoJsonSchemaBuilder oneOf(Set<JsonSchemaObject> oneOf) {
 		}
 
 		/**
-		 * @param notMatch
+		 * @param notMatch must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see UntypedJsonSchemaObject#notMatch(JsonSchemaObject)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder notMatch(JsonSchemaObject notMatch) {
 
 			root = root.notMatch(notMatch);
@@ -256,23 +475,35 @@ public MongoJsonSchemaBuilder notMatch(JsonSchemaObject notMatch) {
 		}
 
 		/**
-		 * @param description
+		 * @param description must not be {@literal null}.
 		 * @return {@code this} {@link MongoJsonSchemaBuilder}.
 		 * @see UntypedJsonSchemaObject#description(String)
 		 */
+		@Contract("_ -> this")
 		public MongoJsonSchemaBuilder description(String description) {
 
 			root = root.description(description);
 			return this;
 		}
 
+		/**
+		 * Define the {@literal encryptMetadata} element of the schema.
+		 *
+		 * @param encryptionMetadata can be {@literal null}.
+		 * @since 3.3
+		 */
+		public void encryptionMetadata(@Nullable Document encryptionMetadata) {
+			this.encryptionMetadata = encryptionMetadata;
+		}
+
 		/**
 		 * Obtain the {@link MongoJsonSchema}.
 		 *
 		 * @return new instance of {@link MongoJsonSchema}.
 		 */
+		@Contract("-> new")
 		public MongoJsonSchema build() {
-			return MongoJsonSchema.of(root);
+			return new DefaultMongoJsonSchema(root, encryptionMetadata);
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/QueryCharacteristic.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/QueryCharacteristic.java
new file mode 100644
index 0000000000..8604ba9d6c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/QueryCharacteristic.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2025 the original author 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.schema;
+
+import org.bson.Document;
+
+/**
+ * Defines the specific character of a query that can be executed. Mainly used to define the characteristic of queryable
+ * encrypted fields.
+ * 
+ * @author Christoph Strobl
+ * @since 4.5
+ */
+public interface QueryCharacteristic {
+
+	/**
+	 * @return the query type, eg. {@literal range}.
+	 */
+	String queryType();
+
+	/**
+	 * @return the raw {@link Document} representation of the instance.
+	 */
+	default Document toDocument() {
+		return new Document("queryType", queryType());
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/QueryCharacteristics.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/QueryCharacteristics.java
new file mode 100644
index 0000000000..9283bf4afa
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/QueryCharacteristics.java
@@ -0,0 +1,263 @@
+/*
+ * Copyright 2025 the original author 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.schema;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.bson.BsonNull;
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Range.Bound;
+
+/**
+ * Encapsulation of individual {@link QueryCharacteristic query characteristics} used to define queries that can be
+ * executed when using queryable encryption.
+ *
+ * @author Christoph Strobl
+ * @since 4.5
+ */
+public class QueryCharacteristics implements Iterable<QueryCharacteristic> {
+
+	/**
+	 * instance indicating none
+	 */
+	private static final QueryCharacteristics NONE = new QueryCharacteristics(Collections.emptyList());
+
+	private final List<QueryCharacteristic> characteristics;
+
+	QueryCharacteristics(List<QueryCharacteristic> characteristics) {
+		this.characteristics = characteristics;
+	}
+
+	/**
+	 * @return marker instance indicating no characteristics have been defined.
+	 */
+	public static QueryCharacteristics none() {
+		return NONE;
+	}
+
+	/**
+	 * Create new {@link QueryCharacteristics} from given list of {@link QueryCharacteristic characteristics}.
+	 *
+	 * @param characteristics must not be {@literal null}.
+	 * @return new instance of {@link QueryCharacteristics}.
+	 */
+	public static QueryCharacteristics of(List<QueryCharacteristic> characteristics) {
+		return new QueryCharacteristics(List.copyOf(characteristics));
+	}
+
+	/**
+	 * Create new {@link QueryCharacteristics} from given {@link QueryCharacteristic characteristics}.
+	 *
+	 * @param characteristics must not be {@literal null}.
+	 * @return new instance of {@link QueryCharacteristics}.
+	 */
+	public static QueryCharacteristics of(QueryCharacteristic... characteristics) {
+		return new QueryCharacteristics(Arrays.asList(characteristics));
+	}
+
+	/**
+	 * @return the list of {@link QueryCharacteristic characteristics}.
+	 */
+	public List<QueryCharacteristic> getCharacteristics() {
+		return characteristics;
+	}
+
+	@Override
+	public Iterator<QueryCharacteristic> iterator() {
+		return this.characteristics.iterator();
+	}
+
+	/**
+	 * Create a new {@link RangeQuery range query characteristic} used to define range queries against an encrypted field.
+	 *
+	 * @param <T> targeted field type
+	 * @return new instance of {@link RangeQuery}.
+	 */
+	public static <T> RangeQuery<T> range() {
+		return new RangeQuery<>();
+	}
+
+	/**
+	 * Create a new {@link EqualityQuery equality query characteristic} used to define equality queries against an
+	 * encrypted field.
+	 *
+	 * @param <T> targeted field type
+	 * @return new instance of {@link EqualityQuery}.
+	 */
+	public static <T> EqualityQuery<T> equality() {
+		return new EqualityQuery<>(null);
+	}
+
+	/**
+	 * {@link QueryCharacteristic} for equality comparison.
+	 *
+	 * @param <T>
+	 * @since 4.5
+	 */
+	public static class EqualityQuery<T> implements QueryCharacteristic {
+
+		private final @Nullable Long contention;
+
+		/**
+		 * Create new instance of {@link EqualityQuery}.
+		 *
+		 * @param contention can be {@literal null}.
+		 */
+		public EqualityQuery(@Nullable Long contention) {
+			this.contention = contention;
+		}
+
+		/**
+		 * @param contention concurrent counter partition factor.
+		 * @return new instance of {@link EqualityQuery}.
+		 */
+		public EqualityQuery<T> contention(long contention) {
+			return new EqualityQuery<>(contention);
+		}
+
+		@Override
+		public String queryType() {
+			return "equality";
+		}
+
+		@Override
+		public Document toDocument() {
+			return QueryCharacteristic.super.toDocument().append("contention", contention);
+		}
+	}
+
+	/**
+	 * {@link QueryCharacteristic} for range comparison.
+	 *
+	 * @param <T>
+	 * @since 4.5
+	 */
+	public static class RangeQuery<T> implements QueryCharacteristic {
+
+		private final @Nullable Range<T> valueRange;
+		private final @Nullable Integer trimFactor;
+		private final @Nullable Long sparsity;
+		private final @Nullable Long precision;
+		private final @Nullable Long contention;
+
+		private RangeQuery() {
+			this(Range.unbounded(), null, null, null, null);
+		}
+
+		/**
+		 * Create new instance of {@link RangeQuery}.
+		 *
+		 * @param valueRange
+		 * @param trimFactor
+		 * @param sparsity
+		 * @param contention
+		 */
+		public RangeQuery(@Nullable Range<T> valueRange, @Nullable Integer trimFactor, @Nullable Long sparsity,
+				@Nullable Long precision, @Nullable Long contention) {
+			this.valueRange = valueRange;
+			this.trimFactor = trimFactor;
+			this.sparsity = sparsity;
+			this.precision = precision;
+			this.contention = contention;
+		}
+
+		/**
+		 * @param lower the lower value range boundary for the queryable field.
+		 * @return new instance of {@link RangeQuery}.
+		 */
+		public RangeQuery<T> min(T lower) {
+
+			Range<T> range = Range.of(Bound.inclusive(lower),
+					valueRange != null ? valueRange.getUpperBound() : Bound.unbounded());
+			return new RangeQuery<>(range, trimFactor, sparsity, precision, contention);
+		}
+
+		/**
+		 * @param upper the upper value range boundary for the queryable field.
+		 * @return new instance of {@link RangeQuery}.
+		 */
+		public RangeQuery<T> max(T upper) {
+
+			Range<T> range = Range.of(valueRange != null ? valueRange.getLowerBound() : Bound.unbounded(),
+					Bound.inclusive(upper));
+			return new RangeQuery<>(range, trimFactor, sparsity, precision, contention);
+		}
+
+		/**
+		 * @param trimFactor value to control the throughput of concurrent inserts and updates.
+		 * @return new instance of {@link RangeQuery}.
+		 */
+		public RangeQuery<T> trimFactor(int trimFactor) {
+			return new RangeQuery<>(valueRange, trimFactor, sparsity, precision, contention);
+		}
+
+		/**
+		 * @param sparsity value to control the value density within the index.
+		 * @return new instance of {@link RangeQuery}.
+		 */
+		public RangeQuery<T> sparsity(long sparsity) {
+			return new RangeQuery<>(valueRange, trimFactor, sparsity, precision, contention);
+		}
+
+		/**
+		 * @param contention concurrent counter partition factor.
+		 * @return new instance of {@link RangeQuery}.
+		 */
+		public RangeQuery<T> contention(long contention) {
+			return new RangeQuery<>(valueRange, trimFactor, sparsity, precision, contention);
+		}
+
+		/**
+		 * @param precision digits considered comparing floating point numbers.
+		 * @return new instance of {@link RangeQuery}.
+		 */
+		public RangeQuery<T> precision(long precision) {
+			return new RangeQuery<>(valueRange, trimFactor, sparsity, precision, contention);
+		}
+
+		@Override
+		public String queryType() {
+			return "range";
+		}
+
+		@Override
+		@SuppressWarnings("unchecked")
+		public Document toDocument() {
+
+			Document target = QueryCharacteristic.super.toDocument();
+			if (contention != null) {
+				target.append("contention", contention);
+			}
+			if (trimFactor != null) {
+				target.append("trimFactor", trimFactor);
+			}
+			if (valueRange != null) {
+				target.append("min", valueRange.getLowerBound().getValue().orElse((T) BsonNull.VALUE)).append("max",
+						valueRange.getUpperBound().getValue().orElse((T) BsonNull.VALUE));
+			}
+			if (sparsity != null) {
+				target.append("sparsity", sparsity);
+			}
+
+			return target;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypeUnifyingMergeFunction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypeUnifyingMergeFunction.java
new file mode 100644
index 0000000000..87bdd8c618
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypeUnifyingMergeFunction.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2022-2025 the original author 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.schema;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.BiFunction;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema.ConflictResolutionFunction;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema.ConflictResolutionFunction.Path;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema.ConflictResolutionFunction.Resolution;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Merge function considering BSON type hints. Conflicts are resolved through a {@link ConflictResolutionFunction}.
+ *
+ * @author Christoph Strobl
+ * @since 3.4
+ */
+class TypeUnifyingMergeFunction implements BiFunction<Map<String, Object>, Map<String, Object>, Document> {
+
+	private final ConflictResolutionFunction conflictResolutionFunction;
+
+	public TypeUnifyingMergeFunction(ConflictResolutionFunction conflictResolutionFunction) {
+		this.conflictResolutionFunction = conflictResolutionFunction;
+	}
+
+	@Override
+	public Document apply(Map<String, Object> left, Map<String, Object> right) {
+		return merge(SimplePath.root(), left, right);
+	}
+
+	@SuppressWarnings("unchecked")
+	Document merge(SimplePath path, Map<String, Object> left, Map<String, Object> right) {
+
+		Document target = new Document(left);
+
+		for (String key : right.keySet()) {
+
+			SimplePath currentPath = path.append(key);
+			if (isTypeKey(key)) {
+
+				Object unifiedExistingType = getUnifiedExistingType(key, target);
+
+				if (unifiedExistingType != null) {
+					if (!ObjectUtils.nullSafeEquals(unifiedExistingType, right.get(key))) {
+						resolveConflict(currentPath, left, right, target);
+					}
+					continue;
+				}
+			}
+
+			if (!target.containsKey(key)) {
+				target.put(key, right.get(key));
+				continue;
+			}
+
+			Object existingEntry = target.get(key);
+			Object newEntry = right.get(key);
+			if (existingEntry instanceof Map && newEntry instanceof Map) {
+				target.put(key, merge(currentPath, (Map<String, Object>) existingEntry, (Map<String, Object>) newEntry));
+			} else if (!ObjectUtils.nullSafeEquals(existingEntry, newEntry)) {
+				resolveConflict(currentPath, left, right, target);
+			}
+		}
+
+		return target;
+	}
+
+	private void resolveConflict(Path path, Map<String, Object> left, Map<String, Object> right, Document target) {
+		applyConflictResolution(path, target, conflictResolutionFunction.resolveConflict(path, left, right));
+	}
+
+	private void applyConflictResolution(Path path, Document target, Resolution resolution) {
+
+		if (Resolution.SKIP.equals(resolution) || resolution.getValue() == null) {
+			target.remove(path.currentElement());
+			return;
+		}
+
+		if (isTypeKey(resolution.getKey())) {
+			target.put(getTypeKeyToUse(resolution.getKey(), target), resolution.getValue());
+		} else {
+			target.put(resolution.getKey(), resolution.getValue());
+		}
+	}
+
+	private static boolean isTypeKey(String key) {
+		return "bsonType".equals(key) || "type".equals(key);
+	}
+
+	private static String getTypeKeyToUse(String key, Document source) {
+
+		if ("bsonType".equals(key) && source.containsKey("type")) {
+			return "type";
+		}
+		if ("type".equals(key) && source.containsKey("bsonType")) {
+			return "bsonType";
+		}
+		return key;
+	}
+
+	private static @Nullable Object getUnifiedExistingType(String key, Document source) {
+		return source.get(getTypeKeyToUse(key, source));
+	}
+
+	/**
+	 * Trivial {@link List} based {@link Path} implementation.
+	 *
+	 * @author Christoph Strobl
+	 * @since 3.4
+	 */
+	static class SimplePath implements Path {
+
+		private final List<String> path;
+
+		SimplePath(List<String> path) {
+			this.path = path;
+		}
+
+		static SimplePath root() {
+			return new SimplePath(Collections.emptyList());
+		}
+
+		static SimplePath of(List<String> path, String next) {
+
+			List<String> fullPath = new ArrayList<>(path.size() + 1);
+			fullPath.addAll(path);
+			fullPath.add(next);
+			return new SimplePath(fullPath);
+		}
+
+		public SimplePath append(String next) {
+			return of(this.path, next);
+		}
+
+		@Override
+		public @Nullable String currentElement() {
+			return CollectionUtils.lastElement(path);
+		}
+
+		@Override
+		public String dotPath() {
+			return StringUtils.collectionToDelimitedString(path, ".");
+		}
+
+		@Override
+		public String toString() {
+			return dotPath();
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java
index af492337cf..7b299fd4d2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/TypedJsonSchemaObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Optional;
@@ -28,9 +27,10 @@
 import java.util.stream.Collectors;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -41,6 +41,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Michał Kurcius
  * @since 2.1
  */
 public class TypedJsonSchemaObject extends UntypedJsonSchemaObject {
@@ -69,7 +70,7 @@ public class TypedJsonSchemaObject extends UntypedJsonSchemaObject {
 
 		super(restrictions, description, generateDescription);
 
-		Assert.notNull(types, "Types must not be null! Please consider using 'Collections.emptySet()'.");
+		Assert.notNull(types, "Types must not be null Please consider using 'Collections.emptySet()'");
 
 		this.types = types;
 	}
@@ -82,16 +83,12 @@ public class TypedJsonSchemaObject extends UntypedJsonSchemaObject {
 	 */
 	public static TypedJsonSchemaObject of(Type... types) {
 
-		Assert.notNull(types, "Types must not be null!");
-		Assert.noNullElements(types, "Types must not contain null!");
+		Assert.notNull(types, "Types must not be null");
+		Assert.noNullElements(types, "Types must not contain null");
 
 		return new TypedJsonSchemaObject(new LinkedHashSet<>(Arrays.asList(types)), null, false, Restrictions.empty());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes()
-	 */
 	@Override
 	public Set<Type> getTypes() {
 		return types;
@@ -104,6 +101,7 @@ public Set<Type> getTypes() {
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
 	@Override
+	@Contract("_ -> new")
 	public TypedJsonSchemaObject description(String description) {
 		return new TypedJsonSchemaObject(types, description, generateDescription, restrictions);
 	}
@@ -111,10 +109,10 @@ public TypedJsonSchemaObject description(String description) {
 	/**
 	 * Auto generate the {@literal description} if not explicitly set.
 	 *
-	 * @param description must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
 	@Override
+	@Contract("-> new")
 	public TypedJsonSchemaObject generatedDescription() {
 		return new TypedJsonSchemaObject(types, description, true, restrictions);
 	}
@@ -126,6 +124,7 @@ public TypedJsonSchemaObject generatedDescription() {
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
 	@Override
+	@Contract("_ -> new")
 	public TypedJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 		return new TypedJsonSchemaObject(types, description, generateDescription,
 				restrictions.possibleValues(possibleValues));
@@ -138,6 +137,7 @@ public TypedJsonSchemaObject possibleValues(Collection<? extends Object> possibl
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
 	@Override
+	@Contract("_ -> new")
 	public TypedJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 		return new TypedJsonSchemaObject(types, description, generateDescription, restrictions.allOf(allOf));
 	}
@@ -149,6 +149,7 @@ public TypedJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
 	@Override
+	@Contract("_ -> new")
 	public TypedJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 		return new TypedJsonSchemaObject(types, description, generateDescription, restrictions.anyOf(anyOf));
 	}
@@ -160,6 +161,7 @@ public TypedJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
 	@Override
+	@Contract("_ -> new")
 	public TypedJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 		return new TypedJsonSchemaObject(types, description, generateDescription, restrictions.oneOf(oneOf));
 	}
@@ -167,10 +169,11 @@ public TypedJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 	/**
 	 * The field value must not match the specified schemas.
 	 *
-	 * @param oneOf must not be {@literal null}.
+	 * @param notMatch must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
 	@Override
+	@Contract("_ -> new")
 	public TypedJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 		return new TypedJsonSchemaObject(types, description, generateDescription, restrictions.notMatch(notMatch));
 	}
@@ -215,8 +218,7 @@ private Optional<String> getOrCreateDescription() {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	protected String generateDescription() {
+	protected @Nullable String generateDescription() {
 		return null;
 	}
 
@@ -269,6 +271,7 @@ public ObjectJsonSchemaObject propertiesCount(Range<Integer> range) {
 		 * @param count the allowed minimal number of properties.
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject minProperties(int count) {
 
 			Bound<Integer> upper = this.propertiesCount != null ? this.propertiesCount.getUpperBound() : Bound.unbounded();
@@ -281,6 +284,7 @@ public ObjectJsonSchemaObject minProperties(int count) {
 		 * @param count the allowed maximum number of properties.
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject maxProperties(int count) {
 
 			Bound<Integer> lower = this.propertiesCount != null ? this.propertiesCount.getLowerBound() : Bound.unbounded();
@@ -293,6 +297,7 @@ public ObjectJsonSchemaObject maxProperties(int count) {
 		 * @param properties the names of required properties.
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject required(String... properties) {
 
 			ObjectJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -310,6 +315,7 @@ public ObjectJsonSchemaObject required(String... properties) {
 		 * @param additionalPropertiesAllowed
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject additionalProperties(boolean additionalPropertiesAllowed) {
 
 			ObjectJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -324,6 +330,7 @@ public ObjectJsonSchemaObject additionalProperties(boolean additionalPropertiesA
 		 * @param schema must not be {@literal null}.
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject additionalProperties(ObjectJsonSchemaObject schema) {
 
 			ObjectJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -337,6 +344,7 @@ public ObjectJsonSchemaObject additionalProperties(ObjectJsonSchemaObject schema
 		 * @param properties must not be {@literal null}.
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject properties(JsonSchemaProperty... properties) {
 
 			ObjectJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -354,6 +362,7 @@ public ObjectJsonSchemaObject properties(JsonSchemaProperty... properties) {
 		 * @param regularExpressions must not be {@literal null}.
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject patternProperties(JsonSchemaProperty... regularExpressions) {
 
 			ObjectJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -370,77 +379,57 @@ public ObjectJsonSchemaObject patternProperties(JsonSchemaProperty... regularExp
 		 * @param property must not be {@literal null}.
 		 * @return new instance of {@link ObjectJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject property(JsonSchemaProperty property) {
 			return properties(property);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return newInstance(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return newInstance(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return newInstance(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return newInstance(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject description(String description) {
 			return newInstance(description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.UntypedJsonSchemaObject#generatedDescription()
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ObjectJsonSchemaObject generatedDescription() {
 			return newInstance(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument()
-		 */
+		public List<JsonSchemaProperty> getProperties() {
+			return properties;
+		}
+
 		@Override
 		public Document toDocument() {
 
@@ -467,7 +456,7 @@ public Document toDocument() {
 			if (additionalProperties != null) {
 
 				doc.append("additionalProperties",
-						additionalProperties instanceof JsonSchemaObject ? ((JsonSchemaObject) additionalProperties).toDocument()
+						additionalProperties instanceof JsonSchemaObject schemaObject ? schemaObject.toDocument()
 								: additionalProperties);
 			}
 			return doc;
@@ -502,10 +491,6 @@ private Document reduceToDocument(Collection<JsonSchemaProperty> source) {
 					.collect(Document::new, Document::putAll, (target, propertyDocument) -> {});
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
 		protected String generateDescription() {
 
@@ -524,8 +509,8 @@ protected String generateDescription() {
 							StringUtils.collectionToDelimitedString(requiredProperties, ", "));
 				}
 			}
-			if (additionalProperties instanceof Boolean) {
-				description += (((Boolean) additionalProperties) ? " " : " not ") + "allowing additional properties";
+			if (additionalProperties instanceof Boolean booleanValue) {
+				description += (booleanValue ? " " : " not ") + "allowing additional properties";
 			}
 
 			if (!CollectionUtils.isEmpty(properties)) {
@@ -553,8 +538,7 @@ protected String generateDescription() {
 	 */
 	public static class NumericJsonSchemaObject extends TypedJsonSchemaObject {
 
-		private static final Set<Type> NUMERIC_TYPES = new HashSet<>(
-				Arrays.asList(Type.doubleType(), Type.intType(), Type.longType(), Type.numberType(), Type.bigDecimalType()));
+		private static final Set<Type> NUMERIC_TYPES = Set.of(Type.doubleType(), Type.intType(), Type.longType(), Type.numberType(), Type.bigDecimalType());
 
 		@Nullable Number multipleOf;
 		@Nullable Range<? extends Number> range;
@@ -583,9 +567,10 @@ private NumericJsonSchemaObject(Set<Type> types, @Nullable String description, b
 		 * @param value must not be {@literal null}.
 		 * @return must not be {@literal null}.
 		 */
-		NumericJsonSchemaObject multipleOf(Number value) {
+		@Contract("_ -> new")
+		public NumericJsonSchemaObject multipleOf(Number value) {
 
-			Assert.notNull(value, "Value must not be null!");
+			Assert.notNull(value, "Value must not be null");
 			NumericJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
 			newInstance.multipleOf = value;
 
@@ -599,9 +584,10 @@ NumericJsonSchemaObject multipleOf(Number value) {
 		 * @param range must not be {@literal null}.
 		 * @return new instance of {@link NumericJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject within(Range<? extends Number> range) {
 
-			Assert.notNull(range, "Range must not be null!");
+			Assert.notNull(range, "Range must not be null");
 
 			NumericJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
 			newInstance.range = range;
@@ -616,9 +602,10 @@ public NumericJsonSchemaObject within(Range<? extends Number> range) {
 		 * @return new instance of {@link NumericJsonSchemaObject}.
 		 */
 		@SuppressWarnings("unchecked")
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject gt(Number min) {
 
-			Assert.notNull(min, "Min must not be null!");
+			Assert.notNull(min, "Min must not be null");
 
 			Bound upper = this.range != null ? this.range.getUpperBound() : Bound.unbounded();
 			return within(Range.of(createBound(min, false), upper));
@@ -631,9 +618,10 @@ public NumericJsonSchemaObject gt(Number min) {
 		 * @return new instance of {@link NumericJsonSchemaObject}.
 		 */
 		@SuppressWarnings("unchecked")
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject gte(Number min) {
 
-			Assert.notNull(min, "Min must not be null!");
+			Assert.notNull(min, "Min must not be null");
 
 			Bound upper = this.range != null ? this.range.getUpperBound() : Bound.unbounded();
 			return within(Range.of(createBound(min, true), upper));
@@ -646,9 +634,10 @@ public NumericJsonSchemaObject gte(Number min) {
 		 * @return new instance of {@link NumericJsonSchemaObject}.
 		 */
 		@SuppressWarnings("unchecked")
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject lt(Number max) {
 
-			Assert.notNull(max, "Max must not be null!");
+			Assert.notNull(max, "Max must not be null");
 
 			Bound lower = this.range != null ? this.range.getLowerBound() : Bound.unbounded();
 			return within(Range.of(lower, createBound(max, false)));
@@ -661,81 +650,57 @@ public NumericJsonSchemaObject lt(Number max) {
 		 * @return new instance of {@link NumericJsonSchemaObject}.
 		 */
 		@SuppressWarnings("unchecked")
-		NumericJsonSchemaObject lte(Number max) {
+		@Contract("_ -> new")
+		public NumericJsonSchemaObject lte(Number max) {
 
-			Assert.notNull(max, "Max must not be null!");
+			Assert.notNull(max, "Max must not be null");
 
 			Bound lower = this.range != null ? this.range.getLowerBound() : Bound.unbounded();
 			return within(Range.of(lower, createBound(max, true)));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return newInstance(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return newInstance(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return newInstance(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return newInstance(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject description(String description) {
 			return newInstance(description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription()
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NumericJsonSchemaObject generatedDescription() {
 			return newInstance(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument()
-		 */
 		@Override
 		public Document toDocument() {
 
@@ -782,39 +747,35 @@ private NumericJsonSchemaObject newInstance(@Nullable String description, boolea
 
 		private static Bound<?> createBound(Number number, boolean inclusive) {
 
-			if (number instanceof Long) {
-				return inclusive ? Bound.inclusive((Long) number) : Bound.exclusive((Long) number);
+			if (number instanceof Long longValue) {
+				return inclusive ? Bound.inclusive(longValue) : Bound.exclusive(longValue);
 			}
-			if (number instanceof Double) {
-				return inclusive ? Bound.inclusive((Double) number) : Bound.exclusive((Double) number);
+			if (number instanceof Double doubleValue) {
+				return inclusive ? Bound.inclusive(doubleValue) : Bound.exclusive(doubleValue);
 			}
-			if (number instanceof Float) {
-				return inclusive ? Bound.inclusive((Float) number) : Bound.exclusive((Float) number);
+			if (number instanceof Float floatValue) {
+				return inclusive ? Bound.inclusive(floatValue) : Bound.exclusive(floatValue);
 			}
-			if (number instanceof Integer) {
-				return inclusive ? Bound.inclusive((Integer) number) : Bound.exclusive((Integer) number);
+			if (number instanceof Integer integerValue) {
+				return inclusive ? Bound.inclusive(integerValue) : Bound.exclusive(integerValue);
 			}
-			if (number instanceof BigDecimal) {
-				return inclusive ? Bound.inclusive((BigDecimal) number) : Bound.exclusive((BigDecimal) number);
+			if (number instanceof BigDecimal bigDecimalValue) {
+				return inclusive ? Bound.inclusive(bigDecimalValue) : Bound.exclusive(bigDecimalValue);
 			}
 
-			throw new IllegalArgumentException("Unsupported numeric value.");
+			throw new IllegalArgumentException("Unsupported numeric value");
 		}
 
 		private static Set<Type> validateTypes(Set<Type> types) {
 
 			types.forEach(type -> {
 				Assert.isTrue(NUMERIC_TYPES.contains(type),
-						() -> String.format("%s is not a valid numeric type. Expected one of %s.", type, NUMERIC_TYPES));
+						() -> String.format("%s is not a valid numeric type; Expected one of %s", type, NUMERIC_TYPES));
 			});
 
 			return types;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
 		protected String generateDescription() {
 
@@ -859,9 +820,10 @@ private StringJsonSchemaObject(@Nullable String description, boolean generateDes
 		 * @param range must not be {@literal null}.
 		 * @return new instance of {@link StringJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaObject length(Range<Integer> range) {
 
-			Assert.notNull(range, "Range must not be null!");
+			Assert.notNull(range, "Range must not be null");
 
 			StringJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
 			newInstance.length = range;
@@ -875,6 +837,7 @@ public StringJsonSchemaObject length(Range<Integer> range) {
 		 * @param length
 		 * @return new instance of {@link StringJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaObject minLength(int length) {
 
 			Bound<Integer> upper = this.length != null ? this.length.getUpperBound() : Bound.unbounded();
@@ -887,6 +850,7 @@ public StringJsonSchemaObject minLength(int length) {
 		 * @param length
 		 * @return new instance of {@link StringJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaObject maxLength(int length) {
 
 			Bound<Integer> lower = this.length != null ? this.length.getLowerBound() : Bound.unbounded();
@@ -899,9 +863,10 @@ public StringJsonSchemaObject maxLength(int length) {
 		 * @param pattern must not be {@literal null}.
 		 * @return new instance of {@link StringJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public StringJsonSchemaObject matching(String pattern) {
 
-			Assert.notNull(pattern, "Pattern must not be null!");
+			Assert.notNull(pattern, "Pattern must not be null");
 
 			StringJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
 			newInstance.pattern = pattern;
@@ -909,73 +874,48 @@ public StringJsonSchemaObject matching(String pattern) {
 			return newInstance;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public StringJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public StringJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return newInstance(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public StringJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return newInstance(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public StringJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return newInstance(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public StringJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return newInstance(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public StringJsonSchemaObject description(String description) {
 			return newInstance(description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription()
-		 */
 		@Override
+		@Contract("-> new")
 		public StringJsonSchemaObject generatedDescription() {
 			return newInstance(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#toDocument()
-		 */
 		@Override
 		public Document toDocument() {
 
@@ -987,7 +927,7 @@ public Document toDocument() {
 				length.getUpperBound().getValue().ifPresent(it -> doc.append("maxLength", it));
 			}
 
-			if (!StringUtils.isEmpty(pattern)) {
+			if (StringUtils.hasText(pattern)) {
 				doc.append("pattern", pattern);
 			}
 
@@ -1005,10 +945,6 @@ private StringJsonSchemaObject newInstance(@Nullable String description, boolean
 			return newInstance;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
 		protected String generateDescription() {
 
@@ -1056,6 +992,7 @@ private ArrayJsonSchemaObject(@Nullable String description, boolean generateDesc
 		 * @param uniqueItems
 		 * @return new instance of {@link ArrayJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject uniqueItems(boolean uniqueItems) {
 
 			ArrayJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -1071,6 +1008,7 @@ public ArrayJsonSchemaObject uniqueItems(boolean uniqueItems) {
 		 * @param range must not be {@literal null}. Consider {@link Range#unbounded()} instead.
 		 * @return new instance of {@link ArrayJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject range(Range<Integer> range) {
 
 			ArrayJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -1085,6 +1023,7 @@ public ArrayJsonSchemaObject range(Range<Integer> range) {
 		 * @param count the allowed minimal number of array items.
 		 * @return new instance of {@link ArrayJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject minItems(int count) {
 
 			Bound<Integer> upper = this.range != null ? this.range.getUpperBound() : Bound.unbounded();
@@ -1097,6 +1036,7 @@ public ArrayJsonSchemaObject minItems(int count) {
 		 * @param count the allowed maximal number of array items.
 		 * @return new instance of {@link ArrayJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject maxItems(int count) {
 
 			Bound<Integer> lower = this.range != null ? this.range.getLowerBound() : Bound.unbounded();
@@ -1109,6 +1049,7 @@ public ArrayJsonSchemaObject maxItems(int count) {
 		 * @param items the allowed items in the array.
 		 * @return new instance of {@link ArrayJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject items(Collection<JsonSchemaObject> items) {
 
 			ArrayJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -1123,6 +1064,7 @@ public ArrayJsonSchemaObject items(Collection<JsonSchemaObject> items) {
 		 * @param additionalItemsAllowed {@literal true} to allow additional items in the array, {@literal false} otherwise.
 		 * @return new instance of {@link ArrayJsonSchemaObject}.
 		 */
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject additionalItems(boolean additionalItemsAllowed) {
 
 			ArrayJsonSchemaObject newInstance = newInstance(description, generateDescription, restrictions);
@@ -1131,80 +1073,55 @@ public ArrayJsonSchemaObject additionalItems(boolean additionalItemsAllowed) {
 			return newInstance;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return newInstance(description, generateDescription, restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return newInstance(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return newInstance(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return newInstance(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return newInstance(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject description(String description) {
 			return newInstance(description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription()
-		 */
 		@Override
+		@Contract("_ -> new")
 		public ArrayJsonSchemaObject generatedDescription() {
 			return newInstance(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#toDocument()
-		 */
 		@Override
 		public Document toDocument() {
 
 			Document doc = new Document(super.toDocument());
 
 			if (!CollectionUtils.isEmpty(items)) {
-				doc.append("items", items.size() == 1 ? items.iterator().next()
+				doc.append("items", items.size() == 1 ? items.iterator().next().toDocument()
 						: items.stream().map(JsonSchemaObject::toDocument).collect(Collectors.toList()));
 			}
 
@@ -1238,10 +1155,6 @@ private ArrayJsonSchemaObject newInstance(@Nullable String description, boolean
 			return newInstance;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
 		protected String generateDescription() {
 
@@ -1292,76 +1205,52 @@ private BooleanJsonSchemaObject(@Nullable String description, boolean generateDe
 			super(Type.booleanType(), description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public BooleanJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return new BooleanJsonSchemaObject(description, generateDescription, restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public BooleanJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return new BooleanJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public BooleanJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new BooleanJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public BooleanJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new BooleanJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public BooleanJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return new BooleanJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public BooleanJsonSchemaObject description(String description) {
 			return new BooleanJsonSchemaObject(description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription()
-		 */
 		@Override
+		@Contract("_ -> new")
 		public BooleanJsonSchemaObject generatedDescription() {
 			return new BooleanJsonSchemaObject(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
+		@Contract("-> new")
 		protected String generateDescription() {
-			return "Must be a boolean.";
+			return "Must be a boolean";
 		}
 	}
 
@@ -1385,76 +1274,51 @@ private NullJsonSchemaObject(@Nullable String description, boolean generateDescr
 			super(Type.nullType(), description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NullJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return new NullJsonSchemaObject(description, generateDescription, restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NullJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return new NullJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NullJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new NullJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NullJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new NullJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NullJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return new NullJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public NullJsonSchemaObject description(String description) {
 			return new NullJsonSchemaObject(description, generateDescription, restrictions);
 		}
 
-		/*
-		* (non-Javadoc)
-		* @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription()
-		*/
 		@Override
+		@Contract("-> new")
 		public NullJsonSchemaObject generatedDescription() {
 			return new NullJsonSchemaObject(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
 		protected String generateDescription() {
-			return "Must be null.";
+			return "Must be null";
 		}
 	}
 
@@ -1477,76 +1341,51 @@ private DateJsonSchemaObject(@Nullable String description, boolean generateDescr
 			super(Type.dateType(), description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public DateJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return new DateJsonSchemaObject(description, generateDescription, restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public DateJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return new DateJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public DateJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new DateJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public DateJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new DateJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public DateJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return new DateJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public DateJsonSchemaObject description(String description) {
 			return new DateJsonSchemaObject(description, generateDescription, restrictions);
 		}
 
-		/*
-		* (non-Javadoc)
-		* @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription()
-		*/
 		@Override
+		@Contract("-> new")
 		public DateJsonSchemaObject generatedDescription() {
 			return new DateJsonSchemaObject(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
 		protected String generateDescription() {
-			return "Must be a date.";
+			return "Must be a date";
 		}
 	}
 
@@ -1569,77 +1408,52 @@ private TimestampJsonSchemaObject(@Nullable String description, boolean generate
 			super(Type.timestampType(), description, generateDescription, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#possibleValues(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TimestampJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 			return new TimestampJsonSchemaObject(description, generateDescription,
 					restrictions.possibleValues(possibleValues));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#allOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TimestampJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 			return new TimestampJsonSchemaObject(description, generateDescription, restrictions.allOf(allOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#anyOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TimestampJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 			return new TimestampJsonSchemaObject(description, generateDescription, restrictions.anyOf(anyOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#oneOf(java.util.Collection)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TimestampJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 			return new TimestampJsonSchemaObject(description, generateDescription, restrictions.oneOf(oneOf));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#notMatch(org.springframework.data.mongodb.core.schema.JsonSchemaObject)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TimestampJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 			return new TimestampJsonSchemaObject(description, generateDescription, restrictions.notMatch(notMatch));
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#description(java.lang.String)
-		 */
 		@Override
+		@Contract("_ -> new")
 		public TimestampJsonSchemaObject description(String description) {
 			return new TimestampJsonSchemaObject(description, generateDescription, restrictions);
 		}
 
-		/*
-		* (non-Javadoc)
-		* @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generatedDescription()
-		*/
 		@Override
+		@Contract("-> new")
 		public TimestampJsonSchemaObject generatedDescription() {
 			return new TimestampJsonSchemaObject(description, true, restrictions);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.core.schema.TypedJsonSchemaObject#generateDescription()
-		 */
 		@Override
 		protected String generateDescription() {
-			return "Must be a timestamp.";
+			return "Must be a timestamp";
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java
index dfa584cc6c..d13f8d7985 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/UntypedJsonSchemaObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
  */
 package org.springframework.data.mongodb.core.schema;
 
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -26,7 +23,8 @@
 import java.util.stream.Collectors;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
@@ -61,10 +59,6 @@ public static UntypedJsonSchemaObject newInstance() {
 		return new UntypedJsonSchemaObject(null, null, false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.schema.JsonSchemaObject#getTypes()
-	 */
 	@Override
 	public Set<Type> getTypes() {
 		return Collections.emptySet();
@@ -76,6 +70,7 @@ public Set<Type> getTypes() {
 	 * @param description must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
+	@Contract("_ -> new")
 	public UntypedJsonSchemaObject description(String description) {
 		return new UntypedJsonSchemaObject(restrictions, description, generateDescription);
 	}
@@ -85,6 +80,7 @@ public UntypedJsonSchemaObject description(String description) {
 	 *
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
+	@Contract("-> new")
 	public UntypedJsonSchemaObject generatedDescription() {
 		return new UntypedJsonSchemaObject(restrictions, description, true);
 	}
@@ -95,6 +91,7 @@ public UntypedJsonSchemaObject generatedDescription() {
 	 * @param possibleValues must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
+	@Contract("_ -> new")
 	public UntypedJsonSchemaObject possibleValues(Collection<? extends Object> possibleValues) {
 		return new UntypedJsonSchemaObject(restrictions.possibleValues(possibleValues), description, generateDescription);
 	}
@@ -105,6 +102,7 @@ public UntypedJsonSchemaObject possibleValues(Collection<? extends Object> possi
 	 * @param allOf must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
+	@Contract("_ -> new")
 	public UntypedJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 		return new UntypedJsonSchemaObject(restrictions.allOf(allOf), description, generateDescription);
 	}
@@ -115,6 +113,7 @@ public UntypedJsonSchemaObject allOf(Collection<JsonSchemaObject> allOf) {
 	 * @param anyOf must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
+	@Contract("_ -> new")
 	public UntypedJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 		return new UntypedJsonSchemaObject(restrictions.anyOf(anyOf), description, generateDescription);
 	}
@@ -125,6 +124,7 @@ public UntypedJsonSchemaObject anyOf(Collection<JsonSchemaObject> anyOf) {
 	 * @param oneOf must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
+	@Contract("_ -> new")
 	public UntypedJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 		return new UntypedJsonSchemaObject(restrictions.oneOf(oneOf), description, generateDescription);
 	}
@@ -132,9 +132,10 @@ public UntypedJsonSchemaObject oneOf(Collection<JsonSchemaObject> oneOf) {
 	/**
 	 * The field value must not match the specified schemas.
 	 *
-	 * @param oneOf must not be {@literal null}.
+	 * @param notMatch must not be {@literal null}.
 	 * @return new instance of {@link TypedJsonSchemaObject}.
 	 */
+	@Contract("_ -> new")
 	public UntypedJsonSchemaObject notMatch(JsonSchemaObject notMatch) {
 		return new UntypedJsonSchemaObject(restrictions.notMatch(notMatch), description, generateDescription);
 	}
@@ -170,8 +171,7 @@ private Optional<String> getOrCreateDescription() {
 	 *
 	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	protected String generateDescription() {
+	protected @Nullable String generateDescription() {
 		return null;
 	}
 
@@ -182,15 +182,24 @@ protected String generateDescription() {
 	 * @author Christoph Strobl
 	 * @since 2.1
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
 	static class Restrictions {
 
-		private final Collection<? extends Object> possibleValues;
+		private final Collection<?> possibleValues;
 		private final Collection<JsonSchemaObject> allOf;
 		private final Collection<JsonSchemaObject> anyOf;
 		private final Collection<JsonSchemaObject> oneOf;
 		private final @Nullable JsonSchemaObject notMatch;
 
+		Restrictions(Collection<?> possibleValues, Collection<JsonSchemaObject> allOf,
+				Collection<JsonSchemaObject> anyOf, Collection<JsonSchemaObject> oneOf, @Nullable JsonSchemaObject notMatch) {
+
+			this.possibleValues = possibleValues;
+			this.allOf = allOf;
+			this.anyOf = anyOf;
+			this.oneOf = oneOf;
+			this.notMatch = notMatch;
+		}
+
 		/**
 		 * @return new empty {@link Restrictions}.
 		 */
@@ -204,9 +213,10 @@ static Restrictions empty() {
 		 * @param possibleValues must not be {@literal null}.
 		 * @return
 		 */
-		Restrictions possibleValues(Collection<? extends Object> possibleValues) {
+		@Contract("_ -> new")
+		Restrictions possibleValues(Collection<?> possibleValues) {
 
-			Assert.notNull(possibleValues, "PossibleValues must not be null!");
+			Assert.notNull(possibleValues, "PossibleValues must not be null");
 			return new Restrictions(possibleValues, allOf, anyOf, oneOf, notMatch);
 		}
 
@@ -214,9 +224,10 @@ Restrictions possibleValues(Collection<? extends Object> possibleValues) {
 		 * @param allOf must not be {@literal null}.
 		 * @return
 		 */
+		@Contract("_ -> new")
 		Restrictions allOf(Collection<JsonSchemaObject> allOf) {
 
-			Assert.notNull(allOf, "AllOf must not be null!");
+			Assert.notNull(allOf, "AllOf must not be null");
 			return new Restrictions(possibleValues, allOf, anyOf, oneOf, notMatch);
 		}
 
@@ -224,9 +235,10 @@ Restrictions allOf(Collection<JsonSchemaObject> allOf) {
 		 * @param anyOf must not be {@literal null}.
 		 * @return
 		 */
+		@Contract("_ -> new")
 		Restrictions anyOf(Collection<JsonSchemaObject> anyOf) {
 
-			Assert.notNull(anyOf, "AnyOf must not be null!");
+			Assert.notNull(anyOf, "AnyOf must not be null");
 			return new Restrictions(possibleValues, allOf, anyOf, oneOf, notMatch);
 		}
 
@@ -234,9 +246,10 @@ Restrictions anyOf(Collection<JsonSchemaObject> anyOf) {
 		 * @param oneOf must not be {@literal null}.
 		 * @return
 		 */
+		@Contract("_ -> new")
 		Restrictions oneOf(Collection<JsonSchemaObject> oneOf) {
 
-			Assert.notNull(oneOf, "OneOf must not be null!");
+			Assert.notNull(oneOf, "OneOf must not be null");
 			return new Restrictions(possibleValues, allOf, anyOf, oneOf, notMatch);
 		}
 
@@ -244,9 +257,10 @@ Restrictions oneOf(Collection<JsonSchemaObject> oneOf) {
 		 * @param notMatch must not be {@literal null}.
 		 * @return
 		 */
+		@Contract("_ -> new")
 		Restrictions notMatch(JsonSchemaObject notMatch) {
 
-			Assert.notNull(notMatch, "NotMatch must not be null!");
+			Assert.notNull(notMatch, "NotMatch must not be null");
 			return new Restrictions(possibleValues, allOf, anyOf, oneOf, notMatch);
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/package-info.java
index 380d92af09..cdc583e038 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/schema/package-info.java
@@ -1,6 +1,6 @@
 /**
  * MongoDB-specific JSON schema implementation classes.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 @org.springframework.lang.NonNullFields
 package org.springframework.data.mongodb.core.schema;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/ExecutableMongoScript.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/ExecutableMongoScript.java
index a0ecfe19bf..d443d4bcea 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/ExecutableMongoScript.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/ExecutableMongoScript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public class ExecutableMongoScript {
 	 */
 	public ExecutableMongoScript(String code) {
 
-		Assert.hasText(code, "Code must not be null or empty!");
+		Assert.hasText(code, "Code must not be null or empty");
 		this.code = code;
 	}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/NamedMongoScript.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/NamedMongoScript.java
index d02dd7966f..c344a07cae 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/NamedMongoScript.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/NamedMongoScript.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 /**
  * An {@link ExecutableMongoScript} assigned to a name that allows calling the function by its {@literal name} once it
- * has been saved to the {@link com.mongodb.DB} instance.
+ * has been saved to the {@link com.mongodb.client.MongoDatabase} instance.
  *
  * @author Christoph Strobl
  * @author Oliver Gierke
@@ -34,7 +34,7 @@ public class NamedMongoScript {
 	private final ExecutableMongoScript script;
 
 	/**
-	 * Creates new {@link NamedMongoScript} that can be saved to the {@link com.mongodb.DB} instance.
+	 * Creates new {@link NamedMongoScript} that can be saved to the {@link com.mongodb.client.MongoDatabase} instance.
 	 *
 	 * @param name must not be {@literal null} or empty.
 	 * @param rawScript the {@link String} representation of the {@literal JavaScript} function. Must not be
@@ -52,8 +52,8 @@ public NamedMongoScript(String name, String rawScript) {
 	 */
 	public NamedMongoScript(String name, ExecutableMongoScript script) {
 
-		Assert.hasText(name, "Name must not be null or empty!");
-		Assert.notNull(script, "ExecutableMongoScript must not be null!");
+		Assert.hasText(name, "Name must not be null or empty");
+		Assert.notNull(script, "ExecutableMongoScript must not be null");
 
 		this.name = name;
 		this.script = script;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/package-info.java
index 34eb8ea890..976b238fbd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/script/package-info.java
@@ -3,6 +3,6 @@
  *
  * @since 1.7
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.script;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java
index 73b1ccf8e0..a5b4a2aabf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,13 @@
 import java.util.Collections;
 import java.util.Iterator;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.SpelNode;
 import org.springframework.expression.spel.ast.Literal;
 import org.springframework.expression.spel.ast.MethodReference;
 import org.springframework.expression.spel.ast.Operator;
 import org.springframework.expression.spel.ast.OperatorNot;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -49,8 +49,8 @@ public class ExpressionNode implements Iterable<ExpressionNode> {
 	 */
 	protected ExpressionNode(SpelNode node, ExpressionState state) {
 
-		Assert.notNull(node, "SpelNode must not be null!");
-		Assert.notNull(state, "ExpressionState must not be null!");
+		Assert.notNull(node, "SpelNode must not be null");
+		Assert.notNull(state, "ExpressionState must not be null");
 
 		this.node = node;
 		this.state = state;
@@ -67,20 +67,20 @@ protected ExpressionNode(SpelNode node, ExpressionState state) {
 	 */
 	public static ExpressionNode from(SpelNode node, ExpressionState state) {
 
-		if (node instanceof Operator) {
-			return new OperatorNode((Operator) node, state);
+		if (node instanceof Operator operator) {
+			return new OperatorNode(operator, state);
 		}
 
-		if (node instanceof MethodReference) {
-			return new MethodReferenceNode((MethodReference) node, state);
+		if (node instanceof MethodReference methodReference) {
+			return new MethodReferenceNode(methodReference, state);
 		}
 
-		if (node instanceof Literal) {
-			return new LiteralNode((Literal) node, state);
+		if (node instanceof Literal literal) {
+			return new LiteralNode(literal, state);
 		}
 
-		if (node instanceof OperatorNot) {
-			return new NotOperatorNode((OperatorNot) node, state);
+		if (node instanceof OperatorNot operatorNot) {
+			return new NotOperatorNode(operatorNot, state);
 		}
 
 		return new ExpressionNode(node, state);
@@ -103,7 +103,7 @@ public String getName() {
 	 */
 	public boolean isOfType(Class<?> type) {
 
-		Assert.notNull(type, "Type must not be empty!");
+		Assert.notNull(type, "Type must not be empty");
 		return type.isAssignableFrom(node.getClass());
 	}
 
@@ -114,7 +114,7 @@ public boolean isOfType(Class<?> type) {
 	 * @return
 	 */
 	boolean isOfSameTypeAs(@Nullable ExpressionNode node) {
-		return node == null ? false : this.node.getClass().equals(node.node.getClass());
+		return node != null && this.node.getClass().equals(node.node.getClass());
 	}
 
 	/**
@@ -150,8 +150,7 @@ public boolean isLiteral() {
 	 *
 	 * @return
 	 */
-	@Nullable
-	public Object getValue() {
+	public @Nullable Object getValue() {
 		return node.getValue(state);
 	}
 
@@ -172,7 +171,7 @@ public boolean hasChildren() {
 	 */
 	public ExpressionNode getChild(int index) {
 
-		Assert.isTrue(index >= 0, "Index must be greater or equal to zero!");
+		Assert.isTrue(index >= 0, "Index must be greater or equal to zero");
 		return from(node.getChild(index), state);
 	}
 
@@ -184,7 +183,7 @@ public ExpressionNode getChild(int index) {
 	 */
 	public boolean hasfirstChildNotOfType(Class<?> type) {
 
-		Assert.notNull(type, "Type must not be null!");
+		Assert.notNull(type, "Type must not be null");
 		return hasChildren() && !node.getChild(0).getClass().equals(type);
 	}
 
@@ -198,10 +197,6 @@ protected ExpressionNode from(SpelNode node) {
 		return from(node, state);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
 	@Override
 	public Iterator<ExpressionNode> iterator() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformationContextSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformationContextSupport.java
index aea2f914f2..89edd4eab2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformationContextSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformationContextSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -46,7 +46,7 @@ public class ExpressionTransformationContextSupport<T extends ExpressionNode> {
 	public ExpressionTransformationContextSupport(T currentNode, @Nullable ExpressionNode parentNode,
 			@Nullable Document previousOperationObject) {
 
-		Assert.notNull(currentNode, "currentNode must not be null!");
+		Assert.notNull(currentNode, "currentNode must not be null");
 
 		this.currentNode = currentNode;
 		this.parentNode = parentNode;
@@ -67,8 +67,7 @@ public T getCurrentNode() {
 	 *
 	 * @return
 	 */
-	@Nullable
-	public ExpressionNode getParentNode() {
+	public @Nullable ExpressionNode getParentNode() {
 		return parentNode;
 	}
 
@@ -81,8 +80,7 @@ public ExpressionNode getParentNode() {
 	 * @see #addToPreviousOrReturn(Object)
 	 * @return
 	 */
-	@Nullable
-	public Document getPreviousOperationObject() {
+	public @Nullable Document getPreviousOperationObject() {
 		return previousOperationObject;
 	}
 
@@ -110,9 +108,9 @@ public boolean parentIsSameOperation() {
 	 * @param value
 	 * @return
 	 */
-	public Document addToPreviousOperation(Object value) {
+	public Document addToPreviousOperation(@Nullable Object value) {
 
-		Assert.state(previousOperationObject != null, "No previous operation available!");
+		Assert.state(previousOperationObject != null, "No previous operation available");
 
 		extractArgumentListFrom(previousOperationObject).add(value);
 		return previousOperationObject;
@@ -124,11 +122,14 @@ public Document addToPreviousOperation(Object value) {
 	 * @param value
 	 * @return
 	 */
-	public Object addToPreviousOrReturn(Object value) {
+	public @Nullable Object addToPreviousOrReturn(@Nullable Object value) {
 		return hasPreviousOperation() ? addToPreviousOperation(value) : value;
 	}
 
+	@SuppressWarnings("unchecked")
 	private List<Object> extractArgumentListFrom(Document context) {
-		return (List<Object>) context.get(context.keySet().iterator().next());
+
+		Object o = context.get(context.keySet().iterator().next());
+		return o instanceof List<?> l ? (List<Object>) l : List.of();
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformer.java
index a42f368a3e..da5748f523 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,10 @@
  */
 package org.springframework.data.mongodb.core.spel;
 
+import org.jspecify.annotations.Nullable;
+
 /**
- * SPI interface to implement components that can transfrom an {@link ExpressionTransformationContextSupport} into an
+ * SPI interface to implement components that can transform an {@link ExpressionTransformationContextSupport} into an
  * object.
  *
  * @author Oliver Gierke
@@ -29,5 +31,5 @@ public interface ExpressionTransformer<T extends ExpressionTransformationContext
 	 * @param context will never be {@literal null}.
 	 * @return
 	 */
-	Object transform(T context);
+	@Nullable Object transform(T context);
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java
index a86ed75c73..b276831860 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/LiteralNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,9 @@
  */
 package org.springframework.data.mongodb.core.spel;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.ast.BooleanLiteral;
 import org.springframework.expression.spel.ast.FloatLiteral;
@@ -28,7 +27,6 @@
 import org.springframework.expression.spel.ast.NullLiteral;
 import org.springframework.expression.spel.ast.RealLiteral;
 import org.springframework.expression.spel.ast.StringLiteral;
-import org.springframework.lang.Nullable;
 
 /**
  * A node representing a literal in an expression.
@@ -39,23 +37,10 @@
  */
 public class LiteralNode extends ExpressionNode {
 
-	private static final Set<Class<?>> SUPPORTED_LITERAL_TYPES;
+	private static final Set<Class<?>> SUPPORTED_LITERAL_TYPES = Set.of(BooleanLiteral.class, FloatLiteral.class,
+			IntLiteral.class, LongLiteral.class, NullLiteral.class, RealLiteral.class, StringLiteral.class);
 	private final Literal literal;
 
-	static {
-
-		Set<Class<?>> supportedTypes = new HashSet<Class<?>>(7, 1);
-		supportedTypes.add(BooleanLiteral.class);
-		supportedTypes.add(FloatLiteral.class);
-		supportedTypes.add(IntLiteral.class);
-		supportedTypes.add(LongLiteral.class);
-		supportedTypes.add(NullLiteral.class);
-		supportedTypes.add(RealLiteral.class);
-		supportedTypes.add(StringLiteral.class);
-
-		SUPPORTED_LITERAL_TYPES = Collections.unmodifiableSet(supportedTypes);
-	}
-
 	/**
 	 * Creates a new {@link LiteralNode} from the given {@link Literal} and {@link ExpressionState}.
 	 *
@@ -75,18 +60,13 @@ public class LiteralNode extends ExpressionNode {
 	 */
 	public boolean isUnaryMinus(@Nullable ExpressionNode parent) {
 
-		if (!(parent instanceof OperatorNode)) {
+		if (!(parent instanceof OperatorNode operatorNode)) {
 			return false;
 		}
 
-		OperatorNode operator = (OperatorNode) parent;
-		return operator.isUnaryMinus();
+		return operatorNode.isUnaryMinus();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isLiteral()
-	 */
 	@Override
 	public boolean isLiteral() {
 		return SUPPORTED_LITERAL_TYPES.contains(literal.getClass());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/MethodReferenceNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/MethodReferenceNode.java
index fd00c39a4f..db2801e649 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/MethodReferenceNode.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/MethodReferenceNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,9 +21,9 @@
 import java.util.HashMap;
 import java.util.Map;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.ast.MethodReference;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 
@@ -35,6 +35,7 @@
  * @author Sebastien Gerard
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Julia Lee
  */
 public class MethodReferenceNode extends ExpressionNode {
 
@@ -68,6 +69,12 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("lte", arrayArgRef().forOperator("$lte"));
 		map.put("ne", arrayArgRef().forOperator("$ne"));
 
+		// DOCUMENT OPERATORS
+		map.put("rank", emptyRef().forOperator("$rank"));
+		map.put("denseRank", emptyRef().forOperator("$denseRank"));
+		map.put("documentNumber", emptyRef().forOperator("$documentNumber"));
+		map.put("shift", mapArgRef().forOperator("$shift").mappingParametersTo("output", "by", "default"));
+
 		// ARITHMETIC OPERATORS
 		map.put("abs", singleArgRef().forOperator("$abs"));
 		map.put("add", arrayArgRef().forOperator("$add"));
@@ -84,6 +91,23 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("sqrt", singleArgRef().forOperator("$sqrt"));
 		map.put("subtract", arrayArgRef().forOperator("$subtract"));
 		map.put("trunc", singleArgRef().forOperator("$trunc"));
+		map.put("round", arrayArgRef().forOperator("$round"));
+		map.put("derivative", mapArgRef().forOperator("$derivative").mappingParametersTo("input", "unit"));
+		map.put("integral", mapArgRef().forOperator("$integral").mappingParametersTo("input", "unit"));
+		map.put("sin", singleArgRef().forOperator("$sin"));
+		map.put("sinh", singleArgRef().forOperator("$sinh"));
+		map.put("asin", singleArgRef().forOperator("$asin"));
+		map.put("asinh", singleArgRef().forOperator("$asinh"));
+		map.put("cos", singleArgRef().forOperator("$cos"));
+		map.put("cosh", singleArgRef().forOperator("$cosh"));
+		map.put("acos", singleArgRef().forOperator("$acos"));
+		map.put("acosh", singleArgRef().forOperator("$acosh"));
+		map.put("tan", singleArgRef().forOperator("$tan"));
+		map.put("tanh", singleArgRef().forOperator("$tanh"));
+		map.put("rand", emptyRef().forOperator("$rand"));
+		map.put("atan", singleArgRef().forOperator("$atan"));
+		map.put("atan2", arrayArgRef().forOperator("$atan2"));
+		map.put("atanh", singleArgRef().forOperator("$atanh"));
 
 		// STRING OPERATORS
 		map.put("concat", arrayArgRef().forOperator("$concat"));
@@ -100,6 +124,11 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("trim", mapArgRef().forOperator("$trim").mappingParametersTo("input", "chars"));
 		map.put("ltrim", mapArgRef().forOperator("$ltrim").mappingParametersTo("input", "chars"));
 		map.put("rtrim", mapArgRef().forOperator("$rtrim").mappingParametersTo("input", "chars"));
+		map.put("regexFind", mapArgRef().forOperator("$regexFind").mappingParametersTo("input", "regex", "options"));
+		map.put("regexFindAll", mapArgRef().forOperator("$regexFindAll").mappingParametersTo("input", "regex", "options"));
+		map.put("regexMatch", mapArgRef().forOperator("$regexMatch").mappingParametersTo("input", "regex", "options"));
+		map.put("replaceOne", mapArgRef().forOperator("$replaceOne").mappingParametersTo("input", "find", "replacement"));
+		map.put("replaceAll", mapArgRef().forOperator("$replaceAll").mappingParametersTo("input", "find", "replacement"));
 
 		// TEXT SEARCH OPERATORS
 		map.put("meta", singleArgRef().forOperator("$meta"));
@@ -109,9 +138,12 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("concatArrays", arrayArgRef().forOperator("$concatArrays"));
 		map.put("filter", mapArgRef().forOperator("$filter") //
 				.mappingParametersTo("input", "as", "cond"));
+		map.put("first", singleArgRef().forOperator("$first"));
 		map.put("isArray", singleArgRef().forOperator("$isArray"));
+		map.put("last", singleArgRef().forOperator("$last"));
 		map.put("size", singleArgRef().forOperator("$size"));
 		map.put("slice", arrayArgRef().forOperator("$slice"));
+		map.put("sortArray", mapArgRef().forOperator("$sortArray").mappingParametersTo("input", "sortBy"));
 		map.put("reverseArray", singleArgRef().forOperator("$reverseArray"));
 		map.put("reduce", mapArgRef().forOperator("$reduce").mappingParametersTo("input", "initialValue", "in"));
 		map.put("zip", mapArgRef().forOperator("$zip").mappingParametersTo("inputs", "useLongestLength", "defaults"));
@@ -129,6 +161,14 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("literal", singleArgRef().forOperator("$literal"));
 
 		// DATE OPERATORS
+		map.put("dateAdd",
+				mapArgRef().forOperator("$dateAdd").mappingParametersTo("startDate", "unit", "amount", "timezone"));
+		map.put("dateSubtract",
+				mapArgRef().forOperator("$dateSubtract").mappingParametersTo("startDate", "unit", "amount", "timezone"));
+		map.put("dateDiff", mapArgRef().forOperator("$dateDiff").mappingParametersTo("startDate", "endDate", "unit",
+				"timezone", "startOfWeek"));
+		map.put("dateTrunc", mapArgRef().forOperator("$dateTrunc").mappingParametersTo("date", "unit", "binSize",
+				"startOfWeek", "timezone"));
 		map.put("dayOfYear", singleArgRef().forOperator("$dayOfYear"));
 		map.put("dayOfMonth", singleArgRef().forOperator("$dayOfMonth"));
 		map.put("dayOfWeek", singleArgRef().forOperator("$dayOfWeek"));
@@ -144,14 +184,16 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("dateFromString", mapArgRef().forOperator("$dateFromString") //
 				.mappingParametersTo("dateString", "format", "timezone", "onError", "onNull"));
 		map.put("dateFromParts", mapArgRef().forOperator("$dateFromParts").mappingParametersTo("year", "month", "day",
-				"hour", "minute", "second", "milliseconds", "timezone"));
+				"hour", "minute", "second", "millisecond", "timezone"));
 		map.put("isoDateFromParts", mapArgRef().forOperator("$dateFromParts").mappingParametersTo("isoWeekYear", "isoWeek",
-				"isoDayOfWeek", "hour", "minute", "second", "milliseconds", "timezone"));
+				"isoDayOfWeek", "hour", "minute", "second", "millisecond", "timezone"));
 		map.put("dateToParts", mapArgRef().forOperator("$dateToParts") //
 				.mappingParametersTo("date", "timezone", "iso8601"));
 		map.put("isoDayOfWeek", singleArgRef().forOperator("$isoDayOfWeek"));
 		map.put("isoWeek", singleArgRef().forOperator("$isoWeek"));
 		map.put("isoWeekYear", singleArgRef().forOperator("$isoWeekYear"));
+		map.put("tsIncrement", singleArgRef().forOperator("$tsIncrement"));
+		map.put("tsSecond", singleArgRef().forOperator("$tsSecond"));
 
 		// CONDITIONAL OPERATORS
 		map.put("cond", mapArgRef().forOperator("$cond") //
@@ -169,6 +211,28 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("addToSet", singleArgRef().forOperator("$addToSet"));
 		map.put("stdDevPop", arrayArgRef().forOperator("$stdDevPop"));
 		map.put("stdDevSamp", arrayArgRef().forOperator("$stdDevSamp"));
+		map.put("covariancePop", arrayArgRef().forOperator("$covariancePop"));
+		map.put("covarianceSamp", arrayArgRef().forOperator("$covarianceSamp"));
+		map.put("bottom", mapArgRef().forOperator("$bottom") //
+				.mappingParametersTo("output", "sortBy"));
+		map.put("bottomN", mapArgRef().forOperator("$bottomN") //
+				.mappingParametersTo("n", "output", "sortBy"));
+		map.put("firstN", mapArgRef().forOperator("$firstN") //
+				.mappingParametersTo("n", "input"));
+		map.put("lastN", mapArgRef().forOperator("$lastN") //
+				.mappingParametersTo("n", "input"));
+		map.put("top", mapArgRef().forOperator("$top") //
+				.mappingParametersTo("output", "sortBy"));
+		map.put("topN", mapArgRef().forOperator("$topN") //
+				.mappingParametersTo("n", "output", "sortBy"));
+		map.put("maxN", mapArgRef().forOperator("$maxN") //
+				.mappingParametersTo("n", "input"));
+		map.put("minN", mapArgRef().forOperator("$minN") //
+				.mappingParametersTo("n", "input"));
+		map.put("percentile", mapArgRef().forOperator("$percentile") //
+				.mappingParametersTo("input", "p", "method"));
+		map.put("median", mapArgRef().forOperator("$median") //
+				.mappingParametersTo("input", "method"));
 
 		// TYPE OPERATORS
 		map.put("type", singleArgRef().forOperator("$type"));
@@ -176,6 +240,8 @@ public class MethodReferenceNode extends ExpressionNode {
 		// OBJECT OPERATORS
 		map.put("objectToArray", singleArgRef().forOperator("$objectToArray"));
 		map.put("mergeObjects", arrayArgRef().forOperator("$mergeObjects"));
+		map.put("getField", mapArgRef().forOperator("$getField").mappingParametersTo("field", "input"));
+		map.put("setField", mapArgRef().forOperator("$setField").mappingParametersTo("field", "value", "input"));
 
 		// CONVERT OPERATORS
 		map.put("convert", mapArgRef().forOperator("$convert") //
@@ -188,6 +254,10 @@ public class MethodReferenceNode extends ExpressionNode {
 		map.put("toLong", singleArgRef().forOperator("$toLong"));
 		map.put("toObjectId", singleArgRef().forOperator("$toObjectId"));
 		map.put("toString", singleArgRef().forOperator("$toString"));
+		map.put("degreesToRadians", singleArgRef().forOperator("$degreesToRadians"));
+
+		// expression operators
+		map.put("locf", singleArgRef().forOperator("$locf"));
 
 		FUNCTIONS = Collections.unmodifiableMap(map);
 	}
@@ -196,27 +266,13 @@ public class MethodReferenceNode extends ExpressionNode {
 		super(reference, state);
 	}
 
-	/**
-	 * Returns the name of the method.
-	 *
-	 * @deprecated since 1.10. Please use {@link #getMethodReference()}.
-	 */
-	@Nullable
-	@Deprecated
-	public String getMethodName() {
-
-		AggregationMethodReference methodReference = getMethodReference();
-		return methodReference != null ? methodReference.getMongoOperator() : null;
-	}
-
 	/**
 	 * Return the {@link AggregationMethodReference}.
 	 *
 	 * @return can be {@literal null}.
 	 * @since 1.10
 	 */
-	@Nullable
-	public AggregationMethodReference getMethodReference() {
+	public @Nullable AggregationMethodReference getMethodReference() {
 
 		String name = getName();
 		String methodName = name.substring(0, name.indexOf('('));
@@ -231,7 +287,7 @@ public static final class AggregationMethodReference {
 
 		private final @Nullable String mongoOperator;
 		private final @Nullable ArgumentType argumentType;
-		private final @Nullable String[] argumentMap;
+		private final String @Nullable[] argumentMap;
 
 		/**
 		 * Creates new {@link AggregationMethodReference}.
@@ -241,7 +297,7 @@ public static final class AggregationMethodReference {
 		 * @param argumentMap can be {@literal null}.
 		 */
 		private AggregationMethodReference(@Nullable String mongoOperator, @Nullable ArgumentType argumentType,
-				@Nullable String[] argumentMap) {
+				String @Nullable[] argumentMap) {
 
 			this.mongoOperator = mongoOperator;
 			this.argumentType = argumentType;
@@ -253,8 +309,7 @@ private AggregationMethodReference(@Nullable String mongoOperator, @Nullable Arg
 		 *
 		 * @return can be {@literal null}.
 		 */
-		@Nullable
-		public String getMongoOperator() {
+		public @Nullable String getMongoOperator() {
 			return this.mongoOperator;
 		}
 
@@ -263,8 +318,7 @@ public String getMongoOperator() {
 		 *
 		 * @return never {@literal null}.
 		 */
-		@Nullable
-		public ArgumentType getArgumentType() {
+		public @Nullable ArgumentType getArgumentType() {
 			return this.argumentType;
 		}
 
@@ -304,6 +358,16 @@ static AggregationMethodReference mapArgRef() {
 			return new AggregationMethodReference(null, ArgumentType.MAP, null);
 		}
 
+		/**
+		 * Create a new {@link AggregationMethodReference} for a {@link ArgumentType#EMPTY_DOCUMENT} argument.
+		 *
+		 * @return never {@literal null}.
+		 * @since 3.3
+		 */
+		static AggregationMethodReference emptyRef() {
+			return new AggregationMethodReference(null, ArgumentType.EMPTY_DOCUMENT, null);
+		}
+
 		/**
 		 * Create a new {@link AggregationMethodReference} for a given {@literal aggregationExpressionOperator} reusing
 		 * previously set arguments.
@@ -328,7 +392,7 @@ AggregationMethodReference forOperator(String aggregationExpressionOperator) {
 		AggregationMethodReference mappingParametersTo(String... aggregationExpressionProperties) {
 
 			Assert.isTrue(ObjectUtils.nullSafeEquals(argumentType, ArgumentType.MAP),
-					"Parameter mapping can only be applied to AggregationMethodReference with MAPPED ArgumentType.");
+					"Parameter mapping can only be applied to AggregationMethodReference with MAPPED ArgumentType");
 			return new AggregationMethodReference(mongoOperator, argumentType, aggregationExpressionProperties);
 		}
 
@@ -339,7 +403,7 @@ AggregationMethodReference mappingParametersTo(String... aggregationExpressionPr
 		 * @since 1.10
 		 */
 		public enum ArgumentType {
-			SINGLE, ARRAY, MAP
+			SINGLE, ARRAY, MAP, EMPTY_DOCUMENT
 		}
 	}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/NotOperatorNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/NotOperatorNode.java
index 97df6afee0..ea0608225f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/NotOperatorNode.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/NotOperatorNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core.spel;
 
 import org.springframework.expression.spel.ExpressionState;
-import org.springframework.expression.spel.SpelNode;
 import org.springframework.expression.spel.ast.OperatorNot;
 
 /**
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java
index 6cd8ce9318..7d242e777e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/OperatorNode.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,6 @@
  */
 package org.springframework.data.mongodb.core.spel;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -34,47 +31,15 @@
  */
 public class OperatorNode extends ExpressionNode {
 
-	private static final Map<String, String> OPERATORS;
-	private static final Set<Class> SUPPORTED_MATH_OPERATORS;
-
-	static {
-
-		Map<String, String> map = new HashMap<String, String>(14, 1);
-
-		map.put("+", "$add");
-		map.put("-", "$subtract");
-		map.put("*", "$multiply");
-		map.put("/", "$divide");
-		map.put("%", "$mod");
-		map.put("^", "$pow");
-		map.put("==", "$eq");
-		map.put("!=", "$ne");
-		map.put(">", "$gt");
-		map.put(">=", "$gte");
-		map.put("<", "$lt");
-		map.put("<=", "$lte");
-
-		map.put("and", "$and");
-		map.put("or", "$or");
-
-		OPERATORS = Collections.unmodifiableMap(map);
-
-		Set<Class> set = new HashSet<Class>(12, 1);
-		set.add(OpMinus.class);
-		set.add(OpPlus.class);
-		set.add(OpMultiply.class);
-		set.add(OpDivide.class);
-		set.add(OpModulus.class);
-		set.add(OperatorPower.class);
-		set.add(OpNE.class);
-		set.add(OpEQ.class);
-		set.add(OpGT.class);
-		set.add(OpGE.class);
-		set.add(OpLT.class);
-		set.add(OpLE.class);
-
-		SUPPORTED_MATH_OPERATORS = Collections.unmodifiableSet(set);
-	}
+	private static final Map<String, String> OPERATORS = Map.ofEntries(Map.entry("+", "$add"),
+			Map.entry("-", "$subtract"), Map.entry("*", "$multiply"), Map.entry("/", "$divide"), Map.entry("%", "$mod"),
+			Map.entry("^", "$pow"), Map.entry("==", "$eq"), Map.entry("!=", "$ne"), Map.entry(">", "$gt"),
+			Map.entry(">=", "$gte"), Map.entry("<", "$lt"), Map.entry("<=", "$lte"), Map.entry("and", "$and"),
+			Map.entry("or", "$or"));
+
+	private static final Set<Class> SUPPORTED_MATH_OPERATORS = Set.of(OpMinus.class, OpPlus.class, OpMultiply.class,
+			OpDivide.class, OpModulus.class, OperatorPower.class, OpNE.class, OpEQ.class, OpGT.class, OpGE.class, OpLT.class,
+			OpLE.class);
 
 	private final Operator operator;
 
@@ -89,19 +54,11 @@ public class OperatorNode extends ExpressionNode {
 		this.operator = node;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isMathematicalOperation()
-	 */
 	@Override
 	public boolean isMathematicalOperation() {
 		return SUPPORTED_MATH_OPERATORS.contains(operator.getClass());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.spel.ExpressionNode#isConjunctionOperator()
-	 */
 	@Override
 	public boolean isLogicalOperator() {
 		return operator instanceof OpOr || operator instanceof OpAnd;
@@ -125,7 +82,7 @@ public String getMongoOperator() {
 
 		if (!OPERATORS.containsKey(operator.getOperatorName())) {
 			throw new IllegalArgumentException(String.format(
-					"Unknown operator name. Cannot translate %s into its MongoDB aggregation function representation.",
+					"Unknown operator name; Cannot translate %s into its MongoDB aggregation function representation",
 					operator.getOperatorName()));
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/package-info.java
index fbfa2ae78b..627cb8a04f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/package-info.java
@@ -3,6 +3,6 @@
  * 
  * @since 1.4
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.core.spel;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/timeseries/Granularity.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/timeseries/Granularity.java
new file mode 100644
index 0000000000..c923cbb884
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/timeseries/Granularity.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2021-2025 the original author 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.timeseries;
+
+/**
+ * {@link GranularityDefinition Granularities} available for Time Series data.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public enum Granularity implements GranularityDefinition {
+
+	/**
+	 * Server default value to indicate no explicit value should be sent.
+	 */
+	DEFAULT,
+
+	/**
+	 * High frequency ingestion.
+	 */
+	SECONDS,
+
+	/**
+	 * Medium frequency ingestion.
+	 */
+	MINUTES,
+
+	/**
+	 * Low frequency ingestion.
+	 */
+	HOURS
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/timeseries/GranularityDefinition.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/timeseries/GranularityDefinition.java
new file mode 100644
index 0000000000..0e714470db
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/timeseries/GranularityDefinition.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2021-2025 the original author 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.timeseries;
+
+/**
+ * The Granularity of time series data that is closest to the time span between incoming measurements.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public interface GranularityDefinition {
+
+	String name();
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java
index 594e87c59a..d739994e89 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/CriteriaValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,13 @@
  */
 package org.springframework.data.mongodb.core.validation;
 
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.CriteriaDefinition;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * {@link Validator} implementation based on {@link CriteriaDefinition query expressions}.
@@ -34,12 +32,14 @@
  * @see Criteria
  * @see <a href="https://docs.mongodb.com/manual/core/schema-validation/#query-expressions">Schema Validation</a>
  */
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-@EqualsAndHashCode
 class CriteriaValidator implements Validator {
 
 	private final CriteriaDefinition criteria;
 
+	private CriteriaValidator(CriteriaDefinition criteria) {
+		this.criteria = criteria;
+	}
+
 	/**
 	 * Creates a new {@link Validator} object, which is basically setup of query operators, based on a
 	 * {@link CriteriaDefinition} instance.
@@ -50,26 +50,35 @@ class CriteriaValidator implements Validator {
 	 */
 	static CriteriaValidator of(CriteriaDefinition criteria) {
 
-		Assert.notNull(criteria, "Criteria must not be null!");
+		Assert.notNull(criteria, "Criteria must not be null");
 
 		return new CriteriaValidator(criteria);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.validation.Validator#toDocument()
-	 */
 	@Override
 	public Document toDocument() {
 		return criteria.getCriteriaObject();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return SerializationUtils.serializeToJsonSafely(toDocument());
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		CriteriaValidator that = (CriteriaValidator) o;
+
+		return ObjectUtils.nullSafeEquals(criteria, that.criteria);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(criteria);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java
index c6f4936bc2..9adf5fcf79 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/DocumentValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,11 @@
  */
 package org.springframework.data.mongodb.core.validation;
 
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Most trivial {@link Validator} implementation using plain {@link Document} to describe the desired document structure
@@ -32,12 +30,14 @@
  * @since 2.1
  * @see <a href="https://docs.mongodb.com/manual/core/schema-validation/">Schema Validation</a>
  */
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-@EqualsAndHashCode
 class DocumentValidator implements Validator {
 
 	private final Document validatorObject;
 
+	private DocumentValidator(Document validatorObject) {
+		this.validatorObject = validatorObject;
+	}
+
 	/**
 	 * Create new {@link DocumentValidator} defining validation rules via a plain {@link Document}.
 	 *
@@ -46,26 +46,36 @@ class DocumentValidator implements Validator {
 	 */
 	static DocumentValidator of(Document validatorObject) {
 
-		Assert.notNull(validatorObject, "ValidatorObject must not be null!");
+		Assert.notNull(validatorObject, "ValidatorObject must not be null");
 
 		return new DocumentValidator(new Document(validatorObject));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.validation.Validator#toDocument()
-	 */
 	@Override
 	public Document toDocument() {
 		return new Document(validatorObject);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return SerializationUtils.serializeToJsonSafely(validatorObject);
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		DocumentValidator that = (DocumentValidator) o;
+
+		return ObjectUtils.nullSafeEquals(validatorObject, that.validatorObject);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(validatorObject);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java
index e52e667596..b04e65b1db 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/JsonSchemaValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,12 @@
  */
 package org.springframework.data.mongodb.core.validation;
 
-import lombok.AccessLevel;
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
-
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
 
 /**
  * {@link Validator} implementation based on {@link MongoJsonSchema JSON Schema}.
@@ -32,12 +30,14 @@
  * @since 2.1
  * @see <a href="https://docs.mongodb.com/manual/core/schema-validation/#json-schema">Schema Validation</a>
  */
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-@EqualsAndHashCode
 class JsonSchemaValidator implements Validator {
 
 	private final MongoJsonSchema schema;
 
+	private JsonSchemaValidator(MongoJsonSchema schema) {
+		this.schema = schema;
+	}
+
 	/**
 	 * Create new {@link JsonSchemaValidator} defining validation rules via {@link MongoJsonSchema}.
 	 *
@@ -46,26 +46,36 @@ class JsonSchemaValidator implements Validator {
 	 */
 	static JsonSchemaValidator of(MongoJsonSchema schema) {
 
-		Assert.notNull(schema, "Schema must not be null!");
+		Assert.notNull(schema, "Schema must not be null");
 
 		return new JsonSchemaValidator(schema);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.validation.Validator#toDocument()
-	 */
 	@Override
 	public Document toDocument() {
 		return schema.toDocument();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return SerializationUtils.serializeToJsonSafely(toDocument());
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+
+		if (this == o)
+			return true;
+		if (o == null || getClass() != o.getClass())
+			return false;
+
+		JsonSchemaValidator that = (JsonSchemaValidator) o;
+
+		return ObjectUtils.nullSafeEquals(schema, that.schema);
+	}
+
+	@Override
+	public int hashCode() {
+		return ObjectUtils.nullSafeHashCode(schema);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/Validator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/Validator.java
index 2ef8f0fc18..9261642c70 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/Validator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/Validator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,7 +48,7 @@ public interface Validator {
 	 */
 	static Validator document(Document validationRules) {
 
-		Assert.notNull(validationRules, "ValidationRules must not be null!");
+		Assert.notNull(validationRules, "ValidationRules must not be null");
 		return DocumentValidator.of(validationRules);
 	}
 
@@ -61,7 +61,7 @@ static Validator document(Document validationRules) {
 	 */
 	static Validator schema(MongoJsonSchema schema) {
 
-		Assert.notNull(schema, "Schema must not be null!");
+		Assert.notNull(schema, "Schema must not be null");
 		return JsonSchemaValidator.of(schema);
 	}
 
@@ -75,7 +75,7 @@ static Validator schema(MongoJsonSchema schema) {
 	 */
 	static Validator criteria(CriteriaDefinition criteria) {
 
-		Assert.notNull(criteria, "Criteria must not be null!");
+		Assert.notNull(criteria, "Criteria must not be null");
 		return CriteriaValidator.of(criteria);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/package-info.java
index 002a4ee1fb..83fe5719a3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/validation/package-info.java
@@ -1,6 +1,6 @@
 /**
  * MongoDB schema validation specifics.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 @org.springframework.lang.NonNullFields
 package org.springframework.data.mongodb.core.validation;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java
index 280ad20980..8f61be8659 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AntPath.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ class AntPath {
 	 */
 	public AntPath(String path) {
 
-		Assert.notNull(path, "Path must not be null!");
+		Assert.notNull(path, "Path must not be null");
 
 		this.path = path;
 	}
@@ -98,10 +98,6 @@ private static String quote(String s, int start, int end) {
 		return Pattern.quote(s.substring(start, end));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see java.lang.Object#toString()
-	 */
 	@Override
 	public String toString() {
 		return path;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AsyncInputStreamAdapter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AsyncInputStreamAdapter.java
deleted file mode 100644
index ff2a33bf57..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/AsyncInputStreamAdapter.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import lombok.RequiredArgsConstructor;
-import reactor.core.CoreSubscriber;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.FluxSink;
-import reactor.core.publisher.Mono;
-import reactor.core.publisher.Operators;
-import reactor.util.concurrent.Queues;
-import reactor.util.context.Context;
-
-import java.nio.ByteBuffer;
-import java.util.Queue;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscription;
-
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
-
-import com.mongodb.reactivestreams.client.Success;
-import com.mongodb.reactivestreams.client.gridfs.AsyncInputStream;
-
-/**
- * Adapter accepting a binary stream {@link Publisher} and emitting its through {@link AsyncInputStream}.
- * <p>
- * This adapter subscribes to the binary {@link Publisher} as soon as the first chunk gets {@link #read(ByteBuffer)
- * requested}. Requests are queued and binary chunks are requested from the {@link Publisher}. As soon as the
- * {@link Publisher} emits items, chunks are provided to the read request which completes the number-of-written-bytes
- * {@link Publisher}.
- * <p>
- * {@link AsyncInputStream} is supposed to work as sequential callback API that is called until reaching EOF.
- * {@link #close()} is propagated as cancellation signal to the binary {@link Publisher}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.2
- */
-@RequiredArgsConstructor
-class AsyncInputStreamAdapter implements AsyncInputStream {
-
-	private static final AtomicLongFieldUpdater<AsyncInputStreamAdapter> DEMAND = AtomicLongFieldUpdater
-			.newUpdater(AsyncInputStreamAdapter.class, "demand");
-
-	private static final AtomicIntegerFieldUpdater<AsyncInputStreamAdapter> SUBSCRIBED = AtomicIntegerFieldUpdater
-			.newUpdater(AsyncInputStreamAdapter.class, "subscribed");
-
-	private static final int SUBSCRIPTION_NOT_SUBSCRIBED = 0;
-	private static final int SUBSCRIPTION_SUBSCRIBED = 1;
-
-	private final Publisher<? extends DataBuffer> buffers;
-	private final Context subscriberContext;
-
-	private volatile Subscription subscription;
-	private volatile boolean cancelled;
-	private volatile boolean allDataBuffersReceived;
-	private volatile Throwable error;
-	private final Queue<ReadRequest> readRequests = Queues.<ReadRequest> small().get();
-
-	private final Queue<DataBuffer> bufferQueue = Queues.<DataBuffer> small().get();
-
-	// see DEMAND
-	volatile long demand;
-
-	// see SUBSCRIBED
-	volatile int subscribed = SUBSCRIPTION_NOT_SUBSCRIBED;
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.mongodb.reactivestreams.client.gridfs.AsyncInputStream#read(java.nio.ByteBuffer)
-	 */
-	@Override
-	public Publisher<Integer> read(ByteBuffer dst) {
-
-		return Flux.create(sink -> {
-
-			readRequests.offer(new ReadRequest(sink, dst));
-
-			sink.onCancel(this::terminatePendingReads);
-			sink.onDispose(this::terminatePendingReads);
-			sink.onRequest(this::request);
-		});
-	}
-
-	void onError(FluxSink<Integer> sink, Throwable e) {
-
-		readRequests.poll();
-		sink.error(e);
-	}
-
-	void onComplete(FluxSink<Integer> sink, int writtenBytes) {
-
-		readRequests.poll();
-		DEMAND.decrementAndGet(this);
-		sink.next(writtenBytes);
-		sink.complete();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.mongodb.reactivestreams.client.gridfs.AsyncInputStream#skip(long)
-	 */
-	@Override
-	public Publisher<Long> skip(long bytesToSkip) {
-		throw new UnsupportedOperationException("Skip is currently not implemented");
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.mongodb.reactivestreams.client.gridfs.AsyncInputStream#close()
-	 */
-	@Override
-	public Publisher<Success> close() {
-
-		return Mono.create(sink -> {
-
-			cancelled = true;
-
-			if (error != null) {
-				terminatePendingReads();
-				sink.error(error);
-				return;
-			}
-
-			terminatePendingReads();
-			sink.success(Success.SUCCESS);
-		});
-	}
-
-	protected void request(long n) {
-
-		if (allDataBuffersReceived && bufferQueue.isEmpty()) {
-
-			terminatePendingReads();
-			return;
-		}
-
-		Operators.addCap(DEMAND, this, n);
-
-		if (SUBSCRIBED.get(this) == SUBSCRIPTION_NOT_SUBSCRIBED) {
-
-			if (SUBSCRIBED.compareAndSet(this, SUBSCRIPTION_NOT_SUBSCRIBED, SUBSCRIPTION_SUBSCRIBED)) {
-				buffers.subscribe(new DataBufferCoreSubscriber());
-			}
-
-		} else {
-
-			Subscription subscription = this.subscription;
-
-			if (subscription != null) {
-				requestFromSubscription(subscription);
-			}
-		}
-
-	}
-
-	void requestFromSubscription(Subscription subscription) {
-
-		if (cancelled) {
-			subscription.cancel();
-		}
-
-		drainLoop();
-	}
-
-	void drainLoop() {
-
-		while (DEMAND.get(AsyncInputStreamAdapter.this) > 0) {
-
-			DataBuffer wip = bufferQueue.peek();
-
-			if (wip == null) {
-				break;
-			}
-
-			if (wip.readableByteCount() == 0) {
-				bufferQueue.poll();
-				continue;
-			}
-
-			ReadRequest consumer = AsyncInputStreamAdapter.this.readRequests.peek();
-			if (consumer == null) {
-				break;
-			}
-
-			consumer.transferBytes(wip, wip.readableByteCount());
-		}
-
-		if (bufferQueue.isEmpty()) {
-
-			if (allDataBuffersReceived) {
-				terminatePendingReads();
-				return;
-			}
-
-			if (demand > 0) {
-				subscription.request(1);
-			}
-		}
-	}
-
-	/**
-	 * Terminates pending reads with empty buffers.
-	 */
-	void terminatePendingReads() {
-
-		ReadRequest readers;
-
-		while ((readers = readRequests.poll()) != null) {
-			readers.onComplete();
-		}
-	}
-
-	private class DataBufferCoreSubscriber implements CoreSubscriber<DataBuffer> {
-
-		@Override
-		public Context currentContext() {
-			return AsyncInputStreamAdapter.this.subscriberContext;
-		}
-
-		@Override
-		public void onSubscribe(Subscription s) {
-
-			AsyncInputStreamAdapter.this.subscription = s;
-			s.request(1);
-		}
-
-		@Override
-		public void onNext(DataBuffer dataBuffer) {
-
-			if (cancelled || allDataBuffersReceived) {
-				DataBufferUtils.release(dataBuffer);
-				Operators.onNextDropped(dataBuffer, AsyncInputStreamAdapter.this.subscriberContext);
-				return;
-			}
-
-			ReadRequest readRequest = AsyncInputStreamAdapter.this.readRequests.peek();
-
-			if (readRequest == null) {
-
-				DataBufferUtils.release(dataBuffer);
-				Operators.onNextDropped(dataBuffer, AsyncInputStreamAdapter.this.subscriberContext);
-				subscription.cancel();
-				return;
-			}
-
-			bufferQueue.offer(dataBuffer);
-
-			drainLoop();
-		}
-
-		@Override
-		public void onError(Throwable t) {
-
-			if (AsyncInputStreamAdapter.this.cancelled || AsyncInputStreamAdapter.this.allDataBuffersReceived) {
-				Operators.onErrorDropped(t, AsyncInputStreamAdapter.this.subscriberContext);
-				return;
-			}
-
-			AsyncInputStreamAdapter.this.error = t;
-			AsyncInputStreamAdapter.this.allDataBuffersReceived = true;
-			terminatePendingReads();
-		}
-
-		@Override
-		public void onComplete() {
-
-			AsyncInputStreamAdapter.this.allDataBuffersReceived = true;
-			if (bufferQueue.isEmpty()) {
-				terminatePendingReads();
-			}
-		}
-	}
-
-	/**
-	 * Request to read bytes and transfer these to the associated {@link ByteBuffer}.
-	 */
-	class ReadRequest {
-
-		private final FluxSink<Integer> sink;
-		private final ByteBuffer dst;
-
-		private int writtenBytes;
-
-		ReadRequest(FluxSink<Integer> sink, ByteBuffer dst) {
-			this.sink = sink;
-			this.dst = dst;
-			this.writtenBytes = -1;
-		}
-
-		public void onComplete() {
-
-			if (error != null) {
-				AsyncInputStreamAdapter.this.onError(sink, error);
-				return;
-			}
-
-			AsyncInputStreamAdapter.this.onComplete(sink, writtenBytes);
-		}
-
-		public void transferBytes(DataBuffer db, int bytes) {
-
-			try {
-
-				if (error != null) {
-					AsyncInputStreamAdapter.this.onError(sink, error);
-					return;
-				}
-
-				ByteBuffer byteBuffer = db.asByteBuffer();
-				int remaining = byteBuffer.remaining();
-				int writeCapacity = Math.min(dst.remaining(), remaining);
-				int limit = Math.min(byteBuffer.position() + writeCapacity, byteBuffer.capacity());
-				int toWrite = limit - byteBuffer.position();
-
-				if (toWrite == 0) {
-
-					AsyncInputStreamAdapter.this.onComplete(sink, writtenBytes);
-					return;
-				}
-
-				int oldPosition = byteBuffer.position();
-
-				byteBuffer.limit(toWrite);
-				dst.put(byteBuffer);
-				byteBuffer.limit(byteBuffer.capacity());
-				byteBuffer.position(oldPosition);
-				db.readPosition(db.readPosition() + toWrite);
-
-				if (writtenBytes == -1) {
-					writtenBytes = bytes;
-				} else {
-					writtenBytes += bytes;
-				}
-
-			} catch (Exception e) {
-				AsyncInputStreamAdapter.this.onError(sink, e);
-			} finally {
-
-				if (db.readableByteCount() == 0) {
-					DataBufferUtils.release(db);
-				}
-			}
-		}
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/BinaryStreamAdapters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/BinaryStreamAdapters.java
deleted file mode 100644
index 0bb0b1fdde..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/BinaryStreamAdapters.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import org.reactivestreams.Publisher;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferFactory;
-import org.springframework.core.io.buffer.DataBufferUtils;
-
-import com.mongodb.reactivestreams.client.gridfs.AsyncInputStream;
-
-/**
- * Utility methods to create adapters from between {@link Publisher} of {@link DataBuffer} and {@link AsyncInputStream}.
- *
- * @author Mark Paluch
- * @since 2.2
- */
-class BinaryStreamAdapters {
-
-	/**
-	 * Creates a {@link Flux} emitting {@link DataBuffer} by reading binary chunks from {@link AsyncInputStream}.
-	 * Publisher termination (completion, error, cancellation) closes the {@link AsyncInputStream}.
-	 * <p/>
-	 * The resulting {@link org.reactivestreams.Publisher} filters empty binary chunks and uses {@link DataBufferFactory}
-	 * settings to determine the chunk size.
-	 *
-	 * @param inputStream must not be {@literal null}.
-	 * @param dataBufferFactory must not be {@literal null}.
-	 * @param bufferSize read {@code n} bytes per iteration.
-	 * @return {@link Flux} emitting {@link DataBuffer}s.
-	 * @see DataBufferFactory#allocateBuffer()
-	 */
-	static Flux<DataBuffer> toPublisher(AsyncInputStream inputStream, DataBufferFactory dataBufferFactory,
-			int bufferSize) {
-
-		return DataBufferPublisherAdapter.createBinaryStream(inputStream, dataBufferFactory, bufferSize) //
-				.filter(it -> {
-
-					if (it.readableByteCount() == 0) {
-						DataBufferUtils.release(it);
-						return false;
-					}
-					return true;
-				});
-	}
-
-	/**
-	 * Creates a {@link Mono} emitting a {@link AsyncInputStream} to consume a {@link Publisher} emitting
-	 * {@link DataBuffer} and exposing the binary stream through {@link AsyncInputStream}. {@link DataBuffer}s are
-	 * released by the adapter during consumption.
-	 * <p/>
-	 * This method returns a {@link Mono} to retain the {@link reactor.util.context.Context subscriber context}.
-	 *
-	 * @param dataBuffers must not be {@literal null}.
-	 * @return {@link Mono} emitting {@link AsyncInputStream}.
-	 * @see DataBufferUtils#release(DataBuffer)
-	 */
-	static Mono<AsyncInputStream> toAsyncInputStream(Publisher<? extends DataBuffer> dataBuffers) {
-
-		return Mono.create(sink -> {
-			sink.success(new AsyncInputStreamAdapter(dataBuffers, sink.currentContext()));
-		});
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java
deleted file mode 100644
index de364c9279..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapter.java
+++ /dev/null
@@ -1,341 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import lombok.RequiredArgsConstructor;
-import reactor.core.CoreSubscriber;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.FluxSink;
-import reactor.core.publisher.Mono;
-import reactor.core.publisher.Operators;
-import reactor.util.context.Context;
-
-import java.nio.ByteBuffer;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import java.util.concurrent.atomic.AtomicLongFieldUpdater;
-
-import org.reactivestreams.Publisher;
-import org.reactivestreams.Subscription;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferFactory;
-
-import com.mongodb.reactivestreams.client.Success;
-import com.mongodb.reactivestreams.client.gridfs.AsyncInputStream;
-
-/**
- * Utility to adapt a {@link AsyncInputStream} to a {@link Publisher} emitting {@link DataBuffer}.
- *
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.2
- */
-class DataBufferPublisherAdapter {
-
-	/**
-	 * Creates a {@link Publisher} emitting {@link DataBuffer}s by reading binary chunks from {@link AsyncInputStream}.
-	 * Closes the {@link AsyncInputStream} once the {@link Publisher} terminates.
-	 *
-	 * @param inputStream must not be {@literal null}.
-	 * @param dataBufferFactory must not be {@literal null}.
-	 * @param bufferSize read {@code n} bytes per iteration.
-	 * @return the resulting {@link Publisher}.
-	 */
-	static Flux<DataBuffer> createBinaryStream(AsyncInputStream inputStream, DataBufferFactory dataBufferFactory,
-			int bufferSize) {
-
-		return Flux.usingWhen(Mono.just(new DelegatingAsyncInputStream(inputStream, dataBufferFactory, bufferSize)),
-				DataBufferPublisherAdapter::doRead, AsyncInputStream::close, (it, err) -> it.close(), AsyncInputStream::close);
-	}
-
-	/**
-	 * Use an {@link AsyncInputStreamHandler} to read data from the given {@link AsyncInputStream}.
-	 *
-	 * @param inputStream the source stream.
-	 * @return a {@link Flux} emitting data chunks one by one.
-	 * @since 2.2.1
-	 */
-	private static Flux<DataBuffer> doRead(DelegatingAsyncInputStream inputStream) {
-
-		AsyncInputStreamHandler streamHandler = new AsyncInputStreamHandler(inputStream, inputStream.dataBufferFactory,
-				inputStream.bufferSize);
-		return Flux.create((sink) -> {
-
-			sink.onDispose(streamHandler::close);
-			sink.onCancel(streamHandler::close);
-
-			sink.onRequest(n -> {
-				streamHandler.request(sink, n);
-			});
-		});
-	}
-
-	/**
-	 * An {@link AsyncInputStream} also holding a {@link DataBufferFactory} and default {@literal bufferSize} for reading
-	 * from it, delegating operations on the {@link AsyncInputStream} to the reference instance. <br />
-	 * Used to pass on the {@link AsyncInputStream} and parameters to avoid capturing lambdas.
-	 *
-	 * @author Christoph Strobl
-	 * @since 2.2.1
-	 */
-	private static class DelegatingAsyncInputStream implements AsyncInputStream {
-
-		private final AsyncInputStream inputStream;
-		private final DataBufferFactory dataBufferFactory;
-		private int bufferSize;
-
-		/**
-		 * @param inputStream the source input stream.
-		 * @param dataBufferFactory
-		 * @param bufferSize
-		 */
-		DelegatingAsyncInputStream(AsyncInputStream inputStream, DataBufferFactory dataBufferFactory, int bufferSize) {
-
-			this.inputStream = inputStream;
-			this.dataBufferFactory = dataBufferFactory;
-			this.bufferSize = bufferSize;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see com.mongodb.reactivestreams.client.gridfs.AsyncInputStream#read(java.nio.ByteBuffer)
-		 */
-		@Override
-		public Publisher<Integer> read(ByteBuffer dst) {
-			return inputStream.read(dst);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see com.mongodb.reactivestreams.client.gridfs.AsyncInputStream#skip(long)
-		 */
-		@Override
-		public Publisher<Long> skip(long bytesToSkip) {
-			return inputStream.skip(bytesToSkip);
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see com.mongodb.reactivestreams.client.gridfs.AsyncInputStream#close()
-		 */
-		@Override
-		public Publisher<Success> close() {
-			return inputStream.close();
-		}
-	}
-
-	@RequiredArgsConstructor
-	static class AsyncInputStreamHandler {
-
-		private static final AtomicLongFieldUpdater<AsyncInputStreamHandler> DEMAND = AtomicLongFieldUpdater
-				.newUpdater(AsyncInputStreamHandler.class, "demand");
-
-		private static final AtomicIntegerFieldUpdater<AsyncInputStreamHandler> STATE = AtomicIntegerFieldUpdater
-				.newUpdater(AsyncInputStreamHandler.class, "state");
-
-		private static final AtomicIntegerFieldUpdater<AsyncInputStreamHandler> DRAIN = AtomicIntegerFieldUpdater
-				.newUpdater(AsyncInputStreamHandler.class, "drain");
-
-		private static final AtomicIntegerFieldUpdater<AsyncInputStreamHandler> READ = AtomicIntegerFieldUpdater
-				.newUpdater(AsyncInputStreamHandler.class, "read");
-
-		private static final int STATE_OPEN = 0;
-		private static final int STATE_CLOSED = 1;
-
-		private static final int DRAIN_NONE = 0;
-		private static final int DRAIN_COMPLETION = 1;
-
-		private static final int READ_NONE = 0;
-		private static final int READ_IN_PROGRESS = 1;
-
-		final AsyncInputStream inputStream;
-		final DataBufferFactory dataBufferFactory;
-		final int bufferSize;
-
-		// see DEMAND
-		volatile long demand;
-
-		// see STATE
-		volatile int state = STATE_OPEN;
-
-		// see DRAIN
-		volatile int drain = DRAIN_NONE;
-
-		// see READ_IN_PROGRESS
-		volatile int read = READ_NONE;
-
-		void request(FluxSink<DataBuffer> sink, long n) {
-
-			Operators.addCap(DEMAND, this, n);
-			drainLoop(sink);
-		}
-
-		/**
-		 * Loops while we have demand and while no read is in progress.
-		 *
-		 * @param sink
-		 */
-		void drainLoop(FluxSink<DataBuffer> sink) {
-			while (onShouldRead()) {
-				emitNext(sink);
-			}
-		}
-
-		boolean onShouldRead() {
-			return !isClosed() && getDemand() > 0 && onWantRead();
-		}
-
-		boolean onWantRead() {
-			return READ.compareAndSet(this, READ_NONE, READ_IN_PROGRESS);
-		}
-
-		void onReadDone() {
-			READ.compareAndSet(this, READ_IN_PROGRESS, READ_NONE);
-		}
-
-		long getDemand() {
-			return DEMAND.get(this);
-		}
-
-		void decrementDemand() {
-			DEMAND.decrementAndGet(this);
-		}
-
-		void close() {
-			STATE.compareAndSet(this, STATE_OPEN, STATE_CLOSED);
-		}
-
-		boolean enterDrainLoop() {
-			return DRAIN.compareAndSet(this, DRAIN_NONE, DRAIN_COMPLETION);
-		}
-
-		void leaveDrainLoop() {
-			DRAIN.set(this, DRAIN_NONE);
-		}
-
-		boolean isClosed() {
-			return STATE.get(this) == STATE_CLOSED;
-		}
-
-		/**
-		 * Emit the next {@link DataBuffer}.
-		 *
-		 * @param sink
-		 * @return
-		 */
-		private void emitNext(FluxSink<DataBuffer> sink) {
-
-			ByteBuffer transport = ByteBuffer.allocate(bufferSize);
-			BufferCoreSubscriber bufferCoreSubscriber = new BufferCoreSubscriber(sink, dataBufferFactory, transport);
-			try {
-				inputStream.read(transport).subscribe(bufferCoreSubscriber);
-			} catch (Throwable e) {
-				sink.error(e);
-			}
-		}
-
-		private class BufferCoreSubscriber implements CoreSubscriber<Integer> {
-
-			private final FluxSink<DataBuffer> sink;
-			private final DataBufferFactory factory;
-			private final ByteBuffer transport;
-			private volatile Subscription subscription;
-
-			BufferCoreSubscriber(FluxSink<DataBuffer> sink, DataBufferFactory factory, ByteBuffer transport) {
-
-				this.sink = sink;
-				this.factory = factory;
-				this.transport = transport;
-			}
-
-			@Override
-			public Context currentContext() {
-				return sink.currentContext();
-			}
-
-			@Override
-			public void onSubscribe(Subscription s) {
-
-				this.subscription = s;
-				s.request(1);
-			}
-
-			@Override
-			public void onNext(Integer bytes) {
-
-				if (isClosed()) {
-					return;
-				}
-
-				if (bytes > 0) {
-
-					DataBuffer buffer = readNextChunk();
-					sink.next(buffer);
-					decrementDemand();
-				}
-
-				if (bytes == -1) {
-					sink.complete();
-					return;
-				}
-
-				subscription.request(1);
-			}
-
-			private DataBuffer readNextChunk() {
-
-				transport.flip();
-
-				DataBuffer dataBuffer = factory.allocateBuffer(transport.remaining());
-				dataBuffer.write(transport);
-
-				transport.clear();
-
-				return dataBuffer;
-			}
-
-			@Override
-			public void onError(Throwable t) {
-
-				if (isClosed()) {
-
-					Operators.onErrorDropped(t, sink.currentContext());
-					return;
-				}
-
-				close();
-				sink.error(t);
-			}
-
-			@Override
-			public void onComplete() {
-
-				onReadDone();
-
-				if (!isClosed()) {
-
-					if (enterDrainLoop()) {
-						try {
-							drainLoop(sink);
-						} finally {
-							leaveDrainLoop();
-						}
-					}
-
-				}
-			}
-		}
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsCriteria.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsCriteria.java
index 80e6d94278..e0aa5bb2d5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsCriteria.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsCriteria.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.gridfs;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.lang.Nullable;
 
 /**
  * GridFs-specific helper class to define {@link Criteria}s.
@@ -29,7 +29,7 @@ public class GridFsCriteria extends Criteria {
 	/**
 	 * Creates a new {@link GridFsCriteria} for the given key.
 	 *
-	 * @param key
+	 * @param key must not be {@literal null}.
 	 */
 	public GridFsCriteria(String key) {
 		super(key);
@@ -38,7 +38,7 @@ public GridFsCriteria(String key) {
 	/**
 	 * Creates a {@link GridFsCriteria} for restrictions on the file's metadata.
 	 *
-	 * @return
+	 * @return new instance of {@link GridFsCriteria}.
 	 */
 	public static GridFsCriteria whereMetaData() {
 		return new GridFsCriteria("metadata");
@@ -47,8 +47,8 @@ public static GridFsCriteria whereMetaData() {
 	/**
 	 * Creates a {@link GridFsCriteria} for restrictions on a single file's metadata item.
 	 *
-	 * @param metadataKey
-	 * @return
+	 * @param metadataKey can be {@literal null}.
+	 * @return new instance of {@link GridFsCriteria}.
 	 */
 	public static GridFsCriteria whereMetaData(@Nullable String metadataKey) {
 
@@ -59,7 +59,7 @@ public static GridFsCriteria whereMetaData(@Nullable String metadataKey) {
 	/**
 	 * Creates a {@link GridFsCriteria} for restrictions on the file's name.
 	 *
-	 * @return
+	 * @return new instance of {@link GridFsCriteria}.
 	 */
 	public static GridFsCriteria whereFilename() {
 		return new GridFsCriteria("filename");
@@ -68,7 +68,7 @@ public static GridFsCriteria whereFilename() {
 	/**
 	 * Creates a {@link GridFsCriteria} for restrictions on the file's content type.
 	 *
-	 * @return
+	 * @return new instance of {@link GridFsCriteria}.
 	 */
 	public static GridFsCriteria whereContentType() {
 		return new GridFsCriteria("metadata.".concat(GridFsResource.CONTENT_TYPE_FIELD));
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsObject.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsObject.java
new file mode 100644
index 0000000000..99807e63a2
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsObject.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2020-2025 the original author 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.gridfs;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+
+import com.mongodb.client.gridfs.model.GridFSFile;
+import org.springframework.lang.Contract;
+
+/**
+ * A common interface when dealing with GridFs items using Spring Data.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public interface GridFsObject<ID, CONTENT> {
+
+	/**
+	 * The {@link GridFSFile#getId()} value converted into its simple java type. <br />
+	 * A {@link org.bson.BsonString} will be converted to plain {@link String}.
+	 *
+	 * @return can be {@literal null} depending on the implementation.
+	 */
+	@Nullable
+	ID getFileId();
+
+	/**
+	 * The filename.
+	 *
+	 * @return
+	 */
+	String getFilename();
+
+	/**
+	 * The actual file content.
+	 *
+	 * @return
+	 * @throws IllegalStateException if the content cannot be obtained.
+	 */
+	CONTENT getContent();
+
+	/**
+	 * Additional information like file metadata (eg. contentType).
+	 *
+	 * @return never {@literal null}.
+	 */
+	Options getOptions();
+
+	/**
+	 * Additional, context relevant information.
+	 *
+	 * @author Christoph Strobl
+	 */
+	class Options {
+
+		private final Document metadata;
+		private final int chunkSize;
+
+		private Options(Document metadata, int chunkSize) {
+
+			this.metadata = metadata;
+			this.chunkSize = chunkSize;
+		}
+
+		/**
+		 * Static factory to create empty options.
+		 *
+		 * @return new instance of {@link Options}.
+		 */
+		public static Options none() {
+			return new Options(new Document(), -1);
+		}
+
+		/**
+		 * Static factory method to create {@link Options} with given content type.
+		 *
+		 * @param contentType
+		 * @return new instance of {@link Options}.
+		 */
+		public static Options typed(String contentType) {
+			return new Options(new Document("_contentType", contentType), -1);
+		}
+
+		/**
+		 * Static factory method to create {@link Options} by extracting information from the given {@link GridFSFile}.
+		 *
+		 * @param gridFSFile can be {@literal null}, returns {@link #none()} in that case.
+		 * @return new instance of {@link Options}.
+		 */
+		public static Options from(@Nullable GridFSFile gridFSFile) {
+			return gridFSFile != null ? new Options(gridFSFile.getMetadata(), gridFSFile.getChunkSize()) : none();
+		}
+
+		/**
+		 * Set the associated content type.
+		 *
+		 * @param contentType must not be {@literal null}.
+		 * @return new instance of {@link Options}.
+		 */
+		@Contract("_ -> new")
+		public Options contentType(String contentType) {
+
+			Options target = new Options(new Document(metadata), chunkSize);
+			target.metadata.put("_contentType", contentType);
+			return target;
+		}
+
+		/**
+		 * @param metadata
+		 * @return new instance of {@link Options}.
+		 */
+		@Contract("_ -> new")
+		public Options metadata(Document metadata) {
+			return new Options(metadata, chunkSize);
+		}
+
+		/**
+		 * @param chunkSize the file chunk size to use.
+		 * @return new instance of {@link Options}.
+		 */
+		@Contract("_ -> new")
+		public Options chunkSize(int chunkSize) {
+			return new Options(metadata, chunkSize);
+		}
+
+		/**
+		 * @return never {@literal null}.
+		 */
+		public Document getMetadata() {
+			return metadata;
+		}
+
+		/**
+		 * @return the chunk size to use.
+		 */
+		public int getChunkSize() {
+			return chunkSize;
+		}
+
+		/**
+		 * @return {@literal null} if not set.
+		 */
+		@Nullable
+		String getContentType() {
+			return (String) metadata.get("_contentType");
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java
index b5997d512e..4878b431f4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,10 +19,13 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.io.support.ResourcePatternResolver;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.gridfs.GridFsUpload.GridFsUploadBuilder;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.client.gridfs.GridFSFindIterable;
 
@@ -45,7 +48,9 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 * @param filename must not be {@literal null} or empty.
 	 * @return the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just created.
 	 */
-	ObjectId store(InputStream content, String filename);
+	default ObjectId store(InputStream content, String filename) {
+		return store(content, filename, null, null);
+	}
 
 	/**
 	 * Stores the given content into a file with the given name.
@@ -54,7 +59,9 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 * @param metadata can be {@literal null}.
 	 * @return the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just created.
 	 */
-	ObjectId store(InputStream content, @Nullable Object metadata);
+	default ObjectId store(InputStream content, @Nullable Object metadata) {
+		return store(content, null, metadata);
+	}
 
 	/**
 	 * Stores the given content into a file with the given name.
@@ -63,7 +70,9 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 * @param metadata can be {@literal null}.
 	 * @return the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just created.
 	 */
-	ObjectId store(InputStream content, @Nullable Document metadata);
+	default ObjectId store(InputStream content, @Nullable Document metadata) {
+		return store(content, null, metadata);
+	}
 
 	/**
 	 * Stores the given content into a file with the given name and content type.
@@ -73,7 +82,9 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 * @param contentType can be {@literal null}.
 	 * @return the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just created.
 	 */
-	ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType);
+	default ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType) {
+		return store(content, filename, contentType, null);
+	}
 
 	/**
 	 * Stores the given content into a file with the given name using the given metadata. The metadata object will be
@@ -84,7 +95,9 @@ public interface GridFsOperations extends ResourcePatternResolver {
 	 * @param metadata can be {@literal null}.
 	 * @return the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just created.
 	 */
-	ObjectId store(InputStream content, @Nullable String filename, @Nullable Object metadata);
+	default ObjectId store(InputStream content, @Nullable String filename, @Nullable Object metadata) {
+		return store(content, filename, null, metadata);
+	}
 
 	/**
 	 * Stores the given content into a file with the given name and content type using the given metadata. The metadata
@@ -107,19 +120,48 @@ ObjectId store(InputStream content, @Nullable String filename, @Nullable String
 	 * @param metadata can be {@literal null}.
 	 * @return the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just created.
 	 */
-	ObjectId store(InputStream content, @Nullable String filename, @Nullable Document metadata);
+	default ObjectId store(InputStream content, @Nullable String filename, @Nullable Document metadata) {
+		return store(content, filename, null, metadata);
+	}
 
 	/**
 	 * Stores the given content into a file with the given name and content type using the given metadata.
 	 *
 	 * @param content must not be {@literal null}.
 	 * @param filename must not be {@literal null} or empty.
-	 * @param contentType can be {@literal null}.
+	 * @param contentType can be {@literal null}. If not empty, may override content type within {@literal metadata}.
 	 * @param metadata can be {@literal null}.
 	 * @return the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just created.
 	 */
-	ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Document metadata);
+	default ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType,
+			@Nullable Document metadata) {
+
+		GridFsUploadBuilder<ObjectId> uploadBuilder = GridFsUpload.fromStream(content);
+		if (StringUtils.hasText(filename)) {
+			uploadBuilder.filename(filename);
+		}
+		if (!ObjectUtils.isEmpty(metadata)) {
+			uploadBuilder.metadata(metadata);
+		}
+		if (StringUtils.hasText(contentType)) {
+			uploadBuilder.contentType(contentType);
+		}
+
+		return store(uploadBuilder.build());
+	}
+
+	/**
+	 * Stores the given {@link GridFsObject}, likely a {@link GridFsUpload}, into into a file with given
+	 * {@link GridFsObject#getFilename() name}. If the {@link GridFsObject#getFileId()} is set, the file will be stored
+	 * with that id, otherwise the server auto creates a new id. <br />
+	 *
+	 * @param upload the {@link GridFsObject} (most likely a {@link GridFsUpload}) to be stored.
+	 * @param <T> id type of the underlying {@link com.mongodb.client.gridfs.model.GridFSFile}
+	 * @return the id of the stored file. Either an auto created value or {@link GridFsObject#getFileId()}, but never
+	 *         {@literal null}.
+	 * @since 3.0
+	 */
+	<T> T store(GridFsObject<T, InputStream> upload);
 
 	/**
 	 * Returns all files matching the given query. Note, that currently {@link Sort} criterias defined at the
@@ -137,10 +179,9 @@ ObjectId store(InputStream content, @Nullable String filename, @Nullable String
 	 * case no file matches.
 	 *
 	 * @param query must not be {@literal null}.
-	 * @return
+	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	com.mongodb.client.gridfs.model.GridFSFile findOne(Query query);
+	com.mongodb.client.gridfs.model.@Nullable GridFSFile findOne(Query query);
 
 	/**
 	 * Deletes all files matching the given {@link Query}.
@@ -172,7 +213,7 @@ ObjectId store(InputStream content, @Nullable String filename, @Nullable String
 	 * Returns all {@link GridFsResource}s matching the given file name pattern.
 	 *
 	 * @param filenamePattern must not be {@literal null}.
-	 * @return
+	 * @return an empty array if none found.
 	 * @see ResourcePatternResolver#getResources(String)
 	 */
 	GridFsResource[] getResources(String filenamePattern);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperationsSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperationsSupport.java
index 99d3d1125d..9a5621dcbc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperationsSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsOperationsSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,9 +18,9 @@
 import java.util.Optional;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -43,7 +43,7 @@ class GridFsOperationsSupport {
 	 */
 	GridFsOperationsSupport(MongoConverter converter) {
 
-		Assert.notNull(converter, "MongoConverter must not be null!");
+		Assert.notNull(converter, "MongoConverter must not be null");
 
 		this.converter = converter;
 		this.queryMapper = new QueryMapper(converter);
@@ -91,8 +91,8 @@ protected GridFSUploadOptions computeUploadOptionsFor(@Nullable String contentTy
 	 */
 	protected Document toDocument(@Nullable Object value) {
 
-		if (value instanceof Document) {
-			return (Document) value;
+		if (value instanceof Document document) {
+			return document;
 		}
 
 		Document document = new Document();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java
index 19c646e214..db6ce9833d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,10 +21,10 @@
 import java.io.InputStream;
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.io.InputStreamResource;
 import org.springframework.core.io.Resource;
-import org.springframework.data.util.Optionals;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.util.BsonUtils;
 import org.springframework.util.Assert;
 
 import com.mongodb.MongoGridFSException;
@@ -38,7 +38,7 @@
  * @author Hartmut Lang
  * @author Mark Paluch
  */
-public class GridFsResource extends InputStreamResource {
+public class GridFsResource extends InputStreamResource implements GridFsObject<Object, InputStream> {
 
 	static final String CONTENT_TYPE_FIELD = "_contentType";
 	private static final ByteArrayInputStream EMPTY_INPUT_STREAM = new ByteArrayInputStream(new byte[0]);
@@ -97,10 +97,6 @@ public static GridFsResource absent(String filename) {
 		return new GridFsResource(filename);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.InputStreamResource#getInputStream()
-	 */
 	@Override
 	public InputStream getInputStream() throws IOException, IllegalStateException {
 
@@ -108,50 +104,32 @@ public InputStream getInputStream() throws IOException, IllegalStateException {
 		return super.getInputStream();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#contentLength()
-	 */
 	@Override
+	@SuppressWarnings("NullAway")
 	public long contentLength() throws IOException {
 
 		verifyExists();
 		return getGridFSFile().getLength();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#getFilename()
-	 */
 	@Override
 	public String getFilename() throws IllegalStateException {
 		return this.filename;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#exists()
-	 */
 	@Override
 	public boolean exists() {
 		return this.file != null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#lastModified()
-	 */
 	@Override
+	@SuppressWarnings("NullAway")
 	public long lastModified() throws IOException {
 
 		verifyExists();
 		return getGridFSFile().getUploadDate().getTime();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#getDescription()
-	 */
 	@Override
 	public String getDescription() {
 		return String.format("GridFs resource [%s]", this.getFilename());
@@ -163,6 +141,7 @@ public String getDescription() {
 	 * @return never {@literal null}.
 	 * @throws IllegalStateException if the file does not {@link #exists()}.
 	 */
+	@SuppressWarnings("NullAway")
 	public Object getId() {
 
 		Assert.state(exists(), () -> String.format("%s does not exist.", getDescription()));
@@ -170,12 +149,19 @@ public Object getId() {
 		return getGridFSFile().getId();
 	}
 
+	@Override
+	@SuppressWarnings("NullAway")
+	public @Nullable Object getFileId() {
+
+		Assert.state(exists(), () -> String.format("%s does not exist.", getDescription()));
+		return BsonUtils.toJavaType(getGridFSFile().getId());
+	}
+
 	/**
 	 * @return the underlying {@link GridFSFile}. Can be {@literal null} if absent.
 	 * @since 2.2
 	 */
-	@Nullable
-	public GridFSFile getGridFSFile() {
+	public @Nullable GridFSFile getGridFSFile() {
 		return this.file;
 	}
 
@@ -184,22 +170,33 @@ public GridFSFile getGridFSFile() {
 	 *
 	 * @return never {@literal null}.
 	 * @throws com.mongodb.MongoGridFSException in case no content type declared on {@link GridFSFile#getMetadata()} nor
-	 *           provided via {@link GridFSFile#getContentType()}.
+	 *           provided via {@link GridFSFile}.
 	 * @throws IllegalStateException if the file does not {@link #exists()}.
 	 */
-	@SuppressWarnings("deprecation")
+	@SuppressWarnings("NullAway")
 	public String getContentType() {
 
 		Assert.state(exists(), () -> String.format("%s does not exist.", getDescription()));
 
-		return Optionals
-				.firstNonEmpty(
-						() -> Optional.ofNullable(getGridFSFile().getMetadata())
-								.map(it -> it.get(CONTENT_TYPE_FIELD, String.class)),
-						() -> Optional.ofNullable(getGridFSFile().getContentType()))
+		return Optional.ofNullable(getGridFSFile().getMetadata()).map(it -> it.get(CONTENT_TYPE_FIELD, String.class))
 				.orElseThrow(() -> new MongoGridFSException("No contentType data for this GridFS file"));
 	}
 
+	@Override
+	public InputStream getContent() {
+
+		try {
+			return getInputStream();
+		} catch (IOException e) {
+			throw new IllegalStateException("Failed to obtain input stream for " + filename, e);
+		}
+	}
+
+	@Override
+	public Options getOptions() {
+		return Options.from(getGridFSFile());
+	}
+
 	private void verifyExists() throws FileNotFoundException {
 
 		if (!exists()) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java
index 98990d2d99..722a57edc1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,15 +22,17 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Supplier;
 
-import org.bson.BsonObjectId;
 import org.bson.Document;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.io.support.ResourcePatternResolver;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.util.Lazy;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
@@ -39,6 +41,7 @@
 import com.mongodb.client.gridfs.GridFSBuckets;
 import com.mongodb.client.gridfs.GridFSFindIterable;
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
 
 /**
  * {@link GridFsOperations} implementation to store content into MongoDB GridFS.
@@ -51,136 +54,111 @@
  * @author Mark Paluch
  * @author Hartmut Lang
  * @author Niklas Helge Hanft
+ * @author Denis Zavedeev
  */
 public class GridFsTemplate extends GridFsOperationsSupport implements GridFsOperations, ResourcePatternResolver {
 
-	private final MongoDbFactory dbFactory;
-
-	private final @Nullable String bucket;
+	private final Supplier<GridFSBucket> bucketSupplier;
 
 	/**
-	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDbFactory} and {@link MongoConverter}.
+	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDatabaseFactory} and {@link MongoConverter}.
+	 * <p>
+	 * Note that the {@link GridFSBucket} is obtained only once from {@link MongoDatabaseFactory#getMongoDatabase()
+	 * MongoDatabase}. Use {@link #GridFsTemplate(MongoConverter, Supplier)} if you want to use different buckets from the
+	 * same Template instance.
 	 *
 	 * @param dbFactory must not be {@literal null}.
 	 * @param converter must not be {@literal null}.
 	 */
-	public GridFsTemplate(MongoDbFactory dbFactory, MongoConverter converter) {
+	public GridFsTemplate(MongoDatabaseFactory dbFactory, MongoConverter converter) {
 		this(dbFactory, converter, null);
 	}
 
 	/**
-	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDbFactory} and {@link MongoConverter}.
+	 * Creates a new {@link GridFsTemplate} using the given {@link MongoDatabaseFactory} and {@link MongoConverter}.
+	 * <p>
+	 * Note that the {@link GridFSBucket} is obtained only once from {@link MongoDatabaseFactory#getMongoDatabase()
+	 * MongoDatabase}. Use {@link #GridFsTemplate(MongoConverter, Supplier)} if you want to use different buckets from the
+	 * same Template instance.
 	 *
 	 * @param dbFactory must not be {@literal null}.
 	 * @param converter must not be {@literal null}.
-	 * @param bucket
-	 */
-	public GridFsTemplate(MongoDbFactory dbFactory, MongoConverter converter, @Nullable String bucket) {
-
-		super(converter);
-
-		Assert.notNull(dbFactory, "MongoDbFactory must not be null!");
-
-		this.dbFactory = dbFactory;
-		this.bucket = bucket;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String)
+	 * @param bucket can be {@literal null}.
 	 */
-	public ObjectId store(InputStream content, String filename) {
-		return store(content, filename, (Object) null);
+	public GridFsTemplate(MongoDatabaseFactory dbFactory, MongoConverter converter, @Nullable String bucket) {
+		this(converter, Lazy.of(() -> getGridFs(dbFactory, bucket)));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.Object)
+	/**
+	 * Creates a new {@link GridFsTemplate} using the given {@link MongoConverter} and {@link Supplier} providing the
+	 * required {@link GridFSBucket}.
+	 *
+	 * @param converter must not be {@literal null}.
+	 * @param gridFSBucket must not be {@literal null}.
+	 * @since 4.2
 	 */
-	@Override
-	public ObjectId store(InputStream content, @Nullable Object metadata) {
-		return store(content, null, metadata);
-	}
+	public GridFsTemplate(MongoConverter converter, Supplier<GridFSBucket> gridFSBucket) {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, com.mongodb.Document)
-	 */
-	@Override
-	public ObjectId store(InputStream content, @Nullable Document metadata) {
-		return store(content, null, metadata);
-	}
+		super(converter);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.String)
-	 */
-	public ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType) {
-		return store(content, filename, contentType, (Object) null);
-	}
+		Assert.notNull(gridFSBucket, "GridFSBucket supplier must not be null");
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.Object)
-	 */
-	public ObjectId store(InputStream content, @Nullable String filename, @Nullable Object metadata) {
-		return store(content, filename, null, metadata);
+		this.bucketSupplier = gridFSBucket;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, java.lang.String, java.lang.Object)
-	 */
+	@Override
 	public ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType,
 			@Nullable Object metadata) {
 		return store(content, filename, contentType, toDocument(metadata));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, com.mongodb.Document)
-	 */
-	public ObjectId store(InputStream content, @Nullable String filename, @Nullable Document metadata) {
-		return this.store(content, filename, null, metadata);
-	}
+	@Override
+	@SuppressWarnings("unchecked")
+	public <T> T store(GridFsObject<T, InputStream> upload) {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#store(java.io.InputStream, java.lang.String, com.mongodb.Document)
-	 */
-	public ObjectId store(InputStream content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Document metadata) {
+		GridFSUploadOptions uploadOptions = computeUploadOptionsFor(upload.getOptions().getContentType(),
+				upload.getOptions().getMetadata());
 
-		Assert.notNull(content, "InputStream must not be null!");
-		return getGridFs().uploadFromStream(filename, content, computeUploadOptionsFor(contentType, metadata));
+		if (upload.getOptions().getChunkSize() > 0) {
+			uploadOptions.chunkSizeBytes(upload.getOptions().getChunkSize());
+		}
+
+		if (upload.getFileId() == null) {
+			return (T) getGridFs().uploadFromStream(upload.getFilename(), upload.getContent(), uploadOptions);
+		}
+
+		getGridFs().uploadFromStream(BsonUtils.simpleToBsonValue(upload.getFileId()), upload.getFilename(),
+				upload.getContent(), uploadOptions);
+		return upload.getFileId();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#find(com.mongodb.Document)
-	 */
+	@Override
 	public GridFSFindIterable find(Query query) {
 
-		Assert.notNull(query, "Query must not be null!");
+		Assert.notNull(query, "Query must not be null");
 
 		Document queryObject = getMappedQuery(query.getQueryObject());
 		Document sortObject = getMappedQuery(query.getSortObject());
 
-		return getGridFs().find(queryObject).sort(sortObject);
+		GridFSFindIterable iterable = getGridFs().find(queryObject).sort(sortObject);
+
+		if (query.getSkip() > 0) {
+			iterable = iterable.skip(Math.toIntExact(query.getSkip()));
+		}
+
+		if (query.getLimit() > 0) {
+			iterable = iterable.limit(query.getLimit());
+		}
+
+		return iterable;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#findOne(com.mongodb.Document)
-	 */
+	@Override
 	public GridFSFile findOne(Query query) {
 		return find(query).first();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#delete(org.springframework.data.mongodb.core.query.Query)
-	 */
+	@Override
 	public void delete(Query query) {
 
 		for (GridFSFile gridFSFile : find(query)) {
@@ -188,18 +166,12 @@ public void delete(Query query) {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.ResourceLoader#getClassLoader()
-	 */
-	public ClassLoader getClassLoader() {
-		return dbFactory.getClass().getClassLoader();
+	@Override
+	public @Nullable ClassLoader getClassLoader() {
+		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.ResourceLoader#getResource(java.lang.String)
-	 */
+	@Override
 	public GridFsResource getResource(String location) {
 
 		return Optional.ofNullable(findOne(query(whereFilename().is(location)))) //
@@ -207,21 +179,15 @@ public GridFsResource getResource(String location) {
 				.orElseGet(() -> GridFsResource.absent(location));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.GridFsOperations#getResource(com.mongodb.client.gridfs.model.GridFSFile)
-	 */
+	@Override
 	public GridFsResource getResource(GridFSFile file) {
 
-		Assert.notNull(file, "GridFSFile must not be null!");
+		Assert.notNull(file, "GridFSFile must not be null");
 
 		return new GridFsResource(file, getGridFs().openDownloadStream(file.getId()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.support.ResourcePatternResolver#getResources(java.lang.String)
-	 */
+	@Override
 	public GridFsResource[] getResources(String locationPattern) {
 
 		if (!StringUtils.hasText(locationPattern)) {
@@ -246,8 +212,14 @@ public GridFsResource[] getResources(String locationPattern) {
 	}
 
 	private GridFSBucket getGridFs() {
+		return this.bucketSupplier.get();
+	}
+
+	private static GridFSBucket getGridFs(MongoDatabaseFactory dbFactory, @Nullable String bucket) {
+
+		Assert.notNull(dbFactory, "MongoDatabaseFactory must not be null");
 
-		MongoDatabase db = dbFactory.getDb();
+		MongoDatabase db = dbFactory.getMongoDatabase();
 		return bucket == null ? GridFSBuckets.create(db) : GridFSBuckets.create(db, bucket);
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsUpload.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsUpload.java
new file mode 100644
index 0000000000..6f2b9ed85b
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/GridFsUpload.java
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2020-2025 the original author 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.gridfs;
+
+import java.io.InputStream;
+import java.util.function.Supplier;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.util.Lazy;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+
+import com.mongodb.client.gridfs.model.GridFSFile;
+
+/**
+ * Upload descriptor for a GridFS file upload.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.0
+ */
+public class GridFsUpload<ID> implements GridFsObject<ID, InputStream> {
+
+	private final @Nullable ID id;
+	private final Lazy<InputStream> dataStream;
+	private final String filename;
+	private final Options options;
+
+	private GridFsUpload(@Nullable ID id, Lazy<InputStream> dataStream, String filename, Options options) {
+
+		Assert.notNull(dataStream, "Data Stream must not be null");
+		Assert.notNull(filename, "Filename must not be null");
+		Assert.notNull(options, "Options must not be null");
+
+		this.id = id;
+		this.dataStream = dataStream;
+		this.filename = filename;
+		this.options = options;
+	}
+
+	/**
+	 * The {@link GridFSFile#getId()} value converted into its simple java type. <br />
+	 * A {@link org.bson.BsonString} will be converted to plain {@link String}.
+	 *
+	 * @return can be {@literal null}.
+	 * @see org.springframework.data.mongodb.gridfs.GridFsObject#getFileId()
+	 */
+	@Override
+	public @Nullable ID getFileId() {
+		return id;
+	}
+
+	@Override
+	public String getFilename() {
+		return filename;
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	public InputStream getContent() {
+		return dataStream.orElse(InputStream.nullInputStream());
+	}
+
+	@Override
+	public Options getOptions() {
+		return options;
+	}
+
+	/**
+	 * Create a new instance of {@link GridFsUpload} for the given {@link InputStream}.
+	 *
+	 * @param stream must not be {@literal null}.
+	 * @return new instance of {@link GridFsUpload}.
+	 */
+	public static GridFsUploadBuilder<ObjectId> fromStream(InputStream stream) {
+		return new GridFsUploadBuilder<ObjectId>().content(stream);
+	}
+
+	/**
+	 * Builder to create {@link GridFsUpload} in a fluent way.
+	 *
+	 * @param <T> the target id type.
+	 */
+	public static class GridFsUploadBuilder<T> {
+
+		private @Nullable Object id;
+		private @Nullable Lazy<InputStream> dataStream;
+		private @Nullable String filename;
+		private Options options = Options.none();
+
+		private GridFsUploadBuilder() {}
+
+		/**
+		 * Define the content of the file to upload.
+		 *
+		 * @param stream the upload content.
+		 * @return this.
+		 */
+		public GridFsUploadBuilder<T> content(InputStream stream) {
+
+			Assert.notNull(stream, "InputStream must not be null");
+
+			return content(() -> stream);
+		}
+
+		/**
+		 * Define the content of the file to upload.
+		 *
+		 * @param stream the upload content.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public GridFsUploadBuilder<T> content(Supplier<InputStream> stream) {
+
+			Assert.notNull(stream, "InputStream Supplier must not be null");
+
+			this.dataStream = Lazy.of(stream);
+			return this;
+		}
+
+		/**
+		 * Set the id to use.
+		 *
+		 * @param id the id to save the content to.
+		 * @param <T1>
+		 * @return this.
+		 */
+		@SuppressWarnings("unchecked")
+		@Contract("_ -> this")
+		public <T1> GridFsUploadBuilder<T1> id(T1 id) {
+
+			this.id = id;
+			return (GridFsUploadBuilder<T1>) this;
+		}
+
+		/**
+		 * Set the filename.
+		 *
+		 * @param filename the filename to use.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public GridFsUploadBuilder<T> filename(String filename) {
+
+			this.filename = filename;
+			return this;
+		}
+
+		/**
+		 * Set additional file information.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public GridFsUploadBuilder<T> options(Options options) {
+
+			Assert.notNull(options, "Options must not be null");
+
+			this.options = options;
+			return this;
+		}
+
+		/**
+		 * Set the file metadata.
+		 *
+		 * @param metadata must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public GridFsUploadBuilder<T> metadata(Document metadata) {
+
+			this.options = this.options.metadata(metadata);
+			return this;
+		}
+
+		/**
+		 * Set the upload chunk size in bytes.
+		 *
+		 * @param chunkSize use negative number for default.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public GridFsUploadBuilder<T> chunkSize(int chunkSize) {
+
+			this.options = this.options.chunkSize(chunkSize);
+			return this;
+		}
+
+		/**
+		 * Set id, filename, metadata and chunk size from given file.
+		 *
+		 * @param gridFSFile must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public GridFsUploadBuilder<T> gridFsFile(GridFSFile gridFSFile) {
+
+			Assert.notNull(gridFSFile, "GridFSFile must not be null");
+
+			this.id = gridFSFile.getId();
+			this.filename = gridFSFile.getFilename();
+			this.options = this.options.metadata(gridFSFile.getMetadata());
+			this.options = this.options.chunkSize(gridFSFile.getChunkSize());
+
+			return this;
+		}
+
+		/**
+		 * Set the content type.
+		 *
+		 * @param contentType must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public GridFsUploadBuilder<T> contentType(String contentType) {
+
+			this.options = this.options.contentType(contentType);
+			return this;
+		}
+
+		@Contract("-> new")
+		public GridFsUpload<T> build() {
+
+			Assert.notNull(dataStream, "DataStream must be set first");
+			Assert.notNull(filename, "Filename must be set first");
+			Assert.notNull(options, "Options must be set first");
+
+			return new GridFsUpload(id, dataStream, filename, options);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsOperations.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsOperations.java
index 9da9221477..f8a6bd804f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsOperations.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsOperations.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,14 +20,16 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.gridfs.ReactiveGridFsUpload.ReactiveGridFsUploadBuilder;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 
 import com.mongodb.client.gridfs.model.GridFSFile;
-import com.mongodb.reactivestreams.client.gridfs.AsyncInputStream;
 
 /**
  * Collection of operations to store and read files from MongoDB GridFS using reactive infrastructure.
@@ -101,20 +103,6 @@ default Mono<ObjectId> store(Publisher<DataBuffer> content, @Nullable String fil
 		return store(content, filename, null, metadata);
 	}
 
-	/**
-	 * Stores the given content into a file with the given name and content type using the given metadata. The metadata
-	 * object will be marshalled before writing.
-	 *
-	 * @param content must not be {@literal null}.
-	 * @param filename must not be {@literal null} or empty.
-	 * @param contentType can be {@literal null}.
-	 * @param metadata can be {@literal null}
-	 * @return a {@link Mono} emitting the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just
-	 *         created.
-	 */
-	Mono<ObjectId> store(AsyncInputStream content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Object metadata);
-
 	/**
 	 * Stores the given content into a file with the given name and content type using the given metadata. The metadata
 	 * object will be marshalled before writing.
@@ -147,30 +135,45 @@ default Mono<ObjectId> store(Publisher<DataBuffer> content, @Nullable String fil
 	 *
 	 * @param content must not be {@literal null}.
 	 * @param filename must not be {@literal null} or empty.
-	 * @param contentType can be {@literal null}.
+	 * @param contentType can be {@literal null}. If not empty, may override content type within {@literal metadata}.
 	 * @param metadata can be {@literal null}.
 	 * @return a {@link Mono} emitting the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just
 	 *         created.
 	 */
-	Mono<ObjectId> store(AsyncInputStream content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Document metadata);
+	default Mono<ObjectId> store(Publisher<DataBuffer> content, @Nullable String filename, @Nullable String contentType,
+			@Nullable Document metadata) {
+
+		ReactiveGridFsUploadBuilder<ObjectId> uploadBuilder = ReactiveGridFsUpload.fromPublisher(content);
+
+		if (StringUtils.hasText(filename)) {
+			uploadBuilder.filename(filename);
+		}
+		if (!ObjectUtils.isEmpty(metadata)) {
+			uploadBuilder.metadata(metadata);
+		}
+		if (StringUtils.hasText(contentType)) {
+			uploadBuilder.contentType(contentType);
+		}
+
+		return store(uploadBuilder.build());
+	}
 
 	/**
-	 * Stores the given content into a file with the given name and content type using the given metadata.
+	 * Stores the given {@link GridFsObject}, likely a {@link GridFsUpload}, into into a file with given
+	 * {@link GridFsObject#getFilename() name}. If the {@link GridFsObject#getFileId()} is set, the file will be stored
+	 * with that id, otherwise the server auto creates a new id. <br />
 	 *
-	 * @param content must not be {@literal null}.
-	 * @param filename must not be {@literal null} or empty.
-	 * @param contentType can be {@literal null}.
-	 * @param metadata can be {@literal null}.
-	 * @return a {@link Mono} emitting the {@link ObjectId} of the {@link com.mongodb.client.gridfs.model.GridFSFile} just
-	 *         created.
+	 * @param upload the {@link GridFsObject} (most likely a {@link GridFsUpload}) to be stored.
+	 * @param <T> id type of the underlying {@link com.mongodb.client.gridfs.model.GridFSFile}
+	 * @return {@link Mono} emitting the id of the stored file which is either an auto created value or
+	 *         {@link GridFsObject#getFileId()}.
+	 * @since 3.0
 	 */
-	Mono<ObjectId> store(Publisher<DataBuffer> content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Document metadata);
+	<T> Mono<T> store(GridFsObject<T, Publisher<DataBuffer>> upload);
 
 	/**
 	 * Returns a {@link Flux} emitting all files matching the given query. <br />
-	 * <strong>Note:</strong> Currently {@link Sort} criteria defined at the {@link Query} will not be regarded as MongoDB
+	 * <strong>NOTE:</strong> Currently {@link Sort} criteria defined at the {@link Query} will not be regarded as MongoDB
 	 * does not support ordering for GridFS file access.
 	 *
 	 * @see <a href="https://jira.mongodb.org/browse/JAVA-431">MongoDB Jira: JAVA-431</a>
@@ -182,7 +185,7 @@ Mono<ObjectId> store(Publisher<DataBuffer> content, @Nullable String filename, @
 	/**
 	 * Returns a {@link Mono} emitting a single {@link com.mongodb.client.gridfs.model.GridFSFile} matching the given
 	 * query or {@link Mono#empty()} in case no file matches. <br />
-	 * <strong>NOTE</strong> If more than one file matches the given query the resulting {@link Mono} emits an error. If
+	 * <strong>NOTE:</strong> If more than one file matches the given query the resulting {@link Mono} emits an error. If
 	 * you want to obtain the first found file use {@link #findFirst(Query)}.
 	 *
 	 * @param query must not be {@literal null}.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java
index fb40dad10c..e889ec7183 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,71 +16,89 @@
 package org.springframework.data.mongodb.gridfs;
 
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
 import java.io.InputStream;
-import java.util.function.IntFunction;
+import java.util.concurrent.atomic.AtomicBoolean;
 
+import org.bson.BsonValue;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
-import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.lang.Nullable;
+import org.springframework.core.io.buffer.DataBufferFactory;
+import org.springframework.core.io.buffer.DataBufferUtils;
+import org.springframework.core.io.buffer.DefaultDataBufferFactory;
+import org.springframework.data.mongodb.util.BsonUtils;
 import org.springframework.util.Assert;
 
 import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.reactivestreams.client.gridfs.GridFSDownloadPublisher;
 
 /**
- * Reactive {@link GridFSFile} based {@link Resource} implementation.
+ * Reactive {@link GridFSFile} based {@link Resource} implementation. Note that the {@link #getDownloadStream() content}
+ * can be consumed only once.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
  * @since 2.2
  */
-public class ReactiveGridFsResource extends AbstractResource {
+public class ReactiveGridFsResource implements GridFsObject<Object, Publisher<DataBuffer>> {
 
-	private static final Integer DEFAULT_CHUNK_SIZE = 256 * 1024;
+	private final AtomicBoolean consumed = new AtomicBoolean(false);
 
-	private final @Nullable GridFSFile file;
+	private final @Nullable Object id;
+	private final Options options;
 	private final String filename;
-	private final IntFunction<Flux<DataBuffer>> contentFunction;
+	private final @Nullable GridFSDownloadPublisher downloadPublisher;
+	private final DataBufferFactory dataBufferFactory;
 
 	/**
 	 * Creates a new, absent {@link ReactiveGridFsResource}.
 	 *
 	 * @param filename filename of the absent resource.
-	 * @param content
+	 * @param downloadPublisher
 	 */
-	private ReactiveGridFsResource(String filename, Publisher<DataBuffer> content) {
-
-		this.file = null;
-		this.filename = filename;
-		this.contentFunction = any -> Flux.from(content);
+	public ReactiveGridFsResource(String filename, @Nullable GridFSDownloadPublisher downloadPublisher) {
+		this(null, filename, Options.none(), downloadPublisher);
 	}
 
 	/**
-	 * Creates a new {@link ReactiveGridFsResource} from the given {@link GridFSFile}.
+	 * Creates a new, absent {@link ReactiveGridFsResource}.
 	 *
-	 * @param file must not be {@literal null}.
-	 * @param content
+	 * @param id
+	 * @param filename filename of the absent resource.
+	 * @param options
+	 * @param downloadPublisher
+	 * @since 3.0
 	 */
-	public ReactiveGridFsResource(GridFSFile file, Publisher<DataBuffer> content) {
-		this(file, (IntFunction<Flux<DataBuffer>>) any -> Flux.from(content));
+	public ReactiveGridFsResource(@Nullable Object id, String filename, Options options,
+			@Nullable GridFSDownloadPublisher downloadPublisher) {
+		this(id, filename, options, downloadPublisher, new DefaultDataBufferFactory());
+	}
+
+	ReactiveGridFsResource(GridFSFile file, @Nullable GridFSDownloadPublisher downloadPublisher, DataBufferFactory dataBufferFactory) {
+		this(file.getId(), file.getFilename(), Options.from(file), downloadPublisher, dataBufferFactory);
 	}
 
 	/**
-	 * Creates a new {@link ReactiveGridFsResource} from the given {@link GridFSFile}.
+	 * Creates a new, absent {@link ReactiveGridFsResource}.
 	 *
-	 * @param file must not be {@literal null}.
-	 * @param contentFunction
-	 * @since 2.2.1
+	 * @param id
+	 * @param filename filename of the absent resource.
+	 * @param options
+	 * @param downloadPublisher
+	 * @param dataBufferFactory
+	 * @since 3.0
 	 */
-	ReactiveGridFsResource(GridFSFile file, IntFunction<Flux<DataBuffer>> contentFunction) {
+	ReactiveGridFsResource(@Nullable Object id, String filename, Options options,
+			@Nullable GridFSDownloadPublisher downloadPublisher, DataBufferFactory dataBufferFactory) {
 
-		this.file = file;
-		this.filename = file.getFilename();
-		this.contentFunction = contentFunction;
+		this.id = id;
+		this.filename = filename;
+		this.options = options;
+		this.downloadPublisher = downloadPublisher;
+		this.dataBufferFactory = dataBufferFactory;
 	}
 
 	/**
@@ -93,123 +111,111 @@ public ReactiveGridFsResource(GridFSFile file, Publisher<DataBuffer> content) {
 	public static ReactiveGridFsResource absent(String filename) {
 
 		Assert.notNull(filename, "Filename must not be null");
-
-		return new ReactiveGridFsResource(filename, Flux.empty());
+		return new ReactiveGridFsResource(filename, null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.InputStreamResource#getInputStream()
-	 */
 	@Override
-	public InputStream getInputStream() throws IllegalStateException {
-		throw new UnsupportedOperationException();
+	public @Nullable Object getFileId() {
+		return id instanceof BsonValue bsonValue ? BsonUtils.toJavaType(bsonValue) : id;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#contentLength()
-	 */
-	@Override
-	public long contentLength() throws IOException {
-
-		verifyExists();
-		return getGridFSFile().getLength();
-	}
-
-	/*
-	 * (non-Javadoc)
+	/**
 	 * @see org.springframework.core.io.AbstractResource#getFilename()
 	 */
-	@Override
 	public String getFilename() throws IllegalStateException {
 		return this.filename;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#exists()
+	/**
+	 * @return the underlying {@link GridFSFile}. Can be {@literal null} if absent.
+	 * @since 2.2
 	 */
-	@Override
-	public boolean exists() {
-		return this.file != null;
+	public Mono<GridFSFile> getGridFSFile() {
+		return downloadPublisher != null ? Mono.from(downloadPublisher.getGridFSFile()) : Mono.empty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#lastModified()
+	/**
+	 * Obtain the data as {@link InputStream}. <br />
+	 * <strong>NOTE:</strong> Buffers data in memory. Use {@link #getDownloadStream()} for large files.
+	 *
+	 * @throws IllegalStateException if the underlying {@link Publisher} has already been consumed.
+	 * @see org.springframework.core.io.InputStreamResource#getInputStream()
+	 * @see #getDownloadStream()
+	 * @see DataBufferUtils#join(Publisher)
+	 * @since 3.0
 	 */
-	@Override
-	public long lastModified() throws IOException {
+	public Mono<InputStream> getInputStream() throws IllegalStateException {
 
-		verifyExists();
-		return getGridFSFile().getUploadDate().getTime();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.io.AbstractResource#getDescription()
-	 */
-	@Override
-	public String getDescription() {
-		return String.format("GridFs resource [%s]", this.getFilename());
+		return getDownloadStream() //
+				.transform(DataBufferUtils::join) //
+				.as(Mono::from) //
+				.map(DataBuffer::asInputStream);
 	}
 
 	/**
-	 * Returns the {@link Resource}'s id.
+	 * Obtain the download stream emitting chunks of data as they come in. <br />
 	 *
-	 * @return never {@literal null}.
-	 * @throws IllegalStateException if the file does not {@link #exists()}.
+	 * @return {@link Flux#empty()} if the file does not exist.
+	 * @throws IllegalStateException if the underlying {@link Publisher} has already been consumed.
+	 * @see org.springframework.core.io.InputStreamResource#getInputStream()
+	 * @see #getDownloadStream()
+	 * @see DataBufferUtils#join(Publisher)
+	 * @since 3.0
 	 */
-	public Object getId() {
+	public Flux<DataBuffer> getDownloadStream() {
 
-		Assert.state(exists(), () -> String.format("%s does not exist.", getDescription()));
+		if (downloadPublisher == null) {
+			return Flux.empty();
+		}
 
-		return getGridFSFile().getId();
+		return createDownloadStream(downloadPublisher);
 	}
 
-	/**
-	 * @return the underlying {@link GridFSFile}. Can be {@literal null} if absent.
-	 * @since 2.2
-	 */
-	@Nullable
-	public GridFSFile getGridFSFile() {
-		return file;
+	@Override
+	public Flux<DataBuffer> getContent() {
+		return getDownloadStream();
 	}
 
-	/**
-	 * Retrieve the download stream using the default chunk size of 256 kB.
-	 *
-	 * @return a {@link Flux} emitting data chunks one by one. Please make sure to
-	 *         {@link org.springframework.core.io.buffer.DataBufferUtils#release(DataBuffer) release} all
-	 *         {@link DataBuffer buffers} when done.
-	 */
-	public Flux<DataBuffer> getDownloadStream() {
-		return getDownloadStream(DEFAULT_CHUNK_SIZE);
+	@Override
+	public Options getOptions() {
+		return options;
 	}
 
 	/**
-	 * Retrieve the download stream.
+	 * Obtain the download stream emitting chunks of data with given {@code chunkSize} as they come in.
 	 *
-	 * @param chunkSize chunk size in bytes to use.
-	 * @return a {@link Flux} emitting data chunks one by one. Please make sure to
-	 *         {@link org.springframework.core.io.buffer.DataBufferUtils#release(DataBuffer) release} all
-	 *         {@link DataBuffer buffers} when done.
-	 * @since 2.2.1
+	 * @param chunkSize the preferred number of bytes per emitted {@link DataBuffer}.
+	 * @return {@link Flux#empty()} if the file does not exist.
+	 * @throws IllegalStateException if the underlying {@link Publisher} has already been consumed.
+	 * @see org.springframework.core.io.InputStreamResource#getInputStream()
+	 * @see #getDownloadStream()
+	 * @see DataBufferUtils#join(Publisher)
+	 * @since 3.0
 	 */
 	public Flux<DataBuffer> getDownloadStream(int chunkSize) {
 
-		if (!exists()) {
-			return Flux.error(new FileNotFoundException(String.format("%s does not exist.", getDescription())));
+		if (downloadPublisher == null) {
+			return Flux.empty();
 		}
 
-		return contentFunction.apply(chunkSize);
+		return createDownloadStream(downloadPublisher.bufferSizeBytes(chunkSize));
+	}
+
+	private Flux<DataBuffer> createDownloadStream(GridFSDownloadPublisher publisher) {
+
+		return Flux.from(publisher) //
+				.map(dataBufferFactory::wrap) //
+				.doOnSubscribe(it -> this.verifyStreamStillAvailable());
+	}
+
+	public boolean exists() {
+		return downloadPublisher != null;
 	}
 
-	private void verifyExists() throws FileNotFoundException {
+	private void verifyStreamStillAvailable() {
 
-		if (!exists()) {
-			throw new FileNotFoundException(String.format("%s does not exist.", getDescription()));
+		if (!consumed.compareAndSet(false, true)) {
+			throw new IllegalStateException("Stream already consumed.");
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java
index cec6937630..092f81d1fa 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,8 +21,12 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.nio.ByteBuffer;
+
+import org.bson.BsonValue;
 import org.bson.Document;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.core.io.buffer.DataBufferFactory;
@@ -32,17 +36,17 @@
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.util.Lazy;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 
 import com.mongodb.client.gridfs.model.GridFSFile;
-import com.mongodb.reactivestreams.client.MongoDatabase;
-import com.mongodb.reactivestreams.client.gridfs.AsyncInputStream;
+import com.mongodb.client.gridfs.model.GridFSUploadOptions;
 import com.mongodb.reactivestreams.client.gridfs.GridFSBucket;
 import com.mongodb.reactivestreams.client.gridfs.GridFSBuckets;
-import com.mongodb.reactivestreams.client.gridfs.GridFSDownloadStream;
 import com.mongodb.reactivestreams.client.gridfs.GridFSFindPublisher;
+import com.mongodb.reactivestreams.client.gridfs.GridFSUploadPublisher;
 
 /**
  * {@link ReactiveGridFsOperations} implementation to store content into MongoDB GridFS. Uses by default
@@ -50,17 +54,24 @@
  *
  * @author Mark Paluch
  * @author Nick Stolwijk
+ * @author Denis Zavedeev
+ * @author Christoph Strobl
+ * @author Mathieu Ouellet
  * @since 2.2
  */
 public class ReactiveGridFsTemplate extends GridFsOperationsSupport implements ReactiveGridFsOperations {
 
-	private final ReactiveMongoDatabaseFactory dbFactory;
 	private final DataBufferFactory dataBufferFactory;
-	private final @Nullable String bucket;
+	private final Mono<GridFSBucket> bucketSupplier;
 
 	/**
 	 * Creates a new {@link ReactiveGridFsTemplate} using the given {@link ReactiveMongoDatabaseFactory} and
 	 * {@link MongoConverter}.
+	 * <p>
+	 * Note that the {@link GridFSBucket} is obtained only once from
+	 * {@link ReactiveMongoDatabaseFactory#getMongoDatabase() MongoDatabase}. Use
+	 * {@link #ReactiveGridFsTemplate(MongoConverter, Mono, DataBufferFactory)} if you want to use different buckets from
+	 * the same Template instance.
 	 *
 	 * @param dbFactory must not be {@literal null}.
 	 * @param converter must not be {@literal null}.
@@ -72,10 +83,15 @@ public ReactiveGridFsTemplate(ReactiveMongoDatabaseFactory dbFactory, MongoConve
 	/**
 	 * Creates a new {@link ReactiveGridFsTemplate} using the given {@link ReactiveMongoDatabaseFactory} and
 	 * {@link MongoConverter}.
+	 * <p>
+	 * Note that the {@link GridFSBucket} is obtained only once from
+	 * {@link ReactiveMongoDatabaseFactory#getMongoDatabase() MongoDatabase}. Use
+	 * {@link #ReactiveGridFsTemplate(MongoConverter, Mono, DataBufferFactory)} if you want to use different buckets from
+	 * the same Template instance.
 	 *
 	 * @param dbFactory must not be {@literal null}.
 	 * @param converter must not be {@literal null}.
-	 * @param bucket
+	 * @param bucket can be {@literal null}.
 	 */
 	public ReactiveGridFsTemplate(ReactiveMongoDatabaseFactory dbFactory, MongoConverter converter,
 			@Nullable String bucket) {
@@ -85,156 +101,135 @@ public ReactiveGridFsTemplate(ReactiveMongoDatabaseFactory dbFactory, MongoConve
 	/**
 	 * Creates a new {@link ReactiveGridFsTemplate} using the given {@link DataBufferFactory},
 	 * {@link ReactiveMongoDatabaseFactory} and {@link MongoConverter}.
+	 * <p>
+	 * Note that the {@link GridFSBucket} is obtained only once from
+	 * {@link ReactiveMongoDatabaseFactory#getMongoDatabase() MongoDatabase}. Use
+	 * {@link #ReactiveGridFsTemplate(MongoConverter, Mono, DataBufferFactory)} if you want to use different buckets from
+	 * the same Template instance.
 	 *
 	 * @param dataBufferFactory must not be {@literal null}.
 	 * @param dbFactory must not be {@literal null}.
 	 * @param converter must not be {@literal null}.
-	 * @param bucket
+	 * @param bucket can be {@literal null}.
 	 */
 	public ReactiveGridFsTemplate(DataBufferFactory dataBufferFactory, ReactiveMongoDatabaseFactory dbFactory,
 			MongoConverter converter, @Nullable String bucket) {
+		this(converter, Mono.defer(Lazy.of(() -> doGetBucket(dbFactory, bucket))), dataBufferFactory);
+	}
+
+	/**
+	 * Creates a new {@link ReactiveGridFsTemplate} using the given {@link MongoConverter}, {@link Mono} emitting a
+	 * {@link ReactiveMongoDatabaseFactory} and {@link DataBufferFactory}.
+	 *
+	 * @param converter must not be {@literal null}.
+	 * @param gridFSBucket must not be {@literal null}.
+	 * @param dataBufferFactory must not be {@literal null}.
+	 * @since 4.2
+	 */
+	public ReactiveGridFsTemplate(MongoConverter converter, Mono<GridFSBucket> gridFSBucket,
+			DataBufferFactory dataBufferFactory) {
 
 		super(converter);
 
-		Assert.notNull(dataBufferFactory, "DataBufferFactory must not be null!");
-		Assert.notNull(dbFactory, "ReactiveMongoDatabaseFactory must not be null!");
+		Assert.notNull(gridFSBucket, "GridFSBucket Mono must not be null");
+		Assert.notNull(dataBufferFactory, "DataBufferFactory must not be null");
 
+		this.bucketSupplier = gridFSBucket;
 		this.dataBufferFactory = dataBufferFactory;
-		this.dbFactory = dbFactory;
-		this.bucket = bucket;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#store(com.mongodb.reactivestreams.client.gridfs.AsyncInputStream, java.lang.String, java.lang.String, java.lang.Object)
-	 */
-	@Override
-	public Mono<ObjectId> store(AsyncInputStream content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Object metadata) {
-		return store(content, filename, contentType, toDocument(metadata));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#store(org.reactivestreams.Publisher, java.lang.String, java.lang.String, java.lang.Object)
-	 */
 	@Override
 	public Mono<ObjectId> store(Publisher<DataBuffer> content, @Nullable String filename, @Nullable String contentType,
 			@Nullable Object metadata) {
 		return store(content, filename, contentType, toDocument(metadata));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#store(com.mongodb.reactivestreams.client.gridfs.AsyncInputStream, java.lang.String, java.lang.String, org.bson.Document)
-	 */
 	@Override
-	public Mono<ObjectId> store(AsyncInputStream content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Document metadata) {
+	@SuppressWarnings("unchecked")
+	public <T> Mono<T> store(GridFsObject<T, Publisher<DataBuffer>> upload) {
 
-		Assert.notNull(content, "InputStream must not be null!");
-		return Mono.from(getGridFs().uploadFromStream(filename, content, computeUploadOptionsFor(contentType, metadata)));
-	}
+		GridFSUploadOptions uploadOptions = computeUploadOptionsFor(upload.getOptions().getContentType(),
+				upload.getOptions().getMetadata());
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#store(org.reactivestreams.Publisher, java.lang.String, java.lang.String, org.bson.Document)
-	 */
-	@Override
-	public Mono<ObjectId> store(Publisher<DataBuffer> content, @Nullable String filename, @Nullable String contentType,
-			@Nullable Document metadata) {
+		if (upload.getOptions().getChunkSize() > 0) {
+			uploadOptions.chunkSizeBytes(upload.getOptions().getChunkSize());
+		}
 
-		Assert.notNull(content, "Content must not be null!");
+		String filename = upload.getFilename();
+		Flux<ByteBuffer> source = Flux.from(upload.getContent()).map(DataBuffer::toByteBuffer);
+		T fileId = upload.getFileId();
 
-		return BinaryStreamAdapters.toAsyncInputStream(content).flatMap(it -> store(it, filename, contentType, metadata));
+		if (fileId == null) {
+			return (Mono<T>) createMono(new AutoIdCreatingUploadCallback(filename, source, uploadOptions));
+		}
+
+		UploadCallback callback = new UploadCallback(BsonUtils.simpleToBsonValue(fileId), filename, source, uploadOptions);
+		return createMono(callback).thenReturn(fileId);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#find(org.springframework.data.mongodb.core.query.Query)
-	 */
 	@Override
 	public Flux<GridFSFile> find(Query query) {
-		return Flux.from(prepareQuery(query));
+
+		Document queryObject = getMappedQuery(query.getQueryObject());
+		Document sortObject = getMappedQuery(query.getSortObject());
+
+		return createFlux(new FindCallback(query, queryObject, sortObject));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#findOne(org.springframework.data.mongodb.core.query.Query)
-	 */
 	@Override
 	public Mono<GridFSFile> findOne(Query query) {
 
-		return Flux.from(prepareQuery(query).limit(2)) //
+		Document queryObject = getMappedQuery(query.getQueryObject());
+		Document sortObject = getMappedQuery(query.getSortObject());
+
+		return createFlux(new FindLimitCallback(query, queryObject, sortObject, 2)) //
 				.collectList() //
-				.flatMap(it -> {
-					if (it.isEmpty()) {
-						return Mono.empty();
+				.handle((files, sink) -> {
+
+					if (files.size() == 1) {
+						sink.next(files.get(0));
+						return;
 					}
 
-					if (it.size() > 1) {
-						return Mono.error(new IncorrectResultSizeDataAccessException(
+					if (files.size() > 1) {
+						sink.error(new IncorrectResultSizeDataAccessException(
 								"Query " + SerializationUtils.serializeToJsonSafely(query) + " returned non unique result.", 1));
 					}
-
-					return Mono.just(it.get(0));
 				});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#findFirst(org.springframework.data.mongodb.core.query.Query)
-	 */
 	@Override
 	public Mono<GridFSFile> findFirst(Query query) {
-		return Flux.from(prepareQuery(query).limit(1)).next();
+
+		Document queryObject = getMappedQuery(query.getQueryObject());
+		Document sortObject = getMappedQuery(query.getSortObject());
+
+		return createFlux(new FindLimitCallback(query, queryObject, sortObject, 1)).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#delete(org.springframework.data.mongodb.core.query.Query)
-	 */
 	@Override
 	public Mono<Void> delete(Query query) {
-		return find(query).flatMap(it -> getGridFs().delete(it.getId())).then();
+		return find(query).flatMap(it -> createMono(new DeleteCallback(it.getId()))).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#getResource(java.lang.String)
-	 */
 	@Override
 	public Mono<ReactiveGridFsResource> getResource(String location) {
 
-		Assert.notNull(location, "Filename must not be null!");
+		Assert.notNull(location, "Filename must not be null");
 
 		return findOne(query(whereFilename().is(location))).flatMap(this::getResource)
 				.defaultIfEmpty(ReactiveGridFsResource.absent(location));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#getResource(com.mongodb.client.gridfs.model.GridFSFile)
-	 */
 	@Override
 	public Mono<ReactiveGridFsResource> getResource(GridFSFile file) {
 
-		Assert.notNull(file, "GridFSFile must not be null!");
+		Assert.notNull(file, "GridFSFile must not be null");
 
-		return Mono.fromSupplier(() -> {
-
-			return new ReactiveGridFsResource(file, chunkSize -> {
-
-				GridFSDownloadStream stream = getGridFs().openDownloadStream(file.getId());
-				return BinaryStreamAdapters.toPublisher(stream, dataBufferFactory, chunkSize);
-			});
-		});
+		return doGetBucket()
+				.map(it -> new ReactiveGridFsResource(file, it.downloadToPublisher(file.getId()), dataBufferFactory));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations#getResources(java.lang.String)
-	 */
 	@Override
 	public Flux<ReactiveGridFsResource> getResources(String locationPattern) {
 
@@ -253,26 +248,130 @@ public Flux<ReactiveGridFsResource> getResources(String locationPattern) {
 		return getResource(locationPattern).flux();
 	}
 
-	protected GridFSFindPublisher prepareQuery(Query query) {
+	/**
+	 * Create a reusable Mono for a {@link ReactiveBucketCallback}. It's up to the developer to choose to obtain a new
+	 * {@link Flux} or to reuse the {@link Flux}.
+	 *
+	 * @param callback must not be {@literal null}
+	 * @return a {@link Mono} wrapping the {@link ReactiveBucketCallback}.
+	 */
+	public <T> Mono<T> createMono(ReactiveBucketCallback<T> callback) {
+
+		Assert.notNull(callback, "ReactiveBucketCallback must not be null");
+
+		return doGetBucket().flatMap(bucket -> Mono.from(callback.doInBucket(bucket)));
+	}
+
+	/**
+	 * Create a reusable Flux for a {@link ReactiveBucketCallback}. It's up to the developer to choose to obtain a new
+	 * {@link Flux} or to reuse the {@link Flux}.
+	 *
+	 * @param callback must not be {@literal null}
+	 * @return a {@link Flux} wrapping the {@link ReactiveBucketCallback}.
+	 */
+	public <T> Flux<T> createFlux(ReactiveBucketCallback<T> callback) {
+
+		Assert.notNull(callback, "ReactiveBucketCallback must not be null");
 
-		Assert.notNull(query, "Query must not be null!");
+		return doGetBucket().flatMapMany(callback::doInBucket);
+	}
 
-		Document queryObject = getMappedQuery(query.getQueryObject());
-		Document sortObject = getMappedQuery(query.getSortObject());
+	protected Mono<GridFSBucket> doGetBucket() {
+		return bucketSupplier;
+	}
+
+	private static Mono<GridFSBucket> doGetBucket(ReactiveMongoDatabaseFactory dbFactory, @Nullable String bucket) {
+
+		Assert.notNull(dbFactory, "ReactiveMongoDatabaseFactory must not be null");
+
+		return dbFactory.getMongoDatabase()
+				.map(db -> bucket == null ? GridFSBuckets.create(db) : GridFSBuckets.create(db, bucket));
+	}
+
+	/**
+	 * @param <T>
+	 * @author Mathieu Ouellet
+	 * @since 3.0
+	 */
+	interface ReactiveBucketCallback<T> {
+		Publisher<T> doInBucket(GridFSBucket bucket);
+	}
 
-		GridFSFindPublisher publisherToUse = getGridFs().find(queryObject).sort(sortObject);
+	private static class FindCallback implements ReactiveBucketCallback<GridFSFile> {
 
-		Integer cursorBatchSize = query.getMeta().getCursorBatchSize();
-		if (cursorBatchSize != null) {
-			publisherToUse = publisherToUse.batchSize(cursorBatchSize);
+		private final Query query;
+		private final Document queryObject;
+		private final Document sortObject;
+
+		public FindCallback(Query query, Document queryObject, Document sortObject) {
+
+			this.query = query;
+			this.queryObject = queryObject;
+			this.sortObject = sortObject;
 		}
 
-		return publisherToUse;
+		@Override
+		public GridFSFindPublisher doInBucket(GridFSBucket bucket) {
+
+			GridFSFindPublisher findPublisher = bucket.find(queryObject).sort(sortObject);
+
+			if (query.getLimit() > 0) {
+				findPublisher = findPublisher.limit(query.getLimit());
+			}
+
+			if (query.getSkip() > 0) {
+				findPublisher = findPublisher.skip(Math.toIntExact(query.getSkip()));
+			}
+
+			Integer cursorBatchSize = query.getMeta().getCursorBatchSize();
+			if (cursorBatchSize != null) {
+				findPublisher = findPublisher.batchSize(cursorBatchSize);
+			}
+
+			return findPublisher;
+		}
 	}
 
-	protected GridFSBucket getGridFs() {
+	private static class FindLimitCallback extends FindCallback {
+
+		private final int limit;
 
-		MongoDatabase db = dbFactory.getMongoDatabase();
-		return bucket == null ? GridFSBuckets.create(db) : GridFSBuckets.create(db, bucket);
+		public FindLimitCallback(Query query, Document queryObject, Document sortObject, int limit) {
+
+			super(query, queryObject, sortObject);
+			this.limit = limit;
+		}
+
+		@Override
+		public GridFSFindPublisher doInBucket(GridFSBucket bucket) {
+			return super.doInBucket(bucket).limit(limit);
+		}
 	}
+
+	private record UploadCallback(BsonValue fileId, String filename, Publisher<ByteBuffer> source,
+			GridFSUploadOptions uploadOptions) implements ReactiveBucketCallback<Void> {
+
+		@Override
+		public GridFSUploadPublisher<Void> doInBucket(GridFSBucket bucket) {
+			return bucket.uploadFromPublisher(fileId, filename, source, uploadOptions);
+		}
+	}
+
+	private record AutoIdCreatingUploadCallback(String filename, Publisher<ByteBuffer> source,
+			GridFSUploadOptions uploadOptions) implements ReactiveBucketCallback<ObjectId> {
+
+		@Override
+		public GridFSUploadPublisher<ObjectId> doInBucket(GridFSBucket bucket) {
+			return bucket.uploadFromPublisher(filename, source, uploadOptions);
+		}
+	}
+
+	private record DeleteCallback(BsonValue id) implements ReactiveBucketCallback<Void> {
+
+		@Override
+		public Publisher<Void> doInBucket(GridFSBucket bucket) {
+			return bucket.delete(id);
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsUpload.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsUpload.java
new file mode 100644
index 0000000000..09ea77798c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsUpload.java
@@ -0,0 +1,227 @@
+/*
+ * Copyright 2020-2025 the original author 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.gridfs;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
+import org.reactivestreams.Publisher;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+
+import com.mongodb.client.gridfs.model.GridFSFile;
+
+/**
+ * Upload descriptor for a GridFS file upload.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 3.0
+ */
+public class ReactiveGridFsUpload<ID> implements GridFsObject<ID, Publisher<DataBuffer>> {
+
+	private final @Nullable ID id;
+	private final Publisher<DataBuffer> dataStream;
+	private final String filename;
+	private final Options options;
+
+	private ReactiveGridFsUpload(@Nullable ID id, Publisher<DataBuffer> dataStream, String filename, Options options) {
+
+		Assert.notNull(dataStream, "Data Stream must not be null");
+		Assert.notNull(filename, "Filename must not be null");
+		Assert.notNull(options, "Options must not be null");
+
+		this.id = id;
+		this.dataStream = dataStream;
+		this.filename = filename;
+		this.options = options;
+	}
+
+	/**
+	 * The {@link GridFSFile#getId()} value converted into its simple java type. <br />
+	 * A {@link org.bson.BsonString} will be converted to plain {@link String}.
+	 *
+	 * @return can be {@literal null}.
+	 * @see org.springframework.data.mongodb.gridfs.GridFsObject#getFileId()
+	 */
+	@Override
+	public @Nullable ID getFileId() {
+		return id;
+	}
+
+	@Override
+	public String getFilename() {
+		return filename;
+	}
+
+	@Override
+	public Publisher<DataBuffer> getContent() {
+		return dataStream;
+	}
+
+	@Override
+	public Options getOptions() {
+		return options;
+	}
+
+	/**
+	 * Create a new instance of {@link ReactiveGridFsUpload} for the given {@link Publisher}.
+	 *
+	 * @param source must not be {@literal null}.
+	 * @return new instance of {@link GridFsUpload}.
+	 */
+	public static ReactiveGridFsUploadBuilder<ObjectId> fromPublisher(Publisher<DataBuffer> source) {
+		return new ReactiveGridFsUploadBuilder<ObjectId>().content(source);
+	}
+
+	/**
+	 * Builder to create {@link ReactiveGridFsUpload} in a fluent way.
+	 *
+	 * @param <T> the target id type.
+	 */
+	public static class ReactiveGridFsUploadBuilder<T> {
+
+		private @Nullable Object id;
+		private @Nullable Publisher<DataBuffer> dataStream;
+		private @Nullable String filename;
+		private Options options = Options.none();
+
+		private ReactiveGridFsUploadBuilder() {}
+
+		/**
+		 * Define the content of the file to upload.
+		 *
+		 * @param source the upload content.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public ReactiveGridFsUploadBuilder<T> content(Publisher<DataBuffer> source) {
+			this.dataStream = source;
+			return this;
+		}
+
+		/**
+		 * Set the id to use.
+		 *
+		 * @param id the id to save the content to.
+		 * @param <T1>
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public <T1> ReactiveGridFsUploadBuilder<T1> id(T1 id) {
+
+			this.id = id;
+			return (ReactiveGridFsUploadBuilder<T1>) this;
+		}
+
+		/**
+		 * Set the filename.
+		 *
+		 * @param filename the filename to use.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public ReactiveGridFsUploadBuilder<T> filename(String filename) {
+
+			this.filename = filename;
+			return this;
+		}
+
+		/**
+		 * Set additional file information.
+		 *
+		 * @param options must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public ReactiveGridFsUploadBuilder<T> options(Options options) {
+
+			Assert.notNull(options, "Options must not be null");
+
+			this.options = options;
+			return this;
+		}
+
+		/**
+		 * Set the file metadata.
+		 *
+		 * @param metadata must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public ReactiveGridFsUploadBuilder<T> metadata(Document metadata) {
+
+			this.options = this.options.metadata(metadata);
+			return this;
+		}
+
+		/**
+		 * Set the upload chunk size in bytes.
+		 *
+		 * @param chunkSize use negative number for default.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public ReactiveGridFsUploadBuilder<T> chunkSize(int chunkSize) {
+
+			this.options = this.options.chunkSize(chunkSize);
+			return this;
+		}
+
+		/**
+		 * Set id, filename, metadata and chunk size from given file.
+		 *
+		 * @param gridFSFile must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public ReactiveGridFsUploadBuilder<T> gridFsFile(GridFSFile gridFSFile) {
+
+			Assert.notNull(gridFSFile, "GridFSFile must not be null");
+
+			this.id = gridFSFile.getId();
+			this.filename = gridFSFile.getFilename();
+			this.options = this.options.metadata(gridFSFile.getMetadata());
+			this.options = this.options.chunkSize(gridFSFile.getChunkSize());
+
+			return this;
+		}
+
+		/**
+		 * Set the content type.
+		 *
+		 * @param contentType must not be {@literal null}.
+		 * @return this.
+		 */
+		@Contract("_ -> this")
+		public ReactiveGridFsUploadBuilder<T> contentType(String contentType) {
+
+			this.options = this.options.contentType(contentType);
+			return this;
+		}
+
+		@Contract("-> new")
+		public ReactiveGridFsUpload<T> build() {
+
+			Assert.notNull(dataStream, "DataStream must be set first");
+			Assert.notNull(filename, "Filename must be set first");
+			Assert.notNull(options, "Options must be set first");
+
+			return new ReactiveGridFsUpload(id, dataStream, filename, options);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java
index 2f3b5af150..57726d69cc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/gridfs/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Support for MongoDB GridFS feature.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.gridfs;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java
deleted file mode 100644
index 0ff0829261..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AbstractMonitor.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.bson.Document;
-
-import com.mongodb.MongoClient;
-import com.mongodb.ServerAddress;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.connection.ServerDescription;
-
-/**
- * Base class to encapsulate common configuration settings when connecting to a database
- *
- * @author Mark Pollack
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
-public abstract class AbstractMonitor {
-
-	private final Object mongoClient;
-
-	/**
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #AbstractMonitor(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	protected AbstractMonitor(MongoClient mongoClient) {
-		this.mongoClient = mongoClient;
-	}
-
-	/**
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	protected AbstractMonitor(com.mongodb.client.MongoClient mongoClient) {
-		this.mongoClient = mongoClient;
-	}
-
-	public Document getServerStatus() {
-		return getDb("admin").runCommand(new Document("serverStatus", 1).append("rangeDeleter", 1).append("repl", 1));
-	}
-
-	public MongoDatabase getDb(String databaseName) {
-
-		if (mongoClient instanceof MongoClient) {
-			return ((MongoClient) mongoClient).getDatabase(databaseName);
-		}
-
-		return ((com.mongodb.client.MongoClient) mongoClient).getDatabase(databaseName);
-	}
-
-	protected MongoClient getMongoClient() {
-
-		if (mongoClient instanceof MongoClient) {
-			return (MongoClient) mongoClient;
-		}
-
-		throw new IllegalStateException("A com.mongodb.MongoClient is required but was com.mongodb.client.MongoClient");
-	}
-
-	protected List<ServerAddress> hosts() {
-
-		if (mongoClient instanceof MongoClient) {
-			return ((MongoClient) mongoClient).getServerAddressList();
-		}
-
-		return ((com.mongodb.client.MongoClient) mongoClient).getClusterDescription().getServerDescriptions().stream()
-				.map(ServerDescription::getAddress).collect(Collectors.toList());
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AssertMetrics.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AssertMetrics.java
deleted file mode 100644
index 85bad3e70b..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/AssertMetrics.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import com.mongodb.MongoClient;
-import org.bson.Document;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-import com.mongodb.DBObject;
-import com.mongodb.Mongo;
-
-/**
- * JMX Metrics for assertions
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Assertion Metrics")
-public class AssertMetrics extends AbstractMonitor {
-
-	/**
-	 *
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #AssertMetrics(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	public AssertMetrics(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 *
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	public AssertMetrics(com.mongodb.client.MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Regular")
-	public int getRegular() {
-		return getBtree("regular");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Warning")
-	public int getWarning() {
-		return getBtree("warning");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Msg")
-	public int getMsg() {
-		return getBtree("msg");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "User")
-	public int getUser() {
-		return getBtree("user");
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Rollovers")
-	public int getRollovers() {
-		return getBtree("rollovers");
-	}
-
-	private int getBtree(String key) {
-		Document asserts = (Document) getServerStatus().get("asserts");
-		// Class c = btree.get(key).getClass();
-		return (Integer) asserts.get(key);
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BackgroundFlushingMetrics.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BackgroundFlushingMetrics.java
deleted file mode 100644
index ba7da4db36..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BackgroundFlushingMetrics.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import java.util.Date;
-
-import org.bson.Document;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-import com.mongodb.MongoClient;
-
-/**
- * JMX Metrics for Background Flushing
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Background Flushing Metrics")
-public class BackgroundFlushingMetrics extends AbstractMonitor {
-
-	/**
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #BackgroundFlushingMetrics(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	public BackgroundFlushingMetrics(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	public BackgroundFlushingMetrics(com.mongodb.client.MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Flushes")
-	public int getFlushes() {
-		return getFlushingData("flushes", java.lang.Integer.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Total ms", unit = "ms")
-	public int getTotalMs() {
-		return getFlushingData("total_ms", java.lang.Integer.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Average ms", unit = "ms")
-	public double getAverageMs() {
-		return getFlushingData("average_ms", java.lang.Double.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Last Ms", unit = "ms")
-	public int getLastMs() {
-		return getFlushingData("last_ms", java.lang.Integer.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Last finished")
-	public Date getLastFinished() {
-		return getLast();
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> T getFlushingData(String key, Class<T> targetClass) {
-		Document mem = (Document) getServerStatus().get("backgroundFlushing");
-		return (T) mem.get(key);
-	}
-
-	private Date getLast() {
-		Document bgFlush = (Document) getServerStatus().get("backgroundFlushing");
-		Date lastFinished = (Date) bgFlush.get("last_finished");
-		return lastFinished;
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BtreeIndexCounters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BtreeIndexCounters.java
deleted file mode 100644
index 0bdb4e86e4..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/BtreeIndexCounters.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import org.bson.Document;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-import com.mongodb.MongoClient;
-
-/**
- * JMX Metrics for B-tree index counters
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Btree Metrics")
-public class BtreeIndexCounters extends AbstractMonitor {
-
-	/**
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #BtreeIndexCounters(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	public BtreeIndexCounters(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	public BtreeIndexCounters(com.mongodb.client.MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Accesses")
-	public int getAccesses() {
-		return getBtree("accesses");
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Hits")
-	public int getHits() {
-		return getBtree("hits");
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Misses")
-	public int getMisses() {
-		return getBtree("misses");
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Resets")
-	public int getResets() {
-		return getBtree("resets");
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Miss Ratio")
-	public int getMissRatio() {
-		return getBtree("missRatio");
-	}
-
-	private int getBtree(String key) {
-		Document indexCounters = (Document) getServerStatus().get("indexCounters");
-		if (indexCounters.get("note") != null) {
-			String message = (String) indexCounters.get("note");
-			if (message.contains("not supported")) {
-				return -1;
-			}
-		}
-		Document btree = (Document) indexCounters.get("btree");
-		// Class c = btree.get(key).getClass();
-		return (Integer) btree.get(key);
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ConnectionMetrics.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ConnectionMetrics.java
deleted file mode 100644
index 88502cb177..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ConnectionMetrics.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import org.bson.Document;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-import com.mongodb.MongoClient;
-
-/**
- * JMX Metrics for Connections
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Connection metrics")
-public class ConnectionMetrics extends AbstractMonitor {
-
-	/**
-	 *
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #ConnectionMetrics(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	public ConnectionMetrics(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	public ConnectionMetrics(com.mongodb.client.MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Current Connections")
-	public int getCurrent() {
-		return getConnectionData("current", java.lang.Integer.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Available Connections")
-	public int getAvailable() {
-		return getConnectionData("available", java.lang.Integer.class);
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> T getConnectionData(String key, Class<T> targetClass) {
-		Document mem = (Document) getServerStatus().get("connections");
-		// Class c = mem.get(key).getClass();
-		return (T) mem.get(key);
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/GlobalLockMetrics.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/GlobalLockMetrics.java
deleted file mode 100644
index 239ed9f003..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/GlobalLockMetrics.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import org.bson.Document;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-import com.mongodb.DBObject;
-import com.mongodb.MongoClient;
-
-/**
- * JMX Metrics for Global Locks
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Global Lock Metrics")
-public class GlobalLockMetrics extends AbstractMonitor {
-
-	/**
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #GlobalLockMetrics(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	public GlobalLockMetrics(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	public GlobalLockMetrics(com.mongodb.client.MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Total time")
-	public double getTotalTime() {
-		return getGlobalLockData("totalTime", java.lang.Double.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Lock time", unit = "s")
-	public double getLockTime() {
-		return getGlobalLockData("lockTime", java.lang.Double.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Lock time")
-	public double getLockTimeRatio() {
-		return getGlobalLockData("ratio", java.lang.Double.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Current Queue")
-	public int getCurrentQueueTotal() {
-		return getCurrentQueue("total");
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Reader Queue")
-	public int getCurrentQueueReaders() {
-		return getCurrentQueue("readers");
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Writer Queue")
-	public int getCurrentQueueWriters() {
-		return getCurrentQueue("writers");
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> T getGlobalLockData(String key, Class<T> targetClass) {
-		DBObject globalLock = (DBObject) getServerStatus().get("globalLock");
-		return (T) globalLock.get(key);
-	}
-
-	private int getCurrentQueue(String key) {
-		Document globalLock = (Document) getServerStatus().get("globalLock");
-		Document currentQueue = (Document) globalLock.get("currentQueue");
-		return (Integer) currentQueue.get(key);
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/MemoryMetrics.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/MemoryMetrics.java
deleted file mode 100644
index cde524252f..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/MemoryMetrics.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import org.bson.Document;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-import com.mongodb.MongoClient;
-
-/**
- * JMX Metrics for Memory
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Memory Metrics")
-public class MemoryMetrics extends AbstractMonitor {
-
-	/**
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #MemoryMetrics(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	public MemoryMetrics(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	public MemoryMetrics(com.mongodb.client.MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Memory address size")
-	public int getBits() {
-		return getMemData("bits", java.lang.Integer.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Resident in Physical Memory", unit = "MB")
-	public int getResidentSpace() {
-		return getMemData("resident", java.lang.Integer.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Virtual Address Space", unit = "MB")
-	public int getVirtualAddressSpace() {
-		return getMemData("virtual", java.lang.Integer.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Is memory info supported on this platform")
-	public boolean getMemoryInfoSupported() {
-		return getMemData("supported", java.lang.Boolean.class);
-	}
-
-	@ManagedMetric(metricType = MetricType.GAUGE, displayName = "Memory Mapped Space", unit = "MB")
-	public int getMemoryMappedSpace() {
-		return getMemData("mapped", java.lang.Integer.class);
-	}
-
-	@SuppressWarnings("unchecked")
-	private <T> T getMemData(String key, Class<T> targetClass) {
-		Document mem = (Document) getServerStatus().get("mem");
-		// Class c = mem.get(key).getClass();
-		return (T) mem.get(key);
-	}
-
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/OperationCounters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/OperationCounters.java
deleted file mode 100644
index 3ef8f069ce..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/OperationCounters.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import org.bson.Document;
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-import org.springframework.util.NumberUtils;
-
-import com.mongodb.MongoClient;
-
-/**
- * JMX Metrics for Operation counters
- *
- * @author Mark Pollack
- */
-@ManagedResource(description = "Operation Counters")
-public class OperationCounters extends AbstractMonitor {
-
-	/**
-	 * @param mongoClient
-	 * @deprecated since 2.2 in favor of {@link #OperationCounters(com.mongodb.client.MongoClient)}
-	 */
-	@Deprecated
-	public OperationCounters(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 * @param mongoClient
-	 * @since 2.2
-	 */
-	public OperationCounters(com.mongodb.client.MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Insert operation count")
-	public int getInsertCount() {
-		return getOpCounter("insert");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Query operation count")
-	public int getQueryCount() {
-		return getOpCounter("query");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Update operation count")
-	public int getUpdateCount() {
-		return getOpCounter("update");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Delete operation count")
-	public int getDeleteCount() {
-		return getOpCounter("delete");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "GetMore operation count")
-	public int getGetMoreCount() {
-		return getOpCounter("getmore");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Command operation count")
-	public int getCommandCount() {
-		return getOpCounter("command");
-	}
-
-	private int getOpCounter(String key) {
-		Document opCounters = (Document) getServerStatus().get("opcounters");
-		return NumberUtils.convertNumberToTargetClass((Number) opCounters.get(key), Integer.class);
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ServerInfo.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ServerInfo.java
deleted file mode 100644
index 3ab17bcd46..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/ServerInfo.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.monitor;
-
-import java.net.UnknownHostException;
-
-import org.springframework.jmx.export.annotation.ManagedMetric;
-import org.springframework.jmx.export.annotation.ManagedOperation;
-import org.springframework.jmx.export.annotation.ManagedResource;
-import org.springframework.jmx.support.MetricType;
-
-import com.mongodb.MongoClient;
-import org.springframework.util.StringUtils;
-
-/**
- * Expose basic server information via JMX
- *
- * @author Mark Pollack
- * @author Thomas Darimont
- * @author Christoph Strobl
- */
-@ManagedResource(description = "Server Information")
-public class ServerInfo extends AbstractMonitor {
-
-	public ServerInfo(MongoClient mongoClient) {
-		super(mongoClient);
-	}
-
-	/**
-	 * Returns the hostname of the used server reported by MongoDB.
-	 *
-	 * @return the reported hostname can also be an IP address.
-	 * @throws UnknownHostException
-	 */
-	@ManagedOperation(description = "Server host name")
-	public String getHostName() throws UnknownHostException {
-
-		/*
-		 * UnknownHostException is not necessary anymore, but clients could have
-		 * called this method in a try..catch(UnknownHostException) already
-		 */
-		return StringUtils.collectionToDelimitedString(hosts(), ";");
-	}
-
-	@ManagedMetric(displayName = "Uptime Estimate")
-	public double getUptimeEstimate() {
-		return (Double) getServerStatus().get("uptimeEstimate");
-	}
-
-	@ManagedOperation(description = "MongoDB Server Version")
-	public String getVersion() {
-		return (String) getServerStatus().get("version");
-	}
-
-	@ManagedOperation(description = "Local Time")
-	public String getLocalTime() {
-		return (String) getServerStatus().get("localTime");
-	}
-
-	@ManagedMetric(metricType = MetricType.COUNTER, displayName = "Server uptime in seconds", unit = "seconds")
-	public double getUptime() {
-		return (Double) getServerStatus().get("uptime");
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/package-info.java
deleted file mode 100644
index 0d495584a9..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/monitor/package-info.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/**
- * MongoDB specific JMX monitoring support.
- */
-@org.springframework.lang.NonNullApi
-package org.springframework.data.mongodb.monitor;
-
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/ContextProviderFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/ContextProviderFactory.java
new file mode 100644
index 0000000000..4b37225b5d
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/ContextProviderFactory.java
@@ -0,0 +1,136 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
+import reactor.core.CoreSubscriber;
+
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Collectors;
+
+import org.reactivestreams.Subscriber;
+import org.springframework.data.util.ReactiveWrappers;
+import org.springframework.data.util.ReactiveWrappers.ReactiveLibrary;
+import org.springframework.util.ClassUtils;
+
+import com.mongodb.ContextProvider;
+import com.mongodb.RequestContext;
+import com.mongodb.client.SynchronousContextProvider;
+import com.mongodb.reactivestreams.client.ReactiveContextProvider;
+
+/**
+ * Factory to create a {@link ContextProvider} to propagate the request context across tasks. Requires either
+ * {@link SynchronousContextProvider} or {@link ReactiveContextProvider} to be present.
+ *
+ * @author Mark Paluch
+ * @since 3.0
+ */
+public class ContextProviderFactory {
+
+	private static final boolean SYNCHRONOUS_PRESENT = ClassUtils
+			.isPresent("com.mongodb.client.SynchronousContextProvider", ContextProviderFactory.class.getClassLoader());
+
+	private static final boolean REACTIVE_PRESENT = ClassUtils.isPresent(
+			"com.mongodb.reactivestreams.client.ReactiveContextProvider", ContextProviderFactory.class.getClassLoader())
+			&& ReactiveWrappers.isAvailable(ReactiveLibrary.PROJECT_REACTOR);
+
+	/**
+	 * Create a {@link ContextProvider} given {@link ObservationRegistry}. The factory method attempts to create a
+	 * {@link ContextProvider} that is capable to propagate request contexts across imperative or reactive usage,
+	 * depending on their class path presence.
+	 *
+	 * @param observationRegistry must not be {@literal null}.
+	 * @return
+	 */
+	public static ContextProvider create(ObservationRegistry observationRegistry) {
+
+		if (SYNCHRONOUS_PRESENT && REACTIVE_PRESENT) {
+			return new CompositeContextProvider(observationRegistry);
+		}
+
+		if (SYNCHRONOUS_PRESENT) {
+			return new DefaultSynchronousContextProvider(observationRegistry);
+		}
+
+		if (REACTIVE_PRESENT) {
+			return DefaultReactiveContextProvider.INSTANCE;
+		}
+
+		throw new IllegalStateException(
+				"Cannot create ContextProvider. Neither SynchronousContextProvider nor ReactiveContextProvider is on the class path.");
+	}
+
+	record DefaultSynchronousContextProvider(
+			ObservationRegistry observationRegistry) implements SynchronousContextProvider {
+
+		@Override
+		public RequestContext getContext() {
+
+			MapRequestContext requestContext = new MapRequestContext();
+
+			Observation currentObservation = observationRegistry.getCurrentObservation();
+			if (currentObservation != null) {
+				requestContext.put(ObservationThreadLocalAccessor.KEY, currentObservation);
+			}
+
+			return requestContext;
+		}
+
+	}
+
+	enum DefaultReactiveContextProvider implements ReactiveContextProvider {
+
+		INSTANCE;
+
+		@Override
+		public RequestContext getContext(Subscriber<?> subscriber) {
+
+			if (subscriber instanceof CoreSubscriber<?> cs) {
+
+				Map<Object, Object> map = cs.currentContext().stream()
+						.collect(Collectors.toConcurrentMap(Entry::getKey, Entry::getValue));
+
+				return new MapRequestContext(map);
+			}
+
+			return new MapRequestContext();
+		}
+	}
+
+	record CompositeContextProvider(DefaultSynchronousContextProvider synchronousContextProvider)
+			implements
+				SynchronousContextProvider,
+				ReactiveContextProvider {
+
+		CompositeContextProvider(ObservationRegistry observationRegistry) {
+			this(new DefaultSynchronousContextProvider(observationRegistry));
+		}
+
+		@Override
+		public RequestContext getContext() {
+			return synchronousContextProvider.getContext();
+		}
+
+		@Override
+		public RequestContext getContext(Subscriber<?> subscriber) {
+			return DefaultReactiveContextProvider.INSTANCE.getContext(subscriber);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/DefaultMongoHandlerObservationConvention.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/DefaultMongoHandlerObservationConvention.java
new file mode 100644
index 0000000000..550a71b301
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/DefaultMongoHandlerObservationConvention.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import io.micrometer.common.KeyValues;
+
+import org.springframework.data.mongodb.observability.MongoObservation.LowCardinalityCommandKeyNames;
+import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.ServerAddress;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ConnectionId;
+import com.mongodb.event.CommandStartedEvent;
+
+/**
+ * Default {@link MongoHandlerObservationConvention} implementation.
+ *
+ * @author Greg Turnquist
+ * @author Mark Paluch
+ * @since 4.0
+ */
+class DefaultMongoHandlerObservationConvention implements MongoHandlerObservationConvention {
+
+	@Override
+	public KeyValues getLowCardinalityKeyValues(MongoHandlerContext context) {
+
+		KeyValues keyValues = KeyValues.of(LowCardinalityCommandKeyNames.DB_SYSTEM.withValue("mongodb"),
+				LowCardinalityCommandKeyNames.MONGODB_COMMAND.withValue(context.getCommandName()));
+
+		ConnectionString connectionString = context.getConnectionString();
+		if (connectionString != null) {
+
+			keyValues = keyValues
+					.and(LowCardinalityCommandKeyNames.DB_CONNECTION_STRING.withValue(connectionString.getConnectionString()));
+
+			String user = connectionString.getUsername();
+
+			if (!ObjectUtils.isEmpty(user)) {
+				keyValues = keyValues.and(LowCardinalityCommandKeyNames.DB_USER.withValue(user));
+			}
+
+		}
+
+		if (!ObjectUtils.isEmpty(context.getDatabaseName())) {
+			keyValues = keyValues.and(LowCardinalityCommandKeyNames.DB_NAME.withValue(context.getDatabaseName()));
+		}
+
+		if (!ObjectUtils.isEmpty(context.getCollectionName())) {
+			keyValues = keyValues
+					.and(LowCardinalityCommandKeyNames.MONGODB_COLLECTION.withValue(context.getCollectionName()));
+		}
+
+		if(context.getCommandStartedEvent() == null) {
+			throw new IllegalStateException("not command started event present");
+		}
+
+		ConnectionDescription connectionDescription = context.getCommandStartedEvent().getConnectionDescription();
+
+		if (connectionDescription != null) {
+
+			ServerAddress serverAddress = connectionDescription.getServerAddress();
+
+			if (serverAddress != null) {
+
+				keyValues = keyValues.and(LowCardinalityCommandKeyNames.NET_TRANSPORT.withValue("IP.TCP"),
+						LowCardinalityCommandKeyNames.NET_PEER_NAME.withValue(serverAddress.getHost()),
+						LowCardinalityCommandKeyNames.NET_PEER_PORT.withValue("" + serverAddress.getPort()));
+			}
+
+			ConnectionId connectionId = connectionDescription.getConnectionId();
+			if (connectionId != null) {
+				keyValues = keyValues.and(LowCardinalityCommandKeyNames.MONGODB_CLUSTER_ID
+						.withValue(connectionId.getServerId().getClusterId().getValue()));
+			}
+		}
+
+		return keyValues;
+	}
+
+	@Override
+	public KeyValues getHighCardinalityKeyValues(MongoHandlerContext context) {
+		return KeyValues.empty();
+	}
+
+	@Override
+	public String getContextualName(MongoHandlerContext context) {
+
+		String collectionName = context.getCollectionName();
+		CommandStartedEvent commandStartedEvent = context.getCommandStartedEvent();
+
+		Assert.notNull(commandStartedEvent, "CommandStartedEvent must not be null");
+
+		if (ObjectUtils.isEmpty(collectionName)) {
+			return commandStartedEvent.getCommandName();
+		}
+
+		return collectionName + "." + commandStartedEvent.getCommandName();
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MapRequestContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MapRequestContext.java
new file mode 100644
index 0000000000..6185c95db5
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MapRequestContext.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.stream.Stream;
+
+import com.mongodb.RequestContext;
+import org.jspecify.annotations.Nullable;
+
+/**
+ * A {@link Map}-based {@link RequestContext}.
+ *
+ * @author Marcin Grzejszczak
+ * @author Greg Turnquist
+ * @since 4.0.0
+ */
+class MapRequestContext implements RequestContext {
+
+	private final Map<Object, Object> map;
+
+	public MapRequestContext() {
+		this(new HashMap<>());
+	}
+
+	public MapRequestContext(Map<Object, Object> context) {
+		this.map = context;
+	}
+
+	@Override
+	public <T> T get(Object key) {
+
+
+		T value = (T) map.get(key);
+		if(value != null) {
+			return value;
+		}
+		throw new NoSuchElementException("%s is missing".formatted(key));
+	}
+
+	@Override
+	public boolean hasKey(Object key) {
+		return map.containsKey(key);
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return map.isEmpty();
+	}
+
+	@Override
+	public void put(Object key, Object value) {
+		map.put(key, value);
+	}
+
+	@Override
+	public void delete(Object key) {
+		map.remove(key);
+	}
+
+	@Override
+	public int size() {
+		return map.size();
+	}
+
+	@Override
+	public Stream<Map.Entry<Object, Object>> stream() {
+		return map.entrySet().stream();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerContext.java
new file mode 100644
index 0000000000..cab9cd5cb8
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerContext.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.transport.Kind;
+import io.micrometer.observation.transport.SenderContext;
+
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.bson.BsonDocument;
+import org.bson.BsonValue;
+import org.jspecify.annotations.Nullable;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.RequestContext;
+import com.mongodb.event.CommandFailedEvent;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.event.CommandSucceededEvent;
+
+/**
+ * A {@link Observation.Context} that contains MongoDB events.
+ *
+ * @author Marcin Grzejszczak
+ * @author Greg Turnquist
+ * @author Mark Paluch
+ * @since 4.0
+ */
+public class MongoHandlerContext extends SenderContext<Object> {
+
+	/**
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/reference/command">https://docs.mongodb.com/manual/reference/command</a> for
+	 *      the command reference
+	 */
+	private static final Set<String> COMMANDS_WITH_COLLECTION_NAME = new LinkedHashSet<>(
+			Arrays.asList("aggregate", "count", "distinct", "mapReduce", "geoSearch", "delete", "find", "findAndModify",
+					"insert", "update", "collMod", "compact", "convertToCapped", "create", "createIndexes", "drop", "dropIndexes",
+					"killCursors", "listIndexes", "reIndex"));
+
+	private final @Nullable ConnectionString connectionString;
+	private final @Nullable CommandStartedEvent commandStartedEvent;
+	private final @Nullable RequestContext requestContext;
+	private final @Nullable String collectionName;
+
+	private @Nullable CommandSucceededEvent commandSucceededEvent;
+	private @Nullable CommandFailedEvent commandFailedEvent;
+
+	public MongoHandlerContext(@Nullable ConnectionString connectionString, CommandStartedEvent commandStartedEvent,
+			RequestContext requestContext) {
+
+		super((carrier, key, value) -> {}, Kind.CLIENT);
+		this.connectionString = connectionString;
+		this.commandStartedEvent = commandStartedEvent;
+		this.requestContext = requestContext;
+		this.collectionName = getCollectionName(commandStartedEvent);
+	}
+
+	public @Nullable CommandStartedEvent getCommandStartedEvent() {
+		return this.commandStartedEvent;
+	}
+
+	public @Nullable RequestContext getRequestContext() {
+		return this.requestContext;
+	}
+
+	public String getDatabaseName() {
+		return commandStartedEvent != null ? commandStartedEvent.getDatabaseName() : "n/a";
+	}
+
+	public @Nullable String getCollectionName() {
+		return this.collectionName;
+	}
+
+	public String getCommandName() {
+		return commandStartedEvent != null ? commandStartedEvent.getCommandName() : "n/a";
+	}
+
+	public @Nullable ConnectionString getConnectionString() {
+		return connectionString;
+	}
+
+	void setCommandSucceededEvent(CommandSucceededEvent commandSucceededEvent) {
+		this.commandSucceededEvent = commandSucceededEvent;
+	}
+
+	void setCommandFailedEvent(CommandFailedEvent commandFailedEvent) {
+		this.commandFailedEvent = commandFailedEvent;
+	}
+
+	/**
+	 * Transform the command name into a collection name;
+	 *
+	 * @param event the {@link CommandStartedEvent}
+	 * @return the name of the collection based on the command
+	 */
+	@Nullable
+	private static String getCollectionName(CommandStartedEvent event) {
+
+		String commandName = event.getCommandName();
+		BsonDocument command = event.getCommand();
+
+		if (COMMANDS_WITH_COLLECTION_NAME.contains(commandName)) {
+
+			String collectionName = getNonEmptyBsonString(command.get(commandName));
+
+			if (collectionName != null) {
+				return collectionName;
+			}
+		}
+
+		// Some other commands, like getMore, have a field like {"collection": collectionName}.
+		return command == null ? "" : getNonEmptyBsonString(command.get("collection"));
+	}
+
+	/**
+	 * Utility method to convert {@link BsonValue} into a plain string.
+	 *
+	 * @return trimmed string from {@code bsonValue} or null if the trimmed string was empty or the value wasn't a string
+	 */
+	private static @Nullable String getNonEmptyBsonString(@Nullable BsonValue bsonValue) {
+
+		if (bsonValue == null || !bsonValue.isString()) {
+			return null;
+		}
+
+		String stringValue = bsonValue.asString().getValue().trim();
+
+		return stringValue.isEmpty() ? null : stringValue;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerObservationConvention.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerObservationConvention.java
new file mode 100644
index 0000000000..7d1100c582
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoHandlerObservationConvention.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationConvention;
+
+/**
+ * {@link ObservationConvention} for {@link MongoHandlerContext}.
+ *
+ * @author Greg Turnquist
+ * @since 4
+ */
+public interface MongoHandlerObservationConvention extends ObservationConvention<MongoHandlerContext> {
+
+	@Override
+	default boolean supportsContext(Observation.Context context) {
+		return context instanceof MongoHandlerContext;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java
new file mode 100644
index 0000000000..9dfc292521
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservation.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import io.micrometer.common.docs.KeyName;
+import io.micrometer.observation.docs.ObservationDocumentation;
+
+/**
+ * A MongoDB-based {@link io.micrometer.observation.Observation}.
+ *
+ * @author Marcin Grzejszczak
+ * @author Greg Turnquist
+ * @since 4.0
+ */
+enum MongoObservation implements ObservationDocumentation {
+
+	/**
+	 * Timer created around a MongoDB command execution.
+	 */
+	MONGODB_COMMAND_OBSERVATION {
+
+		@Override
+		public String getName() {
+			return "spring.data.mongodb.command";
+		}
+
+		@Override
+		public KeyName[] getLowCardinalityKeyNames() {
+			return LowCardinalityCommandKeyNames.values();
+		}
+
+		@Override
+		public KeyName[] getHighCardinalityKeyNames() {
+			return new KeyName[0];
+		}
+
+	};
+
+	/**
+	 * Enums related to low cardinality key names for MongoDB commands.
+	 */
+	enum LowCardinalityCommandKeyNames implements KeyName {
+
+		/**
+		 * MongoDB database system.
+		 */
+		DB_SYSTEM {
+			@Override
+			public String asString() {
+				return "db.system";
+			}
+		},
+
+		/**
+		 * MongoDB connection string.
+		 */
+		DB_CONNECTION_STRING {
+			@Override
+			public String asString() {
+				return "db.connection_string";
+			}
+		},
+
+		/**
+		 * Network transport.
+		 */
+		NET_TRANSPORT {
+			@Override
+			public String asString() {
+				return "net.transport";
+			}
+		},
+
+		/**
+		 * Name of the database host.
+		 */
+		NET_PEER_NAME {
+			@Override
+			public String asString() {
+				return "net.peer.name";
+			}
+		},
+
+		/**
+		 * Logical remote port number.
+		 */
+		NET_PEER_PORT {
+			@Override
+			public String asString() {
+				return "net.peer.port";
+			}
+		},
+
+		/**
+		 * Mongo peer address.
+		 */
+		NET_SOCK_PEER_ADDR {
+			@Override
+			public String asString() {
+				return "net.sock.peer.addr";
+			}
+		},
+
+		/**
+		 * Mongo peer port.
+		 */
+		NET_SOCK_PEER_PORT {
+			@Override
+			public String asString() {
+				return "net.sock.peer.port";
+			}
+		},
+
+		/**
+		 * MongoDB user.
+		 */
+		DB_USER {
+			@Override
+			public String asString() {
+				return "db.user";
+			}
+		},
+
+		/**
+		 * MongoDB database name.
+		 */
+		DB_NAME {
+			@Override
+			public String asString() {
+				return "db.name";
+			}
+		},
+
+		/**
+		 * MongoDB collection name.
+		 */
+		MONGODB_COLLECTION {
+			@Override
+			public String asString() {
+				return "db.mongodb.collection";
+			}
+		},
+
+		/**
+		 * MongoDB cluster identifier.
+		 */
+		MONGODB_CLUSTER_ID {
+			@Override
+			public String asString() {
+				return "spring.data.mongodb.cluster_id";
+			}
+		},
+
+		/**
+		 * MongoDB command value.
+		 */
+		MONGODB_COMMAND {
+			@Override
+			public String asString() {
+				return "db.operation";
+			}
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java
new file mode 100644
index 0000000000..914396ab96
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/MongoObservationCommandListener.java
@@ -0,0 +1,218 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
+
+import java.util.function.BiConsumer;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.Assert;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.RequestContext;
+import com.mongodb.event.CommandFailedEvent;
+import com.mongodb.event.CommandListener;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.event.CommandSucceededEvent;
+
+/**
+ * Implement MongoDB's {@link CommandListener} using Micrometer's {@link Observation} API.
+ *
+ * @author OpenZipkin Brave Authors
+ * @author Marcin Grzejszczak
+ * @author Greg Turnquist
+ * @author François Kha
+ * @since 4.0
+ */
+public class MongoObservationCommandListener implements CommandListener {
+
+	private static final Log log = LogFactory.getLog(MongoObservationCommandListener.class);
+
+	private final ObservationRegistry observationRegistry;
+	private final @Nullable ConnectionString connectionString;
+
+	private final MongoHandlerObservationConvention observationConvention;
+
+	/**
+	 * Create a new {@link MongoObservationCommandListener} to record {@link Observation}s.
+	 *
+	 * @param observationRegistry must not be {@literal null}
+	 */
+	public MongoObservationCommandListener(ObservationRegistry observationRegistry) {
+		this(observationRegistry, null);
+	}
+
+	/**
+	 * Create a new {@link MongoObservationCommandListener} to record {@link Observation}s. This constructor attaches the
+	 * {@link ConnectionString} to every {@link Observation}.
+	 *
+	 * @param observationRegistry must not be {@literal null}
+	 * @param connectionString can be {@literal null}
+	 */
+	public MongoObservationCommandListener(ObservationRegistry observationRegistry,
+			@Nullable ConnectionString connectionString) {
+		this(observationRegistry, connectionString, new DefaultMongoHandlerObservationConvention());
+	}
+
+	/**
+	 * Create a new {@link MongoObservationCommandListener} to record {@link Observation}s. This constructor attaches the
+	 * {@link ConnectionString} to every {@link Observation} and uses the given {@link MongoHandlerObservationConvention}.
+	 *
+	 * @param observationRegistry must not be {@literal null}
+	 * @param connectionString can be {@literal null}
+	 * @param observationConvention must not be {@literal null}
+	 * @since 4.3
+	 */
+	public MongoObservationCommandListener(ObservationRegistry observationRegistry,
+			@Nullable ConnectionString connectionString, MongoHandlerObservationConvention observationConvention) {
+
+		Assert.notNull(observationRegistry, "ObservationRegistry must not be null");
+		Assert.notNull(observationConvention, "ObservationConvention must not be null");
+
+		this.observationRegistry = observationRegistry;
+		this.connectionString = connectionString;
+		this.observationConvention = observationConvention;
+	}
+
+	@Override
+	public void commandStarted(CommandStartedEvent event) {
+
+		if (log.isDebugEnabled()) {
+			log.debug("Instrumenting the command started event");
+		}
+
+		String databaseName = event.getDatabaseName();
+
+		if ("admin".equals(databaseName)) {
+			return; // don't instrument commands like "endSessions"
+		}
+
+		RequestContext requestContext = event.getRequestContext();
+
+		if (requestContext == null) {
+			return;
+		}
+
+		Observation parent = observationFromContext(requestContext);
+
+		if (log.isDebugEnabled()) {
+			log.debug("Found the following observation passed from the mongo context [" + parent + "]");
+		}
+
+		MongoHandlerContext observationContext = new MongoHandlerContext(connectionString, event, requestContext);
+		observationContext.setRemoteServiceName("mongo");
+
+		Observation observation = MongoObservation.MONGODB_COMMAND_OBSERVATION
+				.observation(this.observationRegistry, () -> observationContext) //
+				.observationConvention(this.observationConvention);
+
+		if (parent != null) {
+			observation.parentObservation(parent);
+		}
+
+		observation.start();
+
+		requestContext.put(ObservationThreadLocalAccessor.KEY, observation);
+
+		if (log.isDebugEnabled()) {
+			log.debug(
+					"Created a child observation  [" + observation + "] for Mongo instrumentation and put it in Mongo context");
+		}
+	}
+
+	@Override
+	public void commandSucceeded(CommandSucceededEvent event) {
+
+		doInObservation(event.getRequestContext(), (observation, context) -> {
+
+			context.setCommandSucceededEvent(event);
+
+			if (log.isDebugEnabled()) {
+				log.debug("Command succeeded - will stop observation [" + observation + "]");
+			}
+
+			observation.stop();
+		});
+	}
+
+	@Override
+	public void commandFailed(CommandFailedEvent event) {
+
+		doInObservation(event.getRequestContext(), (observation, context) -> {
+
+			context.setCommandFailedEvent(event);
+
+			if (log.isDebugEnabled()) {
+				log.debug("Command failed - will stop observation [" + observation + "]");
+			}
+
+			observation.error(event.getThrowable());
+			observation.stop();
+		});
+	}
+
+	/**
+	 * Performs the given action for the {@link Observation} and {@link MongoHandlerContext} if there is an ongoing Mongo
+	 * Observation. Exceptions thrown by the action are relayed to the caller.
+	 *
+	 * @param requestContext the context to extract the Observation from.
+	 * @param action the action to invoke.
+	 */
+	private void doInObservation(@Nullable RequestContext requestContext,
+			BiConsumer<Observation, MongoHandlerContext> action) {
+
+		if (requestContext == null) {
+			return;
+		}
+
+		Observation observation = requestContext.getOrDefault(ObservationThreadLocalAccessor.KEY, null);
+		if (observation == null || !(observation.getContext() instanceof MongoHandlerContext context)) {
+			return;
+		}
+
+		action.accept(observation, context);
+	}
+
+	/**
+	 * Extract the {@link Observation} from MongoDB's {@link RequestContext}.
+	 *
+	 * @param context
+	 * @return
+	 */
+	private static @Nullable Observation observationFromContext(RequestContext context) {
+
+		Observation observation = context.getOrDefault(ObservationThreadLocalAccessor.KEY, null);
+
+		if (observation != null) {
+
+			if (log.isDebugEnabled()) {
+				log.debug("Found a observation in Mongo context [" + observation + "]");
+			}
+			return observation;
+		}
+
+		if (log.isDebugEnabled()) {
+			log.debug("No observation was found - will not create any child observations");
+		}
+
+		return null;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/package-info.java
new file mode 100644
index 0000000000..d6319e5f4f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/observability/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Infrastructure to provide driver observability using Micrometer.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.mongodb.observability;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java
index 900342bbcb..989655f4a6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/package-info.java
@@ -1,5 +1,5 @@
 /**
  * Spring Data's MongoDB abstraction.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Aggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Aggregation.java
index eea5b01188..871f89d041 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Aggregation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Aggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,25 +23,28 @@
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.annotation.QueryAnnotation;
+import org.springframework.data.mongodb.core.annotation.Collation;
 
 /**
  * The {@link Aggregation} annotation can be used to annotate a {@link org.springframework.data.repository.Repository}
  * query method so that it runs the {@link Aggregation#pipeline()} on invocation.
- * <p />
+ * <p>
  * Pipeline stages are mapped against the {@link org.springframework.data.repository.Repository} domain type to consider
  * {@link org.springframework.data.mongodb.core.mapping.Field field} mappings and may contain simple placeholders
  * {@code ?0} as well as {@link org.springframework.expression.spel.standard.SpelExpression SpelExpressions}.
- * <p />
+ * <p>
  * Query method {@link org.springframework.data.domain.Sort} and {@link org.springframework.data.domain.Pageable}
  * arguments are applied at the end of the pipeline or can be defined manually as part of it.
  *
  * @author Christoph Strobl
  * @since 2.2
  */
+@Collation
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Documented
 @QueryAnnotation
+@ReadPreference
 public @interface Aggregation {
 
 	/**
@@ -60,23 +63,23 @@
 	 *
 	 * // aggregation resulting in collection with single value
 	 * &#64;Aggregation("{ '$project': { '_id' : '$lastname' } }")
-	 * List<String> findAllLastnames();
+	 * List&lt;String&gt; findAllLastnames();
 	 *
 	 * // aggregation with parameter replacement
 	 * &#64;Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
-	 * List<PersonAggregate> groupByLastnameAnd(String property);
+	 * List&lt;PersonAggregate&gt; groupByLastnameAnd(String property);
 	 *
 	 * // aggregation with sort in pipeline
 	 * &#64;Aggregation(pipeline = {"{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }", "{ '$sort' : { 'lastname' : -1 } }"})
-	 * List<PersonAggregate> groupByLastnameAnd(String property);
+	 * List&lt;PersonAggregate&gt; groupByLastnameAnd(String property);
 	 *
 	 * // Sort parameter is used for sorting results
 	 * &#64;Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
-	 * List<PersonAggregate> groupByLastnameAnd(String property, Sort sort);
+	 * List&lt;PersonAggregate&gt; groupByLastnameAnd(String property, Sort sort);
 	 *
 	 * // Pageable parameter used for sort, skip and limit
 	 * &#64;Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
-	 * List<PersonAggregate> groupByLastnameAnd(String property, Pageable page);
+	 * List&lt;PersonAggregate&gt; groupByLastnameAnd(String property, Pageable page);
 	 *
 	 * // Single value result aggregation.
 	 * &#64;Aggregation("{ '$group' : { '_id' : null, 'total' : { $sum: '$age' } } }")
@@ -88,7 +91,7 @@
 	 *
 	 * // Raw aggregation result
 	 * &#64;Aggregation("{ '$group' : { '_id' : null, 'total' : { $sum: '$age' } } })
-	 * AggregationResults&lt;org.bson.Document>&gt; sumAgeAndReturnAggregationResultWrapper();
+	 * AggregationResults&lt;org.bson.Document&gt;&gt; sumAgeAndReturnAggregationResultWrapper();
 	 * </pre>
 	 *
 	 * @return an empty array by default.
@@ -102,26 +105,44 @@
 	 * <pre class="code">
 	 * // Fixed value
 	 * &#64;Aggregation(pipeline = "...", collation = "en_US")
-	 * List<Entry> findAllByFixedCollation();
+	 * List&lt;Entry&gt; findAllByFixedCollation();
 	 *
 	 * // Fixed value as Document
 	 * &#64;Aggregation(pipeline = "...", collation = "{ 'locale' :  'en_US' }")
-	 * List<Entry> findAllByFixedJsonCollation();
+	 * List&lt;Entry&gt; findAllByFixedJsonCollation();
 	 *
 	 * // Dynamic value as String
 	 * &#64;Aggregation(pipeline = "...", collation = "?0")
-	 * List<Entry> findAllByDynamicCollation(String collation);
+	 * List&lt;Entry&gt; findAllByDynamicCollation(String collation);
 	 *
 	 * // Dynamic value as Document
 	 * &#64;Aggregation(pipeline = "...", collation = "{ 'locale' :  ?0 }")
-	 * List<Entry> findAllByDynamicJsonCollation(String collation);
+	 * List&lt;Entry&gt; findAllByDynamicJsonCollation(String collation);
 	 *
 	 * // SpEL expression
 	 * &#64;Aggregation(pipeline = "...", collation = "?#{[0]}")
-	 * List<Entry> findAllByDynamicSpElCollation(String collation);
+	 * List&lt;Entry&gt; findAllByDynamicSpElCollation(String collation);
 	 * </pre>
 	 *
 	 * @return an empty {@link String} by default.
 	 */
+	@AliasFor(annotation = Collation.class, attribute = "value")
 	String collation() default "";
+
+	/**
+	 * The mode of the read preference to use. This attribute ({@code @Aggregation(pipeline = { ... }, readPreference =
+	 * "secondary")}) is an alias for:
+	 *
+	 * <pre class="code">
+	 * &#64;@Aggregation(pipeline = { ... })
+	 * &#64;ReadPreference("secondary")
+	 * List&lt;PersonAggregate&gt; groupByLastnameAnd(String property);
+	 * </pre>
+	 *
+	 * @return the index name.
+	 * @since 4.2
+	 * @see ReadPreference#value()
+	 */
+	@AliasFor(annotation = ReadPreference.class, attribute = "value")
+	String readPreference() default "";
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/CountQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/CountQuery.java
index bdbaaba83f..c8f6cf4d0d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/CountQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/CountQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
 	 * Takes a MongoDB JSON string to define the actual query to be executed. This one will take precedence over the
 	 * method name then. Alias for {@link Query#value}.
 	 *
-	 * @return
+	 * @return an empty String by default.
 	 */
 	@AliasFor(annotation = Query.class)
 	String value() default "";
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/DeleteQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/DeleteQuery.java
index 49de6afaba..b1d620046f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/DeleteQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/DeleteQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,7 +41,7 @@
 	 * Takes a MongoDB JSON string to define the actual query to be executed. This one will take precedence over the
 	 * method name then. Alias for {@link Query#value}.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	@AliasFor(annotation = Query.class)
 	String value() default "";
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ExistsQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ExistsQuery.java
index 0df1ba751e..0d057340a5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ExistsQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ExistsQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@
 	 * Takes a MongoDB JSON string to define the actual query to be executed. This one will take precedence over the
 	 * method name then. Alias for {@link Query#value}.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	@AliasFor(annotation = Query.class)
 	String value() default "";
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Hint.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Hint.java
new file mode 100644
index 0000000000..50db722b15
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Hint.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2023-2025 the original author 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.repository;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * Annotation to declare index hints for repository query, update and aggregate operations. The index is specified by
+ * its name.
+ *
+ * @author Christoph Strobl
+ * @since 4.1
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+@Documented
+public @interface Hint {
+
+	/**
+	 * The name of the index to use. In case of an {@literal aggregation} the index is evaluated against the initial
+	 * collection or view.
+	 *
+	 * @return the index name.
+	 */
+	String value() default "";
+
+	/**
+	 * The name of the index to use. In case of an {@literal aggregation} the index is evaluated against the initial
+	 * collection or view.
+	 *
+	 * @return the index name.
+	 */
+	@AliasFor("value")
+	String indexName() default "";
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Meta.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Meta.java
index 704cf9aace..37109426f9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Meta.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Meta.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,25 +37,16 @@
 	/**
 	 * Set the maximum time limit in milliseconds for processing operations.
 	 *
-	 * @return
+	 * @return {@literal -1} by default.
 	 * @since 1.10
 	 */
 	long maxExecutionTimeMs() default -1;
 
-	/**
-	 * Only scan the specified number of documents.
-	 *
-	 * @return
-	 * @deprecated since 2.2. {@code $maxScan} has been removed without replacement in MongoDB 4.2.
-	 */
-	@Deprecated
-	long maxScanDocuments() default -1;
-
 	/**
 	 * Sets the number of documents to return per batch. <br />
 	 * Use {@literal 0 (zero)} for no limit. A <strong>negative limit</strong> closes the cursor after returning a single
 	 * batch indicating to the server that the client will not ask for a subsequent one.
-	 * 
+	 *
 	 * @return {@literal 0 (zero)} by default.
 	 * @since 2.1
 	 */
@@ -64,17 +55,10 @@
 	/**
 	 * Add a comment to the query.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String comment() default "";
 
-	/**
-	 * Using snapshot prevents the cursor from returning a document more than once.
-	 *
-	 * @return
-	 */
-	boolean snapshot() default false;
-
 	/**
 	 * Set {@link org.springframework.data.mongodb.core.query.Meta.CursorOption} to be used when executing query.
 	 *
@@ -83,4 +67,13 @@
 	 */
 	org.springframework.data.mongodb.core.query.Meta.CursorOption[] flags() default {};
 
+	/**
+	 * When set to {@literal true}, aggregation stages can write data to disk.
+	 *
+	 * @return {@literal false} by default.
+	 * @since 3.0
+	 * @see Aggregation
+	 */
+	boolean allowDiskUse() default false;
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java
index 116f914b2b..5a80e90cd2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/MongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,9 @@
 
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.data.repository.ListPagingAndSortingRepository;
 import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.PagingAndSortingRepository;
 import org.springframework.data.repository.query.QueryByExampleExecutor;
 
 /**
@@ -33,28 +34,8 @@
  * @author Khaled Baklouti
  */
 @NoRepositoryBean
-public interface MongoRepository<T, ID> extends PagingAndSortingRepository<T, ID>, QueryByExampleExecutor<T> {
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#saveAll(java.lang.Iterable)
-	 */
-	@Override
-	<S extends T> List<S> saveAll(Iterable<S> entities);
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll()
-	 */
-	@Override
-	List<T> findAll();
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
-	 */
-	@Override
-	List<T> findAll(Sort sort);
+public interface MongoRepository<T, ID>
+		extends ListCrudRepository<T, ID>, ListPagingAndSortingRepository<T, ID>, QueryByExampleExecutor<T> {
 
 	/**
 	 * Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use the
@@ -69,7 +50,7 @@ public interface MongoRepository<T, ID> extends PagingAndSortingRepository<T, ID
 
 	/**
 	 * Inserts the given entities. Assumes the given entities to have not been persisted yet and thus will optimize the
-	 * insert over a call to {@link #save(Iterable)}. Prefer using {@link #save(Iterable)} to avoid the usage of store
+	 * insert over a call to {@link #saveAll(Iterable)}. Prefer using {@link #saveAll(Iterable)} to avoid the usage of store
 	 * specific API.
 	 *
 	 * @param entities must not be {@literal null}.
@@ -78,16 +59,31 @@ public interface MongoRepository<T, ID> extends PagingAndSortingRepository<T, ID
 	 */
 	<S extends T> List<S> insert(Iterable<S> entities);
 
-	/*
-	 * (non-Javadoc)
+	/**
+	 * Returns all entities matching the given {@link Example}. In case no match could be found an empty {@link List} is
+	 * returned. <br />
+	 * By default the {@link Example} uses typed matching restricting it to probe assignable types. For example, when
+	 * sticking with the default type key ({@code _class}), the query has restrictions such as
+	 * <code>_class : &#123; $in : [com.acme.Person] &#125;</code>. <br />
+	 * To avoid the above mentioned type restriction use an {@link org.springframework.data.mongodb.core.query.UntypedExampleMatcher} with
+	 * {@link Example#of(Object, org.springframework.data.domain.ExampleMatcher)}.
+	 *
 	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example)
 	 */
 	@Override
 	<S extends T> List<S> findAll(Example<S> example);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Sort)
+	/**
+	 * Returns all entities matching the given {@link Example} applying the given {@link Sort}. In case no match could be
+	 * found an empty {@link List} is returned. <br />
+	 * By default the {@link Example} uses typed matching restricting it to probe assignable types. For example, when
+	 * sticking with the default type key ({@code _class}), the query has restrictions such as
+	 * <code>_class : &#123; $in : [com.acme.Person] &#125;</code>. <br />
+	 * To avoid the above mentioned type restriction use an {@link org.springframework.data.mongodb.core.query.UntypedExampleMatcher} with
+	 * {@link Example#of(Object, org.springframework.data.domain.ExampleMatcher)}.
+	 *
+	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example,
+	 *      org.springframework.data.domain.Sort)
 	 */
 	@Override
 	<S extends T> List<S> findAll(Example<S> example, Sort sort);
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Near.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Near.java
index 4d576471b0..f0da9965a3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Near.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Near.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Query.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Query.java
index 0bc3e1618c..fa15ff5af0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Query.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Query.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,9 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.annotation.QueryAnnotation;
+import org.springframework.data.mongodb.core.annotation.Collation;
 
 /**
  * Annotation to declare finder queries directly on repository methods. Both attributes allow using a placeholder
@@ -31,18 +33,22 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Jorge Rodríguez
  */
+@Collation
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
 @Documented
 @QueryAnnotation
+@Hint
+@ReadPreference
 public @interface Query {
 
 	/**
 	 * Takes a MongoDB JSON string to define the actual query to be executed. This one will take precedence over the
 	 * method name then.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String value() default "";
 
@@ -50,7 +56,7 @@
 	 * Defines the fields that should be returned for the given query. Note that only these fields will make it into the
 	 * domain object returned.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String fields() default "";
 
@@ -58,7 +64,7 @@
 	 * Returns whether the query defined should be executed as count projection.
 	 *
 	 * @since 1.3
-	 * @return
+	 * @return {@literal false} by default.
 	 */
 	boolean count() default false;
 
@@ -66,7 +72,7 @@
 	 * Returns whether the query defined should be executed as exists projection.
 	 *
 	 * @since 1.10
-	 * @return
+	 * @return {@literal false} by default.
 	 */
 	boolean exists() default false;
 
@@ -74,24 +80,23 @@
 	 * Returns whether the query should delete matching documents.
 	 *
 	 * @since 1.5
-	 * @return
+	 * @return {@literal false} by default.
 	 */
 	boolean delete() default false;
 
 	/**
-	 * Defines a default sort order for the given query.<br />
-	 * <strong>NOTE:</strong> The so set defaults can be altered / overwritten using an explicit
-	 * {@link org.springframework.data.domain.Sort} argument of the query method.
+	 * Defines a default sort order for the given query. <strong>NOTE:</strong> The so set defaults can be altered /
+	 * overwritten using an explicit {@link org.springframework.data.domain.Sort} argument of the query method.
 	 *
 	 * <pre>
 	 * <code>
 	 *
 	 * 		&#64;Query(sort = "{ age : -1 }") // order by age descending
-	 * 		List<Person> findByFirstname(String firstname);
+	 * 		List&lt;Person&gt; findByFirstname(String firstname);
 	 * </code>
 	 * </pre>
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 * @since 2.1
 	 */
 	String sort() default "";
@@ -102,27 +107,61 @@
 	 * <pre class="code">
 	 * // Fixed value
 	 * &#64;Query(collation = "en_US")
-	 * List<Entry> findAllByFixedCollation();
+	 * List&lt;Entry&gt; findAllByFixedCollation();
 	 *
 	 * // Fixed value as Document
 	 * &#64;Query(collation = "{ 'locale' :  'en_US' }")
-	 * List<Entry> findAllByFixedJsonCollation();
+	 * List&lt;Entry&gt; findAllByFixedJsonCollation();
 	 *
 	 * // Dynamic value as String
 	 * &#64;Query(collation = "?0")
-	 * List<Entry> findAllByDynamicCollation(String collation);
+	 * List&lt;Entry&gt; findAllByDynamicCollation(String collation);
 	 *
 	 * // Dynamic value as Document
 	 * &#64;Query(collation = "{ 'locale' :  ?0 }")
-	 * List<Entry> findAllByDynamicJsonCollation(String collation);
+	 * List&lt;Entry&gt; findAllByDynamicJsonCollation(String collation);
 	 *
 	 * // SpEL expression
 	 * &#64;Query(collation = "?#{[0]}")
-	 * List<Entry> findAllByDynamicSpElCollation(String collation);
+	 * List&lt;Entry&gt; findAllByDynamicSpElCollation(String collation);
 	 * </pre>
 	 *
 	 * @return an empty {@link String} by default.
 	 * @since 2.2
 	 */
+	@AliasFor(annotation = Collation.class, attribute = "value")
 	String collation() default "";
+
+	/**
+	 * The name of the index to use. {@code @Query(value = "...", hint = "lastname-idx")} can be used as shortcut for:
+	 *
+	 * <pre class="code">
+	 * &#64;Query(...)
+	 * &#64;Hint("lastname-idx")
+	 * List&lt;User&gt; findAllByLastname(String collation);
+	 * </pre>
+	 *
+	 * @return the index name.
+	 * @since 4.1
+	 * @see Hint#indexName()
+	 */
+	@AliasFor(annotation = Hint.class, attribute = "indexName")
+	String hint() default "";
+
+	/**
+	 * The mode of the read preference to use. This attribute
+	 * ({@code @Query(value = "...", readPreference = "secondary")}) is an alias for:
+	 *
+	 * <pre class="code">
+	 * &#64;Query(...)
+	 * &#64;ReadPreference("secondary")
+	 * List&lt;User&gt; findAllByLastname(String lastname);
+	 * </pre>
+	 *
+	 * @return the index name.
+	 * @since 4.2
+	 * @see ReadPreference#value()
+	 */
+	@AliasFor(annotation = ReadPreference.class, attribute = "value")
+	String readPreference() default "";
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ReactiveMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ReactiveMongoRepository.java
index 8029fa640b..f8a2b34d11 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ReactiveMongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ReactiveMongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.NoRepositoryBean;
 import org.springframework.data.repository.query.ReactiveQueryByExampleExecutor;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 import org.springframework.data.repository.reactive.ReactiveSortingRepository;
 
 /**
@@ -32,7 +33,8 @@
  * @since 2.0
  */
 @NoRepositoryBean
-public interface ReactiveMongoRepository<T, ID> extends ReactiveSortingRepository<T, ID>, ReactiveQueryByExampleExecutor<T> {
+public interface ReactiveMongoRepository<T, ID>
+		extends ReactiveCrudRepository<T, ID>, ReactiveSortingRepository<T, ID>, ReactiveQueryByExampleExecutor<T> {
 
 	/**
 	 * Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use the
@@ -64,16 +66,33 @@ public interface ReactiveMongoRepository<T, ID> extends ReactiveSortingRepositor
 	 */
 	<S extends T> Flux<S> insert(Publisher<S> entities);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example)
+	/**
+	 * Returns all entities matching the given {@link Example}. In case no match could be found an empty {@link Flux} is
+	 * returned. <br />
+	 * By default the {@link Example} uses typed matching restricting it to probe assignable types. For example, when
+	 * sticking with the default type key ({@code _class}), the query has restrictions such as
+	 * <code>_class : &#123; $in : [com.acme.Person] &#125;</code>. <br />
+	 * To avoid the above mentioned type restriction use an {@link org.springframework.data.mongodb.core.query.UntypedExampleMatcher} with
+	 * {@link Example#of(Object, org.springframework.data.domain.ExampleMatcher)}.
+	 *
+	 * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#findAll(org.springframework.data.domain.Example)
 	 */
+	@Override
 	<S extends T> Flux<S> findAll(Example<S> example);
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Sort)
+	/**
+	 * Returns all entities matching the given {@link Example} applying the given {@link Sort}. In case no match could be
+	 * found an empty {@link Flux} is returned. <br />
+	 * By default the {@link Example} uses typed matching restricting it to probe assignable types. For example, when
+	 * sticking with the default type key ({@code _class}), the query has restrictions such as
+	 * <code>_class : &#123; $in : [com.acme.Person] &#125;</code>. <br />
+	 * To avoid the above mentioned type restriction use an {@link org.springframework.data.mongodb.core.query.UntypedExampleMatcher} with
+	 * {@link Example#of(Object, org.springframework.data.domain.ExampleMatcher)}.
+	 *
+	 * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#findAll(org.springframework.data.domain.Example,
+	 *      org.springframework.data.domain.Sort)
 	 */
+	@Override
 	<S extends T> Flux<S> findAll(Example<S> example, Sort sort);
 
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ReadPreference.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ReadPreference.java
new file mode 100644
index 0000000000..ddb4a67d1c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/ReadPreference.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2023-2025 the original author 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.repository;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to declare read preference for repository and query.
+ *
+ * @author Jorge Rodríguez
+ * @author Christoph Strobl
+ * @since 4.2
+ * @see com.mongodb.ReadPreference
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+@Documented
+public @interface ReadPreference {
+
+	/**
+	 * Configure the read preference mode.
+	 *
+	 * @return read preference mode.
+	 */
+	String value() default "";
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Tailable.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Tailable.java
index cb94cd0ade..7bd22059c5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Tailable.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Tailable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Update.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Update.java
new file mode 100644
index 0000000000..9bc62aa258
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/Update.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2022-2025 the original author 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.repository;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+
+/**
+ * Annotation to declare update operators directly on repository methods. Both attributes allow using a placeholder
+ * notation of {@code ?0}, {@code ?1} and so on. The update will be applied to documents matching the either method name
+ * derived or annotated query, but not to any custom implementation methods.
+ *
+ * @author Christoph Strobl
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+@Documented
+public @interface Update {
+
+	/**
+	 * Takes a MongoDB JSON string to define the actual update to be executed.
+	 *
+	 * @return the MongoDB JSON string representation of the update. Empty string by default.
+	 * @see #update()
+	 */
+	@AliasFor("update")
+	String value() default "";
+
+	/**
+	 * Takes a MongoDB JSON string to define the actual update to be executed.
+	 *
+	 * @return the MongoDB JSON string representation of the update. Empty string by default.
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/tutorial/update-documents/">https://docs.mongodb.com/manual/tutorial/update-documents/</a>
+	 */
+	@AliasFor("value")
+	String update() default "";
+
+	/**
+	 * Takes a MongoDB JSON string representation of an aggregation pipeline to define the update stages to be executed.
+	 * <p>
+	 * This allows to e.g. define update statement that can evaluate conditionals based on a field value, etc.
+	 *
+	 * @return the MongoDB JSON string representation of the update pipeline. Empty array by default.
+	 * @see <a href=
+	 *      "https://docs.mongodb.com/manual/tutorial/update-documents-with-aggregation-pipeline/">https://docs.mongodb.com/manual/tutorial/update-documents-with-aggregation-pipeline</a>
+	 */
+	String[] pipeline() default {};
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/VectorSearch.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/VectorSearch.java
new file mode 100644
index 0000000000..336889f719
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/VectorSearch.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2025 the original author 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.repository;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.core.annotation.AliasFor;
+import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation;
+
+/**
+ * Annotation to declare Vector Search queries directly on repository methods. Vector Search queries are used to search
+ * for similar documents based on vector embeddings typically returning
+ * {@link org.springframework.data.domain.SearchResults} and limited by either a
+ * {@link org.springframework.data.domain.Score} (within) or a {@link org.springframework.data.domain.Range} of scores
+ * (between).
+ * <p>
+ * Vector search must define an index name using the {@link #indexName()} attribute. The index must be created in the
+ * MongoDB Atlas cluster before executing the query. Any misspelling of the index name will result in returning no
+ * results.
+ * <p>
+ * When using pre-filters, you can either define {@link #filter()} or use query derivation to define the pre-filter.
+ * {@link org.springframework.data.domain.Vector} and distance parameters are considered once these are present. Vector
+ * search supports sorting and will consider {@link org.springframework.data.domain.Sort} parameters.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see org.springframework.data.domain.Score
+ * @see org.springframework.data.domain.Vector
+ * @see org.springframework.data.domain.SearchResults
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
+@Documented
+@Query
+@Hint
+public @interface VectorSearch {
+
+	/**
+	 * Configuration whether to use
+	 * {@link org.springframework.data.mongodb.core.aggregation.VectorSearchOperation.SearchType#ANN} or
+	 * {@link org.springframework.data.mongodb.core.aggregation.VectorSearchOperation.SearchType#ENN} for the search.
+	 *
+	 * @return the search type to use.
+	 */
+	VectorSearchOperation.SearchType searchType() default VectorSearchOperation.SearchType.DEFAULT;
+
+	/**
+	 * Name of the Atlas Vector Search index to use. Atlas Vector Search doesn't return results if you misspell the index
+	 * name or if the specified index doesn't already exist on the cluster.
+	 *
+	 * @return name of the Atlas Vector Search index to use.
+	 */
+	@AliasFor(annotation = Hint.class, value = "indexName")
+	String indexName();
+
+	/**
+	 * Indexed vector type field to search. This is defaulted from the domain model using the first Vector property found.
+	 *
+	 * @return an empty String by default.
+	 */
+	String path() default "";
+
+	/**
+	 * Takes a MongoDB JSON (MQL) string defining the pre-filter against indexed fields. Supports Value Expressions. Alias
+	 * for {@link VectorSearch#filter}.
+	 *
+	 * @return an empty String by default.
+	 */
+	@AliasFor(annotation = Query.class)
+	String value() default "";
+
+	/**
+	 * Takes a MongoDB JSON (MQL) string defining the pre-filter against indexed fields. Supports Value Expressions. Alias
+	 * for {@link VectorSearch#value}.
+	 *
+	 * @return an empty String by default.
+	 */
+	@AliasFor(annotation = Query.class, value = "value")
+	String filter() default "";
+
+	/**
+	 * Number of documents to return in the results. This value can't exceed the value of {@link #numCandidates} if you
+	 * specify {@link #numCandidates}. Limit accepts Value Expressions. A Vector Search method cannot define both,
+	 * {@code limit()} and a {@link org.springframework.data.domain.Limit} parameter. Supports Value Expressions.
+	 *
+	 * @return number of documents to return in the results.
+	 */
+	String limit() default "";
+
+	/**
+	 * Number of nearest neighbors to use during the search. Value must be less than or equal to ({@code <=})
+	 * {@code 10000}. You can't specify a number less than the {@link #limit() number of documents to return}. We
+	 * recommend that you specify a number at least {@code 20} times higher than the {@link #limit() number of documents
+	 * to return} to increase accuracy.
+	 * <p>
+	 * This over-request pattern is the recommended way to trade off latency and recall in your ANN searches, and we
+	 * recommend tuning this parameter based on your specific dataset size and query requirements. Required if the query
+	 * uses
+	 * {@link org.springframework.data.mongodb.core.aggregation.VectorSearchOperation.SearchType#ANN}/{@link org.springframework.data.mongodb.core.aggregation.VectorSearchOperation.SearchType#DEFAULT}.
+	 * Supports Value Expressions.
+	 *
+	 * @return number of nearest neighbors to use during the search.
+	 */
+	String numCandidates() default "";
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationInteraction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationInteraction.java
new file mode 100644
index 0000000000..003982daf6
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationInteraction.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.data.repository.aot.generate.QueryMetadata;
+
+/**
+ * An {@link MongoInteraction aggregation interaction}.
+ * 
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+class AggregationInteraction extends MongoInteraction implements QueryMetadata {
+
+	private final StringAggregation aggregation;
+
+	AggregationInteraction(String[] raw) {
+		this.aggregation = new StringAggregation(raw);
+	}
+
+	List<String> stages() {
+		return Arrays.asList(aggregation.pipeline());
+	}
+
+	@Override
+	InteractionType getExecutionType() {
+		return InteractionType.AGGREGATION;
+	}
+
+	@Override
+	public Map<String, Object> serialize() {
+
+		return Map.of(pipelineSerializationKey(), stages());
+	}
+
+	protected String pipelineSerializationKey() {
+		return "pipeline";
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationUpdateInteraction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationUpdateInteraction.java
new file mode 100644
index 0000000000..cc672ed1e9
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AggregationUpdateInteraction.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.Map;
+
+/**
+ * An {@link MongoInteraction} to execute an aggregation update.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+class AggregationUpdateInteraction extends AggregationInteraction {
+
+	private final QueryInteraction filter;
+
+	AggregationUpdateInteraction(QueryInteraction filter, String[] raw) {
+
+		super(raw);
+		this.filter = filter;
+	}
+
+	QueryInteraction getFilter() {
+		return filter;
+	}
+
+	@Override
+	public Map<String, Object> serialize() {
+
+		Map<String, Object> serialized = filter.serialize();
+		serialized.putAll(super.serialize());
+		return serialized;
+	}
+
+	@Override
+	protected String pipelineSerializationKey() {
+		return "update-" + super.pipelineSerializationKey();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotMongoRepositoryPostProcessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotMongoRepositoryPostProcessor.java
new file mode 100644
index 0000000000..324871b475
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotMongoRepositoryPostProcessor.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2022-2025 the original author 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.repository.aot;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.aot.generate.GenerationContext;
+import org.springframework.data.aot.AotContext;
+import org.springframework.data.mongodb.aot.LazyLoadingProxyAotProcessor;
+import org.springframework.data.mongodb.aot.MongoAotPredicates;
+import org.springframework.data.repository.aot.generate.RepositoryContributor;
+import org.springframework.data.repository.config.AotRepositoryContext;
+import org.springframework.data.repository.config.RepositoryRegistrationAotProcessor;
+import org.springframework.data.util.TypeContributor;
+import org.springframework.data.util.TypeUtils;
+
+/**
+ * @author Christoph Strobl
+ */
+public class AotMongoRepositoryPostProcessor extends RepositoryRegistrationAotProcessor {
+
+	private final LazyLoadingProxyAotProcessor lazyLoadingProxyAotProcessor = new LazyLoadingProxyAotProcessor();
+
+	@Override
+	protected @Nullable RepositoryContributor contribute(AotRepositoryContext repositoryContext,
+			GenerationContext generationContext) {
+		// do some custom type registration here
+		super.contribute(repositoryContext, generationContext);
+
+		repositoryContext.getResolvedTypes().stream().filter(MongoAotPredicates.IS_SIMPLE_TYPE.negate()).forEach(type -> {
+			TypeContributor.contribute(type, it -> true, generationContext);
+			lazyLoadingProxyAotProcessor.registerLazyLoadingProxyIfNeeded(type, generationContext);
+		});
+
+		boolean enabled = Boolean.parseBoolean(
+				repositoryContext.getEnvironment().getProperty(AotContext.GENERATED_REPOSITORIES_ENABLED, "false"));
+		if (!enabled) {
+			return null;
+		}
+
+		return new MongoRepositoryContributor(repositoryContext);
+	}
+
+	@Override
+	protected void contributeType(Class<?> type, GenerationContext generationContext) {
+
+		if (TypeUtils.type(type).isPartOf("org.springframework.data.mongodb", "com.mongodb")) {
+			return;
+		}
+		super.contributeType(type, generationContext);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotQueryCreator.java
new file mode 100644
index 0000000000..17c19ad951
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/AotQueryCreator.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+import org.bson.conversions.Bson;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.convert.MongoWriter;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition.Placeholder;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor;
+import org.springframework.data.mongodb.repository.query.MongoParameterAccessor;
+import org.springframework.data.mongodb.repository.query.MongoQueryCreator;
+import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.data.util.TypeInformation;
+
+import com.mongodb.DBRef;
+
+/**
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+class AotQueryCreator {
+
+	private MongoMappingContext mappingContext;
+
+	public AotQueryCreator() {
+
+		MongoMappingContext mongoMappingContext = new MongoMappingContext();
+		mongoMappingContext.setSimpleTypeHolder(
+				MongoCustomConversions.create((cfg) -> cfg.useNativeDriverJavaTimeCodecs()).getSimpleTypeHolder());
+		mongoMappingContext.setAutoIndexCreation(false);
+		mongoMappingContext.afterPropertiesSet();
+
+		this.mappingContext = mongoMappingContext;
+	}
+
+	@SuppressWarnings("NullAway")
+	StringQuery createQuery(PartTree partTree, int parameterCount) {
+
+		Query query = new MongoQueryCreator(partTree,
+				new PlaceholderConvertingParameterAccessor(new PlaceholderParameterAccessor(parameterCount)), mappingContext)
+				.createQuery();
+
+		if (partTree.isLimiting()) {
+			query.limit(partTree.getMaxResults());
+		}
+		return new StringQuery(query);
+	}
+
+	static class PlaceholderConvertingParameterAccessor extends ConvertingParameterAccessor {
+
+		/**
+		 * Creates a new {@link ConvertingParameterAccessor} with the given {@link MongoWriter} and delegate.
+		 *
+		 * @param delegate must not be {@literal null}.
+		 */
+		public PlaceholderConvertingParameterAccessor(PlaceholderParameterAccessor delegate) {
+			super(PlaceholderWriter.INSTANCE, delegate);
+		}
+	}
+
+	@NullUnmarked
+	enum PlaceholderWriter implements MongoWriter<Object> {
+
+		INSTANCE;
+
+		@Override
+		public @Nullable Object convertToMongoType(@Nullable Object obj, @Nullable TypeInformation<?> typeInformation) {
+			return obj instanceof Placeholder p ? p.getValue() : obj;
+		}
+
+		@Override
+		public DBRef toDBRef(Object object, @Nullable MongoPersistentProperty referringProperty) {
+			return null;
+		}
+
+		@Override
+		public void write(Object source, Bson sink) {
+
+		}
+	}
+
+	@NullUnmarked
+	static class PlaceholderParameterAccessor implements MongoParameterAccessor {
+
+		private final List<Placeholder> placeholders;
+
+		public PlaceholderParameterAccessor(int parameterCount) {
+			if (parameterCount == 0) {
+				placeholders = List.of();
+			} else {
+				placeholders = IntStream.range(0, parameterCount).mapToObj(Placeholder::indexed).collect(Collectors.toList());
+			}
+		}
+
+		@Override
+		public Range<Distance> getDistanceRange() {
+			return null;
+		}
+
+		@Override
+		public @Nullable Vector getVector() {
+			return null;
+		}
+
+		@Override
+		public @Nullable Score getScore() {
+			return null;
+		}
+
+		@Override
+		public @Nullable Range<Score> getScoreRange() {
+			return null;
+		}
+
+		@Override
+		public @Nullable Point getGeoNearLocation() {
+			return null;
+		}
+
+		@Override
+		public @Nullable TextCriteria getFullText() {
+			return null;
+		}
+
+		@Override
+		public @Nullable Collation getCollation() {
+			return null;
+		}
+
+		@Override
+		public Object[] getValues() {
+			return placeholders.toArray();
+		}
+
+		@Override
+		public @Nullable UpdateDefinition getUpdate() {
+			return null;
+		}
+
+		@Override
+		public @Nullable ScrollPosition getScrollPosition() {
+			return null;
+		}
+
+		@Override
+		public Pageable getPageable() {
+			return null;
+		}
+
+		@Override
+		public Sort getSort() {
+			return null;
+		}
+
+		@Override
+		public @Nullable Class<?> findDynamicProjection() {
+			return null;
+		}
+
+		@Override
+		public @Nullable Object getBindableValue(int index) {
+			return placeholders.get(index).getValue();
+		}
+
+		@Override
+		public boolean hasBindableNullValue() {
+			return false;
+		}
+
+		@Override
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		public Iterator<Object> iterator() {
+			return ((List) placeholders).iterator();
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java
new file mode 100644
index 0000000000..178ce4bda6
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoAotRepositoryFragmentSupport.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.BindableMongoExpression;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Support class for MongoDB AOT repository fragments.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+public class MongoAotRepositoryFragmentSupport {
+
+	private final RepositoryMetadata repositoryMetadata;
+	private final MongoOperations mongoOperations;
+	private final MongoConverter mongoConverter;
+	private final ProjectionFactory projectionFactory;
+
+	protected MongoAotRepositoryFragmentSupport(MongoOperations mongoOperations,
+			RepositoryFactoryBeanSupport.FragmentCreationContext context) {
+		this(mongoOperations, context.getRepositoryMetadata(), context.getProjectionFactory());
+	}
+
+	protected MongoAotRepositoryFragmentSupport(MongoOperations mongoOperations, RepositoryMetadata repositoryMetadata,
+			ProjectionFactory projectionFactory) {
+
+		this.mongoOperations = mongoOperations;
+		this.mongoConverter = mongoOperations.getConverter();
+		this.repositoryMetadata = repositoryMetadata;
+		this.projectionFactory = projectionFactory;
+	}
+
+	protected Document bindParameters(String source, Object[] parameters) {
+		return new BindableMongoExpression(source, this.mongoConverter, parameters).toDocument();
+	}
+
+	protected BasicQuery createQuery(String queryString, Object[] parameters) {
+
+		Document queryDocument = bindParameters(queryString, parameters);
+		return new BasicQuery(queryDocument);
+	}
+
+	protected AggregationPipeline createPipeline(List<Object> rawStages) {
+
+		List<AggregationOperation> stages = new ArrayList<>(rawStages.size());
+		boolean first = true;
+		for (Object rawStage : rawStages) {
+			if (rawStage instanceof Document stageDocument) {
+				if (first) {
+					stages.add((ctx) -> ctx.getMappedObject(stageDocument));
+				} else {
+					stages.add((ctx) -> stageDocument);
+				}
+			} else if (rawStage instanceof AggregationOperation aggregationOperation) {
+				stages.add(aggregationOperation);
+			} else {
+				throw new RuntimeException("%s cannot be converted to AggregationOperation".formatted(rawStage.getClass()));
+			}
+			if (first) {
+				first = false;
+			}
+		}
+		return new AggregationPipeline(stages);
+	}
+
+	protected List<Object> convertSimpleRawResults(Class<?> targetType, List<Document> rawResults) {
+
+		List<Object> list = new ArrayList<>(rawResults.size());
+		for (Document it : rawResults) {
+			list.add(extractSimpleTypeResult(it, targetType, mongoConverter));
+		}
+		return list;
+	}
+
+	protected @Nullable Object convertSimpleRawResult(Class<?> targetType, Document rawResult) {
+		return extractSimpleTypeResult(rawResult, targetType, mongoConverter);
+	}
+
+	private static <T> @Nullable T extractSimpleTypeResult(@Nullable Document source, Class<T> targetType,
+			MongoConverter converter) {
+
+		if (ObjectUtils.isEmpty(source)) {
+			return null;
+		}
+
+		if (source.size() == 1) {
+			return getPotentiallyConvertedSimpleTypeValue(converter, source.values().iterator().next(), targetType);
+		}
+
+		Document intermediate = new Document(source);
+		intermediate.remove(FieldName.ID.name());
+
+		if (intermediate.size() == 1) {
+			return getPotentiallyConvertedSimpleTypeValue(converter, intermediate.values().iterator().next(), targetType);
+		}
+
+		for (Map.Entry<String, Object> entry : intermediate.entrySet()) {
+			if (entry != null && ClassUtils.isAssignable(targetType, entry.getValue().getClass())) {
+				return targetType.cast(entry.getValue());
+			}
+		}
+
+		throw new IllegalArgumentException(
+				String.format("o_O no entry of type %s found in %s.", targetType.getSimpleName(), source.toJson()));
+	}
+
+	@Nullable
+	@SuppressWarnings("unchecked")
+	private static <T> T getPotentiallyConvertedSimpleTypeValue(MongoConverter converter, @Nullable Object value,
+			Class<T> targetType) {
+
+		if (value == null) {
+			return null;
+		}
+
+		if (ClassUtils.isAssignableValue(targetType, value)) {
+			return (T) value;
+		}
+
+		return converter.getConversionService().convert(value, targetType);
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoCodeBlocks.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoCodeBlocks.java
new file mode 100644
index 0000000000..999391f5ec
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoCodeBlocks.java
@@ -0,0 +1,850 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.regex.Pattern;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.core.annotation.MergedAnnotation;
+import org.springframework.data.domain.SliceImpl;
+import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
+import org.springframework.data.mongodb.core.ExecutableRemoveOperation.ExecutableRemove;
+import org.springframework.data.mongodb.core.ExecutableUpdateOperation.ExecutableUpdate;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
+import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.BasicUpdate;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.repository.Hint;
+import org.springframework.data.mongodb.repository.Meta;
+import org.springframework.data.mongodb.repository.ReadPreference;
+import org.springframework.data.mongodb.repository.query.MongoQueryExecution.DeleteExecution;
+import org.springframework.data.mongodb.repository.query.MongoQueryExecution.PagedExecution;
+import org.springframework.data.mongodb.repository.query.MongoQueryExecution.SlicedExecution;
+import org.springframework.data.mongodb.repository.query.MongoQueryMethod;
+import org.springframework.data.repository.aot.generate.AotQueryMethodGenerationContext;
+import org.springframework.data.util.ReflectionUtils;
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.CodeBlock.Builder;
+import org.springframework.javapoet.TypeName;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.NumberUtils;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link CodeBlock} generator for common tasks.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+class MongoCodeBlocks {
+
+	private static final Pattern PARAMETER_BINDING_PATTERN = Pattern.compile("\\?(\\d+)");
+
+	/**
+	 * Builder for generating query parsing {@link CodeBlock}.
+	 *
+	 * @param context
+	 * @param queryMethod
+	 * @return new instance of {@link QueryCodeBlockBuilder}.
+	 */
+	static QueryCodeBlockBuilder queryBlockBuilder(AotQueryMethodGenerationContext context,
+			MongoQueryMethod queryMethod) {
+		return new QueryCodeBlockBuilder(context, queryMethod);
+	}
+
+	/**
+	 * Builder for generating finder query execution {@link CodeBlock}.
+	 *
+	 * @param context
+	 * @param queryMethod
+	 * @return
+	 */
+	static QueryExecutionCodeBlockBuilder queryExecutionBlockBuilder(AotQueryMethodGenerationContext context,
+			MongoQueryMethod queryMethod) {
+
+		return new QueryExecutionCodeBlockBuilder(context, queryMethod);
+	}
+
+	/**
+	 * Builder for generating delete execution {@link CodeBlock}.
+	 *
+	 * @param context
+	 * @param queryMethod
+	 * @return
+	 */
+	static DeleteExecutionCodeBlockBuilder deleteExecutionBlockBuilder(AotQueryMethodGenerationContext context,
+			MongoQueryMethod queryMethod) {
+
+		return new DeleteExecutionCodeBlockBuilder(context, queryMethod);
+	}
+
+	/**
+	 * Builder for generating update parsing {@link CodeBlock}.
+	 *
+	 * @param context
+	 * @param queryMethod
+	 * @return
+	 */
+	static UpdateCodeBlockBuilder updateBlockBuilder(AotQueryMethodGenerationContext context,
+			MongoQueryMethod queryMethod) {
+		return new UpdateCodeBlockBuilder(context, queryMethod);
+	}
+
+	/**
+	 * Builder for generating update execution {@link CodeBlock}.
+	 *
+	 * @param context
+	 * @param queryMethod
+	 * @return
+	 */
+	static UpdateExecutionCodeBlockBuilder updateExecutionBlockBuilder(AotQueryMethodGenerationContext context,
+			MongoQueryMethod queryMethod) {
+
+		return new UpdateExecutionCodeBlockBuilder(context, queryMethod);
+	}
+
+	/**
+	 * Builder for generating aggregation (pipeline) parsing {@link CodeBlock}.
+	 *
+	 * @param context
+	 * @param queryMethod
+	 * @return
+	 */
+	static AggregationCodeBlockBuilder aggregationBlockBuilder(AotQueryMethodGenerationContext context,
+			MongoQueryMethod queryMethod) {
+
+		return new AggregationCodeBlockBuilder(context, queryMethod);
+	}
+
+	/**
+	 * Builder for generating aggregation execution {@link CodeBlock}.
+	 *
+	 * @param context
+	 * @param queryMethod
+	 * @return
+	 */
+	static AggregationExecutionCodeBlockBuilder aggregationExecutionBlockBuilder(AotQueryMethodGenerationContext context,
+			MongoQueryMethod queryMethod) {
+
+		return new AggregationExecutionCodeBlockBuilder(context, queryMethod);
+	}
+
+	@NullUnmarked
+	static class DeleteExecutionCodeBlockBuilder {
+
+		private final AotQueryMethodGenerationContext context;
+		private final MongoQueryMethod queryMethod;
+		private String queryVariableName;
+
+		DeleteExecutionCodeBlockBuilder(AotQueryMethodGenerationContext context, MongoQueryMethod queryMethod) {
+
+			this.context = context;
+			this.queryMethod = queryMethod;
+		}
+
+		DeleteExecutionCodeBlockBuilder referencing(String queryVariableName) {
+
+			this.queryVariableName = queryVariableName;
+			return this;
+		}
+
+		CodeBlock build() {
+
+			String mongoOpsRef = context.fieldNameOf(MongoOperations.class);
+			Builder builder = CodeBlock.builder();
+
+			Class<?> domainType = context.getRepositoryInformation().getDomainType();
+			boolean isProjecting = context.getActualReturnType() != null
+					&& !ObjectUtils.nullSafeEquals(TypeName.get(domainType), context.getActualReturnType());
+
+			Object actualReturnType = isProjecting ? context.getActualReturnType().getType() : domainType;
+
+			builder.add("\n");
+			builder.addStatement("$T<$T> $L = $L.remove($T.class)", ExecutableRemove.class, domainType,
+					context.localVariable("remover"), mongoOpsRef, domainType);
+
+			DeleteExecution.Type type = DeleteExecution.Type.FIND_AND_REMOVE_ALL;
+			if (!queryMethod.isCollectionQuery()) {
+				if (!ClassUtils.isPrimitiveOrWrapper(context.getMethod().getReturnType())) {
+					type = DeleteExecution.Type.FIND_AND_REMOVE_ONE;
+				} else {
+					type = DeleteExecution.Type.ALL;
+				}
+			}
+
+			actualReturnType = ClassUtils.isPrimitiveOrWrapper(context.getMethod().getReturnType())
+					? TypeName.get(context.getMethod().getReturnType())
+					: queryMethod.isCollectionQuery() ? context.getReturnTypeName() : actualReturnType;
+
+			if (ClassUtils.isVoidType(context.getMethod().getReturnType())) {
+				builder.addStatement("new $T($L, $T.$L).execute($L)", DeleteExecution.class, context.localVariable("remover"),
+						DeleteExecution.Type.class, type.name(), queryVariableName);
+			} else if (context.getMethod().getReturnType() == Optional.class) {
+				builder.addStatement("return $T.ofNullable(($T) new $T($L, $T.$L).execute($L))", Optional.class,
+						actualReturnType, DeleteExecution.class, context.localVariable("remover"), DeleteExecution.Type.class,
+						type.name(), queryVariableName);
+			} else {
+				builder.addStatement("return ($T) new $T($L, $T.$L).execute($L)", actualReturnType, DeleteExecution.class,
+						context.localVariable("remover"), DeleteExecution.Type.class, type.name(), queryVariableName);
+			}
+
+			return builder.build();
+		}
+	}
+
+	@NullUnmarked
+	static class UpdateExecutionCodeBlockBuilder {
+
+		private final AotQueryMethodGenerationContext context;
+		private final MongoQueryMethod queryMethod;
+		private String queryVariableName;
+		private String updateVariableName;
+
+		UpdateExecutionCodeBlockBuilder(AotQueryMethodGenerationContext context, MongoQueryMethod queryMethod) {
+
+			this.context = context;
+			this.queryMethod = queryMethod;
+		}
+
+		UpdateExecutionCodeBlockBuilder withFilter(String queryVariableName) {
+
+			this.queryVariableName = queryVariableName;
+			return this;
+		}
+
+		UpdateExecutionCodeBlockBuilder referencingUpdate(String updateVariableName) {
+
+			this.updateVariableName = updateVariableName;
+			return this;
+		}
+
+		CodeBlock build() {
+
+			String mongoOpsRef = context.fieldNameOf(MongoOperations.class);
+			Builder builder = CodeBlock.builder();
+
+			builder.add("\n");
+
+			String updateReference = updateVariableName;
+			Class<?> domainType = context.getRepositoryInformation().getDomainType();
+			builder.addStatement("$T<$T> $L = $L.update($T.class)", ExecutableUpdate.class, domainType,
+					context.localVariable("updater"), mongoOpsRef, domainType);
+
+			Class<?> returnType = ClassUtils.resolvePrimitiveIfNecessary(queryMethod.getReturnedObjectType());
+			if (ReflectionUtils.isVoid(returnType)) {
+				builder.addStatement("$L.matching($L).apply($L).all()", context.localVariable("updater"), queryVariableName,
+						updateReference);
+			} else if (ClassUtils.isAssignable(Long.class, returnType)) {
+				builder.addStatement("return $L.matching($L).apply($L).all().getModifiedCount()",
+						context.localVariable("updater"), queryVariableName, updateReference);
+			} else {
+				builder.addStatement("$T $L = $L.matching($L).apply($L).all().getModifiedCount()", Long.class,
+						context.localVariable("modifiedCount"), context.localVariable("updater"), queryVariableName,
+						updateReference);
+				builder.addStatement("return $T.convertNumberToTargetClass($L, $T.class)", NumberUtils.class,
+						context.localVariable("modifiedCount"), returnType);
+			}
+
+			return builder.build();
+		}
+	}
+
+	@NullUnmarked
+	static class AggregationExecutionCodeBlockBuilder {
+
+		private final AotQueryMethodGenerationContext context;
+		private final MongoQueryMethod queryMethod;
+		private String aggregationVariableName;
+
+		AggregationExecutionCodeBlockBuilder(AotQueryMethodGenerationContext context, MongoQueryMethod queryMethod) {
+
+			this.context = context;
+			this.queryMethod = queryMethod;
+		}
+
+		AggregationExecutionCodeBlockBuilder referencing(String aggregationVariableName) {
+
+			this.aggregationVariableName = aggregationVariableName;
+			return this;
+		}
+
+		CodeBlock build() {
+
+			String mongoOpsRef = context.fieldNameOf(MongoOperations.class);
+			Builder builder = CodeBlock.builder();
+
+			builder.add("\n");
+
+			Class<?> outputType = queryMethod.getReturnedObjectType();
+			if (MongoSimpleTypes.HOLDER.isSimpleType(outputType)) {
+				outputType = Document.class;
+			} else if (ClassUtils.isAssignable(AggregationResults.class, outputType)) {
+				outputType = queryMethod.getReturnType().getComponentType().getType();
+			}
+
+			if (ReflectionUtils.isVoid(queryMethod.getReturnedObjectType())) {
+				builder.addStatement("$L.aggregate($L, $T.class)", mongoOpsRef, aggregationVariableName, outputType);
+				return builder.build();
+			}
+
+			if (ClassUtils.isAssignable(AggregationResults.class, context.getMethod().getReturnType())) {
+				builder.addStatement("return $L.aggregate($L, $T.class)", mongoOpsRef, aggregationVariableName, outputType);
+				return builder.build();
+			}
+
+			if (outputType == Document.class) {
+
+				Class<?> returnType = ClassUtils.resolvePrimitiveIfNecessary(queryMethod.getReturnedObjectType());
+
+				if (queryMethod.isStreamQuery()) {
+
+					builder.addStatement("$T<$T> $L = $L.aggregateStream($L, $T.class)", Stream.class, Document.class,
+							context.localVariable("results"), mongoOpsRef, aggregationVariableName, outputType);
+
+					builder.addStatement("return $L.map(it -> ($T) convertSimpleRawResult($T.class, it))",
+							context.localVariable("results"), returnType, returnType);
+				} else {
+
+					builder.addStatement("$T $L = $L.aggregate($L, $T.class)", AggregationResults.class,
+							context.localVariable("results"), mongoOpsRef, aggregationVariableName, outputType);
+
+					if (!queryMethod.isCollectionQuery()) {
+						builder.addStatement("return $T.<$T>firstElement(convertSimpleRawResults($T.class, $L.getMappedResults()))",
+								CollectionUtils.class, returnType, returnType, context.localVariable("results"));
+					} else {
+						builder.addStatement("return convertSimpleRawResults($T.class, $L.getMappedResults())", returnType,
+								context.localVariable("results"));
+					}
+				}
+			} else {
+				if (queryMethod.isSliceQuery()) {
+					builder.addStatement("$T $L = $L.aggregate($L, $T.class)", AggregationResults.class,
+							context.localVariable("results"), mongoOpsRef, aggregationVariableName, outputType);
+					builder.addStatement("boolean $L = $L.getMappedResults().size() > $L.getPageSize()",
+							context.localVariable("hasNext"), context.localVariable("results"), context.getPageableParameterName());
+					builder.addStatement(
+							"return new $T<>($L ? $L.getMappedResults().subList(0, $L.getPageSize()) : $L.getMappedResults(), $L, $L)",
+							SliceImpl.class, context.localVariable("hasNext"), context.localVariable("results"),
+							context.getPageableParameterName(), context.localVariable("results"), context.getPageableParameterName(),
+							context.localVariable("hasNext"));
+				} else {
+
+					if (queryMethod.isStreamQuery()) {
+						builder.addStatement("return $L.aggregateStream($L, $T.class)", mongoOpsRef, aggregationVariableName,
+								outputType);
+					} else {
+
+						builder.addStatement("return $L.aggregate($L, $T.class).getMappedResults()", mongoOpsRef,
+								aggregationVariableName, outputType);
+					}
+				}
+			}
+
+			return builder.build();
+		}
+	}
+
+	@NullUnmarked
+	static class QueryExecutionCodeBlockBuilder {
+
+		private final AotQueryMethodGenerationContext context;
+		private final MongoQueryMethod queryMethod;
+		private QueryInteraction query;
+
+		QueryExecutionCodeBlockBuilder(AotQueryMethodGenerationContext context, MongoQueryMethod queryMethod) {
+
+			this.context = context;
+			this.queryMethod = queryMethod;
+		}
+
+		QueryExecutionCodeBlockBuilder forQuery(QueryInteraction query) {
+
+			this.query = query;
+			return this;
+		}
+
+		CodeBlock build() {
+
+			String mongoOpsRef = context.fieldNameOf(MongoOperations.class);
+
+			Builder builder = CodeBlock.builder();
+
+			boolean isProjecting = context.getReturnedType().isProjecting();
+			Class<?> domainType = context.getRepositoryInformation().getDomainType();
+			Object actualReturnType = queryMethod.getParameters().hasDynamicProjection() || isProjecting
+					? TypeName.get(context.getActualReturnType().getType())
+					: domainType;
+
+			builder.add("\n");
+
+			if (queryMethod.getParameters().hasDynamicProjection()) {
+				builder.addStatement("$T<$T> $L = $L.query($T.class).as($L)", FindWithQuery.class, actualReturnType,
+						context.localVariable("finder"), mongoOpsRef, domainType, context.getDynamicProjectionParameterName());
+			} else if (isProjecting) {
+				builder.addStatement("$T<$T> $L = $L.query($T.class).as($T.class)", FindWithQuery.class, actualReturnType,
+						context.localVariable("finder"), mongoOpsRef, domainType, actualReturnType);
+			} else {
+
+				builder.addStatement("$T<$T> $L = $L.query($T.class)", FindWithQuery.class, actualReturnType,
+						context.localVariable("finder"), mongoOpsRef, domainType);
+			}
+
+			String terminatingMethod;
+
+			if (queryMethod.isCollectionQuery() || queryMethod.isPageQuery() || queryMethod.isSliceQuery()) {
+				terminatingMethod = "all()";
+			} else if (query.isCount()) {
+				terminatingMethod = "count()";
+			} else if (query.isExists()) {
+				terminatingMethod = "exists()";
+			} else if (queryMethod.isStreamQuery()) {
+				terminatingMethod = "stream()";
+			} else {
+				terminatingMethod = Optional.class.isAssignableFrom(context.getReturnType().toClass()) ? "one()" : "oneValue()";
+			}
+
+			if (queryMethod.isPageQuery()) {
+				builder.addStatement("return new $T($L, $L).execute($L)", PagedExecution.class, context.localVariable("finder"),
+						context.getPageableParameterName(), query.name());
+			} else if (queryMethod.isSliceQuery()) {
+				builder.addStatement("return new $T($L, $L).execute($L)", SlicedExecution.class,
+						context.localVariable("finder"), context.getPageableParameterName(), query.name());
+			} else if (queryMethod.isScrollQuery()) {
+
+				String scrollPositionParameterName = context.getScrollPositionParameterName();
+
+				builder.addStatement("return $L.matching($L).scroll($L)", context.localVariable("finder"), query.name(),
+						scrollPositionParameterName);
+			} else {
+				if (query.isCount() && !ClassUtils.isAssignable(Long.class, context.getActualReturnType().getRawClass())) {
+
+					Class<?> returnType = ClassUtils.resolvePrimitiveIfNecessary(queryMethod.getReturnedObjectType());
+					builder.addStatement("return $T.convertNumberToTargetClass($L.matching($L).$L, $T.class)", NumberUtils.class,
+							context.localVariable("finder"), query.name(), terminatingMethod, returnType);
+
+				} else {
+					builder.addStatement("return $L.matching($L).$L", context.localVariable("finder"), query.name(),
+							terminatingMethod);
+				}
+			}
+
+			return builder.build();
+		}
+	}
+
+	@NullUnmarked
+	static class AggregationCodeBlockBuilder {
+
+		private final AotQueryMethodGenerationContext context;
+		private final MongoQueryMethod queryMethod;
+
+		private AggregationInteraction source;
+		private final List<String> arguments;
+		private String aggregationVariableName;
+		private boolean pipelineOnly;
+
+		AggregationCodeBlockBuilder(AotQueryMethodGenerationContext context, MongoQueryMethod queryMethod) {
+
+			this.context = context;
+			this.arguments = context.getBindableParameterNames();
+			this.queryMethod = queryMethod;
+		}
+
+		AggregationCodeBlockBuilder stages(AggregationInteraction aggregation) {
+
+			this.source = aggregation;
+			return this;
+		}
+
+		AggregationCodeBlockBuilder usingAggregationVariableName(String aggregationVariableName) {
+
+			this.aggregationVariableName = aggregationVariableName;
+			return this;
+		}
+
+		AggregationCodeBlockBuilder pipelineOnly(boolean pipelineOnly) {
+
+			this.pipelineOnly = pipelineOnly;
+			return this;
+		}
+
+		CodeBlock build() {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+			builder.add("\n");
+
+			String pipelineName = context.localVariable(aggregationVariableName + (pipelineOnly ? "" : "Pipeline"));
+			builder.add(pipeline(pipelineName));
+
+			if (!pipelineOnly) {
+
+				builder.addStatement("$T<$T> $L = $T.newAggregation($T.class, $L.getOperations())", TypedAggregation.class,
+						context.getRepositoryInformation().getDomainType(), aggregationVariableName, Aggregation.class,
+						context.getRepositoryInformation().getDomainType(), pipelineName);
+
+				builder.add(aggregationOptions(aggregationVariableName));
+			}
+
+			return builder.build();
+		}
+
+		private CodeBlock pipeline(String pipelineVariableName) {
+
+			String sortParameter = context.getSortParameterName();
+			String limitParameter = context.getLimitParameterName();
+			String pageableParameter = context.getPageableParameterName();
+
+			boolean mightBeSorted = StringUtils.hasText(sortParameter);
+			boolean mightBeLimited = StringUtils.hasText(limitParameter);
+			boolean mightBePaged = StringUtils.hasText(pageableParameter);
+
+			int stageCount = source.stages().size();
+			if (mightBeSorted) {
+				stageCount++;
+			}
+			if (mightBeLimited) {
+				stageCount++;
+			}
+			if (mightBePaged) {
+				stageCount += 3;
+			}
+
+			Builder builder = CodeBlock.builder();
+			builder.add(aggregationStages(context.localVariable("stages"), source.stages(), stageCount, arguments));
+
+			if (mightBeSorted) {
+				builder.add(sortingStage(sortParameter));
+			}
+
+			if (mightBeLimited) {
+				builder.add(limitingStage(limitParameter));
+			}
+
+			if (mightBePaged) {
+				builder.add(pagingStage(pageableParameter, queryMethod.isSliceQuery()));
+			}
+
+			builder.addStatement("$T $L = createPipeline($L)", AggregationPipeline.class, pipelineVariableName,
+					context.localVariable("stages"));
+			return builder.build();
+		}
+
+		private CodeBlock aggregationOptions(String aggregationVariableName) {
+
+			Builder builder = CodeBlock.builder();
+			List<CodeBlock> options = new ArrayList<>(5);
+			if (ReflectionUtils.isVoid(queryMethod.getReturnedObjectType())) {
+				options.add(CodeBlock.of(".skipOutput()"));
+			}
+
+			MergedAnnotation<Hint> hintAnnotation = context.getAnnotation(Hint.class);
+			String hint = hintAnnotation.isPresent() ? hintAnnotation.getString("value") : null;
+			if (StringUtils.hasText(hint)) {
+				options.add(CodeBlock.of(".hint($S)", hint));
+			}
+
+			MergedAnnotation<ReadPreference> readPreferenceAnnotation = context.getAnnotation(ReadPreference.class);
+			String readPreference = readPreferenceAnnotation.isPresent() ? readPreferenceAnnotation.getString("value") : null;
+			if (StringUtils.hasText(readPreference)) {
+				options.add(CodeBlock.of(".readPreference($T.valueOf($S))", com.mongodb.ReadPreference.class, readPreference));
+			}
+
+			if (queryMethod.hasAnnotatedCollation()) {
+				options.add(CodeBlock.of(".collation($T.parse($S))", Collation.class, queryMethod.getAnnotatedCollation()));
+			}
+
+			if (!options.isEmpty()) {
+
+				Builder optionsBuilder = CodeBlock.builder();
+				optionsBuilder.add("$T $L = $T.builder()\n", AggregationOptions.class,
+						context.localVariable("aggregationOptions"), AggregationOptions.class);
+				optionsBuilder.indent();
+				for (CodeBlock optionBlock : options) {
+					optionsBuilder.add(optionBlock);
+					optionsBuilder.add("\n");
+				}
+				optionsBuilder.add(".build();\n");
+				optionsBuilder.unindent();
+				builder.add(optionsBuilder.build());
+
+				builder.addStatement("$L = $L.withOptions($L)", aggregationVariableName, aggregationVariableName,
+						context.localVariable("aggregationOptions"));
+			}
+			return builder.build();
+		}
+
+		private CodeBlock aggregationStages(String stageListVariableName, Iterable<String> stages, int stageCount,
+				List<String> arguments) {
+
+			Builder builder = CodeBlock.builder();
+			builder.addStatement("$T<$T> $L = new $T($L)", List.class, Object.class, stageListVariableName, ArrayList.class,
+					stageCount);
+			int stageCounter = 0;
+
+			for (String stage : stages) {
+				String stageName = context.localVariable("stage_%s".formatted(stageCounter++));
+				builder.add(renderExpressionToDocument(stage, stageName, arguments));
+				builder.addStatement("$L.add($L)", context.localVariable("stages"), stageName);
+			}
+
+			return builder.build();
+		}
+
+		private CodeBlock sortingStage(String sortProvider) {
+
+			Builder builder = CodeBlock.builder();
+
+			builder.beginControlFlow("if ($L.isSorted())", sortProvider);
+			builder.addStatement("$T $L = new $T()", Document.class, context.localVariable("sortDocument"), Document.class);
+			builder.beginControlFlow("for ($T $L : $L)", Order.class, context.localVariable("order"), sortProvider);
+			builder.addStatement("$L.append($L.getProperty(), $L.isAscending() ? 1 : -1);",
+					context.localVariable("sortDocument"), context.localVariable("order"), context.localVariable("order"));
+			builder.endControlFlow();
+			builder.addStatement("stages.add(new $T($S, $L))", Document.class, "$sort",
+					context.localVariable("sortDocument"));
+			builder.endControlFlow();
+
+			return builder.build();
+		}
+
+		private CodeBlock pagingStage(String pageableProvider, boolean slice) {
+
+			Builder builder = CodeBlock.builder();
+
+			builder.add(sortingStage(pageableProvider + ".getSort()"));
+
+			builder.beginControlFlow("if ($L.isPaged())", pageableProvider);
+			builder.beginControlFlow("if ($L.getOffset() > 0)", pageableProvider);
+			builder.addStatement("$L.add($T.skip($L.getOffset()))", context.localVariable("stages"), Aggregation.class,
+					pageableProvider);
+			builder.endControlFlow();
+			if (slice) {
+				builder.addStatement("$L.add($T.limit($L.getPageSize() + 1))", context.localVariable("stages"),
+						Aggregation.class, pageableProvider);
+			} else {
+				builder.addStatement("$L.add($T.limit($L.getPageSize()))", context.localVariable("stages"), Aggregation.class,
+						pageableProvider);
+			}
+			builder.endControlFlow();
+
+			return builder.build();
+		}
+
+		private CodeBlock limitingStage(String limitProvider) {
+
+			Builder builder = CodeBlock.builder();
+
+			builder.beginControlFlow("if ($L.isLimited())", limitProvider);
+			builder.addStatement("$L.add($T.limit($L.max()))", context.localVariable("stages"), Aggregation.class,
+					limitProvider);
+			builder.endControlFlow();
+
+			return builder.build();
+		}
+
+	}
+
+	@NullUnmarked
+	static class QueryCodeBlockBuilder {
+
+		private final AotQueryMethodGenerationContext context;
+		private final MongoQueryMethod queryMethod;
+
+		private QueryInteraction source;
+		private final List<String> arguments;
+		private String queryVariableName;
+
+		QueryCodeBlockBuilder(AotQueryMethodGenerationContext context, MongoQueryMethod queryMethod) {
+
+			this.context = context;
+			this.arguments = context.getBindableParameterNames();
+			this.queryMethod = queryMethod;
+		}
+
+		QueryCodeBlockBuilder filter(QueryInteraction query) {
+
+			this.source = query;
+			return this;
+		}
+
+		QueryCodeBlockBuilder usingQueryVariableName(String queryVariableName) {
+			this.queryVariableName = queryVariableName;
+			return this;
+		}
+
+		CodeBlock build() {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+
+			builder.add("\n");
+			builder.add(renderExpressionToQuery(source.getQuery().getQueryString(), queryVariableName));
+
+			if (StringUtils.hasText(source.getQuery().getFieldsString())) {
+
+				builder.add(renderExpressionToDocument(source.getQuery().getFieldsString(), "fields", arguments));
+				builder.addStatement("$L.setFieldsObject(fields)", queryVariableName);
+			}
+
+			String sortParameter = context.getSortParameterName();
+			if (StringUtils.hasText(sortParameter)) {
+				builder.addStatement("$L.with($L)", queryVariableName, sortParameter);
+			} else if (StringUtils.hasText(source.getQuery().getSortString())) {
+
+				builder.add(renderExpressionToDocument(source.getQuery().getSortString(), "sort", arguments));
+				builder.addStatement("$L.setSortObject(sort)", queryVariableName);
+			}
+
+			String limitParameter = context.getLimitParameterName();
+			if (StringUtils.hasText(limitParameter)) {
+				builder.addStatement("$L.limit($L)", queryVariableName, limitParameter);
+			} else if (context.getPageableParameterName() == null && source.getQuery().isLimited()) {
+				builder.addStatement("$L.limit($L)", queryVariableName, source.getQuery().getLimit());
+			}
+
+			String pageableParameter = context.getPageableParameterName();
+			if (StringUtils.hasText(pageableParameter) && !queryMethod.isPageQuery() && !queryMethod.isSliceQuery()) {
+				builder.addStatement("$L.with($L)", queryVariableName, pageableParameter);
+			}
+
+			MergedAnnotation<Hint> hintAnnotation = context.getAnnotation(Hint.class);
+			String hint = hintAnnotation.isPresent() ? hintAnnotation.getString("value") : null;
+
+			if (StringUtils.hasText(hint)) {
+				builder.addStatement("$L.withHint($S)", queryVariableName, hint);
+			}
+
+			MergedAnnotation<ReadPreference> readPreferenceAnnotation = context.getAnnotation(ReadPreference.class);
+			String readPreference = readPreferenceAnnotation.isPresent() ? readPreferenceAnnotation.getString("value") : null;
+
+			if (StringUtils.hasText(readPreference)) {
+				builder.addStatement("$L.withReadPreference($T.valueOf($S))", queryVariableName,
+						com.mongodb.ReadPreference.class, readPreference);
+			}
+
+			MergedAnnotation<Meta> metaAnnotation = context.getAnnotation(Meta.class);
+
+			if (metaAnnotation.isPresent()) {
+
+				long maxExecutionTimeMs = metaAnnotation.getLong("maxExecutionTimeMs");
+				if (maxExecutionTimeMs != -1) {
+					builder.addStatement("$L.maxTimeMsec($L)", queryVariableName, maxExecutionTimeMs);
+				}
+
+				int cursorBatchSize = metaAnnotation.getInt("cursorBatchSize");
+				if (cursorBatchSize != 0) {
+					builder.addStatement("$L.cursorBatchSize($L)", queryVariableName, cursorBatchSize);
+				}
+
+				String comment = metaAnnotation.getString("comment");
+				if (StringUtils.hasText("comment")) {
+					builder.addStatement("$L.comment($S)", queryVariableName, comment);
+				}
+			}
+
+			// TODO: Meta annotation: Disk usage
+
+			return builder.build();
+		}
+
+		private CodeBlock renderExpressionToQuery(@Nullable String source, String variableName) {
+
+			Builder builder = CodeBlock.builder();
+			if (!StringUtils.hasText(source)) {
+
+				builder.addStatement("$T $L = new $T(new $T())", BasicQuery.class, variableName, BasicQuery.class,
+						Document.class);
+			} else if (!containsPlaceholder(source)) {
+				builder.addStatement("$T $L = new $T($T.parse($S))", BasicQuery.class, variableName, BasicQuery.class,
+						Document.class, source);
+			} else {
+				builder.addStatement("$T $L = createQuery($S, new $T[]{ $L })", BasicQuery.class, variableName, source,
+						Object.class, StringUtils.collectionToDelimitedString(arguments, ", "));
+			}
+
+			return builder.build();
+		}
+	}
+
+	@NullUnmarked
+	static class UpdateCodeBlockBuilder {
+
+		private UpdateInteraction source;
+		private List<String> arguments;
+		private String updateVariableName;
+
+		public UpdateCodeBlockBuilder(AotQueryMethodGenerationContext context, MongoQueryMethod queryMethod) {
+			this.arguments = context.getBindableParameterNames();
+		}
+
+		public UpdateCodeBlockBuilder update(UpdateInteraction update) {
+			this.source = update;
+			return this;
+		}
+
+		public UpdateCodeBlockBuilder usingUpdateVariableName(String updateVariableName) {
+			this.updateVariableName = updateVariableName;
+			return this;
+		}
+
+		CodeBlock build() {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+
+			builder.add("\n");
+			String tmpVariableName = updateVariableName + "Document";
+			builder.add(renderExpressionToDocument(source.getUpdate().getUpdateString(), tmpVariableName, arguments));
+			builder.addStatement("$T $L = new $T($L)", BasicUpdate.class, updateVariableName, BasicUpdate.class,
+					tmpVariableName);
+
+			return builder.build();
+		}
+	}
+
+	private static CodeBlock renderExpressionToDocument(@Nullable String source, String variableName,
+			List<String> arguments) {
+
+		Builder builder = CodeBlock.builder();
+		if (!StringUtils.hasText(source)) {
+			builder.addStatement("$T $L = new $T()", Document.class, variableName, Document.class);
+		} else if (!containsPlaceholder(source)) {
+			builder.addStatement("$T $L = $T.parse($S)", Document.class, variableName, Document.class, source);
+		} else {
+			builder.addStatement("$T $L = bindParameters($S, new $T[]{ $L })", Document.class, variableName, source,
+					Object.class, StringUtils.collectionToDelimitedString(arguments, ", "));
+		}
+		return builder.build();
+	}
+
+	private static boolean containsPlaceholder(String source) {
+		return PARAMETER_BINDING_PATTERN.matcher(source).find();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoInteraction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoInteraction.java
new file mode 100644
index 0000000000..fa9ca2f99e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoInteraction.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+/**
+ * Base abstraction for interactions with MongoDB.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+abstract class MongoInteraction {
+
+	abstract InteractionType getExecutionType();
+
+	boolean isAggregation() {
+		return InteractionType.AGGREGATION.equals(getExecutionType());
+	}
+
+	boolean isCount() {
+		return InteractionType.COUNT.equals(getExecutionType());
+	}
+
+	boolean isDelete() {
+		return InteractionType.DELETE.equals(getExecutionType());
+	}
+
+	boolean isExists() {
+		return InteractionType.EXISTS.equals(getExecutionType());
+	}
+
+	boolean isUpdate() {
+		return InteractionType.UPDATE.equals(getExecutionType());
+	}
+
+	String name() {
+
+		if (isDelete()) {
+			return "deleteQuery";
+		}
+		if (isCount()) {
+			return "countQuery";
+		}
+		return "filterQuery";
+	}
+
+	enum InteractionType {
+		QUERY, COUNT, DELETE, EXISTS, UPDATE, AGGREGATION
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributor.java
new file mode 100644
index 0000000000..424d067d74
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributor.java
@@ -0,0 +1,283 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import static org.springframework.data.mongodb.repository.aot.MongoCodeBlocks.*;
+
+import java.lang.reflect.Method;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jspecify.annotations.Nullable;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.Query;
+import org.springframework.data.mongodb.repository.Update;
+import org.springframework.data.mongodb.repository.query.MongoQueryMethod;
+import org.springframework.data.repository.aot.generate.AotRepositoryClassBuilder;
+import org.springframework.data.repository.aot.generate.AotRepositoryConstructorBuilder;
+import org.springframework.data.repository.aot.generate.MethodContributor;
+import org.springframework.data.repository.aot.generate.RepositoryContributor;
+import org.springframework.data.repository.config.AotRepositoryContext;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
+import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.javapoet.CodeBlock;
+import org.springframework.javapoet.TypeName;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * MongoDB specific {@link RepositoryContributor}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class MongoRepositoryContributor extends RepositoryContributor {
+
+	private static final Log logger = LogFactory.getLog(MongoRepositoryContributor.class);
+
+	private final AotQueryCreator queryCreator;
+	private final MongoMappingContext mappingContext;
+
+	public MongoRepositoryContributor(AotRepositoryContext repositoryContext) {
+
+		super(repositoryContext);
+		this.queryCreator = new AotQueryCreator();
+		this.mappingContext = new MongoMappingContext();
+	}
+
+	@Override
+	protected void customizeClass(AotRepositoryClassBuilder classBuilder) {
+		classBuilder.customize(builder -> builder.superclass(TypeName.get(MongoAotRepositoryFragmentSupport.class)));
+	}
+
+	@Override
+	protected void customizeConstructor(AotRepositoryConstructorBuilder constructorBuilder) {
+
+		constructorBuilder.addParameter("operations", TypeName.get(MongoOperations.class));
+		constructorBuilder.addParameter("context", TypeName.get(RepositoryFactoryBeanSupport.FragmentCreationContext.class),
+				false);
+
+		constructorBuilder.customize((builder) -> {
+			builder.addStatement("super(operations, context)");
+		});
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	protected @Nullable MethodContributor<? extends QueryMethod> contributeQueryMethod(Method method) {
+
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, getRepositoryInformation(), getProjectionFactory(),
+				mappingContext);
+
+		if (queryMethod.hasAnnotatedAggregation()) {
+			AggregationInteraction aggregation = new AggregationInteraction(queryMethod.getAnnotatedAggregation());
+			return aggregationMethodContributor(queryMethod, aggregation);
+		}
+
+		QueryInteraction query = createStringQuery(getRepositoryInformation(), queryMethod,
+				AnnotatedElementUtils.findMergedAnnotation(method, Query.class), method.getParameterCount());
+
+		if (queryMethod.hasAnnotatedQuery()) {
+			if (StringUtils.hasText(queryMethod.getAnnotatedQuery())
+					&& Pattern.compile("[\\?:][#$]\\{.*\\}").matcher(queryMethod.getAnnotatedQuery()).find()) {
+
+				if (logger.isDebugEnabled()) {
+					logger.debug(
+							"Skipping AOT generation for [%s]. SpEL expressions are not supported".formatted(method.getName()));
+				}
+				return MethodContributor.forQueryMethod(queryMethod).metadataOnly(query);
+			}
+		}
+
+		if (backoff(queryMethod)) {
+			return null;
+		}
+
+		if (query.isDelete()) {
+			return deleteMethodContributor(queryMethod, query);
+		}
+
+		if (queryMethod.isModifyingQuery()) {
+
+			int updateIndex = queryMethod.getParameters().getUpdateIndex();
+			if (updateIndex != -1) {
+
+				UpdateInteraction update = new UpdateInteraction(query, null, updateIndex);
+				return updateMethodContributor(queryMethod, update);
+
+			} else {
+				Update updateSource = queryMethod.getUpdateSource();
+				if (StringUtils.hasText(updateSource.value())) {
+					UpdateInteraction update = new UpdateInteraction(query, new StringUpdate(updateSource.value()), null);
+					return updateMethodContributor(queryMethod, update);
+				}
+
+				if (!ObjectUtils.isEmpty(updateSource.pipeline())) {
+					AggregationUpdateInteraction update = new AggregationUpdateInteraction(query, updateSource.pipeline());
+					return aggregationUpdateMethodContributor(queryMethod, update);
+				}
+			}
+		}
+
+		return queryMethodContributor(queryMethod, query);
+	}
+
+	@SuppressWarnings("NullAway")
+	private QueryInteraction createStringQuery(RepositoryInformation repositoryInformation, MongoQueryMethod queryMethod,
+			@Nullable Query queryAnnotation, int parameterCount) {
+
+		QueryInteraction query;
+		if (queryMethod.hasAnnotatedQuery() && queryAnnotation != null) {
+			query = new QueryInteraction(new StringQuery(queryMethod.getAnnotatedQuery()), queryAnnotation.count(),
+					queryAnnotation.delete(), queryAnnotation.exists());
+		} else {
+
+			PartTree partTree = new PartTree(queryMethod.getName(), repositoryInformation.getDomainType());
+			query = new QueryInteraction(queryCreator.createQuery(partTree, parameterCount), partTree.isCountProjection(),
+					partTree.isDelete(), partTree.isExistsProjection());
+		}
+
+		if (queryAnnotation != null && StringUtils.hasText(queryAnnotation.sort())) {
+			query = query.withSort(queryAnnotation.sort());
+		}
+		if (queryAnnotation != null && StringUtils.hasText(queryAnnotation.fields())) {
+			query = query.withFields(queryAnnotation.fields());
+		}
+
+		return query;
+	}
+
+	private static boolean backoff(MongoQueryMethod method) {
+
+		// TODO: namedQuery, Regex queries, queries accepting Shapes (e.g. within) or returning arrays.
+		boolean skip = method.isGeoNearQuery() || method.isSearchQuery()
+				|| method.getName().toLowerCase(Locale.ROOT).contains("regex") || method.getReturnType().getType().isArray();
+
+		if (skip && logger.isDebugEnabled()) {
+			logger.debug("Skipping AOT generation for [%s]. Method is either returning an array or a geo-near, regex query"
+					.formatted(method.getName()));
+		}
+		return skip;
+	}
+
+	private static MethodContributor<MongoQueryMethod> aggregationMethodContributor(MongoQueryMethod queryMethod,
+			AggregationInteraction aggregation) {
+
+		return MethodContributor.forQueryMethod(queryMethod).withMetadata(aggregation).contribute(context -> {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+
+			builder.add(aggregationBlockBuilder(context, queryMethod).stages(aggregation)
+					.usingAggregationVariableName("aggregation").build());
+			builder.add(aggregationExecutionBlockBuilder(context, queryMethod).referencing("aggregation").build());
+
+			return builder.build();
+		});
+	}
+
+	private static MethodContributor<MongoQueryMethod> updateMethodContributor(MongoQueryMethod queryMethod,
+			UpdateInteraction update) {
+
+		return MethodContributor.forQueryMethod(queryMethod).withMetadata(update).contribute(context -> {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+
+			// update filter
+			String filterVariableName = context.localVariable(update.name());
+			builder.add(queryBlockBuilder(context, queryMethod).filter(update.getFilter())
+					.usingQueryVariableName(filterVariableName).build());
+
+			// update definition
+			String updateVariableName;
+
+			if (update.hasUpdateDefinitionParameter()) {
+				updateVariableName = context.getParameterName(update.getRequiredUpdateDefinitionParameter());
+			} else {
+				updateVariableName = context.localVariable("updateDefinition");
+				builder.add(updateBlockBuilder(context, queryMethod).update(update).usingUpdateVariableName(updateVariableName)
+						.build());
+			}
+
+			builder.add(updateExecutionBlockBuilder(context, queryMethod).withFilter(filterVariableName)
+					.referencingUpdate(updateVariableName).build());
+			return builder.build();
+		});
+	}
+
+	private static MethodContributor<MongoQueryMethod> aggregationUpdateMethodContributor(MongoQueryMethod queryMethod,
+			AggregationUpdateInteraction update) {
+
+		return MethodContributor.forQueryMethod(queryMethod).withMetadata(update).contribute(context -> {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+
+			// update filter
+			String filterVariableName = context.localVariable(update.name());
+			QueryCodeBlockBuilder queryCodeBlockBuilder = queryBlockBuilder(context, queryMethod).filter(update.getFilter());
+			builder.add(queryCodeBlockBuilder.usingQueryVariableName(filterVariableName).build());
+
+			// update definition
+			String updateVariableName = "updateDefinition";
+			builder.add(aggregationBlockBuilder(context, queryMethod).stages(update)
+					.usingAggregationVariableName(updateVariableName).pipelineOnly(true).build());
+
+			builder.addStatement("$T $L = $T.from($L.getOperations())", AggregationUpdate.class,
+					context.localVariable("aggregationUpdate"), AggregationUpdate.class, updateVariableName);
+
+			builder.add(updateExecutionBlockBuilder(context, queryMethod).withFilter(filterVariableName)
+					.referencingUpdate(context.localVariable("aggregationUpdate")).build());
+			return builder.build();
+		});
+	}
+
+	private static MethodContributor<MongoQueryMethod> deleteMethodContributor(MongoQueryMethod queryMethod,
+			QueryInteraction query) {
+
+		return MethodContributor.forQueryMethod(queryMethod).withMetadata(query).contribute(context -> {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+			QueryCodeBlockBuilder queryCodeBlockBuilder = queryBlockBuilder(context, queryMethod).filter(query);
+
+			String queryVariableName = context.localVariable(query.name());
+			builder.add(queryCodeBlockBuilder.usingQueryVariableName(queryVariableName).build());
+			builder.add(deleteExecutionBlockBuilder(context, queryMethod).referencing(queryVariableName).build());
+			return builder.build();
+		});
+	}
+
+	private static MethodContributor<MongoQueryMethod> queryMethodContributor(MongoQueryMethod queryMethod,
+			QueryInteraction query) {
+
+		return MethodContributor.forQueryMethod(queryMethod).withMetadata(query).contribute(context -> {
+
+			CodeBlock.Builder builder = CodeBlock.builder();
+			QueryCodeBlockBuilder queryCodeBlockBuilder = queryBlockBuilder(context, queryMethod).filter(query);
+
+			builder.add(queryCodeBlockBuilder.usingQueryVariableName(context.localVariable(query.name())).build());
+			builder.add(queryExecutionBlockBuilder(context, queryMethod).forQuery(query).build());
+			return builder.build();
+		});
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/QueryInteraction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/QueryInteraction.java
new file mode 100644
index 0000000000..563079c03b
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/QueryInteraction.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.springframework.data.repository.aot.generate.QueryMetadata;
+import org.springframework.util.StringUtils;
+
+/**
+ * An {@link MongoInteraction} to execute a query.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+class QueryInteraction extends MongoInteraction implements QueryMetadata {
+
+	private final StringQuery query;
+	private final InteractionType interactionType;
+
+	QueryInteraction(StringQuery query, boolean count, boolean delete, boolean exists) {
+
+		this.query = query;
+		if (count) {
+			interactionType = InteractionType.COUNT;
+		} else if (exists) {
+			interactionType = InteractionType.EXISTS;
+		} else if (delete) {
+			interactionType = InteractionType.DELETE;
+		} else {
+			interactionType = InteractionType.QUERY;
+		}
+	}
+
+	StringQuery getQuery() {
+		return query;
+	}
+
+	QueryInteraction withSort(String sort) {
+		query.sort(sort);
+		return this;
+	}
+
+	QueryInteraction withFields(String fields) {
+		query.fields(fields);
+		return this;
+	}
+
+	@Override
+	InteractionType getExecutionType() {
+		return interactionType;
+	}
+
+	@Override
+	public Map<String, Object> serialize() {
+
+		Map<String, Object> serialized = new LinkedHashMap<>();
+
+		serialized.put("filter", query.getQueryString());
+		if (query.isSorted()) {
+			serialized.put("sort", query.getSortString());
+		}
+		if (StringUtils.hasText(query.getFieldsString())) {
+			serialized.put("fields", query.getFieldsString());
+		}
+
+		return serialized;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/RepositoryRuntimeHints.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/RepositoryRuntimeHints.java
new file mode 100644
index 0000000000..00ff498731
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/RepositoryRuntimeHints.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2022-2025 the original author 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.repository.aot;
+
+import static org.springframework.data.mongodb.aot.MongoAotPredicates.*;
+
+import java.util.List;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.aot.hint.MemberCategory;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.data.mongodb.aot.MongoAotPredicates;
+import org.springframework.data.mongodb.repository.support.CrudMethodMetadata;
+import org.springframework.data.mongodb.repository.support.QuerydslMongoPredicateExecutor;
+import org.springframework.data.mongodb.repository.support.ReactiveQuerydslMongoPredicateExecutor;
+import org.springframework.data.querydsl.QuerydslUtils;
+import org.springframework.util.ClassUtils;
+
+/**
+ * @author Christoph Strobl
+ * @since 4.0
+ */
+class RepositoryRuntimeHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+
+		hints.reflection().registerTypes(
+				List.of(TypeReference.of("org.springframework.data.mongodb.repository.support.SimpleMongoRepository")),
+				builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+						MemberCategory.INVOKE_PUBLIC_METHODS));
+
+		if (isAopPresent(classLoader)) {
+
+			// required for pushing ReadPreference,... into the default repository implementation
+			hints.proxies().registerJdkProxy(CrudMethodMetadata.class, //
+					org.springframework.aop.SpringProxy.class, //
+					org.springframework.aop.framework.Advised.class, //
+					org.springframework.core.DecoratingProxy.class);
+		}
+
+		if (isReactorPresent()) {
+
+			hints.reflection().registerTypes(
+					List.of(
+							TypeReference.of("org.springframework.data.mongodb.repository.support.SimpleReactiveMongoRepository")),
+					builder -> builder.withMembers(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS,
+							MemberCategory.INVOKE_PUBLIC_METHODS));
+		}
+
+		if (QuerydslUtils.QUERY_DSL_PRESENT) {
+			registerQuerydslHints(hints, classLoader);
+		}
+	}
+
+	/**
+	 * Register hints for Querydsl integration.
+	 *
+	 * @param hints must not be {@literal null}.
+	 * @param classLoader can be {@literal null}.
+	 * @since 4.0.2
+	 */
+	private static void registerQuerydslHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+
+		if (isReactorPresent()) {
+			hints.reflection().registerType(ReactiveQuerydslMongoPredicateExecutor.class,
+					MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+
+		}
+
+		if (MongoAotPredicates.isSyncClientPresent(classLoader)) {
+			hints.reflection().registerType(QuerydslMongoPredicateExecutor.class, MemberCategory.INVOKE_PUBLIC_METHODS,
+					MemberCategory.INVOKE_DECLARED_CONSTRUCTORS);
+		}
+	}
+
+	private static boolean isAopPresent(@Nullable ClassLoader classLoader) {
+		return ClassUtils.isPresent("org.springframework.aop.Pointcut", classLoader);
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringAggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringAggregation.java
new file mode 100644
index 0000000000..7b73215e98
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringAggregation.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+/**
+ * Value object holding the raw representation of an Aggregation Pipeline.
+ * 
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+record StringAggregation(String[] pipeline) {
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringQuery.java
new file mode 100644
index 0000000000..d037198bba
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringQuery.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.Optional;
+import java.util.Set;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.Field;
+import org.springframework.data.mongodb.core.query.Meta;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+
+/**
+ * Helper to capture setting for AOT queries.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+class StringQuery extends Query {
+
+	private Query delegate;
+	private @Nullable String raw;
+	private @Nullable String sort;
+	private @Nullable String fields;
+
+	public StringQuery(Query query) {
+		this.delegate = query;
+	}
+
+	public StringQuery(String query) {
+		this.delegate = new Query();
+		this.raw = query;
+	}
+
+	@Nullable
+	String getQueryString() {
+
+		if (StringUtils.hasText(raw)) {
+			return raw;
+		}
+
+		Document queryObj = getQueryObject();
+		if (queryObj.isEmpty()) {
+			return null;
+		}
+		return toJson(queryObj);
+	}
+
+	public Query sort(String sort) {
+		this.sort = sort;
+		return this;
+	}
+
+	@Override
+	public Field fields() {
+		return delegate.fields();
+	}
+
+	@Override
+	public boolean hasReadConcern() {
+		return delegate.hasReadConcern();
+	}
+
+	@Override
+	public @Nullable ReadConcern getReadConcern() {
+		return delegate.getReadConcern();
+	}
+
+	@Override
+	public boolean hasReadPreference() {
+		return delegate.hasReadPreference();
+	}
+
+	@Override
+	public @Nullable ReadPreference getReadPreference() {
+		return delegate.getReadPreference();
+	}
+
+	@Override
+	public boolean hasKeyset() {
+		return delegate.hasKeyset();
+	}
+
+	@Override
+	public @Nullable KeysetScrollPosition getKeyset() {
+		return delegate.getKeyset();
+	}
+
+	@Override
+	public Set<Class<?>> getRestrictedTypes() {
+		return delegate.getRestrictedTypes();
+	}
+
+	@Override
+	public Document getQueryObject() {
+		return delegate.getQueryObject();
+	}
+
+	@Override
+	public Document getFieldsObject() {
+		return delegate.getFieldsObject();
+	}
+
+	@Override
+	public Document getSortObject() {
+		return delegate.getSortObject();
+	}
+
+	@Override
+	public boolean isSorted() {
+		return delegate.isSorted() || StringUtils.hasText(sort);
+	}
+
+	@Override
+	public long getSkip() {
+		return delegate.getSkip();
+	}
+
+	@Override
+	public boolean isLimited() {
+		return delegate.isLimited();
+	}
+
+	@Override
+	public int getLimit() {
+		return delegate.getLimit();
+	}
+
+	@Override
+	public @Nullable String getHint() {
+		return delegate.getHint();
+	}
+
+	@Override
+	public Meta getMeta() {
+		return delegate.getMeta();
+	}
+
+	@Override
+	public Optional<Collation> getCollation() {
+		return delegate.getCollation();
+	}
+
+	@Nullable
+	String getSortString() {
+		if (StringUtils.hasText(sort)) {
+			return sort;
+		}
+		Document sort = getSortObject();
+		if (sort.isEmpty()) {
+			return null;
+		}
+		return toJson(sort);
+	}
+
+	@Nullable
+	String getFieldsString() {
+		if (StringUtils.hasText(fields)) {
+			return fields;
+		}
+
+		Document fields = getFieldsObject();
+		if (fields.isEmpty()) {
+			return null;
+		}
+		return toJson(fields);
+	}
+
+	StringQuery fields(String fields) {
+		this.fields = fields;
+		return this;
+	}
+
+	String toJson(Document source) {
+		return BsonUtils.writeJson(source).toJsonString();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringUpdate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringUpdate.java
new file mode 100644
index 0000000000..f65ee7912f
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/StringUpdate.java
@@ -0,0 +1,27 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+/**
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+record StringUpdate(String raw) {
+
+	String getUpdateString() {
+		return raw;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/UpdateInteraction.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/UpdateInteraction.java
new file mode 100644
index 0000000000..525a4782a5
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/UpdateInteraction.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.util.Map;
+
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.repository.aot.generate.QueryMetadata;
+import org.springframework.util.Assert;
+
+/**
+ * An {@link MongoInteraction} to execute an update.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @since 5.0
+ */
+class UpdateInteraction extends MongoInteraction implements QueryMetadata {
+
+	private final QueryInteraction filter;
+	private final @Nullable StringUpdate update;
+	private final @Nullable Integer updateDefinitionParameter;
+
+	UpdateInteraction(QueryInteraction filter, @Nullable StringUpdate update,
+			@Nullable Integer updateDefinitionParameter) {
+		this.filter = filter;
+		this.update = update;
+		this.updateDefinitionParameter = updateDefinitionParameter;
+	}
+
+	public QueryInteraction getFilter() {
+		return filter;
+	}
+
+	public @Nullable StringUpdate getUpdate() {
+		return update;
+	}
+
+	public int getRequiredUpdateDefinitionParameter() {
+
+		Assert.notNull(updateDefinitionParameter, "UpdateDefinitionParameter must not be null!");
+
+		return updateDefinitionParameter;
+	}
+
+	public boolean hasUpdateDefinitionParameter() {
+		return updateDefinitionParameter != null;
+	}
+
+	@Override
+	public Map<String, Object> serialize() {
+
+		Map<String, Object> serialized = filter.serialize();
+
+		if (update != null) {
+			serialized.put("filter", filter.getQuery().getQueryString());
+			serialized.put("update", update.getUpdateString());
+		}
+
+		return serialized;
+	}
+
+	@Override
+	InteractionType getExecutionType() {
+		return InteractionType.UPDATE;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/package-info.java
new file mode 100644
index 0000000000..750cc38678
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/aot/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Ahead-Of-Time processors for MongoDB repositories.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.mongodb.repository.aot;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java
index 7134995e63..0b2515af52 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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.Optional;
 import java.util.Set;
 
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.context.spi.CreationalContext;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
@@ -54,14 +54,10 @@ public MongoRepositoryBean(Bean<MongoOperations> operations, Set<Annotation> qua
 
 		super(qualifiers, repositoryType, beanManager, detector);
 
-		Assert.notNull(operations, "MongoOperations bean must not be null!");
+		Assert.notNull(operations, "MongoOperations bean must not be null");
 		this.operations = operations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class)
-	 */
 	@Override
 	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java
index 8ffbf5de79..c74e9c3f2f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/MongoRepositoryExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,15 +24,16 @@
 import java.util.Optional;
 import java.util.Set;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessBean;
+import jakarta.enterprise.event.Observes;
+import jakarta.enterprise.inject.UnsatisfiedResolutionException;
+import jakarta.enterprise.inject.spi.AfterBeanDiscovery;
+import jakarta.enterprise.inject.spi.Bean;
+import jakarta.enterprise.inject.spi.BeanManager;
+import jakarta.enterprise.inject.spi.ProcessBean;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.repository.cdi.CdiRepositoryBean;
 import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
@@ -45,7 +46,7 @@
  */
 public class MongoRepositoryExtension extends CdiRepositoryExtensionSupport {
 
-	private static final Logger LOG = LoggerFactory.getLogger(MongoRepositoryExtension.class);
+	private static final Log LOG = LogFactory.getLog(MongoRepositoryExtension.class);
 
 	private final Map<Set<Annotation>, Bean<MongoOperations>> mongoOperations = new HashMap<Set<Annotation>, Bean<MongoOperations>>();
 
@@ -66,7 +67,7 @@ <X> void processBean(@Observes ProcessBean<X> processBean) {
 				}
 
 				// Store the EntityManager bean using its qualifiers.
-				mongoOperations.put(new HashSet<Annotation>(bean.getQualifiers()), (Bean<MongoOperations>) bean);
+				mongoOperations.put(new HashSet<>(bean.getQualifiers()), (Bean<MongoOperations>) bean);
 			}
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java
index a2cbf659dd..db7edc05bd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/cdi/package-info.java
@@ -1,6 +1,6 @@
 /**
  * CDI support for MongoDB specific repository implementation.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.repository.cdi;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java
index f74da9b406..b6f693e16d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableMongoRepositories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import java.lang.annotation.Target;
 
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -47,7 +48,8 @@
 
 	/**
 	 * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation declarations e.g.:
-	 * {@code @EnableMongoRepositories("org.my.pkg")} instead of {@code @EnableMongoRepositories(basePackages="org.my.pkg")}.
+	 * {@code @EnableMongoRepositories("org.my.pkg")} instead of
+	 * {@code @EnableMongoRepositories(basePackages="org.my.pkg")}.
 	 */
 	String[] value() default {};
 
@@ -80,7 +82,7 @@
 	 * for a repository named {@code PersonRepository} the corresponding implementation class will be looked up scanning
 	 * for {@code PersonRepositoryImpl}.
 	 *
-	 * @return
+	 * @return {@literal Impl} by default.
 	 */
 	String repositoryImplementationPostfix() default "Impl";
 
@@ -88,7 +90,7 @@
 	 * Configures the location of where to find the Spring Data named queries properties file. Will default to
 	 * {@code META-INFO/mongo-named-queries.properties}.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String namedQueriesLocation() default "";
 
@@ -96,7 +98,7 @@
 	 * Returns the key of the {@link QueryLookupStrategy} to be used for lookup queries for query methods. Defaults to
 	 * {@link Key#CREATE_IF_NOT_FOUND}.
 	 *
-	 * @return
+	 * @return {@link Key#CREATE_IF_NOT_FOUND} by default.
 	 */
 	Key queryLookupStrategy() default Key.CREATE_IF_NOT_FOUND;
 
@@ -104,35 +106,44 @@
 	 * Returns the {@link FactoryBean} class to be used for each repository instance. Defaults to
 	 * {@link MongoRepositoryFactoryBean}.
 	 *
-	 * @return
+	 * @return {@link MongoRepositoryFactoryBean} by default.
 	 */
 	Class<?> repositoryFactoryBeanClass() default MongoRepositoryFactoryBean.class;
 
 	/**
 	 * Configure the repository base class to be used to create repository proxies for this particular configuration.
 	 *
-	 * @return
+	 * @return {@link DefaultRepositoryBaseClass} by default.
 	 * @since 1.8
 	 */
 	Class<?> repositoryBaseClass() default DefaultRepositoryBaseClass.class;
 
+	/**
+	 * Configure a specific {@link BeanNameGenerator} to be used when creating the repository beans.
+	 * @return the {@link BeanNameGenerator} to be used or the base {@link BeanNameGenerator} interface to indicate context default.
+	 * @since 4.4
+	 */
+	Class<? extends BeanNameGenerator> nameGenerator() default BeanNameGenerator.class;
+
 	/**
 	 * Configures the name of the {@link MongoTemplate} bean to be used with the repositories detected.
 	 *
-	 * @return
+	 * @return {@literal mongoTemplate} by default.
 	 */
 	String mongoTemplateRef() default "mongoTemplate";
 
 	/**
 	 * Whether to automatically create indexes for query methods defined in the repository interface.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 */
 	boolean createIndexesForQueryMethods() default false;
 
 	/**
 	 * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the
 	 * repositories infrastructure.
+	 *
+	 * @return {@literal false} by default.
 	 */
 	boolean considerNestedRepositories() default false;
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableReactiveMongoRepositories.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableReactiveMongoRepositories.java
index ef653d8b2f..9973bc7bdf 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableReactiveMongoRepositories.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/EnableReactiveMongoRepositories.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,6 +24,7 @@
 import java.lang.annotation.Target;
 
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -84,7 +85,7 @@
 	 * for a repository named {@code PersonRepository} the corresponding implementation class will be looked up scanning
 	 * for {@code PersonRepositoryImpl}.
 	 *
-	 * @return
+	 * @return {@literal Impl} by default.
 	 */
 	String repositoryImplementationPostfix() default "Impl";
 
@@ -92,7 +93,7 @@
 	 * Configures the location of where to find the Spring Data named queries properties file. Will default to
 	 * {@code META-INF/mongo-named-queries.properties}.
 	 *
-	 * @return
+	 * @return empty {@link String} by default.
 	 */
 	String namedQueriesLocation() default "";
 
@@ -100,7 +101,7 @@
 	 * Returns the key of the {@link QueryLookupStrategy} to be used for lookup queries for query methods. Defaults to
 	 * {@link Key#CREATE_IF_NOT_FOUND}.
 	 *
-	 * @return
+	 * @return {@link Key#CREATE_IF_NOT_FOUND} by default.
 	 */
 	Key queryLookupStrategy() default Key.CREATE_IF_NOT_FOUND;
 
@@ -108,34 +109,43 @@
 	 * Returns the {@link FactoryBean} class to be used for each repository instance. Defaults to
 	 * {@link MongoRepositoryFactoryBean}.
 	 *
-	 * @return
+	 * @return {@link ReactiveMongoRepositoryFactoryBean} by default.
 	 */
 	Class<?> repositoryFactoryBeanClass() default ReactiveMongoRepositoryFactoryBean.class;
 
 	/**
 	 * Configure the repository base class to be used to create repository proxies for this particular configuration.
 	 *
-	 * @return
+	 * @return {@link DefaultRepositoryBaseClass} by default.
 	 */
 	Class<?> repositoryBaseClass() default DefaultRepositoryBaseClass.class;
 
+	/**
+	 * Configure a specific {@link BeanNameGenerator} to be used when creating the repository beans.
+	 * @return the {@link BeanNameGenerator} to be used or the base {@link BeanNameGenerator} interface to indicate context default.
+	 * @since 4.4
+	 */
+	Class<? extends BeanNameGenerator> nameGenerator() default BeanNameGenerator.class;
+
 	/**
 	 * Configures the name of the {@link MongoTemplate} bean to be used with the repositories detected.
 	 *
-	 * @return
+	 * @return {@literal reactiveMongoTemplate} by default.
 	 */
 	String reactiveMongoTemplateRef() default "reactiveMongoTemplate";
 
 	/**
 	 * Whether to automatically create indexes for query methods defined in the repository interface.
 	 *
-	 * @return
+	 * @return {@literal false} by default.
 	 */
 	boolean createIndexesForQueryMethods() default false;
 
 	/**
 	 * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the
 	 * repositories infrastructure.
+	 *
+	 * @return {@literal false} by default.
 	 */
 	boolean considerNestedRepositories() default false;
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java
index b7c378d477..508ca16f50 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,19 +28,11 @@
  */
 class MongoRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableMongoRepositories.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension()
-	 */
 	@Override
 	protected RepositoryConfigurationExtension getExtension() {
 		return new MongoRepositoryConfigurationExtension();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java
index 2929efcc16..2d852a0e07 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigNamespaceHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,10 +27,6 @@
  */
 public class MongoRepositoryConfigNamespaceHandler extends MongoNamespaceHandler {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.config.MongoNamespaceHandler#init()
-	 */
 	@Override
 	public void init() {
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java
index fa8b7df2cd..48b4000750 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,16 +19,20 @@
 import java.util.Collection;
 import java.util.Collections;
 
+import org.springframework.beans.factory.aot.BeanRegistrationAotProcessor;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.data.config.ParsingUtils;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.aot.AotMongoRepositoryPostProcessor;
 import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
+import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
 import org.springframework.data.repository.config.XmlRepositoryConfigurationSource;
 import org.springframework.data.repository.core.RepositoryMetadata;
+
 import org.w3c.dom.Element;
 
 /**
@@ -42,54 +46,46 @@ public class MongoRepositoryConfigurationExtension extends RepositoryConfigurati
 	private static final String MONGO_TEMPLATE_REF = "mongo-template-ref";
 	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName()
-	 */
 	@Override
 	public String getModuleName() {
 		return "MongoDB";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModulePrefix()
-	 */
 	@Override
-	protected String getModulePrefix() {
+	public String getModulePrefix() {
 		return "mongo";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryBeanClassName()
-	 */
+	@Override
+	public String getRepositoryBaseClassName() {
+		return SimpleMongoRepository.class.getName();
+	}
+
+	@Override
 	public String getRepositoryFactoryBeanClassName() {
 		return MongoRepositoryFactoryBean.class.getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingAnnotations()
-	 */
 	@Override
-	protected Collection<Class<? extends Annotation>> getIdentifyingAnnotations() {
+	public String getModuleIdentifier() {
+		return getModulePrefix();
+	}
+
+	@Override
+	public Collection<Class<? extends Annotation>> getIdentifyingAnnotations() {
 		return Collections.singleton(Document.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes()
-	 */
+	@Override
+	public Class<? extends BeanRegistrationAotProcessor> getRepositoryAotProcessor() {
+		return AotMongoRepositoryPostProcessor.class;
+	}
+
 	@Override
 	protected Collection<Class<?>> getIdentifyingTypes() {
 		return Collections.singleton(MongoRepository.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
-	 */
 	@Override
 	public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) {
 
@@ -99,10 +95,6 @@ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfiguratio
 		ParsingUtils.setPropertyValue(builder, element, CREATE_QUERY_INDEXES, "createIndexesForQueryMethods");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource)
-	 */
 	@Override
 	public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) {
 
@@ -112,10 +104,6 @@ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfi
 		builder.addPropertyValue("createIndexesForQueryMethods", attributes.getBoolean("createIndexesForQueryMethods"));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#useRepositoryConfiguration(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected boolean useRepositoryConfiguration(RepositoryMetadata metadata) {
 		return !metadata.isReactiveRepository();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java
index 35286eb71b..2c8384be93 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,19 +30,11 @@
  */
 class ReactiveMongoRepositoriesRegistrar extends RepositoryBeanDefinitionRegistrarSupport {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getAnnotation()
-	 */
 	@Override
 	protected Class<? extends Annotation> getAnnotation() {
 		return EnableReactiveMongoRepositories.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryBeanDefinitionRegistrarSupport#getExtension()
-	 */
 	@Override
 	protected RepositoryConfigurationExtension getExtension() {
 		return new ReactiveMongoRepositoryConfigurationExtension();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java
index a003b057e0..457e889bef 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,10 +23,12 @@
 import org.springframework.data.config.ParsingUtils;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactoryBean;
+import org.springframework.data.mongodb.repository.support.SimpleReactiveMongoRepository;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtension;
 import org.springframework.data.repository.config.XmlRepositoryConfigurationSource;
 import org.springframework.data.repository.core.RepositoryMetadata;
+
 import org.w3c.dom.Element;
 
 /**
@@ -42,36 +44,26 @@ public class ReactiveMongoRepositoryConfigurationExtension extends MongoReposito
 	private static final String MONGO_TEMPLATE_REF = "reactive-mongo-template-ref";
 	private static final String CREATE_QUERY_INDEXES = "create-query-indexes";
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getModuleName()
-	 */
 	@Override
 	public String getModuleName() {
 		return "Reactive MongoDB";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName()
-	 */
-	public String getRepositoryFactoryClassName() {
+	@Override
+	public String getRepositoryBaseClassName() {
+		return SimpleReactiveMongoRepository.class.getName();
+	}
+
+	@Override
+	public String getRepositoryFactoryBeanClassName() {
 		return ReactiveMongoRepositoryFactoryBean.class.getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes()
-	 */
 	@Override
 	protected Collection<Class<?>> getIdentifyingTypes() {
 		return Collections.singleton(ReactiveMongoRepository.class);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
-	 */
 	@Override
 	public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfigurationSource config) {
 
@@ -81,10 +73,6 @@ public void postProcess(BeanDefinitionBuilder builder, XmlRepositoryConfiguratio
 		ParsingUtils.setPropertyValue(builder, element, CREATE_QUERY_INDEXES, "createIndexesForQueryMethods");
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource)
-	 */
 	@Override
 	public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfigurationSource config) {
 
@@ -94,10 +82,6 @@ public void postProcess(BeanDefinitionBuilder builder, AnnotationRepositoryConfi
 		builder.addPropertyValue("createIndexesForQueryMethods", attributes.getBoolean("createIndexesForQueryMethods"));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#useRepositoryConfiguration(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
 	protected boolean useRepositoryConfiguration(RepositoryMetadata metadata) {
 		return metadata.isReactiveRepository();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java
index d0d9b07081..e276d4d1e0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/config/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Support infrastructure for the configuration of MongoDB specific repositories.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.repository.config;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/package-info.java
index 8deddfe939..799597e19c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/package-info.java
@@ -1,6 +1,6 @@
 /**
  * MongoDB specific repository implementation.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.repository;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java
index b355c37572..596b895ebd 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,24 +15,45 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.expression.ValueEvaluationContextProvider;
+import org.springframework.data.expression.ValueExpression;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.ExecutableFind;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind;
+import org.springframework.data.mongodb.core.ExecutableRemoveOperation.ExecutableRemove;
+import org.springframework.data.mongodb.core.ExecutableUpdateOperation.ExecutableUpdate;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.query.BasicUpdate;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.Update;
 import org.springframework.data.mongodb.repository.query.MongoQueryExecution.DeleteExecution;
 import org.springframework.data.mongodb.repository.query.MongoQueryExecution.GeoNearExecution;
 import org.springframework.data.mongodb.repository.query.MongoQueryExecution.PagedExecution;
 import org.springframework.data.mongodb.repository.query.MongoQueryExecution.PagingGeoNearExecution;
 import org.springframework.data.mongodb.repository.query.MongoQueryExecution.SlicedExecution;
+import org.springframework.data.mongodb.repository.query.MongoQueryExecution.UpdateExecution;
+import org.springframework.data.mongodb.util.json.ParameterBindingContext;
+import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
 import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.util.Lazy;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.MongoDatabase;
 
 /**
  * Base class for {@link RepositoryQuery} implementations for Mongo.
@@ -41,30 +62,32 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Jorge Rodríguez
  */
 public abstract class AbstractMongoQuery implements RepositoryQuery {
 
 	private final MongoQueryMethod method;
 	private final MongoOperations operations;
 	private final ExecutableFind<?> executableFind;
-	private final SpelExpressionParser expressionParser;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	private final ExecutableUpdate<?> executableUpdate;
+	private final ExecutableRemove<?> executableRemove;
+	private final Lazy<ParameterBindingDocumentCodec> codec = Lazy
+			.of(() -> new ParameterBindingDocumentCodec(getCodecRegistry()));
+	private final ValueExpressionDelegate valueExpressionDelegate;
+	private final ValueEvaluationContextProvider valueEvaluationContextProvider;
 
 	/**
 	 * Creates a new {@link AbstractMongoQuery} from the given {@link MongoQueryMethod} and {@link MongoOperations}.
 	 *
 	 * @param method must not be {@literal null}.
 	 * @param operations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @param delegate must not be {@literal null}
+	 * @since 4.4.0
 	 */
-	public AbstractMongoQuery(MongoQueryMethod method, MongoOperations operations, SpelExpressionParser expressionParser,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+	public AbstractMongoQuery(MongoQueryMethod method, MongoOperations operations, ValueExpressionDelegate delegate) {
 
-		Assert.notNull(operations, "MongoOperations must not be null!");
-		Assert.notNull(method, "MongoQueryMethod must not be null!");
-		Assert.notNull(expressionParser, "SpelExpressionParser must not be null!");
-		Assert.notNull(evaluationContextProvider, "QueryMethodEvaluationContextProvider must not be null!");
+		Assert.notNull(operations, "MongoOperations must not be null");
+		Assert.notNull(method, "MongoQueryMethod must not be null");
 
 		this.method = method;
 		this.operations = operations;
@@ -73,24 +96,19 @@ public AbstractMongoQuery(MongoQueryMethod method, MongoOperations operations, S
 		Class<?> type = metadata.getCollectionEntity().getType();
 
 		this.executableFind = operations.query(type);
-		this.expressionParser = expressionParser;
-		this.evaluationContextProvider = evaluationContextProvider;
+		this.executableUpdate = operations.update(type);
+		this.executableRemove = operations.remove(type);
+		this.valueExpressionDelegate = delegate;
+		this.valueEvaluationContextProvider = delegate.createValueContextProvider(method.getParameters());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod()
-	 */
+	@Override
 	public MongoQueryMethod getQueryMethod() {
 		return method;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[])
-	 */
 	@Override
-	public Object execute(Object[] parameters) {
+	public @Nullable Object execute(Object[] parameters) {
 
 		ConvertingParameterAccessor accessor = new ConvertingParameterAccessor(operations.getConverter(),
 				new MongoParametersParameterAccessor(method, parameters));
@@ -110,7 +128,7 @@ public Object execute(Object[] parameters) {
 	 * @param accessor for providing invocation arguments. Never {@literal null}.
 	 * @param typeToRead the desired component target type. Can be {@literal null}.
 	 */
-	protected Object doExecute(MongoQueryMethod method, ResultProcessor processor, ConvertingParameterAccessor accessor,
+	protected @Nullable Object doExecute(MongoQueryMethod method, ResultProcessor processor, ConvertingParameterAccessor accessor,
 			@Nullable Class<?> typeToRead) {
 
 		Query query = createQuery(accessor);
@@ -118,6 +136,8 @@ protected Object doExecute(MongoQueryMethod method, ResultProcessor processor, C
 		applyQueryMetaAttributesWhenPresent(query);
 		query = applyAnnotatedDefaultSortIfPresent(query);
 		query = applyAnnotatedCollationIfPresent(query, accessor);
+		query = applyHintIfPresent(query);
+		query = applyAnnotatedReadPreferenceIfPresent(query);
 
 		FindWithQuery<?> find = typeToRead == null //
 				? executableFind //
@@ -126,11 +146,39 @@ protected Object doExecute(MongoQueryMethod method, ResultProcessor processor, C
 		return getExecution(accessor, find).execute(query);
 	}
 
-	private MongoQueryExecution getExecution(ConvertingParameterAccessor accessor, FindWithQuery<?> operation) {
+	/**
+	 * If present apply the {@link com.mongodb.ReadPreference} from the
+	 * {@link org.springframework.data.mongodb.repository.ReadPreference} annotation.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.2
+	 */
+	private Query applyAnnotatedReadPreferenceIfPresent(Query query) {
+
+		if (!method.hasAnnotatedReadPreference()) {
+			return query;
+		}
+
+		return query.withReadPreference(com.mongodb.ReadPreference.valueOf(method.getAnnotatedReadPreference()));
+	}
+
+	@SuppressWarnings("NullAway")
+	MongoQueryExecution getExecution(ConvertingParameterAccessor accessor, FindWithQuery<?> operation) {
 
 		if (isDeleteQuery()) {
-			return new DeleteExecution(operations, method);
-		} else if (method.isGeoNearQuery() && method.isPageQuery()) {
+			return new DeleteExecution<>(executableRemove, method);
+		}
+
+		if (method.isModifyingQuery()) {
+			if (isLimiting()) {
+				throw new IllegalStateException(
+						String.format("Update method must not be limiting; Offending method: %s", method));
+			}
+			return new UpdateExecution(executableUpdate, method, () -> createUpdate(accessor), accessor);
+		}
+
+		if (method.isGeoNearQuery() && method.isPageQuery()) {
 			return new PagingGeoNearExecution(operation, method, accessor, this);
 		} else if (method.isGeoNearQuery()) {
 			return new GeoNearExecution(operation, method, accessor);
@@ -140,6 +188,9 @@ private MongoQueryExecution getExecution(ConvertingParameterAccessor accessor, F
 			return q -> operation.matching(q).stream();
 		} else if (method.isCollectionQuery()) {
 			return q -> operation.matching(q.with(accessor.getPageable()).with(accessor.getSort())).all();
+		} else if (method.isScrollQuery()) {
+			return q -> operation.matching(q.with(accessor.getPageable()).with(accessor.getSort()))
+					.scroll(accessor.getScrollPosition());
 		} else if (method.isPageQuery()) {
 			return new PagedExecution(operation, accessor.getPageable());
 		} else if (isCountQuery()) {
@@ -148,7 +199,6 @@ private MongoQueryExecution getExecution(ConvertingParameterAccessor accessor, F
 			return q -> operation.matching(q).exists();
 		} else {
 			return q -> {
-
 				TerminatingFind<?> find = operation.matching(q);
 				return isLimiting() ? find.firstValue() : find.oneValue();
 			};
@@ -193,7 +243,23 @@ Query applyAnnotatedDefaultSortIfPresent(Query query) {
 	Query applyAnnotatedCollationIfPresent(Query query, ConvertingParameterAccessor accessor) {
 
 		return QueryUtils.applyCollation(query, method.hasAnnotatedCollation() ? method.getAnnotatedCollation() : null,
-				accessor, getQueryMethod().getParameters(), expressionParser, evaluationContextProvider);
+				accessor, getExpressionEvaluatorFor(accessor));
+	}
+
+	/**
+	 * If present apply the hint from the {@link org.springframework.data.mongodb.repository.Hint} annotation.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.1
+	 */
+	Query applyHintIfPresent(Query query) {
+
+		if (!method.hasAnnotatedHint()) {
+			return query;
+		}
+
+		return query.withHint(method.getAnnotatedHint());
 	}
 
 	/**
@@ -208,6 +274,115 @@ protected Query createCountQuery(ConvertingParameterAccessor accessor) {
 		return applyQueryMetaAttributesWhenPresent(createQuery(accessor));
 	}
 
+	/**
+	 * Retrieves the {@link UpdateDefinition update} from the given
+	 * {@link org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getUpdate() accessor} or creates
+	 * one via by parsing the annotated statement extracted from {@link Update}.
+	 *
+	 * @param accessor never {@literal null}.
+	 * @return the computed {@link UpdateDefinition}.
+	 * @throws IllegalStateException if no update could be found.
+	 * @since 3.4
+	 */
+	@SuppressWarnings("NullAway")
+	protected UpdateDefinition createUpdate(ConvertingParameterAccessor accessor) {
+
+		if (accessor.getUpdate() != null) {
+			return accessor.getUpdate();
+		}
+
+		if (method.hasAnnotatedUpdate()) {
+
+			Update updateSource = method.getUpdateSource();
+			if (StringUtils.hasText(updateSource.update())) {
+				return new BasicUpdate(bindParameters(updateSource.update(), accessor));
+			}
+			if (!ObjectUtils.isEmpty(updateSource.pipeline())) {
+				return AggregationUpdate.from(parseAggregationPipeline(updateSource.pipeline(), accessor));
+			}
+		}
+
+		throw new IllegalStateException(String.format("No Update provided for method %s.", method));
+	}
+
+	/**
+	 * Parse the given aggregation pipeline stages applying values to placeholders to compute the actual list of
+	 * {@link AggregationOperation operations}.
+	 *
+	 * @param sourcePipeline must not be {@literal null}.
+	 * @param accessor must not be {@literal null}.
+	 * @return the parsed aggregation pipeline.
+	 * @since 3.4
+	 */
+	protected List<AggregationOperation> parseAggregationPipeline(String[] sourcePipeline,
+			ConvertingParameterAccessor accessor) {
+
+		List<AggregationOperation> stages = new ArrayList<>(sourcePipeline.length);
+		for (String source : sourcePipeline) {
+			stages.add(computePipelineStage(source, accessor));
+		}
+		return stages;
+	}
+
+	private AggregationOperation computePipelineStage(String source, ConvertingParameterAccessor accessor) {
+		return new StringAggregationOperation(source, getQueryMethod().getDomainClass(),
+				(it) -> bindParameters(it, accessor));
+	}
+
+	protected Document decode(String source, ParameterBindingContext bindingContext) {
+		return getParameterBindingCodec().decode(source, bindingContext);
+	}
+
+	private Document bindParameters(String source, ConvertingParameterAccessor accessor) {
+		return decode(source, prepareBindingContext(source, accessor));
+	}
+
+	/**
+	 * Create the {@link ParameterBindingContext binding context} used for SpEL evaluation.
+	 *
+	 * @param source the JSON source.
+	 * @param accessor value provider for parameter binding.
+	 * @return never {@literal null}.
+	 * @since 3.4
+	 */
+	protected ParameterBindingContext prepareBindingContext(String source, MongoParameterAccessor accessor) {
+
+		ValueExpressionEvaluator evaluator = getExpressionEvaluatorFor(accessor);
+		return new ParameterBindingContext(accessor::getBindableValue, evaluator);
+	}
+
+	/**
+	 * Obtain the {@link ParameterBindingDocumentCodec} used for parsing JSON expressions.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.4
+	 */
+	protected ParameterBindingDocumentCodec getParameterBindingCodec() {
+		return codec.get();
+	}
+
+	/**
+	 * Obtain a {@link ValueExpressionEvaluator} suitable to evaluate expressions.
+	 *
+	 * @param accessor must not be {@literal null}.
+	 * @return the {@link ValueExpressionEvaluator}.
+	 * @since 4.4.0
+	 */
+	protected ValueExpressionEvaluator getExpressionEvaluatorFor(MongoParameterAccessor accessor) {
+		return new ValueExpressionDelegateValueExpressionEvaluator(valueExpressionDelegate,
+				(ValueExpression expression) -> valueEvaluationContextProvider.getEvaluationContext(accessor.getValues(),
+						expression.getExpressionDependencies()));
+	}
+
+	/**
+	 * @return the {@link CodecRegistry} used.
+	 * @since 2.4
+	 */
+	@SuppressWarnings("NullAway")
+	protected CodecRegistry getCodecRegistry() {
+		return operations.execute(MongoDatabase::getCodecRegistry);
+	}
+
 	/**
 	 * Creates a {@link Query} instance using the given {@link ParameterAccessor}
 	 *
@@ -246,4 +421,5 @@ protected Query createCountQuery(ConvertingParameterAccessor accessor) {
 	 * @since 2.0.4
 	 */
 	protected abstract boolean isLimiting();
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java
index 6b281d3d2d..d363c93442 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,35 +17,59 @@
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
+import reactor.util.function.Tuple2;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
+
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.convert.EntityInstantiators;
+import org.springframework.data.expression.ReactiveValueEvaluationContextProvider;
+import org.springframework.data.expression.ValueEvaluationContext;
+import org.springframework.data.expression.ValueEvaluationContextProvider;
+import org.springframework.data.expression.ValueExpression;
+import org.springframework.data.mapping.model.EntityInstantiators;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithProjection;
 import org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithQuery;
 import org.springframework.data.mongodb.core.ReactiveFindOperation.TerminatingFind;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.ReactiveUpdateOperation.ReactiveUpdate;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.query.BasicUpdate;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.Update;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.DeleteExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.GeoNearExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.ResultProcessingConverter;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.ResultProcessingExecution;
+import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.UpdateExecution;
+import org.springframework.data.mongodb.util.json.ParameterBindingContext;
+import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
 import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.spel.ExpressionDependencies;
 import org.springframework.util.Assert;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.MongoClientSettings;
 
 /**
  * Base class for reactive {@link RepositoryQuery} implementations for MongoDB.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Jorge Rodríguez
  * @since 2.0
  */
 public abstract class AbstractReactiveMongoQuery implements RepositoryQuery {
@@ -54,8 +78,9 @@ public abstract class AbstractReactiveMongoQuery implements RepositoryQuery {
 	private final ReactiveMongoOperations operations;
 	private final EntityInstantiators instantiators;
 	private final FindWithProjection<?> findOperationWithProjection;
-	private final SpelExpressionParser expressionParser;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	private final ReactiveUpdate<?> updateOps;
+	private final ValueExpressionDelegate valueExpressionDelegate;
+	private final ReactiveValueEvaluationContextProvider valueEvaluationContextProvider;
 
 	/**
 	 * Creates a new {@link AbstractReactiveMongoQuery} from the given {@link MongoQueryMethod} and
@@ -63,72 +88,61 @@ public abstract class AbstractReactiveMongoQuery implements RepositoryQuery {
 	 *
 	 * @param method must not be {@literal null}.
 	 * @param operations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 * @since 4.4.0
 	 */
 	public AbstractReactiveMongoQuery(ReactiveMongoQueryMethod method, ReactiveMongoOperations operations,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ValueExpressionDelegate delegate) {
 
-		Assert.notNull(method, "MongoQueryMethod must not be null!");
-		Assert.notNull(operations, "ReactiveMongoOperations must not be null!");
-		Assert.notNull(expressionParser, "SpelExpressionParser must not be null!");
-		Assert.notNull(evaluationContextProvider, "QueryMethodEvaluationContextProvider must not be null!");
+		Assert.notNull(method, "MongoQueryMethod must not be null");
+		Assert.notNull(operations, "ReactiveMongoOperations must not be null");
+		Assert.notNull(delegate, "ValueExpressionDelegate must not be null");
 
 		this.method = method;
 		this.operations = operations;
 		this.instantiators = new EntityInstantiators();
-		this.expressionParser = expressionParser;
-		this.evaluationContextProvider = evaluationContextProvider;
+		this.valueExpressionDelegate = delegate;
 
 		MongoEntityMetadata<?> metadata = method.getEntityInformation();
 		Class<?> type = metadata.getCollectionEntity().getType();
 
 		this.findOperationWithProjection = operations.query(type);
+		this.updateOps = operations.update(type);
+		ValueEvaluationContextProvider valueContextProvider = valueExpressionDelegate
+				.createValueContextProvider(method.getParameters());
+		Assert.isInstanceOf(ReactiveValueEvaluationContextProvider.class, valueContextProvider,
+				"ValueEvaluationContextProvider must be reactive");
+		this.valueEvaluationContextProvider = (ReactiveValueEvaluationContextProvider) valueContextProvider;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#getQueryMethod()
-	 */
+	@Override
 	public MongoQueryMethod getQueryMethod() {
 		return method;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.RepositoryQuery#execute(java.lang.Object[])
-	 */
-	public Object execute(Object[] parameters) {
+	@Override
+	public Publisher<Object> execute(Object[] parameters) {
 
 		return method.hasReactiveWrapperParameter() ? executeDeferred(parameters)
 				: execute(new MongoParametersParameterAccessor(method, parameters));
 	}
 
 	@SuppressWarnings("unchecked")
-	private Object executeDeferred(Object[] parameters) {
+	private Publisher<Object> executeDeferred(Object[] parameters) {
 
 		ReactiveMongoParameterAccessor parameterAccessor = new ReactiveMongoParameterAccessor(method, parameters);
 
-		if (getQueryMethod().isCollectionQuery()) {
-			return Flux.defer(() -> (Publisher<Object>) execute(parameterAccessor));
-		}
-
-		return Mono.defer(() -> (Mono<Object>) execute(parameterAccessor));
+		return parameterAccessor.resolveParameters().flatMapMany(this::execute);
 	}
 
-	private Object execute(MongoParameterAccessor parameterAccessor) {
+	private Publisher<Object> execute(MongoParameterAccessor parameterAccessor) {
 
 		ConvertingParameterAccessor accessor = new ConvertingParameterAccessor(operations.getConverter(),
 				parameterAccessor);
 
-		TypeInformation<?> returnType = method.getReturnType();
 		ResultProcessor processor = method.getResultProcessor().withDynamicProjection(accessor);
 		Class<?> typeToRead = processor.getReturnedType().getTypeToRead();
 
-		if (typeToRead == null && returnType.getComponentType() != null) {
-			typeToRead = returnType.getComponentType().getType();
-		}
-
 		return doExecute(method, processor, accessor, typeToRead);
 	}
 
@@ -141,24 +155,32 @@ private Object execute(MongoParameterAccessor parameterAccessor) {
 	 * @param accessor for providing invocation arguments. Never {@literal null}.
 	 * @param typeToRead the desired component target type. Can be {@literal null}.
 	 */
-	protected Object doExecute(ReactiveMongoQueryMethod method, ResultProcessor processor,
+	protected Publisher<Object> doExecute(ReactiveMongoQueryMethod method, ResultProcessor processor,
 			ConvertingParameterAccessor accessor, @Nullable Class<?> typeToRead) {
 
-		Query query = createQuery(accessor);
+		return createQuery(accessor).flatMapMany(it -> {
 
-		applyQueryMetaAttributesWhenPresent(query);
-		query = applyAnnotatedDefaultSortIfPresent(query);
-		query = applyAnnotatedCollationIfPresent(query, accessor);
+			Query query = it;
+			applyQueryMetaAttributesWhenPresent(query);
+			query = applyAnnotatedDefaultSortIfPresent(query);
+			query = applyAnnotatedCollationIfPresent(query, accessor);
+			query = applyHintIfPresent(query);
+			query = applyAnnotatedReadPreferenceIfPresent(query);
 
-		FindWithQuery<?> find = typeToRead == null //
-				? findOperationWithProjection //
-				: findOperationWithProjection.as(typeToRead);
+			FindWithQuery<?> find = typeToRead == null //
+					? findOperationWithProjection //
+					: findOperationWithProjection.as(typeToRead);
 
-		String collection = method.getEntityInformation().getCollectionName();
+			String collection = method.getEntityInformation().getCollectionName();
+
+			ReactiveMongoQueryExecution execution = getExecution(accessor,
+					getResultProcessing(processor), find);
+			return execution.execute(query, processor.getReturnedType().getDomainType(), collection);
+		});
+	}
 
-		ReactiveMongoQueryExecution execution = getExecution(accessor,
-				new ResultProcessingConverter(processor, operations, instantiators), find);
-		return execution.execute(query, processor.getReturnedType().getDomainType(), collection);
+	ResultProcessingConverter getResultProcessing(ResultProcessor processor) {
+		return new ResultProcessingConverter(processor, operations, instantiators);
 	}
 
 	/**
@@ -173,16 +195,28 @@ private ReactiveMongoQueryExecution getExecution(MongoParameterAccessor accessor
 		return new ResultProcessingExecution(getExecutionToWrap(accessor, operation), resultProcessing);
 	}
 
+	@SuppressWarnings("NullAway")
 	private ReactiveMongoQueryExecution getExecutionToWrap(MongoParameterAccessor accessor, FindWithQuery<?> operation) {
 
 		if (isDeleteQuery()) {
 			return new DeleteExecution(operations, method);
+		} else if (method.isModifyingQuery()) {
+
+			if (isLimiting()) {
+				throw new IllegalStateException(
+						String.format("Update method must not be limiting; Offending method: %s", method));
+			}
+
+			return new UpdateExecution(updateOps, method, accessor, createUpdate(accessor));
 		} else if (method.isGeoNearQuery()) {
 			return new GeoNearExecution(operations, accessor, method.getReturnType());
 		} else if (isTailable(method)) {
 			return (q, t, c) -> operation.matching(q.with(accessor.getPageable())).tail();
 		} else if (method.isCollectionQuery()) {
 			return (q, t, c) -> operation.matching(q.with(accessor.getPageable())).all();
+		} else if (method.isScrollQuery()) {
+			return (q, t, c) -> operation.matching(q.with(accessor.getPageable()).with(accessor.getSort()))
+					.scroll(accessor.getScrollPosition());
 		} else if (isCountQuery()) {
 			return (q, t, c) -> operation.matching(q).count();
 		} else if (isExistsQuery()) {
@@ -243,7 +277,40 @@ Query applyAnnotatedDefaultSortIfPresent(Query query) {
 	Query applyAnnotatedCollationIfPresent(Query query, ConvertingParameterAccessor accessor) {
 
 		return QueryUtils.applyCollation(query, method.hasAnnotatedCollation() ? method.getAnnotatedCollation() : null,
-				accessor, getQueryMethod().getParameters(), expressionParser, evaluationContextProvider);
+				accessor, getValueExpressionEvaluator(accessor));
+	}
+
+	/**
+	 * If present apply the hint from the {@link org.springframework.data.mongodb.repository.Hint} annotation.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.1
+	 */
+	Query applyHintIfPresent(Query query) {
+
+		if (!method.hasAnnotatedHint()) {
+			return query;
+		}
+
+		return query.withHint(method.getAnnotatedHint());
+	}
+
+	/**
+	 * If present apply the {@link com.mongodb.ReadPreference} from the
+	 * {@link org.springframework.data.mongodb.repository.ReadPreference} annotation.
+	 *
+	 * @param query must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.2
+	 */
+	private Query applyAnnotatedReadPreferenceIfPresent(Query query) {
+
+		if (!method.hasAnnotatedReadPreference()) {
+			return query;
+		}
+
+		return query.withReadPreference(com.mongodb.ReadPreference.valueOf(method.getAnnotatedReadPreference()));
 	}
 
 	/**
@@ -254,8 +321,146 @@ Query applyAnnotatedCollationIfPresent(Query query, ConvertingParameterAccessor
 	 * @param accessor must not be {@literal null}.
 	 * @return
 	 */
-	protected Query createCountQuery(ConvertingParameterAccessor accessor) {
-		return applyQueryMetaAttributesWhenPresent(createQuery(accessor));
+	protected Mono<Query> createCountQuery(ConvertingParameterAccessor accessor) {
+		return createQuery(accessor).map(this::applyQueryMetaAttributesWhenPresent);
+	}
+
+	/**
+	 * Retrieves the {@link UpdateDefinition update} from the given
+	 * {@link org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getUpdate() accessor} or creates
+	 * one via by parsing the annotated statement extracted from {@link Update}.
+	 *
+	 * @param accessor never {@literal null}.
+	 * @return the computed {@link UpdateDefinition}.
+	 * @throws IllegalStateException if no update could be found.
+	 * @since 3.4
+	 */
+	@SuppressWarnings("NullAway")
+	protected Mono<UpdateDefinition> createUpdate(MongoParameterAccessor accessor) {
+
+		if (accessor.getUpdate() != null) {
+			return Mono.just(accessor.getUpdate());
+		}
+
+		if (method.hasAnnotatedUpdate()) {
+			Update updateSource = method.getUpdateSource();
+			if (StringUtils.hasText(updateSource.update())) {
+
+				String updateJson = updateSource.update();
+				return getParameterBindingCodec() //
+						.flatMap(codec -> expressionEvaluator(updateJson, accessor, codec) //
+								.map(evaluator -> decode(evaluator, updateJson, accessor, codec))) //
+						.map(BasicUpdate::fromDocument);
+			}
+			if (!ObjectUtils.isEmpty(updateSource.pipeline())) {
+				return parseAggregationPipeline(updateSource.pipeline(), accessor).map(AggregationUpdate::from);
+			}
+		}
+
+		throw new IllegalStateException(String.format("No Update provided for method %s.", method));
+	}
+
+	/**
+	 * Parse the given aggregation pipeline stages applying values to placeholders to compute the actual list of
+	 * {@link AggregationOperation operations}.
+	 *
+	 * @param pipeline must not be {@literal null}.
+	 * @param accessor must not be {@literal null}.
+	 * @return the parsed aggregation pipeline.
+	 * @since 3.4
+	 */
+	protected Mono<List<AggregationOperation>> parseAggregationPipeline(String[] pipeline,
+			MongoParameterAccessor accessor) {
+
+		return getCodecRegistry().map(ParameterBindingDocumentCodec::new).flatMap(codec -> {
+
+			List<Mono<AggregationOperation>> stages = new ArrayList<>(pipeline.length);
+			for (String source : pipeline) {
+				stages.add(computePipelineStage(source, accessor, codec));
+			}
+			return Flux.concat(stages).collectList();
+		});
+	}
+
+	private Mono<AggregationOperation> computePipelineStage(String source, MongoParameterAccessor accessor,
+			ParameterBindingDocumentCodec codec) {
+
+		return expressionEvaluator(source, accessor, codec).map(evaluator -> new StringAggregationOperation(source,
+				AbstractReactiveMongoQuery.this.getQueryMethod().getDomainClass(),
+				bsonString -> AbstractReactiveMongoQuery.this.decode(evaluator, bsonString, accessor, codec)));
+	}
+
+	private Mono<Tuple2<ValueExpressionEvaluator, ParameterBindingDocumentCodec>> expressionEvaluator(String source,
+			MongoParameterAccessor accessor, ParameterBindingDocumentCodec codec) {
+
+		ExpressionDependencies dependencies = codec.captureExpressionDependencies(source, accessor::getBindableValue,
+				valueExpressionDelegate.getValueExpressionParser());
+		return getValueExpressionEvaluatorLater(dependencies, accessor).zipWith(Mono.just(codec));
+	}
+
+	private Document decode(Tuple2<ValueExpressionEvaluator, ParameterBindingDocumentCodec> expressionEvaluator,
+			String source, MongoParameterAccessor accessor, ParameterBindingDocumentCodec codec) {
+
+		ParameterBindingContext bindingContext = new ParameterBindingContext(accessor::getBindableValue,
+				expressionEvaluator.getT1());
+		return codec.decode(source, bindingContext);
+	}
+
+	/**
+	 * Obtain the {@link ParameterBindingDocumentCodec} used for parsing JSON expressions.
+	 *
+	 * @return never {@literal null}.
+	 * @since 3.4
+	 */
+	protected Mono<ParameterBindingDocumentCodec> getParameterBindingCodec() {
+		return getCodecRegistry().map(ParameterBindingDocumentCodec::new);
+	}
+
+	/**
+	 * Obtain a {@link ValueExpressionEvaluator} suitable to evaluate expressions.
+	 *
+	 * @param accessor must not be {@literal null}.
+	 * @since 4.3
+	 */
+	ValueExpressionEvaluator getValueExpressionEvaluator(MongoParameterAccessor accessor) {
+
+		return new ValueExpressionEvaluator() {
+
+			@Override
+			public <T> @Nullable T evaluate(String expressionString) {
+				ValueExpression expression = valueExpressionDelegate.parse(expressionString);
+				ValueEvaluationContext evaluationContext = valueEvaluationContextProvider
+						.getEvaluationContext(accessor.getValues(), expression.getExpressionDependencies());
+				return (T) expression.evaluate(evaluationContext);
+			}
+		};
+	}
+
+	/**
+	 * Obtain a {@link Mono publisher} emitting the {@link ValueExpressionEvaluator} suitable to evaluate expressions
+	 * backed by the given dependencies.
+	 *
+	 * @param dependencies must not be {@literal null}.
+	 * @param accessor must not be {@literal null}.
+	 * @return a {@link Mono} emitting the {@link ValueExpressionEvaluator} when ready.
+	 * @since 4.3
+	 */
+	protected Mono<ValueExpressionEvaluator> getValueExpressionEvaluatorLater(ExpressionDependencies dependencies,
+			MongoParameterAccessor accessor) {
+
+		return valueEvaluationContextProvider.getEvaluationContextLater(accessor.getValues(), dependencies)
+				.map(evaluationContext -> new ValueExpressionDelegateValueExpressionEvaluator(valueExpressionDelegate,
+						valueExpression -> evaluationContext));
+	}
+
+	/**
+	 * @return a {@link Mono} emitting the {@link CodecRegistry} when ready.
+	 * @since 2.4
+	 */
+	protected Mono<CodecRegistry> getCodecRegistry() {
+
+		return Mono.from(operations.execute(db -> Mono.just(db.getCodecRegistry())))
+				.defaultIfEmpty(MongoClientSettings.getDefaultCodecRegistry());
 	}
 
 	/**
@@ -264,7 +469,7 @@ protected Query createCountQuery(ConvertingParameterAccessor accessor) {
 	 * @param accessor must not be {@literal null}.
 	 * @return
 	 */
-	protected abstract Query createQuery(ConvertingParameterAccessor accessor);
+	protected abstract Mono<Query> createQuery(ConvertingParameterAccessor accessor);
 
 	/**
 	 * Returns whether the query should get a count projection applied.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java
index 7a3328b6fe..639c694ef9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AggregationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,30 +15,36 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import lombok.experimental.UtilityClass;
-
-import java.util.ArrayList;
-import java.util.List;
+import java.time.Duration;
 import java.util.Map;
+import java.util.function.Function;
+import java.util.function.IntUnaryOperator;
+import java.util.function.LongUnaryOperator;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Meta;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.util.json.ParameterBindingContext;
-import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.data.repository.query.ResultProcessor;
+import org.springframework.data.repository.query.ReturnedType;
+import org.springframework.data.util.ReflectionUtils;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
+import org.springframework.util.ObjectUtils;
+
+import com.mongodb.ReadPreference;
 
 /**
  * Internal utility class to help avoid duplicate code required in both the reactive and the sync {@link Aggregation}
@@ -46,12 +52,12 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Divya Srivastava
  * @since 2.2
  */
-@UtilityClass
-class AggregationUtils {
+abstract class AggregationUtils {
 
-	private static final ParameterBindingDocumentCodec CODEC = new ParameterBindingDocumentCodec();
+	private AggregationUtils() {}
 
 	/**
 	 * Apply a collation extracted from the given {@literal collationExpression} to the given
@@ -63,15 +69,11 @@ class AggregationUtils {
 	 * @param accessor must not be {@literal null}.
 	 * @return the {@link Query} having proper {@link Collation}.
 	 * @see AggregationOptions#getCollation()
-	 * @see CollationUtils#computeCollation(String, ConvertingParameterAccessor, MongoParameters, SpelExpressionParser,
-	 *      QueryMethodEvaluationContextProvider)
 	 */
 	static AggregationOptions.Builder applyCollation(AggregationOptions.Builder builder,
-			@Nullable String collationExpression, ConvertingParameterAccessor accessor, MongoParameters parameters,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			@Nullable String collationExpression, ConvertingParameterAccessor accessor, ValueExpressionEvaluator evaluator) {
 
-		Collation collation = CollationUtils.computeCollation(collationExpression, accessor, parameters, expressionParser,
-				evaluationContextProvider);
+		Collation collation = CollationUtils.computeCollation(collationExpression, accessor, evaluator);
 		return collation == null ? builder : builder.collation(collation);
 	}
 
@@ -85,7 +87,7 @@ static AggregationOptions.Builder applyMeta(AggregationOptions.Builder builder,
 
 		Meta meta = queryMethod.getQueryMetaAttributes();
 
-		if (StringUtils.hasText(meta.getComment())) {
+		if (meta.hasComment()) {
 			builder.comment(meta.getComment());
 		}
 
@@ -93,33 +95,135 @@ static AggregationOptions.Builder applyMeta(AggregationOptions.Builder builder,
 			builder.cursorBatchSize(meta.getCursorBatchSize());
 		}
 
+		if (meta.hasMaxTime()) {
+			builder.maxTime(Duration.ofMillis(meta.getRequiredMaxTimeMsec()));
+		}
+
+		if (meta.getAllowDiskUse() != null) {
+			builder.allowDiskUse(meta.getAllowDiskUse());
+		}
+
 		return builder;
 	}
 
 	/**
-	 * Compute the {@link AggregationOperation aggregation} pipeline for the given {@link MongoQueryMethod}. The raw
-	 * {@link org.springframework.data.mongodb.repository.Aggregation#pipeline()} is parsed with a
-	 * {@link ParameterBindingDocumentCodec} to obtain the MongoDB native {@link Document} representation returned by
-	 * {@link AggregationOperation#toDocument(AggregationOperationContext)} that is mapped against the domain type
-	 * properties.
+	 * If present apply the hint from the {@link org.springframework.data.mongodb.repository.Hint} annotation.
 	 *
-	 * @param method
-	 * @param accessor
-	 * @param expressionParser
-	 * @param evaluationContextProvider
-	 * @return
+	 * @param builder must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.1
+	 */
+	static AggregationOptions.Builder applyHint(AggregationOptions.Builder builder, MongoQueryMethod queryMethod) {
+
+		if (!queryMethod.hasAnnotatedHint()) {
+			return builder;
+		}
+
+		return builder.hint(queryMethod.getAnnotatedHint());
+	}
+
+	/**
+	 * If present apply the preference from the {@link org.springframework.data.mongodb.repository.ReadPreference}
+	 * annotation.
+	 *
+	 * @param builder must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.2
+	 */
+	static AggregationOptions.Builder applyReadPreference(AggregationOptions.Builder builder,
+			MongoQueryMethod queryMethod) {
+
+		if (!queryMethod.hasAnnotatedReadPreference()) {
+			return builder;
+		}
+
+		return builder.readPreference(ReadPreference.valueOf(queryMethod.getAnnotatedReadPreference()));
+	}
+
+	static AggregationOptions computeOptions(MongoQueryMethod method, ConvertingParameterAccessor accessor,
+			AggregationPipeline pipeline, ValueExpressionEvaluator evaluator) {
+
+		AggregationOptions.Builder builder = Aggregation.newAggregationOptions();
+
+		AggregationUtils.applyCollation(builder, method.getAnnotatedCollation(), accessor, evaluator);
+		AggregationUtils.applyMeta(builder, method);
+		AggregationUtils.applyHint(builder, method);
+		AggregationUtils.applyReadPreference(builder, method);
+
+		TypeInformation<?> returnType = method.getReturnType();
+		if (returnType.getComponentType() != null) {
+			returnType = returnType.getRequiredComponentType();
+		}
+		if (ReflectionUtils.isVoid(returnType.getType()) && pipeline.isOutOrMerge()) {
+			builder.skipOutput();
+		}
+
+		return builder.build();
+	}
+
+	/**
+	 * Prepares the AggregationPipeline including type discovery and calling {@link AggregationCallback} to run the
+	 * aggregation.
 	 */
-	static List<AggregationOperation> computePipeline(MongoQueryMethod method, ConvertingParameterAccessor accessor,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+	static <T> @Nullable T doAggregate(AggregationPipeline pipeline, MongoQueryMethod method, ResultProcessor processor,
+			ConvertingParameterAccessor accessor,
+			Function<MongoParameterAccessor, ValueExpressionEvaluator> evaluatorFunction, AggregationCallback<T> callback) {
+
+		Class<?> sourceType = method.getDomainClass();
+		ReturnedType returnedType = processor.getReturnedType();
+		// 🙈Interface Projections do not happen on the Aggregation level but through our repository infrastructure.
+		// Non-projections and raw results (AggregationResults<…>) are handled here. Interface projections read a Document
+		// and DTO projections read the returned type.
+		// We also support simple return types (String) that are read from a Document
+		TypeInformation<?> returnType = method.getReturnType();
+		Class<?> returnElementType = (returnType.getComponentType() != null ? returnType.getRequiredComponentType()
+				: returnType).getType();
+		Class<?> entityType;
+
+		boolean isRawAggregationResult = ClassUtils.isAssignable(AggregationResults.class, method.getReturnedObjectType());
+
+		if (returnElementType.equals(Document.class)) {
+			entityType = sourceType;
+		} else {
+			entityType = returnElementType;
+		}
 
-		ParameterBindingContext bindingContext = new ParameterBindingContext((accessor::getBindableValue), expressionParser,
-				evaluationContextProvider.getEvaluationContext(method.getParameters(), accessor.getValues()));
+		AggregationUtils.appendSortIfPresent(pipeline, accessor, entityType);
 
-		List<AggregationOperation> target = new ArrayList<>(method.getAnnotatedAggregation().length);
-		for (String source : method.getAnnotatedAggregation()) {
-			target.add(ctx -> ctx.getMappedObject(CODEC.decode(source, bindingContext), method.getDomainClass()));
+		if (method.isSliceQuery()) {
+			AggregationUtils.appendLimitAndOffsetIfPresent(pipeline, accessor, LongUnaryOperator.identity(),
+					limit -> limit + 1);
+		} else {
+			AggregationUtils.appendLimitAndOffsetIfPresent(pipeline, accessor);
 		}
-		return target;
+
+		AggregationOptions options = AggregationUtils.computeOptions(method, accessor, pipeline,
+				evaluatorFunction.apply(accessor));
+		TypedAggregation<?> aggregation = new TypedAggregation<>(sourceType, pipeline.getOperations(), options);
+
+		boolean isSimpleReturnType = MongoSimpleTypes.HOLDER.isSimpleType(returnElementType);
+		Class<?> typeToRead;
+
+		if (isSimpleReturnType) {
+			typeToRead = Document.class;
+		} else if (isRawAggregationResult) {
+			typeToRead = returnElementType;
+		} else {
+
+			if (returnedType.isProjecting()) {
+				typeToRead = returnedType.getReturnedType().isInterface() ? Document.class : returnedType.getReturnedType();
+			} else {
+				typeToRead = entityType;
+			}
+		}
+
+		return callback.doAggregate(aggregation, sourceType, typeToRead, returnElementType, isSimpleReturnType,
+				isRawAggregationResult);
+	}
+
+	static AggregationPipeline computePipeline(AbstractMongoQuery mongoQuery, MongoQueryMethod method,
+			ConvertingParameterAccessor accessor) {
+		return new AggregationPipeline(mongoQuery.parseAggregationPipeline(method.getAnnotatedAggregation(), accessor));
 	}
 
 	/**
@@ -129,8 +233,8 @@ static List<AggregationOperation> computePipeline(MongoQueryMethod method, Conve
 	 * @param accessor
 	 * @param targetType
 	 */
-	static void appendSortIfPresent(List<AggregationOperation> aggregationPipeline, ConvertingParameterAccessor accessor,
-			Class<?> targetType) {
+	static void appendSortIfPresent(AggregationPipeline aggregationPipeline, ConvertingParameterAccessor accessor,
+			@Nullable Class<?> targetType) {
 
 		if (accessor.getSort().isUnsorted()) {
 			return;
@@ -154,8 +258,24 @@ static void appendSortIfPresent(List<AggregationOperation> aggregationPipeline,
 	 * @param aggregationPipeline
 	 * @param accessor
 	 */
-	static void appendLimitAndOffsetIfPresent(List<AggregationOperation> aggregationPipeline,
+	static void appendLimitAndOffsetIfPresent(AggregationPipeline aggregationPipeline,
 			ConvertingParameterAccessor accessor) {
+		appendLimitAndOffsetIfPresent(aggregationPipeline, accessor, LongUnaryOperator.identity(),
+				IntUnaryOperator.identity());
+	}
+
+	/**
+	 * Append {@code $skip} and {@code $limit} aggregation stage if {@link ConvertingParameterAccessor#getSort()} is
+	 * present.
+	 *
+	 * @param aggregationPipeline
+	 * @param accessor
+	 * @param offsetOperator
+	 * @param limitOperator
+	 * @since 3.3
+	 */
+	static void appendLimitAndOffsetIfPresent(AggregationPipeline aggregationPipeline,
+			ConvertingParameterAccessor accessor, LongUnaryOperator offsetOperator, IntUnaryOperator limitOperator) {
 
 		Pageable pageable = accessor.getPageable();
 		if (pageable.isUnpaged()) {
@@ -163,10 +283,10 @@ static void appendLimitAndOffsetIfPresent(List<AggregationOperation> aggregation
 		}
 
 		if (pageable.getOffset() > 0) {
-			aggregationPipeline.add(Aggregation.skip(pageable.getOffset()));
+			aggregationPipeline.add(Aggregation.skip(offsetOperator.applyAsLong(pageable.getOffset())));
 		}
 
-		aggregationPipeline.add(Aggregation.limit(pageable.getPageSize()));
+		aggregationPipeline.add(Aggregation.limit(limitOperator.applyAsInt(pageable.getPageSize())));
 	}
 
 	/**
@@ -186,10 +306,9 @@ static void appendLimitAndOffsetIfPresent(List<AggregationOperation> aggregation
 	 * @return can be {@literal null} if source {@link Document#isEmpty() is empty}.
 	 * @throws IllegalArgumentException when none of the above rules is met.
 	 */
-	@Nullable
-	static <T> T extractSimpleTypeResult(Document source, Class<T> targetType, MongoConverter converter) {
+	static <T> @Nullable T extractSimpleTypeResult(@Nullable Document source, Class<T> targetType, MongoConverter converter) {
 
-		if (source.isEmpty()) {
+		if (ObjectUtils.isEmpty(source)) {
 			return null;
 		}
 
@@ -198,7 +317,7 @@ static <T> T extractSimpleTypeResult(Document source, Class<T> targetType, Mongo
 		}
 
 		Document intermediate = new Document(source);
-		intermediate.remove("_id");
+		intermediate.remove(FieldName.ID.name());
 
 		if (intermediate.size() == 1) {
 			return getPotentiallyConvertedSimpleTypeValue(converter, intermediate.values().iterator().next(), targetType);
@@ -214,9 +333,8 @@ static <T> T extractSimpleTypeResult(Document source, Class<T> targetType, Mongo
 				String.format("o_O no entry of type %s found in %s.", targetType.getSimpleName(), source.toJson()));
 	}
 
-	@Nullable
 	@SuppressWarnings("unchecked")
-	private static <T> T getPotentiallyConvertedSimpleTypeValue(MongoConverter converter, @Nullable Object value,
+	private static <T> @Nullable T getPotentiallyConvertedSimpleTypeValue(MongoConverter converter, @Nullable Object value,
 			Class<T> targetType) {
 
 		if (value == null) {
@@ -229,4 +347,26 @@ private static <T> T getPotentiallyConvertedSimpleTypeValue(MongoConverter conve
 
 		return converter.getConversionService().convert(value, targetType);
 	}
+
+	/**
+	 * Interface to invoke an aggregation along with source, intermediate, and target types.
+	 *
+	 * @param <T>
+	 */
+	interface AggregationCallback<T> {
+
+		/**
+		 * @param aggregation
+		 * @param domainType
+		 * @param typeToRead
+		 * @param elementType
+		 * @param simpleType whether the aggregation returns {@link Document} or a
+		 *          {@link org.springframework.data.mapping.model.SimpleTypeHolder simple type}.
+		 * @param rawResult whether the aggregation returns {@link AggregationResults}.
+		 * @return
+		 */
+		@Nullable
+		T doAggregate(TypedAggregation<?> aggregation, Class<?> domainType, Class<?> typeToRead, Class<?> elementType,
+				boolean simpleType, boolean rawResult);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/BooleanUtil.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/BooleanUtil.java
index ef41d58f53..74249b40d5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/BooleanUtil.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/BooleanUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,17 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import lombok.experimental.UtilityClass;
-
 /**
  * Utility class containing methods to interact with boolean values.
  *
  * @author Mark Paluch
  * @since 2.0.9
  */
-@UtilityClass
-class BooleanUtil {
+final class BooleanUtil {
+
+	private BooleanUtil() {
+		throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
+	}
 
 	/**
 	 * Count the number of {@literal true} values.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java
index c8ceac681a..108c6ee796 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/CollationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,17 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import lombok.experimental.UtilityClass;
-
 import java.util.Locale;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.util.json.ParameterBindingContext;
 import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -39,28 +37,26 @@
  * @author Christoph Strobl
  * @since 2.2
  */
-@UtilityClass
-class CollationUtils {
+abstract class CollationUtils {
 
 	private static final ParameterBindingDocumentCodec CODEC = new ParameterBindingDocumentCodec();
 	private static final Pattern PARAMETER_BINDING_PATTERN = Pattern.compile("\\?(\\d+)");
 
+	private CollationUtils() {
+	}
+
 	/**
 	 * Compute the {@link Collation} by inspecting the {@link ConvertingParameterAccessor#getCollation() parameter
 	 * accessor} or parsing a potentially given {@literal collationExpression}.
 	 *
 	 * @param collationExpression
 	 * @param accessor
-	 * @param parameters
-	 * @param expressionParser
-	 * @param evaluationContextProvider
+	 * @param expressionEvaluator
 	 * @return can be {@literal null} if neither {@link ConvertingParameterAccessor#getCollation()} nor
 	 *         {@literal collationExpression} are present.
 	 */
-	@Nullable
-	static Collation computeCollation(@Nullable String collationExpression, ConvertingParameterAccessor accessor,
-			MongoParameters parameters, SpelExpressionParser expressionParser,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+	static @Nullable Collation computeCollation(@Nullable String collationExpression, ConvertingParameterAccessor accessor,
+			ValueExpressionEvaluator expressionEvaluator) {
 
 		if (accessor.getCollation() != null) {
 			return accessor.getCollation();
@@ -70,10 +66,10 @@ static Collation computeCollation(@Nullable String collationExpression, Converti
 			return null;
 		}
 
-		if (StringUtils.trimLeadingWhitespace(collationExpression).startsWith("{")) {
+		if (collationExpression.stripLeading().startsWith("{")) {
 
-			ParameterBindingContext bindingContext = new ParameterBindingContext((accessor::getBindableValue),
-					expressionParser, evaluationContextProvider.getEvaluationContext(parameters, accessor.getValues()));
+			ParameterBindingContext bindingContext = ParameterBindingContext.forExpressions(accessor::getBindableValue,
+					expressionEvaluator);
 
 			return Collation.from(CODEC.decode(collationExpression, bindingContext));
 		}
@@ -91,16 +87,17 @@ static Collation computeCollation(@Nullable String collationExpression, Converti
 			if (placeholderValue instanceof String) {
 				return Collation.parse(placeholderValue.toString());
 			}
-			if (placeholderValue instanceof Locale) {
-				return Collation.of((Locale) placeholderValue);
+			if (placeholderValue instanceof Locale locale) {
+				return Collation.of(locale);
 			}
-			if (placeholderValue instanceof Document) {
-				return Collation.from((Document) placeholderValue);
+			if (placeholderValue instanceof Document document) {
+				return Collation.from(document);
 			}
 			throw new IllegalArgumentException(String.format("Collation must be a String, Locale or Document but was %s",
 					ObjectUtils.nullSafeClassName(placeholderValue)));
 		}
 
+		Assert.notNull(placeholderValue, "PlaceholderValue must not be null");
 		return Collation.parse(collationExpression.replace(placeholder, placeholderValue.toString()));
 	}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
index 1ede41714f..f203b67e67 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,20 +20,25 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.ScrollPosition;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Vector;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.repository.query.ParameterAccessor;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
 
@@ -60,116 +65,93 @@ public class ConvertingParameterAccessor implements MongoParameterAccessor {
 	 */
 	public ConvertingParameterAccessor(MongoWriter<?> writer, MongoParameterAccessor delegate) {
 
-		Assert.notNull(writer, "MongoWriter must not be null!");
-		Assert.notNull(delegate, "MongoParameterAccessor must not be null!");
+		Assert.notNull(writer, "MongoWriter must not be null");
+		Assert.notNull(delegate, "MongoParameterAccessor must not be null");
 
 		this.writer = writer;
 		this.delegate = delegate;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see java.lang.Iterable#iterator()
-	 */
 	public PotentiallyConvertingIterator iterator() {
 		return new ConvertingIterator(delegate.iterator());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getPageable()
-	 */
+	@Override
+	public @Nullable Vector getVector() {
+		return delegate.getVector();
+	}
+
+	@Override
+	public @Nullable ScrollPosition getScrollPosition() {
+		return delegate.getScrollPosition();
+	}
+
 	public Pageable getPageable() {
 		return delegate.getPageable();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getSort()
-	 */
 	public Sort getSort() {
 		return delegate.getSort();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getDynamicProjection()
-	 */
 	@Override
-	public Optional<Class<?>> getDynamicProjection() {
-		return delegate.getDynamicProjection();
+	public @Nullable Class<?> findDynamicProjection() {
+		return delegate.findDynamicProjection();
+	}
+
+	public @Nullable Object getBindableValue(int index) {
+		return getConvertedValue(delegate.getBindableValue(index), null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection()
-	 */
 	@Override
-	public Class<?> findDynamicProjection() {
-		return delegate.findDynamicProjection();
+	public @Nullable Score getScore() {
+		return delegate.getScore();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int)
-	 */
-	public Object getBindableValue(int index) {
-		return getConvertedValue(delegate.getBindableValue(index), null);
+	@Override
+	public @Nullable Range<Score> getScoreRange() {
+		return delegate.getScoreRange();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getDistanceRange()
-	 */
 	@Override
-	public Range<Distance> getDistanceRange() {
+	public @Nullable Range<Distance> getDistanceRange() {
 		return delegate.getDistanceRange();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation()
-	 */
-	public Point getGeoNearLocation() {
+	public @Nullable Point getGeoNearLocation() {
 		return delegate.getGeoNearLocation();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getFullText()
-	 */
-	public TextCriteria getFullText() {
+	public @Nullable TextCriteria getFullText() {
 		return delegate.getFullText();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getCollation()
-	 */
 	@Override
-	public Collation getCollation() {
+	public @Nullable Collation getCollation() {
 		return delegate.getCollation();
 	}
 
+	@Override
+	public @Nullable UpdateDefinition getUpdate() {
+		return delegate.getUpdate();
+	}
+
+	@Override
+	public Limit getLimit() {
+		return delegate.getLimit();
+	}
+
 	/**
 	 * Converts the given value with the underlying {@link MongoWriter}.
 	 *
 	 * @param value can be {@literal null}.
 	 * @param typeInformation can be {@literal null}.
-	 * @return
+	 * @return can be {@literal null}.
 	 */
-	@Nullable
-	private Object getConvertedValue(Object value, @Nullable TypeInformation<?> typeInformation) {
+	private @Nullable Object getConvertedValue(@Nullable Object value, @Nullable TypeInformation<?> typeInformation) {
 		return writer.convertToMongoType(value, typeInformation == null ? null : typeInformation.getActualType());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue()
-	 */
 	public boolean hasBindableNullValue() {
 		return delegate.hasBindableNullValue();
 	}
@@ -192,27 +174,15 @@ public ConvertingIterator(Iterator<Object> delegate) {
 			this.delegate = delegate;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.Iterator#hasNext()
-		 */
 		public boolean hasNext() {
 			return delegate.hasNext();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.Iterator#next()
-		 */
-		public Object next() {
+		public @Nullable Object next() {
 			return delegate.next();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.ConvertingParameterAccessor.PotentiallConvertingIterator#nextConverted()
-		 */
-		public Object nextConverted(MongoPersistentProperty property) {
+		public @Nullable Object nextConverted(MongoPersistentProperty property) {
 
 			Object next = next();
 
@@ -223,8 +193,10 @@ public Object nextConverted(MongoPersistentProperty property) {
 			if (property.isAssociation()) {
 				if (next.getClass().isArray() || next instanceof Iterable) {
 
-					List<DBRef> dbRefs = new ArrayList<DBRef>();
-					for (Object element : asCollection(next)) {
+					Collection<?> values = asCollection(next);
+
+					List<DBRef> dbRefs = new ArrayList<>(values.size());
+					for (Object element : values) {
 						dbRefs.add(writer.toDBRef(element, property));
 					}
 
@@ -237,10 +209,6 @@ public Object nextConverted(MongoPersistentProperty property) {
 			return getConvertedValue(next, property.getTypeInformation());
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.util.Iterator#remove()
-		 */
 		public void remove() {
 			delegate.remove();
 		}
@@ -251,18 +219,21 @@ public void remove() {
 	 * array. Will return an empty {@link Collection} in case {@literal null} is given. Will wrap all other types into a
 	 * single-element collection.
 	 *
-	 * @param source
-	 * @return
+	 * @param source can be {@literal null}, returns an empty {@link List} in that case.
+	 * @return never {@literal null}.
 	 */
 	private static Collection<?> asCollection(@Nullable Object source) {
 
-		if (source instanceof Iterable) {
+		if (source instanceof Iterable<?> iterable) {
 
-			List<Object> result = new ArrayList<Object>();
-			for (Object element : (Iterable<?>) source) {
-				result.add(element);
+			if (source instanceof Collection<?> collection) {
+				return new ArrayList<>(collection);
 			}
 
+			List<Object> result = new ArrayList<>();
+			for (Object element : iterable) {
+				result.add(element);
+			}
 			return result;
 		}
 
@@ -273,12 +244,8 @@ private static Collection<?> asCollection(@Nullable Object source) {
 		return source.getClass().isArray() ? CollectionUtils.arrayToList(source) : Collections.singleton(source);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getValues()
-	 */
 	@Override
-	public Object[] getValues() {
+	public Object @Nullable[] getValues() {
 		return delegate.getValues();
 	}
 
@@ -294,7 +261,6 @@ public interface PotentiallyConvertingIterator extends Iterator<Object> {
 		 *
 		 * @return
 		 */
-		Object nextConverted(MongoPersistentProperty property);
+		@Nullable Object nextConverted(MongoPersistentProperty property);
 	}
-
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java
deleted file mode 100644
index 4ce713e150..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/DtoInstantiatingConverter.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright 2015-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.repository.query;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.convert.EntityInstantiator;
-import org.springframework.data.convert.EntityInstantiators;
-import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.mapping.PersistentPropertyAccessor;
-import org.springframework.data.mapping.PreferredConstructor;
-import org.springframework.data.mapping.PreferredConstructor.Parameter;
-import org.springframework.data.mapping.SimplePropertyHandler;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.model.ParameterValueProvider;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.util.Assert;
-
-/**
- * {@link Converter} to instantiate DTOs from fully equipped domain objects.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- */
-class DtoInstantiatingConverter implements Converter<Object, Object> {
-
-	private final Class<?> targetType;
-	private final MappingContext<? extends PersistentEntity<?, ?>, ? extends PersistentProperty<?>> context;
-	private final EntityInstantiator instantiator;
-
-	/**
-	 * Creates a new {@link Converter} to instantiate DTOs.
-	 *
-	 * @param dtoType must not be {@literal null}.
-	 * @param context must not be {@literal null}.
-	 * @param instantiators must not be {@literal null}.
-	 */
-	public DtoInstantiatingConverter(Class<?> dtoType,
-			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context,
-			EntityInstantiators instantiator) {
-
-		Assert.notNull(dtoType, "DTO type must not be null!");
-		Assert.notNull(context, "MappingContext must not be null!");
-		Assert.notNull(instantiator, "EntityInstantiators must not be null!");
-
-		this.targetType = dtoType;
-		this.context = context;
-		this.instantiator = instantiator.getInstantiatorFor(context.getRequiredPersistentEntity(dtoType));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-	 */
-	@Override
-	public Object convert(Object source) {
-
-		if (targetType.isInterface()) {
-			return source;
-		}
-
-		final PersistentEntity<?, ?> sourceEntity = context.getRequiredPersistentEntity(source.getClass());
-		final PersistentPropertyAccessor sourceAccessor = sourceEntity.getPropertyAccessor(source);
-		final PersistentEntity<?, ?> targetEntity = context.getRequiredPersistentEntity(targetType);
-		final PreferredConstructor<?, ? extends PersistentProperty<?>> constructor = targetEntity
-				.getPersistenceConstructor();
-
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		Object dto = instantiator.createInstance(targetEntity, new ParameterValueProvider() {
-
-			@Override
-			public Object getParameterValue(Parameter parameter) {
-				return sourceAccessor.getProperty(sourceEntity.getPersistentProperty(parameter.getName().toString()));
-			}
-		});
-
-		final PersistentPropertyAccessor dtoAccessor = targetEntity.getPropertyAccessor(dto);
-
-		targetEntity.doWithProperties(new SimplePropertyHandler() {
-
-			@Override
-			public void doWithPersistentProperty(PersistentProperty<?> property) {
-
-				if (constructor.isConstructorParameter(property)) {
-					return;
-				}
-
-				dtoAccessor.setProperty(property,
-						sourceAccessor.getProperty(sourceEntity.getPersistentProperty(property.getName())));
-			}
-		});
-
-		return dto;
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityInformation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityInformation.java
index 22242a4f90..c54d689b52 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityInformation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.repository.core.EntityInformation;
-import org.springframework.lang.Nullable;
 
 /**
  * Mongo specific {@link EntityInformation}.
@@ -58,8 +58,7 @@ default boolean isVersioned() {
 	 * @return can be {@literal null}.
 	 * @since 2.2
 	 */
-	@Nullable
-	default Object getVersion(T entity) {
+	default @Nullable Object getVersion(T entity) {
 		return null;
 	}
 
@@ -75,7 +74,7 @@ default boolean hasCollation() {
 
 	/**
 	 * Return the collation for the entity or {@literal null} if {@link #hasCollation() not defined}.
-	 * 
+	 *
 	 * @return can be {@literal null}.
 	 * @since 2.2
 	 */
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityMetadata.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityMetadata.java
index 170c4943dd..9aa8af8cfe 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityMetadata.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoEntityMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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 @@ public interface MongoEntityMetadata<T> extends EntityMetadata<T> {
 
 	/**
 	 * Returns the {@link MongoPersistentEntity} that supposed to determine the collection to be queried.
-	 * 
+	 *
 	 * @return
 	 * @since 2.0.4
 	 */
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameterAccessor.java
index 43bdfcc22c..1b52233eac 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,16 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.domain.Range;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.lang.Nullable;
 
 /**
  * Mongo-specific {@link ParameterAccessor} exposing a maximum distance parameter.
@@ -39,7 +42,7 @@ public interface MongoParameterAccessor extends ParameterAccessor {
 	 * @return the maximum distance to apply to the geo query or {@literal null} if there's no {@link Distance} parameter
 	 *         at all or the given value for it was {@literal null}.
 	 */
-	Range<Distance> getDistanceRange();
+	@Nullable Range<Distance> getDistanceRange();
 
 	/**
 	 * Returns the {@link Point} to use for a geo-near query.
@@ -73,5 +76,14 @@ public interface MongoParameterAccessor extends ParameterAccessor {
 	 * @return
 	 * @since 1.8
 	 */
-	Object[] getValues();
+	Object @Nullable[] getValues();
+
+	/**
+	 * Returns the {@link Update} to be used for an update execution.
+	 *
+	 * @return {@literal null} if not present.
+	 * @since 3.4
+	 */
+	@Nullable
+	UpdateDefinition getUpdate();
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java
index e7800498a2..94acef17ce 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParameters.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,23 +15,30 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.List;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.core.MethodParameter;
 import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Vector;
 import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.GeoPage;
+import org.springframework.data.geo.GeoResult;
+import org.springframework.data.geo.GeoResults;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.repository.Near;
 import org.springframework.data.mongodb.repository.query.MongoParameters.MongoParameter;
 import org.springframework.data.repository.query.Parameter;
 import org.springframework.data.repository.query.Parameters;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
 
 /**
  * Custom extension of {@link Parameters} discovering additional
@@ -39,45 +46,70 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Thomas Darimont
  */
 public class MongoParameters extends Parameters<MongoParameters, MongoParameter> {
 
+	private static final List<Class<? extends Serializable>> GEO_NEAR_RESULTS = Arrays.asList(GeoResult.class,
+			GeoResults.class, GeoPage.class);
+
 	private final int rangeIndex;
 	private final int maxDistanceIndex;
-	private final @Nullable Integer fullTextIndex;
-	private final @Nullable Integer nearIndex;
-	private final @Nullable Integer collationIndex;
+	private final int fullTextIndex;
+	private final int nearIndex;
+	private final int collationIndex;
+	private final int updateIndex;
+	private final TypeInformation<?> domainType;
 
 	/**
 	 * Creates a new {@link MongoParameters} instance from the given {@link Method} and {@link MongoQueryMethod}.
 	 *
-	 * @param method must not be {@literal null}.
-	 * @param isGeoNearMethod indicate if this is a geo spatial query method
+	 * @param parametersSource must not be {@literal null}.
+	 * @since 4.5
 	 */
-	public MongoParameters(Method method, boolean isGeoNearMethod) {
+	public MongoParameters(ParametersSource parametersSource) {
+		this(parametersSource, isGeoNearQuery(parametersSource.getMethod()));
+	}
 
-		super(method);
+	/**
+	 * Creates a new {@link MongoParameters} instance from the given {@link Method} and {@link MongoQueryMethod}.
+	 *
+	 * @param parametersSource must not be {@literal null}.
+	 * @param isGeoNearMethod indicate if this is a geo-spatial query method
+	 */
+	public MongoParameters(ParametersSource parametersSource, boolean isGeoNearMethod) {
+		this(parametersSource, new NearIndex(parametersSource, isGeoNearMethod));
+	}
+
+	/**
+	 * Creates a new {@link MongoParameters} instance from the given {@link Method} and {@link MongoQueryMethod}.
+	 *
+	 * @param parametersSource must not be {@literal null}.
+	 * @param nearIndex the near parameter index.
+	 */
+	private MongoParameters(ParametersSource parametersSource, NearIndex nearIndex) {
+
+		super(parametersSource, methodParameter -> new MongoParameter(methodParameter,
+				parametersSource.getDomainTypeInformation(), nearIndex.nearIndex));
+
+		Method method = parametersSource.getMethod();
 		List<Class<?>> parameterTypes = Arrays.asList(method.getParameterTypes());
 
+		this.domainType = parametersSource.getDomainTypeInformation();
 		this.fullTextIndex = parameterTypes.indexOf(TextCriteria.class);
 
-		ClassTypeInformation<?> declaringClassInfo = ClassTypeInformation.from(method.getDeclaringClass());
+		TypeInformation<?> declaringClassInfo = TypeInformation.of(parametersSource.getContainingClass());
 		List<TypeInformation<?>> parameterTypeInfo = declaringClassInfo.getParameterTypes(method);
 
 		this.rangeIndex = getTypeIndex(parameterTypeInfo, Range.class, Distance.class);
 		this.maxDistanceIndex = this.rangeIndex == -1 ? getTypeIndex(parameterTypeInfo, Distance.class, null) : -1;
 		this.collationIndex = getTypeIndex(parameterTypeInfo, Collation.class, null);
-
-		int index = findNearIndexInParameters(method);
-		if (index == -1 && isGeoNearMethod) {
-			index = getNearIndex(parameterTypes);
-		}
-
-		this.nearIndex = index;
+		this.updateIndex = QueryUtils.indexOfAssignableParameter(UpdateDefinition.class, parameterTypes);
+		this.nearIndex = nearIndex.nearIndex;
 	}
 
-	private MongoParameters(List<MongoParameter> parameters, int maxDistanceIndex, @Nullable Integer nearIndex,
-			@Nullable Integer fullTextIndex, int rangeIndex, @Nullable Integer collationIndex) {
+	private MongoParameters(List<MongoParameter> parameters, int maxDistanceIndex, int nearIndex, int fullTextIndex,
+			int rangeIndex, int collationIndex, int updateIndex, TypeInformation<?> domainType) {
 
 		super(parameters);
 
@@ -86,9 +118,44 @@ private MongoParameters(List<MongoParameter> parameters, int maxDistanceIndex, @
 		this.maxDistanceIndex = maxDistanceIndex;
 		this.rangeIndex = rangeIndex;
 		this.collationIndex = collationIndex;
+		this.updateIndex = updateIndex;
+		this.domainType = domainType;
 	}
 
-	private final int getNearIndex(List<Class<?>> parameterTypes) {
+	static boolean isGeoNearQuery(Method method) {
+
+		Class<?> returnType = method.getReturnType();
+
+		for (Class<?> type : GEO_NEAR_RESULTS) {
+			if (type.isAssignableFrom(returnType)) {
+				return true;
+			}
+		}
+
+		if (Iterable.class.isAssignableFrom(returnType)) {
+			TypeInformation<?> from = TypeInformation.fromReturnTypeOf(method);
+			return GeoResult.class.equals(from.getRequiredComponentType().getType());
+		}
+
+		return false;
+	}
+
+	static class NearIndex {
+
+		private final int nearIndex;
+
+		public NearIndex(ParametersSource parametersSource, boolean isGeoNearMethod) {
+
+			int index = findNearIndexInParameters(parametersSource.getMethod());
+			if (index == -1 && isGeoNearMethod) {
+				index = getNearIndex(Arrays.asList(parametersSource.getMethod().getParameterTypes()));
+			}
+
+			this.nearIndex = index;
+		}
+	}
+
+	private static int getNearIndex(List<Class<?>> parameterTypes) {
 
 		for (Class<?> reference : Arrays.asList(Point.class, double[].class)) {
 
@@ -101,25 +168,28 @@ private final int getNearIndex(List<Class<?>> parameterTypes) {
 			if (nearIndex == parameterTypes.lastIndexOf(reference)) {
 				return nearIndex;
 			} else {
-				throw new IllegalStateException("Multiple Point parameters found but none annotated with @Near!");
+				throw new IllegalStateException("Multiple Point parameters found but none annotated with @Near");
 			}
 		}
 
 		return -1;
 	}
 
-	private int findNearIndexInParameters(Method method) {
+	static int findNearIndexInParameters(Method method) {
 
 		int index = -1;
 		for (java.lang.reflect.Parameter p : method.getParameters()) {
 
-			MongoParameter param = createParameter(MethodParameter.forParameter(p));
-			if (param.isManuallyAnnotatedNearParameter()) {
+			MethodParameter methodParameter = MethodParameter.forParameter(p);
+
+			if ((Point.class.isAssignableFrom(methodParameter.getParameterType())
+					|| methodParameter.getParameterType().equals(double[].class))
+					&& methodParameter.hasParameterAnnotation(Near.class)) {
 				if (index == -1) {
-					index = param.getIndex();
+					index = methodParameter.getParameterIndex();
 				} else {
 					throw new IllegalStateException(
-							String.format("Found multiple @Near annotations ond method %s! Only one allowed!", method.toString()));
+							String.format("Found multiple @Near annotations ond method %s; Only one allowed", method));
 				}
 
 			}
@@ -127,19 +197,6 @@ private int findNearIndexInParameters(Method method) {
 		return index;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.Parameters#createParameter(org.springframework.core.MethodParameter)
-	 */
-	@Override
-	protected MongoParameter createParameter(MethodParameter parameter) {
-		return new MongoParameter(parameter);
-	}
-
-	public int getDistanceRangeIndex() {
-		return -1;
-	}
-
 	/**
 	 * Returns the index of the {@link Distance} parameter to be used for max distance in geo queries.
 	 *
@@ -160,13 +217,13 @@ public int getNearIndex() {
 	}
 
 	/**
-	 * Returns the index of the parameter to be used as a textquery param
+	 * Returns the index of the parameter to be used as a text query param
 	 *
 	 * @return
 	 * @since 1.6
 	 */
 	public int getFullTextParameterIndex() {
-		return fullTextIndex != null ? fullTextIndex.intValue() : -1;
+		return fullTextIndex;
 	}
 
 	/**
@@ -174,7 +231,7 @@ public int getFullTextParameterIndex() {
 	 * @since 1.6
 	 */
 	public boolean hasFullTextParameter() {
-		return this.fullTextIndex != null && this.fullTextIndex.intValue() >= 0;
+		return this.fullTextIndex >= 0;
 	}
 
 	/**
@@ -192,17 +249,23 @@ public int getRangeIndex() {
 	 * @since 2.2
 	 */
 	public int getCollationParameterIndex() {
-		return collationIndex != null ? collationIndex.intValue() : -1;
+		return collationIndex;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.Parameters#createFrom(java.util.List)
+	/**
+	 * Returns the index of the {@link UpdateDefinition} parameter or -1 if not present.
+	 *
+	 * @return -1 if not present.
+	 * @since 3.4
 	 */
+	public int getUpdateIndex() {
+		return updateIndex;
+	}
+
 	@Override
 	protected MongoParameters createFrom(List<MongoParameter> parameters) {
 		return new MongoParameters(parameters, this.maxDistanceIndex, this.nearIndex, this.fullTextIndex, this.rangeIndex,
-				this.collationIndex);
+				this.collationIndex, this.updateIndex, this.domainType);
 	}
 
 	private int getTypeIndex(List<TypeInformation<?>> parameterTypes, Class<?> type, @Nullable Class<?> componentType) {
@@ -229,36 +292,35 @@ private int getTypeIndex(List<TypeInformation<?>> parameterTypes, Class<?> type,
 	 *
 	 * @author Oliver Gierke
 	 */
-	class MongoParameter extends Parameter {
+	static class MongoParameter extends Parameter {
 
 		private final MethodParameter parameter;
+		private final @Nullable Integer nearIndex;
 
 		/**
 		 * Creates a new {@link MongoParameter}.
 		 *
 		 * @param parameter must not be {@literal null}.
+		 * @param domainType must not be {@literal null}.
 		 */
-		MongoParameter(MethodParameter parameter) {
-			super(parameter);
+		MongoParameter(MethodParameter parameter, TypeInformation<?> domainType, @Nullable Integer nearIndex) {
+			super(parameter, domainType);
 			this.parameter = parameter;
+			this.nearIndex = nearIndex;
 
 			if (!isPoint() && hasNearAnnotation()) {
-				throw new IllegalArgumentException("Near annotation is only allowed at Point parameter!");
+				throw new IllegalArgumentException("Near annotation is only allowed at Point parameter");
 			}
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.Parameter#isSpecialParameter()
-		 */
 		@Override
 		public boolean isSpecialParameter() {
-			return super.isSpecialParameter() || Distance.class.isAssignableFrom(getType()) || isNearParameter()
+			return super.isSpecialParameter() || Distance.class.isAssignableFrom(getType())
+					|| Vector.class.isAssignableFrom(getType()) || isNearParameter()
 					|| TextCriteria.class.isAssignableFrom(getType()) || Collation.class.isAssignableFrom(getType());
 		}
 
 		private boolean isNearParameter() {
-			Integer nearIndex = MongoParameters.this.nearIndex;
 			return nearIndex != null && nearIndex.equals(getIndex());
 		}
 
@@ -273,7 +335,6 @@ private boolean isPoint() {
 		private boolean hasNearAnnotation() {
 			return parameter.getParameterAnnotation(Near.class) != null;
 		}
-
 	}
 
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java
index 5f26803ddc..0f56223492 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,19 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import org.jspecify.annotations.Nullable;
+
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
+import org.springframework.data.domain.Score;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Term;
 import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.lang.Nullable;
+import org.springframework.lang.Contract;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -37,7 +41,7 @@
  */
 public class MongoParametersParameterAccessor extends ParametersParameterAccessor implements MongoParameterAccessor {
 
-	private final MongoQueryMethod method;
+	final MongoQueryMethod method;
 
 	/**
 	 * Creates a new {@link MongoParametersParameterAccessor}.
@@ -52,6 +56,24 @@ public MongoParametersParameterAccessor(MongoQueryMethod method, Object[] values
 		this.method = method;
 	}
 
+	@SuppressWarnings("NullAway")
+	@Override
+	public Range<Score> getScoreRange() {
+
+		MongoParameters mongoParameters = method.getParameters();
+
+		if (mongoParameters.hasScoreRangeParameter()) {
+			return getValue(mongoParameters.getScoreRangeIndex());
+		}
+
+		Score score = getScore();
+		Bound<Score> maxDistance = score != null ? Bound.inclusive(score) : Bound.unbounded();
+
+		return Range.of(Bound.unbounded(), maxDistance);
+	}
+
+	@SuppressWarnings("NullAway")
+	@Override
 	public Range<Distance> getDistanceRange() {
 
 		MongoParameters mongoParameters = method.getParameters();
@@ -69,11 +91,7 @@ public Range<Distance> getDistanceRange() {
 		return Range.of(Bound.unbounded(), maxDistance);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation()
-	 */
-	public Point getGeoNearLocation() {
+	public @Nullable Point getGeoNearLocation() {
 
 		int nearIndex = method.getParameters().getNearIndex();
 
@@ -87,10 +105,9 @@ public Point getGeoNearLocation() {
 			return null;
 		}
 
-		if (value instanceof double[]) {
-			double[] typedValue = (double[]) value;
+		if (value instanceof double[] typedValue) {
 			if (typedValue.length != 2) {
-				throw new IllegalArgumentException("The given double[] must have exactly 2 elements!");
+				throw new IllegalArgumentException("The given double[] must have exactly 2 elements");
 			} else {
 				return new Point(typedValue[0], typedValue[1]);
 			}
@@ -99,31 +116,27 @@ public Point getGeoNearLocation() {
 		return (Point) value;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getFullText()
-	 */
-	@Nullable
 	@Override
-	public TextCriteria getFullText() {
+	public @Nullable TextCriteria getFullText() {
 		int index = method.getParameters().getFullTextParameterIndex();
 		return index >= 0 ? potentiallyConvertFullText(getValue(index)) : null;
 	}
 
-	protected TextCriteria potentiallyConvertFullText(Object fullText) {
+	@Contract("null -> fail")
+	protected TextCriteria potentiallyConvertFullText(@Nullable Object fullText) {
 
 		Assert.notNull(fullText, "Fulltext parameter must not be 'null'.");
 
-		if (fullText instanceof String) {
-			return TextCriteria.forDefaultLanguage().matching((String) fullText);
+		if (fullText instanceof String stringValue) {
+			return TextCriteria.forDefaultLanguage().matching(stringValue);
 		}
 
-		if (fullText instanceof Term) {
-			return TextCriteria.forDefaultLanguage().matching((Term) fullText);
+		if (fullText instanceof Term term) {
+			return TextCriteria.forDefaultLanguage().matching(term);
 		}
 
-		if (fullText instanceof TextCriteria) {
-			return ((TextCriteria) fullText);
+		if (fullText instanceof TextCriteria textCriteria) {
+			return textCriteria;
 		}
 
 		throw new IllegalArgumentException(
@@ -131,12 +144,8 @@ protected TextCriteria potentiallyConvertFullText(Object fullText) {
 						ClassUtils.getShortName(fullText.getClass())));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getCollation()
-	 */
 	@Override
-	public Collation getCollation() {
+	public @Nullable Collation getCollation() {
 
 		if (method.getParameters().getCollationParameterIndex() == -1) {
 			return null;
@@ -145,12 +154,15 @@ public Collation getCollation() {
 		return getValue(method.getParameters().getCollationParameterIndex());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getValues()
-	 */
 	@Override
-	public Object[] getValues() {
+	public Object @Nullable[] getValues() {
 		return super.getValues();
 	}
+
+	@Override
+	public @Nullable UpdateDefinition getUpdate() {
+
+		int updateIndex = method.getParameters().getUpdateIndex();
+		return updateIndex == -1 ? null : (UpdateDefinition) getValue(updateIndex);
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
index 7ed2d4e17c..ba7394ec17 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryCreator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,8 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Criteria.Placeholder;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -23,9 +24,10 @@
 import java.util.Optional;
 import java.util.regex.Pattern;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.BsonRegularExpression;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
 import org.springframework.data.domain.Sort;
@@ -51,8 +53,10 @@
 import org.springframework.data.repository.query.parser.Part.IgnoreCaseType;
 import org.springframework.data.repository.query.parser.Part.Type;
 import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.data.util.Streamable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Custom query creator to create Mongo criterias.
@@ -62,13 +66,14 @@
  * @author Christoph Strobl
  * @author Edward Prentice
  */
-class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
+public class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 
-	private static final Logger LOG = LoggerFactory.getLogger(MongoQueryCreator.class);
+	private static final Log LOG = LogFactory.getLog(MongoQueryCreator.class);
 
 	private final MongoParameterAccessor accessor;
 	private final MappingContext<?, MongoPersistentProperty> context;
 	private final boolean isGeoNearQuery;
+	private final boolean isSearchQuery;
 
 	/**
 	 * Creates a new {@link MongoQueryCreator} from the given {@link PartTree}, {@link ConvertingParameterAccessor} and
@@ -78,9 +83,9 @@ class MongoQueryCreator extends AbstractQueryCreator<Query, Criteria> {
 	 * @param accessor
 	 * @param context
 	 */
-	public MongoQueryCreator(PartTree tree, ConvertingParameterAccessor accessor,
+	public MongoQueryCreator(PartTree tree, MongoParameterAccessor accessor,
 			MappingContext<?, MongoPersistentProperty> context) {
-		this(tree, accessor, context, false);
+		this(tree, accessor, context, false, false);
 	}
 
 	/**
@@ -91,28 +96,31 @@ public MongoQueryCreator(PartTree tree, ConvertingParameterAccessor accessor,
 	 * @param accessor
 	 * @param context
 	 * @param isGeoNearQuery
+	 * @param isSearchQuery
 	 */
-	public MongoQueryCreator(PartTree tree, ConvertingParameterAccessor accessor,
-			MappingContext<?, MongoPersistentProperty> context, boolean isGeoNearQuery) {
+	public MongoQueryCreator(PartTree tree, MongoParameterAccessor accessor,
+			MappingContext<?, MongoPersistentProperty> context, boolean isGeoNearQuery, boolean isSearchQuery) {
 
 		super(tree, accessor);
 
-		Assert.notNull(context, "MappingContext must not be null!");
+		Assert.notNull(context, "MappingContext must not be null");
 
 		this.accessor = accessor;
 		this.isGeoNearQuery = isGeoNearQuery;
+		this.isSearchQuery = isSearchQuery;
 		this.context = context;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#create(org.springframework.data.repository.query.parser.Part, java.util.Iterator)
-	 */
 	@Override
 	protected Criteria create(Part part, Iterator<Object> iterator) {
 
 		if (isGeoNearQuery && part.getType().equals(Type.NEAR)) {
-			return null;
+			return new Criteria();
+		}
+
+		if (isPartOfSearchQuery(part)) {
+			skip(part, iterator);
+			return new Criteria();
 		}
 
 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
@@ -121,10 +129,6 @@ protected Criteria create(Part part, Iterator<Object> iterator) {
 		return from(part, property, where(path.toDotPath()), iterator);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#and(org.springframework.data.repository.query.parser.Part, java.lang.Object, java.util.Iterator)
-	 */
 	@Override
 	protected Criteria and(Part part, Criteria base, Iterator<Object> iterator) {
 
@@ -132,16 +136,17 @@ protected Criteria and(Part part, Criteria base, Iterator<Object> iterator) {
 			return create(part, iterator);
 		}
 
+		if (isPartOfSearchQuery(part)) {
+			skip(part, iterator);
+			return base;
+		}
+
 		PersistentPropertyPath<MongoPersistentProperty> path = context.getPersistentPropertyPath(part.getProperty());
 		MongoPersistentProperty property = path.getLeafProperty();
 
 		return from(part, property, base.and(path.toDotPath()), iterator);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#or(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	protected Criteria or(Criteria base, Criteria criteria) {
 
@@ -149,12 +154,8 @@ protected Criteria or(Criteria base, Criteria criteria) {
 		return result.orOperator(base, criteria);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.parser.AbstractQueryCreator#complete(java.lang.Object, org.springframework.data.domain.Sort)
-	 */
 	@Override
-	protected Query complete(Criteria criteria, Sort sort) {
+	protected Query complete(@Nullable Criteria criteria, Sort sort) {
 
 		Query query = (criteria == null ? new Query() : new Query(criteria)).with(sort);
 
@@ -174,6 +175,7 @@ protected Query complete(Criteria criteria, Sort sort) {
 	 * @param parameters
 	 * @return
 	 */
+	@SuppressWarnings("NullAway")
 	private Criteria from(Part part, MongoPersistentProperty property, Criteria criteria, Iterator<Object> parameters) {
 
 		Type type = part.getType();
@@ -196,9 +198,17 @@ private Criteria from(Part part, MongoPersistentProperty property, Criteria crit
 			case IS_NULL:
 				return criteria.is(null);
 			case NOT_IN:
-				return criteria.nin(nextAsArray(parameters));
+				Object ninValue = parameters.next();
+				if (ninValue instanceof Placeholder) {
+					return criteria.raw("$nin", ninValue);
+				}
+				return criteria.nin(valueAsList(ninValue, part));
 			case IN:
-				return criteria.in(nextAsArray(parameters));
+				Object inValue = parameters.next();
+				if (inValue instanceof Placeholder) {
+					return criteria.raw("$in", inValue);
+				}
+				return criteria.in(valueAsList(inValue, part));
 			case LIKE:
 			case STARTING_WITH:
 			case ENDING_WITH:
@@ -211,9 +221,14 @@ private Criteria from(Part part, MongoPersistentProperty property, Criteria crit
 			case REGEX:
 
 				Object param = parameters.next();
-				return param instanceof Pattern ? criteria.regex((Pattern) param) : criteria.regex(param.toString());
+				return param instanceof Pattern pattern ? criteria.regex(pattern) : criteria.regex(param.toString());
 			case EXISTS:
-				return criteria.exists((Boolean) parameters.next());
+				Object next = parameters.next();
+				if (next instanceof Placeholder placeholder) {
+					return criteria.raw("$exists", placeholder);
+				} else {
+					return criteria.exists((Boolean) next);
+				}
 			case TRUE:
 				return criteria.is(true);
 			case FALSE:
@@ -256,30 +271,25 @@ private Criteria from(Part part, MongoPersistentProperty property, Criteria crit
 				return criteria.within((Shape) parameter);
 			case SIMPLE_PROPERTY:
 
-				return isSimpleComparisionPossible(part) ? criteria.is(parameters.next())
+				return isSimpleComparisonPossible(part) ? criteria.is(parameters.next())
 						: createLikeRegexCriteriaOrThrow(part, property, criteria, parameters, false);
 
 			case NEGATING_SIMPLE_PROPERTY:
 
-				return isSimpleComparisionPossible(part) ? criteria.ne(parameters.next())
+				return isSimpleComparisonPossible(part) ? criteria.ne(parameters.next())
 						: createLikeRegexCriteriaOrThrow(part, property, criteria, parameters, true);
 			default:
-				throw new IllegalArgumentException("Unsupported keyword!");
+				throw new IllegalArgumentException("Unsupported keyword");
 		}
 	}
 
-	private boolean isSimpleComparisionPossible(Part part) {
+	private boolean isSimpleComparisonPossible(Part part) {
 
-		switch (part.shouldIgnoreCase()) {
-			case NEVER:
-				return true;
-			case WHEN_POSSIBLE:
-				return part.getProperty().getType() != String.class;
-			case ALWAYS:
-				return false;
-			default:
-				return true;
-		}
+		return switch (part.shouldIgnoreCase()) {
+			case NEVER -> true;
+			case WHEN_POSSIBLE -> part.getProperty().getType() != String.class;
+			case ALWAYS -> false;
+		};
 	}
 
 	/**
@@ -337,7 +347,11 @@ private Criteria createContainingCriteria(Part part, MongoPersistentProperty pro
 			Iterator<Object> parameters) {
 
 		if (property.isCollectionLike()) {
-			return criteria.in(nextAsArray(parameters));
+			Object next = parameters.next();
+			if (next instanceof Placeholder) {
+				return criteria.raw("$in", next);
+			}
+			return criteria.in(valueAsList(next, part));
 		}
 
 		return addAppropriateLikeRegexTo(criteria, part, parameters.next());
@@ -351,12 +365,13 @@ private Criteria createContainingCriteria(Part part, MongoPersistentProperty pro
 	 * @param value
 	 * @return the criteria extended with the regex.
 	 */
+	@SuppressWarnings("NullAway")
 	private Criteria addAppropriateLikeRegexTo(Criteria criteria, Part part, Object value) {
 
 		if (value == null) {
 
 			throw new IllegalArgumentException(String.format(
-					"Argument for creating $regex pattern for property '%s' must not be null!", part.getProperty().getSegment()));
+					"Argument for creating $regex pattern for property '%s' must not be null", part.getProperty().getSegment()));
 		}
 
 		return criteria.regex(toLikeRegex(value.toString(), part), toRegexOptions(part));
@@ -366,7 +381,7 @@ private Criteria addAppropriateLikeRegexTo(Criteria criteria, Part part, Object
 	 * @param part
 	 * @return the regex options or {@literal null}.
 	 */
-	private String toRegexOptions(Part part) {
+	private @Nullable String toRegexOptions(Part part) {
 
 		String regexOptions = null;
 		switch (part.shouldIgnoreCase()) {
@@ -397,26 +412,44 @@ private <T> T nextAs(Iterator<Object> iterator, Class<T> type) {
 		}
 
 		throw new IllegalArgumentException(
-				String.format("Expected parameter type of %s but got %s!", type, parameter.getClass()));
+				String.format("Expected parameter type of %s but got %s", type, parameter.getClass()));
 	}
 
-	private Object[] nextAsArray(Iterator<Object> iterator) {
+	private java.util.List<?> valueAsList(Object value, Part part) {
+
+		Streamable<?> streamable = asStreamable(value);
+		if (!isSimpleComparisonPossible(part)) {
 
-		Object next = iterator.next();
+			MatchMode matchMode = toMatchMode(part.getType());
+			String regexOptions = toRegexOptions(part);
 
-		if (next instanceof Collection) {
-			return ((Collection<?>) next).toArray();
-		} else if (next != null && next.getClass().isArray()) {
-			return (Object[]) next;
+			streamable = streamable.map(it -> {
+				if (it instanceof String sv) {
+
+					return new BsonRegularExpression(MongoRegexCreator.INSTANCE.toRegularExpression(sv, matchMode), regexOptions);
+				}
+				return it;
+			});
 		}
 
-		return new Object[] { next };
+		return streamable.toList();
 	}
 
-	private String toLikeRegex(String source, Part part) {
+	private Streamable<?> asStreamable(Object value) {
+
+		if (value instanceof Collection<?> collection) {
+			return Streamable.of(collection);
+		} else if (ObjectUtils.isArray(value)) {
+			return Streamable.of((Object[]) value);
+		}
+		return Streamable.of(value);
+	}
+
+	private @Nullable String toLikeRegex(String source, Part part) {
 		return MongoRegexCreator.INSTANCE.toRegularExpression(source, toMatchMode(part.getType()));
 	}
 
+	@SuppressWarnings("NullAway")
 	private boolean isSpherical(MongoPersistentProperty property) {
 
 		if (property.isAnnotationPresent(GeoSpatialIndexed.class)) {
@@ -427,10 +460,23 @@ private boolean isSpherical(MongoPersistentProperty property) {
 		return false;
 	}
 
+	private boolean isPartOfSearchQuery(Part part) {
+		return isSearchQuery && (part.getType().equals(Type.NEAR) || part.getType().equals(Type.WITHIN));
+	}
+
+	private static void skip(Part part, Iterator<?> parameters) {
+
+		int total = part.getNumberOfArguments();
+		int i = 0;
+		while (parameters.hasNext() && i < total) {
+			parameters.next();
+			i++;
+		}
+	}
+
 	/**
 	 * Compute a {@link Type#BETWEEN} typed {@link Part} using {@link Criteria#gt(Object) $gt},
-	 * {@link Criteria#gte(Object) $gte}, {@link Criteria#lt(Object) $lt} and {@link Criteria#lte(Object) $lte}.
-	 * <p/>
+	 * {@link Criteria#gte(Object) $gte}, {@link Criteria#lt(Object) $lt} and {@link Criteria#lte(Object) $lte}. <br />
 	 * In case the first {@literal value} is actually a {@link Range} the lower and upper bounds of the {@link Range} are
 	 * used according to their {@link Bound#isInclusive() inclusion} definition. Otherwise the {@literal value} is used
 	 * for {@literal $gt} and {@link Iterator#next() parameters.next()} as {@literal $lt}.
@@ -443,11 +489,10 @@ private boolean isSpherical(MongoPersistentProperty property) {
 	private static Criteria computeBetweenPart(Criteria criteria, Iterator<Object> parameters) {
 
 		Object value = parameters.next();
-		if (!(value instanceof Range)) {
+		if (!(value instanceof Range<?> range)) {
 			return criteria.gt(value).lt(parameters.next());
 		}
 
-		Range<?> range = (Range<?>) value;
 		Optional<?> min = range.getLowerBound().getValue();
 		Optional<?> max = range.getUpperBound().getValue();
 
@@ -474,24 +519,14 @@ private static Criteria computeBetweenPart(Criteria criteria, Iterator<Object> p
 
 	private static MatchMode toMatchMode(Type type) {
 
-		switch (type) {
-			case NOT_CONTAINING:
-			case CONTAINING:
-				return MatchMode.CONTAINING;
-			case STARTING_WITH:
-				return MatchMode.STARTING_WITH;
-			case ENDING_WITH:
-				return MatchMode.ENDING_WITH;
-			case LIKE:
-			case NOT_LIKE:
-				return MatchMode.LIKE;
-			case REGEX:
-				return MatchMode.REGEX;
-			case NEGATING_SIMPLE_PROPERTY:
-			case SIMPLE_PROPERTY:
-				return MatchMode.EXACT;
-			default:
-				return MatchMode.DEFAULT;
-		}
+		return switch (type) {
+			case NOT_CONTAINING, CONTAINING -> MatchMode.CONTAINING;
+			case STARTING_WITH -> MatchMode.STARTING_WITH;
+			case ENDING_WITH -> MatchMode.ENDING_WITH;
+			case LIKE, NOT_LIKE -> MatchMode.LIKE;
+			case REGEX -> MatchMode.REGEX;
+			case NEGATING_SIMPLE_PROPERTY, SIMPLE_PROPERTY, IN -> MatchMode.EXACT;
+			default -> MatchMode.DEFAULT;
+		};
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java
index cbd8eb0824..c0531e0e19 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,19 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
-
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
+import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.domain.ScoringFunction;
+import org.springframework.data.domain.SearchResult;
+import org.springframework.data.domain.SearchResults;
+import org.springframework.data.domain.Similarity;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.SliceImpl;
 import org.springframework.data.geo.Distance;
@@ -30,13 +35,28 @@
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.geo.Point;
+import org.springframework.data.mongodb.core.ExecutableAggregationOperation.TerminatingAggregation;
+import org.springframework.data.mongodb.core.ExecutableFindOperation;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind;
+import org.springframework.data.mongodb.core.ExecutableRemoveOperation;
+import org.springframework.data.mongodb.core.ExecutableRemoveOperation.ExecutableRemove;
+import org.springframework.data.mongodb.core.ExecutableRemoveOperation.TerminatingRemove;
+import org.springframework.data.mongodb.core.ExecutableUpdateOperation.ExecutableUpdate;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.repository.support.PageableExecutionUtils;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.query.VectorSearchDelegate.QueryContainer;
+import org.springframework.data.mongodb.repository.util.SliceUtils;
+import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.data.util.TypeInformation;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 
 import com.mongodb.client.result.DeleteResult;
 
@@ -50,8 +70,9 @@
  * @author Christoph Strobl
  */
 @FunctionalInterface
-interface MongoQueryExecution {
+public interface MongoQueryExecution {
 
+	@Nullable
 	Object execute(Query query);
 
 	/**
@@ -61,29 +82,33 @@ interface MongoQueryExecution {
 	 * @author Christoph Strobl
 	 * @since 1.5
 	 */
-	@RequiredArgsConstructor
-	final class SlicedExecution implements MongoQueryExecution {
+	final class SlicedExecution<T> implements MongoQueryExecution {
+
+		private final FindWithQuery<T> find;
+		private final Pageable pageable;
+
+		public SlicedExecution(ExecutableFindOperation.FindWithQuery<T> find, Pageable pageable) {
 
-		private final @NonNull FindWithQuery<?> find;
-		private final @NonNull Pageable pageable;
+			Assert.notNull(find, "Find must not be null");
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			this.find = find;
+			this.pageable = pageable;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
 		@SuppressWarnings({ "unchecked", "rawtypes" })
-		public Object execute(Query query) {
+		public Slice<T> execute(Query query) {
 
 			int pageSize = pageable.getPageSize();
 
 			// Apply Pageable but tweak limit to peek into next page
-			Query modifiedQuery = query.with(pageable).limit(pageSize + 1);
+			Query modifiedQuery = SliceUtils.limitResult(query, pageable).with(pageable.getSort());
 			List result = find.matching(modifiedQuery).all();
 
 			boolean hasNext = result.size() > pageSize;
 
-			return new SliceImpl<Object>(hasNext ? result.subList(0, pageSize) : result, pageable, hasNext);
+			return new SliceImpl<T>(hasNext ? result.subList(0, pageSize) : result, pageable, hasNext);
 		}
 	}
 
@@ -94,22 +119,26 @@ public Object execute(Query query) {
 	 * @author Mark Paluch
 	 * @author Christoph Strobl
 	 */
-	@RequiredArgsConstructor
-	final class PagedExecution implements MongoQueryExecution {
+	final class PagedExecution<T> implements MongoQueryExecution {
+
+		private final FindWithQuery<T> operation;
+		private final Pageable pageable;
+
+		public PagedExecution(ExecutableFindOperation.FindWithQuery<T> operation, Pageable pageable) {
 
-		private final @NonNull FindWithQuery<?> operation;
-		private final @NonNull Pageable pageable;
+			Assert.notNull(operation, "Operation must not be null");
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			this.operation = operation;
+			this.pageable = pageable;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
-		public Object execute(Query query) {
+		public Page<T> execute(Query query) {
 
 			int overallLimit = query.getLimit();
 
-			TerminatingFind<?> matching = operation.matching(query);
+			TerminatingFind<T> matching = operation.matching(query);
 
 			// Apply raw pagination
 			query.with(pageable);
@@ -132,17 +161,24 @@ public Object execute(Query query) {
 	 *
 	 * @author Oliver Gierke
 	 */
-	@RequiredArgsConstructor
 	class GeoNearExecution implements MongoQueryExecution {
 
-		private final @NonNull FindWithQuery<?> operation;
-		private final @NonNull MongoQueryMethod method;
-		private final @NonNull MongoParameterAccessor accessor;
+		private final FindWithQuery<?> operation;
+		private final MongoQueryMethod method;
+		private final MongoParameterAccessor accessor;
+
+		public GeoNearExecution(ExecutableFindOperation.FindWithQuery<?> operation, MongoQueryMethod method,
+				MongoParameterAccessor accessor) {
+
+			Assert.notNull(operation, "Operation must not be null");
+			Assert.notNull(method, "Method must not be null");
+			Assert.notNull(accessor, "Accessor must not be null");
+
+			this.operation = operation;
+			this.method = method;
+			this.accessor = accessor;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
 		public Object execute(Query query) {
 
@@ -150,10 +186,12 @@ public Object execute(Query query) {
 			return isListOfGeoResult(method.getReturnType()) ? results.getContent() : results;
 		}
 
-		@SuppressWarnings("unchecked")
+		@SuppressWarnings({ "unchecked", "NullAway" })
 		GeoResults<Object> doExecuteQuery(Query query) {
 
 			Point nearLocation = accessor.getGeoNearLocation();
+			Assert.notNull(nearLocation, "[query.location] must not be null");
+
 			NearQuery nearQuery = NearQuery.near(nearLocation);
 
 			if (query != null) {
@@ -161,6 +199,8 @@ GeoResults<Object> doExecuteQuery(Query query) {
 			}
 
 			Range<Distance> distances = accessor.getDistanceRange();
+			Assert.notNull(nearLocation, "[query.distance] must not be null");
+
 			distances.getLowerBound().getValue().ifPresent(it -> nearQuery.minDistance(it).in(it.getMetric()));
 			distances.getUpperBound().getValue().ifPresent(it -> nearQuery.maxDistance(it).in(it.getMetric()));
 
@@ -181,6 +221,84 @@ private static boolean isListOfGeoResult(TypeInformation<?> returnType) {
 		}
 	}
 
+	/**
+	 * {@link MongoQueryExecution} to execute vector search.
+	 *
+	 * @author Mark Paluch
+	 * @author Chistoph Strobl
+	 * @since 5.0
+	 */
+	class VectorSearchExecution implements MongoQueryExecution {
+
+		private final MongoOperations operations;
+		private final TypeInformation<?> returnType;
+		private final String collectionName;
+		private final Class<?> targetType;
+		private final ScoringFunction scoringFunction;
+		private final AggregationPipeline pipeline;
+
+		VectorSearchExecution(MongoOperations operations, MongoQueryMethod method, String collectionName,
+				QueryContainer queryContainer) {
+			this(operations, queryContainer.outputType(), collectionName, method.getReturnType(), queryContainer.pipeline(),
+					queryContainer.scoringFunction());
+		}
+
+		public VectorSearchExecution(MongoOperations operations, Class<?> targetType, String collectionName,
+				TypeInformation<?> returnType, AggregationPipeline pipeline, ScoringFunction scoringFunction) {
+
+			this.operations = operations;
+			this.returnType = returnType;
+			this.collectionName = collectionName;
+			this.targetType = targetType;
+			this.scoringFunction = scoringFunction;
+			this.pipeline = pipeline;
+		}
+
+		@Override
+		@SuppressWarnings({ "unchecked", "rawtypes" })
+		public Object execute(Query query) {
+
+			TerminatingAggregation<?> executableAggregation = operations.aggregateAndReturn(targetType)
+					.inCollection(collectionName).by(TypedAggregation.newAggregation(targetType, pipeline.getOperations()));
+
+			if (!isSearchResult(returnType)) {
+				return executableAggregation.all().getMappedResults();
+			}
+
+			AggregationResults<? extends SearchResult<?>> result = executableAggregation
+					.map((raw, container) -> new SearchResult<>(container.get(),
+							Similarity.raw(raw.getDouble("__score__"), scoringFunction)))
+					.all();
+
+			return isListOfSearchResult(returnType) ? result.getMappedResults()
+					: new SearchResults(result.getMappedResults());
+		}
+
+		private static boolean isListOfSearchResult(TypeInformation<?> returnType) {
+
+			if (!Collection.class.isAssignableFrom(returnType.getType())) {
+				return false;
+			}
+
+			TypeInformation<?> componentType = returnType.getComponentType();
+			return componentType != null && SearchResult.class.equals(componentType.getType());
+		}
+
+		private static boolean isSearchResult(TypeInformation<?> returnType) {
+
+			if (SearchResults.class.isAssignableFrom(returnType.getType())) {
+				return true;
+			}
+
+			if (!Iterable.class.isAssignableFrom(returnType.getType())) {
+				return false;
+			}
+
+			TypeInformation<?> componentType = returnType.getComponentType();
+			return componentType != null && SearchResult.class.equals(componentType.getType());
+		}
+	}
+
 	/**
 	 * {@link MongoQueryExecution} to execute geo-near queries with paging.
 	 *
@@ -203,10 +321,6 @@ final class PagingGeoNearExecution extends GeoNearExecution {
 			this.mongoQuery = query;
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution.GeoNearExecution#execute(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
 		public Object execute(Query query) {
 
@@ -235,28 +349,75 @@ public Object execute(Query query) {
 	 * @author Christoph Strobl
 	 * @since 1.5
 	 */
-	@RequiredArgsConstructor
-	final class DeleteExecution implements MongoQueryExecution {
+	final class DeleteExecution<T> implements MongoQueryExecution {
+
+		private ExecutableRemoveOperation.ExecutableRemove<T> remove;
+		private Type type;
+
+		public DeleteExecution(ExecutableRemove<T> remove, QueryMethod queryMethod) {
+			this.remove = remove;
+			if (queryMethod.isCollectionQuery()) {
+				this.type = Type.FIND_AND_REMOVE_ALL;
+			} else if (queryMethod.isQueryForEntity()
+					&& !ClassUtils.isPrimitiveOrWrapper(queryMethod.getReturnedObjectType())) {
+				this.type = Type.FIND_AND_REMOVE_ONE;
+			} else {
+				this.type = Type.ALL;
+			}
+		}
 
-		private final @NonNull MongoOperations operations;
-		private final @NonNull MongoQueryMethod method;
+		public DeleteExecution(ExecutableRemove<T> remove, Type type) {
+			this.remove = remove;
+			this.type = type;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.MongoQueryExecution#execute(org.springframework.data.mongodb.core.query.Query)
-		 */
 		@Override
-		public Object execute(Query query) {
+		public @Nullable Object execute(Query query) {
+
+			TerminatingRemove<T> doRemove = remove.matching(query);
+			if (Type.ALL.equals(type)) {
+				DeleteResult result = doRemove.all();
+				return result.wasAcknowledged() ? Long.valueOf(result.getDeletedCount()) : Long.valueOf(0);
+			} else if (Type.FIND_AND_REMOVE_ALL.equals(type)) {
+				return doRemove.findAndRemove();
+			} else if (Type.FIND_AND_REMOVE_ONE.equals(type)) {
+				Iterator<T> removed = doRemove.findAndRemove().iterator();
+				return removed.hasNext() ? removed.next() : null;
+			}
+			throw new RuntimeException();
+		}
 
-			String collectionName = method.getEntityInformation().getCollectionName();
-			Class<?> type = method.getEntityInformation().getJavaType();
+		public enum Type {
+			FIND_AND_REMOVE_ONE, FIND_AND_REMOVE_ALL, ALL
+		}
+	}
 
-			if (method.isCollectionQuery()) {
-				return operations.findAllAndRemove(query, type, collectionName);
-			}
+	/**
+	 * {@link MongoQueryExecution} updating documents matching the query.
+	 *
+	 * @author Christph Strobl
+	 * @since 3.4
+	 */
+	final class UpdateExecution implements MongoQueryExecution {
+
+		private final ExecutableUpdate<?> updateOps;
+		private Supplier<UpdateDefinition> updateDefinitionSupplier;
+		private final MongoParameterAccessor accessor;
+
+		UpdateExecution(ExecutableUpdate<?> updateOps, MongoQueryMethod method, Supplier<UpdateDefinition> updateSupplier,
+				MongoParameterAccessor accessor) {
+
+			this.updateOps = updateOps;
+			this.updateDefinitionSupplier = updateSupplier;
+			this.accessor = accessor;
+		}
+
+		@Override
+		public Object execute(Query query) {
 
-			DeleteResult writeResult = operations.remove(query, type, collectionName);
-			return writeResult.wasAcknowledged() ? writeResult.getDeletedCount() : 0L;
+			return updateOps.matching(query.with(accessor.getSort())) //
+					.apply(updateDefinitionSupplier.get()) //
+					.all().getModifiedCount();
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java
index a8d244424d..de628d59f4 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/MongoQueryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,31 +15,36 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Function;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.annotation.AnnotatedElementUtils;
-import org.springframework.data.geo.GeoPage;
-import org.springframework.data.geo.GeoResult;
-import org.springframework.data.geo.GeoResults;
 import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.core.annotation.Collation;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.repository.Aggregation;
+import org.springframework.data.mongodb.repository.Hint;
 import org.springframework.data.mongodb.repository.Meta;
 import org.springframework.data.mongodb.repository.Query;
+import org.springframework.data.mongodb.repository.ReadPreference;
 import org.springframework.data.mongodb.repository.Tailable;
+import org.springframework.data.mongodb.repository.Update;
+import org.springframework.data.mongodb.repository.VectorSearch;
+import org.springframework.data.mongodb.util.BsonUtils;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.query.ParametersSource;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.Lazy;
+import org.springframework.data.util.ReactiveWrappers;
+import org.springframework.data.util.ReflectionUtils;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ConcurrentReferenceHashMap;
@@ -52,17 +57,16 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Jorge Rodríguez
  */
 public class MongoQueryMethod extends QueryMethod {
 
-	@SuppressWarnings("unchecked") private static final List<Class<? extends Serializable>> GEO_NEAR_RESULTS = Arrays
-			.asList(GeoResult.class, GeoResults.class, GeoPage.class);
-
 	private final Method method;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
 	private final Map<Class<? extends Annotation>, Optional<Annotation>> annotationCache;
 
 	private @Nullable MongoEntityMetadata<?> metadata;
+	private final Lazy<Boolean> isModifying = Lazy.of(this::resolveModifyingQueryIndicators);
 
 	/**
 	 * Creates a new {@link MongoQueryMethod} from the given {@link Method}.
@@ -74,25 +78,30 @@ public class MongoQueryMethod extends QueryMethod {
 	 */
 	public MongoQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory projectionFactory,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
+		this(method, metadata, projectionFactory, mappingContext, MongoParameters::new);
+	}
+
+	/**
+	 * Creates a new {@link MongoQueryMethod} from the given {@link Method}.
+	 *
+	 * @param method must not be {@literal null}.
+	 * @param metadata must not be {@literal null}.
+	 * @param projectionFactory must not be {@literal null}.
+	 * @param mappingContext must not be {@literal null}.
+	 */
+	MongoQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory projectionFactory,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			Function<ParametersSource, ? extends MongoParameters> parametersFunction) {
 
-		super(method, metadata, projectionFactory);
+		super(method, metadata, projectionFactory, parametersFunction);
 
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		Assert.notNull(mappingContext, "MappingContext must not be null");
 
 		this.method = method;
 		this.mappingContext = mappingContext;
 		this.annotationCache = new ConcurrentReferenceHashMap<>();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#getParameters(java.lang.reflect.Method)
-	 */
-	@Override
-	protected MongoParameters createParameters(Method method) {
-		return new MongoParameters(method, isGeoNearQuery(method));
-	}
-
 	/**
 	 * Returns whether the method has an annotated query.
 	 *
@@ -109,7 +118,7 @@ public boolean hasAnnotatedQuery() {
 	 * @return
 	 */
 	@Nullable
-	String getAnnotatedQuery() {
+	public String getAnnotatedQuery() {
 		return findAnnotatedQuery().orElse(null);
 	}
 
@@ -134,10 +143,6 @@ String getFieldSpecification() {
 				.orElse(null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#getEntityInformation()
-	 */
 	@Override
 	@SuppressWarnings("unchecked")
 	public MongoEntityMetadata<?> getEntityInformation() {
@@ -168,18 +173,10 @@ public MongoEntityMetadata<?> getEntityInformation() {
 		return this.metadata;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#getDomainClass()
-	 */
 	protected Class<?> getDomainClass() {
 		return super.getDomainClass();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#getParameters()
-	 */
 	@Override
 	public MongoParameters getParameters() {
 		return (MongoParameters) super.getParameters();
@@ -191,29 +188,11 @@ public MongoParameters getParameters() {
 	 * @return
 	 */
 	public boolean isGeoNearQuery() {
-		return isGeoNearQuery(this.method);
-	}
-
-	private boolean isGeoNearQuery(Method method) {
-
-		Class<?> returnType = method.getReturnType();
-
-		for (Class<?> type : GEO_NEAR_RESULTS) {
-			if (type.isAssignableFrom(returnType)) {
-				return true;
-			}
-		}
-
-		if (Iterable.class.isAssignableFrom(returnType)) {
-			TypeInformation<?> from = ClassTypeInformation.fromReturnTypeOf(method);
-			return GeoResult.class.equals(from.getRequiredComponentType().getType());
-		}
-
-		return false;
+		return MongoParameters.isGeoNearQuery(this.method);
 	}
 
 	/**
-	 * Returns the {@link Query} annotation that is applied to the method or {@code null} if none available.
+	 * Returns the {@link Query} annotation that is applied to the method or {@literal null} if none available.
 	 *
 	 * @return
 	 */
@@ -226,8 +205,8 @@ Optional<Query> lookupQueryAnnotation() {
 		return doFindAnnotation(Query.class);
 	}
 
-	TypeInformation<?> getReturnType() {
-		return ClassTypeInformation.fromReturnTypeOf(method);
+	public TypeInformation<?> getReturnType() {
+		return TypeInformation.fromReturnTypeOf(method);
 	}
 
 	/**
@@ -239,7 +218,7 @@ public boolean hasQueryMetaAttributes() {
 	}
 
 	/**
-	 * Returns the {@link Meta} annotation that is applied to the method or {@code null} if not available.
+	 * Returns the {@link Meta} annotation that is applied to the method or {@literal null} if not available.
 	 *
 	 * @return
 	 * @since 1.6
@@ -250,7 +229,7 @@ Meta getMetaAnnotation() {
 	}
 
 	/**
-	 * Returns the {@link Tailable} annotation that is applied to the method or {@code null} if not available.
+	 * Returns the {@link Tailable} annotation that is applied to the method or {@literal null} if not available.
 	 *
 	 * @return
 	 * @since 2.0
@@ -278,11 +257,6 @@ public org.springframework.data.mongodb.core.query.Meta getQueryMetaAttributes()
 			metaAttributes.setMaxTimeMsec(meta.maxExecutionTimeMs());
 		}
 
-		if (meta.maxScanDocuments() > 0) {
-			// TODO: Mongo 4 - removal
-			metaAttributes.setMaxScan(meta.maxScanDocuments());
-		}
-
 		if (meta.cursorBatchSize() != 0) {
 			metaAttributes.setCursorBatchSize(meta.cursorBatchSize());
 		}
@@ -291,12 +265,6 @@ public org.springframework.data.mongodb.core.query.Meta getQueryMetaAttributes()
 			metaAttributes.setComment(meta.comment());
 		}
 
-		if (meta.snapshot()) {
-
-			// TODO: Mongo 4 - removal
-			metaAttributes.setSnapshot(meta.snapshot());
-		}
-
 		if (!ObjectUtils.isEmpty(meta.flags())) {
 
 			for (org.springframework.data.mongodb.core.query.Meta.CursorOption option : meta.flags()) {
@@ -304,13 +272,17 @@ public org.springframework.data.mongodb.core.query.Meta getQueryMetaAttributes()
 			}
 		}
 
+		if (meta.allowDiskUse()) {
+			metaAttributes.setAllowDiskUse(meta.allowDiskUse());
+		}
+
 		return metaAttributes;
 	}
 
 	/**
-	 * Check if the query method is decorated with an non empty {@link Query#sort()}.
+	 * Check if the query method is decorated with a non-empty {@link Query#sort()}.
 	 *
-	 * @return true if method annotated with {@link Query} having an non empty sort attribute.
+	 * @return true if method annotated with {@link Query} having a non-empty sort attribute.
 	 * @since 2.1
 	 */
 	public boolean hasAnnotatedSort() {
@@ -328,41 +300,69 @@ public boolean hasAnnotatedSort() {
 	public String getAnnotatedSort() {
 
 		return lookupQueryAnnotation().map(Query::sort).orElseThrow(() -> new IllegalStateException(
-				"Expected to find @Query annotation but did not. Make sure to check hasAnnotatedSort() before."));
+				"Expected to find @Query annotation but did not; Make sure to check hasAnnotatedSort() before."));
 	}
 
 	/**
-	 * Check if the query method is decorated with an non empty {@link Query#collation()} or or
-	 * {@link Aggregation#collation()}.
+	 * Check if the query method is decorated with a non-empty {@link ReadPreference}.
 	 *
 	 * @return true if method annotated with {@link Query} or {@link Aggregation} having a non-empty collation attribute.
-	 * @since 2.2
+	 * @since 4.2
 	 */
-	public boolean hasAnnotatedCollation() {
+	public boolean hasAnnotatedReadPreference() {
+		return doFindReadPreferenceAnnotation().map(ReadPreference::value).filter(StringUtils::hasText).isPresent();
+	}
+
+	/**
+	 * Get the {@link com.mongodb.ReadPreference} extracted from the {@link ReadPreference} annotation.
+	 *
+	 * @return the name of the {@link ReadPreference}.
+	 * @throws IllegalStateException if method not annotated with {@link Query}. Make sure to check
+	 *           {@link #hasAnnotatedReadPreference()} first.
+	 * @since 4.2
+	 */
+	public String getAnnotatedReadPreference() {
 
-		Optional<String> optionalCollation = lookupQueryAnnotation().map(Query::collation);
+		return doFindReadPreferenceAnnotation().map(ReadPreference::value).orElseThrow(() -> new IllegalStateException(
+				"Expected to find @ReadPreference annotation but did not; Make sure to check hasAnnotatedReadPreference() before."));
+	}
 
-		if (!optionalCollation.isPresent()) {
-			optionalCollation = lookupAggregationAnnotation().map(Aggregation::collation);
-		}
+	/**
+	 * Get {@link com.mongodb.ReadPreference#getName() name} from query. First check if the method is annotated. If not,
+	 * check if the class is annotated. So if the method and the class are annotated with @ReadPreference, the method
+	 * annotation takes precedence.
+	 *
+	 * @return the {@link ReadPreference}
+	 * @since 4.2
+	 */
+	private Optional<ReadPreference> doFindReadPreferenceAnnotation() {
+		return doFindAnnotation(ReadPreference.class).or(() -> doFindAnnotationInClass(ReadPreference.class));
+	}
 
-		return optionalCollation.filter(StringUtils::hasText).isPresent();
+	/**
+	 * Check if the query method is decorated with a non-empty {@link Query#collation()} or
+	 * {@link Aggregation#collation()}.
+	 *
+	 * @return true if method annotated with {@link Query} or {@link Aggregation} having a non-empty collation attribute.
+	 * @since 2.2
+	 */
+	public boolean hasAnnotatedCollation() {
+		return doFindAnnotation(Collation.class).map(Collation::value).filter(StringUtils::hasText).isPresent();
 	}
 
 	/**
 	 * Get the collation value extracted from the {@link Query} or {@link Aggregation} annotation.
 	 *
-	 * @return the {@link Query#collation()} or or {@link Aggregation#collation()} value.
+	 * @return the {@link Query#collation()} or {@link Aggregation#collation()} value.
 	 * @throws IllegalStateException if method not annotated with {@link Query} or {@link Aggregation}. Make sure to check
 	 *           {@link #hasAnnotatedQuery()} first.
 	 * @since 2.2
 	 */
 	public String getAnnotatedCollation() {
 
-		return lookupQueryAnnotation().map(Query::collation)
-				.orElseGet(() -> lookupAggregationAnnotation().map(Aggregation::collation) //
-						.orElseThrow(() -> new IllegalStateException(
-								"Expected to find @Query annotation but did not. Make sure to check hasAnnotatedCollation() before.")));
+		return doFindAnnotation(Collation.class).map(Collation::value) //
+				.orElseThrow(() -> new IllegalStateException(
+						"Expected to find @Collation annotation but did not; Make sure to check hasAnnotatedCollation() before."));
 	}
 
 	/**
@@ -385,7 +385,27 @@ public boolean hasAnnotatedAggregation() {
 	 */
 	public String[] getAnnotatedAggregation() {
 		return findAnnotatedAggregation().orElseThrow(() -> new IllegalStateException(
-				"Expected to find @Aggregation annotation but did not. Make sure to check hasAnnotatedAggregation() before."));
+				"Expected to find @Aggregation annotation but did not; Make sure to check hasAnnotatedAggregation() before."));
+	}
+
+	/**
+	 * @return {@literal true} if the {@link Hint} annotation is present and the index name is not empty.
+	 * @since 4.1
+	 */
+	public boolean hasAnnotatedHint() {
+		return doFindAnnotation(Hint.class).map(Hint::indexName).filter(StringUtils::hasText).isPresent();
+	}
+
+	/**
+	 * Returns the aggregation pipeline declared via a {@link Hint} annotation.
+	 *
+	 * @return the index name (might be empty).
+	 * @throws IllegalStateException if the method is not annotated with {@link Hint}
+	 * @since 4.1
+	 */
+	public String getAnnotatedHint() {
+		return doFindAnnotation(Hint.class).map(Hint::indexName).orElseThrow(() -> new IllegalStateException(
+				"Expected to find @Hint annotation but did not; Make sure to check hasAnnotatedHint() before."));
 	}
 
 	private Optional<String[]> findAnnotatedAggregation() {
@@ -395,14 +415,131 @@ private Optional<String[]> findAnnotatedAggregation() {
 				.filter(it -> !ObjectUtils.isEmpty(it));
 	}
 
+	/**
+	 * Returns whether the method has an annotated vector search.
+	 *
+	 * @return true if {@link VectorSearch} is present.
+	 * @since 5.0
+	 */
+	public boolean hasAnnotatedVectorSearch() {
+		return findAnnotatedVectorSearch().isPresent();
+	}
+
+	Optional<VectorSearch> findAnnotatedVectorSearch() {
+		return lookupVectorSearchAnnotation();
+	}
+
 	Optional<Aggregation> lookupAggregationAnnotation() {
 		return doFindAnnotation(Aggregation.class);
 	}
 
+	Optional<VectorSearch> lookupVectorSearchAnnotation() {
+		return doFindAnnotation(VectorSearch.class);
+	}
+
+	Optional<Update> lookupUpdateAnnotation() {
+		return doFindAnnotation(Update.class);
+	}
+
 	@SuppressWarnings("unchecked")
 	private <A extends Annotation> Optional<A> doFindAnnotation(Class<A> annotationType) {
 
 		return (Optional<A>) this.annotationCache.computeIfAbsent(annotationType,
 				it -> Optional.ofNullable(AnnotatedElementUtils.findMergedAnnotation(method, it)));
 	}
+
+	@SuppressWarnings("unchecked")
+	private <A extends Annotation> Optional<A> doFindAnnotationInClass(Class<A> annotationType) {
+
+		Optional<Annotation> mergedAnnotation = Optional
+				.ofNullable(AnnotatedElementUtils.findMergedAnnotation(method.getDeclaringClass(), annotationType));
+		annotationCache.put(annotationType, mergedAnnotation);
+
+		return (Optional<A>) mergedAnnotation;
+	}
+
+	@Override
+	public boolean isModifyingQuery() {
+		return isModifying.get();
+	}
+
+	private boolean resolveModifyingQueryIndicators() {
+		return hasAnnotatedUpdate()
+				|| QueryUtils.indexOfAssignableParameter(UpdateDefinition.class, method.getParameterTypes()) != -1;
+	}
+
+	/**
+	 * @return {@literal true} if {@link Update} annotation is present.
+	 * @since 3.4
+	 */
+	public boolean hasAnnotatedUpdate() {
+		return lookupUpdateAnnotation().isPresent();
+	}
+
+	/**
+	 * @return the {@link Update} or {@literal null} if not present.
+	 * @since 3.4
+	 */
+	public @Nullable Update getUpdateSource() {
+		return lookupUpdateAnnotation().orElse(null);
+	}
+
+	/**
+	 * Verify the actual {@link QueryMethod} is valid in terms of supported return and parameter types.
+	 *
+	 * @since 3.4
+	 * @throws IllegalStateException
+	 */
+	@SuppressWarnings("NullAway")
+	public void verify() {
+
+		if (isModifyingQuery()) {
+
+			if (isCollectionQuery() || isScrollQuery() || isSliceQuery() || isPageQuery() || isGeoNearQuery()
+					|| !isNumericOrVoidReturnValue()) { //
+				throw new IllegalStateException(
+						String.format(
+								"Update method may be void or return a numeric value (the number of updated documents)."
+										+ " Offending Method: %s.%s",
+								ClassUtils.getShortName(method.getDeclaringClass()), method.getName()));
+			}
+
+			if (hasAnnotatedUpdate()) { // must define either an update or an update pipeline
+				if (!StringUtils.hasText(getUpdateSource().update()) && ObjectUtils.isEmpty(getUpdateSource().pipeline())) {
+					throw new IllegalStateException(
+							String.format(
+									"Update method must define either 'Update#update' or 'Update#pipeline' attribute;"
+											+ " Offending Method: %s.%s",
+									ClassUtils.getShortName(method.getDeclaringClass()), method.getName()));
+				}
+			}
+		}
+
+		if (hasAnnotatedAggregation()) {
+			for (String stage : getAnnotatedAggregation()) {
+				if (BsonUtils.isJsonArray(stage)) {
+					throw new IllegalStateException(String.format(
+							"""
+									Invalid aggregation pipeline. Please split the definition from @Aggregation("[{...}, {...}]") to @Aggregation({ "{...}", "{...}" }).
+									Offending Method: %s.%s
+									""",
+							ClassUtils.getShortName(method.getDeclaringClass()), method.getName()));
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings("NullAway")
+	private boolean isNumericOrVoidReturnValue() {
+
+		Class<?> resultType = getReturnedObjectType();
+		if (ReactiveWrappers.usesReactiveType(resultType)) {
+			resultType = getReturnType().getComponentType().getType();
+		}
+
+		boolean isUpdateCountReturnType = ClassUtils.isAssignable(Number.class, resultType);
+		boolean isVoidReturnType = ReflectionUtils.isVoid(resultType);
+
+		return isUpdateCountReturnType || isVoidReturnType;
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java
index 7a3f3e4b80..9682e4971f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2025 the original author 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,12 +27,11 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.util.StringUtils;
 
 /**
@@ -55,13 +54,13 @@ public class PartTreeMongoQuery extends AbstractMongoQuery {
 	 *
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 * @since 4.4.0
 	 */
 	public PartTreeMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ValueExpressionDelegate delegate) {
 
-		super(method, mongoOperations, expressionParser, evaluationContextProvider);
+		super(method, mongoOperations, delegate);
 
 		this.processor = method.getResultProcessor();
 		this.tree = new PartTree(method.getName(), processor.getReturnedType().getDomainType());
@@ -78,14 +77,11 @@ public PartTree getTree() {
 		return tree;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, boolean)
-	 */
 	@Override
+	@SuppressWarnings("NullAway")
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
-		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, isGeoNearQuery);
+		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, isGeoNearQuery, false);
 		Query query = creator.createQuery();
 
 		if (tree.isLimiting()) {
@@ -123,51 +119,31 @@ protected Query createQuery(ConvertingParameterAccessor accessor) {
 			return result;
 
 		} catch (JsonParseException o_O) {
-			throw new IllegalStateException(String.format("Invalid query or field specification in %s!", getQueryMethod()),
+			throw new IllegalStateException(String.format("Invalid query or field specification in %s", getQueryMethod()),
 					o_O);
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createCountQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
-	 */
 	@Override
 	protected Query createCountQuery(ConvertingParameterAccessor accessor) {
-		return new MongoQueryCreator(tree, accessor, context, false).createQuery();
+		return new MongoQueryCreator(tree, accessor, context, false, false).createQuery();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isCountQuery()
-	 */
 	@Override
 	protected boolean isCountQuery() {
 		return tree.isCountProjection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isExistsQuery()
-	 */
 	@Override
 	protected boolean isExistsQuery() {
 		return tree.isExistsProjection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery()
-	 */
 	@Override
 	protected boolean isDeleteQuery() {
 		return tree.isDelete();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isLimiting()
-	 */
 	@Override
 	protected boolean isLimiting() {
 		return tree.isLimiting();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/QueryUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/QueryUtils.java
index 672afb9d26..4b7262749a 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/QueryUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/QueryUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,19 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import org.aopalliance.intercept.MethodInterceptor;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
 import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.util.ClassUtils;
 
 /**
  * Internal utility class to help avoid duplicate code required in both the reactive and the sync {@link Query} support
@@ -35,6 +40,8 @@
  */
 class QueryUtils {
 
+	protected static final Log LOGGER = LogFactory.getLog(QueryUtils.class);
+
 	/**
 	 * Decorate {@link Query} and add a default sort expression to the given {@link Query}. Attributes of the given
 	 * {@code sort} may be overwritten by the sort explicitly defined by the {@link Query} itself.
@@ -49,19 +56,13 @@ static Query decorateSort(Query query, Document defaultSort) {
 			return query;
 		}
 
-		ProxyFactory factory = new ProxyFactory(query);
-		factory.addAdvice((MethodInterceptor) invocation -> {
+		BasicQuery defaultSortQuery = query instanceof BasicQuery bq ? bq : new BasicQuery(query);
 
-			if (!invocation.getMethod().getName().equals("getSortObject")) {
-				return invocation.proceed();
-			}
+		Document combinedSort = new Document(defaultSort);
+		combinedSort.putAll(defaultSortQuery.getSortObject());
+		defaultSortQuery.setSortObject(combinedSort);
 
-			Document combinedSort = new Document(defaultSort);
-			combinedSort.putAll((Document) invocation.proceed());
-			return combinedSort;
-		});
-
-		return (Query) factory.getProxy();
+		return defaultSortQuery;
 	}
 
 	/**
@@ -71,16 +72,52 @@ static Query decorateSort(Query query, Document defaultSort) {
 	 * @param query must not be {@literal null}.
 	 * @param collationExpression must not be {@literal null}.
 	 * @param accessor must not be {@literal null}.
+	 * @param expressionEvaluator must not be {@literal null}.
 	 * @return the {@link Query} having proper {@link Collation}.
 	 * @see Query#collation(Collation)
 	 * @since 2.2
 	 */
 	static Query applyCollation(Query query, @Nullable String collationExpression, ConvertingParameterAccessor accessor,
-			MongoParameters parameters, SpelExpressionParser expressionParser,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ValueExpressionEvaluator expressionEvaluator) {
 
-		Collation collation = CollationUtils.computeCollation(collationExpression, accessor, parameters, expressionParser,
-				evaluationContextProvider);
+		Collation collation = CollationUtils.computeCollation(collationExpression, accessor, expressionEvaluator);
 		return collation == null ? query : query.collation(collation);
 	}
+
+	/**
+	 * Get the first index of the parameter that can be assigned to the given type.
+	 *
+	 * @param type the type to look for.
+	 * @param parameters the actual parameters.
+	 * @return -1 if not found.
+	 * @since 3.4
+	 */
+	static int indexOfAssignableParameter(Class<?> type, Class<?>[] parameters) {
+		return indexOfAssignableParameter(type, Arrays.asList(parameters));
+	}
+
+	/**
+	 * Get the first index of the parameter that can be assigned to the given type.
+	 *
+	 * @param type the type to look for.
+	 * @param parameters the actual parameters.
+	 * @return -1 if not found.
+	 * @since 3.4
+	 */
+	static int indexOfAssignableParameter(Class<?> type, List<Class<?>> parameters) {
+
+		if (parameters.isEmpty()) {
+			return -1;
+		}
+
+		int i = 0;
+		for (Class<?> parameterType : parameters) {
+			if (ClassUtils.isAssignable(type, parameterType)) {
+				return i;
+			}
+			i++;
+		}
+		return -1;
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java
index 9c32611349..9534a9cf4f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,23 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import org.jspecify.annotations.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
-import reactor.core.publisher.MonoProcessor;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
 
+import org.reactivestreams.Publisher;
 import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
+import org.springframework.data.util.ReactiveWrappers;
 
 /**
  * Reactive {@link org.springframework.data.repository.query.ParametersParameterAccessor} implementation that subscribes
- * to reactive parameter wrapper types upon creation. This class performs synchronization when acessing parameters.
+ * to reactive parameter wrapper types upon creation. This class performs synchronization when accessing parameters.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
@@ -35,62 +39,91 @@
  */
 class ReactiveMongoParameterAccessor extends MongoParametersParameterAccessor {
 
-	private final List<MonoProcessor<?>> subscriptions;
+	private final Object[] values;
 
 	public ReactiveMongoParameterAccessor(MongoQueryMethod method, Object[] values) {
 
 		super(method, values);
+		this.values = values;
 
-		this.subscriptions = new ArrayList<>(values.length);
-
-		for (int i = 0; i < values.length; i++) {
-
-			Object value = values[i];
-
-			if (value == null || !ReactiveWrappers.supports(value.getClass())) {
-				subscriptions.add(null);
-				continue;
-			}
-
-			if (ReactiveWrappers.isSingleValueType(value.getClass())) {
-				subscriptions.add(ReactiveWrapperConverters.toWrapper(value, Mono.class).toProcessor());
-			} else {
-				subscriptions.add(ReactiveWrapperConverters.toWrapper(value, Flux.class).collectList().toProcessor());
-			}
-		}
 	}
 
 	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParametersParameterAccessor#getValue(int)
+	 * @see org.springframework.data.mongodb.repository.query.MongoParametersParameterAccessor#getValues()
 	 */
-	@SuppressWarnings("unchecked")
 	@Override
-	protected <T> T getValue(int index) {
+	public Object @Nullable[] getValues() {
 
-		if (subscriptions.get(index) != null) {
-			return (T) subscriptions.get(index).block();
+		Object[] values = super.getValues();
+		if(values == null) {
+			return new Object[0];
 		}
 
-		return super.getValue(index);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParametersParameterAccessor#getValues()
-	 */
-	@Override
-	public Object[] getValues() {
-
-		Object[] result = new Object[super.getValues().length];
+		Object[] result = new Object[values.length];
 		for (int i = 0; i < result.length; i++) {
 			result[i] = getValue(i);
 		}
 		return result;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParametersParameterAccessor#getBindableValue(int)
-	 */
-	public Object getBindableValue(int index) {
+	public @Nullable Object getBindableValue(int index) {
 		return getValue(getParameters().getBindableParameter(index).getIndex());
 	}
+
+	/**
+	 * Resolve parameters that were provided through reactive wrapper types. Flux is collected into a list, values from
+	 * Mono's are used directly.
+	 *
+	 * @return
+	 */
+	@SuppressWarnings("unchecked")
+	public Mono<ReactiveMongoParameterAccessor> resolveParameters() {
+
+		boolean hasReactiveWrapper = false;
+
+		for (Object value : values) {
+			if (value == null || !ReactiveWrappers.supports(value.getClass())) {
+				continue;
+			}
+
+			hasReactiveWrapper = true;
+			break;
+		}
+
+		if (!hasReactiveWrapper) {
+			return Mono.just(this);
+		}
+
+		Object[] resolved = new Object[values.length];
+		Map<Integer, Optional<?>> holder = new ConcurrentHashMap<>();
+		List<Publisher<?>> publishers = new ArrayList<>();
+
+		for (int i = 0; i < values.length; i++) {
+
+			Object value = resolved[i] = values[i];
+			if (value == null || !ReactiveWrappers.supports(value.getClass())) {
+				continue;
+			}
+
+			if (ReactiveWrappers.isSingleValueType(value.getClass())) {
+
+				int index = i;
+				publishers.add(ReactiveWrapperConverters.toWrapper(value, Mono.class) //
+						.map(Optional::of) //
+						.defaultIfEmpty(Optional.empty()) //
+						.doOnNext(it -> holder.put(index, (Optional<?>) it)));
+			} else {
+
+				int index = i;
+				publishers.add(ReactiveWrapperConverters.toWrapper(value, Flux.class) //
+						.collectList() //
+						.doOnNext(it -> holder.put(index, Optional.of(it))));
+			}
+		}
+
+		return Flux.merge(publishers).then().thenReturn(resolved).map(values -> {
+			holder.forEach((index, v) -> values[index] = v.orElse(null));
+			return new ReactiveMongoParameterAccessor(method, values);
+		});
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java
index 4a8e7e311a..29e2127e18 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecution.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,27 +15,40 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.reactivestreams.Publisher;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.convert.EntityInstantiators;
+import org.springframework.data.convert.DtoInstantiatingConverter;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.domain.SearchResult;
+import org.springframework.data.domain.Similarity;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.geo.Point;
+import org.springframework.data.mapping.model.EntityInstantiators;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.ReactiveUpdateOperation.ReactiveUpdate;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.query.VectorSearchDelegate.QueryContainer;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
-import org.springframework.data.repository.util.ReactiveWrappers;
+import org.springframework.data.util.ReactiveWrappers;
+import org.springframework.data.util.ReflectionUtils;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
+import com.mongodb.client.result.UpdateResult;
+
 /**
  * Set of classes to contain query execution strategies. Depending (mostly) on the return type of a
  * {@link org.springframework.data.repository.query.QueryMethod} a {@link AbstractReactiveMongoQuery} can be executed in
@@ -47,35 +60,40 @@
  */
 interface ReactiveMongoQueryExecution {
 
-	Object execute(Query query, Class<?> type, String collection);
+	Publisher<? extends Object> execute(Query query, Class<?> type, String collection);
 
 	/**
 	 * {@link MongoQueryExecution} to execute geo-near queries.
 	 *
 	 * @author Mark Paluch
 	 */
-	@RequiredArgsConstructor
-	class GeoNearExecution implements ReactiveMongoQueryExecution {
+	final class GeoNearExecution implements ReactiveMongoQueryExecution {
 
 		private final ReactiveMongoOperations operations;
 		private final MongoParameterAccessor accessor;
 		private final TypeInformation<?> returnType;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-		 */
+		public GeoNearExecution(ReactiveMongoOperations operations, MongoParameterAccessor accessor,
+				TypeInformation<?> returnType) {
+
+			this.operations = operations;
+			this.accessor = accessor;
+			this.returnType = returnType;
+		}
+
 		@Override
-		public Object execute(Query query, Class<?> type, String collection) {
+		public Publisher<? extends Object> execute(Query query, Class<?> type, String collection) {
 
 			Flux<GeoResult<Object>> results = doExecuteQuery(query, type, collection);
 			return isStreamOfGeoResult() ? results : results.map(GeoResult::getContent);
 		}
 
 		@SuppressWarnings({ "unchecked", "rawtypes" })
-		protected Flux<GeoResult<Object>> doExecuteQuery(@Nullable Query query, Class<?> type, String collection) {
+		private Flux<GeoResult<Object>> doExecuteQuery(@Nullable Query query, Class<?> type, String collection) {
 
 			Point nearLocation = accessor.getGeoNearLocation();
+			Assert.notNull(nearLocation, "[query.location] ist not present");
+
 			NearQuery nearQuery = NearQuery.near(nearLocation);
 
 			if (query != null) {
@@ -83,6 +101,8 @@ protected Flux<GeoResult<Object>> doExecuteQuery(@Nullable Query query, Class<?>
 			}
 
 			Range<Distance> distances = accessor.getDistanceRange();
+
+			Assert.notNull(distances, "[query.range] ist not present");
 			distances.getUpperBound().getValue().ifPresent(it -> nearQuery.maxDistance(it).in(it.getMetric()));
 			distances.getLowerBound().getValue().ifPresent(it -> nearQuery.minDistance(it).in(it.getMetric()));
 
@@ -99,8 +119,59 @@ private boolean isStreamOfGeoResult() {
 			}
 
 			TypeInformation<?> componentType = returnType.getComponentType();
-			return componentType != null && GeoResult.class.equals(componentType.getType());
+			return (componentType != null) && GeoResult.class.equals(componentType.getType());
+		}
+	}
+
+	/**
+	 * {@link ReactiveMongoQueryExecution} to execute vector search.
+	 *
+	 * @author Mark Paluch
+	 * @since 5.0
+	 */
+	class VectorSearchExecution implements ReactiveMongoQueryExecution {
+
+		private final ReactiveMongoOperations operations;
+		private final QueryContainer queryMetadata;
+		private final AggregationPipeline pipeline;
+		private final boolean returnSearchResult;
+
+		VectorSearchExecution(ReactiveMongoOperations operations, MongoQueryMethod method, QueryContainer queryMetadata) {
+
+			this.operations = operations;
+			this.queryMetadata = queryMetadata;
+			this.pipeline = queryMetadata.pipeline();
+			this.returnSearchResult = isSearchResult(method.getReturnType());
+		}
+
+		@Override
+		public Publisher<? extends Object> execute(Query query, Class<?> type, String collection) {
+
+			Flux<Document> aggregate = operations.aggregate(
+					TypedAggregation.newAggregation(queryMetadata.outputType(), pipeline.getOperations()), collection,
+					Document.class);
+
+			return aggregate.map(document -> {
+
+				Object mappedResult = operations.getConverter().read(queryMetadata.outputType(), document);
+
+				return returnSearchResult
+						? new SearchResult<>(mappedResult,
+								Similarity.raw(document.getDouble(queryMetadata.scoreField()), queryMetadata.scoringFunction()))
+						: mappedResult;
+			});
+		}
+
+		private static boolean isSearchResult(TypeInformation<?> returnType) {
+
+			if (!Publisher.class.isAssignableFrom(returnType.getType())) {
+				return false;
+			}
+
+			TypeInformation<?> componentType = returnType.getComponentType();
+			return componentType != null && SearchResult.class.equals(componentType.getType());
 		}
+
 	}
 
 	/**
@@ -109,41 +180,85 @@ private boolean isStreamOfGeoResult() {
 	 * @author Mark Paluch
 	 * @author Artyom Gabeev
 	 */
-	@RequiredArgsConstructor
 	final class DeleteExecution implements ReactiveMongoQueryExecution {
 
 		private final ReactiveMongoOperations operations;
 		private final MongoQueryMethod method;
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.query.Query, java.lang.Class, java.lang.String)
-		 */
+		public DeleteExecution(ReactiveMongoOperations operations, MongoQueryMethod method) {
+			this.operations = operations;
+			this.method = method;
+		}
+
 		@Override
-		public Object execute(Query query, Class<?> type, String collection) {
+		public Publisher<? extends Object> execute(Query query, Class<?> type, String collection) {
 
 			if (method.isCollectionQuery()) {
 				return operations.findAllAndRemove(query, type, collection);
 			}
 
+			if (method.isQueryForEntity() && !ClassUtils.isPrimitiveOrWrapper(method.getReturnedObjectType())) {
+				return operations.findAndRemove(query, type, collection);
+			}
+
 			return operations.remove(query, type, collection)
 					.map(deleteResult -> deleteResult.wasAcknowledged() ? deleteResult.getDeletedCount() : 0L);
 		}
 	}
 
+	/**
+	 * {@link MongoQueryExecution} updating documents matching the query.
+	 *
+	 * @author Christph Strobl
+	 * @since 3.4
+	 */
+	final class UpdateExecution implements ReactiveMongoQueryExecution {
+
+		private final ReactiveUpdate<?> updateOps;
+		private final MongoParameterAccessor accessor;
+		private Mono<UpdateDefinition> update;
+
+		UpdateExecution(ReactiveUpdate<?> updateOps, ReactiveMongoQueryMethod method, MongoParameterAccessor accessor,
+				Mono<UpdateDefinition> update) {
+
+			this.updateOps = updateOps;
+			this.accessor = accessor;
+			this.update = update;
+		}
+
+		@Override
+		public Publisher<? extends Object> execute(Query query, Class<?> type, String collection) {
+
+			return update.flatMap(it -> updateOps.inCollection(collection) //
+					.matching(query.with(accessor.getSort())) // actually we could do it unsorted
+					.apply(it) //
+					.all() //
+					.map(UpdateResult::getModifiedCount));
+		}
+	}
+
 	/**
 	 * An {@link ReactiveMongoQueryExecution} that wraps the results of the given delegate with the given result
 	 * processing.
 	 */
-	@RequiredArgsConstructor
 	final class ResultProcessingExecution implements ReactiveMongoQueryExecution {
 
-		private final @NonNull ReactiveMongoQueryExecution delegate;
-		private final @NonNull Converter<Object, Object> converter;
+		private final ReactiveMongoQueryExecution delegate;
+		private final Converter<Object, Object> converter;
+
+		public ResultProcessingExecution(ReactiveMongoQueryExecution delegate, Converter<Object, Object> converter) {
+
+			Assert.notNull(delegate, "Delegate must not be null");
+			Assert.notNull(converter, "Converter must not be null");
+
+			this.delegate = delegate;
+			this.converter = converter;
+		}
 
 		@Override
-		public Object execute(Query query, Class<?> type, String collection) {
-			return converter.convert(delegate.execute(query, type, collection));
+		@SuppressWarnings("NullAway")
+		public Publisher<? extends Object> execute(Query query, Class<?> type, String collection) {
+			return (Publisher) converter.convert(delegate.execute(query, type, collection));
 		}
 	}
 
@@ -152,22 +267,40 @@ public Object execute(Query query, Class<?> type, String collection) {
 	 *
 	 * @author Mark Paluch
 	 */
-	@RequiredArgsConstructor
 	final class ResultProcessingConverter implements Converter<Object, Object> {
 
-		private final @NonNull ResultProcessor processor;
-		private final @NonNull ReactiveMongoOperations operations;
-		private final @NonNull EntityInstantiators instantiators;
+		private final ResultProcessor processor;
+		private final ReactiveMongoOperations operations;
+		private final EntityInstantiators instantiators;
+
+		public ResultProcessingConverter(ResultProcessor processor, ReactiveMongoOperations operations,
+				EntityInstantiators instantiators) {
+
+			Assert.notNull(processor, "Processor must not be null");
+			Assert.notNull(operations, "Operations must not be null");
+			Assert.notNull(instantiators, "Instantiators must not be null");
+
+			this.processor = processor;
+			this.operations = operations;
+			this.instantiators = instantiators;
+		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.core.convert.converter.Converter#convert(java.lang.Object)
-		 */
 		@Override
 		public Object convert(Object source) {
 
 			ReturnedType returnedType = processor.getReturnedType();
 
+			if (ReflectionUtils.isVoid(returnedType.getReturnedType())) {
+
+				if (source instanceof Mono<?> mono) {
+					return mono.then();
+				}
+
+				if (source instanceof Publisher<?> publisher) {
+					return Flux.from(publisher).then();
+				}
+			}
+
 			if (ClassUtils.isPrimitiveOrWrapper(returnedType.getReturnedType())) {
 				return source;
 			}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java
index 471960df22..16354c2ff0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethod.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import static org.springframework.data.repository.util.ClassUtils.*;
-
 import java.lang.reflect.Method;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -32,8 +30,9 @@
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.util.ReactiveWrapperConverters;
-import org.springframework.data.repository.util.ReactiveWrappers;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.Lazy;
+import org.springframework.data.util.ReactiveWrappers;
+import org.springframework.data.util.ReflectionUtils;
 import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ClassUtils;
 
@@ -46,10 +45,11 @@
  */
 public class ReactiveMongoQueryMethod extends MongoQueryMethod {
 
-	private static final ClassTypeInformation<Page> PAGE_TYPE = ClassTypeInformation.from(Page.class);
-	private static final ClassTypeInformation<Slice> SLICE_TYPE = ClassTypeInformation.from(Slice.class);
+	private static final TypeInformation<Page> PAGE_TYPE = TypeInformation.of(Page.class);
+	private static final TypeInformation<Slice> SLICE_TYPE = TypeInformation.of(Slice.class);
 
 	private final Method method;
+	private final Lazy<Boolean> isCollectionQuery;
 
 	/**
 	 * Creates a new {@link ReactiveMongoQueryMethod} from the given {@link Method}.
@@ -62,98 +62,46 @@ public class ReactiveMongoQueryMethod extends MongoQueryMethod {
 	public ReactiveMongoQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory projectionFactory,
 			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
 
-		super(method, metadata, projectionFactory, mappingContext);
-
-		if (hasParameterOfType(method, Pageable.class)) {
-
-			TypeInformation<?> returnType = ClassTypeInformation.fromReturnTypeOf(method);
-
-			boolean multiWrapper = ReactiveWrappers.isMultiValueType(returnType.getType());
-			boolean singleWrapperWithWrappedPageableResult = ReactiveWrappers.isSingleValueType(returnType.getType())
-					&& (PAGE_TYPE.isAssignableFrom(returnType.getRequiredComponentType())
-							|| SLICE_TYPE.isAssignableFrom(returnType.getRequiredComponentType()));
-
-			if (singleWrapperWithWrappedPageableResult) {
-				throw new InvalidDataAccessApiUsageException(
-						String.format("'%s.%s' must not use sliced or paged execution. Please use Flux.buffer(size, skip).",
-								ClassUtils.getShortName(method.getDeclaringClass()), method.getName()));
-			}
-
-			if (!multiWrapper) {
-				throw new IllegalStateException(String.format(
-						"Method has to use a either multi-item reactive wrapper return type or a wrapped Page/Slice type. Offending method: %s",
-						method.toString()));
-			}
-
-			if (hasParameterOfType(method, Sort.class)) {
-				throw new IllegalStateException(String.format("Method must not have Pageable *and* Sort parameter. "
-						+ "Use sorting capabilities on Pageble instead! Offending method: %s", method.toString()));
-			}
-		}
+		super(method, metadata, projectionFactory, mappingContext, parametersSource -> {
+			return new MongoParameters(parametersSource,
+					MongoParameters.isGeoNearQuery(parametersSource.getMethod()) || isGeoNearQuery(parametersSource.getMethod()));
+		});
 
 		this.method = method;
+		this.isCollectionQuery = Lazy.of(() -> (!(isPageQuery() || isSliceQuery() || isScrollQuery())
+				&& ReactiveWrappers.isMultiValueType(metadata.getReturnType(method).getType()) || super.isCollectionQuery()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoQueryMethod#createParameters(java.lang.reflect.Method)
-	 */
-	@Override
-	protected MongoParameters createParameters(Method method) {
-		return new MongoParameters(method, isGeoNearQuery(method));
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#isCollectionQuery()
-	 */
 	@Override
 	public boolean isCollectionQuery() {
-		return !(isPageQuery() || isSliceQuery()) && ReactiveWrappers.isMultiValueType(method.getReturnType());
+		return isCollectionQuery.get();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoQueryMethod#isGeoNearQuery()
-	 */
 	@Override
 	public boolean isGeoNearQuery() {
 		return isGeoNearQuery(method);
 	}
 
-	private boolean isGeoNearQuery(Method method) {
+	private static boolean isGeoNearQuery(Method method) {
 
 		if (ReactiveWrappers.supports(method.getReturnType())) {
-			TypeInformation<?> from = ClassTypeInformation.fromReturnTypeOf(method);
+			TypeInformation<?> from = TypeInformation.fromReturnTypeOf(method);
 			return GeoResult.class.equals(from.getRequiredComponentType().getType());
 		}
 
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#isModifyingQuery()
-	 */
 	@Override
 	public boolean isModifyingQuery() {
 		return super.isModifyingQuery();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#isQueryForEntity()
-	 */
 	@Override
 	public boolean isQueryForEntity() {
 		return super.isQueryForEntity();
 	}
 
-	/*
-	 * All reactive query methods are streaming queries.
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryMethod#isStreamQuery()
-	 */
 	@Override
 	public boolean isStreamQuery() {
 		return true;
@@ -175,4 +123,40 @@ public boolean hasReactiveWrapperParameter() {
 		return false;
 	}
 
+	@Override
+	public void verify() {
+
+		if (ReflectionUtils.hasParameterOfType(method, Pageable.class)) {
+
+			TypeInformation<?> returnType = TypeInformation.fromReturnTypeOf(method);
+
+			boolean multiWrapper = ReactiveWrappers.isMultiValueType(returnType.getType());
+			boolean singleWrapperWithWrappedPageableResult = ReactiveWrappers.isSingleValueType(returnType.getType())
+					&& (PAGE_TYPE.isAssignableFrom(returnType.getRequiredComponentType())
+							|| SLICE_TYPE.isAssignableFrom(returnType.getRequiredComponentType()));
+
+			if (ReflectionUtils.hasParameterOfType(method, Sort.class)) {
+				throw new IllegalStateException(String.format("Method must not have Pageable *and* Sort parameter;"
+						+ " Use sorting capabilities on Pageable instead; Offending method: %s", method));
+			}
+
+			if (isScrollQuery()) {
+				return;
+			}
+
+			if (singleWrapperWithWrappedPageableResult) {
+				throw new InvalidDataAccessApiUsageException(
+						String.format("'%s.%s' must not use sliced or paged execution; Please use Flux.buffer(size, skip).",
+								ClassUtils.getShortName(method.getDeclaringClass()), method.getName()));
+			}
+
+			if (!multiWrapper) {
+				throw new IllegalStateException(String.format(
+						"Method has to use a either multi-item reactive wrapper return type or a wrapped Page/Slice type; Offending method: %s",
+						method));
+			}
+		}
+
+		super.verify();
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java
index f5af831a7d..9a17b2b5fc 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactivePartTreeMongoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import reactor.core.publisher.Mono;
+
 import org.bson.Document;
 import org.bson.json.JsonParseException;
 
@@ -26,12 +28,11 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
 import org.springframework.data.repository.query.ResultProcessor;
 import org.springframework.data.repository.query.ReturnedType;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.util.StringUtils;
 
 /**
@@ -53,13 +54,13 @@ public class ReactivePartTreeMongoQuery extends AbstractReactiveMongoQuery {
 	 *
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 * @since 4.4.0
 	 */
 	public ReactivePartTreeMongoQuery(ReactiveMongoQueryMethod method, ReactiveMongoOperations mongoOperations,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ValueExpressionDelegate delegate) {
 
-		super(method, mongoOperations, expressionParser, evaluationContextProvider);
+		super(method, mongoOperations, delegate);
 
 		this.processor = method.getResultProcessor();
 		this.tree = new PartTree(method.getName(), processor.getReturnedType().getDomainType());
@@ -76,16 +77,26 @@ public PartTree getTree() {
 		return tree;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, boolean)
-	 */
 	@Override
-	protected Query createQuery(ConvertingParameterAccessor accessor) {
+	protected Mono<Query> createQuery(ConvertingParameterAccessor accessor) {
+		return Mono.fromSupplier(() -> createQueryInternal(accessor, false));
+	}
+
+	@Override
+	protected Mono<Query> createCountQuery(ConvertingParameterAccessor accessor) {
+		return Mono.fromSupplier(() -> createQueryInternal(accessor, true));
+	}
+
+	@SuppressWarnings("NullAway")
+	private Query createQueryInternal(ConvertingParameterAccessor accessor, boolean isCountQuery) {
 
-		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, isGeoNearQuery);
+		MongoQueryCreator creator = new MongoQueryCreator(tree, accessor, context, !isCountQuery && isGeoNearQuery, false);
 		Query query = creator.createQuery();
 
+		if (isCountQuery) {
+			return query;
+		}
+
 		if (tree.isLimiting()) {
 			query.limit(tree.getMaxResults());
 		}
@@ -114,53 +125,27 @@ protected Query createQuery(ConvertingParameterAccessor accessor) {
 			result.setSortObject(query.getSortObject());
 
 			return result;
-
 		} catch (JsonParseException o_O) {
-			throw new IllegalStateException(String.format("Invalid query or field specification in %s!", getQueryMethod()),
+			throw new IllegalStateException(String.format("Invalid query or field specification in %s", getQueryMethod()),
 					o_O);
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#createCountQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
-	 */
-	@Override
-	protected Query createCountQuery(ConvertingParameterAccessor accessor) {
-		return new MongoQueryCreator(tree, accessor, context, false).createQuery();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isCountQuery()
-	 */
 	@Override
 	protected boolean isCountQuery() {
 		return tree.isCountProjection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isExistsQuery()
-	 */
 	@Override
 	protected boolean isExistsQuery() {
 		return tree.isExistsProjection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isDeleteQuery()
-	 */
 	@Override
 	protected boolean isDeleteQuery() {
 		return tree.isDelete();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isLimiting()
-	 */
 	@Override
 	protected boolean isLimiting() {
 		return tree.isLimiting();
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregation.java
index bfa65ca1e1..ebc33cef96 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,23 @@
 package org.springframework.data.mongodb.repository.query;
 
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 
 import java.util.List;
 
 import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.reactivestreams.Publisher;
 
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
-import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.ResultProcessor;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.util.ClassUtils;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.util.ReflectionUtils;
 
 /**
  * A reactive {@link org.springframework.data.repository.query.RepositoryQuery} to use a plain JSON String to create an
@@ -44,133 +44,89 @@
  */
 public class ReactiveStringBasedAggregation extends AbstractReactiveMongoQuery {
 
-	private final SpelExpressionParser expressionParser;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
 	private final ReactiveMongoOperations reactiveMongoOperations;
 	private final MongoConverter mongoConverter;
 
 	/**
 	 * @param method must not be {@literal null}.
 	 * @param reactiveMongoOperations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 * @since 4.4.0
 	 */
 	public ReactiveStringBasedAggregation(ReactiveMongoQueryMethod method,
-			ReactiveMongoOperations reactiveMongoOperations, SpelExpressionParser expressionParser,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ReactiveMongoOperations reactiveMongoOperations, ValueExpressionDelegate delegate) {
 
-		super(method, reactiveMongoOperations, expressionParser, evaluationContextProvider);
+		super(method, reactiveMongoOperations, delegate);
 
 		this.reactiveMongoOperations = reactiveMongoOperations;
 		this.mongoConverter = reactiveMongoOperations.getConverter();
-		this.expressionParser = expressionParser;
-		this.evaluationContextProvider = evaluationContextProvider;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#doExecute(org.springframework.data.mongodb.repository.query.ReactiveMongoQueryMethod, org.springframework.data.repository.query.ResultProcessor, org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, java.lang.Class)
-	 */
 	@Override
-	protected Object doExecute(ReactiveMongoQueryMethod method, ResultProcessor processor,
-			ConvertingParameterAccessor accessor, Class<?> typeToRead) {
+	@SuppressWarnings("ReactiveStreamsNullableInLambdaInTransform")
+	protected Publisher<Object> doExecute(ReactiveMongoQueryMethod method, ResultProcessor processor,
+			ConvertingParameterAccessor accessor, @Nullable Class<?> ignored) {
 
-		Class<?> sourceType = method.getDomainClass();
-		Class<?> targetType = typeToRead;
+		return computePipeline(accessor).flatMapMany(it -> {
 
-		List<AggregationOperation> pipeline = computePipeline(accessor);
-		AggregationUtils.appendSortIfPresent(pipeline, accessor, typeToRead);
-		AggregationUtils.appendLimitAndOffsetIfPresent(pipeline, accessor);
+			return AggregationUtils.doAggregate(new AggregationPipeline(it), method, processor, accessor,
+					this::getValueExpressionEvaluator,
+					(aggregation, sourceType, typeToRead, elementType, simpleType, rawResult) -> {
 
-		boolean isSimpleReturnType = isSimpleReturnType(typeToRead);
-		boolean isRawReturnType = ClassUtils.isAssignable(org.bson.Document.class, typeToRead);
+						Flux<?> flux = reactiveMongoOperations.aggregate(aggregation, typeToRead);
+						if (ReflectionUtils.isVoid(elementType)) {
+							return flux.then();
+						}
 
-		if (isSimpleReturnType || isRawReturnType) {
-			targetType = Document.class;
-		}
+						ReactiveMongoQueryExecution.ResultProcessingConverter resultProcessing = getResultProcessing(processor);
 
-		AggregationOptions options = computeOptions(method, accessor);
-		TypedAggregation<?> aggregation = new TypedAggregation<>(sourceType, pipeline, options);
+						if (simpleType && !rawResult && !elementType.equals(Document.class)) {
 
-		Flux<?> flux = reactiveMongoOperations.aggregate(aggregation, targetType);
+							flux = flux.handle((item, sink) -> {
 
-		if (isSimpleReturnType && !isRawReturnType) {
-			flux = flux.handle((it, sink) -> {
+								Object result = AggregationUtils.extractSimpleTypeResult((Document) item, elementType, mongoConverter);
 
-				Object result = AggregationUtils.extractSimpleTypeResult((Document) it, typeToRead, mongoConverter);
+								if (result != null) {
+									sink.next(result);
+								}
+							});
+						}
 
-				if (result != null) {
-					sink.next(result);
-				}
-			});
-		}
+						flux = flux.map(resultProcessing::convert);
 
-		if (method.isCollectionQuery()) {
-			return flux;
-		} else {
-			return flux.next();
-		}
+						return method.isCollectionQuery() ? flux : flux.next();
+					});
+		});
 	}
 
 	private boolean isSimpleReturnType(Class<?> targetType) {
 		return MongoSimpleTypes.HOLDER.isSimpleType(targetType);
 	}
 
-	List<AggregationOperation> computePipeline(ConvertingParameterAccessor accessor) {
-		return AggregationUtils.computePipeline(getQueryMethod(), accessor, expressionParser, evaluationContextProvider);
-	}
-
-	private AggregationOptions computeOptions(MongoQueryMethod method, ConvertingParameterAccessor accessor) {
-
-		AggregationOptions.Builder builder = Aggregation.newAggregationOptions();
-
-		AggregationUtils.applyCollation(builder, method.getAnnotatedCollation(), accessor, method.getParameters(),
-				expressionParser, evaluationContextProvider);
-		AggregationUtils.applyMeta(builder, method);
-
-		return builder.build();
+	private Mono<List<AggregationOperation>> computePipeline(ConvertingParameterAccessor accessor) {
+		return parseAggregationPipeline(getQueryMethod().getAnnotatedAggregation(), accessor);
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
-	 */
 	@Override
-	protected Query createQuery(ConvertingParameterAccessor accessor) {
+	protected Mono<Query> createQuery(ConvertingParameterAccessor accessor) {
 		throw new UnsupportedOperationException("No query support for aggregation");
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isCountQuery()
-	 */
 	@Override
 	protected boolean isCountQuery() {
 		return false;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isExistsQuery()
-	 */
 	@Override
 	protected boolean isExistsQuery() {
 		return false;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isDeleteQuery()
-	 */
 	@Override
 	protected boolean isDeleteQuery() {
 		return false;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isLimiting()
-	 */
 	@Override
 	protected boolean isLimiting() {
 		return false;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java
index 5e1e73040c..4bfe2ca39f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,18 +15,23 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import org.bson.Document;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.jspecify.annotations.Nullable;
+import org.springframework.lang.Contract;
+import reactor.core.publisher.Mono;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.bson.Document;
+import org.jspecify.annotations.NonNull;
+import org.springframework.data.expression.ValueExpressionParser;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.util.json.ParameterBindingContext;
 import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.spel.ExpressionDependencies;
 import org.springframework.util.Assert;
 
 /**
@@ -38,55 +43,53 @@
  */
 public class ReactiveStringBasedMongoQuery extends AbstractReactiveMongoQuery {
 
-	private static final String COUNT_EXISTS_AND_DELETE = "Manually defined query for %s cannot be a count and exists or delete query at the same time!";
-	private static final Logger LOG = LoggerFactory.getLogger(ReactiveStringBasedMongoQuery.class);
-	private static final ParameterBindingDocumentCodec CODEC = new ParameterBindingDocumentCodec();
+	private static final String COUNT_EXISTS_AND_DELETE = "Manually defined query for %s cannot be a count and exists or delete query at the same time";
+	private static final Log LOG = LogFactory.getLog(ReactiveStringBasedMongoQuery.class);
 
 	private final String query;
-	private final String fieldSpec;
+	private final @Nullable String fieldSpec;
 
-	private final SpelExpressionParser expressionParser;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+	private final ValueExpressionParser expressionParser;
 
 	private final boolean isCountQuery;
 	private final boolean isExistsQuery;
 	private final boolean isDeleteQuery;
 
 	/**
-	 * Creates a new {@link ReactiveStringBasedMongoQuery} for the given {@link MongoQueryMethod} and
-	 * {@link MongoOperations}.
+	 * Creates a new {@link ReactiveStringBasedMongoQuery} for the given {@link MongoQueryMethod}, {@link MongoOperations}
+	 * and {@link ValueExpressionDelegate}.
 	 *
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 * @since 4.4.0
 	 */
+	@SuppressWarnings("NullAway")
 	public ReactiveStringBasedMongoQuery(ReactiveMongoQueryMethod method, ReactiveMongoOperations mongoOperations,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		this(method.getAnnotatedQuery(), method, mongoOperations, expressionParser, evaluationContextProvider);
+			ValueExpressionDelegate delegate) {
+		this(method.getAnnotatedQuery(), method, mongoOperations, delegate);
 	}
 
 	/**
 	 * Creates a new {@link ReactiveStringBasedMongoQuery} for the given {@link String}, {@link MongoQueryMethod},
-	 * {@link MongoOperations}, {@link SpelExpressionParser} and {@link QueryMethodEvaluationContextProvider}.
+	 * {@link MongoOperations}, {@link ValueExpressionDelegate}.
 	 *
 	 * @param query must not be {@literal null}.
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 * @since 4.4.0
 	 */
+	@SuppressWarnings("NullAway")
 	public ReactiveStringBasedMongoQuery(String query, ReactiveMongoQueryMethod method,
-			ReactiveMongoOperations mongoOperations, SpelExpressionParser expressionParser,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ReactiveMongoOperations mongoOperations, ValueExpressionDelegate delegate) {
 
-		super(method, mongoOperations, expressionParser, evaluationContextProvider);
+		super(method, mongoOperations, delegate);
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(expressionParser, "SpelExpressionParser must not be null!");
+		Assert.notNull(query, "Query must not be null");
 
 		this.query = query;
-		this.expressionParser = expressionParser;
-		this.evaluationContextProvider = evaluationContextProvider;
+		this.expressionParser = delegate.getValueExpressionParser();
 		this.fieldSpec = method.getFieldSpecification();
 
 		if (method.hasAnnotatedQuery()) {
@@ -109,59 +112,54 @@ public ReactiveStringBasedMongoQuery(String query, ReactiveMongoQueryMethod meth
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
-	 */
 	@Override
-	protected Query createQuery(ConvertingParameterAccessor accessor) {
+	protected Mono<Query> createQuery(ConvertingParameterAccessor accessor) {
 
-		ParameterBindingContext bindingContext = new ParameterBindingContext((accessor::getBindableValue), expressionParser,
-				evaluationContextProvider.getEvaluationContext(getQueryMethod().getParameters(), accessor.getValues()));
+		return getCodecRegistry().map(ParameterBindingDocumentCodec::new).flatMap(codec -> {
 
-		Document queryObject = CODEC.decode(this.query, bindingContext);
-		Document fieldsObject = CODEC.decode(this.fieldSpec, bindingContext);
+			Mono<Document> queryObject = getBindingContext(query, accessor, codec)
+					.map(context -> codec.decode(query, context));
+			Mono<Document> fieldsObject = getBindingContext(fieldSpec, accessor, codec)
+					.map(context -> codec.decode(fieldSpec, context));
 
-		Query query = new BasicQuery(queryObject, fieldsObject).with(accessor.getSort());
+			return queryObject.zipWith(fieldsObject).map(tuple -> {
 
-		if (LOG.isDebugEnabled()) {
-			LOG.debug(String.format("Created query %s for %s fields.", query.getQueryObject(), query.getFieldsObject()));
-		}
+				Query query = new BasicQuery(tuple.getT1(), tuple.getT2()).with(accessor.getSort());
 
-		return query;
+				if (LOG.isDebugEnabled()) {
+					LOG.debug(String.format("Created query %s for %s fields.", query.getQueryObject(), query.getFieldsObject()));
+				}
+
+				return query;
+			});
+		});
+	}
+
+	private Mono<ParameterBindingContext> getBindingContext(@Nullable String json, ConvertingParameterAccessor accessor,
+			ParameterBindingDocumentCodec codec) {
+
+		ExpressionDependencies dependencies = codec.captureExpressionDependencies(json, accessor::getBindableValue,
+				expressionParser);
+
+		return getValueExpressionEvaluatorLater(dependencies, accessor)
+				.map(it -> new ParameterBindingContext(accessor::getBindableValue, it));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isCountQuery()
-	 */
 	@Override
 	protected boolean isCountQuery() {
 		return isCountQuery;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isExistsQuery()
-	 */
 	@Override
 	protected boolean isExistsQuery() {
 		return isExistsQuery;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isDeleteQuery()
-	 */
 	@Override
 	protected boolean isDeleteQuery() {
 		return this.isDeleteQuery;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#isLimiting()
-	 */
 	@Override
 	protected boolean isLimiting() {
 		return false;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveVectorSearchAggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveVectorSearchAggregation.java
new file mode 100644
index 0000000000..cf75c7db94
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ReactiveVectorSearchAggregation.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2025 the original author 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.repository.query;
+
+import reactor.core.publisher.Mono;
+
+import org.bson.Document;
+import org.reactivestreams.Publisher;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.VectorSearch;
+import org.springframework.data.mongodb.repository.query.VectorSearchDelegate.QueryContainer;
+import org.springframework.data.mongodb.util.json.ParameterBindingContext;
+import org.springframework.data.repository.query.ResultProcessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.spel.ExpressionDependencies;
+
+/**
+ * {@link AbstractReactiveMongoQuery} implementation to run a {@link VectorSearchAggregation}. The pre-filter is either
+ * derived from the method name or provided through {@link VectorSearch#filter()}.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class ReactiveVectorSearchAggregation extends AbstractReactiveMongoQuery {
+
+	private final ReactiveMongoOperations mongoOperations;
+	private final MongoPersistentEntity<?> collectionEntity;
+	private final ValueExpressionDelegate valueExpressionDelegate;
+	private final VectorSearchDelegate delegate;
+
+	/**
+	 * Creates a new {@link ReactiveVectorSearchAggregation} from the given {@link MongoQueryMethod} and
+	 * {@link MongoOperations}.
+	 *
+	 * @param method must not be {@literal null}.
+	 * @param mongoOperations must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 */
+	public ReactiveVectorSearchAggregation(ReactiveMongoQueryMethod method, ReactiveMongoOperations mongoOperations,
+			ValueExpressionDelegate delegate) {
+
+		super(method, mongoOperations, delegate);
+
+		this.valueExpressionDelegate = delegate;
+		if (!method.isSearchQuery() && !method.isCollectionQuery()) {
+			throw new InvalidMongoDbApiUsageException(String.format(
+					"Repository Vector Search method '%s' must return either return SearchResults<T> or List<T> but was %s",
+					method.getName(), method.getReturnType().getType().getSimpleName()));
+		}
+
+		this.mongoOperations = mongoOperations;
+		this.collectionEntity = method.getEntityInformation().getCollectionEntity();
+		this.delegate = new VectorSearchDelegate(method, mongoOperations.getConverter(), delegate);
+	}
+
+	@Override
+	protected Publisher<Object> doExecute(ReactiveMongoQueryMethod method, ResultProcessor processor,
+			ConvertingParameterAccessor accessor, @org.jspecify.annotations.Nullable Class<?> typeToRead) {
+
+		return getParameterBindingCodec().flatMapMany(codec -> {
+
+			String json = delegate.getQueryString();
+			ExpressionDependencies dependencies = codec.captureExpressionDependencies(json, accessor::getBindableValue,
+					valueExpressionDelegate);
+
+			return getValueExpressionEvaluatorLater(dependencies, accessor).flatMapMany(expressionEvaluator -> {
+
+				ParameterBindingContext bindingContext = new ParameterBindingContext(accessor::getBindableValue,
+						expressionEvaluator);
+				QueryContainer query = delegate.createQuery(expressionEvaluator, processor, accessor, typeToRead, codec,
+						bindingContext);
+
+				ReactiveMongoQueryExecution.VectorSearchExecution execution = new ReactiveMongoQueryExecution.VectorSearchExecution(
+						mongoOperations, method, query);
+
+				return execution.execute(query.query(), Document.class, collectionEntity.getCollection());
+			});
+		});
+	}
+
+	@Override
+	protected Mono<Query> createQuery(ConvertingParameterAccessor accessor) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	protected boolean isCountQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isExistsQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isDeleteQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isLimiting() {
+		return false;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java
index fffb35e159..2c2af25e10 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/SimpleMongoEntityMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import lombok.Getter;
-
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.util.Assert;
 
@@ -28,7 +26,7 @@
 class SimpleMongoEntityMetadata<T> implements MongoEntityMetadata<T> {
 
 	private final Class<T> type;
-	private final @Getter MongoPersistentEntity<?> collectionEntity;
+	private final MongoPersistentEntity<?> collectionEntity;
 
 	/**
 	 * Creates a new {@link SimpleMongoEntityMetadata} using the given type and {@link MongoPersistentEntity} to use for
@@ -39,26 +37,22 @@ class SimpleMongoEntityMetadata<T> implements MongoEntityMetadata<T> {
 	 */
 	public SimpleMongoEntityMetadata(Class<T> type, MongoPersistentEntity<?> collectionEntity) {
 
-		Assert.notNull(type, "Type must not be null!");
-		Assert.notNull(collectionEntity, "Collection entity must not be null or empty!");
+		Assert.notNull(type, "Type must not be null");
+		Assert.notNull(collectionEntity, "Collection entity must not be null or empty");
 
 		this.type = type;
 		this.collectionEntity = collectionEntity;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.EntityMetadata#getJavaType()
-	 */
 	public Class<T> getJavaType() {
 		return type;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoEntityMetadata#getCollectionName()
-	 */
 	public String getCollectionName() {
 		return collectionEntity.getCollection();
 	}
+
+	public MongoPersistentEntity<?> getCollectionEntity() {
+		return this.collectionEntity;
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringAggregationOperation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringAggregationOperation.java
new file mode 100644
index 0000000000..289b953b27
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringAggregationOperation.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2024-2025 the original author 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.repository.query;
+
+import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
+
+/**
+ * String-based aggregation operation for a repository query method.
+ *
+ * @author Christoph Strobl
+ * @since 4.3.1
+ */
+class StringAggregationOperation implements AggregationOperation {
+
+	private static final Pattern OPERATOR_PATTERN = Pattern.compile("\\$\\w+");
+
+	private final String source;
+	private final Class<?> domainType;
+	private final Function<String, Document> bindFunction;
+	private final @Nullable String operator;
+
+	StringAggregationOperation(String source, Class<?> domainType, Function<String, Document> bindFunction) {
+
+		this.source = source;
+		this.domainType = domainType;
+		this.bindFunction = bindFunction;
+
+		Matcher matcher = OPERATOR_PATTERN.matcher(source);
+		this.operator = matcher.find() ? matcher.group() : null;
+	}
+
+	@Override
+	public Document toDocument(AggregationOperationContext context) {
+		return context.getMappedObject(bindFunction.apply(source), domainType);
+	}
+
+	@Override
+	public String getOperator() {
+		return operator != null ? operator : AggregationOperation.super.getOperator();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedAggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedAggregation.java
index a413ee3526..3f6a48e84c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedAggregation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedAggregation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,165 +15,149 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.bson.Document;
-
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.SliceImpl;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
-import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoSimpleTypes;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.ResultProcessor;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.util.ClassUtils;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.util.ReflectionUtils;
 
 /**
+ * {@link AbstractMongoQuery} implementation to run string-based aggregations using
+ * {@link org.springframework.data.mongodb.repository.Aggregation}.
+ *
  * @author Christoph Strobl
+ * @author Divya Srivastava
+ * @author Mark Paluch
  * @since 2.2
  */
 public class StringBasedAggregation extends AbstractMongoQuery {
 
 	private final MongoOperations mongoOperations;
 	private final MongoConverter mongoConverter;
-	private final SpelExpressionParser expressionParser;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
 
 	/**
 	 * Creates a new {@link StringBasedAggregation} from the given {@link MongoQueryMethod} and {@link MongoOperations}.
 	 *
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
-	 * @param expressionParser
-	 * @param evaluationContextProvider
+	 * @param delegate must not be {@literal null}.
+	 * @since 4.4.0
 	 */
 	public StringBasedAggregation(MongoQueryMethod method, MongoOperations mongoOperations,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		super(method, mongoOperations, expressionParser, evaluationContextProvider);
+			ValueExpressionDelegate delegate) {
+		super(method, mongoOperations, delegate);
+
+		if (method.isPageQuery()) {
+			throw new InvalidMongoDbApiUsageException(String.format(
+					"Repository aggregation method '%s' does not support '%s' return type; Please use 'Slice' or 'List' instead",
+					method.getName(), method.getReturnType().getType().getSimpleName()));
+		}
 
 		this.mongoOperations = mongoOperations;
 		this.mongoConverter = mongoOperations.getConverter();
-		this.expressionParser = expressionParser;
-		this.evaluationContextProvider = evaluationContextProvider;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractReactiveMongoQuery#doExecute(org.springframework.data.mongodb.repository.query.MongoQueryMethod, org.springframework.data.repository.query.ResultProcessor, org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor, java.lang.Class)
-	 */
+	@SuppressWarnings("unchecked")
 	@Override
-	protected Object doExecute(MongoQueryMethod method, ResultProcessor resultProcessor,
-			ConvertingParameterAccessor accessor, Class<?> typeToRead) {
+	protected @Nullable Object doExecute(MongoQueryMethod method, ResultProcessor processor, ConvertingParameterAccessor accessor,
+			@Nullable Class<?> ignore) {
 
-		Class<?> sourceType = method.getDomainClass();
-		Class<?> targetType = typeToRead;
+		return AggregationUtils.doAggregate(AggregationUtils.computePipeline(this, method, accessor), method, processor,
+				accessor, this::getExpressionEvaluatorFor,
+				(aggregation, sourceType, typeToRead, elementType, simpleType, rawResult) -> {
 
-		List<AggregationOperation> pipeline = computePipeline(method, accessor);
-		AggregationUtils.appendSortIfPresent(pipeline, accessor, typeToRead);
-		AggregationUtils.appendLimitAndOffsetIfPresent(pipeline, accessor);
+					if (method.isStreamQuery()) {
 
-		boolean isSimpleReturnType = isSimpleReturnType(typeToRead);
-		boolean isRawAggregationResult = ClassUtils.isAssignable(AggregationResults.class, typeToRead);
+						Stream<?> stream = mongoOperations.aggregateStream(aggregation, typeToRead);
 
-		if (isSimpleReturnType) {
-			targetType = Document.class;
-		} else if (isRawAggregationResult) {
-			targetType = method.getReturnType().getRequiredActualType().getRequiredComponentType().getType();
-		}
+						if (!simpleType || elementType.equals(Document.class)) {
+							return stream;
+						}
 
-		AggregationOptions options = computeOptions(method, accessor);
-		TypedAggregation<?> aggregation = new TypedAggregation<>(sourceType, pipeline, options);
+						return stream
+								.map(it -> AggregationUtils.extractSimpleTypeResult((Document) it, elementType, mongoConverter));
+					}
 
-		AggregationResults<?> result = mongoOperations.aggregate(aggregation, targetType);
+					AggregationResults<Object> result = (AggregationResults<Object>) mongoOperations.aggregate(aggregation,
+							typeToRead);
 
-		if (isRawAggregationResult) {
-			return result;
-		}
+					if (ReflectionUtils.isVoid(elementType)) {
+						return null;
+					}
 
-		if (method.isCollectionQuery()) {
+					if (rawResult) {
+						return result;
+					}
 
-			if (isSimpleReturnType) {
+					List<?> results = result.getMappedResults();
+					if (method.isCollectionQuery()) {
+						return simpleType ? convertResults(elementType, (List<Document>) results) : results;
+					}
 
-				return result.getMappedResults().stream()
-						.map(it -> AggregationUtils.extractSimpleTypeResult((Document) it, typeToRead, mongoConverter))
-						.collect(Collectors.toList());
-			}
+					if (method.isSliceQuery()) {
 
-			return result.getMappedResults();
-		}
+						Pageable pageable = accessor.getPageable();
+						int pageSize = pageable.getPageSize();
+						List<Object> resultsToUse = simpleType ? convertResults(elementType, (List<Document>) results)
+								: (List<Object>) results;
+						boolean hasNext = resultsToUse.size() > pageSize;
+						return new SliceImpl<>(hasNext ? resultsToUse.subList(0, pageSize) : resultsToUse, pageable, hasNext);
+					}
 
-		Object uniqueResult = result.getUniqueMappedResult();
+					Object uniqueResult = result.getUniqueMappedResult();
 
-		return isSimpleReturnType
-				? AggregationUtils.extractSimpleTypeResult((Document) uniqueResult, typeToRead, mongoConverter)
-				: uniqueResult;
+					return simpleType
+							? AggregationUtils.extractSimpleTypeResult((Document) uniqueResult, elementType, mongoConverter)
+							: uniqueResult;
+				});
 	}
 
-	private boolean isSimpleReturnType(Class<?> targetType) {
-		return MongoSimpleTypes.HOLDER.isSimpleType(targetType);
-	}
+	private List<Object> convertResults(Class<?> targetType, List<Document> mappedResults) {
 
-	List<AggregationOperation> computePipeline(MongoQueryMethod method, ConvertingParameterAccessor accessor) {
-		return AggregationUtils.computePipeline(method, accessor, expressionParser, evaluationContextProvider);
+		List<Object> list = new ArrayList<>(mappedResults.size());
+		for (Document it : mappedResults) {
+			Object extractSimpleTypeResult = AggregationUtils.extractSimpleTypeResult(it, targetType, mongoConverter);
+			list.add(extractSimpleTypeResult);
+		}
+		return list;
 	}
 
-	private AggregationOptions computeOptions(MongoQueryMethod method, ConvertingParameterAccessor accessor) {
-
-		AggregationOptions.Builder builder = Aggregation.newAggregationOptions();
-
-		AggregationUtils.applyCollation(builder, method.getAnnotatedCollation(), accessor, method.getParameters(),
-				expressionParser, evaluationContextProvider);
-		AggregationUtils.applyMeta(builder, method);
-
-		return builder.build();
+	private boolean isSimpleReturnType(Class<?> targetType) {
+		return MongoSimpleTypes.HOLDER.isSimpleType(targetType);
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
-	 */
 	@Override
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 		throw new UnsupportedOperationException("No query support for aggregation");
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isCountQuery()
-	 */
 	@Override
 	protected boolean isCountQuery() {
 		return false;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isExistsQuery()
-	 */
 	@Override
 	protected boolean isExistsQuery() {
 		return false;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery()
-	 */
 	@Override
 	protected boolean isDeleteQuery() {
 		return false;
 	}
 
-	/*
-	 * (non-Javascript)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isLimiting()
-	 */
 	@Override
 	protected boolean isLimiting() {
 		return false;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java
index 7b045e8f98..c990d3269d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,17 +15,15 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.util.json.ParameterBindingContext;
-import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.util.Assert;
 
 /**
@@ -38,54 +36,50 @@
  */
 public class StringBasedMongoQuery extends AbstractMongoQuery {
 
-	private static final String COUNT_EXISTS_AND_DELETE = "Manually defined query for %s cannot be a count and exists or delete query at the same time!";
-	private static final Logger LOG = LoggerFactory.getLogger(StringBasedMongoQuery.class);
-	private static final ParameterBindingDocumentCodec CODEC = new ParameterBindingDocumentCodec();
+	private static final String COUNT_EXISTS_AND_DELETE = "Manually defined query for %s cannot be a count and exists or delete query at the same time";
+	private static final Log LOG = LogFactory.getLog(StringBasedMongoQuery.class);
 
 	private final String query;
 	private final String fieldSpec;
 
-	private final SpelExpressionParser expressionParser;
-	private final QueryMethodEvaluationContextProvider evaluationContextProvider;
-
 	private final boolean isCountQuery;
 	private final boolean isExistsQuery;
 	private final boolean isDeleteQuery;
 
 	/**
 	 * Creates a new {@link StringBasedMongoQuery} for the given {@link MongoQueryMethod}, {@link MongoOperations},
-	 * {@link SpelExpressionParser} and {@link QueryMethodEvaluationContextProvider}.
+	 * {@link ValueExpressionDelegate}.
 	 *
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
-	 * @param evaluationContextProvider must not be {@literal null}.
+	 * @param expressionSupport must not be {@literal null}.
+	 * @since 4.4.0
 	 */
+	@SuppressWarnings("NullAway")
 	public StringBasedMongoQuery(MongoQueryMethod method, MongoOperations mongoOperations,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		this(method.getAnnotatedQuery(), method, mongoOperations, expressionParser, evaluationContextProvider);
+			ValueExpressionDelegate expressionSupport) {
+		this(method.getAnnotatedQuery(), method, mongoOperations, expressionSupport);
 	}
 
 	/**
 	 * Creates a new {@link StringBasedMongoQuery} for the given {@link String}, {@link MongoQueryMethod},
-	 * {@link MongoOperations}, {@link SpelExpressionParser} and {@link QueryMethodEvaluationContextProvider}.
+	 * {@link MongoOperations}, {@link ValueExpressionDelegate}, {@link QueryMethodValueEvaluationContextAccessor}.
 	 *
 	 * @param query must not be {@literal null}.
 	 * @param method must not be {@literal null}.
 	 * @param mongoOperations must not be {@literal null}.
-	 * @param expressionParser must not be {@literal null}.
+	 * @param expressionSupport must not be {@literal null}.
+	 * @since 4.3
 	 */
+	@SuppressWarnings("NullAway")
 	public StringBasedMongoQuery(String query, MongoQueryMethod method, MongoOperations mongoOperations,
-			SpelExpressionParser expressionParser, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+			ValueExpressionDelegate expressionSupport) {
 
-		super(method, mongoOperations, expressionParser, evaluationContextProvider);
+		super(method, mongoOperations, expressionSupport);
 
-		Assert.notNull(query, "Query must not be null!");
-		Assert.notNull(expressionParser, "SpelExpressionParser must not be null!");
+		Assert.notNull(query, "Query must not be null");
 
 		this.query = query;
-		this.expressionParser = expressionParser;
-		this.evaluationContextProvider = evaluationContextProvider;
 		this.fieldSpec = method.getFieldSpecification();
 
 		if (method.hasAnnotatedQuery()) {
@@ -108,18 +102,11 @@ public StringBasedMongoQuery(String query, MongoQueryMethod method, MongoOperati
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#createQuery(org.springframework.data.mongodb.repository.query.ConvertingParameterAccessor)
-	 */
 	@Override
 	protected Query createQuery(ConvertingParameterAccessor accessor) {
 
-		ParameterBindingContext bindingContext = new ParameterBindingContext((accessor::getBindableValue), expressionParser,
-				evaluationContextProvider.getEvaluationContext(getQueryMethod().getParameters(), accessor.getValues()));
-
-		Document queryObject = CODEC.decode(this.query, bindingContext);
-		Document fieldsObject = CODEC.decode(this.fieldSpec, bindingContext);
+		Document queryObject = decode(this.query, prepareBindingContext(this.query, accessor));
+		Document fieldsObject = decode(this.fieldSpec, prepareBindingContext(this.fieldSpec, accessor));
 
 		Query query = new BasicQuery(queryObject, fieldsObject).with(accessor.getSort());
 
@@ -130,37 +117,21 @@ protected Query createQuery(ConvertingParameterAccessor accessor) {
 		return query;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isCountQuery()
-	 */
 	@Override
 	protected boolean isCountQuery() {
 		return isCountQuery;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isExistsQuery()
-	 */
 	@Override
 	protected boolean isExistsQuery() {
 		return isExistsQuery;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isDeleteQuery()
-	 */
 	@Override
 	protected boolean isDeleteQuery() {
 		return this.isDeleteQuery;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.AbstractMongoQuery#isLimiting()
-	 */
 	@Override
 	protected boolean isLimiting() {
 		return false;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ValueExpressionDelegateValueExpressionEvaluator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ValueExpressionDelegateValueExpressionEvaluator.java
new file mode 100644
index 0000000000..360f5e80eb
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/ValueExpressionDelegateValueExpressionEvaluator.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024-2025 the original author 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.repository.query;
+
+import java.util.function.Function;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.expression.ValueEvaluationContext;
+import org.springframework.data.expression.ValueExpression;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+
+class ValueExpressionDelegateValueExpressionEvaluator implements ValueExpressionEvaluator {
+
+	private final ValueExpressionDelegate delegate;
+	private final Function<ValueExpression, ValueEvaluationContext> expressionToContext;
+
+	ValueExpressionDelegateValueExpressionEvaluator(ValueExpressionDelegate delegate, Function<ValueExpression, ValueEvaluationContext> expressionToContext) {
+		this.delegate = delegate;
+		this.expressionToContext = expressionToContext;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public <T> @Nullable T evaluate(String expressionString) {
+		ValueExpression expression = delegate.parse(expressionString);
+		return (T) expression.evaluate(expressionToContext.apply(expression));
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchAggregation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchAggregation.java
new file mode 100644
index 0000000000..eb8dc2e52e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchAggregation.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2025 the original author 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.repository.query;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.VectorSearch;
+import org.springframework.data.mongodb.repository.query.VectorSearchDelegate.QueryContainer;
+import org.springframework.data.mongodb.util.json.ParameterBindingContext;
+import org.springframework.data.repository.query.ResultProcessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+
+/**
+ * {@link AbstractMongoQuery} implementation to run a {@link VectorSearchAggregation}. The pre-filter is either derived
+ * from the method name or provided through {@link VectorSearch#filter()}.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ */
+public class VectorSearchAggregation extends AbstractMongoQuery {
+
+	private final MongoOperations mongoOperations;
+	private final MongoPersistentEntity<?> collectionEntity;
+	private final VectorSearchDelegate delegate;
+
+	/**
+	 * Creates a new {@link VectorSearchAggregation} from the given {@link MongoQueryMethod} and {@link MongoOperations}.
+	 *
+	 * @param method must not be {@literal null}.
+	 * @param mongoOperations must not be {@literal null}.
+	 * @param delegate must not be {@literal null}.
+	 */
+	public VectorSearchAggregation(MongoQueryMethod method, MongoOperations mongoOperations,
+			ValueExpressionDelegate delegate) {
+
+		super(method, mongoOperations, delegate);
+
+		if (!method.isSearchQuery() && !method.isCollectionQuery()) {
+			throw new InvalidMongoDbApiUsageException(String.format(
+					"Repository Vector Search method '%s' must return either return SearchResults<T> or List<T> but was %s",
+					method.getName(), method.getReturnType().getType().getSimpleName()));
+		}
+
+		this.mongoOperations = mongoOperations;
+		this.collectionEntity = method.getEntityInformation().getCollectionEntity();
+		this.delegate = new VectorSearchDelegate(method, mongoOperations.getConverter(), delegate);
+	}
+
+	@Override
+	protected Object doExecute(MongoQueryMethod method, ResultProcessor processor, ConvertingParameterAccessor accessor,
+			@Nullable Class<?> typeToRead) {
+
+		QueryContainer query = createVectorSearchQuery(processor, accessor, typeToRead);
+
+		MongoQueryExecution.VectorSearchExecution execution = new MongoQueryExecution.VectorSearchExecution(mongoOperations,
+				method, collectionEntity.getCollection(), query);
+
+		return execution.execute(query.query());
+	}
+
+	QueryContainer createVectorSearchQuery(ResultProcessor processor, MongoParameterAccessor accessor,
+			@Nullable Class<?> typeToRead) {
+
+		ValueExpressionEvaluator evaluator = getExpressionEvaluatorFor(accessor);
+		ParameterBindingContext bindingContext = prepareBindingContext(delegate.getQueryString(), accessor);
+
+		return delegate.createQuery(evaluator, processor, accessor, typeToRead, getParameterBindingCodec(), bindingContext);
+	}
+
+	@Override
+	protected Query createQuery(ConvertingParameterAccessor accessor) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	protected boolean isCountQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isExistsQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isDeleteQuery() {
+		return false;
+	}
+
+	@Override
+	protected boolean isLimiting() {
+		return false;
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchDelegate.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchDelegate.java
new file mode 100644
index 0000000000..0dbff2e932
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/VectorSearchDelegate.java
@@ -0,0 +1,422 @@
+/*
+ * Copyright 2025 the original author 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.repository.query;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.ScoringFunction;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.expression.ValueExpression;
+import org.springframework.data.mapping.PersistentPropertyPath;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperation;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.VectorSearch;
+import org.springframework.data.mongodb.util.json.ParameterBindingContext;
+import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
+import org.springframework.data.repository.query.ResultProcessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.repository.query.parser.Part;
+import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.util.NumberUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * Delegate to assemble information about Vector Search queries necessary to run a MongoDB {@code $vectorSearch}.
+ *
+ * @author Mark Paluch
+ */
+class VectorSearchDelegate {
+
+	private final VectorSearchQueryFactory queryFactory;
+	private final VectorSearchOperation.SearchType searchType;
+	private final String indexName;
+	private final @Nullable Integer numCandidates;
+	private final @Nullable String numCandidatesExpression;
+	private final Limit limit;
+	private final @Nullable String limitExpression;
+	private final MongoConverter converter;
+
+	VectorSearchDelegate(MongoQueryMethod method, MongoConverter converter, ValueExpressionDelegate delegate) {
+
+		VectorSearch vectorSearch = method.findAnnotatedVectorSearch().orElseThrow();
+
+		this.searchType = vectorSearch.searchType();
+		this.indexName = method.getAnnotatedHint();
+
+		if (StringUtils.hasText(vectorSearch.numCandidates())) {
+
+			ValueExpression expression = delegate.getValueExpressionParser().parse(vectorSearch.numCandidates());
+
+			if (expression.isLiteral()) {
+				this.numCandidates = Integer.parseInt(vectorSearch.numCandidates());
+				this.numCandidatesExpression = null;
+			} else {
+				this.numCandidates = null;
+				this.numCandidatesExpression = vectorSearch.numCandidates();
+			}
+
+		} else {
+			this.numCandidates = null;
+			this.numCandidatesExpression = null;
+		}
+
+		if (StringUtils.hasText(vectorSearch.limit())) {
+
+			ValueExpression expression = delegate.getValueExpressionParser().parse(vectorSearch.limit());
+
+			if (expression.isLiteral()) {
+				this.limit = Limit.of(Integer.parseInt(vectorSearch.limit()));
+				this.limitExpression = null;
+			} else {
+				this.limit = Limit.unlimited();
+				this.limitExpression = vectorSearch.limit();
+			}
+
+		} else {
+			this.limit = Limit.unlimited();
+			this.limitExpression = null;
+		}
+
+		this.converter = converter;
+
+		if (StringUtils.hasText(vectorSearch.filter())) {
+			this.queryFactory = StringUtils.hasText(vectorSearch.path())
+					? new AnnotatedQueryFactory(vectorSearch.filter(), vectorSearch.path())
+					: new AnnotatedQueryFactory(vectorSearch.filter(), method.getEntityInformation().getCollectionEntity());
+		} else {
+			this.queryFactory = new PartTreeQueryFactory(
+					new PartTree(method.getName(), method.getResultProcessor().getReturnedType().getDomainType()),
+					converter.getMappingContext());
+		}
+	}
+
+	/**
+	 * Create Query Metadata for {@code $vectorSearch}.
+	 */
+	QueryContainer createQuery(ValueExpressionEvaluator evaluator, ResultProcessor processor,
+			MongoParameterAccessor accessor, @Nullable Class<?> typeToRead, ParameterBindingDocumentCodec codec,
+			ParameterBindingContext context) {
+
+		String scoreField = "__score__";
+		Class<?> outputType = typeToRead != null ? typeToRead : processor.getReturnedType().getReturnedType();
+		VectorSearchInput vectorSearchInput = createSearchInput(evaluator, accessor, codec, context);
+		AggregationPipeline pipeline = createVectorSearchPipeline(vectorSearchInput, scoreField, outputType, accessor,
+				evaluator);
+
+		return new QueryContainer(vectorSearchInput.path, scoreField, vectorSearchInput.query, pipeline, searchType,
+				outputType, getSimilarityFunction(accessor), indexName);
+	}
+
+	@SuppressWarnings("NullAway")
+	AggregationPipeline createVectorSearchPipeline(VectorSearchInput input, String scoreField, Class<?> outputType,
+			MongoParameterAccessor accessor, ValueExpressionEvaluator evaluator) {
+
+		Vector vector = accessor.getVector();
+		Score score = accessor.getScore();
+		Range<Score> distance = accessor.getScoreRange();
+		Limit limit = Limit.of(input.query().getLimit());
+
+		List<AggregationOperation> stages = new ArrayList<>();
+		VectorSearchOperation $vectorSearch = Aggregation.vectorSearch(indexName).path(input.path()).vector(vector)
+				.limit(limit);
+
+		Integer candidates = null;
+		if (this.numCandidatesExpression != null) {
+			candidates = ((Number) evaluator.evaluate(this.numCandidatesExpression)).intValue();
+		} else if (this.numCandidates != null) {
+			candidates = this.numCandidates;
+		} else if (input.query().isLimited() && (searchType == VectorSearchOperation.SearchType.ANN
+				|| searchType == VectorSearchOperation.SearchType.DEFAULT)) {
+
+			/*
+			MongoDB: We recommend that you specify a number at least 20 times higher than the number of documents to return (limit) to increase accuracy.
+			 */
+			candidates = input.query().getLimit() * 20;
+		}
+
+		if (candidates != null) {
+			$vectorSearch = $vectorSearch.numCandidates(candidates);
+		}
+		//
+		$vectorSearch = $vectorSearch.filter(input.query.getQueryObject());
+		$vectorSearch = $vectorSearch.searchType(this.searchType);
+		$vectorSearch = $vectorSearch.withSearchScore(scoreField);
+
+		if (score != null) {
+			$vectorSearch = $vectorSearch.withFilterBySore(c -> {
+				c.gt(score.getValue());
+			});
+		} else if (distance.getLowerBound().isBounded() || distance.getUpperBound().isBounded()) {
+			$vectorSearch = $vectorSearch.withFilterBySore(c -> {
+				Range.Bound<Score> lower = distance.getLowerBound();
+				if (lower.isBounded()) {
+					double value = lower.getValue().get().getValue();
+					if (lower.isInclusive()) {
+						c.gte(value);
+					} else {
+						c.gt(value);
+					}
+				}
+
+				Range.Bound<Score> upper = distance.getUpperBound();
+				if (upper.isBounded()) {
+
+					double value = upper.getValue().get().getValue();
+					if (upper.isInclusive()) {
+						c.lte(value);
+					} else {
+						c.lt(value);
+					}
+				}
+			});
+		}
+
+		stages.add($vectorSearch);
+
+		if (input.query().isSorted()) {
+
+			stages.add(ctx -> {
+
+				Document mappedSort = ctx.getMappedObject(input.query().getSortObject(), outputType);
+				mappedSort.append(scoreField, -1);
+				return ctx.getMappedObject(new Document("$sort", mappedSort));
+			});
+		} else {
+			stages.add(Aggregation.sort(Sort.Direction.DESC, scoreField));
+		}
+
+		return new AggregationPipeline(stages);
+	}
+
+	private VectorSearchInput createSearchInput(ValueExpressionEvaluator evaluator, MongoParameterAccessor accessor,
+			ParameterBindingDocumentCodec codec, ParameterBindingContext context) {
+
+		VectorSearchInput input = queryFactory.createQuery(accessor, codec, context);
+		Limit limit = getLimit(evaluator, accessor);
+		if(!input.query.isLimited() || (input.query.isLimited() && !limit.isUnlimited())) {
+			input.query().limit(limit);
+		}
+		return input;
+	}
+
+	private Limit getLimit(ValueExpressionEvaluator evaluator, MongoParameterAccessor accessor) {
+
+		if (this.limitExpression != null) {
+
+			Object value = evaluator.evaluate(this.limitExpression);
+			if (value != null) {
+				if (value instanceof Limit l) {
+					return l;
+				}
+				if (value instanceof Number n) {
+					return Limit.of(n.intValue());
+				}
+				if (value instanceof String s) {
+					return Limit.of(NumberUtils.parseNumber(s, Integer.class));
+				}
+				throw new IllegalArgumentException("Invalid type for Limit. Found [%s], expected Limit or Number");
+			}
+		}
+
+		if (this.limit.isLimited()) {
+			return this.limit;
+		}
+
+		return accessor.getLimit();
+	}
+
+	public String getQueryString() {
+		return queryFactory.getQueryString();
+	}
+
+	ScoringFunction getSimilarityFunction(MongoParameterAccessor accessor) {
+
+		Score score = accessor.getScore();
+
+		if (score != null) {
+			return score.getFunction();
+		}
+
+		Range<Score> scoreRange = accessor.getScoreRange();
+
+		if (scoreRange != null) {
+			if (scoreRange.getUpperBound().isBounded()) {
+				return scoreRange.getUpperBound().getValue().get().getFunction();
+			}
+
+			if (scoreRange.getLowerBound().isBounded()) {
+				return scoreRange.getLowerBound().getValue().get().getFunction();
+			}
+		}
+
+		return ScoringFunction.unspecified();
+	}
+
+	/**
+	 * Metadata for a Vector Search Aggregation.
+	 *
+	 * @param path
+	 * @param query
+	 * @param searchType
+	 * @param outputType
+	 * @param scoringFunction
+	 */
+	record QueryContainer(String path, String scoreField, Query query, AggregationPipeline pipeline,
+			VectorSearchOperation.SearchType searchType, Class<?> outputType, ScoringFunction scoringFunction, String index) {
+
+	}
+
+	/**
+	 * Strategy interface to implement a query factory for the Vector Search pre-filter query.
+	 */
+	private interface VectorSearchQueryFactory {
+
+		VectorSearchInput createQuery(MongoParameterAccessor parameterAccessor, ParameterBindingDocumentCodec codec,
+				ParameterBindingContext context);
+
+		/**
+		 * @return the underlying query string to determine {@link ParameterBindingContext}.
+		 */
+		String getQueryString();
+	}
+
+	private static class AnnotatedQueryFactory implements VectorSearchQueryFactory {
+
+		private final String query;
+		private final String path;
+
+		AnnotatedQueryFactory(String query, String path) {
+
+			this.query = query;
+			this.path = path;
+		}
+
+		AnnotatedQueryFactory(String query, MongoPersistentEntity<?> entity) {
+
+			this.query = query;
+			String path = null;
+			for (MongoPersistentProperty property : entity) {
+				if (Vector.class.isAssignableFrom(property.getType())) {
+					path = property.getFieldName();
+					break;
+				}
+			}
+
+			if (path == null) {
+				throw new InvalidMongoDbApiUsageException(
+						"Cannot find Vector Search property in entity [%s]".formatted(entity.getName()));
+			}
+
+			this.path = path;
+		}
+
+		public VectorSearchInput createQuery(MongoParameterAccessor parameterAccessor, ParameterBindingDocumentCodec codec,
+				ParameterBindingContext context) {
+
+			Document queryObject = codec.decode(this.query, context);
+			Query query = new BasicQuery(queryObject);
+
+			Sort sort = parameterAccessor.getSort();
+			if (sort.isSorted()) {
+				query = query.with(sort);
+			}
+
+			return new VectorSearchInput(path, query);
+		}
+
+		@Override
+		public String getQueryString() {
+			return this.query;
+		}
+	}
+
+	private class PartTreeQueryFactory implements VectorSearchQueryFactory {
+
+		private final String path;
+		private final PartTree tree;
+
+		@SuppressWarnings("NullableProblems")
+		PartTreeQueryFactory(PartTree tree, MappingContext<?, MongoPersistentProperty> context) {
+
+			String path = null;
+			for (PartTree.OrPart part : tree) {
+				for (Part p : part) {
+					if (p.getType() == Part.Type.SIMPLE_PROPERTY || p.getType() == Part.Type.NEAR
+							|| p.getType() == Part.Type.WITHIN || p.getType() == Part.Type.BETWEEN) {
+						PersistentPropertyPath<MongoPersistentProperty> ppp = context.getPersistentPropertyPath(p.getProperty());
+						MongoPersistentProperty property = ppp.getLeafProperty();
+
+						if (Vector.class.isAssignableFrom(property.getType())) {
+							path = p.getProperty().toDotPath();
+							break;
+						}
+					}
+				}
+			}
+
+			if (path == null) {
+				throw new InvalidMongoDbApiUsageException(
+						"No Simple Property/Near/Within/Between part found for a Vector property");
+			}
+
+			this.path = path;
+			this.tree = tree;
+		}
+
+		@SuppressWarnings("NullAway")
+		public VectorSearchInput createQuery(MongoParameterAccessor parameterAccessor, ParameterBindingDocumentCodec codec,
+				ParameterBindingContext context) {
+
+			MongoQueryCreator creator = new MongoQueryCreator(tree, parameterAccessor, converter.getMappingContext(), false,
+					true);
+
+			Query query = creator.createQuery(parameterAccessor.getSort());
+
+			if (tree.isLimiting()) {
+				query.limit(tree.getMaxResults());
+			}
+
+			return new VectorSearchInput(path, query);
+		}
+
+		@Override
+		public String getQueryString() {
+			return "";
+		}
+	}
+
+	private record VectorSearchInput(String path, Query query) {
+
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java
index 20c77e22aa..5f0cc21049 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Query derivation mechanism for MongoDB specific repositories.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.repository.query;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoOps.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CrudMethodMetadata.java
similarity index 59%
rename from spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoOps.java
rename to spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CrudMethodMetadata.java
index 2b386e045c..6f1049e01f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoOps.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CrudMethodMetadata.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2023-2025 the original author 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,29 +15,25 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
-import com.querydsl.core.types.Operator;
+import java.util.Optional;
+
+import com.mongodb.ReadPreference;
 
 /**
- * Spring Data specific {@link Operator operators} for usage with Querydsl and MongoDB.
+ * Interface to abstract {@link CrudMethodMetadata} that provide the {@link ReadPreference} to be used for query
+ * execution.
  *
+ * @author Mark Paluch
  * @author Christoph Strobl
- * @since 2.1
+ * @since 4.2
  */
-enum QuerydslMongoOps implements Operator {
+public interface CrudMethodMetadata {
 
 	/**
-	 * {@link Operator} always evaluating to {@literal false}.
+	 * Returns the {@link ReadPreference} to be used.
+	 *
+	 * @return the {@link ReadPreference} to be used.
 	 */
-	NO_MATCH(Boolean.class);
-
-	private final Class<?> type;
-
-	QuerydslMongoOps(Class<?> type) {
-		this.type = type;
-	}
+	Optional<ReadPreference> getReadPreference();
 
-	@Override
-	public Class<?> getType() {
-		return type;
-	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CrudMethodMetadataPostProcessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CrudMethodMetadataPostProcessor.java
new file mode 100644
index 0000000000..037bd60672
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/CrudMethodMetadataPostProcessor.java
@@ -0,0 +1,233 @@
+/*
+ * Copyright 2023-2025 the original author 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.repository.support;
+
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Method;
+import java.util.HashSet;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.jspecify.annotations.Nullable;
+import org.springframework.aop.TargetSource;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.core.NamedThreadLocal;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.support.RepositoryProxyPostProcessor;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.ReflectionUtils;
+
+import com.mongodb.ReadPreference;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link RepositoryProxyPostProcessor} that sets up interceptors to read metadata information from the invoked method.
+ * This is necessary to allow redeclaration of CRUD methods in repository interfaces and configure read preference
+ * information or query hints on them.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 4.2
+ */
+class CrudMethodMetadataPostProcessor implements RepositoryProxyPostProcessor, BeanClassLoaderAware {
+
+	private @Nullable ClassLoader classLoader = ClassUtils.getDefaultClassLoader();
+
+	@Override
+	public void setBeanClassLoader(@Nullable ClassLoader classLoader) {
+		this.classLoader = classLoader;
+	}
+
+	@Override
+	public void postProcess(ProxyFactory factory, RepositoryInformation repositoryInformation) {
+		factory.addAdvice(new CrudMethodMetadataPopulatingMethodInterceptor(repositoryInformation));
+	}
+
+	/**
+	 * Returns a {@link CrudMethodMetadata} proxy that will lookup the actual target object by obtaining a thread bound
+	 * instance from the {@link TransactionSynchronizationManager} later.
+	 */
+	CrudMethodMetadata getCrudMethodMetadata() {
+
+		ProxyFactory factory = new ProxyFactory();
+
+		factory.addInterface(CrudMethodMetadata.class);
+		factory.setTargetSource(new ThreadBoundTargetSource());
+
+		return (CrudMethodMetadata) factory.getProxy(this.classLoader);
+	}
+
+	/**
+	 * {@link MethodInterceptor} to build and cache {@link DefaultCrudMethodMetadata} instances for the invoked methods.
+	 * Will bind the found information to a {@link TransactionSynchronizationManager} for later lookup.
+	 *
+	 * @see DefaultCrudMethodMetadata
+	 */
+	static class CrudMethodMetadataPopulatingMethodInterceptor implements MethodInterceptor {
+
+		private static final ThreadLocal<MethodInvocation> currentInvocation = new NamedThreadLocal<>(
+				"Current AOP method invocation");
+
+		private final ConcurrentMap<Method, CrudMethodMetadata> metadataCache = new ConcurrentHashMap<>();
+		private final Set<Method> implementations = new HashSet<>();
+		private final RepositoryInformation repositoryInformation;
+
+		CrudMethodMetadataPopulatingMethodInterceptor(RepositoryInformation repositoryInformation) {
+
+			this.repositoryInformation = repositoryInformation;
+
+			ReflectionUtils.doWithMethods(repositoryInformation.getRepositoryInterface(), implementations::add,
+					method -> !repositoryInformation.isQueryMethod(method));
+		}
+
+		/**
+		 * Return the AOP Alliance {@link MethodInvocation} object associated with the current invocation.
+		 *
+		 * @return the invocation object associated with the current invocation.
+		 * @throws IllegalStateException if there is no AOP invocation in progress, or if the
+		 *           {@link CrudMethodMetadataPopulatingMethodInterceptor} was not added to this interceptor chain.
+		 */
+		static MethodInvocation currentInvocation() throws IllegalStateException {
+
+			MethodInvocation invocation = currentInvocation.get();
+
+			if (invocation != null) {
+				return invocation;
+			}
+
+			throw new IllegalStateException(
+					"No MethodInvocation found: Check that an AOP invocation is in progress, and that the "
+							+ "CrudMethodMetadataPopulatingMethodInterceptor is upfront in the interceptor chain.");
+		}
+
+		@Override
+		public @Nullable Object invoke(MethodInvocation invocation) throws Throwable {
+
+			Method method = invocation.getMethod();
+
+			if (!implementations.contains(method)) {
+				return invocation.proceed();
+			}
+
+			MethodInvocation oldInvocation = currentInvocation.get();
+			currentInvocation.set(invocation);
+
+			try {
+
+				CrudMethodMetadata metadata = (CrudMethodMetadata) TransactionSynchronizationManager.getResource(method);
+
+				if (metadata != null) {
+					return invocation.proceed();
+				}
+
+				CrudMethodMetadata methodMetadata = metadataCache.get(method);
+
+				if (methodMetadata == null) {
+
+					methodMetadata = new DefaultCrudMethodMetadata(repositoryInformation.getRepositoryInterface(), method);
+					CrudMethodMetadata tmp = metadataCache.putIfAbsent(method, methodMetadata);
+
+					if (tmp != null) {
+						methodMetadata = tmp;
+					}
+				}
+
+				TransactionSynchronizationManager.bindResource(method, methodMetadata);
+
+				try {
+					return invocation.proceed();
+				} finally {
+					TransactionSynchronizationManager.unbindResource(method);
+				}
+			} finally {
+				currentInvocation.set(oldInvocation);
+			}
+		}
+	}
+
+	/**
+	 * Default implementation of {@link CrudMethodMetadata} that will inspect the backing method for annotations.
+	 */
+	static class DefaultCrudMethodMetadata implements CrudMethodMetadata {
+
+		private final Optional<ReadPreference> readPreference;
+
+		/**
+		 * Creates a new {@link DefaultCrudMethodMetadata} for the given {@link Method}.
+		 *
+		 * @param repositoryInterface the target repository interface.
+		 * @param method must not be {@literal null}.
+		 */
+		DefaultCrudMethodMetadata(Class<?> repositoryInterface, Method method) {
+
+			Assert.notNull(repositoryInterface, "Repository interface must not be null");
+			Assert.notNull(method, "Method must not be null");
+
+			this.readPreference = findReadPreference(method, repositoryInterface);
+		}
+
+		private static Optional<ReadPreference> findReadPreference(AnnotatedElement... annotatedElements) {
+
+			for (AnnotatedElement element : annotatedElements) {
+
+				org.springframework.data.mongodb.repository.ReadPreference preference = AnnotatedElementUtils
+						.findMergedAnnotation(element, org.springframework.data.mongodb.repository.ReadPreference.class);
+
+				if (preference != null && StringUtils.hasText(preference.value())) {
+					return Optional.of(com.mongodb.ReadPreference.valueOf(preference.value()));
+				}
+			}
+
+			return Optional.empty();
+		}
+
+		@Override
+		public Optional<ReadPreference> getReadPreference() {
+			return readPreference;
+		}
+	}
+
+	private static class ThreadBoundTargetSource implements TargetSource {
+
+		@Override
+		public Class<?> getTargetClass() {
+			return CrudMethodMetadata.class;
+		}
+
+		@Override
+		public boolean isStatic() {
+			return false;
+		}
+
+		@Override
+		public @Nullable Object getTarget() {
+
+			MethodInvocation invocation = CrudMethodMetadataPopulatingMethodInterceptor.currentInvocation();
+			return TransactionSynchronizationManager.getResource(invocation.getMethod());
+		}
+
+		@Override
+		public void releaseTarget(Object target) {}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/FetchableFluentQuerySupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/FetchableFluentQuerySupport.java
new file mode 100644
index 0000000000..8590768b8b
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/FetchableFluentQuerySupport.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2021-2025 the original author 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.repository.support;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.query.FluentQuery;
+import org.springframework.util.Assert;
+
+/**
+ * Support class for {@link org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery} implementations.
+ *
+ * @author Mark Paluch
+ * @since 3.3
+ */
+abstract class FetchableFluentQuerySupport<P, T> implements FluentQuery.FetchableFluentQuery<T> {
+
+	private final P predicate;
+	private final Sort sort;
+
+	private final int limit;
+
+	private final Class<T> resultType;
+	private final List<String> fieldsToInclude;
+
+	FetchableFluentQuerySupport(P predicate, Sort sort, int limit, Class<T> resultType, List<String> fieldsToInclude) {
+		this.predicate = predicate;
+		this.sort = sort;
+		this.limit = limit;
+		this.resultType = resultType;
+		this.fieldsToInclude = fieldsToInclude;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#sortBy(org.springframework.data.domain.Sort)
+	 */
+	@Override
+	public FluentQuery.FetchableFluentQuery<T> sortBy(Sort sort) {
+
+		Assert.notNull(sort, "Sort must not be null");
+
+		return create(predicate, sort, limit, resultType, fieldsToInclude);
+	}
+
+	@Override
+	public FluentQuery.FetchableFluentQuery<T> limit(int limit) {
+
+		Assert.isTrue(limit > 0, "Limit must be greater zero");
+
+		return create(predicate, sort, limit, resultType, fieldsToInclude);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#as(java.lang.Class)
+	 */
+	@Override
+	public <R> FluentQuery.FetchableFluentQuery<R> as(Class<R> projection) {
+
+		Assert.notNull(projection, "Projection target type must not be null");
+
+		return create(predicate, sort, limit, projection, fieldsToInclude);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery#project(java.util.Collection)
+	 */
+	@Override
+	public FluentQuery.FetchableFluentQuery<T> project(Collection<String> properties) {
+
+		Assert.notNull(properties, "Projection properties must not be null");
+
+		return create(predicate, sort, limit, resultType, new ArrayList<>(properties));
+	}
+
+	protected abstract <R> FetchableFluentQuerySupport<P, R> create(P predicate, Sort sort, int limit,
+			Class<R> resultType, List<String> fieldsToInclude);
+
+	P getPredicate() {
+		return predicate;
+	}
+
+	Sort getSort() {
+		return sort;
+	}
+
+	int getLimit() {
+		return limit;
+	}
+
+	Class<T> getResultType() {
+		return resultType;
+	}
+
+	List<String> getFieldsToInclude() {
+		return fieldsToInclude;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
index 8a33392bca..23f161890d 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,20 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
-import java.util.Arrays;
-import java.util.HashSet;
+import java.lang.reflect.Field;
 import java.util.Set;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
-import org.springframework.data.mongodb.UncategorizedMongoDbException;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.IndexOperationsProvider;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.repository.query.MongoEntityMetadata;
 import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
@@ -36,6 +37,7 @@
 import org.springframework.data.repository.query.parser.Part.Type;
 import org.springframework.data.repository.query.parser.PartTree;
 import org.springframework.util.Assert;
+import org.springframework.util.ReflectionUtils;
 
 import com.mongodb.MongoException;
 
@@ -49,8 +51,8 @@
  */
 class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTreeMongoQuery> {
 
-	private static final Set<Type> GEOSPATIAL_TYPES = new HashSet<Type>(Arrays.asList(Type.NEAR, Type.WITHIN));
-	private static final Logger LOG = LoggerFactory.getLogger(IndexEnsuringQueryCreationListener.class);
+	private static final Set<Type> GEOSPATIAL_TYPES = Set.of(Type.NEAR, Type.WITHIN);
+	private static final Log LOG = LogFactory.getLog(IndexEnsuringQueryCreationListener.class);
 
 	private final IndexOperationsProvider indexOperationsProvider;
 
@@ -61,14 +63,10 @@ class IndexEnsuringQueryCreationListener implements QueryCreationListener<PartTr
 	 */
 	public IndexEnsuringQueryCreationListener(IndexOperationsProvider indexOperationsProvider) {
 
-		Assert.notNull(indexOperationsProvider, "IndexOperationsProvider must not be null!");
+		Assert.notNull(indexOperationsProvider, "IndexOperationsProvider must not be null");
 		this.indexOperationsProvider = indexOperationsProvider;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.QueryCreationListener#onCreation(org.springframework.data.repository.query.RepositoryQuery)
-	 */
 	public void onCreation(PartTreeMongoQuery query) {
 
 		PartTree tree = query.getTree();
@@ -82,9 +80,14 @@ public void onCreation(PartTreeMongoQuery query) {
 		Sort sort = tree.getSort();
 
 		for (Part part : tree.getParts()) {
+
 			if (GEOSPATIAL_TYPES.contains(part.getType())) {
 				return;
 			}
+			if (isIndexOnUnwrappedType(part)) {
+				return;
+			}
+
 			String property = part.getProperty().toDotPath();
 			Direction order = toDirection(sort, property);
 			index.on(property, order);
@@ -107,10 +110,10 @@ public void onCreation(PartTreeMongoQuery query) {
 
 		MongoEntityMetadata<?> metadata = query.getQueryMethod().getEntityInformation();
 		try {
-			indexOperationsProvider.indexOps(metadata.getCollectionName()).ensureIndex(index);
-		} catch (UncategorizedMongoDbException e) {
+			indexOperationsProvider.indexOps(metadata.getCollectionName(), metadata.getJavaType()).ensureIndex(index);
+		} catch (DataIntegrityViolationException e) {
 
-			if (e.getCause() instanceof MongoException) {
+			if (e.getCause() instanceof MongoException mongoException) {
 
 				/*
 				 * As of MongoDB 4.2 index creation raises an error when creating an index for the very same keys with
@@ -121,12 +124,28 @@ public void onCreation(PartTreeMongoQuery query) {
 				 *
 				 * For details please see: https://docs.mongodb.com/master/release-notes/4.2-compatibility/#indexes
 				 */
-				if (((MongoException) e.getCause()).getCode() != 85) {
+				if (mongoException.getCode() != 85) {
 					throw e;
 				}
 			}
 		}
-		LOG.debug(String.format("Created %s!", index));
+
+		if (LOG.isDebugEnabled()) {
+			LOG.debug(String.format("Created %s", index));
+		}
+	}
+
+	public boolean isIndexOnUnwrappedType(Part part) {
+
+		// TODO we could do it for nested fields in the
+		Field field = ReflectionUtils.findField(part.getProperty().getOwningType().getType(),
+				part.getProperty().getSegment());
+
+		if (field == null) {
+			return false;
+		}
+
+		return AnnotatedElementUtils.hasAnnotation(field, Unwrapped.class);
 	}
 
 	private static Direction toDirection(Sort sort, String property) {
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java
index 9f81af2e1f..443108d2f0 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MappingMongoEntityInformation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 package org.springframework.data.mongodb.repository.support;
 
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.repository.core.support.PersistentEntityInformation;
-import org.springframework.lang.Nullable;
 
 /**
  * {@link MongoEntityInformation} implementation using a {@link MongoPersistentEntity} instance to lookup the necessary
@@ -89,26 +89,14 @@ private MappingMongoEntityInformation(MongoPersistentEntity<T> entity, @Nullable
 		this.fallbackIdType = idType != null ? idType : (Class<ID>) ObjectId.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getCollectionName()
-	 */
 	public String getCollectionName() {
 		return customCollectionName == null ? entityMetadata.getCollection() : customCollectionName;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getIdAttribute()
-	 */
 	public String getIdAttribute() {
-		return entityMetadata.getRequiredIdProperty().getName();
+		return entityMetadata.hasIdProperty() ? entityMetadata.getRequiredIdProperty().getName() : "_id";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.PersistentEntityInformation#getIdType()
-	 */
 	@Override
 	public Class<ID> getIdType() {
 
@@ -119,21 +107,13 @@ public Class<ID> getIdType() {
 		return fallbackIdType;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoEntityInformation#isVersioned()
-	 */
 	@Override
 	public boolean isVersioned() {
 		return this.entityMetadata.hasVersionProperty();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getVersion(Object)
-	 */
 	@Override
-	public Object getVersion(T entity) {
+	public @Nullable Object getVersion(T entity) {
 
 		if (!isVersioned()) {
 			return null;
@@ -144,12 +124,7 @@ public Object getVersion(T entity) {
 		return accessor.getProperty(this.entityMetadata.getRequiredVersionProperty());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoEntityInformation#getCollation()
-	 */
-	@Nullable
-	public Collation getCollation() {
+	public @Nullable Collation getCollation() {
 		return this.entityMetadata.getCollation();
 	}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java
index 76bcd327f5..6deee469e1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoAnnotationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,8 @@
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
 import javax.tools.Diagnostic;
-
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.lang.Nullable;
 
 import com.querydsl.apt.AbstractQuerydslProcessor;
 import com.querydsl.apt.Configuration;
@@ -45,18 +44,14 @@
 @SupportedSourceVersion(SourceVersion.RELEASE_6)
 public class MongoAnnotationProcessor extends AbstractQuerydslProcessor {
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.apt.AbstractQuerydslProcessor#createConfiguration(javax.annotation.processing.RoundEnvironment)
-	 */
 	@Override
 	protected Configuration createConfiguration(@Nullable RoundEnvironment roundEnv) {
 
 		processingEnv.getMessager().printMessage(Diagnostic.Kind.NOTE, "Running " + getClass().getSimpleName());
 
-		DefaultConfiguration configuration = new DefaultConfiguration(roundEnv, processingEnv.getOptions(),
-				Collections.emptySet(), QueryEntities.class, Document.class, QuerySupertype.class,
-				QueryEmbeddable.class, QueryEmbedded.class, QueryTransient.class);
+		DefaultConfiguration configuration = new DefaultConfiguration(processingEnv, roundEnv, Collections.emptySet(),
+				QueryEntities.class, Document.class, QuerySupertype.class, QueryEmbeddable.class, QueryEmbedded.class,
+				QueryTransient.class);
 		configuration.setUnknownAsEmbedded(true);
 
 		return configuration;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoEntityInformationSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoEntityInformationSupport.java
index ba7355cdcb..1a39198757 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoEntityInformationSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoEntityInformationSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,9 +15,9 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -43,7 +43,7 @@ private MongoEntityInformationSupport() {}
 	static <T, ID> MongoEntityInformation<T, ID> entityInformationFor(MongoPersistentEntity<?> entity,
 			@Nullable Class<?> idType) {
 
-		Assert.notNull(entity, "Entity must not be null!");
+		Assert.notNull(entity, "Entity must not be null");
 
 		return new MappingMongoEntityInformation<>((MongoPersistentEntity<T>) entity, (Class<ID>) idType);
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java
index c3d22bd8ae..a309cea0a3 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,12 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
-import static org.springframework.data.querydsl.QuerydslUtils.*;
-
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Optional;
 
-import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
@@ -32,20 +31,17 @@
 import org.springframework.data.mongodb.repository.query.PartTreeMongoQuery;
 import org.springframework.data.mongodb.repository.query.StringBasedAggregation;
 import org.springframework.data.mongodb.repository.query.StringBasedMongoQuery;
+import org.springframework.data.mongodb.repository.query.VectorSearchAggregation;
 import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.RepositoryComposition.RepositoryFragments;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.core.support.RepositoryFragment;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.util.Assert;
 
 /**
@@ -58,10 +54,10 @@
  */
 public class MongoRepositoryFactory extends RepositoryFactorySupport {
 
-	private static final SpelExpressionParser EXPRESSION_PARSER = new SpelExpressionParser();
-
+	private final CrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor = new CrudMethodMetadataPostProcessor();
 	private final MongoOperations operations;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private MongoRepositoryFragmentsContributor fragmentsContributor = MongoRepositoryFragmentsContributor.DEFAULT;
 
 	/**
 	 * Creates a new {@link MongoRepositoryFactory} with the given {@link MongoOperations}.
@@ -70,86 +66,93 @@ public class MongoRepositoryFactory extends RepositoryFactorySupport {
 	 */
 	public MongoRepositoryFactory(MongoOperations mongoOperations) {
 
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
+		Assert.notNull(mongoOperations, "MongoOperations must not be null");
 
 		this.operations = mongoOperations;
 		this.mappingContext = mongoOperations.getConverter().getMappingContext();
+
+		addRepositoryProxyPostProcessor(crudMethodMetadataPostProcessor);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
+	/**
+	 * Configures the {@link MongoRepositoryFragmentsContributor} to be used. Defaults to
+	 * {@link MongoRepositoryFragmentsContributor#DEFAULT}.
+	 *
+	 * @param fragmentsContributor
+	 * @since 5.0
 	 */
-	@Override
-	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-		return SimpleMongoRepository.class;
+	public void setFragmentsContributor(MongoRepositoryFragmentsContributor fragmentsContributor) {
+		this.fragmentsContributor = fragmentsContributor;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata)
-	 */
 	@Override
-	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
+	public void setBeanClassLoader(@Nullable ClassLoader classLoader) {
 
-		RepositoryFragments fragments = RepositoryFragments.empty();
-
-		boolean isQueryDslRepository = QUERY_DSL_PRESENT
-				&& QuerydslPredicateExecutor.class.isAssignableFrom(metadata.getRepositoryInterface());
-
-		if (isQueryDslRepository) {
-
-			if (metadata.isReactiveRepository()) {
-				throw new InvalidDataAccessApiUsageException(
-						"Cannot combine Querydsl and reactive repository support in a single interface");
-			}
+		super.setBeanClassLoader(classLoader);
+		crudMethodMetadataPostProcessor.setBeanClassLoader(classLoader);
+	}
 
-			MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainType(),
-					metadata);
+	@Override
+	protected ProjectionFactory getProjectionFactory(@Nullable ClassLoader classLoader, @Nullable BeanFactory beanFactory) {
+		return this.operations.getConverter().getProjectionFactory();
+	}
 
-			fragments = fragments.append(RepositoryFragment.implemented(
-					getTargetRepositoryViaReflection(QuerydslMongoPredicateExecutor.class, entityInformation, operations)));
-		}
+	@Override
+	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
+		return SimpleMongoRepository.class;
+	}
 
-		return fragments;
+	@Override
+	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
+		return getRepositoryFragments(metadata, operations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation)
+	/**
+	 * Creates {@link RepositoryFragments} based on {@link RepositoryMetadata} to add Mongo-specific extensions.
+	 * Typically, adds a {@link QuerydslMongoPredicateExecutor} if the repository interface uses Querydsl.
+	 * <p>
+	 * Built-in fragment contribution can be customized by configuring {@link MongoRepositoryFragmentsContributor}.
+	 *
+	 * @param metadata repository metadata.
+	 * @param operations the MongoDB operations manager.
+	 * @return {@link RepositoryFragments} to be added to the repository.
+	 * @since 3.2.1
 	 */
+	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata, MongoOperations operations) {
+		return fragmentsContributor.contribute(metadata, getEntityInformation(metadata), operations);
+	}
+
 	@Override
 	protected Object getTargetRepository(RepositoryInformation information) {
 
-		MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType(),
-				information);
-		return getTargetRepositoryViaReflection(information, entityInformation, operations);
+		MongoEntityInformation<?, ?> entityInformation = getEntityInformation(information);
+		Object targetRepository = getTargetRepositoryViaReflection(information, entityInformation, operations);
+
+		if (targetRepository instanceof SimpleMongoRepository<?, ?> repository) {
+			repository.setRepositoryMethodMetadata(crudMethodMetadataPostProcessor.getCrudMethodMetadata());
+		}
+
+		return targetRepository;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider)
-	 */
 	@Override
 	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		return Optional.of(new MongoQueryLookupStrategy(operations, evaluationContextProvider, mappingContext));
+			ValueExpressionDelegate valueExpressionDelegate) {
+		return Optional.of(new MongoQueryLookupStrategy(operations, mappingContext, valueExpressionDelegate));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
-	 */
+	@Deprecated
+	@Override
 	public <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-		return getEntityInformation(domainClass, null);
+		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(domainClass);
+		return MongoEntityInformationSupport.entityInformationFor(entity, null);
 	}
 
-	private <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass,
-			@Nullable RepositoryMetadata metadata) {
+	@Override
+	public MongoEntityInformation<?, ?> getEntityInformation(RepositoryMetadata metadata) {
 
-		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(domainClass);
-		return MongoEntityInformationSupport.<T, ID> entityInformationFor(entity,
-				metadata != null ? metadata.getIdType() : null);
+		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(metadata.getDomainType());
+		return MongoEntityInformationSupport.entityInformationFor(entity, metadata.getIdType());
 	}
 
 	/**
@@ -158,42 +161,30 @@ private <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> doma
 	 * @author Oliver Gierke
 	 * @author Thomas Darimont
 	 */
-	private static class MongoQueryLookupStrategy implements QueryLookupStrategy {
+	private record MongoQueryLookupStrategy(MongoOperations operations,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			ValueExpressionDelegate expressionSupport) implements QueryLookupStrategy {
 
-		private final MongoOperations operations;
-		private final QueryMethodEvaluationContextProvider evaluationContextProvider;
-		MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-		public MongoQueryLookupStrategy(MongoOperations operations,
-				QueryMethodEvaluationContextProvider evaluationContextProvider,
-				MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext) {
-
-			this.operations = operations;
-			this.evaluationContextProvider = evaluationContextProvider;
-			this.mappingContext = mappingContext;
-		}
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
-		 */
 		@Override
 		public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory,
 				NamedQueries namedQueries) {
 
 			MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, mappingContext);
+			queryMethod.verify();
+
 			String namedQueryName = queryMethod.getNamedQueryName();
 
 			if (namedQueries.hasQuery(namedQueryName)) {
 				String namedQuery = namedQueries.getQuery(namedQueryName);
-				return new StringBasedMongoQuery(namedQuery, queryMethod, operations, EXPRESSION_PARSER,
-						evaluationContextProvider);
+				return new StringBasedMongoQuery(namedQuery, queryMethod, operations, expressionSupport);
+			} else if (queryMethod.hasAnnotatedVectorSearch()) {
+				return new VectorSearchAggregation(queryMethod, operations, expressionSupport);
 			} else if (queryMethod.hasAnnotatedAggregation()) {
-				return new StringBasedAggregation(queryMethod, operations, EXPRESSION_PARSER, evaluationContextProvider);
+				return new StringBasedAggregation(queryMethod, operations, expressionSupport);
 			} else if (queryMethod.hasAnnotatedQuery()) {
-				return new StringBasedMongoQuery(queryMethod, operations, EXPRESSION_PARSER, evaluationContextProvider);
+				return new StringBasedMongoQuery(queryMethod, operations, expressionSupport);
 			} else {
-				return new PartTreeMongoQuery(queryMethod, operations, EXPRESSION_PARSER, evaluationContextProvider);
+				return new PartTreeMongoQuery(queryMethod, operations, expressionSupport);
 			}
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java
index 155435f52e..18c7c5a13c 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,24 +17,27 @@
 
 import java.io.Serializable;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
  * {@link org.springframework.beans.factory.FactoryBean} to create {@link MongoRepository} instances.
  *
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
+@SuppressWarnings("NullAway")
 public class MongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
 		extends RepositoryFactoryBeanSupport<T, S, ID> {
 
 	private @Nullable MongoOperations operations;
+	private MongoRepositoryFragmentsContributor repositoryFragmentsContributor = MongoRepositoryFragmentsContributor.DEFAULT;
 	private boolean createIndexesForQueryMethods = false;
 	private boolean mappingContextConfigured = false;
 
@@ -56,6 +59,22 @@ public void setMongoOperations(MongoOperations operations) {
 		this.operations = operations;
 	}
 
+	@Override
+	public MongoRepositoryFragmentsContributor getRepositoryFragmentsContributor() {
+		return repositoryFragmentsContributor;
+	}
+
+	/**
+	 * Configures the {@link MongoRepositoryFragmentsContributor} to contribute built-in fragment functionality to the
+	 * repository.
+	 *
+	 * @param repositoryFragmentsContributor must not be {@literal null}.
+	 * @since 5.0
+	 */
+	public void setRepositoryFragmentsContributor(MongoRepositoryFragmentsContributor repositoryFragmentsContributor) {
+		this.repositoryFragmentsContributor = repositoryFragmentsContributor;
+	}
+
 	/**
 	 * Configures whether to automatically create indexes for the properties referenced in a query method.
 	 *
@@ -65,32 +84,22 @@ public void setCreateIndexesForQueryMethods(boolean createIndexesForQueryMethods
 		this.createIndexesForQueryMethods = createIndexesForQueryMethods;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-	 */
 	@Override
-	protected void setMappingContext(MappingContext<?, ?> mappingContext) {
+	public void setMappingContext(MappingContext<?, ?> mappingContext) {
 
 		super.setMappingContext(mappingContext);
 		this.mappingContextConfigured = true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-	 * #createRepositoryFactory()
-	 */
 	@Override
 	protected RepositoryFactorySupport createRepositoryFactory() {
 
-		RepositoryFactorySupport factory = getFactoryInstance(operations);
+		MongoRepositoryFactory factory = getFactoryInstance(operations);
+		factory.setFragmentsContributor(repositoryFragmentsContributor);
 
 		if (createIndexesForQueryMethods) {
 			factory.addQueryCreationListener(
-					new IndexEnsuringQueryCreationListener(collectionName -> operations.indexOps(collectionName)));
+					new IndexEnsuringQueryCreationListener((collectionName, javaType) -> operations.indexOps(javaType)));
 		}
 
 		return factory;
@@ -102,22 +111,15 @@ protected RepositoryFactorySupport createRepositoryFactory() {
 	 * @param operations
 	 * @return
 	 */
-	protected RepositoryFactorySupport getFactoryInstance(MongoOperations operations) {
+	protected MongoRepositoryFactory getFactoryInstance(MongoOperations operations) {
 		return new MongoRepositoryFactory(operations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-	 * #afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 
 		super.afterPropertiesSet();
-		Assert.state(operations != null, "MongoTemplate must not be null!");
+		Assert.state(operations != null, "MongoTemplate must not be null");
 
 		if (!mappingContextConfigured) {
 			setMappingContext(operations.getConverter().getMappingContext());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFragmentsContributor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFragmentsContributor.java
new file mode 100644
index 0000000000..6d4a409724
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFragmentsContributor.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2025 the original author 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.repository.support;
+
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFragmentsContributor;
+import org.springframework.util.Assert;
+
+/**
+ * MongoDB-specific {@link RepositoryFragmentsContributor} contributing fragments based on the repository.
+ * <p>
+ * Implementations must define a no-args constructor.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see QuerydslMongoPredicateExecutor
+ */
+public interface MongoRepositoryFragmentsContributor extends RepositoryFragmentsContributor {
+
+	MongoRepositoryFragmentsContributor DEFAULT = QuerydslContributor.INSTANCE;
+
+	/**
+	 * Returns a composed {@code MongoRepositoryFragmentsContributor} that first applies this contributor to its inputs,
+	 * and then applies the {@code after} contributor concatenating effectively both results. If evaluation of either
+	 * contributors throws an exception, it is relayed to the caller of the composed contributor.
+	 *
+	 * @param after the contributor to apply after this contributor is applied.
+	 * @return a composed contributor that first applies this contributor and then applies the {@code after} contributor.
+	 */
+	default MongoRepositoryFragmentsContributor andThen(MongoRepositoryFragmentsContributor after) {
+
+		Assert.notNull(after, "MongoRepositoryFragmentsContributor must not be null");
+
+		return new MongoRepositoryFragmentsContributor() {
+
+			@Override
+			public RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+					MongoEntityInformation<?, ?> entityInformation, MongoOperations operations) {
+				return MongoRepositoryFragmentsContributor.this.contribute(metadata, entityInformation, operations)
+						.append(after.contribute(metadata, entityInformation, operations));
+			}
+
+			@Override
+			public RepositoryComposition.RepositoryFragments describe(RepositoryMetadata metadata) {
+				return MongoRepositoryFragmentsContributor.this.describe(metadata).append(after.describe(metadata));
+			}
+		};
+	}
+
+	/**
+	 * Creates {@link RepositoryComposition.RepositoryFragments} based on {@link RepositoryMetadata} to add
+	 * MongoDB-specific extensions.
+	 *
+	 * @param metadata repository metadata.
+	 * @param entityInformation must not be {@literal null}.
+	 * @param operations must not be {@literal null}.
+	 * @return {@link RepositoryComposition.RepositoryFragments} to be added to the repository.
+	 */
+	RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+			MongoEntityInformation<?, ?> entityInformation, MongoOperations operations);
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongodbDocumentSerializer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongodbDocumentSerializer.java
deleted file mode 100644
index 79b8b33bcb..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/MongodbDocumentSerializer.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
- * Copyright 2018-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.repository.support;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.bson.BsonJavaScript;
-import org.bson.BsonRegularExpression;
-import org.bson.Document;
-import org.bson.types.ObjectId;
-import org.springframework.lang.Nullable;
-import org.springframework.util.Assert;
-
-import com.mongodb.DBRef;
-import com.querydsl.core.types.*;
-import com.querydsl.mongodb.MongodbOps;
-
-/**
- * <p>
- * Serializes the given Querydsl query to a Document query for MongoDB.
- * </p>
- * <p>
- * Original implementation source {@link com.querydsl.mongodb.MongodbSerializer} by {@literal The Querydsl Team}
- * (<a href="http://www.querydsl.com/team">http://www.querydsl.com/team</a>) licensed under the Apache License, Version
- * 2.0.
- * </p>
- * Modified to use {@link Document} instead of {@link com.mongodb.DBObject}, updated nullable types and code format. Use
- * Bson specific types and add {@link QuerydslMongoOps#NO_MATCH}.
- *
- * @author laimw
- * @author Mark Paluch
- * @author Christoph Strobl
- * @author Mikhail Kaduchka
- * @since 2.1
- */
-abstract class MongodbDocumentSerializer implements Visitor<Object, Void> {
-
-	@Nullable
-	Object handle(Expression<?> expression) {
-		return expression.accept(this, null);
-	}
-
-	/**
-	 * Create the MongoDB specific query document.
-	 *
-	 * @param predicate must not be {@literal null}.
-	 * @return empty {@link Document} by default.
-	 */
-	Document toQuery(Predicate predicate) {
-
-		Object value = handle(predicate);
-
-		if (value == null) {
-			return new Document();
-		}
-
-		Assert.isInstanceOf(Document.class, value,
-				() -> String.format("Invalid type. Expected Document but found %s", value.getClass()));
-
-		return (Document) value;
-	}
-
-	/**
-	 * Create the MongoDB specific sort document.
-	 *
-	 * @param orderBys must not be {@literal null}.
-	 * @return empty {@link Document} by default.
-	 */
-	Document toSort(List<OrderSpecifier<?>> orderBys) {
-
-		Document sort = new Document();
-
-		orderBys.forEach(orderSpecifier -> {
-
-			Object key = orderSpecifier.getTarget().accept(this, null);
-
-			Assert.notNull(key, () -> String.format("Mapped sort key for %s must not be null!", orderSpecifier));
-			sort.append(key.toString(), orderSpecifier.getOrder() == Order.ASC ? 1 : -1);
-		});
-
-		return sort;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.Constant, java.lang.Void)
-	 */
-	@Override
-	public Object visit(Constant<?> expr, Void context) {
-
-		if (!Enum.class.isAssignableFrom(expr.getType())) {
-			return expr.getConstant();
-		}
-
-		@SuppressWarnings("unchecked") // Guarded by previous check
-		Constant<? extends Enum<?>> expectedExpr = (Constant<? extends Enum<?>>) expr;
-		return expectedExpr.getConstant().name();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.TemplateExpression, java.lang.Void)
-	 */
-	@Override
-	public Object visit(TemplateExpression<?> expr, Void context) {
-		throw new UnsupportedOperationException();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.types.Visitor#visit(com.querydsl.core.types.FactoryExpression, java.lang.Void)
-	 */
-	@Override
-	public Object visit(FactoryExpression<?> expr, Void context) {
-		throw new UnsupportedOperationException();
-	}
-
-	protected String asDBKey(Operation<?> expr, int index) {
-
-		String key = (String) asDBValue(expr, index);
-
-		Assert.hasText(key, () -> String.format("Mapped key must not be null nor empty for expression %s.", expr));
-		return key;
-	}
-
-	@Nullable
-	protected Object asDBValue(Operation<?> expr, int index) {
-		return expr.getArg(index).accept(this, null);
-	}
-
-	private String regexValue(Operation<?> expr, int index) {
-
-		Object value = expr.getArg(index).accept(this, null);
-
-		Assert.notNull(value, () -> String.format("Regex for %s must not be null.", expr));
-		return Pattern.quote(value.toString());
-	}
-
-	protected Document asDocument(String key, @Nullable Object value) {
-		return new Document(key, value);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	public Object visit(Operation<?> expr, Void context) {
-
-		Operator op = expr.getOperator();
-		if (op == Ops.EQ) {
-
-			if (expr.getArg(0) instanceof Operation) {
-				Operation<?> lhs = (Operation<?>) expr.getArg(0);
-				if (lhs.getOperator() == Ops.COL_SIZE || lhs.getOperator() == Ops.ARRAY_SIZE) {
-					return asDocument(asDBKey(lhs, 0), asDocument("$size", asDBValue(expr, 1)));
-				} else {
-					throw new UnsupportedOperationException("Illegal operation " + expr);
-				}
-			} else if (expr.getArg(0) instanceof Path) {
-				Path<?> path = (Path<?>) expr.getArg(0);
-				Constant<?> constant = (Constant<?>) expr.getArg(1);
-				return asDocument(asDBKey(expr, 0), convert(path, constant));
-			}
-		} else if (op == Ops.STRING_IS_EMPTY) {
-			return asDocument(asDBKey(expr, 0), "");
-		} else if (op == Ops.AND) {
-
-			Map<Object, Object> lhs = (Map<Object, Object>) handle(expr.getArg(0));
-			Map<Object, Object> rhs = (Map<Object, Object>) handle(expr.getArg(1));
-
-			LinkedHashSet<Object> lhs2 = new LinkedHashSet<>(lhs.keySet());
-			lhs2.retainAll(rhs.keySet());
-
-			if (lhs2.isEmpty()) {
-				lhs.putAll(rhs);
-				return lhs;
-			} else {
-				List<Object> list = new ArrayList<>(2);
-				list.add(handle(expr.getArg(0)));
-				list.add(handle(expr.getArg(1)));
-				return asDocument("$and", list);
-			}
-
-		} else if (op == Ops.NOT) {
-			// Handle the not's child
-			Operation<?> subOperation = (Operation<?>) expr.getArg(0);
-			Operator subOp = subOperation.getOperator();
-			if (subOp == Ops.IN) {
-				return visit(
-						ExpressionUtils.operation(Boolean.class, Ops.NOT_IN, subOperation.getArg(0), subOperation.getArg(1)),
-						context);
-			} else {
-				Document arg = (Document) handle(expr.getArg(0));
-				return negate(arg);
-			}
-
-		} else if (op == Ops.OR) {
-
-			List<Object> list = new ArrayList<>(2);
-			list.add(handle(expr.getArg(0)));
-			list.add(handle(expr.getArg(1)));
-			return asDocument("$or", list);
-
-		} else if (op == Ops.NE) {
-
-			Path<?> path = (Path<?>) expr.getArg(0);
-			Constant<?> constant = (Constant<?>) expr.getArg(1);
-			return asDocument(asDBKey(expr, 0), asDocument("$ne", convert(path, constant)));
-
-		} else if (op == Ops.STARTS_WITH) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression("^" + regexValue(expr, 1)));
-		} else if (op == Ops.STARTS_WITH_IC) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression("^" + regexValue(expr, 1), "i"));
-		} else if (op == Ops.ENDS_WITH) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression(regexValue(expr, 1) + "$"));
-		} else if (op == Ops.ENDS_WITH_IC) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression(regexValue(expr, 1) + "$", "i"));
-		} else if (op == Ops.EQ_IGNORE_CASE) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression("^" + regexValue(expr, 1) + "$", "i"));
-		} else if (op == Ops.STRING_CONTAINS) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression(".*" + regexValue(expr, 1) + ".*"));
-		} else if (op == Ops.STRING_CONTAINS_IC) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression(".*" + regexValue(expr, 1) + ".*", "i"));
-		} else if (op == Ops.MATCHES) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression(asDBValue(expr, 1).toString()));
-		} else if (op == Ops.MATCHES_IC) {
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression(asDBValue(expr, 1).toString(), "i"));
-		} else if (op == Ops.LIKE) {
-
-			String regex = ExpressionUtils.likeToRegex((Expression) expr.getArg(1)).toString();
-			return asDocument(asDBKey(expr, 0), new BsonRegularExpression(regex));
-		} else if (op == Ops.BETWEEN) {
-
-			Document value = new Document("$gte", asDBValue(expr, 1));
-			value.append("$lte", asDBValue(expr, 2));
-			return asDocument(asDBKey(expr, 0), value);
-		} else if (op == Ops.IN) {
-
-			int constIndex = 0;
-			int exprIndex = 1;
-			if (expr.getArg(1) instanceof Constant<?>) {
-				constIndex = 1;
-				exprIndex = 0;
-			}
-			if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
-				@SuppressWarnings("unchecked") // guarded by previous check
-				Collection<?> values = ((Constant<? extends Collection<?>>) expr.getArg(constIndex)).getConstant();
-				return asDocument(asDBKey(expr, exprIndex), asDocument("$in", values));
-			} else {
-				Path<?> path = (Path<?>) expr.getArg(exprIndex);
-				Constant<?> constant = (Constant<?>) expr.getArg(constIndex);
-				return asDocument(asDBKey(expr, exprIndex), convert(path, constant));
-			}
-		} else if (op == Ops.NOT_IN) {
-
-			int constIndex = 0;
-			int exprIndex = 1;
-			if (expr.getArg(1) instanceof Constant<?>) {
-
-				constIndex = 1;
-				exprIndex = 0;
-			}
-			if (Collection.class.isAssignableFrom(expr.getArg(constIndex).getType())) {
-
-				@SuppressWarnings("unchecked") // guarded by previous check
-				Collection<?> values = ((Constant<? extends Collection<?>>) expr.getArg(constIndex)).getConstant();
-				return asDocument(asDBKey(expr, exprIndex), asDocument("$nin", values));
-			} else {
-
-				Path<?> path = (Path<?>) expr.getArg(exprIndex);
-				Constant<?> constant = (Constant<?>) expr.getArg(constIndex);
-				return asDocument(asDBKey(expr, exprIndex), asDocument("$ne", convert(path, constant)));
-			}
-		} else if (op == Ops.COL_IS_EMPTY) {
-
-			List<Object> list = new ArrayList<>(2);
-			list.add(asDocument(asDBKey(expr, 0), new ArrayList<Object>()));
-			list.add(asDocument(asDBKey(expr, 0), asDocument("$exists", false)));
-			return asDocument("$or", list);
-		} else if (op == Ops.LT) {
-			return asDocument(asDBKey(expr, 0), asDocument("$lt", asDBValue(expr, 1)));
-		} else if (op == Ops.GT) {
-			return asDocument(asDBKey(expr, 0), asDocument("$gt", asDBValue(expr, 1)));
-		} else if (op == Ops.LOE) {
-			return asDocument(asDBKey(expr, 0), asDocument("$lte", asDBValue(expr, 1)));
-		} else if (op == Ops.GOE) {
-			return asDocument(asDBKey(expr, 0), asDocument("$gte", asDBValue(expr, 1)));
-		} else if (op == Ops.IS_NULL) {
-			return asDocument(asDBKey(expr, 0), asDocument("$exists", false));
-		} else if (op == Ops.IS_NOT_NULL) {
-			return asDocument(asDBKey(expr, 0), asDocument("$exists", true));
-		} else if (op == Ops.CONTAINS_KEY) {
-
-			Path<?> path = (Path<?>) expr.getArg(0);
-			Expression<?> key = expr.getArg(1);
-			return asDocument(visit(path, context) + "." + key.toString(), asDocument("$exists", true));
-		} else if (op == MongodbOps.NEAR) {
-			return asDocument(asDBKey(expr, 0), asDocument("$near", asDBValue(expr, 1)));
-		} else if (op == MongodbOps.NEAR_SPHERE) {
-			return asDocument(asDBKey(expr, 0), asDocument("$nearSphere", asDBValue(expr, 1)));
-		} else if (op == MongodbOps.ELEM_MATCH) {
-			return asDocument(asDBKey(expr, 0), asDocument("$elemMatch", asDBValue(expr, 1)));
-		} else if (op == QuerydslMongoOps.NO_MATCH) {
-			return new Document("$where", new BsonJavaScript("function() { return false }"));
-		}
-
-		throw new UnsupportedOperationException("Illegal operation " + expr);
-	}
-
-	private Object negate(Document arg) {
-
-		List<Object> list = new ArrayList<>();
-		for (Map.Entry<String, Object> entry : arg.entrySet()) {
-
-			if (entry.getKey().equals("$or")) {
-				list.add(asDocument("$nor", entry.getValue()));
-			} else if (entry.getKey().equals("$and")) {
-
-				List<Object> list2 = new ArrayList<>();
-				for (Object o : ((Collection) entry.getValue())) {
-					list2.add(negate((Document) o));
-				}
-				list.add(asDocument("$or", list2));
-			} else if (entry.getValue() instanceof Pattern || entry.getValue() instanceof BsonRegularExpression) {
-				list.add(asDocument(entry.getKey(), asDocument("$not", entry.getValue())));
-			} else if (entry.getValue() instanceof Document) {
-				list.add(negate(entry.getKey(), (Document) entry.getValue()));
-			} else {
-				list.add(asDocument(entry.getKey(), asDocument("$ne", entry.getValue())));
-			}
-		}
-		return list.size() == 1 ? list.get(0) : asDocument("$or", list);
-	}
-
-	private Object negate(String key, Document value) {
-
-		if (value.size() == 1) {
-			return asDocument(key, asDocument("$not", value));
-		} else {
-
-			List<Object> list2 = new ArrayList<>();
-			for (Map.Entry<String, Object> entry2 : value.entrySet()) {
-				list2.add(asDocument(key, asDocument("$not", asDocument(entry2.getKey(), entry2.getValue()))));
-			}
-
-			return asDocument("$or", list2);
-		}
-	}
-
-	protected Object convert(Path<?> property, Constant<?> constant) {
-
-		if (isReference(property)) {
-			return asReference(constant.getConstant());
-		} else if (isId(property)) {
-
-			if (isReference(property.getMetadata().getParent())) {
-				return asReferenceKey(property.getMetadata().getParent().getType(), constant.getConstant());
-			} else if (constant.getType().equals(String.class) && isImplicitObjectIdConversion()) {
-
-				String id = (String) constant.getConstant();
-				return ObjectId.isValid(id) ? new ObjectId(id) : id;
-			}
-		}
-		return visit(constant, null);
-	}
-
-	protected boolean isImplicitObjectIdConversion() {
-		return true;
-	}
-
-	protected DBRef asReferenceKey(Class<?> entity, Object id) {
-		// TODO override in subclass
-		throw new UnsupportedOperationException();
-	}
-
-	protected abstract DBRef asReference(Object constant);
-
-	protected abstract boolean isReference(@Nullable Path<?> arg);
-
-	protected boolean isId(Path<?> arg) {
-		// TODO override in subclass
-		return false;
-	}
-
-	@Override
-	public String visit(Path<?> expr, Void context) {
-
-		PathMetadata metadata = expr.getMetadata();
-
-		if (metadata.getParent() != null) {
-
-			Path<?> parent = metadata.getParent();
-			if (parent.getMetadata().getPathType() == PathType.DELEGATE) {
-				parent = parent.getMetadata().getParent();
-			}
-			if (metadata.getPathType() == PathType.COLLECTION_ANY) {
-				return visit(parent, context);
-			} else if (parent.getMetadata().getPathType() != PathType.VARIABLE) {
-
-				String rv = getKeyForPath(expr, metadata);
-				String parentStr = visit(parent, context);
-				return rv != null ? parentStr + "." + rv : parentStr;
-			}
-		}
-		return getKeyForPath(expr, metadata);
-	}
-
-	protected String getKeyForPath(Path<?> expr, PathMetadata metadata) {
-		return metadata.getElement().toString();
-	}
-
-	@Override
-	public Object visit(SubQueryExpression<?> expr, Void context) {
-		throw new UnsupportedOperationException();
-	}
-
-	@Override
-	public Object visit(ParamExpression<?> expr, Void context) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAbstractMongodbQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAbstractMongodbQuery.java
deleted file mode 100644
index 6020077aef..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAbstractMongodbQuery.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * Copyright 2018-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.repository.support;
-
-import java.util.List;
-
-import org.bson.Document;
-import org.bson.codecs.DocumentCodec;
-import org.bson.json.JsonMode;
-import org.bson.json.JsonWriterSettings;
-
-import org.springframework.lang.Nullable;
-
-import com.mongodb.MongoClientSettings;
-import com.querydsl.core.DefaultQueryMetadata;
-import com.querydsl.core.QueryModifiers;
-import com.querydsl.core.SimpleQuery;
-import com.querydsl.core.support.QueryMixin;
-import com.querydsl.core.types.Expression;
-import com.querydsl.core.types.FactoryExpression;
-import com.querydsl.core.types.OrderSpecifier;
-import com.querydsl.core.types.ParamExpression;
-import com.querydsl.core.types.Predicate;
-
-/**
- * {@code QuerydslAbstractMongodbQuery} provides a base class for general Querydsl query implementation.
- * <p>
- * Original implementation source {@link com.querydsl.mongodb.AbstractMongodbQuery} by {@literal The Querydsl Team}
- * (<a href="http://www.querydsl.com/team">http://www.querydsl.com/team</a>) licensed under the Apache License, Version
- * 2.0.
- * </p>
- * Modified for usage with {@link MongodbDocumentSerializer}.
- *
- * @param <Q> concrete subtype
- * @author laimw
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.1
- */
-public abstract class QuerydslAbstractMongodbQuery<K, Q extends QuerydslAbstractMongodbQuery<K, Q>>
-		implements SimpleQuery<Q> {
-
-	private static final JsonWriterSettings JSON_WRITER_SETTINGS = JsonWriterSettings.builder().outputMode(JsonMode.SHELL)
-			.build();
-
-	private final MongodbDocumentSerializer serializer;
-	private final QueryMixin<Q> queryMixin;
-
-	/**
-	 * Create a new MongodbQuery instance
-	 *
-	 * @param serializer serializer
-	 */
-	@SuppressWarnings("unchecked")
-	QuerydslAbstractMongodbQuery(MongodbDocumentSerializer serializer) {
-
-		this.queryMixin = new QueryMixin<>((Q) this, new DefaultQueryMetadata(), false);
-		this.serializer = serializer;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.SimpleQuery#distinct()
-	 */
-	@Override
-	public Q distinct() {
-		return queryMixin.distinct();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.FilteredClause#where(com.querydsl.core.types.Predicate[])
-	 */
-	@Override
-	public Q where(Predicate... e) {
-		return queryMixin.where(e);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.SimpleQuery#limit(long)
-	 */
-	@Override
-	public Q limit(long limit) {
-		return queryMixin.limit(limit);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.SimpleQuery#offset()
-	 */
-	@Override
-	public Q offset(long offset) {
-		return queryMixin.offset(offset);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.SimpleQuery#restrict(com.querydsl.core.QueryModifiers)
-	 */
-	@Override
-	public Q restrict(QueryModifiers modifiers) {
-		return queryMixin.restrict(modifiers);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.SimpleQuery#orderBy(com.querydsl.core.types.OrderSpecifier)
-	 */
-	@Override
-	public Q orderBy(OrderSpecifier<?>... o) {
-		return queryMixin.orderBy(o);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.SimpleQuery#set(com.querydsl.core.types.ParamExpression, Object)
-	 */
-	@Override
-	public <T> Q set(ParamExpression<T> param, T value) {
-		return queryMixin.set(param, value);
-	}
-
-	/**
-	 * Compute the actual projection {@link Document} from a given projectionExpression by serializing the contained
-	 * {@link Expression expressions} individually.
-	 *
-	 * @param projectionExpression the computed projection {@link Document}.
-	 * @return never {@literal null}. An empty {@link Document} by default.
-	 * @see MongodbDocumentSerializer#handle(Expression)
-	 */
-	protected Document createProjection(@Nullable Expression<?> projectionExpression) {
-
-		if (!(projectionExpression instanceof FactoryExpression)) {
-			return new Document();
-		}
-
-		Document projection = new Document();
-		((FactoryExpression<?>) projectionExpression).getArgs().stream() //
-				.filter(Expression.class::isInstance) //
-				.map(Expression.class::cast) //
-				.map(serializer::handle) //
-				.forEach(it -> projection.append(it.toString(), 1));
-
-		return projection;
-	}
-
-	/**
-	 * Compute the filer {@link Document} from the given {@link Predicate}.
-	 *
-	 * @param predicate can be {@literal null}.
-	 * @return an empty {@link Document} if predicate is {@literal null}.
-	 * @see MongodbDocumentSerializer#toQuery(Predicate)
-	 */
-	protected Document createQuery(@Nullable Predicate predicate) {
-
-		if (predicate == null) {
-			return new Document();
-		}
-
-		return serializer.toQuery(predicate);
-	}
-
-	/**
-	 * Compute the sort {@link Document} from the given list of {@link OrderSpecifier order specifiers}.
-	 *
-	 * @param orderSpecifiers can be {@literal null}.
-	 * @return an empty {@link Document} if predicate is {@literal null}.
-	 * @see MongodbDocumentSerializer#toSort(List)
-	 */
-	protected Document createSort(List<OrderSpecifier<?>> orderSpecifiers) {
-		return serializer.toSort(orderSpecifiers);
-	}
-
-	/**
-	 * Get the actual {@link QueryMixin} delegate.
-	 *
-	 * @return
-	 */
-	QueryMixin<Q> getQueryMixin() {
-		return queryMixin;
-	}
-
-	/**
-	 * Get the where definition as a Document instance
-	 *
-	 * @return
-	 */
-	Document asDocument() {
-		return createQuery(queryMixin.getMetadata().getWhere());
-	}
-
-	/**
-	 * Returns the {@literal Mongo Shell} representation of the query. <br />
-	 * The following query
-	 *
-	 * <pre class="code">
-	 *
-	 * where(p.lastname.eq("Matthews")).orderBy(p.firstname.asc()).offset(1).limit(5);
-	 * </pre>
-	 *
-	 * results in
-	 *
-	 * <pre class="code">
-	 *
-	 * find({"lastname" : "Matthews"}).sort({"firstname" : 1}).skip(1).limit(5)
-	 * </pre>
-	 *
-	 * Note that encoding to {@link String} may fail when using data types that cannot be encoded or DBRef's without an
-	 * identifier.
-	 *
-	 * @return never {@literal null}.
-	 */
-	@Override
-	public String toString() {
-
-		Document projection = createProjection(queryMixin.getMetadata().getProjection());
-		Document sort = createSort(queryMixin.getMetadata().getOrderBy());
-		DocumentCodec codec = new DocumentCodec(MongoClientSettings.getDefaultCodecRegistry());
-
-		StringBuilder sb = new StringBuilder("find(" + asDocument().toJson(JSON_WRITER_SETTINGS, codec));
-		if (!projection.isEmpty()) {
-			sb.append(", ").append(projection.toJson(JSON_WRITER_SETTINGS, codec));
-		}
-		sb.append(")");
-		if (!sort.isEmpty()) {
-			sb.append(".sort(").append(sort.toJson(JSON_WRITER_SETTINGS, codec)).append(")");
-		}
-		if (queryMixin.getMetadata().getModifiers().getOffset() != null) {
-			sb.append(".skip(").append(queryMixin.getMetadata().getModifiers().getOffset()).append(")");
-		}
-		if (queryMixin.getMetadata().getModifiers().getLimit() != null) {
-			sb.append(".limit(").append(queryMixin.getMetadata().getModifiers().getLimit()).append(")");
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * Obtain the {@literal Mongo Shell} json query representation.
-	 *
-	 * @return never {@literal null}.
-	 * @since 2.2
-	 */
-	public String toJson() {
-		return toJson(JSON_WRITER_SETTINGS);
-	}
-
-	/**
-	 * Obtain the json query representation applying given {@link JsonWriterSettings settings}.
-	 *
-	 * @param settings must not be {@literal null}.
-	 * @return never {@literal null}.
-	 * @since 2.2
-	 */
-	public String toJson(JsonWriterSettings settings) {
-		return asDocument().toJson(settings);
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAnyEmbeddedBuilder.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAnyEmbeddedBuilder.java
deleted file mode 100644
index 137d339d5c..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslAnyEmbeddedBuilder.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright 2018-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.repository.support;
-
-import java.util.Collection;
-
-import com.querydsl.core.support.QueryMixin;
-import com.querydsl.core.types.ExpressionUtils;
-import com.querydsl.core.types.Path;
-import com.querydsl.core.types.Predicate;
-import com.querydsl.mongodb.MongodbOps;
-
-/**
- * {@code QuerydslAnyEmbeddedBuilder} is a builder for constraints on embedded objects.
- * <p>
- * Original implementation source {@link com.querydsl.mongodb.AnyEmbeddedBuilder} by {@literal The Querydsl Team}
- * (<a href="http://www.querydsl.com/team">http://www.querydsl.com/team</a>) licensed under the Apache License, Version
- * 2.0.
- * </p>
- * Modified for usage with {@link QuerydslAbstractMongodbQuery}.
- * 
- * @param <Q> query type
- * @author tiwe
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.1
- */
-public class QuerydslAnyEmbeddedBuilder<Q extends QuerydslAbstractMongodbQuery<K, Q>, K> {
-
-	private final QueryMixin<Q> queryMixin;
-	private final Path<? extends Collection<?>> collection;
-
-	QuerydslAnyEmbeddedBuilder(QueryMixin<Q> queryMixin, Path<? extends Collection<?>> collection) {
-
-		this.queryMixin = queryMixin;
-		this.collection = collection;
-	}
-
-	/**
-	 * Add the given where conditions.
-	 *
-	 * @param conditions must not be {@literal null}.
-	 * @return the target {@link QueryMixin}.
-	 * @see QueryMixin#where(Predicate)
-	 */
-	public Q on(Predicate... conditions) {
-
-		return queryMixin
-				.where(ExpressionUtils.predicate(MongodbOps.ELEM_MATCH, collection, ExpressionUtils.allOf(conditions)));
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslContributor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslContributor.java
new file mode 100644
index 0000000000..e8460f3697
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslContributor.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2025 the original author 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.repository.support;
+
+import static org.springframework.data.querydsl.QuerydslUtils.*;
+
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFragment;
+import org.springframework.data.repository.core.support.RepositoryFragmentsContributor;
+
+/**
+ * MongoDB-specific {@link RepositoryFragmentsContributor} contributing Querydsl fragments if a repository implements
+ * {@link QuerydslPredicateExecutor}.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see QuerydslMongoPredicateExecutor
+ */
+enum QuerydslContributor implements MongoRepositoryFragmentsContributor {
+
+	INSTANCE;
+
+	@Override
+	public RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+			MongoEntityInformation<?, ?> entityInformation, MongoOperations operations) {
+
+		if (isQuerydslRepository(metadata)) {
+
+			QuerydslMongoPredicateExecutor<?> executor = new QuerydslMongoPredicateExecutor<>(entityInformation, operations);
+
+			return RepositoryComposition.RepositoryFragments
+					.of(RepositoryFragment.implemented(QuerydslPredicateExecutor.class, executor));
+		}
+
+		return RepositoryComposition.RepositoryFragments.empty();
+	}
+
+	@Override
+	public RepositoryComposition.RepositoryFragments describe(RepositoryMetadata metadata) {
+
+		if (isQuerydslRepository(metadata)) {
+			return RepositoryComposition.RepositoryFragments
+					.of(RepositoryFragment.structural(QuerydslPredicateExecutor.class, QuerydslMongoPredicateExecutor.class));
+		}
+
+		return RepositoryComposition.RepositoryFragments.empty();
+	}
+
+	private static boolean isQuerydslRepository(RepositoryMetadata metadata) {
+		return QUERY_DSL_PRESENT && QuerydslPredicateExecutor.class.isAssignableFrom(metadata.getRepositoryInterface());
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslFetchableMongodbQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslFetchableMongodbQuery.java
deleted file mode 100644
index e4f8218930..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslFetchableMongodbQuery.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright 2018-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.repository.support;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithProjection;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.query.BasicQuery;
-import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
-import org.springframework.util.LinkedMultiValueMap;
-
-import com.mysema.commons.lang.CloseableIterator;
-import com.querydsl.core.Fetchable;
-import com.querydsl.core.JoinExpression;
-import com.querydsl.core.QueryMetadata;
-import com.querydsl.core.QueryModifiers;
-import com.querydsl.core.QueryResults;
-import com.querydsl.core.types.Expression;
-import com.querydsl.core.types.ExpressionUtils;
-import com.querydsl.core.types.Operation;
-import com.querydsl.core.types.OrderSpecifier;
-import com.querydsl.core.types.Path;
-import com.querydsl.core.types.Predicate;
-import com.querydsl.core.types.dsl.CollectionPathBase;
-
-/**
- * {@link Fetchable} MongoDB query with utilizing {@link MongoOperations} for command execution.
- *
- * @param <K> result type
- * @param <Q> concrete subtype
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.1
- */
-abstract class QuerydslFetchableMongodbQuery<K, Q extends QuerydslFetchableMongodbQuery<K, Q>>
-		extends QuerydslAbstractMongodbQuery<K, Q> implements Fetchable<K> {
-
-	private final Class<K> entityClass;
-	private final String collection;
-	private final MongoOperations mongoOperations;
-	private final FindWithProjection<K> find;
-
-	QuerydslFetchableMongodbQuery(MongodbDocumentSerializer serializer, Class<? extends K> entityClass, String collection,
-			MongoOperations mongoOperations) {
-
-		super(serializer);
-
-		this.entityClass = (Class<K>) entityClass;
-		this.collection = collection;
-		this.mongoOperations = mongoOperations;
-		find = mongoOperations.query(this.entityClass).inCollection(collection);
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.Fetchable#iterable()
-	 */
-	@Override
-	public CloseableIterator<K> iterate() {
-
-		org.springframework.data.util.CloseableIterator<? extends K> stream = mongoOperations.stream(createQuery(),
-				entityClass, collection);
-
-		return new CloseableIterator<K>() {
-
-			@Override
-			public boolean hasNext() {
-				return stream.hasNext();
-			}
-
-			@Override
-			public K next() {
-				return stream.next();
-			}
-
-			@Override
-			public void remove() {
-				throw new UnsupportedOperationException("Cannot remove from iterator while streaming data.");
-			}
-
-			@Override
-			public void close() {
-				stream.close();
-			}
-		};
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.Fetchable#fetch()
-	 */
-	@Override
-	public List<K> fetch() {
-		return find.matching(createQuery()).all();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.Fetchable#fetchFirst()
-	 */
-	@Override
-	public K fetchFirst() {
-		return find.matching(createQuery()).firstValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.Fetchable#fetchOne()
-	 */
-	@Override
-	public K fetchOne() {
-		return find.matching(createQuery()).oneValue();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.Fetchable#fetchResults()
-	 */
-	@Override
-	public QueryResults<K> fetchResults() {
-
-		long total = fetchCount();
-		return total > 0L ? new QueryResults<>(fetch(), getQueryMixin().getMetadata().getModifiers(), total)
-				: QueryResults.emptyResults();
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.core.Fetchable#fetchCount()
-	 */
-	@Override
-	public long fetchCount() {
-		return find.matching(Query.of(createQuery()).skip(-1).limit(-1)).count();
-	}
-
-	/**
-	 * Define a join.
-	 *
-	 * @param ref reference
-	 * @param target join target
-	 * @return new instance of {@link QuerydslJoinBuilder}.
-	 */
-	public <T> QuerydslJoinBuilder<Q, K, T> join(Path<T> ref, Path<T> target) {
-		return new QuerydslJoinBuilder<>(getQueryMixin(), ref, target);
-	}
-
-	/**
-	 * Define a join.
-	 *
-	 * @param ref reference
-	 * @param target join target
-	 * @return new instance of {@link QuerydslJoinBuilder}.
-	 */
-	public <T> QuerydslJoinBuilder<Q, K, T> join(CollectionPathBase<?, T, ?> ref, Path<T> target) {
-		return new QuerydslJoinBuilder<>(getQueryMixin(), ref, target);
-	}
-
-	/**
-	 * Define a constraint for an embedded object.
-	 *
-	 * @param collection collection must not be {@literal null}.
-	 * @param target target must not be {@literal null}.
-	 * @return new instance of {@link QuerydslAnyEmbeddedBuilder}.
-	 */
-	public <T> QuerydslAnyEmbeddedBuilder<Q, K> anyEmbedded(Path<? extends Collection<T>> collection, Path<T> target) {
-		return new QuerydslAnyEmbeddedBuilder<>(getQueryMixin(), collection);
-	}
-
-	protected org.springframework.data.mongodb.core.query.Query createQuery() {
-
-		QueryMetadata metadata = getQueryMixin().getMetadata();
-
-		return createQuery(createFilter(metadata), metadata.getProjection(), metadata.getModifiers(),
-				metadata.getOrderBy());
-	}
-
-	protected org.springframework.data.mongodb.core.query.Query createQuery(@Nullable Predicate filter,
-			@Nullable Expression<?> projection, QueryModifiers modifiers, List<OrderSpecifier<?>> orderBy) {
-
-		BasicQuery basicQuery = new BasicQuery(createQuery(filter), createProjection(projection));
-
-		Integer limit = modifiers.getLimitAsInteger();
-		Integer offset = modifiers.getOffsetAsInteger();
-
-		if (limit != null) {
-			basicQuery.limit(limit);
-		}
-		if (offset != null) {
-			basicQuery.skip(offset);
-		}
-		if (orderBy.size() > 0) {
-			basicQuery.setSortObject(createSort(orderBy));
-		}
-
-		return basicQuery;
-	}
-
-	@Nullable
-	protected Predicate createFilter(QueryMetadata metadata) {
-
-		Predicate filter;
-		if (!metadata.getJoins().isEmpty()) {
-			filter = ExpressionUtils.allOf(metadata.getWhere(), createJoinFilter(metadata));
-		} else {
-			filter = metadata.getWhere();
-		}
-		return filter;
-	}
-
-	@SuppressWarnings("unchecked")
-	@Nullable
-	protected Predicate createJoinFilter(QueryMetadata metadata) {
-
-		LinkedMultiValueMap<Expression<?>, Predicate> predicates = new LinkedMultiValueMap<>();
-		List<JoinExpression> joins = metadata.getJoins();
-
-		for (int i = joins.size() - 1; i >= 0; i--) {
-
-			JoinExpression join = joins.get(i);
-			Path<?> source = (Path) ((Operation<?>) join.getTarget()).getArg(0);
-			Path<?> target = (Path) ((Operation<?>) join.getTarget()).getArg(1);
-			Collection<Predicate> extraFilters = predicates.get(target.getRoot());
-			Predicate filter = ExpressionUtils.allOf(join.getCondition(), allOf(extraFilters));
-
-			List<? extends Object> ids = getIds(target.getType(), filter);
-
-			if (ids.isEmpty()) {
-				return ExpressionUtils.predicate(QuerydslMongoOps.NO_MATCH, source);
-			}
-
-			Path<?> path = ExpressionUtils.path(String.class, source, "$id");
-			predicates.add(source.getRoot(), ExpressionUtils.in((Path<Object>) path, ids));
-		}
-
-		Path<?> source = (Path) ((Operation) joins.get(0).getTarget()).getArg(0);
-		return allOf(predicates.get(source.getRoot()));
-	}
-
-	private Predicate allOf(Collection<Predicate> predicates) {
-		return predicates != null ? ExpressionUtils.allOf(predicates) : null;
-	}
-
-	/**
-	 * Fetch the list of ids matching a given condition.
-	 *
-	 * @param targetType must not be {@literal null}.
-	 * @param condition must not be {@literal null}.
-	 * @return empty {@link List} if none found.
-	 */
-	protected List<Object> getIds(Class<?> targetType, Predicate condition) {
-
-		Query query = createQuery(condition, null, QueryModifiers.EMPTY, Collections.emptyList());
-		return mongoOperations.findDistinct(query, "_id", targetType, Object.class);
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslJoinBuilder.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslJoinBuilder.java
deleted file mode 100644
index 94b969d855..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslJoinBuilder.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright 2018-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.repository.support;
-
-import com.querydsl.core.JoinType;
-import com.querydsl.core.support.QueryMixin;
-import com.querydsl.core.types.ExpressionUtils;
-import com.querydsl.core.types.Path;
-import com.querydsl.core.types.Predicate;
-
-/**
- * {@code QuerydslJoinBuilder} is a builder for join constraints.
- * <p>
- * Original implementation source {@link com.querydsl.mongodb.JoinBuilder} by {@literal The Querydsl Team}
- * (<a href="http://www.querydsl.com/team">http://www.querydsl.com/team</a>) licensed under the Apache License, Version
- * 2.0.
- * </p>
- * Modified for usage with {@link QuerydslAbstractMongodbQuery}.
- *
- * @param <Q>
- * @param <T>
- * @author tiwe
- * @author Mark Paluch
- * @author Christoph Strobl
- * @since 2.1
- */
-public class QuerydslJoinBuilder<Q extends QuerydslAbstractMongodbQuery<K, Q>, K, T> {
-
-	private final QueryMixin<Q> queryMixin;
-	private final Path<?> ref;
-	private final Path<T> target;
-
-	QuerydslJoinBuilder(QueryMixin<Q> queryMixin, Path<?> ref, Path<T> target) {
-
-		this.queryMixin = queryMixin;
-		this.ref = ref;
-		this.target = target;
-	}
-
-	/**
-	 * Add the given join conditions.
-	 *
-	 * @param conditions must not be {@literal null}.
-	 * @return the target {@link QueryMixin}.
-	 * @see QueryMixin#on(Predicate)
-	 */
-	@SuppressWarnings("unchecked")
-	public Q on(Predicate... conditions) {
-
-		queryMixin.addJoin(JoinType.JOIN, ExpressionUtils.as((Path) ref, target));
-		queryMixin.on(conditions);
-		return queryMixin.getSelf();
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java
index 5529a1a7da..833ce69458 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,30 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
+import org.bson.Document;
+
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.querydsl.EntityPathResolver;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.querydsl.SimpleEntityPathResolver;
-import org.springframework.data.repository.support.PageableExecutionUtils;
+import org.springframework.data.repository.query.FluentQuery;
+import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.util.Assert;
 
 import com.querydsl.core.NonUniqueResultException;
@@ -79,14 +90,10 @@ public QuerydslMongoPredicateExecutor(MongoEntityInformation<T, ?> entityInforma
 		this.mongoOperations = mongoOperations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findById(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Optional<T> findOne(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		try {
 			return Optional.ofNullable(createQueryFor(predicate).fetchOne());
@@ -95,95 +102,78 @@ public Optional<T> findOne(Predicate predicate) {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public List<T> findAll(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		return createQueryFor(predicate).fetch();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier<?>[])
-	 */
 	@Override
 	public List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
-		Assert.notNull(orders, "Order specifiers must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(orders, "Order specifiers must not be null");
 
 		return createQueryFor(predicate).orderBy(orders).fetch();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort)
-	 */
 	@Override
 	public List<T> findAll(Predicate predicate, Sort sort) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
-		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(sort, "Sort must not be null");
 
 		return applySorting(createQueryFor(predicate), sort).fetch();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[])
-	 */
 	@Override
 	public Iterable<T> findAll(OrderSpecifier<?>... orders) {
 
-		Assert.notNull(orders, "Order specifiers must not be null!");
+		Assert.notNull(orders, "Order specifiers must not be null");
 
 		return createQuery().orderBy(orders).fetch();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Pageable)
-	 */
 	@Override
 	public Page<T> findAll(Predicate predicate, Pageable pageable) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
-		Assert.notNull(pageable, "Pageable must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(pageable, "Pageable must not be null");
 
 		SpringDataMongodbQuery<T> query = createQueryFor(predicate);
 
 		return PageableExecutionUtils.getPage(applyPagination(query, pageable).fetch(), pageable, query::fetchCount);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#count(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public long count(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		return createQueryFor(predicate).fetchCount();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.QuerydslPredicateExecutor#exists(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public boolean exists(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		return createQueryFor(predicate).fetchCount() > 0;
 	}
 
+	@Override
+	@SuppressWarnings("unchecked")
+	public <S extends T, R> R findBy(Predicate predicate,
+			Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
+
+		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(queryFunction, "Query function must not be null");
+
+		return queryFunction.apply(new FluentQuerydsl<>(predicate, (Class<S>) typeInformation().getJavaType()));
+	}
+
 	/**
 	 * Creates a {@link SpringDataMongodbQuery} for the given {@link Predicate}.
 	 *
@@ -212,7 +202,10 @@ private SpringDataMongodbQuery<T> createQuery() {
 	 */
 	private SpringDataMongodbQuery<T> applyPagination(SpringDataMongodbQuery<T> query, Pageable pageable) {
 
-		query = query.offset(pageable.getOffset()).limit(pageable.getPageSize());
+		if (pageable.isPaged()) {
+			query = query.offset(pageable.getOffset()).limit(pageable.getPageSize());
+		}
+
 		return applySorting(query, pageable.getSort());
 	}
 
@@ -228,4 +221,100 @@ private SpringDataMongodbQuery<T> applySorting(SpringDataMongodbQuery<T> query,
 		toOrderSpecifiers(sort).forEach(query::orderBy);
 		return query;
 	}
+
+	/**
+	 * {@link org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery} using Querydsl
+	 * {@link Predicate}.
+	 *
+	 * @author Mark Paluch
+	 * @since 3.3
+	 */
+	class FluentQuerydsl<T> extends FetchableFluentQuerySupport<Predicate, T> {
+
+		FluentQuerydsl(Predicate predicate, Class<T> resultType) {
+			this(predicate, Sort.unsorted(), 0, resultType, Collections.emptyList());
+		}
+
+		FluentQuerydsl(Predicate predicate, Sort sort, int limit, Class<T> resultType, List<String> fieldsToInclude) {
+			super(predicate, sort, limit, resultType, fieldsToInclude);
+		}
+
+		@Override
+		protected <R> FluentQuerydsl<R> create(Predicate predicate, Sort sort, int limit, Class<R> resultType,
+				List<String> fieldsToInclude) {
+			return new FluentQuerydsl<>(predicate, sort, limit, resultType, fieldsToInclude);
+		}
+
+		@Override
+		public @Nullable T oneValue() {
+			return createQuery().fetchOne();
+		}
+
+		@Override
+		public @Nullable T firstValue() {
+			return createQuery().fetchFirst();
+		}
+
+		@Override
+		public List<T> all() {
+			return createQuery().fetch();
+		}
+
+		@Override
+		public Window<T> scroll(ScrollPosition scrollPosition) {
+			return createQuery().scroll(scrollPosition);
+		}
+
+		@Override
+		public Page<T> page(Pageable pageable) {
+
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			return createQuery().fetchPage(pageable);
+		}
+
+		@Override
+		public Slice<T> slice(Pageable pageable) {
+
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			return createQuery().fetchSlice(pageable);
+		}
+
+		@Override
+		public Stream<T> stream() {
+			return createQuery().stream();
+		}
+
+		@Override
+		public long count() {
+			return createQuery().fetchCount();
+		}
+
+		@Override
+		public boolean exists() {
+			return count() > 0;
+		}
+
+		private SpringDataMongodbQuery<T> createQuery() {
+			return new SpringDataMongodbQuery<>(mongoOperations, typeInformation().getJavaType(), getResultType(),
+					mongoOperations.getCollectionName(typeInformation().getJavaType()), this::customize).where(getPredicate());
+		}
+
+		private void customize(BasicQuery query) {
+
+			List<String> fieldsToInclude = getFieldsToInclude();
+			if (!fieldsToInclude.isEmpty()) {
+				Document fields = new Document();
+				fieldsToInclude.forEach(field -> fields.put(field, 1));
+				query.setFieldsObject(fields);
+			}
+
+			if (getSort().isSorted()) {
+				query.with(getSort());
+			}
+
+			query.limit(getLimit());
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoRepository.java
deleted file mode 100644
index 5bbd545264..0000000000
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslMongoRepository.java
+++ /dev/null
@@ -1,50 +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.repository.support;
-
-import java.io.Serializable;
-
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
-import org.springframework.data.querydsl.EntityPathResolver;
-import org.springframework.data.querydsl.QuerydslPredicateExecutor;
-
-import com.querydsl.core.types.Predicate;
-
-/**
- * Special Querydsl based repository implementation that allows execution {@link Predicate}s in various forms.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- * @author Mark Paluch
- * @author Christoph Strobl
- * @deprecated since 2.0. Querydsl execution is now linked via composable repositories and no longer requires to be a
- *             subclass of {@link SimpleMongoRepository}. Use {@link QuerydslMongoPredicateExecutor} for standalone
- *             Querydsl {@link Predicate} execution.
- */
-@Deprecated
-public class QuerydslMongoRepository<T, ID extends Serializable> extends QuerydslMongoPredicateExecutor<T>
-		implements QuerydslPredicateExecutor<T> {
-
-	public QuerydslMongoRepository(MongoEntityInformation<T, ?> entityInformation, MongoOperations mongoOperations) {
-		super(entityInformation, mongoOperations);
-	}
-
-	public QuerydslMongoRepository(MongoEntityInformation<T, ?> entityInformation, MongoOperations mongoOperations,
-			EntityPathResolver resolver) {
-		super(entityInformation, mongoOperations, resolver);
-	}
-}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslPredicateExecutorSupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslPredicateExecutorSupport.java
index 58bafbcc97..02c5a67d7e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslPredicateExecutorSupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslPredicateExecutorSupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -82,8 +82,8 @@ protected OrderSpecifier<?> toOrder(Order order) {
 	 */
 	protected List<OrderSpecifier<?>> toOrderSpecifiers(Sort sort) {
 
-		if (sort instanceof QSort) {
-			return ((QSort) sort).getOrderSpecifiers();
+		if (sort instanceof QSort qSort) {
+			return qSort.getOrderSpecifiers();
 		}
 
 		return sort.stream().map(this::toOrder).collect(Collectors.toList());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupport.java
index 2e49a3f960..3d46babd69 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupport.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public abstract class QuerydslRepositorySupport {
 	 */
 	public QuerydslRepositorySupport(MongoOperations operations) {
 
-		Assert.notNull(operations, "MongoOperations must not be null!");
+		Assert.notNull(operations, "MongoOperations must not be null");
 
 		this.template = operations;
 		this.context = operations.getConverter().getMappingContext();
@@ -55,7 +55,7 @@ public QuerydslRepositorySupport(MongoOperations operations) {
 	 */
 	protected <T> SpringDataMongodbQuery<T> from(final EntityPath<T> path) {
 
-		Assert.notNull(path, "EntityPath must not be null!");
+		Assert.notNull(path, "EntityPath must not be null");
 		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(path.getType());
 		return from(path, entity.getCollection());
 	}
@@ -69,8 +69,8 @@ protected <T> SpringDataMongodbQuery<T> from(final EntityPath<T> path) {
 	 */
 	protected <T> SpringDataMongodbQuery<T> from(final EntityPath<T> path, String collection) {
 
-		Assert.notNull(path, "EntityPath must not be null!");
-		Assert.hasText(collection, "Collection name must not be null or empty!");
+		Assert.notNull(path, "EntityPath must not be null");
+		Assert.hasText(collection, "Collection name must not be null or empty");
 
 		return new SpringDataMongodbQuery<T>(template, path.getType(), collection);
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveFluentQuerySupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveFluentQuerySupport.java
new file mode 100644
index 0000000000..1b1c9c3275
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveFluentQuerySupport.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2021-2025 the original author 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.repository.support;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.data.domain.Sort;
+import org.springframework.data.repository.query.FluentQuery;
+import org.springframework.util.Assert;
+
+/**
+ * Support class for {@link org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery} implementations.
+ *
+ * @author Mark Paluch
+ * @since 3.3
+ */
+abstract class ReactiveFluentQuerySupport<P, T> implements FluentQuery.ReactiveFluentQuery<T> {
+
+	private final P predicate;
+	private final Sort sort;
+	private final int limit;
+	private final Class<T> resultType;
+	private final List<String> fieldsToInclude;
+
+	ReactiveFluentQuerySupport(P predicate, Sort sort, int limit, Class<T> resultType, List<String> fieldsToInclude) {
+		this.predicate = predicate;
+		this.sort = sort;
+		this.limit = limit;
+		this.resultType = resultType;
+		this.fieldsToInclude = fieldsToInclude;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#sortBy(org.springframework.data.domain.Sort)
+	 */
+	@Override
+	public ReactiveFluentQuery<T> sortBy(Sort sort) {
+
+		Assert.notNull(sort, "Sort must not be null");
+
+		return create(predicate, sort, limit, resultType, fieldsToInclude);
+	}
+
+	@Override
+	public ReactiveFluentQuery<T> limit(int limit) {
+
+		Assert.isTrue(limit > 0, "Limit must be greater zero");
+
+		return create(predicate, sort, limit, resultType, fieldsToInclude);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#as(java.lang.Class)
+	 */
+	@Override
+	public <R> ReactiveFluentQuery<R> as(Class<R> projection) {
+
+		Assert.notNull(projection, "Projection target type must not be null");
+
+		return create(predicate, sort, limit, projection, fieldsToInclude);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery#project(java.util.Collection)
+	 */
+	@Override
+	public ReactiveFluentQuery<T> project(Collection<String> properties) {
+
+		Assert.notNull(properties, "Projection properties must not be null");
+
+		return create(predicate, sort, limit, resultType, new ArrayList<>(properties));
+	}
+
+	protected abstract <R> ReactiveFluentQuerySupport<P, R> create(P predicate, Sort sort, int limit, Class<R> resultType,
+			List<String> fieldsToInclude);
+
+	P getPredicate() {
+		return predicate;
+	}
+
+	Sort getSort() {
+		return sort;
+	}
+
+	int getLimit() {
+		return limit;
+	}
+
+	Class<T> getResultType() {
+		return resultType;
+	}
+
+	List<String> getFieldsToInclude() {
+		return fieldsToInclude;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java
index 6773e44882..ce9820a4d9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,12 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
-import static org.springframework.data.querydsl.QuerydslUtils.*;
-
-import lombok.AccessLevel;
-import lombok.RequiredArgsConstructor;
-
-import java.io.Serializable;
 import java.lang.reflect.Method;
 import java.util.Optional;
 
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.beans.factory.BeanFactory;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
@@ -34,20 +31,18 @@
 import org.springframework.data.mongodb.repository.query.ReactivePartTreeMongoQuery;
 import org.springframework.data.mongodb.repository.query.ReactiveStringBasedAggregation;
 import org.springframework.data.mongodb.repository.query.ReactiveStringBasedMongoQuery;
+import org.springframework.data.mongodb.repository.query.ReactiveVectorSearchAggregation;
 import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryInformation;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.ReactiveRepositoryFactorySupport;
 import org.springframework.data.repository.core.support.RepositoryComposition.RepositoryFragments;
-import org.springframework.data.repository.core.support.RepositoryFragment;
 import org.springframework.data.repository.query.QueryLookupStrategy;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
 import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.util.Assert;
 
 /**
@@ -60,10 +55,11 @@
  */
 public class ReactiveMongoRepositoryFactory extends ReactiveRepositoryFactorySupport {
 
-	private static final SpelExpressionParser EXPRESSION_PARSER = new SpelExpressionParser();
-
+	private final CrudMethodMetadataPostProcessor crudMethodMetadataPostProcessor = new CrudMethodMetadataPostProcessor();
 	private final ReactiveMongoOperations operations;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	private ReactiveMongoRepositoryFragmentsContributor fragmentsContributor = ReactiveMongoRepositoryFragmentsContributor.DEFAULT;
+	@Nullable private QueryMethodValueEvaluationContextAccessor accessor;
 
 	/**
 	 * Creates a new {@link ReactiveMongoRepositoryFactory} with the given {@link ReactiveMongoOperations}.
@@ -72,83 +68,92 @@ public class ReactiveMongoRepositoryFactory extends ReactiveRepositoryFactorySup
 	 */
 	public ReactiveMongoRepositoryFactory(ReactiveMongoOperations mongoOperations) {
 
-		Assert.notNull(mongoOperations, "ReactiveMongoOperations must not be null!");
+		Assert.notNull(mongoOperations, "ReactiveMongoOperations must not be null");
 
 		this.operations = mongoOperations;
 		this.mappingContext = mongoOperations.getConverter().getMappingContext();
+
+		addRepositoryProxyPostProcessor(crudMethodMetadataPostProcessor);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryBaseClass(org.springframework.data.repository.core.RepositoryMetadata)
+	/**
+	 * Configures the {@link ReactiveMongoRepositoryFragmentsContributor} to be used. Defaults to
+	 * {@link ReactiveMongoRepositoryFragmentsContributor#DEFAULT}.
+	 *
+	 * @param fragmentsContributor
+	 * @since 5.0
 	 */
+	public void setFragmentsContributor(ReactiveMongoRepositoryFragmentsContributor fragmentsContributor) {
+		this.fragmentsContributor = fragmentsContributor;
+	}
+
+	@Override
+	public void setBeanClassLoader(@Nullable ClassLoader classLoader) {
+
+		super.setBeanClassLoader(classLoader);
+		crudMethodMetadataPostProcessor.setBeanClassLoader(classLoader);
+	}
+
+	@Override
+	@SuppressWarnings("NullAway")
+	protected ProjectionFactory getProjectionFactory(@Nullable ClassLoader classLoader, @Nullable BeanFactory beanFactory) {
+		return this.operations.getConverter().getProjectionFactory();
+	}
+
 	@Override
 	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
 		return SimpleReactiveMongoRepository.class;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getRepositoryFragments(org.springframework.data.repository.core.RepositoryMetadata)
+	/**
+	 * Creates {@link RepositoryFragments} based on {@link RepositoryMetadata} to add Mongo-specific extensions.
+	 * Typically, adds a {@link ReactiveQuerydslContributor} if the repository interface uses Querydsl.
+	 * <p>
+	 * Built-in fragment contribution can be customized by configuring
+	 * {@link ReactiveMongoRepositoryFragmentsContributor}.
+	 *
+	 * @param metadata repository metadata.
+	 * @return {@link RepositoryFragments} to be added to the repository.
 	 */
 	@Override
 	protected RepositoryFragments getRepositoryFragments(RepositoryMetadata metadata) {
-
-		RepositoryFragments fragments = RepositoryFragments.empty();
-
-		boolean isQueryDslRepository = QUERY_DSL_PRESENT
-				&& ReactiveQuerydslPredicateExecutor.class.isAssignableFrom(metadata.getRepositoryInterface());
-
-		if (isQueryDslRepository) {
-
-			MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(metadata.getDomainType(),
-					metadata);
-
-			fragments = fragments.append(RepositoryFragment.implemented(getTargetRepositoryViaReflection(
-					ReactiveQuerydslMongoPredicateExecutor.class, entityInformation, operations)));
-		}
-
-		return fragments;
+		return fragmentsContributor.contribute(metadata, getEntityInformation(metadata),
+				operations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getTargetRepository(org.springframework.data.repository.core.RepositoryInformation)
-	 */
 	@Override
 	protected Object getTargetRepository(RepositoryInformation information) {
 
-		MongoEntityInformation<?, Serializable> entityInformation = getEntityInformation(information.getDomainType(),
+		MongoEntityInformation<?, ?> entityInformation = getEntityInformation(
 				information);
-		return getTargetRepositoryViaReflection(information, entityInformation, operations);
+		Object targetRepository = getTargetRepositoryViaReflection(information, entityInformation, operations);
+
+		if (targetRepository instanceof SimpleReactiveMongoRepository<?, ?> repository) {
+			repository.setRepositoryMethodMetadata(crudMethodMetadataPostProcessor.getCrudMethodMetadata());
+		}
+
+		return targetRepository;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getQueryLookupStrategy(org.springframework.data.repository.query.QueryLookupStrategy.Key, org.springframework.data.repository.query.EvaluationContextProvider)
-	 */
 	@Override
-	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(@Nullable Key key,
-			QueryMethodEvaluationContextProvider evaluationContextProvider) {
-		return Optional.of(new MongoQueryLookupStrategy(operations, evaluationContextProvider, mappingContext));
+	@SuppressWarnings("NullAway")
+	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(Key key,
+			ValueExpressionDelegate valueExpressionDelegate) {
+		return Optional.of(new MongoQueryLookupStrategy(operations, mappingContext, valueExpressionDelegate));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactorySupport#getEntityInformation(java.lang.Class)
-	 */
+	@Deprecated
+	@Override
 	public <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-		return getEntityInformation(domainClass, null);
+		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(domainClass);
+		return MongoEntityInformationSupport.entityInformationFor(entity, null);
 	}
 
-	@SuppressWarnings("unchecked")
-	private <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> domainClass,
-			@Nullable RepositoryMetadata metadata) {
-
-		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(domainClass);
+	@Override
+	public MongoEntityInformation<?, ?> getEntityInformation(RepositoryMetadata metadata) {
 
-		return new MappingMongoEntityInformation<>((MongoPersistentEntity<T>) entity,
-				metadata != null ? (Class<ID>) metadata.getIdType() : null);
+		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(metadata.getDomainType());
+		return MongoEntityInformationSupport.entityInformationFor(entity, metadata.getIdType());
 	}
 
 	/**
@@ -157,35 +162,30 @@ private <T, ID> MongoEntityInformation<T, ID> getEntityInformation(Class<T> doma
 	 * @author Mark Paluch
 	 * @author Christoph Strobl
 	 */
-	@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
-	private static class MongoQueryLookupStrategy implements QueryLookupStrategy {
+	private record MongoQueryLookupStrategy(ReactiveMongoOperations operations,
+			MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext,
+			ValueExpressionDelegate delegate) implements QueryLookupStrategy {
 
-		private final ReactiveMongoOperations operations;
-		private final QueryMethodEvaluationContextProvider evaluationContextProvider;
-		private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
-
-		/*
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
-		 */
 		@Override
 		public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory,
 				NamedQueries namedQueries) {
 
 			ReactiveMongoQueryMethod queryMethod = new ReactiveMongoQueryMethod(method, metadata, factory, mappingContext);
+			queryMethod.verify();
+
 			String namedQueryName = queryMethod.getNamedQueryName();
 
 			if (namedQueries.hasQuery(namedQueryName)) {
 				String namedQuery = namedQueries.getQuery(namedQueryName);
-				return new ReactiveStringBasedMongoQuery(namedQuery, queryMethod, operations, EXPRESSION_PARSER,
-						evaluationContextProvider);
+				return new ReactiveStringBasedMongoQuery(namedQuery, queryMethod, operations, delegate);
+			} else if (queryMethod.hasAnnotatedVectorSearch()) {
+				return new ReactiveVectorSearchAggregation(queryMethod, operations, delegate);
 			} else if (queryMethod.hasAnnotatedAggregation()) {
-				return new ReactiveStringBasedAggregation(queryMethod, operations, EXPRESSION_PARSER,
-						evaluationContextProvider);
+				return new ReactiveStringBasedAggregation(queryMethod, operations, delegate);
 			} else if (queryMethod.hasAnnotatedQuery()) {
-				return new ReactiveStringBasedMongoQuery(queryMethod, operations, EXPRESSION_PARSER, evaluationContextProvider);
+				return new ReactiveStringBasedMongoQuery(queryMethod, operations, delegate);
 			} else {
-				return new ReactivePartTreeMongoQuery(queryMethod, operations, EXPRESSION_PARSER, evaluationContextProvider);
+				return new ReactivePartTreeMongoQuery(queryMethod, operations, delegate);
 			}
 		}
 	}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java
index f77b2913a0..40de5213aa 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,13 +17,13 @@
 
 import java.io.Serializable;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.index.IndexOperationsAdapter;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
 import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -34,12 +34,13 @@
  * @author Christoph Strobl
  * @since 2.0
  * @see org.springframework.data.repository.reactive.ReactiveSortingRepository
- * @see org.springframework.data.repository.reactive.RxJava2SortingRepository
+ * @see org.springframework.data.repository.reactive.RxJava3SortingRepository
  */
 public class ReactiveMongoRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable>
 		extends RepositoryFactoryBeanSupport<T, S, ID> {
 
 	private @Nullable ReactiveMongoOperations operations;
+	private ReactiveMongoRepositoryFragmentsContributor repositoryFragmentsContributor = ReactiveMongoRepositoryFragmentsContributor.DEFAULT;
 	private boolean createIndexesForQueryMethods = false;
 	private boolean mappingContextConfigured = false;
 
@@ -61,6 +62,23 @@ public void setReactiveMongoOperations(@Nullable ReactiveMongoOperations operati
 		this.operations = operations;
 	}
 
+	@Override
+	public ReactiveMongoRepositoryFragmentsContributor getRepositoryFragmentsContributor() {
+		return repositoryFragmentsContributor;
+	}
+
+	/**
+	 * Configures the {@link MongoRepositoryFragmentsContributor} to contribute built-in fragment functionality to the
+	 * repository.
+	 *
+	 * @param repositoryFragmentsContributor must not be {@literal null}.
+	 * @since 5.0
+	 */
+	public void setRepositoryFragmentsContributor(
+			ReactiveMongoRepositoryFragmentsContributor repositoryFragmentsContributor) {
+		this.repositoryFragmentsContributor = repositoryFragmentsContributor;
+	}
+
 	/**
 	 * Configures whether to automatically create indexes for the properties referenced in a query method.
 	 *
@@ -70,32 +88,23 @@ public void setCreateIndexesForQueryMethods(boolean createIndexesForQueryMethods
 		this.createIndexesForQueryMethods = createIndexesForQueryMethods;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport#setMappingContext(org.springframework.data.mapping.context.MappingContext)
-	 */
 	@Override
-	protected void setMappingContext(MappingContext<?, ?> mappingContext) {
+	public void setMappingContext(MappingContext<?, ?> mappingContext) {
 
 		super.setMappingContext(mappingContext);
 		this.mappingContextConfigured = true;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-	 * #createRepositoryFactory()
-	 */
 	@Override
+	@SuppressWarnings("NullAway")
 	protected RepositoryFactorySupport createRepositoryFactory() {
 
-		RepositoryFactorySupport factory = getFactoryInstance(operations);
+		ReactiveMongoRepositoryFactory factory = getFactoryInstance(operations);
+		factory.setFragmentsContributor(repositoryFragmentsContributor);
 
 		if (createIndexesForQueryMethods) {
 			factory.addQueryCreationListener(new IndexEnsuringQueryCreationListener(
-					collectionName -> IndexOperationsAdapter.blocking(operations.indexOps(collectionName))));
+					(collectionName, javaType) -> IndexOperationsAdapter.blocking(operations.indexOps(javaType))));
 		}
 
 		return factory;
@@ -107,22 +116,15 @@ protected RepositoryFactorySupport createRepositoryFactory() {
 	 * @param operations
 	 * @return
 	 */
-	protected RepositoryFactorySupport getFactoryInstance(ReactiveMongoOperations operations) {
+	protected ReactiveMongoRepositoryFactory getFactoryInstance(ReactiveMongoOperations operations) {
 		return new ReactiveMongoRepositoryFactory(operations);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 *
-	 * @see
-	 * org.springframework.data.repository.support.RepositoryFactoryBeanSupport
-	 * #afterPropertiesSet()
-	 */
 	@Override
 	public void afterPropertiesSet() {
 
 		super.afterPropertiesSet();
-		Assert.state(operations != null, "ReactiveMongoOperations must not be null!");
+		Assert.state(operations != null, "ReactiveMongoOperations must not be null");
 
 		if (!mappingContextConfigured) {
 			setMappingContext(operations.getConverter().getMappingContext());
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFragmentsContributor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFragmentsContributor.java
new file mode 100644
index 0000000000..fdf3c3649e
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFragmentsContributor.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2025 the original author 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.repository.support;
+
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFragmentsContributor;
+import org.springframework.util.Assert;
+
+/**
+ * Reactive MongoDB-specific {@link RepositoryFragmentsContributor} contributing fragments based on the repository.
+ * <p>
+ * Implementations must define a no-args constructor.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see ReactiveQuerydslMongoPredicateExecutor
+ */
+public interface ReactiveMongoRepositoryFragmentsContributor extends RepositoryFragmentsContributor {
+
+	ReactiveMongoRepositoryFragmentsContributor DEFAULT = ReactiveQuerydslContributor.INSTANCE;
+
+	/**
+	 * Returns a composed {@code ReactiveMongoRepositoryFragmentsContributor} that first applies this contributor to its
+	 * inputs, and then applies the {@code after} contributor concatenating effectively both results. If evaluation of
+	 * either contributors throws an exception, it is relayed to the caller of the composed contributor.
+	 *
+	 * @param after the contributor to apply after this contributor is applied.
+	 * @return a composed contributor that first applies this contributor and then applies the {@code after} contributor.
+	 */
+	default ReactiveMongoRepositoryFragmentsContributor andThen(ReactiveMongoRepositoryFragmentsContributor after) {
+
+		Assert.notNull(after, "ReactiveMongoRepositoryFragmentsContributor must not be null");
+
+		return new ReactiveMongoRepositoryFragmentsContributor() {
+
+			@Override
+			public RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+					MongoEntityInformation<?, ?> entityInformation, ReactiveMongoOperations operations) {
+				return ReactiveMongoRepositoryFragmentsContributor.this.contribute(metadata, entityInformation, operations)
+						.append(after.contribute(metadata, entityInformation, operations));
+			}
+
+			@Override
+			public RepositoryComposition.RepositoryFragments describe(RepositoryMetadata metadata) {
+				return ReactiveMongoRepositoryFragmentsContributor.this.describe(metadata).append(after.describe(metadata));
+			}
+		};
+	}
+
+	/**
+	 * Creates {@link RepositoryComposition.RepositoryFragments} based on {@link RepositoryMetadata} to add
+	 * MongoDB-specific extensions.
+	 *
+	 * @param metadata repository metadata.
+	 * @param entityInformation must not be {@literal null}.
+	 * @param operations must not be {@literal null}.
+	 * @return {@link RepositoryComposition.RepositoryFragments} to be added to the repository.
+	 */
+	RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+			MongoEntityInformation<?, ?> entityInformation, ReactiveMongoOperations operations);
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactivePageableExecutionUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactivePageableExecutionUtils.java
new file mode 100644
index 0000000000..fcf420212a
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactivePageableExecutionUtils.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2021-2025 the original author 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.repository.support;
+
+import reactor.core.publisher.Mono;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.Assert;
+
+/**
+ * Support for query execution using {@link Pageable}. Using {@link ReactivePageableExecutionUtils} assumes that data
+ * queries are cheaper than {@code COUNT} queries and so some cases can take advantage of optimizations.
+ *
+ * @author Mark Paluch
+ * @since 3.3
+ */
+abstract class ReactivePageableExecutionUtils {
+
+	private ReactivePageableExecutionUtils() {}
+
+	/**
+	 * Constructs a {@link Page} based on the given {@code content}, {@link Pageable} and {@link Mono} applying
+	 * optimizations. The construction of {@link Page} omits a count query if the total can be determined based on the
+	 * result size and {@link Pageable}.
+	 *
+	 * @param content must not be {@literal null}.
+	 * @param pageable must not be {@literal null}.
+	 * @param totalSupplier must not be {@literal null}.
+	 * @return the {@link Page}.
+	 */
+	public static <T> Mono<Page<T>> getPage(List<T> content, Pageable pageable, Mono<Long> totalSupplier) {
+
+		Assert.notNull(content, "Content must not be null");
+		Assert.notNull(pageable, "Pageable must not be null");
+		Assert.notNull(totalSupplier, "TotalSupplier must not be null");
+
+		if (pageable.isUnpaged() || pageable.getOffset() == 0) {
+
+			if (pageable.isUnpaged() || pageable.getPageSize() > content.size()) {
+				return Mono.just(new PageImpl<>(content, pageable, content.size()));
+			}
+
+			return totalSupplier.map(total -> new PageImpl<>(content, pageable, total));
+		}
+
+		if (content.size() != 0 && pageable.getPageSize() > content.size()) {
+			return Mono.just(new PageImpl<>(content, pageable, pageable.getOffset() + content.size()));
+		}
+
+		return totalSupplier.map(total -> new PageImpl<>(content, pageable, total));
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslContributor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslContributor.java
new file mode 100644
index 0000000000..2cea75cb44
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslContributor.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2025 the original author 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.repository.support;
+
+import static org.springframework.data.querydsl.QuerydslUtils.*;
+
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFragment;
+import org.springframework.data.repository.core.support.RepositoryFragmentsContributor;
+
+/**
+ * Reactive MongoDB-specific {@link RepositoryFragmentsContributor} contributing Querydsl fragments if a repository
+ * implements {@link QuerydslPredicateExecutor}.
+ *
+ * @author Mark Paluch
+ * @since 5.0
+ * @see ReactiveQuerydslMongoPredicateExecutor
+ */
+enum ReactiveQuerydslContributor implements ReactiveMongoRepositoryFragmentsContributor {
+
+	INSTANCE;
+
+	@Override
+	public RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+			MongoEntityInformation<?, ?> entityInformation, ReactiveMongoOperations operations) {
+
+		if (isQuerydslRepository(metadata)) {
+
+			ReactiveQuerydslPredicateExecutor<?> executor = new ReactiveQuerydslMongoPredicateExecutor<>(entityInformation,
+					operations);
+
+			return RepositoryComposition.RepositoryFragments
+					.of(RepositoryFragment.implemented(ReactiveQuerydslPredicateExecutor.class, executor));
+		}
+
+		return RepositoryComposition.RepositoryFragments.empty();
+	}
+
+	@Override
+	public RepositoryComposition.RepositoryFragments describe(RepositoryMetadata metadata) {
+
+		if (isQuerydslRepository(metadata)) {
+			return RepositoryComposition.RepositoryFragments.of(RepositoryFragment
+					.structural(ReactiveQuerydslPredicateExecutor.class, ReactiveQuerydslMongoPredicateExecutor.class));
+		}
+
+		return RepositoryComposition.RepositoryFragments.empty();
+	}
+
+	private static boolean isQuerydslRepository(RepositoryMetadata metadata) {
+		return QUERY_DSL_PRESENT
+				&& ReactiveQuerydslPredicateExecutor.class.isAssignableFrom(metadata.getRepositoryInterface());
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java
index 49e8ca4101..9a1482823f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,27 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.function.Function;
+
+import org.bson.Document;
+import org.reactivestreams.Publisher;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.querydsl.EntityPathResolver;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
 import org.springframework.data.querydsl.SimpleEntityPathResolver;
+import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.util.Assert;
 
 import com.querydsl.core.types.EntityPath;
@@ -73,92 +87,74 @@ public ReactiveQuerydslMongoPredicateExecutor(MongoEntityInformation<T, ?> entit
 		this.mongoOperations = mongoOperations;
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findOne(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Mono<T> findOne(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		return createQueryFor(predicate).fetchOne();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Flux<T> findAll(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		return createQueryFor(predicate).fetch();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, com.querydsl.core.types.OrderSpecifier[])
-	 */
 	@Override
 	public Flux<T> findAll(Predicate predicate, OrderSpecifier<?>... orders) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
-		Assert.notNull(orders, "Order specifiers must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(orders, "Order specifiers must not be null");
 
 		return createQueryFor(predicate).orderBy(orders).fetch();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.Predicate, org.springframework.data.domain.Sort)
-	 */
 	@Override
 	public Flux<T> findAll(Predicate predicate, Sort sort) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
-		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(sort, "Sort must not be null");
 
 		return applySorting(createQueryFor(predicate), sort).fetch();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#findAll(com.querydsl.core.types.OrderSpecifier[])
-	 */
 	@Override
 	public Flux<T> findAll(OrderSpecifier<?>... orders) {
 
-		Assert.notNull(orders, "Order specifiers must not be null!");
+		Assert.notNull(orders, "Order specifiers must not be null");
 
 		return createQuery().orderBy(orders).fetch();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#count(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Mono<Long> count(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		return createQueryFor(predicate).fetchCount();
 	}
 
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor#exists(com.querydsl.core.types.Predicate)
-	 */
 	@Override
 	public Mono<Boolean> exists(Predicate predicate) {
 
-		Assert.notNull(predicate, "Predicate must not be null!");
+		Assert.notNull(predicate, "Predicate must not be null");
 
 		return createQueryFor(predicate).fetchCount().map(it -> it != 0);
 	}
 
+	@Override
+	public <S extends T, R, P extends Publisher<R>> P findBy(Predicate predicate,
+			Function<FluentQuery.ReactiveFluentQuery<S>, P> queryFunction) {
+
+		Assert.notNull(predicate, "Predicate must not be null");
+		Assert.notNull(queryFunction, "Query function must not be null");
+
+		return queryFunction.apply(new ReactiveFluentQuerydsl<S>(predicate, (Class<S>) typeInformation().getJavaType()));
+	}
+
 	/**
 	 * Creates a {@link ReactiveSpringDataMongodbQuery} for the given {@link Predicate}.
 	 *
@@ -177,8 +173,8 @@ private ReactiveSpringDataMongodbQuery<T> createQueryFor(Predicate predicate) {
 	private ReactiveSpringDataMongodbQuery<T> createQuery() {
 
 		Class<T> javaType = typeInformation().getJavaType();
-		return new ReactiveSpringDataMongodbQuery<>(mongodbSerializer(), mongoOperations, javaType,
-				mongoOperations.getCollectionName(javaType));
+		return new ReactiveSpringDataMongodbQuery<>(mongoOperations, javaType, javaType,
+				mongoOperations.getCollectionName(javaType), it -> {});
 	}
 
 	/**
@@ -194,4 +190,97 @@ private ReactiveSpringDataMongodbQuery<T> applySorting(ReactiveSpringDataMongodb
 		return query;
 	}
 
+	/**
+	 * {@link org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery} using Querydsl {@link Predicate}.
+	 *
+	 * @since 3.3
+	 * @author Mark Paluch
+	 */
+	class ReactiveFluentQuerydsl<T> extends ReactiveFluentQuerySupport<Predicate, T> {
+
+		ReactiveFluentQuerydsl(Predicate predicate, Class<T> resultType) {
+			this(predicate, Sort.unsorted(), 0, resultType, Collections.emptyList());
+		}
+
+		ReactiveFluentQuerydsl(Predicate predicate, Sort sort, int limit, Class<T> resultType,
+				List<String> fieldsToInclude) {
+			super(predicate, sort, limit, resultType, fieldsToInclude);
+		}
+
+		@Override
+		protected <R> ReactiveFluentQuerydsl<R> create(Predicate predicate, Sort sort, int limit, Class<R> resultType,
+				List<String> fieldsToInclude) {
+			return new ReactiveFluentQuerydsl<>(predicate, sort, limit, resultType, fieldsToInclude);
+		}
+
+		@Override
+		public Mono<T> one() {
+			return createQuery().fetchOne();
+		}
+
+		@Override
+		public Mono<T> first() {
+			return createQuery().fetchFirst();
+		}
+
+		@Override
+		public Flux<T> all() {
+			return createQuery().fetch();
+		}
+
+		@Override
+		public Mono<Window<T>> scroll(ScrollPosition scrollPosition) {
+			return createQuery().scroll(scrollPosition);
+		}
+
+		@Override
+		public Mono<Page<T>> page(Pageable pageable) {
+
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			return createQuery().fetchPage(pageable);
+		}
+
+		@Override
+		public Mono<Slice<T>> slice(Pageable pageable) {
+
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			return createQuery().fetchSlice(pageable);
+		}
+
+		@Override
+		public Mono<Long> count() {
+			return createQuery().fetchCount();
+		}
+
+		@Override
+		public Mono<Boolean> exists() {
+			return count().map(it -> it > 0).defaultIfEmpty(false);
+		}
+
+		private ReactiveSpringDataMongodbQuery<T> createQuery() {
+
+			return new ReactiveSpringDataMongodbQuery<>(mongoOperations, typeInformation().getJavaType(), getResultType(),
+					mongoOperations.getCollectionName(typeInformation().getJavaType()), this::customize).where(getPredicate());
+		}
+
+		private void customize(BasicQuery query) {
+
+			List<String> fieldsToInclude = getFieldsToInclude();
+
+			if (!fieldsToInclude.isEmpty()) {
+				Document fields = new Document();
+				fieldsToInclude.forEach(field -> fields.put(field, 1));
+				query.setFieldsObject(fields);
+			}
+
+			if (getSort().isSorted()) {
+				query.with(getSort());
+			}
+
+			query.limit(getLimit());
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveSpringDataMongodbQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveSpringDataMongodbQuery.java
index 1a54f5e35b..a86ada0aad 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveSpringDataMongodbQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/ReactiveSpringDataMongodbQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,18 +15,28 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
+import org.springframework.data.mongodb.repository.util.SliceUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-
-import org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithProjection;
+import java.util.function.Consumer;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.ReactiveFindOperation;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.util.StringUtils;
@@ -40,35 +50,39 @@
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Path;
 import com.querydsl.core.types.Predicate;
-import com.querydsl.core.types.dsl.CollectionPathBase;
+import com.querydsl.mongodb.MongodbOps;
 
 /**
- * MongoDB query with utilizing {@link ReactiveMongoOperations} for command execution.
+ * MongoDB query utilizing {@link ReactiveMongoOperations} for command execution.
  *
+ * @implNote This class uses {@link MongoOperations} to directly convert documents into the target entity type. Also, we
+ *           want entities to participate in lifecycle events and entity callbacks.
  * @param <K> result type
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Rocco Lagrotteria
  * @since 2.2
  */
-class ReactiveSpringDataMongodbQuery<K> extends QuerydslAbstractMongodbQuery<K, ReactiveSpringDataMongodbQuery<K>> {
+class ReactiveSpringDataMongodbQuery<K> extends SpringDataMongodbQuerySupport<ReactiveSpringDataMongodbQuery<K>> {
 
-	private final Class<K> entityClass;
 	private final ReactiveMongoOperations mongoOperations;
-	private final FindWithProjection<K> find;
+	private final Consumer<BasicQuery> queryCustomizer;
+	private final ReactiveFindOperation.FindWithQuery<K> find;
 
 	ReactiveSpringDataMongodbQuery(ReactiveMongoOperations mongoOperations, Class<? extends K> entityClass) {
-		this(new SpringDataMongodbSerializer(mongoOperations.getConverter()), mongoOperations, entityClass, null);
+		this(mongoOperations, entityClass, entityClass, null, it -> {});
 	}
 
-	ReactiveSpringDataMongodbQuery(MongodbDocumentSerializer serializer, ReactiveMongoOperations mongoOperations,
-			Class<? extends K> entityClass, @Nullable String collection) {
+	@SuppressWarnings("unchecked")
+	ReactiveSpringDataMongodbQuery(ReactiveMongoOperations mongoOperations, Class<?> domainType,
+			Class<? extends K> resultType, @Nullable String collection, Consumer<BasicQuery> queryCustomizer) {
 
-		super(serializer);
+		super(new SpringDataMongodbSerializer(mongoOperations.getConverter()));
 
-		this.entityClass = (Class<K>) entityClass;
 		this.mongoOperations = mongoOperations;
-		this.find = StringUtils.hasText(collection) ? mongoOperations.query(this.entityClass).inCollection(collection)
-				: mongoOperations.query(this.entityClass);
+		this.queryCustomizer = queryCustomizer;
+		this.find = (StringUtils.hasText(collection) ? mongoOperations.query(domainType).inCollection(collection)
+				: mongoOperations.query(domainType)).as((Class<K>) resultType);
 	}
 
 	/**
@@ -80,67 +94,72 @@ Flux<K> fetch() {
 		return createQuery().flatMapMany(it -> find.matching(it).all());
 	}
 
+	Mono<Window<K>> scroll(ScrollPosition scrollPosition) {
+		return createQuery().flatMap(it -> find.matching(it).scroll(scrollPosition));
+	}
+
 	/**
-	 * Fetch the first matching query result.
+	 * Fetch all matching query results as page.
 	 *
-	 * @return {@link Mono} emitting the first query result or {@link Mono#empty()} if there are none.
-	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException if more than one match found.
+	 * @return {@link Mono} emitting the requested page.
 	 */
-	Mono<K> fetchOne() {
-		return createQuery().flatMap(it -> find.matching(it).one());
+	Mono<Page<K>> fetchPage(Pageable pageable) {
+
+		Mono<List<K>> content = createQuery().map(it -> it.with(pageable)).flatMapMany(it -> find.matching(it).all())
+				.collectList();
+
+		return content.flatMap(it -> ReactivePageableExecutionUtils.getPage(it, pageable, fetchCount()));
 	}
 
 	/**
-	 * Fetch the count of matching query results.
+	 * Fetch all matching query results as Slice.
 	 *
-	 * @return {@link Mono} emitting the first query result count. Emits always a count even item.
+	 * @param pageable defines range and sort of requested slice
+	 * @return {@link Mono} emitting the requested Slice.
+	 * @since 4.5
 	 */
-	Mono<Long> fetchCount() {
-		return createQuery().flatMap(it -> find.matching(it).count());
+	Mono<Slice<K>> fetchSlice(Pageable pageable) {
+
+		Mono<List<K>> content = createQuery().map(it -> SliceUtils.limitResult(it, pageable).with(pageable.getSort()))
+				.flatMapMany(it -> find.matching(it).all()).collectList();
+
+		return content.map(it -> SliceUtils.sliceResult(it, pageable));
 	}
 
 	/**
-	 * Define a join.
+	 * Fetch the one matching query result.
 	 *
-	 * @param ref reference
-	 * @param target join target
-	 * @return new instance of {@link QuerydslJoinBuilder}.
+	 * @return {@link Mono} emitting the first query result or {@link Mono#empty()} if there are none.
+	 * @throws org.springframework.dao.IncorrectResultSizeDataAccessException if more than one match found.
 	 */
-	<T> QuerydslJoinBuilder<ReactiveSpringDataMongodbQuery<K>, K, T> join(Path<T> ref, Path<T> target) {
-		return new QuerydslJoinBuilder<>(getQueryMixin(), ref, target);
+	Mono<K> fetchOne() {
+		return createQuery().flatMap(it -> find.matching(it).one());
 	}
 
 	/**
-	 * Define a join.
+	 * Fetch the first matching query result. @return {@link Mono} emitting the first query result or {@link Mono#empty()}
+	 * if there are none.
 	 *
-	 * @param ref reference
-	 * @param target join target
-	 * @return new instance of {@link QuerydslJoinBuilder}.
+	 * @since 3.3
 	 */
-	<T> QuerydslJoinBuilder<ReactiveSpringDataMongodbQuery<K>, K, T> join(CollectionPathBase<?, T, ?> ref,
-			Path<T> target) {
-
-		return new QuerydslJoinBuilder<>(getQueryMixin(), ref, target);
+	Mono<K> fetchFirst() {
+		return createQuery().flatMap(it -> find.matching(it).first());
 	}
 
 	/**
-	 * Define a constraint for an embedded object.
+	 * Fetch the count of matching query results.
 	 *
-	 * @param collection collection must not be {@literal null}.
-	 * @param target target must not be {@literal null}.
-	 * @return new instance of {@link QuerydslAnyEmbeddedBuilder}.
+	 * @return {@link Mono} emitting the first query result count. Emits always a count even item.
 	 */
-	<T> QuerydslAnyEmbeddedBuilder<ReactiveSpringDataMongodbQuery<K>, K> anyEmbedded(
-			Path<? extends Collection<T>> collection, Path<T> target) {
-
-		return new QuerydslAnyEmbeddedBuilder<>(getQueryMixin(), collection);
+	Mono<Long> fetchCount() {
+		return createQuery().flatMap(it -> find.matching(it).count());
 	}
 
 	protected Mono<Query> createQuery() {
 
 		QueryMetadata metadata = getQueryMixin().getMetadata();
 
-		return createQuery(createFilter(metadata), metadata.getProjection(), metadata.getModifiers(),
+		return createQuery(createReactiveFilter(metadata), metadata.getProjection(), metadata.getModifiers(),
 				metadata.getOrderBy());
 	}
 
@@ -160,7 +179,8 @@ protected Mono<Query> createQuery(Mono<Predicate> filter, @Nullable Expression<?
 				.defaultIfEmpty(createQuery(null)) //
 				.map(it -> {
 
-					BasicQuery basicQuery = new BasicQuery(it, createProjection(projection));
+					Document fields = createProjection(projection);
+					BasicQuery basicQuery = new BasicQuery(it, fields == null ? new Document() : fields);
 
 					Integer limit = modifiers.getLimitAsInteger();
 					Integer offset = modifiers.getOffsetAsInteger();
@@ -175,15 +195,17 @@ protected Mono<Query> createQuery(Mono<Predicate> filter, @Nullable Expression<?
 						basicQuery.setSortObject(createSort(orderBy));
 					}
 
+					queryCustomizer.accept(basicQuery);
+
 					return basicQuery;
 				});
 	}
 
-	protected Mono<Predicate> createFilter(QueryMetadata metadata) {
+	protected Mono<Predicate> createReactiveFilter(QueryMetadata metadata) {
 
 		if (!metadata.getJoins().isEmpty()) {
 
-			return createJoinFilter(metadata).map(it -> ExpressionUtils.allOf(metadata.getWhere(), it))
+			return createReactiveJoinFilter(metadata).map(it -> ExpressionUtils.allOf(metadata.getWhere(), it))
 					.switchIfEmpty(Mono.justOrEmpty(metadata.getWhere()));
 		}
 
@@ -197,7 +219,7 @@ protected Mono<Predicate> createFilter(QueryMetadata metadata) {
 	 * @return
 	 */
 	@SuppressWarnings("unchecked")
-	protected Mono<Predicate> createJoinFilter(QueryMetadata metadata) {
+	protected Mono<Predicate> createReactiveJoinFilter(QueryMetadata metadata) {
 
 		MultiValueMap<Expression<?>, Mono<Predicate>> predicates = new LinkedMultiValueMap<>();
 		List<JoinExpression> joins = metadata.getJoins();
@@ -230,7 +252,7 @@ protected Mono<Predicate> createJoinFilter(QueryMetadata metadata) {
 
 		Path<?> source = (Path) ((Operation) joins.get(0).getTarget()).getArg(0);
 		return allOf(predicates.get(source.getRoot())).onErrorResume(NoMatchException.class,
-				e -> Mono.just(ExpressionUtils.predicate(QuerydslMongoOps.NO_MATCH, e.source)));
+				e -> Mono.just(ExpressionUtils.predicate(MongodbOps.NO_MATCH, e.source)));
 	}
 
 	private Mono<Predicate> allOf(@Nullable Collection<Mono<Predicate>> predicates) {
@@ -246,8 +268,8 @@ private Mono<Predicate> allOf(@Nullable Collection<Mono<Predicate>> predicates)
 	 */
 	protected Flux<Object> getIds(Class<?> targetType, Mono<Predicate> condition) {
 
-		return condition.flatMapMany(it -> getIds(targetType, it))
-				.switchIfEmpty(Flux.defer(() -> getIds(targetType, (Predicate) null)));
+		return condition.flatMapMany(it -> getJoinIds(targetType, it))
+				.switchIfEmpty(Flux.defer(() -> getJoinIds(targetType, null)));
 	}
 
 	/**
@@ -257,10 +279,16 @@ protected Flux<Object> getIds(Class<?> targetType, Mono<Predicate> condition) {
 	 * @param condition must not be {@literal null}.
 	 * @return empty {@link List} if none found.
 	 */
-	protected Flux<Object> getIds(Class<?> targetType, @Nullable Predicate condition) {
+	protected Flux<Object> getJoinIds(Class<?> targetType, @Nullable Predicate condition) {
 
 		return createQuery(Mono.justOrEmpty(condition), null, QueryModifiers.EMPTY, Collections.emptyList())
-				.flatMapMany(query -> mongoOperations.findDistinct(query, "_id", targetType, Object.class));
+				.flatMapMany(query -> mongoOperations.findDistinct(query, FieldName.ID.name(), targetType, Object.class));
+	}
+
+	@Override
+	protected List<Object> getIds(Class<?> aClass, Predicate predicate) {
+		throw new UnsupportedOperationException(
+				"Use create Flux<Object> getIds(Class<?> targetType, Mono<Predicate> condition)");
 	}
 
 	/**
@@ -276,7 +304,7 @@ static class NoMatchException extends RuntimeException {
 
 		@Override
 		public synchronized Throwable fillInStackTrace() {
-			return null;
+			return this;
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java
index 2ad380c785..7e6e2fc82e 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,29 +18,39 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.ExecutableFindOperation;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
-import org.springframework.data.repository.support.PageableExecutionUtils;
+import org.springframework.data.mongodb.repository.util.SliceUtils;
+import org.springframework.data.support.PageableExecutionUtils;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.data.util.Streamable;
-import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 
+import com.mongodb.ReadPreference;
 import com.mongodb.client.result.DeleteResult;
 
 /**
@@ -50,11 +60,15 @@
  * @author Christoph Strobl
  * @author Thomas Darimont
  * @author Mark Paluch
+ * @author Mehran Behnam
+ * @author Jens Schauder
+ * @author Kirill Egorov
  */
 public class SimpleMongoRepository<T, ID> implements MongoRepository<T, ID> {
 
-	private final MongoOperations mongoOperations;
+	private @Nullable CrudMethodMetadata crudMethodMetadata;
 	private final MongoEntityInformation<T, ID> entityInformation;
+	private final MongoOperations mongoOperations;
 
 	/**
 	 * Creates a new {@link SimpleMongoRepository} for the given {@link MongoEntityInformation} and {@link MongoTemplate}.
@@ -64,21 +78,21 @@ public class SimpleMongoRepository<T, ID> implements MongoRepository<T, ID> {
 	 */
 	public SimpleMongoRepository(MongoEntityInformation<T, ID> metadata, MongoOperations mongoOperations) {
 
-		Assert.notNull(metadata, "MongoEntityInformation must not be null!");
-		Assert.notNull(mongoOperations, "MongoOperations must not be null!");
+		Assert.notNull(metadata, "MongoEntityInformation must not be null");
+		Assert.notNull(mongoOperations, "MongoOperations must not be null");
 
 		this.entityInformation = metadata;
 		this.mongoOperations = mongoOperations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#save(java.lang.Object)
-	 */
+	// -------------------------------------------------------------------------
+	// Methods from CrudRepository
+	// -------------------------------------------------------------------------
+
 	@Override
 	public <S extends T> S save(S entity) {
 
-		Assert.notNull(entity, "Entity must not be null!");
+		Assert.notNull(entity, "Entity must not be null");
 
 		if (entityInformation.isNew(entity)) {
 			return mongoOperations.insert(entity, entityInformation.getCollectionName());
@@ -87,17 +101,13 @@ public <S extends T> S save(S entity) {
 		return mongoOperations.save(entity, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoRepository#saveAll(java.lang.Iterable)
-	 */
 	@Override
 	public <S extends T> List<S> saveAll(Iterable<S> entities) {
 
-		Assert.notNull(entities, "The given Iterable of entities not be null!");
+		Assert.notNull(entities, "The given Iterable of entities not be null");
 
 		Streamable<S> source = Streamable.of(entities);
-		boolean allNew = source.stream().allMatch(it -> entityInformation.isNew(it));
+		boolean allNew = source.stream().allMatch(entityInformation::isNew);
 
 		if (allNew) {
 
@@ -108,261 +118,262 @@ public <S extends T> List<S> saveAll(Iterable<S> entities) {
 		return source.stream().map(this::save).collect(Collectors.toList());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findById(java.io.Serializable)
-	 */
 	@Override
 	public Optional<T> findById(ID id) {
 
-		Assert.notNull(id, "The given id must not be null!");
+		Assert.notNull(id, "The given id must not be null");
+
+		Query query = getIdQuery(id);
+		getReadPreference().ifPresent(query::withReadPreference);
 
 		return Optional.ofNullable(
-				mongoOperations.findById(id, entityInformation.getJavaType(), entityInformation.getCollectionName()));
+				mongoOperations.findOne(query, entityInformation.getJavaType(), entityInformation.getCollectionName()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#existsById(java.lang.Object)
-	 */
 	@Override
 	public boolean existsById(ID id) {
 
-		Assert.notNull(id, "The given id must not be null!");
+		Assert.notNull(id, "The given id must not be null");
+
+		Query query = getIdQuery(id);
+		getReadPreference().ifPresent(query::withReadPreference);
 
-		return mongoOperations.exists(getIdQuery(id), entityInformation.getJavaType(),
-				entityInformation.getCollectionName());
+		return mongoOperations.exists(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
+	}
+
+	@Override
+	public List<T> findAll() {
+		return findAll(new Query());
+	}
+
+	@Override
+	public List<T> findAllById(Iterable<ID> ids) {
+
+		Assert.notNull(ids, "The given Ids of entities not be null");
+
+		return findAll(getIdQuery(ids));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#count()
-	 */
 	@Override
 	public long count() {
-		return mongoOperations.count(new Query(), entityInformation.getCollectionName());
+
+		Query query = new Query();
+		getReadPreference().ifPresent(query::withReadPreference);
+		return mongoOperations.count(query, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteById(java.lang.Object)
-	 */
 	@Override
 	public void deleteById(ID id) {
 
-		Assert.notNull(id, "The given id must not be null!");
+		Assert.notNull(id, "The given id must not be null");
 
-		mongoOperations.remove(getIdQuery(id), entityInformation.getJavaType(), entityInformation.getCollectionName());
+		Query query = getIdQuery(id);
+		getReadPreference().ifPresent(query::withReadPreference);
+		mongoOperations.remove(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Object)
-	 */
 	@Override
 	public void delete(T entity) {
 
-		Assert.notNull(entity, "The given entity must not be null!");
+		Assert.notNull(entity, "The given entity must not be null");
 
 		DeleteResult deleteResult = mongoOperations.remove(entity, entityInformation.getCollectionName());
 
 		if (entityInformation.isVersioned() && deleteResult.wasAcknowledged() && deleteResult.getDeletedCount() == 0) {
 			throw new OptimisticLockingFailureException(String.format(
-					"The entity with id %s with version %s in %s cannot be deleted! Was it modified or deleted in the meantime?",
+					"The entity with id %s with version %s in %s cannot be deleted; Was it modified or deleted in the meantime",
 					entityInformation.getId(entity), entityInformation.getVersion(entity),
 					entityInformation.getCollectionName()));
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#delete(java.lang.Iterable)
-	 */
 	@Override
-	public void deleteAll(Iterable<? extends T> entities) {
+	public void deleteAllById(Iterable<? extends ID> ids) {
 
-		Assert.notNull(entities, "The given Iterable of entities not be null!");
+		Assert.notNull(ids, "The given Iterable of ids must not be null");
 
-		entities.forEach(this::delete);
+		Query query = getIdQuery(ids);
+		getReadPreference().ifPresent(query::withReadPreference);
+		mongoOperations.remove(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#deleteAll()
-	 */
 	@Override
-	public void deleteAll() {
-		mongoOperations.remove(new Query(), entityInformation.getCollectionName());
-	}
+	public void deleteAll(Iterable<? extends T> entities) {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAll()
-	 */
-	@Override
-	public List<T> findAll() {
-		return findAll(new Query());
+		Assert.notNull(entities, "The given Iterable of entities must not be null");
+
+		entities.forEach(this::delete);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.CrudRepository#findAllById(java.lang.Iterable)
-	 */
 	@Override
-	public Iterable<T> findAllById(Iterable<ID> ids) {
+	public void deleteAll() {
+
+		Query query = new Query();
+		getReadPreference().ifPresent(query::withReadPreference);
 
-		return findAll(new Query(new Criteria(entityInformation.getIdAttribute())
-				.in(Streamable.of(ids).stream().collect(StreamUtils.toUnmodifiableList()))));
+		mongoOperations.remove(query, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Pageable)
-	 */
+	// -------------------------------------------------------------------------
+	// Methods from PagingAndSortingRepository
+	// -------------------------------------------------------------------------
+
 	@Override
 	public Page<T> findAll(Pageable pageable) {
 
-		Assert.notNull(pageable, "Pageable must not be null!");
+		Assert.notNull(pageable, "Pageable must not be null");
 
-		Long count = count();
+		long count = count();
 		List<T> list = findAll(new Query().with(pageable));
 
 		return new PageImpl<>(list, pageable, count);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.PagingAndSortingRepository#findAll(org.springframework.data.domain.Sort)
-	 */
 	@Override
 	public List<T> findAll(Sort sort) {
 
-		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(sort, "Sort must not be null");
 
-		return findAll(new Query().with(sort));
+		Query query = new Query().with(sort);
+		return findAll(query);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoRepository#insert(java.lang.Object)
-	 */
+	// -------------------------------------------------------------------------
+	// Methods from MongoRepository
+	// -------------------------------------------------------------------------
+
 	@Override
 	public <S extends T> S insert(S entity) {
 
-		Assert.notNull(entity, "Entity must not be null!");
+		Assert.notNull(entity, "Entity must not be null");
 
 		return mongoOperations.insert(entity, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoRepository#insert(java.lang.Iterable)
-	 */
 	@Override
 	public <S extends T> List<S> insert(Iterable<S> entities) {
 
-		Assert.notNull(entities, "The given Iterable of entities not be null!");
+		Assert.notNull(entities, "The given Iterable of entities not be null");
 
-		List<S> list = Streamable.of(entities).stream().collect(StreamUtils.toUnmodifiableList());
+		Collection<S> list = toCollection(entities);
 
 		if (list.isEmpty()) {
-			return list;
+			return Collections.emptyList();
 		}
 
 		return new ArrayList<>(mongoOperations.insertAll(list));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example, org.springframework.data.domain.Pageable)
-	 */
+	// -------------------------------------------------------------------------
+	// Methods from QueryByExampleExecutor
+	// -------------------------------------------------------------------------
+
 	@Override
-	public <S extends T> Page<S> findAll(final Example<S> example, Pageable pageable) {
+	public <S extends T> Optional<S> findOne(Example<S> example) {
 
-		Assert.notNull(example, "Sample must not be null!");
-		Assert.notNull(pageable, "Pageable must not be null!");
+		Assert.notNull(example, "Sample must not be null");
 
 		Query query = new Query(new Criteria().alike(example)) //
-				.collation(entityInformation.getCollation()).with(pageable); //
+				.collation(entityInformation.getCollation());
+		getReadPreference().ifPresent(query::withReadPreference);
 
-		List<S> list = mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName());
+		return Optional
+				.ofNullable(mongoOperations.findOne(query, example.getProbeType(), entityInformation.getCollectionName()));
+	}
 
-		return PageableExecutionUtils.getPage(list, pageable,
-				() -> mongoOperations.count(Query.of(query).limit(-1).skip(-1), example.getProbeType(), entityInformation.getCollectionName()));
+	@Override
+	public <S extends T> List<S> findAll(Example<S> example) {
+		return findAll(example, Sort.unsorted());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example, org.springframework.data.domain.Sort)
-	 */
 	@Override
 	public <S extends T> List<S> findAll(Example<S> example, Sort sort) {
 
-		Assert.notNull(example, "Sample must not be null!");
-		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(example, "Sample must not be null");
+		Assert.notNull(sort, "Sort must not be null");
 
 		Query query = new Query(new Criteria().alike(example)) //
 				.collation(entityInformation.getCollation()) //
 				.with(sort);
+		getReadPreference().ifPresent(query::withReadPreference);
 
 		return mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example)
-	 */
-	@Override
-	public <S extends T> List<S> findAll(Example<S> example) {
-		return findAll(example, Sort.unsorted());
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findOne(org.springframework.data.domain.Example)
-	 */
 	@Override
-	public <S extends T> Optional<S> findOne(Example<S> example) {
+	public <S extends T> Page<S> findAll(Example<S> example, Pageable pageable) {
 
-		Assert.notNull(example, "Sample must not be null!");
+		Assert.notNull(example, "Sample must not be null");
+		Assert.notNull(pageable, "Pageable must not be null");
 
 		Query query = new Query(new Criteria().alike(example)) //
-				.collation(entityInformation.getCollation());
+				.collation(entityInformation.getCollation()).with(pageable); //
+		getReadPreference().ifPresent(query::withReadPreference);
 
-		return Optional
-				.ofNullable(mongoOperations.findOne(query, example.getProbeType(), entityInformation.getCollectionName()));
+		List<S> list = mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName());
+
+		return PageableExecutionUtils.getPage(list, pageable, () -> mongoOperations
+				.count(Query.of(query).limit(-1).skip(-1), example.getProbeType(), entityInformation.getCollectionName()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#count(org.springframework.data.domain.Example)
-	 */
 	@Override
 	public <S extends T> long count(Example<S> example) {
 
-		Assert.notNull(example, "Sample must not be null!");
+		Assert.notNull(example, "Sample must not be null");
 
 		Query query = new Query(new Criteria().alike(example)) //
 				.collation(entityInformation.getCollation());
+		getReadPreference().ifPresent(query::withReadPreference);
 
 		return mongoOperations.count(query, example.getProbeType(), entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#exists(org.springframework.data.domain.Example)
-	 */
 	@Override
 	public <S extends T> boolean exists(Example<S> example) {
 
-		Assert.notNull(example, "Sample must not be null!");
+		Assert.notNull(example, "Sample must not be null");
 
 		Query query = new Query(new Criteria().alike(example)) //
 				.collation(entityInformation.getCollation());
+		getReadPreference().ifPresent(query::withReadPreference);
 
 		return mongoOperations.exists(query, example.getProbeType(), entityInformation.getCollectionName());
 	}
 
+	@Override
+	public <S extends T, R> R findBy(Example<S> example,
+			Function<org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery<S>, R> queryFunction) {
+
+		Assert.notNull(example, "Sample must not be null");
+		Assert.notNull(queryFunction, "Query function must not be null");
+
+		return queryFunction.apply(new FluentQueryByExample<>(example, example.getProbeType()));
+	}
+
+	// -------------------------------------------------------------------------
+	// Utility methods
+	// -------------------------------------------------------------------------
+
+	/**
+	 * Configures a custom {@link CrudMethodMetadata} to be used to detect {@link ReadPreference}s and query hints to be
+	 * applied to queries.
+	 *
+	 * @param crudMethodMetadata
+	 * @since 4.2
+	 */
+	void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
+		this.crudMethodMetadata = crudMethodMetadata;
+	}
+
+	private Optional<ReadPreference> getReadPreference() {
+
+		if (crudMethodMetadata == null) {
+			return Optional.empty();
+		}
+
+		return crudMethodMetadata.getReadPreference();
+	}
+
 	private Query getIdQuery(Object id) {
 		return new Query(getIdCriteria(id));
 	}
@@ -371,12 +382,131 @@ private Criteria getIdCriteria(Object id) {
 		return where(entityInformation.getIdAttribute()).is(id);
 	}
 
+	private Query getIdQuery(Iterable<? extends ID> ids) {
+
+		Query query = new Query(new Criteria(entityInformation.getIdAttribute()).in(toCollection(ids)));
+		getReadPreference().ifPresent(query::withReadPreference);
+		return query;
+	}
+
+	private static <E> Collection<E> toCollection(Iterable<E> ids) {
+		return ids instanceof Collection<E> collection ? collection
+				: StreamUtils.createStreamFromIterator(ids.iterator()).collect(Collectors.toList());
+	}
+
 	private List<T> findAll(@Nullable Query query) {
 
 		if (query == null) {
 			return Collections.emptyList();
 		}
 
+		getReadPreference().ifPresent(query::withReadPreference);
 		return mongoOperations.find(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
 	}
+
+	/**
+	 * {@link org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery} using {@link Example}.
+	 *
+	 * @author Mark Paluch
+	 * @since 3.3
+	 */
+	class FluentQueryByExample<S, T> extends FetchableFluentQuerySupport<Example<S>, T> {
+
+		FluentQueryByExample(Example<S> example, Class<T> resultType) {
+			this(example, Sort.unsorted(), 0, resultType, Collections.emptyList());
+		}
+
+		FluentQueryByExample(Example<S> example, Sort sort, int limit, Class<T> resultType, List<String> fieldsToInclude) {
+			super(example, sort, limit, resultType, fieldsToInclude);
+		}
+
+		@Override
+		protected <R> FluentQueryByExample<S, R> create(Example<S> predicate, Sort sort, int limit, Class<R> resultType,
+				List<String> fieldsToInclude) {
+			return new FluentQueryByExample<>(predicate, sort, limit, resultType, fieldsToInclude);
+		}
+
+		@Override
+		public @Nullable T oneValue() {
+			return createQuery().oneValue();
+		}
+
+		@Override
+		public @Nullable T firstValue() {
+			return createQuery().firstValue();
+		}
+
+		@Override
+		public List<T> all() {
+			return createQuery().all();
+		}
+
+		@Override
+		public Window<T> scroll(ScrollPosition scrollPosition) {
+			return createQuery().scroll(scrollPosition);
+		}
+
+		@Override
+		public Page<T> page(Pageable pageable) {
+
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			List<T> list = createQuery(q -> q.with(pageable)).all();
+
+			return PageableExecutionUtils.getPage(list, pageable, this::count);
+		}
+
+		@Override
+		public Slice<T> slice(Pageable pageable) {
+
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			List<T> resultList = createQuery(q -> SliceUtils.limitResult(q, pageable).with(pageable.getSort())).all();
+
+			return SliceUtils.sliceResult(resultList, pageable);
+		}
+
+		@Override
+		public Stream<T> stream() {
+			return createQuery().stream();
+		}
+
+		@Override
+		public long count() {
+			return createQuery().count();
+		}
+
+		@Override
+		public boolean exists() {
+			return createQuery().exists();
+		}
+
+		private ExecutableFindOperation.TerminatingFind<T> createQuery() {
+			return createQuery(UnaryOperator.identity());
+		}
+
+		private ExecutableFindOperation.TerminatingFind<T> createQuery(UnaryOperator<Query> queryCustomizer) {
+
+			Query query = new Query(new Criteria().alike(getPredicate())) //
+					.collation(entityInformation.getCollation());
+
+			if (getSort().isSorted()) {
+				query.with(getSort());
+			}
+
+			query.limit(getLimit());
+
+			if (!getFieldsToInclude().isEmpty()) {
+				query.fields().include(getFieldsToInclude());
+			}
+
+			getReadPreference().ifPresent(query::withReadPreference);
+
+			query = queryCustomizer.apply(query);
+
+			return mongoOperations.query(getPredicate().getProbeType()).inCollection(entityInformation.getCollectionName())
+					.as(getResultType()).matching(query);
+		}
+
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java
index eec5c2c154..7e4a3aa665 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,29 +17,42 @@
 
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
-import lombok.NonNull;
-import lombok.RequiredArgsConstructor;
+import org.springframework.data.mongodb.repository.util.SliceUtils;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.function.UnaryOperator;
 
+import org.jspecify.annotations.Nullable;
 import org.reactivestreams.Publisher;
+
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.ReactiveFindOperation;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
-import org.springframework.data.util.StreamUtils;
-import org.springframework.data.util.Streamable;
+import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.util.Assert;
 
+import com.mongodb.ReadPreference;
 import com.mongodb.client.result.DeleteResult;
 
 /**
@@ -49,376 +62,399 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Ruben J Garcia
+ * @author Jens Schauder
+ * @author Clément Petit
+ * @author Kirill Egorov
  * @since 2.0
  */
-@RequiredArgsConstructor
 public class SimpleReactiveMongoRepository<T, ID extends Serializable> implements ReactiveMongoRepository<T, ID> {
 
-	private final @NonNull MongoEntityInformation<T, ID> entityInformation;
-	private final @NonNull ReactiveMongoOperations mongoOperations;
+	private @Nullable CrudMethodMetadata crudMethodMetadata;
+	private final MongoEntityInformation<T, ID> entityInformation;
+	private final ReactiveMongoOperations mongoOperations;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(java.lang.Object)
+	/**
+	 * Creates a new {@link SimpleReactiveMongoRepository} for the given {@link MongoEntityInformation} and
+	 * {@link MongoTemplate}.
+	 *
+	 * @param entityInformation must not be {@literal null}.
+	 * @param mongoOperations must not be {@literal null}.
 	 */
-	@Override
-	public Mono<T> findById(ID id) {
+	public SimpleReactiveMongoRepository(MongoEntityInformation<T, ID> entityInformation,
+			ReactiveMongoOperations mongoOperations) {
 
-		Assert.notNull(id, "The given id must not be null!");
+		Assert.notNull(entityInformation, "EntityInformation must not be null");
+		Assert.notNull(mongoOperations, "MongoOperations must not be null");
 
-		return mongoOperations.findById(id, entityInformation.getJavaType(), entityInformation.getCollectionName());
+		this.entityInformation = entityInformation;
+		this.mongoOperations = mongoOperations;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(org.reactivestreams.Publisher)
-	 */
+	// -------------------------------------------------------------------------
+	// Methods from ReactiveCrudRepository
+	// -------------------------------------------------------------------------
+
 	@Override
-	public Mono<T> findById(Publisher<ID> publisher) {
+	public <S extends T> Mono<S> save(S entity) {
 
-		Assert.notNull(publisher, "The given id must not be null!");
+		Assert.notNull(entity, "Entity must not be null");
 
-		return Mono.from(publisher).flatMap(
-				id -> mongoOperations.findById(id, entityInformation.getJavaType(), entityInformation.getCollectionName()));
+		if (entityInformation.isNew(entity)) {
+			return mongoOperations.insert(entity, entityInformation.getCollectionName());
+		}
+
+		return mongoOperations.save(entity, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#findOne(org.springframework.data.domain.Example)
-	 */
 	@Override
-	public <S extends T> Mono<S> findOne(Example<S> example) {
+	public <S extends T> Flux<S> saveAll(Iterable<S> entities) {
 
-		Assert.notNull(example, "Sample must not be null!");
+		Assert.notNull(entities, "The given Iterable of entities must not be null");
 
-		Query query = new Query(new Criteria().alike(example)) //
-				.collation(entityInformation.getCollation()) //
-				.limit(2);
+		List<S> source = toList(entities);
+		return source.stream().allMatch(entityInformation::isNew) ? //
+				insert(source) : concatMapSequentially(source, this::save);
+	}
 
-		return mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName()).buffer(2)
-				.map(vals -> {
+	@Override
+	public <S extends T> Flux<S> saveAll(Publisher<S> publisher) {
 
-					if (vals.size() > 1) {
-						throw new IncorrectResultSizeDataAccessException(1);
-					}
-					return vals.iterator().next();
-				}).next();
+		Assert.notNull(publisher, "The given Publisher of entities must not be null");
+
+		return concatMapSequentially(publisher, this::save);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(java.lang.Object)
-	 */
 	@Override
-	public Mono<Boolean> existsById(ID id) {
+	public Mono<T> findById(ID id) {
 
-		Assert.notNull(id, "The given id must not be null!");
+		Assert.notNull(id, "The given id must not be null");
 
-		return mongoOperations.exists(getIdQuery(id), entityInformation.getJavaType(),
-				entityInformation.getCollectionName());
+		Query query = getIdQuery(id);
+		getReadPreference().ifPresent(query::withReadPreference);
+		return mongoOperations.findOne(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(org.reactivestreams.Publisher)
-	 */
 	@Override
-	public Mono<Boolean> existsById(Publisher<ID> publisher) {
-
-		Assert.notNull(publisher, "The given id must not be null!");
+	public Mono<T> findById(Publisher<ID> publisher) {
 
-		return Mono.from(publisher).flatMap(id -> mongoOperations.exists(getIdQuery(id), entityInformation.getJavaType(),
-				entityInformation.getCollectionName()));
+		Assert.notNull(publisher, "The given id must not be null");
+		Optional<ReadPreference> readPreference = getReadPreference();
 
+		return Mono.from(publisher).flatMap(id -> {
+			Query query = getIdQuery(id);
+			readPreference.ifPresent(query::withReadPreference);
+			return mongoOperations.findOne(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
+		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#exists(org.springframework.data.domain.Example)
-	 */
 	@Override
-	public <S extends T> Mono<Boolean> exists(Example<S> example) {
+	public Mono<Boolean> existsById(ID id) {
 
-		Assert.notNull(example, "Sample must not be null!");
+		Assert.notNull(id, "The given id must not be null");
 
-		Query query = new Query(new Criteria().alike(example)) //
-				.collation(entityInformation.getCollation());
+		Query query = getIdQuery(id);
+		getReadPreference().ifPresent(query::withReadPreference);
+		return mongoOperations.exists(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
+	}
 
-		return mongoOperations.exists(query, example.getProbeType(), entityInformation.getCollectionName());
+	@Override
+	public Mono<Boolean> existsById(Publisher<ID> publisher) {
+
+		Assert.notNull(publisher, "The given id must not be null");
+		Optional<ReadPreference> readPreference = getReadPreference();
+
+		return Mono.from(publisher).flatMap(id -> {
+			Query query = getIdQuery(id);
+			readPreference.ifPresent(query::withReadPreference);
+			return mongoOperations.exists(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
+		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveSortingRepository#findAll()
-	 */
 	@Override
 	public Flux<T> findAll() {
 		return findAll(new Query());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(java.lang.Iterable)
-	 */
 	@Override
 	public Flux<T> findAllById(Iterable<ID> ids) {
 
-		Assert.notNull(ids, "The given Iterable of Id's must not be null!");
+		Assert.notNull(ids, "The given Iterable of Id's must not be null");
 
-		return findAll(new Query(new Criteria(entityInformation.getIdAttribute())
-				.in(Streamable.of(ids).stream().collect(StreamUtils.toUnmodifiableList()))));
+		return findAll(getIdQuery(ids));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findAllById(org.reactivestreams.Publisher)
-	 */
 	@Override
 	public Flux<T> findAllById(Publisher<ID> ids) {
 
-		Assert.notNull(ids, "The given Publisher of Id's must not be null!");
+		Assert.notNull(ids, "The given Publisher of Id's must not be null");
 
-		return Flux.from(ids).buffer().flatMap(this::findAllById);
+		Optional<ReadPreference> readPreference = getReadPreference();
+		return Flux.from(ids).buffer().flatMapSequential(listOfIds -> {
+			Query query = getIdQuery(listOfIds);
+			readPreference.ifPresent(query::withReadPreference);
+			return mongoOperations.find(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
+		});
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveSortingRepository#findAll(org.springframework.data.domain.Sort)
-	 */
 	@Override
-	public Flux<T> findAll(Sort sort) {
-
-		Assert.notNull(sort, "Sort must not be null!");
+	public Mono<Long> count() {
 
-		return findAll(new Query().with(sort));
+		Query query = new Query();
+		getReadPreference().ifPresent(query::withReadPreference);
+		return mongoOperations.count(query, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Sort)
-	 */
 	@Override
-	public <S extends T> Flux<S> findAll(Example<S> example, Sort sort) {
+	public Mono<Void> deleteById(ID id) {
 
-		Assert.notNull(example, "Sample must not be null!");
-		Assert.notNull(sort, "Sort must not be null!");
+		Assert.notNull(id, "The given id must not be null");
 
-		Query query = new Query(new Criteria().alike(example)) //
-				.collation(entityInformation.getCollation()) //
-				.with(sort);
+		return deleteById(id, getReadPreference());
+	}
 
-		return mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName());
+	private Mono<Void> deleteById(ID id, Optional<ReadPreference> readPreference) {
+
+		Assert.notNull(id, "The given id must not be null");
+
+		Query query = getIdQuery(id);
+		readPreference.ifPresent(query::withReadPreference);
+		return mongoOperations.remove(query, entityInformation.getJavaType(), entityInformation.getCollectionName()).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#findAll(org.springframework.data.domain.Example)
-	 */
 	@Override
-	public <S extends T> Flux<S> findAll(Example<S> example) {
+	public Mono<Void> deleteById(Publisher<ID> publisher) {
 
-		Assert.notNull(example, "Example must not be null!");
+		Assert.notNull(publisher, "Id must not be null");
 
-		return findAll(example, Sort.unsorted());
+		Optional<ReadPreference> readPreference = getReadPreference();
+
+		return Mono.from(publisher).flatMap(id -> {
+			Query query = getIdQuery(id);
+			readPreference.ifPresent(query::withReadPreference);
+			return mongoOperations.remove(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
+		}).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#count()
-	 */
 	@Override
-	public Mono<Long> count() {
-		return mongoOperations.count(new Query(), entityInformation.getCollectionName());
+	public Mono<Void> delete(T entity) {
+
+		Assert.notNull(entity, "The given entity must not be null");
+
+		Mono<DeleteResult> remove = mongoOperations.remove(entity, entityInformation.getCollectionName());
+
+		if (entityInformation.isVersioned()) {
+
+			remove = remove.handle((deleteResult, sink) -> {
+
+				if (deleteResult.wasAcknowledged() && deleteResult.getDeletedCount() == 0) {
+					sink.error(new OptimisticLockingFailureException(String.format(
+							"The entity with id %s with version %s in %s cannot be deleted; Was it modified or deleted in the meantime",
+							entityInformation.getId(entity), entityInformation.getVersion(entity),
+							entityInformation.getCollectionName())));
+				} else {
+					sink.next(deleteResult);
+				}
+			});
+		}
+
+		return remove.then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ReactiveQueryByExampleExecutor#count(org.springframework.data.domain.Example)
-	 */
 	@Override
-	public <S extends T> Mono<Long> count(Example<S> example) {
+	public Mono<Void> deleteAllById(Iterable<? extends ID> ids) {
 
-		Assert.notNull(example, "Sample must not be null!");
+		Assert.notNull(ids, "The given Iterable of Id's must not be null");
 
-		Query query = new Query(new Criteria().alike(example)) //
-				.collation(entityInformation.getCollation());
+		return deleteAllById(ids, getReadPreference());
+	}
 
-		return mongoOperations.count(query, example.getProbeType(), entityInformation.getCollectionName());
+	@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
+	private Mono<Void> deleteAllById(Iterable<? extends ID> ids, Optional<ReadPreference> readPreference) {
+
+		Query query = getIdQuery(ids);
+		readPreference.ifPresent(query::withReadPreference);
+
+		return mongoOperations.remove(query, entityInformation.getJavaType(), entityInformation.getCollectionName()).then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#insert(java.lang.Object)
-	 */
 	@Override
-	public <S extends T> Mono<S> insert(S entity) {
+	public Mono<Void> deleteAll(Iterable<? extends T> entities) {
 
-		Assert.notNull(entity, "Entity must not be null!");
+		Assert.notNull(entities, "The given Iterable of entities must not be null");
 
-		return mongoOperations.insert(entity, entityInformation.getCollectionName());
+		Optional<ReadPreference> readPreference = getReadPreference();
+		return Flux.fromIterable(entities).map(entityInformation::getRequiredId).collectList()
+				.flatMap(ids -> deleteAllById(ids, readPreference));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#insert(java.lang.Iterable)
-	 */
 	@Override
-	public <S extends T> Flux<S> insert(Iterable<S> entities) {
+	public Mono<Void> deleteAll(Publisher<? extends T> entityStream) {
 
-		Assert.notNull(entities, "The given Iterable of entities must not be null!");
+		Assert.notNull(entityStream, "The given Publisher of entities must not be null");
 
-		List<S> source = Streamable.of(entities).stream().collect(StreamUtils.toUnmodifiableList());
+		Optional<ReadPreference> readPreference = getReadPreference();
+		return Flux.from(entityStream)//
+				.map(entityInformation::getRequiredId)//
+				.concatMap(id -> deleteById(id, readPreference))//
+				.then();
+	}
 
-		return source.isEmpty() ? Flux.empty() : Flux.from(mongoOperations.insertAll(source));
+	@Override
+	public Mono<Void> deleteAll() {
+		Query query = new Query();
+		getReadPreference().ifPresent(query::withReadPreference);
+		return mongoOperations.remove(query, entityInformation.getCollectionName()).then(Mono.empty());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.ReactiveMongoRepository#insert(org.reactivestreams.Publisher)
-	 */
+	// -------------------------------------------------------------------------
+	// Methods from ReactiveSortingRepository
+	// -------------------------------------------------------------------------
+
 	@Override
-	public <S extends T> Flux<S> insert(Publisher<S> entities) {
+	public Flux<T> findAll(Sort sort) {
 
-		Assert.notNull(entities, "The given Publisher of entities must not be null!");
+		Assert.notNull(sort, "Sort must not be null");
 
-		return Flux.from(entities).flatMap(entity -> mongoOperations.insert(entity, entityInformation.getCollectionName()));
+		return findAll(new Query().with(sort));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#save(java.lang.Object)
-	 */
-	@Override
-	public <S extends T> Mono<S> save(S entity) {
+	// -------------------------------------------------------------------------
+	// Methods from ReactiveMongoRepository
+	// -------------------------------------------------------------------------
 
-		Assert.notNull(entity, "Entity must not be null!");
+	@Override
+	public <S extends T> Mono<S> insert(S entity) {
 
-		if (entityInformation.isNew(entity)) {
-			return mongoOperations.insert(entity, entityInformation.getCollectionName());
-		}
+		Assert.notNull(entity, "Entity must not be null");
 
-		return mongoOperations.save(entity, entityInformation.getCollectionName());
+		return mongoOperations.insert(entity, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#saveAll(java.lang.Iterable)
-	 */
 	@Override
-	public <S extends T> Flux<S> saveAll(Iterable<S> entities) {
+	public <S extends T> Flux<S> insert(Iterable<S> entities) {
 
-		Assert.notNull(entities, "The given Iterable of entities must not be null!");
+		Assert.notNull(entities, "The given Iterable of entities must not be null");
 
-		Streamable<S> source = Streamable.of(entities);
+		return insert(toCollection(entities));
+	}
 
-		return source.stream().allMatch(entityInformation::isNew) ? //
-				mongoOperations.insert(source.stream().collect(Collectors.toList()), entityInformation.getCollectionName()) : //
-				Flux.fromIterable(entities).flatMap(this::save);
+	private <S extends T> Flux<S> insert(Collection<S> entities) {
+		return entities.isEmpty() ? Flux.empty() : mongoOperations.insert(entities, entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#saveAll(org.reactivestreams.Publisher)
-	 */
 	@Override
-	public <S extends T> Flux<S> saveAll(Publisher<S> entityStream) {
+	public <S extends T> Flux<S> insert(Publisher<S> entities) {
 
-		Assert.notNull(entityStream, "The given Publisher of entities must not be null!");
+		Assert.notNull(entities, "The given Publisher of entities must not be null");
 
-		return Flux.from(entityStream).flatMap(entity -> entityInformation.isNew(entity) ? //
-				mongoOperations.insert(entity, entityInformation.getCollectionName()).then(Mono.just(entity)) : //
-				mongoOperations.save(entity, entityInformation.getCollectionName()).then(Mono.just(entity)));
+		return Flux.from(entities).concatMap(this::insert);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(java.lang.Object)
-	 */
+	// -------------------------------------------------------------------------
+	// Methods from ReactiveMongoRepository
+	// -------------------------------------------------------------------------
+
 	@Override
-	public Mono<Void> deleteById(ID id) {
+	public <S extends T> Mono<S> findOne(Example<S> example) {
 
-		Assert.notNull(id, "The given id must not be null!");
+		Assert.notNull(example, "Sample must not be null");
 
-		return mongoOperations
-				.remove(getIdQuery(id), entityInformation.getJavaType(), entityInformation.getCollectionName()).then();
+		Query query = new Query(new Criteria().alike(example)) //
+				.collation(entityInformation.getCollation()) //
+				.limit(2);
+		getReadPreference().ifPresent(query::withReadPreference);
+
+		return mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName()).buffer(2)
+				.map(vals -> {
+
+					if (vals.size() > 1) {
+						throw new IncorrectResultSizeDataAccessException(1);
+					}
+					return vals.iterator().next();
+				}).next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteById(org.reactivestreams.Publisher)
-	 */
 	@Override
-	public Mono<Void> deleteById(Publisher<ID> publisher) {
+	public <S extends T> Flux<S> findAll(Example<S> example) {
 
-		Assert.notNull(publisher, "Id must not be null!");
+		Assert.notNull(example, "Example must not be null");
 
-		return Mono.from(publisher).flatMap(id -> mongoOperations.remove(getIdQuery(id), entityInformation.getJavaType(),
-				entityInformation.getCollectionName())).then();
+		return findAll(example, Sort.unsorted());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#delete(java.lang.Object)
-	 */
 	@Override
-	public Mono<Void> delete(T entity) {
+	public <S extends T> Flux<S> findAll(Example<S> example, Sort sort) {
 
-		Assert.notNull(entity, "The given entity must not be null!");
+		Assert.notNull(example, "Sample must not be null");
+		Assert.notNull(sort, "Sort must not be null");
 
-		Mono<DeleteResult> remove = mongoOperations.remove(entity, entityInformation.getCollectionName());
+		Query query = new Query(new Criteria().alike(example)) //
+				.collation(entityInformation.getCollation()) //
+				.with(sort);
+		getReadPreference().ifPresent(query::withReadPreference);
 
-		if (entityInformation.isVersioned()) {
+		return mongoOperations.find(query, example.getProbeType(), entityInformation.getCollectionName());
+	}
 
-			remove = remove.handle((deleteResult, sink) -> {
+	@Override
+	public <S extends T> Mono<Long> count(Example<S> example) {
 
-				if (deleteResult.wasAcknowledged() && deleteResult.getDeletedCount() == 0) {
-					sink.error(new OptimisticLockingFailureException(String.format(
-							"The entity with id %s with version %s in %s cannot be deleted! Was it modified or deleted in the meantime?",
-							entityInformation.getId(entity), entityInformation.getVersion(entity),
-							entityInformation.getCollectionName())));
-				} else {
-					sink.next(deleteResult);
-				}
-			});
-		}
+		Assert.notNull(example, "Sample must not be null");
 
-		return remove.then();
+		Query query = new Query(new Criteria().alike(example)) //
+				.collation(entityInformation.getCollation());
+		getReadPreference().ifPresent(query::withReadPreference);
+
+		return mongoOperations.count(query, example.getProbeType(), entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(java.lang.Iterable)
-	 */
 	@Override
-	public Mono<Void> deleteAll(Iterable<? extends T> entities) {
+	public <S extends T> Mono<Boolean> exists(Example<S> example) {
 
-		Assert.notNull(entities, "The given Iterable of entities must not be null!");
+		Assert.notNull(example, "Sample must not be null");
 
-		return Flux.fromIterable(entities).flatMap(this::delete).then();
+		Query query = new Query(new Criteria().alike(example)) //
+				.collation(entityInformation.getCollation());
+		getReadPreference().ifPresent(query::withReadPreference);
+
+		return mongoOperations.exists(query, example.getProbeType(), entityInformation.getCollectionName());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll(org.reactivestreams.Publisher)
-	 */
 	@Override
-	public Mono<Void> deleteAll(Publisher<? extends T> entityStream) {
+	public <S extends T, R, P extends Publisher<R>> P findBy(Example<S> example,
+			Function<FluentQuery.ReactiveFluentQuery<S>, P> queryFunction) {
 
-		Assert.notNull(entityStream, "The given Publisher of entities must not be null!");
+		Assert.notNull(example, "Sample must not be null");
+		Assert.notNull(queryFunction, "Query function must not be null");
 
-		return Flux.from(entityStream)//
-				.map(entityInformation::getRequiredId)//
-				.flatMap(this::deleteById)//
-				.then();
+		return queryFunction
+				.apply(new ReactiveFluentQueryByExample<>(example, example.getProbeType(), getReadPreference()));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.reactive.ReactiveCrudRepository#deleteAll()
+	/**
+	 * Configures a custom {@link CrudMethodMetadata} to be used to detect {@link ReadPreference}s and query hints to be
+	 * applied to queries.
+	 *
+	 * @param crudMethodMetadata
+	 * @since 4.2
 	 */
-	@Override
-	public Mono<Void> deleteAll() {
-		return mongoOperations.remove(new Query(), entityInformation.getCollectionName()).then(Mono.empty());
+	void setRepositoryMethodMetadata(CrudMethodMetadata crudMethodMetadata) {
+		this.crudMethodMetadata = crudMethodMetadata;
+	}
+
+	private Flux<T> findAll(Query query) {
+
+		getReadPreference().ifPresent(query::withReadPreference);
+		return mongoOperations.find(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
+	}
+
+	private Optional<ReadPreference> getReadPreference() {
+
+		if (crudMethodMetadata == null) {
+			return Optional.empty();
+		}
+
+		return crudMethodMetadata.getReadPreference();
 	}
 
 	private Query getIdQuery(Object id) {
@@ -429,8 +465,178 @@ private Criteria getIdCriteria(Object id) {
 		return where(entityInformation.getIdAttribute()).is(id);
 	}
 
-	private Flux<T> findAll(Query query) {
+	private Query getIdQuery(Iterable<? extends ID> ids) {
+		return new Query(where(entityInformation.getIdAttribute()).in(toCollection(ids)));
+	}
+
+	/**
+	 * Transform the elements emitted by this Flux into Publishers, then flatten these inner publishers into a single
+	 * Flux. The operation does not allow interleaving between performing the map operation for the first and second
+	 * source element guaranteeing the mapping operation completed before subscribing to its following inners, that will
+	 * then be subscribed to eagerly emitting elements in order of their source.
+	 *
+	 * <pre class="code">
+	 * Flux.just(first-element).flatMap(...)
+	 *     .concatWith(Flux.fromIterable(remaining-elements).flatMapSequential(...))
+	 * </pre>
+	 *
+	 * @param source the collection of elements to transform.
+	 * @param mapper the transformation {@link Function}. Must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @param <T> source type
+	 */
+	static <T> Flux<T> concatMapSequentially(List<T> source,
+			Function<? super T, ? extends Publisher<? extends T>> mapper) {
+
+		return switch (source.size()) {
+			case 0 -> Flux.empty();
+			case 1 -> Flux.just(source.get(0)).flatMap(mapper);
+			case 2 -> Flux.fromIterable(source).concatMap(mapper);
+			default -> {
+
+				Flux<T> first = Flux.just(source.get(0)).flatMap(mapper);
+				Flux<T> theRest = Flux.fromIterable(source.subList(1, source.size())).flatMapSequential(mapper);
+				yield first.concatWith(theRest);
+			}
+		};
+	}
+
+	static <T> Flux<T> concatMapSequentially(Publisher<T> publisher,
+			Function<? super T, ? extends Publisher<? extends T>> mapper) {
+
+		return Flux.from(publisher).switchOnFirst((signal, source) -> {
+
+			if (!signal.hasValue()) {
+				return source.concatMap(mapper);
+			}
+
+			Mono<T> firstCall = Mono.from(mapper.apply(signal.get()));
+			return firstCall.concatWith(source.skip(1).flatMapSequential(mapper));
+		});
+	}
+
+	private static <E> List<E> toList(Iterable<E> source) {
+
+		Collection<E> collection = toCollection(source);
+
+		if (collection instanceof List<E> list) {
+			return list;
+		}
+
+		return new ArrayList<>(collection);
+	}
+
+	private static <E> Collection<E> toCollection(Iterable<E> source) {
+
+		if (source instanceof Collection<E> collection) {
+			return collection;
+		}
+
+		List<E> list = new ArrayList<>();
+		source.forEach(list::add);
+
+		return list;
+	}
+
+	/**
+	 * {@link org.springframework.data.repository.query.FluentQuery.ReactiveFluentQuery} using {@link Example}.
+	 *
+	 * @author Mark Paluch
+	 * @since 3.3
+	 */
+	class ReactiveFluentQueryByExample<S, T> extends ReactiveFluentQuerySupport<Example<S>, T> {
+
+		private final Optional<ReadPreference> readPreference;
+
+		ReactiveFluentQueryByExample(Example<S> example, Class<T> resultType, Optional<ReadPreference> readPreference) {
+			this(example, Sort.unsorted(), 0, resultType, Collections.emptyList(), readPreference);
+		}
+
+		ReactiveFluentQueryByExample(Example<S> example, Sort sort, int limit, Class<T> resultType,
+				List<String> fieldsToInclude, Optional<ReadPreference> readPreference) {
+			super(example, sort, limit, resultType, fieldsToInclude);
+			this.readPreference = readPreference;
+		}
+
+		@Override
+		protected <R> ReactiveFluentQueryByExample<S, R> create(Example<S> predicate, Sort sort, int limit,
+				Class<R> resultType, List<String> fieldsToInclude) {
+			return new ReactiveFluentQueryByExample<>(predicate, sort, limit, resultType, fieldsToInclude, readPreference);
+		}
+
+		@Override
+		public Mono<T> one() {
+			return createQuery().one();
+		}
+
+		@Override
+		public Mono<T> first() {
+			return createQuery().first();
+		}
+
+		@Override
+		public Flux<T> all() {
+			return createQuery().all();
+		}
+
+		@Override
+		public Mono<Window<T>> scroll(ScrollPosition scrollPosition) {
+			return createQuery().scroll(scrollPosition);
+		}
+
+		@Override
+		public Mono<Page<T>> page(Pageable pageable) {
+
+			Assert.notNull(pageable, "Pageable must not be null");
+
+			Mono<List<T>> items = createQuery(q -> q.with(pageable)).all().collectList();
+
+			return items.flatMap(content -> ReactivePageableExecutionUtils.getPage(content, pageable, this.count()));
+		}
+
+		@Override
+		public Mono<Slice<T>> slice(Pageable pageable) {
+
+			return createQuery(q -> SliceUtils.limitResult(q, pageable).with(pageable.getSort())).all().collectList()
+					.map(it -> SliceUtils.sliceResult(it, pageable));
+		}
+
+		@Override
+		public Mono<Long> count() {
+			return createQuery().count();
+		}
+
+		@Override
+		public Mono<Boolean> exists() {
+			return createQuery().exists();
+		}
+
+		private ReactiveFindOperation.TerminatingFind<T> createQuery() {
+			return createQuery(UnaryOperator.identity());
+		}
+
+		private ReactiveFindOperation.TerminatingFind<T> createQuery(UnaryOperator<Query> queryCustomizer) {
+
+			Query query = new Query(new Criteria().alike(getPredicate())) //
+					.collation(entityInformation.getCollation());
+
+			if (getSort().isSorted()) {
+				query.with(getSort());
+			}
+
+			query.limit(getLimit());
+
+			if (!getFieldsToInclude().isEmpty()) {
+				query.fields().include(getFieldsToInclude());
+			}
+
+			readPreference.ifPresent(query::withReadPreference);
+
+			query = queryCustomizer.apply(query);
+
+			return mongoOperations.query(getPredicate().getProbeType()).inCollection(entityInformation.getCollectionName())
+					.as(getResultType()).matching(query);
+		}
 
-		return mongoOperations.find(query, entityInformation.getJavaType(), entityInformation.getCollectionName());
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java
index ef1ef06ada..24a9342ca1 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuery.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,38 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.ExecutableFindOperation;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.util.SliceUtils;
+import org.springframework.data.support.PageableExecutionUtils;
+
+import com.mysema.commons.lang.CloseableIterator;
+import com.mysema.commons.lang.EmptyCloseableIterator;
+import com.querydsl.core.Fetchable;
+import com.querydsl.core.QueryMetadata;
+import com.querydsl.core.QueryModifiers;
+import com.querydsl.core.QueryResults;
+import com.querydsl.core.types.Expression;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.core.types.Predicate;
+import org.springframework.lang.Contract;
 
 /**
  * Spring Data specific simple {@link com.querydsl.core.Fetchable} {@link com.querydsl.core.SimpleQuery Query}
@@ -25,7 +56,12 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-public class SpringDataMongodbQuery<T> extends QuerydslFetchableMongodbQuery<T, SpringDataMongodbQuery<T>> {
+public class SpringDataMongodbQuery<T> extends SpringDataMongodbQuerySupport<SpringDataMongodbQuery<T>>
+		implements Fetchable<T> {
+
+	private final MongoOperations mongoOperations;
+	private final Consumer<BasicQuery> queryCustomizer;
+	private final ExecutableFindOperation.FindWithQuery<T> find;
 
 	/**
 	 * Creates a new {@link SpringDataMongodbQuery}.
@@ -33,7 +69,7 @@ public class SpringDataMongodbQuery<T> extends QuerydslFetchableMongodbQuery<T,
 	 * @param operations must not be {@literal null}.
 	 * @param type must not be {@literal null}.
 	 */
-	public SpringDataMongodbQuery(final MongoOperations operations, final Class<? extends T> type) {
+	public SpringDataMongodbQuery(MongoOperations operations, Class<? extends T> type) {
 		this(operations, type, operations.getCollectionName(type));
 	}
 
@@ -44,9 +80,213 @@ public SpringDataMongodbQuery(final MongoOperations operations, final Class<? ex
 	 * @param type must not be {@literal null}.
 	 * @param collectionName must not be {@literal null} or empty.
 	 */
-	public SpringDataMongodbQuery(final MongoOperations operations, final Class<? extends T> type,
-			String collectionName) {
+	public SpringDataMongodbQuery(MongoOperations operations, Class<? extends T> type, String collectionName) {
+		this(operations, type, type, collectionName, it -> {});
+	}
+
+	/**
+	 * Creates a new {@link SpringDataMongodbQuery}.
+	 *
+	 * @param operations must not be {@literal null}.
+	 * @param domainType must not be {@literal null}.
+	 * @param resultType must not be {@literal null}.
+	 * @param collectionName must not be {@literal null} or empty.
+	 * @since 3.3
+	 */
+	SpringDataMongodbQuery(MongoOperations operations, Class<?> domainType, Class<? extends T> resultType,
+			String collectionName, Consumer<BasicQuery> queryCustomizer) {
+		super(new SpringDataMongodbSerializer(operations.getConverter()));
+
+		Class<T> resultType1 = (Class<T>) resultType;
+		this.mongoOperations = operations;
+		this.queryCustomizer = queryCustomizer;
+		this.find = mongoOperations.query(domainType).inCollection(collectionName).as(resultType1);
+	}
+
+	@Override
+	public CloseableIterator<T> iterate() {
+
+		try {
+			Stream<T> stream = stream();
+			Iterator<T> iterator = stream.iterator();
+
+			return new CloseableIterator<T>() {
+
+				@Override
+				public boolean hasNext() {
+					return iterator.hasNext();
+				}
+
+				@Override
+				public T next() {
+					return iterator.next();
+				}
+
+				@Override
+				public void remove() {
+					throw new UnsupportedOperationException("Cannot remove from iterator while streaming data.");
+				}
 
-		super(new SpringDataMongodbSerializer(operations.getConverter()), type, collectionName, operations);
+				@Override
+				public void close() {
+					stream.close();
+				}
+			};
+		} catch (RuntimeException e) {
+			return handleException(e, new EmptyCloseableIterator<>());
+		}
 	}
+
+	public Window<T> scroll(ScrollPosition scrollPosition) {
+
+		try {
+			return find.matching(createQuery()).scroll(scrollPosition);
+		} catch (RuntimeException e) {
+			return handleException(e, Window.from(Collections.emptyList(), value -> {
+				throw new UnsupportedOperationException();
+			}));
+		}
+	}
+
+	@Override
+	public Stream<T> stream() {
+
+		try {
+			return find.matching(createQuery()).stream();
+		} catch (RuntimeException e) {
+			return handleException(e, Stream.empty());
+		}
+	}
+
+	@Override
+	public List<T> fetch() {
+		try {
+			return find.matching(createQuery()).all();
+		} catch (RuntimeException e) {
+			return handleException(e, Collections.emptyList());
+		}
+	}
+
+	/**
+	 * Fetch a {@link Page}.
+	 *
+	 * @param pageable
+	 * @return
+	 */
+	public Page<T> fetchPage(Pageable pageable) {
+
+		try {
+
+			List<T> content = find.matching(createQuery().with(pageable)).all();
+
+			return PageableExecutionUtils.getPage(content, pageable, this::fetchCount);
+		} catch (RuntimeException e) {
+			return handleException(e, new PageImpl<>(Collections.emptyList(), pageable, 0));
+		}
+	}
+
+	/**
+	 * Fetch a {@link Slice}.
+	 *
+	 * @param pageable defines range and sort of requested slice
+	 * @return new instance of {@link Slice} containing matching results within range.
+	 * @since 4.5
+	 */
+	public Slice<T> fetchSlice(Pageable pageable) {
+
+		List<T> content = find.matching(SliceUtils.limitResult(createQuery(), pageable).with(pageable.getSort())).all();
+
+		return SliceUtils.sliceResult(content, pageable);
+	}
+
+	@Override
+	public @Nullable T fetchFirst() {
+		try {
+			return find.matching(createQuery()).firstValue();
+		} catch (RuntimeException e) {
+			return handleException(e, null);
+		}
+	}
+
+	@Override
+	public @Nullable T fetchOne() {
+		try {
+			return find.matching(createQuery()).oneValue();
+		} catch (RuntimeException e) {
+			return handleException(e, null);
+		}
+	}
+
+	@Override
+	public QueryResults<T> fetchResults() {
+
+		long total = fetchCount();
+		return total > 0L ? new QueryResults<>(fetch(), getQueryMixin().getMetadata().getModifiers(), total)
+				: QueryResults.emptyResults();
+	}
+
+	@Override
+	public long fetchCount() {
+		try {
+			return find.matching(Query.of(createQuery()).skip(-1).limit(-1)).count();
+		} catch (RuntimeException e) {
+			return handleException(e, 0L);
+		}
+	}
+
+	protected org.springframework.data.mongodb.core.query.Query createQuery() {
+
+		QueryMetadata metadata = getQueryMixin().getMetadata();
+
+		return createQuery(createFilter(metadata), metadata.getProjection(), metadata.getModifiers(),
+				metadata.getOrderBy());
+	}
+
+	protected org.springframework.data.mongodb.core.query.Query createQuery(@Nullable Predicate filter,
+			@Nullable Expression<?> projection, QueryModifiers modifiers, List<OrderSpecifier<?>> orderBy) {
+
+		Document fields = createProjection(projection);
+		BasicQuery basicQuery = new BasicQuery(createQuery(filter), fields == null ? new Document() : fields);
+
+		Integer limit = modifiers.getLimitAsInteger();
+		Integer offset = modifiers.getOffsetAsInteger();
+
+		if (limit != null) {
+			basicQuery.limit(limit);
+		}
+		if (offset != null) {
+			basicQuery.skip(offset);
+		}
+		if (orderBy.size() > 0) {
+			basicQuery.setSortObject(createSort(orderBy));
+		}
+
+		queryCustomizer.accept(basicQuery);
+
+		return basicQuery;
+	}
+
+	/**
+	 * Fetch the list of ids matching a given condition.
+	 *
+	 * @param targetType must not be {@literal null}.
+	 * @param condition must not be {@literal null}.
+	 * @return empty {@link List} if none found.
+	 */
+	protected List<Object> getIds(Class<?> targetType, Predicate condition) {
+
+		Query query = createQuery(condition, null, QueryModifiers.EMPTY, Collections.emptyList());
+		return mongoOperations.findDistinct(query, FieldName.ID.name(), targetType, Object.class);
+	}
+
+	@Contract("_, !null -> !null")
+	private static <T> @Nullable T handleException(RuntimeException e, @Nullable T defaultValue) {
+
+		if (e.getClass().getName().endsWith("$NoResults")) {
+			return defaultValue;
+		}
+
+		throw e;
+	}
+
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuerySupport.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuerySupport.java
new file mode 100644
index 0000000000..64ea5f2384
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbQuerySupport.java
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2021-2025 the original author 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.repository.support;
+
+import java.util.List;
+
+import org.bson.Document;
+import org.bson.codecs.DocumentCodec;
+import org.bson.json.JsonMode;
+import org.bson.json.JsonWriterSettings;
+
+import com.mongodb.MongoClientSettings;
+import com.querydsl.core.support.QueryMixin;
+import com.querydsl.core.types.OrderSpecifier;
+import com.querydsl.mongodb.document.AbstractMongodbQuery;
+import com.querydsl.mongodb.document.MongodbDocumentSerializer;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+
+/**
+ * Support query type to augment Spring Data-specific {@link #toString} representations and
+ * {@link org.springframework.data.domain.Sort} creation.
+ *
+ * @author Mark Paluch
+ * @since 3.3
+ */
+abstract class SpringDataMongodbQuerySupport<Q extends SpringDataMongodbQuerySupport<Q>>
+		extends AbstractMongodbQuery<Q> {
+
+	private final QueryMixin<Q> superQueryMixin;
+
+	private static final JsonWriterSettings JSON_WRITER_SETTINGS = JsonWriterSettings.builder().outputMode(JsonMode.SHELL)
+			.build();
+
+	private final MongodbDocumentSerializer serializer;
+
+	@SuppressWarnings("unchecked")
+	SpringDataMongodbQuerySupport(MongodbDocumentSerializer serializer) {
+
+		super(serializer);
+		this.serializer = serializer;
+		this.superQueryMixin = super.getQueryMixin();
+	}
+
+	/**
+	 * Returns the {@literal Mongo Shell} representation of the query. <br />
+	 * The following query
+	 *
+	 * <pre class="code">
+	 *
+	 * where(p.lastname.eq("Matthews")).orderBy(p.firstname.asc()).offset(1).limit(5);
+	 * </pre>
+	 *
+	 * results in
+	 *
+	 * <pre class="code">
+	 *
+	 * find({"lastname" : "Matthews"}).sort({"firstname" : 1}).skip(1).limit(5)
+	 * </pre>
+	 *
+	 * Note that encoding to {@link String} may fail when using data types that cannot be encoded or DBRef's without an
+	 * identifier.
+	 *
+	 * @return never {@literal null}.
+	 */
+	@Override
+	public String toString() {
+
+		Document projection = createProjection(getQueryMixin().getMetadata().getProjection());
+		Document sort = createSort(getQueryMixin().getMetadata().getOrderBy());
+		DocumentCodec codec = new DocumentCodec(MongoClientSettings.getDefaultCodecRegistry());
+
+		StringBuilder sb = new StringBuilder("find(" + asDocument().toJson(JSON_WRITER_SETTINGS, codec));
+		if (projection != null && projection.isEmpty()) {
+			sb.append(", ").append(projection.toJson(JSON_WRITER_SETTINGS, codec));
+		}
+		sb.append(")");
+		if (!sort.isEmpty()) {
+			sb.append(".sort(").append(sort.toJson(JSON_WRITER_SETTINGS, codec)).append(")");
+		}
+		if (getQueryMixin().getMetadata().getModifiers().getOffset() != null) {
+			sb.append(".skip(").append(getQueryMixin().getMetadata().getModifiers().getOffset()).append(")");
+		}
+		if (getQueryMixin().getMetadata().getModifiers().getLimit() != null) {
+			sb.append(".limit(").append(getQueryMixin().getMetadata().getModifiers().getLimit()).append(")");
+		}
+		return sb.toString();
+	}
+
+	/**
+	 * Get the where definition as a Document instance
+	 *
+	 * @return
+	 */
+	public Document asDocument() {
+		return createQuery(getQueryMixin().getMetadata().getWhere());
+	}
+
+	/**
+	 * Obtain the {@literal Mongo Shell} json query representation.
+	 *
+	 * @return never {@literal null}.
+	 */
+	public String toJson() {
+		return toJson(JSON_WRITER_SETTINGS);
+	}
+
+	/**
+	 * Obtain the json query representation applying given {@link JsonWriterSettings settings}.
+	 *
+	 * @param settings must not be {@literal null}.
+	 * @return never {@literal null}.
+	 */
+	public String toJson(JsonWriterSettings settings) {
+		return asDocument().toJson(settings);
+	}
+
+	/**
+	 * Compute the sort {@link Document} from the given list of {@link OrderSpecifier order specifiers}.
+	 *
+	 * @param orderSpecifiers can be {@literal null}.
+	 * @return an empty {@link Document} if predicate is {@literal null}.
+	 * @see MongodbDocumentSerializer#toSort(List)
+	 */
+	protected Document createSort(List<OrderSpecifier<?>> orderSpecifiers) {
+		return serializer.toSort(orderSpecifiers);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
index c55cf93d1a..756d04d0c2 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,20 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
-import java.util.Collections;
-import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import java.util.regex.Pattern;
 
 import org.bson.Document;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.lang.Nullable;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -39,6 +40,7 @@
 import com.querydsl.core.types.PathMetadata;
 import com.querydsl.core.types.PathType;
 import com.querydsl.mongodb.MongodbSerializer;
+import com.querydsl.mongodb.document.MongodbDocumentSerializer;
 
 /**
  * Custom {@link MongodbSerializer} to take mapping information into account when building keys for constraints.
@@ -47,19 +49,11 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
+@NullUnmarked
 class SpringDataMongodbSerializer extends MongodbDocumentSerializer {
 
-	private static final String ID_KEY = "_id";
-	private static final Set<PathType> PATH_TYPES;
-
-	static {
-
-		Set<PathType> pathTypes = new HashSet<>();
-		pathTypes.add(PathType.VARIABLE);
-		pathTypes.add(PathType.PROPERTY);
-
-		PATH_TYPES = Collections.unmodifiableSet(pathTypes);
-	}
+	private static final String ID_KEY = FieldName.ID.name();
+	private static final Set<PathType> PATH_TYPES = Set.of(PathType.VARIABLE, PathType.PROPERTY);
 
 	private final MongoConverter converter;
 	private final MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
@@ -72,17 +66,13 @@ class SpringDataMongodbSerializer extends MongodbDocumentSerializer {
 	 */
 	public SpringDataMongodbSerializer(MongoConverter converter) {
 
-		Assert.notNull(converter, "MongoConverter must not be null!");
+		Assert.notNull(converter, "MongoConverter must not be null");
 
 		this.mappingContext = converter.getMappingContext();
 		this.converter = converter;
 		this.mapper = new QueryMapper(converter);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.mongodb.MongodbSerializer#visit(com.querydsl.core.types.Constant, java.lang.Void)
-	 */
 	@Override
 	public Object visit(Constant<?> expr, Void context) {
 
@@ -93,10 +83,6 @@ public Object visit(Constant<?> expr, Void context) {
 		return converter.convertToMongoType(expr.getConstant());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.mongodb.MongodbSerializer#getKeyForPath(com.querydsl.core.types.Path, com.querydsl.core.types.PathMetadata)
-	 */
 	@Override
 	protected String getKeyForPath(Path<?> expr, PathMetadata metadata) {
 
@@ -111,85 +97,102 @@ protected String getKeyForPath(Path<?> expr, PathMetadata metadata) {
 		return property == null ? super.getKeyForPath(expr, metadata) : property.getFieldName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see  org.springframework.data.mongodb.repository.support.MongodbSerializer#asDocument(java.lang.String, java.lang.Object)
-	 */
 	@Override
 	protected Document asDocument(@Nullable String key, @Nullable Object value) {
 
-		value = value instanceof Optional ? ((Optional) value).orElse(null) : value;
+		value = value instanceof Optional<?> optional ? optional.orElse(null) : value;
 
 		return super.asDocument(key, value instanceof Pattern ? value : converter.convertToMongoType(value));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.mongodb.MongodbSerializer#isReference(com.querydsl.core.types.Path)
-	 */
 	@Override
 	protected boolean isReference(@Nullable Path<?> path) {
 
 		MongoPersistentProperty property = getPropertyForPotentialDbRef(path);
-		return property == null ? false : property.isAssociation();
+		return property != null && property.isAssociation();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.mongodb.MongodbSerializer#asReference(java.lang.Object)
-	 */
 	@Override
 	protected DBRef asReference(@Nullable Object constant) {
 		return asReference(constant, null);
 	}
 
-	protected DBRef asReference(Object constant, Path<?> path) {
+	protected DBRef asReference(Object constant, @Nullable Path<?> path) {
 		return converter.toDBRef(constant, getPropertyForPotentialDbRef(path));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.mongodb.MongodbSerializer#asDBKey(com.querydsl.core.types.Operation, int)
-	 */
 	@Override
 	protected String asDBKey(@Nullable Operation<?> expr, int index) {
 
 		Expression<?> arg = expr.getArg(index);
 		String key = super.asDBKey(expr, index);
 
-		if (!(arg instanceof Path)) {
+		if (!(arg instanceof Path<?> path)) {
 			return key;
 		}
 
-		Path<?> path = (Path<?>) arg;
-
 		if (!isReference(path)) {
 			return key;
 		}
 
 		MongoPersistentProperty property = getPropertyFor(path);
 
-		return property.isIdProperty() ? key.replaceAll("." + ID_KEY + "$", "") : key;
+		return property != null && property.getOwner().isIdProperty(property) ? key.replaceAll("." + ID_KEY + "$", "")
+				: key;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see com.querydsl.mongodb.MongodbSerializer#convert(com.querydsl.core.types.Path, com.querydsl.core.types.Constant)
-	 */
-	protected Object convert(@Nullable Path<?> path, @Nullable Constant<?> constant) {
+	@Override
+	protected boolean isId(Path<?> arg) {
+		MongoPersistentProperty propertyFor = getPropertyFor(arg);
+		return propertyFor == null ? super.isId(arg) : propertyFor.getOwner().isIdProperty(propertyFor);
+	}
+
+	@Override
+	protected @Nullable Object convert(@Nullable Path<?> path, @Nullable Constant<?> constant) {
+
+		if (constant == null) {
+			return null;
+		}
 
 		if (!isReference(path)) {
-			return super.convert(path, constant);
+
+			MongoPersistentProperty property = getPropertyFor(path);
+			if (property == null) {
+				return super.convert(path, constant);
+			}
+
+			if (property.getOwner().isIdProperty(property)) {
+				return mapper.convertId(constant.getConstant(), property.getFieldType());
+			}
+
+			if (property.hasExplicitWriteTarget()) {
+				return converter.convertToMongoType(constant.getConstant(), TypeInformation.of(property.getFieldType()));
+			}
+
+			return converter.convertToMongoType(constant.getConstant());
 		}
 
 		MongoPersistentProperty property = getPropertyFor(path);
 
-		return property.isIdProperty() ? asReference(constant.getConstant(), path.getMetadata().getParent())
-				: asReference(constant.getConstant(), path);
+		if (property != null) {
+			if (property.isDocumentReference()) {
+				return converter.toDocumentPointer(constant.getConstant(), property).getPointer();
+			}
+
+			if (property.getOwner().isIdProperty(property)) {
+
+				MongoPersistentProperty propertyForPotentialDbRef = getPropertyForPotentialDbRef(path);
+				if (propertyForPotentialDbRef != null && propertyForPotentialDbRef.isDocumentReference()) {
+					return converter.toDocumentPointer(constant.getConstant(), propertyForPotentialDbRef).getPointer();
+				}
+				return asReference(constant.getConstant(), path.getMetadata().getParent());
+			}
+		}
+
+		return asReference(constant.getConstant(), path);
 	}
 
-	@Nullable
-	private MongoPersistentProperty getPropertyFor(Path<?> path) {
+	private @Nullable MongoPersistentProperty getPropertyFor(Path<?> path) {
 
 		Path<?> parent = path.getMetadata().getParent();
 
@@ -209,7 +212,8 @@ private MongoPersistentProperty getPropertyFor(Path<?> path) {
 	 * @param path
 	 * @return
 	 */
-	private MongoPersistentProperty getPropertyForPotentialDbRef(Path<?> path) {
+	@Nullable
+	private MongoPersistentProperty getPropertyForPotentialDbRef(@Nullable Path<?> path) {
 
 		if (path == null) {
 			return null;
@@ -218,7 +222,8 @@ private MongoPersistentProperty getPropertyForPotentialDbRef(Path<?> path) {
 		MongoPersistentProperty property = getPropertyFor(path);
 		PathMetadata metadata = path.getMetadata();
 
-		if (property != null && property.isIdProperty() && metadata != null && metadata.getParent() != null) {
+		if (property != null && property.getOwner().isIdProperty(property) && metadata != null
+				&& metadata.getParent() != null) {
 			return getPropertyFor(metadata.getParent());
 		}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java
index 1d0b8beeba..42cd5a0b18 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/package-info.java
@@ -1,6 +1,6 @@
 /**
  * Support infrastructure for query derivation of MongoDB specific repositories.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.repository.support;
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/util/SliceUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/util/SliceUtils.java
new file mode 100644
index 0000000000..b570687cb5
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/util/SliceUtils.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2025 the original author 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.repository.util;
+
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
+import org.springframework.data.mongodb.core.query.Query;
+
+/**
+ * Utility methods for {@link Slice} handling.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ * @since 4.5
+ */
+public class SliceUtils {
+
+	/**
+	 * Creates a {@link Slice} given {@link Pageable} and {@link List} of results.
+	 *
+	 * @param <T> the element type.
+	 * @param resultList the source list holding the result of the request. If the result list contains more elements
+	 *          (indicating a next slice is available) it is trimmed to the {@link Pageable#getPageSize() page size}.
+	 * @param pageable the source pageable.
+	 * @return new instance of {@link Slice}.
+	 */
+	public static <T> Slice<T> sliceResult(List<T> resultList, Pageable pageable) {
+
+		boolean hasNext = resultList.size() > pageable.getPageSize();
+
+		if (hasNext) {
+			resultList = resultList.subList(0, pageable.getPageSize());
+		}
+
+		return new SliceImpl<>(resultList, pageable, hasNext);
+	}
+
+	/**
+	 * Customize query for {@link #sliceResult sliced result} retrieval. If {@link Pageable#isPaged() paged} the
+	 * {@link Query#limit(int) limit} is set to {@code pagesize + 1} in order to determine if more data is available.
+	 *
+	 * @param query the source query
+	 * @param pageable paging to apply.
+	 * @return new instance of {@link Query} if either {@link Pageable#isPaged() paged}, the source query otherwise.
+	 */
+	public static Query limitResult(Query query, Pageable pageable) {
+
+		if (pageable.isUnpaged()) {
+			return query;
+		}
+
+		Query target = Query.of(query);
+		target.skip(pageable.getOffset());
+		target.limit(pageable.getPageSize() + 1);
+
+		return target;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/BsonUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/BsonUtils.java
index c7dc4da370..dc51da84ed 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/BsonUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/BsonUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,21 +15,69 @@
  */
 package org.springframework.data.mongodb.util;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.StringJoiner;
+import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.stream.StreamSupport;
 
+import org.bson.AbstractBsonWriter;
+import org.bson.BSONObject;
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonBoolean;
+import org.bson.BsonContextType;
+import org.bson.BsonDateTime;
+import org.bson.BsonDbPointer;
+import org.bson.BsonDecimal128;
+import org.bson.BsonDouble;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+import org.bson.BsonJavaScript;
+import org.bson.BsonNull;
+import org.bson.BsonObjectId;
+import org.bson.BsonReader;
+import org.bson.BsonRegularExpression;
+import org.bson.BsonString;
+import org.bson.BsonSymbol;
+import org.bson.BsonTimestamp;
+import org.bson.BsonUndefined;
 import org.bson.BsonValue;
+import org.bson.BsonWriter;
+import org.bson.BsonWriterSettings;
 import org.bson.Document;
+import org.bson.codecs.Codec;
+import org.bson.codecs.DecoderContext;
+import org.bson.codecs.DocumentCodec;
+import org.bson.codecs.EncoderContext;
+import org.bson.codecs.configuration.CodecConfigurationException;
+import org.bson.codecs.configuration.CodecRegistries;
+import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.conversions.Bson;
 import org.bson.json.JsonParseException;
-
+import org.bson.types.Binary;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.CodecRegistryProvider;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.core.mapping.FieldName.Type;
+import org.springframework.data.mongodb.core.query.CriteriaDefinition.Placeholder;
+import org.springframework.lang.Contract;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
@@ -39,39 +87,232 @@
 import com.mongodb.MongoClientSettings;
 
 /**
+ * Internal API for operations on {@link Bson} elements that can be either {@link Document} or {@link DBObject}.
+ *
  * @author Christoph Strobl
  * @author Mark Paluch
  * @since 2.0
  */
 public class BsonUtils {
 
+	/**
+	 * The empty document (immutable). This document is serializable.
+	 *
+	 * @since 3.2.5
+	 */
+	public static final Document EMPTY_DOCUMENT = new EmptyDocument();
+
+	private static final CodecRegistry JSON_CODEC_REGISTRY = CodecRegistries.fromRegistries(
+			MongoClientSettings.getDefaultCodecRegistry(), CodecRegistries.fromCodecs(new PlaceholderCodec()));
+
 	@SuppressWarnings("unchecked")
-	@Nullable
-	public static <T> T get(Bson bson, String key) {
+	@Contract("null, _ -> null")
+	public static <T> @Nullable T get(@Nullable Bson bson, String key) {
 		return (T) asMap(bson).get(key);
 	}
 
-	public static Map<String, Object> asMap(Bson bson) {
-		if (bson instanceof Document) {
-			return (Document) bson;
+	/**
+	 * Return the {@link Bson} object as {@link Map}. Depending on the input type, the return value can be either a casted
+	 * version of {@code bson} or a converted (detached from the original value).
+	 *
+	 * @param bson
+	 * @return
+	 */
+	public static Map<String, Object> asMap(@Nullable Bson bson) {
+		return asMap(bson, MongoClientSettings.getDefaultCodecRegistry());
+	}
+
+	/**
+	 * Return the {@link Bson} object as {@link Map}. Depending on the input type, the return value can be either a casted
+	 * version of {@code bson} or a converted (detached from the original value) using the given {@link CodecRegistry} to
+	 * obtain {@link org.bson.codecs.Codec codecs} that might be required for conversion.
+	 *
+	 * @param bson can be {@literal null}.
+	 * @param codecRegistry must not be {@literal null}.
+	 * @return never {@literal null}. Returns an empty {@link Map} if input {@link Bson} is {@literal null}.
+	 * @since 4.0
+	 */
+	public static Map<String, Object> asMap(@Nullable Bson bson, CodecRegistry codecRegistry) {
+
+		if (bson == null) {
+			return Collections.emptyMap();
+		}
+
+		if (bson instanceof Document document) {
+			return document;
+		}
+		if (bson instanceof BasicDBObject dbo) {
+			return dbo;
+		}
+		if (bson instanceof DBObject dbo) {
+			return dbo.toMap();
+		}
+
+		return new Document(bson.toBsonDocument(Document.class, codecRegistry));
+	}
+
+	/**
+	 * Return the {@link Bson} object as {@link Document}. Depending on the input type, the return value can be either a
+	 * casted version of {@code bson} or a converted (detached from the original value).
+	 *
+	 * @param bson
+	 * @return
+	 * @since 3.2.5
+	 */
+	public static Document asDocument(@Nullable Bson bson) {
+		return asDocument(bson, MongoClientSettings.getDefaultCodecRegistry());
+	}
+
+	/**
+	 * Return the {@link Bson} object as {@link Document}. Depending on the input type, the return value can be either a
+	 * casted version of {@code bson} or a converted (detached from the original value) using the given
+	 * {@link CodecRegistry} to obtain {@link org.bson.codecs.Codec codecs} that might be required for conversion.
+	 *
+	 * @param bson
+	 * @param codecRegistry must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 4.0
+	 */
+	public static Document asDocument(@Nullable Bson bson, CodecRegistry codecRegistry) {
+
+		Map<String, Object> map = asMap(bson, codecRegistry);
+
+		if (map instanceof Document document) {
+			return document;
+		}
+
+		return new Document(map);
+	}
+
+	/**
+	 * Return the {@link Bson} object as mutable {@link Document} containing all entries from {@link Bson}.
+	 *
+	 * @param bson
+	 * @return a mutable {@link Document} containing all entries from {@link Bson}.
+	 * @since 3.2.5
+	 */
+	public static Document asMutableDocument(Bson bson) {
+
+		if (bson instanceof EmptyDocument) {
+			bson = new Document(asDocument(bson));
+		}
+
+		if (bson instanceof Document document) {
+			return document;
 		}
-		if (bson instanceof BasicDBObject) {
-			return ((BasicDBObject) bson);
+
+		Map<String, Object> map = asMap(bson);
+
+		if (map instanceof Document document) {
+			return document;
 		}
-		throw new IllegalArgumentException("o_O what's that? Cannot read values from " + bson.getClass());
+
+		return new Document(map);
 	}
 
 	public static void addToMap(Bson bson, String key, @Nullable Object value) {
 
-		if (bson instanceof Document) {
-			((Document) bson).put(key, value);
+		if (bson instanceof Document document) {
+
+			document.put(key, value);
+			return;
+		}
+		if (bson instanceof BSONObject bsonObject) {
+
+			bsonObject.put(key, value);
+			return;
+		}
+
+		throw new IllegalArgumentException(String.format(
+				"Cannot add key/value pair to %s; as map given Bson must be a Document or BSONObject", bson.getClass()));
+	}
+
+	/**
+	 * Add all entries from the given {@literal source} {@link Map} to the {@literal target}.
+	 *
+	 * @param target must not be {@literal null}.
+	 * @param source must not be {@literal null}.
+	 * @since 3.2
+	 */
+	public static void addAllToMap(Bson target, Map<String, ?> source) {
+
+		if (target instanceof Document document) {
+
+			document.putAll(source);
+			return;
+		}
+
+		if (target instanceof BSONObject bsonObject) {
+
+			bsonObject.putAll(source);
+			return;
+		}
+
+		throw new IllegalArgumentException(
+				String.format("Cannot add all to %s; Given Bson must be a Document or BSONObject.", target.getClass()));
+	}
+
+	/**
+	 * Check if a given entry (key/value pair) is present in the given {@link Bson}.
+	 *
+	 * @param bson must not be {@literal null}.
+	 * @param key must not be {@literal null}.
+	 * @param value can be {@literal null}.
+	 * @return {@literal true} if (key/value pair) is present.
+	 * @since 3.2
+	 */
+	public static boolean contains(Bson bson, String key, @Nullable Object value) {
+
+		if (bson instanceof Document document) {
+			return document.containsKey(key) && ObjectUtils.nullSafeEquals(document.get(key), value);
+		}
+		if (bson instanceof BSONObject bsonObject) {
+			return bsonObject.containsField(key) && ObjectUtils.nullSafeEquals(bsonObject.get(key), value);
+		}
+
+		Map<String, Object> map = asMap(bson);
+		return map.containsKey(key) && ObjectUtils.nullSafeEquals(map.get(key), value);
+	}
+
+	/**
+	 * Remove {@code _id : null} from the given {@link Bson} if present.
+	 *
+	 * @param bson must not be {@literal null}.
+	 * @since 3.2
+	 */
+	public static boolean removeNullId(Bson bson) {
+
+		if (!contains(bson, FieldName.ID.name(), null)) {
+			return false;
+		}
+
+		removeFrom(bson, FieldName.ID.name());
+		return true;
+	}
+
+	/**
+	 * Remove the given {@literal key} from the {@link Bson} value.
+	 *
+	 * @param bson must not be {@literal null}.
+	 * @param key must not be {@literal null}.
+	 * @since 3.2
+	 */
+	static void removeFrom(Bson bson, String key) {
+
+		if (bson instanceof Document document) {
+
+			document.remove(key);
 			return;
 		}
-		if (bson instanceof DBObject) {
-			((DBObject) bson).put(key, value);
+
+		if (bson instanceof BSONObject bsonObject) {
+
+			bsonObject.removeField(key);
 			return;
 		}
-		throw new IllegalArgumentException("o_O what's that? Cannot add value to " + bson.getClass());
+
+		throw new IllegalArgumentException(
+				String.format("Cannot remove from %s given Bson must be a Document or BSONObject.", bson.getClass()));
 	}
 
 	/**
@@ -84,41 +325,129 @@ public static void addToMap(Bson bson, String key, @Nullable Object value) {
 	 */
 	public static Object toJavaType(BsonValue value) {
 
-		switch (value.getBsonType()) {
-			case INT32:
-				return value.asInt32().getValue();
-			case INT64:
-				return value.asInt64().getValue();
-			case STRING:
-				return value.asString().getValue();
-			case DECIMAL128:
-				return value.asDecimal128().doubleValue();
-			case DOUBLE:
-				return value.asDouble().getValue();
-			case BOOLEAN:
-				return value.asBoolean().getValue();
-			case OBJECT_ID:
-				return value.asObjectId().getValue();
-			case DB_POINTER:
-				return new DBRef(value.asDBPointer().getNamespace(), value.asDBPointer().getId());
-			case BINARY:
-				return value.asBinary().getData();
-			case DATE_TIME:
-				return new Date(value.asDateTime().getValue());
-			case SYMBOL:
-				return value.asSymbol().getSymbol();
-			case ARRAY:
-				return value.asArray().toArray();
-			case DOCUMENT:
-				return Document.parse(value.asDocument().toJson());
-			default:
-				return value;
+		return switch (value.getBsonType()) {
+			case INT32 -> value.asInt32().getValue();
+			case INT64 -> value.asInt64().getValue();
+			case STRING -> value.asString().getValue();
+			case DECIMAL128 -> value.asDecimal128().doubleValue();
+			case DOUBLE -> value.asDouble().getValue();
+			case BOOLEAN -> value.asBoolean().getValue();
+			case OBJECT_ID -> value.asObjectId().getValue();
+			case DB_POINTER -> new DBRef(value.asDBPointer().getNamespace(), value.asDBPointer().getId());
+			case BINARY -> {
+
+				BsonBinary binary = value.asBinary();
+				if (binary.getType() != BsonBinarySubType.VECTOR.getValue()) {
+					yield binary.getData();
+				}
+				yield value.asBinary().asVector();
+			}
+			case DATE_TIME -> new Date(value.asDateTime().getValue());
+			case SYMBOL -> value.asSymbol().getSymbol();
+			case ARRAY -> value.asArray().toArray();
+			case DOCUMENT -> Document.parse(value.asDocument().toJson());
+
+			default -> value;
+		};
+	}
+
+	/**
+	 * Convert a given simple value (eg. {@link String}, {@link Long}) to its corresponding {@link BsonValue}.
+	 *
+	 * @param source must not be {@literal null}.
+	 * @return the corresponding {@link BsonValue} representation.
+	 * @throws IllegalArgumentException if {@literal source} does not correspond to a {@link BsonValue} type.
+	 * @since 3.0
+	 */
+	public static BsonValue simpleToBsonValue(@Nullable Object source) {
+		return simpleToBsonValue(source, MongoClientSettings.getDefaultCodecRegistry());
+	}
+
+	/**
+	 * Convert a given simple value (eg. {@link String}, {@link Long}) to its corresponding {@link BsonValue}.
+	 *
+	 * @param source can be {@literal null}.
+	 * @param codecRegistry The {@link CodecRegistry} used as a fallback to convert types using native {@link Codec}. Must
+	 *          not be {@literal null}.
+	 * @return the corresponding {@link BsonValue} representation.
+	 * @throws IllegalArgumentException if {@literal source} does not correspond to a {@link BsonValue} type.
+	 * @since 4.2
+	 */
+	@SuppressWarnings("unchecked")
+	@Contract("null, _ -> !null")
+	public static BsonValue simpleToBsonValue(@Nullable Object source, CodecRegistry codecRegistry) {
+
+		if(source == null) {
+			return BsonNull.VALUE;
+		}
+
+		if (source instanceof BsonValue bsonValue) {
+			return bsonValue;
+		}
+
+		if (source instanceof ObjectId objectId) {
+			return new BsonObjectId(objectId);
+		}
+
+		if (source instanceof String stringValue) {
+			return new BsonString(stringValue);
+		}
+
+		if (source instanceof Double doubleValue) {
+			return new BsonDouble(doubleValue);
+		}
+
+		if (source instanceof Integer integerValue) {
+			return new BsonInt32(integerValue);
+		}
+
+		if (source instanceof Long longValue) {
+			return new BsonInt64(longValue);
+		}
+
+		if (source instanceof byte[] byteArray) {
+			return new BsonBinary(byteArray);
+		}
+
+		if (source instanceof Boolean booleanValue) {
+			return new BsonBoolean(booleanValue);
+		}
+
+		if (source instanceof Float floatValue) {
+			return new BsonDouble(floatValue);
+		}
+
+		if (source instanceof Binary binary) {
+			return new BsonBinary(binary.getType(), binary.getData());
+		}
+
+		if (source instanceof Date date) {
+			new BsonDateTime(date.getTime());
+		}
+
+		try {
+
+			Object value = source;
+			if (ClassUtils.isPrimitiveArray(source.getClass())) {
+				value = CollectionUtils.arrayToList(source);
+			}
+
+			Codec codec = codecRegistry.get(value.getClass());
+			BsonCapturingWriter writer = new BsonCapturingWriter(value.getClass());
+			codec.encode(writer, value,
+					ObjectUtils.isArray(value) || value instanceof Collection<?> ? EncoderContext.builder().build() : null);
+			Object captured = writer.getCapturedValue();
+			return captured instanceof BsonValue bv ? bv : BsonNull.VALUE;
+
+		} catch (CodecConfigurationException e) {
+			throw new IllegalArgumentException(
+					String.format("Unable to convert %s to BsonValue.", source != null ? source.getClass().getName() : "null"));
 		}
 	}
 
 	/**
 	 * Merge the given {@link Document documents} into on in the given order. Keys contained within multiple documents are
-	 * overwritten by their follow ups.
+	 * overwritten by their follow-ups.
 	 *
 	 * @param documents must not be {@literal null}. Can be empty.
 	 * @return the document containing all key value pairs.
@@ -147,7 +476,7 @@ public static Document merge(Document... documents) {
 	 */
 	public static Document toDocumentOrElse(String source, Function<String, Document> orElse) {
 
-		if (StringUtils.trimLeadingWhitespace(source).startsWith("{")) {
+		if (source.stripLeading().startsWith("{")) {
 			return Document.parse(source);
 		}
 
@@ -161,8 +490,7 @@ public static Document toDocumentOrElse(String source, Function<String, Document
 	 * @return
 	 * @since 2.2.1
 	 */
-	@Nullable
-	public static String toJson(@Nullable Document source) {
+	public static @Nullable String toJson(@Nullable Document source) {
 
 		if (source == null) {
 			return null;
@@ -175,29 +503,344 @@ public static String toJson(@Nullable Document source) {
 		}
 	}
 
-	@Nullable
-	private static String toJson(@Nullable Object value) {
+	/**
+	 * Check if a given String looks like {@link Document#parse(String) parsable} json.
+	 *
+	 * @param value can be {@literal null}.
+	 * @return {@literal true} if the given value looks like a json document.
+	 * @since 3.0
+	 */
+	@Contract("null -> false")
+	public static boolean isJsonDocument(@Nullable String value) {
+
+		if (!StringUtils.hasText(value)) {
+			return false;
+		}
+
+		String potentialJson = value.trim();
+		return potentialJson.startsWith("{") && potentialJson.endsWith("}");
+	}
+
+	/**
+	 * Check if a given String looks like {@link org.bson.BsonArray#parse(String) parsable} json array.
+	 *
+	 * @param value can be {@literal null}.
+	 * @return {@literal true} if the given value looks like a json array.
+	 * @since 3.0
+	 */
+	@Contract("null -> false")
+	public static boolean isJsonArray(@Nullable String value) {
+		return StringUtils.hasText(value) && (value.startsWith("[") && value.endsWith("]"));
+	}
+
+	/**
+	 * Parse the given {@literal json} to {@link Document} applying transformations as specified by a potentially given
+	 * {@link org.bson.codecs.Codec}.
+	 *
+	 * @param json must not be {@literal null}.
+	 * @param codecRegistryProvider can be {@literal null}. In that case the default {@link DocumentCodec} is used.
+	 * @return never {@literal null}.
+	 * @throws IllegalArgumentException if the required argument is {@literal null}.
+	 * @since 3.0
+	 */
+	public static Document parse(String json, @Nullable CodecRegistryProvider codecRegistryProvider) {
+
+		Assert.notNull(json, "Json must not be null");
+
+		if (codecRegistryProvider == null) {
+			return Document.parse(json);
+		}
+
+		return Document.parse(json, codecRegistryProvider.getCodecFor(Document.class)
+				.orElseGet(() -> new DocumentCodec(codecRegistryProvider.getCodecRegistry())));
+	}
+
+	/**
+	 * Resolve the value for a given key. If the given {@link Bson} value contains the key the value is immediately
+	 * returned. If not and the key contains a path using the dot ({@code .}) notation it will try to resolve the path by
+	 * inspecting the individual parts. If one of the intermediate ones is {@literal null} or cannot be inspected further
+	 * (wrong) type, {@literal null} is returned.
+	 *
+	 * @param bson the source to inspect. Must not be {@literal null}.
+	 * @param key the key to lookup. Must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @since 3.0.8
+	 */
+	public static @Nullable Object resolveValue(Bson bson, String key) {
+		return resolveValue(asMap(bson), key);
+	}
+
+	/**
+	 * Resolve the value for a given {@link FieldName field name}. If the given name is a {@link Type#KEY} the value is
+	 * obtained from the target {@link Bson} immediately. If the given fieldName is a {@link Type#PATH} maybe using the
+	 * dot ({@code .}) notation it will try to resolve the path by inspecting the individual parts. If one of the
+	 * intermediate ones is {@literal null} or cannot be inspected further (wrong) type, {@literal null} is returned.
+	 *
+	 * @param bson the source to inspect. Must not be {@literal null}.
+	 * @param fieldName the name to lookup. Must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @since 4.2
+	 */
+	public static @Nullable Object resolveValue(Bson bson, FieldName fieldName) {
+		return resolveValue(asMap(bson), fieldName);
+	}
+
+	/**
+	 * Resolve the value for a given {@link FieldName field name}. If the given name is a {@link Type#KEY} the value is
+	 * obtained from the target {@link Bson} immediately. If the given fieldName is a {@link Type#PATH} maybe using the
+	 * dot ({@code .}) notation it will try to resolve the path by inspecting the individual parts. If one of the
+	 * intermediate ones is {@literal null} or cannot be inspected further (wrong) type, {@literal null} is returned.
+	 *
+	 * @param source the source to inspect. Must not be {@literal null}.
+	 * @param fieldName the key to lookup. Must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @since 4.2
+	 */
+	public static @Nullable Object resolveValue(Map<String, Object> source, FieldName fieldName) {
+
+		if (fieldName.isKey()) {
+			return source.get(fieldName.name());
+		}
+
+		String[] parts = fieldName.parts();
+
+		for (int i = 1; i < parts.length; i++) {
+
+			Object result = source.get(parts[i - 1]);
+
+			if (!(result instanceof Bson resultBson)) {
+				return null;
+			}
+
+			source = asMap(resultBson);
+		}
+
+		return source.get(parts[parts.length - 1]);
+	}
+
+	/**
+	 * Resolve the value for a given key. If the given {@link Map} value contains the key the value is immediately
+	 * returned. If not and the key contains a path using the dot ({@code .}) notation it will try to resolve the path by
+	 * inspecting the individual parts. If one of the intermediate ones is {@literal null} or cannot be inspected further
+	 * (wrong) type, {@literal null} is returned.
+	 *
+	 * @param source the source to inspect. Must not be {@literal null}.
+	 * @param key the key to lookup. Must not be {@literal null}.
+	 * @return can be {@literal null}.
+	 * @since 4.1
+	 */
+	public static @Nullable Object resolveValue(Map<String, Object> source, String key) {
+
+		if (source.containsKey(key)) {
+			return source.get(key);
+		}
+
+		return resolveValue(source, FieldName.path(key));
+	}
+
+	public static boolean hasValue(Bson bson, FieldName fieldName) {
+
+		Map<String, Object> source = asMap(bson);
+		if (fieldName.isKey()) {
+			return source.containsKey(fieldName.name());
+		}
+
+		String[] parts = fieldName.parts();
+		Object result;
+
+		for (int i = 1; i < parts.length; i++) {
+
+			result = source.get(parts[i - 1]);
+			source = getAsMap(result);
+
+			if (source == null) {
+				return false;
+			}
+		}
+
+		return source.containsKey(parts[parts.length - 1]);
+
+	}
+
+	/**
+	 * Returns whether the underlying {@link Bson bson} has a value ({@literal null} or non-{@literal null}) for the given
+	 * {@code key}.
+	 *
+	 * @param bson the source to inspect. Must not be {@literal null}.
+	 * @param key the key to lookup. Must not be {@literal null}.
+	 * @return {@literal true} if no non {@literal null} value present.
+	 * @since 3.0.8
+	 */
+	public static boolean hasValue(Bson bson, String key) {
+		return hasValue(bson, FieldName.path(key));
+	}
+
+	/**
+	 * Returns the given source object as map, i.e. {@link Document}s and maps as is or {@literal null} otherwise.
+	 *
+	 * @param source can be {@literal null}.
+	 * @return can be {@literal null}.
+	 */
+	@SuppressWarnings("unchecked")
+	@Contract("null -> null")
+	private static @Nullable Map<String, Object> getAsMap(@Nullable Object source) {
+
+		if (source instanceof Document document) {
+			return document;
+		}
+
+		if (source instanceof BasicDBObject basicDBObject) {
+			return basicDBObject;
+		}
+
+		if (source instanceof DBObject dbObject) {
+			return dbObject.toMap();
+		}
+
+		if (source instanceof Map) {
+			return (Map<String, Object>) source;
+		}
+
+		return null;
+	}
+
+	/**
+	 * Returns the given source object as {@link Bson}, i.e. {@link Document}s and maps as is or throw
+	 * {@link IllegalArgumentException}.
+	 *
+	 * @param source
+	 * @return the converted/casted source object.
+	 * @throws IllegalArgumentException if {@code source} cannot be converted/cast to {@link Bson}.
+	 * @since 3.2.3
+	 * @see #supportsBson(Object)
+	 */
+	@SuppressWarnings("unchecked")
+	public static Bson asBson(Object source) {
+
+		if (source instanceof Document document) {
+			return document;
+		}
+
+		if (source instanceof BasicDBObject basicDBObject) {
+			return basicDBObject;
+		}
+
+		if (source instanceof DBObject dbObject) {
+			return new Document(dbObject.toMap());
+		}
+
+		if (source instanceof Map) {
+			return new Document((Map<String, Object>) source);
+		}
+
+		throw new IllegalArgumentException(String.format("Cannot convert %s to Bson", source));
+	}
+
+	/**
+	 * Returns the given source can be used/converted as {@link Bson}.
+	 *
+	 * @param source
+	 * @return {@literal true} if the given source can be converted to {@link Bson}.
+	 * @since 3.2.3
+	 */
+	public static boolean supportsBson(Object source) {
+		return source instanceof DBObject || source instanceof Map;
+	}
+
+	/**
+	 * Returns given object as {@link Collection}. Will return the {@link Collection} as is if the source is a
+	 * {@link Collection} already, will convert an array into a {@link Collection} or simply create a single element
+	 * collection for everything else.
+	 *
+	 * @param source must not be {@literal null}.
+	 * @return never {@literal null}.
+	 * @since 3.2
+	 */
+	public static Collection<?> asCollection(Object source) {
+
+		if (source instanceof Collection<?> collection) {
+			return collection;
+		}
+
+		return source.getClass().isArray() ? CollectionUtils.arrayToList(source) : Collections.singleton(source);
+	}
+
+	public static Document mapValues(Document source, BiFunction<String, Object, Object> valueMapper) {
+		return mapEntries(source, Entry::getKey, entry -> valueMapper.apply(entry.getKey(), entry.getValue()));
+	}
+
+	public static Document mapEntries(Document source, Function<Entry<String, Object>, String> keyMapper,
+			Function<Entry<String, Object>, Object> valueMapper) {
+
+		if (source.isEmpty()) {
+			return source;
+		}
+
+		Map<String, Object> target = new LinkedHashMap<>(source.size(), 1f);
+		for (Entry<String, Object> entry : source.entrySet()) {
+			target.put(keyMapper.apply(entry), valueMapper.apply(entry));
+		}
+		return new Document(target);
+	}
+
+	/**
+	 * Obtain a preconfigured {@link JsonWriter} allowing to render the given {@link Document} using a
+	 * {@link CodecRegistry} containing a {@link PlaceholderCodec}.
+	 *
+	 * @param document the source document. Must not be {@literal null}.
+	 * @return new instance of {@link JsonWriter}.
+	 * @since 5.0
+	 */
+	public static JsonWriter writeJson(Document document) {
+		return sink -> JSON_CODEC_REGISTRY.get(Document.class).encode(new SpringJsonWriter(sink), document,
+				EncoderContext.builder().build());
+	}
+
+	/**
+	 * Interface to pipe json rendering to a given sink.
+	 *
+	 * @since 5.0
+	 */
+	public interface JsonWriter {
+
+		/**
+		 * Write the json output to the given sink.
+		 *
+		 * @param sink the output target
+		 */
+		void to(StringBuffer sink);
+
+		default String toJsonString() {
+
+			StringBuffer buffer = new StringBuffer();
+			to(buffer);
+			return buffer.toString();
+		}
+	}
+
+	@Contract("null -> null")
+	private static @Nullable String toJson(@Nullable Object value) {
 
 		if (value == null) {
 			return null;
 		}
 
 		try {
-			return value instanceof Document
-					? ((Document) value).toJson(MongoClientSettings.getDefaultCodecRegistry().get(Document.class))
+			return value instanceof Document document
+					? document.toJson(MongoClientSettings.getDefaultCodecRegistry().get(Document.class))
 					: serializeValue(value);
 
 		} catch (Exception e) {
 
-			if (value instanceof Collection) {
-				return toString((Collection<?>) value);
-			} else if (value instanceof Map) {
-				return toString((Map<?, ?>) value);
+			if (value instanceof Collection<?> collection) {
+				return toString(collection);
+			} else if (value instanceof Map<?, ?> map) {
+				return toString(map);
 			} else if (ObjectUtils.isArray(value)) {
 				return toString(Arrays.asList(ObjectUtils.toObjectArray(value)));
 			}
 
-			throw e instanceof JsonParseException ? (JsonParseException) e : new JsonParseException(e);
+			throw e instanceof JsonParseException jsonParseException ? jsonParseException : new JsonParseException(e);
 		}
 	}
 
@@ -213,8 +856,9 @@ private static String serializeValue(@Nullable Object value) {
 
 	private static String toString(Map<?, ?> source) {
 
+		// Avoid String.format for performance
 		return iterableToDelimitedString(source.entrySet(), "{ ", " }",
-				entry -> String.format("\"%s\" : %s", entry.getKey(), toJson(entry.getValue())));
+				entry -> "\"" + entry.getKey() + "\" : " + toJson(entry.getValue()));
 	}
 
 	private static String toString(Collection<?> source) {
@@ -230,4 +874,190 @@ private static <T> String iterableToDelimitedString(Iterable<T> source, String p
 
 		return joiner.toString();
 	}
+
+	static class BsonCapturingWriter extends AbstractBsonWriter {
+
+		private final List<BsonValue> values = new ArrayList<>(0);
+
+		public BsonCapturingWriter(Class<?> type) {
+			super(new BsonWriterSettings());
+
+			if (ClassUtils.isAssignable(Map.class, type)) {
+				setContext(new Context(null, BsonContextType.DOCUMENT));
+			} else if (ClassUtils.isAssignable(List.class, type) || type.isArray()) {
+				setContext(new Context(null, BsonContextType.ARRAY));
+			} else {
+				setContext(new Context(null, BsonContextType.DOCUMENT));
+			}
+		}
+
+		@Nullable
+		BsonValue getCapturedValue() {
+
+			if (values.isEmpty()) {
+				return null;
+			}
+			if (!getContext().getContextType().equals(BsonContextType.ARRAY)) {
+				return values.get(0);
+			}
+
+			return new BsonArray(values);
+		}
+
+		@Override
+		protected void doWriteStartDocument() {
+
+		}
+
+		@Override
+		protected void doWriteEndDocument() {
+
+		}
+
+		@Override
+		public void writeStartArray() {
+			setState(State.VALUE);
+		}
+
+		@Override
+		public void writeEndArray() {
+			setState(State.NAME);
+		}
+
+		@Override
+		protected void doWriteStartArray() {
+
+		}
+
+		@Override
+		protected void doWriteEndArray() {
+
+		}
+
+		@Override
+		protected void doWriteBinaryData(BsonBinary value) {
+			values.add(value);
+		}
+
+		@Override
+		protected void doWriteBoolean(boolean value) {
+			values.add(BsonBoolean.valueOf(value));
+		}
+
+		@Override
+		protected void doWriteDateTime(long value) {
+			values.add(new BsonDateTime(value));
+		}
+
+		@Override
+		protected void doWriteDBPointer(BsonDbPointer value) {
+			values.add(value);
+		}
+
+		@Override
+		protected void doWriteDouble(double value) {
+			values.add(new BsonDouble(value));
+		}
+
+		@Override
+		protected void doWriteInt32(int value) {
+			values.add(new BsonInt32(value));
+		}
+
+		@Override
+		protected void doWriteInt64(long value) {
+			values.add(new BsonInt64(value));
+		}
+
+		@Override
+		protected void doWriteDecimal128(Decimal128 value) {
+			values.add(new BsonDecimal128(value));
+		}
+
+		@Override
+		protected void doWriteJavaScript(String value) {
+			values.add(new BsonJavaScript(value));
+		}
+
+		@Override
+		protected void doWriteJavaScriptWithScope(String value) {
+			throw new UnsupportedOperationException("Cannot capture JavaScriptWith");
+		}
+
+		@Override
+		protected void doWriteMaxKey() {}
+
+		@Override
+		protected void doWriteMinKey() {}
+
+		@Override
+		protected void doWriteNull() {
+			values.add(new BsonNull());
+		}
+
+		@Override
+		protected void doWriteObjectId(ObjectId value) {
+			values.add(new BsonObjectId(value));
+		}
+
+		@Override
+		protected void doWriteRegularExpression(BsonRegularExpression value) {
+			values.add(value);
+		}
+
+		@Override
+		protected void doWriteString(String value) {
+			values.add(new BsonString(value));
+		}
+
+		@Override
+		protected void doWriteSymbol(String value) {
+			values.add(new BsonSymbol(value));
+		}
+
+		@Override
+		protected void doWriteTimestamp(BsonTimestamp value) {
+			values.add(value);
+		}
+
+		@Override
+		protected void doWriteUndefined() {
+			values.add(new BsonUndefined());
+		}
+
+		@Override
+		public void flush() {
+			values.clear();
+		}
+	}
+
+	/**
+	 * Internal {@link Codec} implementation to write
+	 * {@link org.springframework.data.mongodb.core.query.CriteriaDefinition.Placeholder placeholders}.
+	 *
+	 * @since 5.0
+	 * @author Christoph Strobl
+	 */
+	@NullUnmarked
+	static class PlaceholderCodec implements Codec<Placeholder> {
+
+		@Override
+		public Placeholder decode(BsonReader reader, DecoderContext decoderContext) {
+			return null;
+		}
+
+		@Override
+		public void encode(BsonWriter writer, Placeholder value, EncoderContext encoderContext) {
+			if (writer instanceof SpringJsonWriter sjw) {
+				sjw.writePlaceholder(value.toString());
+			} else {
+				writer.writeString(value.toString());
+			}
+		}
+
+		@Override
+		public Class<Placeholder> getEncoderClass() {
+			return Placeholder.class;
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DBObjectUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DBObjectUtils.java
index 5cdab3bdc7..48f2e9b84f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DBObjectUtils.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DBObjectUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,21 @@
  */
 package org.springframework.data.mongodb.util;
 
+import java.util.Arrays;
+
 import com.mongodb.BasicDBList;
 
 /**
  * @author Thomas Darimont
+ * @deprecated since 4.2.0
  */
+@Deprecated(since = "4.2.0", forRemoval = true)
 public class DBObjectUtils {
 
 	public static BasicDBList dbList(Object... items) {
 
 		BasicDBList list = new BasicDBList();
-		for (Object item : items) {
-			list.add(item);
-		}
+		list.addAll(Arrays.asList(items));
 		return list;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DotPath.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DotPath.java
new file mode 100644
index 0000000000..549c7ff720
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DotPath.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2021-2025 the original author 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.util;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.StringUtils;
+
+/**
+ * Value object representing a dot path.
+ *
+ * @author Mark Paluch
+ * @since 3.2
+ */
+public class DotPath {
+
+	private static final DotPath EMPTY = new DotPath("");
+
+	private final String path;
+
+	private DotPath(String path) {
+		this.path = path;
+	}
+
+	/**
+	 * Creates a new {@link DotPath} from {@code dotPath}.
+	 *
+	 * @param dotPath the dot path, can be empty or {@literal null}.
+	 * @return the {@link DotPath} representing {@code dotPath}.
+	 */
+	public static DotPath from(@Nullable String dotPath) {
+
+		if (StringUtils.hasLength(dotPath)) {
+			return new DotPath(dotPath);
+		}
+
+		return EMPTY;
+	}
+
+	/**
+	 * Returns an empty dotpath.
+	 *
+	 * @return an empty dotpath.
+	 */
+	public static DotPath empty() {
+		return EMPTY;
+	}
+
+	/**
+	 * Append a segment to the dotpath. If the dotpath is not empty, then segments are separated with a dot.
+	 *
+	 * @param segment the segment to append.
+	 * @return
+	 */
+	public DotPath append(String segment) {
+
+		if (isEmpty()) {
+			return new DotPath(segment);
+		}
+
+		return new DotPath(path + "." + segment);
+	}
+
+	/**
+	 * Returns whether this dotpath is empty.
+	 *
+	 * @return whether this dotpath is empty.
+	 */
+	public boolean isEmpty() {
+		return !StringUtils.hasLength(path);
+	}
+
+	@Override
+	public String toString() {
+		return path;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DurationUtil.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DurationUtil.java
new file mode 100644
index 0000000000..78eb59a461
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/DurationUtil.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2024-2025 the original author 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.util;
+
+import java.time.Duration;
+import java.util.function.Supplier;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.core.env.Environment;
+import org.springframework.data.expression.ValueEvaluationContext;
+import org.springframework.data.expression.ValueExpression;
+import org.springframework.data.expression.ValueExpressionParser;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.format.datetime.standard.DurationFormatterUtils;
+
+/**
+ * Helper to evaluate Duration from expressions.
+ *
+ * @author Christoph Strobl
+ * @since 4.4
+ */
+public class DurationUtil {
+
+	private static final ValueExpressionParser PARSER = ValueExpressionParser.create(SpelExpressionParser::new);
+
+	/**
+	 * Evaluates and potentially parses the given string representation into a {@link Duration} value.
+	 *
+	 * @param value the {@link String} representation of the duration to evaluate.
+	 * @param evaluationContext context supplier for property and expression language evaluation.
+	 * @return the evaluated duration.
+	 */
+	public static Duration evaluate(String value, ValueEvaluationContext evaluationContext) {
+
+		ValueExpression expression = PARSER.parse(value);
+		Object evaluatedTimeout = expression.evaluate(evaluationContext);
+
+		if (evaluatedTimeout == null) {
+			return Duration.ZERO;
+		}
+
+		if (evaluatedTimeout instanceof Duration duration) {
+			return duration;
+		}
+
+		return parse(evaluatedTimeout.toString());
+	}
+
+	/**
+	 * Evaluates and potentially parses the given string representation into a {@link Duration} value.
+	 *
+	 * @param value the {@link String} representation of the duration to evaluate.
+	 * @param evaluationContext context supplier for expression language evaluation.
+	 * @return the evaluated duration.
+	 */
+	public static Duration evaluate(String value, Supplier<EvaluationContext> evaluationContext) {
+
+		return evaluate(value, new ValueEvaluationContext() {
+			@Override
+			public Environment getEnvironment() {
+				throw new IllegalStateException();
+			}
+
+			@Override
+			public EvaluationContext getEvaluationContext() {
+				return evaluationContext.get();
+			}
+		});
+	}
+
+	/**
+	 *
+	 * @param duration duration string to parse.
+	 * @return parsed {@link Duration}.
+	 * @see DurationFormatterUtils
+	 */
+	public static Duration parse(String duration) {
+		return DurationFormatterUtils.detectAndParse(duration);
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/EmptyDocument.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/EmptyDocument.java
new file mode 100644
index 0000000000..23ea9409cc
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/EmptyDocument.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2021-2025 the original author 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.util;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.function.BiFunction;
+
+import org.bson.Document;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Empty variant of {@link Document}.
+ *
+ * @author Mark Paluch
+ */
+class EmptyDocument extends Document {
+
+	@Override
+	public Document append(String key, Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public Object put(String key, Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public Object remove(Object key) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void putAll(Map<? extends String, ?> map) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public void replaceAll(BiFunction<? super String, ? super Object, ?> function) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public boolean remove(Object key, Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public boolean replace(String key, Object oldValue, Object newValue) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public @Nullable Object replace(String key, Object value) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public Set<Entry<String, Object>> entrySet() {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public Collection<Object> values() {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public Set<String> keySet() {
+		return Collections.emptySet();
+	}
+
+	@Override
+	public void clear() {
+		throw new UnsupportedOperationException();
+	}
+
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoClientVersion.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoClientVersion.java
index 74f8f68e2c..fbbba59e8f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoClientVersion.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoClientVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,12 @@
  */
 package org.springframework.data.mongodb.util;
 
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.util.Version;
 import org.springframework.util.ClassUtils;
 
+import com.mongodb.internal.build.MongoDriverVersion;
+
 /**
  * {@link MongoClientVersion} holds information about the used mongo-java client and is used to distinguish between
  * different versions.
@@ -28,7 +32,8 @@
 public class MongoClientVersion {
 
 	private static final boolean SYNC_CLIENT_PRESENT = ClassUtils.isPresent("com.mongodb.MongoClient",
-			MongoClientVersion.class.getClassLoader());
+			MongoClientVersion.class.getClassLoader())
+			|| ClassUtils.isPresent("com.mongodb.client.MongoClient", MongoClientVersion.class.getClassLoader());
 
 	private static final boolean ASYNC_CLIENT_PRESENT = ClassUtils.isPresent("com.mongodb.async.client.MongoClient",
 			MongoClientVersion.class.getClassLoader());
@@ -36,31 +41,17 @@ public class MongoClientVersion {
 	private static final boolean REACTIVE_CLIENT_PRESENT = ClassUtils
 			.isPresent("com.mongodb.reactivestreams.client.MongoClient", MongoClientVersion.class.getClassLoader());
 
-	/**
-	 * @return {@literal true} if MongoDB Java driver version 3.0 or later is on classpath.
-	 * @deprecated since 2.1, which requires MongoDB Java driver 3.8. Returns {@literal true} by default.
-	 */
-	@Deprecated
-	public static boolean isMongo3Driver() {
-		return true;
-	}
+	private static final boolean IS_VERSION_5_OR_NEWER;
 
-	/**
-	 * @return {@literal true} if MongoDB Java driver version 3.4 or later is on classpath.
-	 * @since 1.10
-	 * @deprecated since 2.1, which requires MongoDB Java driver 3.8. Returns {@literal true} by default.
-	 */
-	@Deprecated
-	public static boolean isMongo34Driver() {
-		return true;
-	}
+	private static final Version CLIENT_VERSION;
 
-	/**
-	 * @return {@literal true} if MongoDB Java driver version 3.8 or later is on classpath.
-	 * @since 2.1
-	 */
-	public static boolean isMongo38Driver() {
-		return true;
+	static {
+
+		ClassLoader classLoader = MongoClientVersion.class.getClassLoader();
+		Version version = getMongoDbDriverVersion(classLoader);
+
+		CLIENT_VERSION = version;
+		IS_VERSION_5_OR_NEWER = CLIENT_VERSION.isGreaterThanOrEqualTo(Version.parse("5.0"));
 	}
 
 	/**
@@ -85,4 +76,38 @@ public static boolean isSyncClientPresent() {
 	public static boolean isReactiveClientPresent() {
 		return REACTIVE_CLIENT_PRESENT;
 	}
+
+	/**
+	 * @return {@literal true} if the MongoDB Java driver version is 5 or newer.
+	 * @since 4.3
+	 */
+	public static boolean isVersion5orNewer() {
+		return IS_VERSION_5_OR_NEWER;
+	}
+
+	private static Version getMongoDbDriverVersion(ClassLoader classLoader) {
+
+		Version version = getVersionFromPackage(classLoader);
+		return version == null ? guessDriverVersionFromClassPath(classLoader) : version;
+	}
+
+	private static @Nullable Version getVersionFromPackage(ClassLoader classLoader) {
+
+		if (ClassUtils.isPresent("com.mongodb.internal.build.MongoDriverVersion", classLoader)) {
+			try {
+				return Version.parse(MongoDriverVersion.VERSION);
+			} catch (IllegalArgumentException exception) {
+				// well not much we can do, right?
+			}
+		}
+		return null;
+	}
+
+	private static Version guessDriverVersionFromClassPath(ClassLoader classLoader) {
+
+		if (ClassUtils.isPresent("com.mongodb.internal.connection.StreamFactoryFactory", classLoader)) {
+			return Version.parse("5");
+		}
+		return Version.parse("4.11");
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java
index cabf3b7ee9..7fcc1383d5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/MongoDbErrorCodes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,20 @@
  */
 package org.springframework.data.mongodb.util;
 
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Map;
 
-import org.springframework.lang.Nullable;
+import com.mongodb.MongoException;
+
+import org.jspecify.annotations.Nullable;
 
 /**
- * {@link MongoDbErrorCodes} holds MongoDB specific error codes outlined in {@literal mongo/base/error_codes.err}.
+ * {@link MongoDbErrorCodes} holds MongoDB specific error codes outlined in {@literal mongo/base/error_codes.yml}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author SangHyuk Lee
  * @since 1.8
  */
 public final class MongoDbErrorCodes {
@@ -31,7 +36,7 @@ public final class MongoDbErrorCodes {
 	static HashMap<Integer, String> dataAccessResourceFailureCodes;
 	static HashMap<Integer, String> dataIntegrityViolationCodes;
 	static HashMap<Integer, String> duplicateKeyCodes;
-	static HashMap<Integer, String> invalidDataAccessApiUsageExeption;
+	static HashMap<Integer, String> invalidDataAccessApiUsageException;
 	static HashMap<Integer, String> permissionDeniedCodes;
 	static HashMap<Integer, String> clientSessionCodes;
 	static HashMap<Integer, String> transactionCodes;
@@ -68,37 +73,38 @@ public final class MongoDbErrorCodes {
 		duplicateKeyCodes.put(11000, "DuplicateKey");
 		duplicateKeyCodes.put(11001, "DuplicateKey");
 
-		invalidDataAccessApiUsageExeption = new HashMap<>(31, 1f);
-		invalidDataAccessApiUsageExeption.put(5, "GraphContainsCycle");
-		invalidDataAccessApiUsageExeption.put(9, "FailedToParse");
-		invalidDataAccessApiUsageExeption.put(14, "TypeMismatch");
-		invalidDataAccessApiUsageExeption.put(15, "Overflow");
-		invalidDataAccessApiUsageExeption.put(16, "InvalidLength");
-		invalidDataAccessApiUsageExeption.put(20, "IllegalOperation");
-		invalidDataAccessApiUsageExeption.put(21, "EmptyArrayOperation");
-		invalidDataAccessApiUsageExeption.put(22, "InvalidBSON");
-		invalidDataAccessApiUsageExeption.put(23, "AlreadyInitialized");
-		invalidDataAccessApiUsageExeption.put(29, "NonExistentPath");
-		invalidDataAccessApiUsageExeption.put(30, "InvalidPath");
-		invalidDataAccessApiUsageExeption.put(40, "ConflictingUpdateOperators");
-		invalidDataAccessApiUsageExeption.put(45, "UserDataInconsistent");
-		invalidDataAccessApiUsageExeption.put(52, "DollarPrefixedFieldName");
-		invalidDataAccessApiUsageExeption.put(53, "InvalidIdField");
-		invalidDataAccessApiUsageExeption.put(54, "NotSingleValueField");
-		invalidDataAccessApiUsageExeption.put(55, "InvalidDBRef");
-		invalidDataAccessApiUsageExeption.put(56, "EmptyFieldName");
-		invalidDataAccessApiUsageExeption.put(57, "DottedFieldName");
-		invalidDataAccessApiUsageExeption.put(59, "CommandNotFound");
-		invalidDataAccessApiUsageExeption.put(60, "DatabaseNotFound");
-		invalidDataAccessApiUsageExeption.put(61, "ShardKeyNotFound");
-		invalidDataAccessApiUsageExeption.put(62, "OplogOperationUnsupported");
-		invalidDataAccessApiUsageExeption.put(66, "ImmutableField");
-		invalidDataAccessApiUsageExeption.put(72, "InvalidOptions");
-		invalidDataAccessApiUsageExeption.put(115, "CommandNotSupported");
-		invalidDataAccessApiUsageExeption.put(116, "DocTooLargeForCapped");
-		invalidDataAccessApiUsageExeption.put(130, "SymbolNotFound");
-		invalidDataAccessApiUsageExeption.put(17280, "KeyTooLong");
-		invalidDataAccessApiUsageExeption.put(13334, "ShardKeyTooBig");
+		invalidDataAccessApiUsageException = new HashMap<>(31, 1f);
+		invalidDataAccessApiUsageException.put(5, "GraphContainsCycle");
+		invalidDataAccessApiUsageException.put(9, "FailedToParse");
+		invalidDataAccessApiUsageException.put(14, "TypeMismatch");
+		invalidDataAccessApiUsageException.put(15, "Overflow");
+		invalidDataAccessApiUsageException.put(16, "InvalidLength");
+		invalidDataAccessApiUsageException.put(20, "IllegalOperation");
+		invalidDataAccessApiUsageException.put(21, "EmptyArrayOperation");
+		invalidDataAccessApiUsageException.put(22, "InvalidBSON");
+		invalidDataAccessApiUsageException.put(23, "AlreadyInitialized");
+		invalidDataAccessApiUsageException.put(29, "NonExistentPath");
+		invalidDataAccessApiUsageException.put(30, "InvalidPath");
+		invalidDataAccessApiUsageException.put(40, "ConflictingUpdateOperators");
+		invalidDataAccessApiUsageException.put(45, "UserDataInconsistent");
+		invalidDataAccessApiUsageException.put(52, "DollarPrefixedFieldName");
+		invalidDataAccessApiUsageException.put(53, "InvalidIdField");
+		invalidDataAccessApiUsageException.put(54, "NotSingleValueField");
+		invalidDataAccessApiUsageException.put(55, "InvalidDBRef");
+		invalidDataAccessApiUsageException.put(56, "EmptyFieldName");
+		invalidDataAccessApiUsageException.put(57, "DottedFieldName");
+		invalidDataAccessApiUsageException.put(59, "CommandNotFound");
+		invalidDataAccessApiUsageException.put(60, "DatabaseNotFound");
+		invalidDataAccessApiUsageException.put(61, "ShardKeyNotFound");
+		invalidDataAccessApiUsageException.put(62, "OplogOperationUnsupported");
+		invalidDataAccessApiUsageException.put(66, "ImmutableField");
+		invalidDataAccessApiUsageException.put(72, "InvalidOptions");
+		invalidDataAccessApiUsageException.put(115, "CommandNotSupported");
+		invalidDataAccessApiUsageException.put(116, "DocTooLargeForCapped");
+		invalidDataAccessApiUsageException.put(10003, "CannotGrowDocumentInCappedNamespace");
+		invalidDataAccessApiUsageException.put(130, "SymbolNotFound");
+		invalidDataAccessApiUsageException.put(17280, "KeyTooLong");
+		invalidDataAccessApiUsageException.put(13334, "ShardKeyTooBig");
 
 		permissionDeniedCodes = new HashMap<>(8, 1f);
 		permissionDeniedCodes.put(11, "UserNotFound");
@@ -113,50 +119,127 @@ public final class MongoDbErrorCodes {
 		clientSessionCodes = new HashMap<>(4, 1f);
 		clientSessionCodes.put(206, "NoSuchSession");
 		clientSessionCodes.put(213, "DuplicateSession");
+		clientSessionCodes.put(217, "IncompleteTransactionHistory");
+		clientSessionCodes.put(225, "TransactionTooOld");
 		clientSessionCodes.put(228, "SessionTransferIncomplete");
+		clientSessionCodes.put(244, "TransactionAborted");
+		clientSessionCodes.put(251, "NoSuchTransaction");
+		clientSessionCodes.put(256, "TransactionCommitted");
+		clientSessionCodes.put(257, "TransactionToLarge");
+		clientSessionCodes.put(261, "TooManyLogicalSessions");
+		clientSessionCodes.put(263, "OperationNotSupportedInTransaction");
 		clientSessionCodes.put(264, "TooManyLogicalSessions");
 
-		transactionCodes = new HashMap<>(8, 1f);
-		transactionCodes.put(217, "IncompleteTransactionHistory");
-		transactionCodes.put(225, "TransactionTooOld");
-		transactionCodes.put(244, "TransactionAborted");
-		transactionCodes.put(251, "NoSuchTransaction");
-		transactionCodes.put(256, "TransactionCommitted");
-		transactionCodes.put(257, "TransactionToLarge");
-		transactionCodes.put(263, "OperationNotSupportedInTransaction");
-		transactionCodes.put(267, "PreparedTransactionInProgress");
-
-		errorCodes = new HashMap<>();
+		transactionCodes = new HashMap<>(0);
+
+ 		errorCodes = new HashMap<>(
+				dataAccessResourceFailureCodes.size() + dataIntegrityViolationCodes.size() + duplicateKeyCodes.size()
+						+ invalidDataAccessApiUsageException.size() + permissionDeniedCodes.size() + clientSessionCodes.size(),
+				1f);
 		errorCodes.putAll(dataAccessResourceFailureCodes);
 		errorCodes.putAll(dataIntegrityViolationCodes);
 		errorCodes.putAll(duplicateKeyCodes);
-		errorCodes.putAll(invalidDataAccessApiUsageExeption);
+		errorCodes.putAll(invalidDataAccessApiUsageException);
 		errorCodes.putAll(permissionDeniedCodes);
 		errorCodes.putAll(clientSessionCodes);
 	}
 
+	public static @Nullable String getErrorDescription(@Nullable Integer errorCode) {
+		return errorCode == null ? null : errorCodes.get(errorCode);
+	}
+
 	public static boolean isDataIntegrityViolationCode(@Nullable Integer errorCode) {
-		return errorCode == null ? false : dataIntegrityViolationCodes.containsKey(errorCode);
+		return errorCode != null && dataIntegrityViolationCodes.containsKey(errorCode);
+	}
+
+	/**
+	 * @param exception can be {@literal null}.
+	 * @return
+	 * @since 4.4
+	 */
+	public static boolean isDataIntegrityViolationError(Exception exception) {
+
+		if (exception instanceof MongoException me) {
+			return isDataIntegrityViolationCode(me.getCode());
+		}
+		return false;
 	}
 
 	public static boolean isDataAccessResourceFailureCode(@Nullable Integer errorCode) {
-		return errorCode == null ? false : dataAccessResourceFailureCodes.containsKey(errorCode);
+		return errorCode != null && dataAccessResourceFailureCodes.containsKey(errorCode);
+	}
+
+	/**
+	 * @param exception can be {@literal null}.
+	 * @return
+	 * @since 4.4
+	 */
+	public static boolean isDataAccessResourceError(Exception exception) {
+
+		if (exception instanceof MongoException me) {
+			return isDataAccessResourceFailureCode(me.getCode());
+		}
+		return false;
 	}
 
 	public static boolean isDuplicateKeyCode(@Nullable Integer errorCode) {
-		return errorCode == null ? false : duplicateKeyCodes.containsKey(errorCode);
+		return errorCode != null && duplicateKeyCodes.containsKey(errorCode);
+	}
+
+	/**
+	 * @param exception can be {@literal null}.
+	 * @return
+	 * @since 4.4
+	 */
+	public static boolean isDuplicateKeyError(Exception exception) {
+
+		if (exception instanceof MongoException me) {
+			return isDuplicateKeyCode(me.getCode());
+		}
+		return false;
+	}
+
+	/**
+	 * @param exception can be {@literal null}.
+	 * @return
+	 * @since 4.4
+	 */
+	public static boolean isDataDuplicateKeyError(Exception exception) {
+		return isDuplicateKeyError(exception);
 	}
 
 	public static boolean isPermissionDeniedCode(@Nullable Integer errorCode) {
-		return errorCode == null ? false : permissionDeniedCodes.containsKey(errorCode);
+		return errorCode != null && permissionDeniedCodes.containsKey(errorCode);
+	}
+
+	/**
+	 * @param exception can be {@literal null}.
+	 * @return
+	 * @since 4.4
+	 */
+	public static boolean isPermissionDeniedError(Exception exception) {
+
+		if (exception instanceof MongoException) {
+			return isPermissionDeniedCode(((MongoException) exception).getCode());
+		}
+		return false;
 	}
 
 	public static boolean isInvalidDataAccessApiUsageCode(@Nullable Integer errorCode) {
-		return errorCode == null ? false : invalidDataAccessApiUsageExeption.containsKey(errorCode);
+		return errorCode != null && invalidDataAccessApiUsageException.containsKey(errorCode);
 	}
 
-	public static String getErrorDescription(@Nullable Integer errorCode) {
-		return errorCode == null ? null : errorCodes.get(errorCode);
+	/**
+	 * @param exception can be {@literal null}.
+	 * @return
+	 * @since 4.4
+	 */
+	public static boolean isInvalidDataAccessApiUsageError(Exception exception) {
+
+		if (exception instanceof MongoException me) {
+			return isInvalidDataAccessApiUsageCode(me.getCode());
+		}
+		return false;
 	}
 
 	/**
@@ -167,7 +250,7 @@ public static String getErrorDescription(@Nullable Integer errorCode) {
 	 * @since 2.1
 	 */
 	public static boolean isClientSessionFailureCode(@Nullable Integer errorCode) {
-		return errorCode == null ? false : clientSessionCodes.containsKey(errorCode);
+		return errorCode != null && clientSessionCodes.containsKey(errorCode);
 	}
 
 	/**
@@ -178,6 +261,19 @@ public static boolean isClientSessionFailureCode(@Nullable Integer errorCode) {
 	 * @since 2.1
 	 */
 	public static boolean isTransactionFailureCode(@Nullable Integer errorCode) {
-		return errorCode == null ? false : transactionCodes.containsKey(errorCode);
+		return errorCode != null && transactionCodes.containsKey(errorCode);
+	}
+
+	/**
+	 * @param exception can be {@literal null}.
+	 * @return
+	 * @since 4.4
+	 */
+	public static boolean isClientSessionFailure(Exception exception) {
+
+		if (exception instanceof MongoException me) {
+			return isClientSessionFailureCode(me.getCode());
+		}
+		return false;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/RegexFlags.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/RegexFlags.java
new file mode 100644
index 0000000000..8b0f4b83ce
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/RegexFlags.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2021-2025 the original author 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.util;
+
+import java.util.regex.Pattern;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Utility to translate {@link Pattern#flags() regex flags} to MongoDB regex options and vice versa.
+ *
+ * @author Mark Paluch
+ * @since 3.3
+ */
+public abstract class RegexFlags {
+
+	private static final int[] FLAG_LOOKUP = new int[Character.MAX_VALUE];
+
+	static {
+		FLAG_LOOKUP['g'] = 256;
+		FLAG_LOOKUP['i'] = Pattern.CASE_INSENSITIVE;
+		FLAG_LOOKUP['m'] = Pattern.MULTILINE;
+		FLAG_LOOKUP['s'] = Pattern.DOTALL;
+		FLAG_LOOKUP['c'] = Pattern.CANON_EQ;
+		FLAG_LOOKUP['x'] = Pattern.COMMENTS;
+		FLAG_LOOKUP['d'] = Pattern.UNIX_LINES;
+		FLAG_LOOKUP['t'] = Pattern.LITERAL;
+		FLAG_LOOKUP['u'] = Pattern.UNICODE_CASE;
+	}
+
+	private RegexFlags() {
+
+	}
+
+	/**
+	 * Lookup the MongoDB specific options from given {@link Pattern#flags() flags}.
+	 *
+	 * @param flags the Regex flags to look up.
+	 * @return the options string. May be empty.
+	 */
+	public static String toRegexOptions(int flags) {
+
+		if (flags == 0) {
+			return "";
+		}
+
+		StringBuilder buf = new StringBuilder();
+
+		for (int i = 'a'; i < 'z'; i++) {
+
+			if (FLAG_LOOKUP[i] == 0) {
+				continue;
+			}
+
+			if ((flags & FLAG_LOOKUP[i]) > 0) {
+				buf.append((char) i);
+			}
+		}
+
+		return buf.toString();
+	}
+
+	/**
+	 * Lookup the MongoDB specific flags for a given regex option string.
+	 *
+	 * @param s the Regex option/flag to look up. Can be {@literal null}.
+	 * @return zero if given {@link String} is {@literal null} or empty.
+	 * @since 2.2
+	 */
+	public static int toRegexFlags(@Nullable String s) {
+
+		int flags = 0;
+
+		if (s == null) {
+			return flags;
+		}
+
+		for (char f : s.toLowerCase().toCharArray()) {
+			flags |= toRegexFlag(f);
+		}
+
+		return flags;
+	}
+
+	/**
+	 * Lookup the MongoDB specific flags for a given character.
+	 *
+	 * @param c the Regex option/flag to look up.
+	 * @return
+	 * @throws IllegalArgumentException for unknown flags
+	 * @since 2.2
+	 */
+	public static int toRegexFlag(char c) {
+
+		int flag = FLAG_LOOKUP[c];
+
+		if (flag == 0) {
+			throw new IllegalArgumentException(String.format("Unrecognized flag [%c]", c));
+		}
+
+		return flag;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/SpringJsonWriter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/SpringJsonWriter.java
new file mode 100644
index 0000000000..07eab92a01
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/SpringJsonWriter.java
@@ -0,0 +1,487 @@
+/*
+ * Copyright 2025 the original author 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.util;
+
+import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
+
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.util.Base64;
+
+import org.bson.BsonBinary;
+import org.bson.BsonDbPointer;
+import org.bson.BsonReader;
+import org.bson.BsonRegularExpression;
+import org.bson.BsonTimestamp;
+import org.bson.BsonWriter;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+import org.jspecify.annotations.NullUnmarked;
+import org.springframework.util.StringUtils;
+
+/**
+ * Internal {@link BsonWriter} implementation that allows to render {@link #writePlaceholder(String) placeholders} as
+ * {@code ?0}.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+@NullUnmarked
+class SpringJsonWriter implements BsonWriter {
+
+	private final StringBuffer buffer;
+
+	private enum JsonContextType {
+		TOP_LEVEL, DOCUMENT, ARRAY,
+	}
+
+	private enum State {
+		INITIAL, NAME, VALUE, DONE
+	}
+
+	private static class JsonContext {
+
+		private final JsonContext parentContext;
+		private final JsonContextType contextType;
+		private boolean hasElements;
+
+		JsonContext(final JsonContext parentContext, final JsonContextType contextType) {
+			this.parentContext = parentContext;
+			this.contextType = contextType;
+		}
+
+		JsonContext nestedDocument() {
+			return new JsonContext(this, JsonContextType.DOCUMENT);
+		}
+
+		JsonContext nestedArray() {
+			return new JsonContext(this, JsonContextType.ARRAY);
+		}
+	}
+
+	private JsonContext context = new JsonContext(null, JsonContextType.TOP_LEVEL);
+	private State state = State.INITIAL;
+
+	public SpringJsonWriter(StringBuffer buffer) {
+		this.buffer = buffer;
+	}
+
+	@Override
+	public void flush() {}
+
+	@Override
+	public void writeBinaryData(BsonBinary binary) {
+
+		preWriteValue();
+		writeStartDocument();
+
+		writeName("$binary");
+
+		writeStartDocument();
+		writeName("base64");
+		writeString(Base64.getEncoder().encodeToString(binary.getData()));
+		writeName("subType");
+		writeInt32(binary.getBsonType().getValue());
+		writeEndDocument();
+
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeBinaryData(String name, BsonBinary binary) {
+
+		writeName(name);
+		writeBinaryData(binary);
+	}
+
+	@Override
+	public void writeBoolean(boolean value) {
+
+		preWriteValue();
+		write(value ? "true" : "false");
+		setNextState();
+	}
+
+	@Override
+	public void writeBoolean(String name, boolean value) {
+
+		writeName(name);
+		writeBoolean(value);
+	}
+
+	@Override
+	public void writeDateTime(long value) {
+
+		// "$date": "2018-11-10T22:26:12.111Z"
+		writeStartDocument();
+		writeName("$date");
+		writeString(ZonedDateTime.ofInstant(Instant.ofEpochMilli(value), ZoneId.of("Z")).format(ISO_OFFSET_DATE_TIME));
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeDateTime(String name, long value) {
+
+		writeName(name);
+		writeDateTime(value);
+	}
+
+	@Override
+	public void writeDBPointer(BsonDbPointer value) {
+
+	}
+
+	@Override
+	public void writeDBPointer(String name, BsonDbPointer value) {
+
+	}
+
+	@Override // {"$numberDouble":"10.5"}
+	public void writeDouble(double value) {
+
+		writeStartDocument();
+		writeName("$numberDouble");
+		writeString(Double.valueOf(value).toString());
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeDouble(String name, double value) {
+
+		writeName(name);
+		writeDouble(value);
+	}
+
+	@Override
+	public void writeEndArray() {
+		write("]");
+		context = context.parentContext;
+		if (context.contextType == JsonContextType.TOP_LEVEL) {
+			state = State.DONE;
+		} else {
+			setNextState();
+		}
+	}
+
+	@Override
+	public void writeEndDocument() {
+		buffer.append("}");
+		context = context.parentContext;
+		if (context.contextType == JsonContextType.TOP_LEVEL) {
+			state = State.DONE;
+		} else {
+			setNextState();
+		}
+	}
+
+	@Override
+	public void writeInt32(int value) {
+
+		writeStartDocument();
+		writeName("$numberInt");
+		writeString(Integer.valueOf(value).toString());
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeInt32(String name, int value) {
+
+		writeName(name);
+		writeInt32(value);
+	}
+
+	@Override
+	public void writeInt64(long value) {
+
+		writeStartDocument();
+		writeName("$numberLong");
+		writeString(Long.valueOf(value).toString());
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeInt64(String name, long value) {
+
+		writeName(name);
+		writeInt64(value);
+	}
+
+	@Override
+	public void writeDecimal128(Decimal128 value) {
+
+		// { "$numberDecimal": "<number>" }
+		writeStartDocument();
+		writeName("$numberDecimal");
+		writeString(value.toString());
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeDecimal128(String name, Decimal128 value) {
+
+		writeName(name);
+		writeDecimal128(value);
+	}
+
+	@Override
+	public void writeJavaScript(String code) {
+
+		writeStartDocument();
+		writeName("$code");
+		writeString(code);
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeJavaScript(String name, String code) {
+
+		writeName(name);
+		writeJavaScript(code);
+	}
+
+	@Override
+	public void writeJavaScriptWithScope(String code) {
+
+	}
+
+	@Override
+	public void writeJavaScriptWithScope(String name, String code) {
+
+	}
+
+	@Override
+	public void writeMaxKey() {
+
+		writeStartDocument();
+		writeName("$maxKey");
+		buffer.append(1);
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeMaxKey(String name) {
+		writeName(name);
+		writeMaxKey();
+	}
+
+	@Override
+	public void writeMinKey() {
+
+		writeStartDocument();
+		writeName("$minKey");
+		buffer.append(1);
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeMinKey(String name) {
+		writeName(name);
+		writeMinKey();
+	}
+
+	@Override
+	public void writeName(String name) {
+		if (context.hasElements) {
+			write(",");
+		} else {
+			context.hasElements = true;
+		}
+
+		writeString(name);
+		buffer.append(":");
+		state = State.VALUE;
+	}
+
+	@Override
+	public void writeNull() {
+		buffer.append("null");
+	}
+
+	@Override
+	public void writeNull(String name) {
+		writeName(name);
+		writeNull();
+	}
+
+	@Override
+	public void writeObjectId(ObjectId objectId) {
+		writeStartDocument();
+		writeName("$oid");
+		writeString(objectId.toHexString());
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeObjectId(String name, ObjectId objectId) {
+		writeName(name);
+		writeObjectId(objectId);
+	}
+
+	@Override
+	public void writeRegularExpression(BsonRegularExpression regularExpression) {
+
+		writeStartDocument();
+		writeName("$regex");
+
+		write("/");
+		write(regularExpression.getPattern());
+		write("/");
+
+		if (StringUtils.hasText(regularExpression.getOptions())) {
+			writeName("$options");
+			writeString(regularExpression.getOptions());
+		}
+
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeRegularExpression(String name, BsonRegularExpression regularExpression) {
+		writeName(name);
+		writeRegularExpression(regularExpression);
+	}
+
+	@Override
+	public void writeStartArray() {
+
+		preWriteValue();
+		write("[");
+		context = context.nestedArray();
+	}
+
+	@Override
+	public void writeStartArray(String name) {
+		writeName(name);
+		writeStartArray();
+	}
+
+	@Override
+	public void writeStartDocument() {
+
+		preWriteValue();
+		write("{");
+		context = context.nestedDocument();
+		state = State.NAME;
+	}
+
+	@Override
+	public void writeStartDocument(String name) {
+		writeName(name);
+		writeStartDocument();
+	}
+
+	@Override
+	public void writeString(String value) {
+		write("'");
+		write(value);
+		write("'");
+	}
+
+	@Override
+	public void writeString(String name, String value) {
+		writeName(name);
+		writeString(value);
+	}
+
+	@Override
+	public void writeSymbol(String value) {
+
+		writeStartDocument();
+		writeName("$symbol");
+		writeString(value);
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeSymbol(String name, String value) {
+
+		writeName(name);
+		writeSymbol(value);
+	}
+
+	@Override // {"$timestamp": {"t": <t>, "i": <i>}}
+	public void writeTimestamp(BsonTimestamp value) {
+
+		preWriteValue();
+		writeStartDocument();
+		writeName("$timestamp");
+		writeStartDocument();
+		writeName("t");
+		buffer.append(value.getTime());
+		writeName("i");
+		buffer.append(value.getInc());
+		writeEndDocument();
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeTimestamp(String name, BsonTimestamp value) {
+
+		writeName(name);
+		writeTimestamp(value);
+	}
+
+	@Override
+	public void writeUndefined() {
+
+		writeStartDocument();
+		writeName("$undefined");
+		writeBoolean(true);
+		writeEndDocument();
+	}
+
+	@Override
+	public void writeUndefined(String name) {
+
+		writeName(name);
+		writeUndefined();
+	}
+
+	@Override
+	public void pipe(BsonReader reader) {
+
+	}
+
+	/**
+	 * @param placeholder
+	 */
+	public void writePlaceholder(String placeholder) {
+		write(placeholder);
+	}
+
+	private void write(String str) {
+		buffer.append(str);
+	}
+
+	private void preWriteValue() {
+
+		if (context.contextType == JsonContextType.ARRAY) {
+			if (context.hasElements) {
+				write(",");
+			}
+		}
+		context.hasElements = true;
+	}
+
+	private void setNextState() {
+		if (context.contextType == JsonContextType.ARRAY) {
+			state = State.VALUE;
+		} else {
+			state = State.NAME;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/aggregation/TestAggregationContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/aggregation/TestAggregationContext.java
new file mode 100644
index 0000000000..950f9ec797
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/aggregation/TestAggregationContext.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2021-2025 the original author 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.util.aggregation;
+
+import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.FieldReference;
+import org.springframework.data.mongodb.core.aggregation.Field;
+import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * @author Christoph Strobl
+ */
+public class TestAggregationContext implements AggregationOperationContext {
+
+	private final AggregationOperationContext delegate;
+
+	private TestAggregationContext(AggregationOperationContext delegate) {
+		this.delegate = delegate;
+	}
+
+	public static AggregationOperationContext contextFor(@Nullable Class<?> type) {
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				new MongoMappingContext());
+		mongoConverter.afterPropertiesSet();
+
+		return contextFor(type, mongoConverter);
+	}
+
+	public static AggregationOperationContext contextFor(@Nullable Class<?> type, MongoConverter mongoConverter) {
+
+		if (type == null) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
+
+		return new TestAggregationContext(new TypeBasedAggregationOperationContext(type, mongoConverter.getMappingContext(),
+				new QueryMapper(mongoConverter)).continueOnMissingFieldReference());
+	}
+
+	@Override
+	public Document getMappedObject(Document document) {
+		return delegate.getMappedObject(document);
+	}
+
+	@Override
+	public Document getMappedObject(Document document, @Nullable Class<?> type) {
+		return delegate.getMappedObject(document, type);
+	}
+
+	@Override
+	public FieldReference getReference(Field field) {
+		return delegate.getReference(field);
+	}
+
+	@Override
+	public FieldReference getReference(String name) {
+		return delegate.getReference(name);
+	}
+
+	@Override
+	public CodecRegistry getCodecRegistry() {
+		return delegate.getCodecRegistry();
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/encryption/EncryptionUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/encryption/EncryptionUtils.java
new file mode 100644
index 0000000000..be9a2e1cff
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/encryption/EncryptionUtils.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2021-2025 the original author 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.util.encryption;
+
+import java.util.Base64;
+import java.util.UUID;
+import java.util.function.Supplier;
+
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.types.Binary;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.util.spel.ExpressionUtils;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.util.Assert;
+
+/**
+ * Internal utility class for dealing with encryption related matters.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public final class EncryptionUtils {
+
+	/**
+	 * Resolve a given plain {@link String} value into the store native {@literal keyId} format, considering potential
+	 * {@link Expression expressions}. <br />
+	 * The potential keyId is probed against an {@link UUID#fromString(String) UUID value} or decoded from the
+	 * {@literal base64} representation prior to conversion into its {@link Binary} format.
+	 *
+	 * @param value the source value to resolve the keyId for. Must not be {@literal null}.
+	 * @param evaluationContext a {@link Supplier} used to provide the {@link EvaluationContext} in case an
+	 *          {@link Expression} is {@link ExpressionUtils#detectExpression(String) detected}.
+	 * @return can be {@literal null}.
+	 * @throws IllegalArgumentException if one of the required arguments is {@literal null}.
+	 */
+	public static @Nullable Object resolveKeyId(String value, Supplier<EvaluationContext> evaluationContext) {
+
+		Assert.notNull(value, "Value must not be null");
+
+		Object potentialKeyId = value;
+		Expression expression = ExpressionUtils.detectExpression(value);
+		if (expression != null) {
+			potentialKeyId = expression.getValue(evaluationContext.get());
+			if (!(potentialKeyId instanceof String)) {
+				return potentialKeyId;
+			}
+		}
+
+		try {
+			return new Binary(BsonBinarySubType.UUID_STANDARD,
+					new BsonBinary(UUID.fromString(potentialKeyId.toString())).getData());
+		} catch (IllegalArgumentException e) {
+
+			return new Binary(BsonBinarySubType.UUID_STANDARD, Base64.getDecoder().decode(potentialKeyId.toString()));
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java
index 0de9eac29e..3961fafc21 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/DateTimeFormatter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 the original author 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,19 +17,16 @@
 
 import static java.time.format.DateTimeFormatter.*;
 
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.ZoneId;
+import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
-import java.time.format.DateTimeParseException;
-import java.time.temporal.TemporalAccessor;
-import java.time.temporal.TemporalQuery;
-import java.util.Calendar;
-import java.util.TimeZone;
+
+import org.jspecify.annotations.NullUnmarked;
 
 /**
- * JsonBuffer implementation borrowed from <a href=
+ * DateTimeFormatter implementation borrowed from <a href=
  * "https://github.com/mongodb/mongo-java-driver/blob/master/bson/src/main/org/bson/json/DateTimeFormatter.java">MongoDB
  * Inc.</a> licensed under the Apache License, Version 2.0. <br />
  * Formatted and modified.
@@ -38,135 +35,25 @@
  * @author Ross Lawley
  * @since 2.2
  */
+@NullUnmarked
 class DateTimeFormatter {
 
-	private static final FormatterImpl FORMATTER_IMPL;
-
-	static {
-		FormatterImpl dateTimeHelper;
-		try {
-			dateTimeHelper = loadDateTimeFormatter(
-					"org.springframework.data.mongodb.util.json.DateTimeFormatter$Java8DateTimeFormatter");
-		} catch (LinkageError e) {
-			// this is expected if running on a release prior to Java 8: fallback to JAXB.
-			dateTimeHelper = loadDateTimeFormatter(
-					"org.springframework.data.mongodb.util.json.DateTimeFormatter$JaxbDateTimeFormatter");
-		}
-
-		FORMATTER_IMPL = dateTimeHelper;
-	}
-
-	private static FormatterImpl loadDateTimeFormatter(final String className) {
-
-		try {
-			return (FormatterImpl) Class.forName(className).getDeclaredConstructor().newInstance();
-		} catch (ClassNotFoundException e) {
-			// this is unexpected as it means the class itself is not found
-			throw new ExceptionInInitializerError(e);
-		} catch (InstantiationException e) {
-			// this is unexpected as it means the class can't be instantiated
-			throw new ExceptionInInitializerError(e);
-		} catch (IllegalAccessException e) {
-			// this is unexpected as it means the no-args constructor isn't accessible
-			throw new ExceptionInInitializerError(e);
-		} catch (NoSuchMethodException e) {
-			throw new ExceptionInInitializerError(e);
-		} catch (InvocationTargetException e) {
-			throw new ExceptionInInitializerError(e);
-		}
-	}
+	private static final int DATE_STRING_LENGTH = "1970-01-01".length();
 
 	static long parse(final String dateTimeString) {
-		return FORMATTER_IMPL.parse(dateTimeString);
+		// ISO_OFFSET_DATE_TIME will not parse date strings consisting of just year-month-day, so use ISO_LOCAL_DATE for
+		// those
+		if (dateTimeString.length() == DATE_STRING_LENGTH) {
+			return LocalDate.parse(dateTimeString, ISO_LOCAL_DATE).atStartOfDay().toInstant(ZoneOffset.UTC).toEpochMilli();
+		} else {
+			return ISO_OFFSET_DATE_TIME.parse(dateTimeString, Instant::from).toEpochMilli();
+		}
 	}
 
 	static String format(final long dateTime) {
-		return FORMATTER_IMPL.format(dateTime);
+		return ZonedDateTime.ofInstant(Instant.ofEpochMilli(dateTime), ZoneId.of("Z")).format(ISO_OFFSET_DATE_TIME);
 	}
 
-	private interface FormatterImpl {
-		long parse(String dateTimeString);
-
-		String format(long dateTime);
+	private DateTimeFormatter() {
 	}
-
-	// Reflective use of DatatypeConverter avoids a compile-time dependency on the java.xml.bind module in Java 9
-	static class JaxbDateTimeFormatter implements FormatterImpl {
-
-		private static final Method DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD;
-		private static final Method DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD;
-
-		static {
-			try {
-				DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
-						.getDeclaredMethod("parseDateTime", String.class);
-				DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
-						.getDeclaredMethod("printDateTime", Calendar.class);
-			} catch (NoSuchMethodException e) {
-				throw new ExceptionInInitializerError(e);
-			} catch (ClassNotFoundException e) {
-				throw new ExceptionInInitializerError(e);
-			}
-		}
-
-		@Override
-		public long parse(final String dateTimeString) {
-			try {
-				return ((Calendar) DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD.invoke(null, dateTimeString)).getTimeInMillis();
-			} catch (IllegalAccessException e) {
-				throw new IllegalStateException(e);
-			} catch (InvocationTargetException e) {
-				throw (RuntimeException) e.getCause();
-			}
-		}
-
-		@Override
-		public String format(final long dateTime) {
-			Calendar calendar = Calendar.getInstance();
-			calendar.setTimeInMillis(dateTime);
-			calendar.setTimeZone(TimeZone.getTimeZone("Z"));
-			try {
-				return (String) DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD.invoke(null, calendar);
-			} catch (IllegalAccessException e) {
-				throw new IllegalStateException();
-			} catch (InvocationTargetException e) {
-				throw (RuntimeException) e.getCause();
-			}
-		}
-	}
-
-	static class Java8DateTimeFormatter implements FormatterImpl {
-
-		// if running on Java 8 or above then java.time.format.DateTimeFormatter will be available and initialization will
-		// succeed.
-		// Otherwise it will fail.
-		static {
-			try {
-				Class.forName("java.time.format.DateTimeFormatter");
-			} catch (ClassNotFoundException e) {
-				throw new ExceptionInInitializerError(e);
-			}
-		}
-
-		@Override
-		public long parse(final String dateTimeString) {
-			try {
-				return ISO_OFFSET_DATE_TIME.parse(dateTimeString, new TemporalQuery<Instant>() {
-					@Override
-					public Instant queryFrom(final TemporalAccessor temporal) {
-						return Instant.from(temporal);
-					}
-				}).toEpochMilli();
-			} catch (DateTimeParseException e) {
-				throw new IllegalArgumentException(e.getMessage());
-			}
-		}
-
-		@Override
-		public String format(final long dateTime) {
-			return ZonedDateTime.ofInstant(Instant.ofEpochMilli(dateTime), ZoneId.of("Z")).format(ISO_OFFSET_DATE_TIME);
-		}
-	}
-
-	private DateTimeFormatter() {}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/EvaluationContextExpressionEvaluator.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/EvaluationContextExpressionEvaluator.java
new file mode 100644
index 0000000000..57fecd284c
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/EvaluationContextExpressionEvaluator.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2022-2025 the original author 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.util.json;
+
+import java.util.Collections;
+import java.util.Map;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+
+/**
+ * @author Christoph Strobl
+ * @since 3.3.5
+ */
+class EvaluationContextExpressionEvaluator implements ValueExpressionEvaluator {
+
+	final ValueProvider valueProvider;
+	final ExpressionParser expressionParser;
+
+	EvaluationContextExpressionEvaluator(ValueProvider valueProvider, ExpressionParser expressionParser) {
+
+		this.valueProvider = valueProvider;
+		this.expressionParser = expressionParser;
+	}
+
+	@Override
+	public <T> @Nullable T evaluate(String expression) {
+		return evaluateExpression(expression, Collections.emptyMap());
+	}
+
+	EvaluationContext getEvaluationContext(String expressionString) {
+		return new StandardEvaluationContext();
+	}
+
+	Expression getParsedExpression(String expressionString) {
+		return expressionParser.parseExpression(expressionString);
+	}
+
+	@SuppressWarnings("unchecked")
+	<T> @Nullable T evaluateExpression(String expressionString, Map<String, Object> variables) {
+
+		Expression expression = getParsedExpression(expressionString);
+		EvaluationContext ctx = getEvaluationContext(expressionString);
+		variables.forEach(ctx::setVariable);
+
+		Object result = expression.getValue(ctx, Object.class);
+		return (T) result;
+	}
+}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonBuffer.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonBuffer.java
index 20fba1b4cd..dcb9a3ff13 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonBuffer.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonBuffer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.springframework.data.mongodb.util.json;
 
 import org.bson.json.JsonParseException;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * JsonBuffer implementation borrowed from <a href=
@@ -27,6 +28,7 @@
  * @author Ross Lawley
  * @since 2.2
  */
+@NullUnmarked
 class JsonBuffer {
 
 	private final String buffer;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonScanner.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonScanner.java
index 2b3bb13778..461e52489f 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonScanner.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonScanner.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 the original author 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,6 +17,7 @@
 
 import org.bson.BsonRegularExpression;
 import org.bson.json.JsonParseException;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * Parses the string representation of a JSON object into a set of {@link JsonToken}-derived objects. <br />
@@ -32,6 +33,7 @@
  * @author Christoph Strobl
  * @since 2.2
  */
+@NullUnmarked
 class JsonScanner {
 
 	private final JsonBuffer buffer;
@@ -115,7 +117,7 @@ public JsonToken nextToken() {
 				} else {
 					int position = buffer.getPosition();
 					buffer.unread(c);
-					throw new JsonParseException("Invalid JSON input. Position: %d. Character: '%c'.", position, c);
+					throw new JsonParseException("Invalid JSON input; Position: %d; Character: '%c'.", position, c);
 				}
 		}
 	}
@@ -199,7 +201,7 @@ private JsonToken scanRegularExpression() {
 							buffer.substring(options, end));
 					return new JsonToken(JsonTokenType.REGULAR_EXPRESSION, regex);
 				case INVALID:
-					throw new JsonParseException("Invalid JSON regular expression. Position: %d.", buffer.getPosition());
+					throw new JsonParseException("Invalid JSON regular expression; Position: %d.", buffer.getPosition());
 				default:
 			}
 		}
@@ -219,10 +221,10 @@ private JsonToken scanBindString() {
 		boolean isExpression = false;
 		int parenthesisCount = 0;
 
-		while (c == '$' || c == '_' || Character.isLetterOrDigit(c) || c == '#' || c == '{' || c == '[' || c == ']'
+		while (c == '$' || c == '_' || Character.isLetterOrDigit(c) || c == '#' || c == '{' || c == '['
 				|| (isExpression && isExpressionAllowedChar(c))) {
 
-			if (charCount == 0 && c == '#') {
+			if (charCount == 0 && (c == '#' || c == '$')) {
 				isExpression = true;
 			} else if (isExpression) {
 				if (c == '{') {
@@ -231,7 +233,7 @@ private JsonToken scanBindString() {
 
 					parenthesisCount--;
 					if (parenthesisCount == 0) {
-						buffer.read();
+						c = buffer.read();
 						break;
 					}
 				}
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonToken.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonToken.java
index 4a5eb845d0..e73d57774b 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonToken.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 the original author 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 org.bson.BsonDouble;
 import org.bson.json.JsonParseException;
 import org.bson.types.Decimal128;
+import org.jspecify.annotations.NullUnmarked;
 
 /**
  * JsonToken implementation borrowed from <a href=
@@ -30,6 +31,7 @@
  * @author Ross Lawley
  * @since 2.2
  */
+@NullUnmarked
 class JsonToken {
 
 	private final Object value;
@@ -49,28 +51,28 @@ <T> T getValue(final Class<T> clazz) {
 
 		try {
 			if (Long.class == clazz) {
-				if (value instanceof Integer) {
-					return clazz.cast(((Integer) value).longValue());
-				} else if (value instanceof String) {
-					return clazz.cast(Long.valueOf((String) value));
+				if (value instanceof Integer integerValue) {
+					return clazz.cast(integerValue.longValue());
+				} else if (value instanceof String stringValue) {
+					return clazz.cast(Long.valueOf(stringValue));
 				}
 			} else if (Integer.class == clazz) {
-				if (value instanceof String) {
-					return clazz.cast(Integer.valueOf((String) value));
+				if (value instanceof String stringValue) {
+					return clazz.cast(Integer.valueOf(stringValue));
 				}
 			} else if (Double.class == clazz) {
-				if (value instanceof String) {
-					return clazz.cast(Double.valueOf((String) value));
+				if (value instanceof String stringValue) {
+					return clazz.cast(Double.valueOf(stringValue));
 				}
 			} else if (Decimal128.class == clazz) {
-				if (value instanceof Integer) {
-					return clazz.cast(new Decimal128((Integer) value));
-				} else if (value instanceof Long) {
-					return clazz.cast(new Decimal128((Long) value));
-				} else if (value instanceof Double) {
-					return clazz.cast(new BsonDouble((Double) value).decimal128Value());
-				} else if (value instanceof String) {
-					return clazz.cast(Decimal128.parse((String) value));
+				if (value instanceof Integer integerValue) {
+					return clazz.cast(new Decimal128(integerValue));
+				} else if (value instanceof Long longValue) {
+					return clazz.cast(new Decimal128(longValue));
+				} else if (value instanceof Double doubleValue) {
+					return clazz.cast(new BsonDouble(doubleValue).decimal128Value());
+				} else if (value instanceof String stringValue) {
+					return clazz.cast(Decimal128.parse(stringValue));
 				}
 			}
 
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonTokenType.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonTokenType.java
index c649afcab6..bbdfbc4ae8 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonTokenType.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/JsonTokenType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingContext.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingContext.java
index 012e67127a..55dccad0c9 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingContext.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,38 +15,136 @@
  */
 package org.springframework.data.mongodb.util.json;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.data.spel.ExpressionDependencies;
+import org.springframework.data.util.Lazy;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.ParseException;
+import org.springframework.expression.ParserContext;
 
 /**
- * Reusable context for binding parameters to an placeholder or a SpEL expression within a JSON structure. <br />
+ * Reusable context for binding parameters to a placeholder or a SpEL expression within a JSON structure. <br />
  * To be used along with {@link ParameterBindingDocumentCodec#decode(String, ParameterBindingContext)}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 2.2
  */
-@RequiredArgsConstructor
-@Getter
 public class ParameterBindingContext {
 
 	private final ValueProvider valueProvider;
-	private final SpelExpressionParser expressionParser;
-	private final EvaluationContext evaluationContext;
+	private final ValueExpressionEvaluator expressionEvaluator;
 
-	@Nullable
-	public Object bindableValueForIndex(int index) {
+	/**
+	 * @param valueProvider
+	 * @param expressionParser
+	 * @param evaluationContext a {@link Supplier} for {@link Lazy} context retrieval.
+	 * @since 2.2.3
+	 */
+	public ParameterBindingContext(ValueProvider valueProvider, ExpressionParser expressionParser,
+			Supplier<EvaluationContext> evaluationContext) {
+		this(valueProvider, new EvaluationContextExpressionEvaluator(valueProvider, unwrap(expressionParser)) {
+			@Override
+			public EvaluationContext getEvaluationContext(String expressionString) {
+				return evaluationContext.get();
+			}
+		});
+	}
+
+	private static ExpressionParser unwrap(ExpressionParser expressionParser) {
+		return new ExpressionParser() {
+			@Override
+			public Expression parseExpression(String expressionString) throws ParseException {
+				return expressionParser.parseExpression(unwrap(expressionString));
+			}
+
+			@Override
+			public Expression parseExpression(String expressionString, ParserContext context) throws ParseException {
+				return expressionParser.parseExpression(unwrap(expressionString), context);
+			}
+		};
+	}
+
+	private static String unwrap(String expressionString) {
+		return expressionString.startsWith("#{") && expressionString.endsWith("}")
+				? expressionString.substring(2, expressionString.length() - 1).trim()
+				: expressionString;
+	}
+
+	/**
+	 * @param valueProvider
+	 * @param expressionEvaluator
+	 * @since 4.4.0
+	 */
+	public ParameterBindingContext(ValueProvider valueProvider, ValueExpressionEvaluator expressionEvaluator) {
+		this.valueProvider = valueProvider;
+		this.expressionEvaluator = expressionEvaluator;
+	}
+
+	/**
+	 * Create a new {@link ParameterBindingContext} that is capable of expression parsing and can provide a
+	 * {@link EvaluationContext} based on {@link ExpressionDependencies}.
+	 *
+	 * @param valueProvider
+	 * @param expressionParser
+	 * @param contextFunction
+	 * @return
+	 * @since 3.1
+	 */
+	public static ParameterBindingContext forExpressions(ValueProvider valueProvider, ExpressionParser expressionParser,
+			Function<ExpressionDependencies, EvaluationContext> contextFunction) {
+
+		return new ParameterBindingContext(valueProvider,
+				new EvaluationContextExpressionEvaluator(valueProvider, expressionParser) {
+
+					@Override
+					public EvaluationContext getEvaluationContext(String expressionString) {
+
+						Expression expression = getParsedExpression(expressionString);
+						ExpressionDependencies dependencies = ExpressionDependencies.discover(expression);
+						return contextFunction.apply(dependencies);
+					}
+				});
+	}
+
+	/**
+	 * Create a new {@link ParameterBindingContext} that is capable of expression parsing.
+	 *
+	 * @param valueProvider
+	 * @param expressionEvaluator
+	 * @return
+	 * @since 4.4.0
+	 */
+	public static ParameterBindingContext forExpressions(ValueProvider valueProvider,
+			ValueExpressionEvaluator expressionEvaluator) {
+
+		return new ParameterBindingContext(valueProvider, expressionEvaluator);
+	}
+
+	public @Nullable Object bindableValueForIndex(int index) {
 		return valueProvider.getBindableValue(index);
 	}
 
-	@Nullable
-	public Object evaluateExpression(String expressionString) {
+	public @Nullable Object evaluateExpression(String expressionString) {
+		return expressionEvaluator.evaluate(expressionString);
+	}
+
+	public @Nullable Object evaluateExpression(String expressionString, Map<String, Object> variables) {
+
+		if (expressionEvaluator instanceof EvaluationContextExpressionEvaluator expressionEvaluator) {
+			return expressionEvaluator.evaluateExpression(expressionString, variables);
+		}
+		return expressionEvaluator.evaluate(expressionString);
+	}
 
-		Expression expression = expressionParser.parseExpression(expressionString);
-		return expression.getValue(this.evaluationContext, Object.class);
+	public ValueProvider getValueProvider() {
+		return valueProvider;
 	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingDocumentCodec.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingDocumentCodec.java
index 2ec51a79b8..8138f397a6 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingDocumentCodec.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingDocumentCodec.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 the original author 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,16 +20,17 @@
 import static org.bson.codecs.configuration.CodecRegistries.*;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 import org.bson.AbstractBsonReader.State;
 import org.bson.BsonBinarySubType;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWriter;
+import org.bson.BsonInvalidOperationException;
 import org.bson.BsonReader;
 import org.bson.BsonType;
 import org.bson.BsonValue;
@@ -38,9 +39,15 @@
 import org.bson.Transformer;
 import org.bson.codecs.*;
 import org.bson.codecs.configuration.CodecRegistry;
+import org.bson.json.JsonParseException;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.expression.ValueExpressionParser;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.data.mongodb.core.mapping.FieldName;
 import org.springframework.data.spel.EvaluationContextProvider;
+import org.springframework.data.spel.ExpressionDependencies;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -56,11 +63,13 @@
  * @author Ross Lawley
  * @author Ralph Schaer
  * @author Christoph Strobl
+ * @author Rocco Lagrotteria
  * @since 2.2
  */
+@NullUnmarked
 public class ParameterBindingDocumentCodec implements CollectibleCodec<Document> {
 
-	private static final String ID_FIELD_NAME = "_id";
+	private static final String ID_FIELD_NAME = FieldName.ID.name();
 	private static final CodecRegistry DEFAULT_REGISTRY = fromProviders(
 			asList(new ValueCodecProvider(), new BsonValueCodecProvider(), new DocumentCodecProvider()));
 	private static final BsonTypeClassMap DEFAULT_BSON_TYPE_CLASS_MAP = new BsonTypeClassMap();
@@ -132,8 +141,8 @@ public BsonValue getDocumentId(final Document document) {
 		}
 
 		Object id = document.get(ID_FIELD_NAME);
-		if (id instanceof BsonValue) {
-			return (BsonValue) id;
+		if (id instanceof BsonValue bsonValue) {
+			return bsonValue;
 		}
 
 		BsonDocument idHoldingDocument = new BsonDocument();
@@ -162,12 +171,12 @@ public void encode(final BsonWriter writer, final Document document, final Encod
 	public Document decode(@Nullable String json, Object[] values) {
 
 		return decode(json, new ParameterBindingContext((index) -> values[index], new SpelExpressionParser(),
-				EvaluationContextProvider.DEFAULT.getEvaluationContext(values)));
+				() -> EvaluationContextProvider.DEFAULT.getEvaluationContext(values)));
 	}
 
 	public Document decode(@Nullable String json, ParameterBindingContext bindingContext) {
 
-		if (StringUtils.isEmpty(json)) {
+		if (!StringUtils.hasText(json)) {
 			return new Document();
 		}
 
@@ -175,27 +184,80 @@ public Document decode(@Nullable String json, ParameterBindingContext bindingCon
 		return this.decode(reader, DecoderContext.builder().build());
 	}
 
+	/**
+	 * Determine {@link ExpressionDependencies} from Expressions that are nested in the {@code json} content. Returns
+	 * {@link Optional#empty()} if {@code json} is empty or of it does not contain any SpEL expressions.
+	 *
+	 * @param json
+	 * @param expressionParser
+	 * @return merged {@link ExpressionDependencies} object if expressions were found, otherwise
+	 *         {@link ExpressionDependencies#none()}.
+	 * @since 3.1
+	 */
+	public ExpressionDependencies captureExpressionDependencies(@Nullable String json, ValueProvider valueProvider,
+			ValueExpressionParser expressionParser) {
+
+		if (!StringUtils.hasText(json)) {
+			return ExpressionDependencies.none();
+		}
+
+		DependencyCapturingExpressionEvaluator expressionEvaluator = new DependencyCapturingExpressionEvaluator(
+				expressionParser);
+		this.decode(new ParameterBindingJsonReader(json, new ParameterBindingContext(valueProvider, expressionEvaluator)),
+				DecoderContext.builder().build());
+
+		return expressionEvaluator.getCapturedDependencies();
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@Override
 	public Document decode(final BsonReader reader, final DecoderContext decoderContext) {
 
-		if (reader instanceof ParameterBindingJsonReader) {
-			ParameterBindingJsonReader bindingReader = (ParameterBindingJsonReader) reader;
+		if (reader instanceof ParameterBindingJsonReader bindingReader) {
 
 			// check if the reader has actually found something to replace on top level and did so.
 			// binds just placeholder queries like: `@Query(?0)`
-			if (bindingReader.currentValue instanceof org.bson.Document) {
-				return (Document) bindingReader.currentValue;
+			if (bindingReader.currentValue instanceof org.bson.Document document) {
+				return document;
+			} else if (bindingReader.currentValue instanceof String stringValue) {
+				try {
+					return decode(stringValue, new Object[0]);
+				} catch (JsonParseException jsonParseException) {
+					throw new IllegalArgumentException("Expression result is not a valid json document", jsonParseException);
+				}
+			} else if (bindingReader.currentValue instanceof Map) {
+				return new Document((Map) bindingReader.currentValue);
 			}
 		}
 
 		Document document = new Document();
-		reader.readStartDocument();
-		while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-			String fieldName = reader.readName();
-			document.put(fieldName, readValue(reader, decoderContext));
-		}
 
-		reader.readEndDocument();
+		try {
+
+			reader.readStartDocument();
+
+			while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
+				String fieldName = reader.readName();
+				Object value = readValue(reader, decoderContext);
+				document.put(fieldName, value);
+			}
+
+			reader.readEndDocument();
+
+		} catch (JsonParseException | BsonInvalidOperationException e) {
+			try {
+
+				Object value = readValue(reader, decoderContext);
+				if (value instanceof Map<?, ?> map) {
+					if (!map.isEmpty()) {
+						return new Document((Map<String, Object>) value);
+					}
+				}
+			} catch (Exception ex) {
+				e.addSuppressed(ex);
+				throw e;
+			}
+		}
 
 		return document;
 	}
@@ -260,9 +322,7 @@ private void writeIterable(final BsonWriter writer, final Iterable<Object> list,
 	private Object readValue(final BsonReader reader, final DecoderContext decoderContext) {
 
 		// Spring Data Customization START
-		if (reader instanceof ParameterBindingJsonReader) {
-
-			ParameterBindingJsonReader bindingReader = (ParameterBindingJsonReader) reader;
+		if (reader instanceof ParameterBindingJsonReader bindingReader) {
 
 			// check if the reader has actually found something to replace and did so.
 			// resets the reader state to move on after the actual value
@@ -274,10 +334,10 @@ private Object readValue(final BsonReader reader, final DecoderContext decoderCo
 				if (ObjectUtils.nullSafeEquals(BsonType.DATE_TIME, bindingReader.getCurrentBsonType())
 						&& !(value instanceof Date)) {
 
-					if (value instanceof Number) {
-						value = new Date(NumberUtils.convertNumberToTargetClass((Number) value, Long.class));
-					} else if (value instanceof String) {
-						value = new Date(DateTimeFormatter.parse((String) value));
+					if (value instanceof Number numberValue) {
+						value = new Date(NumberUtils.convertNumberToTargetClass(numberValue, Long.class));
+					} else if (value instanceof String stringValue) {
+						value = new Date(DateTimeFormatter.parse(stringValue));
 					}
 				}
 
@@ -316,17 +376,37 @@ private List<Object> readList(final BsonReader reader, final DecoderContext deco
 		reader.readStartArray();
 		List<Object> list = new ArrayList<>();
 		while (reader.readBsonType() != BsonType.END_OF_DOCUMENT) {
-
-			// Spring Data Customization START
-			Object listValue = readValue(reader, decoderContext);
-			if (listValue instanceof Collection) {
-				list.addAll((Collection) listValue);
-				break;
-			}
-			list.add(listValue);
-			// Spring Data Customization END
+			list.add(readValue(reader, decoderContext));
 		}
 		reader.readEndArray();
 		return list;
 	}
+
+	/**
+	 * @author Christoph Strobl
+	 * @since 3.1
+	 */
+	static class DependencyCapturingExpressionEvaluator implements ValueExpressionEvaluator {
+
+		private static final Object PLACEHOLDER = new Object();
+
+		private final ValueExpressionParser expressionParser;
+		private final List<ExpressionDependencies> dependencies = new ArrayList<>();
+
+		DependencyCapturingExpressionEvaluator(ValueExpressionParser expressionParser) {
+			this.expressionParser = expressionParser;
+		}
+
+		@Override
+		public <T> @Nullable T evaluate(String expression) {
+
+			dependencies.add(expressionParser.parse(expression).getExpressionDependencies());
+			return (T) PLACEHOLDER;
+		}
+
+		ExpressionDependencies getCapturedDependencies() {
+			return ExpressionDependencies.merged(dependencies);
+		}
+
+	}
 }
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java
index 1063414f10..c1e519e2f5 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2019 the original author or authors.
+ * Copyright 2008-2025 the original author 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,29 +17,33 @@
 
 import static java.lang.String.*;
 
-import lombok.Data;
-
 import java.text.DateFormat;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.time.format.DateTimeParseException;
+import java.util.Base64;
 import java.util.Calendar;
+import java.util.Collections;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.TimeZone;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.bson.*;
-import org.bson.internal.Base64;
 import org.bson.json.JsonParseException;
 import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.NullUnmarked;
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.NumberUtils;
 import org.springframework.util.ObjectUtils;
@@ -56,20 +60,22 @@
  * @author Florian Buecklers
  * @author Brendon Puntin
  * @author Christoph Strobl
+ * @author Rocco Lagrotteria
  * @since 2.2
  */
+@NullUnmarked
 public class ParameterBindingJsonReader extends AbstractBsonReader {
 
-	private static final Pattern PARAMETER_ONLY_BINDING_PATTERN = Pattern.compile("^\\?(\\d+)$");
+	private static final Pattern ENTIRE_QUERY_BINDING_PATTERN = Pattern.compile("^\\?(\\d+)$|^[\\?:][#$]\\{.*\\}$");
 	private static final Pattern PARAMETER_BINDING_PATTERN = Pattern.compile("\\?(\\d+)");
-	private static final Pattern EXPRESSION_BINDING_PATTERN = Pattern.compile("[\\?:]#\\{.*\\}");
+	private static final Pattern EXPRESSION_BINDING_PATTERN = Pattern.compile("[\\?:][#$]\\{.*\\}");
+	private static final Pattern SPEL_PARAMETER_BINDING_PATTERN = Pattern.compile("('\\?(\\d+)'|\\?(\\d+))");
 
 	private final ParameterBindingContext bindingContext;
 
 	private final JsonScanner scanner;
 	private JsonToken pushedToken;
 	Object currentValue;
-	private Mark mark;
 
 	/**
 	 * Constructs a new instance with the given JSON string.
@@ -96,15 +102,17 @@ public ParameterBindingJsonReader(String json, Object[] values) {
 	public ParameterBindingJsonReader(String json, ValueProvider accessor, SpelExpressionParser spelExpressionParser,
 			EvaluationContext evaluationContext) {
 
-		this.scanner = new JsonScanner(json);
-		setContext(new Context(null, BsonContextType.TOP_LEVEL));
+		this(json, accessor, spelExpressionParser, () -> evaluationContext);
+	}
 
-		this.bindingContext = new ParameterBindingContext(accessor, spelExpressionParser, evaluationContext);
+	/**
+	 * @since 2.2.3
+	 */
+	public ParameterBindingJsonReader(String json, ValueProvider accessor, SpelExpressionParser spelExpressionParser,
+			Supplier<EvaluationContext> evaluationContext) {
+
+		this(json, new ParameterBindingContext(accessor, spelExpressionParser, evaluationContext));
 
-		Matcher matcher = PARAMETER_ONLY_BINDING_PATTERN.matcher(json);
-		if (matcher.find()) {
-			currentValue = bindableValueFor(new JsonToken(JsonTokenType.UNQUOTED_STRING, json)).getValue();
-		}
 	}
 
 	public ParameterBindingJsonReader(String json, ParameterBindingContext bindingContext) {
@@ -114,9 +122,10 @@ public ParameterBindingJsonReader(String json, ParameterBindingContext bindingCo
 
 		this.bindingContext = bindingContext;
 
-		Matcher matcher = PARAMETER_ONLY_BINDING_PATTERN.matcher(json);
+		Matcher matcher = ENTIRE_QUERY_BINDING_PATTERN.matcher(json);
 		if (matcher.find()) {
-			currentValue = bindableValueFor(new JsonToken(JsonTokenType.UNQUOTED_STRING, json)).getValue();
+			BindableValue bindingResult = bindableValueFor(new JsonToken(JsonTokenType.UNQUOTED_STRING, json));
+			currentValue = bindingResult.getValue();
 		}
 	}
 
@@ -218,7 +227,7 @@ public BsonType readBsonType() {
 			case REGULAR_EXPRESSION:
 
 				setCurrentBsonType(BsonType.REGULAR_EXPRESSION);
-				currentValue = bindableValueFor(token).getValue().toString();
+				currentValue = bindableValueFor(token).getValue();
 				break;
 			case STRING:
 
@@ -283,10 +292,9 @@ public BsonType readBsonType() {
 				} else if ("DBPointer".equals(value)) {
 					setCurrentBsonType(BsonType.DB_POINTER);
 					currentValue = visitDBPointerConstructor();
-				} else if ("UUID".equals(value) || "GUID".equals(value) || "CSUUID".equals(value) || "CSGUID".equals(value)
-						|| "JUUID".equals(value) || "JGUID".equals(value) || "PYUUID".equals(value) || "PYGUID".equals(value)) {
+				} else if ("UUID".equals(value)) {
 					setCurrentBsonType(BsonType.BINARY);
-					currentValue = visitUUIDConstructor(value);
+					currentValue = visitUUIDConstructor();
 				} else if ("new".equals(value)) {
 					visitNew();
 				} else {
@@ -354,32 +362,55 @@ private BindableValue bindableValueFor(JsonToken token) {
 			return null;
 		}
 
+		boolean isRegularExpression = token.getType().equals(JsonTokenType.REGULAR_EXPRESSION);
+
 		BindableValue bindableValue = new BindableValue();
-		String tokenValue = String.class.cast(token.getValue());
+		String tokenValue = isRegularExpression ? token.getValue(BsonRegularExpression.class).getPattern()
+				: String.class.cast(token.getValue());
 		Matcher matcher = PARAMETER_BINDING_PATTERN.matcher(tokenValue);
 
 		if (token.getType().equals(JsonTokenType.UNQUOTED_STRING)) {
 
-			if (matcher.find()) {
-
-				int index = computeParameterIndex(matcher.group());
-				bindableValue.setValue(getBindableValueForIndex(index));
-				bindableValue.setType(bsonTypeForValue(getBindableValueForIndex(index)));
-				return bindableValue;
-			}
-
 			Matcher regexMatcher = EXPRESSION_BINDING_PATTERN.matcher(tokenValue);
 			if (regexMatcher.find()) {
 
 				String binding = regexMatcher.group();
 				String expression = binding.substring(3, binding.length() - 1);
+				String expressionString = binding.substring(1);
+
+				Matcher inSpelMatcher = SPEL_PARAMETER_BINDING_PATTERN.matcher(expression); // ?0 '?0'
+				Map<String, Object> innerSpelVariables = new HashMap<>();
 
-				Object value = evaluateExpression(expression);
+				while (inSpelMatcher.find()) {
+
+					String group = inSpelMatcher.group();
+					int index = computeParameterIndex(group);
+					Object value = getBindableValueForIndex(index);
+					String varName = "__QVar" + innerSpelVariables.size();
+					expression = expression.replace(group, "#" + varName);
+					expressionString = expressionString.replace(group, "#" + varName);
+					if(group.startsWith("'")) { // retain the string semantic
+						innerSpelVariables.put(varName, nullSafeToString(value));
+					} else {
+						innerSpelVariables.put(varName, value);
+					}
+				}
+
+				Object value = evaluateExpression(expressionString, innerSpelVariables);
 				bindableValue.setValue(value);
 				bindableValue.setType(bsonTypeForValue(value));
 				return bindableValue;
 			}
 
+			if (matcher.find()) {
+
+				int index = computeParameterIndex(matcher.group());
+				Object bindableValueForIndex = getBindableValueForIndex(index);
+				bindableValue.setValue(bindableValueForIndex);
+				bindableValue.setType(bsonTypeForValue(bindableValueForIndex));
+				return bindableValue;
+			}
+
 			bindableValue.setValue(tokenValue);
 			bindableValue.setType(BsonType.STRING);
 			return bindableValue;
@@ -388,45 +419,73 @@ private BindableValue bindableValueFor(JsonToken token) {
 
 		String computedValue = tokenValue;
 
-		boolean matched = false;
+		Matcher regexMatcher = EXPRESSION_BINDING_PATTERN.matcher(computedValue);
+
+		while (regexMatcher.find()) {
+
+			String binding = regexMatcher.group();
+			String expression = binding.substring(3, binding.length() - 1);
+			String expressionString = binding.substring(1);
+
+			Matcher inSpelMatcher = SPEL_PARAMETER_BINDING_PATTERN.matcher(expression);
+			Map<String, Object> innerSpelVariables = new HashMap<>();
+
+			while (inSpelMatcher.find()) {
+
+				String group = inSpelMatcher.group();
+				int index = computeParameterIndex(group);
+				Object value = getBindableValueForIndex(index);
+				String varName = "__QVar" + innerSpelVariables.size();
+				expression = expression.replace(group, "#" + varName);
+				expressionString = expressionString.replace(group, "#" + varName);
+				if(group.startsWith("'")) { // retain the string semantic
+					innerSpelVariables.put(varName, nullSafeToString(value));
+				} else {
+					innerSpelVariables.put(varName, value);
+				}
+			}
+
+			computedValue = computedValue.replace(binding,
+					nullSafeToString(evaluateExpression(expressionString, innerSpelVariables)));
+
+			bindableValue.setValue(computedValue);
+			bindableValue.setType(BsonType.STRING);
+
+			return bindableValue;
+		}
+
 		while (matcher.find()) {
 
-			matched = true;
 			String group = matcher.group();
 			int index = computeParameterIndex(group);
 			computedValue = computedValue.replace(group, nullSafeToString(getBindableValueForIndex(index)));
 		}
 
-		if (!matched) {
-
-			Matcher regexMatcher = EXPRESSION_BINDING_PATTERN.matcher(tokenValue);
+		if (isRegularExpression) {
 
-			while (regexMatcher.find()) {
+			BsonRegularExpression originalExpression = token.getValue(BsonRegularExpression.class);
 
-				String binding = regexMatcher.group();
-				String expression = binding.substring(3, binding.length() - 1);
+			bindableValue.setValue(new BsonRegularExpression(computedValue, originalExpression.getOptions()));
+			bindableValue.setType(BsonType.REGULAR_EXPRESSION);
+		} else {
 
-				computedValue = computedValue.replace(binding, nullSafeToString(evaluateExpression(expression)));
-			}
+			bindableValue.setValue(computedValue);
+			bindableValue.setType(BsonType.STRING);
 		}
-
-		bindableValue.setValue(computedValue);
-		bindableValue.setType(BsonType.STRING);
-
 		return bindableValue;
 	}
 
 	private static String nullSafeToString(@Nullable Object value) {
 
-		if (value instanceof Date) {
-			return DateTimeFormatter.format(((Date) value).getTime());
+		if (value instanceof Date date) {
+			return DateTimeFormatter.format(date.getTime());
 		}
 
 		return ObjectUtils.nullSafeToString(value);
 	}
 
 	private static int computeParameterIndex(String parameter) {
-		return NumberUtils.parseNumber(parameter.replace("?", ""), Integer.class);
+		return NumberUtils.parseNumber(parameter.replace("?", "").replace("'", ""), Integer.class);
 	}
 
 	private Object getBindableValueForIndex(int index) {
@@ -469,13 +528,19 @@ private BsonType bsonTypeForValue(Object value) {
 		if (ClassUtils.isAssignable(Iterable.class, type)) {
 			return BsonType.ARRAY;
 		}
+		if (ClassUtils.isAssignable(Map.class, type)) {
+			return BsonType.DOCUMENT;
+		}
 
 		return BsonType.UNDEFINED;
 	}
 
-	@Nullable
-	private Object evaluateExpression(String expressionString) {
-		return bindingContext.evaluateExpression(expressionString);
+	private @Nullable Object evaluateExpression(String expressionString) {
+		return bindingContext.evaluateExpression(expressionString, Collections.emptyMap());
+	}
+
+	private @Nullable Object evaluateExpression(String expressionString, Map<String,Object> variables) {
+		return bindingContext.evaluateExpression(expressionString, variables);
 	}
 
 	// Spring Data Customization END
@@ -783,9 +848,8 @@ private void visitNew() {
 		} else if ("DBPointer".equals(value)) {
 			currentValue = visitDBPointerConstructor();
 			setCurrentBsonType(BsonType.DB_POINTER);
-		} else if ("UUID".equals(value) || "GUID".equals(value) || "CSUUID".equals(value) || "CSGUID".equals(value)
-				|| "JUUID".equals(value) || "JGUID".equals(value) || "PYUUID".equals(value) || "PYGUID".equals(value)) {
-			currentValue = visitUUIDConstructor(value);
+		} else if ("UUID".equals(value)) {
+			currentValue = visitUUIDConstructor();
 			setCurrentBsonType(BsonType.BINARY);
 		} else {
 			throw new JsonParseException("JSON reader expected a type name but found '%s'.", value);
@@ -805,7 +869,13 @@ private void visitExtendedJSON() {
 					setCurrentBsonType(BsonType.BINARY);
 					return;
 				}
-			} else if ("$regex".equals(value) || "$options".equals(value)) {
+			}
+			if ("$uuid".equals(value)) {
+				currentValue = visitUuidExtendedJson();
+				setCurrentBsonType(BsonType.BINARY);
+				return;
+			}
+			else if ("$regex".equals(value) || "$options".equals(value)) {
 				currentValue = visitRegularExpressionExtendedJson(value);
 				if (currentValue != null) {
 					setCurrentBsonType(BsonType.REGULAR_EXPRESSION);
@@ -895,20 +965,16 @@ private BsonBinary visitBinDataConstructor() {
 		}
 		verifyToken(JsonTokenType.RIGHT_PAREN);
 
-		byte[] bytes = Base64.decode(bytesToken.getValue(String.class));
+		byte[] bytes = Base64.getDecoder().decode(bytesToken.getValue(String.class));
 		return new BsonBinary(subTypeToken.getValue(Integer.class).byteValue(), bytes);
 	}
 
-	private BsonBinary visitUUIDConstructor(final String uuidConstructorName) {
-		verifyToken(JsonTokenType.LEFT_PAREN);
-		String hexString = readStringFromExtendedJson().replaceAll("\\{", "").replaceAll("}", "").replaceAll("-", "");
-		verifyToken(JsonTokenType.RIGHT_PAREN);
-		byte[] bytes = decodeHex(hexString);
-		BsonBinarySubType subType = BsonBinarySubType.UUID_STANDARD;
-		if (!"UUID".equals(uuidConstructorName) || !"GUID".equals(uuidConstructorName)) {
-			subType = BsonBinarySubType.UUID_LEGACY;
-		}
-		return new BsonBinary(subType, bytes);
+	private BsonBinary visitUUIDConstructor() {
+		this.verifyToken(JsonTokenType.LEFT_PAREN);
+		String hexString = this.readStringFromExtendedJson().replace("-", "");
+
+		this.verifyToken(JsonTokenType.RIGHT_PAREN);
+		return new BsonBinary(BsonBinarySubType.UUID_STANDARD, decodeHex(hexString));
 	}
 
 	private BsonRegularExpression visitRegularExpressionConstructor() {
@@ -1022,28 +1088,14 @@ private long visitISODateTimeConstructor() {
 		}
 
 		verifyToken(JsonTokenType.RIGHT_PAREN);
-		String[] patterns = { "yyyy-MM-dd", "yyyy-MM-dd'T'HH:mm:ssz", "yyyy-MM-dd'T'HH:mm:ss.SSSz" };
-
-		SimpleDateFormat format = new SimpleDateFormat(patterns[0], Locale.ENGLISH);
-		ParsePosition pos = new ParsePosition(0);
-		String s = token.getValue(String.class);
-
-		if (s.endsWith("Z")) {
-			s = s.substring(0, s.length() - 1) + "GMT-00:00";
-		}
 
-		for (final String pattern : patterns) {
-			format.applyPattern(pattern);
-			format.setLenient(true);
-			pos.setIndex(0);
+		String dateTimeString = token.getValue(String.class);
 
-			Date date = format.parse(s, pos);
-
-			if (date != null && pos.getIndex() == s.length()) {
-				return date.getTime();
-			}
+		try {
+			return DateTimeFormatter.parse(dateTimeString);
+		} catch (DateTimeParseException e) {
+			throw new JsonParseException("Failed to parse string as a date: " + dateTimeString, e);
 		}
-		throw new JsonParseException("Invalid date format.");
 	}
 
 	private BsonBinary visitHexDataConstructor() {
@@ -1161,7 +1213,7 @@ private BsonBinary visitBinDataExtendedJson(final String firstKey) {
 				byte type;
 				if (firstNestedKey.equals("base64")) {
 					verifyToken(JsonTokenType.COLON);
-					data = Base64.decode(readStringFromExtendedJson());
+					data = Base64.getDecoder().decode(readStringFromExtendedJson());
 					verifyToken(JsonTokenType.COMMA);
 					verifyString("subType");
 					verifyToken(JsonTokenType.COLON);
@@ -1172,7 +1224,7 @@ private BsonBinary visitBinDataExtendedJson(final String firstKey) {
 					verifyToken(JsonTokenType.COMMA);
 					verifyString("base64");
 					verifyToken(JsonTokenType.COLON);
-					data = Base64.decode(readStringFromExtendedJson());
+					data = Base64.getDecoder().decode(readStringFromExtendedJson());
 				} else {
 					throw new JsonParseException("Unexpected key for $binary: " + firstNestedKey);
 				}
@@ -1200,7 +1252,7 @@ private BsonBinary visitLegacyBinaryExtendedJson(final String firstKey) {
 			byte type;
 
 			if (firstKey.equals("$binary")) {
-				data = Base64.decode(readStringFromExtendedJson());
+				data = Base64.getDecoder().decode(readStringFromExtendedJson());
 				verifyToken(JsonTokenType.COMMA);
 				verifyString("$type");
 				verifyToken(JsonTokenType.COLON);
@@ -1210,7 +1262,7 @@ private BsonBinary visitLegacyBinaryExtendedJson(final String firstKey) {
 				verifyToken(JsonTokenType.COMMA);
 				verifyString("$binary");
 				verifyToken(JsonTokenType.COLON);
-				data = Base64.decode(readStringFromExtendedJson());
+				data = Base64.getDecoder().decode(readStringFromExtendedJson());
 			}
 			verifyToken(JsonTokenType.END_OBJECT);
 
@@ -1259,10 +1311,10 @@ private long visitDateTimeExtendedJson() {
 				// Spring Data Customization START
 
 				Object dt = bindableValueFor(valueToken).getValue();
-				if (dt instanceof Date) {
-					value = ((Date) dt).getTime();
-				} else if (dt instanceof Number) {
-					value = NumberUtils.convertNumberToTargetClass((Number) dt, Long.class);
+				if (dt instanceof Date date) {
+					value = date.getTime();
+				} else if (dt instanceof Number numberValue) {
+					value = NumberUtils.convertNumberToTargetClass(numberValue, Long.class);
 				} else {
 					try {
 						value = DateTimeFormatter.parse(dt.toString());
@@ -1368,7 +1420,8 @@ private String readStringFromExtendedJson() {
 		// Spring Data Customization START
 
 		if (patternToken.getType() == JsonTokenType.STRING || patternToken.getType() == JsonTokenType.UNQUOTED_STRING) {
-			return bindableValueFor(patternToken).getValue().toString();
+			Object value = bindableValueFor(patternToken).getValue();
+			return value != null ? value.toString() : null;
 		}
 
 		throw new JsonParseException("JSON reader expected a string but found '%s'.", patternToken.getValue());
@@ -1427,6 +1480,17 @@ private int readIntFromExtendedJson() {
 		return value;
 	}
 
+	private BsonBinary visitUuidExtendedJson() {
+		verifyToken(JsonTokenType.COLON);
+		String hexString = this.readStringFromExtendedJson().replace("-", "");
+		verifyToken(JsonTokenType.END_OBJECT);
+		try {
+			return new BsonBinary(BsonBinarySubType.UUID_STANDARD, decodeHex(hexString));
+		} catch (IllegalArgumentException e) {
+			throw new JsonParseException(e);
+		}
+	}
+
 	private void visitJavaScriptExtendedJson() {
 		verifyToken(JsonTokenType.COLON);
 		String code = readStringFromExtendedJson();
@@ -1554,30 +1618,11 @@ private ObjectId readDbPointerIdFromExtendedJson() {
 		return oid;
 	}
 
-	@Deprecated
-	@Override
-	public void mark() {
-		if (mark != null) {
-			throw new BSONException("A mark already exists; it needs to be reset before creating a new one");
-		}
-		mark = new Mark();
-	}
-
 	@Override
 	public BsonReaderMark getMark() {
 		return new Mark();
 	}
 
-	@Deprecated
-	@Override
-	public void reset() {
-		if (mark == null) {
-			throw new BSONException("trying to reset a mark before creating it");
-		}
-		mark.reset();
-		mark = null;
-	}
-
 	@Override
 	protected Context getContext() {
 		return (Context) super.getContext();
@@ -1640,12 +1685,37 @@ private static byte[] decodeHex(final String hex) {
 
 	// Spring Data Customization START
 
-	@Data
 	static class BindableValue {
 
-		BsonType type;
-		Object value;
-		int index;
+		private BsonType type;
+		private Object value;
+		private int index;
+
+		BindableValue() {}
+
+		BsonType getType() {
+			return type;
+		}
+
+		void setType(BsonType type) {
+			this.type = type;
+		}
+
+		Object getValue() {
+			return value;
+		}
+
+		void setValue(Object value) {
+			this.value = value;
+		}
+
+		int getIndex() {
+			return index;
+		}
+
+		void setIndex(int index) {
+			this.index = index;
+		}
 	}
 
 	// Spring Data Customization END
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ValueProvider.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ValueProvider.java
index d6974b64a4..2ce22214fb 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ValueProvider.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/ValueProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.util.json;
 
-import org.springframework.lang.Nullable;
+import org.jspecify.annotations.Nullable;
 
 /**
  * A value provider to retrieve bindable values by their parameter index.
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/package-info.java
new file mode 100644
index 0000000000..60e5e8c609
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/json/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * MongoDB driver-specific utility classes for Json conversion.
+ */
+@org.jspecify.annotations.NullMarked
+package org.springframework.data.mongodb.util.json;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/package-info.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/package-info.java
index 7caec410f5..a697bb7000 100644
--- a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/package-info.java
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/package-info.java
@@ -2,5 +2,5 @@
  * MongoDB driver-specific utility classes for {@link org.bson.conversions.Bson} and {@link com.mongodb.DBObject}
  * interaction.
  */
-@org.springframework.lang.NonNullApi
+@org.jspecify.annotations.NullMarked
 package org.springframework.data.mongodb.util;
diff --git a/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/spel/ExpressionUtils.java b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/spel/ExpressionUtils.java
new file mode 100644
index 0000000000..796f618906
--- /dev/null
+++ b/spring-data-mongodb/src/main/java/org/springframework/data/mongodb/util/spel/ExpressionUtils.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2021-2025 the original author 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.util.spel;
+
+import java.util.function.Supplier;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ParserContext;
+import org.springframework.expression.common.LiteralExpression;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.util.StringUtils;
+
+/**
+ * Internal utility class for dealing with {@link Expression} and potential ones.
+ *
+ * @author Christoph Strobl
+ * @since 3.3
+ */
+public final class ExpressionUtils {
+
+	private static final SpelExpressionParser PARSER = new SpelExpressionParser();
+
+	/**
+	 * Returns a SpEL {@link Expression} if the given {@link String} is actually an expression that does not evaluate to a
+	 * {@link LiteralExpression} (indicating that no subsequent evaluation is necessary).
+	 *
+	 * @param potentialExpression can be {@literal null}
+	 * @return can be {@literal null}.
+	 */
+	public static @Nullable Expression detectExpression(@Nullable String potentialExpression) {
+
+		if (!StringUtils.hasText(potentialExpression)) {
+			return null;
+		}
+
+		Expression expression = PARSER.parseExpression(potentialExpression, ParserContext.TEMPLATE_EXPRESSION);
+		return expression instanceof LiteralExpression ? null : expression;
+	}
+
+	public static @Nullable Object evaluate(String value, Supplier<EvaluationContext> evaluationContext) {
+
+		Expression expression = detectExpression(value);
+		if (expression == null) {
+			return value;
+		}
+
+		return expression.getValue(evaluationContext.get(), Object.class);
+	}
+}
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/BulkOperationsExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/BulkOperationsExtensions.kt
new file mode 100644
index 0000000000..4c8545ee8c
--- /dev/null
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/BulkOperationsExtensions.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core
+
+import org.springframework.data.mongodb.core.query.Query
+import org.springframework.data.mongodb.core.query.Update
+import org.springframework.data.mongodb.core.query.UpdateDefinition
+import org.springframework.data.util.Pair.of
+
+/**
+ * Extension for [BulkOperations.updateMulti] that converts a list of [kotlin.Pair] to list of [org.springframework.data.util.Pair].
+ *
+ * @author 2tsumo-hitori
+ * @since 4.5
+ */
+fun BulkOperations.updateMulti(kotlinPairs: List<Pair<Query, UpdateDefinition>>): BulkOperations =
+	updateMulti(kotlinPairs.toSpringPairs())
+
+/**
+ * Extension for [BulkOperations.upsert] that converts a list of [kotlin.Pair] to list of [org.springframework.data.util.Pair].
+ *
+ * @author 2tsumo-hitori
+ * @since 4.5
+ */
+fun BulkOperations.upsert(kotlinPairs: List<Pair<Query, Update>>): BulkOperations =
+	upsert(kotlinPairs.toSpringPairs())
+
+/**
+ * Extension for [BulkOperations.updateOne] that converts a [kotlin.Pair] to [org.springframework.data.util.Pair].
+ *
+ * @author 2tsumo-hitori
+ * @since 4.5
+ */
+fun BulkOperations.updateOne(kotlinPairs: List<Pair<Query, UpdateDefinition>>): BulkOperations =
+	updateOne(kotlinPairs.toSpringPairs())
+
+private fun <A : Query, B : UpdateDefinition> List<Pair<A, B>>.toSpringPairs(): List<org.springframework.data.util.Pair<A, B>> {
+	return map { (first, second) -> of(first, second) }
+}
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensions.kt
index 13195bc03a..c995624f38 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,6 @@
  */
 package org.springframework.data.mongodb.core
 
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ExecutableAggregationOperation.aggregateAndReturn] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("aggregateAndReturn<T>()"))
-fun <T : Any> ExecutableAggregationOperation.aggregateAndReturn(entityClass: KClass<T>): ExecutableAggregationOperation.ExecutableAggregation<T> =
-		aggregateAndReturn(entityClass.java)
-
 /**
  * Extension for [ExecutableAggregationOperation.aggregateAndReturn] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt
index e4a88c79cb..cc0d3c7486 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,18 +15,9 @@
  */
 package org.springframework.data.mongodb.core
 
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ExecutableFindOperation.query] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("query<T>()"))
-fun <T : Any> ExecutableFindOperation.query(entityClass: KClass<T>): ExecutableFindOperation.ExecutableFind<T> =
-		query(entityClass.java)
+import org.springframework.data.mapping.toDotPath
+import kotlin.reflect.KProperty
+import kotlin.reflect.KProperty1
 
 /**
  * Extension for [ExecutableFindOperation.query] leveraging reified type parameters.
@@ -39,15 +30,13 @@ inline fun <reified T : Any> ExecutableFindOperation.query(): ExecutableFindOper
 		query(T::class.java)
 
 /**
- * Extension for [ExecutableFindOperation.FindWithProjection.as] providing a [KClass] based variant.
+ * Extension for [ExecutableFindOperation.query] for a type-safe projection of distinct values.
  *
- * @author Sebastien Deleuze
  * @author Mark Paluch
- * @since 2.0
+ * @since 3.0
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("asType<T>()"))
-fun <T : Any> ExecutableFindOperation.FindWithProjection<*>.asType(resultType: KClass<T>): ExecutableFindOperation.FindWithQuery<T> =
-		`as`(resultType.java)
+inline fun <reified T : Any> ExecutableFindOperation.distinct(field : KProperty1<T, *>): ExecutableFindOperation.TerminatingDistinct<Any> =
+		query(T::class.java).distinct(field.name)
 
 /**
  * Extension for [ExecutableFindOperation.FindWithProjection.as] leveraging reified type parameters.
@@ -60,21 +49,20 @@ inline fun <reified T : Any> ExecutableFindOperation.FindWithProjection<*>.asTyp
 		`as`(T::class.java)
 
 /**
- * Extension for [ExecutableFindOperation.DistinctWithProjection.as] providing a [KClass] based variant.
+ * Extension for [ExecutableFindOperation.DistinctWithProjection.as] leveraging reified type parameters.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 2.1
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("asType<T>()"))
-fun <T : Any> ExecutableFindOperation.DistinctWithProjection.asType(resultType: KClass<T>): ExecutableFindOperation.TerminatingDistinct<T> =
-		`as`(resultType.java);
+inline fun <reified T : Any> ExecutableFindOperation.DistinctWithProjection.asType(): ExecutableFindOperation.TerminatingDistinct<T> =
+		`as`(T::class.java)
 
 /**
- * Extension for [ExecutableFindOperation.DistinctWithProjection.as] leveraging reified type parameters.
+ * Extension for [ExecutableFindOperation.FindDistinct.distinct] leveraging KProperty.
  *
- * @author Christoph Strobl
  * @author Mark Paluch
- * @since 2.1
+ * @since 3.0
  */
-inline fun <reified T : Any> ExecutableFindOperation.DistinctWithProjection.asType(): ExecutableFindOperation.TerminatingDistinct<T> =
-		`as`(T::class.java)
+fun ExecutableFindOperation.FindDistinct.distinct(key: KProperty<*>): ExecutableFindOperation.TerminatingDistinct<Any> =
+		distinct(key.toDotPath())
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensions.kt
index 53e0195550..153cc03381 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,6 @@
  */
 package org.springframework.data.mongodb.core
 
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ExecutableInsertOperation.insert] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("insert<T>()"))
-fun <T : Any> ExecutableInsertOperation.insert(entityClass: KClass<T>): ExecutableInsertOperation.ExecutableInsert<T> =
-        insert(entityClass.java)
-
 /**
  * Extension for [ExecutableInsertOperation.insert] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensions.kt
index 6afff66125..fb5551c363 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,18 +15,6 @@
  */
 package org.springframework.data.mongodb.core
 
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ExecutableMapReduceOperation.mapReduce] providing a [KClass] based variant.
- *
- * @author Christoph Strobl
- * @since 2.1
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("mapReduce<T>()"))
-fun <T : Any> ExecutableMapReduceOperation.mapReduce(entityClass: KClass<T>): ExecutableMapReduceOperation.MapReduceWithMapFunction<T> =
-		mapReduce(entityClass.java)
-
 /**
  * Extension for [ExecutableMapReduceOperation.mapReduce] leveraging reified type parameters.
  *
@@ -36,16 +24,6 @@ fun <T : Any> ExecutableMapReduceOperation.mapReduce(entityClass: KClass<T>): Ex
 inline fun <reified T : Any> ExecutableMapReduceOperation.mapReduce(): ExecutableMapReduceOperation.MapReduceWithMapFunction<T> =
 		mapReduce(T::class.java)
 
-/**
- * Extension for [ExecutableMapReduceOperation.MapReduceWithProjection.as] providing a [KClass] based variant.
- *
- * @author Christoph Strobl
- * @since 2.1
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("asType<T>()"))
-fun <T : Any> ExecutableMapReduceOperation.MapReduceWithProjection<*>.asType(resultType: KClass<T>): ExecutableMapReduceOperation.MapReduceWithQuery<T> =
-		`as`(resultType.java)
-
 /**
  * Extension for [ExecutableMapReduceOperation.MapReduceWithProjection.as] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensions.kt
index 83b9f73dbf..d91edb5150 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,6 @@
  */
 package org.springframework.data.mongodb.core
 
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ExecutableRemoveOperation.remove] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("remove<T>()"))
-fun <T : Any> ExecutableRemoveOperation.remove(entityClass: KClass<T>): ExecutableRemoveOperation.ExecutableRemove<T> =
-        remove(entityClass.java)
-
 /**
  * Extension for [ExecutableRemoveOperation.remove] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensions.kt
index 58d23e0b4f..26c9e6b796 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,18 +15,6 @@
  */
 package org.springframework.data.mongodb.core
 
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ExecutableUpdateOperation.update] providing a [KClass] based variant.
- *
- * @author Christoph Strobl
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("update<T>()"))
-fun <T : Any> ExecutableUpdateOperation.update(entityClass: KClass<T>): ExecutableUpdateOperation.ExecutableUpdate<T> =
-		update(entityClass.java)
-
 /**
  * Extension for [ExecutableUpdateOperation.update] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt
index ae0982b823..25af7bd18b 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,22 +26,10 @@ import org.springframework.data.mongodb.core.aggregation.AggregationResults
 import org.springframework.data.mongodb.core.index.IndexOperations
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions
 import org.springframework.data.mongodb.core.mapreduce.MapReduceResults
-import org.springframework.data.mongodb.core.query.Criteria
 import org.springframework.data.mongodb.core.query.NearQuery
 import org.springframework.data.mongodb.core.query.Query
-import org.springframework.data.mongodb.core.query.Update
-import org.springframework.data.util.CloseableIterator
-import kotlin.reflect.KClass
-
-/**
- * Extension for [MongoOperations.getCollectionName] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("getCollectionName<T>()"))
-fun <T : Any> MongoOperations.getCollectionName(entityClass: KClass<T>): String =
-		getCollectionName(entityClass.java)
+import org.springframework.data.mongodb.core.query.UpdateDefinition
+import java.util.stream.Stream
 
 /**
  * Extension for [MongoOperations.getCollectionName] leveraging reified type parameters.
@@ -67,8 +55,8 @@ inline fun <reified T : Any> MongoOperations.execute(action: CollectionCallback<
  * @author Sebastien Deleuze
  * @since 2.0
  */
-inline fun <reified T : Any> MongoOperations.stream(query: Query): CloseableIterator<T> =
-		stream(query, T::class.java)
+inline fun <reified T : Any> MongoOperations.stream(query: Query): Stream<T> =
+	stream(query, T::class.java)
 
 /**
  * Extension for [MongoOperations.stream] leveraging reified type parameters.
@@ -76,20 +64,12 @@ inline fun <reified T : Any> MongoOperations.stream(query: Query): CloseableIter
  * @author Sebastien Deleuze
  * @since 2.0
  */
-inline fun <reified T : Any> MongoOperations.stream(query: Query, collectionName: String? = null): CloseableIterator<T> =
-		if (collectionName != null) stream(query, T::class.java, collectionName)
-		else stream(query, T::class.java)
-
-/**
- * Extension for [MongoOperations.createCollection] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("createCollection<T>(collectionOptions)"))
-fun <T : Any> MongoOperations.createCollection(entityClass: KClass<T>, collectionOptions: CollectionOptions? = null): MongoCollection<Document> =
-		if (collectionOptions != null) createCollection(entityClass.java, collectionOptions)
-		else createCollection(entityClass.java)
+inline fun <reified T : Any> MongoOperations.stream(
+	query: Query,
+	collectionName: String? = null
+): Stream<T> =
+	if (collectionName != null) stream(query, T::class.java, collectionName)
+	else stream(query, T::class.java)
 
 /**
  * Extension for [MongoOperations.createCollection] leveraging reified type parameters.
@@ -102,16 +82,6 @@ inline fun <reified T : Any> MongoOperations.createCollection(
 		if (collectionOptions != null) createCollection(T::class.java, collectionOptions)
 		else createCollection(T::class.java)
 
-/**
- * Extension for [MongoOperations.collectionExists] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("collectionExists<T>()"))
-fun <T : Any> MongoOperations.collectionExists(entityClass: KClass<T>): Boolean =
-		collectionExists(entityClass.java)
-
 /**
  * Extension for [MongoOperations.collectionExists] leveraging reified type parameters.
  *
@@ -121,17 +91,6 @@ fun <T : Any> MongoOperations.collectionExists(entityClass: KClass<T>): Boolean
 inline fun <reified T : Any> MongoOperations.collectionExists(): Boolean =
 		collectionExists(T::class.java)
 
-/**
- * Extension for [MongoOperations.dropCollection] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("dropCollection<T>()"))
-fun <T : Any> MongoOperations.dropCollection(entityClass: KClass<T>) {
-	dropCollection(entityClass.java)
-}
-
 /**
  * Extension for [MongoOperations.dropCollection] leveraging reified type parameters.
  *
@@ -142,16 +101,6 @@ inline fun <reified T : Any> MongoOperations.dropCollection() {
 	dropCollection(T::class.java)
 }
 
-/**
- * Extension for [MongoOperations.indexOps] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("indexOps<T>()"))
-fun <T : Any> MongoOperations.indexOps(entityClass: KClass<T>): IndexOperations =
-		indexOps(entityClass.java)
-
 /**
  * Extension for [MongoOperations.indexOps] leveraging reified type parameters.
  *
@@ -161,17 +110,6 @@ fun <T : Any> MongoOperations.indexOps(entityClass: KClass<T>): IndexOperations
 inline fun <reified T : Any> MongoOperations.indexOps(): IndexOperations =
 		indexOps(T::class.java)
 
-/**
- * Extension for [MongoOperations.bulkOps] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("bulkOps<T>(bulkMode, collectionName)"))
-fun <T : Any> MongoOperations.bulkOps(bulkMode: BulkMode, entityClass: KClass<T>, collectionName: String? = null): BulkOperations =
-		if (collectionName != null) bulkOps(bulkMode, entityClass.java, collectionName)
-		else bulkOps(bulkMode, entityClass.java)
-
 /**
  * Extension for [MongoOperations.bulkOps] leveraging reified type parameters.
  *
@@ -192,37 +130,14 @@ inline fun <reified T : Any> MongoOperations.bulkOps(bulkMode: BulkMode, collect
 inline fun <reified T : Any> MongoOperations.findAll(collectionName: String? = null): List<T> =
 		if (collectionName != null) findAll(T::class.java, collectionName) else findAll(T::class.java)
 
-/**
- * Extension for [MongoOperations.group] leveraging reified type parameters.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Suppress("DEPRECATION")
-@Deprecated("since 2.2, the `group` command has been removed in MongoDB Server 4.2.0.", replaceWith = ReplaceWith("aggregate<T>()"))
-inline fun <reified T : Any> MongoOperations.group(inputCollectionName: String, groupBy: org.springframework.data.mongodb.core.mapreduce.GroupBy): org.springframework.data.mongodb.core.mapreduce.GroupByResults<T> =
-		group(inputCollectionName, groupBy, T::class.java)
-
-/**
- * Extension for [MongoOperations.group] leveraging reified type parameters.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Suppress("DEPRECATION")
-@Deprecated("since 2.2, the `group` command has been removed in MongoDB Server 4.2.0.", replaceWith = ReplaceWith("aggregate<T>()"))
-inline fun <reified T : Any> MongoOperations.group(criteria: Criteria, inputCollectionName: String, groupBy: org.springframework.data.mongodb.core.mapreduce.GroupBy): org.springframework.data.mongodb.core.mapreduce.GroupByResults<T> =
-		group(criteria, inputCollectionName, groupBy, T::class.java)
-
 /**
  * Extension for [MongoOperations.aggregate] leveraging reified type parameters.
  *
- * @author Sebastien Deleuze
- * @since 2.0
+ * @author Mark Paluch
+ * @since 3.2
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("aggregate<T>(aggregation)"))
-inline fun <reified O : Any> MongoOperations.aggregate(aggregation: Aggregation, inputType: KClass<*>): AggregationResults<O> =
-		aggregate(aggregation, inputType.java, O::class.java)
+inline fun <reified I : Any, reified O : Any> MongoOperations.aggregate(aggregation: Aggregation): AggregationResults<O> =
+	aggregate(aggregation, I::class.java, O::class.java)
 
 /**
  * Extension for [MongoOperations.aggregate] leveraging reified type parameters.
@@ -230,18 +145,20 @@ inline fun <reified O : Any> MongoOperations.aggregate(aggregation: Aggregation,
  * @author Sebastien Deleuze
  * @since 2.0
  */
-inline fun <reified O : Any> MongoOperations.aggregate(aggregation: Aggregation, collectionName: String): AggregationResults<O> =
-		aggregate(aggregation, collectionName, O::class.java)
+inline fun <reified O : Any> MongoOperations.aggregate(
+	aggregation: Aggregation,
+	collectionName: String
+): AggregationResults<O> =
+	aggregate(aggregation, collectionName, O::class.java)
 
 /**
  * Extension for [MongoOperations.aggregateStream] leveraging reified type parameters.
  *
- * @author Sebastien Deleuze
- * @since 2.0
+ * @author Mark Paluch
+ * @since 3.2
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("aggregateStream<T>(aggregation)"))
-inline fun <reified O : Any> MongoOperations.aggregateStream(aggregation: Aggregation, inputType: KClass<*>): CloseableIterator<O> =
-		aggregateStream(aggregation, inputType.java, O::class.java)
+inline fun <reified I : Any, reified O : Any> MongoOperations.aggregateStream(aggregation: Aggregation): Stream<O> =
+	aggregateStream(aggregation, I::class.java, O::class.java)
 
 /**
  * Extension for [MongoOperations.aggregateStream] leveraging reified type parameters.
@@ -249,8 +166,11 @@ inline fun <reified O : Any> MongoOperations.aggregateStream(aggregation: Aggreg
  * @author Sebastien Deleuze
  * @since 2.0
  */
-inline fun <reified O : Any> MongoOperations.aggregateStream(aggregation: Aggregation, collectionName: String): CloseableIterator<O> =
-		aggregateStream(aggregation, collectionName, O::class.java)
+inline fun <reified O : Any> MongoOperations.aggregateStream(
+	aggregation: Aggregation,
+	collectionName: String
+): Stream<O> =
+	aggregateStream(aggregation, collectionName, O::class.java)
 
 /**
  * Extension for [MongoOperations.mapReduce] leveraging reified type parameters.
@@ -293,17 +213,6 @@ inline fun <reified T : Any> MongoOperations.geoNear(near: NearQuery, collection
 inline fun <reified T : Any> MongoOperations.findOne(query: Query, collectionName: String? = null): T? =
 		if (collectionName != null) findOne(query, T::class.java, collectionName) else findOne(query, T::class.java)
 
-/**
- * Extension for [MongoOperations.exists] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("exists<T>(query, collectionName)"))
-fun <T : Any> MongoOperations.exists(query: Query, entityClass: KClass<T>, collectionName: String? = null): Boolean =
-		if (collectionName != null) exists(query, entityClass.java, collectionName)
-		else exists(query, entityClass.java)
-
 /**
  * Extension for [MongoOperations.exists] leveraging reified type parameters.
  *
@@ -335,36 +244,6 @@ inline fun <reified T : Any> MongoOperations.findById(id: Any, collectionName: S
 		if (collectionName != null) findById(id, T::class.java, collectionName)
 		else findById(id, T::class.java)
 
-/**
- * Extension for [MongoOperations.findDistinct] leveraging reified type parameters.
- *
- * @author Christoph Strobl
- * @since 2.1
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("findDistinct<T, E>(field)"))
-inline fun <reified T : Any> MongoOperations.findDistinct(field: String, entityClass: KClass<*>): List<T> =
-		findDistinct(field, entityClass.java, T::class.java)
-
-/**
- * Extension for [MongoOperations.findDistinct] leveraging reified type parameters.
- *
- * @author Christoph Strobl
- * @since 2.1
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("findDistinct<T, E>(query, field)"))
-inline fun <reified T : Any> MongoOperations.findDistinct(query: Query, field: String, entityClass: KClass<*>): List<T> =
-		findDistinct(query, field, entityClass.java, T::class.java)
-
-/**
- * Extension for [MongoOperations.findDistinct] leveraging reified type parameters.
- *
- * @author Christoph Strobl
- * @since 2.1
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("findDistinct<T, E>(query, field, collectionName)"))
-inline fun <reified T : Any> MongoOperations.findDistinct(query: Query, field: String, collectionName: String, entityClass: KClass<*>): List<T> =
-		findDistinct(query, field, collectionName, entityClass.java, T::class.java)
-
 /**
  * Extension for [MongoOperations.findDistinct] leveraging reified type parameters.
  *
@@ -382,7 +261,7 @@ inline fun <reified T : Any, reified E : Any> MongoOperations.findDistinct(query
  * @author Sebastien Deleuze
  * @since 2.0
  */
-inline fun <reified T : Any> MongoOperations.findAndModify(query: Query, update: Update, options: FindAndModifyOptions, collectionName: String? = null): T? =
+inline fun <reified T : Any> MongoOperations.findAndModify(query: Query, update: UpdateDefinition, options: FindAndModifyOptions, collectionName: String? = null): T? =
 		if (collectionName != null) findAndModify(query, update, options, T::class.java, collectionName)
 		else findAndModify(query, update, options, T::class.java)
 
@@ -396,17 +275,6 @@ inline fun <reified T : Any> MongoOperations.findAndRemove(query: Query, collect
 		if (collectionName != null) findAndRemove(query, T::class.java, collectionName)
 		else findAndRemove(query, T::class.java)
 
-/**
- * Extension for [MongoOperations.count] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("count<T>(query, collectionName)"))
-fun <T : Any> MongoOperations.count(query: Query = Query(), entityClass: KClass<T>, collectionName: String? = null): Long =
-		if (collectionName != null) count(query, entityClass.java, collectionName)
-		else count(query, entityClass.java)
-
 /**
  * Extension for [MongoOperations.count] leveraging reified type parameters.
  *
@@ -417,17 +285,6 @@ fun <T : Any> MongoOperations.count(query: Query = Query(), entityClass: KClass<
 inline fun <reified T : Any> MongoOperations.count(query: Query = Query(), collectionName: String? = null): Long =
 		if (collectionName != null) count(query, T::class.java, collectionName) else count(query, T::class.java)
 
-/**
- * Extension for [MongoOperations.insert] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("insert<T>(batchToSave)"))
-fun <T : Any> MongoOperations.insert(batchToSave: Collection<T>, entityClass: KClass<T>) {
-	insert(batchToSave, entityClass.java)
-}
-
 /**
  * Extension for [MongoOperations.insert] leveraging reified type parameters.
  *
@@ -437,17 +294,6 @@ fun <T : Any> MongoOperations.insert(batchToSave: Collection<T>, entityClass: KC
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 inline fun <reified T : Any> MongoOperations.insert(batchToSave: Collection<T>): Collection<T> = insert(batchToSave, T::class.java)
 
-/**
- * Extension for [MongoOperations.upsert] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("upsert<T>(query, update, collectionName)"))
-fun <T : Any> MongoOperations.upsert(query: Query, update: Update, entityClass: KClass<T>, collectionName: String? = null): UpdateResult =
-		if (collectionName != null) upsert(query, update, entityClass.java, collectionName)
-		else upsert(query, update, entityClass.java)
-
 /**
  * Extension for [MongoOperations.upsert] leveraging reified type parameters.
  *
@@ -455,21 +301,10 @@ fun <T : Any> MongoOperations.upsert(query: Query, update: Update, entityClass:
  * @since 2.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Any> MongoOperations.upsert(query: Query, update: Update, collectionName: String? = null): UpdateResult =
+inline fun <reified T : Any> MongoOperations.upsert(query: Query, update: UpdateDefinition, collectionName: String? = null): UpdateResult =
 		if (collectionName != null) upsert(query, update, T::class.java, collectionName)
 		else upsert(query, update, T::class.java)
 
-/**
- * Extension for [MongoOperations.updateFirst] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("updateFirst<T>(query, update, collectionName)"))
-fun <T : Any> MongoOperations.updateFirst(query: Query, update: Update, entityClass: KClass<T>, collectionName: String? = null): UpdateResult =
-		if (collectionName != null) updateFirst(query, update, entityClass.java, collectionName)
-		else updateFirst(query, update, entityClass.java)
-
 /**
  * Extension for [MongoOperations.updateFirst] leveraging reified type parameters.
  *
@@ -477,21 +312,10 @@ fun <T : Any> MongoOperations.updateFirst(query: Query, update: Update, entityCl
  * @since 2.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Any> MongoOperations.updateFirst(query: Query, update: Update, collectionName: String? = null): UpdateResult =
+inline fun <reified T : Any> MongoOperations.updateFirst(query: Query, update: UpdateDefinition, collectionName: String? = null): UpdateResult =
 		if (collectionName != null) updateFirst(query, update, T::class.java, collectionName)
 		else updateFirst(query, update, T::class.java)
 
-/**
- * Extension for [MongoOperations.updateMulti] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("updateMulti<T>(query, update, collectionName)"))
-fun <T : Any> MongoOperations.updateMulti(query: Query, update: Update, entityClass: KClass<T>, collectionName: String? = null): UpdateResult =
-		if (collectionName != null) updateMulti(query, update, entityClass.java, collectionName)
-		else updateMulti(query, update, entityClass.java)
-
 /**
  * Extension for [MongoOperations.updateMulti] leveraging reified type parameters.
  *
@@ -499,21 +323,10 @@ fun <T : Any> MongoOperations.updateMulti(query: Query, update: Update, entityCl
  * @since 2.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Any> MongoOperations.updateMulti(query: Query, update: Update, collectionName: String? = null): UpdateResult =
+inline fun <reified T : Any> MongoOperations.updateMulti(query: Query, update: UpdateDefinition, collectionName: String? = null): UpdateResult =
 		if (collectionName != null) updateMulti(query, update, T::class.java, collectionName)
 		else updateMulti(query, update, T::class.java)
 
-/**
- * Extension for [MongoOperations.remove] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("remove<T>(query, collectionName)"))
-fun <T : Any> MongoOperations.remove(query: Query, entityClass: KClass<T>, collectionName: String? = null): DeleteResult =
-		if (collectionName != null) remove(query, entityClass.java, collectionName)
-		else remove(query, entityClass.java)
-
 /**
  * Extension for [MongoOperations.remove] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt
index 8d585ab74a..e59c5786bc 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,6 @@ package org.springframework.data.mongodb.core
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ExecutableAggregationOperation.aggregateAndReturn] providing a [KClass] based variant.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("aggregateAndReturn<T>()"))
-fun <T : Any> ReactiveAggregationOperation.aggregateAndReturn(entityClass: KClass<T>): ReactiveAggregationOperation.ReactiveAggregation<T> =
-        aggregateAndReturn(entityClass.java)
 
 /**
  * Extension for [ExecutableAggregationOperation.aggregateAndReturn] leveraging reified type parameters.
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt
index 264184e380..d589c32285 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt
index 1037c22c29..da1cb7d333 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,17 +20,9 @@ import kotlinx.coroutines.reactive.asFlow
 import kotlinx.coroutines.reactive.awaitFirstOrNull
 import kotlinx.coroutines.reactive.awaitSingle
 import org.springframework.data.geo.GeoResult
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ReactiveFindOperation.query] providing a [KClass] based variant.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("query<T>()"))
-fun <T : Any> ReactiveFindOperation.query(entityClass: KClass<T>): ReactiveFindOperation.ReactiveFind<T> =
-		query(entityClass.java)
+import org.springframework.data.mapping.toDotPath
+import kotlin.reflect.KProperty
+import kotlin.reflect.KProperty1
 
 /**
  * Extension for [ReactiveFindOperation.query] leveraging reified type parameters.
@@ -42,14 +34,13 @@ inline fun <reified T : Any> ReactiveFindOperation.query(): ReactiveFindOperatio
 		query(T::class.java)
 
 /**
- * Extension for [ReactiveFindOperation.FindWithProjection.as] providing a [KClass] based variant.
+ * Extension for [ReactiveFindOperation.query] for a type-safe projection of distinct values.
  *
  * @author Mark Paluch
- * @since 2.0
+ * @since 3.0
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("asType<T>()"))
-fun <T : Any> ReactiveFindOperation.FindWithProjection<*>.asType(resultType: KClass<T>): ReactiveFindOperation.FindWithQuery<T> =
-		`as`(resultType.java)
+inline fun <reified T : Any> ReactiveFindOperation.distinct(field : KProperty1<T, *>): ReactiveFindOperation.TerminatingDistinct<Any> =
+		query(T::class.java).distinct(field.name)
 
 /**
  * Extension for [ReactiveFindOperation.FindWithProjection.as] leveraging reified type parameters.
@@ -61,23 +52,22 @@ inline fun <reified T : Any> ReactiveFindOperation.FindWithProjection<*>.asType(
 		`as`(T::class.java)
 
 /**
- * Extension for [ExecutableFindOperation.DistinctWithProjection.as] providing a [KClass] based variant.
+ * Extension for [ReactiveFindOperation.DistinctWithProjection.as] leveraging reified type parameters.
  *
  * @author Christoph Strobl
  * @since 2.1
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("asType<T>()"))
-fun <T : Any> ReactiveFindOperation.DistinctWithProjection.asType(resultType: KClass<T>): ReactiveFindOperation.TerminatingDistinct<T> =
-		`as`(resultType.java);
+inline fun <reified T : Any> ReactiveFindOperation.DistinctWithProjection.asType(): ReactiveFindOperation.TerminatingDistinct<T> =
+		`as`(T::class.java)
 
 /**
- * Extension for [ReactiveFindOperation.DistinctWithProjection.as] leveraging reified type parameters.
+ * Extension for [ReactiveFindOperation.FindDistinct.distinct] leveraging KProperty.
  *
- * @author Christoph Strobl
- * @since 2.1
+ * @author Mark Paluch
+ * @since 3.0
  */
-inline fun <reified T : Any> ReactiveFindOperation.DistinctWithProjection.asType(): ReactiveFindOperation.TerminatingDistinct<T> =
-		`as`(T::class.java)
+fun ReactiveFindOperation.FindDistinct.distinct(key: KProperty<*>): ReactiveFindOperation.TerminatingDistinct<Any> =
+		distinct(key.toDotPath())
 
 /**
  * Non-nullable Coroutines variant of [ReactiveFindOperation.TerminatingFind.one].
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt
index 04425dc091..2ed40aa074 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,6 @@ package org.springframework.data.mongodb.core
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
 import kotlinx.coroutines.reactive.awaitSingle
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ReactiveInsertOperation.insert] providing a [KClass] based variant.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("insert<T>()"))
-fun <T : Any> ReactiveInsertOperation.insert(entityClass: KClass<T>): ReactiveInsertOperation.ReactiveInsert<T> =
-		insert(entityClass.java)
 
 /**
  * Extension for [ReactiveInsertOperation.insert] leveraging reified type parameters.
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt
index 772c643909..7fc4678100 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,6 @@ package org.springframework.data.mongodb.core
 
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ReactiveMapReduceOperation.mapReduce] providing a [KClass] based variant.
- *
- * @author Christoph Strobl
- * @since 2.1
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("mapReduce<T>()"))
-fun <T : Any> ReactiveMapReduceOperation.mapReduce(entityClass: KClass<T>): ReactiveMapReduceOperation.MapReduceWithMapFunction<T> =
-		mapReduce(entityClass.java)
 
 /**
  * Extension for [ReactiveMapReduceOperation.mapReduce] leveraging reified type parameters.
@@ -38,16 +27,6 @@ fun <T : Any> ReactiveMapReduceOperation.mapReduce(entityClass: KClass<T>): Reac
 inline fun <reified T : Any> ReactiveMapReduceOperation.mapReduce(): ReactiveMapReduceOperation.MapReduceWithMapFunction<T> =
 		mapReduce(T::class.java)
 
-/**
- * Extension for [ReactiveMapReduceOperation.MapReduceWithProjection.as] providing a [KClass] based variant.
- *
- * @author Christoph Strobl
- * @since 2.1
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("asType<T>()"))
-fun <T : Any> ReactiveMapReduceOperation.MapReduceWithProjection<*>.asType(resultType: KClass<T>): ReactiveMapReduceOperation.MapReduceWithQuery<T> =
-		`as`(resultType.java)
-
 /**
  * Extension for [ReactiveMapReduceOperation.MapReduceWithProjection.as] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt
index 6ff2a95df2..fda959be64 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,23 +20,14 @@ import com.mongodb.client.result.UpdateResult
 import com.mongodb.reactivestreams.client.MongoCollection
 import org.bson.Document
 import org.springframework.data.geo.GeoResult
+import org.springframework.data.mongodb.core.aggregation.Aggregation
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation
 import org.springframework.data.mongodb.core.index.ReactiveIndexOperations
 import org.springframework.data.mongodb.core.query.NearQuery
 import org.springframework.data.mongodb.core.query.Query
-import org.springframework.data.mongodb.core.query.Update
+import org.springframework.data.mongodb.core.query.UpdateDefinition
 import reactor.core.publisher.Flux
 import reactor.core.publisher.Mono
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ReactiveMongoOperations.indexOps] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("indexOps<T>()"))
-fun <T : Any> ReactiveMongoOperations.indexOps(entityClass: KClass<T>): ReactiveIndexOperations =
-		indexOps(entityClass.java)
 
 /**
  * Extension for [ReactiveMongoOperations.indexOps] leveraging reified type parameters.
@@ -56,16 +47,6 @@ inline fun <reified T : Any> ReactiveMongoOperations.indexOps(): ReactiveIndexOp
 inline fun <reified T : Any> ReactiveMongoOperations.execute(action: ReactiveCollectionCallback<T>): Flux<T> =
 		execute(T::class.java, action)
 
-/**
- * Extension for [ReactiveMongoOperations.createCollection] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("createCollection<T>(collectionOptions)"))
-fun <T : Any> ReactiveMongoOperations.createCollection(entityClass: KClass<T>, collectionOptions: CollectionOptions? = null): Mono<MongoCollection<Document>> =
-		if (collectionOptions != null) createCollection(entityClass.java, collectionOptions) else createCollection(entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.createCollection] leveraging reified type parameters.
  *
@@ -75,16 +56,6 @@ fun <T : Any> ReactiveMongoOperations.createCollection(entityClass: KClass<T>, c
 inline fun <reified T : Any> ReactiveMongoOperations.createCollection(collectionOptions: CollectionOptions? = null): Mono<MongoCollection<Document>> =
 		if (collectionOptions != null) createCollection(T::class.java, collectionOptions) else createCollection(T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.collectionExists] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("collectionExists<T>()"))
-fun <T : Any> ReactiveMongoOperations.collectionExists(entityClass: KClass<T>): Mono<Boolean> =
-		collectionExists(entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.collectionExists] leveraging reified type parameters.
  *
@@ -94,16 +65,6 @@ fun <T : Any> ReactiveMongoOperations.collectionExists(entityClass: KClass<T>):
 inline fun <reified T : Any> ReactiveMongoOperations.collectionExists(): Mono<Boolean> =
 		collectionExists(T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.dropCollection] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("dropCollection<T>()"))
-fun <T : Any> ReactiveMongoOperations.dropCollection(entityClass: KClass<T>): Mono<Void> =
-		dropCollection(entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.dropCollection] leveraging reified type parameters.
  *
@@ -131,16 +92,6 @@ inline fun <reified T : Any> ReactiveMongoOperations.findAll(collectionName: Str
 inline fun <reified T : Any> ReactiveMongoOperations.findOne(query: Query, collectionName: String? = null): Mono<T> =
 		if (collectionName != null) findOne(query, T::class.java, collectionName) else findOne(query, T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.exists] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("exists<T>(query, collectionName)"))
-fun <T : Any> ReactiveMongoOperations.exists(query: Query, entityClass: KClass<T>, collectionName: String? = null): Mono<Boolean> =
-		if (collectionName != null) exists(query, entityClass.java, collectionName) else exists(query, entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.exists] leveraging reified type parameters.
  *
@@ -173,42 +124,58 @@ inline fun <reified T : Any> ReactiveMongoOperations.findById(id: Any, collectio
  * Extension for [ReactiveMongoOperations.findDistinct] leveraging reified type parameters.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @since 2.1
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("findDistinct<T, E>(field)"))
-inline fun <reified T : Any> ReactiveMongoOperations.findDistinct(field: String, entityClass: KClass<*>): Flux<T> =
-		findDistinct(field, entityClass.java, T::class.java);
+inline fun <reified T : Any, reified E : Any> ReactiveMongoOperations.findDistinct(query: Query, field: String, collectionName: String? = null): Flux<T> =
+		if (collectionName != null) findDistinct(query, field, collectionName, E::class.java, T::class.java)
+		else findDistinct(query, field, E::class.java, T::class.java)
+
 
 /**
- * Extension for [ReactiveMongoOperations.findDistinct] leveraging reified type parameters.
+ * Extension for [ReactiveMongoOperations.aggregate] leveraging reified type parameters.
  *
- * @author Christoph Strobl
- * @since 2.1
+ * @author Wonwoo Lee
+ * @since 3.1.4
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("findDistinct<T, E>(query, field)"))
-inline fun <reified T : Any> ReactiveMongoOperations.findDistinct(query: Query, field: String, entityClass: KClass<*>): Flux<T> =
-		findDistinct(query, field, entityClass.java, T::class.java)
+inline fun <reified O : Any> ReactiveMongoOperations.aggregate(
+	aggregation: TypedAggregation<*>,
+	collectionName: String
+): Flux<O> =
+	this.aggregate(aggregation, collectionName, O::class.java)
 
 /**
- * Extension for [ReactiveMongoOperations.findDistinct] leveraging reified type parameters.
+ * Extension for [ReactiveMongoOperations.aggregate] leveraging reified type parameters.
  *
- * @author Christoph Strobl
- * @since 2.1
+ * @author Wonwoo Lee
+ * @since 3.1.4
  */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("findDistinct<T, E>(query, field, collectionName)"))
-inline fun <reified T : Any> ReactiveMongoOperations.findDistinct(query: Query, field: String, collectionName: String, entityClass: KClass<*>): Flux<T> =
-		findDistinct(query, field, collectionName, entityClass.java, T::class.java)
+inline fun <reified O : Any> ReactiveMongoOperations.aggregate(aggregation: TypedAggregation<*>): Flux<O> =
+	this.aggregate(aggregation, O::class.java)
 
 /**
- * Extension for [ReactiveMongoOperations.findDistinct] leveraging reified type parameters.
+ * Extension for [ReactiveMongoOperations.aggregate] leveraging reified type parameters.
  *
- * @author Christoph Strobl
+ * @author Wonwoo Lee
  * @author Mark Paluch
- * @since 2.1
+ * @since 3.1.4
  */
-inline fun <reified T : Any, reified E : Any> ReactiveMongoOperations.findDistinct(query: Query, field: String, collectionName: String? = null): Flux<T> =
-		if (collectionName != null) findDistinct(query, field, collectionName, E::class.java, T::class.java)
-		else findDistinct(query, field, E::class.java, T::class.java)
+inline fun <reified I : Any, reified O : Any> ReactiveMongoOperations.aggregate(
+	aggregation: Aggregation
+): Flux<O> =
+	this.aggregate(aggregation, I::class.java, O::class.java)
+
+/**
+ * Extension for [ReactiveMongoOperations.aggregate] leveraging reified type parameters.
+ *
+ * @author Wonwoo Lee
+ * @since 3.1.4
+ */
+inline fun <reified O : Any> ReactiveMongoOperations.aggregate(
+	aggregation: Aggregation,
+	collectionName: String
+): Flux<O> =
+	this.aggregate(aggregation, collectionName, O::class.java)
 
 /**
  * Extension for [ReactiveMongoOperations.geoNear] leveraging reified type parameters.
@@ -227,7 +194,7 @@ inline fun <reified T : Any> ReactiveMongoOperations.geoNear(near: NearQuery, co
  * @author Sebastien Deleuze
  * @since 2.0
  */
-inline fun <reified T : Any> ReactiveMongoOperations.findAndModify(query: Query, update: Update, options: FindAndModifyOptions, collectionName: String? = null): Mono<T> =
+inline fun <reified T : Any> ReactiveMongoOperations.findAndModify(query: Query, update: UpdateDefinition, options: FindAndModifyOptions, collectionName: String? = null): Mono<T> =
 		if (collectionName != null) findAndModify(query, update, options, T::class.java, collectionName) else findAndModify(query, update, options, T::class.java)
 
 /**
@@ -240,17 +207,6 @@ inline fun <reified T : Any> ReactiveMongoOperations.findAndRemove(query: Query,
 		if (collectionName != null) findAndRemove(query, T::class.java, collectionName)
 		else findAndRemove(query, T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.count] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("count<T>(query, collectionName)"))
-fun <T : Any> ReactiveMongoOperations.count(query: Query = Query(), entityClass: KClass<T>, collectionName: String? = null): Mono<Long> =
-		if (collectionName != null) count(query, entityClass.java, collectionName)
-		else count(query, entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.count] leveraging reified type parameters.
  *
@@ -262,16 +218,6 @@ inline fun <reified T : Any> ReactiveMongoOperations.count(query: Query = Query(
 		if (collectionName != null) count(query, T::class.java, collectionName)
 		else count(query, T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.insert] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("insert<T>(batchToSave)"))
-fun <T : Any> ReactiveMongoOperations.insert(batchToSave: Collection<T>, entityClass: KClass<T>): Flux<T> =
-		insert(batchToSave, entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.insert] leveraging reified type parameters.
  *
@@ -281,26 +227,6 @@ fun <T : Any> ReactiveMongoOperations.insert(batchToSave: Collection<T>, entityC
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
 inline fun <reified T : Any> ReactiveMongoOperations.insert(batchToSave: Collection<T>): Flux<T> = insert(batchToSave, T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.insertAll] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("insertAll<T>(batchToSave)"))
-fun <T : Any> ReactiveMongoOperations.insertAll(batchToSave: Mono<out Collection<T>>, entityClass: KClass<T>): Flux<T> =
-		insertAll(batchToSave, entityClass.java)
-
-/**
- * Extension for [ReactiveMongoOperations.upsert] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("upsert<T>(query, update, collectionName)"))
-fun <T : Any> ReactiveMongoOperations.upsert(query: Query, update: Update, entityClass: KClass<T>, collectionName: String? = null): Mono<UpdateResult> =
-		if (collectionName != null) upsert(query, update, entityClass.java, collectionName) else upsert(query, update, entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.upsert] leveraging reified type parameters.
  *
@@ -308,21 +234,10 @@ fun <T : Any> ReactiveMongoOperations.upsert(query: Query, update: Update, entit
  * @since 2.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Any> ReactiveMongoOperations.upsert(query: Query, update: Update, collectionName: String? = null): Mono<UpdateResult> =
+inline fun <reified T : Any> ReactiveMongoOperations.upsert(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono<UpdateResult> =
 		if (collectionName != null) upsert(query, update, T::class.java, collectionName)
 		else upsert(query, update, T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.updateFirst] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("updateFirst<T>(query, update, collectionName)"))
-fun <T : Any> ReactiveMongoOperations.updateFirst(query: Query, update: Update, entityClass: KClass<T>, collectionName: String? = null): Mono<UpdateResult> =
-		if (collectionName != null) updateFirst(query, update, entityClass.java, collectionName)
-		else updateFirst(query, update, entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.updateFirst] leveraging reified type parameters.
  *
@@ -330,21 +245,10 @@ fun <T : Any> ReactiveMongoOperations.updateFirst(query: Query, update: Update,
  * @since 2.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Any> ReactiveMongoOperations.updateFirst(query: Query, update: Update, collectionName: String? = null): Mono<UpdateResult> =
+inline fun <reified T : Any> ReactiveMongoOperations.updateFirst(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono<UpdateResult> =
 		if (collectionName != null) updateFirst(query, update, T::class.java, collectionName)
 		else updateFirst(query, update, T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.updateMulti] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("updateMulti<T>(query, update, collectionName)"))
-fun <T : Any> ReactiveMongoOperations.updateMulti(query: Query, update: Update, entityClass: KClass<T>, collectionName: String? = null): Mono<UpdateResult> =
-		if (collectionName != null) updateMulti(query, update, entityClass.java, collectionName)
-		else updateMulti(query, update, entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.updateMulti] leveraging reified type parameters.
  *
@@ -352,21 +256,10 @@ fun <T : Any> ReactiveMongoOperations.updateMulti(query: Query, update: Update,
  * @since 2.0
  */
 @Suppress("EXTENSION_SHADOWED_BY_MEMBER")
-inline fun <reified T : Any> ReactiveMongoOperations.updateMulti(query: Query, update: Update, collectionName: String? = null): Mono<UpdateResult> =
+inline fun <reified T : Any> ReactiveMongoOperations.updateMulti(query: Query, update: UpdateDefinition, collectionName: String? = null): Mono<UpdateResult> =
 		if (collectionName != null) updateMulti(query, update, T::class.java, collectionName)
 		else updateMulti(query, update, T::class.java)
 
-/**
- * Extension for [ReactiveMongoOperations.remove] providing a [KClass] based variant.
- *
- * @author Sebastien Deleuze
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("remove<T>(query, collectionName)"))
-fun <T : Any> ReactiveMongoOperations.remove(query: Query, entityClass: KClass<T>, collectionName: String? = null): Mono<DeleteResult> =
-		if (collectionName != null) remove(query, entityClass.java, collectionName)
-		else remove(query, entityClass.java)
-
 /**
  * Extension for [ReactiveMongoOperations.remove] leveraging reified type parameters.
  *
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt
index d855f6d94d..5cf7ccf514 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,17 +19,6 @@ import com.mongodb.client.result.DeleteResult
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.reactive.asFlow
 import kotlinx.coroutines.reactive.awaitSingle
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ReactiveRemoveOperation.remove] providing a [KClass] based variant.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("remove<T>()"))
-fun <T : Any> ReactiveRemoveOperation.remove(entityClass: KClass<T>): ReactiveRemoveOperation.ReactiveRemove<T> =
-		remove(entityClass.java)
 
 /**
  * Extension for [ReactiveRemoveOperation.remove] leveraging reified type parameters.
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensions.kt
index 1bbba22e55..0c603dcaed 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,6 @@ package org.springframework.data.mongodb.core
 import com.mongodb.client.result.UpdateResult
 import kotlinx.coroutines.reactive.awaitFirstOrNull
 import kotlinx.coroutines.reactive.awaitSingle
-import kotlin.reflect.KClass
-
-/**
- * Extension for [ReactiveUpdateOperation.update] providing a [KClass] based variant.
- *
- * @author Mark Paluch
- * @since 2.0
- */
-@Deprecated("Since 2.2, use the reified variant", replaceWith = ReplaceWith("update<T>()"))
-fun <T : Any> ReactiveUpdateOperation.update(entityClass: KClass<T>): ReactiveUpdateOperation.ReactiveUpdate<T> =
-		update(entityClass.java)
 
 /**
  * Extension for [ReactiveUpdateOperation.update] leveraging reified type parameters.
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensions.kt
index e4be2a00b1..f4744d402a 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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.query
 
+import org.springframework.data.mapping.toDotPath
 import kotlin.reflect.KProperty
 
 /**
@@ -47,7 +48,7 @@ fun Criteria.inValues(vararg o: Any?): Criteria = `in`(*o)
  * @author Tjeu Kayim
  * @since 2.2
  */
-fun where(key: KProperty<*>): Criteria = Criteria.where(asString(key))
+fun where(key: KProperty<*>): Criteria = Criteria.where(key.toDotPath())
 
 /**
  * Add new key to the criteria chain using a KProperty.
@@ -55,4 +56,4 @@ fun where(key: KProperty<*>): Criteria = Criteria.where(asString(key))
  * @author Tjeu Kayim
  * @since 2.2
  */
-infix fun Criteria.and(key: KProperty<*>): Criteria = and(asString(key))
+infix fun Criteria.and(key: KProperty<*>): Criteria = and(key.toDotPath())
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/KPropertyPath.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/KPropertyPath.kt
deleted file mode 100644
index ceeee61647..0000000000
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/KPropertyPath.kt
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.query
-
-import kotlin.reflect.KProperty
-import kotlin.reflect.KProperty1
-
-/**
- * Abstraction of a property path consisting of [KProperty].
- * @author Tjeu Kayim
- * @author Mark Paluch
- * @since 2.2
- */
-class KPropertyPath<T, U>(
-		internal val parent: KProperty<U>,
-		internal val child: KProperty1<U, T>
-) : KProperty<T> by child
-
-/**
- * Recursively construct field name for a nested property.
- * @author Tjeu Kayim
- */
-internal fun asString(property: KProperty<*>): String {
-	return when (property) {
-		is KPropertyPath<*, *> ->
-			"${asString(property.parent)}.${property.child.name}"
-		else -> property.name
-	}
-}
-
-/**
- * Builds [KPropertyPath] from Property References.
- * Refer to a field in an embedded/nested document.
- *
- * For example, referring to the field "book.author":
- * ```
- * Book::author / Author::name isEqualTo "Herman Melville"
- * ```
- * @author Tjeu Kayim
- * @since 2.2
- */
-operator fun <T, U> KProperty<T>.div(other: KProperty1<T, U>) =
-		KPropertyPath(this, other)
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt
index c23d751ed3..43cf02ea4c 100644
--- a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensions.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,6 +19,7 @@ import org.bson.BsonRegularExpression
 import org.springframework.data.geo.Circle
 import org.springframework.data.geo.Point
 import org.springframework.data.geo.Shape
+import org.springframework.data.mapping.toDotPath
 import org.springframework.data.mongodb.core.geo.GeoJson
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject
 import java.util.regex.Pattern
@@ -31,7 +32,7 @@ import kotlin.reflect.KProperty
  * @see Criteria.isEqualTo
  */
 infix fun <T> KProperty<T>.isEqualTo(value: T) =
-		Criteria(asString(this)).isEqualTo(value)
+		Criteria(this.toDotPath()).isEqualTo(value)
 
 /**
  * Creates a criterion using the $ne operator.
@@ -42,7 +43,7 @@ infix fun <T> KProperty<T>.isEqualTo(value: T) =
  * @see Criteria.ne
  */
 infix fun <T> KProperty<T>.ne(value: T): Criteria =
-		Criteria(asString(this)).ne(value)
+		Criteria(this.toDotPath()).ne(value)
 
 /**
  * Creates a criterion using the $lt operator.
@@ -52,8 +53,8 @@ infix fun <T> KProperty<T>.ne(value: T): Criteria =
  * @since 2.2
  * @see Criteria.lt
  */
-infix fun <T> KProperty<T>.lt(value: T): Criteria =
-		Criteria(asString(this)).lt(value)
+infix fun <T> KProperty<T>.lt(value: Any): Criteria =
+	Criteria(this.toDotPath()).lt(value)
 
 /**
  * Creates a criterion using the $lte operator.
@@ -63,8 +64,8 @@ infix fun <T> KProperty<T>.lt(value: T): Criteria =
  * @since 2.2
  * @see Criteria.lte
  */
-infix fun <T> KProperty<T>.lte(value: T): Criteria =
-		Criteria(asString(this)).lte(value)
+infix fun <T> KProperty<T>.lte(value: Any): Criteria =
+	Criteria(this.toDotPath()).lte(value)
 
 /**
  * Creates a criterion using the $gt operator.
@@ -74,8 +75,8 @@ infix fun <T> KProperty<T>.lte(value: T): Criteria =
  * @since 2.2
  * @see Criteria.gt
  */
-infix fun <T> KProperty<T>.gt(value: T): Criteria =
-		Criteria(asString(this)).gt(value)
+infix fun <T> KProperty<T>.gt(value: Any): Criteria =
+	Criteria(this.toDotPath()).gt(value)
 
 /**
  * Creates a criterion using the $gte operator.
@@ -85,8 +86,8 @@ infix fun <T> KProperty<T>.gt(value: T): Criteria =
  * @since 2.2
  * @see Criteria.gte
  */
-infix fun <T> KProperty<T>.gte(value: T): Criteria =
-		Criteria(asString(this)).gte(value)
+infix fun <T> KProperty<T>.gte(value: Any): Criteria =
+	Criteria(this.toDotPath()).gte(value)
 
 /**
  * Creates a criterion using the $in operator.
@@ -97,7 +98,7 @@ infix fun <T> KProperty<T>.gte(value: T): Criteria =
  * @see Criteria.inValues
  */
 fun <T> KProperty<T>.inValues(vararg o: Any): Criteria =
-		Criteria(asString(this)).`in`(*o)
+		Criteria(this.toDotPath()).`in`(*o)
 
 /**
  * Creates a criterion using the $in operator.
@@ -108,7 +109,7 @@ fun <T> KProperty<T>.inValues(vararg o: Any): Criteria =
  * @see Criteria.inValues
  */
 infix fun <T> KProperty<T>.inValues(value: Collection<T>): Criteria =
-		Criteria(asString(this)).`in`(value)
+		Criteria(this.toDotPath()).`in`(value)
 
 /**
  * Creates a criterion using the $nin operator.
@@ -119,7 +120,7 @@ infix fun <T> KProperty<T>.inValues(value: Collection<T>): Criteria =
  * @see Criteria.nin
  */
 fun <T> KProperty<T>.nin(vararg o: Any): Criteria =
-		Criteria(asString(this)).nin(*o)
+		Criteria(this.toDotPath()).nin(*o)
 
 /**
  * Creates a criterion using the $nin operator.
@@ -130,7 +131,7 @@ fun <T> KProperty<T>.nin(vararg o: Any): Criteria =
  * @see Criteria.nin
  */
 infix fun <T> KProperty<T>.nin(value: Collection<T>): Criteria =
-		Criteria(asString(this)).nin(value)
+		Criteria(this.toDotPath()).nin(value)
 
 /**
  * Creates a criterion using the $mod operator.
@@ -141,7 +142,7 @@ infix fun <T> KProperty<T>.nin(value: Collection<T>): Criteria =
  * @see Criteria.mod
  */
 fun KProperty<Number>.mod(value: Number, remainder: Number): Criteria =
-		Criteria(asString(this)).mod(value, remainder)
+		Criteria(this.toDotPath()).mod(value, remainder)
 
 /**
  * Creates a criterion using the $all operator.
@@ -152,7 +153,7 @@ fun KProperty<Number>.mod(value: Number, remainder: Number): Criteria =
  * @see Criteria.all
  */
 fun KProperty<*>.all(vararg o: Any): Criteria =
-		Criteria(asString(this)).all(*o)
+		Criteria(this.toDotPath()).all(*o)
 
 /**
  * Creates a criterion using the $all operator.
@@ -163,7 +164,7 @@ fun KProperty<*>.all(vararg o: Any): Criteria =
  * @see Criteria.all
  */
 infix fun KProperty<*>.all(value: Collection<*>): Criteria =
-		Criteria(asString(this)).all(value)
+		Criteria(this.toDotPath()).all(value)
 
 /**
  * Creates a criterion using the $size operator.
@@ -174,7 +175,7 @@ infix fun KProperty<*>.all(value: Collection<*>): Criteria =
  * @see Criteria.size
  */
 infix fun KProperty<*>.size(s: Int): Criteria =
-		Criteria(asString(this)).size(s)
+		Criteria(this.toDotPath()).size(s)
 
 /**
  * Creates a criterion using the $exists operator.
@@ -185,7 +186,7 @@ infix fun KProperty<*>.size(s: Int): Criteria =
  * @see Criteria.exists
  */
 infix fun KProperty<*>.exists(b: Boolean): Criteria =
-		Criteria(asString(this)).exists(b)
+		Criteria(this.toDotPath()).exists(b)
 
 /**
  * Creates a criterion using the $type operator.
@@ -196,7 +197,7 @@ infix fun KProperty<*>.exists(b: Boolean): Criteria =
  * @see Criteria.type
  */
 infix fun KProperty<*>.type(t: Int): Criteria =
-		Criteria(asString(this)).type(t)
+		Criteria(this.toDotPath()).type(t)
 
 /**
  * Creates a criterion using the $type operator.
@@ -207,7 +208,7 @@ infix fun KProperty<*>.type(t: Int): Criteria =
  * @see Criteria.type
  */
 infix fun KProperty<*>.type(t: Collection<JsonSchemaObject.Type>): Criteria =
-		Criteria(asString(this)).type(*t.toTypedArray())
+		Criteria(this.toDotPath()).type(*t.toTypedArray())
 
 /**
  * Creates a criterion using the $type operator.
@@ -218,7 +219,7 @@ infix fun KProperty<*>.type(t: Collection<JsonSchemaObject.Type>): Criteria =
  * @see Criteria.type
  */
 fun KProperty<*>.type(vararg t: JsonSchemaObject.Type): Criteria =
-		Criteria(asString(this)).type(*t)
+		Criteria(this.toDotPath()).type(*t)
 
 /**
  * Creates a criterion using the $not meta operator which affects the clause directly following
@@ -229,7 +230,7 @@ fun KProperty<*>.type(vararg t: JsonSchemaObject.Type): Criteria =
  * @see Criteria.not
  */
 fun KProperty<*>.not(): Criteria =
-		Criteria(asString(this)).not()
+		Criteria(this.toDotPath()).not()
 
 /**
  * Creates a criterion using a $regex operator.
@@ -240,7 +241,7 @@ fun KProperty<*>.not(): Criteria =
  * @see Criteria.regex
  */
 infix fun KProperty<String?>.regex(re: String): Criteria =
-		Criteria(asString(this)).regex(re, null)
+		Criteria(this.toDotPath()).regex(re, null)
 
 /**
  * Creates a criterion using a $regex and $options operator.
@@ -251,7 +252,7 @@ infix fun KProperty<String?>.regex(re: String): Criteria =
  * @see Criteria.regex
  */
 fun KProperty<String?>.regex(re: String, options: String?): Criteria =
-		Criteria(asString(this)).regex(re, options)
+		Criteria(this.toDotPath()).regex(re, options)
 
 /**
  * Syntactical sugar for [isEqualTo] making obvious that we create a regex predicate.
@@ -260,7 +261,7 @@ fun KProperty<String?>.regex(re: String, options: String?): Criteria =
  * @see Criteria.regex
  */
 infix fun KProperty<String?>.regex(re: Regex): Criteria =
-		Criteria(asString(this)).regex(re.toPattern())
+		Criteria(this.toDotPath()).regex(re.toPattern())
 
 /**
  * Syntactical sugar for [isEqualTo] making obvious that we create a regex predicate.
@@ -269,7 +270,7 @@ infix fun KProperty<String?>.regex(re: Regex): Criteria =
  * @see Criteria.regex
  */
 infix fun KProperty<String?>.regex(re: Pattern): Criteria =
-		Criteria(asString(this)).regex(re)
+		Criteria(this.toDotPath()).regex(re)
 
 /**
  * Syntactical sugar for [isEqualTo] making obvious that we create a regex predicate.
@@ -278,7 +279,7 @@ infix fun KProperty<String?>.regex(re: Pattern): Criteria =
  * @see Criteria.regex
  */
 infix fun KProperty<String?>.regex(re: BsonRegularExpression): Criteria =
-		Criteria(asString(this)).regex(re)
+		Criteria(this.toDotPath()).regex(re)
 
 /**
  * Creates a geospatial criterion using a $geoWithin $centerSphere operation. This is only available for
@@ -294,7 +295,7 @@ infix fun KProperty<String?>.regex(re: BsonRegularExpression): Criteria =
  * @see Criteria.withinSphere
  */
 infix fun KProperty<GeoJson<*>>.withinSphere(circle: Circle): Criteria =
-		Criteria(asString(this)).withinSphere(circle)
+		Criteria(this.toDotPath()).withinSphere(circle)
 
 /**
  * Creates a geospatial criterion using a $geoWithin operation.
@@ -306,7 +307,7 @@ infix fun KProperty<GeoJson<*>>.withinSphere(circle: Circle): Criteria =
  * @see Criteria.within
  */
 infix fun KProperty<GeoJson<*>>.within(shape: Shape): Criteria =
-		Criteria(asString(this)).within(shape)
+		Criteria(this.toDotPath()).within(shape)
 
 /**
  * Creates a geospatial criterion using a $near operation.
@@ -317,7 +318,7 @@ infix fun KProperty<GeoJson<*>>.within(shape: Shape): Criteria =
  * @see Criteria.near
  */
 infix fun KProperty<GeoJson<*>>.near(point: Point): Criteria =
-		Criteria(asString(this)).near(point)
+		Criteria(this.toDotPath()).near(point)
 
 /**
  * Creates a geospatial criterion using a $nearSphere operation. This is only available for Mongo 1.7 and
@@ -330,7 +331,7 @@ infix fun KProperty<GeoJson<*>>.near(point: Point): Criteria =
  * @see Criteria.nearSphere
  */
 infix fun KProperty<GeoJson<*>>.nearSphere(point: Point): Criteria =
-		Criteria(asString(this)).nearSphere(point)
+		Criteria(this.toDotPath()).nearSphere(point)
 
 /**
  * Creates criterion using `$geoIntersects` operator which matches intersections of the given `geoJson`
@@ -340,7 +341,7 @@ infix fun KProperty<GeoJson<*>>.nearSphere(point: Point): Criteria =
  * @see Criteria.intersects
  */
 infix fun KProperty<GeoJson<*>>.intersects(geoJson: GeoJson<*>): Criteria =
-		Criteria(asString(this)).intersects(geoJson)
+		Criteria(this.toDotPath()).intersects(geoJson)
 
 /**
  * Creates a geo-spatial criterion using a $maxDistance operation, for use with $near
@@ -352,7 +353,7 @@ infix fun KProperty<GeoJson<*>>.intersects(geoJson: GeoJson<*>): Criteria =
  * @see Criteria.maxDistance
  */
 infix fun KProperty<GeoJson<*>>.maxDistance(d: Double): Criteria =
-		Criteria(asString(this)).maxDistance(d)
+		Criteria(this.toDotPath()).maxDistance(d)
 
 /**
  * Creates a geospatial criterion using a $minDistance operation, for use with $near or
@@ -362,7 +363,29 @@ infix fun KProperty<GeoJson<*>>.maxDistance(d: Double): Criteria =
  * @see Criteria.minDistance
  */
 infix fun KProperty<GeoJson<*>>.minDistance(d: Double): Criteria =
-		Criteria(asString(this)).minDistance(d)
+		Criteria(this.toDotPath()).minDistance(d)
+
+/**
+ * Creates a geo-spatial criterion using a $maxDistance operation, for use with $near
+ *
+ * See [MongoDB Query operator:
+ * $maxDistance](https://docs.mongodb.com/manual/reference/operator/query/maxDistance/)
+ * @author Sangyong Choi
+ * @since 3.2.5
+ * @see Criteria.maxDistance
+ */
+infix fun Criteria.maxDistance(d: Double): Criteria =
+		this.maxDistance(d)
+
+/**
+ * Creates a geospatial criterion using a $minDistance operation, for use with $near or
+ * $nearSphere.
+ * @author Sangyong Choi
+ * @since 3.2.5
+ * @see Criteria.minDistance
+ */
+infix fun Criteria.minDistance(d: Double): Criteria =
+		this.minDistance(d)
 
 /**
  * Creates a criterion using the $elemMatch operator
@@ -374,7 +397,7 @@ infix fun KProperty<GeoJson<*>>.minDistance(d: Double): Criteria =
  * @see Criteria.elemMatch
  */
 infix fun KProperty<*>.elemMatch(c: Criteria): Criteria =
-		Criteria(asString(this)).elemMatch(c)
+		Criteria(this.toDotPath()).elemMatch(c)
 
 /**
  * Use [Criteria.BitwiseCriteriaOperators] as gateway to create a criterion using one of the
@@ -390,4 +413,4 @@ infix fun KProperty<*>.elemMatch(c: Criteria): Criteria =
  * @see Criteria.bits
  */
 infix fun KProperty<*>.bits(bitwiseCriteria: Criteria.BitwiseCriteriaOperators.() -> Criteria) =
-		Criteria(asString(this)).bits().let(bitwiseCriteria)
+		Criteria(this.toDotPath()).bits().let(bitwiseCriteria)
diff --git a/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedUpdateExtensions.kt b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedUpdateExtensions.kt
new file mode 100644
index 0000000000..d7784a7768
--- /dev/null
+++ b/spring-data-mongodb/src/main/kotlin/org/springframework/data/mongodb/core/query/TypedUpdateExtensions.kt
@@ -0,0 +1,228 @@
+/*
+ * Copyright 2024-2025 the original author 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.query
+
+import org.springframework.data.mapping.toDotPath
+import org.springframework.data.mongodb.core.query.Update.Position
+import kotlin.reflect.KProperty
+
+/**
+ * Static factory method to create an Update using the provided key
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.update
+ */
+fun <T> update(key: KProperty<T>, value: T?) =
+    Update.update(key.toDotPath(), value)
+
+/**
+ * Update using the {@literal $set} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.set
+ */
+fun <T> Update.set(key: KProperty<T>, value: T?) =
+    set(key.toDotPath(), value)
+
+/**
+ * Update using the {@literal $setOnInsert} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.setOnInsert
+ */
+fun <T> Update.setOnInsert(key: KProperty<T>, value: T?) =
+    setOnInsert(key.toDotPath(), value)
+
+/**
+ * Update using the {@literal $unset} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.unset
+ */
+fun <T> Update.unset(key: KProperty<T>) =
+    unset(key.toDotPath())
+
+/**
+ * Update using the {@literal $inc} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.inc
+ */
+fun <T> Update.inc(key: KProperty<T>, inc: Number) =
+    inc(key.toDotPath(), inc)
+
+fun <T> Update.inc(key: KProperty<T>) =
+    inc(key.toDotPath())
+
+/**
+ * Update using the {@literal $push} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.push
+ */
+fun <T> Update.push(key: KProperty<Collection<T>>, value: T?) =
+    push(key.toDotPath(), value)
+
+/**
+ * Update using {@code $push} modifier. <br/>
+ * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values as well as using
+ * {@code $position}.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.push
+ */
+fun <T> Update.push(key: KProperty<T>) =
+    push(key.toDotPath())
+
+/**
+ * Update using {@code $addToSet} modifier. <br/>
+ * Allows creation of {@code $push} command for single or multiple (using {@code $each}) values * {@code $position}.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.addToSet
+ */
+fun <T> Update.addToSet(key: KProperty<T>) =
+    addToSet(key.toDotPath())
+
+/**
+ * Update using the {@literal $addToSet} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.addToSet
+ */
+fun <T> Update.addToSet(key: KProperty<Collection<T>>, value: T?) =
+    addToSet(key.toDotPath(), value)
+
+/**
+ * Update using the {@literal $pop} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.pop
+ */
+fun <T> Update.pop(key: KProperty<T>, pos: Position) =
+    pop(key.toDotPath(), pos)
+
+/**
+ * Update using the {@literal $pull} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.pull
+ */
+fun <T> Update.pull(key: KProperty<T>, value: Any) =
+    pull(key.toDotPath(), value)
+
+/**
+ * Update using the {@literal $pullAll} update modifier
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.pullAll
+ */
+fun <T> Update.pullAll(key: KProperty<Collection<T>>, values: Array<Any>) =
+    pullAll(key.toDotPath(), values)
+
+/**
+ * Update given key to current date using {@literal $currentDate} modifier.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.currentDate
+ */
+fun <T> Update.currentDate(key: KProperty<T>) =
+    currentDate(key.toDotPath())
+
+/**
+ * Update given key to current date using {@literal $currentDate : &#123; $type : "timestamp" &#125;} modifier.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.currentTimestamp
+ */
+fun <T> Update.currentTimestamp(key: KProperty<T>) =
+    currentTimestamp(key.toDotPath())
+
+/**
+ * Multiply the value of given key by the given number.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.multiply
+ */
+fun <T> Update.multiply(key: KProperty<T>, multiplier: Number) =
+    multiply(key.toDotPath(), multiplier)
+
+/**
+ * Update given key to the {@code value} if the {@code value} is greater than the current value of the field.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.max
+ */
+fun <T : Any> Update.max(key: KProperty<T>, value: T) =
+    max(key.toDotPath(), value)
+
+/**
+ * Update given key to the {@code value} if the {@code value} is less than the current value of the field.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.min
+ */
+fun <T : Any> Update.min(key: KProperty<T>, value: T) =
+    min(key.toDotPath(), value)
+
+/**
+ * The operator supports bitwise {@code and}, bitwise {@code or}, and bitwise {@code xor} operations.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.bitwise
+ */
+fun <T> Update.bitwise(key: KProperty<T>) =
+    bitwise(key.toDotPath())
+
+/**
+ * Filter elements in an array that match the given criteria for update. {@code expression} is used directly with the
+ * driver without further type or field mapping.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.filterArray
+ */
+fun <T> Update.filterArray(identifier: KProperty<T>, expression: Any) =
+    filterArray(identifier.toDotPath(), expression)
+
+/**
+ * Determine if a given {@code key} will be touched on execution.
+ *
+ * @author Pawel Matysek
+ * @since 4.4
+ * @see Update.modifies
+ */
+fun <T> Update.modifies(key: KProperty<T>) =
+    modifies(key.toDotPath())
+
diff --git a/spring-data-mongodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/spring-data-mongodb/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
similarity index 100%
rename from spring-data-mongodb/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
rename to spring-data-mongodb/src/main/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
diff --git a/spring-data-mongodb/src/main/resources/META-INF/spring.schemas b/spring-data-mongodb/src/main/resources/META-INF/spring.schemas
index bcc150e5f8..c6c28dbab1 100644
--- a/spring-data-mongodb/src/main/resources/META-INF/spring.schemas
+++ b/spring-data-mongodb/src/main/resources/META-INF/spring.schemas
@@ -10,7 +10,11 @@ http\://www.springframework.org/schema/data/mongo/spring-mongo-1.10.xsd=org/spri
 http\://www.springframework.org/schema/data/mongo/spring-mongo-1.10.2.xsd=org/springframework/data/mongodb/config/spring-mongo-1.10.2.xsd
 http\://www.springframework.org/schema/data/mongo/spring-mongo-2.0.xsd=org/springframework/data/mongodb/config/spring-mongo-2.0.xsd
 http\://www.springframework.org/schema/data/mongo/spring-mongo-2.2.xsd=org/springframework/data/mongodb/config/spring-mongo-2.0.xsd
-http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-2.2.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo-3.0.xsd=org/springframework/data/mongodb/config/spring-mongo-3.0.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo-3.3.xsd=org/springframework/data/mongodb/config/spring-mongo-3.3.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo-4.0.xsd=org/springframework/data/mongodb/config/spring-mongo-4.0.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo-5.0.xsd=org/springframework/data/mongodb/config/spring-mongo-5.0.xsd
+http\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-5.0.xsd
 https\://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd=org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
 https\://www.springframework.org/schema/data/mongo/spring-mongo-1.1.xsd=org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
 https\://www.springframework.org/schema/data/mongo/spring-mongo-1.2.xsd=org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
@@ -22,5 +26,9 @@ https\://www.springframework.org/schema/data/mongo/spring-mongo-1.8.xsd=org/spri
 https\://www.springframework.org/schema/data/mongo/spring-mongo-1.10.xsd=org/springframework/data/mongodb/config/spring-mongo-1.10.xsd
 https\://www.springframework.org/schema/data/mongo/spring-mongo-1.10.2.xsd=org/springframework/data/mongodb/config/spring-mongo-1.10.2.xsd
 https\://www.springframework.org/schema/data/mongo/spring-mongo-2.0.xsd=org/springframework/data/mongodb/config/spring-mongo-2.0.xsd
-https\://www.springframework.org/schema/data/mongo/spring-mongo-2.2.xsd=org/springframework/data/mongodb/config/spring-mongo-2.0.xsd
-https\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-2.2.xsd
+https\://www.springframework.org/schema/data/mongo/spring-mongo-2.2.xsd=org/springframework/data/mongodb/config/spring-mongo-2.2.xsd
+https\://www.springframework.org/schema/data/mongo/spring-mongo-3.0.xsd=org/springframework/data/mongodb/config/spring-mongo-3.0.xsd
+https\://www.springframework.org/schema/data/mongo/spring-mongo-3.3.xsd=org/springframework/data/mongodb/config/spring-mongo-3.3.xsd
+https\://www.springframework.org/schema/data/mongo/spring-mongo-4.0.xsd=org/springframework/data/mongodb/config/spring-mongo-4.0.xsd
+https\://www.springframework.org/schema/data/mongo/spring-mongo-5.0.xsd=org/springframework/data/mongodb/config/spring-mongo-5.0.xsd
+https\://www.springframework.org/schema/data/mongo/spring-mongo.xsd=org/springframework/data/mongodb/config/spring-mongo-5.0.xsd
diff --git a/spring-data-mongodb/src/main/resources/META-INF/spring/aot.factories b/spring-data-mongodb/src/main/resources/META-INF/spring/aot.factories
new file mode 100644
index 0000000000..0130a33d7c
--- /dev/null
+++ b/spring-data-mongodb/src/main/resources/META-INF/spring/aot.factories
@@ -0,0 +1,6 @@
+org.springframework.aot.hint.RuntimeHintsRegistrar=\
+	org.springframework.data.mongodb.aot.MongoRuntimeHints,\
+	org.springframework.data.mongodb.repository.aot.RepositoryRuntimeHints
+
+org.springframework.beans.factory.aot.BeanRegistrationAotProcessor=\
+	org.springframework.data.mongodb.aot.MongoManagedTypesBeanRegistrationAotProcessor
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
index 2b4fbee2b1..a0d95f2425 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.0.xsd
@@ -318,8 +318,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
@@ -348,14 +348,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -363,22 +363,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -395,18 +395,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -430,14 +430,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -466,4 +466,4 @@ This controls if the driver is allowed to read from secondaries or slaves.  Defa
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
index cd81bf328f..dd7287dab3 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.1.xsd
@@ -316,8 +316,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:ID" use="optional">
@@ -346,14 +346,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -361,22 +361,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -393,18 +393,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -428,14 +428,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -464,4 +464,4 @@ This controls if the driver is allowed to read from secondaries or slaves.  Defa
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.2.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.2.xsd
index 1d4a09be13..6c0fcc67c3 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.2.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.2.xsd
@@ -531,7 +531,7 @@ This controls whether or not to fsync.  The 'fsync' option to the getlasterror c
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.xsd
index 5d06b0a499..dde5cd0a91 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.10.xsd
@@ -531,7 +531,7 @@ This controls whether or not to fsync.  The 'fsync' option to the getlasterror c
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
index 71dbf87098..cf995f23cd 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.2.xsd
@@ -230,7 +230,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -331,8 +331,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -361,14 +361,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -376,22 +376,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -408,18 +408,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -443,14 +443,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -479,4 +479,4 @@ This controls if the driver is allowed to read from secondaries or slaves.  Defa
 		</xsd:attribute>
 	</xsd:complexType>
 
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
index 2aa09c0cdd..c1b6b1df34 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.3.xsd
@@ -234,7 +234,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -346,8 +346,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -376,14 +376,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -391,22 +391,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -423,18 +423,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -458,14 +458,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -557,7 +557,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -598,4 +598,4 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd
index 33874b3f26..78f1dabe14 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.4.xsd
@@ -241,7 +241,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -300,7 +300,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -364,8 +364,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -394,14 +394,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -409,22 +409,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -441,18 +441,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -476,14 +476,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -589,7 +589,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -636,4 +636,4 @@ The GridFs bucket string.]]></xsd:documentation>
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-</xsd:schema>
\ No newline at end of file
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd
index 43ba06bae6..0b67ea4db8 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.5.xsd
@@ -248,7 +248,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -318,7 +318,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -382,8 +382,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -412,14 +412,14 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -427,22 +427,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -459,18 +459,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -494,14 +494,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -607,7 +607,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd
index ecb082e81b..13b444dd13 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.7.xsd
@@ -27,7 +27,7 @@ Deprecated since 1.7 - use mongo-client instead. Defines a Mongo instance used f
 			</xsd:appinfo>
 		</xsd:annotation>
 	</xsd:element>
-	
+
 	<xsd:element name="mongo-client" type="mongoClientType">
 	  <xsd:annotation>
 		<xsd:documentation source="org.springframework.data.mongodb.core.MongoClientFactoryBean"><![CDATA[
@@ -37,7 +37,7 @@ Defines a MongoClient instance used for accessing MongoDB.
 				<tool:annotation>
 					<tool:exports type="com.mongodb.MongoClient"/>
 				</tool:annotation>
-			</xsd:appinfo>	  
+			</xsd:appinfo>
 	  </xsd:annotation>
 	</xsd:element>
 
@@ -261,7 +261,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -331,7 +331,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -354,7 +354,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			<xsd:enumeration value="MAJORITY" />
 		</xsd:restriction>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="readPreferenceEnumeration">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="PRIMARY" />
@@ -384,7 +384,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 	<xsd:complexType name="mongoType">
 		<xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Deprecated since 1.7.    	
+Deprecated since 1.7.
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:sequence minOccurs="0" maxOccurs="1">
@@ -410,8 +410,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -440,19 +440,19 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
 		<xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Deprecated since 1.7.    	
+Deprecated since 1.7.
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -460,22 +460,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -492,18 +492,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -527,14 +527,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -550,11 +550,11 @@ The SSLSocketFactory to use for the SSL connection. If none is configured here,
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="mongoClientType">
 		<xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Configuration options for 'MongoClient' - @since 1.7	    	
+Configuration options for 'MongoClient' - @since 1.7
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:sequence minOccurs="0" maxOccurs="1">
@@ -606,11 +606,11 @@ The comma delimited list of username:password@database entries to use for authen
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="clientOptionsType">
 	    <xsd:annotation>
 	    	<xsd:documentation><![CDATA[
-Configuration options for 'MongoClientOptions' - @since 1.7	    	
+Configuration options for 'MongoClientOptions' - @since 1.7
 	    	]]></xsd:documentation>
 	    </xsd:annotation>
 		<xsd:attribute name="description" type="xsd:string">
@@ -626,11 +626,11 @@ The MongoClient description.
 The minimum number of connections per host.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -638,36 +638,36 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-idle-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum idle time for a pooled connection.	
+The maximum idle time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-life-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum life time for a pooled connection.	
+The maximum life time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -684,7 +684,7 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="read-preference">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -694,7 +694,7 @@ The read preference.
 			<xsd:simpleType>
 				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="write-concern">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -704,25 +704,25 @@ The WriteConcern that will be the default value used when asking the MongoDbFact
 			<xsd:simpleType>
 				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This is the frequency that the driver will attempt to determine the current state of each server in the cluster. 
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="min-heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort. 
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="heartbeat-connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout for connections used for the cluster heartbeat. 
+The connect timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -732,7 +732,7 @@ The connect timeout for connections used for the cluster heartbeat.
 The socket timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -746,7 +746,7 @@ This controls if the driver should us an SSL connection.  Defaults to false.
 The SSLSocketFactory to use for the SSL connection. If none is configured here, SSLSocketFactory#getDefault() will be used.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>									
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:group name="beanElementGroup">
@@ -838,7 +838,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd
index cb02bb191c..04413cc9af 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-1.8.xsd
@@ -27,7 +27,7 @@ Deprecated since 1.7 - use mongo-client instead. Defines a Mongo instance used f
 			</xsd:appinfo>
 		</xsd:annotation>
 	</xsd:element>
-	
+
 	<xsd:element name="mongo-client" type="mongoClientType">
 	  <xsd:annotation>
 		<xsd:documentation source="org.springframework.data.mongodb.core.MongoClientFactoryBean"><![CDATA[
@@ -267,7 +267,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="auditing">
 		<xsd:annotation>
 			<xsd:appinfo>
@@ -337,7 +337,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 		</xsd:annotation>
 		<xsd:union memberTypes="xsd:string"/>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="sslSocketFactoryRef">
 	<xsd:annotation>
 			<xsd:appinfo>
@@ -360,7 +360,7 @@ The name of the Mongo object that determines what server to monitor. (by default
 			<xsd:enumeration value="MAJORITY" />
 		</xsd:restriction>
 	</xsd:simpleType>
-	
+
 	<xsd:simpleType name="readPreferenceEnumeration">
 		<xsd:restriction base="xsd:token">
 			<xsd:enumeration value="PRIMARY" />
@@ -416,8 +416,8 @@ The Mongo driver options
 				<xsd:simpleType>
 					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 				</xsd:simpleType>
-			</xsd:attribute>		
-		<!-- MLP 
+			</xsd:attribute>
+		<!-- MLP
 		<xsd:attributeGroup ref="writeConcern" />
 		-->
 		<xsd:attribute name="id" type="xsd:string" use="optional">
@@ -446,7 +446,7 @@ The host to connect to a MongoDB server.  Default is localhost
 The comma delimited list of host:port entries to use for replica set/pairs.
 							]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 	</xsd:complexType>
 
 	<xsd:complexType name="optionsType">
@@ -466,22 +466,22 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -498,18 +498,18 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="auto-connect-retry" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls whether or not on a connect, the system retries automatically.  Default is false. 
+This controls whether or not on a connect, the system retries automatically.  Default is false.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-auto-connect-retry-time" type="xsd:long">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on. 
+The maximum amount of time in millisecons to spend retrying to open connection to the same server. Default is 0, which means to use the default 15s if autoConnectRetry is on.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -533,14 +533,14 @@ This controls timeout for write operations in milliseconds.  The 'wtimeout' opti
 This controls whether or not to fsync.  The 'fsync' option to the getlasterror command. Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>						
+		</xsd:attribute>
 		<xsd:attribute name="slave-ok" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This controls if the driver is allowed to read from secondaries or slaves.  Defaults to false.
+This controls if the driver is allowed to read from secondaries or replicas.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>				
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -556,7 +556,7 @@ The SSLSocketFactory to use for the SSL connection. If none is configured here,
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="mongoClientType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -612,7 +612,7 @@ The comma delimited list of username:password@database entries to use for authen
 			</xsd:annotation>
 		</xsd:attribute>
 	</xsd:complexType>
-	
+
 	<xsd:complexType name="clientOptionsType">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -632,11 +632,11 @@ The MongoClient description.
 The minimum number of connections per host.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>		
+		</xsd:attribute>
 		<xsd:attribute name="connections-per-host" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override	
+The number of connections allowed per host.  Will block if run out.	 Default is 10.  System property MONGO.POOLSIZE can override
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -644,36 +644,36 @@ The number of connections allowed per host.  Will block if run out.	 Default is
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
 The multiplier for connectionsPerHost for # of threads that can block.  Default is 5.
-If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5, 
-then 50 threads can block more than that and an exception will be thrown.			
+If connectionsPerHost is 10, and threadsAllowedToBlockForConnectionMultiplier is 5,
+then 50 threads can block more than that and an exception will be thrown.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-wait-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)	
+The max wait time of a blocking thread for a connection. Default is 12000 ms (2 minutes)
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-idle-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum idle time for a pooled connection.	
+The maximum idle time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="max-connection-life-time" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The maximum life time for a pooled connection.	
+The maximum life time for a pooled connection.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout in milliseconds. 0 is default and infinite.	
+The connect timeout in milliseconds. 0 is default and infinite.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -690,7 +690,7 @@ The socket timeout.  0 is default and infinite.
 The keep alive flag, controls whether or not to have socket keep alive timeout.  Defaults to false.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="read-preference">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -700,7 +700,7 @@ The read preference.
 			<xsd:simpleType>
 				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="write-concern">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -710,25 +710,25 @@ The WriteConcern that will be the default value used when asking the MongoDbFact
 			<xsd:simpleType>
 				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
 			</xsd:simpleType>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-This is the frequency that the driver will attempt to determine the current state of each server in the cluster. 
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="min-heartbeat-frequency" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort. 
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
 		<xsd:attribute name="heartbeat-connect-timeout" type="xsd:string">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
-The connect timeout for connections used for the cluster heartbeat. 
+The connect timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
 		</xsd:attribute>
@@ -738,7 +738,7 @@ The connect timeout for connections used for the cluster heartbeat.
 The socket timeout for connections used for the cluster heartbeat.
 				]]></xsd:documentation>
 			</xsd:annotation>
-		</xsd:attribute>	
+		</xsd:attribute>
 		<xsd:attribute name="ssl" type="xsd:boolean">
 			<xsd:annotation>
 				<xsd:documentation><![CDATA[
@@ -844,7 +844,7 @@ The reference to a Mongoconverter instance.
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="gridFsTemplate">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-2.2.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-2.2.xsd
index bc1c52091a..8364fe70ea 100644
--- a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-2.2.xsd
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-2.2.xsd
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
-  ~ Copyright 2019 the original author or authors.
+  ~ Copyright 2019-2022 the original author or authors.
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-3.0.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-3.0.xsd
new file mode 100644
index 0000000000..b482282b40
--- /dev/null
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-3.0.xsd
@@ -0,0 +1,867 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright 2019-2022 the original author 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.
+  -->
+<xsd:schema xmlns="http://www.springframework.org/schema/data/mongo"
+						xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+						xmlns:beans="http://www.springframework.org/schema/beans"
+						xmlns:tool="http://www.springframework.org/schema/tool"
+						xmlns:repository="http://www.springframework.org/schema/data/repository"
+						targetNamespace="http://www.springframework.org/schema/data/mongo"
+						elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
+	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
+				schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd" />
+
+	<xsd:element name="mongo-client" type="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoClientFactoryBean"><![CDATA[
+Defines a com.mongodb.client.MongoClient instance used for accessing MongoDB.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="com.mongodb.client.MongoClient"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="db-factory">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoDatabaseFactory definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-client-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a com.mongodb.client.MongoClient instance.
+					]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="dbname" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the database to connect to. Default is 'db'.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="client-uri" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoClientURI string.
+@Deprecated since 3.0 - Use connection-string instead.
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoDB Connection String. Supersedes client-uri.
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+@Since 3.0
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:attributeGroup name="mongo-repository-attributes">
+		<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" default="mongoTemplate">
+			<xsd:annotation>
+				<xsd:documentation>
+					The reference to a MongoTemplate. Will default to 'mongoTemplate'.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="create-query-indexes" default="false">
+			<xsd:annotation>
+				<xsd:documentation>
+					Enables creation of indexes for queries that get derived from the method name
+					and thus reference domain class properties. Defaults to false.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
+	<xsd:element name="repositories">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="repository:repositories">
+					<xsd:attributeGroup ref="mongo-repository-attributes"/>
+					<xsd:attributeGroup ref="repository:repository-attributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mapping-converter">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[Defines a MongoConverter for getting rich mapping functionality.]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:exports type="org.springframework.data.mongodb.core.convert.MappingMongoConverter" />
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="custom-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+		Top-level element that contains one or more custom converters to be used for mapping
+		domain objects to and from Mongo's Document]]>
+						</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="converter" type="customConverterType" minOccurs="0" maxOccurs="unbounded"/>
+						</xsd:sequence>
+						<xsd:attribute name="base-package" type="xsd:string" />
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="base-package" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The base package in which to scan for entities annotated with @Document
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="type-mapper-ref" type="typeMapperRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoTypeMapper to be used by this MappingMongoConverter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mapping.model.MappingContext">
+						The reference to a MappingContext. Will default to 'mappingContext'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="disable-validation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener">
+						Disables JSR-303 validation on MongoDB documents before they are saved. By default it is set to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="abbreviate-field-names" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy">
+						Enables abbreviating the field names for domain class properties to the
+						first character of their camel case names, e.g. fooBar -> fb. Defaults to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="field-naming-strategy-ref" type="fieldNamingStrategyRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy">
+						The reference to a FieldNamingStrategy.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="auto-index-creation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						Enable/Disable index creation for annotated properties/entities.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="jmx">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a JMX Model MBeans for monitoring a MongoDB server'.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoClient object that determines what server to monitor. (by default "mongoClient").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="auditing">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback" />
+					<tool:exports type="org.springframework.data.auditing.IsNewAwareAuditingHandler" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attributeGroup ref="repository:auditing-attributes" />
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" />
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:simpleType name="typeMapperRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoTypeMapper"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mappingContextRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mapping.model.MappingContext"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="fieldNamingStrategyRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoTemplateRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoClientFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="sslSocketFactoryRef">
+	<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="javax.net.ssl.SSLSocketFactory"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="encryptionSettingsRef">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Reference to FactoryBean for com.mongodb.AutoEncryptionSettings - @since 2.2
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoEncryptionSettingsFactoryBean" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="DEFAULT" />
+			<xsd:enumeration value="LOCAL" />
+			<xsd:enumeration value="MAJORITY" />
+			<xsd:enumeration value="LINEARIZABLE" />
+			<xsd:enumeration value="AVAILABLE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="writeConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="ACKNOWLEDGED" />
+			<xsd:enumeration value="W1" />
+			<xsd:enumeration value="W2" />
+			<xsd:enumeration value="W3" />
+			<xsd:enumeration value="UNACKNOWLEDGED" />
+			<xsd:enumeration value="JOURNALED" />
+			<xsd:enumeration value="MAJORITY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readPreferenceEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="PRIMARY" />
+			<xsd:enumeration value="PRIMARY_PREFERRED" />
+			<xsd:enumeration value="SECONDARY" />
+			<xsd:enumeration value="SECONDARY_PREFERRED" />
+			<xsd:enumeration value="NEAREST" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="uuidRepresentationEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="UNSPECIFIED" />
+			<xsd:enumeration value="STANDARD" />
+			<xsd:enumeration value="C_SHARP_LEGACY" />
+			<xsd:enumeration value="JAVA_LEGACY" />
+			<xsd:enumeration value="PYTHON_LEGACY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterConnectionModeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="SINGLE" />
+			<xsd:enumeration value="MULTIPLE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterTypeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="STANDALONE" />
+			<xsd:enumeration value="REPLICA_SET" />
+			<xsd:enumeration value="SHARDED" />
+			<xsd:enumeration value="UNKNOWN" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="booleanType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="true" />
+			<xsd:enumeration value="false" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'com.mongodb.client.MongoClient'
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence minOccurs="0" maxOccurs="1">
+			<xsd:element name="client-settings" type="clientSettingsType">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo driver settings
+							]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:exports type="com.mongodb.MongoClientSettings"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the MongoClient definition (by default "mongoClient").]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The mongodb connection string. E.g. 'mongodb://localhost:27017?replicaSet=rs0'
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replica-set" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replica set name when connecting to a cluster.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="credential" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+NOTE: Best way of setting up a connection is by providing the 'connection-string'.
+The comma delimited list of username:password@database entries to use for authentication. Appending ?uri.authMechanism allows to specify the authentication challenge mechanism. If the credential you're trying to pass contains a comma itself, quote it with single quotes: '…'.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="clientSettingsType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'MongoClientSettings' - @since 3.0
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="application-name" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The application name to use when connecting to MongoDB. Mainly used to identify an operation in server logs, query logs and other profiling features.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="uuid-representation" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The storage format of UUID types.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="uuidRepresentationEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-preference" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The read preference to use for quries, map-reduce, aggregation and count operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-concern" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the global read isolation level.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="write-concern">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the default 'WriteConcern' that is controls the acknowledgment of write operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-reads" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether reads should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-writes" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether writes should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="socket-connect-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket connect timeout (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket read timeoutn (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-receive-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the receive buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-send-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the send buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-heartbeat-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-min-heartbeat-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-srv-host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the host name to use in order to look up an SRV DNS record to find the MongoDB hosts.
+NOTE: do not use along with cluster-hosts.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-hosts" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the hosts for the cluster. Any duplicate server addresses are removed from the list.
+NOTE: do not use along with cluster-srv-host
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-connection-mode" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster connection mode to either single node direct or multiple servers.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterConnectionModeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-type" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster type (eg. SHARDED, REPLICA_SET,...).
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterTypeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-local-threshold" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the local threshold when selecting a server based on fastes ping time.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-server-selection-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the timeout to apply when selecting a server.
+Zero indicates an immediate timeout while a negative value means indefinitely wait.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum number of connections allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-min-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the minimum number of connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-wait-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum time a thread may wait for a connection to become available.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-life-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The maximum time a pooled connection can live for.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-idle-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum idle time of a pooled connection.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-initial-delay" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the period of time to wait before running the first maintenance job on the connection pool.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the time period between runs of the maintenance job.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-enabled" default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether SSL should be enabled or not.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-invalid-host-name-allowed" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether invalid host names should be allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-provider" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the SSL Context instance provider.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="encryption-settings-ref" type="encryptionSettingsRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+AutoEncryptionSettings for MongoDB 4.2+
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:group name="beanElementGroup">
+		<xsd:choice>
+			<xsd:element ref="beans:bean"/>
+			<xsd:element ref="beans:ref"/>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:complexType name="customConverterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Element defining a custom converter.
+	]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:group ref="beanElementGroup" minOccurs="0" maxOccurs="1"/>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					A reference to a custom converter.
+				</xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref"/>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="converterRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:element name="template">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoTemplate definition (by default "mongoTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string"
+				use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+								type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="gridFsTemplate">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a GridFsTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the GridFsTemplate definition (by default "gridFsTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="bucket" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The GridFs bucket string.]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-3.3.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-3.3.xsd
new file mode 100644
index 0000000000..3b6d0e9db1
--- /dev/null
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-3.3.xsd
@@ -0,0 +1,895 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright 2019-2022 the original author 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.
+  -->
+<xsd:schema xmlns="http://www.springframework.org/schema/data/mongo"
+						xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+						xmlns:beans="http://www.springframework.org/schema/beans"
+						xmlns:tool="http://www.springframework.org/schema/tool"
+						xmlns:repository="http://www.springframework.org/schema/data/repository"
+						targetNamespace="http://www.springframework.org/schema/data/mongo"
+						elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
+	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
+				schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd" />
+
+	<xsd:element name="mongo-client" type="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoClientFactoryBean"><![CDATA[
+Defines a com.mongodb.client.MongoClient instance used for accessing MongoDB.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="com.mongodb.client.MongoClient"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="db-factory">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoDatabaseFactory definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-client-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a com.mongodb.client.MongoClient instance.
+					]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="dbname" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the database to connect to. Default is 'db'.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="client-uri" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoClientURI string.
+@Deprecated since 3.0 - Use connection-string instead.
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoDB Connection String. Supersedes client-uri.
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+@Since 3.0
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:attributeGroup name="mongo-repository-attributes">
+		<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" default="mongoTemplate">
+			<xsd:annotation>
+				<xsd:documentation>
+					The reference to a MongoTemplate. Will default to 'mongoTemplate'.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="create-query-indexes" default="false">
+			<xsd:annotation>
+				<xsd:documentation>
+					Enables creation of indexes for queries that get derived from the method name
+					and thus reference domain class properties. Defaults to false.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
+	<xsd:element name="repositories">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="repository:repositories">
+					<xsd:attributeGroup ref="mongo-repository-attributes"/>
+					<xsd:attributeGroup ref="repository:repository-attributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mapping-converter">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[Defines a MongoConverter for getting rich mapping functionality.]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:exports type="org.springframework.data.mongodb.core.convert.MappingMongoConverter" />
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="custom-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+		Top-level element that contains one or more custom converters to be used for mapping
+		domain objects to and from Mongo's Document]]>
+						</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="converter" type="customConverterType" minOccurs="0" maxOccurs="unbounded"/>
+						</xsd:sequence>
+						<xsd:attribute name="base-package" type="xsd:string" />
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="base-package" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The base package in which to scan for entities annotated with @Document
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="type-mapper-ref" type="typeMapperRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoTypeMapper to be used by this MappingMongoConverter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mapping.model.MappingContext">
+						The reference to a MappingContext. Will default to 'mappingContext'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="disable-validation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener">
+						Disables JSR-303 validation on MongoDB documents before they are saved. By default it is set to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="abbreviate-field-names" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy">
+						Enables abbreviating the field names for domain class properties to the
+						first character of their camel case names, e.g. fooBar -> fb. Defaults to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="field-naming-strategy-ref" type="fieldNamingStrategyRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy">
+						The reference to a FieldNamingStrategy.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="auto-index-creation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						Enable/Disable index creation for annotated properties/entities.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="jmx">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a JMX Model MBeans for monitoring a MongoDB server'.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoClient object that determines what server to monitor. (by default "mongoClient").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="auditing">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback" />
+					<tool:exports type="org.springframework.data.auditing.IsNewAwareAuditingHandler" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attributeGroup ref="repository:auditing-attributes" />
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" />
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:simpleType name="typeMapperRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoTypeMapper"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mappingContextRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mapping.model.MappingContext"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="fieldNamingStrategyRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoTemplateRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoClientFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="sslSocketFactoryRef">
+	<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="javax.net.ssl.SSLSocketFactory"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="encryptionSettingsRef">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Reference to FactoryBean for com.mongodb.AutoEncryptionSettings - @since 2.2
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoEncryptionSettingsFactoryBean" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="serverApiRef">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Reference to FactoryBean for com.mongodb.MongoServerApiFactoryBean - @since 3.3
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoServerApiFactoryBean" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="DEFAULT" />
+			<xsd:enumeration value="LOCAL" />
+			<xsd:enumeration value="MAJORITY" />
+			<xsd:enumeration value="LINEARIZABLE" />
+			<xsd:enumeration value="AVAILABLE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="writeConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="ACKNOWLEDGED" />
+			<xsd:enumeration value="W1" />
+			<xsd:enumeration value="W2" />
+			<xsd:enumeration value="W3" />
+			<xsd:enumeration value="UNACKNOWLEDGED" />
+			<xsd:enumeration value="JOURNALED" />
+			<xsd:enumeration value="MAJORITY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readPreferenceEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="PRIMARY" />
+			<xsd:enumeration value="PRIMARY_PREFERRED" />
+			<xsd:enumeration value="SECONDARY" />
+			<xsd:enumeration value="SECONDARY_PREFERRED" />
+			<xsd:enumeration value="NEAREST" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="uuidRepresentationEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="UNSPECIFIED" />
+			<xsd:enumeration value="STANDARD" />
+			<xsd:enumeration value="C_SHARP_LEGACY" />
+			<xsd:enumeration value="JAVA_LEGACY" />
+			<xsd:enumeration value="PYTHON_LEGACY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterConnectionModeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="SINGLE" />
+			<xsd:enumeration value="MULTIPLE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterTypeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="STANDALONE" />
+			<xsd:enumeration value="REPLICA_SET" />
+			<xsd:enumeration value="SHARDED" />
+			<xsd:enumeration value="UNKNOWN" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="booleanType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="true" />
+			<xsd:enumeration value="false" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'com.mongodb.client.MongoClient'
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence minOccurs="0" maxOccurs="1">
+			<xsd:element name="client-settings" type="clientSettingsType">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo driver settings
+							]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:exports type="com.mongodb.MongoClientSettings"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the MongoClient definition (by default "mongoClient").]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The mongodb connection string. E.g. 'mongodb://localhost:27017?replicaSet=rs0'
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replica-set" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replica set name when connecting to a cluster.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="credential" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+NOTE: Best way of setting up a connection is by providing the 'connection-string'.
+The comma delimited list of username:password@database entries to use for authentication. Appending ?uri.authMechanism allows to specify the authentication challenge mechanism. If the credential you're trying to pass contains a comma itself, quote it with single quotes: '…'.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="clientSettingsType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'MongoClientSettings' - @since 3.0
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="application-name" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The application name to use when connecting to MongoDB. Mainly used to identify an operation in server logs, query logs and other profiling features.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="uuid-representation" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The storage format of UUID types.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="uuidRepresentationEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-preference" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The read preference to use for quries, map-reduce, aggregation and count operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-concern" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the global read isolation level.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="write-concern">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the default 'WriteConcern' that is controls the acknowledgment of write operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-reads" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether reads should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-writes" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether writes should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="socket-connect-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket connect timeout (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket read timeoutn (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-receive-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the receive buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-send-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the send buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-heartbeat-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-min-heartbeat-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-srv-host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the host name to use in order to look up an SRV DNS record to find the MongoDB hosts.
+NOTE: do not use along with cluster-hosts.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-hosts" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the hosts for the cluster. Any duplicate server addresses are removed from the list.
+NOTE: do not use along with cluster-srv-host
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-connection-mode" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster connection mode to either single node direct or multiple servers.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterConnectionModeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-type" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster type (eg. SHARDED, REPLICA_SET,...).
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterTypeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-local-threshold" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the local threshold when selecting a server based on fastes ping time.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-server-selection-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the timeout to apply when selecting a server.
+Zero indicates an immediate timeout while a negative value means indefinitely wait.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum number of connections allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-min-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the minimum number of connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-wait-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum time a thread may wait for a connection to become available.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-life-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The maximum time a pooled connection can live for.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-idle-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum idle time of a pooled connection.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-initial-delay" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the period of time to wait before running the first maintenance job on the connection pool.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the time period between runs of the maintenance job.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-enabled" default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether SSL should be enabled or not.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-invalid-host-name-allowed" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether invalid host names should be allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-provider" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the SSL Context instance provider.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="encryption-settings-ref" type="encryptionSettingsRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+AutoEncryptionSettings for MongoDB 4.2+
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-api-version" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the server API version for MongoDB 5.0+. Use server-api-ref if required to set additional modes like 'strict',...
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-api-ref" type="serverApiRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+ServerAPI for MongoDB 5.0+
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:group name="beanElementGroup">
+		<xsd:choice>
+			<xsd:element ref="beans:bean"/>
+			<xsd:element ref="beans:ref"/>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:complexType name="customConverterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Element defining a custom converter.
+	]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:group ref="beanElementGroup" minOccurs="0" maxOccurs="1"/>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					A reference to a custom converter.
+				</xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref"/>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="converterRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:element name="template">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoTemplate definition (by default "mongoTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string"
+				use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+								type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="gridFsTemplate">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a GridFsTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the GridFsTemplate definition (by default "gridFsTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="bucket" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The GridFs bucket string.]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-4.0.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-4.0.xsd
new file mode 100644
index 0000000000..1bdaa38450
--- /dev/null
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-4.0.xsd
@@ -0,0 +1,907 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright 2019-2022 the original author 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.
+  -->
+<xsd:schema xmlns="http://www.springframework.org/schema/data/mongo"
+						xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+						xmlns:beans="http://www.springframework.org/schema/beans"
+						xmlns:tool="http://www.springframework.org/schema/tool"
+						xmlns:repository="http://www.springframework.org/schema/data/repository"
+						targetNamespace="http://www.springframework.org/schema/data/mongo"
+						elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/tool" />
+	<xsd:import namespace="http://www.springframework.org/schema/context" />
+	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
+				schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd" />
+
+	<xsd:element name="mongo-client" type="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation source="org.springframework.data.mongodb.core.MongoClientFactoryBean"><![CDATA[
+Defines a com.mongodb.client.MongoClient instance used for accessing MongoDB.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="com.mongodb.client.MongoClient"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="db-factory">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoDatabaseFactory definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-client-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a com.mongodb.client.MongoClient instance.
+					]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="dbname" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the database to connect to. Default is 'db'.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="client-uri" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoClientURI string.
+@Deprecated since 3.0 - Use connection-string instead.
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoDB Connection String. Supersedes client-uri.
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+@Since 3.0
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:attributeGroup name="mongo-repository-attributes">
+		<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef" default="mongoTemplate">
+			<xsd:annotation>
+				<xsd:documentation>
+					The reference to a MongoTemplate. Will default to 'mongoTemplate'.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="create-query-indexes" default="false">
+			<xsd:annotation>
+				<xsd:documentation>
+					Enables creation of indexes for queries that get derived from the method name
+					and thus reference domain class properties. Defaults to false.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
+	<xsd:element name="repositories">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="repository:repositories">
+					<xsd:attributeGroup ref="mongo-repository-attributes"/>
+					<xsd:attributeGroup ref="repository:repository-attributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mapping-converter">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[Defines a MongoConverter for getting rich mapping functionality.]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:exports type="org.springframework.data.mongodb.core.convert.MappingMongoConverter" />
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="custom-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+		Top-level element that contains one or more custom converters to be used for mapping
+		domain objects to and from Mongo's Document]]>
+						</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="converter" type="customConverterType" minOccurs="0" maxOccurs="unbounded"/>
+						</xsd:sequence>
+						<xsd:attribute name="base-package" type="xsd:string" />
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="base-package" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The base package in which to scan for entities annotated with @Document
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="type-mapper-ref" type="typeMapperRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoTypeMapper to be used by this MappingMongoConverter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mapping.model.MappingContext">
+						The reference to a MappingContext. Will default to 'mappingContext'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="disable-validation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener">
+						Disables JSR-303 validation on MongoDB documents before they are saved. By default it is set to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="abbreviate-field-names" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy">
+						Enables abbreviating the field names for domain class properties to the
+						first character of their camel case names, e.g. fooBar -> fb. Defaults to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="field-naming-strategy-ref" type="fieldNamingStrategyRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation source="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy">
+						The reference to a FieldNamingStrategy.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="auto-index-creation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						Enable/Disable index creation for annotated properties/entities.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="jmx">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a JMX Model MBeans for monitoring a MongoDB server'.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="mongo-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoClient object that determines what server to monitor. (by default "mongoClient").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="auditing">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback" />
+					<tool:exports type="org.springframework.data.auditing.IsNewAwareAuditingHandler" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attributeGroup ref="repository:auditing-attributes" />
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef" />
+			<xsd:attribute name="mongo-converter-ref" type="mongoConverterRef" />
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:simpleType name="typeMapperRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoTypeMapper"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mappingContextRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mapping.model.MappingContext"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoConverterRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="fieldNamingStrategyRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoTemplateRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoTemplate"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoClientFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="sslSocketFactoryRef">
+	<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="javax.net.ssl.SSLSocketFactory"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="encryptionSettingsRef">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Reference to FactoryBean for com.mongodb.AutoEncryptionSettings - @since 2.2
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoEncryptionSettingsFactoryBean" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="serverApiRef">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Reference to FactoryBean for com.mongodb.MongoServerApiFactoryBean - @since 3.3
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.MongoServerApiFactoryBean" />
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="DEFAULT" />
+			<xsd:enumeration value="LOCAL" />
+			<xsd:enumeration value="MAJORITY" />
+			<xsd:enumeration value="LINEARIZABLE" />
+			<xsd:enumeration value="AVAILABLE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="writeConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="ACKNOWLEDGED" />
+			<xsd:enumeration value="W1" />
+			<xsd:enumeration value="W2" />
+			<xsd:enumeration value="W3" />
+			<xsd:enumeration value="UNACKNOWLEDGED" />
+			<xsd:enumeration value="JOURNALED" />
+			<xsd:enumeration value="MAJORITY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readPreferenceEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="PRIMARY" />
+			<xsd:enumeration value="PRIMARY_PREFERRED" />
+			<xsd:enumeration value="SECONDARY" />
+			<xsd:enumeration value="SECONDARY_PREFERRED" />
+			<xsd:enumeration value="NEAREST" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="uuidRepresentationEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="UNSPECIFIED" />
+			<xsd:enumeration value="STANDARD" />
+			<xsd:enumeration value="C_SHARP_LEGACY" />
+			<xsd:enumeration value="JAVA_LEGACY" />
+			<xsd:enumeration value="PYTHON_LEGACY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterConnectionModeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="SINGLE" />
+			<xsd:enumeration value="MULTIPLE" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterTypeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="STANDALONE" />
+			<xsd:enumeration value="REPLICA_SET" />
+			<xsd:enumeration value="SHARDED" />
+			<xsd:enumeration value="UNKNOWN" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="booleanType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="true" />
+			<xsd:enumeration value="false" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'com.mongodb.client.MongoClient'
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence minOccurs="0" maxOccurs="1">
+			<xsd:element name="client-settings" type="clientSettingsType">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo driver settings
+							]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:exports type="com.mongodb.MongoClientSettings"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the MongoClient definition (by default "mongoClient").]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The mongodb connection string. E.g. 'mongodb://localhost:27017?replicaSet=rs0'
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replica-set" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replica set name when connecting to a cluster.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="credential" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+NOTE: Best way of setting up a connection is by providing the 'connection-string'.
+The comma delimited list of username:password@database entries to use for authentication. Appending ?uri.authMechanism allows to specify the authentication challenge mechanism. If the credential you're trying to pass contains a comma itself, quote it with single quotes: '…'.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="clientSettingsType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'MongoClientSettings' - @since 3.0
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="application-name" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The application name to use when connecting to MongoDB. Mainly used to identify an operation in server logs, query logs and other profiling features.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="uuid-representation" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The storage format of UUID types.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="uuidRepresentationEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-preference" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The read preference to use for quries, map-reduce, aggregation and count operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-concern" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the global read isolation level.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="write-concern">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the default 'WriteConcern' that is controls the acknowledgment of write operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-reads" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether reads should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-writes" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether writes should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="socket-connect-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket connect timeout (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket read timeoutn (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-receive-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the receive buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-send-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the send buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-heartbeat-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-min-heartbeat-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-srv-host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the host name to use in order to look up an SRV DNS record to find the MongoDB hosts.
+NOTE: do not use along with cluster-hosts.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-hosts" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the hosts for the cluster. Any duplicate server addresses are removed from the list.
+NOTE: do not use along with cluster-srv-host
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-connection-mode" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster connection mode to either single node direct or multiple servers.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterConnectionModeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-type" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster type (eg. SHARDED, REPLICA_SET,...).
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterTypeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-local-threshold" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the local threshold when selecting a server based on fastes ping time.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-server-selection-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the timeout to apply when selecting a server.
+Zero indicates an immediate timeout while a negative value means indefinitely wait.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum number of connections allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-min-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the minimum number of connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-wait-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum time a thread may wait for a connection to become available.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-life-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The maximum time a pooled connection can live for.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-idle-time" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum idle time of a pooled connection.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-initial-delay" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the period of time to wait before running the first maintenance job on the connection pool.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the time period between runs of the maintenance job.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-enabled" default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether SSL should be enabled or not.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string" />
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-invalid-host-name-allowed" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether invalid host names should be allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-provider" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the SSL Context instance provider.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="encryption-settings-ref" type="encryptionSettingsRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+AutoEncryptionSettings for MongoDB 4.2+
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-api-version" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the server API version for MongoDB 5.0+. Use server-api-ref if required to set additional modes like 'strict',...
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-api-ref" type="serverApiRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+ServerAPI for MongoDB 5.0+
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:group name="beanElementGroup">
+		<xsd:choice>
+			<xsd:element ref="beans:bean"/>
+			<xsd:element ref="beans:ref"/>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:complexType name="customConverterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Element defining a custom converter.
+	]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:group ref="beanElementGroup" minOccurs="0" maxOccurs="1"/>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					A reference to a custom converter.
+				</xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref"/>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="converterRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:element name="template">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoTemplate definition (by default "mongoTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string"
+				use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+								type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+					The WriteConcern that will be the default value used when asking the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="gridFsTemplate">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a GridFsTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the GridFsTemplate definition (by default "gridFsTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to type="org.springframework.data.mongodb.MongoDatabaseFactory" />
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="bucket" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The GridFs bucket string.]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+</xsd:schema>
diff --git a/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-5.0.xsd b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-5.0.xsd
new file mode 100644
index 0000000000..5fae630b6b
--- /dev/null
+++ b/spring-data-mongodb/src/main/resources/org/springframework/data/mongodb/config/spring-mongo-5.0.xsd
@@ -0,0 +1,935 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+  ~ Copyright 2019-2025 the original author 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.
+  -->
+<xsd:schema xmlns="http://www.springframework.org/schema/data/mongo"
+            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+            xmlns:beans="http://www.springframework.org/schema/beans"
+            xmlns:tool="http://www.springframework.org/schema/tool"
+            xmlns:repository="http://www.springframework.org/schema/data/repository"
+            targetNamespace="http://www.springframework.org/schema/data/mongo"
+            elementFormDefault="qualified" attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
+	<xsd:import namespace="http://www.springframework.org/schema/tool"/>
+	<xsd:import namespace="http://www.springframework.org/schema/context"/>
+	<xsd:import namespace="http://www.springframework.org/schema/data/repository"
+	            schemaLocation="https://www.springframework.org/schema/data/repository/spring-repository.xsd"/>
+
+	<xsd:element name="mongo-client" type="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation
+					source="org.springframework.data.mongodb.core.MongoClientFactoryBean">
+				<![CDATA[
+Defines a com.mongodb.client.MongoClient instance used for accessing MongoDB.
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports type="com.mongodb.client.MongoClient"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+	</xsd:element>
+
+	<xsd:element name="db-factory">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoDbFactory for connecting to a specific database
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoDatabaseFactory definition (by default "mongoDbFactory").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mongo-client-ref" type="mongoRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a com.mongodb.client.MongoClient instance.
+					]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="dbname" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the database to connect to. Default is 'db'.
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="client-uri" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoClientURI string.
+@Deprecated since 3.0 - Use connection-string instead.
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The MongoDB Connection String. Supersedes client-uri.
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+@Since 3.0
+                    ]]>
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+						The WriteConcern that will be the default value used when asking
+						the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:attributeGroup name="mongo-repository-attributes">
+		<xsd:attribute name="mongo-template-ref" type="mongoTemplateRef"
+		               default="mongoTemplate">
+			<xsd:annotation>
+				<xsd:documentation>
+					The reference to a MongoTemplate. Will default to 'mongoTemplate'.
+				</xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="create-query-indexes" default="false">
+			<xsd:annotation>
+				<xsd:documentation>
+					Enables creation of indexes for queries that get derived from the
+					method name
+					and thus reference domain class properties. Defaults to false.
+				</xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+	</xsd:attributeGroup>
+
+	<xsd:element name="repositories">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="repository:repositories">
+					<xsd:attributeGroup ref="mongo-repository-attributes"/>
+					<xsd:attributeGroup ref="repository:repository-attributes"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="mapping-converter">
+		<xsd:annotation>
+			<xsd:documentation>
+				<![CDATA[Defines a MongoConverter for getting rich mapping functionality.]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:exports
+						type="org.springframework.data.mongodb.core.convert.MappingMongoConverter"/>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="custom-converters" minOccurs="0">
+					<xsd:annotation>
+						<xsd:documentation><![CDATA[
+		Top-level element that contains one or more custom converters to be used for mapping
+		domain objects to and from Mongo's Document]]>
+						</xsd:documentation>
+					</xsd:annotation>
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element name="converter" type="customConverterType"
+							             minOccurs="0" maxOccurs="unbounded"/>
+						</xsd:sequence>
+						<xsd:attribute name="base-package" type="xsd:string"/>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:sequence>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MappingMongoConverter instance (by default "mappingConverter").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="base-package" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The base package in which to scan for entities annotated with @Document
+							]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+									type="org.springframework.data.mongodb.MongoDatabaseFactory"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="type-mapper-ref" type="typeMapperRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoTypeMapper to be used by this
+						MappingMongoConverter.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef"
+			               use="optional">
+				<xsd:annotation>
+					<xsd:documentation
+							source="org.springframework.data.mapping.model.MappingContext">
+						The reference to a MappingContext. Will default to
+						'mappingContext'.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="disable-validation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation
+							source="org.springframework.data.mongodb.core.mapping.event.ValidatingMongoEventListener">
+						Disables JSR-303 validation on MongoDB documents before they are
+						saved. By default it is set to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="abbreviate-field-names" use="optional">
+				<xsd:annotation>
+					<xsd:documentation
+							source="org.springframework.data.mongodb.core.mapping.CamelCaseAbbreviatingFieldNamingStrategy">
+						Enables abbreviating the field names for domain class properties
+						to the
+						first character of their camel case names, e.g. fooBar -> fb.
+						Defaults to false.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+			<xsd:attribute name="field-naming-strategy-ref" type="fieldNamingStrategyRef"
+			               use="optional">
+				<xsd:annotation>
+					<xsd:documentation
+							source="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy">
+						The reference to a FieldNamingStrategy.
+					</xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="auto-index-creation" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						Enable/Disable index creation for annotated properties/entities.
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="xsd:boolean xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="auditing">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation>
+					<tool:exports
+							type="org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback"/>
+					<tool:exports
+							type="org.springframework.data.auditing.IsNewAwareAuditingHandler"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attributeGroup ref="repository:auditing-attributes"/>
+			<xsd:attribute name="mapping-context-ref" type="mappingContextRef"/>
+			<xsd:attribute name="mongo-converter-ref" type="mongoConverterRef"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:simpleType name="typeMapperRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.convert.MongoTypeMapper"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mappingContextRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mapping.model.MappingContext"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoConverterRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="fieldNamingStrategyRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.mapping.FieldNamingStrategy"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoTemplateRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.MongoTemplate"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="mongoRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.MongoClientFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="sslSocketFactoryRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to type="javax.net.ssl.SSLSocketFactory"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="encryptionSettingsRef">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Reference to FactoryBean for com.mongodb.AutoEncryptionSettings - @since 2.2
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.MongoEncryptionSettingsFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="serverApiRef">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Reference to FactoryBean for com.mongodb.MongoServerApiFactoryBean - @since 3.3
+			]]></xsd:documentation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.MongoServerApiFactoryBean"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="DEFAULT"/>
+			<xsd:enumeration value="LOCAL"/>
+			<xsd:enumeration value="MAJORITY"/>
+			<xsd:enumeration value="LINEARIZABLE"/>
+			<xsd:enumeration value="AVAILABLE"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="writeConcernEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="ACKNOWLEDGED"/>
+			<xsd:enumeration value="W1"/>
+			<xsd:enumeration value="W2"/>
+			<xsd:enumeration value="W3"/>
+			<xsd:enumeration value="UNACKNOWLEDGED"/>
+			<xsd:enumeration value="JOURNALED"/>
+			<xsd:enumeration value="MAJORITY"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="readPreferenceEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="PRIMARY"/>
+			<xsd:enumeration value="PRIMARY_PREFERRED"/>
+			<xsd:enumeration value="SECONDARY"/>
+			<xsd:enumeration value="SECONDARY_PREFERRED"/>
+			<xsd:enumeration value="NEAREST"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="uuidRepresentationEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="UNSPECIFIED"/>
+			<xsd:enumeration value="STANDARD"/>
+			<xsd:enumeration value="C_SHARP_LEGACY"/>
+			<xsd:enumeration value="JAVA_LEGACY"/>
+			<xsd:enumeration value="PYTHON_LEGACY"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterConnectionModeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="SINGLE"/>
+			<xsd:enumeration value="MULTIPLE"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clusterTypeEnumeration">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="STANDALONE"/>
+			<xsd:enumeration value="REPLICA_SET"/>
+			<xsd:enumeration value="SHARDED"/>
+			<xsd:enumeration value="UNKNOWN"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="booleanType">
+		<xsd:restriction base="xsd:token">
+			<xsd:enumeration value="true"/>
+			<xsd:enumeration value="false"/>
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:complexType name="mongoClientType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'com.mongodb.client.MongoClient'
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:sequence minOccurs="0" maxOccurs="1">
+			<xsd:element name="client-settings" type="clientSettingsType">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The Mongo driver settings
+							]]></xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation>
+							<tool:exports type="com.mongodb.MongoClientSettings"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:element>
+		</xsd:sequence>
+		<xsd:attribute name="id" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The name of the MongoClient definition (by default "mongoClient").]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-string" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The mongodb connection string. E.g. 'mongodb://localhost:27017?replicaSet=rs0'
+See https://docs.mongodb.com/manual/reference/connection-string/ for full documentation.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="port" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The port to connect to MongoDB server.  Default is 27017
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The host to connect to a MongoDB server.  Default is localhost
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="replica-set" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The replica set name when connecting to a cluster.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="credential" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+NOTE: Best way of setting up a connection is by providing the 'connection-string'.
+The comma delimited list of username:password@database entries to use for authentication. Appending ?uri.authMechanism allows to specify the authentication challenge mechanism. If the credential you're trying to pass contains a comma itself, quote it with single quotes: '…'.
+							]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:complexType name="clientSettingsType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Configuration options for 'MongoClientSettings' - @since 3.0
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:attribute name="application-name" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The application name to use when connecting to MongoDB. Mainly used to identify an operation in server logs, query logs and other profiling features.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="uuid-representation" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The storage format of UUID types.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="uuidRepresentationEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-preference" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The read preference to use for quries, map-reduce, aggregation and count operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readPreferenceEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="read-concern" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the global read isolation level.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="readConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="write-concern">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the default 'WriteConcern' that is controls the acknowledgment of write operations.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-reads" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether reads should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="retry-writes" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets whether writes should be retried if they fail due to a network error.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="socket-connect-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket connect timeout (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-read-timeout" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the socket read timeoutn (msec).
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-receive-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the receive buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="socket-send-buffer-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the send buffer size.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-heartbeat-frequency" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+This is the frequency that the driver will attempt to determine the current state of each server in the cluster.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-min-heartbeat-frequency" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+In the event that the driver has to frequently re-check a server's availability, it will wait at least this long since the previous check to avoid wasted effort.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-srv-host" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the host name to use in order to look up an SRV DNS record to find the MongoDB hosts.
+NOTE: do not use along with cluster-hosts.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-hosts" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the hosts for the cluster. Any duplicate server addresses are removed from the list.
+NOTE: do not use along with cluster-srv-host
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-connection-mode" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster connection mode to either single node direct or multiple servers.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterConnectionModeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-type" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the cluster type (eg. SHARDED, REPLICA_SET,...).
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="clusterTypeEnumeration xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-local-threshold" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the local threshold when selecting a server based on fastes ping time.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="cluster-server-selection-timeout" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the timeout to apply when selecting a server.
+Zero indicates an immediate timeout while a negative value means indefinitely wait.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum number of connections allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-min-size" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the minimum number of connections.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-wait-time" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum time a thread may wait for a connection to become available.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-life-time" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+The maximum time a pooled connection can live for.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-max-connection-idle-time" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the maximum idle time of a pooled connection.
+Zero indicates no limit.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-initial-delay" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the period of time to wait before running the first maintenance job on the connection pool.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="connection-pool-maintenance-frequency" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Sets the time period between runs of the maintenance job.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-enabled" default="false">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether SSL should be enabled or not.
+				]]></xsd:documentation>
+			</xsd:annotation>
+			<xsd:simpleType>
+				<xsd:union memberTypes="booleanType xsd:string"/>
+			</xsd:simpleType>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-invalid-host-name-allowed" type="xsd:string"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set whether invalid host names should be allowed.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="ssl-provider" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the SSL Context instance provider.
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="encryption-settings-ref" type="encryptionSettingsRef"
+		               use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+AutoEncryptionSettings for MongoDB 4.2+
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-api-version" type="xsd:string" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+Set the server API version for MongoDB 5.0+. Use server-api-ref if required to set additional modes like 'strict',...
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+		<xsd:attribute name="server-api-ref" type="serverApiRef" use="optional">
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+ServerAPI for MongoDB 5.0+
+				]]></xsd:documentation>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:group name="beanElementGroup">
+		<xsd:choice>
+			<xsd:element ref="beans:bean"/>
+			<xsd:element ref="beans:ref"/>
+		</xsd:choice>
+	</xsd:group>
+
+	<xsd:complexType name="customConverterType">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+	Element defining a custom converter.
+	]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:group ref="beanElementGroup" minOccurs="0" maxOccurs="1"/>
+		<xsd:attribute name="ref" type="xsd:string">
+			<xsd:annotation>
+				<xsd:documentation>
+					A reference to a custom converter.
+				</xsd:documentation>
+				<xsd:appinfo>
+					<tool:annotation kind="ref"/>
+				</xsd:appinfo>
+			</xsd:annotation>
+		</xsd:attribute>
+	</xsd:complexType>
+
+	<xsd:simpleType name="converterRef">
+		<xsd:annotation>
+			<xsd:appinfo>
+				<tool:annotation kind="ref">
+					<tool:assignable-to
+							type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+				</tool:annotation>
+			</xsd:appinfo>
+		</xsd:annotation>
+		<xsd:union memberTypes="xsd:string"/>
+	</xsd:simpleType>
+
+	<xsd:element name="template">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a MongoTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the MongoTemplate definition (by default "mongoTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+									type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string"
+			               use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+									type="org.springframework.data.mongodb.MongoDatabaseFactory"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="write-concern">
+				<xsd:annotation>
+					<xsd:documentation>
+						The WriteConcern that will be the default value used when asking
+						the MongoDatabaseFactory for a DB object
+					</xsd:documentation>
+				</xsd:annotation>
+				<xsd:simpleType>
+					<xsd:union memberTypes="writeConcernEnumeration xsd:string"/>
+				</xsd:simpleType>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="gridFsTemplate">
+		<xsd:annotation>
+			<xsd:documentation><![CDATA[
+Defines a GridFsTemplate.
+			]]></xsd:documentation>
+		</xsd:annotation>
+		<xsd:complexType>
+			<xsd:attribute name="id" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The name of the GridFsTemplate definition (by default "gridFsTemplate").]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="converter-ref" type="converterRef" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The reference to a MappingMongoConverter instance.
+					]]>
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+									type="org.springframework.data.mongodb.core.convert.MongoConverter"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="db-factory-ref" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation>
+						The reference to a MongoDatabaseFactory.
+					</xsd:documentation>
+					<xsd:appinfo>
+						<tool:annotation kind="ref">
+							<tool:assignable-to
+									type="org.springframework.data.mongodb.MongoDatabaseFactory"/>
+						</tool:annotation>
+					</xsd:appinfo>
+				</xsd:annotation>
+			</xsd:attribute>
+			<xsd:attribute name="bucket" type="xsd:string" use="optional">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+The GridFs bucket string.]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+</xsd:schema>
diff --git a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java
index 5226cf1e95..ce458132d9 100644
--- a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java
+++ b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackage.java
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,14 @@
  * limitations under the License.
  */
 
+import java.util.Collections;
+import java.util.Set;
+
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 
 /**
  * Sample configuration class in default package.
@@ -26,23 +30,20 @@
  * @author Oliver Gierke
  */
 @Configuration
-public class ConfigClassInDefaultPackage extends AbstractMongoConfiguration {
+public class ConfigClassInDefaultPackage extends MongoClientClosingTestConfiguration {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#getDatabaseName()
-	 */
 	@Override
 	protected String getDatabaseName() {
 		return "default";
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.config.AbstractMongoConfiguration#mongo()
-	 */
 	@Override
 	public MongoClient mongoClient() {
-		return new MongoClient();
+		return MongoClients.create();
+	}
+
+	@Override
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+		return Collections.emptySet();
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java
index 87403e68aa..7fa6c358f3 100644
--- a/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java
+++ b/spring-data-mongodb/src/test/java/ConfigClassInDefaultPackageUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.junit.Test;
+
+import org.junit.jupiter.api.Test;
+
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 
 /**
diff --git a/spring-data-mongodb/src/test/java/example/aot/User.java b/spring-data-mongodb/src/test/java/example/aot/User.java
new file mode 100644
index 0000000000..06022c0a55
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/example/aot/User.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright 2025 the original author 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 example.aot;
+
+import java.time.Instant;
+
+import org.springframework.data.mongodb.core.mapping.Field;
+
+/**
+ * @author Christoph Strobl
+ */
+public class User {
+
+	String id;
+
+	String username;
+
+	@Field("first_name") String firstname;
+
+	@Field("last_name") String lastname;
+
+	Instant registrationDate;
+	Instant lastSeen;
+	Long visits;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getFirstname() {
+		return firstname;
+	}
+
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	public String getLastname() {
+		return lastname;
+	}
+
+	public void setLastname(String lastname) {
+		this.lastname = lastname;
+	}
+
+	public Instant getRegistrationDate() {
+		return registrationDate;
+	}
+
+	public void setRegistrationDate(Instant registrationDate) {
+		this.registrationDate = registrationDate;
+	}
+
+	public Instant getLastSeen() {
+		return lastSeen;
+	}
+
+	public void setLastSeen(Instant lastSeen) {
+		this.lastSeen = lastSeen;
+	}
+
+	public Long getVisits() {
+		return visits;
+	}
+
+	public void setVisits(Long visits) {
+		this.visits = visits;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/monitor/Resumeable.java b/spring-data-mongodb/src/test/java/example/aot/UserProjection.java
similarity index 73%
rename from spring-data-mongodb/src/test/java/org/springframework/data/mongodb/monitor/Resumeable.java
rename to spring-data-mongodb/src/test/java/example/aot/UserProjection.java
index db017a47aa..e59598d3a9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/monitor/Resumeable.java
+++ b/spring-data-mongodb/src/test/java/example/aot/UserProjection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.mongodb.monitor;
+package example.aot;
 
-import java.util.function.Supplier;
+import java.time.Instant;
 
 /**
  * @author Christoph Strobl
- * @since 2018/01
  */
-interface Resumeable<T> {
+public interface UserProjection {
 
-	void resumeAt(Supplier<T> token);
+	String getUsername();
+
+	Instant getLastSeen();
 }
diff --git a/spring-data-mongodb/src/test/java/example/aot/UserRepository.java b/spring-data-mongodb/src/test/java/example/aot/UserRepository.java
new file mode 100644
index 0000000000..5eb9fed686
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/example/aot/UserRepository.java
@@ -0,0 +1,290 @@
+/*
+ * Copyright 2025 the original author 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 example.aot;
+
+import java.time.Instant;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.repository.Aggregation;
+import org.springframework.data.mongodb.repository.Hint;
+import org.springframework.data.mongodb.repository.Query;
+import org.springframework.data.mongodb.repository.ReadPreference;
+import org.springframework.data.mongodb.repository.Update;
+import org.springframework.data.repository.CrudRepository;
+
+/**
+ * @author Christoph Strobl
+ */
+public interface UserRepository extends CrudRepository<User, String> {
+
+	/* Derived Queries */
+
+	List<User> findUserNoArgumentsBy();
+
+	User findOneByUsername(String username);
+
+	Optional<User> findOptionalOneByUsername(String username);
+
+	Long countUsersByLastname(String lastname);
+
+	int countUsersAsIntByLastname(String lastname);
+
+	Boolean existsUserByLastname(String lastname);
+
+	List<User> findByLastnameStartingWith(String lastname);
+
+	List<User> findByLastnameEndsWith(String postfix);
+
+	List<User> findByFirstnameLike(String firstname);
+
+	List<User> findByFirstnameNotLike(String firstname);
+
+	List<User> findByUsernameIn(Collection<String> usernames);
+
+	List<User> findByUsernameNotIn(Collection<String> usernames);
+
+	List<User> findByFirstnameAndLastname(String firstname, String lastname);
+
+	List<User> findByFirstnameOrLastname(String firstname, String lastname);
+
+	List<User> findByVisitsBetween(long from, long to);
+
+	List<User> findByLastSeenGreaterThan(Instant time);
+
+	List<User> findByVisitsExists(boolean exists);
+
+	List<User> findByLastnameNot(String lastname);
+
+	List<User> findTop2ByLastnameStartingWith(String lastname);
+
+	List<User> findByLastnameStartingWithOrderByUsername(String lastname);
+
+	List<User> findByLastnameStartingWith(String lastname, Limit limit);
+
+	List<User> findByLastnameStartingWith(String lastname, Sort sort);
+
+	List<User> findByLastnameStartingWith(String lastname, Sort sort, Limit limit);
+
+	List<User> findByLastnameStartingWith(String lastname, Pageable page);
+
+	Page<User> findPageOfUsersByLastnameStartingWith(String lastname, Pageable page);
+
+	Slice<User> findSliceOfUserByLastnameStartingWith(String lastname, Pageable page);
+
+	Stream<User> streamByLastnameStartingWith(String lastname, Sort sort, Limit limit);
+
+	Window<User> findTop2WindowByLastnameStartingWithOrderByUsername(String lastname, ScrollPosition scrollPosition);
+
+	// TODO: GeoQueries
+	// TODO: TextSearch
+
+	/* Annotated Queries */
+
+	@Query("{ 'username' : ?0 }")
+	User findAnnotatedQueryByUsername(String username);
+
+	@Query(value = "{ 'lastname' : { '$regex' : '^?0' } }", count = true)
+	Long countAnnotatedQueryByLastname(String lastname);
+
+	@Query("{ 'lastname' : { '$regex' : '^?0' } }")
+	List<User> findAnnotatedQueryByLastname(String lastname);
+
+	@Query("""
+			{
+			    'lastname' : {
+			        '$regex' : '^?0'
+			    }
+			}""")
+	List<User> findAnnotatedMultilineQueryByLastname(String username);
+
+	@Query("{ 'lastname' : { '$regex' : '^?0' } }")
+	List<User> findAnnotatedQueryByLastname(String lastname, Limit limit);
+
+	@Query("{ 'lastname' : { '$regex' : '^?0' } }")
+	List<User> findAnnotatedQueryByLastname(String lastname, Sort sort);
+
+	@Query("{ 'lastname' : { '$regex' : '^?0' } }")
+	List<User> findAnnotatedQueryByLastname(String lastname, Limit limit, Sort sort);
+
+	@Query("{ 'lastname' : { '$regex' : '^?0' } }")
+	List<User> findAnnotatedQueryByLastname(String lastname, Pageable pageable);
+
+	@Query("{ 'lastname' : { '$regex' : '^?0' } }")
+	Page<User> findAnnotatedQueryPageOfUsersByLastname(String lastname, Pageable pageable);
+
+	@Query("{ 'lastname' : { '$regex' : '^?0' } }")
+	Slice<User> findAnnotatedQuerySliceOfUsersByLastname(String lastname, Pageable pageable);
+
+	/* deletes */
+
+	User deleteByUsername(String username);
+
+	@Query(value = "{ 'username' : ?0 }", delete = true)
+	User deleteAnnotatedQueryByUsername(String username);
+
+	Long deleteByLastnameStartingWith(String lastname);
+
+	@Query(value = "{ 'lastname' : { '$regex' : '^?0' } }", delete = true)
+	Long deleteAnnotatedQueryByLastnameStartingWith(String lastname);
+
+	List<User> deleteUsersByLastnameStartingWith(String lastname);
+
+	@Query(value = "{ 'lastname' : { '$regex' : '^?0' } }", delete = true)
+	List<User> deleteUsersAnnotatedQueryByLastnameStartingWith(String lastname);
+
+	/* Updates */
+
+	@Update("{ '$inc' : { 'visits' : ?1 } }")
+	int findUserAndIncrementVisitsByLastname(String lastname, int increment);
+
+	@Query("{ 'lastname' : ?0 }")
+	@Update("{ '$inc' : { 'visits' : ?1 } }")
+	int updateAllByLastname(String lastname, int increment);
+
+	@Update(pipeline = { "{ '$set' : { 'visits' : { '$ifNull' : [ {'$add' : [ '$visits', ?1 ] }, ?1 ] } } }" })
+	void findAndIncrementVisitsViaPipelineByLastname(String lastname, int increment);
+
+	/* Derived With Annotated Options */
+
+	@Query(sort = "{ 'username' : 1 }")
+	List<User> findWithAnnotatedSortByLastnameStartingWith(String lastname);
+
+	@Query(fields = "{ 'username' : 1 }")
+	List<User> findWithAnnotatedFieldsProjectionByLastnameStartingWith(String lastname);
+
+	@ReadPreference("no-such-read-preference")
+	User findWithReadPreferenceByUsername(String username);
+
+	/* Projecting Queries */
+
+	List<UserProjection> findUserProjectionByLastnameStartingWith(String lastname);
+
+	Page<UserProjection> findUserProjectionByLastnameStartingWith(String lastname, Pageable page);
+
+	<T> Page<T> findUserProjectionByLastnameStartingWith(String lastname, Pageable page, Class<T> projectionType);
+
+	/* Aggregations */
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$project': { '_id' : '$last_name' } }" })
+	List<String> findAllLastnames();
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$group': { '_id' : '$last_name', names : { $addToSet : '$?0' } } }" })
+	List<UserAggregate> groupByLastnameAnd(String property);
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$group': { '_id' : '$last_name', names : { $addToSet : '$?0' } } }" })
+	List<UserAggregate> groupByLastnameAnd(String property, Pageable pageable);
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$group': { '_id' : '$last_name', names : { $addToSet : '$?0' } } }" })
+	Slice<UserAggregate> groupByLastnameAndReturnPage(String property, Pageable pageable);
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$group': { '_id' : '$last_name', names : { $addToSet : '$?0' } } }" })
+	AggregationResults<UserAggregate> groupByLastnameAndAsAggregationResults(String property);
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$group': { '_id' : '$last_name', names : { $addToSet : '$?0' } } }" })
+	Stream<UserAggregate> streamGroupByLastnameAndAsAggregationResults(String property);
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'posts' : { '$ne' : null } } }", //
+			"{ '$project': { 'nrPosts' : {'$size': '$posts' } } }", //
+			"{ '$group' : { '_id' : null, 'total' : { $sum: '$nrPosts' } } }" })
+	int sumPosts();
+
+	@Hint("ln-idx")
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$project': { '_id' : '$last_name' } }" })
+	List<String> findAllLastnamesUsingIndex();
+
+	@ReadPreference("no-such-read-preference")
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$project': { '_id' : '$last_name' } }" })
+	List<String> findAllLastnamesWithReadPreference();
+
+	@Aggregation(pipeline = { //
+			"{ '$match' : { 'last_name' : { '$ne' : null } } }", //
+			"{ '$project': { '_id' : '$last_name' } }" }, collation = "no_collation")
+	List<String> findAllLastnamesWithCollation();
+
+	class UserAggregate {
+
+		@Id //
+		private final String lastname;
+		private final Set<String> names;
+
+		public UserAggregate(String lastname, Collection<String> names) {
+			this.lastname = lastname;
+			this.names = new HashSet<>(names);
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public Set<String> getNames() {
+			return this.names;
+		}
+
+		@Override
+		public String toString() {
+			return "UserAggregate{" + "lastname='" + lastname + '\'' + ", names=" + names + '}';
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			UserAggregate that = (UserAggregate) o;
+			return Objects.equals(lastname, that.lastname) && names.equals(that.names);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(lastname, names);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/example/first/First.java b/spring-data-mongodb/src/test/java/example/first/First.java
index 08a7343d53..04e50fa206 100644
--- a/spring-data-mongodb/src/test/java/example/first/First.java
+++ b/spring-data-mongodb/src/test/java/example/first/First.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/example/second/Second.java b/spring-data-mongodb/src/test/java/example/second/Second.java
index 54fbab8151..446501de87 100644
--- a/spring-data-mongodb/src/test/java/example/second/Second.java
+++ b/spring-data-mongodb/src/test/java/example/second/Second.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/CapturingTransactionOptionsResolver.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/CapturingTransactionOptionsResolver.java
new file mode 100644
index 0000000000..c05122873c
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/CapturingTransactionOptionsResolver.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2024-2025 the original author 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 java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.assertj.core.api.Assertions;
+import org.assertj.core.api.ListAssert;
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * @author Christoph Strobl
+ */
+public class CapturingTransactionOptionsResolver implements MongoTransactionOptionsResolver {
+
+	private final MongoTransactionOptionsResolver delegateResolver;
+	private final List<MongoTransactionOptions> capturedOptions = new ArrayList<>(10);
+
+	public CapturingTransactionOptionsResolver(MongoTransactionOptionsResolver delegateResolver) {
+		this.delegateResolver = delegateResolver;
+	}
+
+	@Override
+	public @Nullable String getLabelPrefix() {
+		return delegateResolver.getLabelPrefix();
+	}
+
+	@Override
+	public MongoTransactionOptions convert(Map<String, String> source) {
+
+		MongoTransactionOptions options = delegateResolver.convert(source);
+		capturedOptions.add(options);
+		return options;
+	}
+
+	public void clear() {
+		capturedOptions.clear();
+	}
+
+	public List<MongoTransactionOptions> getCapturedOptions() {
+		return capturedOptions;
+	}
+
+	public MongoTransactionOptions getLastCapturedOption() {
+		return CollectionUtils.lastElement(capturedOptions);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DefaultMongoTransactionOptionsResolverUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DefaultMongoTransactionOptionsResolverUnitTests.java
new file mode 100644
index 0000000000..2724fb1605
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DefaultMongoTransactionOptionsResolverUnitTests.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import java.util.Set;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.springframework.transaction.interceptor.DefaultTransactionAttribute;
+import org.springframework.transaction.interceptor.TransactionAttribute;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
+
+/**
+ * Unit tests for {@link DefaultMongoTransactionOptionsResolver}.
+ *
+ * @author Yan Kardziyaka
+ * @author Christoph Strobl
+ */
+class DefaultMongoTransactionOptionsResolverUnitTests {
+
+	@ParameterizedTest
+	@ValueSource(strings = { "mongo:maxCommitTime=-PT5S", "mongo:readConcern=invalidValue",
+			"mongo:readPreference=invalidValue", "mongo:writeConcern=invalidValue", "mongo:invalidPreference=jedi",
+			"mongo:readConcern", "mongo:readConcern:local", "mongo:readConcern=" })
+	void shouldThrowExceptionOnInvalidAttribute(String label) {
+
+		TransactionAttribute attribute = transactionAttribute(label);
+
+		assertThatThrownBy(() -> DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(attribute)) //
+				.isInstanceOf(IllegalArgumentException.class);
+	}
+
+	@Test // GH-1628
+	public void shouldReturnEmptyOptionsIfNotTransactionAttribute() {
+
+		DefaultTransactionDefinition definition = new DefaultTransactionDefinition();
+		assertThat(DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(definition))
+				.isSameAs(MongoTransactionOptions.NONE);
+	}
+
+	@Test // GH-1628
+	public void shouldReturnEmptyOptionsIfNoLabelsProvided() {
+
+		TransactionAttribute attribute = new DefaultTransactionAttribute();
+
+		assertThat(DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(attribute))
+				.isSameAs(MongoTransactionOptions.NONE);
+	}
+
+	@Test // GH-1628
+	public void shouldIgnoreNonMongoOptions() {
+
+		TransactionAttribute attribute = transactionAttribute("jpa:ignore");
+
+		assertThat(DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(attribute))
+				.isSameAs(MongoTransactionOptions.NONE);
+	}
+
+	@Test // GH-1628
+	public void shouldReturnMergedOptionsIfLabelsContainMaxCommitTime() {
+
+		TransactionAttribute attribute = transactionAttribute("mongo:maxCommitTime=PT5S");
+
+		assertThat(DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(attribute))
+				.returns(5L, from(options -> options.getMaxCommitTime().toSeconds())) //
+				.returns(null, from(MongoTransactionOptions::getReadConcern)) //
+				.returns(null, from(MongoTransactionOptions::getReadPreference)) //
+				.returns(null, from(MongoTransactionOptions::getWriteConcern));
+	}
+
+	@Test // GH-1628
+	public void shouldReturnReadConcernWhenPresent() {
+
+		TransactionAttribute attribute = transactionAttribute("mongo:readConcern=majority");
+
+		assertThat(DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(attribute))
+				.returns(null, from(TransactionMetadata::getMaxCommitTime)) //
+				.returns(ReadConcern.MAJORITY, from(MongoTransactionOptions::getReadConcern)) //
+				.returns(null, from(MongoTransactionOptions::getReadPreference)) //
+				.returns(null, from(MongoTransactionOptions::getWriteConcern));
+	}
+
+	@Test // GH-1628
+	public void shouldReturnMergedOptionsIfLabelsContainReadPreference() {
+
+		TransactionAttribute attribute = transactionAttribute("mongo:readPreference=primaryPreferred");
+
+		assertThat(DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(attribute))
+				.returns(null, from(TransactionMetadata::getMaxCommitTime)) //
+				.returns(null, from(MongoTransactionOptions::getReadConcern)) //
+				.returns(ReadPreference.primaryPreferred(), from(MongoTransactionOptions::getReadPreference)) //
+				.returns(null, from(MongoTransactionOptions::getWriteConcern));
+	}
+
+	@Test // GH-1628
+	public void shouldReturnMergedOptionsIfLabelsContainWriteConcern() {
+
+		TransactionAttribute attribute = transactionAttribute("mongo:writeConcern=w3");
+
+		assertThat(DefaultMongoTransactionOptionsResolver.INSTANCE.resolve(attribute))
+				.returns(null, from(TransactionMetadata::getMaxCommitTime)) //
+				.returns(null, from(MongoTransactionOptions::getReadConcern)) //
+				.returns(null, from(MongoTransactionOptions::getReadPreference)) //
+				.returns(WriteConcern.W3, from(MongoTransactionOptions::getWriteConcern));
+
+	}
+
+	private static TransactionAttribute transactionAttribute(String... labels) {
+
+		DefaultTransactionAttribute attribute = new DefaultTransactionAttribute();
+		attribute.setLabels(Set.of(labels));
+		return attribute;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java
index bebd844f1b..adcf9eb293 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/DependencyTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,12 @@
 package org.springframework.data.mongodb;
 
 import static de.schauderhaft.degraph.check.JCheck.*;
-import static org.junit.Assert.*;
+import static org.hamcrest.MatcherAssert.*;
 
 import de.schauderhaft.degraph.configuration.NamedPattern;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 /**
  * Tests package dependency constraints.
@@ -28,10 +29,11 @@
  * @author Jens Schauder
  * @author Oliver Gierke
  */
-public class DependencyTests {
+@Disabled("Needs to be tansitioned to ArchUnit")
+class DependencyTests {
 
 	@Test
-	public void noInternalPackageCycles() {
+	void noInternalPackageCycles() {
 
 		assertThat(classpath() //
 				.noJars() //
@@ -43,7 +45,7 @@ public void noInternalPackageCycles() {
 	}
 
 	@Test
-	public void onlyConfigMayUseRepository() {
+	void onlyConfigMayUseRepository() {
 
 		assertThat(classpath() //
 				.including("org.springframework.data.**") //
@@ -60,7 +62,7 @@ public void onlyConfigMayUseRepository() {
 	}
 
 	@Test
-	public void commonsInternaly() {
+	void commonsInternaly() {
 
 		assertThat(classpath() //
 				.noJars() //
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java
index 0ddfc86507..db1ab68269 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoDatabaseUtilsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,15 +19,14 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import javax.transaction.Status;
-import javax.transaction.UserTransaction;
+import jakarta.transaction.Status;
+import jakarta.transaction.UserTransaction;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.jta.JtaTransactionManager;
@@ -42,33 +41,18 @@
 /**
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoDatabaseUtilsUnitTests {
+@ExtendWith(MockitoExtension.class)
+class MongoDatabaseUtilsUnitTests {
 
 	@Mock ClientSession session;
 	@Mock ServerSession serverSession;
-	@Mock MongoDbFactory dbFactory;
+	@Mock MongoDatabaseFactory dbFactory;
 	@Mock MongoDatabase db;
 
 	@Mock UserTransaction userTransaction;
 
-	@Before
-	public void setUp() {
-
-		when(dbFactory.getSession(any())).thenReturn(session);
-
-		when(dbFactory.withSession(session)).thenReturn(dbFactory);
-
-		when(dbFactory.getDb()).thenReturn(db);
-
-		when(session.getServerSession()).thenReturn(serverSession);
-		when(session.hasActiveTransaction()).thenReturn(true);
-
-		when(serverSession.isClosed()).thenReturn(false);
-	}
-
-	@After
-	public void verifyTransactionSynchronizationManagerState() {
+	@AfterEach
+	void verifyTransactionSynchronizationManagerState() {
 
 		assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue();
 		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
@@ -79,7 +63,7 @@ public void verifyTransactionSynchronizationManagerState() {
 	}
 
 	@Test // DATAMONGO-2130
-	public void isTransactionActiveShouldDetectTxViaFactory() {
+	void isTransactionActiveShouldDetectTxViaFactory() {
 
 		when(dbFactory.isTransactionActive()).thenReturn(true);
 
@@ -87,7 +71,7 @@ public void isTransactionActiveShouldDetectTxViaFactory() {
 	}
 
 	@Test // DATAMONGO-2130
-	public void isTransactionActiveShouldReturnFalseIfNoTxActive() {
+	void isTransactionActiveShouldReturnFalseIfNoTxActive() {
 
 		when(dbFactory.isTransactionActive()).thenReturn(false);
 
@@ -95,7 +79,12 @@ public void isTransactionActiveShouldReturnFalseIfNoTxActive() {
 	}
 
 	@Test // DATAMONGO-2130
-	public void isTransactionActiveShouldLookupTxForActiveTransactionSynchronizationViaTxManager() {
+	void isTransactionActiveShouldLookupTxForActiveTransactionSynchronizationViaTxManager() {
+
+		when(dbFactory.getSession(any())).thenReturn(session);
+		when(session.getServerSession()).thenReturn(serverSession);
+		when(session.hasActiveTransaction()).thenReturn(true);
+		when(serverSession.isClosed()).thenReturn(false);
 
 		when(dbFactory.isTransactionActive()).thenReturn(false);
 
@@ -112,7 +101,7 @@ protected void doInTransactionWithoutResult(TransactionStatus transactionStatus)
 	}
 
 	@Test // DATAMONGO-1920
-	public void shouldNotStartSessionWhenNoTransactionOngoing() {
+	void shouldNotStartSessionWhenNoTransactionOngoing() {
 
 		MongoDatabaseUtils.getDatabase(dbFactory, SessionSynchronization.ON_ACTUAL_TRANSACTION);
 
@@ -120,8 +109,39 @@ public void shouldNotStartSessionWhenNoTransactionOngoing() {
 		verify(dbFactory, never()).withSession(any(ClientSession.class));
 	}
 
+	@Test // GH-3760
+	void shouldJustReturnDatabaseIfSessionSynchronizationDisabled() throws Exception {
+
+		when(dbFactory.getMongoDatabase()).thenReturn(db);
+
+		JtaTransactionManager txManager = new JtaTransactionManager(userTransaction);
+		TransactionTemplate txTemplate = new TransactionTemplate(txManager);
+
+		txTemplate.execute(new TransactionCallbackWithoutResult() {
+
+			@Override
+			protected void doInTransactionWithoutResult(TransactionStatus transactionStatus) {
+
+				MongoDatabaseUtils.getDatabase(dbFactory, SessionSynchronization.NEVER);
+
+				assertThat(TransactionSynchronizationManager.hasResource(dbFactory)).isFalse();
+			}
+		});
+
+		verify(userTransaction).getStatus();
+		verifyNoMoreInteractions(userTransaction);
+		verifyNoInteractions(session);
+	}
+
 	@Test // DATAMONGO-1920
-	public void shouldParticipateInOngoingJtaTransactionWithCommitWhenSessionSychronizationIsAny() throws Exception {
+	void shouldParticipateInOngoingJtaTransactionWithCommitWhenSessionSychronizationIsAny() throws Exception {
+
+		when(dbFactory.getSession(any())).thenReturn(session);
+		when(dbFactory.withSession(session)).thenReturn(dbFactory);
+		when(dbFactory.getMongoDatabase()).thenReturn(db);
+		when(session.getServerSession()).thenReturn(serverSession);
+		when(session.hasActiveTransaction()).thenReturn(true);
+		when(serverSession.isClosed()).thenReturn(false);
 
 		when(userTransaction.getStatus()).thenReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE,
 				Status.STATUS_ACTIVE);
@@ -152,7 +172,14 @@ protected void doInTransactionWithoutResult(TransactionStatus transactionStatus)
 	}
 
 	@Test // DATAMONGO-1920
-	public void shouldParticipateInOngoingJtaTransactionWithRollbackWhenSessionSychronizationIsAny() throws Exception {
+	void shouldParticipateInOngoingJtaTransactionWithRollbackWhenSessionSychronizationIsAny() throws Exception {
+
+		when(dbFactory.getSession(any())).thenReturn(session);
+		when(dbFactory.withSession(session)).thenReturn(dbFactory);
+		when(dbFactory.getMongoDatabase()).thenReturn(db);
+		when(session.getServerSession()).thenReturn(serverSession);
+		when(session.hasActiveTransaction()).thenReturn(true);
+		when(serverSession.isClosed()).thenReturn(false);
 
 		when(userTransaction.getStatus()).thenReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE,
 				Status.STATUS_ACTIVE);
@@ -185,8 +212,7 @@ protected void doInTransactionWithoutResult(TransactionStatus transactionStatus)
 	}
 
 	@Test // DATAMONGO-1920
-	public void shouldNotParticipateInOngoingJtaTransactionWithRollbackWhenSessionSychronizationIsNative()
-			throws Exception {
+	void shouldNotParticipateInOngoingJtaTransactionWithRollbackWhenSessionSychronizationIsNative() throws Exception {
 
 		when(userTransaction.getStatus()).thenReturn(Status.STATUS_NO_TRANSACTION, Status.STATUS_ACTIVE,
 				Status.STATUS_ACTIVE);
@@ -219,7 +245,13 @@ protected void doInTransactionWithoutResult(TransactionStatus transactionStatus)
 	}
 
 	@Test // DATAMONGO-1920
-	public void shouldParticipateInOngoingMongoTransactionWhenSessionSychronizationIsNative() {
+	void shouldParticipateInOngoingMongoTransactionWhenSessionSychronizationIsNative() {
+
+		when(dbFactory.getSession(any())).thenReturn(session);
+		when(dbFactory.withSession(session)).thenReturn(dbFactory);
+		when(dbFactory.getMongoDatabase()).thenReturn(db);
+		when(session.getServerSession()).thenReturn(serverSession);
+		when(serverSession.isClosed()).thenReturn(false);
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionTemplate txTemplate = new TransactionTemplate(txManager);
@@ -245,7 +277,13 @@ protected void doInTransactionWithoutResult(TransactionStatus transactionStatus)
 	}
 
 	@Test // DATAMONGO-1920
-	public void shouldParticipateInOngoingMongoTransactionWhenSessionSychronizationIsAny() {
+	void shouldParticipateInOngoingMongoTransactionWhenSessionSynchronizationIsAny() {
+
+		when(dbFactory.getSession(any())).thenReturn(session);
+		when(dbFactory.withSession(session)).thenReturn(dbFactory);
+		when(dbFactory.getMongoDatabase()).thenReturn(db);
+		when(session.getServerSession()).thenReturn(serverSession);
+		when(serverSession.isClosed()).thenReturn(false);
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionTemplate txTemplate = new TransactionTemplate(txManager);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionManagerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionManagerUnitTests.java
index e5bd71134a..db1993e63d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionManagerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionManagerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,14 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
@@ -37,47 +38,44 @@
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.session.ServerSession;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 /**
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoTransactionManagerUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MongoTransactionManagerUnitTests {
 
 	@Mock ClientSession session;
 	@Mock ClientSession session2;
 	@Mock ServerSession serverSession;
-	@Mock MongoDbFactory dbFactory;
-	@Mock MongoDbFactory dbFactory2;
+	@Mock MongoDatabaseFactory dbFactory;
+	@Mock MongoDatabaseFactory dbFactory2;
 	@Mock MongoDatabase db;
 	@Mock MongoDatabase db2;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		when(dbFactory.getSession(any())).thenReturn(session, session2);
-
+		when(dbFactory.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
+		when(dbFactory2.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
 		when(dbFactory.withSession(session)).thenReturn(dbFactory);
-		when(dbFactory.withSession(session2)).thenReturn(dbFactory2);
-
-		when(dbFactory.getDb()).thenReturn(db);
-		when(dbFactory2.getDb()).thenReturn(db2);
-
+		when(dbFactory.getMongoDatabase()).thenReturn(db);
 		when(session.getServerSession()).thenReturn(serverSession);
-		when(session2.getServerSession()).thenReturn(serverSession);
-
-		when(serverSession.isClosed()).thenReturn(false);
 	}
 
-	@After
-	public void verifyTransactionSynchronizationManager() {
+	@AfterEach
+	void verifyTransactionSynchronizationManager() {
 
 		assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue();
 		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
 	}
 
 	@Test // DATAMONGO-1920
-	public void triggerCommitCorrectly() {
+	void triggerCommitCorrectly() {
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionStatus txStatus = txManager.getTransaction(new DefaultTransactionDefinition());
@@ -99,7 +97,7 @@ public void triggerCommitCorrectly() {
 	}
 
 	@Test // DATAMONGO-1920
-	public void participateInOnGoingTransactionWithCommit() {
+	void participateInOnGoingTransactionWithCommit() {
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionStatus txStatus = txManager.getTransaction(new DefaultTransactionDefinition());
@@ -134,7 +132,7 @@ protected void doInTransactionWithoutResult(TransactionStatus status) {
 	}
 
 	@Test // DATAMONGO-1920
-	public void participateInOnGoingTransactionWithRollbackOnly() {
+	void participateInOnGoingTransactionWithRollbackOnly() {
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionStatus txStatus = txManager.getTransaction(new DefaultTransactionDefinition());
@@ -171,7 +169,7 @@ protected void doInTransactionWithoutResult(TransactionStatus status) {
 	}
 
 	@Test // DATAMONGO-1920
-	public void triggerRollbackCorrectly() {
+	void triggerRollbackCorrectly() {
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionStatus txStatus = txManager.getTransaction(new DefaultTransactionDefinition());
@@ -193,7 +191,7 @@ public void triggerRollbackCorrectly() {
 	}
 
 	@Test // DATAMONGO-1920
-	public void suspendTransactionWhilePropagationNotSupported() {
+	void suspendTransactionWhilePropagationNotSupported() {
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionStatus txStatus = txManager.getTransaction(new DefaultTransactionDefinition());
@@ -236,7 +234,12 @@ protected void doInTransactionWithoutResult(TransactionStatus status) {
 	}
 
 	@Test // DATAMONGO-1920
-	public void suspendTransactionWhilePropagationRequiresNew() {
+	void suspendTransactionWhilePropagationRequiresNew() {
+
+		when(dbFactory.withSession(session2)).thenReturn(dbFactory2);
+		when(dbFactory2.getMongoDatabase()).thenReturn(db2);
+		when(session2.getServerSession()).thenReturn(serverSession);
+		when(serverSession.isClosed()).thenReturn(false);
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 		TransactionStatus txStatus = txManager.getTransaction(new DefaultTransactionDefinition());
@@ -280,7 +283,7 @@ protected void doInTransactionWithoutResult(TransactionStatus status) {
 	}
 
 	@Test // DATAMONGO-1920
-	public void readonlyShouldInitiateASessionStartAndCommitTransaction() {
+	void readonlyShouldInitiateASessionStartAndCommitTransaction() {
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 
@@ -306,7 +309,7 @@ public void readonlyShouldInitiateASessionStartAndCommitTransaction() {
 	}
 
 	@Test // DATAMONGO-1920
-	public void readonlyShouldInitiateASessionStartAndRollbackTransaction() {
+	void readonlyShouldInitiateASessionStartAndRollbackTransaction() {
 
 		MongoTransactionManager txManager = new MongoTransactionManager(dbFactory);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionOptionsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionOptionsUnitTests.java
new file mode 100644
index 0000000000..d89edc6206
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/MongoTransactionOptionsUnitTests.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2024-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import java.time.Duration;
+import java.util.concurrent.TimeUnit;
+
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+import com.mongodb.TransactionOptions;
+import com.mongodb.WriteConcern;
+
+/**
+ * Unit tests for {@link MongoTransactionOptions}.
+ *
+ * @author Christoph Strobl
+ */
+class MongoTransactionOptionsUnitTests {
+
+	private static final TransactionOptions NATIVE_OPTIONS = TransactionOptions.builder() //
+			.maxCommitTime(1L, TimeUnit.SECONDS) //
+			.readConcern(ReadConcern.SNAPSHOT) //
+			.readPreference(ReadPreference.secondaryPreferred()) //
+			.writeConcern(WriteConcern.W3) //
+			.build();
+
+	@Test // GH-1628
+	void wrapsNativeDriverTransactionOptions() {
+
+		assertThat(MongoTransactionOptions.of(NATIVE_OPTIONS))
+				.returns(NATIVE_OPTIONS.getMaxCommitTime(TimeUnit.SECONDS), options -> options.getMaxCommitTime().toSeconds())
+				.returns(NATIVE_OPTIONS.getReadConcern(), MongoTransactionOptions::getReadConcern)
+				.returns(NATIVE_OPTIONS.getReadPreference(), MongoTransactionOptions::getReadPreference)
+				.returns(NATIVE_OPTIONS.getWriteConcern(), MongoTransactionOptions::getWriteConcern)
+				.returns(NATIVE_OPTIONS, MongoTransactionOptions::toDriverOptions);
+	}
+
+	@Test // GH-1628
+	void mergeNoneWithDefaultsUsesDefaults() {
+
+		assertThat(MongoTransactionOptions.NONE.mergeWith(MongoTransactionOptions.of(NATIVE_OPTIONS)))
+				.returns(NATIVE_OPTIONS.getMaxCommitTime(TimeUnit.SECONDS), options -> options.getMaxCommitTime().toSeconds())
+				.returns(NATIVE_OPTIONS.getReadConcern(), MongoTransactionOptions::getReadConcern)
+				.returns(NATIVE_OPTIONS.getReadPreference(), MongoTransactionOptions::getReadPreference)
+				.returns(NATIVE_OPTIONS.getWriteConcern(), MongoTransactionOptions::getWriteConcern)
+				.returns(NATIVE_OPTIONS, MongoTransactionOptions::toDriverOptions);
+	}
+
+	@Test // GH-1628
+	void mergeExistingOptionsWithNoneUsesOptions() {
+
+		MongoTransactionOptions source = MongoTransactionOptions.of(NATIVE_OPTIONS);
+		assertThat(source.mergeWith(MongoTransactionOptions.NONE)).isSameAs(source);
+	}
+
+	@Test // GH-1628
+	void mergeExistingOptionsWithUsesFirstNonNullValue() {
+
+		MongoTransactionOptions source = MongoTransactionOptions
+				.of(TransactionOptions.builder().writeConcern(WriteConcern.UNACKNOWLEDGED).build());
+
+		assertThat(source.mergeWith(MongoTransactionOptions.of(NATIVE_OPTIONS)))
+				.returns(NATIVE_OPTIONS.getMaxCommitTime(TimeUnit.SECONDS), options -> options.getMaxCommitTime().toSeconds())
+				.returns(NATIVE_OPTIONS.getReadConcern(), MongoTransactionOptions::getReadConcern)
+				.returns(NATIVE_OPTIONS.getReadPreference(), MongoTransactionOptions::getReadPreference)
+				.returns(source.getWriteConcern(), MongoTransactionOptions::getWriteConcern);
+	}
+
+	@Test // GH-1628
+	void testEquals() {
+
+		assertThat(MongoTransactionOptions.NONE) //
+				.isSameAs(MongoTransactionOptions.NONE) //
+				.isNotEqualTo(new MongoTransactionOptions() {
+					@Override
+					public @Nullable Duration getMaxCommitTime() {
+						return null;
+					}
+
+					@Override
+					public @Nullable ReadConcern getReadConcern() {
+						return null;
+					}
+
+					@Override
+					public @Nullable ReadPreference getReadPreference() {
+						return null;
+					}
+
+					@Override
+					public @Nullable WriteConcern getWriteConcern() {
+						return null;
+					}
+				});
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtilsUnitTests.java
index d50cdd9149..64331704c6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtilsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoDatabaseUtilsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,17 +16,17 @@
 package org.springframework.data.mongodb;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.transaction.reactive.TransactionSynchronizationManager;
 import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -40,27 +40,18 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ReactiveMongoDatabaseUtilsUnitTests {
+@ExtendWith(MockitoExtension.class)
+class ReactiveMongoDatabaseUtilsUnitTests {
 
 	@Mock ClientSession session;
 	@Mock ServerSession serverSession;
 	@Mock ReactiveMongoDatabaseFactory databaseFactory;
 	@Mock MongoDatabase db;
 
-	@Before
-	public void setUp() {
-
-		when(databaseFactory.getSession(any())).thenReturn(Mono.just(session));
-		when(databaseFactory.getMongoDatabase()).thenReturn(db);
-
-		when(session.getServerSession()).thenReturn(serverSession);
-		when(session.hasActiveTransaction()).thenReturn(true);
-	}
-
 	@Test // DATAMONGO-2265
-	public void isTransactionActiveShouldDetectTxViaFactory() {
+	void isTransactionActiveShouldDetectTxViaFactory() {
 
 		when(databaseFactory.isTransactionActive()).thenReturn(true);
 
@@ -70,7 +61,7 @@ public void isTransactionActiveShouldDetectTxViaFactory() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void isTransactionActiveShouldReturnFalseIfNoTxActive() {
+	void isTransactionActiveShouldReturnFalseIfNoTxActive() {
 
 		when(databaseFactory.isTransactionActive()).thenReturn(false);
 
@@ -80,8 +71,11 @@ public void isTransactionActiveShouldReturnFalseIfNoTxActive() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void isTransactionActiveShouldLookupTxForActiveTransactionSynchronizationViaTxManager() {
+	void isTransactionActiveShouldLookupTxForActiveTransactionSynchronizationViaTxManager() {
 
+		when(session.getServerSession()).thenReturn(serverSession);
+		when(session.hasActiveTransaction()).thenReturn(true);
+		when(databaseFactory.getSession(any())).thenReturn(Mono.just(session));
 		when(databaseFactory.isTransactionActive()).thenReturn(false);
 		when(session.commitTransaction()).thenReturn(Mono.empty());
 
@@ -94,8 +88,24 @@ public void isTransactionActiveShouldLookupTxForActiveTransactionSynchronization
 		}).as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
+	@Test // GH-3760
+	void shouldJustReturnDatabaseIfSessionSynchronizationDisabled() {
+
+		when(databaseFactory.getMongoDatabase()).thenReturn(Mono.just(db));
+
+		ReactiveMongoDatabaseUtils.getDatabase(databaseFactory, SessionSynchronization.NEVER) //
+				.as(StepVerifier::create) //
+				.expectNextCount(1) //
+				.verifyComplete();
+
+		verify(databaseFactory, never()).getSession(any());
+		verify(databaseFactory, never()).withSession(any(ClientSession.class));
+	}
+
 	@Test // DATAMONGO-2265
-	public void shouldNotStartSessionWhenNoTransactionOngoing() {
+	void shouldNotStartSessionWhenNoTransactionOngoing() {
+
+		when(databaseFactory.getMongoDatabase()).thenReturn(Mono.just(db));
 
 		ReactiveMongoDatabaseUtils.getDatabase(databaseFactory, SessionSynchronization.ON_ACTUAL_TRANSACTION) //
 				.as(StepVerifier::create) //
@@ -107,7 +117,10 @@ public void shouldNotStartSessionWhenNoTransactionOngoing() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void shouldParticipateInOngoingMongoTransactionWhenSessionSychronizationIsNative() {
+	void shouldParticipateInOngoingMongoTransactionWhenSessionSychronizationIsNative() {
+
+		when(session.getServerSession()).thenReturn(serverSession);
+		when(databaseFactory.getSession(any())).thenReturn(Mono.just(session));
 
 		ReactiveMongoTransactionManager txManager = new ReactiveMongoTransactionManager(databaseFactory);
 		when(session.abortTransaction()).thenReturn(Mono.empty());
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoTransactionManagerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoTransactionManagerUnitTests.java
index 6acc3f046d..9dbb2d550d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoTransactionManagerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveMongoTransactionManagerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,24 +15,21 @@
  */
 package org.springframework.data.mongodb;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import com.mongodb.reactivestreams.client.ClientSession;
 import com.mongodb.reactivestreams.client.MongoDatabase;
@@ -43,9 +40,10 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ReactiveMongoTransactionManagerUnitTests {
+@ExtendWith(MockitoExtension.class)
+class ReactiveMongoTransactionManagerUnitTests {
 
 	@Mock ClientSession session;
 	@Mock ClientSession session2;
@@ -55,30 +53,16 @@ public class ReactiveMongoTransactionManagerUnitTests {
 	@Mock MongoDatabase db;
 	@Mock MongoDatabase db2;
 
-	@Before
-	public void setUp() {
-
+	@BeforeEach
+	void setUp() {
 		when(databaseFactory.getSession(any())).thenReturn(Mono.just(session), Mono.just(session2));
-
 		when(databaseFactory.withSession(session)).thenReturn(databaseFactory);
-		when(databaseFactory.withSession(session2)).thenReturn(databaseFactory2);
-
-		when(databaseFactory.getMongoDatabase()).thenReturn(db);
-		when(databaseFactory2.getMongoDatabase()).thenReturn(db2);
-
+		when(databaseFactory.getMongoDatabase()).thenReturn(Mono.just(db));
 		when(session.getServerSession()).thenReturn(serverSession);
-		when(session2.getServerSession()).thenReturn(serverSession);
-	}
-
-	@After
-	public void verifyTransactionSynchronizationManager() {
-
-		assertThat(TransactionSynchronizationManager.getResourceMap().isEmpty()).isTrue();
-		assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();
 	}
 
 	@Test // DATAMONGO-2265
-	public void triggerCommitCorrectly() {
+	void triggerCommitCorrectly() {
 
 		ReactiveMongoTransactionManager txManager = new ReactiveMongoTransactionManager(databaseFactory);
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(databaseFactory);
@@ -103,7 +87,7 @@ public void triggerCommitCorrectly() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void participateInOnGoingTransactionWithCommit() {
+	void participateInOnGoingTransactionWithCommit() {
 
 		ReactiveMongoTransactionManager txManager = new ReactiveMongoTransactionManager(databaseFactory);
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(databaseFactory);
@@ -131,7 +115,7 @@ public void participateInOnGoingTransactionWithCommit() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void participateInOnGoingTransactionWithRollbackOnly() {
+	void participateInOnGoingTransactionWithRollbackOnly() {
 
 		ReactiveMongoTransactionManager txManager = new ReactiveMongoTransactionManager(databaseFactory);
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(databaseFactory);
@@ -156,7 +140,7 @@ public void participateInOnGoingTransactionWithRollbackOnly() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void suspendTransactionWhilePropagationNotSupported() {
+	void suspendTransactionWhilePropagationNotSupported() {
 
 		ReactiveMongoTransactionManager txManager = new ReactiveMongoTransactionManager(databaseFactory);
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(databaseFactory);
@@ -195,7 +179,11 @@ public void suspendTransactionWhilePropagationNotSupported() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void suspendTransactionWhilePropagationRequiresNew() {
+	void suspendTransactionWhilePropagationRequiresNew() {
+
+		when(databaseFactory.withSession(session2)).thenReturn(databaseFactory2);
+		when(databaseFactory2.getMongoDatabase()).thenReturn(Mono.just(db2));
+		when(session2.getServerSession()).thenReturn(serverSession);
 
 		ReactiveMongoTransactionManager txManager = new ReactiveMongoTransactionManager(databaseFactory);
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(databaseFactory);
@@ -237,7 +225,7 @@ public void suspendTransactionWhilePropagationRequiresNew() {
 	}
 
 	@Test // DATAMONGO-2265
-	public void readonlyShouldInitiateASessionStartAndCommitTransaction() {
+	void readonlyShouldInitiateASessionStartAndCommitTransaction() {
 
 		ReactiveMongoTransactionManager txManager = new ReactiveMongoTransactionManager(databaseFactory);
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(databaseFactory);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionIntegrationTests.java
index 1a4aa79f26..a6135939de 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,82 +15,101 @@
  */
 package org.springframework.data.mongodb;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.RequiredArgsConstructor;
+import static java.util.UUID.*;
+import static org.assertj.core.api.Assertions.*;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
+import java.util.Collections;
+import java.util.Objects;
+import java.util.Set;
 
 import org.bson.types.ObjectId;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledIfSystemProperty;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.SetSystemProperty;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.Version;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.transaction.TransactionSystemException;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.transaction.support.DefaultTransactionDefinition;
 
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
+import com.mongodb.WriteConcern;
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * Integration tests for reactive transaction management.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Yan Kardziyaka
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(MongoClientExtension.class)
+@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+@EnableIfReplicaSetAvailable
+@DisabledIfSystemProperty(named = "user.name", matches = "jenkins")
+@SetSystemProperty(key = "tx.read.concern", value = "local")
 public class ReactiveTransactionIntegrationTests {
 
-	public static @ClassRule RuleChain TEST_RULES = RuleChain.outerRule(MongoVersionRule.atLeast(Version.parse("4.0.0")))
-			.around(ReplicaSet.required());
-
 	private static final String DATABASE = "rxtx-test";
+
+	static @Client MongoClient mongoClient;
+	static GenericApplicationContext context;
+
 	PersonService personService;
 	ReactiveMongoOperations operations;
-	static GenericApplicationContext context;
+	ReactiveTransactionOptionsTestService<Person> transactionOptionsTestService;
+	CapturingTransactionOptionsResolver transactionOptionsResolver;
 
-	@BeforeClass
+	@BeforeAll
 	public static void init() {
 		context = new AnnotationConfigApplicationContext(TestMongoConfig.class, PersonService.class);
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void after() {
 		context.close();
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		personService = context.getBean(PersonService.class);
 		operations = context.getBean(ReactiveMongoOperations.class);
+		transactionOptionsTestService = context.getBean(ReactiveTransactionOptionsTestService.class);
+		transactionOptionsResolver = context.getBean(CapturingTransactionOptionsResolver.class);
+		transactionOptionsResolver.clear(); // clean out left overs from dirty context
 
-		MongoClient client = MongoTestUtils.reactiveClient();
+		try (MongoClient client = MongoTestUtils.reactiveClient()) {
 
-		Flux.merge( //
-				MongoTestUtils.createOrReplaceCollection(DATABASE, operations.getCollectionName(Person.class), client),
-				MongoTestUtils.createOrReplaceCollection(DATABASE, operations.getCollectionName(EventLog.class), client) //
-		).then().as(StepVerifier::create).verifyComplete();
+			Flux.merge( //
+					MongoTestUtils.createOrReplaceCollection(DATABASE, operations.getCollectionName(Person.class), client),
+					MongoTestUtils.createOrReplaceCollection(DATABASE, operations.getCollectionName(EventLog.class), client) //
+			).then().as(StepVerifier::create).thenAwait(Duration.ofMillis(100)).verifyComplete();
+		}
 	}
 
 	@Test // DATAMONGO-2265
@@ -124,6 +143,7 @@ public void commitShouldPersistTxEntries() {
 
 		personService.savePerson(new Person(null, "Walter", "White")) //
 				.as(StepVerifier::create) //
+				.thenAwait(Duration.ofMillis(100))
 				.expectNextCount(1) //
 				.verifyComplete();
 
@@ -218,12 +238,145 @@ public void errorAfterTxShouldNotAffectPreviousStep() {
 				.verifyComplete();
 	}
 
+	@Test // GH-1628
+	public void shouldThrowTransactionSystemExceptionOnTransactionWithInvalidMaxCommitTime() {
+
+		Person person = new Person(ObjectId.get(), randomUUID().toString(), randomUUID().toString());
+		transactionOptionsTestService.saveWithInvalidMaxCommitTime(person) //
+				.as(StepVerifier::create) //
+				.verifyError(TransactionSystemException.class);
+
+		operations.count(new Query(), Person.class) //
+				.as(StepVerifier::create) //
+				.expectNext(0L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-1628
+	public void shouldCommitOnTransactionWithinMaxCommitTime() {
+
+		Person person = new Person(ObjectId.get(), randomUUID().toString(), randomUUID().toString());
+		transactionOptionsTestService.saveWithinMaxCommitTime(person) //
+				.as(StepVerifier::create) //
+				.expectNext(person) //
+				.verifyComplete();
+
+		assertThat(transactionOptionsResolver.getLastCapturedOption()).returns(Duration.ofMinutes(1),
+				MongoTransactionOptions::getMaxCommitTime);
+
+		operations.count(new Query(), Person.class) //
+				.as(StepVerifier::create) //
+				.expectNext(1L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-1628
+	public void shouldThrowInvalidDataAccessApiUsageExceptionOnTransactionWithAvailableReadConcern() {
+		transactionOptionsTestService.availableReadConcernFind(randomUUID().toString()) //
+				.as(StepVerifier::create) //
+				.verifyError(InvalidDataAccessApiUsageException.class);
+	}
+
+	@Test // GH-1628
+	public void shouldThrowTransactionSystemExceptionOnTransactionWithInvalidReadConcern() {
+		transactionOptionsTestService.invalidReadConcernFind(randomUUID().toString()) //
+				.as(StepVerifier::create) //
+				.verifyError(TransactionSystemException.class);
+	}
+
+	@Test // GH-1628
+	public void shouldReadTransactionOptionFromSystemProperty() {
+
+		transactionOptionsTestService.environmentReadConcernFind(randomUUID().toString()).then().as(StepVerifier::create)
+				.verifyComplete();
+
+		assertThat(transactionOptionsResolver.getLastCapturedOption()).returns(
+				new ReadConcern(ReadConcernLevel.fromString(System.getProperty("tx.read.concern"))),
+				MongoTransactionOptions::getReadConcern);
+	}
+
+	@Test // GH-1628
+	public void shouldNotThrowOnTransactionWithMajorityReadConcern() {
+		transactionOptionsTestService.majorityReadConcernFind(randomUUID().toString()) //
+				.as(StepVerifier::create) //
+				.expectNextCount(0L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-1628
+	public void shouldThrowUncategorizedMongoDbExceptionOnTransactionWithPrimaryPreferredReadPreference() {
+		transactionOptionsTestService.findFromPrimaryPreferredReplica(randomUUID().toString()) //
+				.as(StepVerifier::create) //
+				.verifyError(UncategorizedMongoDbException.class);
+	}
+
+	@Test // GH-1628
+	public void shouldThrowTransactionSystemExceptionOnTransactionWithInvalidReadPreference() {
+		transactionOptionsTestService.findFromInvalidReplica(randomUUID().toString()) //
+				.as(StepVerifier::create) //
+				.verifyError(TransactionSystemException.class);
+	}
+
+	@Test // GH-1628
+	public void shouldNotThrowOnTransactionWithPrimaryReadPreference() {
+		transactionOptionsTestService.findFromPrimaryReplica(randomUUID().toString()) //
+				.as(StepVerifier::create) //
+				.expectNextCount(0L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-1628
+	public void shouldThrowTransactionSystemExceptionOnTransactionWithUnacknowledgedWriteConcern() {
+
+		Person person = new Person(ObjectId.get(), randomUUID().toString(), randomUUID().toString());
+		transactionOptionsTestService.unacknowledgedWriteConcernSave(person) //
+				.as(StepVerifier::create) //
+				.verifyError(TransactionSystemException.class);
+
+		operations.count(new Query(), Person.class) //
+				.as(StepVerifier::create).expectNext(0L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-1628
+	public void shouldThrowTransactionSystemExceptionOnTransactionWithInvalidWriteConcern() {
+
+		Person person = new Person(ObjectId.get(), randomUUID().toString(), randomUUID().toString());
+		transactionOptionsTestService.invalidWriteConcernSave(person) //
+				.as(StepVerifier::create) //
+				.verifyError(TransactionSystemException.class);
+
+		operations.count(new Query(), Person.class) //
+				.as(StepVerifier::create) //
+				.expectNext(0L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-1628
+	public void shouldCommitOnTransactionWithAcknowledgedWriteConcern() {
+
+		Person person = new Person(ObjectId.get(), randomUUID().toString(), randomUUID().toString());
+		transactionOptionsTestService.acknowledgedWriteConcernSave(person) //
+				.as(StepVerifier::create) //
+				.expectNext(person) //
+				.verifyComplete();
+
+		assertThat(transactionOptionsResolver.getLastCapturedOption()).returns(WriteConcern.ACKNOWLEDGED,
+				MongoTransactionOptions::getWriteConcern);
+
+		operations.count(new Query(), Person.class) //
+				.as(StepVerifier::create) //
+				.expectNext(1L) //
+				.verifyComplete();
+	}
+
 	@Configuration
+	@EnableTransactionManagement
 	static class TestMongoConfig extends AbstractReactiveMongoConfiguration {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return mongoClient;
 		}
 
 		@Override
@@ -232,24 +385,46 @@ protected String getDatabaseName() {
 		}
 
 		@Bean
-		public ReactiveMongoTransactionManager transactionManager(ReactiveMongoDatabaseFactory factory) {
-			return new ReactiveMongoTransactionManager(factory);
+		CapturingTransactionOptionsResolver txOptionsResolver() {
+			return new CapturingTransactionOptionsResolver(MongoTransactionOptionsResolver.defaultResolver());
+		}
+
+		@Bean
+		public ReactiveMongoTransactionManager txManager(ReactiveMongoDatabaseFactory factory,
+				MongoTransactionOptionsResolver txOptionsResolver) {
+			return new ReactiveMongoTransactionManager(factory, txOptionsResolver, MongoTransactionOptions.NONE);
+		}
+
+		@Bean
+		public ReactiveTransactionOptionsTestService<Person> transactionOptionsTestService(
+				ReactiveMongoOperations operations) {
+			return new ReactiveTransactionOptionsTestService<>(operations, Person.class);
+		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() {
+			return Collections.singleton(Person.class);
 		}
 	}
 
-	@RequiredArgsConstructor
 	static class PersonService {
 
 		final ReactiveMongoOperations operations;
 		final ReactiveMongoTransactionManager manager;
 
+		PersonService(ReactiveMongoOperations operations, ReactiveMongoTransactionManager manager) {
+
+			this.operations = operations;
+			this.manager = manager;
+		}
+
 		public Mono<Person> savePersonErrors(Person person) {
 
 			TransactionalOperator transactionalOperator = TransactionalOperator.create(manager,
 					new DefaultTransactionDefinition());
 
 			return operations.save(person) //
-					.<Person> flatMap(it -> Mono.error(new RuntimeException("poof!"))) //
+					.<Person> flatMap(it -> Mono.error(new RuntimeException("poof"))) //
 					.as(transactionalOperator::transactional);
 		}
 
@@ -278,7 +453,7 @@ public Flux<EventLog> saveWithLogs(Person person) {
 			TransactionalOperator transactionalOperator = TransactionalOperator.create(manager,
 					new DefaultTransactionDefinition());
 
-			return Flux.merge(operations.save(new EventLog(new ObjectId(), "beforeConvert")), //
+			return Flux.concat(operations.save(new EventLog(new ObjectId(), "beforeConvert")), //
 					operations.save(new EventLog(new ObjectId(), "afterConvert")), //
 					operations.save(new EventLog(new ObjectId(), "beforeInsert")), //
 					operations.save(person), //
@@ -292,16 +467,16 @@ public Flux<Void> saveWithErrorLogs(Person person) {
 			TransactionalOperator transactionalOperator = TransactionalOperator.create(manager,
 					new DefaultTransactionDefinition());
 
-			return Flux.merge(operations.save(new EventLog(new ObjectId(), "beforeConvert")), //
+			return Flux.concat(operations.save(new EventLog(new ObjectId(), "beforeConvert")), //
 					operations.save(new EventLog(new ObjectId(), "afterConvert")), //
 					operations.save(new EventLog(new ObjectId(), "beforeInsert")), //
 					operations.save(person), //
 					operations.save(new EventLog(new ObjectId(), "afterInsert"))) //
-					.<Void> flatMap(it -> Mono.error(new RuntimeException("poof!"))) //
+					.<Void> flatMap(it -> Mono.error(new RuntimeException("poof"))) //
 					.as(transactionalOperator::transactional);
 		}
 
-		@Transactional
+		@Transactional(transactionManager = "txManager")
 		public Flux<Person> declarativeSavePerson(Person person) {
 
 			TransactionalOperator transactionalOperator = TransactionalOperator.create(manager,
@@ -312,7 +487,7 @@ public Flux<Person> declarativeSavePerson(Person person) {
 			});
 		}
 
-		@Transactional
+		@Transactional(transactionManager = "txManager")
 		public Flux<Person> declarativeSavePersonErrors(Person person) {
 
 			TransactionalOperator transactionalOperator = TransactionalOperator.create(manager,
@@ -321,25 +496,118 @@ public Flux<Person> declarativeSavePersonErrors(Person person) {
 			return transactionalOperator.execute(reactiveTransaction -> {
 
 				return operations.save(person) //
-						.<Person> flatMap(it -> Mono.error(new RuntimeException("poof!")));
+						.<Person> flatMap(it -> Mono.error(new RuntimeException("poof")));
 			});
 		}
 	}
 
-	@Data
-	@AllArgsConstructor
 	@Document("person-rx")
 	static class Person {
 
 		ObjectId id;
 		String firstname, lastname;
+
+		Person(ObjectId id, String firstname, String lastname) {
+			this.id = id;
+			this.firstname = firstname;
+			this.lastname = lastname;
+		}
+
+		public ObjectId getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public void setId(ObjectId id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname)
+					&& Objects.equals(lastname, person.lastname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname);
+		}
+
+		public String toString() {
+			return "ReactiveTransactionIntegrationTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ", lastname=" + this.getLastname() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
 	static class EventLog {
 
 		ObjectId id;
 		String action;
+
+		public EventLog(ObjectId id, String action) {
+			this.id = id;
+			this.action = action;
+		}
+
+		public ObjectId getId() {
+			return this.id;
+		}
+
+		public String getAction() {
+			return this.action;
+		}
+
+		public void setId(ObjectId id) {
+			this.id = id;
+		}
+
+		public void setAction(String action) {
+			this.action = action;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			EventLog eventLog = (EventLog) o;
+			return Objects.equals(id, eventLog.id) && Objects.equals(action, eventLog.action);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, action);
+		}
+
+		public String toString() {
+			return "ReactiveTransactionIntegrationTests.EventLog(id=" + this.getId() + ", action=" + this.getAction() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionOptionsTestService.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionOptionsTestService.java
new file mode 100644
index 0000000000..98280b287a
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/ReactiveTransactionOptionsTestService.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb;
+
+import reactor.core.publisher.Mono;
+
+import java.util.function.Function;
+
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Helper class for integration tests of {@link Transactional#label()} MongoDb options in reactive context.
+ *
+ * @param <T> root document type
+ * @author Yan Kardziyaka
+ * @see org.springframework.data.mongodb.core.TransactionOptionsTestService
+ */
+public class ReactiveTransactionOptionsTestService<T> {
+	private final Function<Object, Mono<T>> findByIdFunction;
+
+	private final Function<T, Mono<T>> saveFunction;
+
+	public ReactiveTransactionOptionsTestService(ReactiveMongoOperations operations, Class<T> entityClass) {
+		this.findByIdFunction = id -> operations.findById(id, entityClass);
+		this.saveFunction = operations::save;
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:maxCommitTime=-PT6H3M" })
+	public Mono<T> saveWithInvalidMaxCommitTime(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:maxCommitTime=PT1M" })
+	public Mono<T> saveWithinMaxCommitTime(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=available" })
+	public Mono<T> availableReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=invalid" })
+	public Mono<T> invalidReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=${tx.read.concern}" })
+	public Mono<T> environmentReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=majority" })
+	public Mono<T> majorityReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readPreference=primaryPreferred" })
+	public Mono<T> findFromPrimaryPreferredReplica(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readPreference=invalid" })
+	public Mono<T> findFromInvalidReplica(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readPreference=primary" })
+	public Mono<T> findFromPrimaryReplica(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:writeConcern=unacknowledged" })
+	public Mono<T> unacknowledgedWriteConcernSave(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:writeConcern=invalid" })
+	public Mono<T> invalidWriteConcernSave(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:writeConcern=acknowledged" })
+	public Mono<T> acknowledgedWriteConcernSave(T entity) {
+		return saveFunction.apply(entity);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/SessionAwareMethodInterceptorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/SessionAwareMethodInterceptorUnitTests.java
index 29a7a432c8..0027fd89a4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/SessionAwareMethodInterceptorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/SessionAwareMethodInterceptorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,17 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.any;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.data.mongodb.SessionAwareMethodInterceptor.MethodCache;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -44,7 +44,7 @@
  *
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class SessionAwareMethodInterceptorUnitTests {
 
 	@Mock ClientSession session;
@@ -54,7 +54,7 @@ public class SessionAwareMethodInterceptorUnitTests {
 	MongoCollection collection;
 	MongoDatabase database;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		collection = createProxyInstance(session, targetCollection, MongoCollection.class);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/SpringDataMongoDBTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/SpringDataMongoDBTests.java
new file mode 100644
index 0000000000..09b8a428fa
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/SpringDataMongoDBTests.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2020-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author Christoph Strobl
+ */
+class SpringDataMongoDBTests {
+
+	@Test // DATAMONGO-2427
+	void driverInformationHoldsSpringDataHint() {
+		assertThat(SpringDataMongoDB.driverInformation().getDriverNames()).contains("spring-data");
+	}
+
+	@Test // DATAMONGO-2427
+	void versionIsDetectedFromPackage() {
+		assertThat(SpringDataMongoDB.version()).isNotNull();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/LazyLoadingProxyAotProcessorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/LazyLoadingProxyAotProcessorUnitTests.java
new file mode 100644
index 0000000000..c900e20a3b
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/LazyLoadingProxyAotProcessorUnitTests.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2023-2025 the original author 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.aot;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.List;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.aot.generate.ClassNameGenerator;
+import org.springframework.aot.generate.DefaultGenerationContext;
+import org.springframework.aot.generate.GenerationContext;
+import org.springframework.aot.generate.InMemoryGeneratedFiles;
+import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.javapoet.ClassName;
+
+/**
+ * Unit tests for {@link LazyLoadingProxyAotProcessor}.
+ *
+ * @author Christoph Strobl
+ */
+class LazyLoadingProxyAotProcessorUnitTests {
+
+	@Test // GH-4351
+	void registersProxyForLazyDbRefCorrectlyWhenTypeIsCollectionInterface() {
+
+		GenerationContext ctx = new DefaultGenerationContext(new ClassNameGenerator(ClassName.get(this.getClass())),
+				new InMemoryGeneratedFiles());
+
+		new LazyLoadingProxyAotProcessor().registerLazyLoadingProxyIfNeeded(A.class, ctx);
+
+		assertThat(ctx.getRuntimeHints())
+				.satisfies(RuntimeHintsPredicates.proxies().forInterfaces(java.util.Collection.class,
+						org.springframework.data.mongodb.core.convert.LazyLoadingProxy.class, java.util.List.class,
+						org.springframework.aop.SpringProxy.class, org.springframework.aop.framework.Advised.class,
+						org.springframework.core.DecoratingProxy.class)::test);
+	}
+
+	static class A {
+
+		String id;
+
+		@DBRef(lazy = true) //
+		List<B> listRef;
+	}
+
+	static class B {
+		String id;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/MongoRuntimeHintsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/MongoRuntimeHintsUnitTests.java
new file mode 100644
index 0000000000..0f9ecb911e
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/MongoRuntimeHintsUnitTests.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2024-2025 the original author 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.aot;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.aot.hint.MemberCategory.*;
+import static org.springframework.aot.hint.predicate.RuntimeHintsPredicates.*;
+
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.TypeReference;
+import org.springframework.data.mongodb.test.util.ClassPathExclusions;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ServerAddress;
+import com.mongodb.UnixServerAddress;
+import com.mongodb.client.MapReduceIterable;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.reactivestreams.client.MapReducePublisher;
+
+/**
+ * Unit Tests for {@link MongoRuntimeHints}.
+ *
+ * @author Christoph Strobl
+ */
+@SuppressWarnings("deprecation")
+class MongoRuntimeHintsUnitTests {
+
+	@Test // GH-4578
+	@ClassPathExclusions(packages = { "com.mongodb.client", "com.mongodb.reactivestreams.client" })
+	void shouldRegisterGeneralCompatibilityHints() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+
+		new MongoRuntimeHints().registerHints(runtimeHints, this.getClass().getClassLoader());
+
+		Predicate<RuntimeHints> expected = reflection().onType(MongoClientSettings.class)
+				.withMemberCategory(INVOKE_PUBLIC_METHODS)
+				.and(reflection().onType(MongoClientSettings.Builder.class).withMemberCategory(INVOKE_PUBLIC_METHODS))
+				.and(reflection().onType(IndexOptions.class).withMemberCategory(INVOKE_PUBLIC_METHODS))
+				.and(reflection().onType(ServerAddress.class).withMemberCategory(INVOKE_PUBLIC_METHODS))
+				.and(reflection().onType(UnixServerAddress.class).withMemberCategory(INVOKE_PUBLIC_METHODS))
+				.and(reflection().onType(TypeReference.of("com.mongodb.connection.StreamFactoryFactory"))
+						.withMemberCategory(INTROSPECT_PUBLIC_METHODS));
+
+		assertThat(runtimeHints).matches(expected);
+	}
+
+	@Test // GH-4578
+	@ClassPathExclusions(packages = { "com.mongodb.reactivestreams.client" })
+	void shouldRegisterSyncCompatibilityHintsIfPresent() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+
+		new MongoRuntimeHints().registerHints(runtimeHints, this.getClass().getClassLoader());
+
+		Predicate<RuntimeHints> expected = reflection().onType(MapReduceIterable.class)
+				.withMemberCategory(INVOKE_PUBLIC_METHODS)
+				.and(reflection().onType(TypeReference.of("com.mongodb.client.internal.MapReduceIterableImpl"))
+						.withMemberCategory(INVOKE_PUBLIC_METHODS));
+
+		assertThat(runtimeHints).matches(expected);
+	}
+
+	@Test // GH-4578
+	@ClassPathExclusions(packages = { "com.mongodb.client" })
+	void shouldNotRegisterSyncCompatibilityHintsIfClientNotPresent() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+
+		new MongoRuntimeHints().registerHints(runtimeHints, this.getClass().getClassLoader());
+
+		Predicate<RuntimeHints> expected = reflection().onType(TypeReference.of("com.mongodb.client.MapReduceIterable"))
+				.withMemberCategory(INVOKE_PUBLIC_METHODS).negate()
+				.and(reflection().onType(TypeReference.of("com.mongodb.client.internal.MapReduceIterableImpl"))
+						.withMemberCategory(INVOKE_PUBLIC_METHODS).negate());
+
+		assertThat(runtimeHints).matches(expected);
+	}
+
+	@Test // GH-4578
+	@ClassPathExclusions(packages = { "com.mongodb.client" })
+	void shouldRegisterReactiveCompatibilityHintsIfPresent() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+
+		new MongoRuntimeHints().registerHints(runtimeHints, this.getClass().getClassLoader());
+
+		Predicate<RuntimeHints> expected = reflection().onType(MapReducePublisher.class)
+				.withMemberCategory(INVOKE_PUBLIC_METHODS)
+				.and(reflection().onType(TypeReference.of("com.mongodb.reactivestreams.client.internal.MapReducePublisherImpl"))
+						.withMemberCategory(INVOKE_PUBLIC_METHODS));
+
+		assertThat(runtimeHints).matches(expected);
+	}
+
+	@Test // GH-4578
+	@ClassPathExclusions(packages = { "com.mongodb.reactivestreams.client" })
+	void shouldNotRegisterReactiveCompatibilityHintsIfClientNotPresent() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+
+		new MongoRuntimeHints().registerHints(runtimeHints, this.getClass().getClassLoader());
+
+		Predicate<RuntimeHints> expected = reflection()
+				.onType(TypeReference.of("com.mongodb.reactivestreams.client.MapReducePublisher"))
+				.withMemberCategory(INVOKE_PUBLIC_METHODS).negate()
+				.and(reflection().onType(TypeReference.of("com.mongodb.reactivestreams.client.internal.MapReducePublisherImpl"))
+						.withMemberCategory(INVOKE_PUBLIC_METHODS).negate());
+
+		assertThat(runtimeHints).matches(expected);
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/generated/DemoRepo.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/generated/DemoRepo.java
new file mode 100644
index 0000000000..41759e68c7
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/aot/generated/DemoRepo.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2025 the original author 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.aot.generated;
+
+import java.util.List;
+
+import example.aot.User;
+import org.springframework.data.mongodb.BindableMongoExpression;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.query.StringBasedMongoQuery;
+
+/**
+ * @author Christoph Strobl
+ * @since 2025/01
+ */
+public class DemoRepo {
+
+
+    MongoOperations operations;
+
+    List<User> method1(String username) {
+
+        BindableMongoExpression filter = new BindableMongoExpression("{ 'username', ?0 }", operations.getConverter(), new Object[]{username});
+        Query query = new BasicQuery(filter.toDocument());
+
+        return operations.query(User.class)
+            .as(User.class)
+            .matching(query)
+            .all();
+    }
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/classloading/HidingClassLoader.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/classloading/HidingClassLoader.java
new file mode 100644
index 0000000000..d809101f73
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/classloading/HidingClassLoader.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2022-2025 the original author 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.classloading;
+
+import java.net.URLClassLoader;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.stream.Collectors;
+
+import org.springframework.instrument.classloading.ShadowingClassLoader;
+import org.springframework.util.Assert;
+
+/**
+ * is intended for testing code that depends on the presence/absence of certain classes. Classes can be:
+ * <ul>
+ * <li>shadowed: reloaded by this classloader no matter if they are loaded already by the SystemClassLoader</li>
+ * <li>hidden: not loaded by this classloader no matter if they are loaded already by the SystemClassLoader. Trying to
+ * load these classes results in a {@link ClassNotFoundException}</li>
+ * <li>all other classes get loaded by the SystemClassLoader</li>
+ * </ul>
+ *
+ * @author Jens Schauder
+ * @author Oliver Gierke
+ * @author Christoph Strobl
+ */
+public class HidingClassLoader extends ShadowingClassLoader {
+
+	private final Collection<String> hidden;
+
+	public HidingClassLoader(String... hidden) {
+		this(Arrays.asList(hidden));
+	}
+
+	public HidingClassLoader(Collection<String> hidden) {
+
+		super(URLClassLoader.getSystemClassLoader(), false);
+
+		this.hidden = hidden;
+	}
+
+	/**
+	 * Creates a new {@link HidingClassLoader} with the packages of the given classes hidden.
+	 *
+	 * @param packages must not be {@literal null}.
+	 * @return
+	 */
+	public static HidingClassLoader hide(Class<?>... packages) {
+
+		Assert.notNull(packages, "Packages must not be null");
+
+		return new HidingClassLoader(Arrays.stream(packages)//
+				.map(it -> it.getPackage().getName())//
+				.collect(Collectors.toList()));
+	}
+
+	public static HidingClassLoader hideTypes(Class<?>... types) {
+
+		Assert.notNull(types, "Types must not be null!");
+
+		return new HidingClassLoader(Arrays.stream(types)//
+				.map(it -> it.getName())//
+				.collect(Collectors.toList()));
+	}
+
+	@Override
+	public Class<?> loadClass(String name) throws ClassNotFoundException {
+
+		Class<?> loaded = super.loadClass(name);
+		checkIfHidden(loaded);
+		return loaded;
+	}
+
+	@Override
+	protected boolean isEligibleForShadowing(String className) {
+		return isExcluded(className);
+	}
+
+	@Override
+	protected Class<?> findClass(String name) throws ClassNotFoundException {
+
+		Class<?> loaded = super.findClass(name);
+		checkIfHidden(loaded);
+		return loaded;
+	}
+
+	private void checkIfHidden(Class<?> type) throws ClassNotFoundException {
+
+		if (hidden.stream().anyMatch(it -> type.getName().startsWith(it))) {
+			throw new ClassNotFoundException();
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java
index 7df685cc7d..b7f945f2a3 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,34 +17,36 @@
 
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import java.util.Collections;
+import java.util.Set;
 
+import org.bson.Document;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 
 /**
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public abstract class AbstractIntegrationTests {
 
 	@Configuration
-	static class TestConfig extends AbstractMongoClientConfiguration {
+	static class TestConfig extends MongoClientClosingTestConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
@@ -55,12 +57,22 @@ protected String getDatabaseName() {
 		public MongoClient mongoClient() {
 			return MongoTestUtils.client();
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
+
+		@Override
+		protected boolean autoIndexCreation() {
+			return true;
+		}
 	}
 
 	@Autowired MongoOperations operations;
 
-	@Before
-	@After
+	@BeforeEach
+	@AfterEach
 	public void cleanUp() {
 
 		for (String collectionName : operations.getCollectionNames()) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java
index 931d906135..b16cb6961a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractMongoConfigurationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,27 +25,30 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import org.mockito.Mockito;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.MongoManagedTypes;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.convert.MongoTypeMapper;
-import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
 
 /**
- * Unit tests for {@link AbstractMongoConfiguration}.
+ * Unit tests for {@link AbstractMongoClientConfiguration}.
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
@@ -56,8 +59,9 @@ public class AbstractMongoConfigurationUnitTests {
 	@Test // DATAMONGO-496
 	public void usesConfigClassPackageAsBaseMappingPackage() throws ClassNotFoundException {
 
-		AbstractMongoConfiguration configuration = new SampleMongoConfiguration();
-		assertThat(configuration.getMappingBasePackage()).isEqualTo(SampleMongoConfiguration.class.getPackage().getName());
+		AbstractMongoClientConfiguration configuration = new SampleMongoConfiguration();
+		assertThat(configuration.getMappingBasePackages())
+				.containsExactly(SampleMongoConfiguration.class.getPackage().getName());
 		assertThat(configuration.getInitialEntitySet()).hasSize(2);
 		assertThat(configuration.getInitialEntitySet()).contains(Entity.class);
 	}
@@ -79,7 +83,7 @@ public void containsMongoDbFactoryButNoMongoBean() {
 
 		AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
 
-		assertThat(context.getBean(MongoDbFactory.class)).isNotNull();
+		assertThat(context.getBean(MongoDatabaseFactory.class)).isNotNull();
 		assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> context.getBean(MongoClient.class));
 
 		context.close();
@@ -89,7 +93,8 @@ public void containsMongoDbFactoryButNoMongoBean() {
 	public void returnsUninitializedMappingContext() throws Exception {
 
 		SampleMongoConfiguration configuration = new SampleMongoConfiguration();
-		MongoMappingContext context = configuration.mongoMappingContext();
+		MongoMappingContext context = configuration.mongoMappingContext(configuration.customConversions(),
+				MongoManagedTypes.from(Entity.class));
 
 		assertThat(context.getPersistentEntities()).isEmpty();
 		context.initialize();
@@ -101,7 +106,7 @@ public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
 
 		AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
 		MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
-		BasicMongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(Entity.class);
+		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(Entity.class);
 		EvaluationContextProvider provider = (EvaluationContextProvider) ReflectionTestUtils.getField(entity,
 				"evaluationContextProvider");
 
@@ -134,7 +139,7 @@ public void allowsMultipleEntityBasePackages() throws ClassNotFoundException {
 
 	private static void assertScanningDisabled(final String value) throws ClassNotFoundException {
 
-		AbstractMongoConfiguration configuration = new SampleMongoConfiguration() {
+		AbstractMongoClientConfiguration configuration = new SampleMongoConfiguration() {
 			@Override
 			protected Collection<String> getMappingBasePackages() {
 				return Collections.singleton(value);
@@ -146,7 +151,7 @@ protected Collection<String> getMappingBasePackages() {
 	}
 
 	@Configuration
-	static class SampleMongoConfiguration extends AbstractMongoConfiguration {
+	static class SampleMongoConfiguration extends AbstractMongoClientConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
@@ -155,14 +160,13 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient mongoClient() {
-			return new MongoClient();
+			return Mockito.mock(MongoClient.class);
 		}
 
-		@Bean
 		@Override
-		public MappingMongoConverter mappingMongoConverter() throws Exception {
-
-			MappingMongoConverter converter = super.mappingMongoConverter();
+		public MappingMongoConverter mappingMongoConverter(MongoDatabaseFactory databaseFactory,
+				MongoCustomConversions customConversions, MongoMappingContext mappingContext) {
+			MappingMongoConverter converter = super.mappingMongoConverter(databaseFactory, customConversions, mappingContext);
 			converter.setTypeMapper(typeMapper());
 
 			return converter;
@@ -172,9 +176,10 @@ public MappingMongoConverter mappingMongoConverter() throws Exception {
 		public MongoTypeMapper typeMapper() {
 			return new CustomMongoTypeMapper();
 		}
+
 	}
 
-	static class ConfigurationWithMultipleBasePackages extends AbstractMongoConfiguration {
+	static class ConfigurationWithMultipleBasePackages extends AbstractMongoClientConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
@@ -183,7 +188,7 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient mongoClient() {
-			return new MongoClient();
+			return Mockito.mock(MongoClient.class);
 		}
 
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationIntegrationTests.java
index a9c3c33180..2fcb44a6e2 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,18 +19,18 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Configuration;
 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.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * Integration tests for {@link AbstractReactiveMongoConfiguration}.
@@ -57,7 +57,7 @@ static class ReactiveConfiguration extends AbstractReactiveMongoConfiguration {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return Mockito.mock(MongoClient.class);
 		}
 
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java
index ea80df1c4b..6c80842556 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AbstractReactiveMongoConfigurationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,27 +25,28 @@
 import java.util.Collections;
 import java.util.Set;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.data.mongodb.MongoManagedTypes;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
 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.MongoTypeMapper;
-import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.mongodb.Mongo;
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * Unit tests for {@link AbstractReactiveMongoConfiguration}.
@@ -81,7 +82,8 @@ public void containsMongoDbFactoryButNoMongoBean() {
 		AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
 
 		assertThat(context.getBean(SimpleReactiveMongoDatabaseFactory.class)).isNotNull();
-		assertThatExceptionOfType(NoSuchBeanDefinitionException.class).isThrownBy(() -> context.getBean(Mongo.class));
+		assertThatExceptionOfType(NoSuchBeanDefinitionException.class)
+				.isThrownBy(() -> context.getBean(com.mongodb.client.MongoClient.class));
 
 		context.close();
 	}
@@ -90,7 +92,8 @@ public void containsMongoDbFactoryButNoMongoBean() {
 	public void returnsUninitializedMappingContext() throws Exception {
 
 		SampleMongoConfiguration configuration = new SampleMongoConfiguration();
-		MongoMappingContext context = configuration.mongoMappingContext();
+		MongoMappingContext context = configuration.mongoMappingContext(configuration.customConversions(),
+				MongoManagedTypes.from(Entity.class));
 
 		assertThat(context.getPersistentEntities()).isEmpty();
 		context.initialize();
@@ -102,7 +105,7 @@ public void lifecycleCallbacksAreInvokedInAppropriateOrder() {
 
 		AbstractApplicationContext context = new AnnotationConfigApplicationContext(SampleMongoConfiguration.class);
 		MongoMappingContext mappingContext = context.getBean(MongoMappingContext.class);
-		BasicMongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(Entity.class);
+		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(Entity.class);
 		EvaluationContextProvider provider = (EvaluationContextProvider) ReflectionTestUtils.getField(entity,
 				"evaluationContextProvider");
 
@@ -156,14 +159,14 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return Mockito.mock(MongoClient.class);
 		}
 
-		@Bean
 		@Override
-		public MappingMongoConverter mappingMongoConverter() throws Exception {
+		public MappingMongoConverter mappingMongoConverter(ReactiveMongoDatabaseFactory databaseFactory,
+				MongoCustomConversions customConversions, MongoMappingContext mappingContext) {
 
-			MappingMongoConverter converter = super.mappingMongoConverter();
+			MappingMongoConverter converter = super.mappingMongoConverter(databaseFactory, customConversions, mappingContext);
 			converter.setTypeMapper(typeMapper());
 
 			return converter;
@@ -184,7 +187,7 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return Mockito.mock(MongoClient.class);
 		}
 
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java
index 9e047d6823..ee411eb7c7 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,9 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.joda.time.DateTime;
-import org.junit.Test;
+import java.util.Date;
+
+import org.junit.jupiter.api.Test;
 
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -66,11 +67,11 @@ public void enablesAuditingAndSetsPropertiesAccordingly() throws Exception {
 	class Entity {
 
 		@Id Long id;
-		@CreatedDate DateTime created;
-		DateTime modified;
+		@CreatedDate Date created;
+		Date modified;
 
 		@LastModifiedDate
-		public DateTime getModified() {
+		public Date getModified() {
 			return modified;
 		}
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java
index 1e386988a0..c3122d2850 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/AuditingViaJavaConfigRepositoriesTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,30 +18,43 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.Function;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.core.ResolvableType;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.domain.AuditorAware;
+import org.springframework.data.mapping.callback.EntityCallback;
 import org.springframework.data.mongodb.core.AuditablePerson;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.stereotype.Repository;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.client.MongoClient;
 
@@ -52,9 +65,11 @@
  * @author Oliver Gierke
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
-public class AuditingViaJavaConfigRepositoriesTests {
+class AuditingViaJavaConfigRepositoriesTests {
+
+	static @Client MongoClient mongoClient;
 
 	@Autowired AuditablePersonRepository auditablePersonRepository;
 	@Autowired AuditorAware<AuditablePerson> auditorAware;
@@ -65,17 +80,19 @@ public class AuditingViaJavaConfigRepositoriesTests {
 
 	@Configuration
 	@EnableMongoAuditing(auditorAwareRef = "auditorProvider")
-	@EnableMongoRepositories(basePackageClasses = AuditablePersonRepository.class, considerNestedRepositories = true)
+	@EnableMongoRepositories(basePackageClasses = AuditablePersonRepository.class, considerNestedRepositories = true,
+			includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = AuditablePersonRepository.class))
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
+
 			return "database";
 		}
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Bean
@@ -83,16 +100,22 @@ public MongoClient mongoClient() {
 		public AuditorAware<AuditablePerson> auditorProvider() {
 			return mock(AuditorAware.class);
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return new HashSet<>(
+					Arrays.asList(AuditablePerson.class, VersionedAuditablePerson.class, SimpleVersionedAuditablePerson.class));
+		}
 	}
 
-	@Before
-	public void setup() {
+	@BeforeEach
+	void setup() {
 		auditablePersonRepository.deleteAll();
 		this.auditor = auditablePersonRepository.save(new AuditablePerson("auditor"));
 	}
 
 	@Test // DATAMONGO-792, DATAMONGO-883
-	public void basicAuditing() {
+	void basicAuditing() {
 
 		doReturn(Optional.of(this.auditor)).when(this.auditorAware).getCurrentAuditor();
 
@@ -107,18 +130,18 @@ public void basicAuditing() {
 
 	@Test // DATAMONGO-843
 	@SuppressWarnings("resource")
-	public void auditingUsesFallbackMappingContextIfNoneConfiguredWithRepositories() {
+	void auditingUsesFallbackMappingContextIfNoneConfiguredWithRepositories() {
 		new AnnotationConfigApplicationContext(SimpleConfigWithRepositories.class);
 	}
 
 	@Test // DATAMONGO-843
 	@SuppressWarnings("resource")
-	public void auditingUsesFallbackMappingContextIfNoneConfigured() {
+	void auditingUsesFallbackMappingContextIfNoneConfigured() {
 		new AnnotationConfigApplicationContext(SimpleConfig.class);
 	}
 
 	@Test // DATAMONGO-2139
-	public void auditingWorksForVersionedEntityWithWrapperVersion() {
+	void auditingWorksForVersionedEntityWithWrapperVersion() {
 
 		verifyAuditingViaVersionProperty(new VersionedAuditablePerson(), //
 				it -> it.version, //
@@ -128,7 +151,7 @@ public void auditingWorksForVersionedEntityWithWrapperVersion() {
 	}
 
 	@Test // DATAMONGO-2179
-	public void auditingWorksForVersionedEntityBatchWithWrapperVersion() {
+	void auditingWorksForVersionedEntityBatchWithWrapperVersion() {
 
 		verifyAuditingViaVersionProperty(new VersionedAuditablePerson(), //
 				it -> it.version, //
@@ -138,7 +161,7 @@ public void auditingWorksForVersionedEntityBatchWithWrapperVersion() {
 	}
 
 	@Test // DATAMONGO-2139
-	public void auditingWorksForVersionedEntityWithSimpleVersion() {
+	void auditingWorksForVersionedEntityWithSimpleVersion() {
 
 		verifyAuditingViaVersionProperty(new SimpleVersionedAuditablePerson(), //
 				it -> it.version, //
@@ -148,7 +171,7 @@ public void auditingWorksForVersionedEntityWithSimpleVersion() {
 	}
 
 	@Test // DATAMONGO-2139
-	public void auditingWorksForVersionedEntityWithWrapperVersionOnTemplate() {
+	void auditingWorksForVersionedEntityWithWrapperVersionOnTemplate() {
 
 		verifyAuditingViaVersionProperty(new VersionedAuditablePerson(), //
 				it -> it.version, //
@@ -158,7 +181,7 @@ public void auditingWorksForVersionedEntityWithWrapperVersionOnTemplate() {
 	}
 
 	@Test // DATAMONGO-2139
-	public void auditingWorksForVersionedEntityWithSimpleVersionOnTemplate() {
+	void auditingWorksForVersionedEntityWithSimpleVersionOnTemplate() {
 
 		verifyAuditingViaVersionProperty(new SimpleVersionedAuditablePerson(), //
 				it -> it.version, //
@@ -167,6 +190,19 @@ public void auditingWorksForVersionedEntityWithSimpleVersionOnTemplate() {
 				0L, 1L, 2L);
 	}
 
+	@Test // DATAMONGO-2586
+	void auditingShouldOnlyRegisterImperativeAuditingCallback() {
+
+		Object callbacks = ReflectionTestUtils.getField(operations, "entityCallbacks");
+		Object callbackDiscoverer = ReflectionTestUtils.getField(callbacks, "callbackDiscoverer");
+		List<EntityCallback<?>> actualCallbacks = ReflectionTestUtils.invokeMethod(callbackDiscoverer, "getEntityCallbacks",
+				AuditablePerson.class, ResolvableType.forClass(EntityCallback.class));
+
+		assertThat(actualCallbacks) //
+				.hasAtLeastOneElementOfType(AuditingEntityCallback.class) //
+				.doesNotHaveAnyElementsOfTypes(ReactiveAuditingEntityCallback.class);
+	}
+
 	private <T extends AuditablePerson> void verifyAuditingViaVersionProperty(T instance,
 			Function<T, Object> versionExtractor, Function<T, Object> createdDateExtractor, Function<T, T> persister,
 			Object... expectedValues) {
@@ -198,7 +234,7 @@ static class SimpleConfigWithRepositories extends SimpleConfig {}
 
 	@Configuration
 	@EnableMongoAuditing
-	static class SimpleConfig extends AbstractMongoClientConfiguration {
+	static class SimpleConfig extends MongoClientClosingTestConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
@@ -209,6 +245,11 @@ public MongoClient mongoClient() {
 		protected String getDatabaseName() {
 			return "database";
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
 	}
 
 	static class VersionedAuditablePerson extends AuditablePerson {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/CustomMongoTypeMapper.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/CustomMongoTypeMapper.java
index 0784daa106..0d89487955 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/CustomMongoTypeMapper.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/CustomMongoTypeMapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/GeoJsonConfigurationIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/GeoJsonConfigurationIntegrationTests.java
index 1ace056945..be96469878 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/GeoJsonConfigurationIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/GeoJsonConfigurationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,14 +25,14 @@
 import org.springframework.data.mongodb.core.geo.GeoJsonModule;
 import org.springframework.data.web.config.EnableSpringDataWebSupport;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration tests for {@link GeoJsonConfiguration}.
  *
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class GeoJsonConfigurationIntegrationTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserIntegrationTests.java
index d7a92b4f0d..11143da832 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,8 +21,7 @@
 import java.util.Set;
 
 import org.bson.Document;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanReference;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
@@ -38,6 +37,7 @@
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoTypeMapper;
 import org.springframework.data.mongodb.core.mapping.Account;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.stereotype.Component;
 
@@ -48,21 +48,40 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Ryan Tenney
+ * @author Tomasz Forys
  */
 public class MappingMongoConverterParserIntegrationTests {
 
-	DefaultListableBeanFactory factory;
+	private DefaultListableBeanFactory factory;
 
 	@Test // DATAMONGO-243
-	public void allowsDbFactoryRefAttribute() {
+	void allowsDbFactoryRefAttribute() {
 
 		loadValidConfiguration();
 		factory.getBeanDefinition("converter");
 		factory.getBean("converter");
 	}
 
+	@Test // GH-4275
+	void defaultsToFalseForAutoIndexCreation() {
+
+		loadValidConfiguration();
+		MongoMappingContext mongoMappingContext = factory.getBean("converter.mongoMappingContext",
+				MongoMappingContext.class);
+		assertThat(mongoMappingContext.isAutoIndexCreation()).isFalse();
+	}
+
+	@Test // GH-4275
+	void allowsToOverrideAutoIndexCreation() {
+
+		loadValidConfiguration();
+		MongoMappingContext mongoMappingContext = factory.getBean("autoIndexCreationConverter.mongoMappingContext",
+				MongoMappingContext.class);
+		assertThat(mongoMappingContext.isAutoIndexCreation()).isTrue();
+	}
+
 	@Test // DATAMONGO-725
-	public void hasCustomTypeMapper() {
+	void hasCustomTypeMapper() {
 
 		loadValidConfiguration();
 		MappingMongoConverter converter = factory.getBean("converter", MappingMongoConverter.class);
@@ -72,7 +91,7 @@ public void hasCustomTypeMapper() {
 	}
 
 	@Test // DATAMONGO-301
-	public void scansForConverterAndSetsUpCustomConversionsAccordingly() {
+	void scansForConverterAndSetsUpCustomConversionsAccordingly() {
 
 		loadValidConfiguration();
 		CustomConversions conversions = factory.getBean(CustomConversions.class);
@@ -81,7 +100,7 @@ public void scansForConverterAndSetsUpCustomConversionsAccordingly() {
 	}
 
 	@Test // DATAMONGO-607
-	public void activatesAbbreviatingPropertiesCorrectly() {
+	void activatesAbbreviatingPropertiesCorrectly() {
 
 		loadValidConfiguration();
 		BeanDefinition definition = factory.getBeanDefinition("abbreviatingConverter.mongoMappingContext");
@@ -93,7 +112,7 @@ public void activatesAbbreviatingPropertiesCorrectly() {
 	}
 
 	@Test // DATAMONGO-866
-	public void rejectsInvalidFieldNamingStrategyConfiguration() {
+	void rejectsInvalidFieldNamingStrategyConfiguration() {
 
 		BeanDefinitionRegistry factory = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
@@ -104,20 +123,17 @@ public void rejectsInvalidFieldNamingStrategyConfiguration() {
 	}
 
 	@Test // DATAMONGO-892
-	public void shouldThrowBeanDefinitionParsingExceptionIfConverterDefinedAsNestedBean() {
-
-		assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(this::loadNestedBeanConfiguration)
-				.withMessageContaining("Mongo Converter must not be defined as nested bean.");
-
+	void shouldThrowBeanDefinitionParsingExceptionIfConverterDefinedAsNestedBean() {
+		assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(this::loadNestedBeanConfiguration);
 	}
 
 	@Test // DATAMONGO-925, DATAMONGO-928
-	public void shouldSupportCustomFieldNamingStrategy() {
+	void shouldSupportCustomFieldNamingStrategy() {
 		assertStrategyReferenceSetFor("mappingConverterWithCustomFieldNamingStrategy");
 	}
 
 	@Test // DATAMONGO-925, DATAMONGO-928
-	public void shouldNotFailLoadingConfigIfAbbreviationIsDisabledAndStrategySet() {
+	void shouldNotFailLoadingConfigIfAbbreviationIsDisabledAndStrategySet() {
 		assertStrategyReferenceSetFor("mappingConverterWithCustomFieldNamingStrategyAndAbbreviationDisabled");
 	}
 
@@ -131,13 +147,15 @@ private void loadNestedBeanConfiguration() {
 
 	private void loadConfiguration(String configLocation) {
 		factory = new DefaultListableBeanFactory();
+		factory.setAllowBeanDefinitionOverriding(false);
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
 		reader.loadBeanDefinitions(new ClassPathResource(configLocation));
 	}
 
 	private static void assertStrategyReferenceSetFor(String beanId) {
 
-		BeanDefinitionRegistry factory = new DefaultListableBeanFactory();
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.setAllowBeanDefinitionOverriding(false);
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/converter-custom-fieldnamingstrategy.xml"));
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserValidationIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserValidationIntegrationTests.java
index a54f16f2dc..6cdd99cb3b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserValidationIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserValidationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoAuditingRegistrarUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoAuditingRegistrarUnitTests.java
index e1d5b41f32..7a711707fd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoAuditingRegistrarUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoAuditingRegistrarUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,10 +17,10 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.core.type.AnnotationMetadata;
@@ -30,21 +30,21 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoAuditingRegistrarUnitTests {
+@ExtendWith(MockitoExtension.class)
+class MongoAuditingRegistrarUnitTests {
 
-	MongoAuditingRegistrar registrar = new MongoAuditingRegistrar();
+	private MongoAuditingRegistrar registrar = new MongoAuditingRegistrar();
 
 	@Mock AnnotationMetadata metadata;
 	@Mock BeanDefinitionRegistry registry;
 
 	@Test // DATAMONGO-792
-	public void rejectsNullAnnotationMetadata() {
+	void rejectsNullAnnotationMetadata() {
 		assertThatIllegalArgumentException().isThrownBy(() -> registrar.registerBeanDefinitions(null, registry));
 	}
 
 	@Test // DATAMONGO-792
-	public void rejectsNullBeanDefinitionRegistry() {
+	void rejectsNullBeanDefinitionRegistry() {
 		assertThatIllegalArgumentException().isThrownBy(() -> registrar.registerBeanDefinitions(metadata, null));
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientNamespaceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientNamespaceTests.java
new file mode 100644
index 0000000000..f83e0ec76b
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientNamespaceTests.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2019-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.test.util.ReflectionTestUtils.*;
+
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+import org.bson.UuidRepresentation;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.mongodb.core.MongoClientFactoryBean;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoCredential;
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerApiVersion;
+import com.mongodb.connection.ClusterType;
+
+/**
+ * Integration tests for the MongoDB namespace.
+ *
+ * @author Christoph Strobl
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class MongoClientNamespaceTests {
+
+	@Autowired ApplicationContext ctx;
+
+	@Test // DATAMONGO-2384
+	public void clientWithJustHostAndPort() {
+
+		assertThat(ctx.containsBean("client-with-just-host-port")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-just-host-port", MongoClientFactoryBean.class);
+
+		assertThat(getField(factoryBean, "host")).isEqualTo("127.0.0.1");
+		assertThat(getField(factoryBean, "port")).isEqualTo(27017);
+		assertThat(getField(factoryBean, "connectionString")).isNull();
+		assertThat(getField(factoryBean, "credential")).isNull();
+		assertThat(getField(factoryBean, "replicaSet")).isNull();
+		assertThat(getField(factoryBean, "mongoClientSettings")).isNull();
+	}
+
+	@Test // DATAMONGO-2384
+	public void clientWithConnectionString() {
+
+		assertThat(ctx.containsBean("client-with-connection-string")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-connection-string", MongoClientFactoryBean.class);
+
+		assertThat(getField(factoryBean, "host")).isNull();
+		assertThat(getField(factoryBean, "port")).isNull();
+		assertThat(getField(factoryBean, "connectionString"))
+				.isEqualTo(new ConnectionString("mongodb://127.0.0.1:27017/?replicaSet=rs0"));
+		assertThat(getField(factoryBean, "credential")).isNull();
+		assertThat(getField(factoryBean, "replicaSet")).isNull();
+		assertThat(getField(factoryBean, "mongoClientSettings")).isNull();
+	}
+
+	@Test // DATAMONGO-2384
+	public void clientWithReplicaSet() {
+
+		assertThat(ctx.containsBean("client-with-replica-set")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-replica-set", MongoClientFactoryBean.class);
+
+		assertThat(getField(factoryBean, "host")).isNull();
+		assertThat(getField(factoryBean, "port")).isNull();
+		assertThat(getField(factoryBean, "connectionString")).isNull();
+		assertThat(getField(factoryBean, "credential")).isNull();
+		assertThat(getField(factoryBean, "replicaSet")).isEqualTo("rs0");
+		assertThat(getField(factoryBean, "mongoClientSettings")).isNull();
+	}
+
+	@Test // DATAMONGO-2384
+	public void clientWithCredential() {
+
+		assertThat(ctx.containsBean("client-with-auth")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-auth", MongoClientFactoryBean.class);
+
+		assertThat(getField(factoryBean, "host")).isNull();
+		assertThat(getField(factoryBean, "port")).isNull();
+		assertThat(getField(factoryBean, "connectionString")).isNull();
+		assertThat(getField(factoryBean, "credential")).isEqualTo(
+				Collections.singletonList(MongoCredential.createPlainCredential("jon", "snow", "warg".toCharArray())));
+		assertThat(getField(factoryBean, "replicaSet")).isNull();
+		assertThat(getField(factoryBean, "mongoClientSettings")).isNull();
+	}
+
+	@Test // DATAMONGO-2384
+	public void clientWithClusterSettings() {
+
+		assertThat(ctx.containsBean("client-with-cluster-settings")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-cluster-settings", MongoClientFactoryBean.class);
+
+		MongoClientSettings settings = (MongoClientSettings) getField(factoryBean, "mongoClientSettings");
+
+		assertThat(settings.getClusterSettings().getRequiredClusterType()).isEqualTo(ClusterType.REPLICA_SET);
+		assertThat(settings.getClusterSettings().getServerSelectionTimeout(TimeUnit.MILLISECONDS)).isEqualTo(10);
+		assertThat(settings.getClusterSettings().getLocalThreshold(TimeUnit.MILLISECONDS)).isEqualTo(5);
+		assertThat(settings.getClusterSettings().getHosts()).contains(new ServerAddress("localhost", 27018),
+				new ServerAddress("localhost", 27019), new ServerAddress("localhost", 27020));
+	}
+
+	@Test // DATAMONGO-2384
+	public void clientWithConnectionPoolSettings() {
+
+		assertThat(ctx.containsBean("client-with-connection-pool-settings")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-connection-pool-settings",
+				MongoClientFactoryBean.class);
+
+		MongoClientSettings settings = (MongoClientSettings) getField(factoryBean, "mongoClientSettings");
+
+		assertThat(settings.getConnectionPoolSettings().getMaxConnectionLifeTime(TimeUnit.MILLISECONDS)).isEqualTo(10);
+		assertThat(settings.getConnectionPoolSettings().getMinSize()).isEqualTo(10);
+		assertThat(settings.getConnectionPoolSettings().getMaxSize()).isEqualTo(20);
+		assertThat(settings.getConnectionPoolSettings().getMaintenanceFrequency(TimeUnit.MILLISECONDS)).isEqualTo(10);
+		assertThat(settings.getConnectionPoolSettings().getMaintenanceInitialDelay(TimeUnit.MILLISECONDS)).isEqualTo(11);
+		assertThat(settings.getConnectionPoolSettings().getMaxConnectionIdleTime(TimeUnit.MILLISECONDS)).isEqualTo(30);
+		assertThat(settings.getConnectionPoolSettings().getMaxWaitTime(TimeUnit.MILLISECONDS)).isEqualTo(15);
+	}
+
+	@Test // DATAMONGO-2427
+	public void clientWithUUidSettings() {
+
+		assertThat(ctx.containsBean("client-with-uuid-settings")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-uuid-settings", MongoClientFactoryBean.class);
+
+		MongoClientSettings settings = (MongoClientSettings) getField(factoryBean, "mongoClientSettings");
+		assertThat(settings.getUuidRepresentation()).isEqualTo(UuidRepresentation.STANDARD);
+	}
+
+	@Test // GH-3820
+	public void clientWithServerVersion() {
+
+		assertThat(ctx.containsBean("client-with-server-api-settings")).isTrue();
+		MongoClientFactoryBean factoryBean = ctx.getBean("&client-with-server-api-settings", MongoClientFactoryBean.class);
+
+		MongoClientSettings settings = (MongoClientSettings) getField(factoryBean, "mongoClientSettings");
+		assertThat(settings.getServerApi()).isNotNull().satisfies(it -> {
+			assertThat(it.getVersion()).isEqualTo(ServerApiVersion.V1);
+		});
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java
index 2e3d303cee..4b3bb25a9f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoClientParserIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,19 +17,24 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.support.BeanDefinitionReader;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.test.util.ReflectionTestUtils;
 
-import com.mongodb.MongoClient;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoCredential;
 import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
 import com.mongodb.WriteConcern;
+import com.mongodb.client.MongoClient;
 
 /**
  * Integration tests for {@link MongoClientParser}.
@@ -42,7 +47,7 @@ public class MongoClientParserIntegrationTests {
 	DefaultListableBeanFactory factory;
 	BeanDefinitionReader reader;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		this.factory = new DefaultListableBeanFactory();
@@ -62,17 +67,13 @@ public void createsMongoClientWithOptionsCorrectly() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongoClient-bean.xml"));
 
-		AbstractApplicationContext context = new GenericApplicationContext(factory);
-		context.refresh();
-
-		try {
-			MongoClient client = context.getBean("mongo-client-with-options-for-write-concern-and-read-preference",
-					MongoClient.class);
+		try (AbstractApplicationContext context = new GenericApplicationContext(factory)) {
+			context.refresh();
 
-			assertThat(client.getReadPreference()).isEqualTo(ReadPreference.secondary());
-			assertThat(client.getWriteConcern()).isEqualTo(WriteConcern.UNACKNOWLEDGED);
-		} finally {
-			context.close();
+			MongoClientSettings settings = extractClientSettingsFromBean(context,
+					"mongo-client-with-options-for-write-concern-and-read-preference");
+			assertThat(settings.getReadPreference()).isEqualTo(ReadPreference.secondary());
+			assertThat(settings.getWriteConcern()).isEqualTo(WriteConcern.UNACKNOWLEDGED);
 		}
 	}
 
@@ -81,16 +82,12 @@ public void createsMongoClientWithDefaultsCorrectly() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongoClient-bean.xml"));
 
-		AbstractApplicationContext context = new GenericApplicationContext(factory);
-		context.refresh();
+		try (AbstractApplicationContext context = new GenericApplicationContext(factory)) {
 
-		try {
-			MongoClient client = context.getBean("mongoClient", MongoClient.class);
+			context.refresh();
 
-			assertThat(client.getAddress().getHost()).isEqualTo("127.0.0.1");
-			assertThat(client.getAddress().getPort()).isEqualTo(27017);
-		} finally {
-			context.close();
+			MongoClient client = context.getBean("mongoClient", MongoClient.class);
+			assertThat(client.getClusterDescription().getClusterSettings().getHosts()).containsExactly(new ServerAddress());
 		}
 	}
 
@@ -99,16 +96,14 @@ public void createsMongoClientWithCredentialsCorrectly() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongoClient-bean.xml"));
 
-		AbstractApplicationContext context = new GenericApplicationContext(factory);
-		context.refresh();
+		try (AbstractApplicationContext context = new GenericApplicationContext(factory)) {
+
+			context.refresh();
 
-		try {
-			MongoClient client = context.getBean("mongo-client-with-credentials", MongoClient.class);
+			MongoClientSettings settings = extractClientSettingsFromBean(context, "mongo-client-with-credentials");
 
-			assertThat(client.getCredentialsList())
-					.contains(MongoCredential.createPlainCredential("jon", "snow", "warg".toCharArray()));
-		} finally {
-			context.close();
+			assertThat(settings.getCredential())
+					.isEqualTo(MongoCredential.createPlainCredential("jon", "snow", "warg".toCharArray()));
 		}
 	}
 
@@ -117,15 +112,20 @@ public void createsMongoClientWithServerSelectionTimeoutCorrectly() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongoClient-bean.xml"));
 
-		AbstractApplicationContext context = new GenericApplicationContext(factory);
-		context.refresh();
+		try (AbstractApplicationContext context = new GenericApplicationContext(factory)) {
+			context.refresh();
 
-		try {
-
-			MongoClient client = context.getBean("mongo-client-with-server-selection-timeout", MongoClient.class);
-			assertThat(client.getMongoClientOptions().getServerSelectionTimeout()).isEqualTo(100);
-		} finally {
-			context.close();
+			MongoClientSettings settings = extractClientSettingsFromBean(context,
+					"mongo-client-with-server-selection-timeout");
+			assertThat(settings.getClusterSettings().getServerSelectionTimeout(TimeUnit.MILLISECONDS)).isEqualTo(100);
 		}
 	}
+
+	private MongoClientSettings extractClientSettingsFromBean(AbstractApplicationContext context, String beanName) {
+		return extractClientSettings(context.getBean(beanName, MongoClient.class));
+	}
+
+	private MongoClientSettings extractClientSettings(MongoClient client) {
+		return (MongoClientSettings) ReflectionTestUtils.getField(client, "settings");
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditorUnitTests.java
index d2574e89f2..92a7e0036d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoCredentialPropertyEditorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,8 +83,6 @@ public class MongoCredentialPropertyEditorUnitTests {
 
 	static final MongoCredential USER_2_CREDENTIALS = MongoCredential.createCredential(USER_2_NAME, USER_2_DB,
 			USER_2_PWD.toCharArray());
-	static final MongoCredential USER_2_CREDENTIALS_CR_AUTH = MongoCredential.createMongoCRCredential(USER_2_NAME,
-			USER_2_DB, USER_2_PWD.toCharArray());
 
 	static final MongoCredential USER_3_CREDENTIALS_X509_AUTH = MongoCredential.createMongoX509Credential(USER_3_NAME);
 
@@ -176,16 +174,6 @@ public void shouldReturnCredentialsValueCorrectlyWhenGivenMultipleUserNamePasswo
 		assertThat(getValue()).contains(USER_1_CREDENTIALS, USER_2_CREDENTIALS);
 	}
 
-	@Test // DATAMONGO-1158
-	@SuppressWarnings("unchecked")
-	public void shouldReturnCredentialsValueCorrectlyWhenGivenMultipleUserNamePasswordStringWithDatabaseAndAuthOptions() {
-
-		editor.setAsText(StringUtils.collectionToCommaDelimitedString(Arrays
-				.asList(USER_1_AUTH_STRING_WITH_PLAIN_AUTH_MECHANISM, USER_2_AUTH_STRING_WITH_MONGODB_CR_AUTH_MECHANISM)));
-
-		assertThat(getValue()).contains(USER_1_CREDENTIALS_PLAIN_AUTH, USER_2_CREDENTIALS_CR_AUTH);
-	}
-
 	@Test // DATAMONGO-1158
 	@SuppressWarnings("unchecked")
 	public void shouldReturnCredentialsValueCorrectlyWhenGivenMultipleUserNamePasswordStringWithDatabaseAndMixedOptions() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests.java
index 257c34ecc3..a283666c05 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,18 +22,18 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessResourceFailureException;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
- * Integration tests for {@link MongoDbFactory}.
+ * Integration tests for {@link MongoDatabaseFactory}.
  *
  * @author Thomas Risberg
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class MongoDbFactoryNoDatabaseRunningTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java
index 95b19958e0..3ebdf61ae4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoDbFactoryParserIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,8 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
@@ -28,15 +28,14 @@
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.mongodb.MongoClientURI;
-import com.mongodb.MongoURI;
+import com.mongodb.ConnectionString;
 import com.mongodb.WriteConcern;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoDatabase;
 
 /**
@@ -51,7 +50,7 @@ public class MongoDbFactoryParserIntegrationTests {
 	DefaultListableBeanFactory factory;
 	BeanDefinitionReader reader;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		factory = new DefaultListableBeanFactory();
 		reader = new XmlBeanDefinitionReader(factory);
@@ -60,11 +59,13 @@ public void setUp() {
 	@Test // DATAMONGO-2199
 	public void testWriteConcern() throws Exception {
 
-		SimpleMongoClientDbFactory dbFactory = new SimpleMongoClientDbFactory(MongoTestUtils.client(), "database");
-		dbFactory.setWriteConcern(WriteConcern.ACKNOWLEDGED);
-		dbFactory.getDb();
+		try (MongoClient client = MongoTestUtils.client()) {
+			SimpleMongoClientDatabaseFactory dbFactory = new SimpleMongoClientDatabaseFactory(client, "database");
+			dbFactory.setWriteConcern(WriteConcern.ACKNOWLEDGED);
+			dbFactory.getMongoDatabase();
 
-		assertThat(ReflectionTestUtils.getField(dbFactory, "writeConcern")).isEqualTo(WriteConcern.ACKNOWLEDGED);
+			assertThat(ReflectionTestUtils.getField(dbFactory, "writeConcern")).isEqualTo(WriteConcern.ACKNOWLEDGED);
+		}
 	}
 
 	@Test // DATAMONGO-2199
@@ -72,6 +73,7 @@ public void parsesWriteConcern() {
 
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean.xml");
 		assertWriteConcern(ctx, WriteConcern.ACKNOWLEDGED);
+		ctx.close();
 	}
 
 	@Test // DATAMONGO-2199
@@ -80,6 +82,7 @@ public void parsesCustomWriteConcern() {
 		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"namespace/db-factory-bean-custom-write-concern.xml");
 		assertWriteConcern(ctx, new WriteConcern("rack1"));
+		ctx.close();
 	}
 
 	@Test // DATAMONGO-331
@@ -87,11 +90,11 @@ public void readsReplicasWriteConcernCorrectly() {
 
 		AbstractApplicationContext ctx = new ClassPathXmlApplicationContext(
 				"namespace/db-factory-bean-custom-write-concern.xml");
-		MongoDbFactory factory = ctx.getBean("second", MongoDbFactory.class);
-		MongoDatabase db = factory.getDb();
+		MongoDatabaseFactory factory = ctx.getBean("second", MongoDatabaseFactory.class);
+		ctx.close();
 
+		MongoDatabase db = factory.getMongoDatabase();
 		assertThat(db.getWriteConcern()).isEqualTo(WriteConcern.W2);
-		ctx.close();
 	}
 
 	// This test will fail since equals in WriteConcern uses == for _w and not .equals
@@ -119,12 +122,14 @@ public void setsUpMongoDbFactoryUsingAMongoUriWithoutCredentials() {
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
 
 		assertThat(constructorArguments.getArgumentCount()).isOne();
-		ValueHolder argument = constructorArguments.getArgumentValue(0, MongoURI.class);
+		ValueHolder argument = constructorArguments.getArgumentValue(0, ConnectionString.class);
 		assertThat(argument).isNotNull();
 
-		MongoDbFactory dbFactory = factory.getBean("mongoDbFactory", MongoDbFactory.class);
-		MongoDatabase db = dbFactory.getDb();
+		MongoDatabaseFactory dbFactory = factory.getBean("mongoDbFactory", MongoDatabaseFactory.class);
+		MongoDatabase db = dbFactory.getMongoDatabase();
 		assertThat(db.getName()).isEqualTo("database");
+
+		factory.destroyBean(dbFactory);
 	}
 
 	@Test // DATAMONGO-1218
@@ -135,7 +140,7 @@ public void setsUpMongoDbFactoryUsingAMongoClientUri() {
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
 
 		assertThat(constructorArguments.getArgumentCount()).isOne();
-		ValueHolder argument = constructorArguments.getArgumentValue(0, MongoClientURI.class);
+		ValueHolder argument = constructorArguments.getArgumentValue(0, ConnectionString.class);
 		assertThat(argument).isNotNull();
 	}
 
@@ -147,7 +152,7 @@ public void setsUpClientUriWithId() {
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
 
 		assertThat(constructorArguments.getArgumentCount()).isOne();
-		ValueHolder argument = constructorArguments.getArgumentValue(0, MongoClientURI.class);
+		ValueHolder argument = constructorArguments.getArgumentValue(0, ConnectionString.class);
 		assertThat(argument).isNotNull();
 	}
 
@@ -159,24 +164,44 @@ public void setsUpUriWithId() {
 		ConstructorArgumentValues constructorArguments = definition.getConstructorArgumentValues();
 
 		assertThat(constructorArguments.getArgumentCount()).isOne();
-		ValueHolder argument = constructorArguments.getArgumentValue(0, MongoClientURI.class);
+		ValueHolder argument = constructorArguments.getArgumentValue(0, ConnectionString.class);
 		assertThat(argument).isNotNull();
 	}
 
+	@Test // DATAMONGO-2384
+	public void usesConnectionStringToCreateClientClient() {
+
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean.xml");
+
+		MongoDatabaseFactory dbFactory = ctx.getBean("with-connection-string", MongoDatabaseFactory.class);
+		ctx.close();
+
+		assertThat(dbFactory).isInstanceOf(SimpleMongoClientDatabaseFactory.class);
+		assertThat(ReflectionTestUtils.getField(dbFactory, "mongoClient"))
+				.isInstanceOf(com.mongodb.client.MongoClient.class);
+	}
+
+	@Test // DATAMONGO-2384
+	public void usesMongoClientClientRef() {
+
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("namespace/db-factory-bean.xml");
+
+		MongoDatabaseFactory dbFactory = ctx.getBean("with-mongo-client-client-ref", MongoDatabaseFactory.class);
+		assertThat(dbFactory).isInstanceOf(SimpleMongoClientDatabaseFactory.class);
+		assertThat(ReflectionTestUtils.getField(dbFactory, "mongoClient"))
+				.isInstanceOf(com.mongodb.client.MongoClient.class);
+	}
+
 	private static void assertWriteConcern(ClassPathXmlApplicationContext ctx, WriteConcern expectedWriteConcern) {
 
-		SimpleMongoDbFactory dbFactory = ctx.getBean("first", SimpleMongoDbFactory.class);
-		MongoDatabase db = dbFactory.getDb();
+		SimpleMongoClientDatabaseFactory dbFactory = ctx.getBean("first", SimpleMongoClientDatabaseFactory.class);
+		MongoDatabase db = dbFactory.getMongoDatabase();
 		assertThat(db.getName()).isEqualTo("db");
 
 		WriteConcern configuredConcern = (WriteConcern) ReflectionTestUtils.getField(dbFactory, "writeConcern");
 
-		MyWriteConcern myDbFactoryWriteConcern = new MyWriteConcern(configuredConcern);
-		MyWriteConcern myDbWriteConcern = new MyWriteConcern(db.getWriteConcern());
-		MyWriteConcern myExpectedWriteConcern = new MyWriteConcern(expectedWriteConcern);
-
-		assertThat(myDbFactoryWriteConcern).isEqualTo(myExpectedWriteConcern);
-		assertThat(myDbWriteConcern).isEqualTo(myExpectedWriteConcern);
-		assertThat(myDbWriteConcern).isEqualTo(myDbFactoryWriteConcern);
+		assertThat(configuredConcern).isEqualTo(expectedWriteConcern);
+		assertThat(db.getWriteConcern()).isEqualTo(expectedWriteConcern);
+		assertThat(db.getWriteConcern()).isEqualTo(expectedWriteConcern);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests.java
index 172f6309f0..d7689c8e2a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,20 +32,20 @@
 import org.springframework.data.mongodb.core.MongoClientFactoryBean;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.mongodb.MongoClient;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.ServerAddress;
+import com.mongodb.client.MongoClient;
 
 /**
- *
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class MongoNamespaceReplicaSetTests {
 
@@ -58,7 +58,8 @@ public void testParsingMongoWithReplicaSets() throws Exception {
 		assertThat(ctx.containsBean("replicaSetMongo")).isTrue();
 		MongoClientFactoryBean mfb = (MongoClientFactoryBean) ctx.getBean("&replicaSetMongo");
 
-		List<ServerAddress> replicaSetSeeds = (List<ServerAddress>) ReflectionTestUtils.getField(mfb, "replicaSetSeeds");
+		MongoClientSettings settings = (MongoClientSettings) ReflectionTestUtils.getField(mfb, "mongoClientSettings");
+		List<ServerAddress> replicaSetSeeds = settings.getClusterSettings().getHosts();
 
 		assertThat(replicaSetSeeds).isNotNull();
 		assertThat(replicaSetSeeds).contains(new ServerAddress(InetAddress.getByName("127.0.0.1"), 10001),
@@ -72,7 +73,8 @@ public void testParsingWithPropertyPlaceHolder() throws Exception {
 		assertThat(ctx.containsBean("manyReplicaSetMongo")).isTrue();
 		MongoClientFactoryBean mfb = (MongoClientFactoryBean) ctx.getBean("&manyReplicaSetMongo");
 
-		List<ServerAddress> replicaSetSeeds = (List<ServerAddress>) ReflectionTestUtils.getField(mfb, "replicaSetSeeds");
+		MongoClientSettings settings = (MongoClientSettings) ReflectionTestUtils.getField(mfb, "mongoClientSettings");
+		List<ServerAddress> replicaSetSeeds = settings.getClusterSettings().getHosts();
 
 		assertThat(replicaSetSeeds).isNotNull();
 		assertThat(replicaSetSeeds).hasSize(3);
@@ -90,8 +92,8 @@ public void testParsingWithPropertyPlaceHolder() throws Exception {
 	public void testMongoWithReplicaSets() {
 
 		MongoClient mongo = ctx.getBean(MongoClient.class);
-		assertThat(mongo.getAllAddress().size()).isEqualTo(2);
-		List<ServerAddress> servers = mongo.getAllAddress();
+		assertThat(mongo.getClusterDescription().getClusterSettings().getHosts()).isEqualTo(2);
+		List<ServerAddress> servers = mongo.getClusterDescription().getClusterSettings().getHosts();
 		assertThat(servers.get(0).getHost()).isEqualTo("127.0.0.1");
 		assertThat(servers.get(1).getHost()).isEqualTo("localhost");
 		assertThat(servers.get(0).getPort()).isEqualTo(10001);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceTests.java
index 835409c4b7..a3b1a16a85 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoNamespaceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,22 +20,27 @@
 
 import javax.net.ssl.SSLSocketFactory;
 
+import java.util.function.Supplier;
+
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.gridfs.GridFSBucket;
+import com.mongodb.client.gridfs.model.GridFSFile;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoClientFactoryBean;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.gridfs.GridFsOperations;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import com.mongodb.MongoClient;
-import com.mongodb.MongoClientOptions;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ServerAddress;
 import com.mongodb.WriteConcern;
+import com.mongodb.client.MongoClient;
 
 /**
  * Integration tests for the MongoDB namespace.
@@ -46,7 +51,7 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class MongoNamespaceTests {
 
@@ -74,9 +79,8 @@ public void testMongoSingletonWithAttributes() throws Exception {
 		assertThat(host).isEqualTo("localhost");
 		assertThat(port).isEqualTo(new Integer(27017));
 
-		MongoClientOptions options = (MongoClientOptions) getField(mfb, "mongoClientOptions");
-		assertThat(options.getSocketFactory() instanceof SSLSocketFactory)
-				.as("By default socketFactory should not be a SSLSocketFactory").isFalse();
+		MongoClientSettings options = (MongoClientSettings) getField(mfb, "mongoClientSettings");
+		assertThat(options).isNull();
 	}
 
 	@Test // DATAMONGO-764
@@ -85,9 +89,9 @@ public void testMongoSingletonWithSslEnabled() throws Exception {
 		assertThat(ctx.containsBean("mongoSsl")).isTrue();
 		MongoClientFactoryBean mfb = (MongoClientFactoryBean) ctx.getBean("&mongoSsl");
 
-		MongoClientOptions options = (MongoClientOptions) getField(mfb, "mongoClientOptions");
-		assertThat(options.getSocketFactory() instanceof SSLSocketFactory).as("socketFactory should be a SSLSocketFactory")
-				.isTrue();
+		MongoClientSettings options = (MongoClientSettings) getField(mfb, "mongoClientSettings");
+		assertThat(options.getSslSettings().getContext().getSocketFactory() instanceof SSLSocketFactory)
+				.as("socketFactory should be a SSLSocketFactory").isTrue();
 	}
 
 	@Test // DATAMONGO-1490
@@ -96,9 +100,9 @@ public void testMongoClientSingletonWithSslEnabled() {
 		assertThat(ctx.containsBean("mongoClientSsl")).isTrue();
 		MongoClientFactoryBean mfb = (MongoClientFactoryBean) ctx.getBean("&mongoClientSsl");
 
-		MongoClientOptions options = (MongoClientOptions) getField(mfb, "mongoClientOptions");
-		assertThat(options.getSocketFactory() instanceof SSLSocketFactory).as("socketFactory should be a SSLSocketFactory")
-				.isTrue();
+		MongoClientSettings options = (MongoClientSettings) getField(mfb, "mongoClientSettings");
+		assertThat(options.getSslSettings().getContext().getSocketFactory() instanceof SSLSocketFactory)
+				.as("socketFactory should be a SSLSocketFactory").isTrue();
 	}
 
 	@Test // DATAMONGO-764
@@ -107,23 +111,21 @@ public void testMongoSingletonWithSslEnabledAndCustomSslSocketFactory() throws E
 		assertThat(ctx.containsBean("mongoSslWithCustomSslFactory")).isTrue();
 		MongoClientFactoryBean mfb = (MongoClientFactoryBean) ctx.getBean("&mongoSslWithCustomSslFactory");
 
-		SSLSocketFactory customSslSocketFactory = ctx.getBean("customSslSocketFactory", SSLSocketFactory.class);
-		MongoClientOptions options = (MongoClientOptions) getField(mfb, "mongoClientOptions");
+		MongoClientSettings options = (MongoClientSettings) getField(mfb, "mongoClientSettings");
 
-		assertThat(options.getSocketFactory() instanceof SSLSocketFactory).as("socketFactory should be a SSLSocketFactory")
-				.isTrue();
-		assertThat(options.getSocketFactory()).isSameAs(customSslSocketFactory);
+		assertThat(options.getSslSettings().getContext().getSocketFactory() instanceof SSLSocketFactory)
+				.as("socketFactory should be a SSLSocketFactory").isTrue();
+		assertThat(options.getSslSettings().getContext().getProvider().getName()).isEqualTo("SunJSSE");
 	}
 
 	@Test
 	public void testSecondMongoDbFactory() {
 
 		assertThat(ctx.containsBean("secondMongoDbFactory")).isTrue();
-		MongoDbFactory dbf = (MongoDbFactory) ctx.getBean("secondMongoDbFactory");
+		MongoDatabaseFactory dbf = (MongoDatabaseFactory) ctx.getBean("secondMongoDbFactory");
 
 		MongoClient mongo = (MongoClient) getField(dbf, "mongoClient");
-		assertThat(mongo.getAddress().getHost()).isEqualTo("127.0.0.1");
-		assertThat(mongo.getAddress().getPort()).isEqualTo(27017);
+		assertThat(mongo.getClusterDescription().getClusterSettings().getHosts()).containsExactly(new ServerAddress());
 		assertThat(getField(dbf, "databaseName")).isEqualTo("database");
 	}
 
@@ -132,11 +134,10 @@ public void testThirdMongoDbFactory() {
 
 		assertThat(ctx.containsBean("thirdMongoDbFactory")).isTrue();
 
-		MongoDbFactory dbf = (MongoDbFactory) ctx.getBean("thirdMongoDbFactory");
+		MongoDatabaseFactory dbf = (MongoDatabaseFactory) ctx.getBean("thirdMongoDbFactory");
 		MongoClient mongo = (MongoClient) getField(dbf, "mongoClient");
 
-		assertThat(mongo.getAddress().getHost()).isEqualTo("127.0.0.1");
-		assertThat(mongo.getAddress().getPort()).isEqualTo(27017);
+		assertThat(mongo.getClusterDescription().getClusterSettings().getHosts()).containsExactly(new ServerAddress());
 		assertThat(getField(dbf, "databaseName")).isEqualTo("database");
 	}
 
@@ -146,7 +147,7 @@ public void testMongoTemplateFactory() {
 		assertThat(ctx.containsBean("mongoTemplate")).isTrue();
 		MongoOperations operations = (MongoOperations) ctx.getBean("mongoTemplate");
 
-		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "mongoDbFactory");
+		MongoDatabaseFactory dbf = (MongoDatabaseFactory) getField(operations, "mongoDbFactory");
 		assertThat(getField(dbf, "databaseName")).isEqualTo("database");
 
 		MongoConverter converter = (MongoConverter) getField(operations, "mongoConverter");
@@ -159,11 +160,11 @@ public void testSecondMongoTemplateFactory() {
 		assertThat(ctx.containsBean("anotherMongoTemplate")).isTrue();
 		MongoOperations operations = (MongoOperations) ctx.getBean("anotherMongoTemplate");
 
-		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "mongoDbFactory");
+		MongoDatabaseFactory dbf = (MongoDatabaseFactory) getField(operations, "mongoDbFactory");
 		assertThat(getField(dbf, "databaseName")).isEqualTo("database");
 
 		WriteConcern writeConcern = (WriteConcern) getField(operations, "writeConcern");
-		assertThat(writeConcern).isEqualTo(WriteConcern.SAFE);
+		assertThat(writeConcern).isEqualTo(WriteConcern.ACKNOWLEDGED);
 	}
 
 	@Test // DATAMONGO-628
@@ -172,8 +173,12 @@ public void testGridFsTemplateFactory() {
 		assertThat(ctx.containsBean("gridFsTemplate")).isTrue();
 		GridFsOperations operations = (GridFsOperations) ctx.getBean("gridFsTemplate");
 
-		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "dbFactory");
-		assertThat(getField(dbf, "databaseName")).isEqualTo("database");
+		Supplier<GridFSBucket> gridFSBucketSupplier = (Supplier<GridFSBucket>) getField(operations, "bucketSupplier");
+		GridFSBucket gfsBucket = gridFSBucketSupplier.get();
+		assertThat(gfsBucket.getBucketName()).isEqualTo("fs"); // fs is the default
+
+		MongoCollection<GridFSFile> filesCollection = (MongoCollection<GridFSFile>) getField(gfsBucket, "filesCollection");
+		assertThat(filesCollection.getNamespace().getDatabaseName()).isEqualTo("database");
 
 		MongoConverter converter = (MongoConverter) getField(operations, "converter");
 		assertThat(converter).isNotNull();
@@ -185,9 +190,12 @@ public void testSecondGridFsTemplateFactory() {
 		assertThat(ctx.containsBean("secondGridFsTemplate")).isTrue();
 		GridFsOperations operations = (GridFsOperations) ctx.getBean("secondGridFsTemplate");
 
-		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "dbFactory");
-		assertThat(getField(dbf, "databaseName")).isEqualTo("database");
-		assertThat(getField(operations, "bucket")).isEqualTo(null);
+		Supplier<GridFSBucket> gridFSBucketSupplier = (Supplier<GridFSBucket>) getField(operations, "bucketSupplier");
+		GridFSBucket gfsBucket = gridFSBucketSupplier.get();
+		assertThat(gfsBucket.getBucketName()).isEqualTo("fs"); // fs is the default
+
+		MongoCollection<GridFSFile> filesCollection = (MongoCollection<GridFSFile>) getField(gfsBucket, "filesCollection");
+		assertThat(filesCollection.getNamespace().getDatabaseName()).isEqualTo("database");
 
 		MongoConverter converter = (MongoConverter) getField(operations, "converter");
 		assertThat(converter).isNotNull();
@@ -199,17 +207,19 @@ public void testThirdGridFsTemplateFactory() {
 		assertThat(ctx.containsBean("thirdGridFsTemplate")).isTrue();
 		GridFsOperations operations = (GridFsOperations) ctx.getBean("thirdGridFsTemplate");
 
-		MongoDbFactory dbf = (MongoDbFactory) getField(operations, "dbFactory");
-		assertThat(getField(dbf, "databaseName")).isEqualTo("database");
-		assertThat(getField(operations, "bucket")).isEqualTo("bucketString");
+		Supplier<GridFSBucket> gridFSBucketSupplier = (Supplier<GridFSBucket>) getField(operations, "bucketSupplier");
+		GridFSBucket gfsBucket = gridFSBucketSupplier.get();
+		assertThat(gfsBucket.getBucketName()).isEqualTo("bucketString"); // fs is the default
+
+		MongoCollection<GridFSFile> filesCollection = (MongoCollection<GridFSFile>) getField(gfsBucket, "filesCollection");
+		assertThat(filesCollection.getNamespace().getDatabaseName()).isEqualTo("database");
 
 		MongoConverter converter = (MongoConverter) getField(operations, "converter");
 		assertThat(converter).isNotNull();
 	}
 
 	@Test
-	@SuppressWarnings("deprecation")
-	public void testMongoSingletonWithPropertyPlaceHolders() throws Exception {
+	public void testMongoSingletonWithPropertyPlaceHolders() {
 
 		assertThat(ctx.containsBean("mongoClient")).isTrue();
 		MongoClientFactoryBean mfb = (MongoClientFactoryBean) ctx.getBean("&mongoClient");
@@ -219,20 +229,5 @@ public void testMongoSingletonWithPropertyPlaceHolders() throws Exception {
 
 		assertThat(host).isEqualTo("127.0.0.1");
 		assertThat(port).isEqualTo(new Integer(27017));
-
-		MongoClient mongo = mfb.getObject();
-		MongoClientOptions mongoOpts = mongo.getMongoClientOptions();
-
-		assertThat(mongoOpts.getConnectionsPerHost()).isEqualTo(8);
-		assertThat(mongoOpts.getConnectTimeout()).isEqualTo(1000);
-		assertThat(mongoOpts.getMaxWaitTime()).isEqualTo(1500);
-
-		assertThat(mongoOpts.getSocketTimeout()).isEqualTo(1500);
-		assertThat(mongoOpts.getThreadsAllowedToBlockForConnectionMultiplier()).isEqualTo(4);
-
-		// TODO: check the damned defaults
-		// assertEquals("w", mongoOpts.getWriteConcern().getW());
-		// assertEquals(0, mongoOpts.getWriteConcern().getWtimeout());
-		// assertEquals(true, mongoOpts.getWriteConcern().fsync());
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoParserIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoParserIntegrationTests.java
index e0f16b9498..2ae67e583b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoParserIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MongoParserIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,9 @@
 
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -31,10 +32,10 @@
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.io.ClassPathResource;
 
-import com.mongodb.Mongo;
+import com.mongodb.client.MongoClient;
 
 /**
- * Integration tests for {@link MongoParser}.
+ * Integration tests for {@link MongoClientParser}.
  *
  * @author Oliver Gierke
  */
@@ -43,7 +44,7 @@ public class MongoParserIntegrationTests {
 	DefaultListableBeanFactory factory;
 	BeanDefinitionReader reader;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		this.factory = new DefaultListableBeanFactory();
@@ -51,6 +52,7 @@ public void setUp() {
 	}
 
 	@Test
+	@Disabled
 	public void readsMongoAttributesCorrectly() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("namespace/mongo-bean.xml"));
@@ -74,7 +76,7 @@ public void readsServerAddressesCorrectly() {
 		AbstractApplicationContext context = new GenericApplicationContext(factory);
 		context.refresh();
 
-		assertThat(context.getBean("mongo2", Mongo.class)).isNotNull();
+		assertThat(context.getBean("mongo2", MongoClient.class)).isNotNull();
 		context.close();
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MyWriteConcern.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MyWriteConcern.java
deleted file mode 100644
index 725a9cd26b..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MyWriteConcern.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.springframework.data.mongodb.config;
-
-import com.mongodb.WriteConcern;
-
-public class MyWriteConcern {
-
-	public MyWriteConcern(WriteConcern wc) {
-		this._w = wc.getWObject();
-		this._fsync = wc.getFsync();
-		this._j = wc.getJ();
-		this._wtimeout = wc.getWtimeout();
-	}
-
-	Object _w = 0;
-	int _wtimeout = 0;
-	boolean _fsync = false;
-	boolean _j = false;
-	boolean _continueOnErrorForInsert = false;
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + (_continueOnErrorForInsert ? 1231-2018 : 1237);
-		result = prime * result + (_fsync ? 1231-2018 : 1237);
-		result = prime * result + (_j ? 1231-2018 : 1237);
-		result = prime * result + ((_w == null) ? 0 : _w.hashCode());
-		result = prime * result + _wtimeout;
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		MyWriteConcern other = (MyWriteConcern) obj;
-		if (_continueOnErrorForInsert != other._continueOnErrorForInsert)
-			return false;
-		if (_fsync != other._fsync)
-			return false;
-		if (_j != other._j)
-			return false;
-		if (_w == null) {
-			if (other._w != null)
-				return false;
-		} else if (!_w.equals(other._w))
-			return false;
-		if (_wtimeout != other._wtimeout)
-			return false;
-		return true;
-	}
-
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java
index 31b649b09c..fc47fd0572 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReactiveAuditingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,53 +16,67 @@
 package org.springframework.data.mongodb.config;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
 
+import org.springframework.core.ResolvableType;
+import org.springframework.data.mapping.callback.EntityCallback;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAuditingEntityCallback;
+import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
+import org.springframework.test.util.ReflectionTestUtils;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.annotation.Version;
-import org.springframework.data.domain.AuditorAware;
+import org.springframework.data.domain.ReactiveAuditorAware;
 import org.springframework.data.mongodb.core.AuditablePerson;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * Integration test for the auditing support via {@link org.springframework.data.mongodb.core.ReactiveMongoTemplate}.
  *
  * @author Mark Paluch
  */
-@RunWith(SpringRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
-public class ReactiveAuditingTests {
+class ReactiveAuditingTests {
+
+	static @Client MongoClient mongoClient;
 
 	@Autowired ReactiveAuditablePersonRepository auditablePersonRepository;
-	@Autowired AuditorAware<AuditablePerson> auditorAware;
 	@Autowired MongoMappingContext context;
 	@Autowired ReactiveMongoOperations operations;
 
 	@Configuration
-	@EnableMongoAuditing(auditorAwareRef = "auditorProvider")
-	@EnableReactiveMongoRepositories(basePackageClasses = ReactiveAuditingTests.class, considerNestedRepositories = true)
-	static class Config extends AbstractReactiveMongoConfiguration {
+	@EnableReactiveMongoAuditing
+	@EnableReactiveMongoRepositories(basePackageClasses = ReactiveAuditingTests.class, considerNestedRepositories = true,
+			includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ReactiveAuditablePersonRepository.class))
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
@@ -71,18 +85,27 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return mongoClient;
+		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() {
+			return new HashSet<>(
+					Arrays.asList(AuditablePerson.class, VersionedAuditablePerson.class, SimpleVersionedAuditablePerson.class));
 		}
 
 		@Bean
-		@SuppressWarnings("unchecked")
-		public AuditorAware<AuditablePerson> auditorProvider() {
-			return mock(AuditorAware.class);
+		public ReactiveAuditorAware<AuditablePerson> auditorProvider() {
+
+			AuditablePerson person = new AuditablePerson("some-person");
+			person.setId("foo");
+
+			return () -> Mono.just(person);
 		}
 	}
 
-	@Test // DATAMONGO-2139, DATAMONGO-2150
-	public void auditingWorksForVersionedEntityWithWrapperVersion() {
+	@Test // DATAMONGO-2139, DATAMONGO-2150, DATAMONGO-2586
+	void auditingWorksForVersionedEntityWithWrapperVersion() {
 
 		verifyAuditingViaVersionProperty(new VersionedAuditablePerson(), //
 				it -> it.version, //
@@ -92,7 +115,7 @@ public void auditingWorksForVersionedEntityWithWrapperVersion() {
 	}
 
 	@Test // DATAMONGO-2179
-	public void auditingWorksForVersionedEntityBatchWithWrapperVersion() {
+	void auditingWorksForVersionedEntityBatchWithWrapperVersion() {
 
 		verifyAuditingViaVersionProperty(new VersionedAuditablePerson(), //
 				it -> it.version, //
@@ -101,8 +124,8 @@ public void auditingWorksForVersionedEntityBatchWithWrapperVersion() {
 				null, 0L, 1L);
 	}
 
-	@Test // DATAMONGO-2139, DATAMONGO-2150
-	public void auditingWorksForVersionedEntityWithSimpleVersion() {
+	@Test // DATAMONGO-2139, DATAMONGO-2150, DATAMONGO-2586
+	void auditingWorksForVersionedEntityWithSimpleVersion() {
 
 		verifyAuditingViaVersionProperty(new SimpleVersionedAuditablePerson(), //
 				it -> it.version, //
@@ -111,8 +134,8 @@ public void auditingWorksForVersionedEntityWithSimpleVersion() {
 				0L, 1L, 2L);
 	}
 
-	@Test // DATAMONGO-2139, DATAMONGO-2150
-	public void auditingWorksForVersionedEntityWithWrapperVersionOnTemplate() {
+	@Test // DATAMONGO-2139, DATAMONGO-2150, DATAMONGO-2586
+	void auditingWorksForVersionedEntityWithWrapperVersionOnTemplate() {
 
 		verifyAuditingViaVersionProperty(new VersionedAuditablePerson(), //
 				it -> it.version, //
@@ -121,8 +144,8 @@ public void auditingWorksForVersionedEntityWithWrapperVersionOnTemplate() {
 				null, 0L, 1L);
 	}
 
-	@Test // DATAMONGO-2139, DATAMONGO-2150
-	public void auditingWorksForVersionedEntityWithSimpleVersionOnTemplate() {
+	@Test // DATAMONGO-2139, DATAMONGO-2150, DATAMONGO-2586
+	void auditingWorksForVersionedEntityWithSimpleVersionOnTemplate() {
 		verifyAuditingViaVersionProperty(new SimpleVersionedAuditablePerson(), //
 				it -> it.version, //
 				AuditablePerson::getCreatedAt, //
@@ -130,6 +153,19 @@ public void auditingWorksForVersionedEntityWithSimpleVersionOnTemplate() {
 				0L, 1L, 2L);
 	}
 
+	@Test // DATAMONGO-2586
+	void auditingShouldOnlyRegisterReactiveAuditingCallback() {
+
+		Object callbacks = ReflectionTestUtils.getField(operations, "entityCallbacks");
+		Object callbackDiscoverer = ReflectionTestUtils.getField(callbacks, "callbackDiscoverer");
+		List<EntityCallback<?>> actualCallbacks = ReflectionTestUtils.invokeMethod(callbackDiscoverer, "getEntityCallbacks",
+				AuditablePerson.class, ResolvableType.forClass(EntityCallback.class));
+
+		assertThat(actualCallbacks) //
+				.hasAtLeastOneElementOfType(ReactiveAuditingEntityCallback.class) //
+				.doesNotHaveAnyElementsOfTypes(AuditingEntityCallback.class);
+	}
+
 	private <T extends AuditablePerson> void verifyAuditingViaVersionProperty(T instance,
 			Function<T, Object> versionExtractor, Function<T, Object> createdDateExtractor, Function<T, Mono<T>> persister,
 			Object... expectedValues) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditorUnitTests.java
index 4e640c141f..d9280a416d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ReadPreferencePropertyEditorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,8 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.mongodb.ReadPreference;
 
@@ -31,7 +31,7 @@ public class ReadPreferencePropertyEditorUnitTests {
 
 	ReadPreferencePropertyEditor editor;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		editor = new ReadPreferencePropertyEditor();
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditorUnitTests.java
index 21796ced46..38210b3f33 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/ServerAddressPropertyEditorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,9 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 
 import com.mongodb.ServerAddress;
 
@@ -38,12 +39,12 @@ public class ServerAddressPropertyEditorUnitTests {
 
 	ServerAddressPropertyEditor editor;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		editor = new ServerAddressPropertyEditor();
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-454, DATAMONGO-1062
+	@Test // DATAMONGO-454, DATAMONGO-1062
 	public void rejectsAddressConfigWithoutASingleParsableAndResolvableServerAddress() {
 
 		String unknownHost1 = "gugu.nonexistant.example.org";
@@ -51,10 +52,12 @@ public void rejectsAddressConfigWithoutASingleParsableAndResolvableServerAddress
 
 		assertUnresolveableHostnames(unknownHost1, unknownHost2);
 
-		editor.setAsText(unknownHost1 + "," + unknownHost2);
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> editor.setAsText(unknownHost1 + "," + unknownHost2));
 	}
 
 	@Test // DATAMONGO-454
+	@EnabledIfSystemProperty(named = "user.name", matches = "jenkins")
 	public void skipsUnparsableAddressIfAtLeastOneIsParsable() throws UnknownHostException {
 
 		editor.setAsText("foo, localhost");
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java
index 718644b978..7f400c80e0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/StringToWriteConcernConverterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.mongodb.WriteConcern;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditorUnitTests.java
index 6d1267f648..2f9732a33a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/WriteConcernPropertyEditorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,8 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import com.mongodb.WriteConcern;
 
@@ -32,7 +32,7 @@ public class WriteConcernPropertyEditorUnitTests {
 
 	WriteConcernPropertyEditor editor;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		editor = new WriteConcernPropertyEditor();
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/AuditablePerson.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/AuditablePerson.java
index 015f247178..b7bc73a728 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/AuditablePerson.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/AuditablePerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ChangeStreamOptionsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ChangeStreamOptionsUnitTests.java
index b0a6ba2503..a4192df40a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ChangeStreamOptionsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ChangeStreamOptionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.BsonDocument;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link ChangeStreamOptions}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ClientSessionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ClientSessionTests.java
index dcdb60935b..7fb1cddafb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ClientSessionTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ClientSessionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,60 +19,59 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
+import java.util.Objects;
 
 import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersion;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.ReplSetClient;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.ClientSessionOptions;
-import com.mongodb.client.MongoClient;
 import com.mongodb.client.ClientSession;
+import com.mongodb.client.MongoClient;
 
 /**
+ * Integration tests for {@link ClientSession} through {@link MongoTemplate#withSession(ClientSession)}.
+ *
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class ClientSessionTests {
-
-	public static @ClassRule TestRule replSet = ReplicaSet.required();
-	public @Rule MongoVersionRule REQUIRES_AT_LEAST_3_6_0 = MongoVersionRule.atLeast(Version.parse("3.6.0"));
+@ExtendWith({ MongoClientExtension.class })
+@EnableIfReplicaSetAvailable
+@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+class ClientSessionTests {
 
 	private static final String DB_NAME = "client-session-tests";
 	private static final String COLLECTION_NAME = "test";
+	private static final String REF_COLLECTION_NAME = "test-with-ref";
 
-	MongoTemplate template;
-	MongoClient client;
+	private static @ReplSetClient MongoClient mongoClient;
 
-	@Before
-	public void setUp() {
+	private MongoTemplate template;
 
-		client = MongoTestUtils.replSetClient();
+	@BeforeEach
+	void setUp() {
 
-		MongoTestUtils.createOrReplaceCollection(DB_NAME, COLLECTION_NAME, client);
+		MongoTestUtils.createOrReplaceCollection(DB_NAME, COLLECTION_NAME, mongoClient);
 
-		template = new MongoTemplate(client, DB_NAME);
+		template = new MongoTemplate(mongoClient, DB_NAME);
 		template.getDb().getCollection(COLLECTION_NAME).insertOne(new Document("_id", "id-1").append("value", "spring"));
 	}
 
 	@Test // DATAMONGO-1880
-	public void shouldApplyClientSession() {
+	void shouldApplyClientSession() {
 
-		ClientSession session = client.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
+		ClientSession session = mongoClient.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
 
 		assertThat(session.getOperationTime()).isNull();
 
@@ -87,9 +86,9 @@ public void shouldApplyClientSession() {
 	}
 
 	@Test // DATAMONGO-2241
-	public void shouldReuseConfiguredInfrastructure() {
+	void shouldReuseConfiguredInfrastructure() {
 
-		ClientSession session = client.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
+		ClientSession session = mongoClient.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
 
 		MappingMongoConverter source = MappingMongoConverter.class.cast(template.getConverter());
 		MappingMongoConverter sessionTemplateConverter = MappingMongoConverter.class
@@ -103,10 +102,9 @@ public void shouldReuseConfiguredInfrastructure() {
 	}
 
 	@Test // DATAMONGO-1920
-	@MongoVersion(asOf = "3.7.3")
-	public void withCommittedTransaction() {
+	void withCommittedTransaction() {
 
-		ClientSession session = client.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
+		ClientSession session = mongoClient.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
 
 		assertThat(session.getOperationTime()).isNull();
 
@@ -129,10 +127,9 @@ public void withCommittedTransaction() {
 	}
 
 	@Test // DATAMONGO-1920
-	@MongoVersion(asOf = "3.7.3")
-	public void withAbortedTransaction() {
+	void withAbortedTransaction() {
 
-		ClientSession session = client.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
+		ClientSession session = mongoClient.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
 
 		assertThat(session.getOperationTime()).isNull();
 
@@ -154,13 +151,123 @@ public void withAbortedTransaction() {
 		assertThat(template.exists(query(where("id").is(saved.getId())), SomeDoc.class)).isFalse();
 	}
 
-	@Data
-	@AllArgsConstructor
+	@Test // DATAMONGO-2490
+	void shouldBeAbleToReadDbRefDuringTransaction() {
+
+		SomeDoc ref = new SomeDoc("ref-1", "da value");
+		WithDbRef source = new WithDbRef("source-1", "da source", ref);
+
+		ClientSession session = mongoClient.startSession(ClientSessionOptions.builder().causallyConsistent(true).build());
+
+		assertThat(session.getOperationTime()).isNull();
+
+		session.startTransaction();
+
+		WithDbRef saved = template.withSession(() -> session).execute(action -> {
+
+			template.save(ref);
+			template.save(source);
+
+			return template.findOne(query(where("id").is(source.id)), WithDbRef.class);
+		});
+
+		assertThat(saved.getSomeDocRef()).isEqualTo(ref);
+
+		session.abortTransaction();
+	}
+
 	@org.springframework.data.mongodb.core.mapping.Document(COLLECTION_NAME)
 	static class SomeDoc {
 
 		@Id String id;
 		String value;
+
+		SomeDoc(String id, String value) {
+
+			this.id = id;
+			this.value = value;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			SomeDoc someDoc = (SomeDoc) o;
+			return Objects.equals(id, someDoc.id) && Objects.equals(value, someDoc.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "ClientSessionTests.SomeDoc(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(REF_COLLECTION_NAME)
+	static class WithDbRef {
+
+		@Id String id;
+		String value;
+		@DBRef SomeDoc someDocRef;
+
+		WithDbRef(String id, String value, SomeDoc someDocRef) {
+			this.id = id;
+			this.value = value;
+			this.someDocRef = someDocRef;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public SomeDoc getSomeDocRef() {
+			return this.someDocRef;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public void setSomeDocRef(SomeDoc someDocRef) {
+			this.someDocRef = someDocRef;
+		}
+
+		public String toString() {
+			return "ClientSessionTests.WithDbRef(id=" + this.getId() + ", value=" + this.getValue() + ", someDocRef="
+					+ this.getSomeDocRef() + ")";
+		}
 	}
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CloseableIterableCursorAdapterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CloseableIterableCursorAdapterUnitTests.java
index 421e033aa2..a912b04adc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CloseableIterableCursorAdapterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CloseableIterableCursorAdapterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,16 @@
  */
 package org.springframework.data.mongodb.core;
 
+import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoTemplate.CloseableIterableCursorAdapter;
 import org.springframework.data.mongodb.core.MongoTemplate.DocumentCallback;
@@ -35,40 +37,39 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class CloseableIterableCursorAdapterUnitTests {
+@ExtendWith(MockitoExtension.class)
+class CloseableIterableCursorAdapterUnitTests {
 
 	@Mock PersistenceExceptionTranslator exceptionTranslator;
 	@Mock DocumentCallback<Object> callback;
 
-	MongoCursor<Document> cursor;
-	CloseableIterator<Object> adapter;
-
-	@Before
-	public void setUp() {
+	private MongoCursor<Document> cursor;
+	private CloseableIterator<Object> adapter;
 
-		this.cursor = doThrow(IllegalArgumentException.class).when(mock(MongoCursor.class));
-		this.adapter = new CloseableIterableCursorAdapter<Object>(cursor, exceptionTranslator, callback);
+	@BeforeEach
+	void setUp() {
+		this.cursor = mock(MongoCursor.class);
+		this.adapter = new CloseableIterableCursorAdapter<>(cursor, exceptionTranslator, callback);
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1276
-	public void propagatesOriginalExceptionFromAdapterDotNext() {
+	@Test // DATAMONGO-1276
+	void propagatesOriginalExceptionFromAdapterDotNext() {
 
-		cursor.next();
-		adapter.next();
+		doThrow(IllegalArgumentException.class).when(cursor).next();
+		assertThatIllegalArgumentException().isThrownBy(() -> adapter.next());
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1276
-	public void propagatesOriginalExceptionFromAdapterDotHasNext() {
+	@Test // DATAMONGO-1276
+	void propagatesOriginalExceptionFromAdapterDotHasNext() {
 
-		cursor.hasNext();
-		adapter.hasNext();
+		doThrow(IllegalArgumentException.class).when(cursor).hasNext();
+		assertThatIllegalArgumentException().isThrownBy(() -> adapter.hasNext());
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1276
-	public void propagatesOriginalExceptionFromAdapterDotClose() {
+	@Test // DATAMONGO-1276
+	void propagatesOriginalExceptionFromAdapterDotClose() {
 
-		cursor.close();
-		adapter.close();
+		doThrow(IllegalArgumentException.class).when(cursor).close();
+		assertThatIllegalArgumentException().isThrownBy(() -> adapter.close());
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CollationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CollationUnitTests.java
index 4eb14a67c8..0d5e22202c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CollationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CollationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import java.util.Locale;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Collation.Alternate;
 import org.springframework.data.mongodb.core.query.Collation.CaseFirst;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CollectionOptionsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CollectionOptionsUnitTests.java
new file mode 100644
index 0000000000..9de0863cd2
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CollectionOptionsUnitTests.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2022-2025 the original author 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 static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.data.mongodb.core.CollectionOptions.EncryptedFieldsOptions;
+import static org.springframework.data.mongodb.core.CollectionOptions.TimeSeriesOptions;
+import static org.springframework.data.mongodb.core.CollectionOptions.emitChangedRevisions;
+import static org.springframework.data.mongodb.core.CollectionOptions.empty;
+import static org.springframework.data.mongodb.core.CollectionOptions.encryptedCollection;
+import static org.springframework.data.mongodb.core.schema.JsonSchemaProperty.int32;
+import static org.springframework.data.mongodb.core.schema.JsonSchemaProperty.queryable;
+
+import java.util.List;
+
+import org.bson.BsonNull;
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
+import org.springframework.data.mongodb.core.schema.QueryCharacteristics;
+import org.springframework.data.mongodb.core.validation.Validator;
+
+/**
+ * @author Christoph Strobl
+ */
+class CollectionOptionsUnitTests {
+
+	@Test // GH-4210
+	void emptyEquals() {
+		assertThat(empty()).isEqualTo(empty());
+	}
+
+	@Test // GH-4210
+	void collectionProperties() {
+		assertThat(empty().maxDocuments(10).size(1).disableValidation())
+				.isEqualTo(empty().maxDocuments(10).size(1).disableValidation());
+	}
+
+	@Test // GH-4210
+	void changedRevisionsEquals() {
+		assertThat(emitChangedRevisions()).isNotEqualTo(empty()).isEqualTo(emitChangedRevisions());
+	}
+
+	@Test // GH-4210
+	void cappedEquals() {
+		assertThat(empty().capped()).isNotEqualTo(empty()).isEqualTo(empty().capped());
+	}
+
+	@Test // GH-4210
+	void collationEquals() {
+
+		assertThat(empty().collation(Collation.of("en_US"))) //
+				.isEqualTo(empty().collation(Collation.of("en_US"))) //
+				.isNotEqualTo(empty()) //
+				.isNotEqualTo(empty().collation(Collation.of("de_AT")));
+	}
+
+	@Test // GH-4210
+	void timeSeriesEquals() {
+
+		assertThat(empty().timeSeries(TimeSeriesOptions.timeSeries("tf"))) //
+				.isEqualTo(empty().timeSeries(TimeSeriesOptions.timeSeries("tf"))) //
+				.isNotEqualTo(empty()) //
+				.isNotEqualTo(empty().timeSeries(TimeSeriesOptions.timeSeries("other")));
+	}
+
+	@Test // GH-4210
+	void validatorEquals() {
+
+		assertThat(empty().validator(Validator.document(new Document("one", "two")))) //
+				.isEqualTo(empty().validator(Validator.document(new Document("one", "two")))) //
+				.isNotEqualTo(empty()) //
+				.isNotEqualTo(empty().validator(Validator.document(new Document("three", "four"))))
+				.isNotEqualTo(empty().validator(Validator.document(new Document("one", "two"))).moderateValidation());
+	}
+
+	@Test // GH-4185
+	@SuppressWarnings("unchecked")
+	void queryableEncryptionOptionsFromSchemaRenderCorrectly() {
+
+		MongoJsonSchema schema = MongoJsonSchema.builder()
+				.property(JsonSchemaProperty.object("spring")
+						.properties(queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int32("data")), List.of())))
+				.property(queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int64("mongodb")), List.of())).build();
+
+		EncryptedFieldsOptions encryptionOptions = EncryptedFieldsOptions.fromSchema(schema);
+
+		assertThat(encryptionOptions.toDocument().get("fields", List.class)).hasSize(2)
+				.contains(new Document("path", "mongodb").append("bsonType", "long").append("queries", List.of())
+						.append("keyId", BsonNull.VALUE))
+				.contains(new Document("path", "spring.data").append("bsonType", "int").append("queries", List.of())
+						.append("keyId", BsonNull.VALUE));
+	}
+
+	@Test // GH-4185
+	@SuppressWarnings("unchecked")
+	void queryableEncryptionPropertiesOverrideByPath() {
+
+		CollectionOptions collectionOptions = encryptedCollection(options -> options //
+				.queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int32("spring")))
+				.queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int64("data")))
+
+				// override first with data type long
+				.queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int64("spring"))));
+
+		assertThat(collectionOptions.getEncryptedFieldsOptions()).map(EncryptedFieldsOptions::toDocument)
+				.hasValueSatisfying(it -> {
+					assertThat(it.get("fields", List.class)).hasSize(2).contains(new Document("path", "spring")
+							.append("bsonType", "long").append("queries", List.of()).append("keyId", BsonNull.VALUE));
+				});
+	}
+
+	@Test // GH-4185
+	@SuppressWarnings("unchecked")
+	void queryableEncryptionPropertiesOverridesPathFromSchema() {
+
+		EncryptedFieldsOptions encryptionOptions = EncryptedFieldsOptions.fromSchema(MongoJsonSchema.builder()
+				.property(queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int32("spring")), List.of()))
+				.property(queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int64("data")), List.of())).build());
+
+		// override spring from schema with data type long
+		CollectionOptions collectionOptions = CollectionOptions.encryptedCollection(
+				encryptionOptions.queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int64("spring"))));
+
+		assertThat(collectionOptions.getEncryptedFieldsOptions()).map(EncryptedFieldsOptions::toDocument)
+				.hasValueSatisfying(it -> {
+					assertThat(it.get("fields", List.class)).hasSize(2).contains(new Document("path", "spring")
+							.append("bsonType", "long").append("queries", List.of()).append("keyId", BsonNull.VALUE));
+				});
+	}
+
+	@Test // GH-4185
+	void encryptionOptionsAreImmutable() {
+
+		EncryptedFieldsOptions source = EncryptedFieldsOptions
+				.fromProperties(List.of(queryable(int32("spring.data"), List.of(QueryCharacteristics.range().min(1)))));
+
+		assertThat(source.queryable(queryable(int32("mongodb"), List.of(QueryCharacteristics.range().min(1)))))
+				.isNotSameAs(source).satisfies(it -> {
+					assertThat(it.toDocument().get("fields", List.class)).hasSize(2);
+				});
+
+		assertThat(source.toDocument().get("fields", List.class)).hasSize(1);
+	}
+
+	@Test // GH-4185
+	@SuppressWarnings("unchecked")
+	void queryableEncryptionPropertiesOverridesNestedPathFromSchema() {
+
+		EncryptedFieldsOptions encryptionOptions = EncryptedFieldsOptions.fromSchema(MongoJsonSchema.builder()
+				.property(JsonSchemaProperty.object("spring")
+						.properties(queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int32("data")), List.of())))
+				.property(queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int64("mongodb")), List.of())).build());
+
+		// override spring from schema with data type long
+		CollectionOptions collectionOptions = CollectionOptions.encryptedCollection(
+				encryptionOptions.queryable(JsonSchemaProperty.encrypted(JsonSchemaProperty.int64("spring.data"))));
+
+		assertThat(collectionOptions.getEncryptedFieldsOptions()).map(EncryptedFieldsOptions::toDocument)
+				.hasValueSatisfying(it -> {
+					assertThat(it.get("fields", List.class)).hasSize(2).contains(new Document("path", "spring.data")
+							.append("bsonType", "long").append("queries", List.of()).append("keyId", BsonNull.VALUE));
+				});
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java
index 648b2b654c..5be870a295 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/CountQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,19 +15,17 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -39,27 +37,25 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-public class CountQueryUnitTests {
-
-	QueryMapper mapper;
-	MongoMappingContext context;
-	MappingMongoConverter converter;
+class CountQueryUnitTests {
 
-	MongoDbFactory factory = mock(MongoDbFactory.class);
+	private QueryMapper mapper;
+	private MongoMappingContext context;
+	private MappingMongoConverter converter;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		this.context = new MongoMappingContext();
 
-		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), context);
+		this.converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
 		this.converter.afterPropertiesSet();
 
 		this.mapper = new QueryMapper(converter);
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearToGeoWithinWithoutDistance() {
+	void nearToGeoWithinWithoutDistance() {
 
 		Query source = query(where("location").near(new Point(-73.99171, 40.738868)));
 		org.bson.Document target = postProcessQueryForCount(source);
@@ -69,7 +65,7 @@ public void nearToGeoWithinWithoutDistance() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearAndExisting$and() {
+	void nearAndExisting$and() {
 
 		Query source = query(where("location").near(new Point(-73.99171, 40.738868)).minDistance(0.01))
 				.addCriteria(new Criteria().andOperator(where("foo").is("bar")));
@@ -83,7 +79,7 @@ public void nearToGeoWithinWithoutDistance() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearSphereToGeoWithinWithoutDistance() {
+	void nearSphereToGeoWithinWithoutDistance() {
 
 		Query source = query(where("location").nearSphere(new Point(-73.99171, 40.738868)));
 		org.bson.Document target = postProcessQueryForCount(source);
@@ -93,7 +89,7 @@ public void nearSphereToGeoWithinWithoutDistance() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearToGeoWithinWithMaxDistance() {
+	void nearToGeoWithinWithMaxDistance() {
 
 		Query source = query(where("location").near(new Point(-73.99171, 40.738868)).maxDistance(10));
 		org.bson.Document target = postProcessQueryForCount(source);
@@ -103,7 +99,7 @@ public void nearToGeoWithinWithMaxDistance() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearSphereToGeoWithinWithMaxDistance() {
+	void nearSphereToGeoWithinWithMaxDistance() {
 
 		Query source = query(where("location").nearSphere(new Point(-73.99171, 40.738868)).maxDistance(10));
 		org.bson.Document target = postProcessQueryForCount(source);
@@ -113,7 +109,7 @@ public void nearSphereToGeoWithinWithMaxDistance() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearToGeoWithinWithMinDistance() {
+	void nearToGeoWithinWithMinDistance() {
 
 		Query source = query(where("location").near(new Point(-73.99171, 40.738868)).minDistance(0.01));
 		org.bson.Document target = postProcessQueryForCount(source);
@@ -124,7 +120,7 @@ public void nearToGeoWithinWithMinDistance() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearToGeoWithinWithMaxDistanceAndCombinedWithOtherCriteria() {
+	void nearToGeoWithinWithMaxDistanceAndCombinedWithOtherCriteria() {
 
 		Query source = query(
 				where("name").is("food").and("location").near(new Point(-73.99171, 40.738868)).maxDistance(10));
@@ -135,7 +131,7 @@ public void nearToGeoWithinWithMaxDistanceAndCombinedWithOtherCriteria() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearToGeoWithinWithMinDistanceOrCombinedWithOtherCriteria() {
+	void nearToGeoWithinWithMinDistanceOrCombinedWithOtherCriteria() {
 
 		Query source = query(new Criteria().orOperator(where("name").is("food"),
 				where("location").near(new Point(-73.99171, 40.738868)).minDistance(0.01)));
@@ -146,7 +142,7 @@ public void nearToGeoWithinWithMinDistanceOrCombinedWithOtherCriteria() {
 	}
 
 	@Test // DATAMONGO-2059
-	public void nearToGeoWithinWithMaxDistanceOrCombinedWithOtherCriteria() {
+	void nearToGeoWithinWithMaxDistanceOrCombinedWithOtherCriteria() {
 
 		Query source = query(new Criteria().orOperator(where("name").is("food"),
 				where("location").near(new Point(-73.99171, 40.738868)).maxDistance(10)));
@@ -156,6 +152,39 @@ public void nearToGeoWithinWithMaxDistanceOrCombinedWithOtherCriteria() {
 				"{\"$or\" : [ { \"name\": \"food\" }, {\"location\": {\"$geoWithin\": {\"$center\": [[-73.99171, 40.738868], 10.0]}}} ]}"));
 	}
 
+	@Test // GH-4004
+	void nearToGeoWithinWithMaxDistanceUsingGeoJsonSource() {
+
+		Query source = query(new Criteria().orOperator(where("name").is("food"),
+				where("location").near(new GeoJsonPoint(-73.99171, 40.738868)).maxDistance(10)));
+
+		org.bson.Document target = postProcessQueryForCount(source);
+		assertThat(target).isEqualTo(org.bson.Document.parse(
+				"{\"$or\" : [ { \"name\": \"food\" }, {\"location\": {\"$geoWithin\": {\"$center\": [[-73.99171, 40.738868], 10.0]}}} ]}"));
+	}
+
+	@Test // GH-4004
+	void nearSphereToGeoWithinWithoutMaxDistanceUsingGeoJsonSource() {
+
+		Query source = query(new Criteria().orOperator(where("name").is("food"),
+				where("location").nearSphere(new GeoJsonPoint(-73.99171, 40.738868))));
+
+		org.bson.Document target = postProcessQueryForCount(source);
+		assertThat(target).isEqualTo(org.bson.Document.parse(
+				"{\"$or\" : [ { \"name\": \"food\" }, {\"location\": {\"$geoWithin\": {\"$centerSphere\": [[-73.99171, 40.738868], 1.7976931348623157E308]}}} ]}"));
+	}
+
+	@Test // GH-4004
+	void nearSphereToGeoWithinWithMaxDistanceUsingGeoJsonSource() {
+
+		Query source = query(new Criteria().orOperator(where("name").is("food"), where("location")
+				.nearSphere(new GeoJsonPoint(-73.99171, 40.738868)).maxDistance/*in meters for geojson*/(10d)));
+
+		org.bson.Document target = postProcessQueryForCount(source);
+		assertThat(target).isEqualTo(org.bson.Document.parse(
+				"{\"$or\" : [ { \"name\": \"food\" }, {\"location\": {\"$geoWithin\": {\"$centerSphere\": [[-73.99171, 40.738868], 1.567855942887398E-6]}}} ]}"));
+	}
+
 	private org.bson.Document postProcessQueryForCount(Query source) {
 
 		org.bson.Document intermediate = mapper.getMappedObject(source.getQueryObject(), (MongoPersistentEntity<?>) null);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java
index 13547aae83..f0e7eb67b0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,32 +16,43 @@
 package org.springframework.data.mongodb.core;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.domain.Sort.Direction.DESC;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Optional;
+import java.util.stream.Stream;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DuplicateKeyException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.BulkOperationException;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.DefaultBulkOperations.BulkOperationContext;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 import org.springframework.data.util.Pair;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.mongodb.MongoBulkWriteException;
 import com.mongodb.WriteConcern;
+import com.mongodb.bulk.BulkWriteResult;
 import com.mongodb.client.MongoCollection;
 
 /**
@@ -52,21 +63,17 @@
  * @author Christoph Strobl
  * @author Minsu Kim
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
+@ExtendWith(MongoTemplateExtension.class)
 public class DefaultBulkOperationsIntegrationTests {
 
 	static final String COLLECTION_NAME = "bulk_ops";
 
-	@Autowired MongoOperations operations;
+	@Template(initialEntitySet = BaseDoc.class) //
+	static MongoTestTemplate operations;
 
-	MongoCollection<Document> collection;
-
-	@Before
+	@BeforeEach
 	public void setUp() {
-
-		this.collection = this.operations.getCollection(COLLECTION_NAME);
-		this.collection.deleteMany(new Document());
+		operations.flush(COLLECTION_NAME);
 	}
 
 	@Test // DATAMONGO-934
@@ -95,13 +102,13 @@ public void insertOrdered() {
 		assertThat(createBulkOps(BulkMode.ORDERED).insert(documents).execute().getInsertedCount()).isEqualTo(2);
 	}
 
-	@Test // DATAMONGO-934
+	@Test // DATAMONGO-934, DATAMONGO-2285
 	public void insertOrderedFails() {
 
 		List<BaseDoc> documents = Arrays.asList(newDoc("1"), newDoc("1"), newDoc("2"));
 
 		assertThatThrownBy(() -> createBulkOps(BulkMode.ORDERED).insert(documents).execute()) //
-				.isInstanceOf(DuplicateKeyException.class) //
+				.isInstanceOf(BulkOperationException.class) //
 				.hasCauseInstanceOf(MongoBulkWriteException.class) //
 				.extracting(Throwable::getCause) //
 				.satisfies(it -> {
@@ -121,13 +128,13 @@ public void insertUnOrdered() {
 		assertThat(createBulkOps(BulkMode.UNORDERED).insert(documents).execute().getInsertedCount()).isEqualTo(2);
 	}
 
-	@Test // DATAMONGO-934
+	@Test // DATAMONGO-934, DATAMONGO-2285
 	public void insertUnOrderedContinuesOnError() {
 
 		List<BaseDoc> documents = Arrays.asList(newDoc("1"), newDoc("1"), newDoc("2"));
 
 		assertThatThrownBy(() -> createBulkOps(BulkMode.UNORDERED).insert(documents).execute()) //
-				.isInstanceOf(DuplicateKeyException.class) //
+				.isInstanceOf(BulkOperationException.class) //
 				.hasCauseInstanceOf(MongoBulkWriteException.class) //
 				.extracting(Throwable::getCause) //
 				.satisfies(it -> {
@@ -139,13 +146,14 @@ public void insertUnOrderedContinuesOnError() {
 				});
 	}
 
-	@Test // DATAMONGO-934
-	public void upsertDoesUpdate() {
+	@ParameterizedTest // DATAMONGO-934, GH-3872
+	@MethodSource("upsertArguments")
+	void upsertDoesUpdate(UpdateDefinition update) {
 
 		insertSomeDocuments();
 
 		com.mongodb.bulk.BulkWriteResult result = createBulkOps(BulkMode.ORDERED).//
-				upsert(where("value", "value1"), set("value", "value2")).//
+				upsert(where("value", "value1"), update).//
 				execute();
 
 		assertThat(result).isNotNull();
@@ -156,11 +164,12 @@ public void upsertDoesUpdate() {
 		assertThat(result.getUpserts().size()).isZero();
 	}
 
-	@Test // DATAMONGO-934
-	public void upsertDoesInsert() {
+	@ParameterizedTest // DATAMONGO-934, GH-3872
+	@MethodSource("upsertArguments")
+	void upsertDoesInsert(UpdateDefinition update) {
 
 		com.mongodb.bulk.BulkWriteResult result = createBulkOps(BulkMode.ORDERED).//
-				upsert(where("_id", "1"), set("value", "v1")).//
+				upsert(where("_id", "1"), update).//
 				execute();
 
 		assertThat(result).isNotNull();
@@ -175,11 +184,37 @@ public void updateOneOrdered() {
 		testUpdate(BulkMode.ORDERED, false, 2);
 	}
 
+	@Test // GH-3872
+	public void updateOneWithAggregation() {
+
+		insertSomeDocuments();
+
+		BulkOperations bulkOps = createBulkOps(BulkMode.ORDERED);
+		bulkOps.updateOne(where("value", "value1"), AggregationUpdate.update().set("value").toValue("value3"));
+		BulkWriteResult result = bulkOps.execute();
+
+		assertThat(result.getModifiedCount()).isEqualTo(1);
+		assertThat(operations.<Long>execute(COLLECTION_NAME, collection -> collection.countDocuments(new org.bson.Document("value", "value3")))).isOne();
+	}
+
 	@Test // DATAMONGO-934
 	public void updateMultiOrdered() {
 		testUpdate(BulkMode.ORDERED, true, 4);
 	}
 
+	@Test // GH-3872
+	public void updateMultiWithAggregation() {
+
+		insertSomeDocuments();
+
+		BulkOperations bulkOps = createBulkOps(BulkMode.ORDERED);
+		bulkOps.updateMulti(where("value", "value1"), AggregationUpdate.update().set("value").toValue("value3"));
+		BulkWriteResult result = bulkOps.execute();
+
+		assertThat(result.getModifiedCount()).isEqualTo(2);
+		assertThat(operations.<Long>execute(COLLECTION_NAME, collection -> collection.countDocuments(new org.bson.Document("value", "value3")))).isEqualTo(2);
+	}
+
 	@Test // DATAMONGO-934
 	public void updateOneUnOrdered() {
 		testUpdate(BulkMode.UNORDERED, false, 2);
@@ -264,7 +299,7 @@ public void mixedBulkOrdered() {
 	public void mixedBulkOrderedWithList() {
 
 		List<BaseDoc> inserts = Arrays.asList(newDoc("1", "v1"), newDoc("2", "v2"), newDoc("3", "v2"));
-		List<Pair<Query, Update>> updates = Arrays.asList(Pair.of(where("value", "v2"), set("value", "v3")));
+		List<Pair<Query, UpdateDefinition>> updates = Arrays.asList(Pair.of(where("value", "v2"), set("value", "v3")));
 		List<Query> removes = Arrays.asList(where("_id", "1"));
 
 		com.mongodb.bulk.BulkWriteResult result = createBulkOps(BulkMode.ORDERED, BaseDoc.class).insert(inserts)
@@ -292,13 +327,46 @@ public void insertShouldConsiderInheritance() {
 		assertThat(doc).isInstanceOf(SpecialDoc.class);
 	}
 
+	@Test // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	public void updateShouldConsiderSorting() {
+
+		insertSomeDocuments();
+
+		BulkWriteResult result = createBulkOps(BulkMode.ORDERED, BaseDocWithRenamedField.class)
+			.updateOne(new Query().with(Sort.by(DESC, "renamedField")), new Update().set("bsky", "altnps")).execute();
+
+		assertThat(result.getModifiedCount()).isOne();
+
+		Document raw = operations.execute(COLLECTION_NAME, col -> col.find(new Document("_id", "4")).first());
+		assertThat(raw).containsEntry("bsky", "altnps");
+	}
+
+	@Test // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	public void replaceShouldConsiderSorting() {
+
+		insertSomeDocuments();
+
+		BaseDocWithRenamedField target = new BaseDocWithRenamedField();
+		target.value = "replacement";
+
+		BulkWriteResult result = createBulkOps(BulkMode.ORDERED, BaseDocWithRenamedField.class)
+			.replaceOne(new Query().with(Sort.by(DESC, "renamedField")), target).execute();
+
+		assertThat(result.getModifiedCount()).isOne();
+
+		Document raw = operations.execute(COLLECTION_NAME, col -> col.find(new Document("_id", "4")).first());
+		assertThat(raw).containsEntry("value", target.value);
+	}
+
 	private void testUpdate(BulkMode mode, boolean multi, int expectedUpdates) {
 
 		BulkOperations bulkOps = createBulkOps(mode);
 
 		insertSomeDocuments();
 
-		List<Pair<Query, Update>> updates = new ArrayList<Pair<Query, Update>>();
+		List<Pair<Query, UpdateDefinition>> updates = new ArrayList<>();
 		updates.add(Pair.of(where("value", "value1"), set("value", "value3")));
 		updates.add(Pair.of(where("value", "value2"), set("value", "value4")));
 
@@ -353,10 +421,14 @@ private void insertSomeDocuments() {
 
 		final MongoCollection<Document> coll = operations.getCollection(COLLECTION_NAME);
 
-		coll.insertOne(rawDoc("1", "value1"));
-		coll.insertOne(rawDoc("2", "value1"));
-		coll.insertOne(rawDoc("3", "value2"));
-		coll.insertOne(rawDoc("4", "value2"));
+		coll.insertOne(rawDoc("1", "value1").append("rn_f", "001"));
+		coll.insertOne(rawDoc("2", "value1").append("rn_f", "002"));
+		coll.insertOne(rawDoc("3", "value2").append("rn_f", "003"));
+		coll.insertOne(rawDoc("4", "value2").append("rn_f", "004"));
+	}
+
+	private static Stream<Arguments> upsertArguments() {
+		return Stream.of(Arguments.of(set("value", "value2")), Arguments.of(AggregationUpdate.update().set("value").toValue("value2")));
 	}
 
 	private static BaseDoc newDoc(String id) {
@@ -386,4 +458,10 @@ private static Update set(String field, String value) {
 	private static Document rawDoc(String id, String value) {
 		return new Document("_id", id).append("value", value);
 	}
+
+	static class BaseDocWithRenamedField extends BaseDoc {
+
+		@Field("rn_f")
+		String renamedField;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java
index 2f7aac3f5e..6bdcb132f9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultBulkOperationsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,34 @@
 package org.springframework.data.mongodb.core;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyList;
-import static org.mockito.Mockito.eq;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.dao.DataAccessException;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.callback.EntityCallbacks;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.BulkOperationException;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.DefaultBulkOperations.BulkOperationContext;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
@@ -53,6 +53,7 @@
 import org.springframework.data.mongodb.core.convert.UpdateMapper;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveCallback;
 import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
@@ -60,13 +61,19 @@
 import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Update;
 
+import com.mongodb.MongoBulkWriteException;
 import com.mongodb.MongoWriteException;
+import com.mongodb.ServerAddress;
 import com.mongodb.WriteConcern;
 import com.mongodb.WriteError;
+import com.mongodb.bulk.BulkWriteError;
+import com.mongodb.bulk.WriteConcernError;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.BulkWriteOptions;
 import com.mongodb.client.model.DeleteManyModel;
 import com.mongodb.client.model.InsertOneModel;
 import com.mongodb.client.model.ReplaceOneModel;
@@ -81,25 +88,27 @@
  * @author Mark Paluch
  * @author Minsu Kim
  * @author Jens Schauder
+ * @author Roman Puchkovskiy
+ * @author Jacob Botuck
  */
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultBulkOperationsUnitTests {
+@ExtendWith(MockitoExtension.class)
+class DefaultBulkOperationsUnitTests {
 
-	MongoTemplate template;
+	private MongoTemplate template;
 	@Mock MongoDatabase database;
 	@Mock(answer = Answers.RETURNS_DEEP_STUBS) MongoCollection<Document> collection;
-	@Mock MongoDbFactory factory;
+	@Mock MongoDatabaseFactory factory;
 	@Mock DbRefResolver dbRefResolver;
 	@Captor ArgumentCaptor<List<WriteModel<Document>>> captor;
-	MongoConverter converter;
-	MongoMappingContext mappingContext;
+	private MongoConverter converter;
+	private MongoMappingContext mappingContext;
 
-	DefaultBulkOperations ops;
+	private DefaultBulkOperations ops;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		when(factory.getDb()).thenReturn(database);
+		when(factory.getMongoDatabase()).thenReturn(database);
 		when(factory.getExceptionTranslator()).thenReturn(new NullExceptionTranslator());
 		when(database.getCollection(anyString(), eq(Document.class))).thenReturn(collection);
 
@@ -116,7 +125,7 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void updateOneShouldUseCollationWhenPresent() {
+	void updateOneShouldUseCollationWhenPresent() {
 
 		ops.updateOne(new BasicQuery("{}").collation(Collation.of("de")), new Update().set("lastName", "targaryen"))
 				.execute();
@@ -129,7 +138,7 @@ public void updateOneShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void updateManyShouldUseCollationWhenPresent() {
+	void updateManyShouldUseCollationWhenPresent() {
 
 		ops.updateMulti(new BasicQuery("{}").collation(Collation.of("de")), new Update().set("lastName", "targaryen"))
 				.execute();
@@ -142,7 +151,7 @@ public void updateManyShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void removeShouldUseCollationWhenPresent() {
+	void removeShouldUseCollationWhenPresent() {
 
 		ops.remove(new BasicQuery("{}").collation(Collation.of("de"))).execute();
 
@@ -154,7 +163,7 @@ public void removeShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-2218
-	public void replaceOneShouldUseCollationWhenPresent() {
+	void replaceOneShouldUseCollationWhenPresent() {
 
 		ops.replaceOne(new BasicQuery("{}").collation(Collation.of("de")), new SomeDomainType()).execute();
 
@@ -166,7 +175,7 @@ public void replaceOneShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1678
-	public void bulkUpdateShouldMapQueryAndUpdateCorrectly() {
+	void bulkUpdateShouldMapQueryAndUpdateCorrectly() {
 
 		ops.updateOne(query(where("firstName").is("danerys")), Update.update("firstName", "queen danerys")).execute();
 
@@ -178,7 +187,7 @@ public void bulkUpdateShouldMapQueryAndUpdateCorrectly() {
 	}
 
 	@Test // DATAMONGO-1678
-	public void bulkRemoveShouldMapQueryCorrectly() {
+	void bulkRemoveShouldMapQueryCorrectly() {
 
 		ops.remove(query(where("firstName").is("danerys"))).execute();
 
@@ -189,7 +198,7 @@ public void bulkRemoveShouldMapQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-2218
-	public void bulkReplaceOneShouldMapQueryCorrectly() {
+	void bulkReplaceOneShouldMapQueryCorrectly() {
 
 		SomeDomainType replacement = new SomeDomainType();
 		replacement.firstName = "Minsu";
@@ -205,36 +214,39 @@ public void bulkReplaceOneShouldMapQueryCorrectly() {
 		assertThat(updateModel.getReplacement().getString("lastName")).isEqualTo("Kim");
 	}
 
-	@Test // DATAMONGO-2261
-	public void bulkInsertInvokesEntityCallbacks() {
+	@Test // DATAMONGO-2261, DATAMONGO-2479
+	void bulkInsertInvokesEntityCallbacks() {
 
 		BeforeConvertPersonCallback beforeConvertCallback = spy(new BeforeConvertPersonCallback());
 		BeforeSavePersonCallback beforeSaveCallback = spy(new BeforeSavePersonCallback());
+		AfterSavePersonCallback afterSaveCallback = spy(new AfterSavePersonCallback());
 
 		ops = new DefaultBulkOperations(template, "collection-1",
 				new BulkOperationContext(BulkMode.ORDERED, Optional.of(mappingContext.getPersistentEntity(Person.class)),
 						new QueryMapper(converter), new UpdateMapper(converter), null,
-						EntityCallbacks.create(beforeConvertCallback, beforeSaveCallback)));
+						EntityCallbacks.create(beforeConvertCallback, beforeSaveCallback, afterSaveCallback)));
 
 		Person entity = new Person("init");
 		ops.insert(entity);
 
 		ArgumentCaptor<Person> personArgumentCaptor = ArgumentCaptor.forClass(Person.class);
 		verify(beforeConvertCallback).onBeforeConvert(personArgumentCaptor.capture(), eq("collection-1"));
-		verifyZeroInteractions(beforeSaveCallback);
+		verifyNoInteractions(beforeSaveCallback);
 
 		ops.execute();
 
 		verify(beforeSaveCallback).onBeforeSave(personArgumentCaptor.capture(), any(), eq("collection-1"));
-		assertThat(personArgumentCaptor.getAllValues()).extracting("firstName").containsExactly("init", "before-convert");
+		verify(afterSaveCallback).onAfterSave(personArgumentCaptor.capture(), any(), eq("collection-1"));
+		assertThat(personArgumentCaptor.getAllValues()).extracting("firstName").containsExactly("init", "before-convert",
+				"before-convert");
 		verify(collection).bulkWrite(captor.capture(), any());
 
 		InsertOneModel<Document> updateModel = (InsertOneModel<Document>) captor.getValue().get(0);
-		assertThat(updateModel.getDocument()).containsEntry("firstName", "before-save");
+		assertThat(updateModel.getDocument()).containsEntry("firstName", "after-save");
 	}
 
 	@Test // DATAMONGO-2290
-	public void bulkReplaceOneEmitsEventsCorrectly() {
+	void bulkReplaceOneEmitsEventsCorrectly() {
 
 		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
 
@@ -255,7 +267,7 @@ public void bulkReplaceOneEmitsEventsCorrectly() {
 	}
 
 	@Test // DATAMONGO-2290
-	public void bulkInsertEmitsEventsCorrectly() {
+	void bulkInsertEmitsEventsCorrectly() {
 
 		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
 
@@ -276,11 +288,11 @@ public void bulkInsertEmitsEventsCorrectly() {
 	}
 
 	@Test // DATAMONGO-2290
-	public void noAfterSaveEventOnFailure() {
+	void noAfterSaveEventOnFailure() {
 
 		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
-		when(collection.bulkWrite(anyList(), any())).thenThrow(new MongoWriteException(
-				new WriteError(89, "NetworkTimeout", new BsonDocument("hi", new BsonString("there!"))), null));
+		when(collection.bulkWrite(anyList(), any(BulkWriteOptions.class))).thenThrow(new MongoWriteException(
+				new WriteError(89, "NetworkTimeout", new BsonDocument("hi", new BsonString("there"))), null));
 
 		ops = new DefaultBulkOperations(template, "collection-1",
 				new BulkOperationContext(BulkMode.ORDERED, Optional.of(mappingContext.getPersistentEntity(Person.class)),
@@ -292,16 +304,16 @@ public void noAfterSaveEventOnFailure() {
 
 		try {
 			ops.execute();
+			fail("Missing MongoWriteException");
 		} catch (MongoWriteException expected) {
 
 		}
 
 		verify(eventPublisher).publishEvent(any(BeforeSaveEvent.class));
-		verify(eventPublisher, never()).publishEvent(any(AfterSaveEvent.class));
 	}
 
 	@Test // DATAMONGO-2330
-	public void writeConcernNotAppliedWhenNotSet() {
+	void writeConcernNotAppliedWhenNotSet() {
 
 		ops.updateOne(new BasicQuery("{}").collation(Collation.of("de")), new Update().set("lastName", "targaryen"))
 				.execute();
@@ -310,7 +322,7 @@ public void writeConcernNotAppliedWhenNotSet() {
 	}
 
 	@Test // DATAMONGO-2330
-	public void writeConcernAppliedCorrectlyWhenSet() {
+	void writeConcernAppliedCorrectlyWhenSet() {
 
 		ops.setDefaultWriteConcern(WriteConcern.MAJORITY);
 
@@ -320,6 +332,87 @@ public void writeConcernAppliedCorrectlyWhenSet() {
 		verify(collection).withWriteConcern(eq(WriteConcern.MAJORITY));
 	}
 
+	@Test // DATAMONGO-2450
+	void appliesArrayFilterWhenPresent() {
+
+		ops.updateOne(new BasicQuery("{}"), new Update().filterArray(Criteria.where("element").gte(100))).execute();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		UpdateOneModel<Document> updateModel = (UpdateOneModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getOptions().getArrayFilters().get(0))
+				.isEqualTo(new org.bson.Document("element", new Document("$gte", 100)));
+	}
+
+	@Test // DATAMONGO-2502
+	void shouldRetainNestedArrayPathWithPlaceholdersForNoMatchingPaths() {
+
+		ops.updateOne(new BasicQuery("{}"), new Update().set("items.$.documents.0.fileId", "new-id")).execute();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		UpdateOneModel<Document> updateModel = (UpdateOneModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getUpdate())
+				.isEqualTo(new Document("$set", new Document("items.$.documents.0.fileId", "new-id")));
+	}
+
+	@Test // DATAMONGO-2502
+	void shouldRetainNestedArrayPathWithPlaceholdersForMappedEntity() {
+
+		DefaultBulkOperations ops = new DefaultBulkOperations(template, "collection-1",
+				new BulkOperationContext(BulkMode.ORDERED, Optional.of(mappingContext.getPersistentEntity(OrderTest.class)),
+						new QueryMapper(converter), new UpdateMapper(converter), null, null));
+
+		ops.updateOne(new BasicQuery("{}"), Update.update("items.$.documents.0.fileId", "file-id")).execute();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		UpdateOneModel<Document> updateModel = (UpdateOneModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getUpdate())
+				.isEqualTo(new Document("$set", new Document("items.$.documents.0.the_file_id", "file-id")));
+	}
+
+	@Test // DATAMONGO-2285
+	public void translateMongoBulkOperationExceptionWithWriteConcernError() {
+
+		when(collection.bulkWrite(anyList(), any(BulkWriteOptions.class))).thenThrow(new MongoBulkWriteException(null,
+				Collections.emptyList(),
+				new WriteConcernError(42, "codename", "writeconcern error happened", new BsonDocument()), new ServerAddress(), Collections.emptySet()));
+
+		assertThatExceptionOfType(DataIntegrityViolationException.class)
+				.isThrownBy(() -> ops.insert(new SomeDomainType()).execute());
+
+	}
+
+	@Test // DATAMONGO-2285
+	public void translateMongoBulkOperationExceptionWithoutWriteConcernError() {
+
+		when(collection.bulkWrite(anyList(), any(BulkWriteOptions.class))).thenThrow(new MongoBulkWriteException(null,
+				Collections.singletonList(new BulkWriteError(42, "a write error happened", new BsonDocument(), 49)), null,
+				new ServerAddress(), Collections.emptySet()));
+
+		assertThatExceptionOfType(BulkOperationException.class)
+				.isThrownBy(() -> ops.insert(new SomeDomainType()).execute());
+	}
+
+	static class OrderTest {
+
+		String id;
+		List<OrderTestItem> items;
+	}
+
+	static class OrderTestItem {
+
+		private String cartId;
+		private List<OrderTestDocument> documents;
+	}
+
+	static class OrderTestDocument {
+
+		@Field("the_file_id")
+		private String fileId;
+	}
+
 	class SomeDomainType {
 
 		@Id String id;
@@ -350,6 +443,16 @@ public Person onBeforeSave(Person entity, Document document, String collection)
 		}
 	}
 
+	static class AfterSavePersonCallback implements AfterSaveCallback<Person> {
+
+		@Override
+		public Person onAfterSave(Person entity, Document document, String collection) {
+
+			document.put("firstName", "after-save");
+			return new Person("after-save");
+		}
+	}
+
 	static class NullExceptionTranslator implements PersistenceExceptionTranslator {
 
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsIntegrationTests.java
index d9f548bdd3..78a6e6b496 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,28 +15,26 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.assertj.core.api.Assumptions.*;
-import static org.springframework.data.mongodb.core.index.PartialIndexFilter.*;
-import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.index.PartialIndexFilter.of;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
 import org.bson.BsonDocument;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexInfo;
+import org.springframework.data.mongodb.core.index.IndexOperations;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Collation.CaseFirst;
-import org.springframework.data.util.Version;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 import org.springframework.util.ObjectUtils;
 
 import com.mongodb.client.MongoCollection;
@@ -49,43 +47,27 @@
  * @author Oliver Gierke
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
+@ExtendWith(MongoTemplateExtension.class)
 public class DefaultIndexOperationsIntegrationTests {
 
-	private static final Version THREE_DOT_TWO = new Version(3, 2);
-	private static final Version THREE_DOT_FOUR = new Version(3, 4);
-	private static Version mongoVersion;
+	static final String COLLECTION_NAME = "default-index-operations-tests";
 	static final org.bson.Document GEO_SPHERE_2D = new org.bson.Document("loaction", "2dsphere");
 
-	@Autowired MongoTemplate template;
-	DefaultIndexOperations indexOps;
-	MongoCollection<org.bson.Document> collection;
+	@Template //
+	static MongoTestTemplate template;
 
-	@Before
-	public void setUp() {
-
-		queryMongoVersionIfNecessary();
-		String collectionName = this.template.getCollectionName(DefaultIndexOperationsIntegrationTestsSample.class);
-
-		this.collection = this.template.getDb().getCollection(collectionName, Document.class);
-		this.collection.dropIndexes();
-		this.indexOps = new DefaultIndexOperations(template.getMongoDbFactory(), collectionName,
-				new QueryMapper(template.getConverter()));
-	}
+	MongoCollection<org.bson.Document> collection = template.getCollection(COLLECTION_NAME);
+	IndexOperations indexOps = template.indexOps(COLLECTION_NAME);
 
-	private void queryMongoVersionIfNecessary() {
-
-		if (mongoVersion == null) {
-			Document result = template.executeCommand("{ buildInfo: 1 }");
-			mongoVersion = Version.parse(result.get("version").toString());
-		}
+	@BeforeEach
+	public void setUp() {
+		template.dropIndexes(COLLECTION_NAME);
 	}
 
 	@Test // DATAMONGO-1008
 	public void getIndexInfoShouldBeAbleToRead2dsphereIndex() {
 
-		collection.createIndex(GEO_SPHERE_2D);
+		template.getCollection(COLLECTION_NAME).createIndex(GEO_SPHERE_2D);
 
 		IndexInfo info = findAndReturnIndexInfo(GEO_SPHERE_2D);
 		assertThat(info.getIndexFields().get(0).isGeo()).isEqualTo(true);
@@ -94,12 +76,10 @@ public void getIndexInfoShouldBeAbleToRead2dsphereIndex() {
 	@Test // DATAMONGO-1467, DATAMONGO-2198
 	public void shouldApplyPartialFilterCorrectly() {
 
-		assumeThat(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO)).isTrue();
-
 		IndexDefinition id = new Index().named("partial-with-criteria").on("k3y", Direction.ASC)
 				.partial(of(where("q-t-y").gte(10)));
 
-		indexOps.ensureIndex(id);
+		indexOps.createIndex(id);
 
 		IndexInfo info = findAndReturnIndexInfo(indexOps.getIndexInfo(), "partial-with-criteria");
 		assertThat(Document.parse(info.getPartialFilterExpression()))
@@ -109,12 +89,10 @@ public void shouldApplyPartialFilterCorrectly() {
 	@Test // DATAMONGO-1467, DATAMONGO-2198
 	public void shouldApplyPartialFilterWithMappedPropertyCorrectly() {
 
-		assumeThat(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO)).isTrue();
-
 		IndexDefinition id = new Index().named("partial-with-mapped-criteria").on("k3y", Direction.ASC)
 				.partial(of(where("quantity").gte(10)));
 
-		indexOps.ensureIndex(id);
+		template.indexOps(DefaultIndexOperationsIntegrationTestsSample.class).createIndex(id);
 
 		IndexInfo info = findAndReturnIndexInfo(indexOps.getIndexInfo(), "partial-with-mapped-criteria");
 		assertThat(Document.parse(info.getPartialFilterExpression()))
@@ -124,12 +102,10 @@ public void shouldApplyPartialFilterWithMappedPropertyCorrectly() {
 	@Test // DATAMONGO-1467, DATAMONGO-2198
 	public void shouldApplyPartialDBOFilterCorrectly() {
 
-		assumeThat(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO)).isTrue();
-
 		IndexDefinition id = new Index().named("partial-with-dbo").on("k3y", Direction.ASC)
 				.partial(of(new org.bson.Document("qty", new org.bson.Document("$gte", 10))));
 
-		indexOps.ensureIndex(id);
+		indexOps.createIndex(id);
 
 		IndexInfo info = findAndReturnIndexInfo(indexOps.getIndexInfo(), "partial-with-dbo");
 		assertThat(Document.parse(info.getPartialFilterExpression()))
@@ -139,16 +115,12 @@ public void shouldApplyPartialDBOFilterCorrectly() {
 	@Test // DATAMONGO-1467, DATAMONGO-2198
 	public void shouldFavorExplicitMappingHintViaClass() {
 
-		assumeThat(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO)).isTrue();
-
 		IndexDefinition id = new Index().named("partial-with-inheritance").on("k3y", Direction.ASC)
 				.partial(of(where("age").gte(10)));
 
-		indexOps = new DefaultIndexOperations(template.getMongoDbFactory(),
-				this.template.getCollectionName(DefaultIndexOperationsIntegrationTestsSample.class),
-				new QueryMapper(template.getConverter()), MappingToSameCollection.class);
+		indexOps = new DefaultIndexOperations(template, COLLECTION_NAME, MappingToSameCollection.class);
 
-		indexOps.ensureIndex(id);
+		indexOps.createIndex(id);
 
 		IndexInfo info = findAndReturnIndexInfo(indexOps.getIndexInfo(), "partial-with-inheritance");
 		assertThat(Document.parse(info.getPartialFilterExpression()))
@@ -173,16 +145,12 @@ public void shouldReadIndexWithPartialFilterContainingDbRefCorrectly() {
 	@Test // DATAMONGO-1518
 	public void shouldCreateIndexWithCollationCorrectly() {
 
-		assumeThat(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_FOUR)).isTrue();
-
 		IndexDefinition id = new Index().named("with-collation").on("xyz", Direction.ASC)
 				.collation(Collation.of("de_AT").caseFirst(CaseFirst.off()));
 
-		new DefaultIndexOperations(template.getMongoDbFactory(),
-				this.template.getCollectionName(DefaultIndexOperationsIntegrationTestsSample.class),
-				new QueryMapper(template.getConverter()), MappingToSameCollection.class);
+		new DefaultIndexOperations(template, COLLECTION_NAME, MappingToSameCollection.class);
 
-		indexOps.ensureIndex(id);
+		indexOps.createIndex(id);
 
 		Document expected = new Document("locale", "de_AT") //
 				.append("caseLevel", false) //
@@ -205,6 +173,40 @@ public void shouldCreateIndexWithCollationCorrectly() {
 		assertThat(result).isEqualTo(expected);
 	}
 
+	@Test // GH-4348
+	void indexShouldNotBeHiddenByDefault() {
+
+		IndexDefinition index = new Index().named("my-index").on("a", Direction.ASC);
+
+		indexOps = new DefaultIndexOperations(template, COLLECTION_NAME, MappingToSameCollection.class);
+		indexOps.createIndex(index);
+
+		IndexInfo info = findAndReturnIndexInfo(indexOps.getIndexInfo(), "my-index");
+		assertThat(info.isHidden()).isFalse();
+	}
+
+	@Test // GH-4348
+	void shouldCreateHiddenIndex() {
+
+		IndexDefinition index = new Index().named("my-hidden-index").on("a", Direction.ASC).hidden();
+
+		indexOps = new DefaultIndexOperations(template, COLLECTION_NAME, MappingToSameCollection.class);
+		indexOps.createIndex(index);
+
+		IndexInfo info = findAndReturnIndexInfo(indexOps.getIndexInfo(), "my-hidden-index");
+		assertThat(info.isHidden()).isTrue();
+	}
+
+	@Test // GH-4348
+	void alterIndexShouldAllowHiding() {
+
+		collection.createIndex(new Document("a", 1), new IndexOptions().name("my-index"));
+
+		indexOps.alterIndex("my-index", org.springframework.data.mongodb.core.index.IndexOptions.hidden());
+		IndexInfo info = findAndReturnIndexInfo(indexOps.getIndexInfo(), "my-index");
+		assertThat(info.isHidden()).isTrue();
+	}
+
 	private IndexInfo findAndReturnIndexInfo(org.bson.Document keys) {
 		return findAndReturnIndexInfo(indexOps.getIndexInfo(), keys);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsUnitTests.java
index 3131ea3ea7..14550e4c17 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultIndexOperationsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,15 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Data;
-
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.index.HashedIndex;
@@ -45,24 +43,25 @@
  * Unit tests for {@link DefaultIndexOperations}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DefaultIndexOperationsUnitTests {
 
-	MongoTemplate template;
+	private MongoTemplate template;
 
-	@Mock MongoDbFactory factory;
+	@Mock MongoDatabaseFactory factory;
 	@Mock MongoDatabase db;
 	@Mock MongoCollection<Document> collection;
 
-	MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
+	private MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		when(factory.getDb()).thenReturn(db);
+		when(factory.getMongoDatabase()).thenReturn(db);
 		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslator);
 		when(db.getCollection(any(), any(Class.class))).thenReturn(collection);
 		when(collection.createIndex(any(), any(IndexOptions.class))).thenReturn("OK");
@@ -73,7 +72,7 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1183
-	public void indexOperationsMapFieldNameCorrectly() {
+	void indexOperationsMapFieldNameCorrectly() {
 
 		indexOpsFor(Jedi.class).ensureIndex(new Index("name", Direction.DESC));
 
@@ -81,7 +80,7 @@ public void indexOperationsMapFieldNameCorrectly() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void ensureIndexDoesNotSetCollectionIfNoDefaultDefined() {
+	void ensureIndexDoesNotSetCollectionIfNoDefaultDefined() {
 
 		indexOpsFor(Jedi.class).ensureIndex(new Index("firstname", Direction.DESC));
 
@@ -92,7 +91,7 @@ public void ensureIndexDoesNotSetCollectionIfNoDefaultDefined() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void ensureIndexUsesDefaultCollationIfNoneDefinedInOptions() {
+	void ensureIndexUsesDefaultCollationIfNoneDefinedInOptions() {
 
 		indexOpsFor(Sith.class).ensureIndex(new Index("firstname", Direction.DESC));
 
@@ -104,7 +103,7 @@ public void ensureIndexUsesDefaultCollationIfNoneDefinedInOptions() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void ensureIndexDoesNotUseDefaultCollationIfExplicitlySpecifiedInTheIndex() {
+	void ensureIndexDoesNotUseDefaultCollationIfExplicitlySpecifiedInTheIndex() {
 
 		indexOpsFor(Sith.class).ensureIndex(new Index("firstname", Direction.DESC).collation(Collation.of("en_US")));
 
@@ -116,20 +115,43 @@ public void ensureIndexDoesNotUseDefaultCollationIfExplicitlySpecifiedInTheIndex
 	}
 
 	@Test // DATAMONGO-1183
-	public void shouldCreateHashedIndexCorrectly() {
+	void shouldCreateHashedIndexCorrectly() {
 
 		indexOpsFor(Jedi.class).ensureIndex(HashedIndex.hashed("name"));
 
 		verify(collection).createIndex(eq(new Document("firstname", "hashed")), any());
 	}
 
+	@Test // GH-4698
+	void shouldConsiderGivenCollectionName() {
+
+		DefaultIndexOperations operations = new DefaultIndexOperations(template, "foo", Jedi.class);
+
+		operations.ensureIndex(HashedIndex.hashed("name"));
+		verify(db).getCollection(eq("foo"), any(Class.class));
+	}
+
 	private DefaultIndexOperations indexOpsFor(Class<?> type) {
 		return new DefaultIndexOperations(template, template.getCollectionName(type), type);
 	}
 
-	@Data
 	static class Jedi {
+
 		@Field("firstname") String name;
+
+		public Jedi() {}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String toString() {
+			return "DefaultIndexOperationsUnitTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 
 	@org.springframework.data.mongodb.core.mapping.Document(collation = "de_AT")
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsTests.java
new file mode 100644
index 0000000000..79bf563159
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsTests.java
@@ -0,0 +1,395 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.domain.Sort.Direction.DESC;
+
+import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.EnumSource;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.data.mongodb.core.DefaultReactiveBulkOperations.ReactiveBulkOperationContext;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
+
+import com.mongodb.MongoBulkWriteException;
+import com.mongodb.WriteConcern;
+import com.mongodb.bulk.BulkWriteResult;
+
+/**
+ * Tests for {@link DefaultReactiveBulkOperations}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoTemplateExtension.class)
+class DefaultReactiveBulkOperationsTests {
+
+	static final String COLLECTION_NAME = "reactive-bulk-ops";
+
+	@Template(initialEntitySet = BaseDoc.class) static ReactiveMongoTestTemplate template;
+
+	@BeforeEach
+	public void setUp() {
+		template.flush(COLLECTION_NAME).as(StepVerifier::create).verifyComplete();
+	}
+
+	@Test // GH-2821
+	void insertOrdered() {
+
+		List<BaseDoc> documents = Arrays.asList(newDoc("1"), newDoc("2"));
+
+		createBulkOps(BulkMode.ORDERED).insert(documents) //
+				.execute().as(StepVerifier::create) //
+				.consumeNextWith(result -> {
+					assertThat(result.getInsertedCount()).isEqualTo(2);
+				}).verifyComplete();
+	}
+
+	@Test // GH-2821
+	void insertOrderedFails() {
+
+		List<BaseDoc> documents = Arrays.asList(newDoc("1"), newDoc("1"), newDoc("2"));
+
+		createBulkOps(BulkMode.ORDERED).insert(documents) //
+				.execute().as(StepVerifier::create) //
+				.verifyErrorSatisfies(error -> {
+					assertThat(error).isInstanceOf(DuplicateKeyException.class);
+				});
+	}
+
+	@Test // GH-2821
+	public void insertUnOrdered() {
+
+		List<BaseDoc> documents = Arrays.asList(newDoc("1"), newDoc("2"));
+
+		createBulkOps(BulkMode.UNORDERED).insert(documents) //
+				.execute().as(StepVerifier::create) //
+				.consumeNextWith(result -> {
+					assertThat(result.getInsertedCount()).isEqualTo(2);
+				}).verifyComplete();
+	}
+
+	@Test // GH-2821
+	public void insertUnOrderedContinuesOnError() {
+
+		List<BaseDoc> documents = Arrays.asList(newDoc("1"), newDoc("1"), newDoc("2"));
+
+		createBulkOps(BulkMode.UNORDERED).insert(documents) //
+				.execute().as(StepVerifier::create) //
+				.verifyErrorSatisfies(error -> {
+
+					assertThat(error).isInstanceOf(DuplicateKeyException.class);
+					assertThat(error.getCause()).isInstanceOf(MongoBulkWriteException.class);
+
+					MongoBulkWriteException cause = (MongoBulkWriteException) error.getCause();
+					assertThat(cause.getWriteResult().getInsertedCount()).isEqualTo(2);
+					assertThat(cause.getWriteErrors()).isNotNull();
+					assertThat(cause.getWriteErrors().size()).isOne();
+				});
+	}
+
+	@Test // GH-2821
+	void upsertDoesUpdate() {
+
+		insertSomeDocuments();
+
+		createBulkOps(BulkMode.ORDERED).//
+				upsert(where("value", "value1"), set("value", "value2")).//
+				execute().as(StepVerifier::create) //
+				.consumeNextWith(result -> {
+					assertThat(result).isNotNull();
+					assertThat(result.getMatchedCount()).isEqualTo(2);
+					assertThat(result.getModifiedCount()).isEqualTo(2);
+					assertThat(result.getInsertedCount()).isZero();
+					assertThat(result.getUpserts()).isNotNull();
+					assertThat(result.getUpserts().size()).isZero();
+				}) //
+				.verifyComplete();
+	}
+
+	@Test // GH-2821
+	public void upsertDoesInsert() {
+
+		createBulkOps(BulkMode.ORDERED).//
+				upsert(where("_id", "1"), set("value", "v1")).//
+				execute().as(StepVerifier::create) //
+				.consumeNextWith(result -> {
+
+					assertThat(result).isNotNull();
+					assertThat(result.getMatchedCount()).isZero();
+					assertThat(result.getModifiedCount()).isZero();
+					assertThat(result.getUpserts()).isNotNull();
+					assertThat(result.getUpserts().size()).isOne();
+				}) //
+				.verifyComplete();
+	}
+
+	@ParameterizedTest // GH-2821
+	@MethodSource
+	public void testUpdates(BulkMode mode, boolean multi, int expectedUpdateCount) {
+
+		insertSomeDocuments();
+		ReactiveBulkOperations bulkOps = createBulkOps(mode);
+
+		if (multi) {
+			bulkOps.updateMulti(where("value", "value1"), set("value", "value3"));
+			bulkOps.updateMulti(where("value", "value2"), set("value", "value4"));
+		} else {
+			bulkOps.updateOne(where("value", "value1"), set("value", "value3"));
+			bulkOps.updateOne(where("value", "value2"), set("value", "value4"));
+		}
+
+		bulkOps.execute().map(BulkWriteResult::getModifiedCount) //
+				.as(StepVerifier::create) //
+				.expectNext(expectedUpdateCount) //
+				.verifyComplete();
+	}
+
+	private static Stream<Arguments> testUpdates() {
+		return Stream.of(Arguments.of(BulkMode.ORDERED, false, 2), Arguments.of(BulkMode.ORDERED, true, 4),
+				Arguments.of(BulkMode.UNORDERED, false, 2), Arguments.of(BulkMode.UNORDERED, false, 2));
+	}
+
+	@ParameterizedTest // GH-2821
+	@EnumSource(BulkMode.class)
+	void testRemove(BulkMode mode) {
+
+		insertSomeDocuments();
+
+		List<Query> removes = Arrays.asList(where("_id", "1"), where("value", "value2"));
+
+		createBulkOps(mode).remove(removes).execute().map(BulkWriteResult::getDeletedCount).as(StepVerifier::create)
+				.expectNext(3).verifyComplete();
+	}
+
+	@ParameterizedTest // GH-2821
+	@EnumSource(BulkMode.class)
+	void testReplaceOne(BulkMode mode) {
+
+		insertSomeDocuments();
+
+		Query query = where("_id", "1");
+		Document document = rawDoc("1", "value2");
+		createBulkOps(mode).replaceOne(query, document).execute().map(BulkWriteResult::getModifiedCount)
+				.as(StepVerifier::create).expectNext(1).verifyComplete();
+	}
+
+	@Test // GH-2821
+	public void replaceOneDoesReplace() {
+
+		insertSomeDocuments();
+
+		createBulkOps(BulkMode.ORDERED).//
+				replaceOne(where("_id", "1"), rawDoc("1", "value2")).//
+				execute().as(StepVerifier::create).consumeNextWith(result -> {
+
+					assertThat(result).isNotNull();
+					assertThat(result.getMatchedCount()).isOne();
+					assertThat(result.getModifiedCount()).isOne();
+					assertThat(result.getInsertedCount()).isZero();
+				}).verifyComplete();
+	}
+
+	@Test // GH-2821
+	public void replaceOneWithUpsert() {
+
+		createBulkOps(BulkMode.ORDERED).//
+				replaceOne(where("_id", "1"), rawDoc("1", "value2"), FindAndReplaceOptions.options().upsert()).//
+				execute().as(StepVerifier::create).consumeNextWith(result -> {
+
+					assertThat(result).isNotNull();
+					assertThat(result.getMatchedCount()).isZero();
+					assertThat(result.getInsertedCount()).isZero();
+					assertThat(result.getModifiedCount()).isZero();
+					assertThat(result.getUpserts().size()).isOne();
+				});
+	}
+
+	@Test // GH-2821
+	public void mixedBulkOrdered() {
+
+		createBulkOps(BulkMode.ORDERED, BaseDoc.class).insert(newDoc("1", "v1")).//
+				updateOne(where("_id", "1"), set("value", "v2")).//
+				remove(where("value", "v2")).//
+				execute().as(StepVerifier::create).consumeNextWith(result -> {
+
+					assertThat(result).isNotNull();
+					assertThat(result.getInsertedCount()).isOne();
+					assertThat(result.getModifiedCount()).isOne();
+					assertThat(result.getDeletedCount()).isOne();
+				}).verifyComplete();
+	}
+
+	@Test // GH-2821
+	public void mixedBulkOrderedWithList() {
+
+		List<BaseDoc> inserts = Arrays.asList(newDoc("1", "v1"), newDoc("2", "v2"), newDoc("3", "v2"));
+		List<Query> removes = Arrays.asList(where("_id", "1"));
+
+		createBulkOps(BulkMode.ORDERED, BaseDoc.class).insert(inserts).updateMulti(where("value", "v2"), set("value", "v3"))
+				.remove(removes).execute().as(StepVerifier::create).consumeNextWith(result -> {
+
+					assertThat(result).isNotNull();
+					assertThat(result.getInsertedCount()).isEqualTo(3);
+					assertThat(result.getModifiedCount()).isEqualTo(2);
+					assertThat(result.getDeletedCount()).isOne();
+				}).verifyComplete();
+	}
+
+	@Test // GH-2821
+	public void insertShouldConsiderInheritance() {
+
+		SpecialDoc specialDoc = new SpecialDoc();
+		specialDoc.id = "id-special";
+		specialDoc.value = "normal-value";
+		specialDoc.specialValue = "special-value";
+
+		createBulkOps(BulkMode.ORDERED, SpecialDoc.class).insert(Arrays.asList(specialDoc)).execute().then()
+				.as(StepVerifier::create).verifyComplete();
+
+		template.findOne(where("_id", specialDoc.id), BaseDoc.class, COLLECTION_NAME).as(StepVerifier::create)
+				.consumeNextWith(doc -> {
+
+					assertThat(doc).isNotNull();
+					assertThat(doc).isInstanceOf(SpecialDoc.class);
+				}).verifyComplete();
+	}
+
+	@Test // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	public void updateShouldConsiderSorting() {
+
+		insertSomeDocuments();
+
+		createBulkOps(BulkMode.ORDERED, BaseDocWithRenamedField.class) //
+			.updateOne(new Query().with(Sort.by(DESC, "renamedField")), new Update().set("bsky", "altnps")).execute() //
+			.as(StepVerifier::create) //
+			.consumeNextWith(result -> assertThat(result.getModifiedCount()).isOne()) //
+			.verifyComplete();
+
+		template.execute(COLLECTION_NAME, col -> col.find(new Document("_id", "4")).first()).as(StepVerifier::create) //
+			.consumeNextWith(raw -> assertThat(raw).containsEntry("bsky", "altnps")) //
+			.verifyComplete();
+	}
+
+	@Test // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	public void replaceShouldConsiderSorting() {
+
+		insertSomeDocuments();
+
+		BaseDocWithRenamedField target = new BaseDocWithRenamedField();
+		target.value = "replacement";
+
+		createBulkOps(BulkMode.ORDERED, BaseDocWithRenamedField.class) //
+			.replaceOne(new Query().with(Sort.by(DESC, "renamedField")), target).execute() //
+			.as(StepVerifier::create) //
+			.consumeNextWith(result -> assertThat(result.getModifiedCount()).isOne()) //
+			.verifyComplete();
+
+		template.execute(COLLECTION_NAME, col -> col.find(new Document("_id", "4")).first()).as(StepVerifier::create) //
+			.consumeNextWith(raw -> assertThat(raw).containsEntry("value", target.value)) //
+			.verifyComplete();
+	}
+
+	private void insertSomeDocuments() {
+
+		template.execute(COLLECTION_NAME, collection -> {
+			return Flux.from(collection.insertMany(
+					List.of(rawDoc("1", "value1").append("rn_f", "001"), rawDoc("2", "value1").append("rn_f", "002"), rawDoc("3", "value2").append("rn_f", "003"), rawDoc("4", "value2").append("rn_f", "004"))));
+		}).then().as(StepVerifier::create).verifyComplete();
+
+	}
+
+	private DefaultReactiveBulkOperations createBulkOps(BulkMode mode) {
+		return createBulkOps(mode, null);
+	}
+
+	private DefaultReactiveBulkOperations createBulkOps(BulkMode mode, Class<?> entityType) {
+
+		Optional<? extends MongoPersistentEntity<?>> entity = entityType != null
+				? Optional.of(template.getConverter().getMappingContext().getPersistentEntity(entityType))
+				: Optional.empty();
+
+		ReactiveBulkOperationContext bulkOperationContext = new ReactiveBulkOperationContext(mode, entity,
+				new QueryMapper(template.getConverter()), new UpdateMapper(template.getConverter()), null, null);
+
+		DefaultReactiveBulkOperations bulkOps = new DefaultReactiveBulkOperations(template, COLLECTION_NAME,
+				bulkOperationContext);
+		bulkOps.setDefaultWriteConcern(WriteConcern.ACKNOWLEDGED);
+
+		return bulkOps;
+	}
+
+	private static BaseDoc newDoc(String id) {
+
+		BaseDoc doc = new BaseDoc();
+		doc.id = id;
+
+		return doc;
+	}
+
+	private static BaseDoc newDoc(String id, String value) {
+
+		BaseDoc doc = newDoc(id);
+		doc.value = value;
+
+		return doc;
+	}
+
+	private static Query where(String field, String value) {
+		return new Query().addCriteria(Criteria.where(field).is(value));
+	}
+
+	private static Update set(String field, String value) {
+		return new Update().set(field, value);
+	}
+
+	private static Document rawDoc(String id, String value) {
+		return new Document("_id", id).append("value", value);
+	}
+
+	static class BaseDocWithRenamedField extends BaseDoc {
+
+		@Field("rn_f")
+		String renamedField;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsUnitTests.java
new file mode 100644
index 0000000000..3b4cb322bc
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveBulkOperationsUnitTests.java
@@ -0,0 +1,347 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.List;
+import java.util.Optional;
+
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.data.mongodb.core.DefaultBulkOperationsUnitTests.NullExceptionTranslator;
+import org.springframework.data.mongodb.core.DefaultReactiveBulkOperations.ReactiveBulkOperationContext;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
+import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAfterSaveCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeSaveCallback;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Update;
+
+import com.mongodb.MongoWriteException;
+import com.mongodb.WriteError;
+import com.mongodb.bulk.BulkWriteResult;
+import com.mongodb.client.model.BulkWriteOptions;
+import com.mongodb.client.model.DeleteManyModel;
+import com.mongodb.client.model.InsertOneModel;
+import com.mongodb.client.model.ReplaceOneModel;
+import com.mongodb.client.model.UpdateOneModel;
+import com.mongodb.client.model.WriteModel;
+import com.mongodb.reactivestreams.client.MongoCollection;
+import com.mongodb.reactivestreams.client.MongoDatabase;
+
+/**
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class DefaultReactiveBulkOperationsUnitTests {
+
+	ReactiveMongoTemplate template;
+	@Mock ReactiveMongoDatabaseFactory factory;
+
+	@Mock MongoDatabase database;
+	@Mock(answer = Answers.RETURNS_DEEP_STUBS) MongoCollection<Document> collection;
+	@Captor ArgumentCaptor<List<WriteModel<Document>>> captor;
+
+	private MongoConverter converter;
+	private MongoMappingContext mappingContext;
+
+	private DefaultReactiveBulkOperations ops;
+
+	@BeforeEach
+	void setUp() {
+
+		when(factory.getMongoDatabase()).thenReturn(Mono.just(database));
+		when(factory.getExceptionTranslator()).thenReturn(new NullExceptionTranslator());
+		when(database.getCollection(anyString(), eq(Document.class))).thenReturn(collection);
+		when(collection.bulkWrite(anyList(), any())).thenReturn(Mono.just(mock(BulkWriteResult.class)));
+
+		mappingContext = new MongoMappingContext();
+		mappingContext.afterPropertiesSet();
+
+		converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
+		template = new ReactiveMongoTemplate(factory, converter);
+
+		ops = new DefaultReactiveBulkOperations(template, "collection-1",
+				new ReactiveBulkOperationContext(BulkMode.ORDERED,
+						Optional.of(mappingContext.getPersistentEntity(SomeDomainType.class)), new QueryMapper(converter),
+						new UpdateMapper(converter), null, null));
+	}
+
+	@Test // GH-2821
+	void updateOneShouldUseCollationWhenPresent() {
+
+		ops.updateOne(new BasicQuery("{}").collation(Collation.of("de")), new Update().set("lastName", "targaryen"))
+				.execute().subscribe();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+		assertThat(captor.getValue().get(0)).isInstanceOf(UpdateOneModel.class);
+		assertThat(((UpdateOneModel<Document>) captor.getValue().get(0)).getOptions().getCollation())
+				.isEqualTo(com.mongodb.client.model.Collation.builder().locale("de").build());
+	}
+
+	@Test // GH-2821
+	void replaceOneShouldUseCollationWhenPresent() {
+
+		ops.replaceOne(new BasicQuery("{}").collation(Collation.of("de")), new SomeDomainType()).execute().subscribe();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		assertThat(captor.getValue().get(0)).isInstanceOf(ReplaceOneModel.class);
+		assertThat(((ReplaceOneModel<Document>) captor.getValue().get(0)).getReplaceOptions().getCollation())
+				.isEqualTo(com.mongodb.client.model.Collation.builder().locale("de").build());
+	}
+
+	@Test // GH-2821
+	void removeShouldUseCollationWhenPresent() {
+
+		ops.remove(new BasicQuery("{}").collation(Collation.of("de"))).execute().subscribe();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		assertThat(captor.getValue().get(0)).isInstanceOf(DeleteManyModel.class);
+		assertThat(((DeleteManyModel<Document>) captor.getValue().get(0)).getOptions().getCollation())
+				.isEqualTo(com.mongodb.client.model.Collation.builder().locale("de").build());
+	}
+
+	@Test // GH-2821
+	void bulkUpdateShouldMapQueryAndUpdateCorrectly() {
+
+		ops.updateOne(query(where("firstName").is("danerys")), Update.update("firstName", "queen danerys")).execute()
+				.subscribe();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		UpdateOneModel<Document> updateModel = (UpdateOneModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getFilter()).isEqualTo(new Document("first_name", "danerys"));
+		assertThat(updateModel.getUpdate()).isEqualTo(new Document("$set", new Document("first_name", "queen danerys")));
+	}
+
+	@Test // GH-2821
+	void bulkRemoveShouldMapQueryCorrectly() {
+
+		ops.remove(query(where("firstName").is("danerys"))).execute().subscribe();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		DeleteManyModel<Document> updateModel = (DeleteManyModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getFilter()).isEqualTo(new Document("first_name", "danerys"));
+	}
+
+	@Test // GH-2821
+	void bulkReplaceOneShouldMapQueryCorrectly() {
+
+		SomeDomainType replacement = new SomeDomainType();
+		replacement.firstName = "Minsu";
+		replacement.lastName = "Kim";
+
+		ops.replaceOne(query(where("firstName").is("danerys")), replacement).execute().subscribe();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		ReplaceOneModel<Document> updateModel = (ReplaceOneModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getFilter()).isEqualTo(new Document("first_name", "danerys"));
+		assertThat(updateModel.getReplacement().getString("first_name")).isEqualTo("Minsu");
+		assertThat(updateModel.getReplacement().getString("lastName")).isEqualTo("Kim");
+	}
+
+	@Test // GH-2821
+	void bulkInsertInvokesEntityCallbacks() {
+
+		BeforeConvertPersonCallback beforeConvertCallback = spy(new BeforeConvertPersonCallback());
+		BeforeSavePersonCallback beforeSaveCallback = spy(new BeforeSavePersonCallback());
+		AfterSavePersonCallback afterSaveCallback = spy(new AfterSavePersonCallback());
+
+		ops = new DefaultReactiveBulkOperations(template, "collection-1",
+				new ReactiveBulkOperationContext(BulkMode.ORDERED,
+						Optional.of(mappingContext.getPersistentEntity(Person.class)), new QueryMapper(converter),
+						new UpdateMapper(converter), null,
+						ReactiveEntityCallbacks.create(beforeConvertCallback, beforeSaveCallback, afterSaveCallback)));
+
+		Person entity = new Person("init");
+		ops.insert(entity);
+
+		ArgumentCaptor<Person> personArgumentCaptor = ArgumentCaptor.forClass(Person.class);
+		verifyNoInteractions(beforeConvertCallback);
+		verifyNoInteractions(beforeSaveCallback);
+
+		ops.execute().then().as(StepVerifier::create).verifyComplete();
+
+		verify(beforeConvertCallback).onBeforeConvert(personArgumentCaptor.capture(), eq("collection-1"));
+		verify(beforeSaveCallback).onBeforeSave(personArgumentCaptor.capture(), any(), eq("collection-1"));
+		verify(afterSaveCallback).onAfterSave(personArgumentCaptor.capture(), any(), eq("collection-1"));
+		assertThat(personArgumentCaptor.getAllValues()).extracting("firstName").containsExactly("init", "before-convert",
+				"before-save");
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		InsertOneModel<Document> updateModel = (InsertOneModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getDocument()).containsEntry("firstName", "after-save");
+	}
+
+	@Test // GH-2821
+	void bulkReplaceOneEmitsEventsCorrectly() {
+
+		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
+
+		ops = new DefaultReactiveBulkOperations(template, "collection-1",
+				new ReactiveBulkOperationContext(BulkMode.ORDERED,
+						Optional.of(mappingContext.getPersistentEntity(Person.class)), new QueryMapper(converter),
+						new UpdateMapper(converter), eventPublisher, null));
+
+		ops.replaceOne(query(where("firstName").is("danerys")), new SomeDomainType());
+
+		verify(eventPublisher, never()).publishEvent(any(BeforeConvertEvent.class));
+		verify(eventPublisher, never()).publishEvent(any(BeforeSaveEvent.class));
+		verify(eventPublisher, never()).publishEvent(any(AfterSaveEvent.class));
+
+		ops.execute().then().as(StepVerifier::create).verifyComplete();
+
+		verify(eventPublisher).publishEvent(any(BeforeConvertEvent.class));
+		verify(eventPublisher).publishEvent(any(BeforeSaveEvent.class));
+		verify(eventPublisher).publishEvent(any(AfterSaveEvent.class));
+	}
+
+	@Test // GH-2821
+	void bulkInsertEmitsEventsCorrectly() {
+
+		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
+
+		ops = new DefaultReactiveBulkOperations(template, "collection-1",
+				new ReactiveBulkOperationContext(BulkMode.ORDERED,
+						Optional.of(mappingContext.getPersistentEntity(Person.class)), new QueryMapper(converter),
+						new UpdateMapper(converter), eventPublisher, null));
+
+		ops.insert(new SomeDomainType());
+
+		verify(eventPublisher, never()).publishEvent(any(BeforeConvertEvent.class));
+		verify(eventPublisher, never()).publishEvent(any(BeforeSaveEvent.class));
+		verify(eventPublisher, never()).publishEvent(any(AfterSaveEvent.class));
+
+		ops.execute().then().as(StepVerifier::create).verifyComplete();
+
+		verify(eventPublisher).publishEvent(any(BeforeConvertEvent.class));
+		verify(eventPublisher).publishEvent(any(BeforeSaveEvent.class));
+		verify(eventPublisher).publishEvent(any(AfterSaveEvent.class));
+	}
+
+	@Test // GH-2821
+	void noAfterSaveEventOnFailure() {
+
+		ApplicationEventPublisher eventPublisher = mock(ApplicationEventPublisher.class);
+
+		when(collection.bulkWrite(anyList(), any(BulkWriteOptions.class))).thenThrow(new MongoWriteException(
+				new WriteError(89, "NetworkTimeout", new BsonDocument("hi", new BsonString("there"))), null));
+
+		ops = new DefaultReactiveBulkOperations(template, "collection-1",
+				new ReactiveBulkOperationContext(BulkMode.ORDERED,
+						Optional.of(mappingContext.getPersistentEntity(Person.class)), new QueryMapper(converter),
+						new UpdateMapper(converter), eventPublisher, null));
+
+		ops.insert(new SomeDomainType());
+
+		ops.execute().as(StepVerifier::create).expectError();
+
+		verify(eventPublisher, never()).publishEvent(any(AfterSaveEvent.class));
+	}
+
+	@Test // GH-2821
+	void appliesArrayFilterWhenPresent() {
+
+		ops.updateOne(new BasicQuery("{}"), new Update().filterArray(Criteria.where("element").gte(100))).execute()
+				.subscribe();
+
+		verify(collection).bulkWrite(captor.capture(), any());
+
+		UpdateOneModel<Document> updateModel = (UpdateOneModel<Document>) captor.getValue().get(0);
+		assertThat(updateModel.getOptions().getArrayFilters().get(0))
+				.isEqualTo(new org.bson.Document("element", new Document("$gte", 100)));
+	}
+
+	static class BeforeConvertPersonCallback implements ReactiveBeforeConvertCallback<Person> {
+
+		@Override
+		public Mono<Person> onBeforeConvert(Person entity, String collection) {
+			return Mono.just(new Person("before-convert"));
+		}
+	}
+
+	static class BeforeSavePersonCallback implements ReactiveBeforeSaveCallback<Person> {
+
+		@Override
+		public Mono<Person> onBeforeSave(Person entity, Document document, String collection) {
+
+			document.put("firstName", "before-save");
+			return Mono.just(new Person("before-save"));
+		}
+	}
+
+	static class AfterSavePersonCallback implements ReactiveAfterSaveCallback<Person> {
+
+		@Override
+		public Mono<Person> onAfterSave(Person entity, Document document, String collection) {
+
+			document.put("firstName", "after-save");
+			return Mono.just(new Person("after-save"));
+		}
+	}
+
+	class SomeDomainType {
+
+		@Id String id;
+		DefaultBulkOperationsUnitTests.Gender gender;
+		@Field("first_name") String firstName;
+		@Field String lastName;
+	}
+
+	enum Gender {
+		M, F
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsTests.java
index a8b79b24ca..5ecce43102 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.junit.Assume.*;
 import static org.springframework.data.mongodb.core.index.PartialIndexFilter.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
@@ -25,13 +24,10 @@
 import java.util.function.Predicate;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Configuration;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
@@ -39,72 +35,39 @@
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Collation.CaseFirst;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.util.Version;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
-import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
+import com.mongodb.client.model.IndexOptions;
 import com.mongodb.reactivestreams.client.MongoCollection;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Mathieu Ouellet
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@ExtendWith(MongoTemplateExtension.class)
 public class DefaultReactiveIndexOperationsTests {
 
-	@Configuration
-	static class Config extends AbstractReactiveMongoConfiguration {
+	@Template(initialEntitySet = DefaultIndexOperationsIntegrationTestsSample.class) //
+	static ReactiveMongoTestTemplate template;
 
-		@Override
-		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
-		}
+	String collectionName = template.getCollectionName(DefaultIndexOperationsIntegrationTestsSample.class);
 
-		@Override
-		protected String getDatabaseName() {
-			return "index-ops-tests";
-		}
-	}
-
-	private static final Version THREE_DOT_TWO = new Version(3, 2);
-	private static final Version THREE_DOT_FOUR = new Version(3, 4);
-	private static Version mongoVersion;
-
-	@Autowired ReactiveMongoTemplate template;
+	DefaultReactiveIndexOperations indexOps = new DefaultReactiveIndexOperations(template, collectionName,
+			new QueryMapper(template.getConverter()));
 
-	MongoCollection<Document> collection;
-	DefaultReactiveIndexOperations indexOps;
-
-	@Before
+	@BeforeEach
 	public void setUp() {
-
-		queryMongoVersionIfNecessary();
-		String collectionName = this.template.getCollectionName(DefaultIndexOperationsIntegrationTestsSample.class);
-
-		this.collection = this.template.getMongoDatabase().getCollection(collectionName, Document.class);
-		this.indexOps = new DefaultReactiveIndexOperations(template, collectionName,
-				new QueryMapper(template.getConverter()));
-
-		StepVerifier.create(this.collection.dropIndexes()).expectNextCount(1).verifyComplete();
-	}
-
-	private void queryMongoVersionIfNecessary() {
-
-		if (mongoVersion == null) {
-			Document result = template.executeCommand("{ buildInfo: 1 }").block();
-			mongoVersion = Version.parse(result.get("version").toString());
-		}
+		template.getCollection(collectionName).flatMapMany(MongoCollection::dropIndexes) //
+				.as(StepVerifier::create) //
+				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1518
 	public void shouldCreateIndexWithCollationCorrectly() {
 
-		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_FOUR));
-
 		IndexDefinition id = new Index().named("with-collation").on("xyz", Direction.ASC)
 				.collation(Collation.of("de_AT").caseFirst(CaseFirst.off()));
 
@@ -137,8 +100,6 @@ public void shouldCreateIndexWithCollationCorrectly() {
 	@Test // DATAMONGO-1682, DATAMONGO-2198
 	public void shouldApplyPartialFilterCorrectly() {
 
-		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO));
-
 		IndexDefinition id = new Index().named("partial-with-criteria").on("k3y", Direction.ASC)
 				.partial(of(where("q-t-y").gte(10)));
 
@@ -146,7 +107,8 @@ public void shouldApplyPartialFilterCorrectly() {
 
 		indexOps.getIndexInfo().filter(this.indexByName("partial-with-criteria")).as(StepVerifier::create) //
 				.consumeNextWith(indexInfo -> {
-					assertThat(Document.parse(indexInfo.getPartialFilterExpression())).isEqualTo(Document.parse("{ \"q-t-y\" : { \"$gte\" : 10 } }"));
+					assertThat(Document.parse(indexInfo.getPartialFilterExpression()))
+							.isEqualTo(Document.parse("{ \"q-t-y\" : { \"$gte\" : 10 } }"));
 				}) //
 				.verifyComplete();
 	}
@@ -154,8 +116,6 @@ public void shouldApplyPartialFilterCorrectly() {
 	@Test // DATAMONGO-1682, DATAMONGO-2198
 	public void shouldApplyPartialFilterWithMappedPropertyCorrectly() {
 
-		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO));
-
 		IndexDefinition id = new Index().named("partial-with-mapped-criteria").on("k3y", Direction.ASC)
 				.partial(of(where("quantity").gte(10)));
 
@@ -163,15 +123,14 @@ public void shouldApplyPartialFilterWithMappedPropertyCorrectly() {
 
 		indexOps.getIndexInfo().filter(this.indexByName("partial-with-mapped-criteria")).as(StepVerifier::create) //
 				.consumeNextWith(indexInfo -> {
-					assertThat(Document.parse(indexInfo.getPartialFilterExpression())).isEqualTo(Document.parse("{ \"qty\" : { \"$gte\" : 10 } }"));
+					assertThat(Document.parse(indexInfo.getPartialFilterExpression()))
+							.isEqualTo(Document.parse("{ \"qty\" : { \"$gte\" : 10 } }"));
 				}).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1682, DATAMONGO-2198
 	public void shouldApplyPartialDBOFilterCorrectly() {
 
-		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO));
-
 		IndexDefinition id = new Index().named("partial-with-dbo").on("k3y", Direction.ASC)
 				.partial(of(new org.bson.Document("qty", new org.bson.Document("$gte", 10))));
 
@@ -179,7 +138,8 @@ public void shouldApplyPartialDBOFilterCorrectly() {
 
 		indexOps.getIndexInfo().filter(this.indexByName("partial-with-dbo")).as(StepVerifier::create) //
 				.consumeNextWith(indexInfo -> {
-					assertThat(Document.parse(indexInfo.getPartialFilterExpression())).isEqualTo(Document.parse("{ \"qty\" : { \"$gte\" : 10 } }"));
+					assertThat(Document.parse(indexInfo.getPartialFilterExpression()))
+							.isEqualTo(Document.parse("{ \"qty\" : { \"$gte\" : 10 } }"));
 				}) //
 				.verifyComplete();
 
@@ -188,8 +148,6 @@ public void shouldApplyPartialDBOFilterCorrectly() {
 	@Test // DATAMONGO-1682, DATAMONGO-2198
 	public void shouldFavorExplicitMappingHintViaClass() {
 
-		assumeTrue(mongoVersion.isGreaterThanOrEqualTo(THREE_DOT_TWO));
-
 		IndexDefinition id = new Index().named("partial-with-inheritance").on("k3y", Direction.ASC)
 				.partial(of(where("age").gte(10)));
 
@@ -201,7 +159,52 @@ public void shouldFavorExplicitMappingHintViaClass() {
 
 		indexOps.getIndexInfo().filter(this.indexByName("partial-with-inheritance")).as(StepVerifier::create) //
 				.consumeNextWith(indexInfo -> {
-					assertThat(Document.parse(indexInfo.getPartialFilterExpression())).isEqualTo(Document.parse("{ \"a_g_e\" : { \"$gte\" : 10 } }"));
+					assertThat(Document.parse(indexInfo.getPartialFilterExpression()))
+							.isEqualTo(Document.parse("{ \"a_g_e\" : { \"$gte\" : 10 } }"));
+				}) //
+				.verifyComplete();
+	}
+
+	@Test // GH-4348
+	void indexShouldNotBeHiddenByDefault() {
+
+		IndexDefinition index = new Index().named("my-index").on("a", Direction.ASC);
+
+		indexOps.ensureIndex(index).then().as(StepVerifier::create).verifyComplete();
+
+		indexOps.getIndexInfo().filter(this.indexByName("my-index")).as(StepVerifier::create) //
+				.consumeNextWith(indexInfo -> {
+					assertThat(indexInfo.isHidden()).isFalse();
+				}) //
+				.verifyComplete();
+	}
+
+	@Test // GH-4348
+	void shouldCreateHiddenIndex() {
+
+		IndexDefinition index = new Index().named("my-hidden-index").on("a", Direction.ASC).hidden();
+
+		indexOps.ensureIndex(index).then().as(StepVerifier::create).verifyComplete();
+
+		indexOps.getIndexInfo().filter(this.indexByName("my-hidden-index")).as(StepVerifier::create) //
+				.consumeNextWith(indexInfo -> {
+					assertThat(indexInfo.isHidden()).isTrue();
+				}) //
+				.verifyComplete();
+	}
+
+	@Test // GH-4348
+	void alterIndexShouldAllowHiding() {
+
+		template.execute(collectionName, collection -> {
+			return collection.createIndex(new Document("a", 1), new IndexOptions().name("my-index"));
+		}).then().as(StepVerifier::create).verifyComplete();
+
+		indexOps.alterIndex("my-index", org.springframework.data.mongodb.core.index.IndexOptions.hidden())
+				.as(StepVerifier::create).verifyComplete();
+		indexOps.getIndexInfo().filter(this.indexByName("my-index")).as(StepVerifier::create) //
+				.consumeNextWith(indexInfo -> {
+					assertThat(indexInfo.isHidden()).isTrue();
 				}) //
 				.verifyComplete();
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsUnitTests.java
index 5477de09eb..e863a7df8b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultReactiveIndexOperationsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,15 +18,15 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Data;
+import reactor.core.publisher.Mono;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivestreams.Publisher;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
@@ -44,25 +44,26 @@
 
 /**
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class DefaultReactiveIndexOperationsUnitTests {
 
-	ReactiveMongoTemplate template;
+	private ReactiveMongoTemplate template;
 
 	@Mock ReactiveMongoDatabaseFactory factory;
 	@Mock MongoDatabase db;
 	@Mock MongoCollection<Document> collection;
 	@Mock Publisher publisher;
 
-	MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
+	private MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		when(factory.getMongoDatabase()).thenReturn(db);
+		when(factory.getMongoDatabase()).thenReturn(Mono.just(db));
 		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslator);
 		when(db.getCollection(any(), any(Class.class))).thenReturn(collection);
 		when(collection.createIndex(any(), any(IndexOptions.class))).thenReturn(publisher);
@@ -73,7 +74,7 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void ensureIndexDoesNotSetCollectionIfNoDefaultDefined() {
+	void ensureIndexDoesNotSetCollectionIfNoDefaultDefined() {
 
 		indexOpsFor(Jedi.class).ensureIndex(new Index("firstname", Direction.DESC)).subscribe();
 
@@ -84,7 +85,7 @@ public void ensureIndexDoesNotSetCollectionIfNoDefaultDefined() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void ensureIndexUsesDefaultCollationIfNoneDefinedInOptions() {
+	void ensureIndexUsesDefaultCollationIfNoneDefinedInOptions() {
 
 		indexOpsFor(Sith.class).ensureIndex(new Index("firstname", Direction.DESC)).subscribe();
 
@@ -96,7 +97,7 @@ public void ensureIndexUsesDefaultCollationIfNoneDefinedInOptions() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void ensureIndexDoesNotUseDefaultCollationIfExplicitlySpecifiedInTheIndex() {
+	void ensureIndexDoesNotUseDefaultCollationIfExplicitlySpecifiedInTheIndex() {
 
 		indexOpsFor(Sith.class).ensureIndex(new Index("firstname", Direction.DESC).collation(Collation.of("en_US")))
 				.subscribe();
@@ -113,9 +114,23 @@ private DefaultReactiveIndexOperations indexOpsFor(Class<?> type) {
 				new QueryMapper(template.getConverter()), type);
 	}
 
-	@Data
 	static class Jedi {
+
 		@Field("firstname") String name;
+
+		public Jedi() {}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String toString() {
+			return "DefaultReactiveIndexOperationsUnitTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 
 	@org.springframework.data.mongodb.core.mapping.Document(collation = "de_AT")
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsTests.java
index ea1f178efa..6331e1dbc7 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,10 +20,9 @@
 import static org.springframework.data.mongodb.core.query.Query.*;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -32,11 +31,11 @@
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
 import org.springframework.data.mongodb.core.script.NamedMongoScript;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 
@@ -47,11 +46,12 @@
  * @author Oliver Gierke
  * @since 1.7
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
+@EnableIfMongoServerVersion(isLessThan = "4.1.0")
 @ContextConfiguration
 public class DefaultScriptOperationsTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_MOST_4_0 = MongoVersionRule.atMost(Version.parse("4.0.999"));
+	static @Client MongoClient mongoClient;
 
 	@Configuration
 	static class Config {
@@ -60,7 +60,7 @@ static class Config {
 
 		@Bean
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Bean
@@ -78,7 +78,7 @@ public MongoTemplate template() throws Exception {
 	@Autowired MongoTemplate template;
 	DefaultScriptOperations scriptOps;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		template.getCollection(JAVASCRIPT_COLLECTION_NAME).deleteMany(new Document());
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsUnitTests.java
index 410adfe0ed..7418f17c39 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,12 +18,12 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.mongodb.core.script.ExecutableMongoScript;
 import org.springframework.data.mongodb.core.script.NamedMongoScript;
@@ -35,29 +35,29 @@
  * @author Oliver Gierke
  * @since 1.7
  */
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultScriptOperationsUnitTests {
+@ExtendWith(MockitoExtension.class)
+class DefaultScriptOperationsUnitTests {
 
-	DefaultScriptOperations scriptOps;
+	private DefaultScriptOperations scriptOps;
 	@Mock MongoOperations mongoOperations;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		this.scriptOps = new DefaultScriptOperations(mongoOperations);
 	}
 
 	@Test // DATAMONGO-479
-	public void rejectsNullExecutableMongoScript() {
+	void rejectsNullExecutableMongoScript() {
 		assertThatIllegalArgumentException().isThrownBy(() -> scriptOps.register((ExecutableMongoScript) null));
 	}
 
 	@Test // DATAMONGO-479
-	public void rejectsNullNamedMongoScript() {
+	void rejectsNullNamedMongoScript() {
 		assertThatIllegalArgumentException().isThrownBy(() -> scriptOps.register((NamedMongoScript) null));
 	}
 
 	@Test // DATAMONGO-479
-	public void saveShouldUseCorrectCollectionName() {
+	void saveShouldUseCorrectCollectionName() {
 
 		scriptOps.register(new NamedMongoScript("foo", "function..."));
 
@@ -65,7 +65,7 @@ public void saveShouldUseCorrectCollectionName() {
 	}
 
 	@Test // DATAMONGO-479
-	public void saveShouldGenerateScriptNameForExecutableMongoScripts() {
+	void saveShouldGenerateScriptNameForExecutableMongoScripts() {
 
 		scriptOps.register(new ExecutableMongoScript("function..."));
 
@@ -76,27 +76,27 @@ public void saveShouldGenerateScriptNameForExecutableMongoScripts() {
 	}
 
 	@Test // DATAMONGO-479
-	public void executeShouldThrowExceptionWhenScriptIsNull() {
+	void executeShouldThrowExceptionWhenScriptIsNull() {
 		assertThatIllegalArgumentException().isThrownBy(() -> scriptOps.execute(null));
 	}
 
 	@Test // DATAMONGO-479
-	public void existsShouldThrowExceptionWhenScriptNameIsNull() {
+	void existsShouldThrowExceptionWhenScriptNameIsNull() {
 		assertThatIllegalArgumentException().isThrownBy(() -> scriptOps.exists(null));
 	}
 
 	@Test // DATAMONGO-479
-	public void existsShouldThrowExceptionWhenScriptNameIsEmpty() {
+	void existsShouldThrowExceptionWhenScriptNameIsEmpty() {
 		assertThatIllegalArgumentException().isThrownBy(() -> scriptOps.exists(""));
 	}
 
 	@Test // DATAMONGO-479
-	public void callShouldThrowExceptionWhenScriptNameIsNull() {
+	void callShouldThrowExceptionWhenScriptNameIsNull() {
 		assertThatIllegalArgumentException().isThrownBy(() -> scriptOps.call(null));
 	}
 
 	@Test // DATAMONGO-479
-	public void callShouldThrowExceptionWhenScriptNameIsEmpty() {
+	void callShouldThrowExceptionWhenScriptNameIsEmpty() {
 		assertThatIllegalArgumentException().isThrownBy(() -> scriptOps.call(""));
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DocumentTestUtils.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DocumentTestUtils.java
index 1df6a2013d..ed468f8ed2 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DocumentTestUtils.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DocumentTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@
  *
  * @author Oliver Gierke
  * @author Mark Paluch
+ * @author Jongwoo Han
  */
 public abstract class DocumentTestUtils {
 
@@ -38,7 +39,7 @@ private DocumentTestUtils() {}
 	 * Expects the field with the given key to be not {@literal null} and a {@link Document} in turn and returns it.
 	 *
 	 * @param source the {@link Document} to lookup the nested one
-	 * @param key the key of the field to lokup the nested {@link Document}
+	 * @param key the key of the field to lookup the nested {@link Document}
 	 * @return
 	 */
 	public static Document getAsDocument(Document source, String key) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/EntityOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/EntityOperationUnitTests.java
deleted file mode 100644
index bb45f01640..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/EntityOperationUnitTests.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import static org.assertj.core.api.Assertions.*;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.EntityOperations.AdaptibleEntity;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-
-/**
- * @author Christoph Strobl
- */
-public class EntityOperationUnitTests {
-
-	EntityOperations ops;
-	MongoMappingContext mappingContext = new MongoMappingContext();
-	ConversionService conversionService = new DefaultConversionService();
-
-	@Before
-	public void setUp() {
-		ops = new EntityOperations(mappingContext);
-	}
-
-	@Test // DATAMONGO-2293
-	public void populateIdShouldReturnTargetBeanWhenIdIsNull() {
-		assertThat(initAdaptibleEntity(new DomainTypeWithIdProperty()).populateIdIfNecessary(null)).isNotNull();
-	}
-
-	<T> AdaptibleEntity<T> initAdaptibleEntity(T source) {
-		return ops.forEntity(source, conversionService);
-	}
-
-	private static class DomainTypeWithIdProperty {
-
-		@Id String id;
-		String value;
-	}
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/EntityOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/EntityOperationsUnitTests.java
new file mode 100644
index 0000000000..a2197463e6
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/EntityOperationsUnitTests.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2021-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import java.time.Instant;
+import java.util.Map;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mapping.MappingException;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.TimeSeries;
+import org.springframework.data.mongodb.test.util.MongoTestMappingContext;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+
+/**
+ * Unit tests for {@link EntityOperations}.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+class EntityOperationsUnitTests {
+
+	ConversionService conversionService = new DefaultConversionService();
+
+	EntityOperations operations = new EntityOperations(
+			new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, MongoTestMappingContext.newTestContext()));
+
+	@Test // GH-3731
+	void shouldReportInvalidTimeField() {
+		assertThatExceptionOfType(MappingException.class)
+				.isThrownBy(() -> operations.forType(InvalidTimeField.class).getCollectionOptions())
+				.withMessageContaining("Time series field 'foo' does not exist");
+	}
+
+	@Test // GH-3731
+	void shouldReportInvalidMetaField() {
+		assertThatExceptionOfType(MappingException.class)
+				.isThrownBy(() -> operations.forType(InvalidMetaField.class).getCollectionOptions())
+				.withMessageContaining("Meta field 'foo' does not exist");
+	}
+
+	@Test // DATAMONGO-2293
+	void populateIdShouldReturnTargetBeanWhenIdIsNull() {
+		assertThat(initAdaptibleEntity(new DomainTypeWithIdProperty()).populateIdIfNecessary(null)).isNotNull();
+	}
+
+	@Test // GH-4308
+	void shouldExtractKeysFromEntity() {
+
+		WithNestedDocument object = new WithNestedDocument("foo");
+
+		Map<String, Object> keys = operations.forEntity(object).extractKeys(new Document("id", 1),
+				WithNestedDocument.class);
+
+		assertThat(keys).containsEntry("id", "foo");
+	}
+
+	@Test // GH-4308
+	void shouldExtractKeysFromDocument() {
+
+		Document object = new Document("id", "foo");
+
+		Map<String, Object> keys = operations.forEntity(object).extractKeys(new Document("id", 1), Document.class);
+
+		assertThat(keys).containsEntry("id", "foo");
+	}
+
+	@Test // GH-4308
+	void shouldExtractKeysFromNestedEntity() {
+
+		WithNestedDocument object = new WithNestedDocument("foo", new WithNestedDocument("bar"), null);
+
+		Map<String, Object> keys = operations.forEntity(object).extractKeys(new Document("nested.id", 1),
+				WithNestedDocument.class);
+
+		assertThat(keys).containsEntry("nested.id", "bar");
+	}
+
+	@Test // GH-4308
+	void shouldExtractKeysFromNestedEntityDocument() {
+
+		WithNestedDocument object = new WithNestedDocument("foo", new WithNestedDocument("bar"),
+				new Document("john", "doe"));
+
+		Map<String, Object> keys = operations.forEntity(object).extractKeys(new Document("document.john", 1),
+				WithNestedDocument.class);
+
+		assertThat(keys).containsEntry("document.john", "doe");
+	}
+
+	@Test // GH-4308
+	void shouldExtractKeysFromNestedDocument() {
+
+		Document object = new Document("document", new Document("john", "doe"));
+
+		Map<String, Object> keys = operations.forEntity(object).extractKeys(new Document("document.john", 1),
+				Document.class);
+
+		assertThat(keys).containsEntry("document.john", "doe");
+	}
+
+	@Test // GH-4308
+	void shouldExtractIdPropertyNameFromRawDocument() {
+
+		Document object = new Document("_id", "id-1").append("value", "val");
+
+		Map<String, Object> keys = operations.forEntity(object).extractKeys(new Document("value", 1), DomainTypeWithIdProperty.class);
+
+		assertThat(keys).containsEntry("id", "id-1");
+	}
+
+	@Test // GH-4308
+	void shouldExtractValuesFromProxy() {
+
+		ProjectionInterface source = new SpelAwareProxyProjectionFactory().createProjection(ProjectionInterface.class, new Document("_id", "id-1").append("value", "val"));
+
+		Map<String, Object> keys = operations.forEntity(source).extractKeys(new Document("value", 1), DomainTypeWithIdProperty.class);
+
+		assertThat(keys).isEqualTo(new Document("id", "id-1").append("value", "val"));
+	}
+
+	<T> EntityOperations.AdaptibleEntity<T> initAdaptibleEntity(T source) {
+		return operations.forEntity(source, conversionService);
+	}
+
+	private static class DomainTypeWithIdProperty {
+
+		@Id String id;
+		String value;
+	}
+
+	@TimeSeries(timeField = "foo")
+	static class InvalidTimeField {
+
+	}
+
+	@TimeSeries(timeField = "time", metaField = "foo")
+	static class InvalidMetaField {
+		Instant time;
+	}
+
+	class WithNestedDocument {
+
+		String id;
+
+		WithNestedDocument nested;
+
+		Document document;
+
+		public WithNestedDocument() {}
+
+		public WithNestedDocument(String id) {
+			this.id = id;
+		}
+
+		public WithNestedDocument(String id, WithNestedDocument nested, Document document) {
+
+			this.id = id;
+			this.nested = nested;
+			this.document = document;
+		}
+	}
+
+	interface ProjectionInterface {
+		String getValue();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupportUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupportUnitTests.java
index 21666ff64c..80373562c8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupportUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableAggregationOperationSupportUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,63 +20,66 @@
 import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 
 /**
  * Unit tests for {@link ExecutableAggregationOperationSupport}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ExecutableAggregationOperationSupportUnitTests {
 
 	@Mock MongoTemplate template;
-	ExecutableAggregationOperationSupport opSupport;
+	private ExecutableAggregationOperationSupport opSupport;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		opSupport = new ExecutableAggregationOperationSupport(template);
 	}
 
 	@Test // DATAMONGO-1563
-	public void throwsExceptionOnNullDomainType() {
+	void throwsExceptionOnNullDomainType() {
 		assertThatIllegalArgumentException().isThrownBy(() -> opSupport.aggregateAndReturn(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void throwsExceptionOnNullCollectionWhenUsed() {
+	void throwsExceptionOnNullCollectionWhenUsed() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> opSupport.aggregateAndReturn(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void throwsExceptionOnEmptyCollectionWhenUsed() {
+	void throwsExceptionOnEmptyCollectionWhenUsed() {
 		assertThatIllegalArgumentException().isThrownBy(() -> opSupport.aggregateAndReturn(Person.class).inCollection(""));
 	}
 
 	@Test // DATAMONGO-1563
-	public void throwsExceptionOnNullAggregation() {
+	void throwsExceptionOnNullAggregation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> opSupport.aggregateAndReturn(Person.class).by(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void aggregateWithUntypedAggregationAndExplicitCollection() {
+	void aggregateWithUntypedAggregationAndExplicitCollection() {
 
 		opSupport.aggregateAndReturn(Person.class).inCollection("star-wars").by(newAggregation(project("foo"))).all();
 
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
-		verify(template).aggregate(any(Aggregation.class), eq("star-wars"), captor.capture());
+		verify(template).doAggregate(any(Aggregation.class), eq("star-wars"), captor.capture(),
+				eq(QueryResultConverter.entity()));
 		assertThat(captor.getValue()).isEqualTo(Person.class);
 	}
 
 	@Test // DATAMONGO-1563
-	public void aggregateWithUntypedAggregation() {
+	void aggregateWithUntypedAggregation() {
 
 		when(template.getCollectionName(any(Class.class))).thenReturn("person");
 
@@ -85,13 +88,14 @@ public void aggregateWithUntypedAggregation() {
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
 
 		verify(template).getCollectionName(captor.capture());
-		verify(template).aggregate(any(Aggregation.class), eq("person"), captor.capture());
+		verify(template).doAggregate(any(Aggregation.class), eq("person"), captor.capture(),
+				eq(QueryResultConverter.entity()));
 
 		assertThat(captor.getAllValues()).containsExactly(Person.class, Person.class);
 	}
 
 	@Test // DATAMONGO-1563
-	public void aggregateWithTypeAggregation() {
+	void aggregateWithTypeAggregation() {
 
 		when(template.getCollectionName(any(Class.class))).thenReturn("person");
 
@@ -100,23 +104,25 @@ public void aggregateWithTypeAggregation() {
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
 
 		verify(template).getCollectionName(captor.capture());
-		verify(template).aggregate(any(Aggregation.class), eq("person"), captor.capture());
+		verify(template).doAggregate(any(Aggregation.class), eq("person"), captor.capture(),
+				eq(QueryResultConverter.entity()));
 
 		assertThat(captor.getAllValues()).containsExactly(Person.class, Jedi.class);
 	}
 
 	@Test // DATAMONGO-1563
-	public void aggregateStreamWithUntypedAggregationAndExplicitCollection() {
+	void aggregateStreamWithUntypedAggregationAndExplicitCollection() {
 
 		opSupport.aggregateAndReturn(Person.class).inCollection("star-wars").by(newAggregation(project("foo"))).stream();
 
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
-		verify(template).aggregateStream(any(Aggregation.class), eq("star-wars"), captor.capture());
+		verify(template).doAggregateStream(any(Aggregation.class), eq("star-wars"), captor.capture(),
+				eq(QueryResultConverter.entity()), any());
 		assertThat(captor.getValue()).isEqualTo(Person.class);
 	}
 
 	@Test // DATAMONGO-1563
-	public void aggregateStreamWithUntypedAggregation() {
+	void aggregateStreamWithUntypedAggregation() {
 
 		when(template.getCollectionName(any(Class.class))).thenReturn("person");
 
@@ -125,13 +131,14 @@ public void aggregateStreamWithUntypedAggregation() {
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
 
 		verify(template).getCollectionName(captor.capture());
-		verify(template).aggregateStream(any(Aggregation.class), eq("person"), captor.capture());
+		verify(template).doAggregateStream(any(Aggregation.class), eq("person"), captor.capture(),
+				eq(QueryResultConverter.entity()), any());
 
 		assertThat(captor.getAllValues()).containsExactly(Person.class, Person.class);
 	}
 
 	@Test // DATAMONGO-1563
-	public void aggregateStreamWithTypeAggregation() {
+	void aggregateStreamWithTypeAggregation() {
 
 		when(template.getCollectionName(any(Class.class))).thenReturn("person");
 
@@ -140,7 +147,8 @@ public void aggregateStreamWithTypeAggregation() {
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
 
 		verify(template).getCollectionName(captor.capture());
-		verify(template).aggregateStream(any(Aggregation.class), eq("person"), captor.capture());
+		verify(template).doAggregateStream(any(Aggregation.class), eq("person"), captor.capture(),
+				eq(QueryResultConverter.entity()), any());
 
 		assertThat(captor.getAllValues()).containsExactly(Person.class, Jedi.class);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java
index d2ebb4883c..835367990a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableFindOperationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,19 +18,21 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import static org.springframework.data.mongodb.test.util.DirtiesStateExtension.*;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Stream;
 
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -40,10 +42,15 @@
 import org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
 import org.springframework.data.mongodb.core.index.GeospatialIndex;
+import org.springframework.data.mongodb.core.mapping.DBRef;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 /**
  * Integration tests for {@link ExecutableFindOperationSupport}.
@@ -51,26 +58,29 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class ExecutableFindOperationSupportTests {
+@ExtendWith({ MongoTemplateExtension.class, DirtiesStateExtension.class })
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ExecutableFindOperationSupportTests implements StateFunctions {
 
 	private static final String STAR_WARS = "star-wars";
 	private static final String STAR_WARS_PLANETS = "star-wars-universe";
-	MongoTemplate template;
 
-	Person han;
-	Person luke;
+	@Template(database = "executable-find-operation-support-tests", initialEntitySet = { Person.class, Planet.class }) //
+	private static MongoTestTemplate template;
 
-	Planet alderan;
-	Planet dantooine;
+	private Person han;
+	private Person luke;
 
-	@Before
-	public void setUp() {
+	private Planet alderan;
+	private Planet dantooine;
 
-		template = new MongoTemplate(
-				new SimpleMongoClientDbFactory(MongoTestUtils.client(), "ExecutableFindOperationSupportTests"));
-		template.dropCollection(STAR_WARS);
-		template.dropCollection(STAR_WARS_PLANETS);
+	@Override
+	public void clear() {
+		template.flush();
+	}
 
+	@Override
+	public void setupState() {
 		template.indexOps(Planet.class).ensureIndex(
 				new GeospatialIndex("coordinates").typed(GeoSpatialIndexType.GEO_2DSPHERE).named("planet-coordinate-idx"));
 
@@ -79,37 +89,38 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void domainTypeIsRequired() {
+	void domainTypeIsRequired() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.query(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void returnTypeIsRequiredOnSet() {
+	void returnTypeIsRequiredOnSet() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.query(Person.class).as(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void collectionIsRequiredOnSet() {
+	void collectionIsRequiredOnSet() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.query(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAll() {
+	void findAll() {
 		assertThat(template.query(Person.class).all()).containsExactlyInAnyOrder(han, luke);
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllWithCollection() {
+	void findAllWithCollection() {
 		assertThat(template.query(Human.class).inCollection(STAR_WARS).all()).hasSize(2);
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllWithProjection() {
+	void findAllWithProjection() {
 		assertThat(template.query(Person.class).as(Jedi.class).all()).hasOnlyElementsOfType(Jedi.class).hasSize(2);
 	}
 
 	@Test // DATAMONGO-2041
-	public void findAllWithProjectionOnEmbeddedType() {
+	@DirtiesState
+	void findAllWithProjectionOnEmbeddedType() {
 
 		luke.father = new Person();
 		luke.father.firstname = "anakin";
@@ -121,89 +132,104 @@ public void findAllWithProjectionOnEmbeddedType() {
 	}
 
 	@Test // DATAMONGO-1733
-	public void findByReturningAllValuesAsClosedInterfaceProjection() {
+	void findByReturningAllValuesAsClosedInterfaceProjection() {
 
 		assertThat(template.query(Person.class).as(PersonProjection.class).all())
 				.hasOnlyElementsOfTypes(PersonProjection.class);
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllBy() {
+	void findAllBy() {
 
 		assertThat(template.query(Person.class).matching(query(where("firstname").is("luke"))).all())
 				.containsExactlyInAnyOrder(luke);
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllByWithCollectionUsingMappingInformation() {
+	void findAllByWithCollectionUsingMappingInformation() {
 
 		assertThat(template.query(Jedi.class).inCollection(STAR_WARS).matching(query(where("name").is("luke"))).all())
 				.hasSize(1).hasOnlyElementsOfType(Jedi.class);
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllByWithCollection() {
+	void findAllByWithCollection() {
 		assertThat(template.query(Human.class).inCollection(STAR_WARS).matching(query(where("firstname").is("luke"))).all())
 				.hasSize(1);
 	}
 
 	@Test // DATAMONGO-2323
-	public void findAllAsDocument() {
+	void findAllAsDocument() {
 		assertThat(
 				template.query(Document.class).inCollection(STAR_WARS).matching(query(where("firstname").is("luke"))).all())
 						.hasSize(1);
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllByWithProjection() {
+	void findAllByWithProjection() {
 
 		assertThat(template.query(Person.class).as(Jedi.class).matching(query(where("firstname").is("luke"))).all())
 				.hasOnlyElementsOfType(Jedi.class).hasSize(1);
 	}
 
+	@Test // GH-4949
+	void findAllByWithConverter() {
+
+		List<Optional<Jedi>> result = template.query(Person.class).as(Jedi.class)
+				.matching(query(where("firstname").is("luke"))).map((document, reader) -> Optional.of(reader.get())).all();
+
+		assertThat(result).hasOnlyElementsOfType(Optional.class).hasSize(1);
+		assertThat(result).extracting(Optional::get).hasOnlyElementsOfType(Jedi.class).hasSize(1);
+	}
+
 	@Test // DATAMONGO-1563
-	public void findBy() {
+	void findBy() {
 		assertThat(template.query(Person.class).matching(query(where("firstname").is("luke"))).one()).contains(luke);
 	}
 
+	@Test // DATAMONGO-2416
+	void findByCriteria() {
+		assertThat(template.query(Person.class).matching(where("firstname").is("luke")).one()).contains(luke);
+	}
+
 	@Test // DATAMONGO-1563
-	public void findByNoMatch() {
+	void findByNoMatch() {
 		assertThat(template.query(Person.class).matching(query(where("firstname").is("spock"))).one()).isEmpty();
 	}
 
 	@Test // DATAMONGO-1563
-	public void findByTooManyResults() {
+	void findByTooManyResults() {
 		assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class)
 				.isThrownBy(() -> template.query(Person.class).matching(query(where("firstname").in("han", "luke"))).one());
 	}
 
 	@Test // DATAMONGO-1726
-	public void findByReturningOneValue() {
+	void findByReturningOneValue() {
 		assertThat(template.query(Person.class).matching(query(where("firstname").is("luke"))).oneValue()).isEqualTo(luke);
 	}
 
 	@Test // DATAMONGO-1726
-	public void findByReturningOneValueButTooManyResults() {
+	void findByReturningOneValueButTooManyResults() {
 		assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class).isThrownBy(
 				() -> template.query(Person.class).matching(query(where("firstname").in("han", "luke"))).oneValue());
 	}
 
 	@Test // DATAMONGO-1726
-	public void findByReturningFirstValue() {
+	void findByReturningFirstValue() {
 
 		assertThat(template.query(Person.class).matching(query(where("firstname").is("luke"))).firstValue())
 				.isEqualTo(luke);
 	}
 
 	@Test // DATAMONGO-1726
-	public void findByReturningFirstValueForManyResults() {
+	void findByReturningFirstValueForManyResults() {
 
 		assertThat(template.query(Person.class).matching(query(where("firstname").in("han", "luke"))).firstValue())
 				.isIn(han, luke);
 	}
 
 	@Test // DATAMONGO-1733
-	public void findByReturningFirstValueAsClosedInterfaceProjection() {
+	void findByReturningFirstValueAsClosedInterfaceProjection() {
 
 		PersonProjection result = template.query(Person.class).as(PersonProjection.class)
 				.matching(query(where("firstname").is("han"))).firstValue();
@@ -213,7 +239,7 @@ public void findByReturningFirstValueAsClosedInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1733
-	public void findByReturningFirstValueAsOpenInterfaceProjection() {
+	void findByReturningFirstValueAsOpenInterfaceProjection() {
 
 		PersonSpELProjection result = template.query(Person.class).as(PersonSpELProjection.class)
 				.matching(query(where("firstname").is("han"))).firstValue();
@@ -223,7 +249,7 @@ public void findByReturningFirstValueAsOpenInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void streamAll() {
+	void streamAll() {
 
 		try (Stream<Person> stream = template.query(Person.class).stream()) {
 			assertThat(stream).containsExactlyInAnyOrder(han, luke);
@@ -231,7 +257,7 @@ public void streamAll() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void streamAllWithCollection() {
+	void streamAllWithCollection() {
 
 		try (Stream<Human> stream = template.query(Human.class).inCollection(STAR_WARS).stream()) {
 			assertThat(stream).hasSize(2);
@@ -239,15 +265,24 @@ public void streamAllWithCollection() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void streamAllWithProjection() {
+	void streamAllWithProjection() {
 
 		try (Stream<Jedi> stream = template.query(Person.class).as(Jedi.class).stream()) {
 			assertThat(stream).hasOnlyElementsOfType(Jedi.class).hasSize(2);
 		}
 	}
 
+	@Test // GH-4949
+	void streamAllWithConverter() {
+
+		try (Stream<Optional<Jedi>> stream = template.query(Person.class).as(Jedi.class)
+				.map((document, reader) -> Optional.of(reader.get())).stream()) {
+			assertThat(stream).extracting(Optional::get).hasOnlyElementsOfType(Jedi.class).hasSize(2);
+		}
+	}
+
 	@Test // DATAMONGO-1733
-	public void streamAllReturningResultsAsClosedInterfaceProjection() {
+	void streamAllReturningResultsAsClosedInterfaceProjection() {
 
 		TerminatingFind<PersonProjection> operation = template.query(Person.class).as(PersonProjection.class);
 
@@ -260,7 +295,7 @@ public void streamAllReturningResultsAsClosedInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1733
-	public void streamAllReturningResultsAsOpenInterfaceProjection() {
+	void streamAllReturningResultsAsOpenInterfaceProjection() {
 
 		TerminatingFind<PersonSpELProjection> operation = template.query(Person.class).as(PersonSpELProjection.class);
 
@@ -273,7 +308,7 @@ public void streamAllReturningResultsAsOpenInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void streamAllBy() {
+	void streamAllBy() {
 
 		try (Stream<Person> stream = template.query(Person.class).matching(query(where("firstname").is("luke"))).stream()) {
 			assertThat(stream).containsExactlyInAnyOrder(luke);
@@ -281,7 +316,7 @@ public void streamAllBy() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllNearBy() {
+	void findAllNearBy() {
 
 		GeoResults<Planet> results = template.query(Planet.class).near(NearQuery.near(-73.9667, 40.78).spherical(true))
 				.all();
@@ -290,7 +325,7 @@ public void findAllNearBy() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAllNearByWithCollectionAndProjection() {
+	void findAllNearByWithCollectionAndProjection() {
 
 		GeoResults<Human> results = template.query(Object.class).inCollection(STAR_WARS_PLANETS).as(Human.class)
 				.near(NearQuery.near(-73.9667, 40.78).spherical(true)).all();
@@ -301,8 +336,22 @@ public void findAllNearByWithCollectionAndProjection() {
 		assertThat(results.getContent().get(0).getContent().getId()).isEqualTo("alderan");
 	}
 
+	@Test // GH-4949
+	void findAllNearByWithConverter() {
+
+		GeoResults<Optional<Human>> results = template.query(Object.class).inCollection(STAR_WARS_PLANETS).as(Human.class)
+				.near(NearQuery.near(-73.9667, 40.78).spherical(true)).map((document, reader) -> Optional.of(reader.get()))
+				.all();
+
+		assertThat(results.getContent()).hasSize(2);
+		assertThat(results.getContent().get(0).getDistance()).isNotNull();
+		assertThat(results.getContent().get(0).getContent()).isInstanceOf(Optional.class);
+		assertThat(results.getContent().get(0).getContent().get()).isInstanceOf(Human.class);
+		assertThat(results.getContent().get(0).getContent().get().getId()).isEqualTo("alderan");
+	}
+
 	@Test // DATAMONGO-1733
-	public void findAllNearByReturningGeoResultContentAsClosedInterfaceProjection() {
+	void findAllNearByReturningGeoResultContentAsClosedInterfaceProjection() {
 
 		GeoResults<PlanetProjection> results = template.query(Planet.class).as(PlanetProjection.class)
 				.near(NearQuery.near(-73.9667, 40.78).spherical(true)).all();
@@ -315,7 +364,7 @@ public void findAllNearByReturningGeoResultContentAsClosedInterfaceProjection()
 	}
 
 	@Test // DATAMONGO-1733
-	public void findAllNearByReturningGeoResultContentAsOpenInterfaceProjection() {
+	void findAllNearByReturningGeoResultContentAsOpenInterfaceProjection() {
 
 		GeoResults<PlanetSpELProjection> results = template.query(Planet.class).as(PlanetSpELProjection.class)
 				.near(NearQuery.near(-73.9667, 40.78).spherical(true)).all();
@@ -328,29 +377,30 @@ public void findAllNearByReturningGeoResultContentAsOpenInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1728
-	public void firstShouldReturnFirstEntryInCollection() {
+	void firstShouldReturnFirstEntryInCollection() {
 		assertThat(template.query(Person.class).first()).isNotEmpty();
 	}
 
 	@Test // DATAMONGO-1734
-	public void countShouldReturnNrOfElementsInCollectionWhenNoQueryPresent() {
+	void countShouldReturnNrOfElementsInCollectionWhenNoQueryPresent() {
 		assertThat(template.query(Person.class).count()).isEqualTo(2);
 	}
 
 	@Test // DATAMONGO-1734
-	public void countShouldReturnNrOfElementsMatchingQuery() {
+	void countShouldReturnNrOfElementsMatchingQuery() {
 
 		assertThat(template.query(Person.class).matching(query(where("firstname").is(luke.getFirstname()))).count())
 				.isEqualTo(1);
 	}
 
 	@Test // DATAMONGO-1734
-	public void existsShouldReturnTrueIfAtLeastOneElementExistsInCollection() {
+	void existsShouldReturnTrueIfAtLeastOneElementExistsInCollection() {
 		assertThat(template.query(Person.class).exists()).isTrue();
 	}
 
 	@Test // DATAMONGO-1734
-	public void existsShouldReturnFalseIfNoElementExistsInCollection() {
+	@DirtiesState
+	void existsShouldReturnFalseIfNoElementExistsInCollection() {
 
 		template.remove(new BasicQuery("{}"), STAR_WARS);
 
@@ -358,29 +408,29 @@ public void existsShouldReturnFalseIfNoElementExistsInCollection() {
 	}
 
 	@Test // DATAMONGO-1734
-	public void existsShouldReturnTrueIfAtLeastOneElementMatchesQuery() {
+	void existsShouldReturnTrueIfAtLeastOneElementMatchesQuery() {
 
 		assertThat(template.query(Person.class).matching(query(where("firstname").is(luke.getFirstname()))).exists())
 				.isTrue();
 	}
 
 	@Test // DATAMONGO-1734
-	public void existsShouldReturnFalseWhenNoElementMatchesQuery() {
+	void existsShouldReturnFalseWhenNoElementMatchesQuery() {
 		assertThat(template.query(Person.class).matching(query(where("firstname").is("spock"))).exists()).isFalse();
 	}
 
 	@Test // DATAMONGO-1734
-	public void returnsTargetObjectDirectlyIfProjectionInterfaceIsImplemented() {
+	void returnsTargetObjectDirectlyIfProjectionInterfaceIsImplemented() {
 		assertThat(template.query(Person.class).as(Contact.class).all()).allMatch(it -> it instanceof Person);
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsEmptyListIfNoMatchFound() {
+	void distinctReturnsEmptyListIfNoMatchFound() {
 		assertThat(template.query(Person.class).distinct("actually-not-property-in-use").as(String.class).all()).isEmpty();
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsSimpleFieldValuesCorrectlyForCollectionHavingReturnTypeSpecifiedThatCanBeConvertedDirectlyByACodec() {
+	void distinctReturnsSimpleFieldValuesCorrectlyForCollectionHavingReturnTypeSpecifiedThatCanBeConvertedDirectlyByACodec() {
 
 		Person anakin = new Person();
 		anakin.firstname = "anakin";
@@ -393,7 +443,7 @@ public void distinctReturnsSimpleFieldValuesCorrectlyForCollectionHavingReturnTy
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsSimpleFieldValuesCorrectly() {
+	void distinctReturnsSimpleFieldValuesCorrectly() {
 
 		Person anakin = new Person();
 		anakin.firstname = "anakin";
@@ -416,7 +466,7 @@ public void distinctReturnsSimpleFieldValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsComplexValuesCorrectly() {
+	void distinctReturnsComplexValuesCorrectly() {
 
 		Sith sith = new Sith();
 		sith.rank = "lord";
@@ -431,7 +481,7 @@ public void distinctReturnsComplexValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsComplexValuesCorrectlyHavingReturnTypeSpecified() {
+	void distinctReturnsComplexValuesCorrectlyHavingReturnTypeSpecified() {
 
 		Sith sith = new Sith();
 		sith.rank = "lord";
@@ -447,7 +497,7 @@ public void distinctReturnsComplexValuesCorrectlyHavingReturnTypeSpecified() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsComplexValuesCorrectlyHavingReturnTypeDocumentSpecified() {
+	void distinctReturnsComplexValuesCorrectlyHavingReturnTypeDocumentSpecified() {
 
 		Sith sith = new Sith();
 		sith.rank = "lord";
@@ -463,21 +513,22 @@ public void distinctReturnsComplexValuesCorrectlyHavingReturnTypeDocumentSpecifi
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctMapsFieldNameCorrectly() {
+	void distinctMapsFieldNameCorrectly() {
 
 		assertThat(template.query(Jedi.class).inCollection(STAR_WARS).distinct("name").as(String.class).all())
 				.containsExactlyInAnyOrder("han", "luke");
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsRawValuesIfReturnTypeIsBsonValue() {
+	void distinctReturnsRawValuesIfReturnTypeIsBsonValue() {
 
 		assertThat(template.query(Person.class).distinct("lastname").as(BsonValue.class).all())
 				.containsExactlyInAnyOrder(new BsonString("solo"), new BsonString("skywalker"));
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsValuesMappedToTheirJavaTypeEvenWhenNotExplicitlyDefinedByTheDomainType() {
+	@DirtiesState
+	void distinctReturnsValuesMappedToTheirJavaTypeEvenWhenNotExplicitlyDefinedByTheDomainType() {
 
 		template.save(new Document("darth", "vader"), STAR_WARS);
 
@@ -485,7 +536,8 @@ public void distinctReturnsValuesMappedToTheirJavaTypeEvenWhenNotExplicitlyDefin
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsMappedDomainTypeForProjections() {
+	@DirtiesState
+	void distinctReturnsMappedDomainTypeForProjections() {
 
 		luke.father = new Person();
 		luke.father.firstname = "anakin";
@@ -497,7 +549,8 @@ public void distinctReturnsMappedDomainTypeForProjections() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctAlllowsQueryUsingObjectSourceType() {
+	@DirtiesState
+	void distinctAlllowsQueryUsingObjectSourceType() {
 
 		luke.father = new Person();
 		luke.father.firstname = "anakin";
@@ -509,7 +562,8 @@ public void distinctAlllowsQueryUsingObjectSourceType() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsMappedDomainTypeExtractedFromPropertyWhenNoExplicitTypePresent() {
+	@DirtiesState
+	void distinctReturnsMappedDomainTypeExtractedFromPropertyWhenNoExplicitTypePresent() {
 
 		luke.father = new Person();
 		luke.father.firstname = "anakin";
@@ -523,14 +577,91 @@ public void distinctReturnsMappedDomainTypeExtractedFromPropertyWhenNoExplicitTy
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctThrowsExceptionWhenExplicitMappingTypeCannotBeApplied() {
+	void distinctThrowsExceptionWhenExplicitMappingTypeCannotBeApplied() {
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
 				.isThrownBy(() -> template.query(Person.class).distinct("firstname").as(Long.class).all());
 	}
 
+	@Test // DATAMONGO-2507
+	void distinctAppliesFilterQuery() {
+
+		assertThat(template.query(Person.class).inCollection(STAR_WARS).distinct("firstname") //
+				.matching(where("lastname").is(luke.lastname)) //
+				.as(String.class) //
+				.all() //
+		).containsExactlyInAnyOrder("luke");
+	}
+
+	@Test // GH-2860
+	void projectionOnDbRef() {
+
+		WithRefs source = new WithRefs();
+		source.id = "id-1";
+		source.noRef = "value";
+		source.planetDbRef = alderan;
+
+		template.save(source);
+
+		WithDbRefProjection target = template.query(WithRefs.class).as(WithDbRefProjection.class)
+				.matching(where("id").is(source.id)).oneValue();
+
+		assertThat(target.getPlanetDbRef()).isEqualTo(alderan);
+	}
+
+	@Test // GH-2860
+	@Disabled("GH-3913")
+	@DirtiesState
+	void propertyProjectionOnDbRef() {
+
+		WithRefs source = new WithRefs();
+		source.id = "id-1";
+		source.noRef = "value";
+		source.planetDbRef = alderan;
+
+		template.save(source);
+
+		WithDbRefPropertyProjection target = template.query(WithRefs.class).as(WithDbRefPropertyProjection.class)
+				.matching(where("id").is(source.id)).oneValue();
+
+		assertThat(target.getPlanetDbRef().getName()).isEqualTo(alderan.getName());
+	}
+
+	@Test // GH-2860
+	@DirtiesState
+	void projectionOnDocRef() {
+
+		WithRefs source = new WithRefs();
+		source.id = "id-1";
+		source.noRef = "value";
+		source.planetDocRef = alderan;
+
+		template.save(source);
+
+		WithDocumentRefProjection target = template.query(WithRefs.class).as(WithDocumentRefProjection.class)
+				.matching(where("id").is(source.id)).oneValue();
+
+		assertThat(target.getPlanetDocRef()).isEqualTo(alderan);
+	}
+
+	@Test // GH-2860
+	@DirtiesState
+	void propertyProjectionOnDocRef() {
+
+		WithRefs source = new WithRefs();
+		source.id = "id-1";
+		source.noRef = "value";
+		source.planetDocRef = alderan;
+
+		template.save(source);
+
+		WithDocRefPropertyProjection target = template.query(WithRefs.class).as(WithDocRefPropertyProjection.class)
+				.matching(where("id").is(source.id)).oneValue();
+
+		assertThat(target.getPlanetDocRef().getName()).isEqualTo(alderan.getName());
+	}
+
 	interface Contact {}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person implements Contact {
 
@@ -539,6 +670,72 @@ static class Person implements Contact {
 		String lastname;
 		Object ability;
 		Person father;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public Object getAbility() {
+			return this.ability;
+		}
+
+		public Person getFather() {
+			return this.father;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public void setAbility(Object ability) {
+			this.ability = ability;
+		}
+
+		public void setFather(Person father) {
+			this.father = father;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname)
+					&& Objects.equals(lastname, person.lastname) && Objects.equals(ability, person.ability)
+					&& Objects.equals(father, person.father);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname, ability, father);
+		}
+
+		public String toString() {
+			return "ExecutableFindOperationSupportTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ", lastname=" + this.getLastname() + ", ability=" + this.getAbility() + ", father=" + this.getFather()
+					+ ")";
+		}
 	}
 
 	interface PersonProjection {
@@ -551,38 +748,166 @@ public interface PersonSpELProjection {
 		String getName();
 	}
 
+	// TODO: Without getters/setters, not identified as projection/properties
 	static class PersonDtoProjection {
 
 		@Field("firstname") String name;
 		Person father;
+
+		public String getName() {
+			return this.name;
+		}
+
+		public Person getFather() {
+			return this.father;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public void setFather(Person father) {
+			this.father = father;
+		}
 	}
 
-	@Data
 	static class Human {
+
 		@Id String id;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String toString() {
+			return "ExecutableFindOperationSupportTests.Human(id=" + this.getId() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
-	@NoArgsConstructor
 	static class Jedi {
 
 		@Field("firstname") String name;
+
+		public Jedi(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Jedi jedi = (Jedi) o;
+			return Objects.equals(name, jedi.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name);
+		}
+
+		public String toString() {
+			return "ExecutableFindOperationSupportTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 
-	@Data
 	static class Sith {
 
 		String rank;
+
+		public String getRank() {
+			return this.rank;
+		}
+
+		public void setRank(String rank) {
+			this.rank = rank;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Sith sith = (Sith) o;
+			return Objects.equals(rank, sith.rank);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(rank);
+		}
+
+		public String toString() {
+			return "ExecutableFindOperationSupportTests.Sith(rank=" + this.getRank() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS_PLANETS)
 	static class Planet {
 
 		@Id String name;
 		Point coordinates;
+
+		public Planet(String name, Point coordinates) {
+			this.name = name;
+			this.coordinates = coordinates;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public Point getCoordinates() {
+			return this.coordinates;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public void setCoordinates(Point coordinates) {
+			this.coordinates = coordinates;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Planet planet = (Planet) o;
+			return Objects.equals(name, planet.name) && Objects.equals(coordinates, planet.coordinates);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name, coordinates);
+		}
+
+		public String toString() {
+			return "ExecutableFindOperationSupportTests.Planet(name=" + this.getName() + ", coordinates="
+					+ this.getCoordinates() + ")";
+		}
 	}
 
 	interface PlanetProjection {
@@ -595,6 +920,70 @@ interface PlanetSpELProjection {
 		String getId();
 	}
 
+	static class WithRefs {
+
+		@Id String id;
+
+		String noRef;
+
+		@DBRef Planet planetDbRef;
+
+		@DocumentReference Planet planetDocRef;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getNoRef() {
+			return this.noRef;
+		}
+
+		public Planet getPlanetDbRef() {
+			return this.planetDbRef;
+		}
+
+		public Planet getPlanetDocRef() {
+			return this.planetDocRef;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setNoRef(String noRef) {
+			this.noRef = noRef;
+		}
+
+		public void setPlanetDbRef(Planet planetDbRef) {
+			this.planetDbRef = planetDbRef;
+		}
+
+		public void setPlanetDocRef(Planet planetDocRef) {
+			this.planetDocRef = planetDocRef;
+		}
+
+		public String toString() {
+			return "ExecutableFindOperationSupportTests.WithRefs(id=" + this.getId() + ", noRef=" + this.getNoRef()
+					+ ", planetDbRef=" + this.getPlanetDbRef() + ", planetDocRef=" + this.getPlanetDocRef() + ")";
+		}
+	}
+
+	interface WithDbRefProjection {
+		Planet getPlanetDbRef();
+	}
+
+	interface WithDocumentRefProjection {
+		Planet getPlanetDocRef();
+	}
+
+	interface WithDbRefPropertyProjection {
+		PlanetProjection getPlanetDbRef();
+	}
+
+	interface WithDocRefPropertyProjection {
+		PlanetProjection getPlanetDocRef();
+	}
+
 	private void initPersons() {
 
 		han = new Person();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupportUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupportUnitTests.java
index c587e4819f..d5e5d603c0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupportUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableInsertOperationSupportUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,16 +19,14 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Data;
-
 import java.util.Arrays;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 
@@ -38,7 +36,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ExecutableInsertOperationSupportUnitTests {
 
 	private static final String STAR_WARS = "star-wars";
@@ -46,16 +44,12 @@ public class ExecutableInsertOperationSupportUnitTests {
 	@Mock MongoTemplate template;
 	@Mock BulkOperations bulkOperations;
 
-	ExecutableInsertOperationSupport ops;
-
-	Person luke, han;
+	private ExecutableInsertOperationSupport ops;
 
-	@Before
-	public void setUp() {
+	private Person luke, han;
 
-		when(template.bulkOps(any(), any(), any())).thenReturn(bulkOperations);
-		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
-		when(bulkOperations.insert(anyList())).thenReturn(bulkOperations);
+	@BeforeEach
+	void setUp() {
 
 		ops = new ExecutableInsertOperationSupport(template);
 
@@ -69,17 +63,19 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void nullCollectionShouldThrowException() {
+	void nullCollectionShouldThrowException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> ops.insert(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void nullBulkModeShouldThrowException() {
+	void nullBulkModeShouldThrowException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> ops.insert(Person.class).withBulkMode(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void insertShouldUseDerivedCollectionName() {
+	void insertShouldUseDerivedCollectionName() {
+
+		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
 
 		ops.insert(Person.class).one(luke);
 
@@ -92,7 +88,7 @@ public void insertShouldUseDerivedCollectionName() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void insertShouldUseExplicitCollectionName() {
+	void insertShouldUseExplicitCollectionName() {
 
 		ops.insert(Person.class).inCollection(STAR_WARS).one(luke);
 
@@ -101,7 +97,9 @@ public void insertShouldUseExplicitCollectionName() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void insertCollectionShouldDelegateCorrectly() {
+	void insertCollectionShouldDelegateCorrectly() {
+
+		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
 
 		ops.insert(Person.class).all(Arrays.asList(luke, han));
 
@@ -110,7 +108,11 @@ public void insertCollectionShouldDelegateCorrectly() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void bulkInsertCollectionShouldDelegateCorrectly() {
+	void bulkInsertCollectionShouldDelegateCorrectly() {
+
+		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
+		when(template.bulkOps(any(), any(), any())).thenReturn(bulkOperations);
+		when(bulkOperations.insert(anyList())).thenReturn(bulkOperations);
 
 		ops.insert(Person.class).bulk(Arrays.asList(luke, han));
 
@@ -123,7 +125,11 @@ public void bulkInsertCollectionShouldDelegateCorrectly() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void bulkInsertWithBulkModeShouldDelegateCorrectly() {
+	void bulkInsertWithBulkModeShouldDelegateCorrectly() {
+
+		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
+		when(template.bulkOps(any(), any(), any())).thenReturn(bulkOperations);
+		when(bulkOperations.insert(anyList())).thenReturn(bulkOperations);
 
 		ops.insert(Person.class).withBulkMode(BulkMode.UNORDERED).bulk(Arrays.asList(luke, han));
 
@@ -135,10 +141,31 @@ public void bulkInsertWithBulkModeShouldDelegateCorrectly() {
 		verify(bulkOperations).execute();
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person {
+
 		@Id String id;
 		String firstname;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public String toString() {
+			return "ExecutableInsertOperationSupportUnitTests.Person(id=" + this.getId() + ", firstname="
+					+ this.getFirstname() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperationSupportUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperationSupportUnitTests.java
index 036d3d2f13..167852f723 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperationSupportUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableMapReduceOperationSupportUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,16 +18,13 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
@@ -38,10 +35,11 @@
  * Unit tests for {@link ExecutableMapReduceOperationSupport}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @currentRead Beyond the Shadows - Brent Weeks
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ExecutableMapReduceOperationSupportUnitTests {
+@ExtendWith(MockitoExtension.class)
+class ExecutableMapReduceOperationSupportUnitTests {
 
 	private static final String STAR_WARS = "star-wars";
 	private static final String MAP_FUNCTION = "function() { emit(this.id, this.firstname) }";
@@ -49,29 +47,27 @@ public class ExecutableMapReduceOperationSupportUnitTests {
 
 	@Mock MongoTemplate template;
 
-	ExecutableMapReduceOperationSupport mapReduceOpsSupport;
-
-	@Before
-	public void setUp() {
-
-		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
+	private ExecutableMapReduceOperationSupport mapReduceOpsSupport;
 
+	@BeforeEach
+	void setUp() {
 		mapReduceOpsSupport = new ExecutableMapReduceOperationSupport(template);
 	}
 
 	@Test // DATAMONGO-1929
-	public void throwsExceptionOnNullTemplate() {
+	void throwsExceptionOnNullTemplate() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ExecutableMapReduceOperationSupport(null));
 	}
 
 	@Test // DATAMONGO-1929
-	public void throwsExceptionOnNullDomainType() {
+	void throwsExceptionOnNullDomainType() {
 		assertThatIllegalArgumentException().isThrownBy(() -> mapReduceOpsSupport.mapReduce(null));
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesExtractedCollectionName() {
+	void usesExtractedCollectionName() {
 
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).all();
 
 		verify(template).mapReduce(any(Query.class), eq(Person.class), eq(STAR_WARS), eq(MAP_FUNCTION), eq(REDUCE_FUNCTION),
@@ -79,7 +75,7 @@ public void usesExtractedCollectionName() {
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesExplicitCollectionName() {
+	void usesExplicitCollectionName() {
 
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION)
 				.inCollection("the-night-angel").all();
@@ -89,8 +85,9 @@ public void usesExplicitCollectionName() {
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesMapReduceOptionsWhenPresent() {
+	void usesMapReduceOptionsWhenPresent() {
 
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 		MapReduceOptions options = MapReduceOptions.options();
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).with(options).all();
 
@@ -99,8 +96,9 @@ public void usesMapReduceOptionsWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesQueryWhenPresent() {
+	void usesQueryWhenPresent() {
 
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 		Query query = new BasicQuery("{ 'lastname' : 'skywalker' }");
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).matching(query).all();
 
@@ -108,9 +106,22 @@ public void usesQueryWhenPresent() {
 				isNull(), eq(Person.class));
 	}
 
+	@Test // DATAMONGO-2416
+	void usesCriteriaWhenPresent() {
+
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
+		Query query = Query.query(where("lastname").is("skywalker"));
+		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION)
+				.matching(where("lastname").is("skywalker")).all();
+
+		verify(template).mapReduce(eq(query), eq(Person.class), eq(STAR_WARS), eq(MAP_FUNCTION), eq(REDUCE_FUNCTION),
+				isNull(), eq(Person.class));
+	}
+
 	@Test // DATAMONGO-1929
-	public void usesProjectionWhenPresent() {
+	void usesProjectionWhenPresent() {
 
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).as(Jedi.class).all();
 
 		verify(template).mapReduce(any(Query.class), eq(Person.class), eq(STAR_WARS), eq(MAP_FUNCTION), eq(REDUCE_FUNCTION),
@@ -119,7 +130,6 @@ public void usesProjectionWhenPresent() {
 
 	interface Contact {}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person implements Contact {
 
@@ -128,13 +138,75 @@ static class Person implements Contact {
 		String lastname;
 		Object ability;
 		Person father;
+
+		public Person() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public Object getAbility() {
+			return this.ability;
+		}
+
+		public Person getFather() {
+			return this.father;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public void setAbility(Object ability) {
+			this.ability = ability;
+		}
+
+		public void setFather(Person father) {
+			this.father = father;
+		}
+
+		public String toString() {
+			return "ExecutableMapReduceOperationSupportUnitTests.Person(id=" + this.getId() + ", firstname="
+					+ this.getFirstname() + ", lastname=" + this.getLastname() + ", ability=" + this.getAbility() + ", father="
+					+ this.getFather() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
-	@NoArgsConstructor
 	static class Jedi {
 
-		@Field("firstname") String name;
+		@Field("firstname") //
+		String name;
+
+		public Jedi(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String toString() {
+			return "ExecutableMapReduceOperationSupportUnitTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupportTests.java
index b12cdacf50..fe19672068 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableRemoveOperationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,15 +19,18 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 import com.mongodb.client.result.DeleteResult;
 
@@ -37,20 +40,21 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class ExecutableRemoveOperationSupportTests {
+@ExtendWith(MongoTemplateExtension.class)
+class ExecutableRemoveOperationSupportTests {
 
 	private static final String STAR_WARS = "star-wars";
-	MongoTemplate template;
 
-	Person han;
-	Person luke;
+	@Template(initialEntitySet = Person.class) //
+	private static MongoTestTemplate template;
+
+	private Person han;
+	private Person luke;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		template = new MongoTemplate(
-				new SimpleMongoClientDbFactory(MongoTestUtils.client(), "ExecutableRemoveOperationSupportTests"));
-		template.dropCollection(STAR_WARS);
+		template.flush();
 
 		han = new Person();
 		han.firstname = "han";
@@ -65,7 +69,7 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void removeAll() {
+	void removeAll() {
 
 		DeleteResult result = template.remove(Person.class).all();
 
@@ -73,15 +77,23 @@ public void removeAll() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void removeAllMatching() {
+	void removeAllMatching() {
 
 		DeleteResult result = template.remove(Person.class).matching(query(where("firstname").is("han"))).all();
 
 		assertThat(result.getDeletedCount()).isEqualTo(1L);
 	}
 
+	@Test // DATAMONGO-2416
+	void removeAllMatchingCriteria() {
+
+		DeleteResult result = template.remove(Person.class).matching(where("firstname").is("han")).all();
+
+		assertThat(result.getDeletedCount()).isEqualTo(1L);
+	}
+
 	@Test // DATAMONGO-1563
-	public void removeAllMatchingWithAlternateDomainTypeAndCollection() {
+	void removeAllMatchingWithAlternateDomainTypeAndCollection() {
 
 		DeleteResult result = template.remove(Jedi.class).inCollection(STAR_WARS).matching(query(where("name").is("luke")))
 				.all();
@@ -90,23 +102,82 @@ public void removeAllMatchingWithAlternateDomainTypeAndCollection() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void removeAndReturnAllMatching() {
+	void removeAndReturnAllMatching() {
 
 		List<Person> result = template.remove(Person.class).matching(query(where("firstname").is("han"))).findAndRemove();
 
 		assertThat(result).containsExactly(han);
 	}
 
-	@Data
+	@Test // GH-4949
+	void removeAndReturnAllMatchingWithResultConverter() {
+
+		List<Optional<Person>> result = template.remove(Person.class).matching(query(where("firstname").is("han"))).map((raw, converted) -> Optional.of(converted.get())).findAndRemove();
+
+		assertThat(result).containsExactly(Optional.of(han));
+	}
+
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person {
+
 		@Id String id;
 		String firstname;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname);
+		}
+
+		public String toString() {
+			return "ExecutableRemoveOperationSupportTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ")";
+		}
 	}
 
-	@Data
 	static class Jedi {
 
-		@Field("firstname") String name;
+		@Field("firstname") //
+		String name;
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String toString() {
+			return "ExecutableRemoveOperationSupportTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupportTests.java
index 4310ca64e5..46732b1a29 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ExecutableUpdateOperationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,18 +19,20 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
+import java.util.Objects;
 import java.util.Optional;
 
 import org.bson.BsonString;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 import com.mongodb.client.result.UpdateResult;
 
@@ -40,20 +42,21 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class ExecutableUpdateOperationSupportTests {
+@ExtendWith(MongoTemplateExtension.class)
+class ExecutableUpdateOperationSupportTests {
 
 	private static final String STAR_WARS = "star-wars";
-	MongoTemplate template;
 
-	Person han;
-	Person luke;
+	@Template(initialEntitySet = { Human.class, Jedi.class, Person.class }) //
+	private static MongoTestTemplate template;
+
+	private Person han;
+	private Person luke;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		template = new MongoTemplate(
-				new SimpleMongoClientDbFactory(MongoTestUtils.client(), "ExecutableUpdateOperationSupportTests"));
-		template.dropCollection(STAR_WARS);
+		template.remove(Person.class).all();
 
 		han = new Person();
 		han.firstname = "han";
@@ -68,28 +71,28 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void domainTypeIsRequired() {
+	void domainTypeIsRequired() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.update(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void updateIsRequired() {
+	void updateIsRequired() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.update(Person.class).apply(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void collectionIsRequiredOnSet() {
+	void collectionIsRequiredOnSet() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.update(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAndModifyOptionsAreRequiredOnSet() {
+	void findAndModifyOptionsAreRequiredOnSet() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> template.update(Person.class).apply(new Update()).withOptions(null));
 	}
 
 	@Test // DATAMONGO-1563
-	public void updateFirst() {
+	void updateFirst() {
 
 		UpdateResult result = template.update(Person.class).apply(new Update().set("firstname", "Han")).first();
 
@@ -98,7 +101,7 @@ public void updateFirst() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void updateAll() {
+	void updateAll() {
 
 		UpdateResult result = template.update(Person.class).apply(new Update().set("firstname", "Han")).all();
 
@@ -107,7 +110,7 @@ public void updateAll() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void updateAllMatching() {
+	void updateAllMatching() {
 
 		UpdateResult result = template.update(Person.class).matching(queryHan()).apply(new Update().set("firstname", "Han"))
 				.all();
@@ -116,8 +119,19 @@ public void updateAllMatching() {
 		assertThat(result.getUpsertedId()).isNull();
 	}
 
+	@Test // DATAMONGO-2416
+	void updateAllMatchingCriteria() {
+
+		UpdateResult result = template.update(Person.class).matching(where("id").is(han.getId()))
+				.apply(new Update().set("firstname", "Han"))
+				.all();
+
+		assertThat(result.getModifiedCount()).isEqualTo(1L);
+		assertThat(result.getUpsertedId()).isNull();
+	}
+
 	@Test // DATAMONGO-1563
-	public void updateWithDifferentDomainClassAndCollection() {
+	void updateWithDifferentDomainClassAndCollection() {
 
 		UpdateResult result = template.update(Jedi.class).inCollection(STAR_WARS)
 				.matching(query(where("_id").is(han.getId()))).apply(new Update().set("name", "Han")).all();
@@ -129,7 +143,7 @@ public void updateWithDifferentDomainClassAndCollection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAndModifyValue() {
+	void findAndModifyValue() {
 
 		Person result = template.update(Person.class).matching(queryHan()).apply(new Update().set("firstname", "Han"))
 				.findAndModifyValue();
@@ -140,7 +154,7 @@ public void findAndModifyValue() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAndModify() {
+	void findAndModify() {
 
 		Optional<Person> result = template.update(Person.class).matching(queryHan())
 				.apply(new Update().set("firstname", "Han")).findAndModify();
@@ -151,7 +165,7 @@ public void findAndModify() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAndModifyWithDifferentDomainTypeAndCollection() {
+	void findAndModifyWithDifferentDomainTypeAndCollection() {
 
 		Optional<Jedi> result = template.update(Jedi.class).inCollection(STAR_WARS)
 				.matching(query(where("_id").is(han.getId()))).apply(new Update().set("name", "Han")).findAndModify();
@@ -162,7 +176,7 @@ public void findAndModifyWithDifferentDomainTypeAndCollection() {
 	}
 
 	@Test // DATAMONGO-1563
-	public void findAndModifyWithOptions() {
+	void findAndModifyWithOptions() {
 
 		Optional<Person> result = template.update(Person.class).matching(queryHan())
 				.apply(new Update().set("firstname", "Han")).withOptions(FindAndModifyOptions.options().returnNew(true))
@@ -171,8 +185,19 @@ public void findAndModifyWithOptions() {
 		assertThat(result.get()).isNotEqualTo(han).hasFieldOrPropertyWithValue("firstname", "Han");
 	}
 
+	@Test // GH-4949
+	void findAndModifyWithResultConverter() {
+
+		Optional<Person> result = template.update(Person.class).matching(queryHan())
+			.apply(new Update().set("firstname", "Han")).withOptions(FindAndModifyOptions.options().returnNew(true))
+			.map((raw, converted) -> Optional.of(converted.get()))
+			.findAndModifyValue();
+
+		assertThat(result.get()).isNotEqualTo(han).hasFieldOrPropertyWithValue("firstname", "Han");
+	}
+
 	@Test // DATAMONGO-1563
-	public void upsert() {
+	void upsert() {
 
 		UpdateResult result = template.update(Person.class).matching(query(where("id").is("id-3")))
 				.apply(new Update().set("firstname", "Chewbacca")).upsert();
@@ -182,7 +207,7 @@ public void upsert() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceValue() {
+	void findAndReplaceValue() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -195,7 +220,7 @@ public void findAndReplaceValue() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplace() {
+	void findAndReplace() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -208,7 +233,7 @@ public void findAndReplace() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceWithCollection() {
+	void findAndReplaceWithCollection() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -222,7 +247,7 @@ public void findAndReplaceWithCollection() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceWithOptions() {
+	void findAndReplaceWithOptions() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -233,8 +258,31 @@ public void findAndReplaceWithOptions() {
 		assertThat(result).isNotEqualTo(han).hasFieldOrPropertyWithValue("firstname", "Luke");
 	}
 
+	@Test // GH-4463
+	void replace() {
+
+		Person luke = new Person();
+		luke.id = han.id;
+		luke.firstname = "Luke";
+
+		UpdateResult result = template.update(Person.class).matching(queryHan()).replaceWith(luke).replaceFirst();
+		assertThat(result.getModifiedCount()).isEqualTo(1L);
+	}
+
+	@Test // GH-4463
+	void replaceWithOptions() {
+
+		Person luke = new Person();
+		luke.id = "upserted-luke";
+		luke.firstname = "Luke";
+
+		UpdateResult result = template.update(Person.class).matching(query(where("firstname")
+				.is("c3p0"))).replaceWith(luke).withOptions(ReplaceOptions.replaceOptions().upsert()).replaceFirst();
+		assertThat(result.getUpsertedId()).isEqualTo(new BsonString("upserted-luke"));
+	}
+
 	@Test // DATAMONGO-1827
-	public void findAndReplaceWithProjection() {
+	void findAndReplaceWithProjection() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -245,25 +293,100 @@ public void findAndReplaceWithProjection() {
 		assertThat(result.getName()).isEqualTo(han.firstname);
 	}
 
+	@Test // GH-4949
+	void findAndReplaceWithResultConverter() {
+
+		Person luke = new Person();
+		luke.firstname = "Luke";
+
+		Optional<Jedi> result = template.update(Person.class).matching(queryHan()).replaceWith(luke).as(Jedi.class) //
+				.map((raw, converted) -> Optional.of(converted.get()))
+			.findAndReplaceValue();
+
+		assertThat(result.get()).isInstanceOf(Jedi.class).extracting(Jedi::getName).isEqualTo(han.firstname);
+	}
+
 	private Query queryHan() {
 		return query(where("id").is(han.getId()));
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person {
+
 		@Id String id;
 		String firstname;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname);
+		}
+
+		public String toString() {
+			return "ExecutableUpdateOperationSupportTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ")";
+		}
 	}
 
-	@Data
 	static class Human {
+
 		@Id String id;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String toString() {
+			return "ExecutableUpdateOperationSupportTests.Human(id=" + this.getId() + ")";
+		}
 	}
 
-	@Data
 	static class Jedi {
 
-		@Field("firstname") String name;
+		@Field("firstname") //
+		String name;
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String toString() {
+			return "ExecutableUpdateOperationSupportTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Friend.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Friend.java
index be1b48f9b2..59938113fd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Friend.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Friend.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/GeoCommandStatisticsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/GeoCommandStatisticsUnitTests.java
index 9237db04c1..c9f979d2d0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/GeoCommandStatisticsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/GeoCommandStatisticsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,12 +18,13 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link GeoCommandStatistics}.
  *
  * @author Oliver Gierke
+ * @author Mark Paluch
  * @soundtrack Fruitcake - Jeff Coffin (The Inside of the Outside)
  */
 public class GeoCommandStatisticsUnitTests {
@@ -37,10 +38,10 @@ public void rejectsNullCommandResult() {
 	public void fallsBackToNanIfNoAverageDistanceIsAvailable() {
 
 		GeoCommandStatistics statistics = GeoCommandStatistics.from(new Document("stats", null));
-		assertThat(statistics.getAverageDistance()).isEqualTo(Double.NaN);
+		assertThat(statistics.getAverageDistance()).isNaN();
 
 		statistics = GeoCommandStatistics.from(new Document("stats", new Document()));
-		assertThat(statistics.getAverageDistance()).isEqualTo(Double.NaN);
+		assertThat(statistics.getAverageDistance()).isNaN();
 	}
 
 	@Test // DATAMONGO-1361
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java
index 62e9c6abfb..3afcef93d0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/JsonSchemaQueryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,50 +20,44 @@
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.core.schema.JsonSchemaProperty.*;
 
-import lombok.Data;
 import reactor.test.StepVerifier;
 
-import org.bson.Document;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
+import java.util.Objects;
 
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
-
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
-
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  */
+@ExtendWith(MongoTemplateExtension.class)
 public class JsonSchemaQueryTests {
 
 	public static final String DATABASE_NAME = "json-schema-query-tests";
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_6_0 = MongoVersionRule.atLeast(Version.parse("3.6.0"));
+	static @Client com.mongodb.reactivestreams.client.MongoClient reactiveClient;
 
-	static MongoClient client = MongoTestUtils.client();
-	MongoTemplate template;
-	Person jellyBelly, roseSpringHeart, kazmardBoombub;
+	@Template(database = DATABASE_NAME, initialEntitySet = Person.class) //
+	static MongoTestTemplate template;
 
-	@BeforeClass
-	public static void beforeClass() {
-		client = MongoTestUtils.client();
-	}
+	Person jellyBelly, roseSpringHeart, kazmardBoombub;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		template = new MongoTemplate(client, DATABASE_NAME);
+		template.flush();
 
 		jellyBelly = new Person();
 		jellyBelly.id = "1";
@@ -92,6 +86,28 @@ public void setUp() {
 		template.save(jellyBelly);
 		template.save(roseSpringHeart);
 		template.save(kazmardBoombub);
+
+	}
+
+	@Test // DATAMONGO-1835
+	public void createsWorkingSchema() {
+
+		try {
+			template.dropCollection("person_schema");
+		} catch (Exception e) {}
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create(template.getConverter()).createSchemaFor(Person.class);
+
+		template.createCollection("person_schema", CollectionOptions.empty().schema(schema));
+	}
+
+	@Test // DATAMONGO-1835
+	public void queriesBooleanType() {
+
+		MongoJsonSchema schema = MongoJsonSchema.builder().properties(JsonSchemaProperty.bool("alive")).build();
+
+		assertThat(template.find(query(matchingDocumentStructure(schema)), Person.class)).hasSize(3);
+		assertThat(template.find(query(Criteria.where("alive").type(Type.BOOLEAN)), Person.class)).hasSize(3);
 	}
 
 	@Test // DATAMONGO-1835
@@ -108,10 +124,9 @@ public void findsDocumentsWithRequiredFieldsReactively() {
 
 		MongoJsonSchema schema = MongoJsonSchema.builder().required("address").build();
 
-		com.mongodb.reactivestreams.client.MongoClient mongoClient = MongoTestUtils.reactiveClient();
-
-		new ReactiveMongoTemplate(mongoClient, DATABASE_NAME).find(query(matchingDocumentStructure(schema)), Person.class)
-				.as(StepVerifier::create).expectNextCount(2).verifyComplete();
+		new ReactiveMongoTemplate(reactiveClient, DATABASE_NAME)
+				.find(query(matchingDocumentStructure(schema)), Person.class).as(StepVerifier::create).expectNextCount(2)
+				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1835
@@ -198,27 +213,140 @@ public void findsWithSchemaReturningRawDocument() {
 
 		MongoJsonSchema schema = MongoJsonSchema.builder().required("address").build();
 
-		assertThat(template.find(query(matchingDocumentStructure(schema)), Document.class, template.getCollectionName(Person.class)))
-				.hasSize(2);
+		assertThat(template.find(query(matchingDocumentStructure(schema)), Document.class,
+				template.getCollectionName(Person.class))).hasSize(2);
 	}
 
-	@Data
 	static class Person {
 
 		@Id String id;
 
-		@Field("full_name") String name;
+		@Field("full_name") //
+		String name;
 		Gender gender;
 		Address address;
 		Object value;
+
+		boolean alive;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public Gender getGender() {
+			return this.gender;
+		}
+
+		public Address getAddress() {
+			return this.address;
+		}
+
+		public Object getValue() {
+			return this.value;
+		}
+
+		public boolean isAlive() {
+			return this.alive;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public void setGender(Gender gender) {
+			this.gender = gender;
+		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
+		public void setValue(Object value) {
+			this.value = value;
+		}
+
+		public void setAlive(boolean alive) {
+			this.alive = alive;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return alive == person.alive && Objects.equals(id, person.id) && Objects.equals(name, person.name)
+					&& gender == person.gender && Objects.equals(address, person.address) && Objects.equals(value, person.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, gender, address, value, alive);
+		}
+
+		public String toString() {
+			return "JsonSchemaQueryTests.Person(id=" + this.getId() + ", name=" + this.getName() + ", gender="
+					+ this.getGender() + ", address=" + this.getAddress() + ", value=" + this.getValue() + ", alive="
+					+ this.isAlive() + ")";
+		}
 	}
 
-	@Data
 	static class Address {
 
 		String city;
 
-		@Field("str") String street;
+		@Field("str") //
+		String street;
+
+		public String getCity() {
+			return this.city;
+		}
+
+		public String getStreet() {
+			return this.street;
+		}
+
+		public void setCity(String city) {
+			this.city = city;
+		}
+
+		public void setStreet(String street) {
+			this.street = street;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Address address = (Address) o;
+			return Objects.equals(city, address.city) && Objects.equals(street, address.street);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(city, street);
+		}
+
+		public String toString() {
+			return "JsonSchemaQueryTests.Address(city=" + this.getCity() + ", street=" + this.getStreet() + ")";
+		}
 	}
 
 	static enum Gender {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java
index de77ee6b0f..adaecad5da 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MappingMongoJsonSchemaCreatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,27 +15,38 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.springframework.data.mongodb.test.util.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThatExceptionOfType;
 
 import java.util.Collections;
 import java.util.Date;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.bson.BsonDocument;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.convert.WritingConverter;
 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.Encrypted;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.FieldType;
 import org.springframework.data.mongodb.core.mapping.MongoId;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Queryable;
+import org.springframework.data.mongodb.core.mapping.RangeEncrypted;
+import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
+import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema.ConflictResolutionFunction.Resolution;
+import org.springframework.data.spel.spi.EvaluationContextExtension;
+import org.springframework.data.spel.spi.Function;
 
 /**
  * Unit tests for {@link MappingMongoJsonSchemaCreator}.
@@ -43,14 +54,14 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class MappingMongoJsonSchemaCreatorUnitTests {
+class MappingMongoJsonSchemaCreatorUnitTests {
 
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
-	MappingMongoJsonSchemaCreator schemaCreator;
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
+	private MappingMongoJsonSchemaCreator schemaCreator;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		mappingContext = new MongoMappingContext();
 		converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
@@ -58,7 +69,7 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void simpleTypes() {
+	void simpleTypes() {
 
 		MongoJsonSchema schema = schemaCreator.createSchemaFor(VariousFieldTypes.class);
 
@@ -66,21 +77,21 @@ public void simpleTypes() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void withRemappedIdType() {
+	void withRemappedIdType() {
 
 		MongoJsonSchema schema = schemaCreator.createSchemaFor(WithExplicitMongoIdTypeMapping.class);
 		assertThat(schema.toDocument().get("$jsonSchema", Document.class)).isEqualTo(WITH_EXPLICIT_MONGO_ID_TYPE_MAPPING);
 	}
 
 	@Test // DATAMONGO-1849
-	public void cyclic() {
+	void cyclic() {
 
 		MongoJsonSchema schema = schemaCreator.createSchemaFor(Cyclic.class);
 		assertThat(schema.toDocument().get("$jsonSchema", Document.class)).isEqualTo(CYCLIC);
 	}
 
 	@Test // DATAMONGO-1849
-	public void converterRegistered() {
+	void converterRegistered() {
 
 		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
 		MongoCustomConversions mcc = new MongoCustomConversions(
@@ -95,11 +106,232 @@ public void converterRegistered() {
 				"{ 'type' : 'object', 'properties' : { '_id' : { 'type' : 'object' }, 'nested' : { 'type' : 'object' } } }");
 	}
 
+	@Test // GH-3800
+	void csfle/*encryptedFieldsOnly*/() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.filter(MongoJsonSchemaCreator.encryptedOnly()) // filter non encrypted fields
+				.createSchemaFor(Patient.class);
+
+		Document targetSchema = schema.schemaDocument();
+		assertThat(targetSchema.toBsonDocument()).isEqualTo(BsonDocument.parse(PATIENT));
+	}
+
+	@Test // GH-3800
+	void csfleCyclic/*encryptedFieldsOnly*/() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.filter(MongoJsonSchemaCreator.encryptedOnly()) // filter non encrypted fields
+				.createSchemaFor(Cyclic.class);
+
+		Document targetSchema = schema.schemaDocument();
+		assertThat(targetSchema).isNotNull();
+	}
+
+	@Test // GH-3800
+	void csfleWithKeyFromProperties() {
+
+		GenericApplicationContext applicationContext = new GenericApplicationContext();
+		applicationContext.registerBean("encryptionExtension", EncryptionExtension.class, () -> new EncryptionExtension());
+		applicationContext.refresh();
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setApplicationContext(applicationContext);
+		mappingContext.afterPropertiesSet();
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create(mappingContext) //
+				.filter(MongoJsonSchemaCreator.encryptedOnly()) //
+				.createSchemaFor(EncryptionMetadataFromProperty.class);
+
+		assertThat(schema.schemaDocument().toBsonDocument()).isEqualTo(BsonDocument.parse(ENC_FROM_PROPERTY_SCHEMA));
+	}
+
+	@Test // GH-3800
+	void csfleWithKeyFromMethod() {
+
+		GenericApplicationContext applicationContext = new GenericApplicationContext();
+		applicationContext.registerBean("encryptionExtension", EncryptionExtension.class, () -> new EncryptionExtension());
+		applicationContext.refresh();
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setApplicationContext(applicationContext);
+		mappingContext.afterPropertiesSet();
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create(mappingContext) //
+				.filter(MongoJsonSchemaCreator.encryptedOnly()) //
+				.createSchemaFor(EncryptionMetadataFromMethod.class);
+
+		assertThat(schema.schemaDocument().toBsonDocument()).isEqualTo(BsonDocument.parse(ENC_FROM_METHOD_SCHEMA));
+	}
+
+	// --> Combining Schemas and Properties
+
+	@Test // GH-3870
+	void shouldAllowToSpecifyPolymorphicTypesForProperty() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.property("objectValue").withTypes(A.class, B.class).createSchemaFor(SomeTestObject.class);
+
+		Document targetSchema = schema.schemaDocument();
+		assertThat(targetSchema) //
+				.containsEntry("properties.objectValue.properties.aNonEncrypted", new Document("type", "string")) //
+				.containsEntry("properties.objectValue.properties.aEncrypted", ENCRYPTED_BSON_STRING) //
+				.containsEntry("properties.objectValue.properties.bEncrypted", ENCRYPTED_BSON_STRING);
+	}
+
+	@Test // GH-3870
+	void shouldAllowToSpecifyNestedPolymorphicTypesForProperty() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.property("value.objectValue").withTypes(A.class, B.class) //
+				.createSchemaFor(WrapperAroundA.class);
+
+		assertThat(schema.schemaDocument()) //
+				.containsEntry("properties.value.properties.objectValue.properties.aNonEncrypted",
+						new Document("type", "string")) //
+				.containsEntry("properties.value.properties.objectValue.properties.aEncrypted", ENCRYPTED_BSON_STRING) //
+				.containsEntry("properties.value.properties.objectValue.properties.bEncrypted", ENCRYPTED_BSON_STRING);
+
+	}
+
+	@Test // GH-3870
+	void shouldAllowToSpecifyGenericTypesForProperty() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.property("genericValue").withTypes(A.class, B.class).createSchemaFor(SomeTestObject.class);
+
+		assertThat(schema.schemaDocument()) //
+				.containsEntry("properties.genericValue.properties.aNonEncrypted", new Document("type", "string")) //
+				.containsEntry("properties.genericValue.properties.aEncrypted", ENCRYPTED_BSON_STRING) //
+				.containsEntry("properties.genericValue.properties.bEncrypted", ENCRYPTED_BSON_STRING);
+	}
+
+	@Test // GH-3870
+	void encryptionFilterShouldCaptureSpecifiedPolymorphicTypesForProperty() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.property("objectValue").withTypes(A.class, B.class) //
+				.filter(MongoJsonSchemaCreator.encryptedOnly()) //
+				.createSchemaFor(SomeTestObject.class);
+
+		assertThat(schema.schemaDocument()) //
+				.doesNotContainKey("properties.objectValue.properties.aNonEncrypted") //
+				.containsEntry("properties.objectValue.properties.aEncrypted", ENCRYPTED_BSON_STRING) //
+				.containsEntry("properties.objectValue.properties.bEncrypted", ENCRYPTED_BSON_STRING);
+	}
+
+	@Test // GH-3870
+	void allowsToCreateCombinedSchemaWhenPropertiesDoNotOverlap() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create().mergedSchemaFor(A.class, B.class, C.class);
+
+		assertThat(schema.schemaDocument()) //
+				.containsEntry("properties.aNonEncrypted", new Document("type", "string")) //
+				.containsEntry("properties.aEncrypted", ENCRYPTED_BSON_STRING) //
+				.containsEntry("properties.bEncrypted", ENCRYPTED_BSON_STRING) //
+				.containsEntry("properties.cEncrypted", ENCRYPTED_BSON_STRING);
+	}
+
+	@Test // GH-3870
+	void combinedSchemaFailsOnPropertyClash() {
+
+		MongoJsonSchema schemaA = MongoJsonSchemaCreator.create() //
+				.createSchemaFor(A.class);
+		MongoJsonSchema schemaAButDifferent = MongoJsonSchemaCreator.create() //
+				.createSchemaFor(PropertyClashWithA.class);
+
+		MongoJsonSchema targetSchema = schemaA.mergeWith(schemaAButDifferent);
+
+		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(targetSchema::schemaDocument);
+	}
+
+	@Test // GH-3870
+	void combinedSchemaAllowsToCompensateErrors() {
+
+		MongoJsonSchema schemaA = MongoJsonSchemaCreator.create() //
+				.createSchemaFor(A.class);
+		MongoJsonSchema schemaAButDifferent = MongoJsonSchemaCreator.create() //
+				.createSchemaFor(PropertyClashWithA.class);
+
+		MongoJsonSchema schema = schemaA.mergeWith(Collections.singleton(schemaAButDifferent),
+				(path, a, b) -> Resolution.ofValue(path, "object"));
+
+		assertThat(schema.schemaDocument()) //
+				.containsEntry("properties.aNonEncrypted", new Document("type", "object"));
+	}
+
+	@Test // GH-3870
+	void bsonTypeVsJustTypeValueResolutionIsDoneByDefault() {
+
+		MongoJsonSchema schemaUsingType = MongoJsonSchema.builder()
+				.property(JsonSchemaProperty.named("value").ofType(Type.jsonTypeOf("string"))).build();
+		MongoJsonSchema schemaUsingBsonType = MongoJsonSchema.builder()
+				.property(JsonSchemaProperty.named("value").ofType(Type.bsonTypeOf("string"))).build();
+
+		MongoJsonSchema targetSchema = MongoJsonSchema.merge(schemaUsingType, schemaUsingBsonType);
+
+		assertThat(targetSchema.schemaDocument()) //
+				.containsEntry("properties.value", new Document("type", "string"));
+	}
+
+	@Test // GH-4454
+	void wrapEncryptedEntityTypeLikeProperty() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.filter(MongoJsonSchemaCreator.encryptedOnly()) // filter non encrypted fields
+				.createSchemaFor(WithEncryptedEntityLikeProperty.class);
+
+		assertThat(schema.schemaDocument()) //
+				.containsEntry("properties.domainTypeValue", Document.parse("{'encrypt': {'bsonType': 'object' } }"));
+	}
+
+	@Test // GH-4185
+	void qeRangeEncryptedProperties() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create() //
+				.filter(MongoJsonSchemaCreator.encryptedOnly()) // filter non encrypted fields
+				.createSchemaFor(QueryableEncryptedRoot.class);
+
+		String expectedForInt = """
+				{ 'encrypt' : {
+					'algorithm' : 'Range',
+					'bsonType' : 'int',
+					'queries' : [
+						{ 'queryType' : 'range', 'contention' : { '$numberLong' : '0' }, 'max' : 200, 'min' : 0, 'sparsity' : 1, 'trimFactor' : 1 }
+					]
+				}}""";
+
+		String expectedForRootLong = """
+				{ 'encrypt' : {
+					'algorithm' : 'Range',
+					'bsonType' : 'long',
+					'queries' : [
+						{ 'queryType' : 'range', contention : { '$numberLong' : '0' }, 'sparsity' : 0 }
+					]
+				}}""";
+
+		String expectedForNestedLong = """
+				{ 'encrypt' : {
+					'algorithm' : 'Range',
+					'bsonType' : 'long',
+					'queries' : [
+						{ 'queryType' : 'range', contention : { '$numberLong' : '1' }, 'max' : { '$numberLong' : '1' }, 'min' : { '$numberLong' : '-1' }, 'sparsity' : 1, 'trimFactor' : 1 }
+					]
+				}}""";
+
+		assertThat(schema.schemaDocument()) //
+				.doesNotContainKey("properties.unencrypted") //
+				.containsEntry("properties.encryptedInt", Document.parse(expectedForInt))
+				.containsEntry("properties.encryptedLong", Document.parse(expectedForRootLong))
+				.containsEntry("properties.nested.properties.encrypted_long", Document.parse(expectedForNestedLong));
+
+	}
+
 	// --> TYPES AND JSON
 
 	// --> ENUM
 
-	static final String JUST_SOME_ENUM = "{ 'type' : 'string', 'enum' : ['ONE', 'TWO'] }";
+	private static final String JUST_SOME_ENUM = "{ 'type' : 'string', 'enum' : ['ONE', 'TWO'] }";
 
 	enum JustSomeEnum {
 		ONE, TWO
@@ -123,10 +355,13 @@ enum JustSomeEnum {
 			"        'arrayProperty' : { 'type' : 'array' }," + //
 			"        'binaryDataProperty' : { 'bsonType' : 'binData' }," + //
 			"        'collectionProperty' : { 'type' : 'array' }," + //
+			"        'simpleTypeCollectionProperty' : { 'type' : 'array', 'items' : { 'type' : 'string' } }," + //
+			"        'complexTypeCollectionProperty' : { 'type' : 'array', 'items' : { 'type' : 'object', 'properties' : { 'field' : { 'type' : 'string'} } } }"
+			+ //
+			"        'enumTypeCollectionProperty' : { 'type' : 'array', 'items' : " + JUST_SOME_ENUM + " }" + //
 			"        'mapProperty' : { 'type' : 'object' }," + //
 			"        'objectProperty' : { 'type' : 'object' }," + //
-			"        'enumProperty' : " + JUST_SOME_ENUM + //
-			"     }" + //
+			"        'enumProperty' : " + JUST_SOME_ENUM + "     }" + //
 			"}";
 
 	static class VariousFieldTypes {
@@ -142,12 +377,19 @@ static class VariousFieldTypes {
 		Date dateProperty;
 		Object[] arrayProperty;
 		byte[] binaryDataProperty;
-		List<String> collectionProperty;
+		List<Object> collectionProperty;
+		List<String> simpleTypeCollectionProperty;
+		List<SomeDomainType> complexTypeCollectionProperty;
+		List<JustSomeEnum> enumTypeCollectionProperty;
 		Map<String, String> mapProperty;
 		Object objectProperty;
 		JustSomeEnum enumProperty;
 	}
 
+	static class SomeDomainType {
+		String field;
+	}
+
 	// --> NESTED DOMAIN TYPE
 
 	static final String WITH_NESTED_DOMAIN_TYPE = "" + //
@@ -249,4 +491,275 @@ public org.bson.Document convert(VariousFieldTypes source) {
 		}
 	}
 
+	static final String PATIENT = "{" + //
+			"  'type': 'object'," + //
+			"  'encryptMetadata': {" + //
+			"    'keyId': [" + //
+			"      {" + //
+			"        '$binary': {" + //
+			"          'base64': 'xKVup8B1Q+CkHaVRx+qa+g=='," + //
+			"          'subType': '04'" + //
+			"        }" + //
+			"      }" + //
+			"    ]" + //
+			"  }," + //
+			"  'properties': {" + //
+			"    'ssn': {" + //
+			"      'encrypt': {" + //
+			"        'bsonType': 'int'," + //
+			"        'algorithm': 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic'" + //
+			"      }" + //
+			"    }," + //
+			"    'bloodType': {" + //
+			"      'encrypt': {" + //
+			"        'bsonType': 'string'," + //
+			"        'algorithm': 'AEAD_AES_256_CBC_HMAC_SHA_512-Random'" + //
+			"      }" + //
+			"    }," + //
+			"    'medicalRecords': {" + //
+			"      'encrypt': {" + //
+			"        'bsonType': 'array'," + //
+			"        'algorithm': 'AEAD_AES_256_CBC_HMAC_SHA_512-Random'" + //
+			"      }" + //
+			"    }," + //
+			"    'insurance': {" + //
+			"      'type': 'object'," + //
+			"      'properties': {" + //
+			"        'policyNumber': {" + //
+			"          'encrypt': {" + //
+			"            'bsonType': 'int'," + //
+			"            'algorithm': 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic'" + //
+			"          }" + //
+			"        }" + //
+			"      }" + //
+			"    }" + //
+			"  }" + //
+			"}";
+
+	@Encrypted(keyId = "xKVup8B1Q+CkHaVRx+qa+g==")
+	static class Patient {
+		String name;
+
+		@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") //
+		Integer ssn;
+
+		@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Random") //
+		String bloodType;
+
+		String keyAltNameField;
+
+		@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Random") //
+		List<Map<String, String>> medicalRecords;
+
+		Insurance insurance;
+	}
+
+	static class Insurance {
+
+		@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") //
+		Integer policyNumber;
+
+		String provider;
+	}
+
+	static final String ENC_FROM_PROPERTY_ENTITY_KEY = "C5a5aMB7Ttq4wSJTFeRn8g==";
+	static final String ENC_FROM_PROPERTY_PROPOERTY_KEY = "Mw6mdTVPQfm4quqSCLVB3g==";
+	static final String ENC_FROM_PROPERTY_SCHEMA = "{" + //
+			"  'encryptMetadata': {" + //
+			"    'keyId': [" + //
+			"      {" + //
+			"        '$binary': {" + //
+			"          'base64': '" + ENC_FROM_PROPERTY_ENTITY_KEY + "'," + //
+			"          'subType': '04'" + //
+			"        }" + //
+			"      }" + //
+			"    ]" + //
+			"  }," + //
+			"  'type': 'object'," + //
+			"  'properties': {" + //
+			"    'policyNumber': {" + //
+			"      'encrypt': {" + //
+			"        'keyId': [" + //
+			"          [" + //
+			"            {" + //
+			"              '$binary': {" + //
+			"                'base64': '" + ENC_FROM_PROPERTY_PROPOERTY_KEY + "'," + //
+			"                'subType': '04'" + //
+			"              }" + //
+			"            }" + //
+			"          ]" + //
+			"        ]," + //
+			"        'bsonType': 'int'," + //
+			"        'algorithm': 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic'" + //
+			"      }" + //
+			"    }" + //
+			"  }" + //
+			"}";
+
+	@Encrypted(keyId = "#{entityKey}")
+	static class EncryptionMetadataFromProperty {
+
+		@Encrypted(keyId = "#{propertyKey}", algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") //
+		Integer policyNumber;
+
+		String provider;
+	}
+
+	static final String ENC_FROM_METHOD_ENTITY_KEY = "4fPYFM9qSgyRAjgQ2u+IMQ==";
+	static final String ENC_FROM_METHOD_PROPOERTY_KEY = "+idiseKwTVCJfSKC3iUeYQ==";
+	static final String ENC_FROM_METHOD_SCHEMA = "{" + //
+			"  'encryptMetadata': {" + //
+			"    'keyId': [" + //
+			"      {" + //
+			"        '$binary': {" + //
+			"          'base64': '" + ENC_FROM_METHOD_ENTITY_KEY + "'," + //
+			"          'subType': '04'" + //
+			"        }" + //
+			"      }" + //
+			"    ]" + //
+			"  }," + //
+			"  'type': 'object'," + //
+			"  'properties': {" + //
+			"    'policyNumber': {" + //
+			"      'encrypt': {" + //
+			"        'keyId': [" + //
+			"          [" + //
+			"            {" + //
+			"              '$binary': {" + //
+			"                'base64': '" + ENC_FROM_METHOD_PROPOERTY_KEY + "'," + //
+			"                'subType': '04'" + //
+			"              }" + //
+			"            }" + //
+			"          ]" + //
+			"        ]," + //
+			"        'bsonType': 'int'," + //
+			"        'algorithm': 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic'" + //
+			"      }" + //
+			"    }" + //
+			"  }" + //
+			"}";
+
+	@Encrypted(keyId = "#{mongocrypt.keyId(#target)}")
+	static class EncryptionMetadataFromMethod {
+
+		@Encrypted(keyId = "#{mongocrypt.keyId(#target)}", algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") //
+		Integer policyNumber;
+
+		String provider;
+	}
+
+	public static class EncryptionExtension implements EvaluationContextExtension {
+
+		@Override
+		public String getExtensionId() {
+			return "mongocrypt";
+		}
+
+		@Override
+		public Map<String, Object> getProperties() {
+
+			Map<String, Object> properties = new LinkedHashMap<>();
+			properties.put("entityKey", ENC_FROM_PROPERTY_ENTITY_KEY);
+			properties.put("propertyKey", ENC_FROM_PROPERTY_PROPOERTY_KEY);
+			return properties;
+		}
+
+		@Override
+		public Map<String, Function> getFunctions() {
+			try {
+				return Collections.singletonMap("keyId",
+						new Function(EncryptionExtension.class.getMethod("keyId", String.class), this));
+			} catch (NoSuchMethodException e) {
+				e.printStackTrace();
+			}
+			return Collections.emptyMap();
+		}
+
+		public String keyId(String target) {
+
+			if (target.equals("EncryptionMetadataFromMethod")) {
+				return ENC_FROM_METHOD_ENTITY_KEY;
+			}
+
+			if (target.equals("EncryptionMetadataFromMethod.policyNumber")) {
+				return ENC_FROM_METHOD_PROPOERTY_KEY;
+			}
+
+			return "xKVup8B1Q+CkHaVRx+qa+g==";
+		}
+	}
+
+	private static final Document ENCRYPTED_BSON_STRING = Document
+			.parse("{'encrypt': { 'bsonType': 'string','algorithm': 'AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic'} }");
+
+	static class SomeTestObject<T> {
+		T genericValue;
+		Object objectValue;
+	}
+
+	static class RootWithGenerics<S, T> {
+		S sValue;
+		T tValue;
+	}
+
+	static class SubWithFixedGeneric<T> extends RootWithGenerics<A, T> {
+
+	}
+
+	static class Concrete extends SubWithFixedGeneric<B> {
+
+	}
+
+	static class WrapperAroundA {
+
+		SomeTestObject value;
+	}
+
+	static class A {
+
+		String aNonEncrypted;
+
+		@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") String aEncrypted;
+	}
+
+	static class B {
+		@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") String bEncrypted;
+	}
+
+	static class C extends A {
+		@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") String cEncrypted;
+	}
+
+	static class PropertyClashWithA {
+		Integer aNonEncrypted;
+	}
+
+	@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+	static class WithEncryptedEntityLikeProperty {
+		@Encrypted SomeDomainType domainTypeValue;
+	}
+
+	static class QueryableEncryptedRoot {
+
+		String unencrypted;
+
+		@RangeEncrypted(contentionFactor = 0L, rangeOptions = "{ 'min': 0, 'max': 200, 'trimFactor': 1, 'sparsity': 1}") //
+		Integer encryptedInt;
+
+		@Encrypted(algorithm = "Range")
+		@Queryable(contentionFactor = 0L, queryType = "range", queryAttributes = "{ 'sparsity': 0 }") //
+		Long encryptedLong;
+
+		NestedRangeEncrypted nested;
+
+	}
+
+	static class NestedRangeEncrypted {
+
+		@Field("encrypted_long")
+		@RangeEncrypted(contentionFactor = 1L,
+				rangeOptions = "{ 'min': { '$numberLong' : '-1' }, 'max': { '$numberLong' : '1' }, 'trimFactor': 1, 'sparsity': 1}") //
+		Long encryptedLong;
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoAdminIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoAdminIntegrationTests.java
index 5f251e6519..f8a5c1128a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoAdminIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoAdminIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,24 +22,21 @@
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import com.mongodb.DB;
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
 
 /**
  * This test class assumes that you are already running the MongoDB server.
  *
  * @author Mark Pollack
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class MongoAdminIntegrationTests {
 
 	private static final Log logger = LogFactory.getLog(MongoAdminIntegrationTests.class);
 
-	@SuppressWarnings("unused") private DB testAdminDb;
-
 	@Autowired MongoClient mongoClient;
 
 	MongoAdmin mongoAdmin;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientFactoryBeanUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientFactoryBeanUnitTests.java
new file mode 100644
index 0000000000..868190db5d
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientFactoryBeanUnitTests.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2019-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.Test;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ServerAddress;
+
+/**
+ * Unit tests for {@link MongoClientFactoryBean}.
+ *
+ * @author Christoph Strobl
+ */
+class MongoClientFactoryBeanUnitTests {
+
+	static final String CONNECTION_STRING_STRING = "mongodb://db1.example.net:27017,db2.example.net:2500/?replicaSet=test&connectTimeoutMS=300000";
+	static final ConnectionString CONNECTION_STRING = new ConnectionString(CONNECTION_STRING_STRING);
+
+	@Test // DATAMONGO-2427
+	void connectionStringParametersNotOverriddenByDefaults() {
+
+		MongoClientFactoryBean factoryBean = new MongoClientFactoryBean();
+		factoryBean.setConnectionString(CONNECTION_STRING);
+		factoryBean.setMongoClientSettings(MongoClientSettings.builder().build());
+
+		MongoClientSettings settings = factoryBean.computeClientSetting();
+
+		assertThat(settings.getClusterSettings().getRequiredReplicaSetName()).isEqualTo("test");
+		assertThat(settings.getSocketSettings().getConnectTimeout(TimeUnit.MILLISECONDS)).isEqualTo(300000);
+		assertThat(settings.getClusterSettings().getHosts()).hasSize(2);
+	}
+
+	@Test // DATAMONGO-2427
+	void hostPortParametersNotOverriddenByDefaults() {
+
+		MongoClientFactoryBean factoryBean = new MongoClientFactoryBean();
+		factoryBean.setPort(2500);
+		factoryBean.setHost("db2.example.net");
+		factoryBean.setReplicaSet("rs0");
+		factoryBean.setMongoClientSettings(MongoClientSettings.builder().build());
+
+		MongoClientSettings settings = factoryBean.computeClientSetting();
+
+		assertThat(settings.getClusterSettings().getRequiredReplicaSetName()).isEqualTo("rs0");
+		assertThat(settings.getClusterSettings().getHosts()).containsExactly(new ServerAddress("db2.example.net", 2500));
+	}
+
+	@Test // DATAMONGO-2427
+	void explicitSettingsOverrideConnectionStringOnes() {
+
+		MongoClientFactoryBean factoryBean = new MongoClientFactoryBean();
+		factoryBean.setConnectionString(CONNECTION_STRING);
+		factoryBean.setMongoClientSettings(
+				MongoClientSettings.builder().applyToClusterSettings(it -> it.requiredReplicaSetName("rs0"))
+						.applyToSocketSettings(it -> it.connectTimeout(100, TimeUnit.MILLISECONDS)).build());
+
+		MongoClientSettings settings = factoryBean.computeClientSetting();
+
+		assertThat(settings.getClusterSettings().getRequiredReplicaSetName()).isEqualTo("rs0");
+		assertThat(settings.getSocketSettings().getConnectTimeout(TimeUnit.MILLISECONDS)).isEqualTo(100);
+		assertThat(settings.getClusterSettings().getHosts()).hasSize(2);
+	}
+
+	@Test // DATAMONGO-2427
+	void hostAndPortPlusConnectionStringError() {
+
+		MongoClientFactoryBean factoryBean = new MongoClientFactoryBean();
+		factoryBean.setConnectionString(CONNECTION_STRING);
+		factoryBean.setHost("localhost");
+		factoryBean.setPort(27017);
+		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(factoryBean::createInstance);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBeanIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBeanIntegrationTests.java
similarity index 81%
rename from spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBeanIntegrationTests.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBeanIntegrationTests.java
index b4a4734854..7c6e33ec5e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientOptionsFactoryBeanIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBeanIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -27,16 +27,16 @@
 import com.mongodb.ReadPreference;
 
 /**
- * Integration tests for {@link MongoClientOptionsFactoryBean}.
+ * Integration tests for {@link MongoClientSettingsFactoryBean}.
  *
  * @author Christoph Strobl
  */
-public class MongoClientOptionsFactoryBeanIntegrationTests {
+public class MongoClientSettingsFactoryBeanIntegrationTests {
 
 	@Test // DATAMONGO-1158
 	public void convertsReadPreferenceConcernCorrectly() {
 
-		RootBeanDefinition definition = new RootBeanDefinition(MongoClientOptionsFactoryBean.class);
+		RootBeanDefinition definition = new RootBeanDefinition(MongoClientSettingsFactoryBean.class);
 		definition.getPropertyValues().addPropertyValue("readPreference", "NEAREST");
 
 		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
@@ -44,7 +44,7 @@ public void convertsReadPreferenceConcernCorrectly() {
 
 		factory.registerBeanDefinition("factory", definition);
 
-		MongoClientOptionsFactoryBean bean = factory.getBean("&factory", MongoClientOptionsFactoryBean.class);
+		MongoClientSettingsFactoryBean bean = factory.getBean("&factory", MongoClientSettingsFactoryBean.class);
 		assertThat(ReflectionTestUtils.getField(bean, "readPreference")).isEqualTo((Object) ReadPreference.nearest());
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBeanUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBeanUnitTests.java
new file mode 100644
index 0000000000..2ddaca7f24
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoClientSettingsFactoryBeanUnitTests.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2019-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import org.bson.UuidRepresentation;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.data.mongodb.config.ReadConcernPropertyEditor;
+import org.springframework.data.mongodb.config.ReadPreferencePropertyEditor;
+import org.springframework.data.mongodb.config.UUidRepresentationPropertyEditor;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
+
+/**
+ * Unit tests for {@link MongoClientSettingsFactoryBean}.
+ *
+ * @author Christoph Strobl
+ */
+public class MongoClientSettingsFactoryBeanUnitTests {
+
+	@Test // DATAMONGO-2384
+	public void convertsReadPreferenceConcernCorrectly() {
+
+		RootBeanDefinition definition = new RootBeanDefinition(MongoClientSettingsFactoryBean.class);
+		definition.getPropertyValues().addPropertyValue("readPreference", "NEAREST");
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerCustomEditor(ReadPreference.class, ReadPreferencePropertyEditor.class);
+
+		factory.registerBeanDefinition("factory", definition);
+
+		MongoClientSettingsFactoryBean bean = factory.getBean("&factory", MongoClientSettingsFactoryBean.class);
+		assertThat(ReflectionTestUtils.getField(bean, "readPreference")).isEqualTo(ReadPreference.nearest());
+	}
+
+	@Test // DATAMONGO-2384
+	public void convertsReadConcernConcernCorrectly() {
+
+		RootBeanDefinition definition = new RootBeanDefinition(MongoClientSettingsFactoryBean.class);
+		definition.getPropertyValues().addPropertyValue("readConcern", "MAJORITY");
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerCustomEditor(ReadPreference.class, ReadConcernPropertyEditor.class);
+
+		factory.registerBeanDefinition("factory", definition);
+
+		MongoClientSettingsFactoryBean bean = factory.getBean("&factory", MongoClientSettingsFactoryBean.class);
+		assertThat(ReflectionTestUtils.getField(bean, "readConcern")).isEqualTo(ReadConcern.MAJORITY);
+	}
+
+	@Test // DATAMONGO-2427
+	public void convertsUuidRepresentationCorrectly() {
+
+		RootBeanDefinition definition = new RootBeanDefinition(MongoClientSettingsFactoryBean.class);
+		definition.getPropertyValues().addPropertyValue("uUidRepresentation", "STANDARD");
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerCustomEditor(ReadPreference.class, UUidRepresentationPropertyEditor.class);
+
+		factory.registerBeanDefinition("factory", definition);
+
+		MongoClientSettingsFactoryBean bean = factory.getBean("&factory", MongoClientSettingsFactoryBean.class);
+		assertThat(ReflectionTestUtils.getField(bean, "uUidRepresentation")).isEqualTo(UuidRepresentation.STANDARD);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBeanTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBeanTests.java
index c701e7e058..a45b099640 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBeanTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoEncryptionSettingsFactoryBeanTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.test.util.ReflectionTestUtils;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java
index 1a469bb2c1..bdc151ec63 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoExceptionTranslatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,11 +17,11 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import java.net.UnknownHostException;
-
 import org.bson.BsonDocument;
-import org.junit.Before;
-import org.junit.Test;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
 
 import org.springframework.core.NestedRuntimeException;
 import org.springframework.dao.DataAccessException;
@@ -37,6 +37,8 @@
 import com.mongodb.MongoException;
 import com.mongodb.MongoInternalException;
 import com.mongodb.MongoSocketException;
+import com.mongodb.MongoSocketReadTimeoutException;
+import com.mongodb.MongoSocketWriteException;
 import com.mongodb.ServerAddress;
 
 /**
@@ -45,18 +47,20 @@
  * @author Michal Vich
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Brice Vandeputte
  */
-public class MongoExceptionTranslatorUnitTests {
+class MongoExceptionTranslatorUnitTests {
 
-	MongoExceptionTranslator translator;
+	private static final String EXCEPTION_MESSAGE = "IOException";
+	private MongoExceptionTranslator translator;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		translator = new MongoExceptionTranslator();
 	}
 
 	@Test
-	public void translateDuplicateKey() {
+	void translateDuplicateKey() {
 
 		expectExceptionWithCauseMessage(
 				translator.translateExceptionIfPossible(
@@ -64,39 +68,53 @@ public void translateDuplicateKey() {
 				DuplicateKeyException.class, null);
 	}
 
-	@Test
-	public void translateSocketException() {
+	@Test // GH-3568
+	void translateSocketException() {
+
+		expectExceptionWithCauseMessage(
+				translator.translateExceptionIfPossible(new MongoSocketException(EXCEPTION_MESSAGE, new ServerAddress())),
+				DataAccessResourceFailureException.class, EXCEPTION_MESSAGE);
+	}
+
+	@Test // GH-3568
+	void translateSocketExceptionSubclasses() {
+
+		expectExceptionWithCauseMessage(
+				translator.translateExceptionIfPossible(new MongoSocketWriteException("intermediate message",
+						new ServerAddress(), new Exception(EXCEPTION_MESSAGE))),
+				DataAccessResourceFailureException.class, EXCEPTION_MESSAGE);
 
 		expectExceptionWithCauseMessage(
-				translator.translateExceptionIfPossible(new MongoSocketException("IOException", new ServerAddress())),
-				DataAccessResourceFailureException.class, "IOException");
+				translator.translateExceptionIfPossible(new MongoSocketReadTimeoutException("intermediate message",
+						new ServerAddress(), new Exception(EXCEPTION_MESSAGE))),
+				DataAccessResourceFailureException.class, EXCEPTION_MESSAGE);
 
 	}
 
 	@Test
-	public void translateCursorNotFound() throws UnknownHostException {
+	void translateCursorNotFound() {
 
 		expectExceptionWithCauseMessage(
-				translator.translateExceptionIfPossible(new MongoCursorNotFoundException(1L, new ServerAddress())),
+				translator.translateExceptionIfPossible(new MongoCursorNotFoundException(1L, new BsonDocument(), Mockito.mock(ServerAddress.class))),
 				DataAccessResourceFailureException.class);
 	}
 
 	@Test
-	public void translateToDuplicateKeyException() {
+	void translateToDuplicateKeyException() {
 
 		checkTranslatedMongoException(DuplicateKeyException.class, 11000);
 		checkTranslatedMongoException(DuplicateKeyException.class, 11001);
 	}
 
 	@Test
-	public void translateToDataAccessResourceFailureException() {
+	void translateToDataAccessResourceFailureException() {
 
 		checkTranslatedMongoException(DataAccessResourceFailureException.class, 12000);
 		checkTranslatedMongoException(DataAccessResourceFailureException.class, 13440);
 	}
 
 	@Test
-	public void translateToInvalidDataAccessApiUsageException() {
+	void translateToInvalidDataAccessApiUsageException() {
 
 		checkTranslatedMongoException(InvalidDataAccessApiUsageException.class, 10003);
 		checkTranslatedMongoException(InvalidDataAccessApiUsageException.class, 12001);
@@ -106,7 +124,7 @@ public void translateToInvalidDataAccessApiUsageException() {
 	}
 
 	@Test
-	public void translateToUncategorizedMongoDbException() {
+	void translateToUncategorizedMongoDbException() {
 
 		MongoException exception = new MongoException(0, "");
 		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
@@ -115,7 +133,7 @@ public void translateToUncategorizedMongoDbException() {
 	}
 
 	@Test
-	public void translateMongoInternalException() {
+	void translateMongoInternalException() {
 
 		MongoInternalException exception = new MongoInternalException("Internal exception");
 		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
@@ -124,14 +142,14 @@ public void translateMongoInternalException() {
 	}
 
 	@Test
-	public void translateUnsupportedException() {
+	void translateUnsupportedException() {
 
 		RuntimeException exception = new RuntimeException();
 		assertThat(translator.translateExceptionIfPossible(exception)).isNull();
 	}
 
 	@Test // DATAMONGO-2045
-	public void translateSessionExceptions() {
+	void translateSessionExceptions() {
 
 		checkTranslatedMongoException(ClientSessionException.class, 206);
 		checkTranslatedMongoException(ClientSessionException.class, 213);
@@ -140,7 +158,7 @@ public void translateSessionExceptions() {
 	}
 
 	@Test // DATAMONGO-2045
-	public void translateTransactionExceptions() {
+	void translateTransactionExceptions() {
 
 		checkTranslatedMongoException(MongoTransactionException.class, 217);
 		checkTranslatedMongoException(MongoTransactionException.class, 225);
@@ -152,24 +170,47 @@ public void translateTransactionExceptions() {
 		checkTranslatedMongoException(MongoTransactionException.class, 267);
 	}
 
+	@Test // DATAMONGO-2073
+	public void translateTransientTransactionExceptions() {
+
+		MongoException source = new MongoException(267, "PreparedTransactionInProgress");
+		source.addLabel(MongoException.TRANSIENT_TRANSACTION_ERROR_LABEL);
+
+		expectExceptionWithCauseMessage(translator.translateExceptionIfPossible(source),
+				UncategorizedMongoDbException.class,
+				"PreparedTransactionInProgress");
+		assertThat(translator.isTransientFailure(source)).isTrue();
+		assertThat(translator.isTransientFailure(translator.translateExceptionIfPossible(source))).isTrue();
+	}
+
+	@Test // DATAMONGO-2073
+	public void translateMongoExceptionWithTransientLabel() {
+
+		MongoException exception = new MongoException(0, "");
+		exception.addLabel(MongoException.UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL);
+		DataAccessException translatedException = translator.translateExceptionIfPossible(exception);
+
+		expectExceptionWithCauseMessage(translatedException, UncategorizedMongoDbException.class);
+	}
+
 	private void checkTranslatedMongoException(Class<? extends Exception> clazz, int code) {
 
 		DataAccessException translated = translator.translateExceptionIfPossible(new MongoException(code, ""));
 
-		assertThat(translated).as("Expected exception of type " + clazz.getName() + "!").isNotNull();
+		assertThat(translated).as("Expected exception of type " + clazz.getName()).isNotNull();
 
 		Throwable cause = translated.getRootCause();
 		assertThat(cause).isInstanceOf(MongoException.class);
 		assertThat(((MongoException) cause).getCode()).isEqualTo(code);
 	}
 
-	private static void expectExceptionWithCauseMessage(NestedRuntimeException e,
+	private static void expectExceptionWithCauseMessage(@Nullable NestedRuntimeException e,
 			Class<? extends NestedRuntimeException> type) {
 		expectExceptionWithCauseMessage(e, type, null);
 	}
 
-	private static void expectExceptionWithCauseMessage(NestedRuntimeException e,
-			Class<? extends NestedRuntimeException> type, String message) {
+	private static void expectExceptionWithCauseMessage(@Nullable NestedRuntimeException e,
+			Class<? extends NestedRuntimeException> type, @Nullable String message) {
 
 		assertThat(e).isInstanceOf(type);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
index 69cc26f8ae..8b88552860 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoOperationsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,9 @@
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.dao.DataAccessException;
+import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.context.MappingContext;
@@ -37,6 +39,8 @@
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.query.NearQuery;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.util.TypeInformation;
 
 import com.mongodb.DBRef;
@@ -84,7 +88,7 @@ public Object convertToMongoType(Object obj, TypeInformation<?> typeInformation)
 				return null;
 			}
 
-			public DBRef toDBRef(Object object, MongoPersistentProperty referingProperty) {
+			public DBRef toDBRef(Object object, MongoPersistentProperty referringProperty) {
 				return null;
 			}
 
@@ -92,6 +96,21 @@ public DBRef toDBRef(Object object, MongoPersistentProperty referingProperty) {
 			public MongoTypeMapper getTypeMapper() {
 				return null;
 			}
+
+			@Override
+			public ProjectionFactory getProjectionFactory() {
+				return null;
+			}
+
+			@Override
+			public CustomConversions getCustomConversions() {
+				return null;
+			}
+
+			@Override
+			public <R> R project(EntityProjection<R, ?> descriptor, Bson bson) {
+				return null;
+			}
 		};
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBeanTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBeanTests.java
new file mode 100644
index 0000000000..cfa28e9314
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoServerApiFactoryBeanTests.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2021-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.mongodb.ServerApi;
+import com.mongodb.ServerApiVersion;
+
+/**
+ * Integration tests for {@link MongoServerApiFactoryBean}.
+ *
+ * @author Christoph Strobl
+ */
+class MongoServerApiFactoryBeanTests {
+
+	@Test // GH-3820
+	void createsServerApiForVersionString() {
+
+		RootBeanDefinition definition = new RootBeanDefinition(MongoServerApiFactoryBean.class);
+		definition.getPropertyValues().addPropertyValue("version", "V1");
+		definition.getPropertyValues().addPropertyValue("deprecationErrors", "true");
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("factory", definition);
+
+		MongoServerApiFactoryBean bean = factory.getBean("&factory", MongoServerApiFactoryBean.class);
+		assertThat(ReflectionTestUtils.getField(bean, "deprecationErrors")).isEqualTo(true);
+
+		ServerApi target = factory.getBean(ServerApi.class);
+		assertThat(target.getVersion()).isEqualTo(ServerApiVersion.V1);
+		assertThat(target.getDeprecationErrors()).contains(true);
+		assertThat(target.getStrict()).isNotPresent();
+	}
+
+	@Test // GH-3820
+	void createsServerApiForVersionNumber() {
+
+		RootBeanDefinition definition = new RootBeanDefinition(MongoServerApiFactoryBean.class);
+		definition.getPropertyValues().addPropertyValue("version", "1");
+		definition.getPropertyValues().addPropertyValue("strict", "true");
+
+		DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
+		factory.registerBeanDefinition("factory", definition);
+
+		MongoServerApiFactoryBean bean = factory.getBean("&factory", MongoServerApiFactoryBean.class);
+		assertThat(ReflectionTestUtils.getField(bean, "strict")).isEqualTo(true);
+
+		ServerApi target = factory.getBean(ServerApi.class);
+		assertThat(target.getVersion()).isEqualTo(ServerApiVersion.V1);
+		assertThat(target.getDeprecationErrors()).isNotPresent();
+		assertThat(target.getStrict()).contains(true);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateCollationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateCollationTests.java
index 8950571c0c..deaffab4b2 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateCollationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateCollationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,24 +17,24 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Collation.Alternate;
 import org.springframework.data.mongodb.core.query.Collation.ComparisonLevel;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 
@@ -42,18 +42,18 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 public class MongoTemplateCollationTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_4_0 = MongoVersionRule.atLeast(Version.parse("3.4.0"));
 	public static final String COLLECTION_NAME = "collation-1";
+	static @Client MongoClient mongoClient;
 
 	@Configuration
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Override
@@ -65,11 +65,16 @@ protected String getDatabaseName() {
 		protected boolean autoIndexCreation() {
 			return false;
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired MongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		template.dropCollection(COLLECTION_NAME);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDbRefTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDbRefTests.java
index ad7d9a8234..498bfec17a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDbRefTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDbRefTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,22 +19,25 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.convert.LazyLoadingProxy;
 import org.springframework.data.mongodb.core.convert.LazyLoadingTestUtils;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoId;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 import com.mongodb.client.model.Filters;
 
@@ -44,28 +47,24 @@
  *
  * @author Christoph Strobl
  */
+@ExtendWith(MongoTemplateExtension.class)
 public class MongoTemplateDbRefTests {
 
-	MongoTemplate template;
-	MongoTemplate otherDbTemplate;
-
-	@Before
-	public void setUp() {
+	@Template(database = "mongo-template-dbref-tests",
+			initialEntitySet = { RefCycleLoadingIntoDifferentTypeRoot.class,
+					RefCycleLoadingIntoDifferentTypeIntermediate.class, RefCycleLoadingIntoDifferentTypeRootView.class,
+					WithDBRefOnRawStringId.class, WithLazyDBRefOnRawStringId.class, WithRefToAnotherDb.class,
+					WithLazyRefToAnotherDb.class, WithListRefToAnotherDb.class, WithLazyListRefToAnotherDb.class }) //
+	static MongoTestTemplate template;
 
-		template = new MongoTemplate(MongoTestUtils.client(), "mongo-template-dbref-tests");
+	@Template(database = "mongo-template-dbref-tests-other-db", initialEntitySet = JustSomeType.class) //
+	static MongoTestTemplate otherDbTemplate;
 
-		template.dropCollection(RefCycleLoadingIntoDifferentTypeRoot.class);
-		template.dropCollection(RefCycleLoadingIntoDifferentTypeIntermediate.class);
-		template.dropCollection(RefCycleLoadingIntoDifferentTypeRootView.class);
-		template.dropCollection(WithDBRefOnRawStringId.class);
-		template.dropCollection(WithLazyDBRefOnRawStringId.class);
-		template.dropCollection(WithRefToAnotherDb.class);
-		template.dropCollection(WithLazyRefToAnotherDb.class);
-		template.dropCollection(WithListRefToAnotherDb.class);
-		template.dropCollection(WithLazyListRefToAnotherDb.class);
+	@BeforeEach
+	public void setUp() {
 
-		otherDbTemplate = new MongoTemplate(MongoTestUtils.client(), "mongo-template-dbref-tests-other-db");
-		otherDbTemplate.dropCollection(JustSomeType.class);
+		template.flush();
+		otherDbTemplate.flush();
 	}
 
 	@Test // DATAMONGO-1703
@@ -233,85 +232,425 @@ public void shouldResolveLazyListDBRefToAnotherDb() {
 		assertThat(target.getValue()).containsExactlyInAnyOrder(one, two);
 	}
 
-	@Data
+	@Test // GH-2191
+	void shouldAllowToSliceCollectionOfDbRefs() {
+
+		JustSomeType one = new JustSomeType();
+		one.value = "one";
+
+		JustSomeType two = new JustSomeType();
+		two.value = "two";
+
+		template.insertAll(Arrays.asList(one, two));
+
+		WithCollectionDbRef source = new WithCollectionDbRef();
+		source.refs = Arrays.asList(one, two);
+
+		template.save(source);
+
+		Query theQuery = query(where("id").is(source.id));
+		theQuery.fields().slice("refs", 1, 1);
+
+		WithCollectionDbRef target = template.findOne(theQuery, WithCollectionDbRef.class);
+		assertThat(target.getRefs()).containsExactly(two);
+	}
+
+	@Test // GH-2191
+	void shouldAllowToSliceCollectionOfLazyDbRefs() {
+
+		JustSomeType one = new JustSomeType();
+		one.value = "one";
+
+		JustSomeType two = new JustSomeType();
+		two.value = "two";
+
+		template.insertAll(Arrays.asList(one, two));
+
+		WithCollectionDbRef source = new WithCollectionDbRef();
+		source.lazyrefs = Arrays.asList(one, two);
+
+		template.save(source);
+
+		Query theQuery = query(where("id").is(source.id));
+		theQuery.fields().slice("lazyrefs", 1, 1);
+
+		WithCollectionDbRef target = template.findOne(theQuery, WithCollectionDbRef.class);
+		LazyLoadingTestUtils.assertProxyIsResolved(target.lazyrefs, false);
+		assertThat(target.getLazyrefs()).containsExactly(two);
+	}
+
 	@Document("cycle-with-different-type-root")
 	static class RefCycleLoadingIntoDifferentTypeRoot {
 
 		@Id String id;
 		String content;
 		@DBRef RefCycleLoadingIntoDifferentTypeIntermediate refToIntermediate;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getContent() {
+			return this.content;
+		}
+
+		public RefCycleLoadingIntoDifferentTypeIntermediate getRefToIntermediate() {
+			return this.refToIntermediate;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setContent(String content) {
+			this.content = content;
+		}
+
+		public void setRefToIntermediate(RefCycleLoadingIntoDifferentTypeIntermediate refToIntermediate) {
+			this.refToIntermediate = refToIntermediate;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.RefCycleLoadingIntoDifferentTypeRoot(id=" + this.getId() + ", content="
+					+ this.getContent() + ", refToIntermediate=" + this.getRefToIntermediate() + ")";
+		}
 	}
 
-	@Data
 	@Document("cycle-with-different-type-intermediate")
 	static class RefCycleLoadingIntoDifferentTypeIntermediate {
 
 		@Id String id;
 		@DBRef RefCycleLoadingIntoDifferentTypeRootView refToRootView;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public RefCycleLoadingIntoDifferentTypeRootView getRefToRootView() {
+			return this.refToRootView;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setRefToRootView(RefCycleLoadingIntoDifferentTypeRootView refToRootView) {
+			this.refToRootView = refToRootView;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.RefCycleLoadingIntoDifferentTypeIntermediate(id=" + this.getId()
+					+ ", refToRootView=" + this.getRefToRootView() + ")";
+		}
 	}
 
-	@Data
 	@Document("cycle-with-different-type-root")
 	static class RefCycleLoadingIntoDifferentTypeRootView {
 
 		@Id String id;
 		String content;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getContent() {
+			return this.content;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setContent(String content) {
+			this.content = content;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.RefCycleLoadingIntoDifferentTypeRootView(id=" + this.getId() + ", content="
+					+ this.getContent() + ")";
+		}
 	}
 
-	@Data
 	static class RawStringId {
 
 		@MongoId String id;
 		String value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			RawStringId that = (RawStringId) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.RawStringId(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
+	}
+
+	static class WithCollectionDbRef {
+
+		@Id String id;
+
+		@DBRef List<JustSomeType> refs;
+
+		@DBRef(lazy = true) List<JustSomeType> lazyrefs;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public List<JustSomeType> getRefs() {
+			return this.refs;
+		}
+
+		public List<JustSomeType> getLazyrefs() {
+			return this.lazyrefs;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setRefs(List<JustSomeType> refs) {
+			this.refs = refs;
+		}
+
+		public void setLazyrefs(List<JustSomeType> lazyrefs) {
+			this.lazyrefs = lazyrefs;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.WithCollectionDbRef(id=" + this.getId() + ", refs=" + this.getRefs()
+					+ ", lazyrefs=" + this.getLazyrefs() + ")";
+		}
 	}
 
-	@Data
 	static class WithDBRefOnRawStringId {
 
 		@Id String id;
 		@DBRef RawStringId value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public RawStringId getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(RawStringId value) {
+			this.value = value;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.WithDBRefOnRawStringId(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
 	}
 
-	@Data
 	static class WithLazyDBRefOnRawStringId {
 
 		@Id String id;
 		@DBRef(lazy = true) RawStringId value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public RawStringId getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(RawStringId value) {
+			this.value = value;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.WithLazyDBRefOnRawStringId(id=" + this.getId() + ", value=" + this.getValue()
+					+ ")";
+		}
 	}
 
-	@Data
 	static class WithRefToAnotherDb {
 
 		@Id String id;
 		@DBRef(db = "mongo-template-dbref-tests-other-db") JustSomeType value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public JustSomeType getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(JustSomeType value) {
+			this.value = value;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.WithRefToAnotherDb(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
 	}
 
-	@Data
 	static class WithLazyRefToAnotherDb {
 
 		@Id String id;
 		@DBRef(lazy = true, db = "mongo-template-dbref-tests-other-db") JustSomeType value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public JustSomeType getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(JustSomeType value) {
+			this.value = value;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.WithLazyRefToAnotherDb(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
 	}
 
-	@Data
 	static class WithListRefToAnotherDb {
 
 		@Id String id;
 		@DBRef(db = "mongo-template-dbref-tests-other-db") List<JustSomeType> value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public List<JustSomeType> getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(List<JustSomeType> value) {
+			this.value = value;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.WithListRefToAnotherDb(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
 	}
 
-	@Data
 	static class WithLazyListRefToAnotherDb {
 
 		@Id String id;
 		@DBRef(lazy = true, db = "mongo-template-dbref-tests-other-db") List<JustSomeType> value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public List<JustSomeType> getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(List<JustSomeType> value) {
+			this.value = value;
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.WithLazyListRefToAnotherDb(id=" + this.getId() + ", value=" + this.getValue()
+					+ ")";
+		}
 	}
 
-	@Data
 	static class JustSomeType {
 
 		@Id String id;
 		String value;
-	}
 
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			JustSomeType that = (JustSomeType) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "MongoTemplateDbRefTests.JustSomeType(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDocumentReferenceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDocumentReferenceTests.java
new file mode 100644
index 0000000000..9a6bbb4f29
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateDocumentReferenceTests.java
@@ -0,0 +1,2312 @@
+/*
+ * Copyright 2021-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.ReadOnlyProperty;
+import org.springframework.data.annotation.Reference;
+import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.mongodb.core.convert.LazyLoadingTestUtils;
+import org.springframework.data.mongodb.core.mapping.DocumentPointer;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.FieldType;
+import org.springframework.data.mongodb.core.mapping.MongoId;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.model.Filters;
+
+/**
+ * {@link DocumentReference} related integration tests for {@link MongoTemplate}.
+ *
+ * @author Christoph Strobl
+ * @author Julia Lee
+ */
+@ExtendWith(MongoClientExtension.class)
+public class MongoTemplateDocumentReferenceTests {
+
+	public static final String DB_NAME = "document-reference-tests";
+
+	static @Client MongoClient client;
+
+	MongoTestTemplate template = new MongoTestTemplate(cfg -> {
+
+		cfg.configureDatabaseFactory(it -> {
+
+			it.client(client);
+			it.defaultDb(DB_NAME);
+		});
+
+		cfg.configureConversion(it -> {
+			it.customConverters(new ReferencableConverter(), new SimpleObjectRefWithReadingConverterToDocumentConverter(),
+					new DocumentToSimpleObjectRefWithReadingConverter());
+		});
+
+		cfg.configureMappingContext(it -> {
+			it.autocreateIndex(false);
+		});
+	});
+
+	@BeforeEach
+	public void setUp() {
+		template.flushDatabase();
+	}
+
+	@Test // GH-3602
+	void writeSimpleTypeReference() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+
+		SingleRefRoot source = new SingleRefRoot();
+		source.id = "root-1";
+		source.simpleValueRef = new SimpleObjectRef("ref-1", "me-the-referenced-object");
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("simpleValueRef")).isEqualTo("ref-1");
+	}
+
+	@Test // GH-3782
+	void writeTypeReferenceHavingCustomizedIdTargetType() {
+
+		ObjectId expectedIdValue = new ObjectId();
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+
+		SingleRefRoot source = new SingleRefRoot();
+		source.id = "root-1";
+		source.customIdTargetRef = new ObjectRefHavingCustomizedIdTargetType(expectedIdValue.toString(),
+				"me-the-referenced-object");
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("customIdTargetRef")).isEqualTo(expectedIdValue);
+	}
+
+	@Test // GH-3602
+	void writeMapTypeReference() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot source = new CollectionRefRoot();
+		source.id = "root-1";
+		source.mapValueRef = new LinkedHashMap<>();
+		source.mapValueRef.put("frodo", new SimpleObjectRef("ref-1", "me-the-1-referenced-object"));
+		source.mapValueRef.put("bilbo", new SimpleObjectRef("ref-2", "me-the-2-referenced-object"));
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("mapValueRef", Map.class)).containsEntry("frodo", "ref-1").containsEntry("bilbo", "ref-2");
+	}
+
+	@Test // GH-3782
+	void writeMapOfTypeReferenceHavingCustomizedIdTargetType() {
+
+		ObjectId expectedIdValue = new ObjectId();
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot source = new CollectionRefRoot();
+		source.id = "root-1";
+		source.customIdTargetRefMap = Collections.singletonMap("frodo",
+				new ObjectRefHavingCustomizedIdTargetType(expectedIdValue.toString(), "me-the-referenced-object"));
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("customIdTargetRefMap", Map.class)).containsEntry("frodo", expectedIdValue);
+	}
+
+	@Test // GH-3602
+	void writeCollectionOfSimpleTypeReference() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot source = new CollectionRefRoot();
+		source.id = "root-1";
+		source.simpleValueRef = Arrays.asList(new SimpleObjectRef("ref-1", "me-the-1-referenced-object"),
+				new SimpleObjectRef("ref-2", "me-the-2-referenced-object"));
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("simpleValueRef", List.class)).containsExactly("ref-1", "ref-2");
+	}
+
+	@Test // GH-3782
+	void writeListOfTypeReferenceHavingCustomizedIdTargetType() {
+
+		ObjectId expectedIdValue = new ObjectId();
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot source = new CollectionRefRoot();
+		source.id = "root-1";
+		source.customIdTargetRefList = Collections.singletonList(
+				new ObjectRefHavingCustomizedIdTargetType(expectedIdValue.toString(), "me-the-referenced-object"));
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("customIdTargetRefList", List.class)).containsExactly(expectedIdValue);
+	}
+
+	@Test // GH-3602
+	void writeObjectTypeReference() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+
+		SingleRefRoot source = new SingleRefRoot();
+		source.id = "root-1";
+		source.objectValueRef = new ObjectRefOfDocument("ref-1", "me-the-referenced-object");
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("objectValueRef")).isEqualTo(source.getObjectValueRef().toReference());
+	}
+
+	@Test // GH-3602
+	void writeCollectionOfObjectTypeReference() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot source = new CollectionRefRoot();
+		source.id = "root-1";
+		source.objectValueRef = Arrays.asList(new ObjectRefOfDocument("ref-1", "me-the-1-referenced-object"),
+				new ObjectRefOfDocument("ref-2", "me-the-2-referenced-object"));
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("objectValueRef", List.class)).containsExactly(
+				source.getObjectValueRef().get(0).toReference(), source.getObjectValueRef().get(1).toReference());
+	}
+
+	@Test // GH-3602
+	void readSimpleTypeObjectReference() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simpleValueRef", "ref-1");
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+		assertThat(result.getSimpleValueRef()).isEqualTo(new SimpleObjectRef("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readCollectionOfSimpleTypeObjectReference() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simpleValueRef",
+				Collections.singletonList("ref-1"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.getSimpleValueRef()).containsExactly(new SimpleObjectRef("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readLazySimpleTypeObjectReference() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simpleLazyValueRef", "ref-1");
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+
+		LazyLoadingTestUtils.assertProxy(result.simpleLazyValueRef, (proxy) -> {
+
+			assertThat(proxy.isResolved()).isFalse();
+			assertThat(proxy.currentValue()).isNull();
+		});
+		assertThat(result.getSimpleLazyValueRef()).isEqualTo(new SimpleObjectRef("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readSimpleTypeObjectReferenceFromFieldWithCustomName() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simple-value-ref-annotated-field-name",
+				"ref-1");
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+		assertThat(result.getSimpleValueRefWithAnnotatedFieldName())
+				.isEqualTo(new SimpleObjectRef("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readCollectionTypeObjectReferenceFromFieldWithCustomName() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simple-value-ref-annotated-field-name",
+				Collections.singletonList("ref-1"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.getSimpleValueRefWithAnnotatedFieldName())
+				.containsExactly(new SimpleObjectRef("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readObjectReferenceFromDocumentType() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = template.getCollectionName(ObjectRefOfDocument.class);
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("objectValueRef",
+				new Document("id", "ref-1").append("property", "without-any-meaning"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+		assertThat(result.getObjectValueRef()).isEqualTo(new ObjectRefOfDocument("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readCollectionObjectReferenceFromDocumentType() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = template.getCollectionName(ObjectRefOfDocument.class);
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("objectValueRef",
+				Collections.singletonList(new Document("id", "ref-1").append("property", "without-any-meaning")));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.getObjectValueRef())
+				.containsExactly(new ObjectRefOfDocument("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readObjectReferenceFromDocumentDeclaringCollectionName() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = "object-ref-of-document-with-embedded-collection-name";
+		Document refSource = new Document("_id", "ref-1").append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append(
+				"objectValueRefWithEmbeddedCollectionName",
+				new Document("id", "ref-1").append("collection", "object-ref-of-document-with-embedded-collection-name")
+						.append("property", "without-any-meaning"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+		assertThat(result.getObjectValueRefWithEmbeddedCollectionName())
+				.isEqualTo(new ObjectRefOfDocumentWithEmbeddedCollectionName("ref-1", "me-the-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readCollectionObjectReferenceFromDocumentDeclaringCollectionName() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = "object-ref-of-document-with-embedded-collection-name";
+		Document refSource1 = new Document("_id", "ref-1").append("value", "me-the-1-referenced-object");
+		Document refSource2 = new Document("_id", "ref-2").append("value", "me-the-2-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append(
+				"objectValueRefWithEmbeddedCollectionName",
+				Arrays.asList(
+						new Document("id", "ref-2").append("collection", "object-ref-of-document-with-embedded-collection-name"),
+						new Document("id", "ref-1").append("collection", "object-ref-of-document-with-embedded-collection-name")
+								.append("property", "without-any-meaning")));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource1);
+			db.getCollection(refCollectionName).insertOne(refSource2);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.getObjectValueRefWithEmbeddedCollectionName()).containsExactly(
+				new ObjectRefOfDocumentWithEmbeddedCollectionName("ref-2", "me-the-2-referenced-object"),
+				new ObjectRefOfDocumentWithEmbeddedCollectionName("ref-1", "me-the-1-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void useOrderFromAnnotatedSort() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+		Document refSource1 = new Document("_id", "ref-1").append("value", "me-the-1-referenced-object");
+		Document refSource2 = new Document("_id", "ref-2").append("value", "me-the-2-referenced-object");
+		Document refSource3 = new Document("_id", "ref-3").append("value", "me-the-3-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simpleSortedValueRef",
+				Arrays.asList("ref-1", "ref-3", "ref-2"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource1);
+			db.getCollection(refCollectionName).insertOne(refSource2);
+			db.getCollection(refCollectionName).insertOne(refSource3);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.getSimpleSortedValueRef()).containsExactly(
+				new SimpleObjectRef("ref-3", "me-the-3-referenced-object"),
+				new SimpleObjectRef("ref-2", "me-the-2-referenced-object"),
+				new SimpleObjectRef("ref-1", "me-the-1-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void readObjectReferenceFromDocumentNotRelatingToTheIdProperty() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = template.getCollectionName(ObjectRefOnNonIdField.class);
+		Document refSource = new Document("_id", "ref-1").append("refKey1", "ref-key-1").append("refKey2", "ref-key-2")
+				.append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("objectValueRefOnNonIdFields",
+				new Document("refKey1", "ref-key-1").append("refKey2", "ref-key-2").append("property", "without-any-meaning"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+		assertThat(result.getObjectValueRefOnNonIdFields())
+				.isEqualTo(new ObjectRefOnNonIdField("ref-1", "me-the-referenced-object", "ref-key-1", "ref-key-2"));
+	}
+
+	@Test // GH-3602
+	void readLazyObjectReferenceFromDocumentNotRelatingToTheIdProperty() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = template.getCollectionName(ObjectRefOnNonIdField.class);
+		Document refSource = new Document("_id", "ref-1").append("refKey1", "ref-key-1").append("refKey2", "ref-key-2")
+				.append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("lazyObjectValueRefOnNonIdFields",
+				new Document("refKey1", "ref-key-1").append("refKey2", "ref-key-2").append("property", "without-any-meaning"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+
+		LazyLoadingTestUtils.assertProxy(result.lazyObjectValueRefOnNonIdFields, (proxy) -> {
+
+			assertThat(proxy.isResolved()).isFalse();
+			assertThat(proxy.currentValue()).isNull();
+		});
+		assertThat(result.getLazyObjectValueRefOnNonIdFields())
+				.isEqualTo(new ObjectRefOnNonIdField("ref-1", "me-the-referenced-object", "ref-key-1", "ref-key-2"));
+	}
+
+	@Test // GH-3602
+	void readCollectionObjectReferenceFromDocumentNotRelatingToTheIdProperty() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = template.getCollectionName(ObjectRefOnNonIdField.class);
+		Document refSource = new Document("_id", "ref-1").append("refKey1", "ref-key-1").append("refKey2", "ref-key-2")
+				.append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("objectValueRefOnNonIdFields",
+				Collections.singletonList(new Document("refKey1", "ref-key-1").append("refKey2", "ref-key-2").append("property",
+						"without-any-meaning")));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.getObjectValueRefOnNonIdFields())
+				.containsExactly(new ObjectRefOnNonIdField("ref-1", "me-the-referenced-object", "ref-key-1", "ref-key-2"));
+	}
+
+	@Test // GH-3602
+	void readMapOfReferences() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+
+		Document refSource1 = new Document("_id", "ref-1").append("refKey1", "ref-key-1").append("refKey2", "ref-key-2")
+				.append("value", "me-the-1-referenced-object");
+
+		Document refSource2 = new Document("_id", "ref-2").append("refKey1", "ref-key-1").append("refKey2", "ref-key-2")
+				.append("value", "me-the-2-referenced-object");
+
+		Map<String, String> refmap = new LinkedHashMap<>();
+		refmap.put("frodo", "ref-1");
+		refmap.put("bilbo", "ref-2");
+
+		Document source = new Document("_id", "id-1").append("value", "v1").append("mapValueRef", refmap);
+
+		template.execute(db -> {
+
+			db.getCollection(rootCollectionName).insertOne(source);
+			db.getCollection(refCollectionName).insertOne(refSource1);
+			db.getCollection(refCollectionName).insertOne(refSource2);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+
+		assertThat(result.getMapValueRef())
+				.containsEntry("frodo", new SimpleObjectRef("ref-1", "me-the-1-referenced-object"))
+				.containsEntry("bilbo", new SimpleObjectRef("ref-2", "me-the-2-referenced-object"));
+	}
+
+	@Test // GH-3602
+	void loadLazyCyclicReference() {
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+
+		WithRefB b = new WithRefB();
+		b.id = "b";
+
+		a.toB = b;
+		b.lazyToA = a;
+
+		template.save(a);
+		template.save(b);
+
+		WithRefA loadedA = template.query(WithRefA.class).matching(where("id").is(a.id)).firstValue();
+		assertThat(loadedA).isNotNull();
+		assertThat(loadedA.getToB()).isNotNull();
+		LazyLoadingTestUtils.assertProxy(loadedA.getToB().lazyToA, (proxy) -> {
+
+			assertThat(proxy.isResolved()).isFalse();
+			assertThat(proxy.currentValue()).isNull();
+		});
+	}
+
+	@Test // GH-3602
+	void loadEagerCyclicReference() {
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+
+		WithRefB b = new WithRefB();
+		b.id = "b";
+
+		a.toB = b;
+		b.eagerToA = a;
+
+		template.save(a);
+		template.save(b);
+
+		WithRefA loadedA = template.query(WithRefA.class).matching(where("id").is(a.id)).firstValue();
+
+		assertThat(loadedA).isNotNull();
+		assertThat(loadedA.getToB()).isNotNull();
+		assertThat(loadedA.getToB().eagerToA).isSameAs(loadedA);
+	}
+
+	@Test // GH-3602
+	void loadAndStoreUnresolvedLazyDoesNotResolveTheProxy() {
+
+		String collectionB = template.getCollectionName(WithRefB.class);
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+
+		WithRefB b = new WithRefB();
+		b.id = "b";
+
+		a.toB = b;
+		b.lazyToA = a;
+
+		template.save(a);
+		template.save(b);
+
+		WithRefA loadedA = template.query(WithRefA.class).matching(where("id").is(a.id)).firstValue();
+		template.save(loadedA.getToB());
+
+		LazyLoadingTestUtils.assertProxy(loadedA.getToB().lazyToA, (proxy) -> {
+
+			assertThat(proxy.isResolved()).isFalse();
+			assertThat(proxy.currentValue()).isNull();
+		});
+
+		Document target = template.execute(db -> {
+			return db.getCollection(collectionB).find(Filters.eq("_id", "b")).first();
+		});
+		assertThat(target.get("lazyToA", Object.class)).isEqualTo("a");
+	}
+
+	@Test // GH-3602
+	void loadCollectionReferenceWithMissingRefs() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+
+		// ref-1 is missing.
+		Document refSource = new Document("_id", "ref-2").append("value", "me-the-2-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simpleValueRef",
+				Arrays.asList("ref-1", "ref-2"));
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.getSimpleValueRef()).containsExactly(new SimpleObjectRef("ref-2", "me-the-2-referenced-object"));
+	}
+
+	@Test // GH-3805
+	void loadEmptyCollectionReference() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		// an empty reference array.
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simplePreinitializedValueRef",
+				Collections.emptyList());
+
+		template.execute(db -> {
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.simplePreinitializedValueRef).isEmpty();
+	}
+
+	@Test // GH-3805
+	void loadEmptyMapReference() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		// an empty reference array.
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simplePreinitializedMapRef",
+				new Document());
+
+		template.execute(db -> {
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.simplePreinitializedMapRef).isEmpty();
+	}
+
+	@Test // GH-3805
+	void loadNoExistingCollectionReference() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		// no reference array at all
+		Document source = new Document("_id", "id-1").append("value", "v1");
+
+		template.execute(db -> {
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		CollectionRefRoot result = template.findOne(query(where("id").is("id-1")), CollectionRefRoot.class);
+		assertThat(result.simplePreinitializedValueRef).isEmpty();
+	}
+
+	@Test // GH-3806
+	void resolveReferenceWhenUsedAsCtorArgument() {
+
+		Publisher publisher = new Publisher();
+		publisher.id = "p-111";
+		publisher.name = "ppp";
+
+		template.save(publisher);
+
+		WithRequiredArgsCtor source = new WithRequiredArgsCtor("id-1", publisher);
+
+		template.save(source);
+
+		WithRequiredArgsCtor target = template.findOne(query(where("id").is(source.id)), WithRequiredArgsCtor.class);
+		assertThat(target.publisher).isNotNull();
+	}
+
+	@Test // GH-3806
+	void resolveLazyReferenceWhenUsedAsCtorArgument() {
+
+		Publisher publisher = new Publisher();
+		publisher.id = "p-111";
+		publisher.name = "ppp";
+
+		template.save(publisher);
+
+		WithLazyRequiredArgsCtor source = new WithLazyRequiredArgsCtor("id-1", publisher);
+
+		template.save(source);
+
+		WithLazyRequiredArgsCtor target = template.findOne(query(where("id").is(source.id)), WithLazyRequiredArgsCtor.class);
+
+		// proxy not yet resolved
+		LazyLoadingTestUtils.assertProxy(target.publisher, (proxy) -> {
+
+			assertThat(proxy.isResolved()).isFalse();
+			assertThat(proxy.currentValue()).isNull();
+		});
+
+		// resolve the proxy by invoking a method on it
+		assertThat(target.getPublisher().getName()).isEqualTo("ppp");
+		LazyLoadingTestUtils.assertProxy(target.publisher, (proxy) -> {
+			assertThat(proxy.isResolved()).isTrue();
+		});
+	}
+
+	@Test // GH-3602
+	void queryForReference() {
+
+		WithRefB b = new WithRefB();
+		b.id = "b";
+		template.save(b);
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+		a.toB = b;
+		template.save(a);
+
+		WithRefA a2 = new WithRefA();
+		a2.id = "a2";
+		template.save(a2);
+
+		WithRefA loadedA = template.query(WithRefA.class).matching(where("toB").is(b)).firstValue();
+		assertThat(loadedA.getId()).isEqualTo(a.getId());
+	}
+
+	@Test // GH-3602
+	void queryForReferenceInCollection() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		Document shouldBeFound = new Document("_id", "id-1").append("value", "v1").append("simpleValueRef",
+				Arrays.asList("ref-1", "ref-2"));
+		Document shouldNotBeFound = new Document("_id", "id-2").append("value", "v2").append("simpleValueRef",
+				Arrays.asList("ref-1"));
+
+		template.execute(db -> {
+
+			db.getCollection(rootCollectionName).insertOne(shouldBeFound);
+			db.getCollection(rootCollectionName).insertOne(shouldNotBeFound);
+			return null;
+		});
+
+		SimpleObjectRef objectRef = new SimpleObjectRef("ref-2", "some irrelevant value");
+
+		List<CollectionRefRoot> loaded = template.query(CollectionRefRoot.class)
+				.matching(where("simpleValueRef").in(objectRef)).all();
+		assertThat(loaded).map(CollectionRefRoot::getId).containsExactly("id-1");
+	}
+
+	@Test // GH-3602
+	void queryForReferenceOnIdField() {
+
+		WithRefB b = new WithRefB();
+		b.id = "b";
+		template.save(b);
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+		a.toB = b;
+		template.save(a);
+
+		WithRefA a2 = new WithRefA();
+		a2.id = "a2";
+		template.save(a2);
+
+		WithRefA loadedA = template.query(WithRefA.class).matching(where("toB.id").is(b.id)).firstValue();
+		assertThat(loadedA.getId()).isEqualTo(a.getId());
+	}
+
+	@Test // GH-3602
+	void updateReferenceWithEntityHavingPointerConversion() {
+
+		WithRefB b = new WithRefB();
+		b.id = "b";
+		template.save(b);
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+		template.save(a);
+
+		template.update(WithRefA.class).apply(new Update().set("toB", b)).first();
+
+		String collectionA = template.getCollectionName(WithRefA.class);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(collectionA).find(Filters.eq("_id", "a")).first();
+		});
+
+		assertThat(target).containsEntry("toB", "b");
+	}
+
+	@Test // GH-3602
+	void updateReferenceWithEntityWithoutPointerConversion() {
+
+		String collectionName = template.getCollectionName(SingleRefRoot.class);
+		SingleRefRoot refRoot = new SingleRefRoot();
+		refRoot.id = "root-1";
+
+		SimpleObjectRef ref = new SimpleObjectRef("ref-1", "me the referenced object");
+
+		template.save(refRoot);
+
+		template.update(SingleRefRoot.class).apply(new Update().set("simpleValueRef", ref)).first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(collectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target).containsEntry("simpleValueRef", "ref-1");
+	}
+
+	@Test // GH-3602
+	void updateReferenceWithValue() {
+
+		WithRefA a = new WithRefA();
+		a.id = "a";
+		template.save(a);
+
+		template.update(WithRefA.class).apply(new Update().set("toB", "b")).first();
+
+		String collectionA = template.getCollectionName(WithRefA.class);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(collectionA).find(Filters.eq("_id", "a")).first();
+		});
+
+		assertThat(target).containsEntry("toB", "b");
+	}
+
+	@Test // GH-4041
+	void updateReferenceWithPushToCollection() {
+
+		WithListOfRefs a = new WithListOfRefs();
+		a.id = "a";
+		template.save(a);
+
+		WithListOfRefs b = new WithListOfRefs();
+		b.id = "b";
+		template.save(b);
+
+		template.update(WithListOfRefs.class).matching(where("id").is(a.id))
+				.apply(new Update().push("refs").each(new Object[] { b })).first();
+
+		String collection = template.getCollectionName(WithListOfRefs.class);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(collection).find(Filters.eq("_id", "a")).first();
+		});
+
+		assertThat(target).containsEntry("refs", Collections.singletonList("b"));
+	}
+
+	@Test // GH-3782
+	void updateReferenceHavingCustomizedIdTargetType() {
+
+		ObjectId expectedIdValue = new ObjectId();
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+
+		SingleRefRoot root = new SingleRefRoot();
+		root.id = "root-1";
+		template.save(root);
+
+		template.update(SingleRefRoot.class).apply(new Update().set("customIdTargetRef",
+				new ObjectRefHavingCustomizedIdTargetType(expectedIdValue.toString(), "b"))).first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target).containsEntry("customIdTargetRef", expectedIdValue);
+	}
+
+	@Test // GH-3602
+	void updateReferenceCollectionWithEntity() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot root = new CollectionRefRoot();
+		root.id = "root-1";
+		root.simpleValueRef = Collections.singletonList(new SimpleObjectRef("ref-1", "beastie"));
+
+		template.save(root);
+
+		template.update(CollectionRefRoot.class)
+				.apply(new Update().push("simpleValueRef").value(new SimpleObjectRef("ref-2", "boys"))).first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target).containsEntry("simpleValueRef", Arrays.asList("ref-1", "ref-2"));
+	}
+
+	@Test // GH-3602
+	void updateReferenceCollectionWithValue() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot root = new CollectionRefRoot();
+		root.id = "root-1";
+		root.simpleValueRef = Collections.singletonList(new SimpleObjectRef("ref-1", "beastie"));
+
+		template.save(root);
+
+		template.update(CollectionRefRoot.class).apply(new Update().push("simpleValueRef").value("ref-2")).first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target).containsEntry("simpleValueRef", Arrays.asList("ref-1", "ref-2"));
+	}
+
+	@Test // GH-3602
+	@Disabled("Property path resolution does not work inside maps, the key is considered :/")
+	void updateReferenceMapWithEntity() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot root = new CollectionRefRoot();
+		root.id = "root-1";
+		root.mapValueRef = Collections.singletonMap("beastie", new SimpleObjectRef("ref-1", "boys"));
+
+		template.save(root);
+
+		template.update(CollectionRefRoot.class)
+				.apply(new Update().set("mapValueRef.rise", new SimpleObjectRef("ref-2", "against"))).first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target).containsEntry("mapValueRef", new Document("beastie", "ref-1").append("rise", "ref-2"));
+	}
+
+	@Test // GH-3602
+	void updateReferenceMapWithValue() {
+
+		String rootCollectionName = template.getCollectionName(CollectionRefRoot.class);
+
+		CollectionRefRoot root = new CollectionRefRoot();
+		root.id = "root-1";
+		root.mapValueRef = Collections.singletonMap("beastie", new SimpleObjectRef("ref-1", "boys"));
+
+		template.save(root);
+
+		template.update(CollectionRefRoot.class).apply(new Update().set("mapValueRef.rise", "ref-2")).first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target).containsEntry("mapValueRef", new Document("beastie", "ref-1").append("rise", "ref-2"));
+	}
+
+	@Test // GH-3602
+	void useReadingWriterConverterPairForLoading() {
+
+		SingleRefRoot root = new SingleRefRoot();
+		root.id = "root-1";
+		root.withReadingConverter = new SimpleObjectRefWithReadingConverter("ref-1", "value-1");
+
+		template.save(root.withReadingConverter);
+
+		template.save(root);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(template.getCollectionName(SingleRefRoot.class)).find(Filters.eq("_id", root.id)).first();
+		});
+
+		assertThat(target).containsEntry("withReadingConverter",
+				new Document("ref-key-from-custom-write-converter", root.withReadingConverter.id));
+
+		SingleRefRoot loaded = template.findOne(query(where("id").is(root.id)), SingleRefRoot.class);
+		assertThat(loaded.withReadingConverter).isInstanceOf(SimpleObjectRefWithReadingConverter.class);
+	}
+
+	@Test // GH-3602
+	void deriveMappingFromLookup() {
+
+		Publisher publisher = new Publisher();
+		publisher.id = "p-1";
+		publisher.acronym = "TOR";
+		publisher.name = "Tom Doherty Associates";
+
+		template.save(publisher);
+
+		Book book = new Book();
+		book.id = "book-1";
+		book.publisher = publisher;
+
+		template.save(book);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(template.getCollectionName(Book.class)).find(Filters.eq("_id", book.id)).first();
+		});
+
+		assertThat(target).containsEntry("publisher", new Document("acc", publisher.acronym).append("n", publisher.name));
+
+		Book result = template.findOne(query(where("id").is(book.id)), Book.class);
+		assertThat(result.publisher).isNotNull();
+	}
+
+	@Test // GH-3602
+	void updateDerivedMappingFromLookup() {
+
+		Publisher publisher = new Publisher();
+		publisher.id = "p-1";
+		publisher.acronym = "TOR";
+		publisher.name = "Tom Doherty Associates";
+
+		template.save(publisher);
+
+		Book book = new Book();
+		book.id = "book-1";
+
+		template.save(book);
+
+		template.update(Book.class).matching(where("id").is(book.id)).apply(new Update().set("publisher", publisher))
+				.first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(template.getCollectionName(Book.class)).find(Filters.eq("_id", book.id)).first();
+		});
+
+		assertThat(target).containsEntry("publisher", new Document("acc", publisher.acronym).append("n", publisher.name));
+
+		Book result = template.findOne(query(where("id").is(book.id)), Book.class);
+		assertThat(result.publisher).isNotNull();
+	}
+
+	@Test // GH-3602
+	void queryDerivedMappingFromLookup() {
+
+		Publisher publisher = new Publisher();
+		publisher.id = "p-1";
+		publisher.acronym = "TOR";
+		publisher.name = "Tom Doherty Associates";
+
+		template.save(publisher);
+
+		Book book = new Book();
+		book.id = "book-1";
+		book.publisher = publisher;
+
+		template.save(book);
+		book.publisher = publisher;
+
+		Book result = template.findOne(query(where("publisher").is(publisher)), Book.class);
+		assertThat(result.publisher).isNotNull();
+	}
+
+	@Test // GH-3602
+	void allowsDirectUsageOfAtReference() {
+
+		Publisher publisher = new Publisher();
+		publisher.id = "p-1";
+		publisher.acronym = "TOR";
+		publisher.name = "Tom Doherty Associates";
+
+		template.save(publisher);
+
+		UsingAtReference root = new UsingAtReference();
+		root.id = "book-1";
+		root.publisher = publisher;
+
+		template.save(root);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(template.getCollectionName(UsingAtReference.class)).find(Filters.eq("_id", root.id)).first();
+		});
+
+		assertThat(target).containsEntry("publisher", "p-1");
+
+		UsingAtReference result = template.findOne(query(where("id").is(root.id)), UsingAtReference.class);
+		assertThat(result.publisher).isNotNull();
+	}
+
+	@Test // GH-3602
+	void updateWhenUsingAtReferenceDirectly() {
+
+		Publisher publisher = new Publisher();
+		publisher.id = "p-1";
+		publisher.acronym = "TOR";
+		publisher.name = "Tom Doherty Associates";
+
+		template.save(publisher);
+
+		UsingAtReference root = new UsingAtReference();
+		root.id = "book-1";
+
+		template.save(root);
+		template.update(UsingAtReference.class).matching(where("id").is(root.id)).apply(new Update().set("publisher", publisher)).first();
+
+		Document target = template.execute(db -> {
+			return db.getCollection(template.getCollectionName(UsingAtReference.class)).find(Filters.eq("_id", root.id)).first();
+		});
+
+		assertThat(target).containsEntry("publisher", "p-1");
+	}
+
+	@Test // GH-3798
+	void allowsOneToMayStyleLookupsUsingSelfVariable() {
+
+		OneToManyStyleBook book1 = new OneToManyStyleBook();
+		book1.id = "id-1";
+		book1.publisherId = "p-100";
+
+		OneToManyStyleBook book2 = new OneToManyStyleBook();
+		book2.id = "id-2";
+		book2.publisherId = "p-200";
+
+		OneToManyStyleBook book3 = new OneToManyStyleBook();
+		book3.id = "id-3";
+		book3.publisherId = "p-100";
+
+		template.save(book1);
+		template.save(book2);
+		template.save(book3);
+
+		OneToManyStylePublisher publisher = new OneToManyStylePublisher();
+		publisher.id = "p-100";
+
+		template.save(publisher);
+
+		OneToManyStylePublisher target = template.findOne(query(where("id").is(publisher.id)), OneToManyStylePublisher.class);
+		assertThat(target.books).containsExactlyInAnyOrder(book1, book3);
+	}
+
+	@Test // GH-3847
+	void writeReferenceWithIdStringThatIsAnObjectId() {
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+
+		ObjectId id = new ObjectId();
+
+		SingleRefRoot source = new SingleRefRoot();
+		source.id = "root-1";
+		source.simpleValueRef = new SimpleObjectRef(id.toHexString(), "me-the-referenced-object");
+
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("simpleValueRef")).isEqualTo(id);
+	}
+
+	@Test // GH-3847
+	void readWithIdStringThatIsAnObjectId() {
+
+		ObjectId id = new ObjectId();
+
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+		String refCollectionName = template.getCollectionName(SimpleObjectRef.class);
+		Document refSource = new Document("_id", id).append("value", "me-the-referenced-object");
+		Document source = new Document("_id", "id-1").append("value", "v1").append("simpleValueRef", id);
+
+		template.execute(db -> {
+
+			db.getCollection(refCollectionName).insertOne(refSource);
+			db.getCollection(rootCollectionName).insertOne(source);
+			return null;
+		});
+
+		SingleRefRoot result = template.findOne(query(where("id").is("id-1")), SingleRefRoot.class);
+		assertThat(result.getSimpleValueRef()).isEqualTo(new SimpleObjectRef(id.toHexString(), "me-the-referenced-object"));
+	}
+
+	@Test // GH-3847
+	void readWriteTypeReferenceHavingFixedStringIdTargetType() {
+
+		ObjectId id = new ObjectId();
+		String rootCollectionName = template.getCollectionName(SingleRefRoot.class);
+
+		ObjectRefHavingStringIdTargetType customStringIdTargetRef = new ObjectRefHavingStringIdTargetType(id.toHexString(),
+				"me-the-referenced-object");
+		template.save(customStringIdTargetRef);
+
+		SingleRefRoot source = new SingleRefRoot();
+		source.id = "root-1";
+		source.customStringIdTargetRef = customStringIdTargetRef;
+		template.save(source);
+
+		Document target = template.execute(db -> {
+			return db.getCollection(rootCollectionName).find(Filters.eq("_id", "root-1")).first();
+		});
+
+		assertThat(target.get("customStringIdTargetRef")).isEqualTo(id.toHexString());
+
+		SingleRefRoot result = template.findOne(query(where("id").is("root-1")), SingleRefRoot.class);
+		assertThat(result.getCustomStringIdTargetRef())
+				.isEqualTo(new ObjectRefHavingStringIdTargetType(id.toHexString(), "me-the-referenced-object"));
+	}
+
+	@Test // GH-4484
+	void resolveReferenceForOneToManyLookupWithSelfVariableWhenUsedInCtorArgument() {
+
+		OneToManyStylePublisherWithRequiredArgsCtor publisher = new OneToManyStylePublisherWithRequiredArgsCtor("p-100", null);
+		template.save(publisher);
+
+		OneToManyStyleBook book1 = new OneToManyStyleBook();
+		book1.id = "id-1";
+		book1.publisherId = publisher.id;
+
+		OneToManyStyleBook book2 = new OneToManyStyleBook();
+		book2.id = "id-2";
+		book2.publisherId = "p-200";
+
+		OneToManyStyleBook book3 = new OneToManyStyleBook();
+		book3.id = "id-3";
+		book3.publisherId = publisher.id;
+
+		template.save(book1);
+		template.save(book2);
+		template.save(book3);
+
+		OneToManyStylePublisherWithRequiredArgsCtor target = template.findOne(query(where("id").is(publisher.id)), OneToManyStylePublisherWithRequiredArgsCtor.class);
+		assertThat(target.books).containsExactlyInAnyOrder(book1, book3);
+	}
+
+	static class SingleRefRoot {
+
+		String id;
+		String value;
+
+		@DocumentReference SimpleObjectRefWithReadingConverter withReadingConverter;
+
+		@DocumentReference(lookup = "{ '_id' : ?#{#target} }") //
+		SimpleObjectRef simpleValueRef;
+
+		@DocumentReference(lookup = "{ '_id' : '?#{#target}' }", lazy = true) //
+		SimpleObjectRef simpleLazyValueRef;
+
+		@Field("simple-value-ref-annotated-field-name") //
+		@DocumentReference(lookup = "{ '_id' : '?#{#target}' }") //
+		SimpleObjectRef simpleValueRefWithAnnotatedFieldName;
+
+		@DocumentReference(lookup = "{ '_id' : '?#{id}' }") //
+		ObjectRefOfDocument objectValueRef;
+
+		@DocumentReference(lookup = "{ '_id' : '?#{id}' }", collection = "#collection") //
+		ObjectRefOfDocumentWithEmbeddedCollectionName objectValueRefWithEmbeddedCollectionName;
+
+		@DocumentReference(lookup = "{ 'refKey1' : '?#{refKey1}', 'refKey2' : '?#{refKey2}' }") //
+		ObjectRefOnNonIdField objectValueRefOnNonIdFields;
+
+		@DocumentReference(lookup = "{ 'refKey1' : '?#{refKey1}', 'refKey2' : '?#{refKey2}' }", lazy = true) //
+		ObjectRefOnNonIdField lazyObjectValueRefOnNonIdFields;
+
+		@DocumentReference ObjectRefHavingCustomizedIdTargetType customIdTargetRef;
+
+		@DocumentReference ObjectRefHavingStringIdTargetType customStringIdTargetRef;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public SimpleObjectRefWithReadingConverter getWithReadingConverter() {
+			return this.withReadingConverter;
+		}
+
+		public SimpleObjectRef getSimpleValueRef() {
+			return this.simpleValueRef;
+		}
+
+		public SimpleObjectRef getSimpleLazyValueRef() {
+			return this.simpleLazyValueRef;
+		}
+
+		public SimpleObjectRef getSimpleValueRefWithAnnotatedFieldName() {
+			return this.simpleValueRefWithAnnotatedFieldName;
+		}
+
+		public ObjectRefOfDocument getObjectValueRef() {
+			return this.objectValueRef;
+		}
+
+		public ObjectRefOfDocumentWithEmbeddedCollectionName getObjectValueRefWithEmbeddedCollectionName() {
+			return this.objectValueRefWithEmbeddedCollectionName;
+		}
+
+		public ObjectRefOnNonIdField getObjectValueRefOnNonIdFields() {
+			return this.objectValueRefOnNonIdFields;
+		}
+
+		public ObjectRefOnNonIdField getLazyObjectValueRefOnNonIdFields() {
+			return this.lazyObjectValueRefOnNonIdFields;
+		}
+
+		public ObjectRefHavingCustomizedIdTargetType getCustomIdTargetRef() {
+			return this.customIdTargetRef;
+		}
+
+		public ObjectRefHavingStringIdTargetType getCustomStringIdTargetRef() {
+			return this.customStringIdTargetRef;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public void setWithReadingConverter(SimpleObjectRefWithReadingConverter withReadingConverter) {
+			this.withReadingConverter = withReadingConverter;
+		}
+
+		public void setSimpleValueRef(SimpleObjectRef simpleValueRef) {
+			this.simpleValueRef = simpleValueRef;
+		}
+
+		public void setSimpleLazyValueRef(SimpleObjectRef simpleLazyValueRef) {
+			this.simpleLazyValueRef = simpleLazyValueRef;
+		}
+
+		public void setSimpleValueRefWithAnnotatedFieldName(SimpleObjectRef simpleValueRefWithAnnotatedFieldName) {
+			this.simpleValueRefWithAnnotatedFieldName = simpleValueRefWithAnnotatedFieldName;
+		}
+
+		public void setObjectValueRef(ObjectRefOfDocument objectValueRef) {
+			this.objectValueRef = objectValueRef;
+		}
+
+		public void setObjectValueRefWithEmbeddedCollectionName(
+				ObjectRefOfDocumentWithEmbeddedCollectionName objectValueRefWithEmbeddedCollectionName) {
+			this.objectValueRefWithEmbeddedCollectionName = objectValueRefWithEmbeddedCollectionName;
+		}
+
+		public void setObjectValueRefOnNonIdFields(ObjectRefOnNonIdField objectValueRefOnNonIdFields) {
+			this.objectValueRefOnNonIdFields = objectValueRefOnNonIdFields;
+		}
+
+		public void setLazyObjectValueRefOnNonIdFields(ObjectRefOnNonIdField lazyObjectValueRefOnNonIdFields) {
+			this.lazyObjectValueRefOnNonIdFields = lazyObjectValueRefOnNonIdFields;
+		}
+
+		public void setCustomIdTargetRef(ObjectRefHavingCustomizedIdTargetType customIdTargetRef) {
+			this.customIdTargetRef = customIdTargetRef;
+		}
+
+		public void setCustomStringIdTargetRef(ObjectRefHavingStringIdTargetType customStringIdTargetRef) {
+			this.customStringIdTargetRef = customStringIdTargetRef;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.SingleRefRoot(id=" + this.getId() + ", value=" + this.getValue()
+					+ ", withReadingConverter=" + this.getWithReadingConverter() + ", simpleValueRef=" + this.getSimpleValueRef()
+					+ ", simpleLazyValueRef=" + this.getSimpleLazyValueRef() + ", simpleValueRefWithAnnotatedFieldName="
+					+ this.getSimpleValueRefWithAnnotatedFieldName() + ", objectValueRef=" + this.getObjectValueRef()
+					+ ", objectValueRefWithEmbeddedCollectionName=" + this.getObjectValueRefWithEmbeddedCollectionName()
+					+ ", objectValueRefOnNonIdFields=" + this.getObjectValueRefOnNonIdFields()
+					+ ", lazyObjectValueRefOnNonIdFields=" + this.getLazyObjectValueRefOnNonIdFields() + ", customIdTargetRef="
+					+ this.getCustomIdTargetRef() + ", customStringIdTargetRef=" + this.getCustomStringIdTargetRef() + ")";
+		}
+	}
+
+	static class CollectionRefRoot {
+
+		String id;
+		String value;
+
+		@DocumentReference(lookup = "{ '_id' : '?#{#target}' }") //
+		List<SimpleObjectRef> simpleValueRef;
+
+		@DocumentReference
+		List<SimpleObjectRef> simplePreinitializedValueRef = new ArrayList<>();
+
+		@DocumentReference(lookup = "{ '_id' : '?#{#target}' }", sort = "{ '_id' : -1 } ") //
+		List<SimpleObjectRef> simpleSortedValueRef;
+
+		@DocumentReference(lookup = "{ '_id' : '?#{#target}' }") //
+		Map<String, SimpleObjectRef> mapValueRef;
+
+		@DocumentReference //
+		Map<String, SimpleObjectRef> simplePreinitializedMapRef = new LinkedHashMap<>();
+
+		@Field("simple-value-ref-annotated-field-name") //
+		@DocumentReference(lookup = "{ '_id' : '?#{#target}' }") //
+		List<SimpleObjectRef> simpleValueRefWithAnnotatedFieldName;
+
+		@DocumentReference(lookup = "{ '_id' : '?#{id}' }") //
+		List<ObjectRefOfDocument> objectValueRef;
+
+		@DocumentReference(lookup = "{ '_id' : '?#{id}' }", collection = "?#{collection}") //
+		List<ObjectRefOfDocumentWithEmbeddedCollectionName> objectValueRefWithEmbeddedCollectionName;
+
+		@DocumentReference(lookup = "{ 'refKey1' : '?#{refKey1}', 'refKey2' : '?#{refKey2}' }") //
+		List<ObjectRefOnNonIdField> objectValueRefOnNonIdFields;
+
+		@DocumentReference List<ObjectRefHavingCustomizedIdTargetType> customIdTargetRefList;
+
+		@DocumentReference Map<String, ObjectRefHavingCustomizedIdTargetType> customIdTargetRefMap;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public List<SimpleObjectRef> getSimpleValueRef() {
+			return this.simpleValueRef;
+		}
+
+		public List<SimpleObjectRef> getSimplePreinitializedValueRef() {
+			return this.simplePreinitializedValueRef;
+		}
+
+		public List<SimpleObjectRef> getSimpleSortedValueRef() {
+			return this.simpleSortedValueRef;
+		}
+
+		public Map<String, SimpleObjectRef> getMapValueRef() {
+			return this.mapValueRef;
+		}
+
+		public Map<String, SimpleObjectRef> getSimplePreinitializedMapRef() {
+			return this.simplePreinitializedMapRef;
+		}
+
+		public List<SimpleObjectRef> getSimpleValueRefWithAnnotatedFieldName() {
+			return this.simpleValueRefWithAnnotatedFieldName;
+		}
+
+		public List<ObjectRefOfDocument> getObjectValueRef() {
+			return this.objectValueRef;
+		}
+
+		public List<ObjectRefOfDocumentWithEmbeddedCollectionName> getObjectValueRefWithEmbeddedCollectionName() {
+			return this.objectValueRefWithEmbeddedCollectionName;
+		}
+
+		public List<ObjectRefOnNonIdField> getObjectValueRefOnNonIdFields() {
+			return this.objectValueRefOnNonIdFields;
+		}
+
+		public List<ObjectRefHavingCustomizedIdTargetType> getCustomIdTargetRefList() {
+			return this.customIdTargetRefList;
+		}
+
+		public Map<String, ObjectRefHavingCustomizedIdTargetType> getCustomIdTargetRefMap() {
+			return this.customIdTargetRefMap;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public void setSimpleValueRef(List<SimpleObjectRef> simpleValueRef) {
+			this.simpleValueRef = simpleValueRef;
+		}
+
+		public void setSimplePreinitializedValueRef(List<SimpleObjectRef> simplePreinitializedValueRef) {
+			this.simplePreinitializedValueRef = simplePreinitializedValueRef;
+		}
+
+		public void setSimpleSortedValueRef(List<SimpleObjectRef> simpleSortedValueRef) {
+			this.simpleSortedValueRef = simpleSortedValueRef;
+		}
+
+		public void setMapValueRef(Map<String, SimpleObjectRef> mapValueRef) {
+			this.mapValueRef = mapValueRef;
+		}
+
+		public void setSimplePreinitializedMapRef(Map<String, SimpleObjectRef> simplePreinitializedMapRef) {
+			this.simplePreinitializedMapRef = simplePreinitializedMapRef;
+		}
+
+		public void setSimpleValueRefWithAnnotatedFieldName(List<SimpleObjectRef> simpleValueRefWithAnnotatedFieldName) {
+			this.simpleValueRefWithAnnotatedFieldName = simpleValueRefWithAnnotatedFieldName;
+		}
+
+		public void setObjectValueRef(List<ObjectRefOfDocument> objectValueRef) {
+			this.objectValueRef = objectValueRef;
+		}
+
+		public void setObjectValueRefWithEmbeddedCollectionName(
+				List<ObjectRefOfDocumentWithEmbeddedCollectionName> objectValueRefWithEmbeddedCollectionName) {
+			this.objectValueRefWithEmbeddedCollectionName = objectValueRefWithEmbeddedCollectionName;
+		}
+
+		public void setObjectValueRefOnNonIdFields(List<ObjectRefOnNonIdField> objectValueRefOnNonIdFields) {
+			this.objectValueRefOnNonIdFields = objectValueRefOnNonIdFields;
+		}
+
+		public void setCustomIdTargetRefList(List<ObjectRefHavingCustomizedIdTargetType> customIdTargetRefList) {
+			this.customIdTargetRefList = customIdTargetRefList;
+		}
+
+		public void setCustomIdTargetRefMap(Map<String, ObjectRefHavingCustomizedIdTargetType> customIdTargetRefMap) {
+			this.customIdTargetRefMap = customIdTargetRefMap;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.CollectionRefRoot(id=" + this.getId() + ", value=" + this.getValue()
+					+ ", simpleValueRef=" + this.getSimpleValueRef() + ", simplePreinitializedValueRef="
+					+ this.getSimplePreinitializedValueRef() + ", simpleSortedValueRef=" + this.getSimpleSortedValueRef()
+					+ ", mapValueRef=" + this.getMapValueRef() + ", simplePreinitializedMapRef="
+					+ this.getSimplePreinitializedMapRef() + ", simpleValueRefWithAnnotatedFieldName="
+					+ this.getSimpleValueRefWithAnnotatedFieldName() + ", objectValueRef=" + this.getObjectValueRef()
+					+ ", objectValueRefWithEmbeddedCollectionName=" + this.getObjectValueRefWithEmbeddedCollectionName()
+					+ ", objectValueRefOnNonIdFields=" + this.getObjectValueRefOnNonIdFields() + ", customIdTargetRefList="
+					+ this.getCustomIdTargetRefList() + ", customIdTargetRefMap=" + this.getCustomIdTargetRefMap() + ")";
+		}
+	}
+
+	@FunctionalInterface
+	interface ReferenceAble {
+		Object toReference();
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document("simple-object-ref")
+	static class SimpleObjectRef {
+
+		@Id String id;
+		String value;
+
+		public SimpleObjectRef(String id, String value) {
+			this.id = id;
+			this.value = value;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			SimpleObjectRef that = (SimpleObjectRef) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.SimpleObjectRef(id=" + this.getId() + ", value=" + this.getValue()
+					+ ")";
+		}
+	}
+
+	static class SimpleObjectRefWithReadingConverter extends SimpleObjectRef {
+
+		public SimpleObjectRefWithReadingConverter(String id, String value) {
+			super(id, value);
+		}
+
+	}
+
+	static class ObjectRefOfDocument implements ReferenceAble {
+
+		@Id String id;
+		String value;
+
+		public ObjectRefOfDocument(String id, String value) {
+			this.id = id;
+			this.value = value;
+		}
+
+		@Override
+		public Object toReference() {
+			return new Document("id", id).append("property", "without-any-meaning");
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ObjectRefOfDocument that = (ObjectRefOfDocument) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.ObjectRefOfDocument(id=" + this.getId() + ", value=" + this.getValue()
+					+ ")";
+		}
+	}
+
+	static class ObjectRefOfDocumentWithEmbeddedCollectionName implements ReferenceAble {
+
+		@Id String id;
+		String value;
+
+		public ObjectRefOfDocumentWithEmbeddedCollectionName(String id, String value) {
+			this.id = id;
+			this.value = value;
+		}
+
+		@Override
+		public Object toReference() {
+			return new Document("id", id).append("collection", "object-ref-of-document-with-embedded-collection-name");
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ObjectRefOfDocumentWithEmbeddedCollectionName that = (ObjectRefOfDocumentWithEmbeddedCollectionName) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.ObjectRefOfDocumentWithEmbeddedCollectionName(id=" + this.getId()
+					+ ", value=" + this.getValue() + ")";
+		}
+	}
+
+	static class ObjectRefOnNonIdField implements ReferenceAble {
+
+		@Id String id;
+		String value;
+		String refKey1;
+		String refKey2;
+
+		public ObjectRefOnNonIdField(String id, String value, String refKey1, String refKey2) {
+			this.id = id;
+			this.value = value;
+			this.refKey1 = refKey1;
+			this.refKey2 = refKey2;
+		}
+
+		@Override
+		public Object toReference() {
+			return new Document("refKey1", refKey1).append("refKey2", refKey2);
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public String getRefKey1() {
+			return this.refKey1;
+		}
+
+		public String getRefKey2() {
+			return this.refKey2;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public void setRefKey1(String refKey1) {
+			this.refKey1 = refKey1;
+		}
+
+		public void setRefKey2(String refKey2) {
+			this.refKey2 = refKey2;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (this == o) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ObjectRefOnNonIdField that = (ObjectRefOnNonIdField) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value) && Objects.equals(refKey1, that.refKey1)
+					&& Objects.equals(refKey2, that.refKey2);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value, refKey1, refKey2);
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.ObjectRefOnNonIdField(id=" + this.getId() + ", value="
+					+ this.getValue() + ", refKey1=" + this.getRefKey1() + ", refKey2=" + this.getRefKey2() + ")";
+		}
+	}
+
+	static class ObjectRefHavingCustomizedIdTargetType {
+
+		@MongoId(targetType = FieldType.OBJECT_ID) String id;
+		String name;
+
+		public ObjectRefHavingCustomizedIdTargetType(String id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ObjectRefHavingCustomizedIdTargetType that = (ObjectRefHavingCustomizedIdTargetType) o;
+			return Objects.equals(id, that.id) && Objects.equals(name, that.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name);
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.ObjectRefHavingCustomizedIdTargetType(id=" + this.getId() + ", name="
+					+ this.getName() + ")";
+		}
+	}
+
+	static class ObjectRefHavingStringIdTargetType {
+
+		@MongoId(targetType = FieldType.STRING) String id;
+		String name;
+
+		public ObjectRefHavingStringIdTargetType(String id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ObjectRefHavingStringIdTargetType that = (ObjectRefHavingStringIdTargetType) o;
+			return Objects.equals(id, that.id) && Objects.equals(name, that.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name);
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.ObjectRefHavingStringIdTargetType(id=" + this.getId() + ", name="
+					+ this.getName() + ")";
+		}
+	}
+
+	static class ReferencableConverter implements Converter<ReferenceAble, DocumentPointer<Object>> {
+
+		@Override
+		public @Nullable DocumentPointer<Object> convert(ReferenceAble source) {
+			return source::toReference;
+		}
+	}
+
+	@WritingConverter
+	static class DocumentToSimpleObjectRefWithReadingConverter
+			implements Converter<DocumentPointer<Document>, SimpleObjectRefWithReadingConverter> {
+
+		@Override
+		public @Nullable SimpleObjectRefWithReadingConverter convert(DocumentPointer<Document> source) {
+
+			Document document = client.getDatabase(DB_NAME).getCollection("simple-object-ref")
+					.find(Filters.eq("_id", source.getPointer().get("ref-key-from-custom-write-converter"))).first();
+			return new SimpleObjectRefWithReadingConverter(document.getString("_id"), document.getString("value"));
+		}
+	}
+
+	@WritingConverter
+	static class SimpleObjectRefWithReadingConverterToDocumentConverter
+			implements Converter<SimpleObjectRefWithReadingConverter, DocumentPointer<Document>> {
+
+		@Override
+		public @Nullable DocumentPointer<Document> convert(SimpleObjectRefWithReadingConverter source) {
+			return () -> new Document("ref-key-from-custom-write-converter", source.getId());
+		}
+	}
+
+	static class WithRefA/* to B */ implements ReferenceAble {
+
+		@Id String id;
+		@DocumentReference //
+		WithRefB toB;
+
+		@Override
+		public Object toReference() {
+			return id;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public WithRefB getToB() {
+			return this.toB;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setToB(WithRefB toB) {
+			this.toB = toB;
+		}
+	}
+
+	static class WithRefB/* to A */ implements ReferenceAble {
+
+		@Id String id;
+		@DocumentReference(lazy = true) //
+		WithRefA lazyToA;
+
+		@DocumentReference //
+		WithRefA eagerToA;
+
+		@Override
+		public Object toReference() {
+			return id;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public WithRefA getLazyToA() {
+			return this.lazyToA;
+		}
+
+		public WithRefA getEagerToA() {
+			return this.eagerToA;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setLazyToA(WithRefA lazyToA) {
+			this.lazyToA = lazyToA;
+		}
+
+		public void setEagerToA(WithRefA eagerToA) {
+			this.eagerToA = eagerToA;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.WithRefB(id=" + this.getId() + ", lazyToA=" + this.getLazyToA()
+					+ ", eagerToA=" + this.getEagerToA() + ")";
+		}
+	}
+
+	static class ReferencedObject {}
+
+	class ToDocumentPointerConverter implements Converter<ReferencedObject, DocumentPointer<Document>> {
+
+		@Nullable
+		@Override
+		public DocumentPointer<Document> convert(ReferencedObject source) {
+			return () -> new Document("", source);
+		}
+	}
+
+	static class Book {
+
+		String id;
+
+		@DocumentReference(lookup = "{ 'acronym' : ?#{acc}, 'name' : ?#{n} }") //
+		Publisher publisher;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Publisher getPublisher() {
+			return this.publisher;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setPublisher(Publisher publisher) {
+			this.publisher = publisher;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.Book(id=" + this.getId() + ", publisher=" + this.getPublisher() + ")";
+		}
+	}
+
+	static class Publisher {
+
+		String id;
+		String acronym;
+		String name;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getAcronym() {
+			return acronym;
+		}
+
+		public void setAcronym(String acronym) {
+			this.acronym = acronym;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	static class UsingAtReference {
+
+		String id;
+
+		@Reference //
+		Publisher publisher;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Publisher getPublisher() {
+			return this.publisher;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setPublisher(Publisher publisher) {
+			this.publisher = publisher;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.UsingAtReference(id=" + this.getId() + ", publisher="
+					+ this.getPublisher() + ")";
+		}
+	}
+
+	static class OneToManyStyleBook {
+
+		@Id
+		String id;
+
+		private String publisherId;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getPublisherId() {
+			return this.publisherId;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setPublisherId(String publisherId) {
+			this.publisherId = publisherId;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			OneToManyStyleBook that = (OneToManyStyleBook) o;
+			return Objects.equals(id, that.id) && Objects.equals(publisherId, that.publisherId);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, publisherId);
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.OneToManyStyleBook(id=" + this.getId() + ", publisherId="
+					+ this.getPublisherId() + ")";
+		}
+	}
+
+	static class OneToManyStylePublisher {
+
+		@Id
+		String id;
+
+		@ReadOnlyProperty
+		@DocumentReference(lookup="{'publisherId':?#{#self._id} }")
+		List<OneToManyStyleBook> books;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public List<OneToManyStyleBook> getBooks() {
+			return this.books;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setBooks(List<OneToManyStyleBook> books) {
+			this.books = books;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.OneToManyStylePublisher(id=" + this.getId() + ", books="
+					+ this.getBooks() + ")";
+		}
+	}
+
+	static class WithRequiredArgsCtor {
+
+		final String id;
+
+		@DocumentReference final Publisher publisher;
+
+		public WithRequiredArgsCtor(String id, Publisher publisher) {
+
+			this.id = id;
+			this.publisher = publisher;
+		}
+	}
+
+	static class WithLazyRequiredArgsCtor {
+
+		final String id;
+
+		@DocumentReference(lazy = true) final Publisher publisher;
+
+		public WithLazyRequiredArgsCtor(String id, Publisher publisher) {
+
+			this.id = id;
+			this.publisher = publisher;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public Publisher getPublisher() {
+			return publisher;
+		}
+	}
+
+	public static class WithListOfRefs {
+
+		@Id private String id;
+
+		@DocumentReference private List<WithListOfRefs> refs;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public List<WithListOfRefs> getRefs() {
+			return this.refs;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setRefs(List<WithListOfRefs> refs) {
+			this.refs = refs;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.WithListOfRefs(id=" + this.getId() + ", refs=" + this.getRefs() + ")";
+		}
+	}
+
+	static class OneToManyStylePublisherWithRequiredArgsCtor {
+
+		@Id
+		String id;
+
+		@ReadOnlyProperty
+		@DocumentReference(lookup="{'publisherId':?#{#self._id} }")
+		List<OneToManyStyleBook> books;
+
+		public OneToManyStylePublisherWithRequiredArgsCtor(String id, List<OneToManyStyleBook> books) {
+			this.id = id;
+			this.books = books;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public List<OneToManyStyleBook> getBooks() {
+			return this.books;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setBooks(List<OneToManyStyleBook> books) {
+			this.books = books;
+		}
+
+		public String toString() {
+			return "MongoTemplateDocumentReferenceTests.OneToManyStylePublisherWithRequiredArgsCtor(id=" + this.getId() + ", book="
+				+ this.getBooks() + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateFieldProjectionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateFieldProjectionTests.java
new file mode 100644
index 0000000000..1cbb5ab519
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateFieldProjectionTests.java
@@ -0,0 +1,268 @@
+/*
+ * Copyright 2021-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import java.util.Objects;
+import java.util.function.Consumer;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.MongoExpression;
+import org.springframework.data.mongodb.core.aggregation.AggregationSpELExpression;
+import org.springframework.data.mongodb.core.aggregation.StringOperators;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
+
+/**
+ * Integration tests for {@link org.springframework.data.mongodb.core.query.Field}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Giacomo Baso
+ */
+@ExtendWith(MongoTemplateExtension.class)
+@EnableIfMongoServerVersion(isGreaterThanEqual = "4.4")
+class MongoTemplateFieldProjectionTests {
+
+	private static @Template MongoTestTemplate template;
+
+	private Person luke;
+
+	@BeforeEach
+	void beforeEach() {
+
+		luke = new Person();
+		luke.id = "luke";
+		luke.firstname = "luke";
+		luke.lastname = "skywalker";
+
+		template.save(luke);
+	}
+
+	@AfterEach
+	void afterEach() {
+		template.flush(Person.class, Wrapper.class);
+	}
+
+	@Test // GH-3583
+	void usesMongoExpressionAsIs() {
+
+		Person result = findLuke(fields -> {
+			fields.include("firstname").project(MongoExpression.create("'$toUpper' : '$last_name'"))
+					.as("last_name");
+		});
+
+		assertThat(result).isEqualTo(luke.upperCaseLastnameClone());
+	}
+
+	@Test // GH-3583
+	void usesMongoExpressionWithPlaceholdersAsIs() {
+
+		Person result = findLuke(fields -> {
+			fields.include("firstname").project(MongoExpression.create("'$toUpper' : '$?0'", "last_name"))
+					.as("last_name");
+		});
+
+		assertThat(result).isEqualTo(luke.upperCaseLastnameClone());
+	}
+
+	@Test // GH-4821
+	void usesMongoExpressionWithLineBreaksAsIs() {
+
+		Person result = findLuke(fields -> {
+			fields.include("firstname").project(MongoExpression.create("""
+							{
+							  '$toUpper' : '$last_name'
+							}
+							"""))
+					.as("last_name");
+		});
+
+		assertThat(result).isEqualTo(luke.upperCaseLastnameClone());
+	}
+
+	@Test // GH-3583
+	void mapsAggregationExpressionToDomainType() {
+
+		Person result = findLuke(fields -> {
+			fields.include("firstname").project(StringOperators.valueOf("lastname").toUpper()).as("last_name");
+		});
+
+		assertThat(result).isEqualTo(luke.upperCaseLastnameClone());
+	}
+
+	@Test // GH-3583
+	void mapsAggregationSpELExpressionToDomainType() {
+
+		Person result = findLuke(fields -> {
+			fields.include("firstname").project(AggregationSpELExpression.expressionOf("toUpper(lastname)")).as("last_name");
+		});
+
+		assertThat(result).isEqualTo(luke.upperCaseLastnameClone());
+	}
+
+	@Test // GH-3583
+	void mapsNestedPathAggregationExpressionToDomainType() {
+
+		Wrapper wrapper = new Wrapper();
+		wrapper.id = "wrapper";
+		wrapper.person = luke;
+
+		template.save(wrapper);
+
+		Query query = Query.query(Criteria.where("id").is(wrapper.id));
+		query.fields().include("person.firstname", "person.id")
+				.project(StringOperators.valueOf("person.lastname").toUpper()).as("person.last_name");
+
+		Wrapper result = template.findOne(query, Wrapper.class);
+		assertThat(result.person).isEqualTo(luke.upperCaseLastnameClone());
+	}
+
+	@Test // GH-3583
+	void mapsProjectionOnUnwrapped() {
+
+		luke.address = new Address();
+		luke.address.planet = "tatoine";
+
+		template.save(luke);
+
+		Person result = findLuke(fields -> {
+			fields.project(StringOperators.valueOf("address.planet").toUpper()).as("planet");
+		});
+
+		assertThat(result.address.planet).isEqualTo("TATOINE");
+	}
+
+	private Person findLuke(Consumer<org.springframework.data.mongodb.core.query.Field> projection) {
+
+		Query query = Query.query(Criteria.where("id").is(luke.id));
+		projection.accept(query.fields());
+		return template.findOne(query, Person.class);
+	}
+
+	static class Wrapper {
+
+		@Id String id;
+		Person person;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Wrapper wrapper = (Wrapper) o;
+			return Objects.equals(id, wrapper.id) && Objects.equals(person, wrapper.person);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, person);
+		}
+
+		public String toString() {
+			return "MongoTemplateFieldProjectionTests.Wrapper(id=" + this.id + ", person=" + this.person + ")";
+		}
+	}
+
+	static class Person {
+
+		@Id String id;
+		String firstname;
+
+		@Field("last_name") //
+		String lastname;
+
+		@Unwrapped.Nullable Address address;
+
+		Person toUpperCaseLastnameClone(Person source) {
+
+			Person target = new Person();
+			target.id = source.id;
+			target.firstname = source.firstname;
+			target.lastname = source.lastname.toUpperCase();
+			target.address = source.address;
+
+			return target;
+		}
+
+		Person upperCaseLastnameClone() {
+			return toUpperCaseLastnameClone(this);
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname)
+					&& Objects.equals(lastname, person.lastname) && Objects.equals(address, person.address);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname, address);
+		}
+
+		public String toString() {
+			return "MongoTemplateFieldProjectionTests.Person(id=" + this.id + ", firstname=" + this.firstname + ", lastname="
+					+ this.lastname + ", address=" + this.address + ")";
+		}
+	}
+
+	static class Address {
+
+		String planet;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Address address = (Address) o;
+			return Objects.equals(planet, address.planet);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(planet);
+		}
+
+		public String toString() {
+			return "MongoTemplateFieldProjectionTests.Address(planet=" + this.planet + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateMappingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateMappingTests.java
index 3477a598a0..75fbbd516a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateMappingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,8 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
 import java.util.Arrays;
+import java.util.Objects;
 
 import org.bson.Document;
 import org.junit.Before;
@@ -32,7 +31,7 @@
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.annotation.Id;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoCollection;
@@ -48,7 +47,7 @@
  * @author Thomas Risberg
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:template-mapping.xml")
 public class MongoTemplateMappingTests {
 
@@ -101,18 +100,94 @@ public void writesAndReadsEntityWithOpenNativeMongoGeoJsonTypesCorrectly() {
 		assertThat(template1.findOne(query(where("id").is(source.id)), WithOpenMongoGeoJson.class)).isEqualTo(source);
 	}
 
-	@Data
 	static class WithMongoGeoJson {
 
 		@Id String id;
 		MultiPolygon multiPolygon;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public MultiPolygon getMultiPolygon() {
+			return this.multiPolygon;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setMultiPolygon(MultiPolygon multiPolygon) {
+			this.multiPolygon = multiPolygon;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithMongoGeoJson that = (WithMongoGeoJson) o;
+			return Objects.equals(id, that.id) && Objects.equals(multiPolygon, that.multiPolygon);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, multiPolygon);
+		}
+
+		public String toString() {
+			return "MongoTemplateMappingTests.WithMongoGeoJson(id=" + this.getId() + ", multiPolygon="
+					+ this.getMultiPolygon() + ")";
+		}
 	}
 
-	@Data
 	static class WithOpenMongoGeoJson {
 
 		@Id String id;
 		Geometry geometry;
+
+		public WithOpenMongoGeoJson() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Geometry getGeometry() {
+			return this.geometry;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setGeometry(Geometry geometry) {
+			this.geometry = geometry;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithOpenMongoGeoJson that = (WithOpenMongoGeoJson) o;
+			return Objects.equals(id, that.id) && Objects.equals(geometry, that.geometry);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, geometry);
+		}
+
+		public String toString() {
+			return "MongoTemplateMappingTests.WithOpenMongoGeoJson(id=" + this.getId() + ", geometry=" + this.getGeometry()
+					+ ")";
+		}
 	}
 
 	private void addAndRetrievePerson(MongoTemplate template) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateReplaceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateReplaceTests.java
new file mode 100644
index 0000000000..6b8e158e55
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateReplaceTests.java
@@ -0,0 +1,297 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.ReplaceOptions.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.bson.BsonInt64;
+import org.bson.Document;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.result.UpdateResult;
+
+/**
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoClientExtension.class)
+public class MongoTemplateReplaceTests {
+
+	static final String DB_NAME = "mongo-template-replace-tests";
+	static final String RESTAURANT_COLLECTION = "restaurant";
+
+	static @Client MongoClient client;
+	private MongoTemplate template;
+
+	@BeforeEach
+	void beforeEach() {
+
+		template = new MongoTemplate(client, DB_NAME);
+		template.setEntityLifecycleEventsEnabled(false);
+
+		initTestData();
+	}
+
+	@AfterEach()
+	void afterEach() {
+		clearTestData();
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocument() {
+
+		UpdateResult result = template.replace(query(where("name").is("Central Perk Cafe")),
+				new Restaurant("Central Pork Cafe", "Manhattan"));
+
+		assertThat(result.getMatchedCount()).isEqualTo(1);
+		assertThat(result.getModifiedCount()).isEqualTo(1);
+
+		Document document = retrieve(collection -> collection.find(Filters.eq("_id", 1)).first());
+		assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+	}
+
+	@Test // GH-4462
+	void replacesFirstOnMoreThanOneMatch() {
+
+		UpdateResult result = template
+				.replace(query(where("violations").exists(true)), new Restaurant("Central Pork Cafe", "Manhattan"));
+
+		assertThat(result.getMatchedCount()).isEqualTo(1);
+		assertThat(result.getModifiedCount()).isEqualTo(1);
+
+		Document document = retrieve(collection -> collection.find(Filters.eq("_id", 2)).first());
+		assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithRawDoc() {
+
+		UpdateResult result = template.replace(query(where("r-name").is("Central Perk Cafe")),
+				Document.parse("{ 'r-name' : 'Central Pork Cafe', 'Borough' : 'Manhattan' }"),
+				template.getCollectionName(Restaurant.class));
+
+		assertThat(result.getMatchedCount()).isEqualTo(1);
+		assertThat(result.getModifiedCount()).isEqualTo(1);
+
+		Document document = retrieve(collection -> collection.find(Filters.eq("_id", 1)).first());
+		assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithRawDocMappingQueryAgainstDomainType() {
+
+		UpdateResult result = template.replace(query(where("name").is("Central Perk Cafe")), Restaurant.class,
+				Document.parse("{ 'r-name' : 'Central Pork Cafe', 'Borough' : 'Manhattan' }"), ReplaceOptions.none(), template.getCollectionName(Restaurant.class));
+
+		assertThat(result.getMatchedCount()).isEqualTo(1);
+		assertThat(result.getModifiedCount()).isEqualTo(1);
+
+		Document document = retrieve(collection -> collection.find(Filters.eq("_id", 1)).first());
+		assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithMatchingId() {
+
+		UpdateResult result = template.replace(query(where("name").is("Central Perk Cafe")),
+				new Restaurant(1L, "Central Pork Cafe", "Manhattan", 0));
+
+		assertThat(result.getMatchedCount()).isEqualTo(1);
+		assertThat(result.getModifiedCount()).isEqualTo(1);
+
+		Document document = retrieve(collection -> collection.find(Filters.eq("_id", 1)).first());
+		assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithNewIdThrowsDataIntegrityViolationException() {
+
+		assertThatExceptionOfType(DataIntegrityViolationException.class)
+				.isThrownBy(() -> template.replace(query(where("name").is("Central Perk Cafe")),
+						new Restaurant(4L, "Central Pork Cafe", "Manhattan", 0)));
+	}
+
+	@Test // GH-4462
+	void doesNothingIfNoMatchFoundAndUpsertSetToFalse/* by default */() {
+
+		UpdateResult result = template.replace(query(where("name").is("Pizza Rat's Pizzaria")),
+				new Restaurant(null, "Pizza Rat's Pizzaria", "Manhattan", 8));
+
+		assertThat(result.getMatchedCount()).isEqualTo(0);
+		assertThat(result.getModifiedCount()).isEqualTo(0);
+
+		Document document = retrieve(collection -> collection.find(Filters.eq("r-name", "Pizza Rat's Pizzaria")).first());
+		assertThat(document).isNull();
+	}
+
+	@Test // GH-4462
+	void insertsIfNoMatchFoundAndUpsertSetToTrue() {
+
+		UpdateResult result = template.replace(query(where("name").is("Pizza Rat's Pizzaria")),
+				new Restaurant(4L, "Pizza Rat's Pizzaria", "Manhattan", 8), replaceOptions().upsert());
+
+		assertThat(result.getMatchedCount()).isEqualTo(0);
+		assertThat(result.getModifiedCount()).isEqualTo(0);
+		assertThat(result.getUpsertedId()).isEqualTo(new BsonInt64(4L));
+
+		Document document = retrieve(collection -> collection.find(Filters.eq("_id", 4)).first());
+		assertThat(document).containsEntry("r-name", "Pizza Rat's Pizzaria");
+	}
+
+	@Test // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	void replaceConsidersSort() {
+
+		UpdateResult result = template.replace(new Query().with(Sort.by(Direction.DESC, "name")), new Restaurant("resist", "Manhattan"));
+
+		assertThat(result.getModifiedCount()).isOne();
+		Document document = retrieve(collection -> collection.find(Filters.eq("_id", 2)).first());
+		assertThat(document).containsEntry("r-name", "resist");
+	}
+
+	void initTestData() {
+
+		List<Document> testData = Stream.of( //
+				"{ '_id' : 1, 'r-name' : 'Central Perk Cafe', 'Borough' : 'Manhattan' }",
+				"{ '_id' : 2, 'r-name' : 'Rock A Feller Bar and Grill', 'Borough' : 'Queens', 'violations' : 2 }",
+				"{ '_id' : 3, 'r-name' : 'Empire State Pub', 'Borough' : 'Brooklyn', 'violations' : 0 }") //
+				.map(Document::parse).collect(Collectors.toList());
+
+		doInCollection(collection -> collection.insertMany(testData));
+	}
+
+	void clearTestData() {
+		doInCollection(collection -> collection.deleteMany(new Document()));
+	}
+
+	void doInCollection(Consumer<MongoCollection<Document>> consumer) {
+		retrieve(collection -> {
+			consumer.accept(collection);
+			return "done";
+		});
+	}
+
+	<T> T retrieve(Function<MongoCollection<Document>, T> fkt) {
+		return fkt.apply(client.getDatabase(DB_NAME).getCollection(RESTAURANT_COLLECTION));
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(RESTAURANT_COLLECTION)
+	static class Restaurant {
+
+		Long id;
+
+		@Field("r-name") String name;
+		String borough;
+		Integer violations;
+
+		Restaurant() {}
+
+		Restaurant(String name, String borough) {
+
+			this.name = name;
+			this.borough = borough;
+		}
+
+		Restaurant(Long id, String name, String borough, Integer violations) {
+
+			this.id = id;
+			this.name = name;
+			this.borough = borough;
+			this.violations = violations;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getRName() {
+			return name;
+		}
+
+		public void setRName(String rName) {
+			this.name = rName;
+		}
+
+		public String getBorough() {
+			return borough;
+		}
+
+		public void setBorough(String borough) {
+			this.borough = borough;
+		}
+
+		public int getViolations() {
+			return violations;
+		}
+
+		public void setViolations(int violations) {
+			this.violations = violations;
+		}
+
+		@Override
+		public String toString() {
+			return "Restaurant{" + "id=" + id + ", name='" + name + '\'' + ", borough='" + borough + '\'' + ", violations="
+					+ violations + '}';
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Restaurant that = (Restaurant) o;
+			return violations == that.violations && Objects.equals(id, that.id) && Objects.equals(name, that.name)
+					&& Objects.equals(borough, that.borough);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, borough, violations);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateScrollTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateScrollTests.java
new file mode 100644
index 0000000000..772392f037
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateScrollTests.java
@@ -0,0 +1,582 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.data.annotation.PersistenceCreator;
+import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mapping.context.PersistentEntities;
+import org.springframework.data.mongodb.core.MongoTemplateTests.PersonWithIdPropertyOfTypeUUIDListener;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.util.ObjectUtils;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Integration tests for {@link org.springframework.data.domain.Window} queries.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoClientExtension.class)
+class MongoTemplateScrollTests {
+
+	static @Client MongoClient client;
+
+	public static final String DB_NAME = "mongo-template-scroll-tests";
+
+	ConfigurableApplicationContext context = new GenericApplicationContext();
+
+	MongoTestTemplate template = new MongoTestTemplate(cfg -> {
+
+		cfg.configureDatabaseFactory(it -> {
+
+			it.client(client);
+			it.defaultDb(DB_NAME);
+		});
+
+		cfg.configureMappingContext(it -> {
+			it.autocreateIndex(false);
+		});
+
+		cfg.configureApplicationContext(it -> {
+			it.applicationContext(context);
+			it.addEventListener(new PersonWithIdPropertyOfTypeUUIDListener());
+		});
+
+		cfg.configureAuditing(it -> {
+			it.auditingHandler(ctx -> {
+				return new IsNewAwareAuditingHandler(PersistentEntities.of(ctx));
+			});
+		});
+	});
+
+	private static int compareProxies(PersonInterfaceProjection actual, PersonInterfaceProjection expected) {
+		if (actual.getAge() != expected.getAge()) {
+			return -1;
+		}
+		if (!ObjectUtils.nullSafeEquals(actual.getFirstName(), expected.getFirstName())) {
+			return -1;
+		}
+
+		return 0;
+	}
+
+	@BeforeEach
+	void setUp() {
+		template.remove(Person.class).all();
+		template.remove(WithNestedDocument.class).all();
+		template.remove(WithRenamedField.class).all();
+	}
+
+	@Test // GH-4308
+	void shouldUseKeysetScrollingWithNestedSort() {
+
+		WithNestedDocument john20 = new WithNestedDocument(null, "John", 120, new WithNestedDocument("John", 20),
+				new Document("name", "bar"));
+		WithNestedDocument john40 = new WithNestedDocument(null, "John", 140, new WithNestedDocument("John", 40),
+				new Document("name", "baz"));
+		WithNestedDocument john41 = new WithNestedDocument(null, "John", 141, new WithNestedDocument("John", 41),
+				new Document("name", "foo"));
+
+		template.insertAll(Arrays.asList(john20, john40, john41));
+
+		Query q = new Query(where("name").regex("J.*")).with(Sort.by("nested.name", "nested.age", "document.name"))
+				.limit(2);
+		q.with(ScrollPosition.keyset());
+
+		Window<WithNestedDocument> window = template.scroll(q, WithNestedDocument.class);
+
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+		assertThat(window).hasSize(2);
+		assertThat(window).containsOnly(john20, john40);
+
+		window = template.scroll(q.with(window.positionAt(window.size() - 1)), WithNestedDocument.class);
+
+		assertThat(window.hasNext()).isFalse();
+		assertThat(window.isLast()).isTrue();
+		assertThat(window).hasSize(1);
+		assertThat(window).containsOnly(john41);
+	}
+
+	@Test // GH-4308
+	void shouldErrorOnNullValueForQuery() {
+
+		WithNestedDocument john20 = new WithNestedDocument(null, "John", 120, new WithNestedDocument("John", 20),
+				new Document("name", "bar"));
+		WithNestedDocument john40 = new WithNestedDocument(null, "John", 140, new WithNestedDocument("John", 41),
+				new Document());
+		WithNestedDocument john41 = new WithNestedDocument(null, "John", 140, new WithNestedDocument("John", 41),
+				new Document());
+		WithNestedDocument john42 = new WithNestedDocument(null, "John", 140, new WithNestedDocument("John", 41),
+				new Document());
+		WithNestedDocument john43 = new WithNestedDocument(null, "John", 140, new WithNestedDocument("John", 41),
+				new Document());
+		WithNestedDocument john44 = new WithNestedDocument(null, "John", 141, new WithNestedDocument("John", 41),
+				new Document("name", "foo"));
+
+		template.insertAll(Arrays.asList(john20, john40, john41, john42, john43, john44));
+	}
+
+	@Test // GH-4308
+	void shouldAllowReverseSort() {
+
+		Person jane_20 = new Person("Jane", 20);
+		Person jane_40 = new Person("Jane", 40);
+		Person jane_42 = new Person("Jane", 42);
+		Person john20 = new Person("John", 20);
+		Person john40_1 = new Person("John", 40);
+		Person john40_2 = new Person("John", 40);
+
+		template.insertAll(Arrays.asList(john20, john40_1, john40_2, jane_20, jane_40, jane_42));
+		Query q = new Query(where("firstName").regex("J.*")).with(Sort.by("firstName", "age"));
+		q.with(ScrollPosition.keyset()).limit(6);
+
+		Window<Person> window = template.scroll(q, Person.class);
+
+		assertThat(window.hasNext()).isFalse();
+		assertThat(window.isLast()).isTrue();
+		assertThat(window).hasSize(6);
+
+		KeysetScrollPosition scrollPosition = (KeysetScrollPosition) window.positionAt(window.size() - 2);
+		window = template.scroll(q.with(scrollPosition.backward()).limit(2), Person.class);
+
+		assertThat(window).hasSize(2);
+		assertThat(window).containsOnly(jane_42, john20);
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+
+		window = template.scroll(q.with(window.positionAt(0)).limit(2), Person.class);
+
+		assertThat(window).hasSize(2);
+		assertThat(window).containsOnly(jane_20, jane_40);
+		assertThat(window.hasNext()).isFalse();
+		assertThat(window.isLast()).isTrue();
+	}
+
+	@Test // GH-4413
+	void shouldAllowInitialBackwardSort() {
+
+		Person jane_20 = new Person("Jane", 20);
+		Person jane_40 = new Person("Jane", 40);
+		Person jane_42 = new Person("Jane", 42);
+		Person john20 = new Person("John", 20);
+		Person john40_1 = new Person("John", 40);
+		Person john40_2 = new Person("John", 40);
+
+		template.insertAll(Arrays.asList(john20, john40_1, john40_2, jane_20, jane_40, jane_42));
+		Query q = new Query(where("firstName").regex("J.*")).with(Sort.by("firstName", "age"));
+		q.with(ScrollPosition.keyset().backward()).limit(3);
+
+		Window<Person> window = template.scroll(q, Person.class);
+		assertThat(window).containsExactly(john20, john40_1, john40_2);
+
+		window = template.scroll(q.with(window.positionAt(0)).limit(3), Person.class);
+		assertThat(window).containsExactly(jane_20, jane_40, jane_42);
+	}
+
+	@ParameterizedTest // GH-4308
+	@MethodSource("positions")
+	public <T> void shouldApplyCursoringCorrectly(ScrollPosition scrollPosition, Class<T> resultType,
+			Function<Person, T> assertionConverter, @Nullable Comparator<T> comparator) {
+
+		Person john20 = new Person("John", 20);
+		Person john40_1 = new Person("John", 40);
+		Person john40_2 = new Person("John", 40);
+		Person jane_20 = new Person("Jane", 20);
+		Person jane_40 = new Person("Jane", 40);
+		Person jane_42 = new Person("Jane", 42);
+
+		template.insertAll(Arrays.asList(john20, john40_1, john40_2, jane_20, jane_40, jane_42));
+		Query q = new Query(where("firstName").regex("J.*")).with(Sort.by("firstName", "age")).limit(2);
+
+		Window<T> window = template.query(Person.class).inCollection("person").as(resultType).matching(q)
+				.scroll(scrollPosition);
+
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+		assertThat(window).hasSize(2);
+		assertWindow(window, comparator).containsOnly(assertionConverter.apply(jane_20), assertionConverter.apply(jane_40));
+
+		window = template.query(Person.class).inCollection("person").as(resultType).matching(q.limit(3))
+				.scroll(window.positionAt(window.size() - 1));
+
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+		assertThat(window).hasSize(3);
+		assertWindow(window, comparator).contains(assertionConverter.apply(jane_42), assertionConverter.apply(john20));
+		assertWindow(window, comparator).containsAnyOf(assertionConverter.apply(john40_1),
+				assertionConverter.apply(john40_2));
+
+		window = template.query(Person.class).inCollection("person").as(resultType).matching(q.limit(1))
+				.scroll(window.positionAt(window.size() - 1));
+
+		assertThat(window.hasNext()).isFalse();
+		assertThat(window.isLast()).isTrue();
+		assertThat(window).hasSize(1);
+		assertWindow(window, comparator).containsAnyOf(assertionConverter.apply(john40_1),
+				assertionConverter.apply(john40_2));
+	}
+
+	@ParameterizedTest // GH-4308
+	@MethodSource("renamedFieldProjectTargets")
+	<T> void scrollThroughResultsWithRenamedField(Class<T> resultType, Function<WithRenamedField, T> assertionConverter) {
+
+		WithRenamedField one = new WithRenamedField("id-1", "v1", null);
+		WithRenamedField two = new WithRenamedField("id-2", "v2", null);
+		WithRenamedField three = new WithRenamedField("id-3", "v3", null);
+
+		template.insertAll(Arrays.asList(one, two, three));
+
+		Query q = new Query(where("value").regex("v.*")).with(Sort.by(Sort.Direction.DESC, "value")).limit(2);
+		q.with(ScrollPosition.keyset());
+
+		Window<T> window = template.query(WithRenamedField.class).as(resultType).matching(q)
+				.scroll(ScrollPosition.keyset());
+
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+		assertThat(window).hasSize(2);
+		assertThat(window).containsOnly(assertionConverter.apply(three), assertionConverter.apply(two));
+
+		window = template.query(WithRenamedField.class).as(resultType).matching(q)
+				.scroll(window.positionAt(window.size() - 1));
+
+		assertThat(window.hasNext()).isFalse();
+		assertThat(window.isLast()).isTrue();
+		assertThat(window).hasSize(1);
+		assertThat(window).containsOnly(assertionConverter.apply(one));
+	}
+
+	static Stream<Arguments> positions() {
+
+		return Stream.of(args(ScrollPosition.keyset(), Person.class, Function.identity()), //
+				args(ScrollPosition.keyset(), Document.class, MongoTemplateScrollTests::toDocument), //
+				args(ScrollPosition.offset(), Person.class, Function.identity()), //
+				args(ScrollPosition.offset(), PersonDtoProjection.class, MongoTemplateScrollTests::toPersonDtoProjection), //
+				args(ScrollPosition.offset(), PersonInterfaceProjection.class,
+						MongoTemplateScrollTests::toPersonInterfaceProjection, MongoTemplateScrollTests::compareProxies));
+	}
+
+	static Stream<Arguments> renamedFieldProjectTargets() {
+		return Stream.of(Arguments.of(WithRenamedField.class, Function.identity()),
+				Arguments.of(Document.class, new Function<WithRenamedField, Document>() {
+					@Override
+					public Document apply(WithRenamedField withRenamedField) {
+						return new Document("_id", withRenamedField.getId()).append("_val", withRenamedField.getValue())
+								.append("_class", WithRenamedField.class.getName());
+					}
+				}));
+	}
+
+	static <T> org.assertj.core.api.IterableAssert<T> assertWindow(Window<T> window, @Nullable Comparator<T> comparator) {
+		return comparator != null ? assertThat(window).usingElementComparator(comparator) : assertThat(window);
+	}
+
+	private static <T> Arguments args(ScrollPosition scrollPosition, Class<T> resultType,
+			Function<Person, T> assertionConverter) {
+		return args(scrollPosition, resultType, assertionConverter, null);
+	}
+
+	private static <T> Arguments args(ScrollPosition scrollPosition, Class<T> resultType,
+			Function<Person, T> assertionConverter, @Nullable Comparator<T> comparator) {
+		return Arguments.of(scrollPosition, resultType, assertionConverter, comparator);
+	}
+
+	static Document toDocument(Person person) {
+
+		return new Document("_class", person.getClass().getName()).append("_id", person.getId()).append("active", true)
+				.append("firstName", person.getFirstName()).append("age", person.getAge());
+	}
+
+	static PersonDtoProjection toPersonDtoProjection(Person person) {
+
+		PersonDtoProjection dto = new PersonDtoProjection();
+		dto.firstName = person.getFirstName();
+		dto.age = person.getAge();
+		return dto;
+	}
+
+	static PersonInterfaceProjection toPersonInterfaceProjection(Person person) {
+
+		return new PersonInterfaceProjectionImpl(person);
+	}
+
+	static class PersonDtoProjection {
+
+		String firstName;
+		int age;
+
+		public String getFirstName() {
+			return this.firstName;
+		}
+
+		public int getAge() {
+			return this.age;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			PersonDtoProjection that = (PersonDtoProjection) o;
+			return age == that.age && Objects.equals(firstName, that.firstName);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(firstName, age);
+		}
+
+		public String toString() {
+			return "MongoTemplateScrollTests.PersonDtoProjection(firstName=" + this.getFirstName() + ", age=" + this.getAge()
+					+ ")";
+		}
+	}
+
+	interface PersonInterfaceProjection {
+		String getFirstName();
+
+		int getAge();
+	}
+
+	static class PersonInterfaceProjectionImpl implements PersonInterfaceProjection {
+
+		final Person delegate;
+
+		public PersonInterfaceProjectionImpl(Person delegate) {
+			this.delegate = delegate;
+		}
+
+		@Override
+		public String getFirstName() {
+			return delegate.getFirstName();
+		}
+
+		@Override
+		public int getAge() {
+			return delegate.getAge();
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o instanceof Proxy) {
+				return true;
+			}
+			return false;
+		}
+
+		@Override
+		public int hashCode() {
+			return ObjectUtils.nullSafeHashCode(delegate);
+		}
+	}
+
+	static class WithRenamedField {
+
+		String id;
+
+		@Field("_val") String value;
+
+		WithRenamedField nested;
+
+		public WithRenamedField(String id, String value, WithRenamedField nested) {
+			this.id = id;
+			this.value = value;
+			this.nested = nested;
+		}
+
+		public WithRenamedField() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public WithRenamedField getNested() {
+			return this.nested;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public void setNested(WithRenamedField nested) {
+			this.nested = nested;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithRenamedField that = (WithRenamedField) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value) && Objects.equals(nested, that.nested);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value, nested);
+		}
+
+		public String toString() {
+			return "MongoTemplateScrollTests.WithRenamedField(id=" + this.getId() + ", value=" + this.getValue() + ", nested="
+					+ this.getNested() + ")";
+		}
+	}
+
+	class WithNestedDocument {
+
+		String id;
+
+		String name;
+
+		int age;
+
+		WithNestedDocument nested;
+
+		Document document;
+
+		public WithNestedDocument(String name, int age) {
+			this.name = name;
+			this.age = age;
+		}
+
+		@PersistenceCreator
+		public WithNestedDocument(String id, String name, int age, WithNestedDocument nested, Document document) {
+			this.id = id;
+			this.name = name;
+			this.age = age;
+			this.nested = nested;
+			this.document = document;
+		}
+
+		public WithNestedDocument() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public int getAge() {
+			return this.age;
+		}
+
+		public WithNestedDocument getNested() {
+			return this.nested;
+		}
+
+		public Document getDocument() {
+			return this.document;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+
+		public void setNested(WithNestedDocument nested) {
+			this.nested = nested;
+		}
+
+		public void setDocument(Document document) {
+			this.document = document;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithNestedDocument that = (WithNestedDocument) o;
+			return age == that.age && Objects.equals(id, that.id) && Objects.equals(name, that.name)
+					&& Objects.equals(nested, that.nested) && Objects.equals(document, that.document);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, age, nested, document);
+		}
+
+		public String toString() {
+			return "MongoTemplateScrollTests.WithNestedDocument(id=" + this.getId() + ", name=" + this.getName() + ", age="
+					+ this.getAge() + ", nested=" + this.getNested() + ", document=" + this.getDocument() + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
index ea74dabf22..5a006bebfe 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,33 +20,28 @@
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.core.query.Update.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.Value;
-import lombok.experimental.Wither;
-
 import java.lang.reflect.InvocationTargetException;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import java.util.stream.Stream;
 
+import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.joda.time.DateTime;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -55,44 +50,49 @@
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
-import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.convert.DbRefResolver;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.aggregation.ComparisonOperators;
+import org.springframework.data.mongodb.core.aggregation.ObjectOperators;
+import org.springframework.data.mongodb.core.aggregation.ReplaceWithOperation;
+import org.springframework.data.mongodb.core.aggregation.StringOperators;
 import org.springframework.data.mongodb.core.convert.LazyLoadingProxy;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions.MongoConverterConfigurationAdapter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.FieldName.Type;
 import org.springframework.data.mongodb.core.mapping.MongoId;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
 import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
-import org.springframework.data.mongodb.core.mapping.event.AuditingEventListener;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.data.mongodb.test.util.MongoVersion;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.CloseableIterator;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -100,12 +100,12 @@
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.mongodb.DBRef;
-import com.mongodb.MongoClient;
 import com.mongodb.MongoException;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.FindIterable;
 import com.mongodb.client.ListIndexesIterable;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.model.Filters;
@@ -126,111 +126,76 @@
  * @author Mark Paluch
  * @author Laszlo Csontos
  * @author duozhilin
+ * @author Jakub Zurawa
+ * @author Florian Lüdiger
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
+@ExtendWith(MongoClientExtension.class)
 public class MongoTemplateTests {
 
-	@Autowired MongoTemplate template;
-	@Autowired MongoDbFactory factory;
+	public static final String DB_NAME = "mongo-template-tests";
 
-	ConfigurableApplicationContext context;
-	MongoTemplate mappingTemplate;
+	static @Client MongoClient client;
 
-	@Rule public MongoVersionRule mongoVersion = MongoVersionRule.any();
+	ConfigurableApplicationContext context = new GenericApplicationContext();
 
-	@Autowired
-	public void setApplicationContext(ConfigurableApplicationContext context) {
+	MongoTestTemplate template = new MongoTestTemplate(cfg -> {
 
-		this.context = context;
+		cfg.configureDatabaseFactory(it -> {
 
-		context.addApplicationListener(new PersonWithIdPropertyOfTypeUUIDListener());
+			it.client(client);
+			it.defaultDb(DB_NAME);
+		});
 
-		PersistentEntities entities = PersistentEntities.of(template.getConverter().getMappingContext());
+		cfg.configureMappingContext(it -> {
+			it.autocreateIndex(false);
+			it.initialEntitySet(AuditablePerson.class);
+		});
 
-		context.addApplicationListener(new AuditingEventListener(() -> new IsNewAwareAuditingHandler(entities)));
-	}
+		cfg.configureApplicationContext(it -> {
+			it.applicationContext(context);
+			it.addEventListener(new PersonWithIdPropertyOfTypeUUIDListener());
+		});
 
-	@Autowired
-	public void setMongoClient(MongoClient mongo) throws Exception {
+		cfg.configureAuditing(it -> {
+			it.auditingHandler(ctx -> {
+				return new IsNewAwareAuditingHandler(PersistentEntities.of(ctx));
+			});
+		});
+	});
 
-		CustomConversions conversions = new MongoCustomConversions(
-				Arrays.asList(DateToDateTimeConverter.INSTANCE, DateTimeToDateConverter.INSTANCE));
+	MongoTestTemplate mappingTemplate = new MongoTestTemplate(cfg -> {
 
-		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setInitialEntitySet(
-				new HashSet<>(Arrays.asList(PersonWith_idPropertyOfTypeObjectId.class, PersonWith_idPropertyOfTypeString.class,
-						PersonWithIdPropertyOfTypeObjectId.class, PersonWithIdPropertyOfTypeString.class,
-						PersonWithIdPropertyOfTypeInteger.class, PersonWithIdPropertyOfTypeBigInteger.class,
-						PersonWithIdPropertyOfPrimitiveInt.class, PersonWithIdPropertyOfTypeLong.class,
-						PersonWithIdPropertyOfPrimitiveLong.class, PersonWithIdPropertyOfTypeUUID.class)));
-		mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
-		mappingContext.initialize();
+		cfg.configureDatabaseFactory(it -> {
 
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
-		MappingMongoConverter mappingConverter = new MappingMongoConverter(dbRefResolver, mappingContext);
-		mappingConverter.setCustomConversions(conversions);
-		mappingConverter.afterPropertiesSet();
+			it.client(client);
+			it.defaultDb(DB_NAME);
+		});
 
-		this.mappingTemplate = new MongoTemplate(factory, mappingConverter);
-	}
+		cfg.configureConversion(it -> {
+			it.customConverters(DateToDateTimeConverter.INSTANCE, DateTimeToDateConverter.INSTANCE);
+		});
 
-	@Before
-	public void setUp() {
+		cfg.configureMappingContext(it -> {
+			it.autocreateIndex(false);
+		});
 
-		cleanDb();
+		cfg.configureApplicationContext(it -> {
+			it.applicationContext(new GenericApplicationContext());
+			it.addEventListener(new PersonWithIdPropertyOfTypeUUIDListener());
+		});
+	});
 
-		this.mappingTemplate.setApplicationContext(context);
-	}
+	MongoDatabaseFactory factory = template.getMongoDatabaseFactory();
 
-	@After
+	@AfterEach
 	public void cleanUp() {
-		cleanDb();
-	}
 
-	protected void cleanDb() {
+		template.flush();
+		template.flush("collection", "personX", "findandreplace");
+
+		mappingTemplate.flush();
+
 		template.dropCollection(Person.class);
-		template.dropCollection(PersonWithAList.class);
-		template.dropCollection(PersonWith_idPropertyOfTypeObjectId.class);
-		template.dropCollection(PersonWith_idPropertyOfTypeString.class);
-		template.dropCollection(PersonWithIdPropertyOfTypeObjectId.class);
-		template.dropCollection(PersonWithIdPropertyOfTypeString.class);
-		template.dropCollection(PersonWithIdPropertyOfTypeInteger.class);
-		template.dropCollection(PersonWithIdPropertyOfTypeBigInteger.class);
-		template.dropCollection(PersonWithIdPropertyOfPrimitiveInt.class);
-		template.dropCollection(PersonWithIdPropertyOfTypeLong.class);
-		template.dropCollection(PersonWithIdPropertyOfPrimitiveLong.class);
-		template.dropCollection(PersonWithIdPropertyOfTypeUUID.class);
-		template.dropCollection(PersonWithVersionPropertyOfTypeInteger.class);
-		template.dropCollection(TestClass.class);
-		template.dropCollection(Sample.class);
-		template.dropCollection(MyPerson.class);
-		template.dropCollection(TypeWithFieldAnnotation.class);
-		template.dropCollection(TypeWithDate.class);
-		template.dropCollection("collection");
-		template.dropCollection("personX");
-		template.dropCollection("findandreplace");
-		template.dropCollection(Document.class);
-		template.dropCollection(ObjectWith3AliasedFields.class);
-		template.dropCollection(ObjectWith3AliasedFieldsAndNestedAddress.class);
-		template.dropCollection(BaseDoc.class);
-		template.dropCollection(ObjectWithEnumValue.class);
-		template.dropCollection(DocumentWithCollection.class);
-		template.dropCollection(DocumentWithCollectionOfSimpleType.class);
-		template.dropCollection(DocumentWithMultipleCollections.class);
-		template.dropCollection(DocumentWithNestedCollection.class);
-		template.dropCollection(DocumentWithEmbeddedDocumentWithCollection.class);
-		template.dropCollection(DocumentWithNestedList.class);
-		template.dropCollection(DocumentWithDBRefCollection.class);
-		template.dropCollection(SomeContent.class);
-		template.dropCollection(SomeTemplate.class);
-		template.dropCollection(Address.class);
-		template.dropCollection(DocumentWithCollectionOfSamples.class);
-		template.dropCollection(WithGeoJson.class);
-		template.dropCollection(DocumentWithNestedTypeHavingStringIdProperty.class);
-		template.dropCollection(ImmutableAudited.class);
-		template.dropCollection(RawStringId.class);
-		template.dropCollection(Outer.class);
 	}
 
 	@Test
@@ -273,7 +238,7 @@ public void throwsExceptionForDuplicateIds() {
 
 		try {
 			template.insert(person);
-			fail("Expected DataIntegrityViolationException!");
+			fail("Expected DataIntegrityViolationException");
 		} catch (DataIntegrityViolationException e) {
 			assertThat(e.getMessage()).contains("E11000 duplicate key error");
 		}
@@ -316,7 +281,7 @@ public void throwsExceptionForIndexViolationIfConfigured() {
 
 		try {
 			template.save(person);
-			fail("Expected DataIntegrityViolationException!");
+			fail("Expected DataIntegrityViolationException");
 		} catch (DataIntegrityViolationException e) {
 			assertThat(e.getMessage()).contains("E11000 duplicate key error");
 		}
@@ -406,11 +371,11 @@ public void testEnsureIndex() throws Exception {
 	@Test // DATAMONGO-746, DATAMONGO-2264
 	public void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() throws Exception {
 
-		template.indexOps(Person.class).dropAllIndexes();
+		template.dropCollection(Person.class);
 
 		assertThat(template.indexOps(Person.class).getIndexInfo().isEmpty()).isTrue();
 
-		factory.getDb().getCollection(template.getCollectionName(Person.class))
+		factory.getMongoDatabase().getCollection(template.getCollectionName(Person.class))
 				.createIndex(new org.bson.Document("age", -1), new IndexOptions().name("age_-1").unique(true).sparse(true));
 
 		ListIndexesIterable<org.bson.Document> indexInfo = template.getCollection(template.getCollectionName(Person.class))
@@ -1163,7 +1128,7 @@ public void testAddingToList() {
 		assertThat(p2).isNotNull();
 		assertThat(p2.getWishList().size()).isEqualTo(0);
 
-		p2.addToWishList("please work!");
+		p2.addToWishList("please work");
 
 		template.save(p2);
 
@@ -1209,7 +1174,7 @@ public void testFindOneWithSort() {
 		assertThat(p5.getFirstName()).isEqualTo("Mark");
 	}
 
-	@Test
+	@Test // DATAMONGO-2572
 	public void testUsingReadPreference() throws Exception {
 		this.template.execute("readPref", new CollectionCallback<Object>() {
 			public Object doInCollection(MongoCollection<org.bson.Document> collection)
@@ -1220,9 +1185,9 @@ public Object doInCollection(MongoCollection<org.bson.Document> collection)
 				return null;
 			}
 		});
-		MongoTemplate slaveTemplate = new MongoTemplate(factory);
-		slaveTemplate.setReadPreference(ReadPreference.secondary());
-		slaveTemplate.execute("readPref", new CollectionCallback<Object>() {
+		MongoTemplate secondaryTemplate = new MongoTemplate(factory);
+		secondaryTemplate.setReadPreference(ReadPreference.secondary());
+		secondaryTemplate.execute("readPref", new CollectionCallback<Object>() {
 			public Object doInCollection(MongoCollection<org.bson.Document> collection)
 					throws MongoException, DataAccessException {
 				assertThat(collection.getReadPreference()).isEqualTo(ReadPreference.secondary());
@@ -1312,6 +1277,7 @@ class ClassWithDBRefs {
 
 	@Test // DATADOC-202
 	public void executeDocument() {
+
 		template.insert(new Person("Tom"));
 		template.insert(new Person("Dick"));
 		template.insert(new Person("Harry"));
@@ -1343,9 +1309,9 @@ public void processDocument(org.bson.Document document) {
 			}
 		}, new CursorPreparer() {
 
-			public FindIterable<org.bson.Document> prepare(FindIterable<org.bson.Document> cursor) {
-				cursor.limit(1);
-				return cursor;
+			public FindIterable<org.bson.Document> prepare(FindIterable<org.bson.Document> iterable) {
+				iterable.limit(1);
+				return iterable;
 			}
 
 		});
@@ -1386,11 +1352,11 @@ public void countRejectsNullCollectionName() {
 	@Test
 	public void returnsEntityWhenQueryingForDateTime() {
 
-		DateTime dateTime = new DateTime(2011, 3, 3, 12, 0, 0, 0);
+		LocalDateTime dateTime = LocalDateTime.of(2011, 3, 3, 12, 0, 0, 0);
 		TestClass testClass = new TestClass(dateTime);
 		mappingTemplate.save(testClass);
 
-		List<TestClass> testClassList = mappingTemplate.find(new Query(Criteria.where("myDate").is(dateTime.toDate())),
+		List<TestClass> testClassList = mappingTemplate.find(new Query(Criteria.where("myDate").is(dateTime)),
 				TestClass.class);
 		assertThat(testClassList.size()).isEqualTo(1);
 		assertThat(testClassList.get(0).myDate).isEqualTo(testClass.myDate);
@@ -1445,18 +1411,21 @@ public void executesQueryWithNegatedRegexCorrectly() {
 		assertThat(result.get(0).field).isEqualTo("Beauford");
 	}
 
-	@Test // DATAMONGO-447
+	@Test // DATAMONGO-447, GH-4707
 	public void storesAndRemovesTypeWithComplexId() {
 
 		MyId id = new MyId();
+		id.id = Instant.now().minusSeconds(2);
 		id.first = "foo";
 		id.second = "bar";
+		id.id = Instant.now().minusSeconds(3);
 
 		TypeWithMyId source = new TypeWithMyId();
 		source.id = id;
 
 		template.save(source);
-		template.remove(query(where("id").is(id)), TypeWithMyId.class);
+		assertThat(template.remove(query(where("id").is(id)), TypeWithMyId.class)).extracting(DeleteResult::getDeletedCount)
+				.isEqualTo(1L);
 	}
 
 	@Test // DATAMONGO-506
@@ -1485,7 +1454,7 @@ public void exceutesBasicQueryCorrectly() {
 		assertThat(result.get(0).getName()).isEqualTo("Oleg");
 	}
 
-	@Test(expected = OptimisticLockingFailureException.class) // DATAMONGO-279
+	@Test // DATAMONGO-279
 	public void optimisticLockingHandling() {
 
 		// Init version
@@ -1517,7 +1486,9 @@ public void optimisticLockingHandling() {
 		person.version = 0;
 		person.firstName = "Patryk3";
 
-		template.save(person);
+		final PersonWithVersionPropertyOfTypeInteger toBeSaved = person;
+
+		assertThatExceptionOfType(OptimisticLockingFailureException.class).isThrownBy(() -> template.save(toBeSaved));
 	}
 
 	@Test // DATAMONGO-562
@@ -1593,13 +1564,14 @@ public void savesPlainDocumentCorrectly() {
 		assertThat(document.containsKey("_id")).isTrue();
 	}
 
-	@Test(expected = MappingException.class) // DATAMONGO-550, DATAMONGO-1730
+	@Test // DATAMONGO-550, DATAMONGO-1730
 	public void rejectsPlainObjectWithOutExplicitCollection() {
 
 		org.bson.Document document = new org.bson.Document("foo", "bar");
 		template.save(document, "collection");
 
-		template.findById(document.get("_id"), org.bson.Document.class);
+		assertThatExceptionOfType(MappingException.class)
+				.isThrownBy(() -> template.findById(document.get("_id"), org.bson.Document.class));
 	}
 
 	@Test // DATAMONGO-550
@@ -1620,7 +1592,7 @@ public void writesPlainString() {
 
 	@Test // DATAMONGO-551
 	public void rejectsNonJsonStringForSave() {
-		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> template.save("Foobar!", "collection"));
+		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> template.save("Foobar", "collection"));
 	}
 
 	@Test // DATAMONGO-588
@@ -1707,7 +1679,7 @@ public void correctlySetsLongVersionProperty() {
 		assertThat(person.version).isEqualTo(0L);
 	}
 
-	@Test(expected = DuplicateKeyException.class) // DATAMONGO-622
+	@Test // DATAMONGO-622
 	public void preventsDuplicateInsert() {
 
 		template.setWriteConcern(WriteConcern.ACKNOWLEDGED);
@@ -1719,7 +1691,7 @@ public void preventsDuplicateInsert() {
 		assertThat(person.version).isEqualTo(0);
 
 		person.version = null;
-		template.save(person);
+		assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(() -> template.save(person));
 	}
 
 	@Test // DATAMONGO-629
@@ -1735,7 +1707,7 @@ public void countAndFindWithoutTypeInformation() {
 		assertThat(template.count(query, collectionName)).isEqualTo(1L);
 	}
 
-	@Test // DATAMONGO-571
+	@Test // DATAMONGO-571, GH-3407
 	public void nullsPropertiesForVersionObjectUpdates() {
 
 		VersionedPerson person = new VersionedPerson();
@@ -1745,11 +1717,17 @@ public void nullsPropertiesForVersionObjectUpdates() {
 		template.save(person);
 		assertThat(person.id).isNotNull();
 
+		person.firstname = null;
 		person.lastname = null;
 		template.save(person);
 
 		person = template.findOne(query(where("id").is(person.id)), VersionedPerson.class);
+		assertThat(person.firstname).isNull();
 		assertThat(person.lastname).isNull();
+
+		org.bson.Document document = template.findOne(query(where("_id").is(person.id)), org.bson.Document.class,
+				"versionedPerson");
+		assertThat(document).doesNotContainKey("firstname").containsEntry("lastname", null);
 	}
 
 	@Test // DATAMONGO-571
@@ -1820,6 +1798,30 @@ public void findsEntityByDateReference() {
 		assertThat(result.get(0).date).isNotNull();
 	}
 
+	@Test // GH-4390
+	void nativeDriverDateTimeCodecShouldBeApplied/*when configured*/() {
+
+		MongoTestTemplate ops = new MongoTestTemplate(cfg -> {
+			cfg.configureConversion(conversion -> {
+				conversion.customConversions(
+						MongoCustomConversions.create(MongoConverterConfigurationAdapter::useNativeDriverJavaTimeCodecs));
+			});
+		});
+
+		TypeWithDate source = new TypeWithDate();
+		source.id = "id-1";
+		source.date = Date.from(Instant.now());
+
+		ops.save(source);
+
+		var dbDate = ops.execute(TypeWithDate.class,
+				collection -> collection.find(new org.bson.Document("_id", source.id)).first().get("date"));
+
+		TypeWithDate target = ops.findOne(query(where("date").is(source.date)), TypeWithDate.class);
+
+		assertThat(target.date).isEqualTo(source.date).isEqualTo(dbDate);
+	}
+
 	@Test // DATAMONGO-540
 	public void findOneAfterUpsertForNonExistingObjectReturnsTheInsertedObject() {
 
@@ -1882,7 +1884,7 @@ public void queryShouldSupportRealAndAliasedPropertyNamesForFieldInclusions() {
 		assertThat(result.property3).isEqualTo(obj.property3);
 	}
 
-	@Test // DATAMONGO-702
+	@Test // DATAMONGO-702, DATAMONGO-2294
 	public void queryShouldSupportRealAndAliasedPropertyNamesForFieldExclusions() {
 
 		ObjectWith3AliasedFields obj = new ObjectWith3AliasedFields();
@@ -1895,8 +1897,7 @@ public void queryShouldSupportRealAndAliasedPropertyNamesForFieldExclusions() {
 
 		Query query = new Query(Criteria.where("id").is(obj.id));
 		query.fields() //
-				.exclude("property2") // real property name
-				.exclude("prop3"); // aliased property name
+				.exclude("property2", "prop3"); // real property name, aliased property name
 
 		ObjectWith3AliasedFields result = template.findOne(query, ObjectWith3AliasedFields.class);
 
@@ -2558,6 +2559,73 @@ public void findAndReplaceShouldProjectReturnedObjectCorrectly() {
 		assertThat(projection.getName()).isEqualTo("Walter");
 	}
 
+	@Test // GH-4707
+	public void findAndReplaceUpsertsObjectWithComplexId() {
+
+		MyId id = new MyId();
+		id.id = Instant.now().minusSeconds(2);
+		id.first = "foo";
+		id.second = "bar";
+		id.time = Instant.now().minusSeconds(3);
+
+		TypeWithMyId replacement = new TypeWithMyId();
+		replacement.value = "spring";
+
+		template.findAndReplace(query(where("id").is(id)), replacement, FindAndReplaceOptions.options().upsert());
+		template.doInCollection(TypeWithMyId.class, collection -> {
+
+			org.bson.Document dbValue = collection.find(new org.bson.Document("_id.first", "foo")).first();
+
+			assertThat(dbValue).isNotNull();
+			assertThat(dbValue.getEmbedded(List.of("_id", "_id"), Object.class)).isInstanceOf(Date.class);
+			assertThat(dbValue.getEmbedded(List.of("_id", "t"), Object.class)).isInstanceOf(Date.class);
+		});
+	}
+
+	@Test // GH-4609
+	public void shouldReadNestedProjection() {
+
+		MyPerson walter = new MyPerson("Walter");
+		walter.address = new Address("spring", "data");
+		template.save(walter);
+
+		PersonPWA result = template.query(MyPerson.class)
+				.as(PersonPWA.class)
+				.matching(where("id").is(walter.id))
+				.firstValue();
+
+		assertThat(result.getAddress().getCity()).isEqualTo("data");
+	}
+
+	interface PersonPWA {
+		String getName();
+		AdressProjection getAddress();
+	}
+
+	interface AdressProjection {
+		String getCity();
+	}
+
+	@Test // GH-4300
+	public void findAndReplaceShouldAllowNativeDomainTypesAndReturnAProjection() {
+
+		MyPerson person = new MyPerson("Walter");
+		person.address = new Address("TX", "Austin");
+		template.save(person);
+
+		MyPerson previous = template.findAndReplace(query(where("name").is("Walter")),
+				new org.bson.Document("name", "Heisenberg"), FindAndReplaceOptions.options(), org.bson.Document.class,
+				"myPerson", MyPerson.class);
+
+		assertThat(previous).isNotNull();
+		assertThat(previous.getAddress()).isEqualTo(person.address);
+
+		org.bson.Document loaded = template.execute(MyPerson.class, collection -> {
+			return collection.find(new org.bson.Document("name", "Heisenberg")).first();
+		});
+		assertThat(loaded.get("_id")).isEqualTo(new ObjectId(person.id));
+	}
+
 	@Test // DATAMONGO-407
 	public void updatesShouldRetainTypeInformationEvenForCollections() {
 
@@ -2624,30 +2692,6 @@ public void updateFirstShouldDoNothingWhenCalledForEntitiesThatDoNotExist() {
 		assertThat(template.findOne(q, VersionedPerson.class)).isNull();
 	}
 
-	@Test // DATAMONGO-354, DATAMONGO-1824
-	@MongoVersion(until = "3.6")
-	@SuppressWarnings("deprecation")
-	public void testUpdateShouldAllowMultiplePushAll() {
-
-		DocumentWithMultipleCollections doc = new DocumentWithMultipleCollections();
-		doc.id = "1234";
-		doc.string1 = Arrays.asList("spring");
-		doc.string2 = Arrays.asList("one");
-
-		template.save(doc);
-
-		Update update = new Update().pushAll("string1", new Object[] { "data", "mongodb" });
-		update.pushAll("string2", new String[] { "two", "three" });
-
-		Query findQuery = new Query(Criteria.where("id").is(doc.id));
-		template.updateFirst(findQuery, update, DocumentWithMultipleCollections.class);
-
-		DocumentWithMultipleCollections result = template.findOne(findQuery, DocumentWithMultipleCollections.class);
-		assertThat(result.string1).contains("spring", "data", "mongodb");
-		assertThat(result.string2).contains("one", "two", "three");
-
-	}
-
 	@Test // DATAMONGO-404
 	public void updateWithPullShouldRemoveNestedItemFromDbRefAnnotatedCollection() {
 
@@ -3067,6 +3111,18 @@ public void generatesIdForInsertAll() {
 		assertThat(jesse.getId()).isNotNull();
 	}
 
+	@Test // GH-4944
+	public void insertAllShouldConvertIdToTargetTypeBeforeSave() {
+
+		RawStringId walter = new RawStringId();
+		walter.value = "walter";
+
+		RawStringId returned = template.insertAll(List.of(walter)).iterator().next();
+		org.bson.Document document = template.execute(RawStringId.class, collection -> collection.find().first());
+
+		assertThat(returned.id).isEqualTo(document.get("_id"));
+	}
+
 	@Test // DATAMONGO-1208
 	public void takesSortIntoAccountWhenStreaming() {
 
@@ -3077,10 +3133,9 @@ public void takesSortIntoAccountWhenStreaming() {
 
 		Query q = new Query();
 		q.with(Sort.by(Direction.ASC, "age"));
-		CloseableIterator<Person> stream = template.stream(q, Person.class);
+		List<Integer> streamResults = template.stream(q, Person.class).map(Person::getAge).toList();
 
-		assertThat(stream.next().getAge()).isEqualTo(youngestPerson.getAge());
-		assertThat(stream.next().getAge()).isEqualTo(oldestPerson.getAge());
+		assertThat(streamResults).containsExactly(youngestPerson.getAge(), oldestPerson.getAge());
 	}
 
 	@Test // DATAMONGO-1208
@@ -3093,7 +3148,7 @@ public void takesLimitIntoAccountWhenStreaming() {
 
 		Query q = new Query();
 		q.with(PageRequest.of(0, 1, Sort.by(Direction.ASC, "age")));
-		CloseableIterator<Person> stream = template.stream(q, Person.class);
+		Iterator<Person> stream = template.stream(q, Person.class).iterator();
 
 		assertThat(stream.next().getAge()).isEqualTo(youngestPerson.getAge());
 		assertThat(stream.hasNext()).isFalse();
@@ -3365,11 +3420,11 @@ public void streamExecutionUsesExplicitCollectionName() {
 
 		template.insert(document, "some_special_collection");
 
-		CloseableIterator<Document> stream = template.stream(new Query(), Document.class);
-		assertThat(stream.hasNext()).isFalse();
+		Stream<Document> stream = template.stream(new Query(), Document.class);
+		assertThat(stream).isEmpty();
 
-		CloseableIterator<org.bson.Document> stream2 = template.stream(new Query(where("_id").is(document.id)),
-				org.bson.Document.class, "some_special_collection");
+		Iterator<org.bson.Document> stream2 = template
+				.stream(new Query(where("_id").is(document.id)), org.bson.Document.class, "some_special_collection").iterator();
 
 		assertThat(stream2.hasNext()).isTrue();
 		assertThat(stream2.next().get("_id")).isEqualTo(new ObjectId(document.id));
@@ -3617,7 +3672,7 @@ public void removeShouldConsiderLimit() {
 				.mapToObj(i -> new Sample("id-" + i, i % 2 == 0 ? "stark" : "lannister")) //
 				.collect(Collectors.toList());
 
-		template.insertAll(samples);
+		template.bulkOps(BulkMode.UNORDERED, Sample.class).insert(samples).execute();
 
 		DeleteResult wr = template.remove(query(where("field").is("lannister")).limit(25), Sample.class);
 
@@ -3632,7 +3687,7 @@ public void removeShouldConsiderSkipAndSort() {
 				.mapToObj(i -> new Sample("id-" + i, i % 2 == 0 ? "stark" : "lannister")) //
 				.collect(Collectors.toList());
 
-		template.insertAll(samples);
+		template.bulkOps(BulkMode.UNORDERED, Sample.class).insert(samples).execute();
 
 		DeleteResult wr = template.remove(new Query().skip(25).with(Sort.by("field")), Sample.class);
 
@@ -3665,12 +3720,13 @@ public void writesAuditingMetadataForImmutableTypes() {
 		ImmutableAudited source = new ImmutableAudited(null, null);
 		ImmutableAudited result = template.save(source);
 
-		assertThat(result).isNotSameAs(source).describedAs("Expected a different instances to be returned!");
-		assertThat(result.modified).isNotNull().describedAs("Auditing field must not be null!");
+		assertThat(result).isNotSameAs(source).describedAs("Expected a different instances to be returned");
+		assertThat(result.modified).isNotNull().describedAs("Auditing field must not be null");
 
 		ImmutableAudited read = template.findOne(query(where("id").is(result.getId())), ImmutableAudited.class);
 
-		assertThat(read.modified).isEqualTo(result.modified).describedAs("Expected auditing information to be read!");
+		assertThat(read.modified).isEqualTo(result.modified.truncatedTo(ChronoUnit.MILLIS))
+				.describedAs("Expected auditing information to be read");
 	}
 
 	@Test // DATAMONGO-1798
@@ -3693,6 +3749,57 @@ public void saveAndLoadStringThatIsAnObjectIdAsString() {
 		assertThat(target).isEqualTo(source);
 	}
 
+	@Test // GH-4184
+	void insertHonorsExistingRawId() {
+
+		RawStringId source = new RawStringId();
+		source.id = "abc";
+		source.value = "new value";
+
+		template.insert(source);
+
+		org.bson.Document result = template
+				.execute(db -> db.getCollection(template.getCollectionName(RawStringId.class)).find().limit(1).cursor().next());
+
+		assertThat(result).isNotNull();
+		assertThat(result.get("_id")).isEqualTo("abc");
+
+		RawStringId target = template.findOne(query(where("id").is(source.id)), RawStringId.class);
+		assertThat(target).isEqualTo(source);
+	}
+
+	@Test // GH-4026
+	void saveShouldGenerateNewIdOfTypeIfExplicitlyDefined() {
+
+		RawStringId source = new RawStringId();
+		source.value = "new value";
+
+		template.save(source);
+
+		template.execute(RawStringId.class, collection -> {
+
+			org.bson.Document first = collection.find(new org.bson.Document()).first();
+			assertThat(first.get("_id")).isInstanceOf(String.class);
+			return null;
+		});
+	}
+
+	@Test // GH-4026
+	void insertShouldGenerateNewIdOfTypeIfExplicitlyDefined() {
+
+		RawStringId source = new RawStringId();
+		source.value = "new value";
+
+		template.insert(source);
+
+		template.execute(RawStringId.class, collection -> {
+
+			org.bson.Document first = collection.find(new org.bson.Document()).first();
+			assertThat(first.get("_id")).isInstanceOf(String.class);
+			return null;
+		});
+	}
+
 	@Test // DATAMONGO-2193
 	public void shouldNotConvertStringToObjectIdForNonIdField() {
 
@@ -3711,6 +3818,267 @@ public void shouldNotConvertStringToObjectIdForNonIdField() {
 		assertThat(target.inner.id).isEqualTo(innerId);
 	}
 
+	@Test // DATAMONGO-2294
+	public void shouldProjectWithCollections() {
+
+		MyPerson person = new MyPerson("Walter");
+		person.address = new Address("TX", "Austin");
+		template.save(person);
+
+		Query queryByChainedInclude = query(where("name").is("Walter"));
+		queryByChainedInclude.fields().include("id").include("name");
+
+		Query queryByCollectionInclude = query(where("name").is("Walter"));
+		queryByCollectionInclude.fields().include("id", "name");
+
+		MyPerson first = template.findAndReplace(queryByChainedInclude, new MyPerson("Walter"));
+		MyPerson second = template.findAndReplace(queryByCollectionInclude, new MyPerson("Walter"));
+
+		assertThat(first).isEqualTo(second);
+		assertThat(first.address).isNull();
+		assertThat(second.address).isNull();
+	}
+
+	@Test // DATAMONGO-2451
+	public void sortOnIdFieldWithExplicitTypeShouldWork() {
+
+		template.dropCollection(WithIdAndFieldAnnotation.class);
+
+		WithIdAndFieldAnnotation f = new WithIdAndFieldAnnotation();
+		f.id = new ObjectId().toHexString();
+		f.value = "value";
+
+		template.save(f);
+
+		assertThat(template.find(new BasicQuery("{}").with(Sort.by("id")), WithIdAndFieldAnnotation.class)).isNotEmpty();
+	}
+
+	@Test // GH-3407
+	void shouldWriteSubdocumentWithNullCorrectly() {
+
+		template.dropCollection(WithSubdocument.class);
+
+		WithSubdocument doc = new WithSubdocument();
+		SubdocumentWithWriteNull subdoc = new SubdocumentWithWriteNull("Walter", "White");
+		doc.subdocument = subdoc;
+
+		template.save(doc);
+
+		org.bson.Document loaded = template.findById(doc.id, org.bson.Document.class, "withSubdocument");
+
+		assertThat(loaded.get("subdocument", org.bson.Document.class)).hasSize(3).containsEntry("firstname", "Walter")
+				.containsEntry("nickname", null);
+	}
+
+	@Test // GH-3407
+	void shouldUpdateSubdocumentWithNullCorrectly() {
+
+		template.dropCollection(WithSubdocument.class);
+
+		WithSubdocument doc = new WithSubdocument();
+		SubdocumentWithWriteNull subdoc = new SubdocumentWithWriteNull("Walter", "White");
+		subdoc.nickname = "Heisenberg";
+		doc.subdocument = subdoc;
+
+		template.save(doc);
+
+		String id = doc.id;
+
+		doc.id = null;
+		subdoc.nickname = null;
+		template.update(WithSubdocument.class).replaceWith(doc).findAndReplaceValue();
+
+		org.bson.Document loaded = template.findById(id, org.bson.Document.class, "withSubdocument");
+
+		assertThat(loaded.get("subdocument", org.bson.Document.class)).hasSize(3).containsEntry("firstname", "Walter")
+				.containsEntry("nickname", null);
+	}
+
+	@Test // GH-3407
+	void shouldFindSubdocumentWithNullCorrectly() {
+
+		template.dropCollection(WithSubdocument.class);
+
+		WithSubdocument doc = new WithSubdocument();
+		SubdocumentWithWriteNull subdoc = new SubdocumentWithWriteNull("Walter", "White");
+		doc.subdocument = subdoc;
+
+		template.save(doc);
+
+		org.bson.Document loaded = template.findOne(query(where("subdocument").is(subdoc)), org.bson.Document.class,
+				"withSubdocument");
+
+		assertThat(loaded).isNotNull();
+	}
+
+	@Test // GH-3811
+	public void sliceShouldLimitCollectionValues() {
+
+		DocumentWithCollectionOfSimpleType source = new DocumentWithCollectionOfSimpleType();
+		source.id = "id-1";
+		source.values = Arrays.asList("spring", "data", "mongodb");
+
+		template.save(source);
+
+		Criteria criteria = Criteria.where("id").is(source.id);
+		Query query = Query.query(criteria);
+		query.fields().slice("values", 0, 1);
+		DocumentWithCollectionOfSimpleType target = template.findOne(query, DocumentWithCollectionOfSimpleType.class);
+
+		assertThat(target.values).containsExactly("spring");
+	}
+
+	@Test // GH-2750
+	void shouldExecuteQueryWithExpression() {
+
+		TypeWithFieldAnnotation source1 = new TypeWithFieldAnnotation();
+		source1.emailAddress = "spring.data@pivotal.com";
+
+		TypeWithFieldAnnotation source2 = new TypeWithFieldAnnotation();
+		source2.emailAddress = "spring.data@vmware.com";
+
+		template.insertAll(List.of(source1, source2));
+
+		TypeWithFieldAnnotation loaded = template.query(TypeWithFieldAnnotation.class)
+				.matching(expr(StringOperators.valueOf("emailAddress").regexFind(".*@vmware.com$", "i"))).firstValue();
+
+		assertThat(loaded).isEqualTo(source2);
+	}
+
+	@Test // GH-4300
+	public void replaceShouldReplaceDocument() {
+
+		org.bson.Document doc = new org.bson.Document("foo", "bar");
+		String collectionName = "replace";
+		template.save(doc, collectionName);
+
+		org.bson.Document replacement = new org.bson.Document("foo", "baz");
+		UpdateResult updateResult = template.replace(query(where("foo").is("bar")), replacement,
+				ReplaceOptions.replaceOptions(), collectionName);
+
+		assertThat(updateResult.wasAcknowledged()).isTrue();
+		assertThat(template.findOne(query(where("foo").is("baz")), org.bson.Document.class, collectionName)).isNotNull();
+	}
+
+	@Test // GH-4464
+	void saveEntityWithDotInFieldName() {
+
+		WithFieldNameContainingDots source = new WithFieldNameContainingDots();
+		source.id = "id-1";
+		source.value = "v1";
+
+		template.save(source);
+
+		org.bson.Document raw = template.execute(WithFieldNameContainingDots.class, collection -> collection.find(new org.bson.Document("_id", source.id)).first());
+		assertThat(raw).containsEntry("field.name.with.dots", "v1");
+	}
+
+	@Test // GH-4464
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "5.0")
+	void queryEntityWithDotInFieldNameUsingExpr() {
+
+		WithFieldNameContainingDots source = new WithFieldNameContainingDots();
+		source.id = "id-1";
+		source.value = "v1";
+
+		WithFieldNameContainingDots source2 = new WithFieldNameContainingDots();
+		source2.id = "id-2";
+		source2.value = "v2";
+
+		template.save(source);
+		template.save(source2);
+
+		WithFieldNameContainingDots loaded = template.query(WithFieldNameContainingDots.class) // with property -> fieldname mapping
+				.matching(expr(ComparisonOperators.valueOf(ObjectOperators.getValueOf("value")).equalToValue("v1"))).firstValue();
+
+		assertThat(loaded).isEqualTo(source);
+
+		loaded = template.query(WithFieldNameContainingDots.class) // using raw fieldname
+				.matching(expr(ComparisonOperators.valueOf(ObjectOperators.getValueOf("field.name.with.dots")).equalToValue("v1"))).firstValue();
+
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4464
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "5.0")
+	void updateEntityWithDotInFieldNameUsingAggregations() {
+
+		WithFieldNameContainingDots source = new WithFieldNameContainingDots();
+		source.id = "id-1";
+		source.value = "v1";
+
+		template.save(source);
+
+		template.update(WithFieldNameContainingDots.class)
+				.matching(where("id").is(source.id))
+				.apply(AggregationUpdate.newUpdate(ReplaceWithOperation.replaceWithValue(ObjectOperators.setValueTo("value", "changed"))))
+				.first();
+
+		org.bson.Document raw = template.execute(WithFieldNameContainingDots.class, collection -> collection.find(new org.bson.Document("_id", source.id)).first());
+		assertThat(raw).containsEntry("field.name.with.dots", "changed");
+
+		template.update(WithFieldNameContainingDots.class)
+				.matching(where("id").is(source.id))
+				.apply(AggregationUpdate.newUpdate(ReplaceWithOperation.replaceWithValue(ObjectOperators.setValueTo("field.name.with.dots", "changed-again"))))
+				.first();
+
+		raw = template.execute(WithFieldNameContainingDots.class, collection -> collection.find(new org.bson.Document("_id", source.id)).first());
+		assertThat(raw).containsEntry("field.name.with.dots", "changed-again");
+	}
+
+	@Test // GH-4464
+	void savesMapWithDotInKey() {
+
+		MongoTestUtils.flushCollection(DB_NAME, template.getCollectionName(WithFieldNameContainingDots.class), client);
+
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				template.getConverter().getMappingContext());
+		converter.preserveMapKeys(true);
+		converter.afterPropertiesSet();
+
+		MongoTemplate template = new MongoTemplate(new SimpleMongoClientDatabaseFactory(client, DB_NAME), converter);
+
+		WithFieldNameContainingDots source = new WithFieldNameContainingDots();
+		source.id = "id-1";
+		source.mapValue = Map.of("k1", "v1", "map.key.with.dot", "v2");
+
+		template.save(source);
+
+		org.bson.Document raw = template.execute(WithFieldNameContainingDots.class,
+				collection -> collection.find(new org.bson.Document("_id", source.id)).first());
+
+		assertThat(raw.get("mapValue", org.bson.Document.class))
+				.containsEntry("k1", "v1")
+				.containsEntry("map.key.with.dot", "v2");
+	}
+
+	@Test // GH-4464
+	void readsMapWithDotInKey() {
+
+		MongoTestUtils.flushCollection(DB_NAME, template.getCollectionName(WithFieldNameContainingDots.class), client);
+
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				template.getConverter().getMappingContext());
+		converter.preserveMapKeys(true);
+		converter.afterPropertiesSet();
+
+		MongoTemplate template = new MongoTemplate(new SimpleMongoClientDatabaseFactory(client, DB_NAME), converter);
+
+		Map<String, String> sourceMap = Map.of("k1", "v1", "sourceMap.key.with.dot", "v2");
+		template.execute(WithFieldNameContainingDots.class,
+				collection -> {
+					collection.insertOne(new org.bson.Document("_id", "id-1").append("mapValue", sourceMap));
+					return null;
+				}
+			);
+
+		WithFieldNameContainingDots loaded = template.query(WithFieldNameContainingDots.class)
+				.matching(where("id").is("id-1"))
+				.firstValue();
+
+		assertThat(loaded.mapValue).isEqualTo(sourceMap);
+	}
+
 	private AtomicReference<ImmutableVersioned> createAfterSaveReference() {
 
 		AtomicReference<ImmutableVersioned> saved = new AtomicReference<>();
@@ -3754,7 +4122,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 			if (this == obj) {
 				return true;
 			}
@@ -3784,7 +4152,6 @@ public boolean equals(Object obj) {
 
 	}
 
-	@Data
 	static class DocumentWithDBRefCollection {
 
 		@Id public String id;
@@ -3802,34 +4169,161 @@ static class DocumentWithDBRefCollection {
 
 		@Field("lazy_db_ref_map") // DATAMONGO-1194
 		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) public Map<String, Sample> lazyDbRefAnnotatedMap;
-	}
 
-	@Data
-	@AllArgsConstructor
-	static class DocumentWithLazyDBRefsAndConstructorCreation {
+		public String getId() {
+			return this.id;
+		}
 
-		@Id public String id;
+		public List<Sample> getDbRefAnnotatedList() {
+			return this.dbRefAnnotatedList;
+		}
 
-		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) //
-		public Sample lazyDbRefProperty;
+		public Sample getDbRefProperty() {
+			return this.dbRefProperty;
+		}
 
-		@Field("lazy_db_ref_list") @org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) //
-		public List<Sample> lazyDbRefAnnotatedList;
+		public List<Sample> getLazyDbRefAnnotatedList() {
+			return this.lazyDbRefAnnotatedList;
+		}
 
-		@Field("lazy_db_ref_map") @org.springframework.data.mongodb.core.mapping.DBRef(
-				lazy = true) public Map<String, Sample> lazyDbRefAnnotatedMap;
-	}
+		public Map<String, Sample> getLazyDbRefAnnotatedMap() {
+			return this.lazyDbRefAnnotatedMap;
+		}
 
-	@EqualsAndHashCode
-	static class DocumentWithCollection {
+		public void setId(String id) {
+			this.id = id;
+		}
 
-		@Id String id;
-		List<Model> models;
+		public void setDbRefAnnotatedList(List<Sample> dbRefAnnotatedList) {
+			this.dbRefAnnotatedList = dbRefAnnotatedList;
+		}
 
-		DocumentWithCollection(List<Model> models) {
-			this.models = models;
+		public void setDbRefProperty(Sample dbRefProperty) {
+			this.dbRefProperty = dbRefProperty;
 		}
-	}
+
+		public void setLazyDbRefAnnotatedList(List<Sample> lazyDbRefAnnotatedList) {
+			this.lazyDbRefAnnotatedList = lazyDbRefAnnotatedList;
+		}
+
+		public void setLazyDbRefAnnotatedMap(Map<String, Sample> lazyDbRefAnnotatedMap) {
+			this.lazyDbRefAnnotatedMap = lazyDbRefAnnotatedMap;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			DocumentWithDBRefCollection that = (DocumentWithDBRefCollection) o;
+			return Objects.equals(id, that.id) && Objects.equals(dbRefAnnotatedList, that.dbRefAnnotatedList)
+					&& Objects.equals(dbRefProperty, that.dbRefProperty)
+					&& Objects.equals(lazyDbRefAnnotatedList, that.lazyDbRefAnnotatedList)
+					&& Objects.equals(lazyDbRefAnnotatedMap, that.lazyDbRefAnnotatedMap);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, dbRefAnnotatedList, dbRefProperty, lazyDbRefAnnotatedList, lazyDbRefAnnotatedMap);
+		}
+
+		public String toString() {
+			return "MongoTemplateTests.DocumentWithDBRefCollection(id=" + this.getId() + ", dbRefAnnotatedList="
+					+ this.getDbRefAnnotatedList() + ", dbRefProperty=" + this.getDbRefProperty() + ", lazyDbRefAnnotatedList="
+					+ this.getLazyDbRefAnnotatedList() + ", lazyDbRefAnnotatedMap=" + this.getLazyDbRefAnnotatedMap() + ")";
+		}
+	}
+
+	static class DocumentWithLazyDBRefsAndConstructorCreation {
+
+		@Id public String id;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) //
+		public Sample lazyDbRefProperty;
+
+		@Field("lazy_db_ref_list")
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) //
+		public List<Sample> lazyDbRefAnnotatedList;
+
+		@Field("lazy_db_ref_map")
+		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) public Map<String, Sample> lazyDbRefAnnotatedMap;
+
+		public DocumentWithLazyDBRefsAndConstructorCreation(String id, Sample lazyDbRefProperty,
+				List<Sample> lazyDbRefAnnotatedList, Map<String, Sample> lazyDbRefAnnotatedMap) {
+			this.id = id;
+			this.lazyDbRefProperty = lazyDbRefProperty;
+			this.lazyDbRefAnnotatedList = lazyDbRefAnnotatedList;
+			this.lazyDbRefAnnotatedMap = lazyDbRefAnnotatedMap;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Sample getLazyDbRefProperty() {
+			return this.lazyDbRefProperty;
+		}
+
+		public List<Sample> getLazyDbRefAnnotatedList() {
+			return this.lazyDbRefAnnotatedList;
+		}
+
+		public Map<String, Sample> getLazyDbRefAnnotatedMap() {
+			return this.lazyDbRefAnnotatedMap;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setLazyDbRefProperty(Sample lazyDbRefProperty) {
+			this.lazyDbRefProperty = lazyDbRefProperty;
+		}
+
+		public void setLazyDbRefAnnotatedList(List<Sample> lazyDbRefAnnotatedList) {
+			this.lazyDbRefAnnotatedList = lazyDbRefAnnotatedList;
+		}
+
+		public void setLazyDbRefAnnotatedMap(Map<String, Sample> lazyDbRefAnnotatedMap) {
+			this.lazyDbRefAnnotatedMap = lazyDbRefAnnotatedMap;
+		}
+
+		public String toString() {
+			return "MongoTemplateTests.DocumentWithLazyDBRefsAndConstructorCreation(id=" + this.getId()
+					+ ", lazyDbRefProperty=" + this.getLazyDbRefProperty() + ", lazyDbRefAnnotatedList="
+					+ this.getLazyDbRefAnnotatedList() + ", lazyDbRefAnnotatedMap=" + this.getLazyDbRefAnnotatedMap() + ")";
+		}
+	}
+
+	static class DocumentWithCollection {
+
+		@Id String id;
+		List<Model> models;
+
+		DocumentWithCollection(List<Model> models) {
+			this.models = models;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			DocumentWithCollection that = (DocumentWithCollection) o;
+			return Objects.equals(id, that.id) && Objects.equals(models, that.models);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, models);
+		}
+	}
 
 	static class DocumentWithCollectionOfSimpleType {
 
@@ -3842,11 +4336,27 @@ static class DocumentWithCollectionOfSamples {
 		List<Sample> samples;
 	}
 
-	@EqualsAndHashCode
 	static class DocumentWithNestedTypeHavingStringIdProperty {
 
 		@Id String id;
 		Sample sample;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			DocumentWithNestedTypeHavingStringIdProperty that = (DocumentWithNestedTypeHavingStringIdProperty) o;
+			return Objects.equals(id, that.id) && Objects.equals(sample, that.sample);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, sample);
+		}
 	}
 
 	static class DocumentWithMultipleCollections {
@@ -3880,7 +4390,6 @@ static interface Model {
 		String id();
 	}
 
-	@EqualsAndHashCode
 	static class ModelA implements Model {
 
 		@Id String id;
@@ -3899,6 +4408,23 @@ public String value() {
 		public String id() {
 			return id;
 		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ModelA modelA = (ModelA) o;
+			return Objects.equals(id, modelA.id) && Objects.equals(value, modelA.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
 	}
 
 	static class Document {
@@ -3911,15 +4437,17 @@ static class MyId {
 
 		String first;
 		String second;
+		Instant id;
+
+		@Field("t") Instant time;
 	}
 
 	static class TypeWithMyId {
 
 		@Id MyId id;
+		String value;
 	}
 
-	@EqualsAndHashCode
-	@NoArgsConstructor
 	static class Sample {
 
 		@Id String id;
@@ -3929,14 +4457,33 @@ public Sample(String id, String field) {
 			this.id = id;
 			this.field = field;
 		}
+
+		public Sample() {}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Sample sample = (Sample) o;
+			return Objects.equals(id, sample.id) && Objects.equals(field, sample.field);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, field);
+		}
 	}
 
 	static class TestClass {
 
-		DateTime myDate;
+		LocalDateTime myDate;
 
-		@PersistenceConstructor
-		TestClass(DateTime myDate) {
+		@PersistenceCreator
+		TestClass(LocalDateTime myDate) {
 			this.myDate = myDate;
 		}
 	}
@@ -3947,36 +4494,81 @@ static class PersonWithConvertedId {
 		String name;
 	}
 
-	static enum DateTimeToDateConverter implements Converter<DateTime, Date> {
+	static enum DateTimeToDateConverter implements Converter<LocalDateTime, Date> {
 
 		INSTANCE;
 
-		public Date convert(DateTime source) {
-			return source == null ? null : source.toDate();
+		public Date convert(LocalDateTime source) {
+			return source == null ? null : java.util.Date.from(source.atZone(ZoneId.systemDefault()).toInstant());
 		}
 	}
 
-	static enum DateToDateTimeConverter implements Converter<Date, DateTime> {
+	static enum DateToDateTimeConverter implements Converter<Date, LocalDateTime> {
 
 		INSTANCE;
 
-		public DateTime convert(Date source) {
-			return source == null ? null : new DateTime(source.getTime());
+		public LocalDateTime convert(Date source) {
+			return source == null ? null : LocalDateTime.ofInstant(source.toInstant(), ZoneId.systemDefault());
 		}
 	}
 
-	@Data
-	@NoArgsConstructor
-	@AllArgsConstructor
 	public static class MyPerson {
 
 		String id;
 		String name;
 		Address address;
 
+		public MyPerson() {}
+
 		public MyPerson(String name) {
 			this.name = name;
 		}
+
+		public MyPerson(String id, String name, Address address) {
+			this.id = id;
+			this.name = name;
+			this.address = address;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Address getAddress() {
+			return address;
+		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+			MyPerson myPerson = (MyPerson) o;
+			return Objects.equals(id, myPerson.id) && Objects.equals(name, myPerson.name)
+					&& Objects.equals(address, myPerson.address);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, address);
+		}
 	}
 
 	interface MyPersonProjection {
@@ -3997,7 +4589,7 @@ static class Address {
 		}
 
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 
 			if (obj == this) {
 				return true;
@@ -4028,13 +4620,31 @@ public int hashCode() {
 	static class VersionedPerson {
 
 		@Version Long version;
-		String id, firstname, lastname;
+		String id, firstname;
+		@Field(write = Field.Write.ALWAYS) String lastname;
 	}
 
 	static class TypeWithFieldAnnotation {
 
 		@Id ObjectId id;
 		@Field("email") String emailAddress;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			TypeWithFieldAnnotation that = (TypeWithFieldAnnotation) o;
+			return Objects.equals(id, that.id) && Objects.equals(emailAddress, that.emailAddress);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, emailAddress);
+		}
 	}
 
 	static class TypeWithDate {
@@ -4075,7 +4685,6 @@ public SomeContent getContent() {
 		}
 	}
 
-	@EqualsAndHashCode
 	public static class SomeContent {
 
 		String id;
@@ -4089,7 +4698,6 @@ public String getName() {
 
 		public void setText(String text) {
 			this.text = text;
-
 		}
 
 		public String getId() {
@@ -4099,6 +4707,24 @@ public String getId() {
 		public String getText() {
 			return text;
 		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			SomeContent that = (SomeContent) o;
+			return Objects.equals(id, that.id) && Objects.equals(text, that.text) && Objects.equals(name, that.name)
+					&& Objects.equals(dbrefMessage, that.dbrefMessage);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, text, name, dbrefMessage);
+		}
 	}
 
 	static class SomeMessage {
@@ -4113,7 +4739,7 @@ static class DocumentWithLazyDBrefUsedInPresistenceConstructor {
 		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) Document refToDocUsedInCtor;
 		@org.springframework.data.mongodb.core.mapping.DBRef(lazy = true) Document refToDocNotUsedInCtor;
 
-		@PersistenceConstructor
+		@PersistenceCreator
 		public DocumentWithLazyDBrefUsedInPresistenceConstructor(Document refToDocUsedInCtor) {
 			this.refToDocUsedInCtor = refToDocUsedInCtor;
 		}
@@ -4129,11 +4755,28 @@ static class WithGeoJson {
 		GeoJsonPoint point;
 	}
 
-	@Data
 	static class WithObjectTypeProperty {
 
 		@Id String id;
 		Object value;
+
+		public WithObjectTypeProperty() {}
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public void setValue(Object value) {
+			this.value = value;
+		}
 	}
 
 	static class PersonWithIdPropertyOfTypeUUIDListener
@@ -4206,32 +4849,112 @@ public String toString() {
 	}
 
 	// DATAMONGO-1992
-
-	@AllArgsConstructor
-	@Wither
 	static class ImmutableVersioned {
 
 		final @Id String id;
 		final @Version Long version;
 
 		public ImmutableVersioned() {
-			id = null;
-			version = null;
+			this(null, null);
+		}
+
+		public ImmutableVersioned(String id, Long version) {
+			this.id = id;
+			this.version = version;
+		}
+
+		ImmutableVersioned withVersion(Long version) {
+			return new ImmutableVersioned(id, version);
+		}
+
+		ImmutableVersioned withId(String id) {
+			return new ImmutableVersioned(id, version);
 		}
 	}
 
-	@Value
-	@Wither
 	static class ImmutableAudited {
-		@Id String id;
-		@LastModifiedDate Instant modified;
+
+		final @Id String id;
+		final @LastModifiedDate Instant modified;
+
+		ImmutableAudited(String id, Instant modified) {
+			this.id = id;
+			this.modified = modified;
+		}
+
+		ImmutableAudited withId(String id) {
+			return new ImmutableAudited(id, modified);
+		}
+
+		ImmutableAudited withModified(Instant modified) {
+			return new ImmutableAudited(id, modified);
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public Instant getModified() {
+			return modified;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ImmutableAudited that = (ImmutableAudited) o;
+			return Objects.equals(id, that.id) && Objects.equals(modified, that.modified);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, modified);
+		}
 	}
 
-	@Data
 	static class RawStringId {
 
 		@MongoId String id;
 		String value;
+
+		public RawStringId() {}
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			RawStringId that = (RawStringId) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
 	}
 
 	static class Outer {
@@ -4245,4 +4968,113 @@ static class Inner {
 		@Field("id") String id;
 		String value;
 	}
+
+	static class WithIdAndFieldAnnotation {
+
+		@Id //
+		@Field(name = "_id") //
+		String id;
+		String value;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+	}
+
+	static class WithSubdocument {
+
+		@Id //
+		@Field(name = "_id") //
+		String id;
+		SubdocumentWithWriteNull subdocument;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public SubdocumentWithWriteNull getSubdocument() {
+			return subdocument;
+		}
+
+		public void setSubdocument(SubdocumentWithWriteNull subdocument) {
+			this.subdocument = subdocument;
+		}
+	}
+
+	static class SubdocumentWithWriteNull {
+
+		final String firstname, lastname;
+
+		@Field(write = Field.Write.ALWAYS) String nickname;
+
+		public SubdocumentWithWriteNull(String firstname, String lastname) {
+			this.firstname = firstname;
+			this.lastname = lastname;
+		}
+
+		public String getFirstname() {
+			return firstname;
+		}
+
+		public String getLastname() {
+			return lastname;
+		}
+
+		public String getNickname() {
+			return nickname;
+		}
+
+		public void setNickname(String nickname) {
+			this.nickname = nickname;
+		}
+	}
+
+	static class WithFieldNameContainingDots {
+
+		String id;
+
+		@Field(value = "field.name.with.dots", nameType = Type.KEY)
+		String value;
+
+		Map<String, String> mapValue;
+
+		@Override
+		public String toString() {
+			return "WithMap{" + "id='" + id + '\'' + ", value='" + value + '\'' + ", mapValue=" + mapValue + '}';
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithFieldNameContainingDots withFieldNameContainingDots = (WithFieldNameContainingDots) o;
+			return Objects.equals(id, withFieldNameContainingDots.id) && Objects.equals(value, withFieldNameContainingDots.value)
+					&& Objects.equals(mapValue, withFieldNameContainingDots.mapValue);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value, mapValue);
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTransactionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTransactionTests.java
index da8ab558ee..ec0ab192fa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTransactionTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateTransactionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,69 +15,85 @@
  */
 package org.springframework.data.mongodb.core;
 
+import static java.util.UUID.*;
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.test.util.MongoTestUtils.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
+import java.time.Duration;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.SetSystemProperty;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Persistable;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.CapturingTransactionOptionsResolver;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.MongoTransactionManager;
+import org.springframework.data.mongodb.MongoTransactionOptions;
+import org.springframework.data.mongodb.MongoTransactionOptionsResolver;
+import org.springframework.data.mongodb.UncategorizedMongoDbException;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.test.util.AfterTransactionAssertion;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.ReplSetClient;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
+import org.springframework.transaction.TransactionSystemException;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadConcernLevel;
 import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.Filters;
 
 /**
  * @author Christoph Strobl
+ * @author Yan Kardziyaka
  * @currentRead Shadow's Edge - Brent Weeks
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
+@EnableIfReplicaSetAvailable
+@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 @ContextConfiguration
 @Transactional(transactionManager = "txManager")
+@SetSystemProperty(key = "tx.read.concern", value = "local")
 public class MongoTemplateTransactionTests {
 
-	public static @ClassRule RuleChain TEST_RULES = RuleChain.outerRule(MongoVersionRule.atLeast(Version.parse("3.7.3")))
-			.around(ReplicaSet.required());
-
 	static final String DB_NAME = "template-tx-tests";
 	static final String COLLECTION_NAME = "assassins";
 
+	static @ReplSetClient MongoClient mongoClient;
+
 	@Configuration
+	@EnableTransactionManagement
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Bean
 		public MongoClient mongoClient() {
-			return MongoTestUtils.replSetClient();
+			return mongoClient;
 		}
 
 		@Override
@@ -91,21 +107,40 @@ protected boolean autoIndexCreation() {
 		}
 
 		@Bean
-		MongoTransactionManager txManager(MongoDbFactory dbFactory) {
-			return new MongoTransactionManager(dbFactory);
+		CapturingTransactionOptionsResolver txOptionsResolver() {
+			return new CapturingTransactionOptionsResolver(MongoTransactionOptionsResolver.defaultResolver());
+		}
+
+		@Bean
+		MongoTransactionManager txManager(MongoDatabaseFactory dbFactory,
+				MongoTransactionOptionsResolver txOptionsResolver) {
+			return new MongoTransactionManager(dbFactory, txOptionsResolver, MongoTransactionOptions.NONE);
+		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
+
+		@Bean
+		public TransactionOptionsTestService<Assassin> transactionOptionsTestService(MongoOperations operations) {
+			return new TransactionOptionsTestService<>(operations, Assassin.class);
 		}
 	}
 
 	@Autowired MongoTemplate template;
 	@Autowired MongoClient client;
+	@Autowired TransactionOptionsTestService<Assassin> transactionOptionsTestService;
+	@Autowired CapturingTransactionOptionsResolver transactionOptionsResolver;
 
 	List<AfterTransactionAssertion<? extends Persistable<?>>> assertionList;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		template.setReadPreference(ReadPreference.primary());
 		assertionList = new CopyOnWriteArrayList<>();
+		transactionOptionsResolver.clear(); // clean out left overs from dirty context
 	}
 
 	@BeforeTransaction
@@ -162,6 +197,140 @@ public void shouldBeAbleToViewChangesDuringTransaction() throws InterruptedExcep
 		assertAfterTransaction(durzo).isNotPresent();
 	}
 
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldThrowIllegalArgumentExceptionOnTransactionWithInvalidMaxCommitTime() {
+
+		Assassin assassin = new Assassin(randomUUID().toString(), randomUUID().toString());
+
+		assertThatThrownBy(() -> transactionOptionsTestService.saveWithInvalidMaxCommitTime(assassin)) //
+				.isInstanceOf(IllegalArgumentException.class);
+
+		assertAfterTransaction(assassin).isNotPresent();
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldCommitOnTransactionWithinMaxCommitTime() {
+
+		Assassin assassin = new Assassin(randomUUID().toString(), randomUUID().toString());
+
+		transactionOptionsTestService.saveWithinMaxCommitTime(assassin);
+
+		assertThat(transactionOptionsResolver.getLastCapturedOption()).returns(Duration.ofMinutes(1),
+				MongoTransactionOptions::getMaxCommitTime);
+
+		assertAfterTransaction(assassin).isPresent();
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldThrowInvalidDataAccessApiUsageExceptionOnTransactionWithAvailableReadConcern() {
+
+		assertThatThrownBy(() -> transactionOptionsTestService.availableReadConcernFind(randomUUID().toString())) //
+				.isInstanceOf(InvalidDataAccessApiUsageException.class);
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldThrowIllegalArgumentExceptionOnTransactionWithInvalidReadConcern() {
+
+		assertThatThrownBy(() -> transactionOptionsTestService.invalidReadConcernFind(randomUUID().toString())) //
+				.isInstanceOf(IllegalArgumentException.class);
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldReadTransactionOptionFromSystemProperty() {
+
+		transactionOptionsTestService.environmentReadConcernFind(randomUUID().toString());
+
+		assertThat(transactionOptionsResolver.getLastCapturedOption()).returns(
+				new ReadConcern(ReadConcernLevel.fromString(System.getProperty("tx.read.concern"))),
+				MongoTransactionOptions::getReadConcern);
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldNotThrowOnTransactionWithMajorityReadConcern() {
+		assertThatNoException() //
+				.isThrownBy(() -> transactionOptionsTestService.majorityReadConcernFind(randomUUID().toString()));
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldThrowUncategorizedMongoDbExceptionOnTransactionWithPrimaryPreferredReadPreference() {
+
+		assertThatThrownBy(() -> transactionOptionsTestService.findFromPrimaryPreferredReplica(randomUUID().toString())) //
+				.isInstanceOf(UncategorizedMongoDbException.class);
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldThrowIllegalArgumentExceptionOnTransactionWithInvalidReadPreference() {
+
+		assertThatThrownBy(() -> transactionOptionsTestService.findFromInvalidReplica(randomUUID().toString())) //
+				.isInstanceOf(IllegalArgumentException.class);
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldNotThrowOnTransactionWithPrimaryReadPreference() {
+
+		assertThatNoException() //
+				.isThrownBy(() -> transactionOptionsTestService.findFromPrimaryReplica(randomUUID().toString()));
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldThrowTransactionSystemExceptionOnTransactionWithUnacknowledgedWriteConcern() {
+
+		Assassin assassin = new Assassin(randomUUID().toString(), randomUUID().toString());
+
+		assertThatThrownBy(() -> transactionOptionsTestService.unacknowledgedWriteConcernSave(assassin)) //
+				.isInstanceOf(TransactionSystemException.class);
+
+		assertAfterTransaction(assassin).isNotPresent();
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldThrowIllegalArgumentExceptionOnTransactionWithInvalidWriteConcern() {
+
+		Assassin assassin = new Assassin(randomUUID().toString(), randomUUID().toString());
+
+		assertThatThrownBy(() -> transactionOptionsTestService.invalidWriteConcernSave(assassin)) //
+				.isInstanceOf(IllegalArgumentException.class);
+
+		assertAfterTransaction(assassin).isNotPresent();
+	}
+
+	@Rollback(false)
+	@Test // GH-1628
+	@Transactional(transactionManager = "txManager", propagation = Propagation.NEVER)
+	public void shouldCommitOnTransactionWithAcknowledgedWriteConcern() {
+
+		Assassin assassin = new Assassin(randomUUID().toString(), randomUUID().toString());
+
+		transactionOptionsTestService.acknowledgedWriteConcernSave(assassin);
+
+		assertThat(transactionOptionsResolver.getLastCapturedOption()).returns(WriteConcern.ACKNOWLEDGED,
+				MongoTransactionOptions::getWriteConcern);
+
+		assertAfterTransaction(assassin).isPresent();
+	}
+
 	// --- Just some helpers and tests entities
 
 	private AfterTransactionAssertion assertAfterTransaction(Assassin assassin) {
@@ -171,17 +340,57 @@ private AfterTransactionAssertion assertAfterTransaction(Assassin assassin) {
 		return assertion;
 	}
 
-	@Data
-	@AllArgsConstructor
 	@org.springframework.data.mongodb.core.mapping.Document(COLLECTION_NAME)
 	static class Assassin implements Persistable<String> {
 
 		@Id String id;
 		String name;
 
+		public Assassin(String id, String name) {
+			this.id = id;
+			this.name = name;
+		}
+
 		@Override
 		public boolean isNew() {
 			return id == null;
 		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Assassin assassin = (Assassin) o;
+			return Objects.equals(id, assassin.id) && Objects.equals(name, assassin.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name);
+		}
+
+		public String toString() {
+			return "MongoTemplateTransactionTests.Assassin(id=" + this.getId() + ", name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java
index 89d808183a..ef72548fac 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,16 +19,18 @@
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.Data;
-
 import java.math.BigInteger;
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 import java.util.regex.Pattern;
@@ -37,6 +39,7 @@
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -46,6 +49,7 @@
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationListener;
@@ -60,17 +64,14 @@
 import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.geo.Point;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.callback.EntityCallbacks;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
-import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
-import org.springframework.data.mongodb.core.aggregation.ArithmeticOperators;
+import org.springframework.data.mapping.context.InvalidPersistentPropertyPath;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.aggregation.*;
 import org.springframework.data.mongodb.core.aggregation.ComparisonOperators.Gte;
-import org.springframework.data.mongodb.core.aggregation.ConditionalOperators;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Switch.CaseOperator;
-import org.springframework.data.mongodb.core.aggregation.Fields;
-import org.springframework.data.mongodb.core.aggregation.SetOperation;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
@@ -79,12 +80,16 @@
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexCreator;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Sharded;
+import org.springframework.data.mongodb.core.mapping.TimeSeries;
 import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
+import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveCallback;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertCallback;
 import org.springframework.data.mongodb.core.mapping.event.BeforeConvertEvent;
 import org.springframework.data.mongodb.core.mapping.event.BeforeSaveCallback;
 import org.springframework.data.mongodb.core.mapping.event.BeforeSaveEvent;
-import org.springframework.data.mongodb.core.mapreduce.GroupBy;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
@@ -92,14 +97,20 @@
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.timeseries.Granularity;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.mock.env.MockEnvironment;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.CollectionUtils;
 
-import com.mongodb.DB;
+import com.mongodb.MongoClientSettings;
 import com.mongodb.MongoException;
 import com.mongodb.MongoNamespace;
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
+import com.mongodb.ServerAddress;
+import com.mongodb.ServerCursor;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.AggregateIterable;
 import com.mongodb.client.DistinctIterable;
@@ -116,7 +127,7 @@
 import com.mongodb.client.model.FindOneAndReplaceOptions;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.MapReduceAction;
-import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.TimeSeriesGranularity;
 import com.mongodb.client.model.UpdateOptions;
 import com.mongodb.client.result.DeleteResult;
 import com.mongodb.client.result.UpdateResult;
@@ -128,13 +139,17 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Michael J. Simons
+ * @author Roman Puchkovskiy
+ * @author Yadhukrishna S Pai
+ * @author Jakub Zurawa
+ * @author Ben Foster
  */
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 
-	MongoTemplate template;
+	private MongoTemplate template;
 
-	@Mock MongoDbFactory factory;
+	@Mock MongoDatabaseFactory factory;
 	@Mock MongoClient mongo;
 	@Mock MongoDatabase db;
 	@Mock MongoCollection<Document> collection;
@@ -147,30 +162,35 @@ public class MongoTemplateUnitTests extends MongoOperationsUnitTests {
 	@Mock UpdateResult updateResult;
 	@Mock DeleteResult deleteResult;
 
-	Document commandResultDocument = new Document();
+	private Document commandResultDocument = new Document();
 
-	MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
+	private MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
+	private MockEnvironment environment = new MockEnvironment();
 
 	@BeforeEach
-	public void beforeEach() {
+	void beforeEach() {
 
 		when(findIterable.iterator()).thenReturn(cursor);
-		when(factory.getDb()).thenReturn(db);
+		when(factory.getMongoDatabase()).thenReturn(db);
 		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslator);
+		when(factory.getCodecRegistry()).thenReturn(MongoClientSettings.getDefaultCodecRegistry());
 		when(db.getCollection(any(String.class), eq(Document.class))).thenReturn(collection);
 		when(db.runCommand(any(), any(Class.class))).thenReturn(commandResultDocument);
 		when(collection.find(any(org.bson.Document.class), any(Class.class))).thenReturn(findIterable);
 		when(collection.mapReduce(any(), any(), eq(Document.class))).thenReturn(mapReduceIterable);
-		when(collection.countDocuments(any(Bson.class), any(CountOptions.class))).thenReturn(1L); // TODO: MongoDB 4 - fix me
+		when(collection.countDocuments(any(Bson.class), any(CountOptions.class))).thenReturn(1L);
+		when(collection.estimatedDocumentCount(any())).thenReturn(1L);
 		when(collection.getNamespace()).thenReturn(new MongoNamespace("db.mock-collection"));
 		when(collection.aggregate(any(List.class), any())).thenReturn(aggregateIterable);
+		when(collection.withReadConcern(any())).thenReturn(collection);
 		when(collection.withReadPreference(any())).thenReturn(collection);
-		when(collection.replaceOne(any(), any(), any(ReplaceOptions.class))).thenReturn(updateResult);
+		when(collection.replaceOne(any(), any(), any(com.mongodb.client.model.ReplaceOptions.class))).thenReturn(updateResult);
 		when(collection.withWriteConcern(any())).thenReturn(collectionWithWriteConcern);
 		when(collection.distinct(anyString(), any(Document.class), any())).thenReturn(distinctIterable);
 		when(collectionWithWriteConcern.deleteOne(any(Bson.class), any())).thenReturn(deleteResult);
+		when(collectionWithWriteConcern.replaceOne(any(), any(), any(com.mongodb.client.model.ReplaceOptions.class))).thenReturn(updateResult);
 		when(findIterable.projection(any())).thenReturn(findIterable);
 		when(findIterable.sort(any(org.bson.Document.class))).thenReturn(findIterable);
 		when(findIterable.collation(any())).thenReturn(findIterable);
@@ -188,36 +208,42 @@ public void beforeEach() {
 		when(aggregateIterable.map(any())).thenReturn(aggregateIterable);
 		when(aggregateIterable.maxTime(anyLong(), any())).thenReturn(aggregateIterable);
 		when(aggregateIterable.into(any())).thenReturn(Collections.emptyList());
+		when(aggregateIterable.hint(any())).thenReturn(aggregateIterable);
+		when(aggregateIterable.hintString(any())).thenReturn(aggregateIterable);
 		when(distinctIterable.collation(any())).thenReturn(distinctIterable);
 		when(distinctIterable.map(any())).thenReturn(distinctIterable);
 		when(distinctIterable.into(any())).thenReturn(Collections.emptyList());
 
 		this.mappingContext = new MongoMappingContext();
+		mappingContext.setAutoIndexCreation(true);
+		mappingContext.setEnvironment(environment);
+		mappingContext.setSimpleTypeHolder(new MongoCustomConversions(Collections.emptyList()).getSimpleTypeHolder());
 		mappingContext.afterPropertiesSet();
 
 		this.converter = spy(new MappingMongoConverter(new DefaultDbRefResolver(factory), mappingContext));
+		when(this.converter.getEnvironment()).thenReturn(environment);
 		converter.afterPropertiesSet();
 		this.template = new MongoTemplate(factory, converter);
 	}
 
 	@Test
-	public void rejectsNullDatabaseName() {
+	void rejectsNullDatabaseName() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new MongoTemplate(mongo, null));
 	}
 
 	@Test // DATAMONGO-1968
-	public void rejectsNullMongo() {
+	void rejectsNullMongo() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new MongoTemplate((MongoClient) null, "database"));
 	}
 
 	@Test // DATAMONGO-1968
-	public void rejectsNullMongoClient() {
+	void rejectsNullMongoClient() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> new MongoTemplate((com.mongodb.client.MongoClient) null, "database"));
 	}
 
 	@Test // DATAMONGO-1870
-	public void removeHandlesMongoExceptionProperly() {
+	void removeHandlesMongoExceptionProperly() {
 
 		MongoTemplate template = mockOutGetDb();
 
@@ -225,13 +251,13 @@ public void removeHandlesMongoExceptionProperly() {
 	}
 
 	@Test
-	public void defaultsConverterToMappingMongoConverter() {
+	void defaultsConverterToMappingMongoConverter() {
 		MongoTemplate template = new MongoTemplate(mongo, "database");
 		assertThat(ReflectionTestUtils.getField(template, "mongoConverter") instanceof MappingMongoConverter).isTrue();
 	}
 
 	@Test
-	public void rejectsNotFoundMapReduceResource() {
+	void rejectsNotFoundMapReduceResource() {
 
 		GenericApplicationContext ctx = new GenericApplicationContext();
 		ctx.refresh();
@@ -242,14 +268,14 @@ public void rejectsNotFoundMapReduceResource() {
 	}
 
 	@Test // DATAMONGO-322
-	public void rejectsEntityWithNullIdIfNotSupportedIdType() {
+	void rejectsEntityWithNullIdIfNotSupportedIdType() {
 
 		Object entity = new NotAutogenerateableId();
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() -> template.save(entity));
 	}
 
 	@Test // DATAMONGO-322
-	public void storesEntityWithSetIdAlthoughNotAutogenerateable() {
+	void storesEntityWithSetIdAlthoughNotAutogenerateable() {
 
 		NotAutogenerateableId entity = new NotAutogenerateableId();
 		entity.id = 1;
@@ -258,7 +284,7 @@ public void storesEntityWithSetIdAlthoughNotAutogenerateable() {
 	}
 
 	@Test // DATAMONGO-322
-	public void autogeneratesIdForEntityWithAutogeneratableId() {
+	void autogeneratesIdForEntityWithAutogeneratableId() {
 
 		this.converter.afterPropertiesSet();
 
@@ -272,7 +298,7 @@ public void autogeneratesIdForEntityWithAutogeneratableId() {
 	}
 
 	@Test // DATAMONGO-1912
-	public void autogeneratesIdForMap() {
+	void autogeneratesIdForMap() {
 
 		MongoTemplate template = spy(this.template);
 		doReturn(new ObjectId()).when(template).saveDocument(any(String.class), any(Document.class), any(Class.class));
@@ -284,7 +310,7 @@ public void autogeneratesIdForMap() {
 	}
 
 	@Test // DATAMONGO-374
-	public void convertsUpdateConstraintsUsingConverters() {
+	void convertsUpdateConstraintsUsingConverters() {
 
 		CustomConversions conversions = new MongoCustomConversions(Collections.singletonList(MyConverter.INSTANCE));
 		this.converter.setCustomConversions(conversions);
@@ -302,7 +328,7 @@ public void convertsUpdateConstraintsUsingConverters() {
 	}
 
 	@Test // DATAMONGO-474
-	public void setsUnpopulatedIdField() {
+	void setsUnpopulatedIdField() {
 
 		NotAutogenerateableId entity = new NotAutogenerateableId();
 
@@ -311,7 +337,7 @@ public void setsUnpopulatedIdField() {
 	}
 
 	@Test // DATAMONGO-474
-	public void doesNotSetAlreadyPopulatedId() {
+	void doesNotSetAlreadyPopulatedId() {
 
 		NotAutogenerateableId entity = new NotAutogenerateableId();
 		entity.id = 5;
@@ -321,7 +347,7 @@ public void doesNotSetAlreadyPopulatedId() {
 	}
 
 	@Test // DATAMONGO-868
-	public void findAndModifyShouldBumpVersionByOneWhenVersionFieldNotIncludedInUpdate() {
+	void findAndModifyShouldBumpVersionByOneWhenVersionFieldNotIncludedInUpdate() {
 
 		VersionedEntity v = new VersionedEntity();
 		v.id = 1;
@@ -337,7 +363,7 @@ public void findAndModifyShouldBumpVersionByOneWhenVersionFieldNotIncludedInUpda
 	}
 
 	@Test // DATAMONGO-868
-	public void findAndModifyShouldNotBumpVersionByOneWhenVersionFieldAlreadyIncludedInUpdate() {
+	void findAndModifyShouldNotBumpVersionByOneWhenVersionFieldAlreadyIncludedInUpdate() {
 
 		VersionedEntity v = new VersionedEntity();
 		v.id = 1;
@@ -355,7 +381,7 @@ public void findAndModifyShouldNotBumpVersionByOneWhenVersionFieldAlreadyInclude
 	}
 
 	@Test // DATAMONGO-533
-	public void registersDefaultEntityIndexCreatorIfApplicationContextHasOneForDifferentMappingContext() {
+	void registersDefaultEntityIndexCreatorIfApplicationContextHasOneForDifferentMappingContext() {
 
 		GenericApplicationContext applicationContext = new GenericApplicationContext();
 		applicationContext.getBeanFactory().registerSingleton("foo",
@@ -377,18 +403,32 @@ public boolean matches(MongoPersistentEntityIndexCreator argument) {
 	}
 
 	@Test // DATAMONGO-566
-	public void findAllAndRemoveShouldRetrieveMatchingDocumentsPriorToRemoval() {
+	void findAllAndRemoveShouldRetrieveMatchingDocumentsPriorToRemoval() {
 
 		BasicQuery query = new BasicQuery("{'foo':'bar'}");
 		template.findAllAndRemove(query, VersionedEntity.class);
 		verify(collection, times(1)).find(Mockito.eq(query.getQueryObject()), any(Class.class));
 	}
 
+	@Test // GH-3648
+	void shouldThrowExceptionIfEntityReaderReturnsNull() {
+
+		when(cursor.hasNext()).thenReturn(true).thenReturn(true).thenReturn(false);
+		when(cursor.next()).thenReturn(new org.bson.Document("_id", Integer.valueOf(0)));
+		MappingMongoConverter converter = mock(MappingMongoConverter.class);
+		when(converter.getMappingContext()).thenReturn((MappingContext) mappingContext);
+		when(converter.getProjectionFactory()).thenReturn(new SpelAwareProxyProjectionFactory());
+		template = new MongoTemplate(factory, converter);
+
+		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> template.findAll(Person.class))
+				.withMessageContaining("returned null");
+	}
+
 	@Test // DATAMONGO-566
-	public void findAllAndRemoveShouldRemoveDocumentsReturedByFindQuery() {
+	void findAllAndRemoveShouldRemoveDocumentsReturedByFindQuery() {
 
-		Mockito.when(cursor.hasNext()).thenReturn(true).thenReturn(true).thenReturn(false);
-		Mockito.when(cursor.next()).thenReturn(new org.bson.Document("_id", Integer.valueOf(0)))
+		when(cursor.hasNext()).thenReturn(true).thenReturn(true).thenReturn(false);
+		when(cursor.next()).thenReturn(new org.bson.Document("_id", Integer.valueOf(0)))
 				.thenReturn(new org.bson.Document("_id", Integer.valueOf(1)));
 
 		ArgumentCaptor<org.bson.Document> queryCaptor = ArgumentCaptor.forClass(org.bson.Document.class);
@@ -397,19 +437,19 @@ public void findAllAndRemoveShouldRemoveDocumentsReturedByFindQuery() {
 
 		verify(collection, times(1)).deleteMany(queryCaptor.capture(), any());
 
-		Document idField = DocumentTestUtils.getAsDocument(queryCaptor.getValue(), "_id");
-		assertThat((List<Object>) idField.get("$in")).containsExactly(Integer.valueOf(0), Integer.valueOf(1));
+		List<Document> ors = DocumentTestUtils.getAsDBList(queryCaptor.getValue(), "$or");
+		assertThat(ors).containsExactlyInAnyOrder(new Document("_id", 0), new Document("_id", 1));
 	}
 
 	@Test // DATAMONGO-566
-	public void findAllAndRemoveShouldNotTriggerRemoveIfFindResultIsEmpty() {
+	void findAllAndRemoveShouldNotTriggerRemoveIfFindResultIsEmpty() {
 
 		template.findAllAndRemove(new BasicQuery("{'foo':'bar'}"), VersionedEntity.class);
 		verify(collection, never()).deleteMany(any(org.bson.Document.class));
 	}
 
 	@Test // DATAMONGO-948
-	public void sortShouldBeTakenAsIsWhenExecutingQueryWithoutSpecificTypeInformation() {
+	void sortShouldBeTakenAsIsWhenExecutingQueryWithoutSpecificTypeInformation() {
 
 		Query query = Query.query(Criteria.where("foo").is("bar")).with(Sort.by("foo"));
 		template.executeQuery(query, "collection1", new DocumentCallbackHandler() {
@@ -427,7 +467,7 @@ public void processDocument(Document document) throws MongoException, DataAccess
 	}
 
 	@Test // DATAMONGO-1166, DATAMONGO-1824
-	public void aggregateShouldHonorReadPreferenceWhenSet() {
+	void aggregateShouldHonorReadPreferenceWhenSet() {
 
 		template.setReadPreference(ReadPreference.secondary());
 
@@ -437,15 +477,54 @@ public void aggregateShouldHonorReadPreferenceWhenSet() {
 	}
 
 	@Test // DATAMONGO-1166, DATAMONGO-1824
-	public void aggregateShouldIgnoreReadPreferenceWhenNotSet() {
+	void aggregateShouldIgnoreReadPreferenceWhenNotSet() {
 
 		template.aggregate(newAggregation(Aggregation.unwind("foo")), "collection-1", Wrapper.class);
 
 		verify(collection, never()).withReadPreference(any());
 	}
 
+	@Test // GH-4277
+	void aggregateShouldHonorOptionsReadConcernWhenSet() {
+
+		AggregationOptions options = AggregationOptions.builder().readConcern(ReadConcern.SNAPSHOT).build();
+		template.aggregate(newAggregation(Aggregation.unwind("foo")).withOptions(options), "collection-1", Wrapper.class);
+
+		verify(collection).withReadConcern(ReadConcern.SNAPSHOT);
+	}
+
+	@Test // GH-4277
+	void aggregateShouldHonorOptionsReadPreferenceWhenSet() {
+
+		AggregationOptions options = AggregationOptions.builder().readPreference(ReadPreference.secondary()).build();
+		template.aggregate(newAggregation(Aggregation.unwind("foo")).withOptions(options), "collection-1", Wrapper.class);
+
+		verify(collection).withReadPreference(ReadPreference.secondary());
+	}
+
+	@Test // GH-4277
+	void aggregateStreamShouldHonorOptionsReadPreferenceWhenSet() {
+
+		AggregationOptions options = AggregationOptions.builder().readPreference(ReadPreference.secondary()).build();
+		template.aggregateStream(newAggregation(Aggregation.unwind("foo")).withOptions(options), "collection-1",
+				Wrapper.class);
+
+		verify(collection).withReadPreference(ReadPreference.secondary());
+	}
+
+	@Test // GH-4644
+	void aggregateStreamShouldHonorMaxTimeIfSet() {
+
+		AggregationOptions options = AggregationOptions.builder().maxTime(Duration.ofSeconds(20)).build();
+
+		template.aggregateStream(newAggregation(Aggregation.unwind("foo")).withOptions(options), "collection-1",
+				Wrapper.class);
+
+		verify(aggregateIterable).maxTime(20000, TimeUnit.MILLISECONDS);
+	}
+
 	@Test // DATAMONGO-2153
-	public void aggregateShouldHonorOptionsComment() {
+	void aggregateShouldHonorOptionsComment() {
 
 		AggregationOptions options = AggregationOptions.builder().comment("expensive").build();
 
@@ -454,8 +533,67 @@ public void aggregateShouldHonorOptionsComment() {
 		verify(aggregateIterable).comment("expensive");
 	}
 
+	@Test // DATAMONGO-1836
+	void aggregateShouldHonorOptionsHint() {
+
+		Document hint = new Document("dummyField", 1);
+		AggregationOptions options = AggregationOptions.builder().hint(hint).build();
+
+		template.aggregate(newAggregation(Aggregation.unwind("foo")).withOptions(options), "collection-1", Wrapper.class);
+
+		verify(aggregateIterable).hint(hint);
+	}
+
+	@Test // GH-4238
+	void aggregateShouldHonorOptionsHintString() {
+
+		AggregationOptions options = AggregationOptions.builder().hint("index-1").build();
+
+		template.aggregate(newAggregation(Aggregation.unwind("foo")).withOptions(options), "collection-1", Wrapper.class);
+
+		verify(aggregateIterable).hintString("index-1");
+	}
+
+	@Test // GH-3542
+	void aggregateShouldUseRelaxedMappingByDefault() {
+
+		MongoTemplate template = new MongoTemplate(factory, converter) {
+
+			@Override
+			protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String collectionName,
+					Class<O> outputType, AggregationOperationContext context) {
+
+				assertThat(ReflectionTestUtils.getField(context, "lookupPolicy")).isEqualTo(FieldLookupPolicy.relaxed());
+				return super.doAggregate(aggregation, collectionName, outputType, context);
+			}
+		};
+
+		template.aggregate(
+				newAggregation(Jedi.class, Aggregation.unwind("foo")).withOptions(AggregationOptions.builder().build()),
+				Jedi.class);
+	}
+
+	@Test // GH-3542
+	void aggregateShouldUseStrictMappingIfOptionsIndicate() {
+
+		MongoTemplate template = new MongoTemplate(factory, converter) {
+
+			@Override
+			protected <O> AggregationResults<O> doAggregate(Aggregation aggregation, String collectionName,
+					Class<O> outputType, AggregationOperationContext context) {
+
+				assertThat(context).isInstanceOf(TypeBasedAggregationOperationContext.class);
+				return super.doAggregate(aggregation, collectionName, outputType, context);
+			}
+		};
+
+		assertThatExceptionOfType(InvalidPersistentPropertyPath.class)
+				.isThrownBy(() -> template.aggregate(newAggregation(Jedi.class, Aggregation.unwind("foo"))
+						.withOptions(AggregationOptions.builder().strictMapping().build()), Jedi.class));
+	}
+
 	@Test // DATAMONGO-1166, DATAMONGO-2264
-	public void geoNearShouldHonorReadPreferenceWhenSet() {
+	void geoNearShouldHonorReadPreferenceWhenSet() {
 
 		template.setReadPreference(ReadPreference.secondary());
 
@@ -465,8 +603,30 @@ public void geoNearShouldHonorReadPreferenceWhenSet() {
 		verify(collection).withReadPreference(eq(ReadPreference.secondary()));
 	}
 
+	@Test // GH-4277
+	void geoNearShouldHonorReadPreferenceFromQuery() {
+
+		NearQuery query = NearQuery.near(new Point(1, 1));
+		query.withReadPreference(ReadPreference.secondary());
+
+		template.geoNear(query, Wrapper.class);
+
+		verify(collection).withReadPreference(eq(ReadPreference.secondary()));
+	}
+
+	@Test // GH-4277
+	void geoNearShouldHonorReadConcernFromQuery() {
+
+		NearQuery query = NearQuery.near(new Point(1, 1));
+		query.withReadConcern(ReadConcern.SNAPSHOT);
+
+		template.geoNear(query, Wrapper.class);
+
+		verify(collection).withReadConcern(eq(ReadConcern.SNAPSHOT));
+	}
+
 	@Test // DATAMONGO-1166, DATAMONGO-2264
-	public void geoNearShouldIgnoreReadPreferenceWhenNotSet() {
+	void geoNearShouldIgnoreReadPreferenceWhenNotSet() {
 
 		NearQuery query = NearQuery.near(new Point(1, 1));
 		template.geoNear(query, Wrapper.class);
@@ -476,7 +636,7 @@ public void geoNearShouldIgnoreReadPreferenceWhenNotSet() {
 
 	@Test // DATAMONGO-1334
 	@Disabled("TODO: mongo3 - a bit hard to tests with the immutable object stuff")
-	public void mapReduceShouldUseZeroAsDefaultLimit() {
+	void mapReduceShouldUseZeroAsDefaultLimit() {
 
 		MongoCursor cursor = mock(MongoCursor.class);
 		MapReduceIterable output = mock(MapReduceIterable.class);
@@ -496,7 +656,7 @@ public void mapReduceShouldUseZeroAsDefaultLimit() {
 	}
 
 	@Test // DATAMONGO-1334
-	public void mapReduceShouldPickUpLimitFromQuery() {
+	void mapReduceShouldPickUpLimitFromQuery() {
 
 		MongoCursor cursor = mock(MongoCursor.class);
 		MapReduceIterable output = mock(MapReduceIterable.class);
@@ -517,7 +677,7 @@ public void mapReduceShouldPickUpLimitFromQuery() {
 	}
 
 	@Test // DATAMONGO-1334
-	public void mapReduceShouldPickUpLimitFromOptions() {
+	void mapReduceShouldPickUpLimitFromOptions() {
 
 		MongoCursor cursor = mock(MongoCursor.class);
 		MapReduceIterable output = mock(MapReduceIterable.class);
@@ -538,7 +698,7 @@ public void mapReduceShouldPickUpLimitFromOptions() {
 	}
 
 	@Test // DATAMONGO-1334
-	public void mapReduceShouldPickUpLimitFromOptionsWhenQueryIsNotPresent() {
+	void mapReduceShouldPickUpLimitFromOptionsWhenQueryIsNotPresent() {
 
 		MongoCursor cursor = mock(MongoCursor.class);
 		MapReduceIterable output = mock(MapReduceIterable.class);
@@ -557,7 +717,7 @@ public void mapReduceShouldPickUpLimitFromOptionsWhenQueryIsNotPresent() {
 	}
 
 	@Test // DATAMONGO-1334
-	public void mapReduceShouldPickUpLimitFromOptionsEvenWhenQueryDefinesItDifferently() {
+	void mapReduceShouldPickUpLimitFromOptionsEvenWhenQueryDefinesItDifferently() {
 
 		MongoCursor cursor = mock(MongoCursor.class);
 		MapReduceIterable output = mock(MapReduceIterable.class);
@@ -579,7 +739,7 @@ public void mapReduceShouldPickUpLimitFromOptionsEvenWhenQueryDefinesItDifferent
 	}
 
 	@Test // DATAMONGO-1639
-	public void beforeConvertEventForUpdateSeesNextVersion() {
+	void beforeConvertEventForUpdateSeesNextVersion() {
 
 		when(updateResult.getModifiedCount()).thenReturn(1L);
 
@@ -603,7 +763,7 @@ public void onBeforeConvert(BeforeConvertEvent<VersionedEntity> event) {
 	}
 
 	@Test // DATAMONGO-1447
-	public void shouldNotAppend$isolatedToNonMulitUpdate() {
+	void shouldNotAppend$isolatedToNonMulitUpdate() {
 
 		template.updateFirst(new Query(), new Update().isolated().set("jon", "snow"), Wrapper.class);
 
@@ -617,7 +777,7 @@ public void onBeforeConvert(BeforeConvertEvent<VersionedEntity> event) {
 	}
 
 	@Test // DATAMONGO-1447
-	public void shouldAppend$isolatedToUpdateMultiEmptyQuery() {
+	void shouldAppend$isolatedToUpdateMultiEmptyQuery() {
 
 		template.updateMulti(new Query(), new Update().isolated().set("jon", "snow"), Wrapper.class);
 
@@ -631,7 +791,7 @@ public void onBeforeConvert(BeforeConvertEvent<VersionedEntity> event) {
 	}
 
 	@Test // DATAMONGO-1447
-	public void shouldAppend$isolatedToUpdateMultiQueryIfNotPresentAndUpdateSetsValue() {
+	void shouldAppend$isolatedToUpdateMultiQueryIfNotPresentAndUpdateSetsValue() {
 
 		Update update = new Update().isolated().set("jon", "snow");
 		Query query = new BasicQuery("{'eddard':'stark'}");
@@ -648,7 +808,7 @@ public void onBeforeConvert(BeforeConvertEvent<VersionedEntity> event) {
 	}
 
 	@Test // DATAMONGO-1447
-	public void shouldNotAppend$isolatedToUpdateMultiQueryIfNotPresentAndUpdateDoesNotSetValue() {
+	void shouldNotAppend$isolatedToUpdateMultiQueryIfNotPresentAndUpdateDoesNotSetValue() {
 
 		Update update = new Update().set("jon", "snow");
 		Query query = new BasicQuery("{'eddard':'stark'}");
@@ -665,7 +825,7 @@ public void onBeforeConvert(BeforeConvertEvent<VersionedEntity> event) {
 	}
 
 	@Test // DATAMONGO-1447
-	public void shouldNotOverwrite$isolatedToUpdateMultiQueryIfPresentAndUpdateDoesNotSetValue() {
+	void shouldNotOverwrite$isolatedToUpdateMultiQueryIfPresentAndUpdateDoesNotSetValue() {
 
 		Update update = new Update().set("jon", "snow");
 		Query query = new BasicQuery("{'eddard':'stark', '$isolated' : 1}");
@@ -682,7 +842,7 @@ public void onBeforeConvert(BeforeConvertEvent<VersionedEntity> event) {
 	}
 
 	@Test // DATAMONGO-1447
-	public void shouldNotOverwrite$isolatedToUpdateMultiQueryIfPresentAndUpdateSetsValue() {
+	void shouldNotOverwrite$isolatedToUpdateMultiQueryIfPresentAndUpdateSetsValue() {
 
 		Update update = new Update().isolated().set("jon", "snow");
 		Query query = new BasicQuery("{'eddard':'stark', '$isolated' : 0}");
@@ -699,7 +859,7 @@ public void onBeforeConvert(BeforeConvertEvent<VersionedEntity> event) {
 	}
 
 	@Test // DATAMONGO-1311
-	public void executeQueryShouldUseBatchSizeWhenPresent() {
+	void executeQueryShouldUseBatchSizeWhenPresent() {
 
 		when(findIterable.batchSize(anyInt())).thenReturn(findIterable);
 
@@ -709,8 +869,25 @@ public void executeQueryShouldUseBatchSizeWhenPresent() {
 		verify(findIterable).batchSize(1234);
 	}
 
+	@Test // GH-4277
+	void findShouldUseReadConcernWhenPresent() {
+
+		template.find(new BasicQuery("{'foo' : 'bar'}").withReadConcern(ReadConcern.SNAPSHOT), AutogenerateableId.class);
+
+		verify(collection).withReadConcern(ReadConcern.SNAPSHOT);
+	}
+
+	@Test // GH-4277
+	void findShouldUseReadPreferenceWhenPresent() {
+
+		template.find(new BasicQuery("{'foo' : 'bar'}").withReadPreference(ReadPreference.secondary()),
+				AutogenerateableId.class);
+
+		verify(collection).withReadPreference(ReadPreference.secondary());
+	}
+
 	@Test // DATAMONGO-1518
-	public void executeQueryShouldUseCollationWhenPresent() {
+	void executeQueryShouldUseCollationWhenPresent() {
 
 		template.executeQuery(new BasicQuery("{}").collation(Collation.of("fr")), "collection-1", val -> {});
 
@@ -718,15 +895,15 @@ public void executeQueryShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void streamQueryShouldUseCollationWhenPresent() {
+	void streamQueryShouldUseCollationWhenPresent() {
 
-		template.stream(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class).next();
+		template.stream(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class);
 
 		verify(findIterable).collation(eq(com.mongodb.client.model.Collation.builder().locale("fr").build()));
 	}
 
 	@Test // DATAMONGO-1518
-	public void findShouldUseCollationWhenPresent() {
+	void findShouldUseCollationWhenPresent() {
 
 		template.find(new BasicQuery("{'foo' : 'bar'}").collation(Collation.of("fr")), AutogenerateableId.class);
 
@@ -734,7 +911,7 @@ public void findShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void findOneShouldUseCollationWhenPresent() {
+	void findOneShouldUseCollationWhenPresent() {
 
 		template.findOne(new BasicQuery("{'foo' : 'bar'}").collation(Collation.of("fr")), AutogenerateableId.class);
 
@@ -742,7 +919,7 @@ public void findOneShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void existsShouldUseCollationWhenPresent() {
+	void existsShouldUseCollationWhenPresent() {
 
 		template.exists(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class);
 
@@ -754,7 +931,7 @@ public void existsShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void findAndModfiyShoudUseCollationWhenPresent() {
+	void findAndModfiyShoudUseCollationWhenPresent() {
 
 		template.findAndModify(new BasicQuery("{}").collation(Collation.of("fr")), new Update(), AutogenerateableId.class);
 
@@ -765,7 +942,7 @@ public void findAndModfiyShoudUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void findAndRemoveShouldUseCollationWhenPresent() {
+	void findAndRemoveShouldUseCollationWhenPresent() {
 
 		template.findAndRemove(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class);
 
@@ -776,7 +953,7 @@ public void findAndRemoveShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-2196
-	public void removeShouldApplyWriteConcern() {
+	void removeShouldApplyWriteConcern() {
 
 		Person person = new Person();
 		person.id = "id-1";
@@ -789,7 +966,7 @@ public void removeShouldApplyWriteConcern() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void findAndRemoveManyShouldUseCollationWhenPresent() {
+	void findAndRemoveManyShouldUseCollationWhenPresent() {
 
 		template.doRemove("collection-1", new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class,
 				true);
@@ -801,7 +978,7 @@ public void findAndRemoveManyShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void updateOneShouldUseCollationWhenPresent() {
+	void updateOneShouldUseCollationWhenPresent() {
 
 		template.updateFirst(new BasicQuery("{}").collation(Collation.of("fr")), new Update().set("foo", "bar"),
 				AutogenerateableId.class);
@@ -813,7 +990,7 @@ public void updateOneShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void updateManyShouldUseCollationWhenPresent() {
+	void updateManyShouldUseCollationWhenPresent() {
 
 		template.updateMulti(new BasicQuery("{}").collation(Collation.of("fr")), new Update().set("foo", "bar"),
 				AutogenerateableId.class);
@@ -824,19 +1001,42 @@ public void updateManyShouldUseCollationWhenPresent() {
 		assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr");
 	}
 
+	@Test // GH-3218
+	void updateUsesHintStringFromQuery() {
+
+		template.updateFirst(new Query().withHint("index-1"), new Update().set("spring", "data"), Human.class);
+
+		ArgumentCaptor<UpdateOptions> options = ArgumentCaptor.forClass(UpdateOptions.class);
+		verify(collection).updateOne(any(Bson.class), any(Bson.class), options.capture());
+
+		assertThat(options.getValue().getHintString()).isEqualTo("index-1");
+	}
+
+	@Test // GH-3218
+	void updateUsesHintDocumentFromQuery() {
+
+		template.updateFirst(new Query().withHint("{ name : 1 }"), new Update().set("spring", "data"), Human.class);
+
+		ArgumentCaptor<UpdateOptions> options = ArgumentCaptor.forClass(UpdateOptions.class);
+		verify(collection).updateOne(any(Bson.class), any(Bson.class), options.capture());
+
+		assertThat(options.getValue().getHint()).isEqualTo(new Document("name", 1));
+	}
+
 	@Test // DATAMONGO-1518
-	public void replaceOneShouldUseCollationWhenPresent() {
+	void replaceOneShouldUseCollationWhenPresent() {
 
 		template.updateFirst(new BasicQuery("{}").collation(Collation.of("fr")), new Update(), AutogenerateableId.class);
 
-		ArgumentCaptor<ReplaceOptions> options = ArgumentCaptor.forClass(ReplaceOptions.class);
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
 		verify(collection).replaceOne(any(), any(), options.capture());
 
 		assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr");
 	}
 
 	@Test // DATAMONGO-1518, DATAMONGO-1824
-	public void aggregateShouldUseCollationWhenPresent() {
+	void aggregateShouldUseCollationWhenPresent() {
 
 		Aggregation aggregation = newAggregation(project("id"))
 				.withOptions(newAggregationOptions().collation(Collation.of("fr")).build());
@@ -846,7 +1046,7 @@ public void aggregateShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1824
-	public void aggregateShouldUseBatchSizeWhenPresent() {
+	void aggregateShouldUseBatchSizeWhenPresent() {
 
 		Aggregation aggregation = newAggregation(project("id"))
 				.withOptions(newAggregationOptions().collation(Collation.of("fr")).cursorBatchSize(100).build());
@@ -856,7 +1056,7 @@ public void aggregateShouldUseBatchSizeWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void mapReduceShouldUseCollationWhenPresent() {
+	void mapReduceShouldUseCollationWhenPresent() {
 
 		template.mapReduce("", "", "", MapReduceOptions.options().collation(Collation.of("fr")), AutogenerateableId.class);
 
@@ -864,7 +1064,7 @@ public void mapReduceShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-2027
-	public void mapReduceShouldUseOutputCollectionWhenPresent() {
+	void mapReduceShouldUseOutputCollectionWhenPresent() {
 
 		template.mapReduce("", "", "", MapReduceOptions.options().outputCollection("out-collection"),
 				AutogenerateableId.class);
@@ -873,44 +1073,43 @@ public void mapReduceShouldUseOutputCollectionWhenPresent() {
 	}
 
 	@Test // DATAMONGO-2027
-	public void mapReduceShouldNotUseOutputCollectionForInline() {
+	void mapReduceShouldNotUseOutputCollectionForInline() {
 
-		template.mapReduce("", "", "", MapReduceOptions.options().outputCollection("out-collection").outputTypeInline(),
+		template.mapReduce("", "", "", MapReduceOptions.options().actionInline().outputCollection("out-collection"),
 				AutogenerateableId.class);
 
 		verify(mapReduceIterable, never()).collectionName(any());
 	}
 
 	@Test // DATAMONGO-2027
-	public void mapReduceShouldUseOutputActionWhenPresent() {
+	void mapReduceShouldUseOutputActionWhenPresent() {
 
-		template.mapReduce("", "", "", MapReduceOptions.options().outputCollection("out-collection").outputTypeMerge(),
+		template.mapReduce("", "", "", MapReduceOptions.options().actionMerge().outputCollection("out-collection"),
 				AutogenerateableId.class);
 
 		verify(mapReduceIterable).action(eq(MapReduceAction.MERGE));
 	}
 
 	@Test // DATAMONGO-2027
-	public void mapReduceShouldUseOutputDatabaseWhenPresent() {
+	void mapReduceShouldUseOutputDatabaseWhenPresent() {
 
 		template.mapReduce("", "", "",
-				MapReduceOptions.options().outputDatabase("out-database").outputCollection("out-collection").outputTypeMerge(),
+				MapReduceOptions.options().outputDatabase("out-database").outputCollection("out-collection"),
 				AutogenerateableId.class);
 
 		verify(mapReduceIterable).databaseName(eq("out-database"));
 	}
 
 	@Test // DATAMONGO-2027
-	public void mapReduceShouldNotUseOutputDatabaseForInline() {
+	void mapReduceShouldNotUseOutputDatabaseForInline() {
 
-		template.mapReduce("", "", "", MapReduceOptions.options().outputDatabase("out-database").outputTypeInline(),
-				AutogenerateableId.class);
+		template.mapReduce("", "", "", MapReduceOptions.options().outputDatabase("out-database"), AutogenerateableId.class);
 
 		verify(mapReduceIterable, never()).databaseName(any());
 	}
 
 	@Test // DATAMONGO-1518, DATAMONGO-2264
-	public void geoNearShouldUseCollationWhenPresent() {
+	void geoNearShouldUseCollationWhenPresent() {
 
 		NearQuery query = NearQuery.near(0D, 0D).query(new BasicQuery("{}").collation(Collation.of("fr")));
 		template.geoNear(query, AutogenerateableId.class);
@@ -918,22 +1117,8 @@ public void geoNearShouldUseCollationWhenPresent() {
 		verify(aggregateIterable).collation(eq(com.mongodb.client.model.Collation.builder().locale("fr").build()));
 	}
 
-	@Test // DATAMONGO-1518
-	public void groupShouldUseCollationWhenPresent() {
-
-		commandResultDocument.append("retval", Collections.emptySet());
-		template.group("collection-1", GroupBy.key("id").reduceFunction("bar").collation(Collation.of("fr")),
-				AutogenerateableId.class);
-
-		ArgumentCaptor<Document> cmd = ArgumentCaptor.forClass(Document.class);
-		verify(db).runCommand(cmd.capture(), any(Class.class));
-
-		assertThat(cmd.getValue().get("group", Document.class).get("collation", Document.class))
-				.isEqualTo(new Document("locale", "fr"));
-	}
-
 	@Test // DATAMONGO-1880
-	public void countShouldUseCollationWhenPresent() {
+	void countShouldUseCollationWhenPresent() {
 
 		template.count(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class);
 
@@ -945,7 +1130,7 @@ public void countShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-2360
-	public void countShouldApplyQueryHintIfPresent() {
+	void countShouldApplyQueryHintIfPresent() {
 
 		Document queryHint = new Document("age", 1);
 		template.count(new BasicQuery("{}").withHint(queryHint), AutogenerateableId.class);
@@ -956,71 +1141,82 @@ public void countShouldApplyQueryHintIfPresent() {
 		assertThat(options.getValue().getHint()).isEqualTo(queryHint);
 	}
 
+	@Test // DATAMONGO-2365
+	void countShouldApplyQueryHintAsIndexNameIfPresent() {
+
+		template.count(new BasicQuery("{}").withHint("idx-1"), AutogenerateableId.class);
+
+		ArgumentCaptor<CountOptions> options = ArgumentCaptor.forClass(CountOptions.class);
+		verify(collection).countDocuments(any(), options.capture());
+
+		assertThat(options.getValue().getHintString()).isEqualTo("idx-1");
+	}
+
 	@Test // DATAMONGO-1733
-	public void appliesFieldsWhenInterfaceProjectionIsClosedAndQueryDoesNotDefineFields() {
+	void appliesFieldsWhenInterfaceProjectionIsClosedAndQueryDoesNotDefineFields() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, PersonProjection.class,
-				CursorPreparer.NO_OP_PREPARER);
+		template.doFind(CollectionPreparer.identity(), "star-wars", new Document(), new Document(), Person.class,
+				PersonProjection.class, QueryResultConverter.entity(), CursorPreparer.NO_OP_PREPARER);
 
 		verify(findIterable).projection(eq(new Document("firstname", 1)));
 	}
 
 	@Test // DATAMONGO-1733
-	public void doesNotApplyFieldsWhenInterfaceProjectionIsClosedAndQueryDefinesFields() {
+	void doesNotApplyFieldsWhenInterfaceProjectionIsClosedAndQueryDefinesFields() {
 
-		template.doFind("star-wars", new Document(), new Document("bar", 1), Person.class, PersonProjection.class,
-				CursorPreparer.NO_OP_PREPARER);
+		template.doFind(CollectionPreparer.identity(), "star-wars", new Document(), new Document("bar", 1), Person.class,
+				PersonProjection.class, QueryResultConverter.entity(), CursorPreparer.NO_OP_PREPARER);
 
 		verify(findIterable).projection(eq(new Document("bar", 1)));
 	}
 
 	@Test // DATAMONGO-1733
-	public void doesNotApplyFieldsWhenInterfaceProjectionIsOpen() {
+	void doesNotApplyFieldsWhenInterfaceProjectionIsOpen() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, PersonSpELProjection.class,
-				CursorPreparer.NO_OP_PREPARER);
+		template.doFind(CollectionPreparer.identity(), "star-wars", new Document(), new Document(), Person.class,
+				PersonSpELProjection.class, QueryResultConverter.entity(), CursorPreparer.NO_OP_PREPARER);
 
-		verify(findIterable).projection(eq(new Document()));
+		verify(findIterable).projection(eq(BsonUtils.EMPTY_DOCUMENT));
 	}
 
 	@Test // DATAMONGO-1733, DATAMONGO-2041
-	public void appliesFieldsToDtoProjection() {
+	void appliesFieldsToDtoProjection() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, Jedi.class,
-				CursorPreparer.NO_OP_PREPARER);
+		template.doFind(CollectionPreparer.identity(), "star-wars", new Document(), new Document(), Person.class,
+				Jedi.class, QueryResultConverter.entity(), CursorPreparer.NO_OP_PREPARER);
 
 		verify(findIterable).projection(eq(new Document("firstname", 1)));
 	}
 
 	@Test // DATAMONGO-1733
-	public void doesNotApplyFieldsToDtoProjectionWhenQueryDefinesFields() {
+	void doesNotApplyFieldsToDtoProjectionWhenQueryDefinesFields() {
 
-		template.doFind("star-wars", new Document(), new Document("bar", 1), Person.class, Jedi.class,
-				CursorPreparer.NO_OP_PREPARER);
+		template.doFind(CollectionPreparer.identity(), "star-wars", new Document(), new Document("bar", 1), Person.class,
+				Jedi.class, QueryResultConverter.entity(), CursorPreparer.NO_OP_PREPARER);
 
 		verify(findIterable).projection(eq(new Document("bar", 1)));
 	}
 
 	@Test // DATAMONGO-1733
-	public void doesNotApplyFieldsWhenTargetIsNotAProjection() {
+	void doesNotApplyFieldsWhenTargetIsNotAProjection() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, Person.class,
-				CursorPreparer.NO_OP_PREPARER);
+		template.doFind(CollectionPreparer.identity(), "star-wars", new Document(), new Document(), Person.class,
+				Person.class, QueryResultConverter.entity(), CursorPreparer.NO_OP_PREPARER);
 
-		verify(findIterable).projection(eq(new Document()));
+		verify(findIterable).projection(eq(BsonUtils.EMPTY_DOCUMENT));
 	}
 
 	@Test // DATAMONGO-1733
-	public void doesNotApplyFieldsWhenTargetExtendsDomainType() {
+	void doesNotApplyFieldsWhenTargetExtendsDomainType() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, PersonExtended.class,
-				CursorPreparer.NO_OP_PREPARER);
+		template.doFind(CollectionPreparer.identity(), "star-wars", new Document(), new Document(), Person.class,
+				PersonExtended.class, QueryResultConverter.entity(), CursorPreparer.NO_OP_PREPARER);
 
-		verify(findIterable).projection(eq(new Document()));
+		verify(findIterable).projection(eq(BsonUtils.EMPTY_DOCUMENT));
 	}
 
 	@Test // DATAMONGO-1348, DATAMONGO-2264
-	public void geoNearShouldMapQueryCorrectly() {
+	void geoNearShouldMapQueryCorrectly() {
 
 		NearQuery query = NearQuery.near(new Point(1, 1));
 		query.query(Query.query(Criteria.where("customName").is("rand al'thor")));
@@ -1037,7 +1233,7 @@ public void geoNearShouldMapQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-1348, DATAMONGO-2264
-	public void geoNearShouldMapGeoJsonPointCorrectly() {
+	void geoNearShouldMapGeoJsonPointCorrectly() {
 
 		NearQuery query = NearQuery.near(new GeoJsonPoint(1, 2));
 		query.query(Query.query(Criteria.where("customName").is("rand al'thor")));
@@ -1053,8 +1249,8 @@ public void geoNearShouldMapGeoJsonPointCorrectly() {
 				.containsEntry("$geoNear.near.coordinates.[1]", 2D);
 	}
 
-	@Test // DATAMONGO-2155
-	public void saveVersionedEntityShouldCallUpdateCorrectly() {
+	@Test // DATAMONGO-2155, GH-3407
+	void saveVersionedEntityShouldCallUpdateCorrectly() {
 
 		when(updateResult.getModifiedCount()).thenReturn(1L);
 
@@ -1067,15 +1263,15 @@ public void saveVersionedEntityShouldCallUpdateCorrectly() {
 
 		template.save(entity);
 
-		verify(collection, times(1)).replaceOne(queryCaptor.capture(), updateCaptor.capture(), any(ReplaceOptions.class));
+		verify(collection, times(1)).replaceOne(queryCaptor.capture(), updateCaptor.capture(), any(com.mongodb.client.model.ReplaceOptions.class));
 
 		assertThat(queryCaptor.getValue()).isEqualTo(new Document("_id", 1).append("version", 10));
 		assertThat(updateCaptor.getValue())
-				.isEqualTo(new Document("version", 11).append("_class", VersionedEntity.class.getName()));
+				.isEqualTo(new Document("version", 11).append("_class", VersionedEntity.class.getName()).append("name", null));
 	}
 
 	@Test // DATAMONGO-1783
-	public void usesQueryOffsetForCountOperation() {
+	void usesQueryOffsetForCountOperation() {
 
 		template.count(new BasicQuery("{}").skip(100), AutogenerateableId.class);
 
@@ -1086,7 +1282,7 @@ public void usesQueryOffsetForCountOperation() {
 	}
 
 	@Test // DATAMONGO-1783
-	public void usesQueryLimitForCountOperation() {
+	void usesQueryLimitForCountOperation() {
 
 		template.count(new BasicQuery("{}").limit(10), AutogenerateableId.class);
 
@@ -1097,7 +1293,7 @@ public void usesQueryLimitForCountOperation() {
 	}
 
 	@Test // DATAMONGO-2215
-	public void updateShouldApplyArrayFilters() {
+	void updateShouldApplyArrayFilters() {
 
 		template.updateFirst(new BasicQuery("{}"),
 				new Update().set("grades.$[element]", 100).filterArray(Criteria.where("element").gte(100)),
@@ -1111,7 +1307,7 @@ public void updateShouldApplyArrayFilters() {
 	}
 
 	@Test // DATAMONGO-2215
-	public void findAndModifyShouldApplyArrayFilters() {
+	void findAndModifyShouldApplyArrayFilters() {
 
 		template.findAndModify(new BasicQuery("{}"),
 				new Update().set("grades.$[element]", 100).filterArray(Criteria.where("element").gte(100)),
@@ -1125,15 +1321,15 @@ public void findAndModifyShouldApplyArrayFilters() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void streamQueryShouldUseDefaultCollationWhenPresent() {
+	void streamQueryShouldUseDefaultCollationWhenPresent() {
 
-		template.stream(new BasicQuery("{}"), Sith.class).next();
+		template.stream(new BasicQuery("{}"), Sith.class);
 
 		verify(findIterable).collation(eq(com.mongodb.client.model.Collation.builder().locale("de_AT").build()));
 	}
 
 	@Test // DATAMONGO-1854
-	public void findShouldNotUseCollationWhenNoDefaultPresent() {
+	void findShouldNotUseCollationWhenNoDefaultPresent() {
 
 		template.find(new BasicQuery("{'foo' : 'bar'}"), Jedi.class);
 
@@ -1141,7 +1337,7 @@ public void findShouldNotUseCollationWhenNoDefaultPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findShouldUseDefaultCollationWhenPresent() {
+	void findShouldUseDefaultCollationWhenPresent() {
 
 		template.find(new BasicQuery("{'foo' : 'bar'}"), Sith.class);
 
@@ -1149,7 +1345,7 @@ public void findShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findOneShouldUseDefaultCollationWhenPresent() {
+	void findOneShouldUseDefaultCollationWhenPresent() {
 
 		template.findOne(new BasicQuery("{'foo' : 'bar'}"), Sith.class);
 
@@ -1157,7 +1353,7 @@ public void findOneShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void existsShouldUseDefaultCollationWhenPresent() {
+	void existsShouldUseDefaultCollationWhenPresent() {
 
 		template.exists(new BasicQuery("{}"), Sith.class);
 
@@ -1169,7 +1365,7 @@ public void existsShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndModfiyShoudUseDefaultCollationWhenPresent() {
+	void findAndModfiyShoudUseDefaultCollationWhenPresent() {
 
 		template.findAndModify(new BasicQuery("{}"), new Update(), Sith.class);
 
@@ -1181,7 +1377,7 @@ public void findAndModfiyShoudUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndRemoveShouldUseDefaultCollationWhenPresent() {
+	void findAndRemoveShouldUseDefaultCollationWhenPresent() {
 
 		template.findAndRemove(new BasicQuery("{}"), Sith.class);
 
@@ -1193,7 +1389,7 @@ public void findAndRemoveShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldNotCollationIfNotPresent() {
+	void createCollectionShouldNotCollationIfNotPresent() {
 
 		template.createCollection(AutogenerateableId.class);
 
@@ -1204,7 +1400,7 @@ public void createCollectionShouldNotCollationIfNotPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldApplyDefaultCollation() {
+	void createCollectionShouldApplyDefaultCollation() {
 
 		template.createCollection(Sith.class);
 
@@ -1216,7 +1412,7 @@ public void createCollectionShouldApplyDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldFavorExplicitOptionsOverDefaultCollation() {
+	void createCollectionShouldFavorExplicitOptionsOverDefaultCollation() {
 
 		template.createCollection(Sith.class, CollectionOptions.just(Collation.of("en_US")));
 
@@ -1228,7 +1424,7 @@ public void createCollectionShouldFavorExplicitOptionsOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldUseDefaultCollationIfCollectionOptionsAreNull() {
+	void createCollectionShouldUseDefaultCollationIfCollectionOptionsAreNull() {
 
 		template.createCollection(Sith.class, null);
 
@@ -1240,7 +1436,7 @@ public void createCollectionShouldUseDefaultCollationIfCollectionOptionsAreNull(
 	}
 
 	@Test // DATAMONGO-1854
-	public void aggreateShouldUseDefaultCollationIfPresent() {
+	void aggreateShouldUseDefaultCollationIfPresent() {
 
 		template.aggregate(newAggregation(Sith.class, project("id")), AutogenerateableId.class, Document.class);
 
@@ -1248,7 +1444,7 @@ public void aggreateShouldUseDefaultCollationIfPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void aggreateShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent() {
+	void aggreateShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent() {
 
 		template.aggregateStream(newAggregation(Sith.class, project("id")).withOptions(
 				newAggregationOptions().collation(Collation.of("fr")).build()), AutogenerateableId.class, Document.class);
@@ -1257,7 +1453,7 @@ public void aggreateShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent
 	}
 
 	@Test // DATAMONGO-1854
-	public void aggreateStreamShouldUseDefaultCollationIfPresent() {
+	void aggreateStreamShouldUseDefaultCollationIfPresent() {
 
 		template.aggregate(newAggregation(Sith.class, project("id")), AutogenerateableId.class, Document.class);
 
@@ -1265,7 +1461,7 @@ public void aggreateStreamShouldUseDefaultCollationIfPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void aggreateStreamShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent() {
+	void aggreateStreamShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent() {
 
 		template.aggregateStream(newAggregation(Sith.class, project("id")).withOptions(
 				newAggregationOptions().collation(Collation.of("fr")).build()), AutogenerateableId.class, Document.class);
@@ -1274,7 +1470,7 @@ public void aggreateStreamShouldUseCollationFromOptionsEvenIfDefaultCollationIsP
 	}
 
 	@Test // DATAMONGO-2390
-	public void aggregateShouldNoApplyZeroOrNegativeMaxTime() {
+	void aggregateShouldNoApplyZeroOrNegativeMaxTime() {
 
 		template.aggregate(
 				newAggregation(Sith.class, project("id")).withOptions(newAggregationOptions().maxTime(Duration.ZERO).build()),
@@ -1286,7 +1482,7 @@ public void aggregateShouldNoApplyZeroOrNegativeMaxTime() {
 	}
 
 	@Test // DATAMONGO-2390
-	public void aggregateShouldApplyMaxTimeIfSet() {
+	void aggregateShouldApplyMaxTimeIfSet() {
 
 		template.aggregate(newAggregation(Sith.class, project("id")).withOptions(
 				newAggregationOptions().maxTime(Duration.ofSeconds(10)).build()), AutogenerateableId.class, Document.class);
@@ -1295,7 +1491,7 @@ public void aggregateShouldApplyMaxTimeIfSet() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndReplaceShouldUseCollationWhenPresent() {
+	void findAndReplaceShouldUseCollationWhenPresent() {
 
 		template.findAndReplace(new BasicQuery("{}").collation(Collation.of("fr")), new AutogenerateableId());
 
@@ -1306,7 +1502,7 @@ public void findAndReplaceShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findOneWithSortShouldUseCollationWhenPresent() {
+	void findOneWithSortShouldUseCollationWhenPresent() {
 
 		template.findOne(new BasicQuery("{}").collation(Collation.of("fr")).with(Sort.by("id")), Sith.class);
 
@@ -1314,7 +1510,7 @@ public void findOneWithSortShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findOneWithSortShouldUseDefaultCollationWhenPresent() {
+	void findOneWithSortShouldUseDefaultCollationWhenPresent() {
 
 		template.findOne(new BasicQuery("{}").with(Sort.by("id")), Sith.class);
 
@@ -1322,7 +1518,7 @@ public void findOneWithSortShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndReplaceShouldUseDefaultCollationWhenPresent() {
+	void findAndReplaceShouldUseDefaultCollationWhenPresent() {
 
 		template.findAndReplace(new BasicQuery("{}"), new Sith());
 
@@ -1333,7 +1529,7 @@ public void findAndReplaceShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
+	void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
 
 		template.findAndReplace(new BasicQuery("{}").collation(Collation.of("fr")), new Sith());
 
@@ -1344,7 +1540,7 @@ public void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findDistinctShouldUseDefaultCollationWhenPresent() {
+	void findDistinctShouldUseDefaultCollationWhenPresent() {
 
 		template.findDistinct(new BasicQuery("{}"), "name", Sith.class, String.class);
 
@@ -1352,7 +1548,7 @@ public void findDistinctShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findDistinctPreferCollationFromQueryOverDefaultCollation() {
+	void findDistinctPreferCollationFromQueryOverDefaultCollation() {
 
 		template.findDistinct(new BasicQuery("{}").collation(Collation.of("fr")), "name", Sith.class, String.class);
 
@@ -1360,7 +1556,7 @@ public void findDistinctPreferCollationFromQueryOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateFirstShouldUseDefaultCollationWhenPresent() {
+	void updateFirstShouldUseDefaultCollationWhenPresent() {
 
 		template.updateFirst(new BasicQuery("{}"), Update.update("foo", "bar"), Sith.class);
 
@@ -1372,7 +1568,7 @@ public void updateFirstShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateFirstShouldPreferExplicitCollationOverDefaultCollation() {
+	void updateFirstShouldPreferExplicitCollationOverDefaultCollation() {
 
 		template.updateFirst(new BasicQuery("{}").collation(Collation.of("fr")), Update.update("foo", "bar"), Sith.class);
 
@@ -1384,7 +1580,7 @@ public void updateFirstShouldPreferExplicitCollationOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateMultiShouldUseDefaultCollationWhenPresent() {
+	void updateMultiShouldUseDefaultCollationWhenPresent() {
 
 		template.updateMulti(new BasicQuery("{}"), Update.update("foo", "bar"), Sith.class);
 
@@ -1396,7 +1592,7 @@ public void updateMultiShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateMultiShouldPreferExplicitCollationOverDefaultCollation() {
+	void updateMultiShouldPreferExplicitCollationOverDefaultCollation() {
 
 		template.updateMulti(new BasicQuery("{}").collation(Collation.of("fr")), Update.update("foo", "bar"), Sith.class);
 
@@ -1408,7 +1604,7 @@ public void updateMultiShouldPreferExplicitCollationOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void removeShouldUseDefaultCollationWhenPresent() {
+	void removeShouldUseDefaultCollationWhenPresent() {
 
 		template.remove(new BasicQuery("{}"), Sith.class);
 
@@ -1420,7 +1616,7 @@ public void removeShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void removeShouldPreferExplicitCollationOverDefaultCollation() {
+	void removeShouldPreferExplicitCollationOverDefaultCollation() {
 
 		template.remove(new BasicQuery("{}").collation(Collation.of("fr")), Sith.class);
 
@@ -1432,7 +1628,7 @@ public void removeShouldPreferExplicitCollationOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void mapReduceShouldUseDefaultCollationWhenPresent() {
+	void mapReduceShouldUseDefaultCollationWhenPresent() {
 
 		template.mapReduce("", "", "", MapReduceOptions.options(), Sith.class);
 
@@ -1440,7 +1636,7 @@ public void mapReduceShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void mapReduceShouldPreferExplicitCollationOverDefaultCollation() {
+	void mapReduceShouldPreferExplicitCollationOverDefaultCollation() {
 
 		template.mapReduce("", "", "", MapReduceOptions.options().collation(Collation.of("fr")), Sith.class);
 
@@ -1448,7 +1644,7 @@ public void mapReduceShouldPreferExplicitCollationOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void saveShouldInvokeCallbacks() {
+	void saveShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -1466,7 +1662,7 @@ public void saveShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void insertShouldInvokeCallbacks() {
+	void insertShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -1484,7 +1680,7 @@ public void insertShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void insertAllShouldInvokeCallbacks() {
+	void insertAllShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -1506,7 +1702,7 @@ public void insertAllShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void findAndReplaceShouldInvokeCallbacks() {
+	void findAndReplaceShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -1524,7 +1720,7 @@ public void findAndReplaceShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void publishesEventsAndEntityCallbacksInOrder() {
+	void publishesEventsAndEntityCallbacksInOrder() {
 
 		BeforeConvertCallback<Person> beforeConvertCallback = new BeforeConvertCallback<Person>() {
 
@@ -1583,7 +1779,7 @@ public void onBeforeSave(BeforeSaveEvent<Person> event) {
 	}
 
 	@Test // DATAMONGO-2261
-	public void beforeSaveCallbackAllowsTargetDocumentModifications() {
+	void beforeSaveCallbackAllowsTargetDocumentModifications() {
 
 		BeforeSaveCallback<Person> beforeSaveCallback = new BeforeSaveCallback<Person>() {
 
@@ -1609,12 +1805,12 @@ public Person onBeforeSave(Person entity, Document document, String collection)
 
 		ArgumentCaptor<Document> captor = ArgumentCaptor.forClass(Document.class);
 
-		verify(collection).replaceOne(any(), captor.capture(), any(ReplaceOptions.class));
+		verify(collection).replaceOne(any(), captor.capture(), any(com.mongodb.client.model.ReplaceOptions.class));
 		assertThat(captor.getValue()).containsEntry("added-by", "callback");
 	}
 
 	@Test // DATAMONGO-2307
-	public void beforeSaveCallbackAllowsTargetEntityModificationsUsingSave() {
+	void beforeSaveCallbackAllowsTargetEntityModificationsUsingSave() {
 
 		StaticApplicationContext ctx = new StaticApplicationContext();
 		ctx.registerBean(BeforeSaveCallback.class, this::beforeSaveCallbackReturningNewPersonWithTransientAttribute);
@@ -1632,7 +1828,7 @@ public void beforeSaveCallbackAllowsTargetEntityModificationsUsingSave() {
 	}
 
 	@Test // DATAMONGO-2307
-	public void beforeSaveCallbackAllowsTargetEntityModificationsUsingInsert() {
+	void beforeSaveCallbackAllowsTargetEntityModificationsUsingInsert() {
 
 		StaticApplicationContext ctx = new StaticApplicationContext();
 		ctx.registerBean(BeforeSaveCallback.class, this::beforeSaveCallbackReturningNewPersonWithTransientAttribute);
@@ -1652,12 +1848,12 @@ public void beforeSaveCallbackAllowsTargetEntityModificationsUsingInsert() {
 	// TODO: additional tests for what is when saved.
 
 	@Test // DATAMONGO-2261
-	public void entityCallbacksAreNotSetByDefault() {
+	void entityCallbacksAreNotSetByDefault() {
 		Assertions.assertThat(ReflectionTestUtils.getField(template, "entityCallbacks")).isNull();
 	}
 
 	@Test // DATAMONGO-2261
-	public void entityCallbacksShouldBeInitiatedOnSettingApplicationContext() {
+	void entityCallbacksShouldBeInitiatedOnSettingApplicationContext() {
 
 		ApplicationContext ctx = new StaticApplicationContext();
 		template.setApplicationContext(ctx);
@@ -1666,7 +1862,7 @@ public void entityCallbacksShouldBeInitiatedOnSettingApplicationContext() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void setterForEntityCallbackOverridesContextInitializedOnes() {
+	void setterForEntityCallbackOverridesContextInitializedOnes() {
 
 		ApplicationContext ctx = new StaticApplicationContext();
 		template.setApplicationContext(ctx);
@@ -1678,7 +1874,7 @@ public void setterForEntityCallbackOverridesContextInitializedOnes() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void setterForApplicationContextShouldNotOverrideAlreadySetEntityCallbacks() {
+	void setterForApplicationContextShouldNotOverrideAlreadySetEntityCallbacks() {
 
 		EntityCallbacks callbacks = EntityCallbacks.create();
 		ApplicationContext ctx = new StaticApplicationContext();
@@ -1689,39 +1885,39 @@ public void setterForApplicationContextShouldNotOverrideAlreadySetEntityCallback
 		Assertions.assertThat(ReflectionTestUtils.getField(template, "entityCallbacks")).isSameAs(callbacks);
 	}
 
-	@Test // DATAMONGO-2344
-	public void slaveOkQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFind() {
+	@Test // DATAMONGO-2344, DATAMONGO-2572
+	void allowSecondaryReadsQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFind() {
 
-		template.find(new Query().slaveOk(), AutogenerateableId.class);
+		template.find(new Query().allowSecondaryReads(), AutogenerateableId.class);
 
 		verify(collection).withReadPreference(eq(ReadPreference.primaryPreferred()));
 	}
 
-	@Test // DATAMONGO-2344
-	public void slaveOkQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindOne() {
+	@Test // DATAMONGO-2344, DATAMONGO-2572
+	void allowSecondaryReadsQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindOne() {
 
-		template.findOne(new Query().slaveOk(), AutogenerateableId.class);
+		template.findOne(new Query().allowSecondaryReads(), AutogenerateableId.class);
 
 		verify(collection).withReadPreference(eq(ReadPreference.primaryPreferred()));
 	}
 
-	@Test // DATAMONGO-2344
-	public void slaveOkQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindDistinct() {
+	@Test // DATAMONGO-2344, DATAMONGO-2572
+	void allowSecondaryReadsQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindDistinct() {
 
-		template.findDistinct(new Query().slaveOk(), "name", AutogenerateableId.class, String.class);
+		template.findDistinct(new Query().allowSecondaryReads(), "name", AutogenerateableId.class, String.class);
 
 		verify(collection).withReadPreference(eq(ReadPreference.primaryPreferred()));
 	}
 
-	@Test // DATAMONGO-2344
-	public void slaveOkQueryOptionShouldApplyPrimaryPreferredReadPreferenceForStream() {
+	@Test // DATAMONGO-2344, DATAMONGO-2572
+	void allowSecondaryReadsQueryOptionShouldApplyPrimaryPreferredReadPreferenceForStream() {
 
-		template.stream(new Query().slaveOk(), AutogenerateableId.class);
+		template.stream(new Query().allowSecondaryReads(), AutogenerateableId.class);
 		verify(collection).withReadPreference(eq(ReadPreference.primaryPreferred()));
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldAllowAggregationExpressions() {
+	void updateShouldAllowAggregationExpressions() {
 
 		AggregationUpdate update = AggregationUpdate.update().set("total")
 				.toValue(ArithmeticOperators.valueOf("val1").sum().and("val2"));
@@ -1737,7 +1933,7 @@ public void updateShouldAllowAggregationExpressions() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldAllowMultipleAggregationExpressions() {
+	void updateShouldAllowMultipleAggregationExpressions() {
 
 		AggregationUpdate update = AggregationUpdate.update() //
 				.set("average").toValue(ArithmeticOperators.valueOf("tests").avg()) //
@@ -1765,7 +1961,7 @@ public void updateShouldAllowMultipleAggregationExpressions() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldMapAggregationExpressionToDomainType() {
+	void updateShouldMapAggregationExpressionToDomainType() {
 
 		AggregationUpdate update = AggregationUpdate.update().set("name")
 				.toValue(ArithmeticOperators.valueOf("val1").sum().and("val2"));
@@ -1781,7 +1977,7 @@ public void updateShouldMapAggregationExpressionToDomainType() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldPassOnUnsetCorrectly() {
+	void updateShouldPassOnUnsetCorrectly() {
 
 		SetOperation setOperation = SetOperation.builder().set("status").toValue("Modified").and().set("comments")
 				.toValue(Fields.fields("misc1").and("misc2").asList());
@@ -1801,7 +1997,7 @@ public void updateShouldPassOnUnsetCorrectly() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldMapAggregationUnsetToDomainType() {
+	void updateShouldMapAggregationUnsetToDomainType() {
 
 		AggregationUpdate update = AggregationUpdate.update();
 		update.unset("name");
@@ -1815,180 +2011,1007 @@ public void updateShouldMapAggregationUnsetToDomainType() {
 		assertThat(captor.getValue()).isEqualTo(Collections.singletonList(Document.parse("{ $unset : \"firstname\" }")));
 	}
 
-	class AutogenerateableId {
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyIfNotPresentInFilter() {
 
-		@Id BigInteger id;
+		template.save(new ShardedEntityWithNonDefaultShardKey("id-1", "AT", 4230));
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		verify(collection).replaceOne(filter.capture(), any(), any());
+
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1").append("country", "AT").append("userid", 4230));
 	}
 
-	class NotAutogenerateableId {
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyToVersionedEntityIfNotPresentInFilter() {
 
-		@Id Integer id;
+		when(collection.replaceOne(any(), any(), any(com.mongodb.client.model.ReplaceOptions.class)))
+				.thenReturn(UpdateResult.acknowledged(1, 1L, null));
 
-		public Pattern getId() {
-			return Pattern.compile(".");
-		}
-	}
+		template.save(new ShardedVersionedEntityWithNonDefaultShardKey("id-1", 1L, "AT", 4230));
 
-	static class VersionedEntity {
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		verify(collection).replaceOne(filter.capture(), any(), any());
 
-		@Id Integer id;
-		@Version Integer version;
+		assertThat(filter.getValue())
+				.isEqualTo(new Document("_id", "id-1").append("version", 1L).append("country", "AT").append("userid", 4230));
 	}
 
-	enum MyConverter implements Converter<AutogenerateableId, String> {
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyFromExistingDocumentIfNotPresentInFilter() {
 
-		INSTANCE;
+		when(findIterable.first()).thenReturn(new Document("_id", "id-1").append("country", "US").append("userid", 4230));
 
-		public String convert(AutogenerateableId source) {
-			return source.toString();
-		}
-	}
+		template.save(new ShardedEntityWithNonDefaultShardKey("id-1", "AT", 4230));
 
-	@Data
-	@org.springframework.data.mongodb.core.mapping.Document(collection = "star-wars")
-	static class Person {
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		ArgumentCaptor<Document> replacement = ArgumentCaptor.forClass(Document.class);
 
-		@Id String id;
-		String firstname;
+		verify(collection).replaceOne(filter.capture(), replacement.capture(), any());
+
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1").append("country", "US").append("userid", 4230));
+		assertThat(replacement.getValue()).containsEntry("country", "AT").containsEntry("userid", 4230);
 	}
 
-	static class PersonExtended extends Person {
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyFromGivenDocumentIfShardKeyIsImmutable() {
 
-		String lastname;
-	}
+		template.save(new ShardedEntityWithNonDefaultImmutableShardKey("id-1", "AT", 4230));
 
-	static class PersonWithTransientAttribute extends Person {
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		ArgumentCaptor<Document> replacement = ArgumentCaptor.forClass(Document.class);
 
-		@Transient boolean isNew = true;
-	}
+		verify(collection).replaceOne(filter.capture(), replacement.capture(), any());
 
-	interface PersonProjection {
-		String getFirstname();
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1").append("country", "AT").append("userid", 4230));
+		assertThat(replacement.getValue()).containsEntry("country", "AT").containsEntry("userid", 4230);
+
+		verifyNoInteractions(findIterable);
 	}
 
-	public interface PersonSpELProjection {
+	@Test // DATAMONGO-2341
+	void saveShouldAppendDefaultShardKeyIfNotPresentInFilter() {
 
-		@Value("#{target.firstname}")
-		String getName();
+		template.save(new ShardedEntityWithDefaultShardKey("id-1", "AT", 4230));
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		verify(collection).replaceOne(filter.capture(), any(), any());
+
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1"));
+		verify(findIterable, never()).first();
 	}
 
-	@Data
-	static class Human {
-		@Id String id;
+	@Test // GH-3590
+	void shouldIncludeValueFromNestedShardKeyPath() {
+
+		WithShardKeyPointingToNested source = new WithShardKeyPointingToNested();
+		source.id = "id-1";
+		source.value = "v1";
+		source.nested = new WithNamedFields();
+		source.nested.customName = "cname";
+		source.nested.name = "name";
+
+		template.save(source);
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		verify(collection).replaceOne(filter.capture(), any(), any());
+
+		assertThat(filter.getValue())
+				.isEqualTo(new Document("_id", "id-1").append("value", "v1").append("nested.custom-named-field", "cname"));
 	}
 
-	@Data
-	static class Jedi {
+	@Test // DATAMONGO-2341
+	void saveShouldProjectOnShardKeyWhenLoadingExistingDocument() {
 
-		@Field("firstname") String name;
+		when(findIterable.first()).thenReturn(new Document("_id", "id-1").append("country", "US").append("userid", 4230));
+
+		template.save(new ShardedEntityWithNonDefaultShardKey("id-1", "AT", 4230));
+
+		verify(findIterable).projection(new Document("country", 1).append("userid", 1));
 	}
 
-	class Wrapper {
+	@Test // DATAMONGO-2341
+	void saveVersionedShouldProjectOnShardKeyWhenLoadingExistingDocument() {
 
-		AutogenerateableId foo;
+		when(collection.replaceOne(any(), any(), any(com.mongodb.client.model.ReplaceOptions.class)))
+				.thenReturn(UpdateResult.acknowledged(1, 1L, null));
+		when(findIterable.first()).thenReturn(new Document("_id", "id-1").append("country", "US").append("userid", 4230));
+
+		template.save(new ShardedVersionedEntityWithNonDefaultShardKey("id-1", 1L, "AT", 4230));
+
+		verify(findIterable).projection(new Document("country", 1).append("userid", 1));
 	}
 
-	static class EntityWithListOfSimple {
-		List<Integer> grades;
+	@Test // DATAMONGO-2479
+	void findShouldInvokeAfterConvertCallback() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(findIterable.iterator()).thenReturn(new OneElementCursor<>(document));
+
+		template.find(new Query(), Person.class);
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
 	}
 
-	static class WithNamedFields {
+	@Test // DATAMONGO-2479
+	void findByIdShouldInvokeAfterConvertCallback() {
 
-		@Id String id;
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
 
-		String name;
-		@Field("custom-named-field") String customName;
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(findIterable.first()).thenReturn(document);
+
+		template.findById("init", Person.class);
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
 	}
 
-	@org.springframework.data.mongodb.core.mapping.Document(collation = "de_AT")
-	static class Sith {
+	@Test // DATAMONGO-2479
+	void findOneShouldInvokeAfterConvertCallback() {
 
-		@Field("firstname") String name;
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(findIterable.first()).thenReturn(document);
+
+		template.findOne(new Query(), Person.class);
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
 	}
 
-	/**
-	 * Mocks out the {@link MongoTemplate#getDb()} method to return the {@link DB} mock instead of executing the actual
-	 * behaviour.
-	 *
-	 * @return
-	 */
-	private MongoTemplate mockOutGetDb() {
+	@Test // DATAMONGO-2479
+	void findAllShouldInvokeAfterConvertCallback() {
 
-		MongoTemplate template = spy(this.template);
-		when(template.getDb()).thenReturn(db);
-		return template;
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(findIterable.iterator()).thenReturn(new OneElementCursor<>(document));
+
+		template.findAll(Person.class);
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.MongoOperationsUnitTests#getOperations()
-	 */
-	@Override
-	protected MongoOperations getOperationsForExceptionHandling() {
-		MongoTemplate template = spy(this.template);
-		lenient().when(template.getDb()).thenThrow(new MongoException("Error!"));
-		return template;
+	@Test // DATAMONGO-2479
+	void findAndModifyShouldInvokeAfterConvertCallback() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndUpdate(any(Bson.class), any(Bson.class), any())).thenReturn(document);
+
+		template.findAndModify(new Query(), new Update(), Person.class);
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.core.MongoOperationsUnitTests#getOperations()
-	 */
-	@Override
-	protected MongoOperations getOperations() {
-		return this.template;
+	@Test // DATAMONGO-2479
+	void findAndRemoveShouldInvokeAfterConvertCallback() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndDelete(any(Bson.class), any())).thenReturn(document);
+
+		template.findAndRemove(new Query(), Person.class);
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
 	}
 
-	private BeforeSaveCallback<PersonWithTransientAttribute> beforeSaveCallbackReturningNewPersonWithTransientAttribute() {
-		return (entity, document, collection) -> {
+	@Test // DATAMONGO-2479
+	void findAllAndRemoveShouldInvokeAfterConvertCallback() {
 
-			// Return a completely new instance, ie in case of an immutable entity;
-			PersonWithTransientAttribute newEntity = new PersonWithTransientAttribute();
-			newEntity.id = entity.id;
-			newEntity.firstname = entity.firstname;
-			newEntity.isNew = false;
-			return newEntity;
-		};
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(findIterable.iterator()).thenReturn(new OneElementCursor<>(document));
+
+		template.findAllAndRemove(new Query(), Person.class);
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
 	}
 
-	static class ValueCapturingEntityCallback<T> {
+	@Test // DATAMONGO-2479
+	void findAndReplaceShouldInvokeAfterConvertCallbacks() {
 
-		private final List<T> values = new ArrayList<>(1);
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
 
-		protected void capture(T value) {
-			values.add(value);
-		}
+		template.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
 
-		public List<T> getValues() {
-			return values;
-		}
+		Person entity = new Person("init", "luke");
 
-		@Nullable
-		public T getValue() {
-			return CollectionUtils.lastElement(values);
-		}
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndReplace(any(Bson.class), any(Document.class), any())).thenReturn(document);
+
+		Person saved = template.findAndReplace(new Query(), entity);
 
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(saved.id).isEqualTo("after-convert");
 	}
 
-	static class ValueCapturingBeforeConvertCallback extends ValueCapturingEntityCallback<Person>
-			implements BeforeConvertCallback<Person> {
+	@Test // DATAMONGO-2479
+	void saveShouldInvokeAfterSaveCallbacks() {
 
-		@Override
-		public Person onBeforeConvert(Person entity, String collection) {
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
 
-			capture(entity);
-			return entity;
-		}
+		template.setEntityCallbacks(EntityCallbacks.create(afterSaveCallback));
+
+		Person entity = new Person("init", "luke");
+
+		Person saved = template.save(entity);
+
+		verify(afterSaveCallback).onAfterSave(eq(entity), any(), anyString());
+		assertThat(saved.id).isEqualTo("after-save");
 	}
 
-	static class ValueCapturingBeforeSaveCallback extends ValueCapturingEntityCallback<Person>
-			implements BeforeSaveCallback<Person> {
+	@Test // DATAMONGO-2479
+	void insertShouldInvokeAfterSaveCallbacks() {
 
-		@Override
-		public Person onBeforeSave(Person entity, Document document, String collection) {
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
 
-			capture(entity);
-			return entity;
+		template.setEntityCallbacks(EntityCallbacks.create(afterSaveCallback));
+
+		Person entity = new Person("init", "luke");
+
+		Person saved = template.insert(entity);
+
+		verify(afterSaveCallback).onAfterSave(eq(entity), any(), anyString());
+		assertThat(saved.id).isEqualTo("after-save");
+	}
+
+	@Test // DATAMONGO-2479
+	void insertAllShouldInvokeAfterSaveCallbacks() {
+
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterSaveCallback));
+
+		Person entity1 = new Person();
+		entity1.id = "1";
+		entity1.firstname = "luke";
+
+		Person entity2 = new Person();
+		entity1.id = "2";
+		entity1.firstname = "luke";
+
+		Collection<Person> saved = template.insertAll(Arrays.asList(entity1, entity2));
+
+		verify(afterSaveCallback, times(2)).onAfterSave(any(), any(), anyString());
+		assertThat(saved.iterator().next().getId()).isEqualTo("after-save");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAndReplaceShouldInvokeAfterSaveCallbacks() {
+
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
+
+		template.setEntityCallbacks(EntityCallbacks.create(afterSaveCallback));
+
+		Person entity = new Person("init", "luke");
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndReplace(any(Bson.class), any(Document.class), any())).thenReturn(document);
+
+		Person saved = template.findAndReplace(new Query(), entity);
+
+		verify(afterSaveCallback).onAfterSave(eq(new Person("init", "luke")), any(), anyString());
+		assertThat(saved.id).isEqualTo("after-save");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAndReplaceShouldEmitAfterSaveEvent() {
+
+		AbstractMongoEventListener<Person> eventListener = new AbstractMongoEventListener<Person>() {
+
+			@Override
+			public void onAfterSave(AfterSaveEvent<Person> event) {
+
+				assertThat(event.getSource().id).isEqualTo("init");
+				event.getSource().id = "after-save-event";
+			}
+		};
+
+		StaticApplicationContext ctx = new StaticApplicationContext();
+		ctx.registerBean(ApplicationListener.class, () -> eventListener);
+		ctx.refresh();
+
+		template.setApplicationContext(ctx);
+
+		Person entity = new Person("init", "luke");
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndReplace(any(Bson.class), any(Document.class), any())).thenReturn(document);
+
+		Person saved = template.findAndReplace(new Query(), entity);
+
+		assertThat(saved.id).isEqualTo("after-save-event");
+	}
+
+	@Test // DATAMONGO-2556
+	void esitmatedCountShouldBeDelegatedCorrectly() {
+
+		template.estimatedCount(Person.class);
+
+		verify(db).getCollection("star-wars", Document.class);
+		verify(collection).estimatedDocumentCount(any());
+	}
+
+	@Test // GH-2911
+	void insertErrorsOnCustomIteratorImplementation() {
+
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> template.insert(new TypeImplementingIterator()));
+	}
+
+	@Test // GH-3570
+	void saveErrorsOnCollectionLikeObjects() {
+
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> template.save(new ArrayList<>(Arrays.asList(1, 2, 3)), "myList"));
+	}
+
+	@Test // GH-3731
+	void createCollectionShouldSetUpTimeSeriesWithDefaults() {
+
+		template.createCollection(TimeSeriesTypeWithDefaults.class);
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getTimeSeriesOptions().toString())
+				.isEqualTo(new com.mongodb.client.model.TimeSeriesOptions("timestamp").toString());
+	}
+
+	@Test // GH-3731
+	void createCollectionShouldSetUpTimeSeries() {
+
+		template.createCollection(TimeSeriesType.class);
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getTimeSeriesOptions().toString())
+				.isEqualTo(new com.mongodb.client.model.TimeSeriesOptions("time_stamp").metaField("meta")
+						.granularity(TimeSeriesGranularity.HOURS).toString());
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromString() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsPlainString.class);
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.MINUTES))
+				.isEqualTo(10);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromProperty() {
+
+		environment.setProperty("my.timeout", "12m");
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterFromProperty.class);
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.MINUTES))
+			.isEqualTo(12);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromIso8601String() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsIso8601Style.class);
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.DAYS))
+				.isEqualTo(1);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromExpression() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsExpression.class);
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.SECONDS))
+				.isEqualTo(11);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromExpressionReturningDuration() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsExpressionResultingInDuration.class);
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.SECONDS))
+				.isEqualTo(100);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithInvalidTimeoutExpiration() {
+
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
+				template.createCollection(TimeSeriesTypeWithInvalidExpireAfter.class)
+		);
+	}
+
+	@Test // GH-3522
+	void usedCountDocumentsForEmptyQueryByDefault() {
+
+		template.count(new Query(), Human.class);
+
+		verify(collection).countDocuments(any(Document.class), any());
+	}
+
+	@Test // GH-3522
+	void delegatesToEstimatedCountForEmptyQueryIfEnabled() {
+
+		template.useEstimatedCount(true);
+
+		template.count(new Query(), Human.class);
+
+		verify(collection).estimatedDocumentCount(any());
+	}
+
+	@Test // GH-3522
+	void stillUsesCountDocumentsForNonEmptyQueryEvenIfEstimationEnabled() {
+
+		template.useEstimatedCount(true);
+
+		template.count(new BasicQuery("{ 'spring' : 'data-mongodb' }"), Human.class);
+
+		verify(collection).countDocuments(any(Document.class), any());
+	}
+
+	@Test // GH-4374
+	void countConsidersMaxTimeMs() {
+
+		template.count(new BasicQuery("{ 'spring' : 'data-mongodb' }").maxTimeMsec(5000), Human.class);
+
+		ArgumentCaptor<CountOptions> options = ArgumentCaptor.forClass(CountOptions.class);
+		verify(collection).countDocuments(any(Document.class), options.capture());
+		assertThat(options.getValue().getMaxTime(TimeUnit.MILLISECONDS)).isEqualTo(5000);
+	}
+
+	@Test // GH-4374
+	void countPassesOnComment() {
+
+		template.count(new BasicQuery("{ 'spring' : 'data-mongodb' }").comment("rocks!"), Human.class);
+
+		ArgumentCaptor<CountOptions> options = ArgumentCaptor.forClass(CountOptions.class);
+		verify(collection).countDocuments(any(Document.class), options.capture());
+		assertThat(options.getValue().getComment()).isEqualTo(BsonUtils.simpleToBsonValue("rocks!"));
+	}
+
+	@Test // GH-3984
+	void templatePassesOnTimeSeriesOptionsWhenNoTypeGiven() {
+
+		template.createCollection("time-series-collection", CollectionOptions.timeSeries("time_stamp"));
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getTimeSeriesOptions().toString())
+				.isEqualTo(new com.mongodb.client.model.TimeSeriesOptions("time_stamp").toString());
+	}
+
+	@Test // GH-4300
+	void findAndReplaceAllowsDocumentSourceType() {
+
+		template.findAndReplace(new Query(), new Document("spring", "data"), FindAndReplaceOptions.options().upsert(),
+				Document.class, "coll-1", Person.class);
+
+		verify(db).getCollection(eq("coll-1"), eq(Document.class));
+		verify(collection).findOneAndReplace((Bson) any(Bson.class), eq(new Document("spring", "data")),
+				any(FindOneAndReplaceOptions.class));
+	}
+
+	@Test // GH-4462
+	void replaceShouldUseCollationWhenPresent() {
+
+		template.replace(new BasicQuery("{}").collation(Collation.of("fr")), new AutogenerateableId());
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(), any(), options.capture());
+
+		assertThat(options.getValue().isUpsert()).isFalse();
+		assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr");
+	}
+
+	@Test // GH-4462
+	void replaceShouldNotUpsertByDefault() {
+
+		template.replace(new BasicQuery("{}"), new Sith());
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(), any(), options.capture());
+
+		assertThat(options.getValue().isUpsert()).isFalse();
+	}
+
+	@Test // GH-4462
+	void replaceShouldUpsert() {
+
+		template.replace(new BasicQuery("{}"), new Sith(), ReplaceOptions.replaceOptions().upsert());
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(), any(), options.capture());
+
+		assertThat(options.getValue().isUpsert()).isTrue();
+	}
+
+	@Test // GH-4462
+	void replaceShouldUseDefaultCollationWhenPresent() {
+
+		template.replace(new BasicQuery("{}"), new Sith(), ReplaceOptions.replaceOptions());
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(), any(), options.capture());
+
+		assertThat(options.getValue().getCollation().getLocale()).isEqualTo("de_AT");
+	}
+
+	@Test // GH-4462
+	void replaceShouldUseHintIfPresent() {
+
+		template.replace(new BasicQuery("{}").withHint("index-to-use"), new Sith(),
+				ReplaceOptions.replaceOptions().upsert());
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(), any(), options.capture());
+
+		assertThat(options.getValue().getHintString()).isEqualTo("index-to-use");
+	}
+
+	@Test // GH-4462
+	void replaceShouldApplyWriteConcern() {
+
+		template.setWriteConcernResolver(new WriteConcernResolver() {
+			public WriteConcern resolve(MongoAction action) {
+
+				assertThat(action.getMongoActionOperation()).isEqualTo(MongoActionOperation.REPLACE);
+				return WriteConcern.UNACKNOWLEDGED;
+			}
+		});
+
+		template.replace(new BasicQuery("{}").withHint("index-to-use"), new Sith(),
+				ReplaceOptions.replaceOptions().upsert());
+
+		verify(collection).withWriteConcern(eq(WriteConcern.UNACKNOWLEDGED));
+	}
+
+    @Test // GH-4099
+    void passOnTimeSeriesExpireOption() {
+
+        template.createCollection("time-series-collection",
+            CollectionOptions.timeSeries("time_stamp", options -> options.expireAfter(Duration.ofSeconds(10))));
+
+        ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+        verify(db).createCollection(any(), options.capture());
+
+        assertThat(options.getValue().getExpireAfter(TimeUnit.SECONDS)).isEqualTo(10);
+    }
+
+    @Test // GH-4099
+    void doNotSetTimeSeriesExpireOptionForNegativeValue() {
+
+        template.createCollection("time-series-collection",
+            CollectionOptions.timeSeries("time_stamp", options -> options.expireAfter(Duration.ofSeconds(-10))));
+
+        ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+        verify(db).createCollection(any(), options.capture());
+
+        assertThat(options.getValue().getExpireAfter(TimeUnit.SECONDS)).isEqualTo(0L);
+    }
+
+
+    class AutogenerateableId {
+
+		@Id BigInteger id;
+	}
+
+	class NotAutogenerateableId {
+
+		@Id Integer id;
+
+		public Pattern getId() {
+			return Pattern.compile(".");
+		}
+	}
+
+	static class VersionedEntity {
+
+		@Id Integer id;
+		@Version Integer version;
+
+		@Field(write = Field.Write.ALWAYS) String name;
+	}
+
+	enum MyConverter implements Converter<AutogenerateableId, String> {
+
+		INSTANCE;
+
+		public String convert(AutogenerateableId source) {
+			return source.toString();
+		}
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(collection = "star-wars")
+	static class Person {
+
+		@Id String id;
+		String firstname;
+
+		public Person() {}
+
+		public Person(String id, String firstname) {
+			this.id = id;
+			this.firstname = firstname;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getFirstname() {
+			return firstname;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname);
+		}
+	}
+
+	static class PersonExtended extends Person {
+
+		String lastname;
+	}
+
+	static class PersonWithTransientAttribute extends Person {
+
+		@Transient boolean isNew = true;
+	}
+
+	interface PersonProjection {
+		String getFirstname();
+	}
+
+	public interface PersonSpELProjection {
+
+		@Value("#{target.firstname}")
+		String getName();
+	}
+
+	static class Human {
+		@Id String id;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+	}
+
+	static class Jedi {
+
+		@Field("firstname") String name;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+	}
+
+	class Wrapper {
+
+		AutogenerateableId foo;
+	}
+
+	static class EntityWithListOfSimple {
+		List<Integer> grades;
+	}
+
+	static class WithNamedFields {
+
+		@Id String id;
+
+		String name;
+		@Field("custom-named-field") String customName;
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(collation = "de_AT")
+	static class Sith {
+
+		@Field("firstname") String name;
+	}
+
+	@Sharded(shardKey = { "value", "nested.customName" })
+	static class WithShardKeyPointingToNested {
+		String id;
+		String value;
+		WithNamedFields nested;
+	}
+
+	@TimeSeries(timeField = "timestamp")
+	static class TimeSeriesTypeWithDefaults {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", metaField = "meta", granularity = Granularity.HOURS)
+	static class TimeSeriesType {
+
+		String id;
+
+		@Field("time_stamp") Instant timestamp;
+		Object meta;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "${my.timeout}")
+	static class TimeSeriesTypeWithExpireAfterFromProperty {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "10m")
+	static class TimeSeriesTypeWithExpireAfterAsPlainString {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "P1D")
+	static class TimeSeriesTypeWithExpireAfterAsIso8601Style {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "#{10 + 1 + 's'}")
+	static class TimeSeriesTypeWithExpireAfterAsExpression {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "#{T(java.time.Duration).ofSeconds(100)}")
+	static class TimeSeriesTypeWithExpireAfterAsExpressionResultingInDuration {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "123ops")
+	static class TimeSeriesTypeWithInvalidExpireAfter {
+
+		String id;
+		Instant timestamp;
+	}
+
+	static class TypeImplementingIterator implements Iterator {
+
+		@Override
+		public boolean hasNext() {
+			return false;
+		}
+
+		@Override
+		public Object next() {
+			return null;
+		}
+	}
+
+	/**
+	 * Mocks out the {@link MongoTemplate#getDb()} method to return the {@link DB} mock instead of executing the actual
+	 * behaviour.
+	 *
+	 * @return
+	 */
+	private MongoTemplate mockOutGetDb() {
+
+		MongoTemplate template = spy(this.template);
+		when(template.getDb()).thenReturn(db);
+		return template;
+	}
+
+	@Override
+	protected MongoOperations getOperationsForExceptionHandling() {
+		when(template.getMongoDatabaseFactory().getMongoDatabase()).thenThrow(new MongoException("Error"));
+		return template;
+	}
+
+	@Override
+	protected MongoOperations getOperations() {
+		return this.template;
+	}
+
+	private BeforeSaveCallback<PersonWithTransientAttribute> beforeSaveCallbackReturningNewPersonWithTransientAttribute() {
+		return (entity, document, collection) -> {
+
+			// Return a completely new instance, ie in case of an immutable entity;
+			PersonWithTransientAttribute newEntity = new PersonWithTransientAttribute();
+			newEntity.id = entity.id;
+			newEntity.firstname = entity.firstname;
+			newEntity.isNew = false;
+			return newEntity;
+		};
+	}
+
+	static class ValueCapturingEntityCallback<T> {
+
+		private final List<T> values = new ArrayList<>(1);
+
+		protected void capture(T value) {
+			values.add(value);
+		}
+
+		public List<T> getValues() {
+			return values;
+		}
+
+		public @Nullable T getValue() {
+			return CollectionUtils.lastElement(values);
+		}
+
+	}
+
+	static class ValueCapturingBeforeConvertCallback extends ValueCapturingEntityCallback<Person>
+			implements BeforeConvertCallback<Person> {
+
+		@Override
+		public Person onBeforeConvert(Person entity, String collection) {
+
+			capture(entity);
+			return entity;
+		}
+	}
+
+	static class ValueCapturingBeforeSaveCallback extends ValueCapturingEntityCallback<Person>
+			implements BeforeSaveCallback<Person> {
+
+		@Override
+		public Person onBeforeSave(Person entity, Document document, String collection) {
+
+			capture(entity);
+			return entity;
+		}
+	}
+
+	static class ValueCapturingAfterSaveCallback extends ValueCapturingEntityCallback<Person>
+			implements AfterSaveCallback<Person> {
+
+		@Override
+		public Person onAfterSave(Person entity, Document document, String collection) {
+
+			capture(entity);
+			return new Person() {
+				{
+					id = "after-save";
+					firstname = entity.firstname;
+				}
+			};
+		}
+	}
+
+	static class ValueCapturingAfterConvertCallback extends ValueCapturingEntityCallback<Person>
+			implements AfterConvertCallback<Person> {
+
+		@Override
+		public Person onAfterConvert(Person entity, Document document, String collection) {
+
+			capture(entity);
+			return new Person() {
+				{
+					id = "after-convert";
+					firstname = entity.firstname;
+				}
+			};
+		}
+	}
+
+	static class OneElementCursor<T> implements MongoCursor<T> {
+		private final Iterator<T> iterator;
+
+		OneElementCursor(T element) {
+			iterator = Collections.singletonList(element).iterator();
+		}
+
+		@Override
+		public void close() {
+			// nothing to close
+		}
+
+		@Override
+		public boolean hasNext() {
+			return iterator.hasNext();
+		}
+
+		@Override
+		public T next() {
+			return iterator.next();
+		}
+
+		@Override
+		public int available() {
+			return 1;
+		}
+
+		@Override
+		public T tryNext() {
+			if (iterator.hasNext()) {
+				return iterator.next();
+			} else {
+				return null;
+			}
+		}
+
+		@Override
+		public ServerCursor getServerCursor() {
+			throw new IllegalStateException("Not implemented");
+		}
+
+		@Override
+		public ServerAddress getServerAddress() {
+			throw new IllegalStateException("Not implemented");
 		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnwrappedTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnwrappedTests.java
new file mode 100644
index 0000000000..b8fc2986c2
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUnwrappedTests.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright 2020-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.Template;
+
+/**
+ * Integration tests for {@link Unwrapped}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoTemplateExtension.class)
+class MongoTemplateUnwrappedTests {
+
+	private static @Template MongoTemplate template;
+
+	@Test // DATAMONGO-1902
+	void readWrite() {
+
+		WithUnwrapped source = new WithUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = new UnwrappableType();
+		source.embeddableValue.stringValue = "string-val";
+		source.embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		source.embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		template.save(source);
+
+		assertThat(template.findOne(query(where("id").is(source.id)), WithUnwrapped.class)).isEqualTo(source);
+	}
+
+	@Test // DATAMONGO-1902
+	void filterOnUnwrappedValue() {
+
+		WithUnwrapped source = new WithUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = new UnwrappableType();
+		source.embeddableValue.stringValue = "string-val";
+		source.embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		source.embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		template.save(source);
+
+		assertThat(template.findOne(
+				Query.query(where("embeddableValue.stringValue").is(source.embeddableValue.stringValue)), WithUnwrapped.class))
+						.isEqualTo(source);
+	}
+
+	@Test // DATAMONGO-1902
+	void readWritePrefixed() {
+
+		WithPrefixedUnwrapped source = new WithPrefixedUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = new UnwrappableType();
+		source.embeddableValue.stringValue = "string-val";
+		source.embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		source.embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		template.save(source);
+
+		assertThat(template.findOne(query(where("id").is(source.id)), WithPrefixedUnwrapped.class)).isEqualTo(source);
+	}
+
+	@Test // DATAMONGO-1902
+	void filterOnPrefixedUnwrappedValue() {
+
+		WithPrefixedUnwrapped source = new WithPrefixedUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = new UnwrappableType();
+		source.embeddableValue.stringValue = "string-val";
+		source.embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		source.embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		template.save(source);
+
+		assertThat(
+				template.findOne(Query.query(where("embeddableValue.stringValue").is(source.embeddableValue.stringValue)),
+						WithPrefixedUnwrapped.class)).isEqualTo(source);
+	}
+
+	static class WithUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable UnwrappableType embeddableValue;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithUnwrapped that = (WithUnwrapped) o;
+			return Objects.equals(id, that.id) && Objects.equals(embeddableValue, that.embeddableValue);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, embeddableValue);
+		}
+
+		public String toString() {
+			return "MongoTemplateUnwrappedTests.WithUnwrapped(id=" + this.id + ", embeddableValue=" + this.embeddableValue
+					+ ")";
+		}
+	}
+
+	static class WithPrefixedUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable("prefix-") UnwrappableType embeddableValue;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithPrefixedUnwrapped that = (WithPrefixedUnwrapped) o;
+			return Objects.equals(id, that.id) && Objects.equals(embeddableValue, that.embeddableValue);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, embeddableValue);
+		}
+
+		public String toString() {
+			return "MongoTemplateUnwrappedTests.WithPrefixedUnwrapped(id=" + this.id + ", embeddableValue="
+					+ this.embeddableValue + ")";
+		}
+	}
+
+	static class UnwrappableType {
+
+		String stringValue;
+		List<String> listValue;
+
+		@Field("with-at-field-annotation") //
+		String atFieldAnnotatedValue;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			UnwrappableType that = (UnwrappableType) o;
+			return Objects.equals(stringValue, that.stringValue) && Objects.equals(listValue, that.listValue)
+					&& Objects.equals(atFieldAnnotatedValue, that.atFieldAnnotatedValue);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(stringValue, listValue, atFieldAnnotatedValue);
+		}
+
+		public String toString() {
+			return "MongoTemplateUnwrappedTests.UnwrappableType(stringValue=" + this.stringValue + ", listValue="
+					+ this.listValue + ", atFieldAnnotatedValue=" + this.atFieldAnnotatedValue + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUpdateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUpdateTests.java
index 27e33eb788..4249506d77 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUpdateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateUpdateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,59 +15,61 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 
+import com.mongodb.client.result.UpdateResult;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
 import org.springframework.data.mongodb.core.aggregation.ArithmeticOperators;
 import org.springframework.data.mongodb.core.aggregation.ReplaceWithOperation;
 import org.springframework.data.mongodb.core.aggregation.SetOperation;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.BasicUpdate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
-import org.springframework.data.mongodb.test.util.MongoServerCondition;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
-import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 
 /**
  * @author Christoph Strobl
  */
-@ExtendWith(MongoServerCondition.class)
-@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
-public class MongoTemplateUpdateTests {
+@ExtendWith({ MongoTemplateExtension.class })
+class MongoTemplateUpdateTests {
 
-	static final String DB_NAME = "update-test";
-
-	MongoClient client;
-	MongoTemplate template;
+	@Template(initialEntitySet = { Score.class, Versioned.class, Book.class }) //
+	static MongoTestTemplate template;
 
 	@BeforeEach
 	void setUp() {
-
-		client = MongoTestUtils.client();
-		template = new MongoTemplate(new SimpleMongoClientDbFactory(client, DB_NAME));
-
-		MongoTestUtils.createOrReplaceCollection(DB_NAME, template.getCollectionName(Score.class), client);
-		MongoTestUtils.createOrReplaceCollection(DB_NAME, template.getCollectionName(Versioned.class), client);
-		MongoTestUtils.createOrReplaceCollection(DB_NAME, template.getCollectionName(Book.class), client);
+		template.flush();
 	}
 
 	@Test // DATAMONGO-2331
-	public void aggregateUpdateWithSet() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void aggregateUpdateWithSet() {
 
 		Score score1 = new Score(1, "Maya", Arrays.asList(10, 5, 10), Arrays.asList(10, 8), 0);
 		Score score2 = new Score(2, "Ryan", Arrays.asList(5, 6, 5), Arrays.asList(8, 8), 8);
@@ -91,7 +93,8 @@ public void aggregateUpdateWithSet() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void aggregateUpdateWithSetToValue() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void aggregateUpdateWithSetToValue() {
 
 		Book one = new Book();
 		one.id = 1;
@@ -108,7 +111,8 @@ public void aggregateUpdateWithSetToValue() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void versionedAggregateUpdateWithSet() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void versionedAggregateUpdateWithSet() {
 
 		Versioned source = template.insert(Versioned.class).one(new Versioned("id-1", "value-0"));
 
@@ -122,22 +126,24 @@ public void versionedAggregateUpdateWithSet() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void versionedAggregateUpdateTouchingVersionProperty() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void versionedAggregateUpdateTouchingVersionProperty() {
 
 		Versioned source = template.insert(Versioned.class).one(new Versioned("id-1", "value-0"));
 
 		AggregationUpdate update = AggregationUpdate.update()
-				.set(SetOperation.builder().set("value").toValue("changed").and().set("version").toValue(10L));
+			.set(SetOperation.builder().set("value").toValue("changed").and().set("version").toValue(10L));
 		template.update(Versioned.class).matching(Query.query(Criteria.where("id").is(source.id))).apply(update).first();
 
 		assertThat(
-				collection(Versioned.class).find(new org.bson.Document("_id", source.id)).limit(1).into(new ArrayList<>()))
-						.containsExactly(new org.bson.Document("_id", source.id).append("version", 10L).append("value", "changed")
-								.append("_class", "org.springframework.data.mongodb.core.MongoTemplateUpdateTests$Versioned"));
+			collection(Versioned.class).find(new org.bson.Document("_id", source.id)).limit(1).into(new ArrayList<>()))
+			.containsExactly(new org.bson.Document("_id", source.id).append("version", 10L).append("value", "changed")
+				.append("_class", "org.springframework.data.mongodb.core.MongoTemplateUpdateTests$Versioned"));
 	}
 
 	@Test // DATAMONGO-2331
-	public void aggregateUpdateWithUnset() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void aggregateUpdateWithUnset() {
 
 		Book antelopeAntics = new Book();
 		antelopeAntics.id = 1;
@@ -170,7 +176,8 @@ public void aggregateUpdateWithUnset() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void aggregateUpdateWithReplaceWith() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void aggregateUpdateWithReplaceWith() {
 
 		Book one = new Book();
 		one.id = 1;
@@ -193,7 +200,8 @@ public void aggregateUpdateWithReplaceWith() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void aggregateUpdateWithReplaceWithNewObject() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void aggregateUpdateWithReplaceWithNewObject() {
 
 		Book one = new Book();
 		one.id = 1;
@@ -216,7 +224,8 @@ public void aggregateUpdateWithReplaceWithNewObject() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void aggregationUpdateUpsertsCorrectly() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void aggregationUpdateUpsertsCorrectly() {
 
 		AggregationUpdate update = AggregationUpdate.update().set("title").toValue("The Burning White");
 
@@ -227,7 +236,8 @@ public void aggregationUpdateUpsertsCorrectly() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void aggregateUpdateFirstMatch() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void aggregateUpdateFirstMatch() {
 
 		Book one = new Book();
 		one.id = 1;
@@ -248,8 +258,8 @@ public void aggregateUpdateFirstMatch() {
 	}
 
 	@Test // DATAMONGO-2331
-	@Disabled("https://jira.mongodb.org/browse/JAVA-3432")
-	public void findAndModifyAppliesAggregationUpdateCorrectly() {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void findAndModifyAppliesAggregationUpdateCorrectly() {
 
 		Book one = new Book();
 		one.id = 1;
@@ -272,12 +282,86 @@ public void findAndModifyAppliesAggregationUpdateCorrectly() {
 
 	}
 
+	@Test // DATAMMONGO-2423
+	void nullValueShouldBePropagatedToDatabase() {
+
+		Book currentRead = new Book();
+		currentRead.id = 1;
+		currentRead.author = new Author("Brent", "Weeks");
+		currentRead.title = "The Burning White";
+
+		template.save(currentRead);
+
+		template.update(Book.class).apply(new Update().set("title", null)).first();
+
+		assertThat(collection(Book.class).find(new org.bson.Document("_id", currentRead.id)).first()).containsEntry("title",
+				null);
+	}
+
+	@ParameterizedTest // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	@MethodSource("sortedUpdateBookArgs")
+	void updateFirstWithSort(Class<?> domainType, Sort sort, UpdateDefinition update) {
+
+		Book one = new Book();
+		one.id = 1;
+		one.isbn = "001 001 300";
+		one.title = "News isn't fake";
+		one.author = new Author("John", "Backus");
+
+		Book two = new Book();
+		two.id = 2;
+		two.title = "love is love";
+		two.isbn = "001 001 100";
+		two.author = new Author("Grace", "Hopper");
+
+		template.insertAll(Arrays.asList(one, two));
+
+		UpdateResult result = template.update(domainType) //
+			.inCollection(template.getCollectionName(Book.class))//
+			.matching(new Query().with(sort)).apply(update) //
+			.first();
+
+		assertThat(result.getModifiedCount()).isOne();
+		assertThat(collection(Book.class).find(new org.bson.Document("_id", two.id)).first()).containsEntry("title",
+			"Science is real!");
+	}
+
+	@Test // GH-4918
+	void updateShouldHonorVersionProvided() {
+
+		Versioned source = template.insert(Versioned.class).one(new Versioned("id-1", "value-0"));
+
+		Update update = new BasicUpdate("{ '$set' : { 'value' : 'changed' }, '$inc' : { 'version' : 10 } }");
+		template.update(Versioned.class).matching(Query.query(Criteria.where("id").is(source.id))).apply(update).first();
+
+		assertThat(
+			collection(Versioned.class).find(new org.bson.Document("_id", source.id)).limit(1).into(new ArrayList<>()))
+			.containsExactly(new org.bson.Document("_id", source.id).append("version", 10L).append("value", "changed")
+				.append("_class", "org.springframework.data.mongodb.core.MongoTemplateUpdateTests$Versioned"));
+	}
+
 	private List<org.bson.Document> all(Class<?> type) {
 		return collection(type).find(new org.bson.Document()).into(new ArrayList<>());
 	}
 
 	private MongoCollection<org.bson.Document> collection(Class<?> type) {
-		return client.getDatabase(DB_NAME).getCollection(template.getCollectionName(type));
+		return template.getCollection(template.getCollectionName(type));
+	}
+
+	private static Stream<Arguments> sortedUpdateBookArgs() {
+
+		Update update = new Update().set("title", "Science is real!");
+		AggregationUpdate aggUpdate = AggregationUpdate.update().set("title").toValue("Science is real!");
+
+		return Stream.of( //
+				Arguments.of(Book.class, Sort.by(Direction.ASC, "isbn"), update), // typed, no field mapping
+				Arguments.of(Book.class, Sort.by(Direction.DESC, "author.lastname"), update), // typed, map `lastname`
+				Arguments.of(Book.class, Sort.by(Direction.DESC, "author.last"), update), // typed, raw field name
+				Arguments.of(Object.class, Sort.by(Direction.ASC, "isbn"), update), // untyped, requires raw field name
+				Arguments.of(Book.class, Sort.by(Direction.ASC, "isbn"), aggUpdate), // aggregation, no field mapping
+				Arguments.of(Book.class, Sort.by(Direction.DESC, "author.last"), aggUpdate) // aggregation, map `lastname`
+		);
 	}
 
 	@Document("scores")
@@ -318,6 +402,24 @@ static class Book {
 		String isbn;
 		Author author;
 		@Field("copies") Collection<Warehouse> stock;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Book book = (Book) o;
+			return Objects.equals(id, book.id) && Objects.equals(title, book.title) && Objects.equals(isbn, book.isbn)
+					&& Objects.equals(author, book.author) && Objects.equals(stock, book.stock);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, title, isbn, author, stock);
+		}
 	}
 
 	static class Author {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateValidationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateValidationTests.java
index 1983634d06..fd1b70f3c7 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateValidationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateValidationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,29 +19,28 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.validation.Validator.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
-import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
 import org.springframework.data.mongodb.core.CollectionOptions.ValidationOptions;
+import org.springframework.data.mongodb.core.mapping.Encrypted;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Criteria;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
-import org.springframework.lang.Nullable;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.model.ValidationAction;
@@ -49,25 +48,26 @@
 
 /**
  * Integration tests for {@link CollectionOptions#validation(ValidationOptions)} using
- * {@link org.springframework.data.mongodb.core.validation.CriteriaValidator} and
- * {@link org.springframework.data.mongodb.core.validation.DocumentValidator}.
+ * {@link org.springframework.data.mongodb.core.validation.CriteriaValidator},
+ * {@link org.springframework.data.mongodb.core.validation.DocumentValidator} and
+ * {@link org.springframework.data.mongodb.core.validation.JsonSchemaValidator}.
  *
  * @author Andreas Zink
  * @author Christoph Strobl
+ * @author Julia Lee
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 public class MongoTemplateValidationTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_2_0 = MongoVersionRule.atLeast(Version.parse("3.2.0"));
-
 	static final String COLLECTION_NAME = "validation-1";
+	static @Client MongoClient mongoClient;
 
 	@Configuration
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Override
@@ -79,11 +79,16 @@ protected String getDatabaseName() {
 		protected boolean autoIndexCreation() {
 			return false;
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired MongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		template.dropCollection(COLLECTION_NAME);
 	}
@@ -185,6 +190,20 @@ public void mapsDocumentValidatorFieldsCorrectly() {
 		assertThat(getValidatorInfo(COLLECTION_NAME)).isEqualTo(new Document("customName", new Document("$type", "bool")));
 	}
 
+	@Test // GH-4454
+	public void failsJsonSchemaValidationForEncryptedDomainEntityProperty() {
+
+		MongoJsonSchema schema = MongoJsonSchemaCreator.create().createSchemaFor(BeanWithEncryptedDomainEntity.class);
+		template.createCollection(COLLECTION_NAME, CollectionOptions.empty().schema(schema));
+
+		BeanWithEncryptedDomainEntity person = new BeanWithEncryptedDomainEntity();
+		person.encryptedDomainEntity = new SimpleBean("some string", 100, null);
+
+		assertThatExceptionOfType(DataIntegrityViolationException.class)
+			.isThrownBy(() -> template.save(person))
+			.withMessageContaining("Document failed validation");
+	}
+
 	private Document getCollectionOptions(String collectionName) {
 		return getCollectionInfo(collectionName).get("options", Document.class);
 	}
@@ -210,13 +229,68 @@ private Document getCollectionInfo(String collectionName) {
 		});
 	}
 
-	@Data
-	@AllArgsConstructor
 	@org.springframework.data.mongodb.core.mapping.Document(collection = COLLECTION_NAME)
 	static class SimpleBean {
 
 		private @Nullable String nonNullString;
 		private @Nullable Integer rangedInteger;
 		private @Field("customName") Object customFieldName;
+
+		public SimpleBean(@Nullable String nonNullString, @Nullable Integer rangedInteger, Object customFieldName) {
+			this.nonNullString = nonNullString;
+			this.rangedInteger = rangedInteger;
+			this.customFieldName = customFieldName;
+		}
+
+		public @Nullable String getNonNullString() {
+			return this.nonNullString;
+		}
+
+		public @Nullable Integer getRangedInteger() {
+			return this.rangedInteger;
+		}
+
+		public Object getCustomFieldName() {
+			return this.customFieldName;
+		}
+
+		public void setNonNullString(@Nullable String nonNullString) {
+			this.nonNullString = nonNullString;
+		}
+
+		public void setRangedInteger(@Nullable Integer rangedInteger) {
+			this.rangedInteger = rangedInteger;
+		}
+
+		public void setCustomFieldName(Object customFieldName) {
+			this.customFieldName = customFieldName;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			SimpleBean that = (SimpleBean) o;
+			return Objects.equals(nonNullString, that.nonNullString) && Objects.equals(rangedInteger, that.rangedInteger) && Objects.equals(customFieldName, that.customFieldName);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(nonNullString, rangedInteger, customFieldName);
+		}
+
+		public String toString() {
+			return "MongoTemplateValidationTests.SimpleBean(nonNullString=" + this.getNonNullString() + ", rangedInteger=" + this.getRangedInteger() + ", customFieldName=" + this.getCustomFieldName() + ")";
+		}
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(collection = COLLECTION_NAME)
+	@Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+	static class BeanWithEncryptedDomainEntity {
+		@Encrypted SimpleBean encryptedDomainEntity;
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateViewTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateViewTests.java
new file mode 100644
index 0000000000..15fe90a34a
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/MongoTemplateViewTests.java
@@ -0,0 +1,211 @@
+/*
+ * Copyright 2022-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.bson.Document;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.CollectionInfo;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoTestUtils;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Integration tests for Views.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoClientExtension.class)
+public class MongoTemplateViewTests {
+
+	static @Client MongoClient client;
+	static final String DB_NAME = "mongo-template-view-tests";
+
+	private MongoTemplate template;
+
+	Student alex = new Student(22001L, "Alex", 1, 4.0D);
+	Student bernie = new Student(21001L, "bernie", 2, 3.7D);
+	Student chris = new Student(20010L, "Chris", 3, 2.5D);
+	Student drew = new Student(22021L, "Drew", 1, 3.2D);
+	Student harley1 = new Student(17301L, "harley", 6, 3.1D);
+	Student farmer = new Student(21022L, "Farmer", 1, 2.2D);
+	Student george = new Student(20020L, "george", 3, 2.8D);
+	Student harley2 = new Student(18020, "Harley", 5, 2.8D);
+
+	List<Student> students = Arrays.asList(alex, bernie, chris, drew, harley1, farmer, george, harley2);
+
+	@BeforeEach
+	void beforeEach() {
+		template = new MongoTemplate(client, DB_NAME);
+	}
+
+	@AfterEach
+	void afterEach() {
+		client.getDatabase(DB_NAME).drop();
+	}
+
+	@Test // GH-2594
+	void createsViewFromPipeline() {
+
+		template.insertAll(students);
+
+		template.createView("firstYears", Student.class, match(where("year").is(1)));
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "firstYears");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getViewTarget()).isEqualTo("student");
+		assertThat(collectionInfo.getViewPipeline()).containsExactly(new Document("$match", new Document("year", 1)));
+	}
+
+	@Test // GH-2594
+	void mapsPipelineAgainstDomainObject() {
+
+		template.insertAll(students);
+
+		template.createView("fakeStudents", Student.class, match(where("studentID").gte("22")));
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "fakeStudents");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getViewPipeline())
+				.containsExactly(new Document("$match", new Document("sID", new Document("$gte", "22"))));
+	}
+
+	@Test // GH-2594
+	void takesPipelineAsIsIfNoTypeDefined() {
+
+		template.insertAll(students);
+
+		template.createView("fakeStudents", "student", AggregationPipeline.of(match(where("studentID").gte("22"))),
+				ViewOptions.none());
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "fakeStudents");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getViewPipeline())
+				.containsExactly(new Document("$match", new Document("studentID", new Document("$gte", "22"))));
+	}
+
+	@Test // GH-2594
+	void readsFromView() {
+
+		template.insertAll(students);
+		client.getDatabase(DB_NAME).createView("firstYears", "student",
+				Arrays.asList(new Document("$match", new Document("year", 1))));
+
+		assertThat(template.query(Student.class).inCollection("firstYears").all()).containsExactlyInAnyOrder(alex, drew,
+				farmer);
+	}
+
+	@Test // GH-2594
+	void appliesCollationToView() {
+
+		template.insertAll(students);
+
+		template.createView("firstYears", Student.class, AggregationPipeline.of(match(where("year").is(1))),
+				new ViewOptions().collation(Collation.of("en_US")));
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "firstYears");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getCollation().getLocale()).isEqualTo("en_US");
+	}
+
+	private static class Student {
+
+		@Field("sID") Long studentID;
+
+		int year;
+
+		double score;
+
+		String name;
+
+		public Student(long studentID, String name, int year, double score) {
+			this.studentID = studentID;
+			this.name = name;
+			this.year = year;
+			this.score = score;
+		}
+
+		public Long getStudentID() {
+			return this.studentID;
+		}
+
+		public int getYear() {
+			return this.year;
+		}
+
+		public double getScore() {
+			return this.score;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setStudentID(Long studentID) {
+			this.studentID = studentID;
+		}
+
+		public void setYear(int year) {
+			this.year = year;
+		}
+
+		public void setScore(double score) {
+			this.score = score;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Student student = (Student) o;
+			return year == student.year && Double.compare(student.score, score) == 0
+					&& Objects.equals(studentID, student.studentID) && Objects.equals(name, student.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(studentID, year, score, name);
+		}
+
+		public String toString() {
+			return "MongoTemplateViewTests.Student(studentID=" + this.getStudentID() + ", year=" + this.getYear() + ", score="
+					+ this.getScore() + ", name=" + this.getName() + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/NoExplicitIdTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/NoExplicitIdTests.java
index 5e74309c05..8604fd960d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/NoExplicitIdTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/NoExplicitIdTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,20 +19,25 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
+import java.util.Collections;
 import java.util.Map;
 import java.util.Optional;
+import java.util.Set;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 
@@ -42,12 +47,14 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
 public class NoExplicitIdTests {
 
+	static @Client MongoClient mongoClient;
+
 	@Configuration
-	@EnableMongoRepositories(considerNestedRepositories = true)
+	@EnableMongoRepositories(considerNestedRepositories = true, includeFilters=@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = TypeWithoutExplicitIdPropertyRepository.class))
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Override
@@ -57,19 +64,24 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Override
 		protected boolean autoIndexCreation() {
 			return false;
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired MongoOperations mongoOps;
 	@Autowired TypeWithoutExplicitIdPropertyRepository repo;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		mongoOps.dropCollection(TypeWithoutIdProperty.class);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java
index 8cabf50871..7b07cd9448 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.springframework.data.mongodb.core;
 
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 
 public class Person {
 
@@ -89,13 +90,8 @@ public boolean isActive() {
 		return active;
 	}
 
-	/*
-	  * (non-Javadoc)
-	  *
-	  * @see java.lang.Object#equals(java.lang.Object)
-	  */
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 		if (obj == this) {
 			return true;
 		}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExample.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExample.java
index 4290d75f64..cacd564056 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExample.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExample.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2025 the original author 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,9 @@
 
 import java.util.List;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.support.AbstractApplicationContext;
@@ -29,12 +30,13 @@
  */
 public class PersonExample {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(PersonExample.class);
+	private static final Log LOGGER = LogFactory.getLog(PersonExample.class);
 
 	@Autowired private MongoOperations mongoOps;
 
 	public static void main(String[] args) {
-		AbstractApplicationContext applicationContext = new AnnotationConfigApplicationContext(PersonExampleAppConfig.class);
+		AbstractApplicationContext applicationContext = new AnnotationConfigApplicationContext(
+				PersonExampleAppConfig.class);
 		PersonExample example = applicationContext.getBean(PersonExample.class);
 		example.doWork();
 		applicationContext.close();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExampleAppConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExampleAppConfig.java
index c5cbb7beab..31afdb91b6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExampleAppConfig.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonExampleAppConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithAList.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithAList.java
index dbf32eca24..cb347aa3e7 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithAList.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithAList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveInt.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveInt.java
index 2cd233e6a8..dd397643ec 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveInt.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveInt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveLong.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveLong.java
index be0a7e4400..0cc26b2419 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveLong.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfPrimitiveLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeBigInteger.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeBigInteger.java
index 0a56f5baa5..36c8ea56ed 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeBigInteger.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeBigInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeInteger.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeInteger.java
index c071200681..bfdb86b9af 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeInteger.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeLong.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeLong.java
index ae3ef0e727..f8eb961f27 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeLong.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeObjectId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeObjectId.java
index cbc136ae4d..47caf5db27 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeObjectId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeObjectId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeString.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeString.java
index f2658c6f51..fa5bb5d8ea 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeString.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeUUID.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeUUID.java
index bb6e9c28d0..f9db1e4d04 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeUUID.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithIdPropertyOfTypeUUID.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,58 @@
  */
 package org.springframework.data.mongodb.core;
 
-import lombok.Data;
-
+import java.util.Objects;
 import java.util.UUID;
 
-@Data
 public class PersonWithIdPropertyOfTypeUUID {
 
 	private UUID id;
 	private String firstName;
 	private int age;
+
+	public UUID getId() {
+		return this.id;
+	}
+
+	public String getFirstName() {
+		return this.firstName;
+	}
+
+	public int getAge() {
+		return this.age;
+	}
+
+	public void setId(UUID id) {
+		this.id = id;
+	}
+
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		PersonWithIdPropertyOfTypeUUID that = (PersonWithIdPropertyOfTypeUUID) o;
+		return age == that.age && Objects.equals(id, that.id) && Objects.equals(firstName, that.firstName);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, firstName, age);
+	}
+
+	public String toString() {
+		return "PersonWithIdPropertyOfTypeUUID(id=" + this.getId() + ", firstName=" + this.getFirstName() + ", age="
+				+ this.getAge() + ")";
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeInteger.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeInteger.java
index f1933d7552..132f0830d4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeInteger.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeInteger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@ public class PersonWithVersionPropertyOfTypeInteger {
 	String firstName;
 	int age;
 
-	@Version
-	Integer version;
+	@Version Integer version;
 
 	@Override
 	public String toString() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeLong.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeLong.java
index 08f2a916f8..41ef862dd0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeLong.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWithVersionPropertyOfTypeLong.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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 @@ public class PersonWithVersionPropertyOfTypeLong {
 
 	@Override
 	public String toString() {
-		return "PersonWithVersionPropertyOfTypeLong [id=" + id + ", firstName=" + firstName + ", age=" + age
-				+ ", version=" + version + "]";
+		return "PersonWithVersionPropertyOfTypeLong [id=" + id + ", firstName=" + firstName + ", age=" + age + ", version="
+				+ version + "]";
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeObjectId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeObjectId.java
index 095a7758be..8f2ca7d9ff 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeObjectId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeObjectId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeString.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeString.java
index e5a012775a..43bfe53dc0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeString.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWith_idPropertyOfTypeString.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWriteConverter.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWriteConverter.java
index 5a8f691048..5017a6947e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWriteConverter.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/PersonWriteConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Portfolio.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Portfolio.java
index e739b64385..22ba43f9be 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Portfolio.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Portfolio.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryByExampleTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryByExampleTests.java
index 6155340002..52ee79aa1f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryByExampleTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryByExampleTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,13 +17,12 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import lombok.EqualsAndHashCode;
-import lombok.ToString;
-
 import java.util.List;
+import java.util.Objects;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
@@ -32,7 +31,9 @@
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.UntypedExampleMatcher;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 /**
  * Integration tests for Query-by-example.
@@ -41,16 +42,18 @@
  * @author Mark Paluch
  * @author Oliver Gierke
  */
+@ExtendWith(MongoTemplateExtension.class)
 public class QueryByExampleTests {
 
-	MongoOperations operations;
+	@Template(initialEntitySet = Person.class) //
+	static MongoTestTemplate operations;
+
 	Person p1, p2, p3;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		operations = new MongoTemplate(MongoTestUtils.client(), "query-by-example");
-		operations.remove(new Query(), Person.class);
+		operations.flush();
 
 		p1 = new Person();
 		p1.firstname = "bran";
@@ -134,16 +137,14 @@ public void findByExampleShouldReturnEverythingWhenSampleIsEmpty() {
 		assertThat(result).containsExactlyInAnyOrder(p1, p2, p3);
 	}
 
-	@Test // DATAMONGO-1245
+	@Test // DATAMONGO-1245, GH-3544
 	public void findByExampleWithCriteria() {
 
 		Person sample = new Person();
 		sample.lastname = "stark";
 
-		Query query = new Query(new Criteria().alike(Example.of(sample)).and("firstname").regex("^ary*"));
-
-		List<Person> result = operations.find(query, Person.class);
-		assertThat(result).hasSize(1);
+		Query query = new Query(new Criteria().alike(Example.of(sample)).and("firstname").regex(".*n.*"));
+		assertThat(operations.find(query, Person.class)).containsExactly(p1);
 	}
 
 	@Test // DATAMONGO-1459
@@ -218,29 +219,90 @@ public void alikeShouldWorkOnNestedProperties() {
 	}
 
 	@Document("dramatis-personae")
-	@EqualsAndHashCode
-	@ToString
 	static class Person {
 
 		@Id String id;
 		String firstname, middlename;
 		@Field("last_name") String lastname;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname)
+					&& Objects.equals(middlename, person.middlename) && Objects.equals(lastname, person.lastname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, middlename, lastname);
+		}
+
+		public String toString() {
+			return "QueryByExampleTests.Person(id=" + this.id + ", firstname=" + this.firstname + ", middlename="
+					+ this.middlename + ", lastname=" + this.lastname + ")";
+		}
 	}
 
-	@EqualsAndHashCode
-	@ToString
 	static class NotAPersonButStillMatchingFields {
 
 		String firstname, middlename;
 		@Field("last_name") String lastname;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			NotAPersonButStillMatchingFields that = (NotAPersonButStillMatchingFields) o;
+			return Objects.equals(firstname, that.firstname) && Objects.equals(middlename, that.middlename)
+					&& Objects.equals(lastname, that.lastname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(firstname, middlename, lastname);
+		}
+
+		public String toString() {
+			return "QueryByExampleTests.NotAPersonButStillMatchingFields(firstname=" + this.firstname + ", middlename="
+					+ this.middlename + ", lastname=" + this.lastname + ")";
+		}
 	}
 
 	@Document("dramatis-personae")
-	@EqualsAndHashCode
-	@ToString
 	static class PersonWrapper {
 
 		@Id String id;
 		Person child;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			PersonWrapper that = (PersonWrapper) o;
+			return Objects.equals(id, that.id) && Objects.equals(child, that.child);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, child);
+		}
+
+		public String toString() {
+			return "QueryByExampleTests.PersonWrapper(id=" + this.id + ", child=" + this.child + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryCursorPreparerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryCursorPreparerUnitTests.java
index 5a5a8d6271..8c1ef8348b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryCursorPreparerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryCursorPreparerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,21 +19,21 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import java.util.concurrent.TimeUnit;
-
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoTemplate.QueryCursorPreparer;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.data.mongodb.core.query.Meta;
 import org.springframework.data.mongodb.core.query.Query;
 
+import com.mongodb.MongoClientSettings;
 import com.mongodb.client.FindIterable;
 
 /**
@@ -42,30 +42,32 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Anton Barkan
  */
-@RunWith(MockitoJUnitRunner.class)
-public class QueryCursorPreparerUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class QueryCursorPreparerUnitTests {
 
-	@Mock MongoDbFactory factory;
+	@Mock MongoDatabaseFactory factory;
 	@Mock MongoExceptionTranslator exceptionTranslatorMock;
 	@Mock FindIterable<Document> cursor;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslatorMock);
+		when(factory.getCodecRegistry()).thenReturn(MongoClientSettings.getDefaultCodecRegistry());
 		when(cursor.batchSize(anyInt())).thenReturn(cursor);
 		when(cursor.comment(anyString())).thenReturn(cursor);
+		when(cursor.allowDiskUse(anyBoolean())).thenReturn(cursor);
 		when(cursor.maxTime(anyLong(), any())).thenReturn(cursor);
-		when(cursor.maxScan(anyLong())).thenReturn(cursor);
 		when(cursor.hint(any())).thenReturn(cursor);
-		when(cursor.snapshot(anyBoolean())).thenReturn(cursor);
 		when(cursor.noCursorTimeout(anyBoolean())).thenReturn(cursor);
 		when(cursor.collation(any())).thenReturn(cursor);
 	}
 
 	@Test // DATAMONGO-185
-	public void appliesHintsCorrectly() {
+	void appliesHintsCorrectly() {
 
 		Query query = query(where("foo").is("bar")).withHint("{ age: 1 }");
 		prepare(query);
@@ -73,46 +75,26 @@ public void appliesHintsCorrectly() {
 		verify(cursor).hint(new Document("age", 1));
 	}
 
-	@Test // DATAMONGO-2319
-	public void appliesDocumentHintsCorrectly() {
-
-		Query query = query(where("foo").is("bar")).withHint(Document.parse("{ age: 1 }"));
-		prepare(query);
-
-		verify(cursor).hint(new Document("age", 1));
-	}
-
-	@Test // DATAMONGO-957
-	public void doesNotApplyMetaWhenEmpty() {
-
-		Query query = query(where("foo").is("bar"));
-		query.setMeta(new Meta());
-
-		prepare(query);
-
-		verify(cursor, never()).modifiers(any(Document.class));
-	}
-
-	@Test // DATAMONGO-957
-	public void appliesMaxScanCorrectly() {
+	@Test // DATAMONGO-2365
+	void appliesIndexNameAsHintCorrectly() {
 
-		Query query = query(where("foo").is("bar")).maxScan(100);
+		Query query = query(where("foo").is("bar")).withHint("idx-1");
 		prepare(query);
 
-		verify(cursor).maxScan(100);
+		verify(cursor).hintString("idx-1");
 	}
 
-	@Test // DATAMONGO-957
-	public void appliesMaxTimeCorrectly() {
+	@Test // DATAMONGO-2319
+	void appliesDocumentHintsCorrectly() {
 
-		Query query = query(where("foo").is("bar")).maxTime(1, TimeUnit.SECONDS);
+		Query query = query(where("foo").is("bar")).withHint(Document.parse("{ age: 1 }"));
 		prepare(query);
 
-		verify(cursor).maxTime(1000, TimeUnit.MILLISECONDS);
+		verify(cursor).hint(new Document("age", 1));
 	}
 
 	@Test // DATAMONGO-957
-	public void appliesCommentCorrectly() {
+	void appliesCommentCorrectly() {
 
 		Query query = query(where("foo").is("bar")).comment("spring data");
 		prepare(query);
@@ -120,17 +102,17 @@ public void appliesCommentCorrectly() {
 		verify(cursor).comment("spring data");
 	}
 
-	@Test // DATAMONGO-957
-	public void appliesSnapshotCorrectly() {
+	@Test // DATAMONGO-2659
+	void appliesAllowDiskUseCorrectly() {
 
-		Query query = query(where("foo").is("bar")).useSnapshot();
+		Query query = query(where("foo").is("bar")).allowDiskUse(true);
 		prepare(query);
 
-		verify(cursor).snapshot(true);
+		verify(cursor).allowDiskUse(true);
 	}
 
 	@Test // DATAMONGO-1480
-	public void appliesNoCursorTimeoutCorrectly() {
+	void appliesNoCursorTimeoutCorrectly() {
 
 		Query query = query(where("foo").is("bar")).noCursorTimeout();
 
@@ -140,7 +122,7 @@ public void appliesNoCursorTimeoutCorrectly() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void appliesCollationCorrectly() {
+	void appliesCollationCorrectly() {
 
 		prepare(new BasicQuery("{}").collation(Collation.of("fr")));
 
@@ -148,7 +130,7 @@ public void appliesCollationCorrectly() {
 	}
 
 	@Test // DATAMONGO-1311
-	public void appliesBatchSizeCorrectly() {
+	void appliesBatchSizeCorrectly() {
 
 		prepare(new BasicQuery("{}").cursorBatchSize(100));
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryOperationsUnitTests.java
new file mode 100644
index 0000000000..4e103c17be
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryOperationsUnitTests.java
@@ -0,0 +1,229 @@
+/*
+ * Copyright 2021-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.QueryOperations.AggregationDefinition;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
+import org.springframework.data.mongodb.core.aggregation.FieldLookupPolicy;
+import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.MongoId;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.test.util.ReflectionTestUtils;
+
+/**
+ * Unit tests for {@link QueryOperations}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+class QueryOperationsUnitTests {
+
+	static final AggregationOptions NO_MAPPING = AggregationOptions.builder().noMapping().build();
+	static final AggregationOptions STRICT_MAPPING = AggregationOptions.builder().strictMapping().build();
+
+	@Mock QueryMapper queryMapper;
+	@Mock UpdateMapper updateMapper;
+	@Mock EntityOperations entityOperations;
+	@Mock PropertyOperations propertyOperations;
+	@Mock MongoDatabaseFactory mongoDbFactory;
+	@Mock MongoMappingContext mappingContext;
+
+	QueryOperations queryOperations;
+
+	@BeforeEach
+	void beforeEach() {
+
+		when(queryMapper.getMappingContext()).thenReturn((MappingContext) mappingContext);
+
+		queryOperations = new QueryOperations(queryMapper, updateMapper, entityOperations, propertyOperations,
+				mongoDbFactory);
+	}
+
+	@Test // GH-3542
+	void createAggregationContextUsesRelaxedOneForUntypedAggregationsWhenNoInputTypeProvided() {
+
+		Aggregation aggregation = Aggregation.newAggregation(Aggregation.project("name"));
+		AggregationDefinition def = queryOperations.createAggregation(aggregation, (Class<?>) null);
+		TypeBasedAggregationOperationContext ctx = (TypeBasedAggregationOperationContext) def
+				.getAggregationOperationContext();
+
+		assertThat(ReflectionTestUtils.getField(ctx, "lookupPolicy")).isEqualTo(FieldLookupPolicy.relaxed());
+	}
+
+	@Test // GH-3542
+	void createAggregationContextUsesRelaxedOneForTypedAggregationsWhenNoInputTypeProvided() {
+
+		Aggregation aggregation = Aggregation.newAggregation(Person.class, Aggregation.project("name"));
+		AggregationDefinition def = queryOperations.createAggregation(aggregation, Person.class);
+		TypeBasedAggregationOperationContext ctx = (TypeBasedAggregationOperationContext) def
+				.getAggregationOperationContext();
+
+		assertThat(ReflectionTestUtils.getField(ctx, "lookupPolicy")).isEqualTo(FieldLookupPolicy.relaxed());
+	}
+
+	@Test // GH-3542
+	void createAggregationContextUsesRelaxedOneForUntypedAggregationsWhenInputTypeProvided() {
+
+		Aggregation aggregation = Aggregation.newAggregation(Aggregation.project("name"));
+		AggregationDefinition def = queryOperations.createAggregation(aggregation, Person.class);
+		TypeBasedAggregationOperationContext ctx = (TypeBasedAggregationOperationContext) def
+				.getAggregationOperationContext();
+
+		assertThat(ReflectionTestUtils.getField(ctx, "lookupPolicy")).isEqualTo(FieldLookupPolicy.relaxed());
+	}
+
+	@Test // GH-3542
+	void createAggregationContextUsesDefaultIfNoMappingDesired() {
+
+		Aggregation aggregation = Aggregation.newAggregation(Aggregation.project("name")).withOptions(NO_MAPPING);
+		AggregationDefinition ctx = queryOperations.createAggregation(aggregation, Person.class);
+
+		assertThat(ctx.getAggregationOperationContext()).isEqualTo(Aggregation.DEFAULT_CONTEXT);
+	}
+
+	@Test // GH-3542
+	void createAggregationContextUsesStrictlyTypedContextForTypedAggregationsWhenRequested() {
+
+		Aggregation aggregation = Aggregation.newAggregation(Person.class, Aggregation.project("name"))
+				.withOptions(STRICT_MAPPING);
+		AggregationDefinition ctx = queryOperations.createAggregation(aggregation, (Class<?>) null);
+
+		assertThat(ctx.getAggregationOperationContext()).isInstanceOf(TypeBasedAggregationOperationContext.class);
+	}
+
+	@Test // GH-4026
+	void insertContextDoesNotAddIdIfNoPersistentEntityCanBeFound() {
+
+		assertThat(queryOperations.createInsertContext(new Document("value", "one")).prepareId(Person.class).getDocument())//
+				.satisfies(result -> {
+					assertThat(result).isEqualTo(new Document("value", "one"));
+				});
+	}
+
+	@Test // GH-4026
+	void insertContextDoesNotAddIdIfNoIdPropertyCanBeFound() {
+
+		MongoPersistentEntity<Person> entity = mock(MongoPersistentEntity.class);
+		when(entity.getIdProperty()).thenReturn(null);
+		when(mappingContext.getPersistentEntity(eq(Person.class))).thenReturn((MongoPersistentEntity) entity);
+
+		assertThat(queryOperations.createInsertContext(new Document("value", "one")).prepareId(Person.class).getDocument())//
+				.satisfies(result -> {
+					assertThat(result).isEqualTo(new Document("value", "one"));
+				});
+	}
+
+	@Test // GH-4026
+	void insertContextDoesNotAddConvertedIdForNonExplicitFieldTypes() {
+
+		MongoPersistentEntity<Person> entity = mock(MongoPersistentEntity.class);
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
+		when(entity.getIdProperty()).thenReturn(property);
+		when(property.hasExplicitWriteTarget()).thenReturn(false);
+		doReturn(entity).when(mappingContext).getPersistentEntity(eq(Person.class));
+
+		assertThat(queryOperations.createInsertContext(new Document("value", "one")).prepareId(Person.class).getDocument())//
+				.satisfies(result -> {
+					assertThat(result).isEqualTo(new Document("value", "one"));
+				});
+	}
+
+	@Test // GH-4026
+	void insertContextAddsConvertedIdForExplicitFieldTypes() {
+
+		MongoPersistentEntity<Person> entity = mock(MongoPersistentEntity.class);
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
+		when(entity.getIdProperty()).thenReturn(property);
+		when(property.hasExplicitWriteTarget()).thenReturn(true);
+		doReturn(String.class).when(property).getFieldType();
+		doReturn(entity).when(mappingContext).getPersistentEntity(eq(Person.class));
+
+		when(queryMapper.convertId(any(), eq(String.class))).thenReturn("&#9774;");
+
+		assertThat(queryOperations.createInsertContext(new Document("value", "one")).prepareId(Person.class).getDocument())//
+				.satisfies(result -> {
+					assertThat(result).isEqualTo(new Document("value", "one").append("_id", "&#9774;"));
+				});
+	}
+
+	@Test // GH-4026
+	void insertContextAddsConvertedIdForMongoIdTypes() {
+
+		MongoPersistentEntity<Person> entity = mock(MongoPersistentEntity.class);
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
+		when(entity.getIdProperty()).thenReturn(property);
+		when(property.hasExplicitWriteTarget()).thenReturn(false);
+		when(property.isAnnotationPresent(eq(MongoId.class))).thenReturn(true);
+		doReturn(String.class).when(property).getFieldType();
+		doReturn(entity).when(mappingContext).getPersistentEntity(eq(Person.class));
+
+		when(queryMapper.convertId(any(), eq(String.class))).thenReturn("&#9774;");
+
+		assertThat(queryOperations.createInsertContext(new Document("value", "one")).prepareId(Person.class).getDocument())//
+				.satisfies(result -> {
+					assertThat(result).isEqualTo(new Document("value", "one").append("_id", "&#9774;"));
+				});
+	}
+
+	@Test // GH-4026
+	void insertContextDoesNotAddConvertedIdForMongoIdTypesTargetingObjectId() {
+
+		MongoPersistentEntity<Person> entity = mock(MongoPersistentEntity.class);
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
+		when(entity.getIdProperty()).thenReturn(property);
+		when(property.hasExplicitWriteTarget()).thenReturn(false);
+		when(property.isAnnotationPresent(eq(MongoId.class))).thenReturn(true);
+		doReturn(ObjectId.class).when(property).getFieldType();
+		doReturn(entity).when(mappingContext).getPersistentEntity(eq(Person.class));
+
+		assertThat(queryOperations.createInsertContext(new Document("value", "one")).prepareId(Person.class).getDocument())//
+				.satisfies(result -> {
+					assertThat(result).isEqualTo(new Document("value", "one"));
+				});
+	}
+
+	@Test // GH-4184
+	void insertContextDoesNotOverrideExistingId() {
+
+		assertThat(queryOperations.createInsertContext(new Document("_id", "abc")).prepareId(Person.class).getDocument())//
+				.satisfies(result -> {
+					assertThat(result).isEqualTo(new Document("_id", "abc"));
+				});
+	}
+
+	static class Person {
+
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryResultConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryResultConverterUnitTests.java
new file mode 100644
index 0000000000..107b942161
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/QueryResultConverterUnitTests.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright 2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.data.mongodb.core.QueryResultConverter.ConversionResultSupplier;
+
+/**
+ * Unit tests for {@link QueryResultConverter}.
+ *
+ * @author Christoph Strobl
+ */
+class QueryResultConverterUnitTests {
+
+	public static final ConversionResultSupplier<Document> ERROR_SUPPLIER = () -> {
+		throw new IllegalStateException("must not read conversion result");
+	};
+
+	@Test // GH-4949
+	void converterDoesNotEagerlyRetrieveConversionResultFromSupplier() {
+
+		QueryResultConverter<Document, String> converter = new QueryResultConverter<Document, String>() {
+
+			@Override
+			public String mapDocument(Document document, ConversionResultSupplier<Document> reader) {
+				return "done";
+			}
+		};
+
+		assertThat(converter.mapDocument(new Document(), ERROR_SUPPLIER)).isEqualTo("done");
+	}
+
+	@Test // GH-4949
+	void converterPassesOnConversionResultToNextStage() {
+
+		Document source = new Document("value", "10");
+
+		QueryResultConverter<Document, Integer> stagedConverter = new QueryResultConverter<Document, String>() {
+
+			@Override
+			public String mapDocument(Document document, ConversionResultSupplier<Document> reader) {
+				return document.get("value", "-1");
+			}
+		}.andThen(new QueryResultConverter<String, Integer>() {
+
+			@Override
+			public Integer mapDocument(Document document, ConversionResultSupplier<String> reader) {
+
+				assertThat(document).isEqualTo(source);
+				return Integer.valueOf(reader.get());
+			}
+		});
+
+		assertThat(stagedConverter.mapDocument(source, ERROR_SUPPLIER)).isEqualTo(10);
+	}
+
+	@Test // GH-4949
+	void entityConverterDelaysConversion() {
+
+		Document source = new Document("value", "10");
+
+		QueryResultConverter<Document, Integer> converter = QueryResultConverter.<Document> entity()
+				.andThen(new QueryResultConverter<Document, Integer>() {
+
+					@Override
+					public Integer mapDocument(Document document, ConversionResultSupplier<Document> reader) {
+
+						assertThat(document).isEqualTo(source);
+						return Integer.valueOf(document.get("value", "20"));
+					}
+				});
+
+		assertThat(converter.mapDocument(source, ERROR_SUPPLIER)).isEqualTo(10);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupportUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupportUnitTests.java
index 37979a30d0..83e1b3c272 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupportUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveAggregationOperationSupportUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,12 @@
 import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 
@@ -34,50 +34,51 @@
  *
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReactiveAggregationOperationSupportUnitTests {
 
 	@Mock ReactiveMongoTemplate template;
-	ReactiveAggregationOperationSupport opSupport;
+	private ReactiveAggregationOperationSupport opSupport;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		opSupport = new ReactiveAggregationOperationSupport(template);
 	}
 
 	@Test // DATAMONGO-1719
-	public void throwsExceptionOnNullDomainType() {
+	void throwsExceptionOnNullDomainType() {
 		assertThatIllegalArgumentException().isThrownBy(() -> opSupport.aggregateAndReturn(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void throwsExceptionOnNullCollectionWhenUsed() {
+	void throwsExceptionOnNullCollectionWhenUsed() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> opSupport.aggregateAndReturn(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void throwsExceptionOnEmptyCollectionWhenUsed() {
+	void throwsExceptionOnEmptyCollectionWhenUsed() {
 		assertThatIllegalArgumentException().isThrownBy(() -> opSupport.aggregateAndReturn(Person.class).inCollection(""));
 	}
 
 	@Test // DATAMONGO-1719
-	public void throwsExceptionOnNullAggregation() {
+	void throwsExceptionOnNullAggregation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> opSupport.aggregateAndReturn(Person.class).by(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void aggregateWithUntypedAggregationAndExplicitCollection() {
+	void aggregateWithUntypedAggregationAndExplicitCollection() {
 
 		opSupport.aggregateAndReturn(Person.class).inCollection("star-wars").by(newAggregation(project("foo"))).all();
 
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
-		verify(template).aggregate(any(Aggregation.class), eq("star-wars"), captor.capture());
+		verify(template).doAggregate(any(Aggregation.class), eq("star-wars"), captor.capture(), any(Class.class),
+				eq(QueryResultConverter.entity()));
 		assertThat(captor.getValue()).isEqualTo(Person.class);
 	}
 
 	@Test // DATAMONGO-1719
-	public void aggregateWithUntypedAggregation() {
+	void aggregateWithUntypedAggregation() {
 
 		when(template.getCollectionName(any(Class.class))).thenReturn("person");
 
@@ -86,13 +87,14 @@ public void aggregateWithUntypedAggregation() {
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
 
 		verify(template).getCollectionName(captor.capture());
-		verify(template).aggregate(any(Aggregation.class), eq("person"), captor.capture());
+		verify(template).doAggregate(any(Aggregation.class), eq("person"), captor.capture(), any(Class.class),
+				eq(QueryResultConverter.entity()));
 
 		assertThat(captor.getAllValues()).containsExactly(Person.class, Person.class);
 	}
 
 	@Test // DATAMONGO-1719
-	public void aggregateWithTypeAggregation() {
+	void aggregateWithTypeAggregation() {
 
 		when(template.getCollectionName(any(Class.class))).thenReturn("person");
 
@@ -101,7 +103,8 @@ public void aggregateWithTypeAggregation() {
 		ArgumentCaptor<Class> captor = ArgumentCaptor.forClass(Class.class);
 
 		verify(template).getCollectionName(captor.capture());
-		verify(template).aggregate(any(Aggregation.class), eq("person"), captor.capture());
+		verify(template).doAggregate(any(Aggregation.class), eq("person"), captor.capture(), any(Class.class),
+				eq(QueryResultConverter.entity()));
 
 		assertThat(captor.getAllValues()).containsExactly(Person.class, Jedi.class);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportTests.java
index fd1590203d..23d1d03b43 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
-import lombok.SneakyThrows;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
@@ -29,13 +28,16 @@
 import java.util.stream.Collectors;
 
 import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
+import org.springframework.data.mongodb.test.util.ReplSetClient;
 
 import com.mongodb.reactivestreams.client.MongoClient;
 
@@ -45,31 +47,30 @@
  * @author Christoph Strobl
  * @currentRead Dawn Cook - The Decoy Princess
  */
+@ExtendWith(MongoClientExtension.class)
+@EnableIfReplicaSetAvailable
 public class ReactiveChangeStreamOperationSupportTests {
 
-	public static @ClassRule ReplicaSet REPL_SET_REQUIRED = ReplicaSet.required();
 	static final String DATABASE_NAME = "rx-change-stream";
+	static @ReplSetClient MongoClient mongoClient;
 
-	MongoClient client;
 	ReactiveMongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		client = MongoTestUtils.reactiveReplSetClient();
-		template = new ReactiveMongoTemplate(client, DATABASE_NAME);
+		template = new ReactiveMongoTemplate(mongoClient, DATABASE_NAME);
 
-		MongoTestUtils.createOrReplaceCollectionNow(DATABASE_NAME, "person", client);
+		MongoTestUtils.createOrReplaceCollectionNow(DATABASE_NAME, "person", mongoClient);
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
-		MongoTestUtils.dropCollectionNow(DATABASE_NAME, "person", client);
+		MongoTestUtils.dropCollectionNow(DATABASE_NAME, "person", mongoClient);
 	}
 
-	@SneakyThrows
 	@Test // DATAMONGO-2089
-	public void changeStreamEventsShouldBeEmittedCorrectly() {
+	public void changeStreamEventsShouldBeEmittedCorrectly() throws InterruptedException {
 
 		BlockingQueue<ChangeStreamEvent<Document>> documents = new LinkedBlockingQueue<>(100);
 
@@ -102,6 +103,7 @@ public void changeStreamEventsShouldBeEmittedCorrectly() {
 	}
 
 	@Test // DATAMONGO-1803
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 	public void changeStreamEventsShouldBeConvertedCorrectly() throws InterruptedException {
 
 		BlockingQueue<ChangeStreamEvent<Person>> documents = new LinkedBlockingQueue<>(100);
@@ -125,8 +127,8 @@ public void changeStreamEventsShouldBeConvertedCorrectly() throws InterruptedExc
 		Thread.sleep(500); // just give it some time to link receive all events
 
 		try {
-			assertThat(documents.stream().map(ChangeStreamEvent::getBody).collect(Collectors.toList()))
-					.containsOnly(person1, person2, person3);
+			assertThat(documents.stream().map(ChangeStreamEvent::getBody).collect(Collectors.toList())).containsOnly(person1,
+					person2, person3);
 		} finally {
 			disposable.dispose();
 		}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportUnitTests.java
index 0340a1ceb1..46838d6da9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationSupportUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,8 +18,6 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.isNull;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
 import reactor.core.publisher.Flux;
@@ -30,12 +28,12 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.aggregation.TypedAggregation;
@@ -47,20 +45,20 @@
  * @author Christoph Strobl
  * @currentRead Dawn Cook - The Decoy Princess
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ReactiveChangeStreamOperationSupportUnitTests {
+@ExtendWith(MockitoExtension.class)
+class ReactiveChangeStreamOperationSupportUnitTests {
 
 	@Mock ReactiveMongoTemplate template;
-	ReactiveChangeStreamOperationSupport changeStreamSupport;
+	private ReactiveChangeStreamOperationSupport changeStreamSupport;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		when(template.changeStream(any(), any(), any())).thenReturn(Flux.empty());
 		changeStreamSupport = new ReactiveChangeStreamOperationSupport(template);
 	}
 
 	@Test // DATAMONGO-2089
-	public void listenWithoutDomainTypeUsesDocumentAsDefault() {
+	void listenWithoutDomainTypeUsesDocumentAsDefault() {
 
 		changeStreamSupport.changeStream(Document.class).listen().subscribe();
 
@@ -68,7 +66,7 @@ public void listenWithoutDomainTypeUsesDocumentAsDefault() {
 	}
 
 	@Test // DATAMONGO-2089
-	public void listenWithDomainTypeUsesSourceAsTarget() {
+	void listenWithDomainTypeUsesSourceAsTarget() {
 
 		changeStreamSupport.changeStream(Person.class).listen().subscribe();
 
@@ -76,7 +74,7 @@ public void listenWithDomainTypeUsesSourceAsTarget() {
 	}
 
 	@Test // DATAMONGO-2089
-	public void collectionNameIsPassedOnCorrectly() {
+	void collectionNameIsPassedOnCorrectly() {
 
 		changeStreamSupport.changeStream(Person.class).watchCollection("star-wars").listen().subscribe();
 
@@ -84,7 +82,7 @@ public void collectionNameIsPassedOnCorrectly() {
 	}
 
 	@Test // DATAMONGO-2089
-	public void listenWithDomainTypeCreatesTypedAggregation() {
+	void listenWithDomainTypeCreatesTypedAggregation() {
 
 		Criteria criteria = where("operationType").is("insert");
 		changeStreamSupport.changeStream(Person.class).filter(criteria).listen().subscribe();
@@ -104,7 +102,7 @@ public void listenWithDomainTypeCreatesTypedAggregation() {
 	}
 
 	@Test // DATAMONGO-2089
-	public void listenWithoutDomainTypeCreatesUntypedAggregation() {
+	void listenWithoutDomainTypeCreatesUntypedAggregation() {
 
 		Criteria criteria = where("operationType").is("insert");
 		changeStreamSupport.changeStream(Document.class).filter(criteria).listen().subscribe();
@@ -125,7 +123,7 @@ public void listenWithoutDomainTypeCreatesUntypedAggregation() {
 	}
 
 	@Test // DATAMONGO-2089
-	public void optionsShouldBePassedOnCorrectly() {
+	void optionsShouldBePassedOnCorrectly() {
 
 		Document filter = new Document("$match", new Document("operationType", "insert"));
 
@@ -142,7 +140,7 @@ public void optionsShouldBePassedOnCorrectly() {
 	}
 
 	@Test // DATAMONGO-2089
-	public void optionsShouldBeCombinedCorrectly() {
+	void optionsShouldBeCombinedCorrectly() {
 
 		Document filter = new Document("$match", new Document("operationType", "insert"));
 		Instant resumeTimestamp = Instant.now();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveClientSessionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveClientSessionTests.java
index c0ae9a6e6d..9c49a3a743 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveClientSessionTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveClientSessionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,47 +26,43 @@
 import java.util.function.Supplier;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.Version;
 
 import com.mongodb.ClientSessionOptions;
 import com.mongodb.reactivestreams.client.ClientSession;
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.Success;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  * @currentRead Beyond the Shadows - Brent Weeks
  */
+@ExtendWith(MongoClientExtension.class)
+@EnableIfReplicaSetAvailable
 public class ReactiveClientSessionTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_6_0 = MongoVersionRule.atLeast(Version.parse("3.6.0"));
-	public static @ClassRule TestRule replSet = ReplicaSet.required();
-
 	static final String DATABASE_NAME = "reflective-client-session-tests";
 	static final String COLLECTION_NAME = "test";
 
-	MongoClient client;
+	static @Client MongoClient client;
+
 	ReactiveMongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		client = MongoTestUtils.reactiveReplSetClient();
-
 		template = new ReactiveMongoTemplate(client, DATABASE_NAME);
 
 		MongoTestUtils.createOrReplaceCollection(DATABASE_NAME, COLLECTION_NAME, client) //
 				.as(StepVerifier::create) //
-				.expectNext(Success.SUCCESS) //
 				.verifyComplete();
 
 		template.insert(new Document("_id", "id-1").append("value", "spring"), COLLECTION_NAME) //
@@ -140,6 +136,7 @@ public void addsClientSessionToContext() {
 	}
 
 	@Test // DATAMONGO-2001
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 	public void countInTransactionShouldReturnCount() {
 
 		ClientSession session = Mono
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupportTests.java
index 98b654342c..d51696dd74 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveFindOperationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,15 +18,15 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
+import static org.springframework.data.mongodb.test.util.DirtiesStateExtension.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
 import java.util.Date;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -35,8 +35,9 @@
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -48,35 +49,52 @@
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 
-import com.mongodb.reactivestreams.client.MongoClients;
+import com.mongodb.client.MongoClient;
 
 /**
  * Integration tests for {@link ReactiveFindOperationSupport}.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Juergen Zimmermann
  */
-public class ReactiveFindOperationSupportTests {
+@ExtendWith({ MongoClientExtension.class, DirtiesStateExtension.class })
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ReactiveFindOperationSupportTests implements StateFunctions {
 
 	private static final String STAR_WARS = "star-wars";
-	MongoTemplate blocking;
-	ReactiveMongoTemplate template;
+	private MongoTemplate blocking;
+	private ReactiveMongoTemplate template;
 
-	Person han;
-	Person luke;
+	private static @Client MongoClient client;
+	private static @Client com.mongodb.reactivestreams.client.MongoClient reactiveClient;
 
-	@Before
-	public void setUp() {
+	private Person han;
+	private Person luke;
 
-		blocking = new MongoTemplate(
-				new SimpleMongoClientDbFactory(MongoTestUtils.client(), "ExecutableFindOperationSupportTests"));
+	void setUp() {
+		blocking = new MongoTemplate(new SimpleMongoClientDatabaseFactory(client, "ExecutableFindOperationSupportTests"));
+		template = new ReactiveMongoTemplate(reactiveClient, "ExecutableFindOperationSupportTests");
+	}
+
+	@Override
+	public void clear() {
+		if (blocking == null) {
+			setUp();
+		}
 		recreateCollection(STAR_WARS, false);
+	}
 
+	@Override
+	public void setupState() {
+		if (blocking == null) {
+			setUp();
+		}
 		insertObjects();
-
-		template = new ReactiveMongoTemplate(MongoTestUtils.reactiveClient(), "ExecutableFindOperationSupportTests");
 	}
 
 	void insertObjects() {
@@ -108,22 +126,22 @@ void recreateCollection(String collectionName, boolean capped) {
 	}
 
 	@Test // DATAMONGO-1719
-	public void domainTypeIsRequired() {
+	void domainTypeIsRequired() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.query(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void returnTypeIsRequiredOnSet() {
+	void returnTypeIsRequiredOnSet() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.query(Person.class).as(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void collectionIsRequiredOnSet() {
+	void collectionIsRequiredOnSet() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.query(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAll() {
+	void findAll() {
 
 		template.query(Person.class).all().collectList().as(StepVerifier::create).consumeNextWith(actual -> {
 			assertThat(actual).containsExactlyInAnyOrder(han, luke);
@@ -131,35 +149,54 @@ public void findAll() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllWithCollection() {
+	void findAllWithCollection() {
 		template.query(Human.class).inCollection(STAR_WARS).all().as(StepVerifier::create).expectNextCount(2)
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-2323
-	public void findAllAsDocumentDocument() {
+	void findAllAsDocumentDocument() {
 		template.query(Document.class).inCollection(STAR_WARS).all().as(StepVerifier::create).expectNextCount(2)
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllWithProjection() {
+	void findAllWithProjection() {
 
 		template.query(Person.class).as(Jedi.class).all().map(it -> it.getClass().getName()).as(StepVerifier::create) //
 				.expectNext(Jedi.class.getName(), Jedi.class.getName()) //
 				.verifyComplete();
 	}
 
+	@Test // GH-4949
+	void findAllWithConverter() {
+
+		template.query(Person.class).as(Jedi.class).map((document, reader) -> Optional.of(reader.get())).all()
+				.map(Optional::get) //
+				.map(it -> it.getClass().getName()) //
+				.as(StepVerifier::create) //
+				.expectNext(Jedi.class.getName(), Jedi.class.getName()) //
+				.verifyComplete();
+	}
+
 	@Test // DATAMONGO-1719
-	public void findAllBy() {
+	void findAllBy() {
 
 		template.query(Person.class).matching(query(where("firstname").is("luke"))).all().as(StepVerifier::create) //
 				.expectNext(luke) //
 				.verifyComplete();
 	}
 
+	@Test // DATAMONGO-2416
+	void findAllByCriteria() {
+
+		template.query(Person.class).matching(where("firstname").is("luke")).all().as(StepVerifier::create) //
+				.expectNext(luke) //
+				.verifyComplete();
+	}
+
 	@Test // DATAMONGO-1719
-	public void findAllByWithCollectionUsingMappingInformation() {
+	void findAllByWithCollectionUsingMappingInformation() {
 
 		template.query(Jedi.class).inCollection(STAR_WARS).matching(query(where("name").is("luke"))).all()
 				.as(StepVerifier::create).consumeNextWith(it -> assertThat(it).isInstanceOf(Jedi.class)) //
@@ -167,7 +204,7 @@ public void findAllByWithCollectionUsingMappingInformation() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllByWithCollection() {
+	void findAllByWithCollection() {
 
 		template.query(Human.class).inCollection(STAR_WARS).matching(query(where("firstname").is("luke"))).all()
 				.as(StepVerifier::create).expectNextCount(1) //
@@ -175,7 +212,7 @@ public void findAllByWithCollection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllByWithProjection() {
+	void findAllByWithProjection() {
 
 		template.query(Person.class).as(Jedi.class).matching(query(where("firstname").is("luke"))).all()
 				.as(StepVerifier::create).consumeNextWith(it -> assertThat(it).isInstanceOf(Jedi.class)) //
@@ -183,7 +220,7 @@ public void findAllByWithProjection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllByWithClosedInterfaceProjection() {
+	void findAllByWithClosedInterfaceProjection() {
 
 		template.query(Person.class).as(PersonProjection.class).matching(query(where("firstname").is("luke"))).all()
 				.as(StepVerifier::create).consumeNextWith(it -> {
@@ -195,7 +232,7 @@ public void findAllByWithClosedInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllByWithOpenInterfaceProjection() {
+	void findAllByWithOpenInterfaceProjection() {
 
 		template.query(Person.class).as(PersonSpELProjection.class).matching(query(where("firstname").is("luke"))).all()
 				.as(StepVerifier::create).consumeNextWith(it -> {
@@ -207,7 +244,7 @@ public void findAllByWithOpenInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findBy() {
+	void findBy() {
 
 		template.query(Person.class).matching(query(where("firstname").is("luke"))).one().as(StepVerifier::create)
 				.expectNext(luke) //
@@ -215,14 +252,14 @@ public void findBy() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findByNoMatch() {
+	void findByNoMatch() {
 
 		template.query(Person.class).matching(query(where("firstname").is("spock"))).one().as(StepVerifier::create)
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1719
-	public void findByTooManyResults() {
+	void findByTooManyResults() {
 
 		template.query(Person.class).matching(query(where("firstname").in("han", "luke"))).one().as(StepVerifier::create)
 				.expectError(IncorrectResultSizeDataAccessException.class) //
@@ -230,7 +267,8 @@ public void findByTooManyResults() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllNearBy() {
+	@DirtiesState
+	void findAllNearBy() {
 
 		blocking.indexOps(Planet.class).ensureIndex(
 				new GeospatialIndex("coordinates").typed(GeoSpatialIndexType.GEO_2DSPHERE).named("planet-coordinate-idx"));
@@ -250,7 +288,8 @@ public void findAllNearBy() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllNearByWithCollectionAndProjection() {
+	@DirtiesState
+	void findAllNearByWithCollectionAndProjection() {
 
 		blocking.indexOps(Planet.class).ensureIndex(
 				new GeospatialIndex("coordinates").typed(GeoSpatialIndexType.GEO_2DSPHERE).named("planet-coordinate-idx"));
@@ -272,8 +311,35 @@ public void findAllNearByWithCollectionAndProjection() {
 				.verifyComplete();
 	}
 
+	@Test // GH-4949
+	@DirtiesState
+	void findAllNearByWithConverter() {
+
+		blocking.indexOps(Planet.class).ensureIndex(
+				new GeospatialIndex("coordinates").typed(GeoSpatialIndexType.GEO_2DSPHERE).named("planet-coordinate-idx"));
+
+		Planet alderan = new Planet("alderan", new Point(-73.9836, 40.7538));
+		Planet dantooine = new Planet("dantooine", new Point(-73.9928, 40.7193));
+
+		blocking.save(alderan);
+		blocking.save(dantooine);
+
+		template.query(Object.class).inCollection(STAR_WARS).as(Human.class)
+				.near(NearQuery.near(-73.9667, 40.78).spherical(true)).map((document, reader) -> Optional.of(reader.get())) //
+				.all() //
+				.as(StepVerifier::create).consumeNextWith(actual -> {
+					assertThat(actual.getDistance()).isNotNull();
+					assertThat(actual.getContent()).isInstanceOf(Optional.class);
+					assertThat(actual.getContent().get()).isInstanceOf(Human.class);
+					assertThat(actual.getContent().get().getId()).isEqualTo("alderan");
+				}) //
+				.expectNextCount(1) //
+				.verifyComplete();
+	}
+
 	@Test // DATAMONGO-1719
-	public void findAllNearByReturningGeoResultContentAsClosedInterfaceProjection() {
+	@DirtiesState
+	void findAllNearByReturningGeoResultContentAsClosedInterfaceProjection() {
 
 		blocking.indexOps(Planet.class).ensureIndex(
 				new GeospatialIndex("coordinates").typed(GeoSpatialIndexType.GEO_2DSPHERE).named("planet-coordinate-idx"));
@@ -296,7 +362,8 @@ public void findAllNearByReturningGeoResultContentAsClosedInterfaceProjection()
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAllNearByReturningGeoResultContentAsOpenInterfaceProjection() {
+	@DirtiesState
+	void findAllNearByReturningGeoResultContentAsOpenInterfaceProjection() {
 
 		blocking.indexOps(Planet.class).ensureIndex(
 				new GeospatialIndex("coordinates").typed(GeoSpatialIndexType.GEO_2DSPHERE).named("planet-coordinate-idx"));
@@ -319,7 +386,8 @@ public void findAllNearByReturningGeoResultContentAsOpenInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-2080
-	public void tail() throws InterruptedException {
+	@ProvidesState
+	void tail() throws InterruptedException {
 
 		recreateCollection(STAR_WARS, true);
 		insertObjects();
@@ -347,7 +415,8 @@ public void tail() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-2080
-	public void tailWithProjection() {
+	@ProvidesState
+	void tailWithProjection() {
 
 		recreateCollection(STAR_WARS, true);
 		insertObjects();
@@ -360,7 +429,8 @@ public void tailWithProjection() {
 	}
 
 	@Test // DATAMONGO-2080
-	public void tailWithClosedInterfaceProjection() {
+	@ProvidesState
+	void tailWithClosedInterfaceProjection() {
 
 		recreateCollection(STAR_WARS, true);
 		insertObjects();
@@ -377,7 +447,8 @@ public void tailWithClosedInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-2080
-	public void tailWithOpenInterfaceProjection() {
+	@ProvidesState
+	void tailWithOpenInterfaceProjection() {
 
 		recreateCollection(STAR_WARS, true);
 		insertObjects();
@@ -394,17 +465,17 @@ public void tailWithOpenInterfaceProjection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void firstShouldReturnFirstEntryInCollection() {
+	void firstShouldReturnFirstEntryInCollection() {
 		template.query(Person.class).first().as(StepVerifier::create).expectNextCount(1).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1719
-	public void countShouldReturnNrOfElementsInCollectionWhenNoQueryPresent() {
+	void countShouldReturnNrOfElementsInCollectionWhenNoQueryPresent() {
 		template.query(Person.class).count().as(StepVerifier::create).expectNext(2L).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1719
-	public void countShouldReturnNrOfElementsMatchingQuery() {
+	void countShouldReturnNrOfElementsMatchingQuery() {
 
 		template.query(Person.class).matching(query(where("firstname").is(luke.getFirstname()))).count()
 				.as(StepVerifier::create).expectNext(1L) //
@@ -412,12 +483,13 @@ public void countShouldReturnNrOfElementsMatchingQuery() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void existsShouldReturnTrueIfAtLeastOneElementExistsInCollection() {
+	void existsShouldReturnTrueIfAtLeastOneElementExistsInCollection() {
 		template.query(Person.class).exists().as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1719
-	public void existsShouldReturnFalseIfNoElementExistsInCollection() {
+	@DirtiesState
+	void existsShouldReturnFalseIfNoElementExistsInCollection() {
 
 		blocking.remove(new BasicQuery("{}"), STAR_WARS);
 
@@ -425,7 +497,7 @@ public void existsShouldReturnFalseIfNoElementExistsInCollection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void existsShouldReturnTrueIfAtLeastOneElementMatchesQuery() {
+	void existsShouldReturnTrueIfAtLeastOneElementMatchesQuery() {
 
 		template.query(Person.class).matching(query(where("firstname").is(luke.getFirstname()))).exists()
 				.as(StepVerifier::create).expectNext(true) //
@@ -433,7 +505,7 @@ public void existsShouldReturnTrueIfAtLeastOneElementMatchesQuery() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void existsShouldReturnFalseWhenNoElementMatchesQuery() {
+	void existsShouldReturnFalseWhenNoElementMatchesQuery() {
 
 		template.query(Person.class).matching(query(where("firstname").is("spock"))).exists().as(StepVerifier::create)
 				.expectNext(false) //
@@ -441,14 +513,15 @@ public void existsShouldReturnFalseWhenNoElementMatchesQuery() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsEmptyListIfNoMatchFound() {
+	void distinctReturnsEmptyListIfNoMatchFound() {
 
 		template.query(Person.class).distinct("actually-not-property-in-use").as(String.class).all()
 				.as(StepVerifier::create).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsSimpleFieldValuesCorrectlyForCollectionHavingReturnTypeSpecifiedThatCanBeConvertedDirectlyByACodec() {
+	@DirtiesState
+	void distinctReturnsSimpleFieldValuesCorrectlyForCollectionHavingReturnTypeSpecifiedThatCanBeConvertedDirectlyByACodec() {
 
 		Person anakin = new Person();
 		anakin.firstname = "anakin";
@@ -462,7 +535,8 @@ public void distinctReturnsSimpleFieldValuesCorrectlyForCollectionHavingReturnTy
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsSimpleFieldValuesCorrectly() {
+	@DirtiesState
+	void distinctReturnsSimpleFieldValuesCorrectly() {
 
 		Person anakin = new Person();
 		anakin.firstname = "anakin";
@@ -490,7 +564,8 @@ public void distinctReturnsSimpleFieldValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsComplexValuesCorrectly() {
+	@DirtiesState
+	void distinctReturnsComplexValuesCorrectly() {
 
 		Sith sith = new Sith();
 		sith.rank = "lord";
@@ -507,7 +582,8 @@ public void distinctReturnsComplexValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsComplexValuesCorrectlyHavingReturnTypeSpecified() {
+	@DirtiesState
+	void distinctReturnsComplexValuesCorrectlyHavingReturnTypeSpecified() {
 
 		Sith sith = new Sith();
 		sith.rank = "lord";
@@ -524,7 +600,8 @@ public void distinctReturnsComplexValuesCorrectlyHavingReturnTypeSpecified() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsComplexValuesCorrectlyReturnTypeDocumentSpecified() {
+	@DirtiesState
+	void distinctReturnsComplexValuesCorrectlyReturnTypeDocumentSpecified() {
 
 		Sith sith = new Sith();
 		sith.rank = "lord";
@@ -541,7 +618,7 @@ public void distinctReturnsComplexValuesCorrectlyReturnTypeDocumentSpecified() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctMapsFieldNameCorrectly() {
+	void distinctMapsFieldNameCorrectly() {
 
 		template.query(Jedi.class).inCollection(STAR_WARS).distinct("name").as(String.class).all().as(StepVerifier::create)
 				.assertNext(in("han", "luke")).assertNext(in("han", "luke")) //
@@ -549,7 +626,7 @@ public void distinctMapsFieldNameCorrectly() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsRawValuesIfReturnTypeIsBsonValue() {
+	void distinctReturnsRawValuesIfReturnTypeIsBsonValue() {
 
 		Consumer<BsonValue> inValues = in(new BsonString("solo"), new BsonString("skywalker"));
 		template.query(Person.class).distinct("lastname").as(BsonValue.class).all().as(StepVerifier::create)
@@ -559,7 +636,8 @@ public void distinctReturnsRawValuesIfReturnTypeIsBsonValue() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsValuesMappedToTheirJavaTypeEvenWhenNotExplicitlyDefinedByTheDomainType() {
+	@DirtiesState
+	void distinctReturnsValuesMappedToTheirJavaTypeEvenWhenNotExplicitlyDefinedByTheDomainType() {
 
 		blocking.save(new Document("darth", "vader"), STAR_WARS);
 
@@ -569,7 +647,8 @@ public void distinctReturnsValuesMappedToTheirJavaTypeEvenWhenNotExplicitlyDefin
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsMappedDomainTypeForProjections() {
+	@DirtiesState
+	void distinctReturnsMappedDomainTypeForProjections() {
 
 		luke.father = new Person();
 		luke.father.firstname = "anakin";
@@ -582,7 +661,8 @@ public void distinctReturnsMappedDomainTypeForProjections() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctAlllowsQueryUsingObjectSourceType() {
+	@DirtiesState
+	void distinctAlllowsQueryUsingObjectSourceType() {
 
 		luke.father = new Person();
 		luke.father.firstname = "anakin";
@@ -595,7 +675,8 @@ public void distinctAlllowsQueryUsingObjectSourceType() {
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctReturnsMappedDomainTypeExtractedFromPropertyWhenNoExplicitTypePresent() {
+	@DirtiesState
+	void distinctReturnsMappedDomainTypeExtractedFromPropertyWhenNoExplicitTypePresent() {
 
 		luke.father = new Person();
 		luke.father.firstname = "anakin";
@@ -611,16 +692,26 @@ public void distinctReturnsMappedDomainTypeExtractedFromPropertyWhenNoExplicitTy
 	}
 
 	@Test // DATAMONGO-1761
-	public void distinctThrowsExceptionWhenExplicitMappingTypeCannotBeApplied() {
+	void distinctThrowsExceptionWhenExplicitMappingTypeCannotBeApplied() {
 
 		template.query(Person.class).distinct("firstname").as(Long.class).all().as(StepVerifier::create)
 				.expectError(InvalidDataAccessApiUsageException.class) //
 				.verify();
 	}
 
+	@Test // DATAMONGO-2507
+	void distinctAppliesFilterQuery() {
+
+		template.query(Person.class).inCollection(STAR_WARS).distinct("firstname") //
+				.matching(where("lastname").is(luke.lastname)) //
+				.as(String.class) //
+				.all() //
+				.as(StepVerifier::create).consumeNextWith(it -> assertThat(it).isEqualTo("luke")) //
+				.verifyComplete();
+	}
+
 	interface Contact {}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person implements Contact {
 
@@ -629,6 +720,71 @@ static class Person implements Contact {
 		String lastname;
 		Object ability;
 		Person father;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public Object getAbility() {
+			return this.ability;
+		}
+
+		public Person getFather() {
+			return this.father;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public void setAbility(Object ability) {
+			this.ability = ability;
+		}
+
+		public void setFather(Person father) {
+			this.father = father;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname)
+					&& Objects.equals(lastname, person.lastname) && Objects.equals(ability, person.ability)
+					&& Objects.equals(father, person.father);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname, ability, father);
+		}
+
+		public String toString() {
+			return "ReactiveFindOperationSupportTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ", lastname=" + this.getLastname() + ", ability=" + this.getAbility() + ", father=" + this.getFather()
+					+ ")";
+		}
 	}
 
 	interface PersonProjection {
@@ -641,32 +797,128 @@ public interface PersonSpELProjection {
 		String getName();
 	}
 
-	@Data
 	static class Human {
+
 		@Id String id;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String toString() {
+			return "ReactiveFindOperationSupportTests.Human(id=" + this.getId() + ")";
+		}
 	}
 
-	@Data
-	@NoArgsConstructor
-	@AllArgsConstructor
 	static class Jedi {
 
 		@Field("firstname") String name;
+
+		public Jedi() {}
+
+		public Jedi(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Jedi jedi = (Jedi) o;
+			return Objects.equals(name, jedi.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name);
+		}
+
+		public String toString() {
+			return "ReactiveFindOperationSupportTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 
-	@Data
 	static class Sith {
 
 		String rank;
+
+		public String getRank() {
+			return this.rank;
+		}
+
+		public void setRank(String rank) {
+			this.rank = rank;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Sith sith = (Sith) o;
+			return Objects.equals(rank, sith.rank);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(rank);
+		}
+
+		public String toString() {
+			return "ReactiveFindOperationSupportTests.Sith(rank=" + this.getRank() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Planet {
 
 		@Id String name;
 		Point coordinates;
+
+		public Planet(String name, Point coordinates) {
+			this.name = name;
+			this.coordinates = coordinates;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public Point getCoordinates() {
+			return this.coordinates;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public void setCoordinates(Point coordinates) {
+			this.coordinates = coordinates;
+		}
+
+		public String toString() {
+			return "ReactiveFindOperationSupportTests.Planet(name=" + this.getName() + ", coordinates="
+					+ this.getCoordinates() + ")";
+		}
 	}
 
 	interface PlanetProjection {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupportUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupportUnitTests.java
index 7e099a3fbd..b417430934 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupportUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveInsertOperationSupportUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,19 +18,16 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.anyList;
-
-import lombok.Data;
 
 import java.util.Arrays;
+import java.util.Objects;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.annotation.Id;
 
 /**
@@ -38,21 +35,19 @@
  *
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReactiveInsertOperationSupportUnitTests {
 
 	private static final String STAR_WARS = "star-wars";
 
 	@Mock ReactiveMongoTemplate template;
 
-	ReactiveInsertOperationSupport ops;
+	private ReactiveInsertOperationSupport ops;
 
-	Person luke, han;
+	private Person luke, han;
 
-	@Before
-	public void setUp() {
-
-		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
+	@BeforeEach
+	void setUp() {
 
 		ops = new ReactiveInsertOperationSupport(template);
 
@@ -66,12 +61,14 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void nullCollectionShouldThrowException() {
+	void nullCollectionShouldThrowException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> ops.insert(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void insertShouldUseDerivedCollectionName() {
+	void insertShouldUseDerivedCollectionName() {
+
+		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
 
 		ops.insert(Person.class).one(luke);
 
@@ -84,7 +81,7 @@ public void insertShouldUseDerivedCollectionName() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void insertShouldUseExplicitCollectionName() {
+	void insertShouldUseExplicitCollectionName() {
 
 		ops.insert(Person.class).inCollection(STAR_WARS).one(luke);
 
@@ -93,7 +90,9 @@ public void insertShouldUseExplicitCollectionName() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void insertCollectionShouldDelegateCorrectly() {
+	void insertCollectionShouldDelegateCorrectly() {
+
+		when(template.getCollectionName(any(Class.class))).thenReturn(STAR_WARS);
 
 		ops.insert(Person.class).all(Arrays.asList(luke, han));
 
@@ -101,10 +100,48 @@ public void insertCollectionShouldDelegateCorrectly() {
 		verify(template).insert(anyList(), eq(STAR_WARS));
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person {
+
 		@Id String id;
 		String firstname;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname);
+		}
+
+		public String toString() {
+			return "ReactiveInsertOperationSupportUnitTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupportUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupportUnitTests.java
index 5163043064..b5a40f5738 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupportUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMapReduceOperationSupportUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,17 +18,15 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import java.util.Objects;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
@@ -39,9 +37,10 @@
  * Unit tests for {@link ReactiveMapReduceOperationSupport}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  * @currentRead Beyond the Shadows - Brent Weeks
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReactiveMapReduceOperationSupportUnitTests {
 
 	private static final String STAR_WARS = "star-wars";
@@ -50,47 +49,48 @@ public class ReactiveMapReduceOperationSupportUnitTests {
 
 	@Mock ReactiveMongoTemplate template;
 
-	ReactiveMapReduceOperationSupport mapReduceOpsSupport;
-
-	@Before
-	public void setUp() {
-
-		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
+	private ReactiveMapReduceOperationSupport mapReduceOpsSupport;
 
+	@BeforeEach
+	void setUp() {
 		mapReduceOpsSupport = new ReactiveMapReduceOperationSupport(template);
 	}
 
 	@Test // DATAMONGO-1929
-	public void throwsExceptionOnNullTemplate() {
+	void throwsExceptionOnNullTemplate() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ExecutableMapReduceOperationSupport(null));
 	}
 
 	@Test // DATAMONGO-1929
-	public void throwsExceptionOnNullDomainType() {
+	void throwsExceptionOnNullDomainType() {
 		assertThatIllegalArgumentException().isThrownBy(() -> mapReduceOpsSupport.mapReduce(null));
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesExtractedCollectionName() {
+	void usesExtractedCollectionName() {
+
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).all();
 
 		verify(template).mapReduce(any(Query.class), eq(Person.class), eq(STAR_WARS), eq(Person.class), eq(MAP_FUNCTION),
-				eq(REDUCE_FUNCTION), isNull());
+				eq(REDUCE_FUNCTION), any());
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesExplicitCollectionName() {
+	void usesExplicitCollectionName() {
 
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION)
 				.inCollection("the-night-angel").all();
 
 		verify(template).mapReduce(any(Query.class), eq(Person.class), eq("the-night-angel"), eq(Person.class),
-				eq(MAP_FUNCTION), eq(REDUCE_FUNCTION), isNull());
+				eq(MAP_FUNCTION), eq(REDUCE_FUNCTION), any());
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesMapReduceOptionsWhenPresent() {
+	void usesMapReduceOptionsWhenPresent() {
+
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 
 		MapReduceOptions options = MapReduceOptions.options();
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).with(options).all();
@@ -100,27 +100,43 @@ public void usesMapReduceOptionsWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesQueryWhenPresent() {
+	void usesQueryWhenPresent() {
+
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 
 		Query query = new BasicQuery("{ 'lastname' : 'skywalker' }");
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).matching(query).all();
 
 		verify(template).mapReduce(eq(query), eq(Person.class), eq(STAR_WARS), eq(Person.class), eq(MAP_FUNCTION),
-				eq(REDUCE_FUNCTION), isNull());
+				eq(REDUCE_FUNCTION), any());
+	}
+
+	@Test // DATAMONGO-2416
+	void usesCriteriaWhenPresent() {
+
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
+
+		Query query = Query.query(where("lastname").is("skywalker"));
+		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION)
+				.matching(where("lastname").is("skywalker")).all();
+
+		verify(template).mapReduce(eq(query), eq(Person.class), eq(STAR_WARS), eq(Person.class), eq(MAP_FUNCTION),
+				eq(REDUCE_FUNCTION), any());
 	}
 
 	@Test // DATAMONGO-1929
-	public void usesProjectionWhenPresent() {
+	void usesProjectionWhenPresent() {
+
+		when(template.getCollectionName(eq(Person.class))).thenReturn(STAR_WARS);
 
 		mapReduceOpsSupport.mapReduce(Person.class).map(MAP_FUNCTION).reduce(REDUCE_FUNCTION).as(Jedi.class).all();
 
 		verify(template).mapReduce(any(Query.class), eq(Person.class), eq(STAR_WARS), eq(Jedi.class), eq(MAP_FUNCTION),
-				eq(REDUCE_FUNCTION), isNull());
+				eq(REDUCE_FUNCTION), any());
 	}
 
 	interface Contact {}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person implements Contact {
 
@@ -129,13 +145,93 @@ static class Person implements Contact {
 		String lastname;
 		Object ability;
 		Person father;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public Object getAbility() {
+			return this.ability;
+		}
+
+		public Person getFather() {
+			return this.father;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public void setAbility(Object ability) {
+			this.ability = ability;
+		}
+
+		public void setFather(Person father) {
+			this.father = father;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname)
+					&& Objects.equals(lastname, person.lastname) && Objects.equals(ability, person.ability)
+					&& Objects.equals(father, person.father);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname, ability, father);
+		}
+
+		public String toString() {
+			return "ReactiveMapReduceOperationSupportUnitTests.Person(id=" + this.getId() + ", firstname="
+					+ this.getFirstname() + ", lastname=" + this.getLastname() + ", ability=" + this.getAbility() + ", father="
+					+ this.getFather() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
-	@NoArgsConstructor
 	static class Jedi {
 
 		@Field("firstname") String name;
+
+		public Jedi() {}
+
+		public Jedi(String name) {
+			this.name = name;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String toString() {
+			return "ReactiveMapReduceOperationSupportUnitTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateCollationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateCollationTests.java
index f0f602b737..effdc931df 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateCollationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateCollationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,23 +21,22 @@
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.reactivestreams.client.MongoClient;
 
@@ -45,30 +44,35 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
 public class ReactiveMongoTemplateCollationTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_4_0 = MongoVersionRule.atLeast(Version.parse("3.4.0"));
 	public static final String COLLECTION_NAME = "collation-1";
+	static @Client MongoClient mongoClient;
 
 	@Configuration
 	static class Config extends AbstractReactiveMongoConfiguration {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return mongoClient;
 		}
 
 		@Override
 		protected String getDatabaseName() {
 			return "collation-tests";
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet()  {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired ReactiveMongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		template.dropCollection(COLLECTION_NAME).as(StepVerifier::create).verifyComplete();
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateExecuteTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateExecuteTests.java
index eba8ab0e33..3bf9035a44 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateExecuteTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateExecuteTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 import org.springframework.data.mongodb.UncategorizedMongoDbException;
 import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.MongoException;
 import com.mongodb.ReadPreference;
@@ -44,7 +44,7 @@
  *
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:reactive-infrastructure.xml")
 public class ReactiveMongoTemplateExecuteTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
index a2eada0a8c..75b38390cb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateIndexTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import static org.assertj.core.data.Index.atIndex;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.Data;
 import reactor.core.publisher.Flux;
 import reactor.test.StepVerifier;
 
@@ -28,53 +27,61 @@
 import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.RepeatFailedTest;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.index.Indexed;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import com.mongodb.client.model.IndexOptions;
-import com.mongodb.reactivestreams.client.ListIndexesPublisher;
 import com.mongodb.reactivestreams.client.MongoClient;
+import com.mongodb.reactivestreams.client.MongoCollection;
 
 /**
  * Integration test for index creation via {@link ReactiveMongoTemplate}.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Mathieu Ouellet
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:reactive-infrastructure.xml")
+@ExtendWith(MongoClientExtension.class)
 public class ReactiveMongoTemplateIndexTests {
 
-	@Autowired SimpleReactiveMongoDatabaseFactory factory;
-	@Autowired ReactiveMongoTemplate template;
-	@Autowired MongoClient client;
+	private static @Client MongoClient client;
 
-	@Before
-	public void setUp() {
+	private SimpleReactiveMongoDatabaseFactory factory;
+	private ReactiveMongoTemplate template;
 
-		MongoTestUtils.dropCollectionNow(template.getMongoDatabase().getName(), "person", client);
-		MongoTestUtils.dropCollectionNow(template.getMongoDatabase().getName(), "indexfail", client);
-		MongoTestUtils.dropCollectionNow(template.getMongoDatabase().getName(), "indexedSample", client);
+	@BeforeEach
+	void setUp() {
+
+		factory = new SimpleReactiveMongoDatabaseFactory(client, "reactive-template-index-tests");
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setAutoIndexCreation(true);
+		template = new ReactiveMongoTemplate(factory, new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext));
+
+		MongoTestUtils.dropCollectionNow("reactive-template-index-tests", "person", client);
+		MongoTestUtils.dropCollectionNow("reactive-template-index-tests", "indexfail", client);
+		MongoTestUtils.dropCollectionNow("reactive-template-index-tests", "indexedSample", client);
 	}
 
-	@After
-	public void cleanUp() {}
+	@AfterEach
+	void cleanUp() {}
 
-	@Test // DATAMONGO-1444
-	public void testEnsureIndexShouldCreateIndex() {
+	@RepeatFailedTest(3) // DATAMONGO-1444
+	void testEnsureIndexShouldCreateIndex() {
 
 		Person p1 = new Person("Oliver");
 		p1.setAge(25);
@@ -89,7 +96,8 @@ public void testEnsureIndexShouldCreateIndex() {
 				.expectNextCount(1) //
 				.verifyComplete();
 
-		Flux.from(template.getCollection(template.getCollectionName(Person.class)).listIndexes()).collectList() //
+		template.getCollection(template.getCollectionName(Person.class)).flatMapMany(MongoCollection::listIndexes)
+				.collectList() //
 				.as(StepVerifier::create) //
 				.consumeNextWith(indexInfo -> {
 
@@ -108,8 +116,8 @@ public void testEnsureIndexShouldCreateIndex() {
 				}).verifyComplete();
 	}
 
-	@Test // DATAMONGO-1444
-	public void getIndexInfoShouldReturnCorrectIndex() {
+	@RepeatFailedTest(3) // DATAMONGO-1444
+	void getIndexInfoShouldReturnCorrectIndex() {
 
 		Person p1 = new Person("Oliver");
 		p1.setAge(25);
@@ -138,8 +146,8 @@ public void getIndexInfoShouldReturnCorrectIndex() {
 				}).verifyComplete();
 	}
 
-	@Test // DATAMONGO-1444, DATAMONGO-2264
-	public void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() {
+	@RepeatFailedTest(3) // DATAMONGO-1444, DATAMONGO-2264
+	void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() {
 
 		template.indexOps(Person.class).dropAllIndexes() //
 				.as(StepVerifier::create) //
@@ -149,16 +157,15 @@ public void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() {
 				.as(StepVerifier::create) //
 				.verifyComplete();
 
-		Flux.from(factory.getMongoDatabase().getCollection(template.getCollectionName(Person.class))
-				.createIndex(new Document("age", -1), new IndexOptions().unique(true).sparse(true))) //
+		factory.getMongoDatabase() //
+				.flatMapMany(db -> db.getCollection(template.getCollectionName(Person.class))
+						.createIndex(new Document("age", -1), new IndexOptions().unique(true).sparse(true)))
 				.as(StepVerifier::create) //
 				.expectNextCount(1) //
 				.verifyComplete();
 
-		ListIndexesPublisher<Document> listIndexesPublisher = template
-				.getCollection(template.getCollectionName(Person.class)).listIndexes();
-
-		Flux.from(listIndexesPublisher).collectList() //
+		template.getCollection(template.getCollectionName(Person.class)).flatMapMany(MongoCollection::listIndexes)
+				.collectList() //
 				.as(StepVerifier::create) //
 				.consumeNextWith(indexInfos -> {
 
@@ -189,26 +196,32 @@ public void testReadIndexInfoForIndicesCreatedViaMongoShellCommands() {
 				}).verifyComplete();
 	}
 
-	@Test // DATAMONGO-1928
-	public void shouldCreateIndexOnAccess() {
+	@RepeatFailedTest(3) // DATAMONGO-1928
+	void shouldCreateIndexOnAccess() {
 
-		StepVerifier.create(template.getCollection("indexedSample").listIndexes(Document.class)).expectNextCount(0)
+		template.getCollection("indexedSample").flatMapMany(it -> it.listIndexes(Document.class)) //
+				.as(StepVerifier::create) //
+				.expectNextCount(0) //
 				.verifyComplete();
 
-		template.findAll(IndexedSample.class) //
-				.delayElements(Duration.ofMillis(200)) // TODO: check if 4.2.0 server GA still requires this timeout
+		template.findAll(IndexedSample.class).defaultIfEmpty(new IndexedSample()) //
+				.delayElements(Duration.ofMillis(500)) // TODO: check if 4.2.0 server GA still requires this timeout
+				.then()
 				.as(StepVerifier::create) //
 				.verifyComplete();
 
-		StepVerifier.create(template.getCollection("indexedSample").listIndexes(Document.class)).expectNextCount(2)
+		template.getCollection("indexedSample").flatMapMany(it -> it.listIndexes(Document.class)) //
+				.as(StepVerifier::create) //
+				.expectNextCount(2) //
 				.verifyComplete();
 	}
 
-	@Test // DATAMONGO-1928, DATAMONGO-2264
-	public void indexCreationShouldFail() throws InterruptedException {
+	@RepeatFailedTest(3) // DATAMONGO-1928, DATAMONGO-2264
+	void indexCreationShouldFail() throws InterruptedException {
 
-		Flux.from(factory.getMongoDatabase().getCollection("indexfail") //
-				.createIndex(new Document("field", 1), new IndexOptions().name("foo").unique(true).sparse(true)))
+		factory.getMongoDatabase() //
+				.flatMapMany(db -> db.getCollection("indexfail") //
+						.createIndex(new Document("field", 1), new IndexOptions().name("foo").unique(true).sparse(true)))
 				.as(StepVerifier::create) //
 				.expectNextCount(1) //
 				.verifyComplete();
@@ -223,7 +236,6 @@ public void indexCreationShouldFail() throws InterruptedException {
 		assertThat(failure).isNotNull().isInstanceOf(DataIntegrityViolationException.class);
 	}
 
-	@Data
 	static class Sample {
 
 		@Id String id;
@@ -235,21 +247,80 @@ public Sample(String id, String field) {
 			this.id = id;
 			this.field = field;
 		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getField() {
+			return this.field;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setField(String field) {
+			this.field = field;
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateIndexTests.Sample(id=" + this.getId() + ", field=" + this.getField() + ")";
+		}
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document
 	static class IndexedSample {
 
 		@Id String id;
 		@Indexed String field;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getField() {
+			return this.field;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setField(String field) {
+			this.field = field;
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateIndexTests.IndexedSample(id=" + this.getId() + ", field=" + this.getField() + ")";
+		}
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document("indexfail")
 	static class IndexCreationShouldFail {
 
 		@Id String id;
 		@Indexed(name = "foo") String field;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getField() {
+			return this.field;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setField(String field) {
+			this.field = field;
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateIndexTests.IndexCreationShouldFail(id=" + this.getId() + ", field=" + this.getField()
+					+ ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateReplaceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateReplaceTests.java
new file mode 100644
index 0000000000..86433ab338
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateReplaceTests.java
@@ -0,0 +1,329 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.ReplaceOptions.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.bson.BsonInt64;
+import org.bson.Document;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.reactivestreams.Publisher;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.reactivestreams.client.MongoClient;
+import com.mongodb.reactivestreams.client.MongoCollection;
+
+/**
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoClientExtension.class)
+public class ReactiveMongoTemplateReplaceTests {
+
+	static final String DB_NAME = "mongo-template-replace-tests";
+	static final String RESTAURANT_COLLECTION = "restaurant";
+
+	static @Client MongoClient client;
+	private ReactiveMongoTemplate template;
+
+	@BeforeEach
+	void beforeEach() {
+
+		template = new ReactiveMongoTemplate(client, DB_NAME);
+		template.setEntityLifecycleEventsEnabled(false);
+
+		initTestData();
+	}
+
+	@AfterEach()
+	void afterEach() {
+		clearTestData();
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocument() {
+
+		Mono<UpdateResult> result = template.replace(query(where("name").is("Central Perk Cafe")),
+				new Restaurant("Central Pork Cafe", "Manhattan"));
+
+		result.as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getMatchedCount()).isEqualTo(1);
+			assertThat(it.getModifiedCount()).isEqualTo(1);
+		}).verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("_id", 1)).first()).as(StepVerifier::create)
+				.consumeNextWith(document -> {
+					assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+				}).verifyComplete();
+	}
+
+	@Test // GH-4462
+	void replacesFirstOnMoreThanOneMatch() {
+
+		Mono<UpdateResult> result = template.replace(query(where("violations").exists(true)),
+				new Restaurant("Central Pork Cafe", "Manhattan"));
+
+		result.as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getMatchedCount()).isEqualTo(1);
+			assertThat(it.getModifiedCount()).isEqualTo(1);
+		}).verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("_id", 2)).first()).as(StepVerifier::create)
+				.consumeNextWith(document -> {
+					assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+				}).verifyComplete();
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithRawDoc() {
+
+		Mono<UpdateResult> result = template.replace(query(where("r-name").is("Central Perk Cafe")),
+				Document.parse("{ 'r-name' : 'Central Pork Cafe', 'Borough' : 'Manhattan' }"),
+				template.getCollectionName(Restaurant.class));
+
+		result.as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getMatchedCount()).isEqualTo(1);
+			assertThat(it.getModifiedCount()).isEqualTo(1);
+		}).verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("_id", 1)).first()).as(StepVerifier::create)
+				.consumeNextWith(document -> {
+					assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+				}).verifyComplete();
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithRawDocMappingQueryAgainstDomainType() {
+
+		Mono<UpdateResult> result = template.replace(query(where("name").is("Central Perk Cafe")), Restaurant.class,
+				Document.parse("{ 'r-name' : 'Central Pork Cafe', 'Borough' : 'Manhattan' }"), ReplaceOptions.none(), template.getCollectionName(Restaurant.class));
+
+		result.as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getMatchedCount()).isEqualTo(1);
+			assertThat(it.getModifiedCount()).isEqualTo(1);
+		}).verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("_id", 1)).first()).as(StepVerifier::create)
+				.consumeNextWith(document -> {
+					assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+				}).verifyComplete();
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithMatchingId() {
+
+		Mono<UpdateResult> result = template.replace(query(where("name").is("Central Perk Cafe")),
+				new Restaurant(1L, "Central Pork Cafe", "Manhattan", 0));
+
+		result.as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getMatchedCount()).isEqualTo(1);
+			assertThat(it.getModifiedCount()).isEqualTo(1);
+		}).verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("_id", 1)).first()).as(StepVerifier::create)
+				.consumeNextWith(document -> {
+					assertThat(document).containsEntry("r-name", "Central Pork Cafe");
+				}).verifyComplete();
+	}
+
+	@Test // GH-4462
+	void replacesExistingDocumentWithNewIdThrowsDataIntegrityViolationException() {
+
+		template.replace(query(where("name").is("Central Perk Cafe")),
+						new Restaurant(4L, "Central Pork Cafe", "Manhattan", 0))
+				.as(StepVerifier::create)
+				.expectError(DataIntegrityViolationException.class)
+				.verify();
+	}
+
+	@Test // GH-4462
+	void doesNothingIfNoMatchFoundAndUpsertSetToFalse/* by default */() {
+
+		Mono<UpdateResult> result = template.replace(query(where("name").is("Pizza Rat's Pizzaria")),
+				new Restaurant(null, "Pizza Rat's Pizzaria", "Manhattan", 8));
+
+		result.as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getMatchedCount()).isEqualTo(0);
+			assertThat(it.getModifiedCount()).isEqualTo(0);
+		}).verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("r-name", "Pizza Rat's Pizzaria")).first())
+				.as(StepVerifier::create).verifyComplete();
+	}
+
+	@Test // GH-4462
+	void insertsIfNoMatchFoundAndUpsertSetToTrue() {
+
+		Mono<UpdateResult> result = template.replace(query(where("name").is("Pizza Rat's Pizzaria")),
+				new Restaurant(4L, "Pizza Rat's Pizzaria", "Manhattan", 8), replaceOptions().upsert());
+
+		result.as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getMatchedCount()).isEqualTo(0);
+			assertThat(it.getModifiedCount()).isEqualTo(0);
+			assertThat(it.getUpsertedId()).isEqualTo(new BsonInt64(4L));
+		}).verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("_id", 4)).first()).as(StepVerifier::create)
+				.consumeNextWith(document -> {
+					assertThat(document).containsEntry("r-name", "Pizza Rat's Pizzaria");
+				})
+			.verifyComplete();
+	}
+
+	@Test // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	void replaceConsidersSort() {
+
+		template.replace(new Query().with(Sort.by(Direction.DESC, "name")), new Restaurant("resist", "Manhattan")) //
+				.as(StepVerifier::create) //
+			.consumeNextWith(result -> assertThat(result.getModifiedCount()).isOne()) //
+			.verifyComplete();
+
+		retrieve(collection -> collection.find(Filters.eq("_id", 2)).first()).as(StepVerifier::create)
+			.consumeNextWith(document -> {
+				assertThat(document).containsEntry("r-name", "resist");
+			}).verifyComplete();
+	}
+
+	void initTestData() {
+
+		List<Document> testData = Stream.of( //
+				"{ '_id' : 1, 'r-name' : 'Central Perk Cafe', 'Borough' : 'Manhattan' }",
+				"{ '_id' : 2, 'r-name' : 'Rock A Feller Bar and Grill', 'Borough' : 'Queens', 'violations' : 2 }",
+				"{ '_id' : 3, 'r-name' : 'Empire State Pub', 'Borough' : 'Brooklyn', 'violations' : 0 }") //
+				.map(Document::parse).collect(Collectors.toList());
+
+		doInCollection(collection -> collection.insertMany(testData));
+	}
+
+	void clearTestData() {
+		doInCollection(collection -> collection.deleteMany(new Document()));
+	}
+
+	void doInCollection(Function<MongoCollection<Document>, Publisher<?>> fkt) {
+		retrieve(collection -> Mono.from(fkt.apply(collection))).then().as(StepVerifier::create).verifyComplete();
+	}
+
+	<T> Mono<T> retrieve(Function<MongoCollection<Document>, Publisher<T>> fkt) {
+		return Mono.from(fkt.apply(client.getDatabase(DB_NAME).getCollection(RESTAURANT_COLLECTION)));
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(RESTAURANT_COLLECTION)
+	static class Restaurant {
+
+		Long id;
+
+		@Field("r-name") String name;
+		String borough;
+		Integer violations;
+
+		Restaurant() {}
+
+		Restaurant(String name, String borough) {
+
+			this.name = name;
+			this.borough = borough;
+		}
+
+		Restaurant(Long id, String name, String borough, Integer violations) {
+
+			this.id = id;
+			this.name = name;
+			this.borough = borough;
+			this.violations = violations;
+		}
+
+		public Long getId() {
+			return id;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public String getRName() {
+			return name;
+		}
+
+		public void setRName(String rName) {
+			this.name = rName;
+		}
+
+		public String getBorough() {
+			return borough;
+		}
+
+		public void setBorough(String borough) {
+			this.borough = borough;
+		}
+
+		public int getViolations() {
+			return violations;
+		}
+
+		public void setViolations(int violations) {
+			this.violations = violations;
+		}
+
+		@Override
+		public String toString() {
+			return "Restaurant{" + "id=" + id + ", name='" + name + '\'' + ", borough='" + borough + '\'' + ", violations="
+					+ violations + '}';
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Restaurant that = (Restaurant) o;
+			return violations == that.violations && Objects.equals(id, that.id) && Objects.equals(name, that.name)
+					&& Objects.equals(borough, that.borough);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, borough, violations);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateScrollTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateScrollTests.java
new file mode 100644
index 0000000000..0e6e94bdf7
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateScrollTests.java
@@ -0,0 +1,255 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import reactor.test.StepVerifier;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
+
+import com.mongodb.reactivestreams.client.MongoClient;
+
+/**
+ * Integration tests for {@link Window} queries.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoClientExtension.class)
+class ReactiveMongoTemplateScrollTests {
+
+	static @Client MongoClient client;
+
+	public static final String DB_NAME = "mongo-template-scroll-tests";
+
+	ConfigurableApplicationContext context = new GenericApplicationContext();
+
+	private ReactiveMongoTestTemplate template = new ReactiveMongoTestTemplate(cfg -> {
+
+		cfg.configureDatabaseFactory(it -> {
+
+			it.client(client);
+			it.defaultDb(DB_NAME);
+		});
+
+		cfg.configureApplicationContext(it -> {
+			it.applicationContext(context);
+		});
+	});
+
+	@BeforeEach
+	void setUp() {
+
+		template.remove(Person.class).all() //
+				.as(StepVerifier::create) //
+				.expectNextCount(1) //
+				.verifyComplete();
+
+		template.remove(WithRenamedField.class).all() //
+				.as(StepVerifier::create) //
+				.expectNextCount(1) //
+				.verifyComplete();
+	}
+
+	@ParameterizedTest // GH-4308
+	@MethodSource("positions")
+	public <T> void shouldApplyCursoringCorrectly(ScrollPosition scrollPosition, Class<T> resultType,
+			Function<Person, T> assertionConverter) {
+
+		Person john20 = new Person("John", 20);
+		Person john40_1 = new Person("John", 40);
+		Person john40_2 = new Person("John", 40);
+		Person jane_20 = new Person("Jane", 20);
+		Person jane_40 = new Person("Jane", 40);
+		Person jane_42 = new Person("Jane", 42);
+
+		template.insertAll(Arrays.asList(john20, john40_1, john40_2, jane_20, jane_40, jane_42)) //
+				.as(StepVerifier::create) //
+				.expectNextCount(6) //
+				.verifyComplete();
+
+		Query q = new Query(where("firstName").regex("J.*")).with(Sort.by("firstName", "age")).limit(2);
+		q.with(scrollPosition);
+
+		Window<T> window = template.scroll(q, resultType, "person").block(Duration.ofSeconds(10));
+
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+		assertThat(window).hasSize(2);
+		assertThat(window).containsOnly(assertionConverter.apply(jane_20), assertionConverter.apply(jane_40));
+
+		window = template.scroll(q.limit(3).with(window.positionAt(window.size() - 1)), resultType, "person")
+				.block(Duration.ofSeconds(10));
+
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+		assertThat(window).hasSize(3);
+		assertThat(window).contains(assertionConverter.apply(jane_42), assertionConverter.apply(john20));
+		assertThat(window).containsAnyOf(assertionConverter.apply(john40_1), assertionConverter.apply(john40_2));
+
+		window = template.scroll(q.limit(1).with(window.positionAt(window.size() - 1)), resultType, "person")
+				.block(Duration.ofSeconds(10));
+
+		assertThat(window.hasNext()).isFalse();
+		assertThat(window.isLast()).isTrue();
+		assertThat(window).hasSize(1);
+		assertThat(window).containsAnyOf(assertionConverter.apply(john40_1), assertionConverter.apply(john40_2));
+	}
+
+	@ParameterizedTest // GH-4308
+	@MethodSource("renamedFieldProjectTargets")
+	<T> void scrollThroughResultsWithRenamedField(Class<T> resultType, Function<WithRenamedField, T> assertionConverter) {
+
+		WithRenamedField one = new WithRenamedField("id-1", "v1", null);
+		WithRenamedField two = new WithRenamedField("id-2", "v2", null);
+		WithRenamedField three = new WithRenamedField("id-3", "v3", null);
+
+		template.insertAll(Arrays.asList(one, two, three)).as(StepVerifier::create).expectNextCount(3).verifyComplete();
+
+		Query q = new Query(where("value").regex("v.*")).with(Sort.by(Sort.Direction.DESC, "value")).limit(2);
+		q.with(ScrollPosition.keyset());
+
+		Window<T> window = template.query(WithRenamedField.class).as(resultType).matching(q)
+				.scroll(ScrollPosition.keyset()).block(Duration.ofSeconds(10));
+
+		assertThat(window.hasNext()).isTrue();
+		assertThat(window.isLast()).isFalse();
+		assertThat(window).hasSize(2);
+		assertThat(window).containsOnly(assertionConverter.apply(three), assertionConverter.apply(two));
+
+		window = template.query(WithRenamedField.class).as(resultType).matching(q)
+				.scroll(window.positionAt(window.size() - 1)).block(Duration.ofSeconds(10));
+
+		assertThat(window.hasNext()).isFalse();
+		assertThat(window.isLast()).isTrue();
+		assertThat(window).hasSize(1);
+		assertThat(window).containsOnly(assertionConverter.apply(one));
+	}
+
+	static Stream<Arguments> positions() {
+
+		return Stream.of(args(ScrollPosition.keyset(), Person.class, Function.identity()), //
+				args(ScrollPosition.keyset(), Document.class, ReactiveMongoTemplateScrollTests::toDocument), //
+				args(ScrollPosition.offset(), Person.class, Function.identity()));
+	}
+
+	static Stream<Arguments> renamedFieldProjectTargets() {
+		return Stream.of(Arguments.of(WithRenamedField.class, Function.identity()),
+				Arguments.of(Document.class, new Function<WithRenamedField, Document>() {
+					@Override
+					public Document apply(WithRenamedField withRenamedField) {
+						return new Document("_id", withRenamedField.getId()).append("_val", withRenamedField.getValue())
+								.append("_class", WithRenamedField.class.getName());
+					}
+				}));
+	}
+
+	private static <T> Arguments args(ScrollPosition scrollPosition, Class<T> resultType,
+			Function<Person, T> assertionConverter) {
+		return Arguments.of(scrollPosition, resultType, assertionConverter);
+	}
+
+	static Document toDocument(Person person) {
+		return new Document("_class", person.getClass().getName()).append("_id", person.getId()).append("active", true)
+				.append("firstName", person.getFirstName()).append("age", person.getAge());
+	}
+
+	static class WithRenamedField {
+
+		String id;
+
+		@Field("_val") String value;
+
+		WithRenamedField nested;
+
+		public WithRenamedField() {}
+
+		public WithRenamedField(String id, String value, WithRenamedField nested) {
+			this.id = id;
+			this.value = value;
+			this.nested = nested;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public WithRenamedField getNested() {
+			return this.nested;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public void setNested(WithRenamedField nested) {
+			this.nested = nested;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithRenamedField that = (WithRenamedField) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value) && Objects.equals(nested, that.nested);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value, nested);
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateScrollTests.WithRenamedField(id=" + this.getId() + ", value=" + this.getValue()
+					+ ", nested=" + this.getNested() + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTests.java
index c921ba72df..f87227cdde 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,10 +20,6 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Wither;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -36,6 +32,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
@@ -43,19 +40,17 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.assertj.core.api.Assumptions;
 import org.bson.BsonDocument;
 import org.bson.BsonTimestamp;
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
@@ -66,6 +61,7 @@
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.mapping.MappingException;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoTemplateTests.Address;
 import org.springframework.data.mongodb.core.MongoTemplateTests.PersonWithConvertedId;
 import org.springframework.data.mongodb.core.MongoTemplateTests.VersionedPerson;
@@ -73,18 +69,23 @@
 import org.springframework.data.mongodb.core.index.GeospatialIndex;
 import org.springframework.data.mongodb.core.index.Index;
 import org.springframework.data.mongodb.core.index.IndexOperationsAdapter;
+import org.springframework.data.mongodb.core.mapping.MongoId;
 import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
 import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoServerCondition;
+import org.springframework.data.mongodb.test.util.ReactiveMongoTestTemplate;
 
 import com.mongodb.WriteConcern;
+import com.mongodb.reactivestreams.client.MongoClient;
+import com.mongodb.reactivestreams.client.MongoCollection;
 
 /**
  * Integration test for {@link MongoTemplate}.
@@ -92,35 +93,42 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:reactive-infrastructure.xml")
+@ExtendWith({ MongoClientExtension.class, MongoServerCondition.class })
 public class ReactiveMongoTemplateTests {
 
-	@Autowired SimpleReactiveMongoDatabaseFactory factory;
-	@Autowired ReactiveMongoTemplate template;
-	@Autowired ConfigurableApplicationContext context;
+	private static final String DB_NAME = "reactive-mongo-template-tests";
+	private static @Client MongoClient client;
 
-	@Before
-	public void setUp() {
+	private ConfigurableApplicationContext context = new GenericApplicationContext();
+	private ReactiveMongoTestTemplate template = new ReactiveMongoTestTemplate(cfg -> {
 
-		Flux.merge(template.dropCollection("people"), //
-				template.dropCollection("personX"), //
-				template.dropCollection("collection"), //
-				template.dropCollection(Person.class), //
-				template.dropCollection(Venue.class), //
-				template.dropCollection(PersonWithAList.class), //
-				template.dropCollection(PersonWithIdPropertyOfTypeObjectId.class), //
-				template.dropCollection(PersonWithVersionPropertyOfTypeInteger.class), //
-				template.dropCollection(Sample.class), //
-				template.dropCollection(MyPerson.class)) //
-				.as(StepVerifier::create).verifyComplete();
+		cfg.configureDatabaseFactory(it -> {
+
+			it.client(client);
+			it.defaultDb(DB_NAME);
+		});
+
+		cfg.configureApplicationContext(it -> {
+			it.applicationContext(context);
+		});
+	});
+
+	@BeforeEach
+	void setUp() {
+
+		template
+				.flush(Person.class, MyPerson.class, Sample.class, Venue.class, PersonWithVersionPropertyOfTypeInteger.class,
+						RawStringId.class) //
+				.as(StepVerifier::create) //
+				.verifyComplete();
+
+		template.flush("people", "collection", "personX", "unique_person").as(StepVerifier::create).verifyComplete();
 	}
 
-	@After
-	public void cleanUp() {}
+	private ReactiveMongoDatabaseFactory factory = template.getDatabaseFactory();
 
 	@Test // DATAMONGO-1444
-	public void insertSetsId() {
+	void insertSetsId() {
 
 		PersonWithAList person = new PersonWithAList();
 		assert person.getId() == null;
@@ -134,7 +142,7 @@ public void insertSetsId() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertAllSetsId() {
+	void insertAllSetsId() {
 
 		PersonWithAList person = new PersonWithAList();
 
@@ -147,7 +155,7 @@ public void insertAllSetsId() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertCollectionSetsId() {
+	void insertCollectionSetsId() {
 
 		PersonWithAList person = new PersonWithAList();
 
@@ -159,8 +167,21 @@ public void insertCollectionSetsId() {
 		assertThat(person.getId()).isNotNull();
 	}
 
+	@Test // GH-4944
+	void insertAllShouldConvertIdToTargetTypeBeforeSave() {
+
+		RawStringId walter = new RawStringId();
+		walter.value = "walter";
+
+		RawStringId returned = template.insertAll(List.of(walter)).blockLast();
+		template.execute(RawStringId.class, MongoCollection::find) //
+				.as(StepVerifier::create) //
+				.consumeNextWith(actual -> assertThat(returned.id).isEqualTo(actual.get("_id"))) //
+				.verifyComplete();
+	}
+
 	@Test // DATAMONGO-1444
-	public void saveSetsId() {
+	void saveSetsId() {
 
 		PersonWithAList person = new PersonWithAList();
 		assert person.getId() == null;
@@ -173,8 +194,61 @@ public void saveSetsId() {
 		assertThat(person.getId()).isNotNull();
 	}
 
+	@Test // GH-4026
+	void saveShouldGenerateNewIdOfTypeIfExplicitlyDefined() {
+
+		RawStringId source = new RawStringId();
+		source.value = "new value";
+
+		template.save(source).then().as(StepVerifier::create).verifyComplete();
+
+		template.execute(RawStringId.class, collection -> {
+			return collection.find(new org.bson.Document()).first();
+		}) //
+				.map(it -> it.get("_id")) //
+				.as(StepVerifier::create) //
+				.consumeNextWith(id -> {
+					assertThat(id).isInstanceOf(String.class);
+				}).verifyComplete();
+	}
+
+	@Test // GH-4026
+	void insertShouldGenerateNewIdOfTypeIfExplicitlyDefined() {
+
+		RawStringId source = new RawStringId();
+		source.value = "new value";
+
+		template.insert(source).then().as(StepVerifier::create).verifyComplete();
+
+		template.execute(RawStringId.class, collection -> {
+					return collection.find(new org.bson.Document()).first();
+				}) //
+				.map(it -> it.get("_id")) //
+				.as(StepVerifier::create) //
+				.consumeNextWith(id -> {
+					assertThat(id).isInstanceOf(String.class);
+				}).verifyComplete();
+	}
+
+	@Test // GH-4184
+	void insertHonorsExistingRawId() {
+
+		MongoTemplateTests.RawStringId source = new MongoTemplateTests.RawStringId();
+		source.id = "abc";
+		source.value = "new value";
+
+		template.insert(source)
+				.then(template.execute(db -> Flux.from(
+						db.getCollection(template.getCollectionName(MongoTemplateTests.RawStringId.class)).find().limit(1).first()))
+						.next())
+				.as(StepVerifier::create).consumeNextWith(result -> {
+					assertThat(result).isNotNull();
+					assertThat(result.get("_id")).isEqualTo("abc");
+				});
+	}
+
 	@Test // DATAMONGO-1444
-	public void insertsSimpleEntityCorrectly() {
+	void insertsSimpleEntityCorrectly() {
 
 		Person person = new Person("Mark");
 		person.setAge(35);
@@ -190,7 +264,7 @@ public void insertsSimpleEntityCorrectly() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void simpleInsertDoesNotAllowArrays() {
+	void simpleInsertDoesNotAllowArrays() {
 
 		Person person = new Person("Mark");
 		person.setAge(35);
@@ -199,7 +273,7 @@ public void simpleInsertDoesNotAllowArrays() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void simpleInsertDoesNotAllowCollections() {
+	void simpleInsertDoesNotAllowCollections() {
 
 		Person person = new Person("Mark");
 		person.setAge(35);
@@ -208,7 +282,7 @@ public void simpleInsertDoesNotAllowCollections() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertsSimpleEntityWithSuppliedCollectionNameCorrectly() {
+	void insertsSimpleEntityWithSuppliedCollectionNameCorrectly() {
 
 		Person person = new Person("Homer");
 		person.setAge(35);
@@ -224,7 +298,7 @@ public void insertsSimpleEntityWithSuppliedCollectionNameCorrectly() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertBatchCorrectly() {
+	void insertBatchCorrectly() {
 
 		List<Person> people = Arrays.asList(new Person("Dick", 22), new Person("Harry", 23), new Person("Tom", 21));
 
@@ -235,12 +309,12 @@ public void insertBatchCorrectly() {
 
 		template.find(new Query().with(Sort.by("firstname")), Person.class) //
 				.as(StepVerifier::create) //
-				.expectNextSequence(people) //
+				.expectNextCount(3) ///
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertBatchWithSuppliedCollectionNameCorrectly() {
+	void insertBatchWithSuppliedCollectionNameCorrectly() {
 
 		List<Person> people = Arrays.asList(new Person("Dick", 22), new Person("Harry", 23), new Person("Tom", 21));
 
@@ -251,12 +325,12 @@ public void insertBatchWithSuppliedCollectionNameCorrectly() {
 
 		template.find(new Query().with(Sort.by("firstname")), Person.class, "people") //
 				.as(StepVerifier::create) //
-				.expectNextSequence(people) //
+				.expectNextCount(3) //
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertBatchWithSuppliedEntityTypeCorrectly() {
+	void insertBatchWithSuppliedEntityTypeCorrectly() {
 
 		List<Person> people = Arrays.asList(new Person("Dick", 22), new Person("Harry", 23), new Person("Tom", 21));
 
@@ -267,12 +341,12 @@ public void insertBatchWithSuppliedEntityTypeCorrectly() {
 
 		template.find(new Query().with(Sort.by("firstname")), Person.class) //
 				.as(StepVerifier::create) //
-				.expectNextSequence(people) //
+				.expectNextCount(3) //
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void testAddingToList() {
+	void testAddingToList() {
 
 		PersonWithAList person = createPersonWithAList("Sven", 22);
 		template.insert(person) //
@@ -289,7 +363,7 @@ public void testAddingToList() {
 					assertThat(actual.getWishList()).isEmpty();
 				}).verifyComplete();
 
-		person.addToWishList("please work!");
+		person.addToWishList("please work");
 
 		template.save(person).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -317,7 +391,7 @@ public void testAddingToList() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void testFindOneWithSort() {
+	void testFindOneWithSort() {
 
 		PersonWithAList sven = createPersonWithAList("Sven", 22);
 		PersonWithAList erik = createPersonWithAList("Erik", 21);
@@ -341,7 +415,7 @@ public void testFindOneWithSort() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void bogusUpdateDoesNotTriggerException() {
+	void bogusUpdateDoesNotTriggerException() {
 
 		ReactiveMongoTemplate mongoTemplate = new ReactiveMongoTemplate(factory);
 		mongoTemplate.setWriteResultChecking(WriteResultChecking.EXCEPTION);
@@ -362,7 +436,7 @@ public void bogusUpdateDoesNotTriggerException() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void updateFirstByEntityTypeShouldUpdateObject() {
+	void updateFirstByEntityTypeShouldUpdateObject() {
 
 		Person person = new Person("Oliver2", 25);
 		template.insert(person) //
@@ -376,7 +450,7 @@ public void updateFirstByEntityTypeShouldUpdateObject() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void updateFirstByCollectionNameShouldUpdateObjects() {
+	void updateFirstByCollectionNameShouldUpdateObjects() {
 
 		Person person = new Person("Oliver2", 25);
 		template.insert(person, "people") //
@@ -390,7 +464,7 @@ public void updateFirstByCollectionNameShouldUpdateObjects() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void updateMultiByEntityTypeShouldUpdateObjects() {
+	void updateMultiByEntityTypeShouldUpdateObjects() {
 
 		Query query = new Query(
 				new Criteria().orOperator(where("firstName").is("Walter Jr"), where("firstName").is("Walter")));
@@ -406,7 +480,7 @@ public void updateMultiByEntityTypeShouldUpdateObjects() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void updateMultiByCollectionNameShouldUpdateObject() {
+	void updateMultiByCollectionNameShouldUpdateObject() {
 
 		Query query = new Query(
 				new Criteria().orOperator(where("firstName").is("Walter Jr"), where("firstName").is("Walter")));
@@ -427,7 +501,7 @@ public void updateMultiByCollectionNameShouldUpdateObject() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void throwsExceptionForDuplicateIds() {
+	void throwsExceptionForDuplicateIds() {
 
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(factory);
 		template.setWriteResultChecking(WriteResultChecking.EXCEPTION);
@@ -447,7 +521,7 @@ public void throwsExceptionForDuplicateIds() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void throwsExceptionForUpdateWithInvalidPushOperator() {
+	void throwsExceptionForUpdateWithInvalidPushOperator() {
 
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(factory);
 		template.setWriteResultChecking(WriteResultChecking.EXCEPTION);
@@ -470,7 +544,7 @@ public void throwsExceptionForUpdateWithInvalidPushOperator() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void rejectsDuplicateIdInInsertAll() {
+	void rejectsDuplicateIdInInsertAll() {
 
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(factory);
 		template.setWriteResultChecking(WriteResultChecking.EXCEPTION);
@@ -485,7 +559,7 @@ public void rejectsDuplicateIdInInsertAll() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void testFindAndUpdate() {
+	void testFindAndUpdate() {
 
 		template.insertAll(Arrays.asList(new Person("Tom", 21), new Person("Dick", 22), new Person("Harry", 23))) //
 				.as(StepVerifier::create) //
@@ -522,7 +596,7 @@ public void testFindAndUpdate() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldReplaceDocument() {
+	void findAndReplaceShouldReplaceDocument() {
 
 		org.bson.Document doc = new org.bson.Document("foo", "bar");
 		template.save(doc, "findandreplace").as(StepVerifier::create).expectNextCount(1).verifyComplete();
@@ -543,7 +617,7 @@ public void findAndReplaceShouldReplaceDocument() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldErrorOnIdPresent() {
+	void findAndReplaceShouldErrorOnIdPresent() {
 
 		template.save(new MyPerson("Walter")).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -556,21 +630,21 @@ public void findAndReplaceShouldErrorOnIdPresent() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldErrorOnSkip() {
+	void findAndReplaceShouldErrorOnSkip() {
 
 		assertThatIllegalArgumentException().isThrownBy(() -> template
 				.findAndReplace(query(where("name").is("Walter")).skip(10), new MyPerson("Heisenberg")).subscribe());
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldErrorOnLimit() {
+	void findAndReplaceShouldErrorOnLimit() {
 
 		assertThatIllegalArgumentException().isThrownBy(() -> template
 				.findAndReplace(query(where("name").is("Walter")).limit(10), new MyPerson("Heisenberg")).subscribe());
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldConsiderSortAndUpdateFirstIfMultipleFound() {
+	void findAndReplaceShouldConsiderSortAndUpdateFirstIfMultipleFound() {
 
 		MyPerson walter1 = new MyPerson("Walter 1");
 		MyPerson walter2 = new MyPerson("Walter 2");
@@ -587,7 +661,7 @@ public void findAndReplaceShouldConsiderSortAndUpdateFirstIfMultipleFound() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldReplaceObject() {
+	void findAndReplaceShouldReplaceObject() {
 
 		MyPerson person = new MyPerson("Walter");
 		template.save(person) //
@@ -606,7 +680,7 @@ public void findAndReplaceShouldReplaceObject() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldConsiderFields() {
+	void findAndReplaceShouldConsiderFields() {
 
 		MyPerson person = new MyPerson("Walter");
 		person.address = new Address("TX", "Austin");
@@ -628,7 +702,7 @@ public void findAndReplaceShouldConsiderFields() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceNonExistingWithUpsertFalse() {
+	void findAndReplaceNonExistingWithUpsertFalse() {
 
 		template.findAndReplace(query(where("name").is("Walter")), new MyPerson("Heisenberg")) //
 				.as(StepVerifier::create) //
@@ -638,7 +712,7 @@ public void findAndReplaceNonExistingWithUpsertFalse() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceNonExistingWithUpsertTrue() {
+	void findAndReplaceNonExistingWithUpsertTrue() {
 
 		template
 				.findAndReplace(query(where("name").is("Walter")), new MyPerson("Heisenberg"),
@@ -650,7 +724,7 @@ public void findAndReplaceNonExistingWithUpsertTrue() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldProjectReturnedObjectCorrectly() {
+	void findAndReplaceShouldProjectReturnedObjectCorrectly() {
 
 		MyPerson person = new MyPerson("Walter");
 		template.save(person) //
@@ -667,8 +741,34 @@ public void findAndReplaceShouldProjectReturnedObjectCorrectly() {
 				}).verifyComplete();
 	}
 
+	@Test // GH-4300
+	public void findAndReplaceShouldAllowNativeDomainTypesAndReturnAProjection() {
+
+		MongoTemplateTests.MyPerson person = new MongoTemplateTests.MyPerson("Walter");
+		person.address = new Address("TX", "Austin");
+		template.save(person) //
+				.as(StepVerifier::create) //
+				.expectNextCount(1) //
+				.verifyComplete();
+
+		template
+				.findAndReplace(query(where("name").is("Walter")), new org.bson.Document("name", "Heisenberg"),
+						FindAndReplaceOptions.options(), org.bson.Document.class, "myPerson", MongoTemplateTests.MyPerson.class)
+				.as(StepVerifier::create) //
+				.consumeNextWith(actual -> {
+					assertThat(actual.getAddress()).isEqualTo(person.address);
+				}).verifyComplete();
+
+		template.execute(MongoTemplateTests.MyPerson.class, collection -> {
+			return collection.find(new org.bson.Document("name", "Heisenberg")).first();
+		}).as(StepVerifier::create) //
+				.consumeNextWith(loaded -> {
+					assertThat(loaded.get("_id")).isEqualTo(new ObjectId(person.id));
+				}).verifyComplete();
+	}
+
 	@Test // DATAMONGO-1827
-	public void findAndReplaceShouldReplaceObjectReturingNew() {
+	void findAndReplaceShouldReplaceObjectReturingNew() {
 
 		MyPerson person = new MyPerson("Walter");
 		template.save(person) //
@@ -686,7 +786,7 @@ public void findAndReplaceShouldReplaceObjectReturingNew() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void testFindAllAndRemoveFullyReturnsAndRemovesDocuments() {
+	void testFindAllAndRemoveFullyReturnsAndRemovesDocuments() {
 
 		Sample spring = new Sample("100", "spring");
 		Sample data = new Sample("200", "data");
@@ -711,7 +811,7 @@ public void testFindAllAndRemoveFullyReturnsAndRemovesDocuments() {
 	}
 
 	@Test // DATAMONGO-2219
-	public void testFindAllAndRemoveReturnsEmptyWithoutMatches() {
+	void testFindAllAndRemoveReturnsEmptyWithoutMatches() {
 
 		Query qry = query(where("field").in("spring", "mongodb"));
 		template.findAllAndRemove(qry, Sample.class) //
@@ -724,7 +824,7 @@ public void testFindAllAndRemoveReturnsEmptyWithoutMatches() {
 	}
 
 	@Test // DATAMONGO-1774
-	public void testFindAllAndRemoveByCollectionReturnsAndRemovesDocuments() {
+	void testFindAllAndRemoveByCollectionReturnsAndRemovesDocuments() {
 
 		Sample spring = new Sample("100", "spring");
 		Sample data = new Sample("200", "data");
@@ -749,12 +849,12 @@ public void testFindAllAndRemoveByCollectionReturnsAndRemovesDocuments() {
 	}
 
 	@Test // DATAMONGO-1774
-	public void removeWithNullShouldThrowError() {
+	void removeWithNullShouldThrowError() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.remove((Object) null).subscribe());
 	}
 
 	@Test // DATAMONGO-1774
-	public void removeWithEmptyMonoShouldDoNothing() {
+	void removeWithEmptyMonoShouldDoNothing() {
 
 		Sample spring = new Sample("100", "spring");
 		Sample data = new Sample("200", "data");
@@ -773,7 +873,7 @@ public void removeWithEmptyMonoShouldDoNothing() {
 	}
 
 	@Test // DATAMONGO-1774
-	public void removeWithMonoShouldDeleteElement() {
+	void removeWithMonoShouldDeleteElement() {
 
 		Sample spring = new Sample("100", "spring");
 		Sample data = new Sample("200", "data");
@@ -789,7 +889,7 @@ public void removeWithMonoShouldDeleteElement() {
 	}
 
 	@Test // DATAMONGO-1774
-	public void removeWithMonoAndCollectionShouldDeleteElement() {
+	void removeWithMonoAndCollectionShouldDeleteElement() {
 
 		Sample spring = new Sample("100", "spring");
 		Sample data = new Sample("200", "data");
@@ -807,7 +907,7 @@ public void removeWithMonoAndCollectionShouldDeleteElement() {
 	}
 
 	@Test // DATAMONGO-2195
-	public void removeVersionedEntityConsidersVersion() {
+	void removeVersionedEntityConsidersVersion() {
 
 		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
 		person.firstName = "Dave";
@@ -837,7 +937,7 @@ public void removeVersionedEntityConsidersVersion() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void optimisticLockingHandling() {
+	void optimisticLockingHandling() {
 
 		// Init version
 		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
@@ -882,7 +982,7 @@ public void optimisticLockingHandling() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void doesNotFailOnVersionInitForUnversionedEntity() {
+	void doesNotFailOnVersionInitForUnversionedEntity() {
 
 		Document dbObject = new Document();
 		dbObject.put("firstName", "Oliver");
@@ -895,7 +995,7 @@ public void doesNotFailOnVersionInitForUnversionedEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void removesObjectFromExplicitCollection() {
+	void removesObjectFromExplicitCollection() {
 
 		String collectionName = "explicit";
 		template.remove(new Query(), collectionName).as(StepVerifier::create).expectNextCount(1).verifyComplete();
@@ -918,7 +1018,7 @@ public void removesObjectFromExplicitCollection() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void savesMapCorrectly() {
+	void savesMapCorrectly() {
 
 		Map<String, String> map = new HashMap<>();
 		map.put("key", "value");
@@ -931,12 +1031,12 @@ public void savesMapCorrectly() {
 
 	@Test
 	// DATAMONGO-1444, DATAMONGO-1730, DATAMONGO-2150
-	public void savesMongoPrimitiveObjectCorrectly() {
+	void savesMongoPrimitiveObjectCorrectly() {
 		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> template.save(new Object(), "collection"));
 	}
 
 	@Test // DATAMONGO-1444
-	public void savesPlainDbObjectCorrectly() {
+	void savesPlainDbObjectCorrectly() {
 
 		Document dbObject = new Document("foo", "bar");
 
@@ -948,8 +1048,8 @@ public void savesPlainDbObjectCorrectly() {
 		assertThat(dbObject.containsKey("_id")).isTrue();
 	}
 
-	@Test(expected = MappingException.class) // DATAMONGO-1444, DATAMONGO-1730
-	public void rejectsPlainObjectWithOutExplicitCollection() {
+	@Test // DATAMONGO-1444, DATAMONGO-1730
+	void rejectsPlainObjectWithOutExplicitCollection() {
 
 		Document dbObject = new Document("foo", "bar");
 
@@ -958,13 +1058,12 @@ public void rejectsPlainObjectWithOutExplicitCollection() {
 				.expectNextCount(1) //
 				.verifyComplete();
 
-		template.findById(dbObject.get("_id"), Document.class) //
-				.as(StepVerifier::create) //
-				.verifyError(MappingException.class);
+		assertThatExceptionOfType(MappingException.class)
+				.isThrownBy(() -> template.findById(dbObject.get("_id"), Document.class));
 	}
 
 	@Test // DATAMONGO-1444
-	public void readsPlainDbObjectById() {
+	void readsPlainDbObjectById() {
 
 		Document dbObject = new Document("foo", "bar");
 		template.save(dbObject, "collection") //
@@ -982,7 +1081,7 @@ public void readsPlainDbObjectById() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void geoNear() {
+	void geoNear() {
 
 		List<Venue> venues = Arrays.asList(TestEntities.geolocation().pennStation(), //
 				TestEntities.geolocation().tenGenOffice(), //
@@ -997,14 +1096,14 @@ public void geoNear() {
 		IndexOperationsAdapter.blocking(template.indexOps(Venue.class))
 				.ensureIndex(new GeospatialIndex("location").typed(GeoSpatialIndexType.GEO_2D));
 
-		NearQuery geoFar = NearQuery.near(-73, 40, Metrics.KILOMETERS).num(10).maxDistance(150, Metrics.KILOMETERS);
+		NearQuery geoFar = NearQuery.near(-73, 40, Metrics.KILOMETERS).limit(10).maxDistance(150, Metrics.KILOMETERS);
 
 		template.geoNear(geoFar, Venue.class) //
 				.as(StepVerifier::create) //
 				.expectNextCount(4) //
 				.verifyComplete();
 
-		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).num(10).maxDistance(120, Metrics.KILOMETERS);
+		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).limit(10).maxDistance(120, Metrics.KILOMETERS);
 
 		template.geoNear(geoNear, Venue.class) //
 				.as(StepVerifier::create) //
@@ -1013,7 +1112,7 @@ public void geoNear() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void writesPlainString() {
+	void writesPlainString() {
 
 		template.save("{ 'foo' : 'bar' }", "collection") //
 				.as(StepVerifier::create) //
@@ -1022,12 +1121,12 @@ public void writesPlainString() {
 	}
 
 	@Test // DATAMONGO-1444, DATAMONGO-2150
-	public void rejectsNonJsonStringForSave() {
-		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> template.save("Foobar!", "collection"));
+	void rejectsNonJsonStringForSave() {
+		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> template.save("Foobar", "collection"));
 	}
 
 	@Test // DATAMONGO-1444
-	public void initializesVersionOnInsert() {
+	void initializesVersionOnInsert() {
 
 		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
 		person.firstName = "Dave";
@@ -1041,7 +1140,7 @@ public void initializesVersionOnInsert() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void initializesVersionOnBatchInsert() {
+	void initializesVersionOnBatchInsert() {
 
 		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
 		person.firstName = "Dave";
@@ -1055,7 +1154,7 @@ public void initializesVersionOnBatchInsert() {
 	}
 
 	@Test // DATAMONGO-1992
-	public void initializesIdAndVersionAndOfImmutableObject() {
+	void initializesIdAndVersionAndOfImmutableObject() {
 
 		ImmutableVersioned versioned = new ImmutableVersioned();
 
@@ -1074,7 +1173,7 @@ public void initializesIdAndVersionAndOfImmutableObject() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void queryCanBeNull() {
+	void queryCanBeNull() {
 
 		template.findAll(PersonWithIdPropertyOfTypeObjectId.class) //
 				.as(StepVerifier::create) //
@@ -1086,7 +1185,7 @@ public void queryCanBeNull() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void versionsObjectIntoDedicatedCollection() {
+	void versionsObjectIntoDedicatedCollection() {
 
 		PersonWithVersionPropertyOfTypeInteger person = new PersonWithVersionPropertyOfTypeInteger();
 		person.firstName = "Dave";
@@ -1105,7 +1204,7 @@ public void versionsObjectIntoDedicatedCollection() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void correctlySetsLongVersionProperty() {
+	void correctlySetsLongVersionProperty() {
 
 		PersonWithVersionPropertyOfTypeLong person = new PersonWithVersionPropertyOfTypeLong();
 		person.firstName = "Dave";
@@ -1118,11 +1217,11 @@ public void correctlySetsLongVersionProperty() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void throwsExceptionForIndexViolationIfConfigured() {
+	void throwsExceptionForIndexViolationIfConfigured() {
 
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(factory);
 		template.setWriteResultChecking(WriteResultChecking.EXCEPTION);
-		template.indexOps(Person.class) //
+		template.indexOps("unique_person") //
 				.ensureIndex(new Index().on("firstName", Direction.DESC).unique()) //
 				.as(StepVerifier::create) //
 				.expectNextCount(1) //
@@ -1131,7 +1230,7 @@ public void throwsExceptionForIndexViolationIfConfigured() {
 		Person person = new Person(new ObjectId(), "Amol");
 		person.setAge(28);
 
-		template.save(person) //
+		template.save(person, "unique_person") //
 				.as(StepVerifier::create) //
 				.expectNextCount(1) //
 				.verifyComplete();
@@ -1139,13 +1238,16 @@ public void throwsExceptionForIndexViolationIfConfigured() {
 		person = new Person(new ObjectId(), "Amol");
 		person.setAge(28);
 
-		template.save(person) //
+		template.save(person, "unique_person") //
 				.as(StepVerifier::create) //
 				.verifyError(DataIntegrityViolationException.class);
+
+		// safeguard to clean up previous state
+		template.dropCollection(Person.class).as(StepVerifier::create).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void preventsDuplicateInsert() {
+	void preventsDuplicateInsert() {
 
 		template.setWriteConcern(WriteConcern.MAJORITY);
 
@@ -1165,7 +1267,7 @@ public void preventsDuplicateInsert() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void countAndFindWithoutTypeInformation() {
+	void countAndFindWithoutTypeInformation() {
 
 		Person person = new Person();
 		template.save(person) //
@@ -1188,7 +1290,7 @@ public void countAndFindWithoutTypeInformation() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void nullsPropertiesForVersionObjectUpdates() {
+	void nullsPropertiesForVersionObjectUpdates() {
 
 		VersionedPerson person = new VersionedPerson();
 		person.firstname = "Dave";
@@ -1217,7 +1319,7 @@ public void nullsPropertiesForVersionObjectUpdates() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void nullsValuesForUpdatesOfUnversionedEntity() {
+	void nullsValuesForUpdatesOfUnversionedEntity() {
 
 		Person person = new Person("Dave");
 		template.save(person). //
@@ -1241,7 +1343,7 @@ public void nullsValuesForUpdatesOfUnversionedEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void savesJsonStringCorrectly() {
+	void savesJsonStringCorrectly() {
 
 		Document dbObject = new Document().append("first", "first").append("second", "second");
 
@@ -1260,7 +1362,7 @@ public void savesJsonStringCorrectly() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void executesExistsCorrectly() {
+	void executesExistsCorrectly() {
 
 		Sample sample = new Sample();
 		template.save(sample).as(StepVerifier::create).expectNextCount(1).verifyComplete();
@@ -1283,7 +1385,7 @@ public void executesExistsCorrectly() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void tailStreamsData() throws InterruptedException {
+	void tailStreamsData() throws InterruptedException {
 
 		template.dropCollection("capped").then(template.createCollection("capped", //
 				CollectionOptions.empty().size(1000).maxDocuments(10).capped()))
@@ -1305,7 +1407,7 @@ public void tailStreamsData() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1444
-	public void tailStreamsDataUntilCancellation() throws InterruptedException {
+	void tailStreamsDataUntilCancellation() throws InterruptedException {
 
 		template.dropCollection("capped").then(template.createCollection("capped", //
 				CollectionOptions.empty().size(1000).maxDocuments(10).capped()))
@@ -1341,7 +1443,7 @@ public void tailStreamsDataUntilCancellation() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1761
-	public void testDistinct() {
+	void testDistinct() {
 
 		Person person1 = new Person("Christoph", 38);
 		Person person2 = new Person("Christine", 39);
@@ -1359,10 +1461,9 @@ public void testDistinct() {
 	}
 
 	@Test // DATAMONGO-1803
-	@Ignore("Heavily relying on timing assumptions. Cannot test message resumption properly. Too much race for too little time in between.")
-	public void changeStreamEventsShouldBeEmittedCorrectly() throws InterruptedException {
-
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@Disabled("Heavily relying on timing assumptions; Cannot test message resumption properly; Too much race for too little time in between.")
+	@EnableIfReplicaSetAvailable
+	void changeStreamEventsShouldBeEmittedCorrectly() throws InterruptedException {
 
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -1392,10 +1493,9 @@ public void changeStreamEventsShouldBeEmittedCorrectly() throws InterruptedExcep
 	}
 
 	@Test // DATAMONGO-1803
-	@Ignore("Heavily relying on timing assumptions. Cannot test message resumption properly. Too much race for too little time in between.")
-	public void changeStreamEventsShouldBeConvertedCorrectly() throws InterruptedException {
-
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@Disabled("Heavily relying on timing assumptions; Cannot test message resumption properly; Too much race for too little time in between.")
+	@EnableIfReplicaSetAvailable
+	void changeStreamEventsShouldBeConvertedCorrectly() throws InterruptedException {
 
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -1425,10 +1525,9 @@ public void changeStreamEventsShouldBeConvertedCorrectly() throws InterruptedExc
 	}
 
 	@Test // DATAMONGO-1803
-	@Ignore("Heavily relying on timing assumptions. Cannot test message resumption properly. Too much race for too little time in between.")
-	public void changeStreamEventsShouldBeFilteredCorrectly() throws InterruptedException {
-
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@Disabled("Heavily relying on timing assumptions; Cannot test message resumption properly; Too much race for too little time in between.")
+	@EnableIfReplicaSetAvailable
+	void changeStreamEventsShouldBeFilteredCorrectly() throws InterruptedException {
 
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -1459,10 +1558,10 @@ public void changeStreamEventsShouldBeFilteredCorrectly() throws InterruptedExce
 	}
 
 	@Test // DATAMONGO-1803
-	public void mapsReservedWordsCorrectly() throws InterruptedException {
-
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@EnableIfReplicaSetAvailable
+	void mapsReservedWordsCorrectly() throws InterruptedException {
 
+		template.dropCollection(Person.class).onErrorResume(it -> Mono.empty()).as(StepVerifier::create).verifyComplete();
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
 		BlockingQueue<ChangeStreamEvent<Person>> documents = new LinkedBlockingQueue<>(100);
@@ -1502,10 +1601,9 @@ public void mapsReservedWordsCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1803
-	@Ignore("Heavily relying on timing assumptions. Cannot test message resumption properly. Too much race for too little time in between.")
-	public void changeStreamEventsShouldBeResumedCorrectly() throws InterruptedException {
-
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@Disabled("Heavily relying on timing assumptions; Cannot test message resumption properly; Too much race for too little time in between.")
+	@EnableIfReplicaSetAvailable
+	void changeStreamEventsShouldBeResumedCorrectly() throws InterruptedException {
 
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -1546,7 +1644,7 @@ public void changeStreamEventsShouldBeResumedCorrectly() throws InterruptedExcep
 	}
 
 	@Test // DATAMONGO-1870
-	public void removeShouldConsiderLimit() {
+	void removeShouldConsiderLimit() {
 
 		List<Sample> samples = IntStream.range(0, 100) //
 				.mapToObj(i -> new Sample("id-" + i, i % 2 == 0 ? "stark" : "lannister")) //
@@ -1563,7 +1661,7 @@ public void removeShouldConsiderLimit() {
 	}
 
 	@Test // DATAMONGO-1870
-	public void removeShouldConsiderSkipAndSort() {
+	void removeShouldConsiderSkipAndSort() {
 
 		List<Sample> samples = IntStream.range(0, 100) //
 				.mapToObj(i -> new Sample("id-" + i, i % 2 == 0 ? "stark" : "lannister")) //
@@ -1582,8 +1680,7 @@ public void removeShouldConsiderSkipAndSort() {
 	}
 
 	@Test // DATAMONGO-2189
-	@DirtiesContext
-	public void afterSaveEventContainsSavedObjectUsingInsert() {
+	void afterSaveEventContainsSavedObjectUsingInsert() {
 
 		AtomicReference<ImmutableVersioned> saved = createAfterSaveReference();
 		ImmutableVersioned source = new ImmutableVersioned();
@@ -1598,8 +1695,7 @@ public void afterSaveEventContainsSavedObjectUsingInsert() {
 	}
 
 	@Test // DATAMONGO-2189
-	@DirtiesContext
-	public void afterSaveEventContainsSavedObjectUsingInsertAll() {
+	void afterSaveEventContainsSavedObjectUsingInsertAll() {
 
 		AtomicReference<ImmutableVersioned> saved = createAfterSaveReference();
 		ImmutableVersioned source = new ImmutableVersioned();
@@ -1613,11 +1709,28 @@ public void afterSaveEventContainsSavedObjectUsingInsertAll() {
 		assertThat(saved.get().id).isNotNull();
 	}
 
-	@Test // DATAMONGO-2012
-	public void watchesDatabaseCorrectly() throws InterruptedException {
+	@Test // GH-4107
+	void afterSaveEventCanBeDisabled() {
+
+		AtomicReference<ImmutableVersioned> saved = createAfterSaveReference();
+		ImmutableVersioned source = new ImmutableVersioned();
 
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+		template.setEntityLifecycleEventsEnabled(false);
+		template.insertAll(Collections.singleton(new ImmutableVersioned())) //
+				.as(StepVerifier::create) //
+				.expectNextCount(1) //
+				.verifyComplete();
+
+		assertThat(saved).hasValue(null);
+	}
+
+	@Test // DATAMONGO-2012
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+	@EnableIfReplicaSetAvailable
+	void watchesDatabaseCorrectly() throws InterruptedException {
 
+		template.dropCollection(Person.class).onErrorResume(it -> Mono.empty()).as(StepVerifier::create).verifyComplete();
+		template.dropCollection("personX").onErrorResume(it -> Mono.empty()).as(StepVerifier::create).verifyComplete();
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 		template.createCollection("personX").as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -1655,10 +1768,11 @@ public void watchesDatabaseCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-2012, DATAMONGO-2113
-	public void resumesAtTimestampCorrectly() throws InterruptedException {
-
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+	@EnableIfReplicaSetAvailable
+	void resumesAtTimestampCorrectly() throws InterruptedException {
 
+		template.dropCollection(Person.class).onErrorResume(it -> Mono.empty()).as(StepVerifier::create).verifyComplete();
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
 		BlockingQueue<ChangeStreamEvent<Person>> documents = new LinkedBlockingQueue<>(100);
@@ -1705,9 +1819,9 @@ public void resumesAtTimestampCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-2115
-	public void resumesAtBsonTimestampCorrectly() throws InterruptedException {
-
-		Assumptions.assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+	@EnableIfReplicaSetAvailable
+	void resumesAtBsonTimestampCorrectly() throws InterruptedException {
 
 		template.createCollection(Person.class).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
@@ -1770,48 +1884,190 @@ public void onAfterSave(AfterSaveEvent<ImmutableVersioned> event) {
 		return saved;
 	}
 
-	@AllArgsConstructor
-	@Wither
 	static class ImmutableVersioned {
 
 		final @Id String id;
 		final @Version Long version;
 
-		public ImmutableVersioned() {
+		ImmutableVersioned() {
 			id = null;
 			version = null;
 		}
+
+		public ImmutableVersioned(String id, Long version) {
+			this.id = id;
+			this.version = version;
+		}
+
+		public ImmutableVersioned withId(String id) {
+			return this.id == id ? this : new ImmutableVersioned(id, this.version);
+		}
+
+		public ImmutableVersioned withVersion(Long version) {
+			return this.version == version ? this : new ImmutableVersioned(this.id, version);
+		}
 	}
 
-	@Data
 	static class Sample {
 
 		@Id String id;
 		String field;
 
-		public Sample() {}
+		Sample() {}
 
-		public Sample(String id, String field) {
+		Sample(String id, String field) {
 			this.id = id;
 			this.field = field;
 		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getField() {
+			return this.field;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setField(String field) {
+			this.field = field;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Sample sample = (Sample) o;
+			return Objects.equals(id, sample.id) && Objects.equals(field, sample.field);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, field);
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateTests.Sample(id=" + this.getId() + ", field=" + this.getField() + ")";
+		}
 	}
 
-	@Data
-	@NoArgsConstructor
-	@AllArgsConstructor
 	public static class MyPerson {
 
 		String id;
 		String name;
 		Address address;
 
-		public MyPerson(String name) {
+		public MyPerson() {}
+
+		MyPerson(String name) {
+			this.name = name;
+		}
+
+		public MyPerson(String id, String name, Address address) {
+			this.id = id;
+			this.name = name;
+			this.address = address;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public Address getAddress() {
+			return this.address;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
 			this.name = name;
 		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			MyPerson myPerson = (MyPerson) o;
+			return Objects.equals(id, myPerson.id) && Objects.equals(name, myPerson.name)
+					&& Objects.equals(address, myPerson.address);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, address);
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateTests.MyPerson(id=" + this.getId() + ", name=" + this.getName() + ", address="
+					+ this.getAddress() + ")";
+		}
 	}
 
 	interface MyPersonProjection {
 		String getName();
 	}
+
+	static class RawStringId {
+
+		@MongoId String id;
+		String value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			RawStringId that = (RawStringId) o;
+			return Objects.equals(id, that.id) && Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateTests.RawStringId(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTransactionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTransactionTests.java
index bbbcd13a00..5a7271e2b4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTransactionTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTransactionTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,35 +26,40 @@
 import java.util.stream.Collectors;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.reactivestreams.Publisher;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.ReactiveMongoTransactionManager;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.Version;
+import org.springframework.transaction.ReactiveTransaction;
+import org.springframework.transaction.reactive.TransactionCallback;
+import org.springframework.transaction.reactive.TransactionalOperator;
+import org.springframework.transaction.support.DefaultTransactionDefinition;
 
 import com.mongodb.ClientSessionOptions;
 import com.mongodb.reactivestreams.client.ClientSession;
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.Success;
 
 /**
  * Integration tests for Mongo Transactions using {@link ReactiveMongoTemplate}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Mathieu Ouellet
  * @currentRead The Core - Peter V. Brett
  */
+@ExtendWith(MongoClientExtension.class)
+@EnableIfReplicaSetAvailable
+@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 public class ReactiveMongoTemplateTransactionTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_7_5 = MongoVersionRule.atLeast(Version.parse("3.7.5"));
-	public static @ClassRule TestRule replSet = ReplicaSet.required();
-
 	static final String DATABASE_NAME = "reactive-template-tx-tests";
 	static final String COLLECTION_NAME = "test";
 	static final Document DOCUMENT = new Document("_id", "id-1").append("value", "spring");
@@ -65,26 +70,21 @@ public class ReactiveMongoTemplateTransactionTests {
 	static final Person LEESHA = new Person("leesha", 22);
 	static final Person RENNA = new Person("renna", 22);
 
-	MongoClient client;
+	static @Client MongoClient client;
 	ReactiveMongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		client = MongoTestUtils.reactiveReplSetClient();
-
 		template = new ReactiveMongoTemplate(client, DATABASE_NAME);
 
 		MongoTestUtils.createOrReplaceCollection(DATABASE_NAME, COLLECTION_NAME, client).as(StepVerifier::create) //
-				.expectNext(Success.SUCCESS) //
 				.verifyComplete();
 
-		MongoTestUtils.createOrReplaceCollection(DATABASE_NAME, "person", client).as(StepVerifier::create)
-				.expectNext(Success.SUCCESS) //
-				.verifyComplete();
+		MongoTestUtils.createOrReplaceCollection(DATABASE_NAME, "person", client).as(StepVerifier::create).verifyComplete();
 
 		MongoTestUtils.createOrReplaceCollection(DATABASE_NAME, "personWithVersionPropertyOfTypeInteger", client)
-				.as(StepVerifier::create).expectNext(Success.SUCCESS) //
+				.as(StepVerifier::create) //
 				.verifyComplete();
 
 		template.insert(DOCUMENT, COLLECTION_NAME).as(StepVerifier::create).expectNextCount(1).verifyComplete();
@@ -128,8 +128,7 @@ public void reactiveTransactionWithExplicitTransactionStart() {
 	@Test // DATAMONGO-1970
 	public void reactiveTransactionsCommitOnComplete() {
 
-		template.inTransaction().execute(action -> action.remove(ID_QUERY, Document.class, COLLECTION_NAME)) //
-				.as(StepVerifier::create) //
+		initTx().transactional(template.remove(ID_QUERY, Document.class, COLLECTION_NAME)).as(StepVerifier::create) //
 				.expectNextCount(1) //
 				.verifyComplete();
 
@@ -142,11 +141,10 @@ public void reactiveTransactionsCommitOnComplete() {
 	@Test // DATAMONGO-1970
 	public void reactiveTransactionsAbortOnError() {
 
-		template.inTransaction().execute(action -> {
-			return action.remove(ID_QUERY, Document.class, COLLECTION_NAME).flatMap(result -> Mono.fromSupplier(() -> {
-				throw new RuntimeException("¯\\_(ツ)_/¯");
-			}));
-		}).as(StepVerifier::create) //
+		initTx().transactional(
+				template.remove(ID_QUERY, Document.class, COLLECTION_NAME).flatMap(result -> Mono.fromSupplier(() -> {
+					throw new RuntimeException("¯\\_(ツ)_/¯");
+				}))).as(StepVerifier::create) //
 				.expectError() //
 				.verify();
 
@@ -171,32 +169,19 @@ public void withSessionDoesNotManageTransactions() {
 				.verifyComplete();
 	}
 
-	@Test // DATAMONGO-1970
-	public void inTransactionCommitsProvidedTransactionalSession() {
-
-		ClientSession session = Mono.from(client.startSession()).block();
-
-		session.startTransaction();
-
-		template.inTransaction(Mono.just(session)).execute(action -> {
-			return action.remove(ID_QUERY, Document.class, COLLECTION_NAME);
-		}) //
-				.as(StepVerifier::create) //
-				.expectNextCount(1) //
-				.verifyComplete();
-
-		assertThat(session.hasActiveTransaction()).isFalse();
-	}
-
 	@Test // DATAMONGO-1970
 	public void changesNotVisibleOutsideTransaction() {
 
-		template.inTransaction().execute(action -> {
-			return action.remove(ID_QUERY, Document.class, COLLECTION_NAME).flatMap(val -> {
+		initTx().execute(new TransactionCallback<>() {
+			@Override
+			public Publisher<Object> doInTransaction(ReactiveTransaction status) {
+				return template.remove(ID_QUERY, Document.class, COLLECTION_NAME).flatMapMany(val -> {
 
-				// once we use the collection directly we're no longer participating in the tx
-				return Mono.from(template.getCollection(COLLECTION_NAME).find(ID_QUERY.getQueryObject()));
-			});
+					// once we use the collection directly we're no longer participating in the tx
+					return client.getDatabase(DATABASE_NAME).getCollection(COLLECTION_NAME).find(ID_QUERY.getQueryObject())
+							.first();
+				});
+			}
 		}).as(StepVerifier::create).expectNext(DOCUMENT).verifyComplete();
 
 		template.exists(ID_QUERY, COLLECTION_NAME) //
@@ -208,7 +193,7 @@ public void changesNotVisibleOutsideTransaction() {
 	@Test // DATAMONGO-1970
 	public void executeCreatesNewTransaction() {
 
-		ReactiveSessionScoped sessionScoped = template.inTransaction();
+		ReactiveSessionScoped sessionScoped = template.withSession(client.startSession());
 
 		sessionScoped.execute(action -> {
 			return action.remove(ID_QUERY, Document.class, COLLECTION_NAME);
@@ -238,10 +223,9 @@ public void executeCreatesNewTransaction() {
 	@Test // DATAMONGO-1970
 	public void takeDoesNotAbortTransaction() {
 
-		template.inTransaction().execute(action -> {
-			return action.find(query(where("age").exists(true)).with(Sort.by("age")), Person.class).take(3)
-					.flatMap(action::remove);
-		}) //
+		initTx()
+				.transactional(template.find(query(where("age").exists(true)).with(Sort.by("age")), Person.class).take(3)
+						.flatMap(template::remove)) //
 				.as(StepVerifier::create) //
 				.expectNextCount(3) //
 				.verifyComplete();
@@ -255,19 +239,23 @@ public void takeDoesNotAbortTransaction() {
 	@Test // DATAMONGO-1970
 	public void errorInFlowOutsideTransactionDoesNotAbortIt() {
 
-		template.inTransaction().execute(action -> {
-
-			return action.find(query(where("age").is(22)).with(Sort.by("age")), Person.class).buffer(2).flatMap(values -> {
-
-				return action.remove(query(where("id").in(values.stream().map(Person::getId).collect(Collectors.toList()))),
-						Person.class).then(Mono.just(values));
-			});
-		}).flatMap(deleted -> {
-			throw new RuntimeException("error outside the transaction does not influence it.");
-		}) //
-				.as(StepVerifier::create) //
-				.expectError() //
-				.verify();
+		initTx().execute(new TransactionCallback<>() {
+			@Override
+			public Publisher<Object> doInTransaction(ReactiveTransaction status) {
+				return template.find(query(where("age").is(22)).with(Sort.by("age")), Person.class).buffer(2)
+						.flatMap(values -> {
+
+							return template
+									.remove(query(where("id").in(values.stream().map(Person::getId).collect(Collectors.toList()))),
+											Person.class)
+									.then(Mono.just(values));
+						});
+			}
+		}).collectList() // completes the above computation
+				.flatMap(deleted -> {
+					throw new RuntimeException("error outside the transaction does not influence it.");
+				}).as(StepVerifier::create) //
+				.verifyError();
 
 		template.count(query(where("age").exists(true)), Person.class) //
 				.as(StepVerifier::create) //
@@ -283,7 +271,7 @@ public void deleteWithMatchingVersion() {
 
 		PersonWithVersionPropertyOfTypeInteger saved = template.insert(rojer).block();
 
-		template.inTransaction().execute(action -> action.remove(saved)) //
+		initTx().transactional(template.remove(saved)) //
 				.as(StepVerifier::create) //
 				.consumeNextWith(result -> assertThat(result.getDeletedCount()).isOne()) //
 				.verifyComplete();
@@ -298,7 +286,7 @@ public void deleteWithVersionMismatch() {
 		PersonWithVersionPropertyOfTypeInteger saved = template.insert(rojer).block();
 		saved.version = 5;
 
-		template.inTransaction().execute(action -> action.remove(saved)) //
+		initTx().transactional(template.remove(saved)) //
 				.as(StepVerifier::create) //
 				.consumeNextWith(actual -> {
 
@@ -315,9 +303,15 @@ public void deleteNonExistingWithVersion() {
 		rojer.firstName = "rojer";
 		rojer.version = 5;
 
-		template.inTransaction().execute(action -> action.remove(rojer)) //
+		initTx().transactional(template.remove(rojer)) //
 				.as(StepVerifier::create) //
 				.consumeNextWith(result -> assertThat(result.getDeletedCount()).isZero()) //
 				.verifyComplete();
 	}
+
+	TransactionalOperator initTx() {
+
+		ReactiveMongoTransactionManager txmgr = new ReactiveMongoTransactionManager(template.getMongoDatabaseFactory());
+		return TransactionalOperator.create(txmgr, new DefaultTransactionDefinition());
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUnitTests.java
index c420daa62d..36cf0886ad 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,24 +18,33 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
-import lombok.Data;
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.stream.Collectors;
 
 import org.assertj.core.api.Assertions;
+import org.bson.BsonDocument;
+import org.bson.BsonString;
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -45,11 +54,17 @@
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
 import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.geo.Point;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
+import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoTemplateUnitTests.AutogenerateableId;
 import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
 import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
@@ -60,9 +75,15 @@
 import org.springframework.data.mongodb.core.aggregation.Fields;
 import org.springframework.data.mongodb.core.aggregation.SetOperation;
 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.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.TimeSeries;
+import org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener;
+import org.springframework.data.mongodb.core.mapping.event.AfterSaveEvent;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAfterConvertCallback;
+import org.springframework.data.mongodb.core.mapping.event.ReactiveAfterSaveCallback;
 import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeConvertCallback;
 import org.springframework.data.mongodb.core.mapping.event.ReactiveBeforeSaveCallback;
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions;
@@ -72,11 +93,16 @@
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.core.timeseries.Granularity;
+import org.springframework.data.mongodb.util.BsonUtils;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.util.CollectionUtils;
 
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ReadConcern;
 import com.mongodb.ReadPreference;
+import com.mongodb.WriteConcern;
 import com.mongodb.client.model.CountOptions;
 import com.mongodb.client.model.CreateCollectionOptions;
 import com.mongodb.client.model.DeleteOptions;
@@ -84,28 +110,38 @@
 import com.mongodb.client.model.FindOneAndReplaceOptions;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.TimeSeriesGranularity;
 import com.mongodb.client.model.UpdateOptions;
+import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
+import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.InsertManyResult;
+import com.mongodb.client.result.InsertOneResult;
 import com.mongodb.client.result.UpdateResult;
 import com.mongodb.reactivestreams.client.AggregatePublisher;
+import com.mongodb.reactivestreams.client.ChangeStreamPublisher;
 import com.mongodb.reactivestreams.client.DistinctPublisher;
 import com.mongodb.reactivestreams.client.FindPublisher;
 import com.mongodb.reactivestreams.client.MapReducePublisher;
 import com.mongodb.reactivestreams.client.MongoClient;
 import com.mongodb.reactivestreams.client.MongoCollection;
 import com.mongodb.reactivestreams.client.MongoDatabase;
-import com.mongodb.reactivestreams.client.Success;
 
 /**
  * Unit tests for {@link ReactiveMongoTemplate}.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Roman Puchkovskiy
+ * @author Mathieu Ouellet
+ * @author Yadhukrishna S Pai
+ * @author Ben Foster
  */
+@SuppressWarnings({ "unchecked", "rawtypes" })
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
 public class ReactiveMongoTemplateUnitTests {
 
-	ReactiveMongoTemplate template;
+	private ReactiveMongoTemplate template;
 
 	@Mock SimpleReactiveMongoDatabaseFactory factory;
 	@Mock MongoClient mongoClient;
@@ -116,30 +152,34 @@ public class ReactiveMongoTemplateUnitTests {
 	@Mock Publisher runCommandPublisher;
 	@Mock Publisher<UpdateResult> updateResultPublisher;
 	@Mock Publisher findAndUpdatePublisher;
-	@Mock Publisher<Success> successPublisher;
+	@Mock Publisher<Void> successPublisher;
 	@Mock DistinctPublisher distinctPublisher;
 	@Mock Publisher deletePublisher;
 	@Mock MapReducePublisher mapReducePublisher;
+	@Mock ChangeStreamPublisher changeStreamPublisher;
 
-	MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
+	private MongoExceptionTranslator exceptionTranslator = new MongoExceptionTranslator();
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
 
 	@BeforeEach
-	public void beforeEach() {
+	void beforeEach() {
 
 		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslator);
-		when(factory.getMongoDatabase()).thenReturn(db);
+		when(factory.getCodecRegistry()).thenReturn(MongoClientSettings.getDefaultCodecRegistry());
+		when(factory.getMongoDatabase()).thenReturn(Mono.just(db));
 		when(db.getCollection(any())).thenReturn(collection);
 		when(db.getCollection(any(), any())).thenReturn(collection);
 		when(db.runCommand(any(), any(Class.class))).thenReturn(runCommandPublisher);
 		when(db.createCollection(any(), any(CreateCollectionOptions.class))).thenReturn(runCommandPublisher);
 		when(collection.withReadPreference(any())).thenReturn(collection);
+		when(collection.withReadConcern(any())).thenReturn(collection);
 		when(collection.find(any(Class.class))).thenReturn(findPublisher);
 		when(collection.find(any(Document.class), any(Class.class))).thenReturn(findPublisher);
 		when(collection.aggregate(anyList())).thenReturn(aggregatePublisher);
 		when(collection.aggregate(anyList(), any(Class.class))).thenReturn(aggregatePublisher);
 		when(collection.countDocuments(any(), any(CountOptions.class))).thenReturn(Mono.just(0L));
+		when(collection.estimatedDocumentCount(any())).thenReturn(Mono.just(0L));
 		when(collection.updateOne(any(), any(Bson.class), any(UpdateOptions.class))).thenReturn(updateResultPublisher);
 		when(collection.updateMany(any(Bson.class), any(Bson.class), any())).thenReturn(updateResultPublisher);
 		when(collection.updateOne(any(), anyList(), any())).thenReturn(updateResultPublisher);
@@ -160,34 +200,36 @@ public void beforeEach() {
 		when(findPublisher.limit(anyInt())).thenReturn(findPublisher);
 		when(findPublisher.collation(any())).thenReturn(findPublisher);
 		when(findPublisher.first()).thenReturn(findPublisher);
+		when(findPublisher.allowDiskUse(anyBoolean())).thenReturn(findPublisher);
 		when(aggregatePublisher.allowDiskUse(anyBoolean())).thenReturn(aggregatePublisher);
 		when(aggregatePublisher.collation(any())).thenReturn(aggregatePublisher);
 		when(aggregatePublisher.maxTime(anyLong(), any())).thenReturn(aggregatePublisher);
 		when(aggregatePublisher.first()).thenReturn(findPublisher);
 
 		this.mappingContext = new MongoMappingContext();
+		this.mappingContext.setSimpleTypeHolder(new MongoCustomConversions(Collections.emptyList()).getSimpleTypeHolder());
 		this.converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
 		this.template = new ReactiveMongoTemplate(factory, converter);
 	}
 
 	@Test // DATAMONGO-1444
-	public void rejectsNullDatabaseName() {
+	void rejectsNullDatabaseName() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ReactiveMongoTemplate(mongoClient, null));
 	}
 
 	@Test // DATAMONGO-1444
-	public void rejectsNullMongo() {
+	void rejectsNullMongo() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ReactiveMongoTemplate(null, "database"));
 	}
 
 	@Test // DATAMONGO-1444
-	public void defaultsConverterToMappingMongoConverter() throws Exception {
+	void defaultsConverterToMappingMongoConverter() throws Exception {
 		ReactiveMongoTemplate template = new ReactiveMongoTemplate(mongoClient, "database");
 		assertThat(ReflectionTestUtils.getField(template, "mongoConverter") instanceof MappingMongoConverter).isTrue();
 	}
 
 	@Test // DATAMONGO-1912
-	public void autogeneratesIdForMap() {
+	void autogeneratesIdForMap() {
 
 		ReactiveMongoTemplate template = spy(this.template);
 		doReturn(Mono.just(new ObjectId())).when(template).saveDocument(any(String.class), any(Document.class),
@@ -201,7 +243,7 @@ public void autogeneratesIdForMap() {
 	}
 
 	@Test // DATAMONGO-1311
-	public void executeQueryShouldUseBatchSizeWhenPresent() {
+	void executeQueryShouldUseBatchSizeWhenPresent() {
 
 		when(findPublisher.batchSize(anyInt())).thenReturn(findPublisher);
 
@@ -211,8 +253,19 @@ public void executeQueryShouldUseBatchSizeWhenPresent() {
 		verify(findPublisher).batchSize(1234);
 	}
 
+	@Test // DATAMONGO-2659
+	void executeQueryShouldUseAllowDiskSizeWhenPresent() {
+
+		when(findPublisher.batchSize(anyInt())).thenReturn(findPublisher);
+
+		Query query = new Query().allowDiskUse(true);
+		template.find(query, Person.class).subscribe();
+
+		verify(findPublisher).allowDiskUse(true);
+	}
+
 	@Test // DATAMONGO-1518
-	public void findShouldUseCollationWhenPresent() {
+	void findShouldUseCollationWhenPresent() {
 
 		template.find(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class).subscribe();
 
@@ -221,7 +274,7 @@ public void findShouldUseCollationWhenPresent() {
 
 	//
 	@Test // DATAMONGO-1518
-	public void findOneShouldUseCollationWhenPresent() {
+	void findOneShouldUseCollationWhenPresent() {
 
 		template.findOne(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class).subscribe();
 
@@ -229,7 +282,7 @@ public void findOneShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void existsShouldUseCollationWhenPresent() {
+	void existsShouldUseCollationWhenPresent() {
 
 		template.exists(new BasicQuery("{}").collation(Collation.of("fr")), AutogenerateableId.class).subscribe();
 
@@ -237,7 +290,7 @@ public void existsShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void findAndModfiyShoudUseCollationWhenPresent() {
+	void findAndModfiyShoudUseCollationWhenPresent() {
 
 		when(collection.findOneAndUpdate(any(Bson.class), any(Bson.class), any())).thenReturn(Mono.empty());
 
@@ -251,7 +304,7 @@ public void findAndModfiyShoudUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void findAndRemoveShouldUseCollationWhenPresent() {
+	void findAndRemoveShouldUseCollationWhenPresent() {
 
 		when(collection.findOneAndDelete(any(Bson.class), any())).thenReturn(Mono.empty());
 
@@ -264,7 +317,7 @@ public void findAndRemoveShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void findAndRemoveManyShouldUseCollationWhenPresent() {
+	void findAndRemoveManyShouldUseCollationWhenPresent() {
 
 		when(collection.deleteMany(any(Bson.class), any())).thenReturn(Mono.empty());
 
@@ -278,7 +331,7 @@ public void findAndRemoveManyShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void updateOneShouldUseCollationWhenPresent() {
+	void updateOneShouldUseCollationWhenPresent() {
 
 		when(collection.updateOne(any(Bson.class), any(Bson.class), any())).thenReturn(Mono.empty());
 
@@ -292,7 +345,7 @@ public void updateOneShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518
-	public void updateManyShouldUseCollationWhenPresent() {
+	void updateManyShouldUseCollationWhenPresent() {
 
 		when(collection.updateMany(any(Bson.class), any(Bson.class), any())).thenReturn(Mono.empty());
 
@@ -303,11 +356,33 @@ public void updateManyShouldUseCollationWhenPresent() {
 		verify(collection).updateMany(any(), any(Bson.class), options.capture());
 
 		assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr");
+	}
+
+	@Test // GH-3218
+	void updateUsesHintStringFromQuery() {
+
+		template.updateFirst(new Query().withHint("index-1"), new Update().set("spring", "data"), Person.class).subscribe();
+
+		ArgumentCaptor<UpdateOptions> options = ArgumentCaptor.forClass(UpdateOptions.class);
+		verify(collection).updateOne(any(Bson.class), any(Bson.class), options.capture());
+
+		assertThat(options.getValue().getHintString()).isEqualTo("index-1");
+	}
+
+	@Test // GH-3218
+	void updateUsesHintDocumentFromQuery() {
+
+		template.updateFirst(new Query().withHint("{ firstname : 1 }"), new Update().set("spring", "data"), Person.class)
+				.subscribe();
 
+		ArgumentCaptor<UpdateOptions> options = ArgumentCaptor.forClass(UpdateOptions.class);
+		verify(collection).updateOne(any(Bson.class), any(Bson.class), options.capture());
+
+		assertThat(options.getValue().getHint()).isEqualTo(new Document("firstname", 1));
 	}
 
 	@Test // DATAMONGO-1518
-	public void replaceOneShouldUseCollationWhenPresent() {
+	void replaceOneShouldUseCollationWhenPresent() {
 
 		when(collection.replaceOne(any(Bson.class), any(), any(ReplaceOptions.class))).thenReturn(Mono.empty());
 
@@ -321,7 +396,7 @@ public void replaceOneShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518, DATAMONGO-2257
-	public void mapReduceShouldUseCollationWhenPresent() {
+	void mapReduceShouldUseCollationWhenPresent() {
 
 		template.mapReduce(new BasicQuery("{}"), AutogenerateableId.class, AutogenerateableId.class, "", "",
 				MapReduceOptions.options().collation(Collation.of("fr"))).subscribe();
@@ -330,7 +405,7 @@ public void mapReduceShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1518, DATAMONGO-2264
-	public void geoNearShouldUseCollationWhenPresent() {
+	void geoNearShouldUseCollationWhenPresent() {
 
 		NearQuery query = NearQuery.near(0D, 0D).query(new BasicQuery("{}").collation(Collation.of("fr")));
 		template.geoNear(query, AutogenerateableId.class).subscribe();
@@ -338,71 +413,93 @@ public void geoNearShouldUseCollationWhenPresent() {
 		verify(aggregatePublisher).collation(eq(com.mongodb.client.model.Collation.builder().locale("fr").build()));
 	}
 
+	@Test // GH-4277
+	void geoNearShouldHonorReadPreferenceFromQuery() {
+
+		NearQuery query = NearQuery.near(new Point(1, 1));
+		query.withReadPreference(ReadPreference.secondary());
+
+		template.geoNear(query, Wrapper.class).subscribe();
+
+		verify(collection).withReadPreference(eq(ReadPreference.secondary()));
+	}
+
+	@Test // GH-4277
+	void geoNearShouldHonorReadConcernFromQuery() {
+
+		NearQuery query = NearQuery.near(new Point(1, 1));
+		query.withReadConcern(ReadConcern.SNAPSHOT);
+
+		template.geoNear(query, Wrapper.class).subscribe();
+
+		verify(collection).withReadConcern(eq(ReadConcern.SNAPSHOT));
+	}
+
 	@Test // DATAMONGO-1719
-	public void appliesFieldsWhenInterfaceProjectionIsClosedAndQueryDoesNotDefineFields() {
+	void appliesFieldsWhenInterfaceProjectionIsClosedAndQueryDoesNotDefineFields() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, PersonProjection.class,
-				FindPublisherPreparer.NO_OP_PREPARER).subscribe();
+		template.doFind("star-wars", CollectionPreparer.identity(), new Document(), new Document(), Person.class,
+				PersonProjection.class, QueryResultConverter.entity(), FindPublisherPreparer.NO_OP_PREPARER).subscribe();
 
 		verify(findPublisher).projection(eq(new Document("firstname", 1)));
 	}
 
 	@Test // DATAMONGO-1719
-	public void doesNotApplyFieldsWhenInterfaceProjectionIsClosedAndQueryDefinesFields() {
+	void doesNotApplyFieldsWhenInterfaceProjectionIsClosedAndQueryDefinesFields() {
 
-		template.doFind("star-wars", new Document(), new Document("bar", 1), Person.class, PersonProjection.class,
-				FindPublisherPreparer.NO_OP_PREPARER).subscribe();
+		template.doFind("star-wars", CollectionPreparer.identity(), new Document(), new Document("bar", 1), Person.class,
+				PersonProjection.class, QueryResultConverter.entity(), FindPublisherPreparer.NO_OP_PREPARER).subscribe();
 
 		verify(findPublisher).projection(eq(new Document("bar", 1)));
 	}
 
 	@Test // DATAMONGO-1719
-	public void doesNotApplyFieldsWhenInterfaceProjectionIsOpen() {
+	void doesNotApplyFieldsWhenInterfaceProjectionIsOpen() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, PersonSpELProjection.class,
-				FindPublisherPreparer.NO_OP_PREPARER).subscribe();
+		template.doFind("star-wars", CollectionPreparer.identity(), new Document(), new Document(), Person.class,
+				PersonSpELProjection.class, QueryResultConverter.entity(), FindPublisherPreparer.NO_OP_PREPARER).subscribe();
 
 		verify(findPublisher, never()).projection(any());
 	}
 
 	@Test // DATAMONGO-1719, DATAMONGO-2041
-	public void appliesFieldsToDtoProjection() {
+	void appliesFieldsToDtoProjection() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, Jedi.class,
-				FindPublisherPreparer.NO_OP_PREPARER).subscribe();
+		template.doFind("star-wars", CollectionPreparer.identity(), new Document(), new Document(), Person.class,
+				Jedi.class, QueryResultConverter.entity(), FindPublisherPreparer.NO_OP_PREPARER).subscribe();
 
 		verify(findPublisher).projection(eq(new Document("firstname", 1)));
 	}
 
 	@Test // DATAMONGO-1719
-	public void doesNotApplyFieldsToDtoProjectionWhenQueryDefinesFields() {
+	void doesNotApplyFieldsToDtoProjectionWhenQueryDefinesFields() {
 
-		template.doFind("star-wars", new Document(), new Document("bar", 1), Person.class, Jedi.class,
-				FindPublisherPreparer.NO_OP_PREPARER).subscribe();
+		template.doFind("star-wars", CollectionPreparer.identity(), new Document(), new Document("bar", 1), Person.class,
+				Jedi.class, QueryResultConverter.entity(), FindPublisherPreparer.NO_OP_PREPARER).subscribe();
 
 		verify(findPublisher).projection(eq(new Document("bar", 1)));
 	}
 
 	@Test // DATAMONGO-1719
-	public void doesNotApplyFieldsWhenTargetIsNotAProjection() {
+	void doesNotApplyFieldsWhenTargetIsNotAProjection() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, Person.class,
-				FindPublisherPreparer.NO_OP_PREPARER).subscribe();
+		template.doFind("star-wars", CollectionPreparer.identity(), new Document(), new Document(), Person.class,
+				Person.class, QueryResultConverter.entity(), FindPublisherPreparer.NO_OP_PREPARER).subscribe();
 
 		verify(findPublisher, never()).projection(any());
 	}
 
 	@Test // DATAMONGO-1719
-	public void doesNotApplyFieldsWhenTargetExtendsDomainType() {
+	void doesNotApplyFieldsWhenTargetExtendsDomainType() {
 
-		template.doFind("star-wars", new Document(), new Document(), Person.class, PersonExtended.class,
-				FindPublisherPreparer.NO_OP_PREPARER).subscribe();
+		template.doFind("star-wars", CollectionPreparer.identity(), new Document(), new Document(), Person.class,
+				PersonExtended.class, QueryResultConverter.entity(), FindPublisherPreparer.NO_OP_PREPARER).subscribe();
 
 		verify(findPublisher, never()).projection(any());
 	}
 
 	@Test // DATAMONGO-1783
-	public void countShouldUseSkipFromQuery() {
+	void countShouldUseSkipFromQuery() {
 
 		template.count(new Query().skip(10), Person.class, "star-wars").subscribe();
 
@@ -413,7 +510,7 @@ public void countShouldUseSkipFromQuery() {
 	}
 
 	@Test // DATAMONGO-1783
-	public void countShouldUseLimitFromQuery() {
+	void countShouldUseLimitFromQuery() {
 
 		template.count(new Query().limit(100), Person.class, "star-wars").subscribe();
 
@@ -424,7 +521,7 @@ public void countShouldUseLimitFromQuery() {
 	}
 
 	@Test // DATAMONGO-2360
-	public void countShouldApplyQueryHintIfPresent() {
+	void countShouldApplyQueryHintIfPresent() {
 
 		Document queryHint = new Document("age", 1);
 		template.count(new Query().withHint(queryHint), Person.class, "star-wars").subscribe();
@@ -435,8 +532,19 @@ public void countShouldApplyQueryHintIfPresent() {
 		assertThat(options.getValue().getHint()).isEqualTo(queryHint);
 	}
 
+	@Test // DATAMONGO-2365
+	void countShouldApplyQueryHintAsIndexNameIfPresent() {
+
+		template.count(new Query().withHint("idx-1"), Person.class, "star-wars").subscribe();
+
+		ArgumentCaptor<CountOptions> options = ArgumentCaptor.forClass(CountOptions.class);
+		verify(collection).countDocuments(any(), options.capture());
+
+		assertThat(options.getValue().getHintString()).isEqualTo("idx-1");
+	}
+
 	@Test // DATAMONGO-2215
-	public void updateShouldApplyArrayFilters() {
+	void updateShouldApplyArrayFilters() {
 
 		template.updateFirst(new BasicQuery("{}"),
 				new Update().set("grades.$[element]", 100).filterArray(Criteria.where("element").gte(100)),
@@ -450,7 +558,7 @@ public void updateShouldApplyArrayFilters() {
 	}
 
 	@Test // DATAMONGO-2215
-	public void findAndModifyShouldApplyArrayFilters() {
+	void findAndModifyShouldApplyArrayFilters() {
 
 		template.findAndModify(new BasicQuery("{}"),
 				new Update().set("grades.$[element]", 100).filterArray(Criteria.where("element").gte(100)),
@@ -464,7 +572,7 @@ public void findAndModifyShouldApplyArrayFilters() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findShouldNotUseCollationWhenNoDefaultPresent() {
+	void findShouldNotUseCollationWhenNoDefaultPresent() {
 
 		template.find(new BasicQuery("{'foo' : 'bar'}"), Jedi.class).subscribe();
 
@@ -472,7 +580,7 @@ public void findShouldNotUseCollationWhenNoDefaultPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findShouldUseDefaultCollationWhenPresent() {
+	void findShouldUseDefaultCollationWhenPresent() {
 
 		template.find(new BasicQuery("{'foo' : 'bar'}"), Sith.class).subscribe();
 
@@ -480,7 +588,7 @@ public void findShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findOneShouldUseDefaultCollationWhenPresent() {
+	void findOneShouldUseDefaultCollationWhenPresent() {
 
 		template.findOne(new BasicQuery("{'foo' : 'bar'}"), Sith.class).subscribe();
 
@@ -488,7 +596,7 @@ public void findOneShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void existsShouldUseDefaultCollationWhenPresent() {
+	void existsShouldUseDefaultCollationWhenPresent() {
 
 		template.exists(new BasicQuery("{}"), Sith.class).subscribe();
 
@@ -496,7 +604,7 @@ public void existsShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndModfiyShoudUseDefaultCollationWhenPresent() {
+	void findAndModfiyShoudUseDefaultCollationWhenPresent() {
 
 		template.findAndModify(new BasicQuery("{}"), new Update(), Sith.class).subscribe();
 
@@ -508,7 +616,7 @@ public void findAndModfiyShoudUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndRemoveShouldUseDefaultCollationWhenPresent() {
+	void findAndRemoveShouldUseDefaultCollationWhenPresent() {
 
 		template.findAndRemove(new BasicQuery("{}"), Sith.class).subscribe();
 
@@ -520,7 +628,7 @@ public void findAndRemoveShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldNotCollationIfNotPresent() {
+	void createCollectionShouldNotCollationIfNotPresent() {
 
 		template.createCollection(AutogenerateableId.class).subscribe();
 
@@ -531,7 +639,7 @@ public void createCollectionShouldNotCollationIfNotPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldApplyDefaultCollation() {
+	void createCollectionShouldApplyDefaultCollation() {
 
 		template.createCollection(Sith.class).subscribe();
 
@@ -543,7 +651,7 @@ public void createCollectionShouldApplyDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldFavorExplicitOptionsOverDefaultCollation() {
+	void createCollectionShouldFavorExplicitOptionsOverDefaultCollation() {
 
 		template.createCollection(Sith.class, CollectionOptions.just(Collation.of("en_US"))).subscribe();
 
@@ -555,7 +663,7 @@ public void createCollectionShouldFavorExplicitOptionsOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void createCollectionShouldUseDefaultCollationIfCollectionOptionsAreNull() {
+	void createCollectionShouldUseDefaultCollationIfCollectionOptionsAreNull() {
 
 		template.createCollection(Sith.class, null).subscribe();
 
@@ -567,15 +675,57 @@ public void createCollectionShouldUseDefaultCollationIfCollectionOptionsAreNull(
 	}
 
 	@Test // DATAMONGO-1854
-	public void aggreateShouldUseDefaultCollationIfPresent() {
+	void aggreateShouldUseDefaultCollationIfPresent() {
 
 		template.aggregate(newAggregation(Sith.class, project("id")), AutogenerateableId.class, Document.class).subscribe();
 
 		verify(aggregatePublisher).collation(eq(com.mongodb.client.model.Collation.builder().locale("de_AT").build()));
 	}
 
+	@Test // GH-4277
+	void aggreateShouldUseReadConcern() {
+
+		AggregationOptions options = AggregationOptions.builder().readConcern(ReadConcern.SNAPSHOT).build();
+		template.aggregate(newAggregation(Sith.class, project("id")).withOptions(options), AutogenerateableId.class,
+				Document.class).subscribe();
+
+		verify(collection).withReadConcern(ReadConcern.SNAPSHOT);
+	}
+
+	@Test // GH-4286
+	void aggreateShouldUseReadReadPreference() {
+
+		AggregationOptions options = AggregationOptions.builder().readPreference(ReadPreference.primaryPreferred()).build();
+		template.aggregate(newAggregation(Sith.class, project("id")).withOptions(options), AutogenerateableId.class,
+				Document.class).subscribe();
+
+		verify(collection).withReadPreference(ReadPreference.primaryPreferred());
+	}
+
+	@Test // GH-4543
+	void aggregateDoesNotLimitBackpressure() {
+
+		reset(collection);
+
+		AtomicLong request = new AtomicLong();
+		Publisher<Document> realPublisher = Flux.just(new Document()).doOnRequest(request::addAndGet);
+
+		doAnswer(invocation -> {
+			Subscriber<Document> subscriber = invocation.getArgument(0);
+			realPublisher.subscribe(subscriber);
+			return null;
+		}).when(aggregatePublisher).subscribe(any());
+
+		when(collection.aggregate(anyList())).thenReturn(aggregatePublisher);
+		when(collection.aggregate(anyList(), any(Class.class))).thenReturn(aggregatePublisher);
+
+		template.aggregate(newAggregation(Sith.class, project("id")), AutogenerateableId.class, Document.class).subscribe();
+
+		assertThat(request).hasValueGreaterThan(128);
+	}
+
 	@Test // DATAMONGO-1854
-	public void aggreateShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent() {
+	void aggreateShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent() {
 
 		template
 				.aggregate(
@@ -588,7 +738,7 @@ public void aggreateShouldUseCollationFromOptionsEvenIfDefaultCollationIsPresent
 	}
 
 	@Test // DATAMONGO-2153
-	public void aggregateShouldHonorOptionsComment() {
+	void aggregateShouldHonorOptionsComment() {
 
 		AggregationOptions options = AggregationOptions.builder().comment("expensive").build();
 
@@ -598,8 +748,31 @@ public void aggregateShouldHonorOptionsComment() {
 		verify(aggregatePublisher).comment("expensive");
 	}
 
+	@Test // DATAMONGO-1836
+	void aggregateShouldHonorOptionsHint() {
+
+		Document hint = new Document("dummyHint", 1);
+		AggregationOptions options = AggregationOptions.builder().hint(hint).build();
+
+		template.aggregate(newAggregation(Sith.class, project("id")).withOptions(options), AutogenerateableId.class,
+				Document.class).subscribe();
+
+		verify(aggregatePublisher).hint(hint);
+	}
+
+	@Test // GH-4238
+	void aggregateShouldHonorOptionsHintString() {
+
+		AggregationOptions options = AggregationOptions.builder().hint("index-1").build();
+
+		template.aggregate(newAggregation(Sith.class, project("id")).withOptions(options), AutogenerateableId.class,
+				Document.class).subscribe();
+
+		verify(aggregatePublisher).hintString("index-1");
+	}
+
 	@Test // DATAMONGO-2390
-	public void aggregateShouldNoApplyZeroOrNegativeMaxTime() {
+	void aggregateShouldNoApplyZeroOrNegativeMaxTime() {
 
 		template
 				.aggregate(newAggregation(MongoTemplateUnitTests.Sith.class, project("id")).withOptions(
@@ -616,7 +789,7 @@ public void aggregateShouldNoApplyZeroOrNegativeMaxTime() {
 	}
 
 	@Test // DATAMONGO-2390
-	public void aggregateShouldApplyMaxTimeIfSet() {
+	void aggregateShouldApplyMaxTimeIfSet() {
 
 		template
 				.aggregate(
@@ -629,7 +802,7 @@ public void aggregateShouldApplyMaxTimeIfSet() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndReplaceShouldUseCollationWhenPresent() {
+	void findAndReplaceShouldUseCollationWhenPresent() {
 
 		template.findAndReplace(new BasicQuery("{}").collation(Collation.of("fr")), new Jedi()).subscribe();
 
@@ -640,7 +813,7 @@ public void findAndReplaceShouldUseCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndReplaceShouldUseDefaultCollationWhenPresent() {
+	void findAndReplaceShouldUseDefaultCollationWhenPresent() {
 
 		template.findAndReplace(new BasicQuery("{}"), new Sith()).subscribe();
 
@@ -651,7 +824,7 @@ public void findAndReplaceShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
+	void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
 
 		template.findAndReplace(new BasicQuery("{}").collation(Collation.of("fr")), new MongoTemplateUnitTests.Sith())
 				.subscribe();
@@ -663,7 +836,7 @@ public void findAndReplaceShouldUseCollationEvenIfDefaultCollationIsPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findDistinctShouldUseDefaultCollationWhenPresent() {
+	void findDistinctShouldUseDefaultCollationWhenPresent() {
 
 		template.findDistinct(new BasicQuery("{}"), "name", Sith.class, String.class).subscribe();
 
@@ -671,7 +844,7 @@ public void findDistinctShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void findDistinctPreferCollationFromQueryOverDefaultCollation() {
+	void findDistinctPreferCollationFromQueryOverDefaultCollation() {
 
 		template.findDistinct(new BasicQuery("{}").collation(Collation.of("fr")), "name", Sith.class, String.class)
 				.subscribe();
@@ -680,7 +853,7 @@ public void findDistinctPreferCollationFromQueryOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateFirstShouldUseDefaultCollationWhenPresent() {
+	void updateFirstShouldUseDefaultCollationWhenPresent() {
 
 		template.updateFirst(new BasicQuery("{}"), Update.update("foo", "bar"), Sith.class).subscribe();
 
@@ -692,7 +865,7 @@ public void updateFirstShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateFirstShouldPreferExplicitCollationOverDefaultCollation() {
+	void updateFirstShouldPreferExplicitCollationOverDefaultCollation() {
 
 		template.updateFirst(new BasicQuery("{}").collation(Collation.of("fr")), Update.update("foo", "bar"), Sith.class)
 				.subscribe();
@@ -705,7 +878,7 @@ public void updateFirstShouldPreferExplicitCollationOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateMultiShouldUseDefaultCollationWhenPresent() {
+	void updateMultiShouldUseDefaultCollationWhenPresent() {
 
 		template.updateMulti(new BasicQuery("{}"), Update.update("foo", "bar"), Sith.class).subscribe();
 
@@ -717,7 +890,7 @@ public void updateMultiShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void updateMultiShouldPreferExplicitCollationOverDefaultCollation() {
+	void updateMultiShouldPreferExplicitCollationOverDefaultCollation() {
 
 		template.updateMulti(new BasicQuery("{}").collation(Collation.of("fr")), Update.update("foo", "bar"), Sith.class)
 				.subscribe();
@@ -730,7 +903,7 @@ public void updateMultiShouldPreferExplicitCollationOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void removeShouldUseDefaultCollationWhenPresent() {
+	void removeShouldUseDefaultCollationWhenPresent() {
 
 		template.remove(new BasicQuery("{}"), Sith.class).subscribe();
 
@@ -742,7 +915,7 @@ public void removeShouldUseDefaultCollationWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void removeShouldPreferExplicitCollationOverDefaultCollation() {
+	void removeShouldPreferExplicitCollationOverDefaultCollation() {
 
 		template.remove(new BasicQuery("{}").collation(Collation.of("fr")), Sith.class).subscribe();
 
@@ -754,7 +927,7 @@ public void removeShouldPreferExplicitCollationOverDefaultCollation() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void saveShouldInvokeCallbacks() {
+	void saveShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -772,7 +945,7 @@ public void saveShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void insertShouldInvokeCallbacks() {
+	void insertShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -790,7 +963,7 @@ public void insertShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void insertAllShouldInvokeCallbacks() {
+	void insertAllShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -812,7 +985,7 @@ public void insertAllShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void findAndReplaceShouldInvokeCallbacks() {
+	void findAndReplaceShouldInvokeCallbacks() {
 
 		ValueCapturingBeforeConvertCallback beforeConvertCallback = spy(new ValueCapturingBeforeConvertCallback());
 		ValueCapturingBeforeSaveCallback beforeSaveCallback = spy(new ValueCapturingBeforeSaveCallback());
@@ -830,12 +1003,12 @@ public void findAndReplaceShouldInvokeCallbacks() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void entityCallbacksAreNotSetByDefault() {
+	void entityCallbacksAreNotSetByDefault() {
 		Assertions.assertThat(ReflectionTestUtils.getField(template, "entityCallbacks")).isNull();
 	}
 
 	@Test // DATAMONGO-2261
-	public void entityCallbacksShouldBeInitiatedOnSettingApplicationContext() {
+	void entityCallbacksShouldBeInitiatedOnSettingApplicationContext() {
 
 		ApplicationContext ctx = new StaticApplicationContext();
 		template.setApplicationContext(ctx);
@@ -844,7 +1017,7 @@ public void entityCallbacksShouldBeInitiatedOnSettingApplicationContext() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void setterForEntityCallbackOverridesContextInitializedOnes() {
+	void setterForEntityCallbackOverridesContextInitializedOnes() {
 
 		ApplicationContext ctx = new StaticApplicationContext();
 		template.setApplicationContext(ctx);
@@ -856,7 +1029,7 @@ public void setterForEntityCallbackOverridesContextInitializedOnes() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void setterForApplicationContextShouldNotOverrideAlreadySetEntityCallbacks() {
+	void setterForApplicationContextShouldNotOverrideAlreadySetEntityCallbacks() {
 
 		ReactiveEntityCallbacks callbacks = ReactiveEntityCallbacks.create();
 		ApplicationContext ctx = new StaticApplicationContext();
@@ -867,32 +1040,33 @@ public void setterForApplicationContextShouldNotOverrideAlreadySetEntityCallback
 		Assertions.assertThat(ReflectionTestUtils.getField(template, "entityCallbacks")).isSameAs(callbacks);
 	}
 
-	@Test // DATAMONGO-2344
-	public void slaveOkQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFind() {
+	@Test // DATAMONGO-2344, DATAMONGO-2572
+	void allowSecondaryReadsQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFind() {
 
-		template.find(new Query().slaveOk(), AutogenerateableId.class).subscribe();
+		template.find(new Query().allowSecondaryReads(), AutogenerateableId.class).subscribe();
 
 		verify(collection).withReadPreference(eq(ReadPreference.primaryPreferred()));
 	}
 
-	@Test // DATAMONGO-2344
-	public void slaveOkQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindOne() {
+	@Test // DATAMONGO-2344, DATAMONGO-2572
+	void allowSecondaryReadsQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindOne() {
 
-		template.findOne(new Query().slaveOk(), AutogenerateableId.class).subscribe();
+		template.findOne(new Query().allowSecondaryReads(), AutogenerateableId.class).subscribe();
 
 		verify(collection).withReadPreference(eq(ReadPreference.primaryPreferred()));
 	}
 
-	@Test // DATAMONGO-2344
-	public void slaveOkQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindDistinct() {
+	@Test // DATAMONGO-2344, DATAMONGO-2572
+	void allowSecondaryReadsQueryOptionShouldApplyPrimaryPreferredReadPreferenceForFindDistinct() {
 
-		template.findDistinct(new Query().slaveOk(), "name", AutogenerateableId.class, String.class).subscribe();
+		template.findDistinct(new Query().allowSecondaryReads(), "name", AutogenerateableId.class, String.class)
+				.subscribe();
 
 		verify(collection).withReadPreference(eq(ReadPreference.primaryPreferred()));
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldAllowAggregationExpressions() {
+	void updateShouldAllowAggregationExpressions() {
 
 		AggregationUpdate update = AggregationUpdate.update().set("total")
 				.toValue(ArithmeticOperators.valueOf("val1").sum().and("val2"));
@@ -908,7 +1082,7 @@ public void updateShouldAllowAggregationExpressions() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldAllowMultipleAggregationExpressions() {
+	void updateShouldAllowMultipleAggregationExpressions() {
 
 		AggregationUpdate update = AggregationUpdate.update() //
 				.set("average").toValue(ArithmeticOperators.valueOf("tests").avg()) //
@@ -936,7 +1110,7 @@ public void updateShouldAllowMultipleAggregationExpressions() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldMapAggregationExpressionToDomainType() {
+	void updateShouldMapAggregationExpressionToDomainType() {
 
 		AggregationUpdate update = AggregationUpdate.update().set("name")
 				.toValue(ArithmeticOperators.valueOf("val1").sum().and("val2"));
@@ -952,7 +1126,7 @@ public void updateShouldMapAggregationExpressionToDomainType() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldPassOnUnsetCorrectly() {
+	void updateShouldPassOnUnsetCorrectly() {
 
 		SetOperation setOperation = SetOperation.builder().set("status").toValue("Modified").and().set("comments")
 				.toValue(Fields.fields("misc1").and("misc2").asList());
@@ -972,7 +1146,7 @@ public void updateShouldPassOnUnsetCorrectly() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void updateShouldMapAggregationUnsetToDomainType() {
+	void updateShouldMapAggregationUnsetToDomainType() {
 
 		AggregationUpdate update = AggregationUpdate.update();
 		update.unset("name");
@@ -986,12 +1160,709 @@ public void updateShouldMapAggregationUnsetToDomainType() {
 		assertThat(captor.getValue()).isEqualTo(Collections.singletonList(Document.parse("{ $unset : \"firstname\" }")));
 	}
 
-	@Data
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyIfNotPresentInFilter() {
+
+		when(findPublisher.first()).thenReturn(Mono.empty());
+
+		template.save(new ShardedEntityWithNonDefaultShardKey("id-1", "AT", 4230)).subscribe();
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		verify(collection).replaceOne(filter.capture(), any(), any());
+
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1").append("country", "AT").append("userid", 4230));
+	}
+
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyFromGivenDocumentIfShardKeyIsImmutable() {
+
+		template.save(new ShardedEntityWithNonDefaultImmutableShardKey("id-1", "AT", 4230)).subscribe();
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		ArgumentCaptor<Document> replacement = ArgumentCaptor.forClass(Document.class);
+
+		verify(collection).replaceOne(filter.capture(), replacement.capture(), any());
+
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1").append("country", "AT").append("userid", 4230));
+		assertThat(replacement.getValue()).containsEntry("country", "AT").containsEntry("userid", 4230);
+
+		verifyNoInteractions(findPublisher);
+	}
+
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyToVersionedEntityIfNotPresentInFilter() {
+
+		when(collection.replaceOne(any(Bson.class), any(Document.class), any(ReplaceOptions.class)))
+				.thenReturn(Mono.just(UpdateResult.acknowledged(1, 1L, null)));
+		when(findPublisher.first()).thenReturn(Mono.empty());
+
+		template.save(new ShardedVersionedEntityWithNonDefaultShardKey("id-1", 1L, "AT", 4230)).subscribe();
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		verify(collection).replaceOne(filter.capture(), any(), any());
+
+		assertThat(filter.getValue())
+				.isEqualTo(new Document("_id", "id-1").append("version", 1L).append("country", "AT").append("userid", 4230));
+	}
+
+	@Test // DATAMONGO-2341
+	void saveShouldAppendNonDefaultShardKeyFromExistingDocumentIfNotPresentInFilter() {
+
+		when(findPublisher.first())
+				.thenReturn(Mono.just(new Document("_id", "id-1").append("country", "US").append("userid", 4230)));
+
+		template.save(new ShardedEntityWithNonDefaultShardKey("id-1", "AT", 4230)).subscribe();
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		ArgumentCaptor<Document> replacement = ArgumentCaptor.forClass(Document.class);
+
+		verify(collection).replaceOne(filter.capture(), replacement.capture(), any());
+
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1").append("country", "US").append("userid", 4230));
+		assertThat(replacement.getValue()).containsEntry("country", "AT").containsEntry("userid", 4230);
+	}
+
+	@Test // DATAMONGO-2341
+	void saveShouldAppendDefaultShardKeyIfNotPresentInFilter() {
+
+		template.save(new ShardedEntityWithDefaultShardKey("id-1", "AT", 4230)).subscribe();
+
+		ArgumentCaptor<Bson> filter = ArgumentCaptor.forClass(Bson.class);
+		verify(collection).replaceOne(filter.capture(), any(), any());
+
+		assertThat(filter.getValue()).isEqualTo(new Document("_id", "id-1"));
+	}
+
+	@Test // DATAMONGO-2341
+	void saveShouldProjectOnShardKeyWhenLoadingExistingDocument() {
+
+		when(findPublisher.first())
+				.thenReturn(Mono.just(new Document("_id", "id-1").append("country", "US").append("userid", 4230)));
+
+		template.save(new ShardedEntityWithNonDefaultShardKey("id-1", "AT", 4230)).subscribe();
+
+		verify(findPublisher).projection(new Document("country", 1).append("userid", 1));
+	}
+
+	@Test // DATAMONGO-2341
+	void saveVersionedShouldProjectOnShardKeyWhenLoadingExistingDocument() {
+
+		when(collection.replaceOne(any(Bson.class), any(Document.class), any(ReplaceOptions.class)))
+				.thenReturn(Mono.just(UpdateResult.acknowledged(1, 1L, null)));
+		when(findPublisher.first()).thenReturn(Mono.empty());
+
+		template.save(new ShardedVersionedEntityWithNonDefaultShardKey("id-1", 1L, "AT", 4230)).subscribe();
+
+		verify(findPublisher).projection(new Document("country", 1).append("userid", 1));
+	}
+
+	@Test // GH-3648
+	void shouldThrowExceptionIfEntityReaderReturnsNull() {
+
+		MappingMongoConverter converter = mock(MappingMongoConverter.class);
+		when(converter.getMappingContext()).thenReturn((MappingContext) mappingContext);
+		when(converter.getProjectionFactory()).thenReturn(new SpelAwareProxyProjectionFactory());
+		template = new ReactiveMongoTemplate(factory, converter);
+
+		when(collection.find(Document.class)).thenReturn(findPublisher);
+		stubFindSubscribe(new Document());
+
+		template.find(new Query(), Person.class).as(StepVerifier::create).verifyError(MappingException.class);
+	}
+
+	@Test // DATAMONGO-2479
+	void findShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.find(Document.class)).thenReturn(findPublisher);
+		stubFindSubscribe(document);
+
+		List<Person> results = template.find(new Query(), Person.class).timeout(Duration.ofSeconds(1)).toStream()
+				.collect(Collectors.toList());
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(results.get(0).id).isEqualTo("after-convert");
+	}
+
+	@Test // GH-4543
+	void findShouldNotLimitBackpressure() {
+
+		AtomicLong request = new AtomicLong();
+		stubFindSubscribe(new Document(), request);
+
+		template.find(new Query(), Person.class).subscribe();
+
+		assertThat(request).hasValueGreaterThan(128);
+	}
+
+	@Test // DATAMONGO-2479
+	void findByIdShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.find(any(Bson.class), eq(Document.class))).thenReturn(findPublisher);
+		stubFindSubscribe(document);
+
+		Person result = template.findById("init", Person.class).block(Duration.ofSeconds(1));
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(result.id).isEqualTo("after-convert");
+	}
+
+	@Test // DATAMONGO-2479
+	void findOneShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.find(any(Bson.class), eq(Document.class))).thenReturn(findPublisher);
+		stubFindSubscribe(document);
+
+		Person result = template.findOne(new Query(), Person.class).block(Duration.ofSeconds(1));
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(result.id).isEqualTo("after-convert");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAllShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.find(Document.class)).thenReturn(findPublisher);
+		stubFindSubscribe(document);
+
+		List<Person> results = template.findAll(Person.class).timeout(Duration.ofSeconds(1)).toStream()
+				.collect(Collectors.toList());
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(results.get(0).id).isEqualTo("after-convert");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAndModifyShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndUpdate(any(Bson.class), any(Bson.class), any())).thenReturn(findPublisher);
+		stubFindSubscribe(document);
+
+		Person result = template.findAndModify(new Query(), new Update(), Person.class).block(Duration.ofSeconds(1));
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(result.id).isEqualTo("after-convert");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAndRemoveShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndDelete(any(Bson.class), any())).thenReturn(findPublisher);
+		stubFindSubscribe(document);
+
+		Person result = template.findAndRemove(new Query(), Person.class).block(Duration.ofSeconds(1));
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(result.id).isEqualTo("after-convert");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAllAndRemoveShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.find(Document.class)).thenReturn(findPublisher);
+		stubFindSubscribe(document);
+		when(collection.deleteMany(any(Bson.class), any(DeleteOptions.class)))
+				.thenReturn(Mono.just(spy(DeleteResult.class)));
+
+		List<Person> results = template.findAllAndRemove(new Query(), Person.class).timeout(Duration.ofSeconds(1))
+				.toStream().collect(Collectors.toList());
+
+		verify(afterConvertCallback).onAfterConvert(eq(new Person("init", "luke")), eq(document), anyString());
+		assertThat(results.get(0).id).isEqualTo("after-convert");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAndReplaceShouldInvokeAfterConvertCallbacks() {
+
+		ValueCapturingAfterConvertCallback afterConvertCallback = spy(new ValueCapturingAfterConvertCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterConvertCallback));
+
+		when(collection.findOneAndReplace(any(Bson.class), any(Document.class), any())).thenReturn(findPublisher);
+		stubFindSubscribe(new Document("_id", "init").append("firstname", "luke"));
+
+		Person entity = new Person();
+		entity.id = "init";
+		entity.firstname = "luke";
+
+		Person saved = template.findAndReplace(new Query(), entity).block(Duration.ofSeconds(1));
+
+		verify(afterConvertCallback).onAfterConvert(eq(entity), any(), anyString());
+		assertThat(saved.id).isEqualTo("after-convert");
+	}
+
+	@Test // DATAMONGO-2479
+	void saveShouldInvokeAfterSaveCallbacks() {
+
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterSaveCallback));
+
+		when(collection.replaceOne(any(Bson.class), any(Document.class), any(ReplaceOptions.class)))
+				.thenReturn(Mono.just(mock(UpdateResult.class)));
+
+		Person entity = new Person("init", "luke");
+
+		Person saved = template.save(entity).block(Duration.ofSeconds(1));
+
+		verify(afterSaveCallback).onAfterSave(eq(entity), any(), anyString());
+		assertThat(saved.id).isEqualTo("after-save");
+	}
+
+	@Test // DATAMONGO-2479
+	void insertShouldInvokeAfterSaveCallbacks() {
+
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterSaveCallback));
+
+		when(collection.insertOne(any())).thenReturn(Mono.just(mock(InsertOneResult.class)));
+
+		Person entity = new Person("init", "luke");
+
+		Person saved = template.insert(entity).block(Duration.ofSeconds(1));
+
+		verify(afterSaveCallback).onAfterSave(eq(entity), any(), anyString());
+		assertThat(saved.id).isEqualTo("after-save");
+	}
+
+	@Test // DATAMONGO-2479
+	void insertAllShouldInvokeAfterSaveCallbacks() {
+
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterSaveCallback));
+
+		Person entity1 = new Person();
+		entity1.id = "1";
+		entity1.firstname = "luke";
+
+		Person entity2 = new Person();
+		entity1.id = "2";
+		entity1.firstname = "luke";
+
+		when(collection.insertMany(anyList())).then(invocation -> {
+			List<?> list = invocation.getArgument(0);
+			return Flux.fromIterable(list).map(i -> mock(InsertManyResult.class));
+		});
+
+		List<Person> saved = template.insertAll(Arrays.asList(entity1, entity2)).timeout(Duration.ofSeconds(1)).toStream()
+				.collect(Collectors.toList());
+
+		verify(afterSaveCallback, times(2)).onAfterSave(any(), any(), anyString());
+		assertThat(saved.get(0).id).isEqualTo("after-save");
+		assertThat(saved.get(1).id).isEqualTo("after-save");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAndReplaceShouldInvokeAfterSaveCallbacks() {
+
+		ValueCapturingAfterSaveCallback afterSaveCallback = spy(new ValueCapturingAfterSaveCallback());
+
+		template.setEntityCallbacks(ReactiveEntityCallbacks.create(afterSaveCallback));
+
+		when(collection.findOneAndReplace(any(Bson.class), any(Document.class), any())).thenReturn(findPublisher);
+		stubFindSubscribe(new Document("_id", "init").append("firstname", "luke"));
+
+		Person entity = new Person("init", "luke");
+
+		Person saved = template.findAndReplace(new Query(), entity).block(Duration.ofSeconds(1));
+
+		verify(afterSaveCallback).onAfterSave(eq(entity), any(), anyString());
+		assertThat(saved.id).isEqualTo("after-save");
+	}
+
+	@Test // DATAMONGO-2479
+	void findAndReplaceShouldEmitAfterSaveEvent() {
+
+		AbstractMongoEventListener<Person> eventListener = new AbstractMongoEventListener<Person>() {
+
+			@Override
+			public void onAfterSave(AfterSaveEvent<Person> event) {
+
+				assertThat(event.getSource().id).isEqualTo("init");
+				event.getSource().id = "after-save-event";
+			}
+		};
+
+		StaticApplicationContext ctx = new StaticApplicationContext();
+		ctx.registerBean(ApplicationListener.class, () -> eventListener);
+		ctx.refresh();
+
+		template.setApplicationContext(ctx);
+
+		Person entity = new Person("init", "luke");
+
+		Document document = new Document("_id", "init").append("firstname", "luke");
+		when(collection.findOneAndReplace(any(Bson.class), any(Document.class), any())).thenReturn(Mono.just(document));
+
+		Person saved = template.findAndReplace(new Query(), entity).block(Duration.ofSeconds(1));
+
+		assertThat(saved.id).isEqualTo("after-save-event");
+	}
+
+	@Test // DATAMONGO-2556
+	void esitmatedCountShouldBeDelegatedCorrectly() {
+
+		template.estimatedCount(Person.class).subscribe();
+
+		verify(db).getCollection("star-wars", Document.class);
+		verify(collection).estimatedDocumentCount(any());
+	}
+
+	@Test // GH-3522
+	void usedCountDocumentsForEmptyQueryByDefault() {
+
+		template.count(new Query(), Person.class).subscribe();
+
+		verify(collection).countDocuments(any(Document.class), any());
+	}
+
+	@Test // GH-3522
+	void delegatesToEstimatedCountForEmptyQueryIfEnabled() {
+
+		template.useEstimatedCount(true);
+
+		template.count(new Query(), Person.class).subscribe();
+
+		verify(collection).estimatedDocumentCount(any());
+	}
+
+	@Test // GH-3522
+	void stillUsesCountDocumentsForNonEmptyQueryEvenIfEstimationEnabled() {
+
+		template.useEstimatedCount(true);
+
+		template.count(new BasicQuery("{ 'spring' : 'data-mongodb' }"), Person.class).subscribe();
+
+		verify(collection).countDocuments(any(Document.class), any());
+	}
+
+	@Test // GH-4374
+	void countConsidersMaxTimeMs() {
+
+		template.count(new BasicQuery("{ 'spring' : 'data-mongodb' }").maxTimeMsec(5000), Person.class).subscribe();
+
+		ArgumentCaptor<CountOptions> options = ArgumentCaptor.forClass(CountOptions.class);
+		verify(collection).countDocuments(any(Document.class), options.capture());
+		assertThat(options.getValue().getMaxTime(TimeUnit.MILLISECONDS)).isEqualTo(5000);
+	}
+
+	@Test // GH-4374
+	void countPassesOnComment() {
+
+		template.count(new BasicQuery("{ 'spring' : 'data-mongodb' }").comment("rocks!"), Person.class).subscribe();
+
+		ArgumentCaptor<CountOptions> options = ArgumentCaptor.forClass(CountOptions.class);
+		verify(collection).countDocuments(any(Document.class), options.capture());
+		assertThat(options.getValue().getComment()).isEqualTo(BsonUtils.simpleToBsonValue("rocks!"));
+	}
+
+	@Test // GH-2911
+	void insertErrorsOnPublisher() {
+
+		Publisher<String> publisher = Mono.just("data");
+
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> template.insert(publisher));
+	}
+
+	@Test // GH-3731
+	void createCollectionShouldSetUpTimeSeriesWithDefaults() {
+
+		template.createCollection(TimeSeriesTypeWithDefaults.class).subscribe();
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getTimeSeriesOptions().toString())
+				.isEqualTo(new com.mongodb.client.model.TimeSeriesOptions("timestamp").toString());
+	}
+
+	@Test // GH-3731
+	void createCollectionShouldSetUpTimeSeries() {
+
+		template.createCollection(TimeSeriesType.class).subscribe();
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getTimeSeriesOptions().toString())
+				.isEqualTo(new com.mongodb.client.model.TimeSeriesOptions("time_stamp").metaField("meta")
+						.granularity(TimeSeriesGranularity.HOURS).toString());
+	}
+
+	@Test // GH-4167
+	void changeStreamOptionStartAftershouldApplied() {
+
+		when(factory.getMongoDatabase(anyString())).thenReturn(Mono.just(db));
+
+		when(collection.watch(any(Class.class))).thenReturn(changeStreamPublisher);
+		when(changeStreamPublisher.batchSize(anyInt())).thenReturn(changeStreamPublisher);
+		when(changeStreamPublisher.startAfter(any())).thenReturn(changeStreamPublisher);
+		when(changeStreamPublisher.fullDocument(any())).thenReturn(changeStreamPublisher);
+
+		BsonDocument token = new BsonDocument("token", new BsonString("id"));
+		template
+				.changeStream("database", "collection", ChangeStreamOptions.builder().startAfter(token).build(), Object.class)
+				.subscribe();
+
+		verify(changeStreamPublisher).startAfter(eq(token));
+	}
+
+	@Test // GH-4495
+	void changeStreamOptionFullDocumentBeforeChangeShouldBeApplied() {
+
+		when(factory.getMongoDatabase(anyString())).thenReturn(Mono.just(db));
+
+		when(collection.watch(any(Class.class))).thenReturn(changeStreamPublisher);
+		when(changeStreamPublisher.batchSize(anyInt())).thenReturn(changeStreamPublisher);
+		when(changeStreamPublisher.startAfter(any())).thenReturn(changeStreamPublisher);
+		when(changeStreamPublisher.fullDocument(any())).thenReturn(changeStreamPublisher);
+		when(changeStreamPublisher.fullDocumentBeforeChange(any())).thenReturn(changeStreamPublisher);
+
+		ChangeStreamOptions options = ChangeStreamOptions.builder()
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.REQUIRED).build();
+		template.changeStream("database", "collection", options, Object.class).subscribe();
+
+		verify(changeStreamPublisher).fullDocumentBeforeChange(FullDocumentBeforeChange.REQUIRED);
+
+	}
+
+	@Test // GH-4462
+	void replaceShouldUseCollationWhenPresent() {
+
+		template.replace(new BasicQuery("{}").collation(Collation.of("fr")), new Jedi()).subscribe();
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(Bson.class), any(), options.capture());
+
+		assertThat(options.getValue().isUpsert()).isFalse();
+		assertThat(options.getValue().getCollation().getLocale()).isEqualTo("fr");
+	}
+
+	@Test // GH-4462
+	void replaceShouldNotUpsertByDefault() {
+
+		template.replace(new BasicQuery("{}"), new MongoTemplateUnitTests.Sith()).subscribe();
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(Bson.class), any(), options.capture());
+
+		assertThat(options.getValue().isUpsert()).isFalse();
+	}
+
+	@Test // GH-4462
+	void replaceShouldUpsert() {
+
+		template.replace(new BasicQuery("{}"), new MongoTemplateUnitTests.Sith(),
+				org.springframework.data.mongodb.core.ReplaceOptions.replaceOptions().upsert()).subscribe();
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(Bson.class), any(), options.capture());
+
+		assertThat(options.getValue().isUpsert()).isTrue();
+	}
+
+	@Test // GH-4462
+	void replaceShouldUseDefaultCollationWhenPresent() {
+
+		template.replace(new BasicQuery("{}"), new MongoTemplateUnitTests.Sith(),
+				org.springframework.data.mongodb.core.ReplaceOptions.replaceOptions()).subscribe();
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(Bson.class), any(), options.capture());
+
+		assertThat(options.getValue().getCollation().getLocale()).isEqualTo("de_AT");
+	}
+
+	@Test // GH-4462
+	void replaceShouldUseHintIfPresent() {
+
+		template.replace(new BasicQuery("{}").withHint("index-to-use"), new MongoTemplateUnitTests.Sith(),
+				org.springframework.data.mongodb.core.ReplaceOptions.replaceOptions().upsert()).subscribe();
+
+		ArgumentCaptor<com.mongodb.client.model.ReplaceOptions> options = ArgumentCaptor
+				.forClass(com.mongodb.client.model.ReplaceOptions.class);
+		verify(collection).replaceOne(any(Bson.class), any(), options.capture());
+
+		assertThat(options.getValue().getHintString()).isEqualTo("index-to-use");
+	}
+
+	@Test // GH-4462
+	void replaceShouldApplyWriteConcern() {
+
+		template.setWriteConcernResolver(new WriteConcernResolver() {
+			public WriteConcern resolve(MongoAction action) {
+
+				assertThat(action.getMongoActionOperation()).isEqualTo(MongoActionOperation.REPLACE);
+				return WriteConcern.UNACKNOWLEDGED;
+			}
+		});
+
+		template.replace(new BasicQuery("{}").withHint("index-to-use"), new Sith(),
+				org.springframework.data.mongodb.core.ReplaceOptions.replaceOptions().upsert()).subscribe();
+
+		verify(collection).withWriteConcern(eq(WriteConcern.UNACKNOWLEDGED));
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromString() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsPlainString.class).subscribe();
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.MINUTES))
+				.isEqualTo(10);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromIso8601String() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsIso8601Style.class).subscribe();
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.DAYS))
+				.isEqualTo(1);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromExpression() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsExpression.class).subscribe();
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.SECONDS))
+				.isEqualTo(11);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithExpirationFromExpressionReturningDuration() {
+
+		template.createCollection(TimeSeriesTypeWithExpireAfterAsExpressionResultingInDuration.class).subscribe();
+
+		ArgumentCaptor<CreateCollectionOptions> options = ArgumentCaptor.forClass(CreateCollectionOptions.class);
+		verify(db).createCollection(any(), options.capture());
+
+		assertThat(options.getValue().getExpireAfter(TimeUnit.SECONDS))
+				.isEqualTo(100);
+	}
+
+	@Test // GH-4099
+	void createCollectionShouldSetUpTimeSeriesWithInvalidTimeoutExpiration() {
+
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() ->
+			template.createCollection(TimeSeriesTypeWithInvalidExpireAfter.class).subscribe()
+		);
+	}
+
+	private void stubFindSubscribe(Document document) {
+		stubFindSubscribe(document, new AtomicLong());
+	}
+
+	private void stubFindSubscribe(Document document, AtomicLong request) {
+
+		Publisher<Document> realPublisher = Flux.just(document).doOnRequest(request::addAndGet);
+
+		doAnswer(invocation -> {
+			Subscriber<Document> subscriber = invocation.getArgument(0);
+			realPublisher.subscribe(subscriber);
+			return null;
+		}).when(findPublisher).subscribe(any());
+	}
+
 	@org.springframework.data.mongodb.core.mapping.Document(collection = "star-wars")
 	static class Person {
 
 		@Id String id;
 		String firstname;
+
+		public Person() {}
+
+		public Person(String id, String firstname) {
+			this.id = id;
+			this.firstname = firstname;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname);
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateUnitTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname() + ")";
+		}
 	}
 
 	class Wrapper {
@@ -1014,10 +1885,40 @@ public interface PersonSpELProjection {
 		String getName();
 	}
 
-	@Data
 	static class Jedi {
 
 		@Field("firstname") String name;
+
+		public Jedi() {}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Jedi jedi = (Jedi) o;
+			return Objects.equals(name, jedi.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name);
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateUnitTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 
 	@org.springframework.data.mongodb.core.mapping.Document(collation = "de_AT")
@@ -1030,6 +1931,57 @@ static class EntityWithListOfSimple {
 		List<Integer> grades;
 	}
 
+	@TimeSeries(timeField = "timestamp")
+	static class TimeSeriesTypeWithDefaults {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", metaField = "meta", granularity = Granularity.HOURS)
+	static class TimeSeriesType {
+
+		String id;
+
+		@Field("time_stamp") Instant timestamp;
+		Object meta;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "10m")
+	static class TimeSeriesTypeWithExpireAfterAsPlainString {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "P1D")
+	static class TimeSeriesTypeWithExpireAfterAsIso8601Style {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "#{10 + 1 + 's'}")
+	static class TimeSeriesTypeWithExpireAfterAsExpression {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "#{T(java.time.Duration).ofSeconds(100)}")
+	static class TimeSeriesTypeWithExpireAfterAsExpressionResultingInDuration {
+
+		String id;
+		Instant timestamp;
+	}
+
+	@TimeSeries(timeField = "timestamp", expireAfter = "123ops")
+	static class TimeSeriesTypeWithInvalidExpireAfter {
+
+		String id;
+		Instant timestamp;
+	}
+
 	static class ValueCapturingEntityCallback<T> {
 
 		private final List<T> values = new ArrayList<>(1);
@@ -1069,4 +2021,37 @@ public Mono<Person> onBeforeSave(Person entity, Document document, String collec
 			return Mono.just(entity);
 		}
 	}
+
+	static class ValueCapturingAfterConvertCallback extends ValueCapturingEntityCallback<Person>
+			implements ReactiveAfterConvertCallback<Person> {
+
+		@Override
+		public Mono<Person> onAfterConvert(Person entity, Document document, String collection) {
+
+			capture(entity);
+			return Mono.just(new Person() {
+				{
+					id = "after-convert";
+					firstname = entity.firstname;
+				}
+			});
+		}
+	}
+
+	static class ValueCapturingAfterSaveCallback extends ValueCapturingEntityCallback<Person>
+			implements ReactiveAfterSaveCallback<Person> {
+
+		@Override
+		public Mono<Person> onAfterSave(Person entity, Document document, String collection) {
+
+			capture(entity);
+			return Mono.just(new Person() {
+				{
+					id = "after-save";
+					firstname = entity.firstname;
+				}
+			});
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUpdateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUpdateTests.java
index 12997fdf89..35c27815ff 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUpdateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUpdateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,19 +18,26 @@
 import static org.assertj.core.api.Assertions.*;
 
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.Version;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
 import org.springframework.data.mongodb.core.aggregation.ArithmeticOperators;
 import org.springframework.data.mongodb.core.aggregation.ReplaceWithOperation;
@@ -39,8 +46,11 @@
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.test.util.Client;
 import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
-import org.springframework.data.mongodb.test.util.MongoServerCondition;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 
 import com.mongodb.reactivestreams.client.MongoClient;
@@ -49,19 +59,18 @@
 /**
  * @author Christoph Strobl
  */
-@ExtendWith(MongoServerCondition.class)
+@ExtendWith(MongoClientExtension.class)
 @EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
 public class ReactiveMongoTemplateUpdateTests {
 
 	static final String DB_NAME = "reactive-update-test";
 
-	MongoClient client;
+	static @Client MongoClient client;
 	ReactiveMongoTemplate template;
 
 	@BeforeEach
 	void beforeEach() {
 
-		client = MongoTestUtils.reactiveClient();
 		template = new ReactiveMongoTemplate(new SimpleReactiveMongoDatabaseFactory(client, DB_NAME));
 
 		MongoTestUtils.createOrReplaceCollection(DB_NAME, template.getCollectionName(Score.class), client).then()
@@ -186,7 +195,6 @@ public void aggregateUpdateWithReplaceWith() {
 		two.author = new Author("Grace", "Hopper");
 
 		template.insertAll(Arrays.asList(one, two)).then().as(StepVerifier::create).verifyComplete();
-		;
 
 		AggregationUpdate update = AggregationUpdate.update()
 				.replaceWith(ReplaceWithOperation.replaceWithValueOf("author"));
@@ -240,7 +248,6 @@ public void aggregateUpdateFirstMatch() {
 	}
 
 	@Test // DATAMONGO-2331
-	@Disabled("https://jira.mongodb.org/browse/JAVA-3432")
 	public void findAndModifyAppliesAggregationUpdateCorrectly() {
 
 		Book one = new Book();
@@ -271,6 +278,39 @@ public void findAndModifyAppliesAggregationUpdateCorrectly() {
 
 	}
 
+	@ParameterizedTest // GH-4797
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+	@MethodSource("sortedUpdateBookArgs")
+	void updateFirstWithSort(Class<?> domainType, Sort sort, UpdateDefinition update) {
+
+		Book one = new Book();
+		one.id = 1;
+		one.isbn = "001 001 300";
+		one.title = "News isn't fake";
+		one.author = new Author("John", "Backus");
+
+		Book two = new Book();
+		two.id = 2;
+		two.title = "love is love";
+		two.isbn = "001 001 100";
+		two.author = new Author("Grace", "Hopper");
+
+		template.insertAll(Arrays.asList(one, two)).then().as(StepVerifier::create).verifyComplete();
+
+		template.update(domainType) //
+				.inCollection(template.getCollectionName(Book.class))//
+				.matching(new Query().with(sort)).apply(update) //
+				.first().as(StepVerifier::create) //
+				.assertNext(result -> assertThat(result.getModifiedCount()).isOne()) //
+				.verifyComplete();
+
+		Mono.from(collection(Book.class).find(new org.bson.Document("_id", two.id)).first()) //
+				.as(StepVerifier::create) //
+				.assertNext(document -> assertThat(document).containsEntry("title", "Science is real!")) //
+				.verifyComplete();
+	}
+
+
 	private Flux<org.bson.Document> all(Class<?> type) {
 		return Flux.from(collection(type).find(new org.bson.Document()));
 	}
@@ -279,6 +319,21 @@ private MongoCollection<org.bson.Document> collection(Class<?> type) {
 		return client.getDatabase(DB_NAME).getCollection(template.getCollectionName(type));
 	}
 
+	private static Stream<Arguments> sortedUpdateBookArgs() {
+
+		Update update = new Update().set("title", "Science is real!");
+		AggregationUpdate aggUpdate = AggregationUpdate.update().set("title").toValue("Science is real!");
+
+		return Stream.of( //
+			Arguments.of(Book.class, Sort.by(Direction.ASC, "isbn"), update), // typed, no field mapping
+			Arguments.of(Book.class, Sort.by(Direction.DESC, "author.lastname"), update), // typed, map `lastname`
+			Arguments.of(Book.class, Sort.by(Direction.DESC, "author.last"), update), // typed, raw field name
+			Arguments.of(Object.class, Sort.by(Direction.ASC, "isbn"), update), // untyped, requires raw field name
+			Arguments.of(Book.class, Sort.by(Direction.ASC, "isbn"), aggUpdate), // aggregation, no field mapping
+			Arguments.of(Book.class, Sort.by(Direction.DESC, "author.last"), aggUpdate) // aggregation, map `lastname`
+		);
+	}
+
 	@Document("scores")
 	static class Score {
 
@@ -317,6 +372,24 @@ static class Book {
 		String isbn;
 		Author author;
 		@Field("copies") Collection<Warehouse> stock;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Book book = (Book) o;
+			return Objects.equals(id, book.id) && Objects.equals(title, book.title) && Objects.equals(isbn, book.isbn)
+					&& Objects.equals(author, book.author) && Objects.equals(stock, book.stock);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, title, isbn, author, stock);
+		}
 	}
 
 	static class Author {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateViewTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateViewTests.java
new file mode 100644
index 0000000000..0841ddc37f
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateViewTests.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright 2022-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import reactor.test.StepVerifier;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+import org.bson.Document;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Collation;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.CollectionInfo;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoTestUtils;
+
+import com.mongodb.reactivestreams.client.MongoClient;
+
+/**
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoClientExtension.class)
+public class ReactiveMongoTemplateViewTests {
+
+	static @Client com.mongodb.client.MongoClient client;
+	static @Client MongoClient reactiveClient;
+	static final String DB_NAME = "reactive-mongo-template-view-tests";
+
+	private ReactiveMongoTemplate template;
+
+	Student alex = new Student(22001L, "Alex", 1, 4.0D);
+	Student bernie = new Student(21001L, "bernie", 2, 3.7D);
+	Student chris = new Student(20010L, "Chris", 3, 2.5D);
+	Student drew = new Student(22021L, "Drew", 1, 3.2D);
+	Student harley1 = new Student(17301L, "harley", 6, 3.1D);
+	Student farmer = new Student(21022L, "Farmer", 1, 2.2D);
+	Student george = new Student(20020L, "george", 3, 2.8D);
+	Student harley2 = new Student(18020, "Harley", 5, 2.8D);
+
+	List<Student> students = Arrays.asList(alex, bernie, chris, drew, harley1, farmer, george, harley2);
+
+	@BeforeEach
+	void beforeEach() {
+		template = new ReactiveMongoTemplate(reactiveClient, DB_NAME);
+	}
+
+	@AfterEach
+	void afterEach() {
+		client.getDatabase(DB_NAME).drop();
+	}
+
+	@Test // GH-2594
+	void createsViewFromPipeline() {
+
+		template.insertAll(students).then().as(StepVerifier::create).verifyComplete();
+
+		template.createView("firstYears", Student.class, match(where("year").is(1))).then().as(StepVerifier::create)
+				.verifyComplete();
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "firstYears");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getViewTarget()).isEqualTo("student");
+		assertThat(collectionInfo.getViewPipeline()).containsExactly(new Document("$match", new Document("year", 1)));
+	}
+
+	@Test // GH-2594
+	void mapsPipelineAgainstDomainObject() {
+
+		template.insertAll(students).then().as(StepVerifier::create).verifyComplete();
+
+		template.createView("fakeStudents", Student.class, match(where("studentID").gte("22"))).then()
+				.as(StepVerifier::create).verifyComplete();
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "fakeStudents");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getViewPipeline())
+				.containsExactly(new Document("$match", new Document("sID", new Document("$gte", "22"))));
+	}
+
+	@Test // GH-2594
+	void takesPipelineAsIsIfNoTypeDefined() {
+
+		template.insertAll(students).then().as(StepVerifier::create).verifyComplete();
+
+		template.createView("fakeStudents", "student", AggregationPipeline.of(match(where("studentID").gte("22"))),
+				ViewOptions.none()).then().as(StepVerifier::create).verifyComplete();
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "fakeStudents");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getViewPipeline())
+				.containsExactly(new Document("$match", new Document("studentID", new Document("$gte", "22"))));
+	}
+
+	@Test // GH-2594
+	void readsFromView() {
+
+		template.insertAll(students).then().as(StepVerifier::create).verifyComplete();
+		client.getDatabase(DB_NAME).createView("firstYears", "student",
+				Arrays.asList(new Document("$match", new Document("year", 1))));
+
+		template.query(Student.class).inCollection("firstYears").all().collectList().as(StepVerifier::create)
+				.consumeNextWith(it -> assertThat(it).containsExactlyInAnyOrder(alex, drew, farmer));
+	}
+
+	@Test // GH-2594
+	void appliesCollationToView() {
+
+		template.insertAll(students).then().as(StepVerifier::create).verifyComplete();
+
+		template.createView("firstYears", Student.class, AggregationPipeline.of(match(where("year").is(1))),
+				new ViewOptions().collation(Collation.of("en_US"))).then().as(StepVerifier::create).verifyComplete();
+
+		CollectionInfo collectionInfo = MongoTestUtils.readCollectionInfo(client.getDatabase(DB_NAME), "firstYears");
+		assertThat(collectionInfo.isView()).isTrue();
+		assertThat(collectionInfo.getCollation().getLocale()).isEqualTo("en_US");
+	}
+
+	private static class Student {
+
+		@Field("sID") Long studentID;
+
+		int year;
+
+		double score;
+
+		String name;
+
+		public Student() {}
+
+		public Student(long studentID, String name, int year, double score) {
+			this.studentID = studentID;
+			this.name = name;
+			this.year = year;
+			this.score = score;
+		}
+
+		public Long getStudentID() {
+			return this.studentID;
+		}
+
+		public int getYear() {
+			return this.year;
+		}
+
+		public double getScore() {
+			return this.score;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setStudentID(Long studentID) {
+			this.studentID = studentID;
+		}
+
+		public void setYear(int year) {
+			this.year = year;
+		}
+
+		public void setScore(double score) {
+			this.score = score;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Student student = (Student) o;
+			return year == student.year && Double.compare(student.score, score) == 0
+					&& Objects.equals(studentID, student.studentID) && Objects.equals(name, student.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(studentID, year, score, name);
+		}
+
+		public String toString() {
+			return "ReactiveMongoTemplateViewTests.Student(studentID=" + this.getStudentID() + ", year=" + this.getYear()
+					+ ", score=" + this.getScore() + ", name=" + this.getName() + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupportTests.java
index 99fadce8e5..cfdc5fe1a1 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveRemoveOperationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,40 +15,47 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.springframework.data.mongodb.core.query.Criteria.*;
-import static org.springframework.data.mongodb.core.query.Query.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
 
-import lombok.Data;
 import reactor.test.StepVerifier;
 
-import org.junit.Before;
-import org.junit.Test;
+import java.util.Objects;
+import java.util.Optional;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 
-import com.mongodb.reactivestreams.client.MongoClients;
+import com.mongodb.client.MongoClient;
 
 /**
  * Integration tests for {@link ReactiveRemoveOperationSupport}.
  *
  * @author Mark Paluch
  */
-public class ReactiveRemoveOperationSupportTests {
+@ExtendWith(MongoClientExtension.class)
+class ReactiveRemoveOperationSupportTests {
 
 	private static final String STAR_WARS = "star-wars";
-	MongoTemplate blocking;
-	ReactiveMongoTemplate template;
+	private static @Client MongoClient client;
+	private static @Client com.mongodb.reactivestreams.client.MongoClient reactiveClient;
+
+	private MongoTemplate blocking;
+	private ReactiveMongoTemplate template;
 
-	Person han;
-	Person luke;
+	private Person han;
+	private Person luke;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		blocking = new MongoTemplate(
-				new SimpleMongoClientDbFactory(MongoTestUtils.client(), "ExecutableRemoveOperationSupportTests"));
+		blocking = new MongoTemplate(new SimpleMongoClientDatabaseFactory(client, "ExecutableRemoveOperationSupportTests"));
 		blocking.dropCollection(STAR_WARS);
 
 		han = new Person();
@@ -62,11 +69,11 @@ public void setUp() {
 		blocking.save(han);
 		blocking.save(luke);
 
-		template = new ReactiveMongoTemplate(MongoTestUtils.reactiveClient(), "ExecutableRemoveOperationSupportTests");
+		template = new ReactiveMongoTemplate(reactiveClient, "ExecutableRemoveOperationSupportTests");
 	}
 
 	@Test // DATAMONGO-1719
-	public void removeAll() {
+	void removeAll() {
 
 		template.remove(Person.class).all().as(StepVerifier::create).consumeNextWith(actual -> {
 			assertThat(actual.getDeletedCount()).isEqualTo(2L);
@@ -74,14 +81,21 @@ public void removeAll() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void removeAllMatching() {
+	void removeAllMatching() {
 
 		template.remove(Person.class).matching(query(where("firstname").is("han"))).all().as(StepVerifier::create)
 				.consumeNextWith(actual -> assertThat(actual.getDeletedCount()).isEqualTo(1L)).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1719
-	public void removeAllMatchingWithAlternateDomainTypeAndCollection() {
+	void removeAllMatchingCriteria() {
+
+		template.remove(Person.class).matching(where("firstname").is("han")).all().as(StepVerifier::create)
+				.consumeNextWith(actual -> assertThat(actual.getDeletedCount()).isEqualTo(1L)).verifyComplete();
+	}
+
+	@Test // DATAMONGO-1719
+	void removeAllMatchingWithAlternateDomainTypeAndCollection() {
 
 		template.remove(Jedi.class).inCollection(STAR_WARS).matching(query(where("name").is("luke"))).all()
 				.as(StepVerifier::create).consumeNextWith(actual -> assertThat(actual.getDeletedCount()).isEqualTo(1L))
@@ -89,22 +103,97 @@ public void removeAllMatchingWithAlternateDomainTypeAndCollection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void removeAndReturnAllMatching() {
+	void removeAndReturnAllMatching() {
 
 		template.remove(Person.class).matching(query(where("firstname").is("han"))).findAndRemove().as(StepVerifier::create)
 				.expectNext(han).verifyComplete();
 	}
 
-	@Data
+	@Test // GH-4949
+	void removeConvertAndReturnAllMatching() {
+
+		template.remove(Person.class).matching(query(where("firstname").is("han"))).map((raw, it) -> Optional.of(it.get()))
+				.findAndRemove().as(StepVerifier::create).expectNext(Optional.of(han)).verifyComplete();
+
+		template.findById(han.id, Person.class).as(StepVerifier::create).verifyComplete();
+	}
+
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person {
+
 		@Id String id;
 		String firstname;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname);
+		}
+
+		public String toString() {
+			return "ReactiveRemoveOperationSupportTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ")";
+		}
 	}
 
-	@Data
 	static class Jedi {
 
 		@Field("firstname") String name;
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Jedi jedi = (Jedi) o;
+			return Objects.equals(name, jedi.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name);
+		}
+
+		public String toString() {
+			return "ReactiveRemoveOperationSupportTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveSessionBoundMongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveSessionBoundMongoTemplateUnitTests.java
index a35d32c103..02637e9971 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveSessionBoundMongoTemplateUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveSessionBoundMongoTemplateUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,14 +18,10 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.any;
-import static org.mockito.Mockito.anyBoolean;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyList;
-import static org.mockito.Mockito.anyString;
 
 import java.lang.reflect.Proxy;
 
+import com.mongodb.reactivestreams.client.ListCollectionNamesPublisher;
 import org.bson.Document;
 import org.bson.codecs.BsonValueCodec;
 import org.bson.codecs.configuration.CodecRegistry;
@@ -69,6 +65,7 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Mathieu Ouellet
  */
 @SuppressWarnings("unchecked")
 @RunWith(MockitoJUnitRunner.Silent.class)
@@ -86,6 +83,7 @@ public class ReactiveSessionBoundMongoTemplateUnitTests {
 	@Mock MongoDatabase database;
 	@Mock ClientSession clientSession;
 	@Mock FindPublisher findPublisher;
+	Publisher<String> collectionNamesPublisher;
 	@Mock AggregatePublisher aggregatePublisher;
 	@Mock DistinctPublisher distinctPublisher;
 	@Mock Publisher resultPublisher;
@@ -96,12 +94,13 @@ public class ReactiveSessionBoundMongoTemplateUnitTests {
 	@Before
 	public void setUp() {
 
+		mock(ListCollectionNamesPublisher.class);
 		when(client.getDatabase(anyString())).thenReturn(database);
 		when(codecRegistry.get(any(Class.class))).thenReturn(new BsonValueCodec());
 		when(database.getCodecRegistry()).thenReturn(codecRegistry);
 		when(database.getCollection(anyString())).thenReturn(collection);
 		when(database.getCollection(anyString(), any())).thenReturn(collection);
-		when(database.listCollectionNames(any(ClientSession.class))).thenReturn(findPublisher);
+		doReturn(collectionNamesPublisher).when(database).listCollectionNames(any(ClientSession.class));
 		when(database.createCollection(any(ClientSession.class), any(), any())).thenReturn(resultPublisher);
 		when(database.runCommand(any(ClientSession.class), any(), any(Class.class))).thenReturn(resultPublisher);
 		when(collection.find(any(ClientSession.class))).thenReturn(findPublisher);
@@ -111,7 +110,8 @@ public void setUp() {
 		when(collection.deleteMany(any(ClientSession.class), any(), any())).thenReturn(resultPublisher);
 		when(collection.insertOne(any(ClientSession.class), any(Document.class))).thenReturn(resultPublisher);
 		when(collection.aggregate(any(ClientSession.class), anyList(), any(Class.class))).thenReturn(aggregatePublisher);
-		when(collection.countDocuments(any(ClientSession.class), any(), any(CountOptions.class))).thenReturn(resultPublisher);
+		when(collection.countDocuments(any(ClientSession.class), any(), any(CountOptions.class)))
+				.thenReturn(resultPublisher);
 		when(collection.drop(any(ClientSession.class))).thenReturn(resultPublisher);
 		when(collection.findOneAndUpdate(any(ClientSession.class), any(), any(Bson.class), any()))
 				.thenReturn(resultPublisher);
@@ -127,7 +127,6 @@ public void setUp() {
 		when(findPublisher.collation(any())).thenReturn(findPublisher);
 		when(findPublisher.first()).thenReturn(resultPublisher);
 		when(aggregatePublisher.allowDiskUse(anyBoolean())).thenReturn(aggregatePublisher);
-		when(aggregatePublisher.useCursor(anyBoolean())).thenReturn(aggregatePublisher);
 
 		factory = new SimpleReactiveMongoDatabaseFactory(client, "foo");
 
@@ -219,7 +218,7 @@ public void collectionExistsShouldUseProxiedDatabase() {
 		verify(database).listCollectionNames(eq(clientSession));
 	}
 
-	@Test // DATAMONGO-1880
+	@Test // DATAMONGO-1880, GH-3522
 	public void countShouldUseProxiedCollection() {
 
 		template.count(new Query(), Person.class).subscribe();
@@ -227,6 +226,15 @@ public void countShouldUseProxiedCollection() {
 		verify(collection).countDocuments(eq(clientSession), any(), any(CountOptions.class));
 	}
 
+	@Test // GH-3522
+	public void countShouldDelegateToExactCountNoMatterWhat() {
+
+		template.useEstimatedCount(true);
+		template.count(new Query(), Person.class).subscribe();
+
+		verify(collection).countDocuments(eq(clientSession), any(), any(CountOptions.class));
+	}
+
 	@Test // DATAMONGO-1880
 	public void createCollectionShouldUseProxiedDatabase() {
 
@@ -302,12 +310,13 @@ public void upsertShouldUseProxiedCollection() {
 
 	@Test // DATAMONGO-1880
 	public void getCollectionShouldShouldJustReturnTheCollection/*No ClientSession binding*/() {
-		assertThat(template.getCollection(COLLECTION_NAME)).isNotInstanceOf(Proxy.class);
+		assertThat(template.getCollection(COLLECTION_NAME).block()).isNotInstanceOf(Proxy.class)
+				.isInstanceOf(MongoCollection.class);
 	}
 
 	@Test // DATAMONGO-1880
 	public void getDbShouldJustReturnTheDatabase/*No ClientSession binding*/() {
-		assertThat(template.getMongoDatabase()).isNotInstanceOf(Proxy.class);
+		assertThat(template.getMongoDatabase().block()).isNotInstanceOf(Proxy.class).isInstanceOf(MongoDatabase.class);
 	}
 
 	@Test // DATAMONGO-1880
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupportTests.java
index 270a45e101..bef67501b3 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveUpdateOperationSupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,43 +15,51 @@
  */
 package org.springframework.data.mongodb.core;
 
-import static org.assertj.core.api.Assertions.*;
-import static org.springframework.data.mongodb.core.query.Criteria.*;
-import static org.springframework.data.mongodb.core.query.Query.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
 
-import lombok.Data;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import reactor.test.StepVerifier;
 
+import java.util.Objects;
+import java.util.Optional;
+
 import org.bson.BsonString;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 
-import com.mongodb.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
+import com.mongodb.client.MongoClient;
 
 /**
  * Integration tests for {@link ReactiveUpdateOperationSupport}.
  *
  * @author Mark Paluch
  */
-public class ReactiveUpdateOperationSupportTests {
+@ExtendWith(MongoClientExtension.class)
+class ReactiveUpdateOperationSupportTests {
 
 	private static final String STAR_WARS = "star-wars";
-	MongoTemplate blocking;
-	ReactiveMongoTemplate template;
+	private static @Client MongoClient client;
+	private static @Client com.mongodb.reactivestreams.client.MongoClient reactiveClient;
+
+	private MongoTemplate blocking;
+	private ReactiveMongoTemplate template;
 
-	Person han;
-	Person luke;
+	private Person han;
+	private Person luke;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		blocking = new MongoTemplate(new SimpleMongoClientDbFactory(MongoTestUtils.client(), "ExecutableUpdateOperationSupportTests"));
+		blocking = new MongoTemplate(new SimpleMongoClientDatabaseFactory(client, "ExecutableUpdateOperationSupportTests"));
 		blocking.dropCollection(STAR_WARS);
 
 		han = new Person();
@@ -65,32 +73,32 @@ public void setUp() {
 		blocking.save(han);
 		blocking.save(luke);
 
-		template = new ReactiveMongoTemplate(MongoTestUtils.reactiveClient(), "ExecutableUpdateOperationSupportTests");
+		template = new ReactiveMongoTemplate(reactiveClient, "ExecutableUpdateOperationSupportTests");
 	}
 
 	@Test // DATAMONGO-1719
-	public void domainTypeIsRequired() {
+	void domainTypeIsRequired() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.update(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void updateIsRequired() {
+	void updateIsRequired() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.update(Person.class).apply(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void collectionIsRequiredOnSet() {
+	void collectionIsRequiredOnSet() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.update(Person.class).inCollection(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAndModifyOptionsAreRequiredOnSet() {
+	void findAndModifyOptionsAreRequiredOnSet() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> template.update(Person.class).apply(new Update()).withOptions(null));
 	}
 
 	@Test // DATAMONGO-1719
-	public void updateFirst() {
+	void updateFirst() {
 
 		template.update(Person.class).apply(new Update().set("firstname", "Han")).first().as(StepVerifier::create)
 				.consumeNextWith(actual -> {
@@ -102,7 +110,7 @@ public void updateFirst() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void updateAll() {
+	void updateAll() {
 
 		template.update(Person.class).apply(new Update().set("firstname", "Han")).all().as(StepVerifier::create)
 				.consumeNextWith(actual -> {
@@ -113,11 +121,21 @@ public void updateAll() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void updateAllMatching() {
+	void updateAllMatching() {
 
 		template.update(Person.class).matching(queryHan()).apply(new Update().set("firstname", "Han")).all()
-				.as(StepVerifier::create)
-				.consumeNextWith(actual -> {
+				.as(StepVerifier::create).consumeNextWith(actual -> {
+
+					assertThat(actual.getModifiedCount()).isEqualTo(1L);
+					assertThat(actual.getUpsertedId()).isNull();
+				}).verifyComplete();
+	}
+
+	@Test // DATAMONGO-2416
+	void updateAllMatchingCriteria() {
+
+		template.update(Person.class).matching(where("id").is(han.getId())).apply(new Update().set("firstname", "Han"))
+				.all().as(StepVerifier::create).consumeNextWith(actual -> {
 
 					assertThat(actual.getModifiedCount()).isEqualTo(1L);
 					assertThat(actual.getUpsertedId()).isNull();
@@ -125,11 +143,10 @@ public void updateAllMatching() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void updateWithDifferentDomainClassAndCollection() {
+	void updateWithDifferentDomainClassAndCollection() {
 
 		template.update(Jedi.class).inCollection(STAR_WARS).matching(query(where("_id").is(han.getId())))
-				.apply(new Update().set("name", "Han")).all().as(StepVerifier::create)
-				.consumeNextWith(actual -> {
+				.apply(new Update().set("name", "Han")).all().as(StepVerifier::create).consumeNextWith(actual -> {
 
 					assertThat(actual.getModifiedCount()).isEqualTo(1L);
 					assertThat(actual.getUpsertedId()).isNull();
@@ -140,18 +157,17 @@ public void updateWithDifferentDomainClassAndCollection() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAndModify() {
+	void findAndModify() {
 
 		template.update(Person.class).matching(queryHan()).apply(new Update().set("firstname", "Han")).findAndModify()
-				.as(StepVerifier::create)
-				.expectNext(han).verifyComplete();
+				.as(StepVerifier::create).expectNext(han).verifyComplete();
 
 		assertThat(blocking.findOne(queryHan(), Person.class)).isNotEqualTo(han).hasFieldOrPropertyWithValue("firstname",
 				"Han");
 	}
 
 	@Test // DATAMONGO-1719
-	public void findAndModifyWithDifferentDomainTypeAndCollection() {
+	void findAndModifyWithDifferentDomainTypeAndCollection() {
 
 		template.update(Jedi.class).inCollection(STAR_WARS).matching(query(where("_id").is(han.getId())))
 				.apply(new Update().set("name", "Han")).findAndModify().as(StepVerifier::create)
@@ -161,8 +177,20 @@ public void findAndModifyWithDifferentDomainTypeAndCollection() {
 				"Han");
 	}
 
+	@Test // GH-4949
+	void findAndModifyWithWithResultConversion() {
+
+		template.update(Jedi.class).inCollection(STAR_WARS).matching(query(where("_id").is(han.getId())))
+				.apply(new Update().set("name", "Han")).map((raw, it) -> Optional.of(it.get())).findAndModify()
+				.as(StepVerifier::create).consumeNextWith(actual -> assertThat(actual.get().getName()).isEqualTo("han"))
+				.verifyComplete();
+
+		assertThat(blocking.findOne(queryHan(), Person.class)).isNotEqualTo(han).hasFieldOrPropertyWithValue("firstname",
+				"Han");
+	}
+
 	@Test // DATAMONGO-1719
-	public void findAndModifyWithOptions() {
+	void findAndModifyWithOptions() {
 
 		template.update(Person.class).matching(queryHan()).apply(new Update().set("firstname", "Han"))
 				.withOptions(FindAndModifyOptions.options().returnNew(true)).findAndModify().as(StepVerifier::create)
@@ -173,7 +201,7 @@ public void findAndModifyWithOptions() {
 	}
 
 	@Test // DATAMONGO-1719
-	public void upsert() {
+	void upsert() {
 
 		template.update(Person.class).matching(query(where("id").is("id-3")))
 				.apply(new Update().set("firstname", "Chewbacca")).upsert().as(StepVerifier::create).consumeNextWith(actual -> {
@@ -184,7 +212,7 @@ public void upsert() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplace() {
+	void findAndReplace() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -200,7 +228,7 @@ public void findAndReplace() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceWithProjection() {
+	void findAndReplaceWithProjection() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -211,8 +239,20 @@ public void findAndReplaceWithProjection() {
 				}).verifyComplete();
 	}
 
+	@Test // GH-4949
+	void findAndReplaceWithResultConversion() {
+
+		Person luke = new Person();
+		luke.firstname = "Luke";
+
+		template.update(Person.class).matching(queryHan()).replaceWith(luke).map((raw, it) -> Optional.of(it.get())).findAndReplace() //
+			.as(StepVerifier::create).consumeNextWith(it -> {
+				assertThat(it.get().getFirstname()).isEqualTo(han.firstname);
+			}).verifyComplete();
+	}
+
 	@Test // DATAMONGO-1827
-	public void findAndReplaceWithCollection() {
+	void findAndReplaceWithCollection() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -228,7 +268,7 @@ public void findAndReplaceWithCollection() {
 	}
 
 	@Test // DATAMONGO-1827
-	public void findAndReplaceWithOptions() {
+	void findAndReplaceWithOptions() {
 
 		Person luke = new Person();
 		luke.firstname = "Luke";
@@ -245,21 +285,99 @@ private Query queryHan() {
 		return query(where("id").is(han.getId()));
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = STAR_WARS)
 	static class Person {
+
 		@Id String id;
 		String firstname;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname);
+		}
+
+		public String toString() {
+			return "ReactiveUpdateOperationSupportTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ")";
+		}
 	}
 
-	@Data
 	static class Human {
+
 		@Id String id;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String toString() {
+			return "ReactiveUpdateOperationSupportTests.Human(id=" + this.getId() + ")";
+		}
 	}
 
-	@Data
 	static class Jedi {
 
 		@Field("firstname") String name;
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Jedi jedi = (Jedi) o;
+			return Objects.equals(name, jedi.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name);
+		}
+
+		public String toString() {
+			return "ReactiveUpdateOperationSupportTests.Jedi(name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ScrollUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ScrollUtilsUnitTests.java
new file mode 100644
index 0000000000..ed0010242c
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ScrollUtilsUnitTests.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2023-2025 the original author 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 static org.assertj.core.api.AssertionsForClassTypes.*;
+import static org.mockito.Mockito.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.EntityOperations.Entity;
+import org.springframework.data.mongodb.core.query.Query;
+
+/**
+ * Unit tests for {@link ScrollUtils}.
+ *
+ * @author Mark Paluch
+ */
+class ScrollUtilsUnitTests {
+
+	@Test // GH-4413
+	void positionShouldRetainScrollDirection() {
+
+		Query query = new Query();
+		query.with(ScrollPosition.keyset().backward());
+		EntityOperations entityOperationsMock = mock(EntityOperations.class);
+		Entity entityMock = mock(Entity.class);
+
+		when(entityOperationsMock.forEntity(any())).thenReturn(entityMock);
+		when(entityMock.extractKeys(any(), any())).thenReturn(Map.of("k", "v"));
+
+		Window<Integer> window = ScrollUtils.createWindow(query, new ArrayList<>(List.of(1, 2, 3)), Integer.class,
+				entityOperationsMock);
+
+		assertThat(window.positionAt(0)).isInstanceOf(KeysetScrollPosition.class);
+		assertThat(((KeysetScrollPosition) window.positionAt(0)).scrollsBackward()).isTrue();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
index 6de3284991..1bf9114967 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SerializationUtilsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 import java.util.Map;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.query.SerializationUtils;
 
 import com.mongodb.BasicDBList;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateTests.java
index fd0adfe6ca..8769656537 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,8 +21,6 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 import java.util.ArrayList;
@@ -36,12 +34,10 @@
 
 import org.aopalliance.aop.Advice;
 import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.rules.TestRule;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
@@ -50,7 +46,7 @@
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.ClientSessionException;
 import org.springframework.data.mongodb.LazyLoadingException;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.SessionAwareMethodInterceptor;
 import org.springframework.data.mongodb.core.MongoTemplate.SessionBoundMongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
@@ -63,10 +59,10 @@
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoVersion;
+import org.springframework.data.mongodb.test.util.ReplSetClient;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.ClientSessionOptions;
@@ -80,31 +76,29 @@
  *
  * @author Christoph Strobl
  */
+@ExtendWith(MongoClientExtension.class)
+@EnableIfReplicaSetAvailable
 public class SessionBoundMongoTemplateTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_6_0 = MongoVersionRule.atLeast(Version.parse("3.6.0"));
-	public static @ClassRule TestRule replSet = ReplicaSet.required();
+	static @ReplSetClient MongoClient client;
 
-	MongoClient client;
 	MongoTemplate template;
 	SessionBoundMongoTemplate sessionBoundTemplate;
 	ClientSession session;
 	volatile List<MongoCollection<Document>> spiedCollections = new ArrayList<>();
 	volatile List<MongoDatabase> spiedDatabases = new ArrayList<>();
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		client = MongoTestUtils.replSetClient();
-
-		MongoDbFactory factory = new SimpleMongoClientDbFactory(client, "session-bound-mongo-template-tests") {
+		MongoDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(client, "session-bound-mongo-template-tests") {
 
 			@Override
-			public MongoDatabase getDb() throws DataAccessException {
+			public MongoDatabase getMongoDatabase() throws DataAccessException {
 
-				MongoDatabase spiedDatabse = Mockito.spy(super.getDb());
-				spiedDatabases.add(spiedDatabse);
-				return spiedDatabse;
+				MongoDatabase spiedDatabase = Mockito.spy(super.getMongoDatabase());
+				spiedDatabases.add(spiedDatabase);
+				return spiedDatabase;
 			}
 		};
 
@@ -145,7 +139,7 @@ private void injectCollectionSpy(MongoCollection<Document> collection) {
 		};
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 
 		session.close();
@@ -260,6 +254,7 @@ public void shouldErrorOnLoadLazyDbRefWhenSessionIsClosed() {
 	}
 
 	@Test // DATAMONGO-2001
+	@MongoVersion(asOf = "4.0")
 	public void countShouldWorkInTransactions() {
 
 		if (!template.collectionExists(Person.class)) {
@@ -284,6 +279,7 @@ public void countShouldWorkInTransactions() {
 	}
 
 	@Test // DATAMONGO-2012
+	@MongoVersion(asOf = "4.0")
 	public void countWithGeoInTransaction() {
 
 		if (!template.collectionExists(Person.class)) {
@@ -308,6 +304,7 @@ public void countWithGeoInTransaction() {
 	}
 
 	@Test // DATAMONGO-2001
+	@MongoVersion(asOf = "4.0")
 	public void countShouldReturnIsolatedCount() throws InterruptedException {
 
 		if (!template.collectionExists(Person.class)) {
@@ -365,14 +362,32 @@ public void countShouldReturnIsolatedCount() throws InterruptedException {
 		assertThat(resultList).hasSize(nrThreads).allMatch(it -> it.equals(1L));
 	}
 
-	@Data
 	static class WithDbRef {
 
 		@Id String id;
 		@DBRef Person personRef;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Person getPersonRef() {
+			return this.personRef;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setPersonRef(Person personRef) {
+			this.personRef = personRef;
+		}
+
+		public String toString() {
+			return "SessionBoundMongoTemplateTests.WithDbRef(id=" + this.getId() + ", personRef=" + this.getPersonRef() + ")";
+		}
 	}
 
-	@Data
 	static class WithLazyDbRef {
 
 		@Id String id;
@@ -381,6 +396,23 @@ static class WithLazyDbRef {
 		public Person getPersonRef() {
 			return personRef;
 		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setPersonRef(Person personRef) {
+			this.personRef = personRef;
+		}
+
+		public String toString() {
+			return "SessionBoundMongoTemplateTests.WithLazyDbRef(id=" + this.getId() + ", personRef=" + this.getPersonRef()
+					+ ")";
+		}
 	}
 
 	// --> Just some helpers for testing
@@ -393,7 +425,7 @@ MongoDatabase command(int index) {
 		return spiedDatabases.get(index);
 	}
 
-	private MongoConverter getDefaultMongoConverter(MongoDbFactory factory) {
+	private MongoConverter getDefaultMongoConverter(MongoDatabaseFactory factory) {
 
 		DbRefResolver dbRefResolver = new DefaultDbRefResolver(factory);
 		MongoCustomConversions conversions = new MongoCustomConversions(Collections.emptyList());
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java
index fe9027acea..50ea579044 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SessionBoundMongoTemplateUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,6 +21,7 @@
 import java.lang.reflect.Proxy;
 import java.util.Collections;
 
+import com.mongodb.client.*;
 import org.bson.Document;
 import org.bson.codecs.BsonValueCodec;
 import org.bson.codecs.configuration.CodecRegistry;
@@ -33,28 +34,17 @@
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.MongoTemplate.SessionBoundMongoTemplate;
 import org.springframework.data.mongodb.core.aggregation.Aggregation;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.core.mapreduce.GroupBy;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 
-import com.mongodb.client.AggregateIterable;
-import com.mongodb.client.ClientSession;
-import com.mongodb.client.DistinctIterable;
-import com.mongodb.client.FindIterable;
-import com.mongodb.client.MapReduceIterable;
-import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoCollection;
-import com.mongodb.client.MongoCursor;
-import com.mongodb.client.MongoDatabase;
-import com.mongodb.client.MongoIterable;
 import com.mongodb.client.model.CountOptions;
 import com.mongodb.client.model.DeleteOptions;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
@@ -78,13 +68,14 @@ public class SessionBoundMongoTemplateUnitTests {
 
 	SessionBoundMongoTemplate template;
 
-	MongoDbFactory factory;
+	MongoDatabaseFactory factory;
 
 	@Mock(answer = Answers.RETURNS_DEEP_STUBS) MongoCollection collection;
 	@Mock MongoDatabase database;
 	@Mock MongoClient client;
 	@Mock ClientSession clientSession;
 	@Mock FindIterable findIterable;
+	MongoIterable<String> collectionNamesIterable;
 	@Mock MongoIterable mongoIterable;
 	@Mock DistinctIterable distinctIterable;
 	@Mock AggregateIterable aggregateIterable;
@@ -98,11 +89,12 @@ public class SessionBoundMongoTemplateUnitTests {
 	@Before
 	public void setUp() {
 
+		collectionNamesIterable = mock(ListCollectionNamesIterable.class);
 		when(client.getDatabase(anyString())).thenReturn(database);
 		when(codecRegistry.get(any(Class.class))).thenReturn(new BsonValueCodec());
 		when(database.getCodecRegistry()).thenReturn(codecRegistry);
 		when(database.getCollection(anyString(), any())).thenReturn(collection);
-		when(database.listCollectionNames(any(ClientSession.class))).thenReturn(mongoIterable);
+		doReturn(collectionNamesIterable).when(database).listCollectionNames(any(ClientSession.class));
 		when(collection.find(any(ClientSession.class), any(), any())).thenReturn(findIterable);
 		when(collection.aggregate(any(ClientSession.class), anyList(), any())).thenReturn(aggregateIterable);
 		when(collection.distinct(any(ClientSession.class), any(), any(), any())).thenReturn(distinctIterable);
@@ -112,9 +104,9 @@ public void setUp() {
 		when(aggregateIterable.allowDiskUse(anyBoolean())).thenReturn(aggregateIterable);
 		when(aggregateIterable.batchSize(anyInt())).thenReturn(aggregateIterable);
 		when(aggregateIterable.map(any())).thenReturn(aggregateIterable);
-		when(aggregateIterable.useCursor(anyBoolean())).thenReturn(aggregateIterable);
 		when(aggregateIterable.into(any())).thenReturn(Collections.emptyList());
 		when(mongoIterable.iterator()).thenReturn(cursor);
+		when(collectionNamesIterable.iterator()).thenReturn(cursor);
 		when(distinctIterable.map(any())).thenReturn(distinctIterable);
 		when(distinctIterable.into(any())).thenReturn(Collections.emptyList());
 		when(mapReduceIterable.sort(any())).thenReturn(mapReduceIterable);
@@ -124,7 +116,7 @@ public void setUp() {
 		when(cursor.hasNext()).thenReturn(false);
 		when(findIterable.projection(any())).thenReturn(findIterable);
 
-		factory = new SimpleMongoClientDbFactory(client, "foo");
+		factory = new SimpleMongoClientDatabaseFactory(client, "foo");
 
 		this.mappingContext = new MongoMappingContext();
 		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), mappingContext);
@@ -221,7 +213,7 @@ public void collectionExistsShouldUseProxiedDatabase() {
 		verify(database).listCollectionNames(eq(clientSession));
 	}
 
-	@Test // DATAMONGO-1880
+	@Test // DATAMONGO-1880, GH-3522
 	public void countShouldUseProxiedCollection() {
 
 		template.count(new Query(), Person.class);
@@ -229,6 +221,15 @@ public void countShouldUseProxiedCollection() {
 		verify(collection).countDocuments(eq(clientSession), any(), any(CountOptions.class));
 	}
 
+	@Test // DATAMONGO-1880, GH-3522
+	public void countShouldDelegateToExactCountNoMatterWhat() {
+
+		template.useEstimatedCount(true);
+		template.count(new Query(), Person.class);
+
+		verify(collection).countDocuments(eq(clientSession), any(), any(CountOptions.class));
+	}
+
 	@Test // DATAMONGO-1880
 	public void createCollectionShouldUseProxiedDatabase() {
 
@@ -271,17 +272,6 @@ public void geoNearShouldUseProxiedDatabase() {
 		verify(collection).aggregate(eq(clientSession), anyList(), eq(Document.class));
 	}
 
-	@Test // DATAMONGO-1880
-	public void groupShouldUseProxiedDatabase() {
-
-		when(database.runCommand(any(ClientSession.class), any(), eq(Document.class)))
-				.thenReturn(new Document("retval", Collections.emptyList()));
-
-		template.group(COLLECTION_NAME, GroupBy.key("firstName"), Person.class);
-
-		verify(database).runCommand(eq(clientSession), any(), eq(Document.class));
-	}
-
 	@Test // DATAMONGO-1880
 	public void mapReduceShouldUseProxiedCollection() {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithDefaultShardKey.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithDefaultShardKey.java
new file mode 100644
index 0000000000..20debee659
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithDefaultShardKey.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2020-2025 the original author 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.Objects;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.Sharded;
+
+/**
+ * @author Christoph Strobl
+ */
+@Sharded
+public class ShardedEntityWithDefaultShardKey {
+
+	private @Id String id;
+
+	private String country;
+
+	@Field("userid") //
+	private Integer userId;
+
+	public ShardedEntityWithDefaultShardKey(String id, String country, Integer userId) {
+
+		this.id = id;
+		this.country = country;
+		this.userId = userId;
+	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public String getCountry() {
+		return this.country;
+	}
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		ShardedEntityWithDefaultShardKey that = (ShardedEntityWithDefaultShardKey) o;
+		return Objects.equals(id, that.id) && Objects.equals(country, that.country) && Objects.equals(userId, that.userId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, country, userId);
+	}
+
+	public String toString() {
+		return "ShardedEntityWithDefaultShardKey(id=" + this.getId() + ", country=" + this.getCountry() + ", userId="
+				+ this.getUserId() + ")";
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithNonDefaultImmutableShardKey.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithNonDefaultImmutableShardKey.java
new file mode 100644
index 0000000000..a69ad39359
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithNonDefaultImmutableShardKey.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2020-2025 the original author 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.Objects;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.Sharded;
+
+/**
+ * @author Christoph Strobl
+ */
+@Sharded(shardKey = { "country", "userId" }, immutableKey = true)
+public class ShardedEntityWithNonDefaultImmutableShardKey {
+
+	private @Id String id;
+
+	private String country;
+
+	@Field("userid") //
+	private Integer userId;
+
+	public ShardedEntityWithNonDefaultImmutableShardKey(String id, String country, Integer userId) {
+
+		this.id = id;
+		this.country = country;
+		this.userId = userId;
+	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public String getCountry() {
+		return this.country;
+	}
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		ShardedEntityWithNonDefaultImmutableShardKey that = (ShardedEntityWithNonDefaultImmutableShardKey) o;
+		return Objects.equals(id, that.id) && Objects.equals(country, that.country) && Objects.equals(userId, that.userId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, country, userId);
+	}
+
+	public String toString() {
+		return "ShardedEntityWithNonDefaultImmutableShardKey(id=" + this.getId() + ", country=" + this.getCountry()
+				+ ", userId=" + this.getUserId() + ")";
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithNonDefaultShardKey.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithNonDefaultShardKey.java
new file mode 100644
index 0000000000..3dc130a89d
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedEntityWithNonDefaultShardKey.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2020-2025 the original author 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.Objects;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.Sharded;
+
+/**
+ * @author Christoph Strobl
+ */
+@Sharded(shardKey = { "country", "userId" })
+public class ShardedEntityWithNonDefaultShardKey {
+
+	private @Id String id;
+
+	private String country;
+
+	@Field("userid") //
+	private Integer userId;
+
+	public ShardedEntityWithNonDefaultShardKey(String id, String country, Integer userId) {
+
+		this.id = id;
+		this.country = country;
+		this.userId = userId;
+	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public String getCountry() {
+		return this.country;
+	}
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		ShardedEntityWithNonDefaultShardKey that = (ShardedEntityWithNonDefaultShardKey) o;
+		return Objects.equals(id, that.id) && Objects.equals(country, that.country) && Objects.equals(userId, that.userId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, country, userId);
+	}
+
+	public String toString() {
+		return "ShardedEntityWithNonDefaultShardKey(id=" + this.getId() + ", country=" + this.getCountry() + ", userId="
+				+ this.getUserId() + ")";
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedVersionedEntityWithNonDefaultShardKey.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedVersionedEntityWithNonDefaultShardKey.java
new file mode 100644
index 0000000000..fc22a40103
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ShardedVersionedEntityWithNonDefaultShardKey.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2020-2025 the original author 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.Objects;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Version;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.Sharded;
+
+/**
+ * @author Christoph Strobl
+ */
+@Sharded(shardKey = { "country", "userId" })
+public class ShardedVersionedEntityWithNonDefaultShardKey {
+
+	private @Id String id;
+
+	private @Version Long version;
+
+	private String country;
+
+	@Field("userid") //
+	private Integer userId;
+
+	public ShardedVersionedEntityWithNonDefaultShardKey(String id, Long version, String country, Integer userId) {
+
+		this.id = id;
+		this.version = version;
+		this.country = country;
+		this.userId = userId;
+	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public Long getVersion() {
+		return this.version;
+	}
+
+	public String getCountry() {
+		return this.country;
+	}
+
+	public Integer getUserId() {
+		return this.userId;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public void setUserId(Integer userId) {
+		this.userId = userId;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		ShardedVersionedEntityWithNonDefaultShardKey that = (ShardedVersionedEntityWithNonDefaultShardKey) o;
+		return Objects.equals(id, that.id) && Objects.equals(version, that.version) && Objects.equals(country, that.country)
+				&& Objects.equals(userId, that.userId);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, version, country, userId);
+	}
+
+	public String toString() {
+		return "ShardedVersionedEntityWithNonDefaultShardKey(id=" + this.getId() + ", version=" + this.getVersion()
+				+ ", country=" + this.getCountry() + ", userId=" + this.getUserId() + ")";
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleMongoDbFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactoryUnitTests.java
similarity index 53%
rename from spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleMongoDbFactoryUnitTests.java
rename to spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactoryUnitTests.java
index d9191b9967..5e64eed4fd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleMongoDbFactoryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleMongoClientDatabaseFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,40 +17,40 @@
 
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
-import static org.springframework.test.util.ReflectionTestUtils.*;
 
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.aop.framework.AopProxyUtils;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.test.util.ReflectionTestUtils;
 
-import com.mongodb.MongoClientURI;
+import com.mongodb.ConnectionString;
 import com.mongodb.client.ClientSession;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoDatabase;
 
 /**
- * Unit tests for {@link SimpleMongoDbFactory}.
+ * Unit tests for {@link SimpleMongoClientDatabaseFactory}.
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class SimpleMongoDbFactoryUnitTests {
+@ExtendWith(MockitoExtension.class)
+class SimpleMongoClientDatabaseFactoryUnitTests {
 
 	@Mock MongoClient mongo;
 	@Mock ClientSession clientSession;
 	@Mock MongoDatabase database;
 
 	@Test // DATADOC-254, DATAMONGO-1903
-	public void rejectsIllegalDatabaseNames() {
+	void rejectsIllegalDatabaseNames() {
 
 		rejectsDatabaseName("foo.bar");
 		rejectsDatabaseName("foo$bar");
@@ -61,41 +61,41 @@ public void rejectsIllegalDatabaseNames() {
 	}
 
 	@Test // DATADOC-254
-	@SuppressWarnings("deprecation")
-	public void allowsDatabaseNames() {
-		new SimpleMongoClientDbFactory(mongo, "foo-bar");
-		new SimpleMongoClientDbFactory(mongo, "foo_bar");
-		new SimpleMongoClientDbFactory(mongo, "foo01231bar");
+	void allowsDatabaseNames() {
+		new SimpleMongoClientDatabaseFactory(mongo, "foo-bar");
+		new SimpleMongoClientDatabaseFactory(mongo, "foo_bar");
+		new SimpleMongoClientDatabaseFactory(mongo, "foo01231bar");
 	}
 
 	@Test // DATADOC-295
-	@SuppressWarnings("deprecation")
-	public void mongoUriConstructor() {
+	void mongoUriConstructor() {
 
-		MongoClientURI mongoURI = new MongoClientURI("mongodb://myUsername:myPassword@localhost/myDatabase.myCollection");
-		MongoDbFactory mongoDbFactory = new SimpleMongoDbFactory(mongoURI);
+		ConnectionString mongoURI = new ConnectionString(
+				"mongodb://myUsername:myPassword@localhost/myDatabase.myCollection");
+		MongoDatabaseFactory mongoDbFactory = new SimpleMongoClientDatabaseFactory(mongoURI);
 
-		assertThat(getField(mongoDbFactory, "databaseName").toString()).isEqualTo("myDatabase");
+		assertThat(mongoDbFactory).hasFieldOrPropertyWithValue("databaseName", "myDatabase");
 	}
 
 	@Test // DATAMONGO-1158
-	public void constructsMongoClientAccordingToMongoUri() {
+	void constructsMongoClientAccordingToMongoUri() {
 
-		MongoClientURI uri = new MongoClientURI("mongodb://myUserName:myPassWord@127.0.0.1:27017/myDataBase.myCollection");
-		SimpleMongoDbFactory factory = new SimpleMongoDbFactory(uri);
+		ConnectionString uri = new ConnectionString(
+				"mongodb://myUserName:myPassWord@127.0.0.1:27017/myDataBase.myCollection");
+		SimpleMongoClientDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(uri);
 
-		assertThat(getField(factory, "databaseName").toString()).isEqualTo("myDataBase");
+		assertThat(factory).hasFieldOrPropertyWithValue("databaseName", "myDataBase");
 	}
 
 	@Test // DATAMONGO-1880
-	public void cascadedWithSessionUsesRootFactory() {
+	void cascadedWithSessionUsesRootFactory() {
 
 		when(mongo.getDatabase("foo")).thenReturn(database);
 
-		MongoDbFactory factory = new SimpleMongoClientDbFactory(mongo, "foo");
-		MongoDbFactory wrapped = factory.withSession(clientSession).withSession(clientSession);
+		MongoDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(mongo, "foo");
+		MongoDatabaseFactory wrapped = factory.withSession(clientSession).withSession(clientSession);
 
-		InvocationHandler invocationHandler = Proxy.getInvocationHandler(wrapped.getDb());
+		InvocationHandler invocationHandler = Proxy.getInvocationHandler(wrapped.getMongoDatabase());
 
 		Object singletonTarget = AopProxyUtils
 				.getSingletonTarget(ReflectionTestUtils.getField(invocationHandler, "advised"));
@@ -104,7 +104,7 @@ public void cascadedWithSessionUsesRootFactory() {
 	}
 
 	private void rejectsDatabaseName(String databaseName) {
-		assertThatThrownBy(() -> new SimpleMongoClientDbFactory(mongo, databaseName))
+		assertThatThrownBy(() -> new SimpleMongoClientDatabaseFactory(mongo, databaseName))
 				.isInstanceOf(IllegalArgumentException.class);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactoryUnitTests.java
index d89bdce56d..3882acb4a4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactoryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/SimpleReactiveMongoDatabaseFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,10 +21,10 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Proxy;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.aop.framework.AopProxyUtils;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
@@ -38,23 +38,24 @@
  * Unit tests for {@link SimpleReactiveMongoDatabaseFactory}.
  *
  * @author Mark Paluch
+ * @author Mathieu Ouellet
  */
-@RunWith(MockitoJUnitRunner.class)
-public class SimpleReactiveMongoDatabaseFactoryUnitTests {
+@ExtendWith(MockitoExtension.class)
+class SimpleReactiveMongoDatabaseFactoryUnitTests {
 
 	@Mock MongoClient mongoClient;
 	@Mock ClientSession clientSession;
 	@Mock MongoDatabase database;
 
 	@Test // DATAMONGO-1880
-	public void cascadedWithSessionUsesRootFactory() {
+	void cascadedWithSessionUsesRootFactory() {
 
 		when(mongoClient.getDatabase("foo")).thenReturn(database);
 
 		ReactiveMongoDatabaseFactory factory = new SimpleReactiveMongoDatabaseFactory(mongoClient, "foo");
 		ReactiveMongoDatabaseFactory wrapped = factory.withSession(clientSession).withSession(clientSession);
 
-		InvocationHandler invocationHandler = Proxy.getInvocationHandler(wrapped.getMongoDatabase());
+		InvocationHandler invocationHandler = Proxy.getInvocationHandler(wrapped.getMongoDatabase().block());
 
 		Object singletonTarget = AopProxyUtils
 				.getSingletonTarget(ReflectionTestUtils.getField(invocationHandler, "advised"));
@@ -63,7 +64,7 @@ public void cascadedWithSessionUsesRootFactory() {
 	}
 
 	@Test // DATAMONGO-1903
-	public void rejectsIllegalDatabaseNames() {
+	void rejectsIllegalDatabaseNames() {
 
 		rejectsDatabaseName("foo.bar");
 		rejectsDatabaseName("foo$bar");
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestEntities.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestEntities.java
index b41fea370e..45cb804eca 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestEntities.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestEntities.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
index 6a36b3488d..216d4447d0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TestMongoConfiguration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,17 @@
 package org.springframework.data.mongodb.core;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
@@ -35,6 +40,14 @@ public String getDatabaseName() {
 		return "database";
 	}
 
+	@Primary
+	@Bean
+	@Override
+	public MappingMongoConverter mappingMongoConverter(MongoDatabaseFactory databaseFactory,
+			MongoCustomConversions customConversions, MongoMappingContext mappingContext) {
+		return super.mappingMongoConverter(databaseFactory, customConversions, mappingContext);
+	}
+
 	@Override
 	@Bean
 	public MongoClient mongoClient() {
@@ -42,16 +55,21 @@ public MongoClient mongoClient() {
 	}
 
 	@Override
-	public String getMappingBasePackage() {
-		return MongoMappingContext.class.getPackage().getName();
+	protected Collection<String> getMappingBasePackages() {
+		return Collections.singleton(MongoMappingContext.class.getPackage().getName());
 	}
 
 	@Override
-	public CustomConversions customConversions() {
+	public MongoCustomConversions customConversions() {
 
 		List<Converter<?, ?>> converters = new ArrayList<>(2);
 		converters.add(new org.springframework.data.mongodb.core.PersonReadConverter());
 		converters.add(new org.springframework.data.mongodb.core.PersonWriteConverter());
 		return new MongoCustomConversions(converters);
 	}
+
+	@Override
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+		return Collections.emptySet();
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Trade.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Trade.java
index bf388a1075..d673c8ad95 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Trade.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Trade.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TransactionOptionsTestService.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TransactionOptionsTestService.java
new file mode 100644
index 0000000000..b8cc9cc972
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/TransactionOptionsTestService.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2023-2025 the original author 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.function.Function;
+import java.util.function.UnaryOperator;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Helper class for integration tests of {@link Transactional#label()} MongoDb options in non-reactive context.
+ *
+ * @param <T> root document type
+ * @author Yan Kardziyaka
+ * @see org.springframework.data.mongodb.ReactiveTransactionOptionsTestService
+ */
+public class TransactionOptionsTestService<T> {
+
+	private final Function<Object, T> findByIdFunction;
+	private final UnaryOperator<T> saveFunction;
+
+	public TransactionOptionsTestService(MongoOperations operations, Class<T> entityClass) {
+		this.findByIdFunction = id -> operations.findById(id, entityClass);
+		this.saveFunction = operations::save;
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:maxCommitTime=-PT6H3M" })
+	public T saveWithInvalidMaxCommitTime(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:maxCommitTime=PT1M" })
+	public T saveWithinMaxCommitTime(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=available" })
+	public @Nullable T availableReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=invalid" })
+	public @Nullable T invalidReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=${tx.read.concern}" })
+	public @Nullable T environmentReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readConcern=majority" })
+	public @Nullable T majorityReadConcernFind(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readPreference=primaryPreferred" })
+	public @Nullable T findFromPrimaryPreferredReplica(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readPreference=invalid" })
+	public @Nullable T findFromInvalidReplica(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:readPreference=primary" })
+	public @Nullable T findFromPrimaryReplica(Object id) {
+		return findByIdFunction.apply(id);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:writeConcern=unacknowledged" })
+	public T unacknowledgedWriteConcernSave(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:writeConcern=invalid" })
+	public T invalidWriteConcernSave(T entity) {
+		return saveFunction.apply(entity);
+	}
+
+	@Transactional(transactionManager = "txManager", label = { "mongo:writeConcern=acknowledged" })
+	public T acknowledgedWriteConcernSave(T entity) {
+		return saveFunction.apply(entity);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/UnwrapAndReadDocumentCallbackUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/UnwrapAndReadDocumentCallbackUnitTests.java
deleted file mode 100644
index dcf2f2a397..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/UnwrapAndReadDocumentCallbackUnitTests.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2013-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core;
-
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.Mockito.*;
-
-import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.MongoTemplate.UnwrapAndReadDocumentCallback;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
-import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-
-/**
- * Unit tests for {@link UnwrapAndReadDocumentCallback}.
- *
- * @author Oliver Gierke
- * @author Mark Paluch
- */
-@RunWith(MockitoJUnitRunner.class)
-public class UnwrapAndReadDocumentCallbackUnitTests {
-
-	@Mock MongoDbFactory factory;
-	@Mock MongoExceptionTranslator exceptionTranslatorMock;
-
-	UnwrapAndReadDocumentCallback<Target> callback;
-
-	@Before
-	public void setUp() {
-
-		when(factory.getExceptionTranslator()).thenReturn(exceptionTranslatorMock);
-
-		MongoTemplate template = new MongoTemplate(factory);
-		MappingMongoConverter converter = new MappingMongoConverter(new DefaultDbRefResolver(factory),
-				new MongoMappingContext());
-
-		this.callback = template.new UnwrapAndReadDocumentCallback(converter, Target.class, "collection-1");
-	}
-
-	@Test
-	public void usesFirstLevelValues() {
-
-		Target target = callback.doWith(new Document("foo", "bar"));
-
-		assertThat(target.id).isNull();
-		assertThat(target.foo).isEqualTo("bar");
-	}
-
-	@Test
-	public void unwrapsUnderscoreIdIfDocument() {
-
-		Target target = callback.doWith(new Document("_id", new Document("foo", "bar")));
-
-		assertThat(target.id).isNull();
-		assertThat(target.foo).isEqualTo("bar");
-	}
-
-	@Test
-	public void firstLevelPropertiesTrumpNestedOnes() {
-
-		Target target = callback.doWith(new Document("_id", new Document("foo", "bar")).append("foo", "foobar"));
-
-		assertThat(target.id).isNull();
-		assertThat(target.foo).isEqualTo("foobar");
-	}
-
-	@Test
-	public void keepsUnderscoreIdIfScalarValue() {
-
-		Target target = callback.doWith(new Document("_id", "bar").append("foo", "foo"));
-
-		assertThat(target.id).isEqualTo("bar");
-		assertThat(target.foo).isEqualTo("foo");
-	}
-
-	static class Target {
-
-		String id;
-		String foo;
-	}
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/UpdateOperationsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/UpdateOperationsUnitTests.java
new file mode 100644
index 0000000000..61cd3ecce4
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/UpdateOperationsUnitTests.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2020-2025 the original author 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 static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+
+import org.bson.Document;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.CodecRegistryProvider;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.convert.UpdateMapper;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+
+import com.mongodb.MongoClientSettings;
+
+/**
+ * Unit test for {@link com.mongodb.internal.operation.UpdateOperation}.
+ *
+ * @author Christoph Strobl
+ */
+class UpdateOperationsUnitTests {
+
+	static final Document SHARD_KEY = new Document("country", "AT").append("userid", "4230");
+	static final Document SOURCE_DOC = appendShardKey(new Document("_id", "id-1"));
+
+	MongoMappingContext mappingContext = new MongoMappingContext();
+	MongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
+	QueryMapper queryMapper = new QueryMapper(mongoConverter);
+	UpdateMapper updateMapper = new UpdateMapper(mongoConverter);
+	EntityOperations entityOperations = new EntityOperations(mongoConverter, this.queryMapper);
+	PropertyOperations propertyOperations = new PropertyOperations(mongoConverter.getMappingContext());
+
+	ExtendedQueryOperations queryOperations = new ExtendedQueryOperations(queryMapper, updateMapper, entityOperations, propertyOperations,
+			MongoClientSettings::getDefaultCodecRegistry);
+
+	@Test // DATAMONGO-2341
+	void appliesShardKeyToFilter() {
+
+		Document sourceFilter = new Document("name", "kaladin");
+		assertThat(shardedFilter(sourceFilter, ShardedEntityWithNonDefaultShardKey.class, null))
+				.isEqualTo(appendShardKey(sourceFilter));
+	}
+
+	@Test
+	void applyShardKeyDoesNotAlterSourceFilter() {
+
+		Document sourceFilter = new Document("name", "kaladin");
+		shardedFilter(sourceFilter, ShardedEntityWithNonDefaultShardKey.class, null);
+		assertThat(sourceFilter).isEqualTo(new Document("name", "kaladin"));
+	}
+
+	@Test // DATAMONGO-2341
+	void appliesExistingShardKeyToFilter() {
+
+		Document sourceFilter = new Document("name", "kaladin");
+		Document existing = new Document("country", "GB").append("userid", "007");
+
+		assertThat(shardedFilter(sourceFilter, ShardedEntityWithNonDefaultShardKey.class, existing))
+				.isEqualTo(new Document(existing).append("name", "kaladin"));
+	}
+
+	@Test // DATAMONGO-2341
+	void recognizesExistingShardKeyInFilter() {
+
+		Document sourceFilter = appendShardKey(new Document("name", "kaladin"));
+
+		assertThat(queryOperations.replaceSingleContextFor(SOURCE_DOC).requiresShardKey(sourceFilter,
+				entityOf(ShardedEntityWithNonDefaultShardKey.class))).isFalse();
+	}
+
+	@Test // DATAMONGO-2341
+	void recognizesIdPropertyAsShardKey() {
+
+		Document sourceFilter = new Document("_id", "id-1");
+
+		assertThat(queryOperations.replaceSingleContextFor(SOURCE_DOC).requiresShardKey(sourceFilter,
+				entityOf(ShardedEntityWithDefaultShardKey.class))).isFalse();
+	}
+
+	@Test // DATAMONGO-2341
+	void returnsMappedShardKey() {
+
+		queryOperations.replaceSingleContextFor(SOURCE_DOC)
+				.getMappedShardKeyFields(entityOf(ShardedEntityWithDefaultShardKey.class))
+				.containsAll(Arrays.asList("country", "userid"));
+	}
+
+	@NonNull
+	private Document shardedFilter(Document sourceFilter, Class<?> entity, Document existing) {
+		return queryOperations.replaceSingleContextFor(SOURCE_DOC).applyShardKey(entity, sourceFilter, existing);
+	}
+
+	private static Document appendShardKey(Document source) {
+
+		Document target = new Document(source);
+		target.putAll(SHARD_KEY);
+		return target;
+	}
+
+	MongoPersistentEntity<?> entityOf(Class<?> type) {
+		return mappingContext.getPersistentEntity(type);
+	}
+
+	class ExtendedQueryOperations extends QueryOperations {
+
+		ExtendedQueryOperations(QueryMapper queryMapper, UpdateMapper updateMapper, EntityOperations entityOperations, PropertyOperations propertyOperations,
+				CodecRegistryProvider codecRegistryProvider) {
+			super(queryMapper, updateMapper, entityOperations, propertyOperations, codecRegistryProvider);
+		}
+
+		@NonNull
+		private ExtendedUpdateContext replaceSingleContextFor(Document source) {
+			return new ExtendedUpdateContext(MappedDocument.of(source), true);
+		}
+
+		MongoPersistentEntity<?> entityOf(Class<?> type) {
+			return mappingContext.getPersistentEntity(type);
+		}
+
+		class ExtendedUpdateContext extends UpdateContext {
+
+			ExtendedUpdateContext(MappedDocument update, boolean upsert) {
+				super(update, upsert);
+			}
+
+			<T> Document applyShardKey(Class<T> domainType, Document filter, @Nullable Document existing) {
+				return applyShardKey(entityOf(domainType), filter, existing);
+			}
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/User.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/User.java
index 8dfe3f77de..e9eae082e3 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/User.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.core;
 
+import org.jspecify.annotations.Nullable;
+
 public class User {
 
 	@Override
@@ -27,7 +29,7 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 		if (this == obj)
 			return true;
 		if (obj == null)
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java
index 709cbd25cf..13aba70afa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/Venue.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,10 @@
 package org.springframework.data.mongodb.core;
 
 import java.util.Arrays;
+import java.util.Date;
 
-import org.joda.time.LocalDate;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.mongodb.core.mapping.Document;
 
 @Document("newyork")
@@ -28,9 +28,9 @@ public class Venue {
 	@Id private String id;
 	private String name;
 	private double[] location;
-	private LocalDate openingDate;
+	private Date openingDate;
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	Venue(String name, double[] location) {
 		super();
 		this.name = name;
@@ -51,11 +51,11 @@ public double[] getLocation() {
 		return location;
 	}
 
-	public LocalDate getOpeningDate() {
+	public Date getOpeningDate() {
 		return openingDate;
 	}
 
-	public void setOpeningDate(LocalDate openingDate) {
+	public void setOpeningDate(Date openingDate) {
 		this.openingDate = openingDate;
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperatorsUnitTests.java
new file mode 100644
index 0000000000..5b24d85c3b
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AccumulatorOperatorsUnitTests.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.*;
+
+import java.util.Arrays;
+import java.util.Date;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.aggregation.DateOperators.Year;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.util.aggregation.TestAggregationContext;
+
+/**
+ * Unit tests for {@link AccumulatorOperators}.
+ *
+ * @author Christoph Strobl
+ * @author Julia Lee
+ */
+class AccumulatorOperatorsUnitTests {
+
+	@Test // GH-3712
+	void rendersCovariancePopWithFieldReference() {
+
+		assertThat(AccumulatorOperators.valueOf("balance").covariancePop("midichlorianCount")
+				.toDocument(TestAggregationContext.contextFor(Jedi.class)))
+						.isEqualTo(new Document("$covariancePop", Arrays.asList("$balance", "$force")));
+	}
+
+	@Test // GH-3712
+	void rendersCovariancePopWithExpression() {
+
+		assertThat(AccumulatorOperators.valueOf(Year.yearOf("birthdate")).covariancePop("midichlorianCount")
+				.toDocument(TestAggregationContext.contextFor(Jedi.class)))
+						.isEqualTo(new Document("$covariancePop", Arrays.asList(new Document("$year", "$birthdate"), "$force")));
+	}
+
+	@Test // GH-3712
+	void rendersCovarianceSampWithFieldReference() {
+
+		assertThat(AccumulatorOperators.valueOf("balance").covarianceSamp("midichlorianCount")
+				.toDocument(TestAggregationContext.contextFor(Jedi.class)))
+						.isEqualTo(new Document("$covarianceSamp", Arrays.asList("$balance", "$force")));
+	}
+
+	@Test // GH-3712
+	void rendersCovarianceSampWithExpression() {
+
+		assertThat(AccumulatorOperators.valueOf(Year.yearOf("birthdate")).covarianceSamp("midichlorianCount")
+				.toDocument(TestAggregationContext.contextFor(Jedi.class)))
+						.isEqualTo(new Document("$covarianceSamp", Arrays.asList(new Document("$year", "$birthdate"), "$force")));
+	}
+
+	@Test // GH-3718
+	void rendersExpMovingAvgWithNumberOfHistoricDocuments() {
+
+		assertThat(valueOf("price").expMovingAvg().historicalDocuments(2).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $expMovingAvg: { input: \"$price\", N: 2 } }"));
+	}
+
+	@Test // GH-3718
+	void rendersExpMovingAvgWithAlpha() {
+
+		assertThat(valueOf("price").expMovingAvg().alpha(0.75).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $expMovingAvg: { input: \"$price\", alpha: 0.75 } }"));
+	}
+
+	@Test // GH-4139
+	void rendersMax() {
+
+		assertThat(valueOf("price").max().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $max: \"$price\" }"));
+	}
+
+	@Test // GH-4139
+	void rendersMaxN() {
+
+		assertThat(valueOf("price").max(3).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $maxN: { n: 3, input : \"$price\" } }"));
+	}
+
+	@Test // GH-4139
+	void rendersMin() {
+
+		assertThat(valueOf("price").min().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $min: \"$price\" }"));
+	}
+
+	@Test // GH-4139
+	void rendersMinN() {
+
+		assertThat(valueOf("price").min(3).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $minN: { n: 3, input : \"$price\" } }"));
+	}
+
+	@Test // GH-4473
+	void rendersPercentileWithFieldReference() {
+
+		assertThat(valueOf("score").percentile(0.2).toDocument(Aggregation.DEFAULT_CONTEXT))
+			.isEqualTo(Document.parse("{ $percentile: { input: \"$score\", method: \"approximate\", p: [0.2] } }"));
+
+		assertThat(valueOf("score").percentile(0.3, 0.9).toDocument(Aggregation.DEFAULT_CONTEXT))
+			.isEqualTo(Document.parse("{ $percentile: { input: \"$score\", method: \"approximate\", p: [0.3, 0.9] } }"));
+
+		assertThat(valueOf("score").percentile(0.3, 0.9).and("scoreTwo").toDocument(Aggregation.DEFAULT_CONTEXT))
+			.isEqualTo(Document.parse("{ $percentile: { input: [\"$score\", \"$scoreTwo\"], method: \"approximate\", p: [0.3, 0.9] } }"));
+	}
+
+	@Test // GH-4473
+	void rendersPercentileWithExpression() {
+
+		assertThat(valueOf(Sum.sumOf("score")).percentile(0.1).toDocument(Aggregation.DEFAULT_CONTEXT))
+			.isEqualTo(Document.parse("{ $percentile: { input: {\"$sum\": \"$score\"}, method: \"approximate\", p: [0.1] } }"));
+
+		assertThat(valueOf("scoreOne").percentile(0.1, 0.2).and(Sum.sumOf("scoreTwo")).toDocument(Aggregation.DEFAULT_CONTEXT))
+			.isEqualTo(Document.parse("{ $percentile: { input: [\"$scoreOne\", {\"$sum\": \"$scoreTwo\"}], method: \"approximate\", p: [0.1, 0.2] } }"));
+	}
+
+	@Test // GH-4472
+	void rendersMedianWithFieldReference() {
+
+		assertThat(valueOf("score").median().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $median: { input: \"$score\", method: \"approximate\" } }"));
+
+		assertThat(valueOf("score").median().and("scoreTwo").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $median: { input: [\"$score\", \"$scoreTwo\"], method: \"approximate\" } }"));
+	}
+
+	@Test // GH-4472
+	void rendersMedianWithExpression() {
+
+		assertThat(valueOf(Sum.sumOf("score")).median().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $median: { input: {\"$sum\": \"$score\"}, method: \"approximate\" } }"));
+
+		assertThat(valueOf("scoreOne").median().and(Sum.sumOf("scoreTwo")).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $median: { input: [\"$scoreOne\", {\"$sum\": \"$scoreTwo\"}], method: \"approximate\" } }"));
+	}
+
+	@Test // GH-4472
+	void rendersMedianCorrectlyWithTypedAggregationContext() {
+
+		assertThat(valueOf("midichlorianCount").median()
+				.toDocument(TestAggregationContext.contextFor(Jedi.class)))
+						.isEqualTo(Document.parse("{ $median: { input: \"$force\", method: \"approximate\" } }"));
+	}
+
+	static class Jedi {
+
+		String name;
+
+		Date birthdate;
+
+		@Field("force") Integer midichlorianCount;
+
+		Integer balance;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperationUnitTests.java
new file mode 100644
index 0000000000..efc206a0d4
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AddFieldsOperationUnitTests.java
@@ -0,0 +1,177 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.List;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * Unit tests for {@link AddFieldsOperation}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Kim Sumin
+ */
+class AddFieldsOperationUnitTests {
+
+	@Test // DATAMONGO-2363
+	void raisesErrorOnNullField() {
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new AddFieldsOperation(null, "value"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersFieldReferenceCorrectly() {
+
+		assertThat(new AddFieldsOperation("name", "value").toPipelineStages(contextFor(Scores.class)))
+				.containsExactly(Document.parse("{\"$addFields\" : {\"name\":\"value\"}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersMultipleEntriesCorrectly() {
+
+		assertThat(new AddFieldsOperation("name", "value").addField("field-2", "value2")
+				.toPipelineStages(contextFor(Scores.class)))
+						.containsExactly(Document.parse("{\"$addFields\" : {\"name\":\"value\", \"field-2\":\"value2\"}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersMappedFieldReferenceCorrectly() {
+
+		assertThat(new AddFieldsOperation("student", "value").toPipelineStages(contextFor(ScoresWithMappedField.class)))
+				.containsExactly(Document.parse("{\"$addFields\" : {\"student_name\":\"value\"}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersNestedMappedFieldReferenceCorrectly() {
+
+		assertThat(new AddFieldsOperation("scoresWithMappedField.student", "value")
+				.toPipelineStages(contextFor(ScoresWrapper.class)))
+						.containsExactly(Document.parse("{\"$addFields\" : {\"scoresWithMappedField.student_name\":\"value\"}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersTargetValueFieldReferenceCorrectly() {
+
+		assertThat(new AddFieldsOperation("name", Fields.field("value")).toPipelineStages(contextFor(Scores.class)))
+				.containsExactly(Document.parse("{\"$addFields\" : {\"name\":\"$value\"}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersMappedTargetValueFieldReferenceCorrectly() {
+
+		assertThat(new AddFieldsOperation("student", Fields.field("homework"))
+				.toPipelineStages(contextFor(ScoresWithMappedField.class)))
+						.containsExactly(Document.parse("{\"$addFields\" : {\"student_name\":\"$home_work\"}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersNestedMappedTargetValueFieldReferenceCorrectly() {
+
+		assertThat(new AddFieldsOperation("scoresWithMappedField.student", Fields.field("scoresWithMappedField.homework"))
+				.toPipelineStages(contextFor(ScoresWrapper.class)))
+						.containsExactly(Document.parse(
+								"{\"$addFields\" : {\"scoresWithMappedField.student_name\":\"$scoresWithMappedField.home_work\"}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void appliesSpelExpressionCorrectly() {
+
+		AddFieldsOperation operation = AddFieldsOperation.builder().addField("totalHomework")
+				.withValueOfExpression("sum(homework) * [0]", 2) //
+				.build();
+
+		assertThat(operation.toPipelineStages(contextFor(ScoresWrapper.class))).contains(
+				Document.parse("{\"$addFields\" : {\"totalHomework\": { $multiply : [{ \"$sum\" : [\"$homework\"] }, 2] }}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void rendersTargetValueExpressionCorrectly() {
+
+		assertThat(AddFieldsOperation.builder().addField("totalHomework")
+				.withValueOf(ArithmeticOperators.valueOf("homework").sum()).build().toPipelineStages(contextFor(Scores.class)))
+						.containsExactly(Document.parse("{\"$addFields\" : {\"totalHomework\": { \"$sum\" : \"$homework\" }}}"));
+	}
+
+	@Test // DATAMONGO-2363
+	void exposesFieldsCorrectly() {
+
+		ExposedFields fields = AddFieldsOperation.builder().addField("totalHomework").withValue("A+") //
+				.addField("totalQuiz").withValue("B-") //
+				.addField("computed").withValueOfExpression("totalHomework").build().getFields();
+
+		assertThat(fields.getField("totalHomework")).isNotNull();
+		assertThat(fields.getField("totalQuiz")).isNotNull();
+		assertThat(fields.getField("computed")).isNotNull();
+		assertThat(fields.getField("does-not-exist")).isNull();
+	}
+
+	@Test // GH-4933
+	void rendersStringValueAsFieldReferenceCorrectly() {
+
+		AddFieldsOperation operation = AddFieldsOperation.builder().addField("name").withValueOf("value").build();
+
+		assertThat(operation.toPipelineStages(contextFor(Scores.class)))
+				.containsExactly(Document.parse("{\"$addFields\" : {\"name\":\"$value\"}}"));
+
+		AddFieldsOperation mappedOperation = AddFieldsOperation.builder().addField("totalHomework").withValueOf("homework")
+				.build();
+
+		assertThat(mappedOperation.toPipelineStages(contextFor(ScoresWithMappedField.class)))
+				.containsExactly(Document.parse("{\"$addFields\" : {\"totalHomework\":\"$home_work\"}}"));
+	}
+
+	private static AggregationOperationContext contextFor(@Nullable Class<?> type) {
+
+		if (type == null) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				new MongoMappingContext());
+		mongoConverter.afterPropertiesSet();
+
+		return new TypeBasedAggregationOperationContext(type, mongoConverter.getMappingContext(),
+				new QueryMapper(mongoConverter)).continueOnMissingFieldReference();
+	}
+
+	static class Scores {
+
+		String student;
+		List<Integer> homework;
+	}
+
+	static class ScoresWithMappedField {
+
+		@Field("student_name") String student;
+		@Field("home_work") List<Integer> homework;
+	}
+
+	static class ScoresWrapper {
+
+		Scores scores;
+		ScoresWithMappedField scoresWithMappedField;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRendererUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRendererUnitTests.java
new file mode 100644
index 0000000000..5cc93ee5b9
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationOperationRendererUnitTests.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright 2023-2025 the original author 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.aggregation;
+
+import static org.mockito.Mockito.*;
+import static org.springframework.data.domain.Sort.Direction.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+import java.time.ZonedDateTime;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.assertj.core.api.Assertions;
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.convert.ConverterBuilder;
+import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.convert.CustomConversions.StoreConversions;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.test.util.MongoTestMappingContext;
+
+/**
+ * @author Christoph Strobl
+ */
+public class AggregationOperationRendererUnitTests {
+
+	@Test // GH-4443
+	void nonFieldsExposingAggregationOperationContinuesWithSameContextForNextStage() {
+
+		AggregationOperationContext rootContext = mock(AggregationOperationContext.class);
+		AggregationOperation stage1 = mock(AggregationOperation.class);
+		AggregationOperation stage2 = mock(AggregationOperation.class);
+
+		AggregationOperationRenderer.toDocument(List.of(stage1, stage2), rootContext);
+
+		verify(stage1).toPipelineStages(eq(rootContext));
+		verify(stage2).toPipelineStages(eq(rootContext));
+	}
+
+	@Test // GH-4722
+	void contextShouldCarryOnRelaxedFieldMapping() {
+
+		MongoTestMappingContext ctx = new MongoTestMappingContext(cfg -> {
+			cfg.initialEntitySet(TestRecord.class);
+		});
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, ctx);
+
+		Aggregation agg = Aggregation.newAggregation(Aggregation.unwind("layerOne.layerTwo"),
+				project().and("layerOne.layerTwo.layerThree").as("layerOne.layerThree"),
+				sort(DESC, "layerOne.layerThree.fieldA"));
+
+		AggregationOperationRenderer.toDocument(agg.getPipeline().getOperations(),
+				new RelaxedTypeBasedAggregationOperationContext(TestRecord.class, ctx, new QueryMapper(mongoConverter)));
+	}
+
+	@Test // GH-4722
+	void appliesConversionToValuesUsedInAggregation() {
+
+		MongoTestMappingContext ctx = new MongoTestMappingContext(cfg -> {
+			cfg.initialEntitySet(TestRecord.class);
+		});
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, ctx);
+		mongoConverter.setCustomConversions(new CustomConversions(StoreConversions.NONE,
+				Set.copyOf(ConverterBuilder.writing(ZonedDateTime.class, String.class, ZonedDateTime::toString)
+						.andReading(it -> ZonedDateTime.parse(it)).getConverters())));
+		mongoConverter.afterPropertiesSet();
+
+		var agg = Aggregation.newAggregation(Aggregation.sort(Direction.DESC, "version"),
+				Aggregation.group("entityId").first(Aggregation.ROOT).as("value"), Aggregation.replaceRoot("value"),
+				Aggregation.match(Criteria.where("createdDate").lt(ZonedDateTime.now())) // here is the problem
+		);
+
+		List<Document> document = AggregationOperationRenderer.toDocument(agg.getPipeline().getOperations(),
+				new RelaxedTypeBasedAggregationOperationContext(TestRecord.class, ctx, new QueryMapper(mongoConverter)));
+		Assertions.assertThat(document).last()
+				.extracting(it -> it.getEmbedded(List.of("$match", "createdDate", "$lt"), Object.class))
+				.isInstanceOf(String.class);
+	}
+
+	@ParameterizedTest // GH-4722
+	@MethodSource("studentAggregationContexts")
+	void mapsOperationThatDoesNotExposeDedicatedFieldsCorrectly(AggregationOperationContext aggregationContext) {
+
+		var agg = newAggregation(Student.class, Aggregation.unwind("grades"), Aggregation.replaceRoot("grades"),
+				Aggregation.project("grades"));
+
+		List<Document> mappedPipeline = AggregationOperationRenderer.toDocument(agg.getPipeline().getOperations(),
+				aggregationContext);
+
+		Assertions.assertThat(mappedPipeline).last().isEqualTo(Document.parse("{\"$project\": {\"grades\": 1}}"));
+	}
+
+	private static Stream<Arguments> studentAggregationContexts() {
+
+		MongoTestMappingContext ctx = new MongoTestMappingContext(cfg -> {
+			cfg.initialEntitySet(Student.class);
+		});
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, ctx);
+		mongoConverter.afterPropertiesSet();
+
+		QueryMapper queryMapper = new QueryMapper(mongoConverter);
+
+		return Stream.of(
+				Arguments
+						.of(new TypeBasedAggregationOperationContext(Student.class, ctx, queryMapper, FieldLookupPolicy.strict())),
+				Arguments.of(
+						new TypeBasedAggregationOperationContext(Student.class, ctx, queryMapper, FieldLookupPolicy.relaxed())));
+	}
+
+	record TestRecord(@Id String field1, String field2, LayerOne layerOne) {
+		record LayerOne(List<LayerTwo> layerTwo) {
+		}
+
+		record LayerTwo(LayerThree layerThree) {
+		}
+
+		record LayerThree(int fieldA, int fieldB) {
+		}
+	}
+
+	static class Student {
+
+		@Field("mark") List<Grade> grades;
+
+	}
+
+	static class Grade {
+
+		int points;
+		String grades;
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationOptionsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationOptionsTests.java
index 29984aa6d1..ab65236f7c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationOptionsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationOptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link AggregationOptions}.
@@ -28,51 +28,93 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Yadhukrishna S Pai
  * @since 1.6
  */
-public class AggregationOptionsTests {
+class AggregationOptionsTests {
 
+	private final Document dummyHint = new Document("dummyField", 1);
 	AggregationOptions aggregationOptions;
 
-	@Before
-	public void setup() {
+	@BeforeEach
+	void setup() {
 		aggregationOptions = newAggregationOptions().explain(true) //
 				.cursorBatchSize(1) //
 				.allowDiskUse(true) //
-				.comment("hola!") //
+				.comment("hola") //
+				.hint(dummyHint) //
 				.build();
 	}
 
-	@Test // DATAMONGO-960
-	public void aggregationOptionsBuilderShouldSetOptionsAccordingly() {
+	@Test // DATAMONGO-960, DATAMONGO-1836
+	void aggregationOptionsBuilderShouldSetOptionsAccordingly() {
 
 		assertThat(aggregationOptions.isAllowDiskUse()).isTrue();
 		assertThat(aggregationOptions.isExplain()).isTrue();
-		assertThat(aggregationOptions.getCursor().get()).isEqualTo(new Document("batchSize", 1));
+		assertThat(aggregationOptions.getCursor()).contains(new Document("batchSize", 1));
+		assertThat(aggregationOptions.getHint()).contains(dummyHint);
+		assertThat(aggregationOptions.getHintObject()).contains(dummyHint);
 	}
 
-	@Test // DATAMONGO-1637, DATAMONGO-2153
-	public void shouldInitializeFromDocument() {
+	@Test // DATAMONGO-1637, DATAMONGO-2153, DATAMONGO-1836
+	void shouldInitializeFromDocument() {
 
 		Document document = new Document();
 		document.put("cursor", new Document("batchSize", 1));
 		document.put("explain", true);
 		document.put("allowDiskUse", true);
-		document.put("comment", "hola!");
+		document.put("comment", "hola");
+		document.put("hint", dummyHint);
 
 		aggregationOptions = AggregationOptions.fromDocument(document);
 
 		assertThat(aggregationOptions.isAllowDiskUse()).isTrue();
 		assertThat(aggregationOptions.isExplain()).isTrue();
-		assertThat(aggregationOptions.getCursor().get()).isEqualTo(new Document("batchSize", 1));
+		assertThat(aggregationOptions.getCursor()).contains(new Document("batchSize", 1));
 		assertThat(aggregationOptions.getCursorBatchSize()).isEqualTo(1);
-		assertThat(aggregationOptions.getComment().get()).isEqualTo("hola!");
+		assertThat(aggregationOptions.getComment()).contains("hola");
+		assertThat(aggregationOptions.getHint()).contains(dummyHint);
+		assertThat(aggregationOptions.getHintObject()).contains(dummyHint);
 	}
 
-	@Test // DATAMONGO-960, DATAMONGO-2153
-	public void aggregationOptionsToString() {
+	@Test // GH-4664
+	void omitsAllowDiskUseByDefault() {
 
-		assertThat(aggregationOptions.toDocument()).isEqualTo(Document.parse(
-				"{ \"allowDiskUse\" : true , \"explain\" : true , \"cursor\" : { \"batchSize\" : 1}, \"comment\": \"hola!\"}"));
+		aggregationOptions = AggregationOptions.fromDocument(new Document());
+
+		assertThat(aggregationOptions.isAllowDiskUse()).isFalse();
+		assertThat(aggregationOptions.isAllowDiskUseSet()).isFalse();
+
+		assertThat(aggregationOptions.toDocument()).doesNotContainKey("allowDiskUse");
+	}
+
+	@Test // GH-4664
+	void applyOptionsDoesNotChangeAllowDiskUseDefault() {
+
+		aggregationOptions = AggregationOptions.fromDocument(new Document());
+
+		Document empty = new Document();
+		aggregationOptions.applyAndReturnPotentiallyChangedCommand(empty);
+
+		assertThat(empty).doesNotContainKey("allowDiskUse");
+	}
+
+	@Test // GH-4664
+	void applyOptionsDoesNotChangeExistingAllowDiskUse() {
+
+		aggregationOptions = AggregationOptions.fromDocument(new Document());
+
+		Document existing = new Document("allowDiskUse", true);
+		aggregationOptions.applyAndReturnPotentiallyChangedCommand(existing);
+
+		assertThat(existing).containsEntry("allowDiskUse", true);
+	}
+
+	@Test // DATAMONGO-960, DATAMONGO-2153, DATAMONGO-1836
+	void aggregationOptionsToString() {
+
+		assertThat(aggregationOptions.toDocument()).isEqualTo(Document
+				.parse("{ " + "\"allowDiskUse\" : true , " + "\"explain\" : true , " + "\"cursor\" : { \"batchSize\" : 1}, "
+						+ "\"comment\": \"hola\", " + "\"hint\" : { \"dummyField\" : 1}" + "}"));
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
index a9e3e37fee..1495dec1c6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,65 +17,66 @@
 
 import static org.springframework.data.domain.Sort.Direction.*;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.Builder;
-
 import java.io.BufferedInputStream;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoField;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.Scanner;
+import java.util.stream.Stream;
 
 import org.assertj.core.data.Offset;
 import org.bson.Document;
-import org.joda.time.DateTime;
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDateTime;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.dao.DataAccessException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.core.CollectionCallback;
+import org.springframework.data.mongodb.core.BulkOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.TestEntities;
 import org.springframework.data.mongodb.core.Venue;
 import org.springframework.data.mongodb.core.aggregation.AggregationTests.CarDescriptor.Entry;
 import org.springframework.data.mongodb.core.aggregation.BucketAutoOperation.Granularities;
+import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let;
 import org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
 import org.springframework.data.mongodb.core.index.GeospatialIndex;
+import org.springframework.data.mongodb.core.mapping.MongoId;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
 import org.springframework.data.mongodb.test.util.MongoVersion;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.Template;
+import org.springframework.util.ObjectUtils;
 
-import com.mongodb.MongoException;
 import com.mongodb.client.MongoCollection;
 
 /**
@@ -90,53 +91,40 @@
  * @author Maninder Singh
  * @author Sergey Shcherbakov
  * @author Minsu Kim
+ * @author Sangyong Choi
+ * @author Julia Lee
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
+@ExtendWith(MongoTemplateExtension.class)
 public class AggregationTests {
 
 	private static final String INPUT_COLLECTION = "aggregation_test_collection";
-	private static final Logger LOGGER = LoggerFactory.getLogger(AggregationTests.class);
 
 	private static boolean initialized = false;
+	private static List<Document> documents = parseDocuments();
 
-	@Autowired MongoTemplate mongoTemplate;
-
-	@Rule public MongoVersionRule mongoVersion = MongoVersionRule.any();
+	@Template //
+	private static MongoTestTemplate mongoTemplate;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		cleanDb();
 		initSampleDataIfNecessary();
 	}
 
-	@After
-	public void cleanUp() {
+	@AfterEach
+	void cleanUp() {
 		cleanDb();
 	}
 
 	private void cleanDb() {
 
+		mongoTemplate.flush(Product.class, UserWithLikes.class, DATAMONGO753.class, Data.class, DATAMONGO788.class,
+				User.class, Person.class, Reservation.class, Venue.class, MeterData.class, LineItem.class, InventoryItem.class,
+				Sales.class, Sales2.class, Employee.class, Art.class, Venue.class, Item.class);
+
 		mongoTemplate.dropCollection(INPUT_COLLECTION);
-		mongoTemplate.dropCollection(Product.class);
-		mongoTemplate.dropCollection(UserWithLikes.class);
-		mongoTemplate.dropCollection(DATAMONGO753.class);
-		mongoTemplate.dropCollection(Data.class);
-		mongoTemplate.dropCollection(DATAMONGO788.class);
-		mongoTemplate.dropCollection(User.class);
-		mongoTemplate.dropCollection(Person.class);
-		mongoTemplate.dropCollection(Reservation.class);
-		mongoTemplate.dropCollection(Venue.class);
-		mongoTemplate.dropCollection(MeterData.class);
-		mongoTemplate.dropCollection(LineItem.class);
-		mongoTemplate.dropCollection(InventoryItem.class);
-		mongoTemplate.dropCollection(Sales.class);
-		mongoTemplate.dropCollection(Sales2.class);
-		mongoTemplate.dropCollection(Employee.class);
-		mongoTemplate.dropCollection(Art.class);
 		mongoTemplate.dropCollection("personQueryTemp");
-		mongoTemplate.dropCollection(Venue.class);
 	}
 
 	/**
@@ -149,31 +137,9 @@ private void initSampleDataIfNecessary() {
 
 		if (!initialized) {
 
-			LOGGER.debug("Server uses MongoDB Version: {}", mongoVersion);
-
 			mongoTemplate.dropCollection(ZipInfo.class);
-			mongoTemplate.execute(ZipInfo.class, new CollectionCallback<Void>() {
-
-				@Override
-				public Void doInCollection(MongoCollection<Document> collection) throws MongoException, DataAccessException {
-
-					Scanner scanner = null;
-					try {
-						scanner = new Scanner(new BufferedInputStream(new ClassPathResource("zips.json").getInputStream()));
-						while (scanner.hasNextLine()) {
-							String zipInfoRecord = scanner.nextLine();
-							collection.insertOne(Document.parse(zipInfoRecord));
-						}
-					} catch (Exception e) {
-						if (scanner != null) {
-							scanner.close();
-						}
-						throw new RuntimeException("Could not load mongodb sample dataset!", e);
-					}
-
-					return null;
-				}
-			});
+
+			mongoTemplate.bulkOps(BulkOperations.BulkMode.UNORDERED, ZipInfo.class).insert(documents).execute();
 
 			long count = mongoTemplate.count(new Query(), ZipInfo.class);
 			assertThat(count).isEqualTo(29467L);
@@ -182,26 +148,47 @@ public Void doInCollection(MongoCollection<Document> collection) throws MongoExc
 		}
 	}
 
+	static List<Document> parseDocuments() {
+
+		Scanner scanner = null;
+		List<Document> documents = new ArrayList<>(30000);
+
+		try {
+			scanner = new Scanner(new BufferedInputStream(new ClassPathResource("zips.json").getInputStream()));
+			while (scanner.hasNextLine()) {
+				String zipInfoRecord = scanner.nextLine();
+				documents.add(Document.parse(zipInfoRecord));
+			}
+		} catch (Exception e) {
+			if (scanner != null) {
+				scanner.close();
+			}
+			throw new RuntimeException("Could not load mongodb sample dataset", e);
+		}
+
+		return documents;
+	}
+
 	@Test // DATAMONGO-586
-	public void shouldHandleMissingInputCollection() {
+	void shouldHandleMissingInputCollection() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> mongoTemplate.aggregate(newAggregation(), (String) null, TagCount.class));
 	}
 
 	@Test // DATAMONGO-586
-	public void shouldHandleMissingAggregationPipeline() {
+	void shouldHandleMissingAggregationPipeline() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> mongoTemplate.aggregate(null, INPUT_COLLECTION, TagCount.class));
 	}
 
 	@Test // DATAMONGO-586
-	public void shouldHandleMissingEntityClass() {
+	void shouldHandleMissingEntityClass() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> mongoTemplate.aggregate(newAggregation(), INPUT_COLLECTION, null));
 	}
 
 	@Test // DATAMONGO-586
-	public void shouldAggregate() {
+	void shouldAggregate() {
 
 		createTagDocuments();
 
@@ -230,7 +217,7 @@ public void shouldAggregate() {
 	}
 
 	@Test // DATAMONGO-1637
-	public void shouldAggregateAndStream() {
+	void shouldAggregateAndStream() {
 
 		createTagDocuments();
 
@@ -244,22 +231,21 @@ public void shouldAggregateAndStream() {
 				sort(DESC, "n") //
 		).withOptions(new AggregationOptions(true, false, 1));
 
-		CloseableIterator<TagCount> iterator = mongoTemplate.aggregateStream(agg, INPUT_COLLECTION, TagCount.class);
+		try (Stream<TagCount> stream = mongoTemplate.aggregateStream(agg, INPUT_COLLECTION, TagCount.class)) {
 
-		assertThat(iterator).isNotNull();
-		List<TagCount> tagCount = toList(iterator);
-		iterator.close();
+			List<TagCount> tagCount = stream.toList();
 
-		assertThat(tagCount).isNotNull();
-		assertThat(tagCount.size()).isEqualTo(3);
+			assertThat(tagCount).isNotNull();
+			assertThat(tagCount.size()).isEqualTo(3);
 
-		assertTagCount("spring", 3, tagCount.get(0));
-		assertTagCount("mongodb", 2, tagCount.get(1));
-		assertTagCount("nosql", 1, tagCount.get(2));
+			assertTagCount("spring", 3, tagCount.get(0));
+			assertTagCount("mongodb", 2, tagCount.get(1));
+			assertTagCount("nosql", 1, tagCount.get(2));
+		}
 	}
 
 	@Test // DATAMONGO-586
-	public void shouldAggregateEmptyCollection() {
+	void shouldAggregateEmptyCollection() {
 
 		Aggregation aggregation = newAggregation(//
 				project("tags"), //
@@ -282,7 +268,7 @@ public void shouldAggregateEmptyCollection() {
 	}
 
 	@Test // DATAMONGO-1637
-	public void shouldAggregateEmptyCollectionAndStream() {
+	void shouldAggregateEmptyCollectionAndStream() {
 
 		Aggregation aggregation = newAggregation(//
 				project("tags"), //
@@ -294,19 +280,70 @@ public void shouldAggregateEmptyCollectionAndStream() {
 				sort(DESC, "n") //
 		);
 
-		CloseableIterator<TagCount> results = mongoTemplate.aggregateStream(aggregation, INPUT_COLLECTION, TagCount.class);
+		try (Stream<TagCount> stream = mongoTemplate.aggregateStream(aggregation, INPUT_COLLECTION, TagCount.class)) {
 
-		assertThat(results).isNotNull();
+			List<TagCount> tagCount = stream.toList();
+
+			assertThat(tagCount.size()).isEqualTo(0);
+		}
+	}
 
-		List<TagCount> tagCount = toList(results);
-		results.close();
+	@Test // GH-4949
+	void shouldAggregateAsStreamWithConverter() {
 
-		assertThat(tagCount.size()).isEqualTo(0);
+		MongoCollection<Document> coll = mongoTemplate.getCollection(INPUT_COLLECTION);
+
+		coll.insertOne(createDocument("Doc1", "spring", "mongodb", "nosql"));
+		coll.insertOne(createDocument("Doc2"));
+
+		Aggregation aggregation = newAggregation(//
+				project("tags"), //
+				unwind("tags"), //
+				group("tags") //
+						.count().as("n"), //
+				project("n") //
+						.and("tag").previousOperation(), //
+				sort(DESC, "n") //
+		);
+
+		try (Stream<Optional<TagCount>> stream = mongoTemplate.aggregateAndReturn(TagCount.class)
+				.inCollection(INPUT_COLLECTION).by(aggregation).map((document, reader) -> Optional.of(reader.get())).stream()) {
+
+			List<TagCount> tagCount = stream.flatMap(Optional::stream).toList();
+
+			assertThat(tagCount).hasSize(3);
+		}
+	}
+
+	@Test // GH-4949
+	void shouldAggregateWithConverter() {
+
+		MongoCollection<Document> coll = mongoTemplate.getCollection(INPUT_COLLECTION);
+
+		coll.insertOne(createDocument("Doc1", "spring", "mongodb", "nosql"));
+		coll.insertOne(createDocument("Doc2"));
+
+		Aggregation aggregation = newAggregation(//
+				project("tags"), //
+				unwind("tags"), //
+				group("tags") //
+						.count().as("n"), //
+				project("n") //
+						.and("tag").previousOperation(), //
+				sort(DESC, "n") //
+		);
+
+		AggregationResults<Optional<TagCount>> results = mongoTemplate.aggregateAndReturn(TagCount.class)
+				.inCollection(INPUT_COLLECTION) //
+				.by(aggregation) //
+				.map((document, reader) -> Optional.of(reader.get())) //
+				.all();
+
+		assertThat(results.getMappedResults()).extracting(Optional::get).hasOnlyElementsOfType(TagCount.class).hasSize(3);
 	}
 
 	@Test // DATAMONGO-1391
-	@MongoVersion(asOf = "3.2")
-	public void shouldUnwindWithIndex() {
+	void shouldUnwindWithIndex() {
 
 		MongoCollection<Document> coll = mongoTemplate.getCollection(INPUT_COLLECTION);
 
@@ -332,8 +369,8 @@ public void shouldUnwindWithIndex() {
 	}
 
 	@Test // DATAMONGO-1391
-	@MongoVersion(asOf = "3.2")
-	public void shouldUnwindPreserveEmpty() {
+	@EnableIfMongoServerVersion(isLessThan = "6.0") // $sort does not seem to have an effect on $unwind
+	void shouldUnwindPreserveEmpty() {
 
 		MongoCollection<Document> coll = mongoTemplate.getCollection(INPUT_COLLECTION);
 
@@ -359,7 +396,7 @@ public void shouldUnwindPreserveEmpty() {
 	}
 
 	@Test // DATAMONGO-586
-	public void shouldDetectResultMismatch() {
+	void shouldDetectResultMismatch() {
 
 		createTagDocuments();
 
@@ -384,7 +421,7 @@ public void shouldDetectResultMismatch() {
 	}
 
 	@Test // DATAMONGO-1637
-	public void shouldDetectResultMismatchWhileStreaming() {
+	void shouldDetectResultMismatchWhileStreaming() {
 
 		createTagDocuments();
 
@@ -396,20 +433,18 @@ public void shouldDetectResultMismatchWhileStreaming() {
 				limit(2) //
 		);
 
-		CloseableIterator<TagCount> results = mongoTemplate.aggregateStream(aggregation, INPUT_COLLECTION, TagCount.class);
-
-		assertThat(results).isNotNull();
+		try (Stream<TagCount> stream = mongoTemplate.aggregateStream(aggregation, INPUT_COLLECTION, TagCount.class)) {
 
-		List<TagCount> tagCount = toList(results);
-		results.close();
+			List<TagCount> tagCount = stream.toList();
 
-		assertThat(tagCount.size()).isEqualTo(2);
-		assertTagCount(null, 0, tagCount.get(0));
-		assertTagCount(null, 0, tagCount.get(1));
+			assertThat(tagCount.size()).isEqualTo(2);
+			assertTagCount(null, 0, tagCount.get(0));
+			assertTagCount(null, 0, tagCount.get(1));
+		}
 	}
 
 	@Test // DATAMONGO-586
-	public void complexAggregationFrameworkUsageLargestAndSmallestCitiesByState() {
+	void complexAggregationFrameworkUsageLargestAndSmallestCitiesByState() {
 		/*
 		 //complex mongodb aggregation framework example from https://docs.mongodb.org/manual/tutorial/aggregation-examples/#largest-and-smallest-cities-by-state
 		db.zipInfo.aggregate(
@@ -517,7 +552,7 @@ public void complexAggregationFrameworkUsageLargestAndSmallestCitiesByState() {
 	}
 
 	@Test // DATAMONGO-586
-	public void findStatesWithPopulationOver10MillionAggregationExample() {
+	void findStatesWithPopulationOver10MillionAggregationExample() {
 		/*
 		 //complex mongodb aggregation framework example from
 		 https://docs.mongodb.org/manual/tutorial/aggregation-examples/#largest-and-smallest-cities-by-state
@@ -567,7 +602,7 @@ public void findStatesWithPopulationOver10MillionAggregationExample() {
 	 *      Framework: $cond</a>
 	 */
 	@Test // DATAMONGO-861
-	public void aggregationUsingConditionalProjectionToCalculateDiscount() {
+	void aggregationUsingConditionalProjectionToCalculateDiscount() {
 
 		/*
 		db.inventory.aggregate(
@@ -620,7 +655,7 @@ public void aggregationUsingConditionalProjectionToCalculateDiscount() {
 	 *      Framework: $ifNull</a>
 	 */
 	@Test // DATAMONGO-861
-	public void aggregationUsingIfNullToProjectSaneDefaults() {
+	void aggregationUsingIfNullToProjectSaneDefaults() {
 
 		/*
 		db.inventory.aggregate(
@@ -660,7 +695,7 @@ public void aggregationUsingIfNullToProjectSaneDefaults() {
 	}
 
 	@Test // DATAMONGO-861
-	public void aggregationUsingConditionalProjection() {
+	void aggregationUsingConditionalProjection() {
 
 		TypedAggregation<ZipInfo> aggregation = newAggregation(ZipInfo.class, //
 				project() //
@@ -682,7 +717,7 @@ public void aggregationUsingConditionalProjection() {
 	}
 
 	@Test // DATAMONGO-861
-	public void aggregationUsingNestedConditionalProjection() {
+	void aggregationUsingNestedConditionalProjection() {
 
 		TypedAggregation<ZipInfo> aggregation = newAggregation(ZipInfo.class, //
 				project() //
@@ -705,7 +740,7 @@ public void aggregationUsingNestedConditionalProjection() {
 	}
 
 	@Test // DATAMONGO-861
-	public void aggregationUsingIfNullProjection() {
+	void aggregationUsingIfNullProjection() {
 
 		mongoTemplate.insert(new LineItem("id", "caption", 0));
 		mongoTemplate.insert(new LineItem("idonly", null, 0));
@@ -729,7 +764,7 @@ public void aggregationUsingIfNullProjection() {
 	}
 
 	@Test // DATAMONGO-861
-	public void aggregationUsingIfNullReplaceWithFieldReferenceProjection() {
+	void aggregationUsingIfNullReplaceWithFieldReferenceProjection() {
 
 		mongoTemplate.insert(new LineItem("id", "caption", 0));
 		mongoTemplate.insert(new LineItem("idonly", null, 0));
@@ -753,7 +788,7 @@ public void aggregationUsingIfNullReplaceWithFieldReferenceProjection() {
 	}
 
 	@Test // DATAMONGO-861
-	public void shouldAllowGroupingUsingConditionalExpressions() {
+	void shouldAllowGroupingUsingConditionalExpressions() {
 
 		mongoTemplate.dropCollection(CarPerson.class);
 
@@ -797,7 +832,7 @@ public void shouldAllowGroupingUsingConditionalExpressions() {
 	}
 
 	@Test // DATAMONGO-1784, DATAMONGO-2264
-	public void shouldAllowSumUsingConditionalExpressions() {
+	void shouldAllowSumUsingConditionalExpressions() {
 
 		mongoTemplate.dropCollection(CarPerson.class);
 
@@ -845,7 +880,7 @@ public void shouldAllowSumUsingConditionalExpressions() {
 	 *      the Five Most Common “Likes”</a>
 	 */
 	@Test // DATAMONGO-586
-	public void returnFiveMostCommonLikesAggregationFrameworkExample() {
+	void returnFiveMostCommonLikesAggregationFrameworkExample() {
 
 		createUserWithLikesDocuments();
 
@@ -866,7 +901,7 @@ public void returnFiveMostCommonLikesAggregationFrameworkExample() {
 		assertLikeStats(result.getMappedResults().get(4), "e", 3);
 	}
 
-	protected TypedAggregation<UserWithLikes> createUsersWithCommonLikesAggregation() {
+	TypedAggregation<UserWithLikes> createUsersWithCommonLikesAggregation() {
 		return newAggregation(UserWithLikes.class, //
 				unwind("likes"), //
 				group("likes").count().as("number"), //
@@ -877,7 +912,7 @@ protected TypedAggregation<UserWithLikes> createUsersWithCommonLikesAggregation(
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmenticOperatorsInProjectionExample() {
+	void arithmenticOperatorsInProjectionExample() {
 
 		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
 		mongoTemplate.insert(product);
@@ -920,7 +955,7 @@ public void arithmenticOperatorsInProjectionExample() {
 	}
 
 	@Test // DATAMONGO-774
-	public void expressionsInProjectionExample() {
+	void expressionsInProjectionExample() {
 
 		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
 		mongoTemplate.insert(product);
@@ -952,8 +987,7 @@ public void expressionsInProjectionExample() {
 	}
 
 	@Test // DATAMONGO-774
-	@MongoVersion(asOf = "2.4")
-	public void stringExpressionsInProjectionExample() {
+	void stringExpressionsInProjectionExample() {
 
 		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
 		mongoTemplate.insert(product);
@@ -973,7 +1007,7 @@ public void stringExpressionsInProjectionExample() {
 	}
 
 	@Test // DATAMONGO-774
-	public void expressionsInProjectionExampleShowcase() {
+	void expressionsInProjectionExampleShowcase() {
 
 		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
 		mongoTemplate.insert(product);
@@ -1002,7 +1036,7 @@ public void expressionsInProjectionExampleShowcase() {
 	 *      Data MongoDB - Aggregation Framework - invalid reference in group Operation</a>
 	 */
 	@Test // DATAMONGO-753
-	public void allowsNestedFieldReferencesAsGroupIdsInGroupExpressions() {
+	void allowsNestedFieldReferencesAsGroupIdsInGroupExpressions() {
 
 		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("A", 1), new PD("B", 1), new PD("C", 1)));
 		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("B", 1), new PD("B", 1), new PD("C", 1)));
@@ -1032,7 +1066,7 @@ public void allowsNestedFieldReferencesAsGroupIdsInGroupExpressions() {
 	 *      Data MongoDB - Aggregation Framework - invalid reference in group Operation</a>
 	 */
 	@Test // DATAMONGO-753
-	public void aliasesNestedFieldInProjectionImmediately() {
+	void aliasesNestedFieldInProjectionImmediately() {
 
 		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("A", 1), new PD("B", 1), new PD("C", 1)));
 		mongoTemplate.insert(new DATAMONGO753().withPDs(new PD("B", 1), new PD("B", 1), new PD("C", 1)));
@@ -1051,8 +1085,7 @@ public void aliasesNestedFieldInProjectionImmediately() {
 	}
 
 	@Test // DATAMONGO-774
-	@MongoVersion(asOf = "2.4")
-	public void shouldPerformDateProjectionOperatorsCorrectly() throws ParseException {
+	void shouldPerformDateProjectionOperatorsCorrectly() throws ParseException {
 
 		Data data = new Data();
 		data.stringValue = "ABC";
@@ -1078,8 +1111,7 @@ public void shouldPerformDateProjectionOperatorsCorrectly() throws ParseExceptio
 	}
 
 	@Test // DATAMONGO-774
-	@MongoVersion(asOf = "2.4")
-	public void shouldPerformStringProjectionOperatorsCorrectly() throws ParseException {
+	void shouldPerformStringProjectionOperatorsCorrectly() throws ParseException {
 
 		Data data = new Data();
 		data.dateValue = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss.SSSZ").parse("29.08.1983 12:34:56.789+0000");
@@ -1115,8 +1147,7 @@ public void shouldPerformStringProjectionOperatorsCorrectly() throws ParseExcept
 	}
 
 	@Test // DATAMONGO-1550
-	@MongoVersion(asOf = "3.4")
-	public void shouldPerformReplaceRootOperatorCorrectly() throws ParseException {
+	void shouldPerformReplaceRootOperatorCorrectly() throws ParseException {
 
 		Data data = new Data();
 		DataItem dataItem = new DataItem();
@@ -1137,7 +1168,7 @@ public void shouldPerformReplaceRootOperatorCorrectly() throws ParseException {
 	}
 
 	@Test // DATAMONGO-788, DATAMONGO-2264
-	public void referencesToGroupIdsShouldBeRenderedProperly() {
+	void referencesToGroupIdsShouldBeRenderedProperly() {
 
 		mongoTemplate.insert(new DATAMONGO788(1, 1));
 		mongoTemplate.insert(new DATAMONGO788(1, 1));
@@ -1164,15 +1195,15 @@ public void referencesToGroupIdsShouldBeRenderedProperly() {
 	}
 
 	@Test // DATAMONGO-806
-	public void shouldAllowGroupByIdFields() {
+	void shouldAllowGroupByIdFields() {
 
 		mongoTemplate.dropCollection(User.class);
 
-		LocalDateTime now = new LocalDateTime();
+		Instant now = Instant.now();
 
-		User user1 = new User("u1", new PushMessage("1", "aaa", now.toDate()));
-		User user2 = new User("u2", new PushMessage("2", "bbb", now.minusDays(2).toDate()));
-		User user3 = new User("u3", new PushMessage("3", "ccc", now.minusDays(1).toDate()));
+		User user1 = new User("u1", new PushMessage("1", "aaa", now));
+		User user2 = new User("u2", new PushMessage("2", "bbb", now.minus(2, ChronoUnit.DAYS)));
+		User user3 = new User("u3", new PushMessage("3", "ccc", now.minus(1, ChronoUnit.DAYS)));
 
 		mongoTemplate.save(user1);
 		mongoTemplate.save(user2);
@@ -1181,7 +1212,7 @@ public void shouldAllowGroupByIdFields() {
 		Aggregation agg = newAggregation( //
 				project("id", "msgs"), //
 				unwind("msgs"), //
-				match(where("msgs.createDate").gt(now.minusDays(1).toDate())), //
+				match(where("msgs.createDate").gt(Date.from(now.minus(1, ChronoUnit.DAYS)))), //
 				group("id").push("msgs").as("msgs") //
 		);
 
@@ -1195,7 +1226,7 @@ public void shouldAllowGroupByIdFields() {
 	}
 
 	@Test // DATAMONGO-840
-	public void shouldAggregateOrderDataToAnInvoice() {
+	void shouldAggregateOrderDataToAnInvoice() {
 
 		mongoTemplate.dropCollection(Order.class);
 
@@ -1232,7 +1263,7 @@ public void shouldAggregateOrderDataToAnInvoice() {
 	}
 
 	@Test // DATAMONGO-924
-	public void shouldAllowGroupingByAliasedFieldDefinedInFormerAggregationStage() {
+	void shouldAllowGroupingByAliasedFieldDefinedInFormerAggregationStage() {
 
 		mongoTemplate.dropCollection(CarPerson.class);
 
@@ -1263,8 +1294,7 @@ public void shouldAllowGroupingByAliasedFieldDefinedInFormerAggregationStage() {
 	}
 
 	@Test // DATAMONGO-960
-	@MongoVersion(asOf = "2.6")
-	public void returnFiveMostCommonLikesAggregationFrameworkExampleWithSortOnDiskOptionEnabled() {
+	void returnFiveMostCommonLikesAggregationFrameworkExampleWithSortOnDiskOptionEnabled() {
 
 		createUserWithLikesDocuments();
 
@@ -1287,8 +1317,7 @@ public void returnFiveMostCommonLikesAggregationFrameworkExampleWithSortOnDiskOp
 	}
 
 	@Test // DATAMONGO-1637
-	@MongoVersion(asOf = "2.6")
-	public void returnFiveMostCommonLikesAggregationFrameworkExampleWithSortOnDiskOptionEnabledWhileStreaming() {
+	void returnFiveMostCommonLikesAggregationFrameworkExampleWithSortOnDiskOptionEnabledWhileStreaming() {
 
 		createUserWithLikesDocuments();
 
@@ -1298,24 +1327,22 @@ public void returnFiveMostCommonLikesAggregationFrameworkExampleWithSortOnDiskOp
 		assertThat(agg).isNotNull();
 		assertThat(agg.toString()).isNotNull();
 
-		CloseableIterator<LikeStats> iterator = mongoTemplate.aggregateStream(agg, LikeStats.class);
-		List<LikeStats> result = toList(iterator);
-		iterator.close();
+		try (Stream<LikeStats> stream = mongoTemplate.aggregateStream(agg, LikeStats.class)) {
 
-		assertThat(result).isNotNull();
-		assertThat(result).isNotNull();
-		assertThat(result.size()).isEqualTo(5);
+			List<LikeStats> result = stream.toList();
+
+			assertThat(result.size()).isEqualTo(5);
 
-		assertLikeStats(result.get(0), "a", 4);
-		assertLikeStats(result.get(1), "b", 2);
-		assertLikeStats(result.get(2), "c", 4);
-		assertLikeStats(result.get(3), "d", 2);
-		assertLikeStats(result.get(4), "e", 3);
+			assertLikeStats(result.get(0), "a", 4);
+			assertLikeStats(result.get(1), "b", 2);
+			assertLikeStats(result.get(2), "c", 4);
+			assertLikeStats(result.get(3), "d", 2);
+			assertLikeStats(result.get(4), "e", 3);
+		}
 	}
 
 	@Test // DATAMONGO-960
-	@MongoVersion(asOf = "2.6")
-	public void returnFiveMostCommonLikesShouldReturnStageExecutionInformationWithExplainOptionEnabled() {
+	void returnFiveMostCommonLikesShouldReturnStageExecutionInformationWithExplainOptionEnabled() {
 
 		createUserWithLikesDocuments();
 
@@ -1333,8 +1360,7 @@ public void returnFiveMostCommonLikesShouldReturnStageExecutionInformationWithEx
 	}
 
 	@Test // DATAMONGO-954, DATAMONGO-2264
-	@MongoVersion(asOf = "2.6")
-	public void shouldSupportReturningCurrentAggregationRoot() {
+	void shouldSupportReturningCurrentAggregationRoot() {
 
 		mongoTemplate.save(new Person("p1_first", "p1_last", 25));
 		mongoTemplate.save(new Person("p2_first", "p2_last", 32));
@@ -1359,8 +1385,7 @@ public void shouldSupportReturningCurrentAggregationRoot() {
 	 * {@link https://stackoverflow.com/questions/24185987/using-root-inside-spring-data-mongodb-for-retrieving-whole-document}
 	 */
 	@Test // DATAMONGO-954, DATAMONGO-2264
-	@MongoVersion(asOf = "2.6")
-	public void shouldSupportReturningCurrentAggregationRootInReference() {
+	void shouldSupportReturningCurrentAggregationRootInReference() {
 
 		mongoTemplate.save(new Reservation("0123", "42", 100));
 		mongoTemplate.save(new Reservation("0360", "43", 200));
@@ -1379,8 +1404,7 @@ public void shouldSupportReturningCurrentAggregationRootInReference() {
 	}
 
 	@Test // DATAMONGO-1549
-	@MongoVersion(asOf = "3.4")
-	public void shouldApplyCountCorrectly() {
+	void shouldApplyCountCorrectly() {
 
 		mongoTemplate.save(new Reservation("0123", "42", 100));
 		mongoTemplate.save(new Reservation("0360", "43", 200));
@@ -1399,18 +1423,14 @@ public void shouldApplyCountCorrectly() {
 	}
 
 	@Test // DATAMONGO-975
-	public void shouldRetrieveDateTimeFragementsCorrectly() throws Exception {
+	void shouldRetrieveDateTimeFragementsCorrectly() throws Exception {
 
 		mongoTemplate.dropCollection(ObjectWithDate.class);
 
-		DateTime dateTime = new DateTime() //
-				.withZone(DateTimeZone.UTC) //
-				.withYear(2014) //
-				.withMonthOfYear(2) //
-				.withDayOfMonth(7) //
-				.withTime(3, 4, 5, 6).toDateTimeISO();
+		ZonedDateTime dateTime = ZonedDateTime.of(LocalDateTime.of(LocalDate.of(2014, 2, 7), LocalTime.of(3, 4, 5, 6)),
+				ZoneId.of("UTC"));
 
-		ObjectWithDate owd = new ObjectWithDate(dateTime.toDate());
+		ObjectWithDate owd = new ObjectWithDate(Date.from(dateTime.toInstant()));
 		mongoTemplate.insert(owd);
 
 		ProjectionOperation dateProjection = Aggregation.project() //
@@ -1434,12 +1454,12 @@ public void shouldRetrieveDateTimeFragementsCorrectly() throws Exception {
 		assertThat(result.getMappedResults()).hasSize(1);
 		Document document = result.getMappedResults().get(0);
 
-		assertThat(document.get("hour")).isEqualTo((Object) dateTime.getHourOfDay());
-		assertThat(document.get("min")).isEqualTo((Object) dateTime.getMinuteOfHour());
-		assertThat(document.get("second")).isEqualTo((Object) dateTime.getSecondOfMinute());
-		assertThat(document.get("millis")).isEqualTo((Object) dateTime.getMillisOfSecond());
+		assertThat(document.get("hour")).isEqualTo((Object) dateTime.getHour());
+		assertThat(document.get("min")).isEqualTo((Object) dateTime.getMinute());
+		assertThat(document.get("second")).isEqualTo((Object) dateTime.getSecond());
+		assertThat(document.get("millis")).isEqualTo((Object) dateTime.get(ChronoField.MILLI_OF_SECOND));
 		assertThat(document.get("year")).isEqualTo((Object) dateTime.getYear());
-		assertThat(document.get("month")).isEqualTo((Object) dateTime.getMonthOfYear());
+		assertThat(document.get("month")).isEqualTo((Object) dateTime.getMonthValue());
 		// dateTime.getWeekOfWeekyear()) returns 6 since for MongoDB the week starts on sunday and not on monday.
 		assertThat(document.get("week")).isEqualTo((Object) 5);
 		assertThat(document.get("dayOfYear")).isEqualTo((Object) dateTime.getDayOfYear());
@@ -1452,14 +1472,14 @@ public void shouldRetrieveDateTimeFragementsCorrectly() throws Exception {
 	}
 
 	@Test // DATAMONGO-1127
-	public void shouldSupportGeoNearQueriesForAggregationWithDistanceField() {
+	void shouldSupportGeoNearQueriesForAggregationWithDistanceField() {
 
 		mongoTemplate.insertAll(Arrays.asList(TestEntities.geolocation().pennStation(),
 				TestEntities.geolocation().tenGenOffice(), TestEntities.geolocation().flatironBuilding()));
 
 		mongoTemplate.indexOps(Venue.class).ensureIndex(new GeospatialIndex("location"));
 
-		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).num(10).maxDistance(150);
+		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).limit(10).maxDistance(150);
 
 		Aggregation agg = newAggregation(Aggregation.geoNear(geoNear, "distance"));
 		AggregationResults<Document> result = mongoTemplate.aggregate(agg, Venue.class, Document.class);
@@ -1472,7 +1492,7 @@ public void shouldSupportGeoNearQueriesForAggregationWithDistanceField() {
 	}
 
 	@Test // DATAMONGO-1348
-	public void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceField() {
+	void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceField() {
 
 		mongoTemplate.insert(new Venue("Penn Station", -73.99408, 40.75057));
 		mongoTemplate.insert(new Venue("10gen Office", -73.99171, 40.738868));
@@ -1481,7 +1501,7 @@ public void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceField(
 		mongoTemplate.indexOps(Venue.class)
 				.ensureIndex(new GeospatialIndex("location").typed(GeoSpatialIndexType.GEO_2DSPHERE));
 
-		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).num(10).maxDistance(150);
+		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).limit(10).maxDistance(150);
 
 		Aggregation agg = newAggregation(Aggregation.geoNear(geoNear, "distance"));
 		AggregationResults<Document> result = mongoTemplate.aggregate(agg, Venue.class, Document.class);
@@ -1494,7 +1514,7 @@ public void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceField(
 	}
 
 	@Test // DATAMONGO-1348
-	public void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceFieldInMiles() {
+	void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceFieldInMiles() {
 
 		mongoTemplate.insert(new Venue("Penn Station", -73.99408, 40.75057));
 		mongoTemplate.insert(new Venue("10gen Office", -73.99171, 40.738868));
@@ -1503,7 +1523,7 @@ public void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceFieldI
 		mongoTemplate.indexOps(Venue.class)
 				.ensureIndex(new GeospatialIndex("location").typed(GeoSpatialIndexType.GEO_2DSPHERE));
 
-		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).num(10).maxDistance(150)
+		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).limit(10).maxDistance(150)
 				.inMiles();
 
 		Aggregation agg = newAggregation(Aggregation.geoNear(geoNear, "distance"));
@@ -1517,7 +1537,7 @@ public void shouldSupportGeoJsonInGeoNearQueriesForAggregationWithDistanceFieldI
 	}
 
 	@Test // DATAMONGO-1133
-	public void shouldHonorFieldAliasesForFieldReferences() {
+	void shouldHonorFieldAliasesForFieldReferences() {
 
 		mongoTemplate.insert(new MeterData("m1", "counter1", 42));
 		mongoTemplate.insert(new MeterData("m1", "counter1", 13));
@@ -1537,8 +1557,7 @@ public void shouldHonorFieldAliasesForFieldReferences() {
 	}
 
 	@Test // DATAMONGO-1326
-	@MongoVersion(asOf = "3.2")
-	public void shouldLookupPeopleCorectly() {
+	void shouldLookupPeopleCorectly() {
 
 		createUsersWithReferencedPersons();
 
@@ -1556,9 +1575,47 @@ public void shouldLookupPeopleCorectly() {
 		assertThat(firstItem).containsEntry("linkedPerson.[0].firstname", "u1");
 	}
 
+	@Test // GH-3322
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "5.0")
+	void shouldLookupPeopleCorrectlyWithPipeline() {
+		createUsersWithReferencedPersons();
+
+		TypedAggregation<User> agg = newAggregation(User.class, //
+				lookup().from("person").localField("_id").foreignField("firstname").pipeline(match(where("firstname").is("u1"))).as("linkedPerson"), //
+				sort(ASC, "id"));
+
+		AggregationResults<Document> results = mongoTemplate.aggregate(agg, User.class, Document.class);
+
+		List<Document> mappedResults = results.getMappedResults();
+
+		Document firstItem = mappedResults.get(0);
+
+		assertThat(firstItem).containsEntry("_id", "u1");
+		assertThat(firstItem).containsEntry("linkedPerson.[0].firstname", "u1");
+	}
+
+	@Test // GH-3322
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "5.0")
+	void shouldLookupPeopleCorrectlyWithPipelineAndLet() {
+		createUsersWithReferencedPersons();
+
+		TypedAggregation<User> agg = newAggregation(User.class, //
+				lookup().from("person").localField("_id").foreignField("firstname").let(Let.ExpressionVariable.newVariable("the_id").forField("_id")).pipeline(
+						match(ctx -> new Document("$expr", new Document("$eq", List.of("$$the_id", "u1"))))).as("linkedPerson"),
+				sort(ASC, "id"));
+
+		AggregationResults<Document> results = mongoTemplate.aggregate(agg, User.class, Document.class);
+
+		List<Document> mappedResults = results.getMappedResults();
+
+		Document firstItem = mappedResults.get(0);
+
+		assertThat(firstItem).containsEntry("_id", "u1");
+		assertThat(firstItem).containsEntry("linkedPerson.[0].firstname", "u1");
+	}
+
 	@Test // DATAMONGO-1326
-	@MongoVersion(asOf = "3.2")
-	public void shouldGroupByAndLookupPeopleCorectly() {
+	void shouldGroupByAndLookupPeopleCorrectly() {
 
 		createUsersWithReferencedPersons();
 
@@ -1579,7 +1636,7 @@ public void shouldGroupByAndLookupPeopleCorectly() {
 
 	@Test // DATAMONGO-1418, DATAMONGO-1824
 	@MongoVersion(asOf = "2.6")
-	public void shouldCreateOutputCollection() {
+	void shouldCreateOutputCollection() {
 
 		createPersonDocuments();
 
@@ -1603,8 +1660,7 @@ public void shouldCreateOutputCollection() {
 	}
 
 	@Test // DATAMONGO-1637
-	@MongoVersion(asOf = "2.6")
-	public void shouldCreateOutputCollectionWhileStreaming() {
+	void shouldCreateOutputCollectionWhileStreaming() {
 
 		createPersonDocuments();
 
@@ -1626,8 +1682,7 @@ public void shouldCreateOutputCollectionWhileStreaming() {
 	}
 
 	@Test // DATAMONGO-1637
-	@MongoVersion(asOf = "2.6")
-	public void shouldReturnDocumentsWithOutputCollectionWhileStreaming() {
+	void shouldReturnDocumentsWithOutputCollectionWhileStreaming() {
 
 		createPersonDocuments();
 
@@ -1637,13 +1692,14 @@ public void shouldReturnDocumentsWithOutputCollectionWhileStreaming() {
 				sort(DESC, "count"), //
 				out(tempOutCollection));
 
-		CloseableIterator<Document> iterator = mongoTemplate.aggregateStream(agg, Document.class);
+		try (Stream<Document> stream = mongoTemplate.aggregateStream(agg, Document.class)) {
 
-		List<Document> result = toList(iterator);
+			List<Document> result = stream.toList();
 
-		assertThat(result).hasSize(2);
-		assertThat(result.get(0)).containsEntry("_id", "MALE").containsEntry("count", 3);
-		assertThat(result.get(1)).containsEntry("_id", "FEMALE").containsEntry("count", 2);
+			assertThat(result).hasSize(2);
+			assertThat(result.get(0)).containsEntry("_id", "MALE").containsEntry("count", 3);
+			assertThat(result.get(1)).containsEntry("_id", "FEMALE").containsEntry("count", 2);
+		}
 
 		mongoTemplate.dropCollection(tempOutCollection);
 	}
@@ -1657,17 +1713,16 @@ private void createPersonDocuments() {
 		mongoTemplate.save(new Person("Leoniv", "Yakubov", 55, Person.Sex.MALE));
 	}
 
-	@Test // DATAMONGO-1418
-	public void outShouldOutBeTheLastOperation() {
+	@Test // DATAMONGO-1418, DATAMONGO-2536
+	void outShouldOutBeTheLastOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newAggregation(match(new Criteria()), //
 				group("field1").count().as("totalCount"), //
 				out("collection1"), //
-				skip(100L)));
+				skip(100L)).toPipeline(DEFAULT_CONTEXT));
 	}
 
 	@Test // DATAMONGO-1325
-	@MongoVersion(asOf = "3.2")
-	public void shouldApplySampleCorrectly() {
+	void shouldApplySampleCorrectly() {
 
 		createUserWithLikesDocuments();
 
@@ -1684,7 +1739,7 @@ public void shouldApplySampleCorrectly() {
 
 	@Test // DATAMONGO-1457
 	@MongoVersion(asOf = "3.2")
-	public void sliceShouldBeAppliedCorrectly() {
+	void sliceShouldBeAppliedCorrectly() {
 
 		createUserWithLikesDocuments();
 
@@ -1700,8 +1755,7 @@ public void sliceShouldBeAppliedCorrectly() {
 	}
 
 	@Test // DATAMONGO-1491
-	@MongoVersion(asOf = "3.2")
-	public void filterShouldBeAppliedCorrectly() {
+	void filterShouldBeAppliedCorrectly() {
 
 		Item item43 = Item.builder().itemId("43").quantity(2).price(2L).build();
 		Item item2 = Item.builder().itemId("2").quantity(1).price(240L).build();
@@ -1722,7 +1776,7 @@ public void filterShouldBeAppliedCorrectly() {
 		mongoTemplate.insert(Arrays.asList(sales1, sales2, sales3), Sales.class);
 
 		TypedAggregation<Sales> agg = newAggregation(Sales.class, project().and("items")
-				.filter("item", AggregationFunctionExpressions.GTE.of(field("item.price"), 100)).as("items"));
+				.filter("item", ComparisonOperators.valueOf("item.price").greaterThanEqualToValue(100)).as("items"));
 
 		assertThat(mongoTemplate.aggregate(agg, Sales.class).getMappedResults()).contains(
 				Sales.builder().id("0").items(Collections.singletonList(item2)).build(),
@@ -1731,8 +1785,7 @@ public void filterShouldBeAppliedCorrectly() {
 	}
 
 	@Test // DATAMONGO-1538
-	@MongoVersion(asOf = "3.2")
-	public void letShouldBeAppliedCorrectly() {
+	void letShouldBeAppliedCorrectly() {
 
 		Sales2 sales1 = Sales2.builder().id("1").price(10).tax(0.5F).applyDiscount(true).build();
 		Sales2 sales2 = Sales2.builder().id("2").price(10).tax(0.25F).applyDiscount(false).build();
@@ -1740,15 +1793,13 @@ public void letShouldBeAppliedCorrectly() {
 		mongoTemplate.insert(Arrays.asList(sales1, sales2), Sales2.class);
 
 		ExpressionVariable total = ExpressionVariable.newVariable("total")
-				.forExpression(AggregationFunctionExpressions.ADD.of(Fields.field("price"), Fields.field("tax")));
+				.forExpression(ArithmeticOperators.valueOf("price").sum().and("tax"));
 		ExpressionVariable discounted = ExpressionVariable.newVariable("discounted")
 				.forExpression(ConditionalOperators.Cond.when("applyDiscount").then(0.9D).otherwise(1.0D));
 
 		TypedAggregation<Sales2> agg = Aggregation.newAggregation(Sales2.class,
-				Aggregation.project()
-						.and(VariableOperators.Let.define(total, discounted).andApply(
-								AggregationFunctionExpressions.MULTIPLY.of(Fields.field("total"), Fields.field("discounted"))))
-						.as("finalTotal"));
+				Aggregation.project().and(VariableOperators.Let.define(total, discounted)
+						.andApply(ArithmeticOperators.valueOf("total").multiplyBy("discounted"))).as("finalTotal"));
 
 		AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
 		assertThat(result.getMappedResults()).contains(new Document("_id", "1").append("finalTotal", 9.450000000000001D),
@@ -1756,8 +1807,7 @@ public void letShouldBeAppliedCorrectly() {
 	}
 
 	@Test // DATAMONGO-1551, DATAMONGO-2264
-	@MongoVersion(asOf = "3.4")
-	public void graphLookupShouldBeAppliedCorrectly() {
+	void graphLookupShouldBeAppliedCorrectly() {
 
 		Employee em1 = Employee.builder().id(1).name("Dev").build();
 		Employee em2 = Employee.builder().id(2).name("Eliot").reportsTo("Dev").build();
@@ -1789,8 +1839,7 @@ public void graphLookupShouldBeAppliedCorrectly() {
 	}
 
 	@Test // DATAMONGO-1552
-	@MongoVersion(asOf = "3.4")
-	public void bucketShouldCollectDocumentsIntoABucket() {
+	void bucketShouldCollectDocumentsIntoABucket() {
 
 		Art a1 = Art.builder().id(1).title("The Pillars of Society").artist("Grosz").year(1926).price(199.99).build();
 		Art a2 = Art.builder().id(2).title("Melancholy III").artist("Munch").year(1902).price(280.00).build();
@@ -1823,9 +1872,8 @@ public void bucketShouldCollectDocumentsIntoABucket() {
 		assertThat((Double) bound100.get("sum")).isCloseTo(3672.9, Offset.offset(0.1D));
 	}
 
-	@Test // DATAMONGO-1552
-	@MongoVersion(asOf = "3.4")
-	public void bucketAutoShouldCollectDocumentsIntoABucket() {
+	@Test // DATAMONGO-1552, DATAMONGO-2437
+	void bucketAutoShouldCollectDocumentsIntoABucket() {
 
 		Art a1 = Art.builder().id(1).title("The Pillars of Society").artist("Grosz").year(1926).price(199.99).build();
 		Art a2 = Art.builder().id(2).title("Melancholy III").artist("Munch").year(1902).price(280.00).build();
@@ -1844,21 +1892,21 @@ public void bucketAutoShouldCollectDocumentsIntoABucket() {
 		AggregationResults<Document> result = mongoTemplate.aggregate(aggregation, Document.class);
 		assertThat(result.getMappedResults().size()).isEqualTo(3);
 
-		// { "min" : 680.0 , "max" : 820.0 , "count" : 1 , "titles" : [ "Dancer"] , "sum" : 760.4000000000001}
+		// { "_id" : { "min" : 680.0 , "max" : 820.0 }, "count" : 1 , "titles" : [ "Dancer"] , "sum" : 760.4000000000001}
 		Document bound0 = result.getMappedResults().get(0);
-		assertThat(bound0).containsEntry("count", 1).containsEntry("titles.[0]", "Dancer").containsEntry("min", 680.0)
-				.containsKey("max");
+		assertThat(bound0).containsEntry("count", 1).containsEntry("titles.[0]", "Dancer").containsEntry("_id.min", 680.0)
+				.containsKey("_id.max");
 
-		// { "min" : 820.0 , "max" : 1800.0 , "count" : 1 , "titles" : [ "The Great Wave off Kanagawa"] , "sum" : 1673.0}
+		// { "_id" : { "min" : 820.0 , "max" : 1800.0 }, "count" : 1 , "titles" : [ "The Great Wave off Kanagawa"] , "sum" :
+		// 1673.0}
 		Document bound1 = result.getMappedResults().get(1);
-		assertThat(bound1).containsEntry("count", 1).containsEntry("min", 820.0);
+		assertThat(bound1).containsEntry("count", 1).containsEntry("_id.min", 820.0);
 		assertThat((List<String>) bound1.get("titles")).contains("The Great Wave off Kanagawa");
 		assertThat((Double) bound1.get("sum")).isCloseTo(1673.0, Offset.offset(0.1D));
 	}
 
 	@Test // DATAMONGO-1552
-	@MongoVersion(asOf = "3.4")
-	public void facetShouldCreateFacets() {
+	void facetShouldCreateFacets() {
 
 		Art a1 = Art.builder().id(1).title("The Pillars of Society").artist("Grosz").year(1926).price(199.99).build();
 		Art a2 = Art.builder().id(2).title("Melancholy III").artist("Munch").year(1902).price(280.00).build();
@@ -1900,8 +1948,52 @@ public void facetShouldCreateFacets() {
 		assertThat(categorizeByYear).hasSize(3);
 	}
 
+	@Test // GH-4473
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "7.0")
+	void percentileShouldBeAppliedCorrectly() {
+
+		DATAMONGO788 objectToSave = new DATAMONGO788(62, 81, 80);
+		DATAMONGO788 objectToSave2 = new DATAMONGO788(60, 83, 79);
+
+		mongoTemplate.insert(objectToSave);
+		mongoTemplate.insert(objectToSave2);
+
+		Aggregation agg = Aggregation.newAggregation(
+				project().and(ArithmeticOperators.valueOf("x").percentile(0.9, 0.4).and("y").and("xField"))
+				.as("percentileValues"));
+
+		AggregationResults<Document> result = mongoTemplate.aggregate(agg, DATAMONGO788.class, Document.class);
+
+		// MongoDB server returns $percentile as an array of doubles
+		List<Document> rawResults = (List<Document>) result.getRawResults().get("results");
+		assertThat((List<Object>) rawResults.get(0).get("percentileValues")).containsExactly(81.0, 80.0);
+		assertThat((List<Object>) rawResults.get(1).get("percentileValues")).containsExactly(83.0, 79.0);
+	}
+
+	@Test // GH-4472
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "7.0")
+	void medianShouldBeAppliedCorrectly() {
+
+		DATAMONGO788 objectToSave = new DATAMONGO788(62, 81, 80);
+		DATAMONGO788 objectToSave2 = new DATAMONGO788(60, 83, 79);
+
+		mongoTemplate.insert(objectToSave);
+		mongoTemplate.insert(objectToSave2);
+
+		Aggregation agg = Aggregation.newAggregation(
+				project().and(ArithmeticOperators.valueOf("x").median().and("y").and("xField"))
+				.as("medianValue"));
+
+		AggregationResults<Document> result = mongoTemplate.aggregate(agg, DATAMONGO788.class, Document.class);
+
+		// MongoDB server returns $median a Double
+		List<Document> rawResults = (List<Document>) result.getRawResults().get("results");
+		assertThat(rawResults.get(0).get("medianValue")).isEqualTo(80.0);
+		assertThat(rawResults.get(1).get("medianValue")).isEqualTo(79.0);
+	}
+
 	@Test // DATAMONGO-1986
-	public void runMatchOperationCriteriaThroughQueryMapperForTypedAggregation() {
+	void runMatchOperationCriteriaThroughQueryMapperForTypedAggregation() {
 
 		mongoTemplate.insertAll(TestEntities.geolocation().newYork());
 
@@ -1916,7 +2008,7 @@ public void runMatchOperationCriteriaThroughQueryMapperForTypedAggregation() {
 	}
 
 	@Test // DATAMONGO-1986
-	public void runMatchOperationCriteriaThroughQueryMapperForUntypedAggregation() {
+	void runMatchOperationCriteriaThroughQueryMapperForUntypedAggregation() {
 
 		mongoTemplate.insertAll(TestEntities.geolocation().newYork());
 
@@ -1930,6 +2022,112 @@ public void runMatchOperationCriteriaThroughQueryMapperForUntypedAggregation() {
 		assertThat(groupResults.getMappedResults().size()).isEqualTo(4);
 	}
 
+	@Test // DATAMONGO-2437
+	void shouldReadComplexIdValueCorrectly() {
+
+		WithComplexId source = new WithComplexId();
+		source.id = new ComplexId();
+		source.id.p1 = "v1";
+		source.id.p2 = "v2";
+
+		mongoTemplate.save(source);
+
+		AggregationResults<WithComplexId> result = mongoTemplate.aggregate(newAggregation(project("id")),
+				WithComplexId.class, WithComplexId.class);
+		assertThat(result.getMappedResults()).containsOnly(source);
+	}
+
+	@Test // DATAMONGO-2536
+	void skipOutputDoesNotReadBackAggregationResults() {
+
+		createTagDocuments();
+
+		Aggregation agg = newAggregation( //
+				project("tags"), //
+				unwind("tags"), //
+				group("tags") //
+						.count().as("n"), //
+				project("n") //
+						.and("tag").previousOperation(), //
+				sort(DESC, "n") //
+		).withOptions(AggregationOptions.builder().skipOutput().build());
+
+		AggregationResults<TagCount> results = mongoTemplate.aggregate(agg, INPUT_COLLECTION, TagCount.class);
+
+		assertThat(results.getMappedResults()).isEmpty();
+		assertThat(results.getRawResults()).isEmpty();
+	}
+
+	@Test // DATAMONGO-2635
+	void mapsEnumsInMatchClauseUsingInCriteriaCorrectly() {
+
+		WithEnum source = new WithEnum();
+		source.enumValue = MyEnum.TWO;
+		source.id = "id-1";
+
+		mongoTemplate.save(source);
+
+		Aggregation agg = newAggregation(match(where("enumValue").in(Collections.singletonList(MyEnum.TWO))));
+
+		AggregationResults<Document> results = mongoTemplate.aggregate(agg, mongoTemplate.getCollectionName(WithEnum.class),
+				Document.class);
+		assertThat(results.getMappedResults()).hasSize(1);
+	}
+
+	@Test // GH-4043
+	void considersMongoIdWithinTypedCollections() {
+
+		UserRef userRef = new UserRef();
+		userRef.id = "4ee921aca44fd11b3254e001";
+		userRef.name = "u-1";
+
+		Widget widget = new Widget();
+		widget.id = "w-1";
+		widget.users = List.of(userRef);
+
+		mongoTemplate.save(widget);
+
+		Criteria criteria = Criteria.where("users").elemMatch(Criteria.where("id").is("4ee921aca44fd11b3254e001"));
+		AggregationResults<Widget> aggregate = mongoTemplate.aggregate(newAggregation(match(criteria)), Widget.class, Widget.class);
+		assertThat(aggregate.getMappedResults()).contains(widget);
+	}
+
+	@Test // GH-4443
+	void shouldHonorFieldAliasesForFieldReferencesUsingFieldExposingOperation() {
+
+		Item item1 = Item.builder().itemId("1").tags(Arrays.asList("a", "b")).build();
+		Item item2 = Item.builder().itemId("1").tags(Arrays.asList("a", "c")).build();
+		mongoTemplate.insert(Arrays.asList(item1, item2), Item.class);
+
+		TypedAggregation<Item> aggregation = newAggregation(Item.class,
+				match(where("itemId").is("1")),
+				unwind("tags"),
+				match(where("itemId").is("1").and("tags").is("c")));
+		AggregationResults<Document> results = mongoTemplate.aggregate(aggregation, Document.class);
+		List<Document> mappedResults = results.getMappedResults();
+		assertThat(mappedResults).hasSize(1);
+		assertThat(mappedResults.get(0)).containsEntry("item_id", "1");
+	}
+
+	@Test // GH-4443
+	void projectShouldResetContextToAvoidMappingFieldsAgainstANoLongerExistingTarget() {
+
+		Item item1 = Item.builder().itemId("1").tags(Arrays.asList("a", "b")).build();
+		Item item2 = Item.builder().itemId("1").tags(Arrays.asList("a", "c")).build();
+		mongoTemplate.insert(Arrays.asList(item1, item2), Item.class);
+
+		TypedAggregation<Item> aggregation = newAggregation(Item.class,
+				match(where("itemId").is("1")),
+				unwind("tags"),
+				project().and("itemId").as("itemId").and("tags").as("tags"),
+				match(where("itemId").is("1").and("tags").is("c")));
+
+		AggregationResults<Document> results = mongoTemplate.aggregate(aggregation, Document.class);
+		List<Document> mappedResults = results.getMappedResults();
+		assertThat(mappedResults).hasSize(1);
+		assertThat(mappedResults.get(0)).containsEntry("itemId", "1");
+	}
+
 	private void createUsersWithReferencedPersons() {
 
 		mongoTemplate.dropCollection(User.class);
@@ -1998,16 +2196,6 @@ private static void assertTagCount(String tag, int n, TagCount tagCount) {
 		assertThat(tagCount.getN()).isEqualTo(n);
 	}
 
-	private static <T> List<T> toList(CloseableIterator<? extends T> results) {
-
-		List<T> result = new ArrayList<T>();
-		while (results.hasNext()) {
-			result.add(results.next());
-		}
-
-		return result;
-	}
-
 	static class DATAMONGO753 {
 
 		PD[] pd;
@@ -2023,7 +2211,7 @@ static class PD {
 		String pDch;
 		@org.springframework.data.mongodb.core.mapping.Field("alias") int up;
 
-		public PD(String pDch, int up) {
+		PD(String pDch, int up) {
 			this.pDch = pDch;
 			this.up = up;
 		}
@@ -2038,12 +2226,18 @@ static class DATAMONGO788 {
 
 		public DATAMONGO788() {}
 
-		public DATAMONGO788(int x, int y) {
+		DATAMONGO788(int x, int y) {
 			this.x = x;
 			this.xField = x;
 			this.y = y;
 			this.yField = y;
 		}
+
+		public DATAMONGO788(int x, int y, int xField) {
+			this.x = x;
+			this.y = y;
+			this.xField = xField;
+		}
 	}
 
 	// DATAMONGO-806
@@ -2054,7 +2248,7 @@ static class User {
 
 		public User() {}
 
-		public User(String id, PushMessage... msgs) {
+		User(String id, PushMessage... msgs) {
 			this.id = id;
 			this.msgs = Arrays.asList(msgs);
 		}
@@ -2069,7 +2263,11 @@ static class PushMessage {
 
 		public PushMessage() {}
 
-		public PushMessage(String id, String content, Date createDate) {
+		PushMessage(String id, String content, Instant createDate) {
+			this(id, content, Date.from(createDate));
+		}
+
+		PushMessage(String id, String content, Date createDate) {
 			this.id = id;
 			this.content = content;
 			this.createDate = createDate;
@@ -2084,7 +2282,7 @@ static class CarPerson {
 		private String lastName;
 		private Descriptors descriptors;
 
-		public CarPerson(String firstname, String lastname, Entry... entries) {
+		CarPerson(String firstname, String lastname, Entry... entries) {
 			this.firstName = firstname;
 			this.lastName = lastname;
 
@@ -2104,7 +2302,7 @@ static class CarDescriptor {
 
 		private List<Entry> entries = new ArrayList<AggregationTests.CarDescriptor.Entry>();
 
-		public CarDescriptor(Entry... entries) {
+		CarDescriptor(Entry... entries) {
 
 			for (Entry entry : entries) {
 				this.entries.add(entry);
@@ -2120,7 +2318,7 @@ static class Entry {
 
 			public Entry() {}
 
-			public Entry(String make, String model, int year) {
+			Entry(String make, String model, int year) {
 				this.make = make;
 				this.model = model;
 				this.year = year;
@@ -2136,7 +2334,7 @@ static class Reservation {
 
 		public Reservation() {}
 
-		public Reservation(String hotelCode, String confirmationNumber, int timestamp) {
+		Reservation(String hotelCode, String confirmationNumber, int timestamp) {
 			this.hotelCode = hotelCode;
 			this.confirmationNumber = confirmationNumber;
 			this.timestamp = timestamp;
@@ -2147,7 +2345,7 @@ static class ObjectWithDate {
 
 		Date dateValue;
 
-		public ObjectWithDate(Date dateValue) {
+		ObjectWithDate(Date dateValue) {
 			this.dateValue = dateValue;
 		}
 	}
@@ -2163,14 +2361,14 @@ static class InventoryItem {
 
 		public InventoryItem() {}
 
-		public InventoryItem(int id, String item, int qty) {
+		InventoryItem(int id, String item, int qty) {
 
 			this.id = id;
 			this.item = item;
 			this.qty = qty;
 		}
 
-		public InventoryItem(int id, String item, String description, int qty) {
+		InventoryItem(int id, String item, String description, int qty) {
 
 			this.id = id;
 			this.item = item;
@@ -2180,49 +2378,402 @@ public InventoryItem(int id, String item, String description, int qty) {
 	}
 
 	// DATAMONGO-1491
-	@lombok.Data
-	@Builder
 	static class Sales {
 
 		@Id String id;
 		List<Item> items;
+
+		Sales(String id, List<Item> items) {
+			this.id = id;
+			this.items = items;
+		}
+
+		public static SalesBuilder builder() {
+			return new SalesBuilder();
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public List<Item> getItems() {
+			return this.items;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setItems(List<Item> items) {
+			this.items = items;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Sales sales = (Sales) o;
+			return Objects.equals(id, sales.id) && Objects.equals(items, sales.items);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, items);
+		}
+
+		public String toString() {
+			return "AggregationTests.Sales(id=" + this.getId() + ", items=" + this.getItems() + ")";
+		}
+
+		public static class SalesBuilder {
+
+			private String id;
+			private List<Item> items;
+
+			SalesBuilder() {}
+
+			public SalesBuilder id(String id) {
+				this.id = id;
+				return this;
+			}
+
+			public SalesBuilder items(List<Item> items) {
+				this.items = items;
+				return this;
+			}
+
+			public Sales build() {
+				return new Sales(id, items);
+			}
+
+			public String toString() {
+				return "AggregationTests.Sales.SalesBuilder(id=" + this.id + ", items=" + this.items + ")";
+			}
+		}
 	}
 
-	// DATAMONGO-1491
-	@lombok.Data
-	@Builder
+	// DATAMONGO-1491, GH-4443
 	static class Item {
 
 		@org.springframework.data.mongodb.core.mapping.Field("item_id") //
 		String itemId;
 		Integer quantity;
 		Long price;
+		List<String> tags = new ArrayList<>();
+
+		Item(String itemId, Integer quantity, Long price, List<String> tags) {
+
+			this.itemId = itemId;
+			this.quantity = quantity;
+			this.price = price;
+			this.tags = tags;
+		}
+
+		public static ItemBuilder builder() {
+			return new ItemBuilder();
+		}
+
+		public String getItemId() {
+			return this.itemId;
+		}
+
+		public Integer getQuantity() {
+			return this.quantity;
+		}
+
+		public Long getPrice() {
+			return this.price;
+		}
+
+		public void setItemId(String itemId) {
+			this.itemId = itemId;
+		}
+
+		public void setQuantity(Integer quantity) {
+			this.quantity = quantity;
+		}
+
+		public void setPrice(Long price) {
+			this.price = price;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Item item = (Item) o;
+			return Objects.equals(itemId, item.itemId) && Objects.equals(quantity, item.quantity)
+					&& Objects.equals(price, item.price);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(itemId, quantity, price);
+		}
+
+		public String toString() {
+			return "AggregationTests.Item(itemId=" + this.getItemId() + ", quantity=" + this.getQuantity() + ", price="
+					+ this.getPrice() + ")";
+		}
+
+		public static class ItemBuilder {
+
+			private String itemId;
+			private Integer quantity;
+			private Long price;
+			private List<String> tags;
+
+			ItemBuilder() {}
+
+			public ItemBuilder itemId(String itemId) {
+				this.itemId = itemId;
+				return this;
+			}
+
+			public ItemBuilder quantity(Integer quantity) {
+				this.quantity = quantity;
+				return this;
+			}
+
+			public ItemBuilder price(Long price) {
+				this.price = price;
+				return this;
+			}
+
+			public ItemBuilder tags(List<String> tags) {
+				this.tags = tags;
+				return this;
+			}
+
+			public Item build() {
+				return new Item(itemId, quantity, price, tags);
+			}
+
+			public String toString() {
+				return "AggregationTests.Item.ItemBuilder(itemId=" + this.itemId + ", quantity=" + this.quantity + ", price="
+						+ this.price + ")";
+			}
+		}
 	}
 
 	// DATAMONGO-1538
-	@lombok.Data
-	@Builder
 	static class Sales2 {
 
 		String id;
 		Integer price;
 		Float tax;
 		boolean applyDiscount;
+
+		Sales2(String id, Integer price, Float tax, boolean applyDiscount) {
+
+			this.id = id;
+			this.price = price;
+			this.tax = tax;
+			this.applyDiscount = applyDiscount;
+		}
+
+		public static Sales2Builder builder() {
+			return new Sales2Builder();
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Integer getPrice() {
+			return this.price;
+		}
+
+		public Float getTax() {
+			return this.tax;
+		}
+
+		public boolean isApplyDiscount() {
+			return this.applyDiscount;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setPrice(Integer price) {
+			this.price = price;
+		}
+
+		public void setTax(Float tax) {
+			this.tax = tax;
+		}
+
+		public void setApplyDiscount(boolean applyDiscount) {
+			this.applyDiscount = applyDiscount;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Sales2 sales2 = (Sales2) o;
+			return applyDiscount == sales2.applyDiscount && Objects.equals(id, sales2.id)
+					&& Objects.equals(price, sales2.price) && Objects.equals(tax, sales2.tax);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, price, tax, applyDiscount);
+		}
+
+		public String toString() {
+			return "AggregationTests.Sales2(id=" + this.getId() + ", price=" + this.getPrice() + ", tax=" + this.getTax()
+					+ ", applyDiscount=" + this.isApplyDiscount() + ")";
+		}
+
+		public static class Sales2Builder {
+
+			private String id;
+			private Integer price;
+			private Float tax;
+			private boolean applyDiscount;
+
+			public Sales2Builder id(String id) {
+				this.id = id;
+				return this;
+			}
+
+			public Sales2Builder price(Integer price) {
+				this.price = price;
+				return this;
+			}
+
+			public Sales2Builder tax(Float tax) {
+				this.tax = tax;
+				return this;
+			}
+
+			public Sales2Builder applyDiscount(boolean applyDiscount) {
+				this.applyDiscount = applyDiscount;
+				return this;
+			}
+
+			public Sales2 build() {
+				return new Sales2(id, price, tax, applyDiscount);
+			}
+
+			public String toString() {
+				return "AggregationTests.Sales2.Sales2Builder(id=" + this.id + ", price=" + this.price + ", tax=" + this.tax
+						+ ", applyDiscount=" + this.applyDiscount + ")";
+			}
+		}
 	}
 
 	// DATAMONGO-1551
-	@lombok.Data
-	@Builder
 	static class Employee {
 
 		int id;
 		String name;
 		String reportsTo;
+
+		Employee(int id, String name, String reportsTo) {
+
+			this.id = id;
+			this.name = name;
+			this.reportsTo = reportsTo;
+		}
+
+		public static EmployeeBuilder builder() {
+			return new EmployeeBuilder();
+		}
+
+		public int getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public String getReportsTo() {
+			return this.reportsTo;
+		}
+
+		public void setId(int id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public void setReportsTo(String reportsTo) {
+			this.reportsTo = reportsTo;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Employee employee = (Employee) o;
+			return id == employee.id && Objects.equals(name, employee.name) && Objects.equals(reportsTo, employee.reportsTo);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, reportsTo);
+		}
+
+		public String toString() {
+			return "AggregationTests.Employee(id=" + this.getId() + ", name=" + this.getName() + ", reportsTo="
+					+ this.getReportsTo() + ")";
+		}
+
+		public static class EmployeeBuilder {
+
+			private int id;
+			private String name;
+			private String reportsTo;
+
+			public EmployeeBuilder id(int id) {
+				this.id = id;
+				return this;
+			}
+
+			public EmployeeBuilder name(String name) {
+				this.name = name;
+				return this;
+			}
+
+			public EmployeeBuilder reportsTo(String reportsTo) {
+				this.reportsTo = reportsTo;
+				return this;
+			}
+
+			public Employee build() {
+				return new Employee(id, name, reportsTo);
+			}
+
+			public String toString() {
+				return "AggregationTests.Employee.EmployeeBuilder(id=" + this.id + ", name=" + this.name + ", reportsTo="
+						+ this.reportsTo + ")";
+			}
+		}
 	}
 
 	// DATAMONGO-1552
-	@lombok.Data
-	@Builder
 	static class Art {
 
 		int id;
@@ -2230,5 +2781,322 @@ static class Art {
 		String artist;
 		Integer year;
 		double price;
+
+		Art(int id, String title, String artist, Integer year, double price) {
+
+			this.id = id;
+			this.title = title;
+			this.artist = artist;
+			this.year = year;
+			this.price = price;
+		}
+
+		public static ArtBuilder builder() {
+			return new ArtBuilder();
+		}
+
+		public int getId() {
+			return this.id;
+		}
+
+		public String getTitle() {
+			return this.title;
+		}
+
+		public String getArtist() {
+			return this.artist;
+		}
+
+		public Integer getYear() {
+			return this.year;
+		}
+
+		public double getPrice() {
+			return this.price;
+		}
+
+		public void setId(int id) {
+			this.id = id;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public void setArtist(String artist) {
+			this.artist = artist;
+		}
+
+		public void setYear(Integer year) {
+			this.year = year;
+		}
+
+		public void setPrice(double price) {
+			this.price = price;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Art art = (Art) o;
+			return id == art.id && Double.compare(art.price, price) == 0 && Objects.equals(title, art.title)
+					&& Objects.equals(artist, art.artist) && Objects.equals(year, art.year);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, title, artist, year, price);
+		}
+
+		public String toString() {
+			return "AggregationTests.Art(id=" + this.getId() + ", title=" + this.getTitle() + ", artist=" + this.getArtist()
+					+ ", year=" + this.getYear() + ", price=" + this.getPrice() + ")";
+		}
+
+		public static class ArtBuilder {
+
+			private int id;
+			private String title;
+			private String artist;
+			private Integer year;
+			private double price;
+
+			public ArtBuilder id(int id) {
+				this.id = id;
+				return this;
+			}
+
+			public ArtBuilder title(String title) {
+				this.title = title;
+				return this;
+			}
+
+			public ArtBuilder artist(String artist) {
+				this.artist = artist;
+				return this;
+			}
+
+			public ArtBuilder year(Integer year) {
+				this.year = year;
+				return this;
+			}
+
+			public ArtBuilder price(double price) {
+				this.price = price;
+				return this;
+			}
+
+			public Art build() {
+				return new Art(id, title, artist, year, price);
+			}
+
+			public String toString() {
+				return "AggregationTests.Art.ArtBuilder(id=" + this.id + ", title=" + this.title + ", artist=" + this.artist
+						+ ", year=" + this.year + ", price=" + this.price + ")";
+			}
+		}
+	}
+
+	static class WithComplexId {
+		@Id ComplexId id;
+
+		public ComplexId getId() {
+			return this.id;
+		}
+
+		public void setId(ComplexId id) {
+			this.id = id;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithComplexId that = (WithComplexId) o;
+			return Objects.equals(id, that.id);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id);
+		}
+
+		public String toString() {
+			return "AggregationTests.WithComplexId(id=" + this.getId() + ")";
+		}
+	}
+
+	static class ComplexId {
+
+		String p1;
+		String p2;
+
+		public String getP1() {
+			return this.p1;
+		}
+
+		public String getP2() {
+			return this.p2;
+		}
+
+		public void setP1(String p1) {
+			this.p1 = p1;
+		}
+
+		public void setP2(String p2) {
+			this.p2 = p2;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ComplexId complexId = (ComplexId) o;
+			return Objects.equals(p1, complexId.p1) && Objects.equals(p2, complexId.p2);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(p1, p2);
+		}
+
+		public String toString() {
+			return "AggregationTests.ComplexId(p1=" + this.getP1() + ", p2=" + this.getP2() + ")";
+		}
+	}
+
+	static enum MyEnum {
+		ONE, TWO
+	}
+
+	static class WithEnum {
+
+		@Id String id;
+		MyEnum enumValue;
+
+		public WithEnum() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public MyEnum getEnumValue() {
+			return this.enumValue;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setEnumValue(MyEnum enumValue) {
+			this.enumValue = enumValue;
+		}
+
+		public String toString() {
+			return "AggregationTests.WithEnum(id=" + this.getId() + ", enumValue=" + this.getEnumValue() + ")";
+		}
+	}
+
+	static class Widget {
+
+		@Id String id;
+		List<UserRef> users;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public List<UserRef> getUsers() {
+			return users;
+		}
+
+		public void setUsers(List<UserRef> users) {
+			this.users = users;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+
+			Widget widget = (Widget) o;
+
+			if (!ObjectUtils.nullSafeEquals(id, widget.id)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(users, widget.users);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = ObjectUtils.nullSafeHashCode(id);
+			result = 31 * result + ObjectUtils.nullSafeHashCode(users);
+			return result;
+		}
+	}
+
+	static class UserRef {
+
+		@MongoId String id;
+		String name;
+
+		public UserRef() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			UserRef userRef = (UserRef) o;
+			return Objects.equals(id, userRef.id) && Objects.equals(name, userRef.name);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name);
+		}
+
+		public String toString() {
+			return "AggregationTests.UserRef(id=" + this.getId() + ", name=" + this.getName() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java
index 332d866e57..066a80f82c 100755
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,14 +24,24 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.bson.Document;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond;
+import org.springframework.data.mongodb.core.aggregation.ProjectionOperationUnitTests.BookWithFieldAnnotation;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Criteria;
 
+import com.mongodb.client.model.Aggregates;
+import com.mongodb.client.model.Projections;
+
 /**
  * Unit tests for {@link Aggregation}.
  *
@@ -39,31 +49,32 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Julia Lee
  */
 public class AggregationUnitTests {
 
 	@Test
-	public void rejectsNullAggregationOperation() {
+	void rejectsNullAggregationOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newAggregation((AggregationOperation[]) null));
 	}
 
 	@Test
-	public void rejectsNullTypedAggregationOperation() {
+	void rejectsNullTypedAggregationOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newAggregation(String.class, (AggregationOperation[]) null));
 	}
 
 	@Test
-	public void rejectsNoAggregationOperation() {
+	void rejectsNoAggregationOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newAggregation(new AggregationOperation[0]));
 	}
 
 	@Test
-	public void rejectsNoTypedAggregationOperation() {
+	void rejectsNoTypedAggregationOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newAggregation(String.class, new AggregationOperation[0]));
 	}
 
 	@Test // DATAMONGO-753
-	public void checkForCorrectFieldScopeTransfer() {
+	void checkForCorrectFieldScopeTransfer() {
 
 		assertThatIllegalArgumentException().isThrownBy(() -> {
 			newAggregation( //
@@ -75,7 +86,7 @@ public void checkForCorrectFieldScopeTransfer() {
 	}
 
 	@Test // DATAMONGO-753
-	public void unwindOperationShouldNotChangeAvailableFields() {
+	void unwindOperationShouldNotChangeAvailableFields() {
 
 		newAggregation( //
 				project("a", "b"), //
@@ -85,7 +96,7 @@ public void unwindOperationShouldNotChangeAvailableFields() {
 	}
 
 	@Test // DATAMONGO-1391
-	public void unwindOperationWithIndexShouldPreserveFields() {
+	void unwindOperationWithIndexShouldPreserveFields() {
 
 		newAggregation( //
 				project("a", "b"), //
@@ -95,7 +106,7 @@ public void unwindOperationWithIndexShouldPreserveFields() {
 	}
 
 	@Test // DATAMONGO-1391
-	public void unwindOperationWithIndexShouldAddIndexField() {
+	void unwindOperationWithIndexShouldAddIndexField() {
 
 		newAggregation( //
 				project("a", "b"), //
@@ -105,7 +116,7 @@ public void unwindOperationWithIndexShouldAddIndexField() {
 	}
 
 	@Test // DATAMONGO-1391
-	public void fullUnwindOperationShouldBuildCorrectClause() {
+	void fullUnwindOperationShouldBuildCorrectClause() {
 
 		Document agg = newAggregation( //
 				unwind("a", "x", true)).toDocument("foo", Aggregation.DEFAULT_CONTEXT);
@@ -118,7 +129,7 @@ public void fullUnwindOperationShouldBuildCorrectClause() {
 	}
 
 	@Test // DATAMONGO-1391
-	public void unwindOperationWithPreserveNullShouldBuildCorrectClause() {
+	void unwindOperationWithPreserveNullShouldBuildCorrectClause() {
 
 		Document agg = newAggregation( //
 				unwind("a", true)).toDocument("foo", Aggregation.DEFAULT_CONTEXT);
@@ -131,7 +142,7 @@ public void unwindOperationWithPreserveNullShouldBuildCorrectClause() {
 	}
 
 	@Test // DATAMONGO-1550
-	public void replaceRootOperationShouldBuildCorrectClause() {
+	void replaceRootOperationShouldBuildCorrectClause() {
 
 		Document agg = newAggregation( //
 				replaceRoot().withDocument().andValue("value").as("field")) //
@@ -143,7 +154,7 @@ public void replaceRootOperationShouldBuildCorrectClause() {
 	}
 
 	@Test // DATAMONGO-753
-	public void matchOperationShouldNotChangeAvailableFields() {
+	void matchOperationShouldNotChangeAvailableFields() {
 
 		newAggregation( //
 				project("a", "b"), //
@@ -153,7 +164,7 @@ public void matchOperationShouldNotChangeAvailableFields() {
 	}
 
 	@Test // DATAMONGO-788
-	public void referencesToGroupIdsShouldBeRenderedAsReferences() {
+	void referencesToGroupIdsShouldBeRenderedAsReferences() {
 
 		Document agg = newAggregation( //
 				project("a"), //
@@ -169,7 +180,7 @@ public void referencesToGroupIdsShouldBeRenderedAsReferences() {
 	}
 
 	@Test // DATAMONGO-791
-	public void allowAggregationOperationsToBePassedAsIterable() {
+	void allowAggregationOperationsToBePassedAsIterable() {
 
 		List<AggregationOperation> ops = new ArrayList<AggregationOperation>();
 		ops.add(project("a"));
@@ -186,7 +197,7 @@ public void allowAggregationOperationsToBePassedAsIterable() {
 	}
 
 	@Test // DATAMONGO-791
-	public void allowTypedAggregationOperationsToBePassedAsIterable() {
+	void allowTypedAggregationOperationsToBePassedAsIterable() {
 
 		List<AggregationOperation> ops = new ArrayList<>();
 		ops.add(project("a"));
@@ -203,7 +214,7 @@ public void allowTypedAggregationOperationsToBePassedAsIterable() {
 	}
 
 	@Test // DATAMONGO-838
-	public void expressionBasedFieldsShouldBeReferencableInFollowingOperations() {
+	void expressionBasedFieldsShouldBeReferencableInFollowingOperations() {
 
 		Document agg = newAggregation( //
 				project("a").andExpression("b+c").as("foo"), //
@@ -217,7 +228,7 @@ public void expressionBasedFieldsShouldBeReferencableInFollowingOperations() {
 	}
 
 	@Test // DATAMONGO-908
-	public void shouldSupportReferingToNestedPropertiesInGroupOperation() {
+	void shouldSupportReferingToNestedPropertiesInGroupOperation() {
 
 		Document agg = newAggregation( //
 				project("cmsParameterId", "rules"), //
@@ -235,7 +246,7 @@ public void shouldSupportReferingToNestedPropertiesInGroupOperation() {
 	}
 
 	@Test // DATAMONGO-1585
-	public void shouldSupportSortingBySyntheticAndExposedGroupFields() {
+	void shouldSupportSortingBySyntheticAndExposedGroupFields() {
 
 		Document agg = newAggregation( //
 				group("cmsParameterId").addToSet("title").as("titles"), //
@@ -251,7 +262,7 @@ public void shouldSupportSortingBySyntheticAndExposedGroupFields() {
 	}
 
 	@Test // DATAMONGO-1585
-	public void shouldSupportSortingByProjectedFields() {
+	void shouldSupportSortingByProjectedFields() {
 
 		Document agg = newAggregation( //
 				project("cmsParameterId") //
@@ -270,7 +281,7 @@ public void shouldSupportSortingByProjectedFields() {
 	}
 
 	@Test // DATAMONGO-924
-	public void referencingProjectionAliasesFromPreviousStepShouldReferToTheSameFieldTarget() {
+	void referencingProjectionAliasesFromPreviousStepShouldReferToTheSameFieldTarget() {
 
 		Document agg = newAggregation( //
 				project().and("foo.bar").as("ba") //
@@ -285,7 +296,7 @@ public void referencingProjectionAliasesFromPreviousStepShouldReferToTheSameFiel
 	}
 
 	@Test // DATAMONGO-960
-	public void shouldRenderAggregationWithDefaultOptionsCorrectly() {
+	void shouldRenderAggregationWithDefaultOptionsCorrectly() {
 
 		Document agg = newAggregation( //
 				project().and("a").as("aa") //
@@ -296,7 +307,7 @@ public void shouldRenderAggregationWithDefaultOptionsCorrectly() {
 	}
 
 	@Test // DATAMONGO-960
-	public void shouldRenderAggregationWithCustomOptionsCorrectly() {
+	void shouldRenderAggregationWithCustomOptionsCorrectly() {
 
 		AggregationOptions aggregationOptions = newAggregationOptions().explain(true).cursor(new Document("foo", 1))
 				.allowDiskUse(true).build();
@@ -316,7 +327,7 @@ public void shouldRenderAggregationWithCustomOptionsCorrectly() {
 	}
 
 	@Test // DATAMONGO-954, DATAMONGO-1585
-	public void shouldSupportReferencingSystemVariables() {
+	void shouldSupportReferencingSystemVariables() {
 
 		Document agg = newAggregation( //
 				project("someKey") //
@@ -337,7 +348,7 @@ public void shouldSupportReferencingSystemVariables() {
 	}
 
 	@Test // DATAMONGO-1254
-	public void shouldExposeAliasedFieldnameForProjectionsIncludingOperationsDownThePipeline() {
+	void shouldExposeAliasedFieldnameForProjectionsIncludingOperationsDownThePipeline() {
 
 		Document agg = Aggregation.newAggregation(//
 				project("date") //
@@ -351,7 +362,7 @@ public void shouldExposeAliasedFieldnameForProjectionsIncludingOperationsDownThe
 	}
 
 	@Test // DATAMONGO-1254
-	public void shouldUseAliasedFieldnameForProjectionsIncludingOperationsDownThePipelineWhenUsingSpEL() {
+	void shouldUseAliasedFieldnameForProjectionsIncludingOperationsDownThePipelineWhenUsingSpEL() {
 
 		Document agg = Aggregation.newAggregation(//
 				project("date") //
@@ -365,7 +376,7 @@ public void shouldUseAliasedFieldnameForProjectionsIncludingOperationsDownThePip
 	}
 
 	@Test // DATAMONGO-861
-	public void conditionExpressionBasedFieldsShouldBeReferencableInFollowingOperations() {
+	void conditionExpressionBasedFieldsShouldBeReferencableInFollowingOperations() {
 
 		Document agg = newAggregation( //
 				project("a", "answer"), //
@@ -383,7 +394,7 @@ public void conditionExpressionBasedFieldsShouldBeReferencableInFollowingOperati
 	}
 
 	@Test // DATAMONGO-861
-	public void shouldRenderProjectionConditionalExpressionCorrectly() {
+	void shouldRenderProjectionConditionalExpressionCorrectly() {
 
 		Document agg = Aggregation.newAggregation(//
 				project().and(ConditionalOperators.Cond.newBuilder() //
@@ -402,7 +413,7 @@ public void shouldRenderProjectionConditionalExpressionCorrectly() {
 	}
 
 	@Test // DATAMONGO-861
-	public void shouldRenderProjectionConditionalCorrectly() {
+	void shouldRenderProjectionConditionalCorrectly() {
 
 		Document agg = Aggregation.newAggregation(//
 				project().and("color").applyCondition(ConditionalOperators.Cond.newBuilder() //
@@ -421,7 +432,7 @@ public void shouldRenderProjectionConditionalCorrectly() {
 	}
 
 	@Test // DATAMONGO-861
-	public void shouldRenderProjectionConditionalWithCriteriaCorrectly() {
+	void shouldRenderProjectionConditionalWithCriteriaCorrectly() {
 
 		Document agg = Aggregation.newAggregation(project()//
 				.and("color")//
@@ -438,14 +449,14 @@ public void shouldRenderProjectionConditionalWithCriteriaCorrectly() {
 		assertThat(getAsDocument(project, "color")).containsEntry("$cond", expectedCondition);
 	}
 
-	@Test // DATAMONGO-861
-	public void referencingProjectionAliasesShouldRenderProjectionConditionalWithFieldReferenceCorrectly() {
+	@Test // DATAMONGO-861, DATAMONGO-2242
+	void referencingProjectionAliasesShouldRenderProjectionConditionalWithFieldReferenceCorrectly() {
 
 		Document agg = Aggregation.newAggregation(//
 				project().and("color").as("chroma"), project().and("luminosity") //
 						.applyCondition(ConditionalOperators //
 								.when("chroma") //
-								.thenValueOf("bright") //
+								.then("bright") //
 								.otherwise("dark"))) //
 				.toDocument("foo", Aggregation.DEFAULT_CONTEXT);
 
@@ -459,7 +470,7 @@ public void referencingProjectionAliasesShouldRenderProjectionConditionalWithFie
 	}
 
 	@Test // DATAMONGO-861
-	public void referencingProjectionAliasesShouldRenderProjectionConditionalWithCriteriaReferenceCorrectly() {
+	void referencingProjectionAliasesShouldRenderProjectionConditionalWithCriteriaReferenceCorrectly() {
 
 		Document agg = Aggregation.newAggregation(//
 				project().and("color").as("chroma"), project().and("luminosity") //
@@ -478,7 +489,7 @@ public void referencingProjectionAliasesShouldRenderProjectionConditionalWithCri
 	}
 
 	@Test // DATAMONGO-861
-	public void shouldRenderProjectionIfNullWithFieldReferenceCorrectly() {
+	void shouldRenderProjectionIfNullWithFieldReferenceCorrectly() {
 
 		Document agg = Aggregation.newAggregation(//
 				project().and("color"), //
@@ -494,7 +505,7 @@ public void shouldRenderProjectionIfNullWithFieldReferenceCorrectly() {
 	}
 
 	@Test // DATAMONGO-861
-	public void shouldRenderProjectionIfNullWithFallbackFieldReferenceCorrectly() {
+	void shouldRenderProjectionIfNullWithFallbackFieldReferenceCorrectly() {
 
 		Document agg = Aggregation.newAggregation(//
 				project("fallback").and("color").as("chroma"), project().and("luminosity") //
@@ -508,7 +519,7 @@ public void shouldRenderProjectionIfNullWithFallbackFieldReferenceCorrectly() {
 	}
 
 	@Test // DATAMONGO-1552
-	public void shouldHonorDefaultCountField() {
+	void shouldHonorDefaultCountField() {
 
 		Document agg = Aggregation.newAggregation(//
 				bucket("year"), //
@@ -521,7 +532,7 @@ public void shouldHonorDefaultCountField() {
 	}
 
 	@Test // DATAMONGO-1533
-	public void groupOperationShouldAllowUsageOfDerivedSpELAggregationExpression() {
+	void groupOperationShouldAllowUsageOfDerivedSpELAggregationExpression() {
 
 		Document agg = newAggregation( //
 				project("a"), //
@@ -539,7 +550,7 @@ public void groupOperationShouldAllowUsageOfDerivedSpELAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1756
-	public void projectOperationShouldRenderNestedFieldNamesCorrectly() {
+	void projectOperationShouldRenderNestedFieldNamesCorrectly() {
 
 		Document agg = newAggregation(project().and("value1.value").plus("value2.value").as("val")).toDocument("collection",
 				Aggregation.DEFAULT_CONTEXT);
@@ -549,7 +560,7 @@ public void projectOperationShouldRenderNestedFieldNamesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1871
-	public void providedAliasShouldAllowNestingExpressionWithAliasCorrectly() {
+	void providedAliasShouldAllowNestingExpressionWithAliasCorrectly() {
 
 		Document condition = new Document("$and",
 				Arrays.asList(new Document("$gte", Arrays.asList("$$est.dt", "2015-12-29")), //
@@ -566,7 +577,7 @@ public void providedAliasShouldAllowNestingExpressionWithAliasCorrectly() {
 	}
 
 	@Test // DATAMONGO-2377
-	public void shouldAllowInternalThisAndValueReferences() {
+	void shouldAllowInternalThisAndValueReferences() {
 
 		Document untyped = newAggregation( //
 				Arrays.asList( //
@@ -583,9 +594,102 @@ public void shouldAllowInternalThisAndValueReferences() {
 				"{\"attributeRecordArrays\": {\"$reduce\": {\"input\": \"$attributeRecordArrays\", \"initialValue\": [], \"in\": {\"$concatArrays\": [\"$$value\", \"$$this\"]}}}}"));
 	}
 
+	@Test // DATAMONGO-2644
+	void projectOnIdIsAlwaysValid() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		Document target = new Aggregation(bucket("start"), project("_id")).toDocument("collection-1",
+				new RelaxedTypeBasedAggregationOperationContext(BookWithFieldAnnotation.class, mappingContext,
+						new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext))));
+
+		assertThat(extractPipelineElement(target, 1, "$project")).isEqualTo(Document.parse(" { \"_id\" : 1 }"));
+	}
+
+	@Test // GH-3898
+	void shouldNotConvertIncludeExcludeValuesForProjectOperation() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		RelaxedTypeBasedAggregationOperationContext context = new RelaxedTypeBasedAggregationOperationContext(
+				WithRetypedIdField.class, mappingContext,
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
+		Document document = project(WithRetypedIdField.class).toDocument(context);
+		assertThat(document).isEqualTo(new Document("$project", new Document("_id", 1).append("renamed-field", 1).append("entries", 1)));
+	}
+
+	@Test // GH-4038
+	void createsBasicAggregationOperationFromJsonString() {
+
+		AggregationOperation stage = stage("{ $project : { name : 1} }");
+		Document target = newAggregation(stage).toDocument("col-1", DEFAULT_CONTEXT);
+		assertThat(extractPipelineElement(target, 0, "$project")).containsEntry("name", 1);
+	}
+
+	@Test // GH-4038
+	void createsBasicAggregationOperationFromBson() {
+
+		AggregationOperation stage = stage(Aggregates.project(Projections.fields(Projections.include("name"))));
+		Document target = newAggregation(stage).toDocument("col-1", DEFAULT_CONTEXT);
+		assertThat(extractPipelineElement(target, 0, "$project")).containsKey("name");
+	}
+
+	@Test // GH-3917
+	void inheritedFieldsExposingContextShouldNotFailOnUnknownFieldReferenceForRelaxedRootContext() {
+
+		List<AggregationOperation> aggregationOperations = new ArrayList<>();
+
+		GroupOperation groupOperation = Aggregation.group("_id", "label_name");
+		aggregationOperations.add(groupOperation);
+
+		ProjectionOperation projectionOperation = Aggregation.project("label_name").andExclude("_id");
+		aggregationOperations.add(projectionOperation);
+
+		Sort sort = Sort.by(Sort.Direction.DESC, "serial_number");
+		SortOperation sortOperation = new SortOperation(sort).and(Sort.Direction.DESC, "label_name");
+		aggregationOperations.add(sortOperation);
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		QueryMapper queryMapper = new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext));
+
+		List<Document> documents = newAggregation(City.class, aggregationOperations).toPipeline(new RelaxedTypeBasedAggregationOperationContext(City.class, mappingContext, queryMapper));
+		assertThat(documents.get(2)).isEqualTo("{ $sort : { 'serial_number' : -1, 'label_name' : -1 } }");
+	}
+
+	@Test // GH-4443
+	void fieldsExposingContextShouldUseCustomFieldNameFromRelaxedRootContext() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		RelaxedTypeBasedAggregationOperationContext context = new RelaxedTypeBasedAggregationOperationContext(
+				WithRetypedIdField.class, mappingContext,
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
+
+		TypedAggregation<WithRetypedIdField> agg = newAggregation(WithRetypedIdField.class,
+				unwind("entries"), match(where("foo").is("value 2")));
+		List<Document> pipeline = agg.toPipeline(context);
+
+		Document fields = getAsDocument(pipeline.get(1), "$match");
+		assertThat(fields.get("renamed-field")).isEqualTo("value 2");
+	}
+
 	private Document extractPipelineElement(Document agg, int index, String operation) {
 
 		List<Document> pipeline = (List<Document>) agg.get("pipeline");
-		return (Document) pipeline.get(index).get(operation);
+		Object value = pipeline.get(index).get(operation);
+		if (value instanceof Document document) {
+			return document;
+		}
+		if (value instanceof Map map) {
+			return new Document(map);
+		}
+		throw new IllegalArgumentException();
+	}
+
+	public class WithRetypedIdField {
+
+		@Id @org.springframework.data.mongodb.core.mapping.Field private String id;
+
+		@org.springframework.data.mongodb.core.mapping.Field("renamed-field") private String foo;
+
+		private List<String> entries = new ArrayList<>();
+
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdateUnitTests.java
index 48faa1e099..60a6437f91 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdateUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationUpdateUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link AggregationUpdate}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationVariableUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationVariableUnitTests.java
new file mode 100644
index 0000000000..7ebf7c2849
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/AggregationVariableUnitTests.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+/**
+ * Unit tests for {@link AggregationVariable}.
+ *
+ * @author Christoph Strobl
+ */
+class AggregationVariableUnitTests {
+
+	@Test // GH-4070
+	void variableErrorsOnNullValue() {
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> AggregationVariable.variable(null));
+	}
+
+	@Test // GH-4070
+	void createsVariable() {
+
+		var variable = AggregationVariable.variable("$$now");
+
+		assertThat(variable.getTarget()).isEqualTo("$$now");
+		assertThat(variable.isInternal()).isFalse();
+	}
+
+	@Test // GH-4070
+	void prefixesVariableIfNeeded() {
+
+		var variable = AggregationVariable.variable("this");
+
+		assertThat(variable.getTarget()).isEqualTo("$$this");
+	}
+
+	@Test // GH-4070
+	void localVariableErrorsOnNullValue() {
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> AggregationVariable.localVariable(null));
+	}
+
+	@Test // GH-4070
+	void localVariable() {
+
+		var variable = AggregationVariable.localVariable("$$this");
+
+		assertThat(variable.getTarget()).isEqualTo("$$this");
+		assertThat(variable.isInternal()).isTrue();
+	}
+
+	@Test // GH-4070
+	void prefixesLocalVariableIfNeeded() {
+
+		var variable = AggregationVariable.localVariable("this");
+
+		assertThat(variable.getTarget()).isEqualTo("$$this");
+	}
+
+	@Test // GH-4070
+	void isVariableReturnsTrueForAggregationVariableTypes() {
+
+		var variable = Mockito.mock(AggregationVariable.class);
+
+		assertThat(AggregationVariable.isVariable(variable)).isTrue();
+	}
+
+	@Test // GH-4070
+	void isVariableReturnsTrueForFieldThatTargetsVariable() {
+
+		var variable = Fields.field("value", "$$this");
+
+		assertThat(AggregationVariable.isVariable(variable)).isTrue();
+	}
+
+	@Test // GH-4070
+	void isVariableReturnsFalseForFieldThatDontTargetsVariable() {
+
+		var variable = Fields.field("value", "$this");
+
+		assertThat(AggregationVariable.isVariable(variable)).isFalse();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperatorsUnitTests.java
new file mode 100644
index 0000000000..381ddb45a1
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ArithmeticOperatorsUnitTests.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2019-2025 the original author 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.aggregation;
+
+import static org.springframework.data.mongodb.core.aggregation.ArithmeticOperators.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ArithmeticOperators}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Mushtaq Ahmed
+ * @author Divya Srivastava
+ */
+class ArithmeticOperatorsUnitTests {
+
+	@Test // DATAMONGO-2370
+	void roundShouldWithoutPlace() {
+
+		assertThat(valueOf("field").round().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(new Document("$round", Collections.singletonList("$field")));
+	}
+
+	@Test // DATAMONGO-2370
+	void roundShouldWithPlace() {
+
+		assertThat(valueOf("field").roundToPlace(3).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(new Document("$round", Arrays.asList("$field", 3)));
+	}
+
+	@Test // DATAMONGO-2370
+	void roundShouldWithPlaceFromField() {
+
+		assertThat(valueOf("field").round().placeOf("my-field").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(new Document("$round", Arrays.asList("$field", "$my-field")));
+	}
+
+	@Test // DATAMONGO-2370
+	void roundShouldWithPlaceFromExpression() {
+
+		assertThat(valueOf("field").round().placeOf((ctx -> new Document("$first", "$source")))
+				.toDocument(Aggregation.DEFAULT_CONTEXT))
+						.isEqualTo(new Document("$round", Arrays.asList("$field", new Document("$first", "$source"))));
+	}
+
+	@Test // GH-3716
+	void rendersDerivativeCorrectly() {
+
+		assertThat(
+				valueOf("miles").derivative(SetWindowFieldsOperation.WindowUnits.HOUR).toDocument(Aggregation.DEFAULT_CONTEXT))
+						.isEqualTo("{ $derivative: { input: \"$miles\", unit: \"hour\" } }");
+	}
+
+	@Test // GH-3721
+	void rendersIntegral() {
+		assertThat(valueOf("kilowatts").integral().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $integral : { input : \"$kilowatts\" } }");
+	}
+
+	@Test // GH-3721
+	void rendersIntegralWithUnit() {
+		assertThat(valueOf("kilowatts").integral(SetWindowFieldsOperation.WindowUnits.HOUR)
+				.toDocument(Aggregation.DEFAULT_CONTEXT))
+						.isEqualTo("{ $integral : { input : \"$kilowatts\", unit : \"hour\" } }");
+	}
+
+	@Test // GH-3728
+	void rendersSin() {
+
+		assertThat(valueOf("angle").sin().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $sin : \"$angle\" }");
+	}
+
+	@Test // GH-3728
+	void rendersSinWithValueInDegrees() {
+
+		assertThat(valueOf("angle").sin(AngularUnit.DEGREES).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $sin : { $degreesToRadians : \"$angle\" } }");
+	}
+
+	@Test // GH-3728
+	void rendersSinh() {
+
+		assertThat(valueOf("angle").sinh().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $sinh : \"$angle\" }");
+	}
+
+	@Test // GH-3728
+	void rendersSinhWithValueInDegrees() {
+
+		assertThat(valueOf("angle").sinh(AngularUnit.DEGREES).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $sinh : { $degreesToRadians : \"$angle\" } }");
+	}
+
+	@Test // GH-3708
+	void rendersASin() {
+		assertThat(valueOf("field").asin().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $asin : \"$field\" }");
+	}
+
+	@Test // GH-3708
+	void rendersASinh() {
+		assertThat(valueOf("field").asinh().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $asinh : \"$field\" }");
+	}
+
+	@Test // GH-3710
+	void rendersCos() {
+
+		assertThat(valueOf("angle").cos().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $cos : \"$angle\" }");
+	}
+
+	@Test // GH-3710
+	void rendersCosWithValueInDegrees() {
+
+		assertThat(valueOf("angle").cos(AngularUnit.DEGREES).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $cos : { $degreesToRadians : \"$angle\" } }");
+	}
+
+	@Test // GH-3710
+	void rendersCosh() {
+
+		assertThat(valueOf("angle").cosh().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $cosh : \"$angle\" }");
+	}
+	
+	@Test // GH-3707
+	void rendersACos() {
+		assertThat(valueOf("field").acos().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $acos : \"$field\" }");
+	}
+
+	@Test // GH-3707
+	void rendersACosh() {
+		assertThat(valueOf("field").acosh().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $acosh : \"$field\" }");
+	}
+
+	@Test // GH-3710
+	void rendersCoshWithValueInDegrees() {
+
+		assertThat(valueOf("angle").cosh(AngularUnit.DEGREES).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $cosh : { $degreesToRadians : \"$angle\" } }");
+	}
+
+	@Test // GH-3730
+	void rendersTan() {
+
+		assertThat(valueOf("angle").tan().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $tan : \"$angle\" }");
+	}
+
+	@Test // GH-3730
+	void rendersTanWithValueInDegrees() {
+
+		assertThat(valueOf("angle").tan(AngularUnit.DEGREES).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $tan : { $degreesToRadians : \"$angle\" } }");
+	}
+
+	@Test // GH-3730
+	void rendersTanh() {
+
+		assertThat(valueOf("angle").tanh().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $tanh : \"$angle\" }");
+	}
+
+	@Test // GH-3730
+	void rendersTanhWithValueInDegrees() {
+
+		assertThat(valueOf("angle").tanh(AngularUnit.DEGREES).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $tanh : { $degreesToRadians : \"$angle\" } }");
+	}
+
+	@Test // GH-3709
+	void rendersATan() {
+
+		assertThat(valueOf("field").atan().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $atan : \"$field\" }");
+	}
+
+	@Test // GH-3709
+	void rendersATan2() {
+
+		assertThat(valueOf("field1").atan2("field2").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $atan2 : [ \"$field1\" , \"$field2\" ] }");
+	}
+
+	@Test // GH-3709
+	void rendersATanh() {
+
+		assertThat(valueOf("field").atanh().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $atanh : \"$field\" }");
+	}
+
+	@Test // GH-3724
+	void rendersRand() {
+		assertThat(rand().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(new Document("$rand", new Document()));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ArrayOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ArrayOperatorsUnitTests.java
index 84f07911ea..0ab5545f23 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ArrayOperatorsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ArrayOperatorsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,16 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import static org.springframework.data.mongodb.test.util.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.ArrayToObject;
 
 /**
@@ -31,6 +32,7 @@
  *
  * @author Christoph Strobl
  * @author Shashank Sharma
+ * @author Divya Srivastava
  * @currentRead Royal Assassin - Robin Hobb
  */
 public class ArrayOperatorsUnitTests {
@@ -129,4 +131,75 @@ public void inWithValueList() {
 		assertThat(ArrayOperators.arrayOf(VALUE_LIST).containsValue("$userName").toDocument(Aggregation.DEFAULT_CONTEXT))
 				.isEqualTo("{ \"$in\" : [\"$userName\", " + VALUE_LIST_STRING + "] }");
 	}
+
+	@Test // GH-3694
+	public void firstWithValueList() {
+
+		assertThat(ArrayOperators.arrayOf(VALUE_LIST).first().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ \"$first\" : " + VALUE_LIST_STRING + "}");
+	}
+
+	@Test // GH-3694
+	public void firstWithExpression() {
+
+		assertThat(ArrayOperators.arrayOf(EXPRESSION).first().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ \"$first\" : " + EXPRESSION_STRING + "}");
+	}
+
+	@Test // GH-3694
+	public void firstWithFieldReference() {
+
+		assertThat(ArrayOperators.arrayOf("field").first().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $first : \"$field\" }");
+	}
+
+	@Test // GH-3694
+	public void lastWithValueList() {
+
+		assertThat(ArrayOperators.arrayOf(VALUE_LIST).last().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ \"$last\" : " + VALUE_LIST_STRING + "}");
+	}
+
+	@Test // GH-3694
+	public void lastWithExpression() {
+
+		assertThat(ArrayOperators.arrayOf(EXPRESSION).last().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ \"$last\" : " + EXPRESSION_STRING + "}");
+	}
+
+	@Test // GH-3694
+	public void lastWithFieldReference() {
+
+		assertThat(ArrayOperators.arrayOf("field").last().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $last : \"$field\" }");
+	}
+
+	@Test // GH-4139
+	void sortByWithFieldRef() {
+
+		assertThat(ArrayOperators.arrayOf("team").sort(Sort.by("name")).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $sortArray: { input: \"$team\", sortBy: { name: 1 } } }");
+	}
+
+	@Test // GH-4929
+	public void sortArrayByValueAscending() {
+
+		Document result = ArrayOperators.arrayOf("numbers").sort(Direction.ASC).toDocument(Aggregation.DEFAULT_CONTEXT);
+		assertThat(result).isEqualTo("{ $sortArray: { input: '$numbers', sortBy: 1 } }");
+	}
+
+	@Test // GH-4929
+	public void sortArrayByValueDescending() {
+
+		Document result = ArrayOperators.arrayOf("numbers").sort(Direction.DESC).toDocument(Aggregation.DEFAULT_CONTEXT);
+		assertThat(result).isEqualTo("{ $sortArray: { input: '$numbers', sortBy: -1 } }");
+	}
+
+	@Test // GH-4929
+	void sortByWithDirection() {
+
+		assertThat(ArrayOperators.arrayOf(List.of("a", "b", "d", "c")).sort(Direction.DESC)
+				.toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $sortArray: { input: [\"a\", \"b\", \"d\", \"c\"], sortBy: -1 } }");
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BasicAggregationOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BasicAggregationOperationUnitTests.java
new file mode 100644
index 0000000000..c5b73b6576
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BasicAggregationOperationUnitTests.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+import com.mongodb.MongoClientSettings;
+
+/**
+ * Unit tests for {@link BasicAggregationOperation}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class BasicAggregationOperationUnitTests {
+
+	@Mock QueryMapper queryMapper;
+	@Mock MongoConverter converter;
+
+	TypeBasedAggregationOperationContext ctx;
+
+	@BeforeEach
+	void beforeEach() {
+
+		// no field mapping though having a type based context
+		ctx = new TypeBasedAggregationOperationContext(Person.class, new MongoMappingContext(), queryMapper);
+		when(queryMapper.getConverter()).thenReturn(converter);
+		when(converter.getCodecRegistry()).thenReturn(MongoClientSettings.getDefaultCodecRegistry());
+	}
+
+	@Test // GH-4038
+	void usesGivenDocumentAsIs() {
+
+		Document source = new Document("value", 1);
+		assertThat(new BasicAggregationOperation(source).toDocument(ctx)).isSameAs(source);
+	}
+
+	@Test // GH-4038
+	void parsesJson() {
+
+		Document source = new Document("value", 1);
+		assertThat(new BasicAggregationOperation(source.toJson()).toDocument(ctx)).isEqualTo(source);
+	}
+
+	@Test // GH-4038
+	void errorsOnInvalidValue() {
+
+		BasicAggregationOperation agg = new BasicAggregationOperation(new Object());
+		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> agg.toDocument(ctx));
+	}
+
+	@Test // GH-4038
+	void errorsOnNonJsonSting() {
+
+		BasicAggregationOperation agg = new BasicAggregationOperation("#005BBB #FFD500");
+		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> agg.toDocument(ctx));
+	}
+
+	private static class Person {
+
+		@Field("v-a-l-u-e") Object value;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperationUnitTests.java
index 86474a4bd4..af05e7bee0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketAutoOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.aggregation.BucketAutoOperation.Granularities;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketOperationUnitTests.java
index 8fa36f773f..36a943d1c1 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/BucketOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link BucketOperation}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/City.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/City.java
index d5d81a2035..7940f9e354 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/City.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/City.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,59 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
+import java.util.Objects;
 
 /**
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-@lombok.Data
-@AllArgsConstructor
-@NoArgsConstructor
 class City {
 
 	String name;
 	int population;
 
+	public City() {}
+
+	public City(String name, int population) {
+
+		this.name = name;
+		this.population = population;
+	}
+
 	public String toString() {
 		return "City [name=" + name + ", population=" + population + "]";
 	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public int getPopulation() {
+		return this.population;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public void setPopulation(int population) {
+		this.population = population;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		City city = (City) o;
+		return population == city.population && Objects.equals(name, city.name);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name, population);
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CondExpressionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CondExpressionUnitTests.java
index 4623e0a1ed..c11313176f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CondExpressionUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CondExpressionUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.aggregation.ConditionalOperators.Cond;
 import org.springframework.data.mongodb.core.query.Criteria;
 
@@ -34,42 +34,42 @@
 public class CondExpressionUnitTests {
 
 	@Test // DATAMONGO-861
-	public void builderRejectsEmptyFieldName() {
+	void builderRejectsEmptyFieldName() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newBuilder().when(""));
 	}
 
 	@Test // DATAMONGO-861
-	public void builderRejectsNullFieldName() {
+	void builderRejectsNullFieldName() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newBuilder().when((Document) null));
 	}
 
 	@Test // DATAMONGO-861
-	public void builderRejectsNullCriteriaName() {
+	void builderRejectsNullCriteriaName() {
 		assertThatIllegalArgumentException().isThrownBy(() -> newBuilder().when((Criteria) null));
 	}
 
 	@Test // DATAMONGO-861
-	public void builderRejectsBuilderAsThenValue() {
+	void builderRejectsBuilderAsThenValue() {
 		assertThatIllegalArgumentException().isThrownBy(
 				() -> newBuilder().when("isYellow").then(newBuilder().when("field").then("then-value")).otherwise("otherwise"));
 	}
 
-	@Test // DATAMONGO-861, DATAMONGO-1542
-	public void simpleBuilderShouldRenderCorrectly() {
+	@Test // DATAMONGO-861, DATAMONGO-1542, DATAMONGO-2242
+	void simpleBuilderShouldRenderCorrectly() {
 
 		Cond operator = ConditionalOperators.when("isYellow").thenValueOf("bright").otherwise("dark");
 		Document document = operator.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		Document expectedCondition = new Document() //
 				.append("if", "$isYellow") //
-				.append("then", "bright") //
+				.append("then", "$bright") //
 				.append("else", "dark");
 
 		assertThat(document).containsEntry("$cond", expectedCondition);
 	}
 
-	@Test // DATAMONGO-861, DATAMONGO-1542
-	public void simpleCriteriaShouldRenderCorrectly() {
+	@Test // DATAMONGO-861, DATAMONGO-1542, DATAMONGO-2242
+	void simpleCriteriaShouldRenderCorrectly() {
 
 		Cond operator = ConditionalOperators.when(Criteria.where("luminosity").gte(100)).thenValueOf("bright")
 				.otherwise("dark");
@@ -77,14 +77,14 @@ public void simpleCriteriaShouldRenderCorrectly() {
 
 		Document expectedCondition = new Document() //
 				.append("if", new Document("$gte", Arrays.<Object> asList("$luminosity", 100))) //
-				.append("then", "bright") //
+				.append("then", "$bright") //
 				.append("else", "dark");
 
 		assertThat(document).containsEntry("$cond", expectedCondition);
 	}
 
-	@Test // DATAMONGO-861
-	public void andCriteriaShouldRenderCorrectly() {
+	@Test // DATAMONGO-861, DATAMONGO-2242
+	void andCriteriaShouldRenderCorrectly() {
 
 		Cond operator = ConditionalOperators.when(Criteria.where("luminosity").gte(100) //
 				.andOperator(Criteria.where("hue").is(50), //
@@ -99,14 +99,14 @@ public void andCriteriaShouldRenderCorrectly() {
 
 		Document expectedCondition = new Document() //
 				.append("if", Arrays.<Object> asList(luminosity, new Document("$and", Arrays.asList(hue, saturation)))) //
-				.append("then", "bright") //
+				.append("then", "$bright") //
 				.append("else", "$dark-field");
 
 		assertThat(document).containsEntry("$cond", expectedCondition);
 	}
 
-	@Test // DATAMONGO-861, DATAMONGO-1542
-	public void twoArgsCriteriaShouldRenderCorrectly() {
+	@Test // DATAMONGO-861, DATAMONGO-1542, DATAMONGO-2242
+	void twoArgsCriteriaShouldRenderCorrectly() {
 
 		Criteria criteria = Criteria.where("luminosity").gte(100) //
 				.and("saturation").and("chroma").is(200);
@@ -119,14 +119,14 @@ public void twoArgsCriteriaShouldRenderCorrectly() {
 
 		Document expectedCondition = new Document() //
 				.append("if", Arrays.asList(gte, is)) //
-				.append("then", "bright") //
+				.append("then", "$bright") //
 				.append("else", "dark");
 
 		assertThat(document).containsEntry("$cond", expectedCondition);
 	}
 
 	@Test // DATAMONGO-861, DATAMONGO-1542
-	public void nestedCriteriaShouldRenderCorrectly() {
+	void nestedCriteriaShouldRenderCorrectly() {
 
 		Cond operator = ConditionalOperators.when(Criteria.where("luminosity").gte(100)) //
 				.thenValueOf(newBuilder() //
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperatorsUnitTests.java
new file mode 100644
index 0000000000..00f44194f6
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ConditionalOperatorsUnitTests.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.aggregation.ConditionalOperators.*;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ConditionalOperators}.
+ *
+ * @author Christoph Strobl
+ */
+class ConditionalOperatorsUnitTests {
+
+	@Test // GH-3720
+	void rendersIfNullWithMultipleConditionalValuesCorrectly() {
+
+		assertThat(ifNull("description").orIfNull("quantity").then("Unspecified").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $ifNull: [ \"$description\", \"$quantity\", \"Unspecified\" ] }"));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ConvertOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ConvertOperatorsUnitTests.java
index ca356281ea..3600818a16 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ConvertOperatorsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ConvertOperatorsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link ConvertOperators}.
@@ -222,4 +222,11 @@ public void toStringUsingExpression() {
 		assertThat(ConvertOperators.valueOf(EXPRESSION).convertToString().toDocument(Aggregation.DEFAULT_CONTEXT))
 				.isEqualTo(Document.parse("{ $toString: " + EXPRESSION_STRING + " } "));
 	}
+
+	@Test // GH-3714
+	void degreesToRadiansUsingFieldReference() {
+
+		assertThat(ConvertOperators.valueOf("angle_a").convertDegreesToRadians().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $degreesToRadians : \"$angle_a\"}"));
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CountOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CountOperationUnitTests.java
index bff258a655..eea05fbfaa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CountOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/CountOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link CountOperation}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Data.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Data.java
index 090f5649dd..b1826fdb33 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Data.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Data.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DataItem.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DataItem.java
index 29061e0031..a7d294e138 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DataItem.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DataItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DateOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DateOperatorsUnitTests.java
new file mode 100644
index 0000000000..2dd6e3beea
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DateOperatorsUnitTests.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import java.time.DayOfWeek;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.temporal.ChronoUnit;
+import java.util.TimeZone;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.aggregation.DateOperators.Timezone;
+
+/**
+ * Unit tests for {@link DateOperators}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+class DateOperatorsUnitTests {
+
+	@Test // GH-3713
+	void rendersDateAdd() {
+
+		assertThat(DateOperators.dateOf("purchaseDate").add(3, "day").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $dateAdd: { startDate: \"$purchaseDate\", unit: \"day\", amount: 3 } }");
+	}
+
+	@Test // GH-3713
+	void rendersDateAddWithTimezone() {
+
+		assertThat(DateOperators.zonedDateOf("purchaseDate", Timezone.valueOf("America/Chicago")).add(3, "day")
+				.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
+						"{ $dateAdd: { startDate: \"$purchaseDate\", unit: \"day\", amount: 3, timezone : \"America/Chicago\" } }");
+	}
+
+	@Test // GH-4139
+	void rendersDateSubtract() {
+
+		assertThat(DateOperators.dateOf("purchaseDate").subtract(3, "day").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $dateSubtract: { startDate: \"$purchaseDate\", unit: \"day\", amount: 3 } }");
+	}
+
+	@Test // GH-4139
+	void rendersDateSubtractWithTimezone() {
+
+		assertThat(DateOperators.zonedDateOf("purchaseDate", Timezone.valueOf("America/Chicago")).subtract(3, "day")
+				.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
+				"{ $dateSubtract: { startDate: \"$purchaseDate\", unit: \"day\", amount: 3, timezone : \"America/Chicago\" } }");
+	}
+
+	@Test // GH-3713
+	void rendersDateDiff() {
+
+		assertThat(
+				DateOperators.dateOf("purchaseDate").diffValueOf("delivered", "day").toDocument(Aggregation.DEFAULT_CONTEXT))
+						.isEqualTo("{ $dateDiff: { startDate: \"$purchaseDate\", endDate: \"$delivered\", unit: \"day\" } }");
+	}
+
+	@Test // GH-3713
+	void rendersDateDiffWithTimezone() {
+
+		assertThat(DateOperators.zonedDateOf("purchaseDate", Timezone.valueOf("America/Chicago"))
+				.diffValueOf("delivered", DateOperators.TemporalUnit.from(ChronoUnit.DAYS))
+				.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
+						"{ $dateDiff: { startDate: \"$purchaseDate\", endDate: \"$delivered\", unit: \"day\", timezone : \"America/Chicago\" } }");
+	}
+
+	@Test // GH-3713
+	void rendersTimezoneFromZoneOffset() {
+		assertThat(DateOperators.Timezone.fromOffset(ZoneOffset.ofHoursMinutes(3, 30)).getValue()).isEqualTo("+03:30");
+	}
+
+	@Test // GH-3713
+	void rendersTimezoneFromTimeZoneOffset() {
+		assertThat(DateOperators.Timezone.fromOffset(TimeZone.getTimeZone("America/Chicago")).getValue())
+				.isEqualTo("-06:00");
+	}
+
+	@Test // GH-3713
+	void rendersTimezoneFromTimeZoneId() {
+		assertThat(DateOperators.Timezone.fromZone(TimeZone.getTimeZone("America/Chicago")).getValue())
+				.isEqualTo("America/Chicago");
+	}
+
+	@Test // GH-3713
+	void rendersTimezoneFromZoneId() {
+		assertThat(DateOperators.Timezone.fromZone(ZoneId.of("America/Chicago")).getValue()).isEqualTo("America/Chicago");
+	}
+
+	@Test // GH-4139
+	void rendersDateTrunc() {
+
+		assertThat(DateOperators.dateOf("purchaseDate").truncate("week").binSize(2).startOfWeek(DayOfWeek.MONDAY).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $dateTrunc: { date: \"$purchaseDate\", unit: \"week\", binSize: 2, startOfWeek : \"monday\" } }");
+	}
+
+	@Test // GH-4139
+	void rendersDateTruncWithTimezone() {
+
+		assertThat(DateOperators.zonedDateOf("purchaseDate", Timezone.valueOf("America/Chicago")).truncate("week").binSize(2).startOfWeek(DayOfWeek.MONDAY).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $dateTrunc: { date: \"$purchaseDate\", unit: \"week\", binSize: 2, startOfWeek : \"monday\", timezone : \"America/Chicago\" } }");
+	}
+
+	@Test // GH-4139
+	void rendersTsIncrement() {
+
+		assertThat(DateOperators.dateOf("saleTimestamp").tsIncrement().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
+						"{ $tsIncrement: \"$saleTimestamp\" }");
+	}
+
+	@Test // GH-4139
+	void tsIncrementErrorsOnTimezone() {
+
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> DateOperators.zonedDateOf("purchaseDate", Timezone.valueOf("America/Chicago")).tsIncrement());
+	}
+
+	@Test // GH-4139
+	void rendersTsSecond() {
+
+		assertThat(DateOperators.dateOf("saleTimestamp").tsSecond().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
+				"{ $tsSecond: \"$saleTimestamp\" }");
+	}
+
+	@Test // GH-4139
+	void tsSecondErrorsOnTimezone() {
+
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> DateOperators.zonedDateOf("purchaseDate", Timezone.valueOf("America/Chicago")).tsSecond());
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DensifyOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DensifyOperationUnitTests.java
new file mode 100644
index 0000000000..d830a44582
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DensifyOperationUnitTests.java
@@ -0,0 +1,150 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import java.util.Date;
+
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.aggregation.DensifyOperation.DensifyUnits;
+import org.springframework.data.mongodb.core.aggregation.DensifyOperation.Range;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * Unit tests for {@link DensifyOperation}.
+ *
+ * @author Christoph Strobl
+ */
+class DensifyOperationUnitTests {
+
+	@Test // GH-4139
+	void rendersFieldNamesAsIsForUntypedContext() {
+
+		DensifyOperation densify = DensifyOperation.builder().densify("ts")
+				.range(Range.bounded("2021-05-18T00:00:00", "2021-05-18T08:00:00").incrementBy(1).unit(DensifyUnits.HOUR))
+				.build();
+
+		assertThat(densify.toDocument(contextFor(null))).isEqualTo("""
+				{
+				   $densify: {
+				      field: "ts",
+				      range: {
+				         step: 1,
+				         unit: "hour",
+				         bounds:[ "2021-05-18T00:00:00", "2021-05-18T08:00:00" ]
+				      }
+				   }
+				}
+				""");
+	}
+
+	@Test // GH-4139
+	void rendersFieldNamesCorrectly() {
+
+		DensifyOperation densify = DensifyOperation.builder().densify("ts")
+				.range(Range.bounded("2021-05-18T00:00:00", "2021-05-18T08:00:00").incrementBy(1).unit(DensifyUnits.HOUR))
+				.build();
+
+		assertThat(densify.toDocument(contextFor(Weather.class))).isEqualTo("""
+				{
+				   $densify: {
+				      field: "timestamp",
+				      range: {
+				         step: 1,
+				         unit: "hour",
+				         bounds:[ "2021-05-18T00:00:00", "2021-05-18T08:00:00" ]
+				      }
+				   }
+				}
+				""");
+	}
+
+	@Test // GH-4139
+	void rendersPartitonNamesCorrectly() {
+
+		DensifyOperation densify = DensifyOperation.builder().densify("alt").partitionBy("var")
+				.fullRange(range -> range.incrementBy(200)).build();
+
+		assertThat(densify.toDocument(contextFor(Coffee.class))).isEqualTo("""
+				{
+				   $densify: {
+				      field: "altitude",
+				      partitionByFields : [ "variety" ],
+				      range: {
+				         step: 200,
+				         bounds: "full"
+				      }
+				   }
+				}
+				""");
+	}
+
+	@Test // GH-4139
+	void rendersPartitionRangeCorrectly() {
+
+		DensifyOperation densify = DensifyOperation.builder().densify("alt").partitionBy("var")
+				.partitionRange(range -> range.incrementBy(200)).build();
+
+		assertThat(densify.toDocument(contextFor(Coffee.class))).isEqualTo("""
+				{
+				   $densify: {
+				      field: "altitude",
+				      partitionByFields : [ "variety" ],
+				      range: {
+				         step: 200,
+				         bounds: "partition"
+				      }
+				   }
+				}
+				""");
+	}
+
+	private static AggregationOperationContext contextFor(@Nullable Class<?> type) {
+
+		if (type == null) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				new MongoMappingContext());
+		mongoConverter.afterPropertiesSet();
+
+		return new TypeBasedAggregationOperationContext(type, mongoConverter.getMappingContext(),
+				new QueryMapper(mongoConverter));
+	}
+
+	class Weather {
+
+		@Field("timestamp") Date ts;
+
+		@Field("temp") Long temperature;
+	}
+
+	class Coffee {
+
+		@Field("altitude") Long alt;
+
+		@Field("variety") String var;
+
+		Float score;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DocumentOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DocumentOperatorsUnitTests.java
new file mode 100644
index 0000000000..c647e1c6c7
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DocumentOperatorsUnitTests.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import static org.springframework.data.mongodb.core.aggregation.DocumentOperators.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link DocumentOperators}.
+ *
+ * @author Christoph Strobl
+ */
+class DocumentOperatorsUnitTests {
+
+	@Test // GH-3715
+	void rendersRank() {
+		assertThat(rank().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $rank: {  } }");
+	}
+
+	@Test // GH-3715
+	void rendersDenseRank() {
+		assertThat(denseRank().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $denseRank: {  } }");
+	}
+
+	@Test // GH-3717
+	void rendersDocumentNumber() {
+		assertThat(documentNumber().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $documentNumber: {  } }");
+	}
+
+	@Test // GH-3727
+	void rendersShift() {
+
+		assertThat(valueOf("quantity").shift(1).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $shift: { output: \"$quantity\", by: 1 } }");
+	}
+
+	@Test // GH-3727
+	void rendersShiftWithDefault() {
+
+		assertThat(valueOf("quantity").shift(1).defaultTo("Not available").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $shift: { output: \"$quantity\", by: 1, default: \"Not available\" } }");
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/EvaluationOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/EvaluationOperatorsUnitTests.java
new file mode 100644
index 0000000000..60e6541281
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/EvaluationOperatorsUnitTests.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link EvaluationOperators}.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+class EvaluationOperatorsUnitTests {
+
+	@Test // GH-3790
+	void shouldRenderExprCorrectly() {
+
+		assertThat(EvaluationOperators.valueOf("foo").expr().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $expr: \"$foo\" }");
+	}
+
+	@Test // GH-4139
+	void shouldRenderLocfCorrectly() {
+
+		assertThat(EvaluationOperators.valueOf("foo").locf().toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $locf: \"$foo\" }");
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsUnitTests.java
index d1d14d46ee..ee20b15291 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ExposedFieldsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FacetOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FacetOperationUnitTests.java
index 7b719d71f5..2cfc941bda 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FacetOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FacetOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,13 +66,12 @@ public void shouldRenderEmpty() {
 	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1552
 	public void shouldRejectNonExistingFields() {
 
-		FacetOperation facetOperation = new FacetOperation()
-				.and(project("price"), //
-						bucket("price") //
-								.withBoundaries(0, 150, 200, 300, 400) //
-								.withDefaultBucket("Other") //
-								.andOutputCount().as("count") //
-								.andOutput("title").push().as("titles")) //
+		FacetOperation facetOperation = new FacetOperation().and(project("price"), //
+				bucket("price") //
+						.withBoundaries(0, 150, 200, 300, 400) //
+						.withDefaultBucket("Other") //
+						.andOutputCount().as("count") //
+						.andOutput("title").push().as("titles")) //
 				.as("categorizedByPrice");
 
 		Document agg = facetOperation.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -87,18 +86,16 @@ public void shouldRejectNonExistingFields() {
 	@Test // DATAMONGO-1552
 	public void shouldHonorProjectedFields() {
 
-		FacetOperation facetOperation = new FacetOperation()
-				.and(project("price").and("title").as("name"), //
-						bucketAuto("price", 5) //
-								.andOutput("name").push().as("titles")) //
+		FacetOperation facetOperation = new FacetOperation().and(project("price").and("title").as("name"), //
+				bucketAuto("price", 5) //
+						.andOutput("name").push().as("titles")) //
 				.as("categorizedByPrice");
 
 		Document agg = facetOperation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse("{ $facet: { categorizedByPrice: ["
-				+ "{ $project: { price: 1, name: \"$title\" } }, "
-						+ "{ $bucketAuto: {  buckets: 5, groupBy: \"$price\", "
-						+ "output: { titles: { $push: \"$name\" } } } } ] } }"));
+				+ "{ $project: { price: 1, name: \"$title\" } }, " + "{ $bucketAuto: {  buckets: 5, groupBy: \"$price\", "
+				+ "output: { titles: { $push: \"$name\" } } } } ] } }"));
 	}
 
 	@Test // DATAMONGO-1553
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FieldsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FieldsUnitTests.java
index f8e0336bf8..cfeb411387 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FieldsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FieldsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.aggregation.Fields.*;
 
@@ -117,6 +117,13 @@ public void stripsLeadingDollarsFromTarget() {
 		assertThat(Fields.field("$$$$target").getTarget()).isEqualTo("target");
 	}
 
+	@Test // GH-4123
+	public void keepsRawMappingToDbRefId() {
+
+		assertThat(Fields.field("$id").getName()).isEqualTo("id");
+		assertThat(Fields.field("person.$id").getTarget()).isEqualTo("person.$id");
+	}
+
 	private static void verify(Field field, String name, String target) {
 
 		assertThat(field).isNotNull();
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FilterExpressionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FilterExpressionUnitTests.java
index f054296dc4..a5df9647a1 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FilterExpressionUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/FilterExpressionUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016. the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,43 +22,39 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
 /**
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class FilterExpressionUnitTests {
-
-	@Mock MongoDbFactory mongoDbFactory;
+@ExtendWith(MockitoExtension.class)
+class FilterExpressionUnitTests {
 
 	private AggregationOperationContext aggregationContext;
 	private MongoMappingContext mappingContext;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		mappingContext = new MongoMappingContext();
 		aggregationContext = new TypeBasedAggregationOperationContext(Sales.class, mappingContext,
-				new QueryMapper(new MappingMongoConverter(new DefaultDbRefResolver(mongoDbFactory), mappingContext)));
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
 	}
 
 	@Test // DATAMONGO-1491
-	public void shouldConstructFilterExpressionCorrectly() {
+	void shouldConstructFilterExpressionCorrectly() {
 
 		TypedAggregation<Sales> agg = Aggregation.newAggregation(Sales.class,
 				Aggregation.project()
-						.and(filter("items").as("item").by(AggregationFunctionExpressions.GTE.of(Fields.field("item.price"), 100)))
+						.and(filter("items").as("item").by(ComparisonOperators.valueOf("item.price").greaterThanEqualToValue(100)))
 						.as("items"));
 
 		Document $filter = extractFilterOperatorFromDocument(agg.toDocument("sales", aggregationContext));
@@ -72,10 +68,10 @@ public void shouldConstructFilterExpressionCorrectly() {
 	}
 
 	@Test // DATAMONGO-1491
-	public void shouldConstructFilterExpressionCorrectlyWhenUsingFilterOnProjectionBuilder() {
+	void shouldConstructFilterExpressionCorrectlyWhenUsingFilterOnProjectionBuilder() {
 
 		TypedAggregation<Sales> agg = Aggregation.newAggregation(Sales.class, Aggregation.project().and("items")
-				.filter("item", AggregationFunctionExpressions.GTE.of(Fields.field("item.price"), 100)).as("items"));
+				.filter("item", ComparisonOperators.valueOf("item.price").greaterThanEqualToValue(100)).as("items"));
 
 		Document $filter = extractFilterOperatorFromDocument(agg.toDocument("sales", aggregationContext));
 		Document expected = Document.parse("{" + //
@@ -88,11 +84,11 @@ public void shouldConstructFilterExpressionCorrectlyWhenUsingFilterOnProjectionB
 	}
 
 	@Test // DATAMONGO-1491
-	public void shouldConstructFilterExpressionCorrectlyWhenInputMapToArray() {
+	void shouldConstructFilterExpressionCorrectlyWhenInputMapToArray() {
 
 		TypedAggregation<Sales> agg = Aggregation.newAggregation(Sales.class,
 				Aggregation.project().and(filter(Arrays.<Object> asList(1, "a", 2, null, 3.1D, 4, "5")).as("num")
-						.by(AggregationFunctionExpressions.GTE.of(Fields.field("num"), 3))).as("items"));
+						.by(ComparisonOperators.valueOf("num").greaterThanEqualToValue(3))).as("items"));
 
 		Document $filter = extractFilterOperatorFromDocument(agg.toDocument("sales", aggregationContext));
 		Document expected = Document.parse("{" + //
@@ -105,7 +101,7 @@ public void shouldConstructFilterExpressionCorrectlyWhenInputMapToArray() {
 	}
 
 	@Test // DATAMONGO-2320
-	public void shouldConstructFilterExpressionCorrectlyWhenConditionContainsFieldReference() {
+	void shouldConstructFilterExpressionCorrectlyWhenConditionContainsFieldReference() {
 
 		Aggregation agg = Aggregation.newAggregation(Aggregation.project().and((ctx) -> new Document()).as("field-1")
 				.and(filter("items").as("item").by(ComparisonOperators.valueOf("item.price").greaterThan("field-1")))
@@ -121,6 +117,23 @@ public void shouldConstructFilterExpressionCorrectlyWhenConditionContainsFieldRe
 		assertThat($filter).isEqualTo(new Document(expected));
 	}
 
+	@Test // GH-4394
+	void filterShouldAcceptExpression() {
+
+		Document $filter = ArrayOperators.arrayOf(ObjectOperators.valueOf("data.metadata").toArray()).filter().as("item")
+				.by(ComparisonOperators.valueOf("item.price").greaterThan("field-1")).toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		Document expected = Document.parse("""
+				{ $filter : {
+					input: { $objectToArray: "$data.metadata" },
+					as: "item",
+					cond: { $gt: [ "$$item.price", "$field-1" ] }
+				}}
+				""");
+
+		assertThat($filter).isEqualTo(expected);
+	}
+
 	private Document extractFilterOperatorFromDocument(Document source) {
 
 		List<Object> pipeline = DocumentTestUtils.getAsDBList(source, "pipeline");
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperationUnitTests.java
index 094b3279c3..5f66e61bdc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GeoNearOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,8 @@
 import java.util.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
@@ -33,7 +34,6 @@
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.lang.Nullable;
 
 /**
  * Unit tests for {@link GeoNearOperation}.
@@ -70,7 +70,7 @@ public void rendersNearQueryWithKeyCorrectly() {
 	@Test // DATAMONGO-2264
 	public void rendersMaxDistanceCorrectly() {
 
-		NearQuery query = NearQuery.near(10.0, 20.0).maxDistance(new Distance(30.0));
+		NearQuery query = NearQuery.near(10.0, 20.0).maxDistance(Distance.of(30.0));
 
 		assertThat(new GeoNearOperation(query, "distance").toPipelineStages(Aggregation.DEFAULT_CONTEXT))
 				.containsExactly($geoNear().near(10.0, 20.0).maxDistance(30.0).doc());
@@ -79,7 +79,7 @@ public void rendersMaxDistanceCorrectly() {
 	@Test // DATAMONGO-2264
 	public void rendersMinDistanceCorrectly() {
 
-		NearQuery query = NearQuery.near(10.0, 20.0).minDistance(new Distance(30.0));
+		NearQuery query = NearQuery.near(10.0, 20.0).minDistance(Distance.of(30.0));
 
 		assertThat(new GeoNearOperation(query, "distance").toPipelineStages(Aggregation.DEFAULT_CONTEXT))
 				.containsExactly($geoNear().near(10.0, 20.0).minDistance(30.0).doc());
@@ -108,8 +108,9 @@ public void rendersIndexKey() {
 
 		NearQuery query = NearQuery.near(10.0, 20.0);
 
-		assertThat(new GeoNearOperation(query, "distance").useIndex("index-1").toPipelineStages(Aggregation.DEFAULT_CONTEXT))
-				.containsExactly($geoNear().near(10.0, 20.0).key("index-1").doc());
+		assertThat(
+				new GeoNearOperation(query, "distance").useIndex("index-1").toPipelineStages(Aggregation.DEFAULT_CONTEXT))
+						.containsExactly($geoNear().near(10.0, 20.0).key("index-1").doc());
 	}
 
 	@Test // DATAMONGO-2264
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperationUnitTests.java
index fc20d37a3f..b752fab793 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GraphLookupOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import java.util.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.Person;
 import org.springframework.data.mongodb.core.query.Criteria;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GroupOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GroupOperationUnitTests.java
index 4601bca15d..dc6219c7f1 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GroupOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/GroupOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,15 +16,17 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.springframework.data.mongodb.core.aggregation.AggregationFunctionExpressions.*;
 import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 
 import java.util.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
+import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Percentile;
+import org.springframework.data.mongodb.core.aggregation.SelectionOperators.Bottom;
 import org.springframework.data.mongodb.core.query.Criteria;
 
 /**
@@ -33,16 +35,17 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Gustavo de Geus
+ * @author Julia Lee
  */
-public class GroupOperationUnitTests {
+class GroupOperationUnitTests {
 
 	@Test
-	public void rejectsNullFields() {
+	void rejectsNullFields() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new GroupOperation((Fields) null));
 	}
 
 	@Test // DATAMONGO-759
-	public void groupOperationWithNoGroupIdFieldsShouldGenerateNullAsGroupId() {
+	void groupOperationWithNoGroupIdFieldsShouldGenerateNullAsGroupId() {
 
 		GroupOperation operation = new GroupOperation(Fields.from());
 		ExposedFields fields = operation.getFields();
@@ -54,7 +57,7 @@ public void groupOperationWithNoGroupIdFieldsShouldGenerateNullAsGroupId() {
 	}
 
 	@Test // DATAMONGO-759
-	public void groupOperationWithNoGroupIdFieldsButAdditionalFieldsShouldGenerateNullAsGroupId() {
+	void groupOperationWithNoGroupIdFieldsButAdditionalFieldsShouldGenerateNullAsGroupId() {
 
 		GroupOperation operation = new GroupOperation(Fields.from()).count().as("cnt").last("foo").as("foo");
 		ExposedFields fields = operation.getFields();
@@ -68,62 +71,61 @@ public void groupOperationWithNoGroupIdFieldsButAdditionalFieldsShouldGenerateNu
 	}
 
 	@Test
-	public void createsGroupOperationWithSingleField() {
+	void createsGroupOperationWithSingleField() {
 
 		GroupOperation operation = new GroupOperation(fields("a"));
 
 		Document groupClause = extractDocumentFromGroupOperation(operation);
 
-		assertThat(groupClause.get(UNDERSCORE_ID)).isEqualTo((Object) "$a");
+		assertThat(groupClause).containsEntry(UNDERSCORE_ID, "$a");
 	}
 
 	@Test
-	public void createsGroupOperationWithMultipleFields() {
+	void createsGroupOperationWithMultipleFields() {
 
 		GroupOperation operation = new GroupOperation(fields("a").and("b", "c"));
 
 		Document groupClause = extractDocumentFromGroupOperation(operation);
 		Document idClause = DocumentTestUtils.getAsDocument(groupClause, UNDERSCORE_ID);
 
-		assertThat(idClause.get("a")).isEqualTo((Object) "$a");
-		assertThat(idClause.get("b")).isEqualTo((Object) "$c");
+		assertThat(idClause).containsEntry("a", "$a").containsEntry("b", "$c");
 	}
 
 	@Test
-	public void groupFactoryMethodWithMultipleFieldsAndSumOperation() {
+	void groupFactoryMethodWithMultipleFieldsAndSumOperation() {
 
 		GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
 				.sum("e").as("e");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document eOp = DocumentTestUtils.getAsDocument(groupClause, "e");
-		assertThat(eOp).isEqualTo((Document) new Document("$sum", "$e"));
+		assertThat(eOp).isEqualTo(new Document("$sum", "$e"));
 	}
 
 	@Test
-	public void groupFactoryMethodWithMultipleFieldsAndSumOperationWithAlias() {
+	void groupFactoryMethodWithMultipleFieldsAndSumOperationWithAlias() {
 
 		GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
 				.sum("e").as("ee");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document eOp = DocumentTestUtils.getAsDocument(groupClause, "ee");
-		assertThat(eOp).isEqualTo((Document) new Document("$sum", "$e"));
+		assertThat(eOp).isEqualTo(new Document("$sum", "$e"));
 	}
 
 	@Test
-	public void groupFactoryMethodWithMultipleFieldsAndCountOperationWithout() {
+	void groupFactoryMethodWithMultipleFieldsAndCountOperationWithout() {
 
 		GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
 				.count().as("count");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document eOp = DocumentTestUtils.getAsDocument(groupClause, "count");
-		assertThat(eOp).isEqualTo((Document) new Document("$sum", 1));
+		assertThat(eOp).isEqualTo(new Document("$sum", 1));
 	}
 
 	@Test
-	public void groupFactoryMethodWithMultipleFieldsAndMultipleAggregateOperationsWithAlias() {
+	void groupFactoryMethodWithMultipleFieldsAndMultipleAggregateOperationsWithAlias() {
 
 		GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
 				.sum("e").as("sum") //
@@ -131,72 +133,72 @@ public void groupFactoryMethodWithMultipleFieldsAndMultipleAggregateOperationsWi
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document sum = DocumentTestUtils.getAsDocument(groupClause, "sum");
-		assertThat(sum).isEqualTo((Document) new Document("$sum", "$e"));
+		assertThat(sum).isEqualTo(new Document("$sum", "$e"));
 
 		Document min = DocumentTestUtils.getAsDocument(groupClause, "min");
-		assertThat(min).isEqualTo((Document) new Document("$min", "$e"));
+		assertThat(min).isEqualTo(new Document("$min", "$e"));
 	}
 
 	@Test
-	public void groupOperationPushWithValue() {
+	void groupOperationPushWithValue() {
 
 		GroupOperation groupOperation = Aggregation.group("a", "b").push(1).as("x");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
 
-		assertThat(push).isEqualTo((Document) new Document("$push", 1));
+		assertThat(push).isEqualTo(new Document("$push", 1));
 	}
 
 	@Test
-	public void groupOperationPushWithReference() {
+	void groupOperationPushWithReference() {
 
 		GroupOperation groupOperation = Aggregation.group("a", "b").push("ref").as("x");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
 
-		assertThat(push).isEqualTo((Document) new Document("$push", "$ref"));
+		assertThat(push).isEqualTo(new Document("$push", "$ref"));
 	}
 
 	@Test
-	public void groupOperationAddToSetWithReference() {
+	void groupOperationAddToSetWithReference() {
 
 		GroupOperation groupOperation = Aggregation.group("a", "b").addToSet("ref").as("x");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
 
-		assertThat(push).isEqualTo((Document) new Document("$addToSet", "$ref"));
+		assertThat(push).isEqualTo(new Document("$addToSet", "$ref"));
 	}
 
 	@Test
-	public void groupOperationAddToSetWithValue() {
+	void groupOperationAddToSetWithValue() {
 
 		GroupOperation groupOperation = Aggregation.group("a", "b").addToSet(42).as("x");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
 
-		assertThat(push).isEqualTo((Document) new Document("$addToSet", 42));
+		assertThat(push).isEqualTo(new Document("$addToSet", 42));
 	}
 
 	@Test // DATAMONGO-979
-	public void shouldRenderSizeExpressionInGroup() {
+	void shouldRenderSizeExpressionInGroup() {
 
 		GroupOperation groupOperation = Aggregation //
 				.group("username") //
-				.first(SIZE.of(field("tags"))) //
+				.first(ArrayOperators.arrayOf("tags").length()) //
 				.as("tags_count");
 
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document tagsCount = DocumentTestUtils.getAsDocument(groupClause, "tags_count");
 
-		assertThat(tagsCount.get("$first")).isEqualTo((Object) new Document("$size", Arrays.asList("$tags")));
+		assertThat(tagsCount).containsEntry("$first", new Document("$size", "$tags"));
 	}
 
 	@Test // DATAMONGO-1327
-	public void groupOperationStdDevSampWithValue() {
+	void groupOperationStdDevSampWithValue() {
 
 		GroupOperation groupOperation = Aggregation.group("a", "b").stdDevSamp("field").as("fieldStdDevSamp");
 
@@ -207,7 +209,7 @@ public void groupOperationStdDevSampWithValue() {
 	}
 
 	@Test // DATAMONGO-1327
-	public void groupOperationStdDevPopWithValue() {
+	void groupOperationStdDevPopWithValue() {
 
 		GroupOperation groupOperation = Aggregation.group("a", "b").stdDevPop("field").as("fieldStdDevPop");
 
@@ -218,7 +220,7 @@ public void groupOperationStdDevPopWithValue() {
 	}
 
 	@Test // DATAMONGO-1784
-	public void shouldRenderSumWithExpressionInGroup() {
+	void shouldRenderSumWithExpressionInGroup() {
 
 		GroupOperation groupOperation = Aggregation //
 				.group("username") //
@@ -231,16 +233,53 @@ public void shouldRenderSumWithExpressionInGroup() {
 		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
 		Document foobar = DocumentTestUtils.getAsDocument(groupClause, "foobar");
 
-		assertThat(foobar.get("$sum")).isEqualTo(new Document("$cond",
+		assertThat(foobar).containsEntry("$sum", new Document("$cond",
 				new Document("if", new Document("$eq", Arrays.asList("$foo", "bar"))).append("then", 1).append("else", -1)));
 	}
 
 	@Test // DATAMONGO-1784
-	public void sumWithNullExpressionShouldThrowException() {
+	void sumWithNullExpressionShouldThrowException() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> Aggregation.group("username").sum((AggregationExpression) null));
 	}
 
+	@Test // DATAMONGO-2651
+	void accumulatorShouldBeAllowedOnGroupOperation() {
+
+		GroupOperation groupOperation = Aggregation.group("id")
+				.accumulate(
+						ScriptOperators.accumulatorBuilder().init("inti").accumulate("acc").merge("merge").finalize("finalize"))
+				.as("accumulated-value");
+
+		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
+		Document accumulatedValue = DocumentTestUtils.getAsDocument(groupClause, "accumulated-value");
+
+		assertThat(accumulatedValue).containsKey("$accumulator");
+	}
+
+	@Test // GH-4139
+	void groupOperationAllowsToAddFieldsComputedViaExpression() {
+
+		GroupOperation groupOperation = Aggregation.group("id").and("playerId",
+				Bottom.bottom().output("playerId", "score").sortBy(Sort.by(Direction.DESC, "score")));
+		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
+
+		assertThat(groupClause).containsEntry("playerId",
+				Document.parse("{ $bottom : { output: [ \"$playerId\", \"$score\" ], sortBy: { \"score\": -1 }}}"));
+	}
+
+	@Test // GH-4473
+	void groupOperationAllowsAddingFieldWithPercentileAggregationExpression() {
+
+		GroupOperation groupOperation = Aggregation.group("id").and("scorePercentile",
+			Percentile.percentileOf("score").percentages(0.2));
+
+		Document groupClause = extractDocumentFromGroupOperation(groupOperation);
+
+		assertThat(groupClause).containsEntry("scorePercentile",
+			Document.parse("{ $percentile : { input: \"$score\", method: \"approximate\", p: [0.2]}}"));
+	}
+
 	private Document extractDocumentFromGroupOperation(GroupOperation groupOperation) {
 		Document document = groupOperation.toDocument(Aggregation.DEFAULT_CONTEXT);
 		Document groupClause = DocumentTestUtils.getAsDocument(document, "$group");
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Invoice.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Invoice.java
index f4ceb188a6..fb70bab918 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Invoice.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Invoice.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LikeStats.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LikeStats.java
index d797320ebf..e668dc3ed5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LikeStats.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LikeStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LineItem.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LineItem.java
index 46c0e57dcd..32ac758a50 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LineItem.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LineItem.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LookupOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LookupOperationUnitTests.java
index e7ea4f38d8..58bae3f43d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LookupOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/LookupOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,16 @@
 package org.springframework.data.mongodb.core.aggregation;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import static org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable.*;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
-import org.bson.Document;
-import org.junit.Test;
+import java.util.List;
 
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
+import org.springframework.data.mongodb.core.query.Criteria;
 
 /**
  * Unit tests for {@link LookupOperation}.
@@ -62,7 +67,7 @@ public void lookupOperationWithValues() {
 
 		Document lookupClause = extractDocumentFromLookupOperation(lookupOperation);
 
-		assertThat(lookupClause).containsEntry("from", "a") //
+		org.assertj.core.api.Assertions.assertThat(lookupClause).containsEntry("from", "a") //
 				.containsEntry("localField", "b") //
 				.containsEntry("foreignField", "c") //
 				.containsEntry("as", "d");
@@ -114,7 +119,7 @@ public void lookupBuilderBuildsCorrectClause() {
 
 		Document lookupClause = extractDocumentFromLookupOperation(lookupOperation);
 
-		assertThat(lookupClause).containsEntry("from", "a") //
+		org.assertj.core.api.Assertions.assertThat(lookupClause).containsEntry("from", "a") //
 				.containsEntry("localField", "b") //
 				.containsEntry("foreignField", "c") //
 				.containsEntry("as", "d");
@@ -129,4 +134,86 @@ public void lookupBuilderExposesFields() {
 		assertThat(lookupOperation.getFields().exposesSingleFieldOnly()).isTrue();
 		assertThat(lookupOperation.getFields().getField("d")).isNotNull();
 	}
+
+	@Test // GH-3322
+	void buildsLookupWithLetAndPipeline() {
+
+		LookupOperation lookupOperation = LookupOperation.newLookup().from("warehouses")
+				.let(newVariable("order_item").forField("item"), newVariable("order_qty").forField("ordered"))
+				.pipeline(match(ctx -> new Document("$expr",
+						new Document("$and", List.of(Document.parse("{ $eq: [ \"$stock_item\",  \"$$order_item\" ] }"),
+								Document.parse("{ $gte: [ \"$instock\", \"$$order_qty\" ] }"))))))
+				.as("stockdata");
+
+		assertThat(lookupOperation.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("""
+				{ $lookup: {
+					from: "warehouses",
+					let: { order_item: "$item", order_qty: "$ordered" },
+					pipeline: [
+						{ $match:
+							{ $expr:
+								{ $and:
+									[
+										{ $eq: [ "$stock_item",  "$$order_item" ] },
+										{ $gte: [ "$instock", "$$order_qty" ] }
+									]
+								}
+							}
+						}
+					],
+					as: "stockdata"
+				}}
+				""");
+	}
+
+	@Test // GH-3322
+	void buildsLookupWithJustPipeline() {
+
+		LookupOperation lookupOperation = LookupOperation.newLookup().from("holidays") //
+				.pipeline( //
+						match(Criteria.where("year").is(2018)), //
+						project().andExclude("_id").and(ctx -> new Document("name", "$name").append("date", "$date")).as("date"), //
+						Aggregation.replaceRoot("date") //
+				).as("holidays");
+
+		assertThat(lookupOperation.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("""
+				{ $lookup:
+					{
+						from: "holidays",
+						pipeline: [
+							{ $match: { year: 2018 } },
+							{ $project: { _id: 0, date: { name: "$name", date: "$date" } } },
+							{ $replaceRoot: { newRoot: "$date" } }
+						],
+						as: "holidays"
+					}
+				}}
+				""");
+	}
+
+	@Test // GH-3322
+	void buildsLookupWithLocalAndForeignFieldAsWellAsLetAndPipeline() {
+
+		LookupOperation lookupOperation = Aggregation.lookup().from("restaurants") //
+				.localField("restaurant_name")
+				.foreignField("name")
+				.let(newVariable("orders_drink").forField("drink")) //
+				.pipeline(match(ctx -> new Document("$expr", new Document("$in", List.of("$$orders_drink", "$beverages")))))
+				.as("matches");
+
+		assertThat(lookupOperation.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("""
+				{ $lookup: {
+					from: "restaurants",
+					localField: "restaurant_name",
+					foreignField: "name",
+					let: { orders_drink: "$drink" },
+					pipeline: [{
+						$match: {
+							$expr: { $in: [ "$$orders_drink", "$beverages" ] }
+						}
+					}],
+					as: "matches"
+				}}
+				""");
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MatchOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MatchOperationUnitTests.java
new file mode 100644
index 0000000000..ec3decb7a8
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MatchOperationUnitTests.java
@@ -0,0 +1,23 @@
+package org.springframework.data.mongodb.core.aggregation;
+
+
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link MatchOperation}.
+ *
+ * @author Divya Srivastava
+ */
+class MatchOperationUnitTests {
+
+	@Test // GH-3790
+	void matchShouldRenderCorrectly() {
+
+		MatchOperation operation = Aggregation.match(ArithmeticOperators.valueOf("quiz").stdDevPop());
+		assertThat(operation.toDocument(Aggregation.DEFAULT_CONTEXT)).
+				isEqualTo("{ $match: { \"$stdDevPop\" : \"$quiz\" } } ");
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MergeOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MergeOperationUnitTests.java
new file mode 100644
index 0000000000..18980f6a06
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MergeOperationUnitTests.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import static org.springframework.data.mongodb.core.aggregation.MergeOperation.*;
+import static org.springframework.data.mongodb.core.aggregation.MergeOperation.WhenDocumentsMatch.*;
+
+import java.util.Arrays;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.aggregation.AccumulatorOperators.Sum;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * Unit tests for {@link MergeOperation}.
+ *
+ * @author Christoph Strobl
+ */
+class MergeOperationUnitTests {
+
+	private static final String OUT_COLLECTION = "target-collection";
+	private static final String OUT_DB = "target-db";
+
+	private static final Document OUT = new Document("db", OUT_DB).append("coll", OUT_COLLECTION);
+
+	@Test // DATAMONGO-2363
+	void justCollection() {
+
+		assertThat(mergeInto(OUT_COLLECTION).toDocument(DEFAULT_CONTEXT)).isEqualTo(new Document("$merge", OUT_COLLECTION));
+	}
+
+	@Test // DATAMONGO-2363
+	void collectionInDatabase() {
+
+		assertThat(merge().intoCollection(OUT_COLLECTION).inDatabase("target-db").build().toDocument(DEFAULT_CONTEXT))
+				.isEqualTo(new Document("$merge", new Document("into", OUT)));
+	}
+
+	@Test // DATAMONGO-2363
+	void singleOn() {
+
+		assertThat(merge().intoCollection(OUT_COLLECTION).on("id-field").build().toDocument(DEFAULT_CONTEXT))
+				.isEqualTo(new Document("$merge", new Document("into", OUT_COLLECTION).append("on", "id-field")));
+	}
+
+	@Test // DATAMONGO-2363
+	void multipleOn() {
+
+		assertThat(merge().intoCollection(OUT_COLLECTION).on("field-1", "field-2").build().toDocument(DEFAULT_CONTEXT))
+				.isEqualTo(new Document("$merge",
+						new Document("into", OUT_COLLECTION).append("on", Arrays.asList("field-1", "field-2"))));
+	}
+
+	@Test // DATAMONGO-2363
+	void collectionAndSimpleArgs() {
+
+		assertThat(merge().intoCollection(OUT_COLLECTION).on("_id").whenMatched(replaceDocument())
+				.whenNotMatched(WhenDocumentsDontMatch.insertNewDocument()).build().toDocument(DEFAULT_CONTEXT))
+						.isEqualTo(new Document("$merge", new Document("into", OUT_COLLECTION).append("on", "_id")
+								.append("whenMatched", "replace").append("whenNotMatched", "insert")));
+	}
+
+	@Test // DATAMONGO-2363
+	void whenMatchedWithAggregation() {
+
+		String expected = "{ \"$merge\" : {\"into\": \"" + OUT_COLLECTION + "\", \"whenMatched\":  ["
+				+ "{ \"$addFields\" : {" //
+				+ "\"thumbsup\": { \"$sum\":[ \"$thumbsup\", \"$$new.thumbsup\" ] },"
+				+ "\"thumbsdown\": { \"$sum\": [ \"$thumbsdown\", \"$$new.thumbsdown\" ] } } } ]" //
+				+ "} }";
+
+		Aggregation update = Aggregation
+				.newAggregation(AddFieldsOperation.addField("thumbsup").withValueOf(Sum.sumOf("thumbsup").and("$$new.thumbsup"))
+						.addField("thumbsdown").withValueOf(Sum.sumOf("thumbsdown").and("$$new.thumbsdown")).build());
+
+		assertThat(
+				merge().intoCollection(OUT_COLLECTION).whenDocumentsMatchApply(update).build().toDocument(DEFAULT_CONTEXT))
+						.isEqualTo(Document.parse(expected));
+	}
+
+	@Test // DATAMONGO-2363
+	void mapsFieldNames() {
+
+		assertThat(merge().intoCollection("newrestaurants").on("date", "postCode").build()
+				.toDocument(contextFor(Restaurant.class))).isEqualTo(
+						Document.parse("{ \"$merge\": { \"into\": \"newrestaurants\", \"on\": [ \"date\", \"post_code\" ] } }"));
+	}
+
+	private static AggregationOperationContext contextFor(@Nullable Class<?> type) {
+
+		if (type == null) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				new MongoMappingContext());
+		mongoConverter.afterPropertiesSet();
+
+		return new TypeBasedAggregationOperationContext(type, mongoConverter.getMappingContext(),
+				new QueryMapper(mongoConverter)).continueOnMissingFieldReference();
+	}
+
+	static class Restaurant {
+
+		@Field("post_code") String postCode;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java
index dc9ef359a5..52b51ad251 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/MeterData.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ObjectOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ObjectOperatorsUnitTests.java
index 7dca69e055..05d5a2d758 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ObjectOperatorsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ObjectOperatorsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,9 +18,12 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
-import org.springframework.data.mongodb.core.aggregation.Aggregation.SystemVariable;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.aggregation.ObjectOperators.MergeObjects;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
 /**
  * Unit tests for {@link ObjectOperators}.
@@ -67,10 +70,9 @@ public void mergeMuliFieldReference() {
 	@Test // DATAMONGO-2053
 	public void mergeMixed() {
 
-		assertThat(
-				ObjectOperators.valueOf("kettricken").mergeWithValuesOf(EXPRESSION).mergeWithValuesOf("verity")
-						.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
-								Document.parse("{ $mergeObjects: [ \"$kettricken\", " + EXPRESSION_STRING + ", \"$verity\" ] } "));
+		assertThat(ObjectOperators.valueOf("kettricken").mergeWithValuesOf(EXPRESSION).mergeWithValuesOf("verity")
+				.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
+						Document.parse("{ $mergeObjects: [ \"$kettricken\", " + EXPRESSION_STRING + ", \"$verity\" ] } "));
 	}
 
 	@Test // DATAMONGO-2053
@@ -104,4 +106,52 @@ public void toArrayWithExpression() {
 				.isEqualTo(Document.parse("{ $objectToArray : " + EXPRESSION_STRING + " }"));
 	}
 
+	@Test // GH-4139
+	public void getField() {
+
+		assertThat(ObjectOperators.valueOf("batman").getField("robin").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $getField : { field : \"robin\", input : \"$batman\" }}"));
+	}
+
+	@Test // GH-4464
+	public void getFieldOfCurrent() {
+
+		assertThat(ObjectOperators.valueOf(Aggregation.CURRENT).getField("robin").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $getField : { field : \"robin\", input : \"$$CURRENT\" }}"));
+	}
+
+	@Test // GH-4464
+	public void getFieldOfMappedKey() {
+
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, new MongoMappingContext());
+		converter.afterPropertiesSet();
+
+		assertThat(ObjectOperators.getValueOf("population").toDocument(new RelaxedTypeBasedAggregationOperationContext(ZipInfo.class, converter.getMappingContext(), new QueryMapper(converter))))
+				.isEqualTo(Document.parse("{ $getField : { field :  \"pop\", input : \"$$CURRENT\" } }"));
+	}
+
+	@Test // GH-4139
+	public void setField() {
+
+		assertThat(ObjectOperators.valueOf("batman").setField("friend").toValue("robin").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $setField : { field : \"friend\", value : \"robin\", input : \"$batman\" }}"));
+	}
+
+	@Test // GH-4464
+	public void setFieldOfMappedKey() {
+
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, new MongoMappingContext());
+		converter.afterPropertiesSet();
+
+		assertThat(ObjectOperators.setValueTo("population", "robin").toDocument(new RelaxedTypeBasedAggregationOperationContext(ZipInfo.class, converter.getMappingContext(), new QueryMapper(converter))))
+				.isEqualTo(Document.parse("{ $setField : { field : \"pop\", value : \"robin\", input : \"$$CURRENT\" }}"));
+	}
+
+	@Test // GH-4139
+	public void removeField() {
+
+		assertThat(ObjectOperators.valueOf("batman").removeField("joker").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo(Document.parse("{ $setField : { field : \"joker\", value : \"$$REMOVE\", input : \"$batman\" }}"));
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Order.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Order.java
index 33b66552f1..a463b72cff 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Order.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Order.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,8 @@
 import java.util.Date;
 import java.util.List;
 
+import org.springframework.lang.Contract;
+
 /**
  * @author Thomas Darimont
  */
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/OutOperationUnitTest.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/OutOperationUnitTest.java
index c082a547d3..f8812448b3 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/OutOperationUnitTest.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/OutOperationUnitTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link OutOperation}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Product.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Product.java
index e9bf2b46ca..59d374bd73 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Product.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/Product.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperationUnitTests.java
index 12f8509873..b904807d65 100755
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ProjectionOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,22 +17,19 @@
 
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-import static org.springframework.data.mongodb.core.aggregation.AggregationFunctionExpressions.*;
 import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 import static org.springframework.data.mongodb.core.aggregation.VariableOperators.Let.ExpressionVariable.*;
 import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
-import lombok.Data;
-
 import java.util.Arrays;
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
+import org.springframework.data.mongodb.core.aggregation.ArithmeticOperators.Subtract;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Reduce;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Reduce.PropertyExpression;
 import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Reduce.Variable;
@@ -55,24 +52,25 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
+ * @author Divya Srivastava
  * @author Mark Paluch
  */
 public class ProjectionOperationUnitTests {
 
-	static final String MOD = "$mod";
-	static final String ADD = "$add";
-	static final String SUBTRACT = "$subtract";
-	static final String MULTIPLY = "$multiply";
-	static final String DIVIDE = "$divide";
-	static final String PROJECT = "$project";
+	private static final String MOD = "$mod";
+	private static final String ADD = "$add";
+	private static final String SUBTRACT = "$subtract";
+	private static final String MULTIPLY = "$multiply";
+	private static final String DIVIDE = "$divide";
+	private static final String PROJECT = "$project";
 
 	@Test // DATAMONGO-586
-	public void rejectsNullFields() {
+	void rejectsNullFields() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ProjectionOperation((Fields) null));
 	}
 
 	@Test // DATAMONGO-586
-	public void declaresBackReferenceCorrectly() {
+	void declaresBackReferenceCorrectly() {
 
 		ProjectionOperation operation = new ProjectionOperation();
 		operation = operation.and("prop").previousOperation();
@@ -83,7 +81,7 @@ public void declaresBackReferenceCorrectly() {
 	}
 
 	@Test // DATAMONGO-586
-	public void alwaysUsesExplicitReference() {
+	void alwaysUsesExplicitReference() {
 
 		ProjectionOperation operation = new ProjectionOperation(Fields.fields("foo").and("bar", "foobar"));
 
@@ -95,7 +93,7 @@ public void alwaysUsesExplicitReference() {
 	}
 
 	@Test // DATAMONGO-586
-	public void aliasesSimpleFieldProjection() {
+	void aliasesSimpleFieldProjection() {
 
 		ProjectionOperation operation = new ProjectionOperation();
 
@@ -106,7 +104,7 @@ public void aliasesSimpleFieldProjection() {
 	}
 
 	@Test // DATAMONGO-586
-	public void aliasesArithmeticProjection() {
+	void aliasesArithmeticProjection() {
 
 		ProjectionOperation operation = new ProjectionOperation();
 
@@ -121,7 +119,7 @@ public void aliasesArithmeticProjection() {
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmeticProjectionOperationWithoutAlias() {
+	void arithmeticProjectionOperationWithoutAlias() {
 
 		String fieldName = "a";
 		ProjectionOperationBuilder operation = new ProjectionOperation().and(fieldName).plus(1);
@@ -134,7 +132,7 @@ public void arithmeticProjectionOperationWithoutAlias() {
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmeticProjectionOperationPlus() {
+	void arithmeticProjectionOperationPlus() {
 
 		String fieldName = "a";
 		String fieldAlias = "b";
@@ -148,7 +146,7 @@ public void arithmeticProjectionOperationPlus() {
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmeticProjectionOperationMinus() {
+	void arithmeticProjectionOperationMinus() {
 
 		String fieldName = "a";
 		String fieldAlias = "b";
@@ -162,7 +160,7 @@ public void arithmeticProjectionOperationMinus() {
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmeticProjectionOperationMultiply() {
+	void arithmeticProjectionOperationMultiply() {
 
 		String fieldName = "a";
 		String fieldAlias = "b";
@@ -176,7 +174,7 @@ public void arithmeticProjectionOperationMultiply() {
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmeticProjectionOperationDivide() {
+	void arithmeticProjectionOperationDivide() {
 
 		String fieldName = "a";
 		String fieldAlias = "b";
@@ -190,12 +188,12 @@ public void arithmeticProjectionOperationDivide() {
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmeticProjectionOperationDivideByZeroException() {
+	void arithmeticProjectionOperationDivideByZeroException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ProjectionOperation().and("a").divide(0));
 	}
 
 	@Test // DATAMONGO-586
-	public void arithmeticProjectionOperationMod() {
+	void arithmeticProjectionOperationMod() {
 
 		String fieldName = "a";
 		String fieldAlias = "b";
@@ -209,7 +207,7 @@ public void arithmeticProjectionOperationMod() {
 	}
 
 	@Test // DATAMONGO-758, DATAMONGO-1893
-	public void excludeShouldAllowExclusionOfFieldsOtherThanUnderscoreId/* since MongoDB 3.4 */() {
+	void excludeShouldAllowExclusionOfFieldsOtherThanUnderscoreId/* since MongoDB 3.4 */() {
 
 		ProjectionOperation projectionOp = new ProjectionOperation().andExclude("foo");
 		Document document = projectionOp.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -220,7 +218,7 @@ public void arithmeticProjectionOperationMod() {
 	}
 
 	@Test // DATAMONGO-1893
-	public void includeShouldNotInheritFields() {
+	void includeShouldNotInheritFields() {
 
 		ProjectionOperation projectionOp = new ProjectionOperation().andInclude("foo");
 
@@ -228,7 +226,7 @@ public void includeShouldNotInheritFields() {
 	}
 
 	@Test // DATAMONGO-758
-	public void excludeShouldAllowExclusionOfUnderscoreId() {
+	void excludeShouldAllowExclusionOfUnderscoreId() {
 
 		ProjectionOperation projectionOp = new ProjectionOperation().andExclude(Fields.UNDERSCORE_ID);
 		Document document = projectionOp.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -237,7 +235,7 @@ public void excludeShouldAllowExclusionOfUnderscoreId() {
 	}
 
 	@Test // DATAMONGO-1906
-	public void rendersConditionalProjectionCorrectly() {
+	void rendersConditionalProjectionCorrectly() {
 
 		TypedAggregation aggregation = Aggregation.newAggregation(Book.class,
 				Aggregation.project("title")
@@ -252,7 +250,7 @@ public void rendersConditionalProjectionCorrectly() {
 	}
 
 	@Test // DATAMONGO-757
-	public void usesImplictAndExplicitFieldAliasAndIncludeExclude() {
+	void usesImplictAndExplicitFieldAliasAndIncludeExclude() {
 
 		ProjectionOperation operation = Aggregation.project("foo").and("foobar").as("bar").andInclude("inc1", "inc2")
 				.andExclude("_id");
@@ -268,12 +266,12 @@ public void usesImplictAndExplicitFieldAliasAndIncludeExclude() {
 	}
 
 	@Test
-	public void arithmeticProjectionOperationModByZeroException() {
+	void arithmeticProjectionOperationModByZeroException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ProjectionOperation().and("a").mod(0));
 	}
 
 	@Test // DATAMONGO-769
-	public void allowArithmeticOperationsWithFieldReferences() {
+	void allowArithmeticOperationsWithFieldReferences() {
 
 		ProjectionOperation operation = Aggregation.project() //
 				.and("foo").plus("bar").as("fooPlusBar") //
@@ -298,7 +296,7 @@ public void allowArithmeticOperationsWithFieldReferences() {
 	}
 
 	@Test // DATAMONGO-774
-	public void projectionExpressions() {
+	void projectionExpressions() {
 
 		ProjectionOperation operation = Aggregation.project() //
 				.andExpression("(netPrice + surCharge) * taxrate * [0]", 2).as("grossSalesPrice") //
@@ -310,7 +308,7 @@ public void projectionExpressions() {
 	}
 
 	@Test // DATAMONGO-975
-	public void shouldRenderDateTimeFragmentExtractionsForSimpleFieldProjectionsCorrectly() {
+	void shouldRenderDateTimeFragmentExtractionsForSimpleFieldProjectionsCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project() //
 				.and("date").extractHour().as("hour") //
@@ -343,7 +341,7 @@ public void shouldRenderDateTimeFragmentExtractionsForSimpleFieldProjectionsCorr
 	}
 
 	@Test // DATAMONGO-975
-	public void shouldRenderDateTimeFragmentExtractionsForExpressionProjectionsCorrectly() throws Exception {
+	void shouldRenderDateTimeFragmentExtractionsForExpressionProjectionsCorrectly() throws Exception {
 
 		ProjectionOperation operation = Aggregation.project() //
 				.andExpression("date + 86400000") //
@@ -360,7 +358,7 @@ public void shouldRenderDateTimeFragmentExtractionsForExpressionProjectionsCorre
 	}
 
 	@Test // DATAMONGO-979
-	public void shouldRenderSizeExpressionInProjection() {
+	void shouldRenderSizeExpressionInProjection() {
 
 		ProjectionOperation operation = Aggregation //
 				.project() //
@@ -375,21 +373,21 @@ public void shouldRenderSizeExpressionInProjection() {
 	}
 
 	@Test // DATAMONGO-979
-	public void shouldRenderGenericSizeExpressionInProjection() {
+	void shouldRenderGenericSizeExpressionInProjection() {
 
 		ProjectionOperation operation = Aggregation //
 				.project() //
-				.and(SIZE.of(field("tags"))) //
+				.and(ArrayOperators.arrayOf("tags").length()) //
 				.as("tags_count");
 
 		Document document = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		Document projected = extractOperation("$project", document);
-		assertThat(projected.get("tags_count")).isEqualTo(new Document("$size", Arrays.asList("$tags")));
+		assertThat(projected.get("tags_count")).isEqualTo(new Document("$size", "$tags"));
 	}
 
 	@Test // DATAMONGO-1457
-	public void shouldRenderSliceCorrectly() throws Exception {
+	void shouldRenderSliceCorrectly() throws Exception {
 
 		ProjectionOperation operation = Aggregation.project().and("field").slice(10).as("renamed");
 
@@ -400,7 +398,7 @@ public void shouldRenderSliceCorrectly() throws Exception {
 	}
 
 	@Test // DATAMONGO-1457
-	public void shouldRenderSliceWithPositionCorrectly() throws Exception {
+	void shouldRenderSliceWithPositionCorrectly() throws Exception {
 
 		ProjectionOperation operation = Aggregation.project().and("field").slice(10, 5).as("renamed");
 
@@ -411,7 +409,7 @@ public void shouldRenderSliceWithPositionCorrectly() throws Exception {
 	}
 
 	@Test // DATAMONGO-784
-	public void shouldRenderCmpCorrectly() {
+	void shouldRenderCmpCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project().and("field").cmp(10).as("cmp10");
 
@@ -420,7 +418,7 @@ public void shouldRenderCmpCorrectly() {
 	}
 
 	@Test // DATAMONGO-784
-	public void shouldRenderEqCorrectly() {
+	void shouldRenderEqCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project().and("field").eq(10).as("eq10");
 
@@ -429,7 +427,7 @@ public void shouldRenderEqCorrectly() {
 	}
 
 	@Test // DATAMONGO-784
-	public void shouldRenderGtCorrectly() {
+	void shouldRenderGtCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project().and("field").gt(10).as("gt10");
 
@@ -438,7 +436,7 @@ public void shouldRenderGtCorrectly() {
 	}
 
 	@Test // DATAMONGO-784
-	public void shouldRenderGteCorrectly() {
+	void shouldRenderGteCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project().and("field").gte(10).as("gte10");
 
@@ -447,7 +445,7 @@ public void shouldRenderGteCorrectly() {
 	}
 
 	@Test // DATAMONGO-784
-	public void shouldRenderLtCorrectly() {
+	void shouldRenderLtCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project().and("field").lt(10).as("lt10");
 
@@ -456,7 +454,7 @@ public void shouldRenderLtCorrectly() {
 	}
 
 	@Test // DATAMONGO-784
-	public void shouldRenderLteCorrectly() {
+	void shouldRenderLteCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project().and("field").lte(10).as("lte10");
 
@@ -465,7 +463,7 @@ public void shouldRenderLteCorrectly() {
 	}
 
 	@Test // DATAMONGO-784
-	public void shouldRenderNeCorrectly() {
+	void shouldRenderNeCorrectly() {
 
 		ProjectionOperation operation = Aggregation.project().and("field").ne(10).as("ne10");
 
@@ -474,7 +472,7 @@ public void shouldRenderNeCorrectly() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetEquals() {
+	void shouldRenderSetEquals() {
 
 		Document agg = project("A", "B").and("A").equalsArrays("B").as("sameElements")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -484,7 +482,7 @@ public void shouldRenderSetEquals() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetEqualsAggregationExpresssion() {
+	void shouldRenderSetEqualsAggregationExpresssion() {
 
 		Document agg = project("A", "B").and(SetOperators.arrayAsSet("A").isEqualTo("B")).as("sameElements")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -494,7 +492,7 @@ public void shouldRenderSetEqualsAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetIntersection() {
+	void shouldRenderSetIntersection() {
 
 		Document agg = project("A", "B").and("A").intersectsArrays("B").as("commonToBoth")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -504,7 +502,7 @@ public void shouldRenderSetIntersection() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetIntersectionAggregationExpresssion() {
+	void shouldRenderSetIntersectionAggregationExpresssion() {
 
 		Document agg = project("A", "B").and(SetOperators.arrayAsSet("A").intersects("B")).as("commonToBoth")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -514,7 +512,7 @@ public void shouldRenderSetIntersectionAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetUnion() {
+	void shouldRenderSetUnion() {
 
 		Document agg = project("A", "B").and("A").unionArrays("B").as("allValues").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -523,7 +521,7 @@ public void shouldRenderSetUnion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetUnionAggregationExpresssion() {
+	void shouldRenderSetUnionAggregationExpresssion() {
 
 		Document agg = project("A", "B").and(SetOperators.arrayAsSet("A").union("B")).as("allValues")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -533,7 +531,7 @@ public void shouldRenderSetUnionAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetDifference() {
+	void shouldRenderSetDifference() {
 
 		Document agg = project("A", "B").and("B").differenceToArray("A").as("inBOnly")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -543,7 +541,7 @@ public void shouldRenderSetDifference() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetDifferenceAggregationExpresssion() {
+	void shouldRenderSetDifferenceAggregationExpresssion() {
 
 		Document agg = project("A", "B").and(SetOperators.arrayAsSet("B").differenceTo("A")).as("inBOnly")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -553,7 +551,7 @@ public void shouldRenderSetDifferenceAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetIsSubset() {
+	void shouldRenderSetIsSubset() {
 
 		Document agg = project("A", "B").and("A").subsetOfArray("B").as("aIsSubsetOfB")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -563,7 +561,7 @@ public void shouldRenderSetIsSubset() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSetIsSubsetAggregationExpresssion() {
+	void shouldRenderSetIsSubsetAggregationExpresssion() {
 
 		Document agg = project("A", "B").and(SetOperators.arrayAsSet("A").isSubsetOf("B")).as("aIsSubsetOfB")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -573,7 +571,7 @@ public void shouldRenderSetIsSubsetAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAnyElementTrue() {
+	void shouldRenderAnyElementTrue() {
 
 		Document agg = project("responses").and("responses").anyElementInArrayTrue().as("isAnyTrue")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -583,7 +581,7 @@ public void shouldRenderAnyElementTrue() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAnyElementTrueAggregationExpresssion() {
+	void shouldRenderAnyElementTrueAggregationExpresssion() {
 
 		Document agg = project("responses").and(SetOperators.arrayAsSet("responses").anyElementTrue()).as("isAnyTrue")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -593,7 +591,7 @@ public void shouldRenderAnyElementTrueAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAllElementsTrue() {
+	void shouldRenderAllElementsTrue() {
 
 		Document agg = project("responses").and("responses").allElementsInArrayTrue().as("isAllTrue")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -603,7 +601,7 @@ public void shouldRenderAllElementsTrue() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAllElementsTrueAggregationExpresssion() {
+	void shouldRenderAllElementsTrueAggregationExpresssion() {
 
 		Document agg = project("responses").and(SetOperators.arrayAsSet("responses").allElementsTrue()).as("isAllTrue")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -613,7 +611,7 @@ public void shouldRenderAllElementsTrueAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAbs() {
+	void shouldRenderAbs() {
 
 		Document agg = project().and("anyNumber").absoluteValue().as("absoluteValue")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -622,19 +620,18 @@ public void shouldRenderAbs() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAbsAggregationExpresssion() {
+	void shouldRenderAbsAggregationExpresssion() {
 
 		Document agg = project()
-				.and(
-						ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).abs())
-				.as("delta").toDocument(Aggregation.DEFAULT_CONTEXT);
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).abs()).as("delta")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { delta: { $abs: { $subtract: [ \"$start\", \"$end\" ] } } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAddAggregationExpresssion() {
+	void shouldRenderAddAggregationExpresssion() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("price").add("fee")).as("total")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -643,7 +640,7 @@ public void shouldRenderAddAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderCeil() {
+	void shouldRenderCeil() {
 
 		Document agg = project().and("anyNumber").ceil().as("ceilValue").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -651,21 +648,20 @@ public void shouldRenderCeil() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderCeilAggregationExpresssion() {
+	void shouldRenderCeilAggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).ceil())
-				.as("delta").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).ceil()).as("delta")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { delta: { $ceil: { $subtract: [ \"$start\", \"$end\" ] } } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderDivide() {
+	void shouldRenderDivide() {
 
-		Document agg = project().and("value")
-				.divide(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).as("result")
+		Document agg = project().and("value").divide(ArithmeticOperators.valueOf("start").subtract("end")).as("result")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(
@@ -673,11 +669,10 @@ public void shouldRenderDivide() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderDivideAggregationExpresssion() {
+	void shouldRenderDivideAggregationExpresssion() {
 
 		Document agg = project()
-				.and(ArithmeticOperators.valueOf("anyNumber")
-						.divideBy(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))))
+				.and(ArithmeticOperators.valueOf("anyNumber").divideBy(ArithmeticOperators.valueOf("start").subtract("end")))
 				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document
@@ -685,7 +680,7 @@ public void shouldRenderDivideAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderExp() {
+	void shouldRenderExp() {
 
 		Document agg = project().and("value").exp().as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -693,19 +688,18 @@ public void shouldRenderExp() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderExpAggregationExpresssion() {
+	void shouldRenderExpAggregationExpresssion() {
 
 		Document agg = project()
-				.and(
-						ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).exp())
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).exp()).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $exp: { $subtract: [ \"$start\", \"$end\" ] } } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderFloor() {
+	void shouldRenderFloor() {
 
 		Document agg = project().and("value").floor().as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -713,18 +707,18 @@ public void shouldRenderFloor() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderFloorAggregationExpresssion() {
+	void shouldRenderFloorAggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).floor())
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).floor()).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $floor: { $subtract: [ \"$start\", \"$end\" ] } } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLn() {
+	void shouldRenderLn() {
 
 		Document agg = project().and("value").ln().as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -732,10 +726,9 @@ public void shouldRenderLn() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLnAggregationExpresssion() {
+	void shouldRenderLnAggregationExpresssion() {
 
-		Document agg = project()
-				.and(ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).ln())
+		Document agg = project().and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).ln())
 				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
@@ -743,7 +736,7 @@ public void shouldRenderLnAggregationExpresssion() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLog() {
+	void shouldRenderLog() {
 
 		Document agg = project().and("value").log(2).as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -751,18 +744,18 @@ public void shouldRenderLog() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLogAggregationExpresssion() {
+	void shouldRenderLogAggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).log(2))
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).log(2)).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $log: [ { $subtract: [ \"$start\", \"$end\" ] }, 2] } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLog10() {
+	void shouldRenderLog10() {
 
 		Document agg = project().and("value").log10().as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -770,42 +763,41 @@ public void shouldRenderLog10() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLog10AggregationExpresssion() {
+	void shouldRenderLog10AggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).log10())
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).log10()).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $log10: { $subtract: [ \"$start\", \"$end\" ] } } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMod() {
+	void shouldRenderMod() {
 
-		Document agg = project().and("value").mod(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end")))
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project().and("value").mod(ArithmeticOperators.valueOf("start").subtract("end")).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(
 				Document.parse("{ $project: { result: { $mod: [\"$value\", { $subtract: [ \"$start\", \"$end\" ] }] } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderModAggregationExpresssion() {
+	void shouldRenderModAggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).mod(2))
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).mod(2)).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $mod: [{ $subtract: [ \"$start\", \"$end\" ] }, 2] } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMultiply() {
+	void shouldRenderMultiply() {
 
-		Document agg = project().and("value")
-				.multiply(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).as("result")
+		Document agg = project().and("value").multiply(ArithmeticOperators.valueOf("start").subtract("end")).as("result")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document
@@ -813,19 +805,17 @@ public void shouldRenderMultiply() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMultiplyAggregationExpresssion() {
+	void shouldRenderMultiplyAggregationExpresssion() {
 
-		Document agg = project()
-				.and(ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end")))
-						.multiplyBy(2).multiplyBy("refToAnotherNumber"))
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project().and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end"))
+				.multiplyBy(2).multiplyBy("refToAnotherNumber")).as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse(
 				"{ $project: { result: { $multiply: [{ $subtract: [ \"$start\", \"$end\" ] }, 2, \"$refToAnotherNumber\"] } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderPow() {
+	void shouldRenderPow() {
 
 		Document agg = project().and("value").pow(2).as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -833,18 +823,18 @@ public void shouldRenderPow() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderPowAggregationExpresssion() {
+	void shouldRenderPowAggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).pow(2))
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).pow(2)).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $pow: [{ $subtract: [ \"$start\", \"$end\" ] }, 2] } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSqrt() {
+	void shouldRenderSqrt() {
 
 		Document agg = project().and("value").sqrt().as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -852,40 +842,39 @@ public void shouldRenderSqrt() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSqrtAggregationExpresssion() {
+	void shouldRenderSqrtAggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).sqrt())
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).sqrt()).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $sqrt: { $subtract: [ \"$start\", \"$end\" ] } } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSubtract() {
+	void shouldRenderSubtract() {
 
-		Document agg = project().and("numericField").minus(AggregationFunctionExpressions.SIZE.of(field("someArray")))
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project().and("numericField").minus(ArrayOperators.arrayOf("someArray").length()).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(
-				Document.parse("{ $project: { result: { $subtract: [ \"$numericField\", { $size : [\"$someArray\"]}] } } }"));
+				Document.parse("{ $project: { result: { $subtract: [ \"$numericField\", { $size : \"$someArray\"}] } } }"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSubtractAggregationExpresssion() {
+	void shouldRenderSubtractAggregationExpresssion() {
 
 		Document agg = project()
-				.and(ArithmeticOperators.valueOf("numericField")
-						.subtract(AggregationFunctionExpressions.SIZE.of(field("someArray"))))
+				.and(ArithmeticOperators.valueOf("numericField").subtract(ArrayOperators.arrayOf("someArray").length()))
 				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(
-				Document.parse("{ $project: { result: { $subtract: [ \"$numericField\", { $size : [\"$someArray\"]}] } } }"));
+				Document.parse("{ $project: { result: { $subtract: [ \"$numericField\", { $size : \"$someArray\"}] } } }"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderTrunc() {
+	void shouldRenderTrunc() {
 
 		Document agg = project().and("value").trunc().as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -893,18 +882,18 @@ public void shouldRenderTrunc() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderTruncAggregationExpresssion() {
+	void shouldRenderTruncAggregationExpresssion() {
 
-		Document agg = project().and(
-				ArithmeticOperators.valueOf(AggregationFunctionExpressions.SUBTRACT.of(field("start"), field("end"))).trunc())
-				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
+		Document agg = project()
+				.and(ArithmeticOperators.valueOf(ArithmeticOperators.valueOf("start").subtract("end")).trunc()).as("result")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg)
 				.isEqualTo(Document.parse("{ $project: { result: { $trunc: { $subtract: [ \"$start\", \"$end\" ] } } }}"));
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderConcat() {
+	void shouldRenderConcat() {
 
 		Document agg = project().and("item").concat(" - ", field("description")).as("itemDescription")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -915,7 +904,7 @@ public void shouldRenderConcat() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderConcatAggregationExpression() {
+	void shouldRenderConcatAggregationExpression() {
 
 		Document agg = project().and(StringOperators.valueOf("item").concat(" - ").concatValueOf("description"))
 				.as("itemDescription").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -926,7 +915,7 @@ public void shouldRenderConcatAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSubstr() {
+	void shouldRenderSubstr() {
 
 		Document agg = project().and("quarter").substring(0, 2).as("yearSubstring").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -934,7 +923,7 @@ public void shouldRenderSubstr() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSubstrAggregationExpression() {
+	void shouldRenderSubstrAggregationExpression() {
 
 		Document agg = project().and(StringOperators.valueOf("quarter").substring(0, 2)).as("yearSubstring")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -943,7 +932,7 @@ public void shouldRenderSubstrAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderToLower() {
+	void shouldRenderToLower() {
 
 		Document agg = project().and("item").toLower().as("item").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -951,7 +940,7 @@ public void shouldRenderToLower() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderToLowerAggregationExpression() {
+	void shouldRenderToLowerAggregationExpression() {
 
 		Document agg = project().and(StringOperators.valueOf("item").toLower()).as("item")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -960,7 +949,7 @@ public void shouldRenderToLowerAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderToUpper() {
+	void shouldRenderToUpper() {
 
 		Document agg = project().and("item").toUpper().as("item").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -968,7 +957,7 @@ public void shouldRenderToUpper() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderToUpperAggregationExpression() {
+	void shouldRenderToUpperAggregationExpression() {
 
 		Document agg = project().and(StringOperators.valueOf("item").toUpper()).as("item")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -977,7 +966,7 @@ public void shouldRenderToUpperAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderStrCaseCmp() {
+	void shouldRenderStrCaseCmp() {
 
 		Document agg = project().and("quarter").strCaseCmp("13q4").as("comparisonResult")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -987,7 +976,7 @@ public void shouldRenderStrCaseCmp() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderStrCaseCmpAggregationExpression() {
+	void shouldRenderStrCaseCmpAggregationExpression() {
 
 		Document agg = project().and(StringOperators.valueOf("quarter").strCaseCmp("13q4")).as("comparisonResult")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -997,7 +986,7 @@ public void shouldRenderStrCaseCmpAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderArrayElementAt() {
+	void shouldRenderArrayElementAt() {
 
 		Document agg = project().and("favorites").arrayElementAt(0).as("first").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -1005,7 +994,7 @@ public void shouldRenderArrayElementAt() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderArrayElementAtAggregationExpression() {
+	void shouldRenderArrayElementAtAggregationExpression() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("favorites").elementAt(0)).as("first")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1014,7 +1003,7 @@ public void shouldRenderArrayElementAtAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderConcatArrays() {
+	void shouldRenderConcatArrays() {
 
 		Document agg = project().and("instock").concatArrays("ordered").as("items").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -1023,7 +1012,7 @@ public void shouldRenderConcatArrays() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderConcatArraysAggregationExpression() {
+	void shouldRenderConcatArraysAggregationExpression() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("instock").concat("ordered")).as("items")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1033,7 +1022,7 @@ public void shouldRenderConcatArraysAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderIsArray() {
+	void shouldRenderIsArray() {
 
 		Document agg = project().and("instock").isArray().as("isAnArray").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -1041,7 +1030,7 @@ public void shouldRenderIsArray() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderIsArrayAggregationExpression() {
+	void shouldRenderIsArrayAggregationExpression() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("instock").isArray()).as("isAnArray")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1050,7 +1039,7 @@ public void shouldRenderIsArrayAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSizeAggregationExpression() {
+	void shouldRenderSizeAggregationExpression() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("instock").length()).as("arraySize")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1059,7 +1048,7 @@ public void shouldRenderSizeAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSliceAggregationExpression() {
+	void shouldRenderSliceAggregationExpression() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("favorites").slice().itemCount(3)).as("threeFavorites")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1068,7 +1057,7 @@ public void shouldRenderSliceAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSliceWithPositionAggregationExpression() {
+	void shouldRenderSliceWithPositionAggregationExpression() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("favorites").slice().offset(2).itemCount(3))
 				.as("threeFavorites").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1076,8 +1065,19 @@ public void shouldRenderSliceWithPositionAggregationExpression() {
 		assertThat(agg).isEqualTo(Document.parse("{ $project: { threeFavorites: { $slice: [ \"$favorites\", 2, 3 ] } } }"));
 	}
 
+	@Test // DATAMONGO-4857
+	void shouldRenderSliceWithExpressions() {
+
+		Document agg = project().and(ArrayOperators.arrayOf("favorites").slice()
+				.offset(Subtract.valueOf(ArrayOperators.Size.lengthOfArray("myArray")).subtract(1))
+				.itemCount(ArithmeticOperators.rand())).as("threeFavorites").toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg).isEqualTo(Document.parse(
+				"{ $project: { threeFavorites: { $slice: [ \"$favorites\", { \"$subtract\":  [ {\"$size\": \"$myArray\"}, 1]}, { $rand : {} } ] } } }"));
+	}
+
 	@Test // DATAMONGO-1536
-	public void shouldRenderLiteral() {
+	void shouldRenderLiteral() {
 
 		Document agg = project().and("$1").asLiteral().as("literalOnly").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -1085,7 +1085,7 @@ public void shouldRenderLiteral() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLiteralAggregationExpression() {
+	void shouldRenderLiteralAggregationExpression() {
 
 		Document agg = project().and(LiteralOperators.valueOf("$1").asLiteral()).as("literalOnly")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1094,7 +1094,7 @@ public void shouldRenderLiteralAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderDayOfYearAggregationExpression() {
+	void shouldRenderDayOfYearAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").dayOfYear()).as("dayOfYear")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1103,7 +1103,7 @@ public void shouldRenderDayOfYearAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDayOfYearAggregationExpressionWithTimezone() {
+	void shouldRenderDayOfYearAggregationExpressionWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).dayOfYear()).as("dayOfYear")
@@ -1114,7 +1114,7 @@ public void shouldRenderDayOfYearAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderTimeZoneFromField() {
+	void shouldRenderTimeZoneFromField() {
 
 		Document agg = project().and(DateOperators.dateOf("date").withTimezone(Timezone.ofField("tz")).dayOfYear())
 				.as("dayOfYear").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1124,7 +1124,7 @@ public void shouldRenderTimeZoneFromField() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderTimeZoneFromExpression() {
+	void shouldRenderTimeZoneFromExpression() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date")
@@ -1136,7 +1136,7 @@ public void shouldRenderTimeZoneFromExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderDayOfMonthAggregationExpression() {
+	void shouldRenderDayOfMonthAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").dayOfMonth()).as("day")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1145,7 +1145,7 @@ public void shouldRenderDayOfMonthAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDayOfMonthAggregationExpressionWithTimezone() {
+	void shouldRenderDayOfMonthAggregationExpressionWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).dayOfMonth()).as("day")
@@ -1156,7 +1156,7 @@ public void shouldRenderDayOfMonthAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderDayOfWeekAggregationExpression() {
+	void shouldRenderDayOfWeekAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").dayOfWeek()).as("dayOfWeek")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1165,7 +1165,7 @@ public void shouldRenderDayOfWeekAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDayOfWeekAggregationExpressionWithTimezone() {
+	void shouldRenderDayOfWeekAggregationExpressionWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).dayOfWeek()).as("dayOfWeek")
@@ -1176,7 +1176,7 @@ public void shouldRenderDayOfWeekAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderYearAggregationExpression() {
+	void shouldRenderYearAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").year()).as("year")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1185,7 +1185,7 @@ public void shouldRenderYearAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderYearAggregationExpressionWithTimezone() {
+	void shouldRenderYearAggregationExpressionWithTimezone() {
 
 		Document agg = project().and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).year())
 				.as("year").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1195,7 +1195,7 @@ public void shouldRenderYearAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMonthAggregationExpression() {
+	void shouldRenderMonthAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").month()).as("month")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1204,7 +1204,7 @@ public void shouldRenderMonthAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderMonthAggregationExpressionWithTimezone() {
+	void shouldRenderMonthAggregationExpressionWithTimezone() {
 
 		Document agg = project().and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).month())
 				.as("month").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1214,7 +1214,7 @@ public void shouldRenderMonthAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderWeekAggregationExpression() {
+	void shouldRenderWeekAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").week()).as("week")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1223,7 +1223,7 @@ public void shouldRenderWeekAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderWeekAggregationExpressionWithTimezone() {
+	void shouldRenderWeekAggregationExpressionWithTimezone() {
 
 		Document agg = project().and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).week())
 				.as("week").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1233,7 +1233,7 @@ public void shouldRenderWeekAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderHourAggregationExpression() {
+	void shouldRenderHourAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").hour()).as("hour")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1242,7 +1242,7 @@ public void shouldRenderHourAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderHourAggregationExpressionWithTimezone() {
+	void shouldRenderHourAggregationExpressionWithTimezone() {
 
 		Document agg = project().and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).hour())
 				.as("hour").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1252,7 +1252,7 @@ public void shouldRenderHourAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMinuteAggregationExpression() {
+	void shouldRenderMinuteAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").minute()).as("minute")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1261,7 +1261,7 @@ public void shouldRenderMinuteAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderMinuteAggregationExpressionWithTimezone() {
+	void shouldRenderMinuteAggregationExpressionWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).minute()).as("minute")
@@ -1272,7 +1272,7 @@ public void shouldRenderMinuteAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSecondAggregationExpression() {
+	void shouldRenderSecondAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").second()).as("second")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1281,7 +1281,7 @@ public void shouldRenderSecondAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderSecondAggregationExpressionWithTimezone() {
+	void shouldRenderSecondAggregationExpressionWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).second()).as("second")
@@ -1292,7 +1292,7 @@ public void shouldRenderSecondAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMillisecondAggregationExpression() {
+	void shouldRenderMillisecondAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").millisecond()).as("msec")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1301,7 +1301,7 @@ public void shouldRenderMillisecondAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderMillisecondAggregationExpressionWithTimezone() {
+	void shouldRenderMillisecondAggregationExpressionWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).millisecond()).as("msec")
@@ -1312,7 +1312,7 @@ public void shouldRenderMillisecondAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderDateToString() {
+	void shouldRenderDateToString() {
 
 		Document agg = project().and("date").dateAsFormattedString("%H:%M:%S:%L").as("time")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1322,7 +1322,7 @@ public void shouldRenderDateToString() {
 	}
 
 	@Test // DATAMONGO-2047
-	public void shouldRenderDateToStringWithoutFormatOption() {
+	void shouldRenderDateToStringWithoutFormatOption() {
 
 		Document agg = project().and("date").dateAsFormattedString().as("time").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -1330,7 +1330,7 @@ public void shouldRenderDateToStringWithoutFormatOption() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderDateToStringAggregationExpression() {
+	void shouldRenderDateToStringAggregationExpression() {
 
 		Document agg = project().and(DateOperators.dateOf("date").toString("%H:%M:%S:%L")).as("time")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1340,7 +1340,7 @@ public void shouldRenderDateToStringAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1834, DATAMONGO-2047
-	public void shouldRenderDateToStringAggregationExpressionWithTimezone() {
+	void shouldRenderDateToStringAggregationExpressionWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).toString("%H:%M:%S:%L"))
@@ -1358,7 +1358,7 @@ public void shouldRenderDateToStringAggregationExpressionWithTimezone() {
 	}
 
 	@Test // DATAMONGO-2047
-	public void shouldRenderDateToStringWithOnNull() {
+	void shouldRenderDateToStringWithOnNull() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").toStringWithDefaultFormat().onNullReturnValueOf("fallback-field")).as("time")
@@ -1369,7 +1369,7 @@ public void shouldRenderDateToStringWithOnNull() {
 	}
 
 	@Test // DATAMONGO-2047
-	public void shouldRenderDateToStringWithOnNullExpression() {
+	void shouldRenderDateToStringWithOnNullExpression() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").toStringWithDefaultFormat()
@@ -1381,7 +1381,7 @@ public void shouldRenderDateToStringWithOnNullExpression() {
 	}
 
 	@Test // DATAMONGO-2047
-	public void shouldRenderDateToStringWithOnNullAndTimezone() {
+	void shouldRenderDateToStringWithOnNullAndTimezone() {
 
 		Document agg = project().and(DateOperators.dateOf("date").toStringWithDefaultFormat()
 				.onNullReturnValueOf("fallback-field").withTimezone(Timezone.ofField("foo"))).as("time")
@@ -1392,7 +1392,7 @@ public void shouldRenderDateToStringWithOnNullAndTimezone() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSumAggregationExpression() {
+	void shouldRenderSumAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("quizzes").sum()).as("quizTotal")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1401,7 +1401,7 @@ public void shouldRenderSumAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderSumWithMultipleArgsAggregationExpression() {
+	void shouldRenderSumWithMultipleArgsAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("final").sum().and("midterm")).as("examTotal")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1410,7 +1410,7 @@ public void shouldRenderSumWithMultipleArgsAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAvgAggregationExpression() {
+	void shouldRenderAvgAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("quizzes").avg()).as("quizAvg")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1419,7 +1419,7 @@ public void shouldRenderAvgAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderAvgWithMultipleArgsAggregationExpression() {
+	void shouldRenderAvgWithMultipleArgsAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("final").avg().and("midterm")).as("examAvg")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1428,7 +1428,7 @@ public void shouldRenderAvgWithMultipleArgsAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMaxAggregationExpression() {
+	void shouldRenderMaxAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("quizzes").max()).as("quizMax")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1437,7 +1437,7 @@ public void shouldRenderMaxAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMaxWithMultipleArgsAggregationExpression() {
+	void shouldRenderMaxWithMultipleArgsAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("final").max().and("midterm")).as("examMax")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1446,7 +1446,7 @@ public void shouldRenderMaxWithMultipleArgsAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMinAggregationExpression() {
+	void shouldRenderMinAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("quizzes").min()).as("quizMin")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1455,7 +1455,7 @@ public void shouldRenderMinAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderMinWithMultipleArgsAggregationExpression() {
+	void shouldRenderMinWithMultipleArgsAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("final").min().and("midterm")).as("examMin")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1464,7 +1464,7 @@ public void shouldRenderMinWithMultipleArgsAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderStdDevPopAggregationExpression() {
+	void shouldRenderStdDevPopAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("scores").stdDevPop()).as("stdDev")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1473,7 +1473,7 @@ public void shouldRenderStdDevPopAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderStdDevSampAggregationExpression() {
+	void shouldRenderStdDevSampAggregationExpression() {
 
 		Document agg = project().and(ArithmeticOperators.valueOf("scores").stdDevSamp()).as("stdDev")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1482,7 +1482,7 @@ public void shouldRenderStdDevSampAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderCmpAggregationExpression() {
+	void shouldRenderCmpAggregationExpression() {
 
 		Document agg = project().and(ComparisonOperators.valueOf("qty").compareToValue(250)).as("cmp250")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1491,7 +1491,7 @@ public void shouldRenderCmpAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderEqAggregationExpression() {
+	void shouldRenderEqAggregationExpression() {
 
 		Document agg = project().and(ComparisonOperators.valueOf("qty").equalToValue(250)).as("eq250")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1499,8 +1499,17 @@ public void shouldRenderEqAggregationExpression() {
 		assertThat(agg).isEqualTo(Document.parse("{ $project: { eq250: { $eq: [\"$qty\", 250]} } }"));
 	}
 
+	@Test // DATAMONGO-2513
+	void shouldRenderEqAggregationExpressionWithListComparison() {
+
+		Document agg = project().and(ComparisonOperators.valueOf("qty").equalToValue(Arrays.asList(250))).as("eq250")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg).isEqualTo(Document.parse("{ $project: { eq250: { $eq: [\"$qty\", [250]]} } }"));
+	}
+
 	@Test // DATAMONGO-1536
-	public void shouldRenderGtAggregationExpression() {
+	void shouldRenderGtAggregationExpression() {
 
 		Document agg = project().and(ComparisonOperators.valueOf("qty").greaterThanValue(250)).as("gt250")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1509,7 +1518,7 @@ public void shouldRenderGtAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderGteAggregationExpression() {
+	void shouldRenderGteAggregationExpression() {
 
 		Document agg = project().and(ComparisonOperators.valueOf("qty").greaterThanEqualToValue(250)).as("gte250")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1518,7 +1527,7 @@ public void shouldRenderGteAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLtAggregationExpression() {
+	void shouldRenderLtAggregationExpression() {
 
 		Document agg = project().and(ComparisonOperators.valueOf("qty").lessThanValue(250)).as("lt250")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1527,7 +1536,7 @@ public void shouldRenderLtAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLteAggregationExpression() {
+	void shouldRenderLteAggregationExpression() {
 
 		Document agg = project().and(ComparisonOperators.valueOf("qty").lessThanEqualToValue(250)).as("lte250")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1536,7 +1545,7 @@ public void shouldRenderLteAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderNeAggregationExpression() {
+	void shouldRenderNeAggregationExpression() {
 
 		Document agg = project().and(ComparisonOperators.valueOf("qty").notEqualToValue(250)).as("ne250")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1545,7 +1554,7 @@ public void shouldRenderNeAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLogicAndAggregationExpression() {
+	void shouldRenderLogicAndAggregationExpression() {
 
 		Document agg = project()
 				.and(BooleanOperators.valueOf(ComparisonOperators.valueOf("qty").greaterThanValue(100))
@@ -1557,7 +1566,7 @@ public void shouldRenderLogicAndAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderLogicOrAggregationExpression() {
+	void shouldRenderLogicOrAggregationExpression() {
 
 		Document agg = project()
 				.and(BooleanOperators.valueOf(ComparisonOperators.valueOf("qty").greaterThanValue(250))
@@ -1569,7 +1578,7 @@ public void shouldRenderLogicOrAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1536
-	public void shouldRenderNotAggregationExpression() {
+	void shouldRenderNotAggregationExpression() {
 
 		Document agg = project().and(BooleanOperators.not(ComparisonOperators.valueOf("qty").greaterThanValue(250)))
 				.as("result").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1578,11 +1587,10 @@ public void shouldRenderNotAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1540
-	public void shouldRenderMapAggregationExpression() {
+	void shouldRenderMapAggregationExpression() {
 
 		Document agg = Aggregation.project()
-				.and(VariableOperators.mapItemsOf("quizzes").as("grade")
-						.andApply(AggregationFunctionExpressions.ADD.of(field("grade"), 2)))
+				.and(VariableOperators.mapItemsOf("quizzes").as("grade").andApply(ArithmeticOperators.valueOf("grade").add(2)))
 				.as("adjustedGrades").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse(
@@ -1590,19 +1598,19 @@ public void shouldRenderMapAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1540
-	public void shouldRenderMapAggregationExpressionOnExpression() {
+	void shouldRenderMapAggregationExpressionOnExpression() {
 
 		Document agg = Aggregation.project()
-				.and(VariableOperators.mapItemsOf(AggregationFunctionExpressions.SIZE.of("foo")).as("grade")
-						.andApply(AggregationFunctionExpressions.ADD.of(field("grade"), 2)))
+				.and(VariableOperators.mapItemsOf(ArrayOperators.arrayOf("foo").length()).as("grade")
+						.andApply(ArithmeticOperators.valueOf("grade").add(2)))
 				.as("adjustedGrades").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse(
-				"{ $project:{ adjustedGrades:{ $map: { input: { $size : [\"foo\"]}, as: \"grade\",in: { $add: [ \"$$grade\", 2 ] }}}}}"));
+				"{ $project:{ adjustedGrades:{ $map: { input: { $size : \"$foo\"}, as: \"grade\",in: { $add: [ \"$$grade\", 2 ] }}}}}"));
 	}
 
 	@Test // DATAMONGO-861, DATAMONGO-1542
-	public void shouldRenderIfNullConditionAggregationExpression() {
+	void shouldRenderIfNullConditionAggregationExpression() {
 
 		Document agg = project().and(
 				ConditionalOperators.ifNull(ArrayOperators.arrayOf("array").elementAt(1)).then("a more sophisticated value"))
@@ -1613,7 +1621,7 @@ public void shouldRenderIfNullConditionAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-1542
-	public void shouldRenderIfNullValueAggregationExpression() {
+	void shouldRenderIfNullValueAggregationExpression() {
 
 		Document agg = project()
 				.and(ConditionalOperators.ifNull("field").then(ArrayOperators.arrayOf("array").elementAt(1))).as("result")
@@ -1624,7 +1632,7 @@ public void shouldRenderIfNullValueAggregationExpression() {
 	}
 
 	@Test // DATAMONGO-861, DATAMONGO-1542
-	public void fieldReplacementIfNullShouldRenderCorrectly() {
+	void fieldReplacementIfNullShouldRenderCorrectly() {
 
 		Document agg = project().and(ConditionalOperators.ifNull("optional").thenValueOf("$never-null")).as("result")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1634,16 +1642,14 @@ public void fieldReplacementIfNullShouldRenderCorrectly() {
 	}
 
 	@Test // DATAMONGO-1538
-	public void shouldRenderLetExpressionCorrectly() {
+	void shouldRenderLetExpressionCorrectly() {
 
 		Document agg = Aggregation.project()
 				.and(VariableOperators
-						.define(
-								newVariable("total")
-										.forExpression(AggregationFunctionExpressions.ADD.of(Fields.field("price"), Fields.field("tax"))),
+						.define(newVariable("total").forExpression(ArithmeticOperators.valueOf("price").add("tax")),
 								newVariable("discounted")
 										.forExpression(ConditionalOperators.Cond.when("applyDiscount").then(0.9D).otherwise(1.0D)))
-						.andApply(AggregationFunctionExpressions.MULTIPLY.of(Fields.field("total"), Fields.field("discounted")))) //
+						.andApply(ArithmeticOperators.valueOf("total").multiplyBy("discounted"))) //
 				.as("finalTotal").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse("{ $project:{  \"finalTotal\" : { \"$let\": {" + //
@@ -1656,18 +1662,16 @@ public void shouldRenderLetExpressionCorrectly() {
 	}
 
 	@Test // DATAMONGO-1538
-	public void shouldRenderLetExpressionCorrectlyWhenUsingLetOnProjectionBuilder() {
+	void shouldRenderLetExpressionCorrectlyWhenUsingLetOnProjectionBuilder() {
 
-		ExpressionVariable var1 = newVariable("total")
-				.forExpression(AggregationFunctionExpressions.ADD.of(Fields.field("price"), Fields.field("tax")));
+		ExpressionVariable var1 = newVariable("total").forExpression(ArithmeticOperators.valueOf("price").add("tax"));
 
 		ExpressionVariable var2 = newVariable("discounted")
 				.forExpression(ConditionalOperators.Cond.when("applyDiscount").then(0.9D).otherwise(1.0D));
 
 		Document agg = Aggregation.project().and("foo")
-				.let(Arrays.asList(var1, var2),
-						AggregationFunctionExpressions.MULTIPLY.of(Fields.field("total"), Fields.field("discounted")))
-				.as("finalTotal").toDocument(Aggregation.DEFAULT_CONTEXT);
+				.let(Arrays.asList(var1, var2), ArithmeticOperators.valueOf("total").multiplyBy("discounted")).as("finalTotal")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse("{ $project:{ \"finalTotal\" : { \"$let\": {" + //
 				"\"vars\": {" + //
@@ -1679,7 +1683,7 @@ public void shouldRenderLetExpressionCorrectlyWhenUsingLetOnProjectionBuilder()
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderIndexOfBytesCorrectly() {
+	void shouldRenderIndexOfBytesCorrectly() {
 
 		Document agg = project().and(StringOperators.valueOf("item").indexOf("foo")).as("byteLocation")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1689,7 +1693,7 @@ public void shouldRenderIndexOfBytesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderIndexOfBytesWithRangeCorrectly() {
+	void shouldRenderIndexOfBytesWithRangeCorrectly() {
 
 		Document agg = project()
 				.and(StringOperators.valueOf("item").indexOf("foo")
@@ -1701,7 +1705,7 @@ public void shouldRenderIndexOfBytesWithRangeCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderIndexOfCPCorrectly() {
+	void shouldRenderIndexOfCPCorrectly() {
 
 		Document agg = project().and(StringOperators.valueOf("item").indexOfCP("foo")).as("cpLocation")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1710,7 +1714,7 @@ public void shouldRenderIndexOfCPCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderIndexOfCPWithRangeCorrectly() {
+	void shouldRenderIndexOfCPWithRangeCorrectly() {
 
 		Document agg = project()
 				.and(StringOperators.valueOf("item").indexOfCP("foo")
@@ -1722,7 +1726,7 @@ public void shouldRenderIndexOfCPWithRangeCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderSplitCorrectly() {
+	void shouldRenderSplitCorrectly() {
 
 		Document agg = project().and(StringOperators.valueOf("city").split(", ")).as("city_state")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1731,7 +1735,7 @@ public void shouldRenderSplitCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderStrLenBytesCorrectly() {
+	void shouldRenderStrLenBytesCorrectly() {
 
 		Document agg = project().and(StringOperators.valueOf("name").length()).as("length")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1740,7 +1744,7 @@ public void shouldRenderStrLenBytesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderStrLenCPCorrectly() {
+	void shouldRenderStrLenCPCorrectly() {
 
 		Document agg = project().and(StringOperators.valueOf("name").lengthCP()).as("length")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1749,7 +1753,7 @@ public void shouldRenderStrLenCPCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderSubstrCPCorrectly() {
+	void shouldRenderSubstrCPCorrectly() {
 
 		Document agg = project().and(StringOperators.valueOf("quarter").substringCP(0, 2)).as("yearSubstring")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1758,8 +1762,38 @@ public void shouldRenderSubstrCPCorrectly() {
 				.isEqualTo(Document.parse("{ $project : { yearSubstring: { $substrCP: [ \"$quarter\", 0, 2 ] } } }"));
 	}
 
+	@Test // GH-3725
+	void shouldRenderRegexFindCorrectly() {
+
+		Document agg = project().and(StringOperators.valueOf("field1").regexFind("e")).as("regex")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg).isEqualTo(
+				Document.parse("{ $project : { regex: { $regexFind: { \"input\" : \"$field1\", \"regex\" : \"e\" } } } }"));
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllCorrectly() {
+
+		Document agg = project().and(StringOperators.valueOf("field1").regexFindAll("e")).as("regex")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg).isEqualTo(
+				Document.parse("{ $project : { regex: { $regexFindAll: { \"input\" : \"$field1\", \"regex\" : \"e\" } } } }"));
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchCorrectly() {
+
+		Document agg = project().and(StringOperators.valueOf("field1").regexMatch("e")).as("regex")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg).isEqualTo(
+				Document.parse("{ $project : { regex: { $regexMatch: { \"input\" : \"$field1\", \"regex\" : \"e\" } } } }"));
+	}
+
 	@Test // DATAMONGO-1548
-	public void shouldRenderIndexOfArrayCorrectly() {
+	void shouldRenderIndexOfArrayCorrectly() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("items").indexOf(2)).as("index")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1768,7 +1802,7 @@ public void shouldRenderIndexOfArrayCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderRangeCorrectly() {
+	void shouldRenderRangeCorrectly() {
 
 		Document agg = project().and(ArrayOperators.RangeOperator.rangeStartingAt(0L).to("distance").withStepSize(25L))
 				.as("rest_stops").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1779,7 +1813,7 @@ public void shouldRenderRangeCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderReverseArrayCorrectly() {
+	void shouldRenderReverseArrayCorrectly() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("favorites").reverse()).as("reverseFavorites")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1788,7 +1822,7 @@ public void shouldRenderReverseArrayCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderReduceWithSimpleObjectCorrectly() {
+	void shouldRenderReduceWithSimpleObjectCorrectly() {
 
 		Document agg = project()
 				.and(ArrayOperators.arrayOf("probabilityArr")
@@ -1800,7 +1834,7 @@ public void shouldRenderReduceWithSimpleObjectCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderReduceWithComplexObjectCorrectly() {
+	void shouldRenderReduceWithComplexObjectCorrectly() {
 
 		PropertyExpression sum = PropertyExpression.property("sum").definedAs(
 				ArithmeticOperators.valueOf(Variable.VALUE.referringTo("sum").getName()).add(Variable.THIS.getName()));
@@ -1817,7 +1851,7 @@ public void shouldRenderReduceWithComplexObjectCorrectly() {
 	}
 
 	@Test // DATAMONGO-1843
-	public void shouldRenderReduceWithInputAndInExpressionsCorrectly() {
+	void shouldRenderReduceWithInputAndInExpressionsCorrectly() {
 
 		Document expected = Document.parse(
 				"{ \"$project\" : { \"results\" : { \"$reduce\" : { \"input\" : { \"$slice\" : [\"$array\", 5] }, \"initialValue\" : \"\", \"in\" : { \"$concat\" : [\"$$value\", \"/\", \"$$this\"] } } } } }");
@@ -1838,7 +1872,7 @@ public void shouldRenderReduceWithInputAndInExpressionsCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderZipCorrectly() {
+	void shouldRenderZipCorrectly() {
 
 		AggregationExpression elemAt0 = ArrayOperators.arrayOf("matrix").elementAt(0);
 		AggregationExpression elemAt1 = ArrayOperators.arrayOf("matrix").elementAt(1);
@@ -1853,7 +1887,7 @@ public void shouldRenderZipCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderInCorrectly() {
+	void shouldRenderInCorrectly() {
 
 		Document agg = project().and(ArrayOperators.arrayOf("in_stock").containsValue("bananas")).as("has_bananas")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1863,7 +1897,7 @@ public void shouldRenderInCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderIsoDayOfWeekCorrectly() {
+	void shouldRenderIsoDayOfWeekCorrectly() {
 
 		Document agg = project().and(DateOperators.dateOf("birthday").isoDayOfWeek()).as("dayOfWeek")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1872,7 +1906,7 @@ public void shouldRenderIsoDayOfWeekCorrectly() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderIsoDayOfWeekWithTimezoneCorrectly() {
+	void shouldRenderIsoDayOfWeekWithTimezoneCorrectly() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("birthday").withTimezone(Timezone.valueOf("America/Chicago")).isoDayOfWeek())
@@ -1883,7 +1917,7 @@ public void shouldRenderIsoDayOfWeekWithTimezoneCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderIsoWeekCorrectly() {
+	void shouldRenderIsoWeekCorrectly() {
 
 		Document agg = project().and(DateOperators.dateOf("date").isoWeek()).as("weekNumber")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1892,7 +1926,7 @@ public void shouldRenderIsoWeekCorrectly() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderIsoWeekWithTimezoneCorrectly() {
+	void shouldRenderIsoWeekWithTimezoneCorrectly() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).isoWeek()).as("weekNumber")
@@ -1903,7 +1937,7 @@ public void shouldRenderIsoWeekWithTimezoneCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderIsoWeekYearCorrectly() {
+	void shouldRenderIsoWeekYearCorrectly() {
 
 		Document agg = project().and(DateOperators.dateOf("date").isoWeekYear()).as("yearNumber")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1912,7 +1946,7 @@ public void shouldRenderIsoWeekYearCorrectly() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderIsoWeekYearWithTimezoneCorrectly() {
+	void shouldRenderIsoWeekYearWithTimezoneCorrectly() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).isoWeekYear())
@@ -1923,14 +1957,14 @@ public void shouldRenderIsoWeekYearWithTimezoneCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderSwitchCorrectly() {
+	void shouldRenderSwitchCorrectly() {
 
 		String expected = "$switch:\n" + //
 				"{\n" + //
 				"     branches: [\n" + //
 				"       {\n" + //
 				"         case: { $gte : [ { $avg : \"$scores\" }, 90 ] },\n" + //
-				"         then: \"Doing great!\"\n" + //
+				"         then: \"Doing great\"\n" + //
 				"       },\n" + //
 				"       {\n" + //
 				"         case: { $and : [ { $gte : [ { $avg : \"$scores\" }, 80 ] },\n" + //
@@ -1948,7 +1982,7 @@ public void shouldRenderSwitchCorrectly() {
 
 		CaseOperator cond1 = CaseOperator
 				.when(ComparisonOperators.Gte.valueOf(AccumulatorOperators.Avg.avgOf("scores")).greaterThanEqualToValue(90))
-				.then("Doing great!");
+				.then("Doing great");
 		CaseOperator cond2 = CaseOperator
 				.when(BooleanOperators.And.and(
 						ComparisonOperators.Gte.valueOf(AccumulatorOperators.Avg.avgOf("scores")).greaterThanEqualToValue(80),
@@ -1965,7 +1999,7 @@ public void shouldRenderSwitchCorrectly() {
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldTypeCorrectly() {
+	void shouldTypeCorrectly() {
 
 		Document agg = project().and(DataTypeOperators.Type.typeOf("a")).as("a").toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -1973,7 +2007,7 @@ public void shouldTypeCorrectly() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateFromPartsWithJustTheYear() {
+	void shouldRenderDateFromPartsWithJustTheYear() {
 
 		Document agg = project().and(DateOperators.dateFromParts().year(2018)).as("newDate")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -1981,19 +2015,19 @@ public void shouldRenderDateFromPartsWithJustTheYear() {
 		assertThat(agg).isEqualTo(Document.parse("{ $project : { newDate: { $dateFromParts: { year : 2018 } } } }"));
 	}
 
-	@Test // DATAMONGO-1834
-	public void shouldRenderDateFromParts() {
+	@Test // DATAMONGO-1834, DATAMONGO-2671
+	void shouldRenderDateFromParts() {
 
 		Document agg = project()
-				.and(DateOperators.dateFromParts().year(2018).month(3).day(23).hour(14).minute(25).second(10).milliseconds(2))
+				.and(DateOperators.dateFromParts().year(2018).month(3).day(23).hour(14).minute(25).second(10).millisecond(2))
 				.as("newDate").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse(
-				"{ $project : { newDate: { $dateFromParts: { year : 2018, month : 3, day : 23, hour : 14, minute : 25, second : 10, milliseconds : 2 } } } }"));
+				"{ $project : { newDate: { $dateFromParts: { year : 2018, month : 3, day : 23, hour : 14, minute : 25, second : 10, millisecond : 2 } } } }"));
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateFromPartsWithTimezone() {
+	void shouldRenderDateFromPartsWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateFromParts().withTimezone(Timezone.valueOf("America/Chicago")).year(2018)).as("newDate")
@@ -2004,7 +2038,7 @@ public void shouldRenderDateFromPartsWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderIsoDateFromPartsWithJustTheYear() {
+	void shouldRenderIsoDateFromPartsWithJustTheYear() {
 
 		Document agg = project().and(DateOperators.dateFromParts().isoWeekYear(2018)).as("newDate")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -2012,18 +2046,18 @@ public void shouldRenderIsoDateFromPartsWithJustTheYear() {
 		assertThat(agg).isEqualTo(Document.parse("{ $project : { newDate: { $dateFromParts: { isoWeekYear : 2018 } } } }"));
 	}
 
-	@Test // DATAMONGO-1834
-	public void shouldRenderIsoDateFromParts() {
+	@Test // DATAMONGO-1834, DATAMONGO-2671
+	void shouldRenderIsoDateFromParts() {
 
 		Document agg = project().and(DateOperators.dateFromParts().isoWeekYear(2018).isoWeek(12).isoDayOfWeek(5).hour(14)
-				.minute(30).second(42).milliseconds(2)).as("newDate").toDocument(Aggregation.DEFAULT_CONTEXT);
+				.minute(30).second(42).millisecond(2)).as("newDate").toDocument(Aggregation.DEFAULT_CONTEXT);
 
 		assertThat(agg).isEqualTo(Document.parse(
-				"{ $project : { newDate: { $dateFromParts: { isoWeekYear : 2018, isoWeek : 12, isoDayOfWeek : 5, hour : 14, minute : 30, second : 42, milliseconds : 2 } } } }"));
+				"{ $project : { newDate: { $dateFromParts: { isoWeekYear : 2018, isoWeek : 12, isoDayOfWeek : 5, hour : 14, minute : 30, second : 42, millisecond : 2 } } } }"));
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderIsoDateFromPartsWithTimezone() {
+	void shouldRenderIsoDateFromPartsWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateFromParts().withTimezone(Timezone.valueOf("America/Chicago")).isoWeekYear(2018))
@@ -2034,7 +2068,7 @@ public void shouldRenderIsoDateFromPartsWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateToParts() {
+	void shouldRenderDateToParts() {
 
 		Document agg = project().and(DateOperators.dateOf("date").toParts()).as("newDate")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -2043,7 +2077,7 @@ public void shouldRenderDateToParts() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateToIsoParts() {
+	void shouldRenderDateToIsoParts() {
 
 		Document agg = project().and(DateOperators.dateOf("date").toParts().iso8601()).as("newDate")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -2053,7 +2087,7 @@ public void shouldRenderDateToIsoParts() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateToPartsWithTimezone() {
+	void shouldRenderDateToPartsWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateOf("date").withTimezone(Timezone.valueOf("America/Chicago")).toParts()).as("newDate")
@@ -2064,7 +2098,7 @@ public void shouldRenderDateToPartsWithTimezone() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateFromString() {
+	void shouldRenderDateFromString() {
 
 		Document agg = project().and(DateOperators.dateFromString("2017-02-08T12:10:40.787")).as("newDate")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -2074,7 +2108,7 @@ public void shouldRenderDateFromString() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateFromStringWithFieldReference() {
+	void shouldRenderDateFromStringWithFieldReference() {
 
 		Document agg = project().and(DateOperators.dateOf("date").fromString()).as("newDate")
 				.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -2084,7 +2118,7 @@ public void shouldRenderDateFromStringWithFieldReference() {
 	}
 
 	@Test // DATAMONGO-1834
-	public void shouldRenderDateFromStringWithTimezone() {
+	void shouldRenderDateFromStringWithTimezone() {
 
 		Document agg = project()
 				.and(DateOperators.dateFromString("2017-02-08T12:10:40.787").withTimezone(Timezone.valueOf("America/Chicago")))
@@ -2095,7 +2129,7 @@ public void shouldRenderDateFromStringWithTimezone() {
 	}
 
 	@Test // DATAMONGO-2047
-	public void shouldRenderDateFromStringWithFormat() {
+	void shouldRenderDateFromStringWithFormat() {
 
 		Document agg = project().and(DateOperators.dateFromString("2017-02-08T12:10:40.787").withFormat("dd/mm/yyyy"))
 				.as("newDate").toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -2105,7 +2139,7 @@ public void shouldRenderDateFromStringWithFormat() {
 	}
 
 	@Test // DATAMONGO-2200
-	public void typeProjectionShouldIncludeTopLevelFieldsOfType() {
+	void typeProjectionShouldIncludeTopLevelFieldsOfType() {
 
 		ProjectionOperation operation = Aggregation.project(Book.class);
 
@@ -2119,7 +2153,7 @@ public void typeProjectionShouldIncludeTopLevelFieldsOfType() {
 	}
 
 	@Test // DATAMONGO-2200
-	public void typeProjectionShouldMapFieldNames() {
+	void typeProjectionShouldMapFieldNames() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		MongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
@@ -2135,7 +2169,7 @@ public void typeProjectionShouldMapFieldNames() {
 	}
 
 	@Test // DATAMONGO-2200
-	public void typeProjectionShouldIncludeInterfaceProjectionValues() {
+	void typeProjectionShouldIncludeInterfaceProjectionValues() {
 
 		ProjectionOperation operation = Aggregation.project(ProjectionInterface.class);
 
@@ -2148,7 +2182,7 @@ public void typeProjectionShouldIncludeInterfaceProjectionValues() {
 	}
 
 	@Test // DATAMONGO-2200
-	public void typeProjectionShouldBeEmptyIfNoPropertiesFound() {
+	void typeProjectionShouldBeEmptyIfNoPropertiesFound() {
 
 		ProjectionOperation operation = Aggregation.project(EmptyType.class);
 
@@ -2159,7 +2193,7 @@ public void typeProjectionShouldBeEmptyIfNoPropertiesFound() {
 	}
 
 	@Test // DATAMONGO-2312
-	public void simpleFieldReferenceAsArray() {
+	void simpleFieldReferenceAsArray() {
 
 		org.bson.Document doc = Aggregation.newAggregation(project("x", "y", "someField").asArray("myArray"))
 				.toDocument("coll", Aggregation.DEFAULT_CONTEXT);
@@ -2169,7 +2203,7 @@ public void simpleFieldReferenceAsArray() {
 	}
 
 	@Test // DATAMONGO-2312
-	public void mappedFieldReferenceAsArray() {
+	void mappedFieldReferenceAsArray() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
 
@@ -2183,7 +2217,7 @@ public void mappedFieldReferenceAsArray() {
 	}
 
 	@Test // DATAMONGO-2312
-	public void arrayWithNullValue() {
+	void arrayWithNullValue() {
 
 		Document doc = project() //
 				.andArrayOf(Fields.field("field-1"), null, "value").as("myArray") //
@@ -2193,7 +2227,7 @@ public void arrayWithNullValue() {
 	}
 
 	@Test // DATAMONGO-2312
-	public void nestedArrayField() {
+	void nestedArrayField() {
 
 		Document doc = project("_id", "value") //
 				.andArrayOf(Fields.field("field-1"), "plain - string", ArithmeticOperators.valueOf("field-1").sum().and(10))
@@ -2205,7 +2239,7 @@ public void nestedArrayField() {
 	}
 
 	@Test // DATAMONGO-2312
-	public void nestedMappedFieldReferenceInArrayField() {
+	void nestedMappedFieldReferenceInArrayField() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
 
@@ -2219,41 +2253,168 @@ public void nestedMappedFieldReferenceInArrayField() {
 				"{ $project: { \"author\" : 1,  \"myArray\" : [ \"$ti_t_le\", \"plain - string\", { \"$sum\" : [\"$ti_t_le\", 10] } ] } } ] }"));
 	}
 
+	@Test // GH-4473
+	void shouldRenderPercentileAggregationExpression() {
+
+		Document agg = project()
+			.and(ArithmeticOperators.valueOf("score").percentile(0.3, 0.9)).as("scorePercentiles")
+			.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg).isEqualTo(Document.parse("{ $project: { scorePercentiles: { $percentile: { input: \"$score\", method: \"approximate\", p: [0.3, 0.9] } }} } }"));
+	}
+
+	@Test // GH-4473
+	void shouldRenderPercentileWithMultipleArgsAggregationExpression() {
+
+		Document agg = project()
+			.and(ArithmeticOperators.valueOf("scoreOne").percentile(0.4).and("scoreTwo")).as("scorePercentiles")
+			.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(agg).isEqualTo(Document.parse("{ $project: { scorePercentiles: { $percentile: { input: [\"$scoreOne\", \"$scoreTwo\"], method: \"approximate\", p: [0.4] } }} } }"));
+	}
+
+	@Test // GH-4472
+	void shouldRenderMedianAggregationExpressions() {
+
+		Document singleArgAgg = project()
+				.and(ArithmeticOperators.valueOf("score").median()).as("medianValue")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(singleArgAgg).isEqualTo(Document.parse("{ $project: { medianValue: { $median: { input: \"$score\", method: \"approximate\" } }} } }"));
+
+		Document multipleArgsAgg = project()
+				.and(ArithmeticOperators.valueOf("score").median().and("scoreTwo")).as("medianValue")
+				.toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(multipleArgsAgg).isEqualTo(Document.parse("{ $project: { medianValue: { $median: { input: [\"$score\", \"$scoreTwo\"], method: \"approximate\" } }} } }"));
+	}
+
 	private static Document extractOperation(String field, Document fromProjectClause) {
 		return (Document) fromProjectClause.get(field);
 	}
 
-	@Data
 	static class Book {
+
 		String title;
 		Author author;
+
+		public Book() {}
+
+		public String getTitle() {
+			return this.title;
+		}
+
+		public Author getAuthor() {
+			return this.author;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public void setAuthor(Author author) {
+			this.author = author;
+		}
+
+		public String toString() {
+			return "ProjectionOperationUnitTests.Book(title=" + this.getTitle() + ", author=" + this.getAuthor() + ")";
+		}
 	}
 
-	@Data
 	static class BookWithFieldAnnotation {
 
 		@Field("ti_t_le") String title;
 		Author author;
+
+		public String getTitle() {
+			return this.title;
+		}
+
+		public Author getAuthor() {
+			return this.author;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public void setAuthor(Author author) {
+			this.author = author;
+		}
+
+		public String toString() {
+			return "ProjectionOperationUnitTests.BookWithFieldAnnotation(title=" + this.getTitle() + ", author="
+					+ this.getAuthor() + ")";
+		}
 	}
 
-	@Data
 	static class BookRenamed {
+
 		@Field("ti_tl_e") String title;
 		Author author;
+
+		public String getTitle() {
+			return this.title;
+		}
+
+		public Author getAuthor() {
+			return this.author;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public void setAuthor(Author author) {
+			this.author = author;
+		}
+
+		public String toString() {
+			return "ProjectionOperationUnitTests.BookRenamed(title=" + this.getTitle() + ", author=" + this.getAuthor() + ")";
+		}
 	}
 
-	@Data
 	static class Author {
+
 		String first;
 		String last;
 		String middle;
+
+		public String getFirst() {
+			return this.first;
+		}
+
+		public String getLast() {
+			return this.last;
+		}
+
+		public String getMiddle() {
+			return this.middle;
+		}
+
+		public void setFirst(String first) {
+			this.first = first;
+		}
+
+		public void setLast(String last) {
+			this.last = last;
+		}
+
+		public void setMiddle(String middle) {
+			this.middle = middle;
+		}
+
+		public String toString() {
+			return "ProjectionOperationUnitTests.Author(first=" + this.getFirst() + ", last=" + this.getLast() + ", middle="
+					+ this.getMiddle() + ")";
+		}
 	}
 
 	interface ProjectionInterface {
 		String getTitle();
 	}
 
-	static class EmptyType {
+	private static class EmptyType {
 
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationTests.java
index d3edebeb5f..92c1d2cd97 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@
 import reactor.test.StepVerifier;
 
 import java.util.Arrays;
+import java.util.Optional;
 
 import org.bson.Document;
 import org.junit.After;
@@ -37,7 +38,7 @@
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration test for aggregation via {@link org.springframework.data.mongodb.core.ReactiveMongoTemplate}.
@@ -45,7 +46,7 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:reactive-infrastructure.xml")
 public class ReactiveAggregationTests {
 
@@ -115,6 +116,29 @@ public void shouldProjectMultipleDocuments() {
 				}).verifyComplete();
 	}
 
+	@Test // GH-4949
+	public void shouldProjectAndConvertMultipleDocuments() {
+
+		City dresden = new City("Dresden", 100);
+		City linz = new City("Linz", 101);
+		City braunschweig = new City("Braunschweig", 102);
+		City weinheim = new City("Weinheim", 103);
+
+		reactiveMongoTemplate.insertAll(Arrays.asList(dresden, linz, braunschweig, weinheim)).as(StepVerifier::create)
+				.expectNextCount(4).verifyComplete();
+
+		Aggregation agg = newAggregation( //
+				match(where("population").lt(103)));
+
+		reactiveMongoTemplate.aggregateAndReturn(City.class).inCollection("city").by(agg)
+				.map((document, reader) -> Optional.of(reader.get())) //
+				.all() //
+				.collectList() //
+				.as(StepVerifier::create).consumeNextWith(actual -> {
+					assertThat(actual).hasSize(3).extracting(Optional::get).contains(dresden, linz, braunschweig);
+				}).verifyComplete();
+	}
+
 	@Test // DATAMONGO-1646
 	public void shouldAggregateToOutCollection() {
 
@@ -164,4 +188,21 @@ public void runMatchOperationCriteriaThroughQueryMapperForUntypedAggregation() {
 		reactiveMongoTemplate.aggregate(aggregation, "newyork", Document.class).as(StepVerifier::create).expectNextCount(4)
 				.verifyComplete();
 	}
+
+	@Test // DATAMONGO-2356
+	public void skipOutputDoesNotReadBackAggregationResults() {
+
+		Product product = new Product("P1", "A", 1.99, 3, 0.05, 0.19);
+		reactiveMongoTemplate.insert(product).as(StepVerifier::create).expectNextCount(1).verifyComplete();
+
+		double shippingCosts = 1.2;
+
+		TypedAggregation<Product> agg = newAggregation(Product.class, //
+				project("name", "netPrice") //
+						.andExpression("netPrice * 10", shippingCosts).as("salesPrice") //
+		).withOptions(AggregationOptions.builder().skipOutput().build());
+
+		reactiveMongoTemplate.aggregate(agg, Document.class).as(StepVerifier::create).verifyComplete();
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationUnitTests.java
index 18f1c39e8d..68afdb4bfa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReactiveAggregationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,16 +18,16 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyList;
 import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
@@ -43,20 +43,21 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ReactiveAggregationUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class ReactiveAggregationUnitTests {
 
-	static final String INPUT_COLLECTION = "collection-1";
+	private static final String INPUT_COLLECTION = "collection-1";
 
-	ReactiveMongoTemplate template;
-	ReactiveMongoDatabaseFactory factory;
+	private ReactiveMongoTemplate template;
+	private ReactiveMongoDatabaseFactory factory;
 	@Mock MongoClient mongoClient;
 	@Mock MongoDatabase db;
 	@Mock MongoCollection<Document> collection;
 	@Mock AggregatePublisher<Document> publisher;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		factory = new SimpleReactiveMongoDatabaseFactory(mongoClient, "db");
 		template = new ReactiveMongoTemplate(factory);
@@ -69,33 +70,31 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1646
-	public void shouldHandleMissingInputCollection() {
+	void shouldHandleMissingInputCollection() {
 		assertThatIllegalArgumentException()
 				.isThrownBy(() -> template.aggregate(newAggregation(), (String) null, TagCount.class));
 	}
 
 	@Test // DATAMONGO-1646
-	public void shouldHandleMissingAggregationPipeline() {
+	void shouldHandleMissingAggregationPipeline() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.aggregate(null, INPUT_COLLECTION, TagCount.class));
 	}
 
 	@Test // DATAMONGO-1646
-	public void shouldHandleMissingEntityClass() {
+	void shouldHandleMissingEntityClass() {
 		assertThatIllegalArgumentException().isThrownBy(() -> template.aggregate(newAggregation(), INPUT_COLLECTION, null));
 	}
 
 	@Test // DATAMONGO-1646
-	public void errorsOnExplainUsage() {
-		assertThatIllegalArgumentException().isThrownBy(() -> template
-				.aggregate(newAggregation(Product.class, //
-						project("name", "netPrice")) //
-								.withOptions(AggregationOptions.builder().explain(true).build()),
-						INPUT_COLLECTION, TagCount.class)
-				.subscribe());
+	void errorsOnExplainUsage() {
+		assertThatIllegalArgumentException().isThrownBy(() -> template.aggregate(newAggregation(Product.class, //
+				project("name", "netPrice")) //
+						.withOptions(AggregationOptions.builder().explain(true).build()),
+				INPUT_COLLECTION, TagCount.class).subscribe());
 	}
 
 	@Test // DATAMONGO-1646, DATAMONGO-1311
-	public void appliesBatchSizeWhenPresent() {
+	void appliesBatchSizeWhenPresent() {
 
 		when(publisher.batchSize(anyInt())).thenReturn(publisher);
 
@@ -109,19 +108,18 @@ public void appliesBatchSizeWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1646
-	public void appliesCollationCorrectlyWhenPresent() {
+	void appliesCollationCorrectlyWhenPresent() {
 
-		template.aggregate(
-				newAggregation(Product.class, //
-						project("name", "netPrice")) //
-								.withOptions(AggregationOptions.builder().collation(Collation.of("en_US")).build()),
+		template.aggregate(newAggregation(Product.class, //
+				project("name", "netPrice")) //
+						.withOptions(AggregationOptions.builder().collation(Collation.of("en_US")).build()),
 				INPUT_COLLECTION, TagCount.class).subscribe();
 
 		verify(publisher).collation(eq(com.mongodb.client.model.Collation.builder().locale("en_US").build()));
 	}
 
 	@Test // DATAMONGO-1646
-	public void doesNotSetCollationWhenNotPresent() {
+	void doesNotSetCollationWhenNotPresent() {
 
 		template.aggregate(newAggregation(Product.class, //
 				project("name", "netPrice")) //
@@ -132,15 +130,12 @@ public void doesNotSetCollationWhenNotPresent() {
 	}
 
 	@Test // DATAMONGO-1646
-	public void appliesDiskUsageCorrectly() {
-
-		template
-				.aggregate(
-						newAggregation(Product.class, //
-								project("name", "netPrice")) //
-										.withOptions(AggregationOptions.builder().allowDiskUse(true).build()),
-						INPUT_COLLECTION, TagCount.class)
-				.subscribe();
+	void appliesDiskUsageCorrectly() {
+
+		template.aggregate(newAggregation(Product.class, //
+				project("name", "netPrice")) //
+						.withOptions(AggregationOptions.builder().allowDiskUse(true).build()),
+				INPUT_COLLECTION, TagCount.class).subscribe();
 
 		verify(publisher).allowDiskUse(eq(true));
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/RedactOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/RedactOperationUnitTests.java
new file mode 100644
index 0000000000..d29e32a988
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/RedactOperationUnitTests.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.query.Criteria;
+
+/**
+ * Unit tests for {@link RedactOperation}.
+ *
+ * @author Christoph Strobl
+ */
+class RedactOperationUnitTests {
+
+	Document expected = new Document("$redact",
+			new Document("$cond", new Document("if", new Document("$eq", Arrays.asList("$level", 5)))
+					.append("then", "$$PRUNE").append("else", "$$DESCEND")));
+	Document expectedMapped = new Document("$redact",
+			new Document("$cond", new Document("if", new Document("$eq", Arrays.asList("$le_v_el", 5)))
+					.append("then", "$$PRUNE").append("else", "$$DESCEND")));
+
+	@Test // DATAMONGO-931
+	void errorsOnNullExpression() {
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new RedactOperation(null));
+	}
+
+	@Test // DATAMONGO-931
+	void mapsAggregationExpressionCorrectly() {
+
+		assertThat(new RedactOperation(ConditionalOperators.when(Criteria.where("level").is(5)) //
+				.then(RedactOperation.PRUNE) //
+				.otherwise(RedactOperation.DESCEND)).toDocument(contextFor(null))).isEqualTo(expected);
+	}
+
+	@Test // DATAMONGO-931
+	void mapsAggregationExpressionViaBuilderCorrectly() {
+
+		assertThat(RedactOperation.builder().when(Criteria.where("level").is(5)) //
+				.thenPrune() //
+				.otherwiseDescend().build().toDocument(contextFor(null))).isEqualTo(expected);
+	}
+
+	@Test // DATAMONGO-931
+	void mapsTypedAggregationExpressionCorrectly() {
+
+		assertThat(new RedactOperation(ConditionalOperators.when(Criteria.where("level").is(5)) //
+				.then(RedactOperation.PRUNE) //
+				.otherwise(RedactOperation.DESCEND)).toDocument(contextFor(DomainType.class))).isEqualTo(expectedMapped);
+	}
+
+	static class DomainType {
+
+		@Field("le_v_el") String level;
+
+		public String getLevel() {
+			return this.level;
+		}
+
+		public void setLevel(String level) {
+			this.level = level;
+		}
+
+		public String toString() {
+			return "RedactOperationUnitTests.DomainType(level=" + this.getLevel() + ")";
+		}
+	}
+
+	private static AggregationOperationContext contextFor(@Nullable Class<?> type) {
+
+		if (type == null) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				new MongoMappingContext());
+		mongoConverter.afterPropertiesSet();
+
+		return new TypeBasedAggregationOperationContext(type, mongoConverter.getMappingContext(),
+				new QueryMapper(mongoConverter)).continueOnMissingFieldReference();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperationUnitTests.java
index 18205729b8..23480dd390 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceRootOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,8 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.aggregation.ReplaceRootOperation.ReplaceRootDocumentOperation;
 
 /**
@@ -27,20 +26,20 @@
  *
  * @author Mark Paluch
  */
-public class ReplaceRootOperationUnitTests {
+class ReplaceRootOperationUnitTests {
 
 	@Test // DATAMONGO-1550
-	public void rejectsNullField() {
+	void rejectsNullField() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ReplaceRootOperation((Field) null));
 	}
 
 	@Test // DATAMONGO-1550
-	public void rejectsNullExpression() {
+	void rejectsNullExpression() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ReplaceRootOperation((AggregationExpression) null));
 	}
 
 	@Test // DATAMONGO-1550
-	public void shouldRenderCorrectly() {
+	void shouldRenderCorrectly() {
 
 		ReplaceRootOperation operation = ReplaceRootDocumentOperation.builder()
 				.withDocument(new Document("hello", "world"));
@@ -50,12 +49,12 @@ public void shouldRenderCorrectly() {
 	}
 
 	@Test // DATAMONGO-1550
-	public void shouldRenderExpressionCorrectly() {
+	void shouldRenderExpressionCorrectly() {
 
 		ReplaceRootOperation operation = new ReplaceRootOperation(VariableOperators //
 				.mapItemsOf("array") //
 				.as("element") //
-				.andApply(AggregationFunctionExpressions.MULTIPLY.of("$$element", 10)));
+				.andApply(ArithmeticOperators.valueOf("$$element").multiplyBy(10)));
 
 		Document dbObject = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -64,11 +63,11 @@ public void shouldRenderExpressionCorrectly() {
 	}
 
 	@Test // DATAMONGO-1550
-	public void shouldComposeDocument() {
+	void shouldComposeDocument() {
 
 		ReplaceRootOperation operation = ReplaceRootDocumentOperation.builder().withDocument() //
 				.andValue("value").as("key") //
-				.and(AggregationFunctionExpressions.MULTIPLY.of("$$element", 10)).as("multiply");
+				.and(ArithmeticOperators.valueOf("$$element").multiplyBy(10)).as("multiply");
 
 		Document dbObject = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
@@ -77,7 +76,7 @@ public void shouldComposeDocument() {
 	}
 
 	@Test // DATAMONGO-1550
-	public void shouldComposeSubDocument() {
+	void shouldComposeSubDocument() {
 
 		Document partialReplacement = new Document("key", "override").append("key2", "value2");
 
@@ -92,7 +91,7 @@ public void shouldComposeSubDocument() {
 	}
 
 	@Test // DATAMONGO-1550
-	public void shouldNotExposeFields() {
+	void shouldNotExposeFields() {
 
 		ReplaceRootOperation operation = new ReplaceRootOperation(Fields.field("field"));
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperationUnitTests.java
index 5beab8b90d..9d8a1502e2 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ReplaceWithOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,22 +18,22 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link ReplaceRootOperation}.
  *
  * @author Christoph Strobl
  */
-public class ReplaceWithOperationUnitTests {
+class ReplaceWithOperationUnitTests {
 
 	@Test // DATAMONGO-2331
-	public void rejectsNullField() {
+	void rejectsNullField() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new ReplaceWithOperation(null));
 	}
 
 	@Test // DATAMONGO-2331
-	public void shouldRenderValueCorrectly() {
+	void shouldRenderValueCorrectly() {
 
 		ReplaceWithOperation operation = ReplaceWithOperation.replaceWithValue(new Document("hello", "world"));
 		Document dbObject = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
@@ -42,12 +42,12 @@ public void shouldRenderValueCorrectly() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void shouldRenderExpressionCorrectly() {
+	void shouldRenderExpressionCorrectly() {
 
 		ReplaceWithOperation operation = ReplaceWithOperation.replaceWithValueOf(VariableOperators //
 				.mapItemsOf("array") //
 				.as("element") //
-				.andApply(AggregationFunctionExpressions.MULTIPLY.of("$$element", 10)));
+				.andApply(ArithmeticOperators.valueOf("$$element").multiplyBy(10)));
 
 		Document dbObject = operation.toDocument(Aggregation.DEFAULT_CONTEXT);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SampleOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SampleOperationUnitTests.java
index 8461994421..718a084f37 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SampleOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SampleOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link SampleOperation}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ScriptOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ScriptOperatorsUnitTests.java
new file mode 100644
index 0000000000..60a8a6b013
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/ScriptOperatorsUnitTests.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.aggregation.ScriptOperators.*;
+
+import java.util.Collections;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ScriptOperators}.
+ *
+ * @author Christoph Strobl
+ */
+class ScriptOperatorsUnitTests {
+
+	private static final String FUNCTION_BODY = "function(name) { return hex_md5(name) == \"15b0a220baa16331e8d80e15367677ad\" }";
+	private static final Document EMPTY_ARGS_FUNCTION_DOCUMENT = new Document("body", FUNCTION_BODY)
+			.append("args", Collections.emptyList()).append("lang", "js");
+
+	private static final String INIT_FUNCTION = "function() { return { count: 0, sum: 0 } }";
+	private static final String ACC_FUNCTION = "function(state, numCopies) { return { count: state.count + 1, sum: state.sum + numCopies } }";
+	private static final String MERGE_FUNCTION = "function(state1, state2) { return { count: state1.count + state2.count, sum: state1.sum + state2.sum } }";
+	private static final String FINALIZE_FUNCTION = "function(state) { return (state.sum / state.count) }";
+
+	private static final Document $ACCUMULATOR = Document.parse("{" + //
+			"      $accumulator:" + //
+			"      {" + //
+			"        init: '" + INIT_FUNCTION + "'," + //
+			"        accumulate: '" + ACC_FUNCTION + "'," + //
+			"        accumulateArgs: [\"$copies\"]," + //
+			"        merge: '" + MERGE_FUNCTION + "'," + //
+			"        finalize: '" + FINALIZE_FUNCTION + "'," + //
+			"        lang: \"js\"" + //
+			"      }" + //
+			"    }" + //
+			"  }");
+
+	@Test // DATAMONGO-2623
+	void functionWithoutArgsShouldBeRenderedCorrectly() {
+
+		assertThat(function(FUNCTION_BODY).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo($function(EMPTY_ARGS_FUNCTION_DOCUMENT));
+	}
+
+	@Test // DATAMONGO-2623
+	void functionWithArgsShouldBeRenderedCorrectly() {
+
+		assertThat(function(FUNCTION_BODY).args("$name").toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(
+				$function(new Document(EMPTY_ARGS_FUNCTION_DOCUMENT).append("args", Collections.singletonList("$name"))));
+	}
+
+	@Test // DATAMONGO-2623
+	void accumulatorWithStringInput() {
+
+		Accumulator accumulator = accumulatorBuilder() //
+				.init(INIT_FUNCTION) //
+				.accumulate(ACC_FUNCTION).accumulateArgs("$copies") //
+				.merge(MERGE_FUNCTION) //
+				.finalize(FINALIZE_FUNCTION);
+
+		assertThat(accumulator.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo($ACCUMULATOR);
+	}
+
+	@Test // DATAMONGO-2623
+	void accumulatorWithFunctionInput() {
+
+		Accumulator accumulator = accumulatorBuilder() //
+				.init(function(INIT_FUNCTION)) //
+				.accumulate(function(ACC_FUNCTION).args("$copies")) //
+				.merge(MERGE_FUNCTION) //
+				.finalize(FINALIZE_FUNCTION);
+
+		assertThat(accumulator.toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo($ACCUMULATOR);
+	}
+
+	static Document $function(Document source) {
+		return new Document("$function", source);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SelectionOperatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SelectionOperatorUnitTests.java
new file mode 100644
index 0000000000..1737d35215
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SelectionOperatorUnitTests.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2022-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * @author Christoph Strobl
+ */
+class SelectionOperatorUnitTests {
+
+	@Test // GH-4139
+	void bottomRenderedCorrectly() {
+
+		Document document = SelectionOperators.Bottom.bottom().output(Fields.fields("playerId", "score"))
+				.sortBy(Sort.by(Direction.DESC, "score")).toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(document).isEqualTo(Document.parse("""
+				{
+				   $bottom:
+				   {
+				      output: [ "$playerId", "$score" ],
+				      sortBy: { "score": -1 }
+				   }
+				}
+				"""));
+	}
+
+	@Test // GH-4139
+	void bottomMapsFieldNamesCorrectly() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		RelaxedTypeBasedAggregationOperationContext aggregationContext = new RelaxedTypeBasedAggregationOperationContext(
+				Player.class, mappingContext,
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
+
+		Document document = SelectionOperators.Bottom.bottom().output(Fields.fields("playerId", "score"))
+				.sortBy(Sort.by(Direction.DESC, "score")).toDocument(aggregationContext);
+
+		assertThat(document).isEqualTo(Document.parse("""
+				{
+				   $bottom:
+				   {
+				      output: [ "$player_id", "$s_cor_e" ],
+				      sortBy: { "s_cor_e": -1 }
+				   }
+				}
+				"""));
+	}
+
+	@Test // GH-4139
+	void bottomNRenderedCorrectly() {
+
+		Document document = SelectionOperators.Bottom.bottom(3).output(Fields.fields("playerId", "score"))
+				.sortBy(Sort.by(Direction.DESC, "score")).toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(document).isEqualTo(Document.parse("""
+				{
+				   $bottomN:
+				   {
+				      n : 3,
+				      output: [ "$playerId", "$score" ],
+				      sortBy: { "score": -1 }
+				   }
+				}
+				"""));
+	}
+
+	@Test // GH-4139
+	void topMapsFieldNamesCorrectly() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		RelaxedTypeBasedAggregationOperationContext aggregationContext = new RelaxedTypeBasedAggregationOperationContext(
+				Player.class, mappingContext,
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
+
+		Document document = SelectionOperators.Top.top().output(Fields.fields("playerId", "score"))
+				.sortBy(Sort.by(Direction.DESC, "score")).toDocument(aggregationContext);
+
+		assertThat(document).isEqualTo(Document.parse("""
+				{
+				   $top:
+				   {
+				      output: [ "$player_id", "$s_cor_e" ],
+				      sortBy: { "s_cor_e": -1 }
+				   }
+				}
+				"""));
+	}
+
+	@Test // GH-4139
+	void topNRenderedCorrectly() {
+
+		Document document = SelectionOperators.Top.top(3).output(Fields.fields("playerId", "score"))
+				.sortBy(Sort.by(Direction.DESC, "score")).toDocument(Aggregation.DEFAULT_CONTEXT);
+
+		assertThat(document).isEqualTo(Document.parse("""
+				{
+				   $topN:
+				   {
+				      n : 3,
+				      output: [ "$playerId", "$score" ],
+				      sortBy: { "score": -1 }
+				   }
+				}
+				"""));
+	}
+
+	@Test // GH-4139
+	void firstNMapsFieldNamesCorrectly() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		RelaxedTypeBasedAggregationOperationContext aggregationContext = new RelaxedTypeBasedAggregationOperationContext(
+				Player.class, mappingContext,
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
+
+		Document document = SelectionOperators.First.first(3).of("score").toDocument(aggregationContext);
+
+		assertThat(document).isEqualTo(Document.parse("""
+				{
+				   $firstN:
+				   {
+				      n: 3,
+				      input: "$s_cor_e"
+				   }
+				}
+				"""));
+	}
+
+	@Test // GH-4139
+	void lastNMapsFieldNamesCorrectly() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		RelaxedTypeBasedAggregationOperationContext aggregationContext = new RelaxedTypeBasedAggregationOperationContext(
+				Player.class, mappingContext,
+				new QueryMapper(new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext)));
+
+		Document document = SelectionOperators.Last.last(3).of("score").toDocument(aggregationContext);
+
+		assertThat(document).isEqualTo(Document.parse("""
+				{
+				   $lastN:
+				   {
+				      n: 3,
+				      input: "$s_cor_e"
+				   }
+				}
+				"""));
+	}
+
+	static class Player {
+
+		@Field("player_id") String playerId;
+
+		@Field("s_cor_e") Integer score;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetOperationUnitTests.java
index f5eb12877a..75632f4ace 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,42 +20,43 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.lang.Nullable;
 
 /**
  * Unit tests for {@link SetOperation}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-public class SetOperationUnitTests {
+class SetOperationUnitTests {
 
 	@Test // DATAMONGO-2331
-	public void raisesErrorOnNullField() {
+	void raisesErrorOnNullField() {
 		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new SetOperation(null, "value"));
 	}
 
 	@Test // DATAMONGO-2331
-	public void rendersFieldReferenceCorrectly() {
+	void rendersFieldReferenceCorrectly() {
 
 		assertThat(new SetOperation("name", "value").toPipelineStages(contextFor(Scores.class)))
 				.containsExactly(Document.parse("{\"$set\" : {\"name\":\"value\"}}"));
 	}
 
 	@Test // DATAMONGO-2331
-	public void rendersMappedFieldReferenceCorrectly() {
+	void rendersMappedFieldReferenceCorrectly() {
 
 		assertThat(new SetOperation("student", "value").toPipelineStages(contextFor(ScoresWithMappedField.class)))
 				.containsExactly(Document.parse("{\"$set\" : {\"student_name\":\"value\"}}"));
 	}
 
 	@Test // DATAMONGO-2331
-	public void rendersNestedMappedFieldReferenceCorrectly() {
+	void rendersNestedMappedFieldReferenceCorrectly() {
 
 		assertThat(
 				new SetOperation("scoresWithMappedField.student", "value").toPipelineStages(contextFor(ScoresWrapper.class)))
@@ -63,14 +64,14 @@ public void rendersNestedMappedFieldReferenceCorrectly() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void rendersTargetValueFieldReferenceCorrectly() {
+	void rendersTargetValueFieldReferenceCorrectly() {
 
 		assertThat(new SetOperation("name", Fields.field("value")).toPipelineStages(contextFor(Scores.class)))
 				.containsExactly(Document.parse("{\"$set\" : {\"name\":\"$value\"}}"));
 	}
 
 	@Test // DATAMONGO-2331
-	public void rendersMappedTargetValueFieldReferenceCorrectly() {
+	void rendersMappedTargetValueFieldReferenceCorrectly() {
 
 		assertThat(
 				new SetOperation("student", Fields.field("homework")).toPipelineStages(contextFor(ScoresWithMappedField.class)))
@@ -78,7 +79,7 @@ public void rendersMappedTargetValueFieldReferenceCorrectly() {
 	}
 
 	@Test // DATAMONGO-2331
-	public void rendersNestedMappedTargetValueFieldReferenceCorrectly() {
+	void rendersNestedMappedTargetValueFieldReferenceCorrectly() {
 
 		assertThat(new SetOperation("scoresWithMappedField.student", Fields.field("scoresWithMappedField.homework"))
 				.toPipelineStages(contextFor(ScoresWrapper.class)))
@@ -86,16 +87,42 @@ public void rendersNestedMappedTargetValueFieldReferenceCorrectly() {
 								.parse("{\"$set\" : {\"scoresWithMappedField.student_name\":\"$scoresWithMappedField.home_work\"}}"));
 	}
 
+	@Test // DATAMONGO-2363
+	void appliesSpelExpressionCorrectly() {
+
+		SetOperation operation = SetOperation.builder().set("totalHomework").withValueOfExpression("sum(homework) * [0]",
+				2);
+
+		assertThat(operation.toPipelineStages(contextFor(AddFieldsOperationUnitTests.ScoresWrapper.class))).contains(
+				Document.parse("{\"$set\" : {\"totalHomework\": { $multiply : [{ \"$sum\" : [\"$homework\"] }, 2] }}}"));
+	}
+
 	@Test // DATAMONGO-2331
-	public void rendersTargetValueExpressionCorrectly() {
+	void rendersTargetValueExpressionCorrectly() {
 
 		assertThat(SetOperation.builder().set("totalHomework").toValueOf(ArithmeticOperators.valueOf("homework").sum())
 				.toPipelineStages(contextFor(Scores.class)))
 						.containsExactly(Document.parse("{\"$set\" : {\"totalHomework\": { \"$sum\" : \"$homework\" }}}"));
 	}
 
+	@Test // GH-4933
+	void rendersTargetFieldReferenceCorrectly() {
+
+		assertThat(
+				SetOperation.builder().set("totalHomework").toValueOf("homework").toPipelineStages(contextFor(Scores.class)))
+				.containsExactly(Document.parse("{\"$set\" : {\"totalHomework\": \"$homework\" }}"));
+	}
+
+	@Test // GH-4933
+	void rendersMappedTargetFieldReferenceCorrectly() {
+
+		assertThat(SetOperation.builder().set("totalHomework").toValueOf("homework")
+				.toPipelineStages(contextFor(ScoresWithMappedField.class)))
+				.containsExactly(Document.parse("{\"$set\" : {\"totalHomework\": \"$home_work\" }}"));
+	}
+
 	@Test // DATAMONGO-2331
-	public void exposesFieldsCorrectly() {
+	void exposesFieldsCorrectly() {
 
 		ExposedFields fields = SetOperation.builder().set("totalHomework").toValue("A+") //
 				.and() //
@@ -138,5 +165,4 @@ static class ScoresWrapper {
 		Scores scores;
 		ScoresWithMappedField scoresWithMappedField;
 	}
-
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationTests.java
new file mode 100644
index 0000000000..bc0edcea0b
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationTests.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import org.bson.Document;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.aggregation.DateOperators.Year;
+import org.springframework.data.mongodb.core.aggregation.SetWindowFieldsOperation.Windows;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
+
+/**
+ * Integration tests for {@link SetWindowFieldsOperation}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MongoTemplateExtension.class)
+@EnableIfMongoServerVersion(isGreaterThanEqual = "5.0")
+class SetWindowFieldsOperationTests {
+
+	@Template //
+	private static MongoTestTemplate mongoTemplate;
+
+	@AfterEach
+	void afterEach() {
+		mongoTemplate.flush(CakeSale.class);
+	}
+
+	@Test // GH-3711
+	void executesSetWindowFieldsOperationCorrectly() {
+
+		initCakeSales();
+
+		SetWindowFieldsOperation setWindowFieldsOperation = SetWindowFieldsOperation.builder() //
+				.partitionByField("state") // resolves to field ref "$state"
+				.sortBy(Sort.by(Direction.ASC, "date")) // resolves to "orderDate"
+				.output(AccumulatorOperators.valueOf("qty").sum()) // resolves to "$quantity"
+				.within(Windows.documents().fromUnbounded().toCurrent().build()) //
+				.as("cumulativeQuantityForState") //
+				.build(); //
+
+		AggregationResults<Document> results = mongoTemplate.aggregateAndReturn(Document.class)
+				.by(Aggregation.newAggregation(CakeSale.class, setWindowFieldsOperation)).all();
+
+		assertThat(results.getMappedResults()).map(it -> it.get("cumulativeQuantityForState")).contains(162, 282, 427, 134,
+				238, 378);
+	}
+
+	@Test // GH-4745
+	void exposesFieldsToNextStageCorrectly() {
+
+		initCakeSales();
+
+		SetWindowFieldsOperation setWindowFieldsOperation = SetWindowFieldsOperation.builder() //
+				.partitionByField("state") // resolves to field ref "$state"
+				.sortBy(Sort.by(Direction.ASC, "date")) // resolves to "orderDate"
+				.output(AccumulatorOperators.valueOf("qty").sum()) // resolves to "$quantity"
+				.within(Windows.documents().fromUnbounded().toCurrent().build()) //
+				.as("cumulativeQuantityForState") //
+				.build(); //
+
+		AggregationResults<Document> results = mongoTemplate.aggregateAndReturn(Document.class)
+				.by(Aggregation.newAggregation(CakeSale.class, setWindowFieldsOperation,
+						/* and now project on the field to see it can be referenced */
+						Aggregation.project("cumulativeQuantityForState")))
+				.all();
+
+		assertThat(results.getMappedResults()).map(it -> it.get("cumulativeQuantityForState")).contains(162, 282, 427, 134,
+				238, 378);
+	}
+
+	@Test // GH-3711
+	void executesSetWindowFieldsOperationWithPartitionExpressionCorrectly() {
+
+		initCakeSales();
+
+		SetWindowFieldsOperation setWindowFieldsOperation = SetWindowFieldsOperation.builder() //
+				.partitionByExpression(Year.yearOf("date")) // resolves to $year: "$orderDate"
+				.sortBy(Sort.by(Direction.ASC, "date")) // resolves to "orderDate"
+				.output(AccumulatorOperators.valueOf("qty").sum()) // resolves to "$quantity"
+				.within(Windows.documents().fromUnbounded().toCurrent().build()) //
+				.as("cumulativeQuantityForState") //
+				.build(); //
+
+		AggregationResults<Document> results = mongoTemplate.aggregateAndReturn(Document.class)
+				.by(Aggregation.newAggregation(CakeSale.class, setWindowFieldsOperation)).all();
+
+		assertThat(results.getMappedResults()).map(it -> it.get("cumulativeQuantityForState")).contains(134, 296, 104, 224,
+				145, 285);
+	}
+
+	void initCakeSales() {
+
+		mongoTemplate.execute(CakeSale.class, collection -> {
+
+			List<Document> source = Arrays.asList(Document.parse(
+					"{ _id: 0, type: \"chocolate\", orderDate: { $date : \"2020-05-18T14:10:30Z\" }, state: \"CA\", price: 13, quantity: 120 }"),
+					Document.parse(
+							"{ _id: 1, type: \"chocolate\", orderDate: { $date : \"2021-03-20T11:30:05Z\"}, state: \"WA\", price: 14, quantity: 140 }"),
+					Document.parse(
+							"{ _id: 2, type: \"vanilla\", orderDate: { $date : \"2021-01-11T06:31:15Z\"}, state: \"CA\", price: 12, quantity: 145 }"),
+					Document.parse(
+							"{ _id: 3, type: \"vanilla\", orderDate: { $date : \"2020-02-08T13:13:23Z\"}, state: \"WA\", price: 13, quantity: 104 }"),
+					Document.parse(
+							"{ _id: 4, type: \"strawberry\", orderDate: { $date : \"2019-05-18T16:09:01Z\"}, state: \"CA\", price: 41, quantity: 162 }"),
+					Document.parse(
+							"{ _id: 5, type: \"strawberry\", orderDate: { $date : \"2019-01-08T06:12:03Z\"}, state: \"WA\", price: 43, quantity: 134 }"));
+
+			collection.insertMany(source);
+			return "OK";
+		});
+	}
+
+	static class CakeSale {
+
+		@Id Integer id;
+
+		String state;
+
+		@Field("orderDate") //
+		Date date;
+
+		@Field("quantity") //
+		Integer qty;
+
+		String type;
+
+		public Integer getId() {
+			return this.id;
+		}
+
+		public String getState() {
+			return this.state;
+		}
+
+		public Date getDate() {
+			return this.date;
+		}
+
+		public Integer getQty() {
+			return this.qty;
+		}
+
+		public String getType() {
+			return this.type;
+		}
+
+		public void setId(Integer id) {
+			this.id = id;
+		}
+
+		public void setState(String state) {
+			this.state = state;
+		}
+
+		public void setDate(Date date) {
+			this.date = date;
+		}
+
+		public void setQty(Integer qty) {
+			this.qty = qty;
+		}
+
+		public void setType(String type) {
+			this.type = type;
+		}
+
+		public String toString() {
+			return "SetWindowFieldsOperationTests.CakeSale(id=" + this.getId() + ", state=" + this.getState() + ", date="
+					+ this.getDate() + ", qty=" + this.getQty() + ", type=" + this.getType() + ")";
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationUnitTests.java
new file mode 100644
index 0000000000..18eb659cd0
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SetWindowFieldsOperationUnitTests.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2021-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Date;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.data.mongodb.core.aggregation.SetWindowFieldsOperation.Windows;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * Unit tests for {@link SetWindowFieldsOperation}.
+ *
+ * @author Christoph Strobl
+ */
+class SetWindowFieldsOperationUnitTests {
+
+	@Test // GH-3711
+	void rendersTargetFieldNamesCorrectly() {
+
+		SetWindowFieldsOperation setWindowFieldsOperation = SetWindowFieldsOperation.builder() //
+				.partitionByField("state") // resolves to field ref "$state"
+				.sortBy(Sort.by(Direction.ASC, "date")) // resolves to "orderDate"
+				.output(AccumulatorOperators.valueOf("qty").sum()) // resolves to "$quantity"
+				.within(Windows.documents().fromUnbounded().toCurrent().build()) //
+				.as("cumulativeQuantityForState") //
+				.build(); //
+
+		Document document = setWindowFieldsOperation.toDocument(contextFor(CakeSale.class));
+		assertThat(document).isEqualTo(Document.parse(
+				"{ $setWindowFields: { partitionBy: \"$state\", sortBy: { orderDate: 1 }, output: { cumulativeQuantityForState: { $sum: \"$quantity\", window: { documents: [ \"unbounded\", \"current\" ] } } } } }"));
+	}
+
+	@Test // GH-3711
+	void exposesTargetFieldNames() {
+
+		SetWindowFieldsOperation setWindowFieldsOperation = SetWindowFieldsOperation.builder() //
+				.output(AccumulatorOperators.valueOf("qty").sum()) // resolves to "$quantity"
+				.within(Windows.documents().fromUnbounded().toCurrent().build()) //
+				.as("f1") //
+				.output(AccumulatorOperators.valueOf("qty").avg()) // resolves to "$quantity"
+				.within(Windows.documents().from(-1).to(0).build()) //
+				.as("f2") //
+				.build(); //
+
+		assertThat(setWindowFieldsOperation.getFields()).map(ExposedField::getName).containsExactly("f1", "f2");
+	}
+
+	@Test // GH-3711
+	void rendersMuiltipleOutputFields() {
+
+		SetWindowFieldsOperation setWindowFieldsOperation = SetWindowFieldsOperation.builder() //
+				.output(AccumulatorOperators.valueOf("qty").sum()) // resolves to "$quantity"
+				.within(Windows.documents().fromUnbounded().toCurrent().build()) //
+				.as("f1") //
+				.output(AccumulatorOperators.valueOf("qty").avg()) // resolves to "$quantity"
+				.within(Windows.documents().from(-1).to(0).build()) //
+				.as("f2") //
+				.build(); //
+
+		Document document = setWindowFieldsOperation.toDocument(contextFor(CakeSale.class));
+		assertThat(document).isEqualTo(Document.parse(
+				"{ $setWindowFields: { output: { f1 : { $sum: \"$quantity\", window: { documents: [ \"unbounded\", \"current\" ] } }, f2 : { $avg: \"$quantity\", window: { documents: [ -1, 0 ] } } } } }"));
+	}
+
+	private static AggregationOperationContext contextFor(@Nullable Class<?> type) {
+
+		if (type == null) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				new MongoMappingContext());
+		mongoConverter.afterPropertiesSet();
+
+		return new TypeBasedAggregationOperationContext(type, mongoConverter.getMappingContext(),
+				new QueryMapper(mongoConverter));
+	}
+
+	static class CakeSale {
+
+		String state;
+
+		@Field("orderDate") Date date;
+
+		@Field("quantity") Integer qty;
+
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SkipOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SkipOperationUnitTests.java
index c6b9bff7c2..73f78348fb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SkipOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SkipOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link SkipOperation}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperationUnitTests.java
index 1507c83bb8..923778dea4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortByCountOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link SortByCountOperation}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortOperationUnitTests.java
index 3eba5bb377..19f80f2d08 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SortOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 import static org.springframework.data.mongodb.core.DocumentTestUtils.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerIntegrationTests.java
index 275b232c51..86f4ff03cf 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,25 +23,25 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mapping.context.InvalidPersistentPropertyPath;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 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.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration tests for {@link SpelExpressionTransformer}.
  *
  * @author Thomas Darimont
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class SpelExpressionTransformerIntegrationTests {
 
-	@Autowired MongoDbFactory mongoDbFactory;
+	@Autowired MongoDatabaseFactory mongoDbFactory;
 
 	SpelExpressionTransformer transformer;
 	DbRefResolver dbRefResolver;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerUnitTests.java
index ac16820de3..abe2fd5605 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,14 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
 
 import java.util.Arrays;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.Person;
 
@@ -32,15 +32,17 @@
  * @author Thomas Darimont
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Divya Srivastava
+ * @author Julia Lee
  */
 public class SpelExpressionTransformerUnitTests {
 
-	SpelExpressionTransformer transformer = new SpelExpressionTransformer();
+	private SpelExpressionTransformer transformer = new SpelExpressionTransformer();
 
-	Data data;
+	private Data data;
 
-	@Before
-	public void setup() {
+	@BeforeEach
+	void beforeEach() {
 
 		this.data = new Data();
 		this.data.primitiveLongValue = 42;
@@ -51,891 +53,1237 @@ public void setup() {
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderConstantExpression() {
+	void shouldRenderConstantExpression() {
 
-		assertThat(transform("1")).isEqualTo((Object) "1");
-		assertThat(transform("-1")).isEqualTo((Object) "-1");
-		assertThat(transform("1.0")).isEqualTo((Object) "1.0");
-		assertThat(transform("-1.0")).isEqualTo((Object) "-1.0");
-		assertThat(transform("null")).isNull();
+		assertThat(transformValue("1")).isEqualTo("1");
+		assertThat(transformValue("-1")).isEqualTo("-1");
+		assertThat(transformValue("1.0")).isEqualTo("1.0");
+		assertThat(transformValue("-1.0")).isEqualTo("-1.0");
+		assertThat(transformValue("null")).isNull();
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldSupportKnownOperands() {
+	void shouldSupportKnownOperands() {
 
-		assertThat(transform("a + b")).isEqualTo((Object) Document.parse("{ \"$add\" : [ \"$a\" , \"$b\"]}"));
-		assertThat(transform("a - b")).isEqualTo((Object) Document.parse("{ \"$subtract\" : [ \"$a\" , \"$b\"]}"));
-		assertThat(transform("a * b")).isEqualTo((Object) Document.parse("{ \"$multiply\" : [ \"$a\" , \"$b\"]}"));
-		assertThat(transform("a / b")).isEqualTo((Object) Document.parse("{ \"$divide\" : [ \"$a\" , \"$b\"]}"));
-		assertThat(transform("a % b")).isEqualTo((Object) Document.parse("{ \"$mod\" : [ \"$a\" , \"$b\"]}"));
+		assertThat(transform("a + b")).isEqualTo("{ \"$add\" : [ \"$a\" , \"$b\"]}");
+		assertThat(transform("a - b")).isEqualTo("{ \"$subtract\" : [ \"$a\" , \"$b\"]}");
+		assertThat(transform("a * b")).isEqualTo("{ \"$multiply\" : [ \"$a\" , \"$b\"]}");
+		assertThat(transform("a / b")).isEqualTo("{ \"$divide\" : [ \"$a\" , \"$b\"]}");
+		assertThat(transform("a % b")).isEqualTo("{ \"$mod\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldThrowExceptionOnUnknownOperand() {
+	void shouldThrowExceptionOnUnknownOperand() {
 		assertThatIllegalArgumentException().isThrownBy(() -> transform("a++"));
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderSumExpression() {
-		assertThat(transform("a + 1")).isEqualTo((Object) Document.parse("{ \"$add\" : [ \"$a\" , 1]}"));
+	void shouldRenderSumExpression() {
+		assertThat(transform("a + 1")).isEqualTo("{ \"$add\" : [ \"$a\" , 1]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderFormula() {
+	void shouldRenderFormula() {
 
-		assertThat(transform("(netPrice + surCharge) * taxrate + 42")).isEqualTo((Object) Document.parse(
-				"{ \"$add\" : [ { \"$multiply\" : [ { \"$add\" : [ \"$netPrice\" , \"$surCharge\"]} , \"$taxrate\"]} , 42]}"));
+		assertThat(transform("(netPrice + surCharge) * taxrate + 42")).isEqualTo(
+				"{ \"$add\" : [ { \"$multiply\" : [ { \"$add\" : [ \"$netPrice\" , \"$surCharge\"]} , \"$taxrate\"]} , 42]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderFormulaInCurlyBrackets() {
+	void shouldRenderFormulaInCurlyBrackets() {
 
-		assertThat(transform("{(netPrice + surCharge) * taxrate + 42}")).isEqualTo((Object) Document.parse(
-				"{ \"$add\" : [ { \"$multiply\" : [ { \"$add\" : [ \"$netPrice\" , \"$surCharge\"]} , \"$taxrate\"]} , 42]}"));
+		assertThat(transform("{(netPrice + surCharge) * taxrate + 42}")).isEqualTo(
+				"{ \"$add\" : [ { \"$multiply\" : [ { \"$add\" : [ \"$netPrice\" , \"$surCharge\"]} , \"$taxrate\"]} , 42]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderFieldReference() {
+	void shouldRenderFieldReference() {
 
-		assertThat(transform("foo")).isEqualTo((Object) "$foo");
-		assertThat(transform("$foo")).isEqualTo((Object) "$foo");
+		assertThat(transformValue("foo")).isEqualTo("$foo");
+		assertThat(transformValue("$foo")).isEqualTo("$foo");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderNestedFieldReference() {
+	void shouldRenderNestedFieldReference() {
 
-		assertThat(transform("foo.bar")).isEqualTo((Object) "$foo.bar");
-		assertThat(transform("$foo.bar")).isEqualTo((Object) "$foo.bar");
+		assertThat(transformValue("foo.bar")).isEqualTo("$foo.bar");
+		assertThat(transformValue("$foo.bar")).isEqualTo("$foo.bar");
 	}
 
 	@Test // DATAMONGO-774
-	@Ignore
-	public void shouldRenderNestedIndexedFieldReference() {
+	@Disabled
+	void shouldRenderNestedIndexedFieldReference() {
 
 		// TODO add support for rendering nested indexed field references
-		assertThat(transform("foo[3].bar")).isEqualTo((Object) "$foo[3].bar");
+		assertThat(transformValue("foo[3].bar")).isEqualTo("$foo[3].bar");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderConsecutiveOperation() {
-		assertThat(transform("1 + 1 + 1")).isEqualTo((Object) Document.parse("{ \"$add\" : [ 1 , 1 , 1]}"));
+	void shouldRenderConsecutiveOperation() {
+		assertThat(transform("1 + 1 + 1")).isEqualTo("{ \"$add\" : [ 1 , 1 , 1]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderComplexExpression0() {
+	void shouldRenderComplexExpression0() {
 
 		assertThat(transform("-(1 + q)"))
-				.isEqualTo((Object) Document.parse("{ \"$multiply\" : [ -1 , { \"$add\" : [ 1 , \"$q\"]}]}"));
+				.isEqualTo("{ \"$multiply\" : [ -1 , { \"$add\" : [ 1 , \"$q\"]}]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderComplexExpression1() {
+	void shouldRenderComplexExpression1() {
 
-		assertThat(transform("1 + (q + 1) / (q - 1)")).isEqualTo((Object) Document.parse(
-				"{ \"$add\" : [ 1 , { \"$divide\" : [ { \"$add\" : [ \"$q\" , 1]} , { \"$subtract\" : [ \"$q\" , 1]}]}]}"));
+		assertThat(transform("1 + (q + 1) / (q - 1)")).isEqualTo(
+				"{ \"$add\" : [ 1 , { \"$divide\" : [ { \"$add\" : [ \"$q\" , 1]} , { \"$subtract\" : [ \"$q\" , 1]}]}]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderComplexExpression2() {
+	void shouldRenderComplexExpression2() {
 
-		assertThat(transform("(q + 1 + 4 - 5) / (q + 1 + 3 + 4)")).isEqualTo((Object) Document.parse(
-				"{ \"$divide\" : [ { \"$subtract\" : [ { \"$add\" : [ \"$q\" , 1 , 4]} , 5]} , { \"$add\" : [ \"$q\" , 1 , 3 , 4]}]}"));
+		assertThat(transform("(q + 1 + 4 - 5) / (q + 1 + 3 + 4)")).isEqualTo(
+				"{ \"$divide\" : [ { \"$subtract\" : [ { \"$add\" : [ \"$q\" , 1 , 4]} , 5]} , { \"$add\" : [ \"$q\" , 1 , 3 , 4]}]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderBinaryExpressionWithMixedSignsCorrectly() {
+	void shouldRenderBinaryExpressionWithMixedSignsCorrectly() {
 
-		assertThat(transform("-4 + 1")).isEqualTo((Object) Document.parse("{ \"$add\" : [ -4 , 1]}"));
-		assertThat(transform("1 + -4")).isEqualTo((Object) Document.parse("{ \"$add\" : [ 1 , -4]}"));
+		assertThat(transform("-4 + 1")).isEqualTo("{ \"$add\" : [ -4 , 1]}");
+		assertThat(transform("1 + -4")).isEqualTo("{ \"$add\" : [ 1 , -4]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderConsecutiveOperationsInComplexExpression() {
+	void shouldRenderConsecutiveOperationsInComplexExpression() {
 
-		assertThat(transform("1 + 1 + (1 + 1 + 1) / q")).isEqualTo(
-				(Object) Document.parse("{ \"$add\" : [ 1 , 1 , { \"$divide\" : [ { \"$add\" : [ 1 , 1 , 1]} , \"$q\"]}]}"));
+		assertThat(transform("1 + 1 + (1 + 1 + 1) / q"))
+				.isEqualTo("{ \"$add\" : [ 1 , 1 , { \"$divide\" : [ { \"$add\" : [ 1 , 1 , 1]} , \"$q\"]}]}");
 	}
 
 	@Test // DATAMONGO-774
-	public void shouldRenderParameterExpressionResults() {
-		assertThat(transform("[0] + [1] + [2]", 1, 2, 3)).isEqualTo((Object) Document.parse("{ \"$add\" : [ 1 , 2 , 3]}"));
+	void shouldRenderParameterExpressionResults() {
+		assertThat(transform("[0] + [1] + [2]", 1, 2, 3)).isEqualTo("{ \"$add\" : [ 1 , 2 , 3]}");
 	}
 
 	@Test // DATAMONGO-774
-	@Ignore("TODO: mongo3 renders this a bit strange")
-	public void shouldRenderNestedParameterExpressionResults() {
+	void shouldRenderNestedParameterExpressionResults() {
 
 		assertThat(
 				((Document) transform("[0].primitiveLongValue + [0].primitiveDoubleValue + [0].doubleValue.longValue()", data))
-						.toJson()).isEqualTo(Document.parse("{ \"$add\" : [ 42 , 1.2345 , 23]}").toJson());
+						.toJson())
+								.isEqualTo(Document
+										.parse("{ \"$add\" : [ { $numberLong : \"42\"} , 1.2345 , { $numberLong : \"23\" } ]}").toJson());
 	}
 
 	@Test // DATAMONGO-774
-	@Ignore("TODO: mongo3 renders this a bit strange")
-	public void shouldRenderNestedParameterExpressionResultsInNestedExpressions() {
+	void shouldRenderNestedParameterExpressionResultsInNestedExpressions() {
+
+		Document target = ((Document) transform(
+				"((1 + [0].primitiveLongValue) + [0].primitiveDoubleValue) * [0].doubleValue.longValue()", data));
 
 		assertThat(
 				((Document) transform("((1 + [0].primitiveLongValue) + [0].primitiveDoubleValue) * [0].doubleValue.longValue()",
-						data)).toJson()).isEqualTo(
-								new Document("$multiply", Arrays.asList(new Document("$add", Arrays.asList(1, 42L, 1.2345D, 23L))))
-										.toJson());
+						data)))
+								.isEqualTo(new Document("$multiply",
+										Arrays.<Object> asList(new Document("$add", Arrays.<Object> asList(1, 42L, 1.2345D)), 23L)));
 	}
 
 	@Test // DATAMONGO-840
-	public void shouldRenderCompoundExpressionsWithIndexerAndFieldReference() {
+	void shouldRenderCompoundExpressionsWithIndexerAndFieldReference() {
 
 		Person person = new Person();
 		person.setAge(10);
-		assertThat(transform("[0].age + a.c", person))
-				.isEqualTo((Object) Document.parse("{ \"$add\" : [ 10 , \"$a.c\"] }"));
+		assertThat(transform("[0].age + a.c", person)).isEqualTo("{ \"$add\" : [ 10 , \"$a.c\"] }");
 	}
 
 	@Test // DATAMONGO-840
-	public void shouldRenderCompoundExpressionsWithOnlyFieldReferences() {
+	void shouldRenderCompoundExpressionsWithOnlyFieldReferences() {
 
-		assertThat(transform("a.b + a.c")).isEqualTo((Object) Document.parse("{ \"$add\" : [ \"$a.b\" , \"$a.c\"]}"));
+		assertThat(transform("a.b + a.c")).isEqualTo("{ \"$add\" : [ \"$a.b\" , \"$a.c\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeAnd() {
-		assertThat(transform("and(a, b)")).isEqualTo((Object) Document.parse("{ \"$and\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeAnd() {
+		assertThat(transform("and(a, b)")).isEqualTo("{ \"$and\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeOr() {
-		assertThat(transform("or(a, b)")).isEqualTo((Object) Document.parse("{ \"$or\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeOr() {
+		assertThat(transform("or(a, b)")).isEqualTo("{ \"$or\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeNot() {
-		assertThat(transform("not(a)")).isEqualTo((Object) Document.parse("{ \"$not\" : [ \"$a\"]}"));
+	void shouldRenderMethodReferenceNodeNot() {
+		assertThat(transform("not(a)")).isEqualTo("{ \"$not\" : [ \"$a\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeSetEquals() {
-		assertThat(transform("setEquals(a, b)"))
-				.isEqualTo((Object) Document.parse("{ \"$setEquals\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeSetEquals() {
+		assertThat(transform("setEquals(a, b)")).isEqualTo("{ \"$setEquals\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeSetEqualsForArrays() {
+	void shouldRenderMethodReferenceNodeSetEqualsForArrays() {
 		assertThat(transform("setEquals(new int[]{1,2,3}, new int[]{4,5,6})"))
-				.isEqualTo((Object) Document.parse("{ \"$setEquals\" : [ [ 1 , 2 , 3] , [ 4 , 5 , 6]]}"));
+				.isEqualTo("{ \"$setEquals\" : [ [ 1 , 2 , 3] , [ 4 , 5 , 6]]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeSetEqualsMixedArrays() {
+	void shouldRenderMethodReferenceNodeSetEqualsMixedArrays() {
 		assertThat(transform("setEquals(a, new int[]{4,5,6})"))
-				.isEqualTo((Object) Document.parse("{ \"$setEquals\" : [ \"$a\" , [ 4 , 5 , 6]]}"));
+				.isEqualTo("{ \"$setEquals\" : [ \"$a\" , [ 4 , 5 , 6]]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceSetIntersection() {
+	void shouldRenderMethodReferenceSetIntersection() {
 		assertThat(transform("setIntersection(a, new int[]{4,5,6})"))
-				.isEqualTo((Object) Document.parse("{ \"$setIntersection\" : [ \"$a\" , [ 4 , 5 , 6]]}"));
+				.isEqualTo("{ \"$setIntersection\" : [ \"$a\" , [ 4 , 5 , 6]]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceSetUnion() {
+	void shouldRenderMethodReferenceSetUnion() {
 		assertThat(transform("setUnion(a, new int[]{4,5,6})"))
-				.isEqualTo((Object) Document.parse("{ \"$setUnion\" : [ \"$a\" , [ 4 , 5 , 6]]}"));
+				.isEqualTo("{ \"$setUnion\" : [ \"$a\" , [ 4 , 5 , 6]]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceSeDifference() {
+	void shouldRenderMethodReferenceSeDifference() {
 		assertThat(transform("setDifference(a, new int[]{4,5,6})"))
-				.isEqualTo((Object) Document.parse("{ \"$setDifference\" : [ \"$a\" , [ 4 , 5 , 6]]}"));
+				.isEqualTo("{ \"$setDifference\" : [ \"$a\" , [ 4 , 5 , 6]]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceSetIsSubset() {
+	void shouldRenderMethodReferenceSetIsSubset() {
 		assertThat(transform("setIsSubset(a, new int[]{4,5,6})"))
-				.isEqualTo((Object) Document.parse("{ \"$setIsSubset\" : [ \"$a\" , [ 4 , 5 , 6]]}"));
+				.isEqualTo("{ \"$setIsSubset\" : [ \"$a\" , [ 4 , 5 , 6]]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceAnyElementTrue() {
-		assertThat(transform("anyElementTrue(a)")).isEqualTo((Object) Document.parse("{ \"$anyElementTrue\" : [ \"$a\"]}"));
+	void shouldRenderMethodReferenceAnyElementTrue() {
+		assertThat(transform("anyElementTrue(a)")).isEqualTo("{ \"$anyElementTrue\" : [ \"$a\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceAllElementsTrue() {
+	void shouldRenderMethodReferenceAllElementsTrue() {
 		assertThat(transform("allElementsTrue(a, new int[]{4,5,6})"))
-				.isEqualTo((Object) Document.parse("{ \"$allElementsTrue\" : [ \"$a\" , [ 4 , 5 , 6]]}"));
+				.isEqualTo("{ \"$allElementsTrue\" : [ \"$a\" , [ 4 , 5 , 6]]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceCmp() {
-		assertThat(transform("cmp(a, 250)")).isEqualTo((Object) Document.parse("{ \"$cmp\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceCmp() {
+		assertThat(transform("cmp(a, 250)")).isEqualTo("{ \"$cmp\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceEq() {
-		assertThat(transform("eq(a, 250)")).isEqualTo((Object) Document.parse("{ \"$eq\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceEq() {
+		assertThat(transform("eq(a, 250)")).isEqualTo("{ \"$eq\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceGt() {
-		assertThat(transform("gt(a, 250)")).isEqualTo((Object) Document.parse("{ \"$gt\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceGt() {
+		assertThat(transform("gt(a, 250)")).isEqualTo("{ \"$gt\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceGte() {
-		assertThat(transform("gte(a, 250)")).isEqualTo((Object) Document.parse("{ \"$gte\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceGte() {
+		assertThat(transform("gte(a, 250)")).isEqualTo("{ \"$gte\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceLt() {
-		assertThat(transform("lt(a, 250)")).isEqualTo((Object) Document.parse("{ \"$lt\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceLt() {
+		assertThat(transform("lt(a, 250)")).isEqualTo("{ \"$lt\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceLte() {
-		assertThat(transform("lte(a, 250)")).isEqualTo((Object) Document.parse("{ \"$lte\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceLte() {
+		assertThat(transform("lte(a, 250)")).isEqualTo("{ \"$lte\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNe() {
-		assertThat(transform("ne(a, 250)")).isEqualTo((Object) Document.parse("{ \"$ne\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceNe() {
+		assertThat(transform("ne(a, 250)")).isEqualTo("{ \"$ne\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceAbs() {
-		assertThat(transform("abs(1)")).isEqualTo((Object) Document.parse("{ \"$abs\" : 1}"));
+	void shouldRenderMethodReferenceAbs() {
+		assertThat(transform("abs(1)")).isEqualTo("{ \"$abs\" : 1}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceAdd() {
-		assertThat(transform("add(a, 250)")).isEqualTo((Object) Document.parse("{ \"$add\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceAdd() {
+		assertThat(transform("add(a, 250)")).isEqualTo("{ \"$add\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceCeil() {
-		assertThat(transform("ceil(7.8)")).isEqualTo((Object) Document.parse("{ \"$ceil\" : 7.8}"));
+	void shouldRenderMethodReferenceCeil() {
+		assertThat(transform("ceil(7.8)")).isEqualTo("{ \"$ceil\" : 7.8}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceDivide() {
-		assertThat(transform("divide(a, 250)")).isEqualTo((Object) Document.parse("{ \"$divide\" : [ \"$a\" , 250]}"));
+	void shouldRenderMethodReferenceDivide() {
+		assertThat(transform("divide(a, 250)")).isEqualTo("{ \"$divide\" : [ \"$a\" , 250]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceExp() {
-		assertThat(transform("exp(2)")).isEqualTo((Object) Document.parse("{ \"$exp\" : 2}"));
+	void shouldRenderMethodReferenceExp() {
+		assertThat(transform("exp(2)")).isEqualTo("{ \"$exp\" : 2}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceFloor() {
-		assertThat(transform("floor(2)")).isEqualTo((Object) Document.parse("{ \"$floor\" : 2}"));
+	void shouldRenderMethodReferenceFloor() {
+		assertThat(transform("floor(2)")).isEqualTo("{ \"$floor\" : 2}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceLn() {
-		assertThat(transform("ln(2)")).isEqualTo((Object) Document.parse("{ \"$ln\" : 2}"));
+	void shouldRenderMethodReferenceLn() {
+		assertThat(transform("ln(2)")).isEqualTo("{ \"$ln\" : 2}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceLog() {
-		assertThat(transform("log(100, 10)")).isEqualTo((Object) Document.parse("{ \"$log\" : [ 100 , 10]}"));
+	void shouldRenderMethodReferenceLog() {
+		assertThat(transform("log(100, 10)")).isEqualTo("{ \"$log\" : [ 100 , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceLog10() {
-		assertThat(transform("log10(100)")).isEqualTo((Object) Document.parse("{ \"$log10\" : 100}"));
+	void shouldRenderMethodReferenceLog10() {
+		assertThat(transform("log10(100)")).isEqualTo("{ \"$log10\" : 100}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeMod() {
-		assertThat(transform("mod(a, b)")).isEqualTo((Object) Document.parse("{ \"$mod\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeMod() {
+		assertThat(transform("mod(a, b)")).isEqualTo("{ \"$mod\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeMultiply() {
-		assertThat(transform("multiply(a, b)")).isEqualTo((Object) Document.parse("{ \"$multiply\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeMultiply() {
+		assertThat(transform("multiply(a, b)")).isEqualTo("{ \"$multiply\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodePow() {
-		assertThat(transform("pow(a, 2)")).isEqualTo((Object) Document.parse("{ \"$pow\" : [ \"$a\" , 2]}"));
+	void shouldRenderMethodReferenceNodePow() {
+		assertThat(transform("pow(a, 2)")).isEqualTo("{ \"$pow\" : [ \"$a\" , 2]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceSqrt() {
-		assertThat(transform("sqrt(2)")).isEqualTo((Object) Document.parse("{ \"$sqrt\" : 2}"));
+	void shouldRenderMethodReferenceSqrt() {
+		assertThat(transform("sqrt(2)")).isEqualTo("{ \"$sqrt\" : 2}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeSubtract() {
-		assertThat(transform("subtract(a, b)")).isEqualTo((Object) Document.parse("{ \"$subtract\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeSubtract() {
+		assertThat(transform("subtract(a, b)")).isEqualTo("{ \"$subtract\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceTrunc() {
-		assertThat(transform("trunc(2.1)")).isEqualTo((Object) Document.parse("{ \"$trunc\" : 2.1}"));
+	void shouldRenderMethodReferenceTrunc() {
+		assertThat(transform("trunc(2.1)")).isEqualTo("{ \"$trunc\" : 2.1}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeConcat() {
-		assertThat(transform("concat(a, b, 'c')"))
-				.isEqualTo((Object) Document.parse("{ \"$concat\" : [ \"$a\" , \"$b\" , \"c\"]}"));
+	void shouldRenderMethodReferenceNodeConcat() {
+		assertThat(transform("concat(a, b, 'c')")).isEqualTo("{ \"$concat\" : [ \"$a\" , \"$b\" , \"c\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeSubstrc() {
-		assertThat(transform("substr(a, 0, 1)")).isEqualTo((Object) Document.parse("{ \"$substr\" : [ \"$a\" , 0 , 1]}"));
+	void shouldRenderMethodReferenceNodeSubstrc() {
+		assertThat(transform("substr(a, 0, 1)")).isEqualTo("{ \"$substr\" : [ \"$a\" , 0 , 1]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceToLower() {
-		assertThat(transform("toLower(a)")).isEqualTo((Object) Document.parse("{ \"$toLower\" : \"$a\"}"));
+	void shouldRenderMethodReferenceToLower() {
+		assertThat(transform("toLower(a)")).isEqualTo("{ \"$toLower\" : \"$a\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceToUpper() {
-		assertThat(transform("toUpper(a)")).isEqualTo((Object) Document.parse("{ \"$toUpper\" : \"$a\"}"));
+	void shouldRenderMethodReferenceToUpper() {
+		assertThat(transform("toUpper(a)")).isEqualTo("{ \"$toUpper\" : \"$a\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeStrCaseCmp() {
-		assertThat(transform("strcasecmp(a, b)"))
-				.isEqualTo((Object) Document.parse("{ \"$strcasecmp\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeStrCaseCmp() {
+		assertThat(transform("strcasecmp(a, b)")).isEqualTo("{ \"$strcasecmp\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceMeta() {
-		assertThat(transform("meta('textScore')")).isEqualTo((Object) Document.parse("{ \"$meta\" : \"textScore\"}"));
+	void shouldRenderMethodReferenceMeta() {
+		assertThat(transform("meta('textScore')")).isEqualTo("{ \"$meta\" : \"textScore\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeArrayElemAt() {
-		assertThat(transform("arrayElemAt(a, 10)"))
-				.isEqualTo((Object) Document.parse("{ \"$arrayElemAt\" : [ \"$a\" , 10]}"));
+	void shouldRenderMethodReferenceNodeArrayElemAt() {
+		assertThat(transform("arrayElemAt(a, 10)")).isEqualTo("{ \"$arrayElemAt\" : [ \"$a\" , 10]}");
+	}
+
+	@Test // GH-3694
+	void shouldRenderMethodReferenceNodeFirst() {
+		assertThat(transform("first(a)")).isEqualTo("{ \"$first\" : \"$a\" }");
+	}
+
+	@Test // GH-3694
+	void shouldRenderMethodReferenceNodeLast() {
+		assertThat(transform("last(a)")).isEqualTo("{ \"$last\" : \"$a\" }");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeConcatArrays() {
+	void shouldRenderMethodReferenceNodeConcatArrays() {
 		assertThat(transform("concatArrays(a, b, c)"))
-				.isEqualTo((Object) Document.parse("{ \"$concatArrays\" : [ \"$a\" , \"$b\" , \"$c\"]}"));
+				.isEqualTo("{ \"$concatArrays\" : [ \"$a\" , \"$b\" , \"$c\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeFilter() {
-		assertThat(transform("filter(a, 'num', '$$num' > 10)")).isEqualTo((Object) Document.parse(
-				"{ \"$filter\" : { \"input\" : \"$a\" , \"as\" : \"num\" , \"cond\" : { \"$gt\" : [ \"$$num\" , 10]}}}"));
+	void shouldRenderMethodReferenceNodeFilter() {
+		assertThat(transform("filter(a, 'num', '$$num' > 10)")).isEqualTo(
+				"{ \"$filter\" : { \"input\" : \"$a\" , \"as\" : \"num\" , \"cond\" : { \"$gt\" : [ \"$$num\" , 10]}}}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceIsArray() {
-		assertThat(transform("isArray(a)")).isEqualTo((Object) Document.parse("{ \"$isArray\" : \"$a\"}"));
+	void shouldRenderMethodReferenceIsArray() {
+		assertThat(transform("isArray(a)")).isEqualTo("{ \"$isArray\" : \"$a\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceIsSize() {
-		assertThat(transform("size(a)")).isEqualTo((Object) Document.parse("{ \"$size\" : \"$a\"}"));
+	void shouldRenderMethodReferenceIsSize() {
+		assertThat(transform("size(a)")).isEqualTo("{ \"$size\" : \"$a\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeSlice() {
-		assertThat(transform("slice(a, 10)")).isEqualTo((Object) Document.parse("{ \"$slice\" : [ \"$a\" , 10]}"));
+	void shouldRenderMethodReferenceNodeSlice() {
+		assertThat(transform("slice(a, 10)")).isEqualTo("{ \"$slice\" : [ \"$a\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeMap() {
-		assertThat(transform("map(quizzes, 'grade', '$$grade' + 2)")).isEqualTo((Object) Document.parse(
-				"{ \"$map\" : { \"input\" : \"$quizzes\" , \"as\" : \"grade\" , \"in\" : { \"$add\" : [ \"$$grade\" , 2]}}}"));
+	void shouldRenderMethodReferenceNodeMap() {
+		assertThat(transform("map(quizzes, 'grade', '$$grade' + 2)")).isEqualTo(
+				"{ \"$map\" : { \"input\" : \"$quizzes\" , \"as\" : \"grade\" , \"in\" : { \"$add\" : [ \"$$grade\" , 2]}}}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeLet() {
-		assertThat(transform("let({low:1, high:'$$low'}, gt('$$low', '$$high'))")).isEqualTo((Object) Document.parse(
-				"{ \"$let\" : { \"vars\" : { \"low\" : 1 , \"high\" : \"$$low\"} , \"in\" : { \"$gt\" : [ \"$$low\" , \"$$high\"]}}}"));
+	void shouldRenderMethodReferenceNodeLet() {
+		assertThat(transform("let({low:1, high:'$$low'}, gt('$$low', '$$high'))")).isEqualTo(
+				"{ \"$let\" : { \"vars\" : { \"low\" : 1 , \"high\" : \"$$low\"} , \"in\" : { \"$gt\" : [ \"$$low\" , \"$$high\"]}}}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceLiteral() {
-		assertThat(transform("literal($1)")).isEqualTo((Object) Document.parse("{ \"$literal\" : \"$1\"}"));
+	void shouldRenderMethodReferenceLiteral() {
+		assertThat(transform("literal($1)")).isEqualTo("{ \"$literal\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceDayOfYear() {
-		assertThat(transform("dayOfYear($1)")).isEqualTo((Object) Document.parse("{ \"$dayOfYear\" : \"$1\"}"));
+	void shouldRenderMethodReferenceDayOfYear() {
+		assertThat(transform("dayOfYear($1)")).isEqualTo("{ \"$dayOfYear\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceDayOfMonth() {
-		assertThat(transform("dayOfMonth($1)")).isEqualTo((Object) Document.parse("{ \"$dayOfMonth\" : \"$1\"}"));
+	void shouldRenderMethodReferenceDayOfMonth() {
+		assertThat(transform("dayOfMonth($1)")).isEqualTo("{ \"$dayOfMonth\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceDayOfWeek() {
-		assertThat(transform("dayOfWeek($1)")).isEqualTo((Object) Document.parse("{ \"$dayOfWeek\" : \"$1\"}"));
+	void shouldRenderMethodReferenceDayOfWeek() {
+		assertThat(transform("dayOfWeek($1)")).isEqualTo("{ \"$dayOfWeek\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceYear() {
-		assertThat(transform("year($1)")).isEqualTo((Object) Document.parse("{ \"$year\" : \"$1\"}"));
+	void shouldRenderMethodReferenceYear() {
+		assertThat(transform("year($1)")).isEqualTo("{ \"$year\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceMonth() {
-		assertThat(transform("month($1)")).isEqualTo((Object) Document.parse("{ \"$month\" : \"$1\"}"));
+	void shouldRenderMethodReferenceMonth() {
+		assertThat(transform("month($1)")).isEqualTo("{ \"$month\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceWeek() {
-		assertThat(transform("week($1)")).isEqualTo((Object) Document.parse("{ \"$week\" : \"$1\"}"));
+	void shouldRenderMethodReferenceWeek() {
+		assertThat(transform("week($1)")).isEqualTo("{ \"$week\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceHour() {
-		assertThat(transform("hour($1)")).isEqualTo((Object) Document.parse("{ \"$hour\" : \"$1\"}"));
+	void shouldRenderMethodReferenceHour() {
+		assertThat(transform("hour($1)")).isEqualTo("{ \"$hour\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceMinute() {
-		assertThat(transform("minute($1)")).isEqualTo((Object) Document.parse("{ \"$minute\" : \"$1\"}"));
+	void shouldRenderMethodReferenceMinute() {
+		assertThat(transform("minute($1)")).isEqualTo("{ \"$minute\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceSecond() {
-		assertThat(transform("second($1)")).isEqualTo((Object) Document.parse("{ \"$second\" : \"$1\"}"));
+	void shouldRenderMethodReferenceSecond() {
+		assertThat(transform("second($1)")).isEqualTo("{ \"$second\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceMillisecond() {
-		assertThat(transform("millisecond($1)")).isEqualTo((Object) Document.parse("{ \"$millisecond\" : \"$1\"}"));
+	void shouldRenderMethodReferenceMillisecond() {
+		assertThat(transform("millisecond($1)")).isEqualTo("{ \"$millisecond\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceDateToString() {
-		assertThat(transform("dateToString('%Y-%m-%d', $date)")).isEqualTo(
-				(Object) Document.parse("{ \"$dateToString\" : { \"format\" : \"%Y-%m-%d\" , \"date\" : \"$date\"}}"));
+	void shouldRenderMethodReferenceDateToString() {
+		assertThat(transform("dateToString('%Y-%m-%d', $date)"))
+				.isEqualTo("{ \"$dateToString\" : { \"format\" : \"%Y-%m-%d\" , \"date\" : \"$date\"}}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceCond() {
-		assertThat(transform("cond(qty > 250, 30, 20)")).isEqualTo((Object) Document
-				.parse("{ \"$cond\" : { \"if\" : { \"$gt\" : [ \"$qty\" , 250]} , \"then\" : 30 , \"else\" : 20}}"));
+	void shouldRenderMethodReferenceCond() {
+		assertThat(transform("cond(qty > 250, 30, 20)")).isEqualTo(
+				"{ \"$cond\" : { \"if\" : { \"$gt\" : [ \"$qty\" , 250]} , \"then\" : 30 , \"else\" : 20}}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeIfNull() {
-		assertThat(transform("ifNull(a, 10)")).isEqualTo((Object) Document.parse("{ \"$ifNull\" : [ \"$a\" , 10]}"));
+	void shouldRenderMethodReferenceNodeIfNull() {
+		assertThat(transform("ifNull(a, 10)")).isEqualTo("{ \"$ifNull\" : [ \"$a\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeSum() {
-		assertThat(transform("sum(a, b)")).isEqualTo((Object) Document.parse("{ \"$sum\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeSum() {
+		assertThat(transform("sum(a, b)")).isEqualTo("{ \"$sum\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeAvg() {
-		assertThat(transform("avg(a, b)")).isEqualTo((Object) Document.parse("{ \"$avg\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeAvg() {
+		assertThat(transform("avg(a, b)")).isEqualTo("{ \"$avg\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceFirst() {
-		assertThat(transform("first($1)")).isEqualTo((Object) Document.parse("{ \"$first\" : \"$1\"}"));
+	void shouldRenderMethodReferenceFirst() {
+		assertThat(transform("first($1)")).isEqualTo("{ \"$first\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceLast() {
-		assertThat(transform("last($1)")).isEqualTo((Object) Document.parse("{ \"$last\" : \"$1\"}"));
+	void shouldRenderMethodReferenceLast() {
+		assertThat(transform("last($1)")).isEqualTo("{ \"$last\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeMax() {
-		assertThat(transform("max(a, b)")).isEqualTo((Object) Document.parse("{ \"$max\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeMax() {
+		assertThat(transform("max(a, b)")).isEqualTo("{ \"$max\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeMin() {
-		assertThat(transform("min(a, b)")).isEqualTo((Object) Document.parse("{ \"$min\" : [ \"$a\" , \"$b\"]}"));
+	void shouldRenderMethodReferenceNodeMin() {
+		assertThat(transform("min(a, b)")).isEqualTo("{ \"$min\" : [ \"$a\" , \"$b\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodePush() {
+	void shouldRenderMethodReferenceNodePush() {
 		assertThat(transform("push({'item':'$item', 'quantity':'$qty'})"))
-				.isEqualTo((Object) Document.parse("{ \"$push\" : { \"item\" : \"$item\" , \"quantity\" : \"$qty\"}}"));
+				.isEqualTo("{ \"$push\" : { \"item\" : \"$item\" , \"quantity\" : \"$qty\"}}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceAddToSet() {
-		assertThat(transform("addToSet($1)")).isEqualTo((Object) Document.parse("{ \"$addToSet\" : \"$1\"}"));
+	void shouldRenderMethodReferenceAddToSet() {
+		assertThat(transform("addToSet($1)")).isEqualTo("{ \"$addToSet\" : \"$1\"}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeStdDevPop() {
+	void shouldRenderMethodReferenceNodeStdDevPop() {
 		assertThat(transform("stdDevPop(scores.score)"))
-				.isEqualTo((Object) Document.parse("{ \"$stdDevPop\" : [ \"$scores.score\"]}"));
+				.isEqualTo("{ \"$stdDevPop\" : [ \"$scores.score\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderMethodReferenceNodeStdDevSamp() {
-		assertThat(transform("stdDevSamp(age)")).isEqualTo((Object) Document.parse("{ \"$stdDevSamp\" : [ \"$age\"]}"));
+	void shouldRenderMethodReferenceNodeStdDevSamp() {
+		assertThat(transform("stdDevSamp(age)")).isEqualTo("{ \"$stdDevSamp\" : [ \"$age\"]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeEq() {
-		assertThat(transform("foo == 10")).isEqualTo((Object) Document.parse("{ \"$eq\" : [ \"$foo\" , 10]}"));
+	void shouldRenderOperationNodeEq() {
+		assertThat(transform("foo == 10")).isEqualTo("{ \"$eq\" : [ \"$foo\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeNe() {
-		assertThat(transform("foo != 10")).isEqualTo((Object) Document.parse("{ \"$ne\" : [ \"$foo\" , 10]}"));
+	void shouldRenderOperationNodeNe() {
+		assertThat(transform("foo != 10")).isEqualTo("{ \"$ne\" : [ \"$foo\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeGt() {
-		assertThat(transform("foo > 10")).isEqualTo((Object) Document.parse("{ \"$gt\" : [ \"$foo\" , 10]}"));
+	void shouldRenderOperationNodeGt() {
+		assertThat(transform("foo > 10")).isEqualTo("{ \"$gt\" : [ \"$foo\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeGte() {
-		assertThat(transform("foo >= 10")).isEqualTo((Object) Document.parse("{ \"$gte\" : [ \"$foo\" , 10]}"));
+	void shouldRenderOperationNodeGte() {
+		assertThat(transform("foo >= 10")).isEqualTo("{ \"$gte\" : [ \"$foo\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeLt() {
-		assertThat(transform("foo < 10")).isEqualTo((Object) Document.parse("{ \"$lt\" : [ \"$foo\" , 10]}"));
+	void shouldRenderOperationNodeLt() {
+		assertThat(transform("foo < 10")).isEqualTo("{ \"$lt\" : [ \"$foo\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeLte() {
-		assertThat(transform("foo <= 10")).isEqualTo((Object) Document.parse("{ \"$lte\" : [ \"$foo\" , 10]}"));
+	void shouldRenderOperationNodeLte() {
+		assertThat(transform("foo <= 10")).isEqualTo("{ \"$lte\" : [ \"$foo\" , 10]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodePow() {
-		assertThat(transform("foo^2")).isEqualTo((Object) Document.parse("{ \"$pow\" : [ \"$foo\" , 2]}"));
+	void shouldRenderOperationNodePow() {
+		assertThat(transform("foo^2")).isEqualTo("{ \"$pow\" : [ \"$foo\" , 2]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeOr() {
-		assertThat(transform("true || false")).isEqualTo((Object) Document.parse("{ \"$or\" : [ true , false]}"));
+	void shouldRenderOperationNodeOr() {
+		assertThat(transform("true || false")).isEqualTo("{ \"$or\" : [ true , false]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderComplexOperationNodeOr() {
+	void shouldRenderComplexOperationNodeOr() {
 		assertThat(transform("1+2 || concat(a, b) || true")).isEqualTo(
-				(Object) Document.parse("{ \"$or\" : [ { \"$add\" : [ 1 , 2]} , { \"$concat\" : [ \"$a\" , \"$b\"]} , true]}"));
+				"{ \"$or\" : [ { \"$add\" : [ 1 , 2]} , { \"$concat\" : [ \"$a\" , \"$b\"]} , true]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderOperationNodeAnd() {
-		assertThat(transform("true && false")).isEqualTo((Object) Document.parse("{ \"$and\" : [ true , false]}"));
+	void shouldRenderOperationNodeAnd() {
+		assertThat(transform("true && false")).isEqualTo("{ \"$and\" : [ true , false]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderComplexOperationNodeAnd() {
-		assertThat(transform("1+2 && concat(a, b) && true")).isEqualTo((Object) Document
-				.parse("{ \"$and\" : [ { \"$add\" : [ 1 , 2]} , { \"$concat\" : [ \"$a\" , \"$b\"]} , true]}"));
+	void shouldRenderComplexOperationNodeAnd() {
+		assertThat(transform("1+2 && concat(a, b) && true")).isEqualTo(
+				"{ \"$and\" : [ { \"$add\" : [ 1 , 2]} , { \"$concat\" : [ \"$a\" , \"$b\"]} , true]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderNotCorrectly() {
-		assertThat(transform("!true")).isEqualTo((Object) Document.parse("{ \"$not\" : [ true]}"));
+	void shouldRenderNotCorrectly() {
+		assertThat(transform("!true")).isEqualTo("{ \"$not\" : [ true]}");
 	}
 
 	@Test // DATAMONGO-1530
-	public void shouldRenderComplexNotCorrectly() {
-		assertThat(transform("!(foo > 10)"))
-				.isEqualTo((Object) Document.parse("{ \"$not\" : [ { \"$gt\" : [ \"$foo\" , 10]}]}"));
+	void shouldRenderComplexNotCorrectly() {
+		assertThat(transform("!(foo > 10)")).isEqualTo("{ \"$not\" : [ { \"$gt\" : [ \"$foo\" , 10]}]}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceIndexOfBytes() {
+	void shouldRenderMethodReferenceIndexOfBytes() {
 		assertThat(transform("indexOfBytes(item, 'foo')"))
-				.isEqualTo(Document.parse("{ \"$indexOfBytes\" : [ \"$item\" , \"foo\"]}"));
+				.isEqualTo("{ \"$indexOfBytes\" : [ \"$item\" , \"foo\"]}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceIndexOfCP() {
+	void shouldRenderMethodReferenceIndexOfCP() {
 		assertThat(transform("indexOfCP(item, 'foo')"))
-				.isEqualTo(Document.parse("{ \"$indexOfCP\" : [ \"$item\" , \"foo\"]}"));
+				.isEqualTo("{ \"$indexOfCP\" : [ \"$item\" , \"foo\"]}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceSplit() {
-		assertThat(transform("split(item, ',')")).isEqualTo(Document.parse("{ \"$split\" : [ \"$item\" , \",\"]}"));
+	void shouldRenderMethodReferenceSplit() {
+		assertThat(transform("split(item, ',')")).isEqualTo("{ \"$split\" : [ \"$item\" , \",\"]}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceStrLenBytes() {
-		assertThat(transform("strLenBytes(item)")).isEqualTo(Document.parse("{ \"$strLenBytes\" : \"$item\"}"));
+	void shouldRenderMethodReferenceStrLenBytes() {
+		assertThat(transform("strLenBytes(item)")).isEqualTo("{ \"$strLenBytes\" : \"$item\"}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceStrLenCP() {
-		assertThat(transform("strLenCP(item)")).isEqualTo(Document.parse("{ \"$strLenCP\" : \"$item\"}"));
+	void shouldRenderMethodReferenceStrLenCP() {
+		assertThat(transform("strLenCP(item)")).isEqualTo("{ \"$strLenCP\" : \"$item\"}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodSubstrCP() {
-		assertThat(transform("substrCP(item, 0, 5)")).isEqualTo(Document.parse("{ \"$substrCP\" : [ \"$item\" , 0 , 5]}"));
+	void shouldRenderMethodSubstrCP() {
+		assertThat(transform("substrCP(item, 0, 5)")).isEqualTo("{ \"$substrCP\" : [ \"$item\" , 0 , 5]}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceReverseArray() {
-		assertThat(transform("reverseArray(array)")).isEqualTo(Document.parse("{ \"$reverseArray\" : \"$array\"}"));
+	void shouldRenderMethodReferenceReverseArray() {
+		assertThat(transform("reverseArray(array)")).isEqualTo("{ \"$reverseArray\" : \"$array\"}");
 	}
 
 	@Test // DATAMONGO-1548
-	@Ignore("Document API cannot render String[]")
-	public void shouldRenderMethodReferenceReduce() {
-		assertThat(transform("reduce(field, '', {'$concat':new String[]{'$$value','$$this'}})")).isEqualTo(Document.parse(
-				"{ \"$reduce\" : { \"input\" : \"$field\" , \"initialValue\" : \"\" , \"in\" : { \"$concat\" : [ \"$$value\" , \"$$this\"]}}}"));
+	void shouldRenderMethodReferenceReduce() {
+		assertThat(transform("reduce(field, '', {'$concat':{'$$value','$$this'}})")).isEqualTo(
+				"{ \"$reduce\" : { \"input\" : \"$field\" , \"initialValue\" : \"\" , \"in\" : { \"$concat\" : [ \"$$value\" , \"$$this\"]}}}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceZip() {
+	void shouldRenderMethodReferenceZip() {
 		assertThat(transform("zip(new String[]{'$array1', '$array2'})"))
-				.isEqualTo(Document.parse("{ \"$zip\" : { \"inputs\" : [ \"$array1\" , \"$array2\"]}}"));
+				.isEqualTo("{ \"$zip\" : { \"inputs\" : [ \"$array1\" , \"$array2\"]}}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodReferenceZipWithOptionalArgs() {
-		assertThat(transform("zip(new String[]{'$array1', '$array2'}, true, new int[]{1,2})")).isEqualTo(Document.parse(
-				"{ \"$zip\" : { \"inputs\" : [ \"$array1\" , \"$array2\"] , \"useLongestLength\" : true , \"defaults\" : [ 1 , 2]}}"));
+	void shouldRenderMethodReferenceZipWithOptionalArgs() {
+		assertThat(transform("zip(new String[]{'$array1', '$array2'}, true, new int[]{1,2})")).isEqualTo(
+				"{ \"$zip\" : { \"inputs\" : [ \"$array1\" , \"$array2\"] , \"useLongestLength\" : true , \"defaults\" : [ 1 , 2]}}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodIn() {
-		assertThat(transform("in('item', array)")).isEqualTo(Document.parse("{ \"$in\" : [ \"item\" , \"$array\"]}"));
+	void shouldRenderMethodIn() {
+		assertThat(transform("in('item', array)")).isEqualTo("{ \"$in\" : [ \"item\" , \"$array\"]}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodRefereneIsoDayOfWeek() {
-		assertThat(transform("isoDayOfWeek(date)")).isEqualTo(Document.parse("{ \"$isoDayOfWeek\" : \"$date\"}"));
+	void shouldRenderMethodRefereneIsoDayOfWeek() {
+		assertThat(transform("isoDayOfWeek(date)")).isEqualTo("{ \"$isoDayOfWeek\" : \"$date\"}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodRefereneIsoWeek() {
-		assertThat(transform("isoWeek(date)")).isEqualTo(Document.parse("{ \"$isoWeek\" : \"$date\"}"));
+	void shouldRenderMethodRefereneIsoWeek() {
+		assertThat(transform("isoWeek(date)")).isEqualTo("{ \"$isoWeek\" : \"$date\"}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodRefereneIsoWeekYear() {
-		assertThat(transform("isoWeekYear(date)")).isEqualTo(Document.parse("{ \"$isoWeekYear\" : \"$date\"}"));
+	void shouldRenderMethodRefereneIsoWeekYear() {
+		assertThat(transform("isoWeekYear(date)")).isEqualTo("{ \"$isoWeekYear\" : \"$date\"}");
 	}
 
 	@Test // DATAMONGO-1548
-	public void shouldRenderMethodRefereneType() {
-		assertThat(transform("type(a)")).isEqualTo(Document.parse("{ \"$type\" : \"$a\"}"));
+	void shouldRenderMethodRefereneType() {
+		assertThat(transform("type(a)")).isEqualTo("{ \"$type\" : \"$a\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderArrayToObjectWithFieldReference() {
-		assertThat(transform("arrayToObject(field)")).isEqualTo(Document.parse("{ \"$arrayToObject\" : \"$field\"}"));
+	void shouldRenderArrayToObjectWithFieldReference() {
+		assertThat(transform("arrayToObject(field)")).isEqualTo("{ \"$arrayToObject\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderArrayToObjectWithArray() {
+	void shouldRenderArrayToObjectWithArray() {
 
 		assertThat(transform("arrayToObject(new String[]{'key', 'value'})"))
-				.isEqualTo(Document.parse("{ \"$arrayToObject\" : [\"key\", \"value\"]}"));
+				.isEqualTo("{ \"$arrayToObject\" : [\"key\", \"value\"]}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderObjectToArrayWithFieldReference() {
-		assertThat(transform("objectToArray(field)")).isEqualTo(Document.parse("{ \"$objectToArray\" : \"$field\"}"));
+	void shouldRenderObjectToArrayWithFieldReference() {
+		assertThat(transform("objectToArray(field)")).isEqualTo("{ \"$objectToArray\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderMergeObjects() {
+	void shouldRenderMergeObjects() {
 
 		assertThat(transform("mergeObjects(field1, $$ROOT)"))
-				.isEqualTo(Document.parse("{ \"$mergeObjects\" : [\"$field1\", \"$$ROOT\"]}"));
+				.isEqualTo("{ \"$mergeObjects\" : [\"$field1\", \"$$ROOT\"]}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderTrimWithoutChars() {
-		assertThat(transform("trim(field)")).isEqualTo(Document.parse("{ \"$trim\" : {\"input\" : \"$field\"}}"));
+	void shouldRenderTrimWithoutChars() {
+		assertThat(transform("trim(field)")).isEqualTo("{ \"$trim\" : {\"input\" : \"$field\"}}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderTrimWithChars() {
+	void shouldRenderTrimWithChars() {
 
 		assertThat(transform("trim(field, 'ie')"))
-				.isEqualTo(Document.parse("{ \"$trim\" : {\"input\" : \"$field\", \"chars\" : \"ie\" }}"));
+				.isEqualTo("{ \"$trim\" : {\"input\" : \"$field\", \"chars\" : \"ie\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderTrimWithCharsFromFieldReference() {
+	void shouldRenderTrimWithCharsFromFieldReference() {
 
 		assertThat(transform("trim(field1, field2)"))
-				.isEqualTo(Document.parse("{ \"$trim\" : {\"input\" : \"$field1\", \"chars\" : \"$field2\" }}"));
+				.isEqualTo("{ \"$trim\" : {\"input\" : \"$field1\", \"chars\" : \"$field2\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderLtrimWithoutChars() {
-		assertThat(transform("ltrim(field)")).isEqualTo(Document.parse("{ \"$ltrim\" : {\"input\" : \"$field\"}}"));
+	void shouldRenderLtrimWithoutChars() {
+		assertThat(transform("ltrim(field)")).isEqualTo("{ \"$ltrim\" : {\"input\" : \"$field\"}}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderLtrimWithChars() {
+	void shouldRenderLtrimWithChars() {
 
 		assertThat(transform("ltrim(field, 'ie')"))
-				.isEqualTo(Document.parse("{ \"$ltrim\" : {\"input\" : \"$field\", \"chars\" : \"ie\" }}"));
+				.isEqualTo("{ \"$ltrim\" : {\"input\" : \"$field\", \"chars\" : \"ie\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderLtrimWithCharsFromFieldReference() {
+	void shouldRenderLtrimWithCharsFromFieldReference() {
 
 		assertThat(transform("ltrim(field1, field2)"))
-				.isEqualTo(Document.parse("{ \"$ltrim\" : {\"input\" : \"$field1\", \"chars\" : \"$field2\" }}"));
+				.isEqualTo("{ \"$ltrim\" : {\"input\" : \"$field1\", \"chars\" : \"$field2\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderRtrimWithoutChars() {
-		assertThat(transform("rtrim(field)")).isEqualTo(Document.parse("{ \"$rtrim\" : {\"input\" : \"$field\"}}"));
+	void shouldRenderRtrimWithoutChars() {
+		assertThat(transform("rtrim(field)")).isEqualTo("{ \"$rtrim\" : {\"input\" : \"$field\"}}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderRtrimWithChars() {
+	void shouldRenderRtrimWithChars() {
 
 		assertThat(transform("rtrim(field, 'ie')"))
-				.isEqualTo(Document.parse("{ \"$rtrim\" : {\"input\" : \"$field\", \"chars\" : \"ie\" }}"));
+				.isEqualTo("{ \"$rtrim\" : {\"input\" : \"$field\", \"chars\" : \"ie\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderRtrimWithCharsFromFieldReference() {
+	void shouldRenderRtrimWithCharsFromFieldReference() {
 
 		assertThat(transform("rtrim(field1, field2)"))
-				.isEqualTo(Document.parse("{ \"$rtrim\" : {\"input\" : \"$field1\", \"chars\" : \"$field2\" }}"));
+				.isEqualTo("{ \"$rtrim\" : {\"input\" : \"$field1\", \"chars\" : \"$field2\" }}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindWithoutOptions() {
+
+		assertThat(transform("regexFind(field1,'e')"))
+				.isEqualTo("{ \"$regexFind\" : {\"input\" : \"$field1\" , \"regex\" : \"e\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindWithOptions() {
+
+		assertThat(transform("regexFind(field1,'e','i')"))
+				.isEqualTo("{ \"$regexFind\" : {\"input\" : \"$field1\" , \"regex\" : \"e\" , \"options\" : \"i\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindWithOptionsFromFieldReference() {
+
+		assertThat(transform("regexFind(field1,'e',field2)"))
+				.isEqualTo("{ \"$regexFind\" : {\"input\" : \"$field1\" , \"regex\" : \"e\" , \"options\" : \"$field2\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllWithoutOptions() {
+
+		assertThat(transform("regexFindAll(field1,'e')"))
+				.isEqualTo("{ \"$regexFindAll\" : {\"input\" : \"$field1\" , \"regex\" : \"e\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllWithOptions() {
+
+		assertThat(transform("regexFindAll(field1,'e','i')"))
+				.isEqualTo("{ \"$regexFindAll\" : {\"input\" : \"$field1\" , \"regex\" : \"e\" , \"options\" : \"i\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllWithOptionsFromFieldReference() {
+
+		assertThat(transform("regexFindAll(field1,'e',field2)"))
+				.isEqualTo("{ \"$regexFindAll\" : {\"input\" : \"$field1\" , \"regex\" : \"e\" , \"options\" : \"$field2\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchWithoutOptions() {
+
+		assertThat(transform("regexMatch(field1,'e')"))
+				.isEqualTo("{ \"$regexMatch\" : {\"input\" : \"$field1\" , \"regex\" : \"e\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchWithOptions() {
+
+		assertThat(transform("regexMatch(field1,'e','i')"))
+				.isEqualTo("{ \"$regexMatch\" : {\"input\" : \"$field1\" , \"regex\" : \"e\" , \"options\" : \"i\"}}");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchWithOptionsFromFieldReference() {
+
+		assertThat(transform("regexMatch(field1,'e',field2)"))
+				.isEqualTo("{ \"$regexMatch\" : {\"input\" : \"$field1\" , \"regex\" : \"e\" , \"options\" : \"$field2\"}}");
+	}
+	
+	@Test // GH-3695
+	void shouldRenderReplaceOne() {
+
+		assertThat(transform("replaceOne(field, 'bar', 'baz')"))
+				.isEqualTo("{ \"$replaceOne\" : {\"input\" : \"$field\" , \"find\" : \"bar\" , \"replacement\" : \"baz\"}}");
+	}
+
+	@Test // GH-3695
+	void shouldRenderReplaceAll() {
+
+		assertThat(transform("replaceAll(field, 'bar', 'baz')"))
+				.isEqualTo("{ \"$replaceAll\" : {\"input\" : \"$field\" , \"find\" : \"bar\" , \"replacement\" : \"baz\"}}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderConvertWithoutOptionalParameters() {
+	void shouldRenderConvertWithoutOptionalParameters() {
 
 		assertThat(transform("convert(field, 'string')"))
-				.isEqualTo(Document.parse("{ \"$convert\" : {\"input\" : \"$field\", \"to\" : \"string\" }}"));
+				.isEqualTo("{ \"$convert\" : {\"input\" : \"$field\", \"to\" : \"string\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderConvertWithOnError() {
+	void shouldRenderConvertWithOnError() {
 
-		assertThat(transform("convert(field, 'int', 'Not an integer.')")).isEqualTo(Document
-				.parse("{ \"$convert\" : {\"input\" : \"$field\", \"to\" : \"int\", \"onError\" : \"Not an integer.\" }}"));
+		assertThat(transform("convert(field, 'int', 'Not an integer.')"))
+				.isEqualTo("{ \"$convert\" : {\"input\" : \"$field\", \"to\" : \"int\", \"onError\" : \"Not an integer.\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderConvertWithOnErrorOnNull() {
+	void shouldRenderConvertWithOnErrorOnNull() {
 
-		assertThat(transform("convert(field, 'int', 'Not an integer.', -1)")).isEqualTo(Document.parse(
-				"{ \"$convert\" : {\"input\" : \"$field\", \"to\" : \"int\", \"onError\" : \"Not an integer.\", \"onNull\" : -1 }}"));
+		assertThat(transform("convert(field, 'int', 'Not an integer.', -1)")).isEqualTo(
+				"{ \"$convert\" : {\"input\" : \"$field\", \"to\" : \"int\", \"onError\" : \"Not an integer.\", \"onNull\" : -1 }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToBool() {
-		assertThat(transform("toBool(field)")).isEqualTo(Document.parse("{ \"$toBool\" : \"$field\"}"));
+	void shouldRenderToBool() {
+		assertThat(transform("toBool(field)")).isEqualTo("{ \"$toBool\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToDate() {
-		assertThat(transform("toDate(field)")).isEqualTo(Document.parse("{ \"$toDate\" : \"$field\"}"));
+	void shouldRenderToDate() {
+		assertThat(transform("toDate(field)")).isEqualTo("{ \"$toDate\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToDecimal() {
-		assertThat(transform("toDecimal(field)")).isEqualTo(Document.parse("{ \"$toDecimal\" : \"$field\"}"));
+	void shouldRenderToDecimal() {
+		assertThat(transform("toDecimal(field)")).isEqualTo("{ \"$toDecimal\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToDouble() {
-		assertThat(transform("toDouble(field)")).isEqualTo(Document.parse("{ \"$toDouble\" : \"$field\"}"));
+	void shouldRenderToDouble() {
+		assertThat(transform("toDouble(field)")).isEqualTo("{ \"$toDouble\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToInt() {
-		assertThat(transform("toInt(field)")).isEqualTo(Document.parse("{ \"$toInt\" : \"$field\"}"));
+	void shouldRenderToInt() {
+		assertThat(transform("toInt(field)")).isEqualTo("{ \"$toInt\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToLong() {
-		assertThat(transform("toLong(field)")).isEqualTo(Document.parse("{ \"$toLong\" : \"$field\"}"));
+	void shouldRenderToLong() {
+		assertThat(transform("toLong(field)")).isEqualTo("{ \"$toLong\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToObjectId() {
-		assertThat(transform("toObjectId(field)")).isEqualTo(Document.parse("{ \"$toObjectId\" : \"$field\"}"));
+	void shouldRenderToObjectId() {
+		assertThat(transform("toObjectId(field)")).isEqualTo("{ \"$toObjectId\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderToString() {
-		assertThat(transform("toString(field)")).isEqualTo(Document.parse("{ \"$toString\" : \"$field\"}"));
+	void shouldRenderToString() {
+		assertThat(transform("toString(field)")).isEqualTo("{ \"$toString\" : \"$field\"}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderDateFromStringWithoutOptionalParameters() {
+	void shouldRenderDateFromStringWithoutOptionalParameters() {
 
 		assertThat(transform("dateFromString(field)"))
-				.isEqualTo(Document.parse("{ \"$dateFromString\" : {\"dateString\" : \"$field\" }}"));
+				.isEqualTo("{ \"$dateFromString\" : {\"dateString\" : \"$field\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderDateFromStringWithFormat() {
+	void shouldRenderDateFromStringWithFormat() {
 
 		assertThat(transform("dateFromString(field, 'DD-MM-YYYY')")).isEqualTo(
-				Document.parse("{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\" }}"));
+				"{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderDateFromStringWithFormatAndTimezone() {
+	void shouldRenderDateFromStringWithFormatAndTimezone() {
 
-		assertThat(transform("dateFromString(field, 'DD-MM-YYYY', 'UTC')")).isEqualTo(Document.parse(
-				"{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\", \"timezone\" : \"UTC\" }}"));
+		assertThat(transform("dateFromString(field, 'DD-MM-YYYY', 'UTC')")).isEqualTo(
+				"{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\", \"timezone\" : \"UTC\" }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderDateFromStringWithFormatTimezoneAndOnError() {
+	void shouldRenderDateFromStringWithFormatTimezoneAndOnError() {
 
-		assertThat(transform("dateFromString(field, 'DD-MM-YYYY', 'UTC', -1)")).isEqualTo(Document.parse(
-				"{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\", \"timezone\" : \"UTC\", \"onError\" : -1 }}"));
+		assertThat(transform("dateFromString(field, 'DD-MM-YYYY', 'UTC', -1)")).isEqualTo(
+				"{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\", \"timezone\" : \"UTC\", \"onError\" : -1 }}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderDateFromStringWithFormatTimezoneOnErrorAndOnNull() {
+	void shouldRenderDateFromStringWithFormatTimezoneOnErrorAndOnNull() {
 
-		assertThat(transform("dateFromString(field, 'DD-MM-YYYY', 'UTC', -1, -2)")).isEqualTo(Document.parse(
-				"{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\", \"timezone\" : \"UTC\", \"onError\" : -1,  \"onNull\" : -2}}"));
+		assertThat(transform("dateFromString(field, 'DD-MM-YYYY', 'UTC', -1, -2)")).isEqualTo(
+				"{ \"$dateFromString\" : {\"dateString\" : \"$field\", \"format\" : \"DD-MM-YYYY\", \"timezone\" : \"UTC\", \"onError\" : -1,  \"onNull\" : -2}}");
 	}
 
-	@Test // DATAMONGO-2077
-	public void shouldRenderDateFromParts() {
+	@Test // DATAMONGO-2077, DATAMONGO-2671
+	void shouldRenderDateFromParts() {
 
-		assertThat(transform("dateFromParts(y, m, d, h, mm, s, ms, 'UTC')")).isEqualTo(Document.parse(
-				"{ \"$dateFromParts\" : {\"year\" : \"$y\", \"month\" : \"$m\", \"day\" : \"$d\", \"hour\" : \"$h\",  \"minute\" : \"$mm\",  \"second\" : \"$s\", \"milliseconds\" : \"$ms\", \"timezone\" : \"UTC\"}}"));
+		assertThat(transform("dateFromParts(y, m, d, h, mm, s, ms, 'UTC')")).isEqualTo(
+				"{ \"$dateFromParts\" : {\"year\" : \"$y\", \"month\" : \"$m\", \"day\" : \"$d\", \"hour\" : \"$h\",  \"minute\" : \"$mm\",  \"second\" : \"$s\", \"millisecond\" : \"$ms\", \"timezone\" : \"UTC\"}}");
 	}
 
-	@Test // DATAMONGO-2077
-	public void shouldRenderIsoDateFromParts() {
+	@Test // DATAMONGO-2077, DATAMONGO-2671
+	void shouldRenderIsoDateFromParts() {
 
-		assertThat(transform("isoDateFromParts(y, m, d, h, mm, s, ms, 'UTC')")).isEqualTo(Document.parse(
-				"{ \"$dateFromParts\" : {\"isoWeekYear\" : \"$y\", \"isoWeek\" : \"$m\", \"isoDayOfWeek\" : \"$d\", \"hour\" : \"$h\",  \"minute\" : \"$mm\",  \"second\" : \"$s\", \"milliseconds\" : \"$ms\", \"timezone\" : \"UTC\"}}"));
+		assertThat(transform("isoDateFromParts(y, m, d, h, mm, s, ms, 'UTC')")).isEqualTo(
+				"{ \"$dateFromParts\" : {\"isoWeekYear\" : \"$y\", \"isoWeek\" : \"$m\", \"isoDayOfWeek\" : \"$d\", \"hour\" : \"$h\",  \"minute\" : \"$mm\",  \"second\" : \"$s\", \"millisecond\" : \"$ms\", \"timezone\" : \"UTC\"}}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderDateToParts() {
+	void shouldRenderDateToParts() {
 
 		assertThat(transform("dateToParts(field, 'UTC', false)")).isEqualTo(
-				Document.parse("{ \"$dateToParts\" : {\"date\" : \"$field\", \"timezone\" : \"UTC\", \"iso8601\" : false}}"));
+				"{ \"$dateToParts\" : {\"date\" : \"$field\", \"timezone\" : \"UTC\", \"iso8601\" : false}}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderIndexOfArray() {
+	void shouldRenderIndexOfArray() {
 
 		assertThat(transform("indexOfArray(field, 2)"))
-				.isEqualTo(Document.parse("{ \"$indexOfArray\" : [\"$field\", 2 ]}"));
+				.isEqualTo("{ \"$indexOfArray\" : [\"$field\", 2 ]}");
 	}
 
 	@Test // DATAMONGO-2077
-	public void shouldRenderRange() {
+	void shouldRenderRange() {
+
+		assertThat(transform("range(0, 10, 2)")).isEqualTo("{ \"$range\" : [0, 10, 2 ]}");
+	}
+
+	@Test // DATAMONGO-2370
+	void shouldRenderRound() {
+		assertThat(transform("round(field)")).isEqualTo("{ \"$round\" : [\"$field\"]}");
+	}
+
+	@Test // DATAMONGO-2370
+	void shouldRenderRoundWithPlace() {
+		assertThat(transform("round(field, 2)")).isEqualTo("{ \"$round\" : [\"$field\", 2]}");
+	}
+
+	@Test // GH-3714
+	void shouldRenderDegreesToRadians() {
+		assertThat(transform("degreesToRadians(angle_a)")).isEqualTo("{ \"$degreesToRadians\" : \"$angle_a\"}");
+	}
+
+	@Test // GH-3712
+	void shouldRenderCovariancePop() {
+		assertThat(transform("covariancePop(field1, field2)"))
+				.isEqualTo("{ \"$covariancePop\" : [\"$field1\", \"$field2\"]}");
+	}
+
+	@Test // GH-3712
+	void shouldRenderCovarianceSamp() {
+		assertThat(transform("covarianceSamp(field1, field2)"))
+				.isEqualTo("{ \"$covarianceSamp\" : [\"$field1\", \"$field2\"]}");
+	}
+
+	@Test // GH-3715
+	void shouldRenderRank() {
+		assertThat(transform("rank()")).isEqualTo("{ $rank : {} }");
+	}
+
+	@Test // GH-3715
+	void shouldRenderDenseRank() {
+		assertThat(transform("denseRank()")).isEqualTo("{ $denseRank : {} }");
+	}
+
+	@Test // GH-3717
+	void shouldRenderDocumentNumber() {
+		assertThat(transform("documentNumber()")).isEqualTo("{ $documentNumber : {} }");
+	}
+
+	@Test // GH-3727
+	void rendersShift() {
+
+		assertThat(transform("shift(quantity, 1)"))
+				.isEqualTo("{ $shift: { output: \"$quantity\", by: 1 } }");
+	}
+
+	@Test // GH-3727
+	void rendersShiftWithDefault() {
+
+		assertThat(transform("shift(quantity, 1, 'Not available')"))
+				.isEqualTo("{ $shift: { output: \"$quantity\", by: 1, default: \"Not available\" } }");
+	}
+
+	@Test // GH-3716
+	void shouldRenderDerivative() {
+		assertThat(transform("derivative(miles, 'hour')"))
+				.isEqualTo("{ \"$derivative\" : { input : '$miles', unit : 'hour'} }");
+	}
+
+	@Test // GH-3721
+	void shouldRenderIntegral() {
+		assertThat(transform("integral(field)")).isEqualTo("{ \"$integral\" : { \"input\" : \"$field\" }}");
+	}
+
+	@Test // GH-3721
+	void shouldRenderIntegralWithUnit() {
+		assertThat(transform("integral(field, 'hour')"))
+				.isEqualTo("{ \"$integral\" : { \"input\" : \"$field\", \"unit\" : \"hour\" }}");
+	}
+
+	@Test // GH-3728
+	void shouldRenderSin() {
+		assertThat(transform("sin(angle)")).isEqualTo("{ \"$sin\" : \"$angle\"}");
+	}
+
+	@Test // GH-3728
+	void shouldRenderSinh() {
+		assertThat(transform("sinh(angle)")).isEqualTo("{ \"$sinh\" : \"$angle\"}");
+	}
+
+	@Test // GH-3708
+	void shouldRenderASin() {
+		assertThat(transform("asin(number)")).isEqualTo("{ \"$asin\" : \"$number\"}");
+	}
+
+	@Test // GH-3708
+	void shouldRenderASinh() {
+		assertThat(transform("asinh(number)")).isEqualTo("{ \"$asinh\" : \"$number\"}");
+	}
+
+	@Test // GH-3710
+	void shouldRenderCos() {
+		assertThat(transform("cos(angle)")).isEqualTo("{ \"$cos\" : \"$angle\"}");
+	}
+
+	@Test // GH-3710
+	void shouldRenderCosh() {
+		assertThat(transform("cosh(angle)")).isEqualTo("{ \"$cosh\" : \"$angle\"}");
+	}
+
+	@Test // GH-3707
+	void shouldRenderACos() {
+		assertThat(transform("acos(angle)")).isEqualTo("{ \"$acos\" : \"$angle\"}");
+	}
+
+	@Test // GH-3707
+	void shouldRenderACosh() {
+		assertThat(transform("acosh(angle)")).isEqualTo("{ \"$acosh\" : \"$angle\"}");
+	}
+
+	@Test // GH-3730
+	void shouldRenderTan() {
+		assertThat(transform("tan(angle)")).isEqualTo("{ \"$tan\" : \"$angle\"}");
+	}
+
+	@Test // GH-3730
+	void shouldRenderTanh() {
+		assertThat(transform("tanh(angle)")).isEqualTo("{ \"$tanh\" : \"$angle\"}");
+	}
+
+	@Test // DATAMONGO - 3709
+	void shouldRenderATan() {
+		assertThat(transform("atan(number)")).isEqualTo("{ \"$atan\" : \"$number\"}");
+	}
+
+	@Test // DATAMONGO - 3709
+	void shouldRenderATan2() {
+		assertThat(transform("atan2(number1,number2)")).isEqualTo("{ \"$atan2\" : [ \"$number1\" , \"$number2\" ] }");
+	}
+
+	@Test // DATAMONGO - 3709
+	void shouldRenderATanh() {
+		assertThat(transform("atanh(number)")).isEqualTo("{ \"$atanh\" : \"$number\"}");
+	}
+
+	@Test // GH-3713
+	void shouldRenderDateAdd() {
+		assertThat(transform("dateAdd(purchaseDate, 'day', 3)"))
+				.isEqualTo("{ $dateAdd: { startDate: \"$purchaseDate\", unit: \"day\", amount: 3 } }");
+	}
+
+	@Test // GH-4139
+	void shouldRenderDateSubtract() {
+		assertThat(transform("dateSubtract(purchaseDate, 'day', 3)"))
+				.isEqualTo("{ $dateSubtract: { startDate: \"$purchaseDate\", unit: \"day\", amount: 3 } }");
+	}
+
+	@Test // GH-3713
+	void shouldRenderDateDiff() {
+		assertThat(transform("dateDiff(purchaseDate, delivered, 'day')"))
+				.isEqualTo("{ $dateDiff: { startDate: \"$purchaseDate\", endDate: \"$delivered\", unit: \"day\" } }");
+	}
+
+	@Test // GH-3724
+	void shouldRenderRand() {
+		assertThat(transform("rand()")).isEqualTo("{ $rand : {} }");
+	}
+
+	@Test // GH-4139
+	void shouldRenderBottom() {
+		assertThat(transform("bottom(new String[]{\"$playerId\", \"$score\" }, { \"score\" : -1 })")).isEqualTo("{ $bottom : { output: [ \"$playerId\", \"$score\" ], sortBy: { \"score\": -1 }}}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderBottomN() {
+		assertThat(transform("bottomN(3, new String[]{\"$playerId\", \"$score\" }, { \"score\" : -1 })")).isEqualTo("{ $bottomN : { n : 3, output: [ \"$playerId\", \"$score\" ], sortBy: { \"score\": -1 }}}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderTop() {
+		assertThat(transform("top(new String[]{\"$playerId\", \"$score\" }, { \"score\" : -1 })")).isEqualTo("{ $top : { output: [ \"$playerId\", \"$score\" ], sortBy: { \"score\": -1 }}}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderTopN() {
+		assertThat(transform("topN(3, new String[]{\"$playerId\", \"$score\" }, { \"score\" : -1 })")).isEqualTo("{ $topN : { n : 3, output: [ \"$playerId\", \"$score\" ], sortBy: { \"score\": -1 }}}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderFirstN() {
+		assertThat(transform("firstN(3, \"$score\")")).isEqualTo("{ $firstN : { n : 3, input : \"$score\" }}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderLastN() {
+		assertThat(transform("lastN(3, \"$score\")")).isEqualTo("{ $lastN : { n : 3, input : \"$score\" }}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderMaxN() {
+		assertThat(transform("maxN(3, \"$score\")")).isEqualTo("{ $maxN : { n : 3, input : \"$score\" }}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderMinN() {
+		assertThat(transform("minN(3, \"$score\")")).isEqualTo("{ $minN : { n : 3, input : \"$score\" }}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderDateTrunc() {
+		assertThat(transform("dateTrunc(purchaseDate, \"week\", 2, \"monday\")")).isEqualTo("{ $dateTrunc : { date : \"$purchaseDate\", unit : \"week\", binSize : 2, startOfWeek : \"monday\" }}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderGetField() {
+		assertThat(transform("getField(\"score\", source)")).isEqualTo("{ $getField : { field : \"score\", input : \"$source\" }}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderSetField() {
+		assertThat(transform("setField(\"score\", 100, source)")).isEqualTo("{ $setField : { field : \"score\", value : 100, input : \"$source\" }}");
+	}
+
+	@Test // GH-4139
+	void shouldRenderSortArray() {
+		assertThat(transform(
+				"sortArray(team, new org.bson.Document(\"name\" , 1))")).isEqualTo("{ $sortArray : { input : \"$team\", sortBy : {\"name\" : 1 } }}");
+	}
+
+	@Test // GH-4139
+	void shouldTsIncrement() {
+		assertThat(transform("tsIncrement(saleTimestamp)")).isEqualTo("{ $tsIncrement: \"$saleTimestamp\" }");
+	}
+
+	@Test // GH-4139
+	void shouldTsSecond() {
+		assertThat(transform("tsSecond(saleTimestamp)")).isEqualTo("{ $tsSecond: \"$saleTimestamp\" }");
+	}
+
+	@Test // GH-4139
+	void shouldRenderLocf() {
+		assertThat(transform("locf(price)")).isEqualTo("{ $locf: \"$price\" }");
+	}
+
+	@Test // GH-4473
+	void shouldRenderPercentile() {
+		assertThat(transform("percentile(new String[]{\"$scoreOne\", \"$scoreTwo\" }, new double[]{0.4}, \"approximate\")"))
+			.isEqualTo("{ $percentile : { input : [\"$scoreOne\", \"$scoreTwo\"], p : [0.4], method : \"approximate\" }}");
+
+		assertThat(transform("percentile(score, new double[]{0.4, 0.85}, \"approximate\")"))
+			.isEqualTo("{ $percentile : { input : \"$score\", p : [0.4, 0.85], method : \"approximate\" }}");
+
+		assertThat(transform("percentile(\"$score\", new double[]{0.4, 0.85}, \"approximate\")"))
+			.isEqualTo("{ $percentile : { input : \"$score\", p : [0.4, 0.85], method : \"approximate\" }}");
+	}
+
+	@Test // GH-4472
+	void shouldRenderMedian() {
+
+		assertThat(transform("median(new String[]{\"$scoreOne\", \"$scoreTwo\" }, \"approximate\")"))
+				.isEqualTo("{ $median : { input : [\"$scoreOne\", \"$scoreTwo\"], method : \"approximate\" }}");
+
+		assertThat(transform("median(score, \"approximate\")"))
+				.isEqualTo("{ $median : { input : \"$score\", method : \"approximate\" }}");
+	}
 
-		assertThat(transform("range(0, 10, 2)")).isEqualTo(Document.parse("{ \"$range\" : [0, 10, 2 ]}"));
+	private Document transform(String expression, Object... params) {
+		return (Document) transformer.transform(expression, Aggregation.DEFAULT_CONTEXT, params);
 	}
 
-	private Object transform(String expression, Object... params) {
+	private Object transformValue(String expression, Object... params) {
 		Object result = transformer.transform(expression, Aggregation.DEFAULT_CONTEXT, params);
 		return result == null ? null : (!(result instanceof org.bson.Document) ? result.toString() : result);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StateStats.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StateStats.java
index 502a903297..a5a47ec85a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StateStats.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StateStats.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StringOperatorsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StringOperatorsUnitTests.java
index 6f42894515..61d2951ebb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StringOperatorsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/StringOperatorsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,134 +15,298 @@
  */
 package org.springframework.data.mongodb.core.aggregation;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import java.util.regex.Pattern;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit test for {@link StringOperators}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Divya Srivastava
  * @currentRead Royal Assassin - Robin Hobb
  */
-public class StringOperatorsUnitTests {
+class StringOperatorsUnitTests {
 
-	static final String EXPRESSION_STRING = "{ \"$fitz\" : \"chivalry\" }";
-	static final Document EXPRESSION_DOC = Document.parse(EXPRESSION_STRING);
-	static final AggregationExpression EXPRESSION = context -> EXPRESSION_DOC;
+	private static final String EXPRESSION_STRING = "{ \"$fitz\" : \"chivalry\" }";
+	private static final Document EXPRESSION_DOC = Document.parse(EXPRESSION_STRING);
+	private static final AggregationExpression EXPRESSION = context -> EXPRESSION_DOC;
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrim() {
+	void shouldRenderTrim() {
 
 		assertThat(StringOperators.valueOf("shrewd").trim().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $trim: { \"input\" : \"$shrewd\" } } "));
+				.isEqualTo("{ $trim: { \"input\" : \"$shrewd\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrimForExpression() {
+	void shouldRenderTrimForExpression() {
 
 		assertThat(StringOperators.valueOf(EXPRESSION).trim().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $trim: { \"input\" : " + EXPRESSION_STRING + " } } "));
+				.isEqualTo("{ $trim: { \"input\" : " + EXPRESSION_STRING + " } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrimWithChars() {
+	void shouldRenderTrimWithChars() {
 
 		assertThat(StringOperators.valueOf("shrewd").trim("sh").toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $trim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } "));
+				.isEqualTo("{ $trim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrimWithCharsExpression() {
+	void shouldRenderTrimWithCharsExpression() {
 
 		assertThat(StringOperators.valueOf("shrewd").trim(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $trim: { \"input\" : \"$shrewd\", \"chars\" : " + EXPRESSION_STRING + " } } "));
+				.isEqualTo("{ $trim: { \"input\" : \"$shrewd\", \"chars\" : " + EXPRESSION_STRING + " } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrimLeft() {
+	void shouldRenderTrimLeft() {
 
 		assertThat(StringOperators.valueOf("shrewd").trim().left().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $ltrim: { \"input\" : \"$shrewd\" } } "));
+				.isEqualTo("{ $ltrim: { \"input\" : \"$shrewd\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrimLeftWithChars() {
+	void shouldRenderTrimLeftWithChars() {
 
 		assertThat(StringOperators.valueOf("shrewd").trim("sh").left().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $ltrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } "));
+				.isEqualTo("{ $ltrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrimRight() {
+	void shouldRenderTrimRight() {
 
 		assertThat(StringOperators.valueOf("shrewd").trim().right().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $rtrim: { \"input\" : \"$shrewd\" } } "));
+				.isEqualTo("{ $rtrim: { \"input\" : \"$shrewd\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderTrimRightWithChars() {
+	void shouldRenderTrimRightWithChars() {
 
 		assertThat(StringOperators.valueOf("shrewd").trim("sh").right().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $rtrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } "));
+				.isEqualTo("{ $rtrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderLTrim() {
+	void shouldRenderLTrim() {
 
 		assertThat(StringOperators.valueOf("shrewd").ltrim().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $ltrim: { \"input\" : \"$shrewd\" } } "));
+				.isEqualTo("{ $ltrim: { \"input\" : \"$shrewd\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderLTrimForExpression() {
+	void shouldRenderLTrimForExpression() {
 
 		assertThat(StringOperators.valueOf(EXPRESSION).ltrim().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $ltrim: { \"input\" : " + EXPRESSION_STRING + " } } "));
+				.isEqualTo("{ $ltrim: { \"input\" : " + EXPRESSION_STRING + " } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderLTrimWithChars() {
+	void shouldRenderLTrimWithChars() {
 
 		assertThat(StringOperators.valueOf("shrewd").ltrim("sh").toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $ltrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } "));
+				.isEqualTo("{ $ltrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderLTrimWithCharsExpression() {
+	void shouldRenderLTrimWithCharsExpression() {
 
 		assertThat(StringOperators.valueOf("shrewd").ltrim(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $ltrim: { \"input\" : \"$shrewd\", \"chars\" : " + EXPRESSION_STRING + " } } "));
+				.isEqualTo("{ $ltrim: { \"input\" : \"$shrewd\", \"chars\" : " + EXPRESSION_STRING + " } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderRTrim() {
+	void shouldRenderRTrim() {
 
 		assertThat(StringOperators.valueOf("shrewd").rtrim().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $rtrim: { \"input\" : \"$shrewd\" } } "));
+				.isEqualTo("{ $rtrim: { \"input\" : \"$shrewd\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderRTrimForExpression() {
+	void shouldRenderRTrimForExpression() {
 
 		assertThat(StringOperators.valueOf(EXPRESSION).rtrim().toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $rtrim: { \"input\" : " + EXPRESSION_STRING + " } } "));
+				.isEqualTo("{ $rtrim: { \"input\" : " + EXPRESSION_STRING + " } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderRTrimWithChars() {
+	void shouldRenderRTrimWithChars() {
 
 		assertThat(StringOperators.valueOf("shrewd").rtrim("sh").toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $rtrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } "));
+				.isEqualTo("{ $rtrim: { \"input\" : \"$shrewd\", \"chars\" : \"sh\" } } ");
 	}
 
 	@Test // DATAMONGO-2049
-	public void shouldRenderRTrimWithCharsExpression() {
+	void shouldRenderRTrimWithCharsExpression() {
 
 		assertThat(StringOperators.valueOf("shrewd").rtrim(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
-				.isEqualTo(Document.parse("{ $rtrim: { \"input\" : \"$shrewd\", \"chars\" : " + EXPRESSION_STRING + " } } "));
+				.isEqualTo("{ $rtrim: { \"input\" : \"$shrewd\", \"chars\" : " + EXPRESSION_STRING + " } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAll() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFindAll("e").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFindAll: { \"input\" : \"$shrewd\" , \"regex\" : \"e\" } }");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllForExpression() {
+
+		assertThat(StringOperators.valueOf(EXPRESSION).regexFindAll("e").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFindAll: { \"input\" : " + EXPRESSION_STRING + " , \"regex\" : \"e\" } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllForRegexExpression() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFindAll(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFindAll: { \"input\" : \"$shrewd\" , \"regex\" : " + EXPRESSION_STRING + " } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllWithPattern() {
+
+		assertThat(StringOperators.valueOf("shrewd")
+				.regexFindAll(
+						Pattern.compile("foo", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL | Pattern.COMMENTS))
+				.toDocument(Aggregation.DEFAULT_CONTEXT))
+						.isEqualTo("{ $regexFindAll: { \"input\" : \"$shrewd\", \"regex\" : \"foo\" , \"options\" : \"imsx\" } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllWithOptions() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFindAll("e").options("i").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFindAll: { \"input\" : \"$shrewd\", \"regex\" : \"e\" , \"options\" : \"i\" } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindAllWithOptionsExpression() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFindAll("e").optionsOf(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFindAll: { \"input\" : \"$shrewd\", \"regex\" : \"e\" , \"options\" : " + EXPRESSION_STRING
+						+ " } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatch() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexMatch("e").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexMatch: { \"input\" : \"$shrewd\" , \"regex\" : \"e\" } }");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchForExpression() {
+
+		assertThat(StringOperators.valueOf(EXPRESSION).regexMatch("e").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexMatch: { \"input\" : " + EXPRESSION_STRING + " , \"regex\" : \"e\" } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchForRegexExpression() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexMatch(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexMatch: { \"input\" : \"$shrewd\" , \"regex\" : " + EXPRESSION_STRING + " } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchForPattern() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexMatch(Pattern.compile("foo", Pattern.CASE_INSENSITIVE))
+				.toDocument(Aggregation.DEFAULT_CONTEXT))
+						.isEqualTo("{ $regexMatch: { \"input\" : \"$shrewd\" , \"regex\" : \"foo\", \"options\" : \"i\"} } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchWithOptions() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexMatch("e").options("i").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexMatch: { \"input\" : \"$shrewd\", \"regex\" : \"e\" , \"options\" : \"i\" } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexMatchWithOptionsExpression() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexMatch("e").optionsOf(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexMatch: { \"input\" : \"$shrewd\", \"regex\" : \"e\" , \"options\" : " + EXPRESSION_STRING
+						+ " } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFind() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFind("e").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFind: { \"input\" : \"$shrewd\" , \"regex\" : \"e\" } }");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindForExpression() {
+
+		assertThat(StringOperators.valueOf(EXPRESSION).regexFind("e").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFind: { \"input\" : " + EXPRESSION_STRING + " , \"regex\" : \"e\" } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindForRegexExpression() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFind(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFind: { \"input\" : \"$shrewd\" , \"regex\" : " + EXPRESSION_STRING + " } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindForPattern() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFind(Pattern.compile("foo", Pattern.MULTILINE))
+				.toDocument(Aggregation.DEFAULT_CONTEXT))
+						.isEqualTo("{ $regexFind: { \"input\" : \"$shrewd\" , \"regex\" : \"foo\", \"options\" : \"m\"} } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindWithOptions() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFind("e").options("i").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFind: { \"input\" : \"$shrewd\", \"regex\" : \"e\" , \"options\" : \"i\" } } ");
+	}
+
+	@Test // GH-3725
+	void shouldRenderRegexFindWithOptionsExpression() {
+
+		assertThat(StringOperators.valueOf("shrewd").regexFind("e").optionsOf(EXPRESSION).toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $regexFind: { \"input\" : \"$shrewd\", \"regex\" : \"e\" , \"options\" : " + EXPRESSION_STRING
+						+ " } } ");
+	}
+	
+	@Test // GH-3695
+	void shouldRenderReplaceOne() {
+
+		assertThat(StringOperators.valueOf("bar").replaceOne("foobar","baz").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $replaceOne : {\"find\" : \"foobar\", \"input\" : \"$bar\", \"replacement\" : \"baz\"}}");
+	}
+
+	@Test // GH-3695
+	void shouldRenderReplaceOneForExpression() {
+
+		assertThat(StringOperators.valueOf(EXPRESSION).replaceOne("a","s").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $replaceOne : {\"find\" : \"a\", \"input\" : " + EXPRESSION_STRING + ", \"replacement\" : \"s\"}}");
 	}
+	
+	@Test // GH-3695
+	void shouldRenderReplaceAll() {
 
+		assertThat(StringOperators.valueOf("bar").replaceAll("foobar","baz").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $replaceAll : {\"find\" : \"foobar\", \"input\" : \"$bar\", \"replacement\" : \"baz\"}}");
+	}
+
+	@Test // GH-3695
+	void shouldRenderReplaceAllForExpression() {
+
+		assertThat(StringOperators.valueOf(EXPRESSION).replaceAll("a","s").toDocument(Aggregation.DEFAULT_CONTEXT))
+				.isEqualTo("{ $replaceAll : {\"find\" : \"a\", \"input\" : " + EXPRESSION_STRING + ", \"replacement\" : \"s\"}}");
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java
index bb0a0921ad..bcc0b6e17f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/TypeBasedAggregationOperationContextUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,19 +20,16 @@
 import static org.springframework.data.mongodb.core.aggregation.Fields.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.AllArgsConstructor;
-
 import java.util.Arrays;
 import java.util.List;
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.annotation.Id;
@@ -40,13 +37,17 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mapping.MappingException;
+import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Reduce;
+import org.springframework.data.mongodb.core.aggregation.ArrayOperators.Reduce.Variable;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.DirectFieldReference;
 import org.springframework.data.mongodb.core.aggregation.ExposedFields.ExposedField;
+import org.springframework.data.mongodb.core.aggregation.SetOperators.SetUnion;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 import org.springframework.data.mongodb.core.query.Criteria;
 
 /**
@@ -57,7 +58,7 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class TypeBasedAggregationOperationContextUnitTests {
 
 	MongoMappingContext context;
@@ -66,7 +67,7 @@ public class TypeBasedAggregationOperationContextUnitTests {
 
 	@Mock DbRefResolver dbRefResolver;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		this.context = new MongoMappingContext();
@@ -283,7 +284,7 @@ public void lookupGroupAggregationShouldOverwriteExposedFields() {
 		assertThat(definition.get("something_totally_different")).isEqualTo(1);
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1326
+	@Test // DATAMONGO-1326
 	public void lookupGroupAggregationShouldFailInvalidFieldReference() {
 
 		TypeBasedAggregationOperationContext context = getContext(MeterData.class);
@@ -291,7 +292,7 @@ public void lookupGroupAggregationShouldFailInvalidFieldReference() {
 				lookup("OtherCollection", "resourceId", "otherId", "lookup"),
 				group().min("lookup.otherkey").as("something_totally_different"), sort(Direction.ASC, "resourceId"));
 
-		agg.toDocument("meterData", context);
+		assertThatIllegalArgumentException().isThrownBy(() -> agg.toDocument("meterData", context));
 	}
 
 	@Test // DATAMONGO-861
@@ -357,14 +358,142 @@ public void projectOperationShouldRenderNestedFieldNamesCorrectlyForTypedAggrega
 				.isEqualTo(new Document("val", new Document("$add", Arrays.asList("$nested1.value1", "$field2.nestedValue2"))));
 	}
 
+	@Test // DATAMONGO-1902
+	void rendersProjectOnUnwrappableTypeFieldCorrectly() {
+
+		AggregationOperationContext context = getContext(WithUnwrapped.class);
+
+		Document agg = newAggregation(WithUnwrapped.class, project().and("unwrappedValue.stringValue").as("val"))
+				.toDocument("collection", context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$stringValue"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersProjectOnUnwrappedFieldWithAtFieldAnnotationCorrectly() {
+
+		AggregationOperationContext context = getContext(WithUnwrapped.class);
+
+		Document agg = newAggregation(WithUnwrapped.class, project().and("unwrappedValue.atFieldAnnotatedValue").as("val"))
+				.toDocument("collection", context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$with-at-field-annotation"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersProjectOnPrefixedUnwrappedFieldCorrectly() {
+
+		AggregationOperationContext context = getContext(WithUnwrapped.class);
+
+		Document agg = newAggregation(WithUnwrapped.class, project().and("prefixedUnwrappedValue.stringValue").as("val"))
+				.toDocument("collection", context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$prefix-stringValue"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersProjectOnPrefixedUnwrappedFieldWithAtFieldAnnotationCorrectly() {
+
+		AggregationOperationContext context = getContext(WithUnwrapped.class);
+
+		Document agg = newAggregation(WithUnwrapped.class,
+				project().and("prefixedUnwrappedValue.atFieldAnnotatedValue").as("val")).toDocument("collection", context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$prefix-with-at-field-annotation"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersProjectOnNestedUnwrappedFieldCorrectly() {
+
+		AggregationOperationContext context = getContext(WrapperAroundWithUnwrapped.class);
+
+		Document agg = newAggregation(WrapperAroundWithUnwrapped.class,
+				project().and("withUnwrapped.unwrappedValue.stringValue").as("val")).toDocument("collection", context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$withUnwrapped.stringValue"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersProjectOnNestedUnwrappedFieldWithAtFieldAnnotationCorrectly() {
+
+		AggregationOperationContext context = getContext(WrapperAroundWithUnwrapped.class);
+
+		Document agg = newAggregation(WrapperAroundWithUnwrapped.class,
+				project().and("withUnwrapped.unwrappedValue.atFieldAnnotatedValue").as("val")).toDocument("collection",
+						context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$withUnwrapped.with-at-field-annotation"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersProjectOnNestedPrefixedUnwrappedFieldCorrectly() {
+
+		AggregationOperationContext context = getContext(WrapperAroundWithUnwrapped.class);
+
+		Document agg = newAggregation(WrapperAroundWithUnwrapped.class,
+				project().and("withUnwrapped.prefixedUnwrappedValue.stringValue").as("val")).toDocument("collection", context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$withUnwrapped.prefix-stringValue"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersProjectOnNestedPrefixedUnwrappedFieldWithAtFieldAnnotationCorrectly() {
+
+		AggregationOperationContext context = getContext(WrapperAroundWithUnwrapped.class);
+
+		Document agg = newAggregation(WrapperAroundWithUnwrapped.class,
+				project().and("withUnwrapped.prefixedUnwrappedValue.atFieldAnnotatedValue").as("val")).toDocument("collection",
+						context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project"))
+				.isEqualTo(new Document("val", "$withUnwrapped.prefix-with-at-field-annotation"));
+	}
+
+	@Test // GH-4070
+	void rendersLocalVariables() {
+
+		AggregationOperationContext context = getContext(WithLists.class);
+
+		Document agg = newAggregation(WithLists.class,
+				project()
+						.and(Reduce.arrayOf("listOfListOfString").withInitialValue(field("listOfString"))
+								.reduce(SetUnion.arrayAsSet(Variable.VALUE.getTarget()).union(Variable.THIS.getTarget())))
+						.as("listOfString")).toDocument("collection", context);
+
+		assertThat(getPipelineElementFromAggregationAt(agg, 0).get("$project")).isEqualTo(Document.parse("""
+				{
+					"listOfString" : {
+						"$reduce" : {
+							"in" : { "$setUnion" : ["$$value", "$$this"] },
+							"initialValue" : "$listOfString",
+							"input" : "$listOfListOfString"
+						}
+					}
+				}
+				"""));
+	}
+
 	@org.springframework.data.mongodb.core.mapping.Document(collection = "person")
-	@AllArgsConstructor
 	public static class FooPerson {
 
 		final ObjectId id;
 		final String name;
 		@org.springframework.data.mongodb.core.mapping.Field("last_name") final String lastName;
 		final Age age;
+
+		public FooPerson(ObjectId id, String name, String lastName, Age age) {
+			this.id = id;
+			this.name = name;
+			this.lastName = lastName;
+			this.age = age;
+		}
 	}
 
 	public static class Age {
@@ -433,4 +562,31 @@ static class Nested {
 		String value1;
 		@org.springframework.data.mongodb.core.mapping.Field("nestedValue2") String value2;
 	}
+
+	static class WrapperAroundWithUnwrapped {
+
+		String id;
+		WithUnwrapped withUnwrapped;
+	}
+
+	static class WithUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable UnwrappableType unwrappedValue;
+		@Unwrapped.Nullable("prefix-") UnwrappableType prefixedUnwrappedValue;
+	}
+
+	static class UnwrappableType {
+
+		String stringValue;
+
+		@org.springframework.data.mongodb.core.mapping.Field("with-at-field-annotation") //
+		String atFieldAnnotatedValue;
+	}
+
+	static class WithLists {
+		public List<String> listOfString;
+		public List<List<String>> listOfListOfString;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperationUnitTests.java
new file mode 100644
index 0000000000..ef514ca882
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnionWithOperationUnitTests.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2020-2025 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.convert.QueryMapper;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+
+/**
+ * Unit tests for {@link UnionWithOperation}.
+ *
+ * @author Christoph Strobl
+ */
+class UnionWithOperationUnitTests {
+
+	@Test // DATAMONGO-2622
+	void throwsErrorWhenNoCollectionPresent() {
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> UnionWithOperation.unionWith(null));
+	}
+
+	@Test // DATAMONGO-2622
+	void rendersJustCollectionCorrectly() {
+
+		assertThat(UnionWithOperation.unionWith("coll-1").toPipelineStages(contextFor(Warehouse.class)))
+				.containsExactly(new Document("$unionWith", new Document("coll", "coll-1")));
+	}
+
+	@Test // DATAMONGO-2622
+	void rendersPipelineCorrectly() {
+
+		assertThat(UnionWithOperation.unionWith("coll-1").mapFieldsTo(Warehouse.class)
+				.pipeline(Aggregation.project().and("location").as("region")).toPipelineStages(contextFor(Warehouse.class)))
+						.containsExactly(new Document("$unionWith", new Document("coll", "coll-1").append("pipeline",
+								Arrays.asList(new Document("$project", new Document("region", 1))))));
+	}
+
+	@Test // DATAMONGO-2622
+	void rendersPipelineCorrectlyForDifferentDomainType() {
+
+		assertThat(UnionWithOperation.unionWith("coll-1").pipeline(Aggregation.project().and("name").as("name"))
+				.mapFieldsTo(Supplier.class).toPipelineStages(contextFor(Warehouse.class)))
+						.containsExactly(new Document("$unionWith", new Document("coll", "coll-1").append("pipeline",
+								Arrays.asList(new Document("$project", new Document("name", "$supplier"))))));
+	}
+
+	@Test // DATAMONGO-2622
+	void rendersPipelineCorrectlyForUntypedContext() {
+
+		assertThat(UnionWithOperation.unionWith("coll-1").pipeline(Aggregation.project("region"))
+				.toPipelineStages(contextFor(null)))
+						.containsExactly(new Document("$unionWith", new Document("coll", "coll-1").append("pipeline",
+								Arrays.asList(new Document("$project", new Document("region", 1))))));
+	}
+
+	@Test // DATAMONGO-2622
+	void doesNotMapAgainstFieldsFromAPreviousStage() {
+
+		TypedAggregation<Supplier> agg = TypedAggregation.newAggregation(Supplier.class,
+				Aggregation.project().and("name").as("supplier"),
+				UnionWithOperation.unionWith("coll-1").pipeline(Aggregation.project().and("name").as("name")));
+
+		List<Document> pipeline = agg.toPipeline(contextFor(Supplier.class));
+		assertThat(pipeline).containsExactly(new Document("$project", new Document("supplier", 1)), //
+				new Document("$unionWith", new Document("coll", "coll-1").append("pipeline",
+						Arrays.asList(new Document("$project", new Document("name", 1))))));
+	}
+
+	@Test // DATAMONGO-2622
+	void mapAgainstUnionWithDomainTypeEvenWhenInsideTypedAggregation() {
+
+		TypedAggregation<Supplier> agg = TypedAggregation.newAggregation(Supplier.class,
+				Aggregation.project().and("name").as("supplier"), UnionWithOperation.unionWith("coll-1")
+						.mapFieldsTo(Warehouse.class).pipeline(Aggregation.project().and("location").as("location")));
+
+		List<Document> pipeline = agg.toPipeline(contextFor(Supplier.class));
+		assertThat(pipeline).containsExactly(new Document("$project", new Document("supplier", 1)), //
+				new Document("$unionWith", new Document("coll", "coll-1").append("pipeline",
+						Arrays.asList(new Document("$project", new Document("location", "$region"))))));
+	}
+
+	private static AggregationOperationContext contextFor(@Nullable Class<?> type) {
+
+		if (type == null) {
+			return Aggregation.DEFAULT_CONTEXT;
+		}
+
+		MappingMongoConverter mongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE,
+				new MongoMappingContext());
+		mongoConverter.afterPropertiesSet();
+
+		return new TypeBasedAggregationOperationContext(type, mongoConverter.getMappingContext(),
+				new QueryMapper(mongoConverter));
+	}
+
+	static class Warehouse {
+
+		String name;
+		@Field("region") String location;
+		String state;
+	}
+
+	static class Supplier {
+
+		@Field("supplier") String name;
+		String state;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnsetOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnsetOperationUnitTests.java
index 9f59e429d0..c406b89626 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnsetOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnsetOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +22,14 @@
 import java.util.Collections;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.convert.QueryMapper;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.lang.Nullable;
 
 /**
  * Unit tests for {@link UnsetOperation}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnwindOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnwindOperationUnitTests.java
index 0951e323a3..8d46363c2d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnwindOperationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UnwindOperationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UserWithLikes.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UserWithLikes.java
index a0e00a0b5d..3eb7f4f884 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UserWithLikes.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/UserWithLikes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,27 +18,70 @@
 import java.util.Arrays;
 import java.util.Date;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Set;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 /**
  * @author Thomas Darimont
  * @author Christoph Strobl
  */
-@Data
-@NoArgsConstructor
 public class UserWithLikes {
 
 	String id;
 	Date joined;
 	Set<String> likes = new HashSet<String>();
 
+	public UserWithLikes() {}
+
 	public UserWithLikes(String id, Date joined, String... likes) {
 
 		this.id = id;
 		this.joined = joined;
 		this.likes = new HashSet<String>(Arrays.asList(likes));
 	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public Date getJoined() {
+		return this.joined;
+	}
+
+	public Set<String> getLikes() {
+		return this.likes;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setJoined(Date joined) {
+		this.joined = joined;
+	}
+
+	public void setLikes(Set<String> likes) {
+		this.likes = likes;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		UserWithLikes that = (UserWithLikes) o;
+		return Objects.equals(id, that.id) && Objects.equals(joined, that.joined) && Objects.equals(likes, that.likes);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, joined, likes);
+	}
+
+	public String toString() {
+		return "UserWithLikes(id=" + this.getId() + ", joined=" + this.getJoined() + ", likes=" + this.getLikes() + ")";
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperationUnitTests.java
new file mode 100644
index 0000000000..c4628eda99
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchOperationUnitTests.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2024 the original author 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.aggregation;
+
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
+
+import java.util.List;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.annotation.Id;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation.SearchType;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.util.aggregation.TestAggregationContext;
+
+/**
+ * Unit tests for {@link VectorSearchOperation}.
+ *
+ * @author Christoph Strobl
+ */
+class VectorSearchOperationUnitTests {
+
+	static final Document $VECTOR_SEARCH = Document.parse(
+			"{'index' : 'vector_index', 'limit' : 10, 'path' : 'plot_embedding', 'queryVector' : [-0.0016261312, -0.028070757, -0.011342932]}");
+	static final VectorSearchOperation SEARCH_OPERATION = VectorSearchOperation.search("vector_index")
+			.path("plot_embedding").vector(-0.0016261312, -0.028070757, -0.011342932).limit(10);
+
+	@Test // GH-4706
+	void requiredArgs() {
+
+		List<Document> stages = SEARCH_OPERATION.toPipelineStages(Aggregation.DEFAULT_CONTEXT);
+		assertThat(stages).containsExactly(new Document("$vectorSearch", $VECTOR_SEARCH));
+	}
+
+	@Test // GH-4706
+	void optionalArgs() {
+
+		VectorSearchOperation $search = SEARCH_OPERATION.numCandidates(150).searchType(SearchType.ENN)
+				.filter(new Criteria().andOperator(Criteria.where("year").gt(1955), Criteria.where("year").lt(1975)));
+
+		List<Document> stages = $search.toPipelineStages(Aggregation.DEFAULT_CONTEXT);
+
+		Document filter = new Document("$and",
+				List.of(new Document("year", new Document("$gt", 1955)), new Document("year", new Document("$lt", 1975))));
+		assertThat(stages).containsExactly(new Document("$vectorSearch",
+				new Document($VECTOR_SEARCH).append("exact", true).append("filter", filter).append("numCandidates", 150)));
+	}
+
+	@Test // GH-4706
+	void withScore() {
+
+		List<Document> stages = SEARCH_OPERATION.withSearchScore().toPipelineStages(Aggregation.DEFAULT_CONTEXT);
+		assertThat(stages).containsExactly(new Document("$vectorSearch", $VECTOR_SEARCH),
+				new Document("$addFields", new Document("score", new Document("$meta", "vectorSearchScore"))));
+	}
+
+	@Test // GH-4706
+	void withScoreFilter() {
+
+		List<Document> stages = SEARCH_OPERATION.withFilterBySore(score -> score.gt(50))
+				.toPipelineStages(Aggregation.DEFAULT_CONTEXT);
+		assertThat(stages).containsExactly(new Document("$vectorSearch", $VECTOR_SEARCH),
+				new Document("$addFields", new Document("score", new Document("$meta", "vectorSearchScore"))),
+				new Document("$match", new Document("score", new Document("$gt", 50))));
+	}
+
+	@Test // GH-4706
+	void withScoreFilterOnCustomFieldName() {
+
+		List<Document> stages = SEARCH_OPERATION.withFilterBySore(score -> score.gt(50)).withSearchScore("s-c-o-r-e")
+				.toPipelineStages(Aggregation.DEFAULT_CONTEXT);
+		assertThat(stages).containsExactly(new Document("$vectorSearch", $VECTOR_SEARCH),
+				new Document("$addFields", new Document("s-c-o-r-e", new Document("$meta", "vectorSearchScore"))),
+				new Document("$match", new Document("s-c-o-r-e", new Document("$gt", 50))));
+	}
+
+	@Test // GH-4706
+	void mapsCriteriaToDomainType() {
+
+		VectorSearchOperation $search = SEARCH_OPERATION
+				.filter(new Criteria().andOperator(Criteria.where("y").gt(1955), Criteria.where("y").lt(1975)));
+
+		List<Document> stages = $search.toPipelineStages(TestAggregationContext.contextFor(Movie.class));
+
+		Document filter = new Document("$and",
+				List.of(new Document("year", new Document("$gt", 1955)), new Document("year", new Document("$lt", 1975))));
+		assertThat(stages)
+				.containsExactly(new Document("$vectorSearch", new Document($VECTOR_SEARCH).append("filter", filter)));
+	}
+
+	@Test // GH-4963
+	void shouldSkipLimitIfUnlimited() {
+
+		VectorSearchOperation $search = VectorSearchOperation.search("vector_index").path("plot_embedding")
+				.vector(-0.0016261312, -0.028070757, -0.011342932).limit(Limit.unlimited());
+
+		List<Document> stages = $search.toPipelineStages(TestAggregationContext.contextFor(Movie.class));
+		assertThat(stages.get(0)).doesNotContainKey("$vectorSearch.limit");
+	}
+
+	static class Movie {
+
+		@Id String id;
+		String title;
+
+		@Field("year") String y;
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchTests.java
new file mode 100644
index 0000000000..18991c1768
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/VectorSearchTests.java
@@ -0,0 +1,242 @@
+/*
+ * Copyright 2024 the original author 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.aggregation;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import org.assertj.core.api.InstanceOfAssertFactories;
+import org.bson.BinaryVector;
+import org.bson.Document;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.data.domain.Vector;
+import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation.SearchType;
+import org.springframework.data.mongodb.core.index.VectorIndex;
+import org.springframework.data.mongodb.core.index.VectorIndex.SimilarityFunction;
+import org.springframework.data.mongodb.core.mapping.MongoVector;
+import org.springframework.data.mongodb.test.util.AtlasContainer;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+/**
+ * Integration tests using Vector Search and Vector Indexes through local MongoDB Atlas.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+@Testcontainers(disabledWithoutDocker = true)
+public class VectorSearchTests {
+
+	private static final String SCORE_FIELD = "vector-search-tests";
+	private static final @Container AtlasContainer atlasLocal = AtlasContainer.bestMatch();
+	private static final String COLLECTION_NAME = "collection-1";
+
+	static MongoClient client;
+	static MongoTestTemplate template;
+
+	@BeforeAll
+	static void beforeAll() throws InterruptedException {
+
+		client = MongoClients.create(atlasLocal.getConnectionString());
+		template = new MongoTestTemplate(client, SCORE_FIELD);
+
+		Thread.sleep(250); // just wait a little or the index will be broken
+
+		initDocuments();
+		initIndexes();
+	}
+
+	@AfterAll
+	static void afterAll() {
+		template.dropCollection(WithVectorFields.class);
+	}
+
+	@ParameterizedTest // GH-4706
+	@MethodSource("vectorAggregations")
+	void searchUsingArraysAddingScore(VectorSearchOperation searchOperation) {
+
+		VectorSearchOperation $search = searchOperation.withSearchScore(SCORE_FIELD);
+
+		AggregationResults<Document> results = template.aggregate(Aggregation.newAggregation($search),
+				WithVectorFields.class, Document.class);
+
+		assertThat(results).hasSize(10);
+		assertScoreIsDecreasing(results);
+		assertThat(results.iterator().next()).containsKey(SCORE_FIELD)
+				.extracting(it -> it.get(SCORE_FIELD), InstanceOfAssertFactories.DOUBLE).isEqualByComparingTo(1D);
+	}
+
+	@ParameterizedTest // GH-4706
+	@MethodSource("binaryVectorAggregations")
+	void searchUsingBinaryVectorAddingScore(VectorSearchOperation searchOperation) {
+
+		VectorSearchOperation $search = searchOperation.withSearchScore(SCORE_FIELD);
+
+		AggregationResults<Document> results = template.aggregate(Aggregation.newAggregation($search),
+				WithVectorFields.class, Document.class);
+
+		assertThat(results).hasSize(10);
+		assertScoreIsDecreasing(results);
+		assertThat(results.iterator().next()).containsKey(SCORE_FIELD)
+				.extracting(it -> it.get(SCORE_FIELD), InstanceOfAssertFactories.DOUBLE).isEqualByComparingTo(1D);
+	}
+
+	private static Stream<Arguments> binaryVectorAggregations() {
+
+		return Stream.of(//
+				Arguments.arguments(VectorSearchOperation.search("raw-index").path("rawInt8vector") //
+						.vector(new byte[] { 0, 1, 2, 3, 4 }) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)),
+				Arguments.arguments(VectorSearchOperation.search("wrapper-index").path("int8vector") //
+						.vector(BinaryVector.int8Vector(new byte[] { 0, 1, 2, 3, 4 })) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)),
+				Arguments.arguments(VectorSearchOperation.search("wrapper-index").path("float32vector") //
+						.vector(BinaryVector.floatVector(new float[] { 0.0001f, 1.12345f, 2.23456f, 3.34567f, 4.45678f })) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)));
+	}
+
+	private static Stream<Arguments> vectorAggregations() {
+
+		return Stream.of(//
+				Arguments.arguments(VectorSearchOperation.search("raw-index").path("rawFloat32vector") //
+						.vector(0.0001f, 1.12345f, 2.23456f, 3.34567f, 4.45678f) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)),
+				Arguments.arguments(VectorSearchOperation.search("raw-index").path("rawFloat64vector") //
+						.vector(1.0001d, 2.12345d, 3.23456d, 4.34567d, 5.45678d) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)),
+				Arguments.arguments(VectorSearchOperation.search("wrapper-index").path("float64vector") //
+						.vector(Vector.of(1.0001d, 2.12345d, 3.23456d, 4.34567d, 5.45678d)) //
+						.limit(10)//
+						.numCandidates(20) //
+						.searchType(SearchType.ANN)));
+	}
+
+	static void initDocuments() {
+		IntStream.range(0, 10).mapToObj(WithVectorFields::instance).forEach(template::save);
+	}
+
+	static void initIndexes() {
+
+		VectorIndex rawIndex = new VectorIndex("raw-index")
+				.addVector("rawInt8vector", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5))
+				.addVector("rawFloat32vector", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5))
+				.addVector("rawFloat64vector", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5))
+				.addFilter("justSomeArgument");
+
+		VectorIndex wrapperIndex = new VectorIndex("wrapper-index")
+				.addVector("int8vector", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5))
+				.addVector("float32vector", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5))
+				.addVector("float64vector", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5))
+				.addFilter("justSomeArgument");
+
+		template.searchIndexOps(WithVectorFields.class).createIndex(rawIndex);
+		template.searchIndexOps(WithVectorFields.class).createIndex(wrapperIndex);
+
+		template.awaitIndexCreation(WithVectorFields.class, rawIndex.getName());
+		template.awaitIndexCreation(WithVectorFields.class, wrapperIndex.getName());
+	}
+
+	private static void assertScoreIsDecreasing(Iterable<Document> documents) {
+
+		double previousScore = Integer.MAX_VALUE;
+		for (Document document : documents) {
+
+			Double vectorSearchScore = document.getDouble(SCORE_FIELD);
+			assertThat(vectorSearchScore).isGreaterThan(0D);
+			assertThat(vectorSearchScore).isLessThan(previousScore);
+			previousScore = vectorSearchScore;
+		}
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(COLLECTION_NAME)
+	static class WithVectorFields {
+
+		String id;
+
+		Vector int8vector;
+		Vector float32vector;
+		Vector float64vector;
+
+		BinaryVector rawInt8vector;
+		float[] rawFloat32vector;
+		double[] rawFloat64vector;
+
+		int justSomeArgument;
+
+		static WithVectorFields instance(int offset) {
+
+			WithVectorFields instance = new WithVectorFields();
+			instance.id = "id-%s".formatted(offset);
+			instance.rawFloat32vector = new float[5];
+			instance.rawFloat64vector = new double[5];
+
+			byte[] int8 = new byte[5];
+			for (int i = 0; i < 5; i++) {
+
+				int v = i + offset;
+				int8[i] = (byte) v;
+			}
+			instance.rawInt8vector = BinaryVector.int8Vector(int8);
+
+			if (offset == 0) {
+				instance.rawFloat32vector[0] = 0.0001f;
+				instance.rawFloat64vector[0] = 0.0001d;
+			} else {
+				instance.rawFloat32vector[0] = Float.parseFloat("%s.000%s".formatted(offset, offset));
+				instance.rawFloat64vector[0] = Double.parseDouble("%s.000%s".formatted(offset, offset));
+			}
+			instance.rawFloat32vector[1] = Float.parseFloat("%s.12345".formatted(offset + 1));
+			instance.rawFloat64vector[1] = Double.parseDouble("%s.12345".formatted(offset + 1));
+			instance.rawFloat32vector[2] = Float.parseFloat("%s.23456".formatted(offset + 2));
+			instance.rawFloat64vector[2] = Double.parseDouble("%s.23456".formatted(offset + 2));
+			instance.rawFloat32vector[3] = Float.parseFloat("%s.34567".formatted(offset + 3));
+			instance.rawFloat64vector[3] = Double.parseDouble("%s.34567".formatted(offset + 3));
+			instance.rawFloat32vector[4] = Float.parseFloat("%s.45678".formatted(offset + 4));
+			instance.rawFloat64vector[4] = Double.parseDouble("%s.45678".formatted(offset + 4));
+
+			instance.justSomeArgument = offset;
+
+			instance.int8vector = MongoVector.of(instance.rawInt8vector);
+			instance.float32vector = MongoVector.of(BinaryVector.floatVector(instance.rawFloat32vector));
+			instance.float64vector = Vector.of(instance.rawFloat64vector);
+
+			return instance;
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/MongoTemplateAuditingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/MongoTemplateAuditingTests.java
index ff7b3ab260..e2e1937da6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/MongoTemplateAuditingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/MongoTemplateAuditingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,46 +18,58 @@
 import static org.assertj.core.api.Assertions.*;
 
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
-import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
 import org.springframework.data.mongodb.config.EnableMongoAuditing;
 import org.springframework.data.mongodb.core.KAuditableVersionedEntity;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 
 /**
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 public class MongoTemplateAuditingTests {
 
+	static @Client MongoClient mongoClient;
+
 	@Configuration
 	@EnableMongoAuditing
 	static class Conf extends AbstractMongoClientConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Override
 		protected String getDatabaseName() {
 			return "mongo-template-audit-tests";
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return new HashSet<>(Arrays.asList(ImmutableAuditableEntityWithVersion.class, KAuditableVersionedEntity.class));
+		}
 	}
 
 	@Autowired MongoTemplate template;
@@ -80,7 +92,7 @@ public void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedEntityOnSa
 
 		assertThat(updated.modificationDate).isAfter(inserted.modificationDate);
 		assertThat(fetched.modificationDate).isAfter(inserted.modificationDate);
-		assertThat(fetched.modificationDate).isEqualTo(updated.modificationDate);
+		assertThat(fetched.modificationDate).isEqualTo(updated.modificationDate.truncatedTo(ChronoUnit.MILLIS));
 	}
 
 	@Test // DATAMONGO-2346
@@ -101,7 +113,7 @@ public void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedKotlinEnti
 
 		assertThat(updated.getModificationDate()).isAfter(inserted.getModificationDate());
 		assertThat(fetched.getModificationDate()).isAfter(inserted.getModificationDate());
-		assertThat(fetched.getModificationDate()).isEqualTo(updated.getModificationDate());
+		assertThat(fetched.getModificationDate()).isEqualTo(updated.getModificationDate().truncatedTo(ChronoUnit.MILLIS));
 	}
 
 	static class ImmutableAuditableEntityWithVersion {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/ReactiveMongoTemplateAuditingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/ReactiveMongoTemplateAuditingTests.java
index 42da6644b1..28429b53dc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/ReactiveMongoTemplateAuditingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/auditing/ReactiveMongoTemplateAuditingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,14 @@
 
 import java.time.Duration;
 import java.time.Instant;
+import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -33,47 +37,58 @@
 import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
-import org.springframework.data.mongodb.config.EnableMongoAuditing;
+import org.springframework.data.mongodb.config.EnableReactiveMongoAuditing;
 import org.springframework.data.mongodb.core.KAuditableVersionedEntity;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
+ * Integration tests for {@link EnableReactiveMongoAuditing} through {@link ReactiveMongoTemplate}.
+ *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-public class ReactiveMongoTemplateAuditingTests {
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
+class ReactiveMongoTemplateAuditingTests {
 
 	static final String DB_NAME = "mongo-template-audit-tests";
 
+	static @Client MongoClient mongoClient;
+
 	@Configuration
-	@EnableMongoAuditing
+	@EnableReactiveMongoAuditing
 	static class Conf extends AbstractReactiveMongoConfiguration {
 
 		@Bean
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return mongoClient;
 		}
 
 		@Override
 		protected String getDatabaseName() {
 			return DB_NAME;
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired ReactiveMongoTemplate template;
 	@Autowired MongoClient client;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		MongoTestUtils.flushCollection(DB_NAME, template.getCollectionName(ImmutableAuditableEntityWithVersion.class),
 				client);
@@ -81,7 +96,7 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-2346
-	public void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedEntityOnSave() {
+	void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedEntityOnSave() {
 
 		ImmutableAuditableEntityWithVersion entity = new ImmutableAuditableEntityWithVersion(null, "value", null, null);
 
@@ -96,13 +111,14 @@ public void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedEntityOnSa
 
 					assertThat(tuple3.getT2().modificationDate).isAfter(tuple3.getT1().modificationDate);
 					assertThat(tuple3.getT3().modificationDate).isAfter(tuple3.getT1().modificationDate);
-					assertThat(tuple3.getT3().modificationDate).isEqualTo(tuple3.getT2().modificationDate);
+					assertThat(tuple3.getT3().modificationDate)
+							.isEqualTo(tuple3.getT2().modificationDate.truncatedTo(ChronoUnit.MILLIS));
 				}) //
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-2346
-	public void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedKotlinEntityOnSave() {
+	void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedKotlinEntityOnSave() {
 
 		KAuditableVersionedEntity entity = new KAuditableVersionedEntity(null, "value", null, null);
 
@@ -117,7 +133,8 @@ public void auditingSetsLastModifiedDateCorrectlyForImmutableVersionedKotlinEnti
 
 					assertThat(tuple3.getT2().getModificationDate()).isAfter(tuple3.getT1().getModificationDate());
 					assertThat(tuple3.getT3().getModificationDate()).isAfter(tuple3.getT1().getModificationDate());
-					assertThat(tuple3.getT3().getModificationDate()).isEqualTo(tuple3.getT2().getModificationDate());
+					assertThat(tuple3.getT3().getModificationDate())
+							.isEqualTo(tuple3.getT2().getModificationDate().truncatedTo(ChronoUnit.MILLIS));
 				}) //
 				.verifyComplete();
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverterUnitTests.java
index b16e0ede50..dfd6b0ab56 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/AbstractMongoConverterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,14 +18,18 @@
 import static org.mockito.Mockito.*;
 
 import org.bson.conversions.Bson;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.convert.CustomConversions;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.convert.MongoConverters.ObjectIdToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToObjectIdConverter;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.util.TypeInformation;
 
 import com.mongodb.DBRef;
@@ -59,6 +63,21 @@ public MongoTypeMapper getTypeMapper() {
 			throw new UnsupportedOperationException();
 		}
 
+		@Override
+		public ProjectionFactory getProjectionFactory() {
+			return null;
+		}
+
+		@Override
+		public CustomConversions getCustomConversions() {
+			return null;
+		}
+
+		@Override
+		public <R> R project(EntityProjection<R, ?> descriptor, Bson bson) {
+			return null;
+		}
+
 		@Override
 		public MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> getMappingContext() {
 			throw new UnsupportedOperationException();
@@ -80,7 +99,7 @@ public Object convertToMongoType(Object obj, TypeInformation<?> typeInformation)
 		}
 
 		@Override
-		public DBRef toDBRef(Object object, MongoPersistentProperty referingProperty) {
+		public DBRef toDBRef(Object object, MongoPersistentProperty referringProperty) {
 			throw new UnsupportedOperationException();
 		}
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java
index 83c17cac33..5da3e896e6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/CustomConvertersUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,17 @@
 import java.util.HashSet;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.CustomConversions;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
 /**
@@ -39,20 +40,19 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class CustomConvertersUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class CustomConvertersUnitTests {
 
-	MappingMongoConverter converter;
+	private MappingMongoConverter converter;
 
 	@Mock BarToDocumentConverter barToDocumentConverter;
 	@Mock DocumentToBarConverter documentToBarConverter;
-	@Mock MongoDbFactory mongoDbFactory;
 
-	MongoMappingContext context;
+	private MongoMappingContext context;
 
-	@Before
-	@SuppressWarnings("unchecked")
-	public void setUp() throws Exception {
+	@BeforeEach
+	void setUp() {
 
 		when(barToDocumentConverter.convert(any(Bar.class))).thenReturn(new Document());
 		when(documentToBarConverter.convert(any(Document.class))).thenReturn(new Bar());
@@ -61,17 +61,17 @@ public void setUp() throws Exception {
 				Arrays.asList(barToDocumentConverter, documentToBarConverter));
 
 		context = new MongoMappingContext();
-		context.setInitialEntitySet(new HashSet<Class<?>>(Arrays.asList(Foo.class, Bar.class)));
+		context.setInitialEntitySet(new HashSet<>(Arrays.asList(Foo.class, Bar.class)));
 		context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 		context.initialize();
 
-		converter = new MappingMongoConverter(new DefaultDbRefResolver(mongoDbFactory), context);
+		converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
 		converter.setCustomConversions(conversions);
 		converter.afterPropertiesSet();
 	}
 
 	@Test // DATADOC-101
-	public void nestedToDocumentConverterGetsInvoked() {
+	void nestedToDocumentConverterGetsInvoked() {
 
 		Foo foo = new Foo();
 		foo.bar = new Bar();
@@ -81,7 +81,7 @@ public void nestedToDocumentConverterGetsInvoked() {
 	}
 
 	@Test // DATADOC-101
-	public void nestedFromDocumentConverterGetsInvoked() {
+	void nestedFromDocumentConverterGetsInvoked() {
 
 		Document document = new Document();
 		document.put("bar", new Document());
@@ -91,25 +91,25 @@ public void nestedFromDocumentConverterGetsInvoked() {
 	}
 
 	@Test // DATADOC-101
-	public void toDocumentConverterGetsInvoked() {
+	void toDocumentConverterGetsInvoked() {
 
 		converter.write(new Bar(), new Document());
 		verify(barToDocumentConverter).convert(any(Bar.class));
 	}
 
 	@Test // DATADOC-101
-	public void fromDocumentConverterGetsInvoked() {
+	void fromDocumentConverterGetsInvoked() {
 
 		converter.read(Bar.class, new Document());
 		verify(documentToBarConverter).convert(any(Document.class));
 	}
 
 	@Test // DATADOC-101
-	public void foo() {
+	void foo() {
 		Document document = new Document();
 		document.put("foo", null);
 
-		assertThat(document.containsKey("foo")).isEqualTo(true);
+		assertThat(document).containsKey("foo");
 	}
 
 	public static class Foo {
@@ -122,11 +122,7 @@ public static class Bar {
 		public String foo;
 	}
 
-	private interface BarToDocumentConverter extends Converter<Bar, Document> {
+	private interface BarToDocumentConverter extends Converter<Bar, Document> {}
 
-	}
-
-	private interface DocumentToBarConverter extends Converter<Document, Bar> {
-
-	}
+	private interface DocumentToBarConverter extends Converter<Document, Bar> {}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java
index ea88887071..92e5003628 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DataMongo273Tests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,9 +24,9 @@
 import java.util.Map;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 
@@ -40,7 +40,7 @@ public class DataMongo273Tests {
 
 	MappingMongoConverter converter;
 
-	@Before
+	@BeforeEach
 	public void setupMongoConverter() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
@@ -74,7 +74,7 @@ public void convertMapOfThings() {
 	}
 
 	@Test // DATAMONGO-294
-	@Ignore("TODO: Mongo3 - this is no longer supported as DBList is no Bson type :/")
+	@Disabled("TODO: Mongo3 - this is no longer supported as DBList is no Bson type :/")
 	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public void convertListOfThings() {
 		Plane plane = new Plane("Boeing", 4);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java
index 7db97834c7..71c395e822 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DbRefMappingMongoConverterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,20 +34,23 @@
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.annotation.AccessType;
 import org.springframework.data.annotation.AccessType.Type;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PropertyPath;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverterUnitTests.Person;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -62,34 +65,35 @@
 import com.mongodb.client.MongoDatabase;
 
 /**
- * Unit tests for {@link DbRefMappingMongoConverter}.
+ * Unit tests for {@link MappingMongoConverter}.
  *
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class DbRefMappingMongoConverterUnitTests {
+@ExtendWith(MockitoExtension.class)
+class DbRefMappingMongoConverterUnitTests {
 
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
 
-	@Mock MongoDbFactory dbFactory;
-	DefaultDbRefResolver dbRefResolver;
+	@Mock MongoDatabaseFactory dbFactory;
+	private DefaultDbRefResolver dbRefResolver;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		when(dbFactory.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
 
 		this.dbRefResolver = spy(new DefaultDbRefResolver(dbFactory));
 		this.mappingContext = new MongoMappingContext();
+		this.mappingContext.setSimpleTypeHolder(new MongoCustomConversions(Collections.emptyList()).getSimpleTypeHolder());
 		this.converter = new MappingMongoConverter(dbRefResolver, mappingContext);
 	}
 
 	@Test // DATAMONGO-347
-	public void createsSimpleDBRefCorrectly() {
+	void createsSimpleDBRefCorrectly() {
 
 		Person person = new Person();
 		person.id = "foo";
@@ -100,7 +104,7 @@ public void createsSimpleDBRefCorrectly() {
 	}
 
 	@Test // DATAMONGO-657
-	public void convertDocumentWithMapDBRef() {
+	void convertDocumentWithMapDBRef() {
 
 		Document mapValDocument = new Document();
 		mapValDocument.put("_id", BigInteger.ONE);
@@ -111,10 +115,12 @@ public void convertDocumentWithMapDBRef() {
 
 		MongoDatabase dbMock = mock(MongoDatabase.class);
 		MongoCollection collectionMock = mock(MongoCollection.class);
-		when(dbFactory.getDb()).thenReturn(dbMock);
+		when(dbFactory.getMongoDatabase()).thenReturn(dbMock);
 		when(dbMock.getCollection(anyString(), eq(Document.class))).thenReturn(collectionMock);
 
 		FindIterable fi = mock(FindIterable.class);
+		when(fi.limit(anyInt())).thenReturn(fi);
+		when(fi.sort(any())).thenReturn(fi);
 		when(fi.first()).thenReturn(mapValDocument);
 		when(collectionMock.find(Mockito.any(Bson.class))).thenReturn(fi);
 
@@ -143,7 +149,7 @@ public void convertDocumentWithMapDBRef() {
 	}
 
 	@Test // DATAMONGO-347
-	public void createsDBRefWithClientSpecCorrectly() {
+	void createsDBRefWithClientSpecCorrectly() {
 
 		PropertyPath path = PropertyPath.from("person", PersonClient.class);
 		MongoPersistentProperty property = mappingContext.getPersistentPropertyPath(path).getLeafProperty();
@@ -157,7 +163,7 @@ public void createsDBRefWithClientSpecCorrectly() {
 	}
 
 	@Test // DATAMONGO-348
-	public void lazyLoadingProxyForLazyDbRefOnInterface() {
+	void lazyLoadingProxyForLazyDbRefOnInterface() {
 
 		String id = "42";
 		String value = "bubu";
@@ -178,7 +184,8 @@ public void lazyLoadingProxyForLazyDbRefOnInterface() {
 	}
 
 	@Test // DATAMONGO-348
-	public void lazyLoadingProxyForLazyDbRefOnConcreteCollection() {
+	@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg; ArrayList require to open java.util.")
+	void lazyLoadingProxyForLazyDbRefOnConcreteCollection() {
 
 		String id = "42";
 		String value = "bubu";
@@ -199,7 +206,7 @@ public void lazyLoadingProxyForLazyDbRefOnConcreteCollection() {
 	}
 
 	@Test // DATAMONGO-348
-	public void lazyLoadingProxyForLazyDbRefOnConcreteType() {
+	void lazyLoadingProxyForLazyDbRefOnConcreteType() {
 
 		String id = "42";
 		String value = "bubu";
@@ -220,7 +227,7 @@ public void lazyLoadingProxyForLazyDbRefOnConcreteType() {
 	}
 
 	@Test // DATAMONGO-348
-	public void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructor() {
+	void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructor() {
 
 		String id = "42";
 		String value = "bubu";
@@ -241,7 +248,7 @@ public void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructor
 	}
 
 	@Test // DATAMONGO-348
-	public void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructorButWithoutDefaultConstructor() {
+	void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructorButWithoutDefaultConstructor() {
 
 		String id = "42";
 		String value = "bubu";
@@ -264,7 +271,7 @@ public void lazyLoadingProxyForLazyDbRefOnConcreteTypeWithPersistenceConstructor
 	}
 
 	@Test // DATAMONGO-348
-	public void lazyLoadingProxyForSerializableLazyDbRefOnConcreteType() {
+	void lazyLoadingProxyForSerializableLazyDbRefOnConcreteType() {
 
 		String id = "42";
 		String value = "bubu";
@@ -286,7 +293,7 @@ public void lazyLoadingProxyForSerializableLazyDbRefOnConcreteType() {
 	}
 
 	@Test // DATAMONGO-884
-	public void lazyLoadingProxyForToStringObjectMethodOverridingDbref() {
+	void lazyLoadingProxyForToStringObjectMethodOverridingDbref() {
 
 		String id = "42";
 		String value = "bubu";
@@ -307,7 +314,7 @@ public void lazyLoadingProxyForToStringObjectMethodOverridingDbref() {
 	}
 
 	@Test // DATAMONGO-884
-	public void callingToStringObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
+	void callingToStringObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
 
 		String id = "42";
 		String value = "bubu";
@@ -335,7 +342,7 @@ public void callingToStringObjectMethodOnLazyLoadingDbrefShouldNotInitializeProx
 	}
 
 	@Test // DATAMONGO-884
-	public void equalsObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
+	void equalsObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
 
 		String id = "42";
 		String value = "bubu";
@@ -360,7 +367,7 @@ public void equalsObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
 	}
 
 	@Test // DATAMONGO-884
-	public void hashcodeObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
+	void hashcodeObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
 
 		String id = "42";
 		String value = "bubu";
@@ -383,7 +390,7 @@ public void hashcodeObjectMethodOnLazyLoadingDbrefShouldNotInitializeProxy() {
 	}
 
 	@Test // DATAMONGO-884
-	public void lazyLoadingProxyForEqualsAndHashcodeObjectMethodOverridingDbref() {
+	void lazyLoadingProxyForEqualsAndHashcodeObjectMethodOverridingDbref() {
 
 		String id = "42";
 		String value = "bubu";
@@ -412,7 +419,7 @@ public void lazyLoadingProxyForEqualsAndHashcodeObjectMethodOverridingDbref() {
 	}
 
 	@Test // DATAMONGO-987
-	public void shouldNotGenerateLazyLoadingProxyForNullValues() {
+	void shouldNotGenerateLazyLoadingProxyForNullValues() {
 
 		Document document = new Document();
 		ClassWithLazyDbRefs lazyDbRefs = new ClassWithLazyDbRefs();
@@ -430,7 +437,7 @@ public void shouldNotGenerateLazyLoadingProxyForNullValues() {
 	}
 
 	@Test // DATAMONGO-1005
-	public void shouldBeAbleToStoreDirectReferencesToSelf() {
+	void shouldBeAbleToStoreDirectReferencesToSelf() {
 
 		Document document = new Document();
 
@@ -446,7 +453,7 @@ public void shouldBeAbleToStoreDirectReferencesToSelf() {
 	}
 
 	@Test // DATAMONGO-1005
-	public void shouldBeAbleToStoreNestedReferencesToSelf() {
+	void shouldBeAbleToStoreNestedReferencesToSelf() {
 
 		Document document = new Document();
 
@@ -465,7 +472,7 @@ public void shouldBeAbleToStoreNestedReferencesToSelf() {
 	}
 
 	@Test // DATAMONGO-1012
-	public void shouldEagerlyResolveIdPropertyWithFieldAccess() {
+	void shouldEagerlyResolveIdPropertyWithFieldAccess() {
 
 		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(ClassWithLazyDbRefs.class);
 		MongoPersistentProperty property = entity.getRequiredPersistentProperty("dbRefToConcreteType");
@@ -487,7 +494,7 @@ public void shouldEagerlyResolveIdPropertyWithFieldAccess() {
 	}
 
 	@Test // DATAMONGO-1012
-	public void shouldNotEagerlyResolveIdPropertyWithPropertyAccess() {
+	void shouldNotEagerlyResolveIdPropertyWithPropertyAccess() {
 
 		MongoPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(ClassWithLazyDbRefs.class);
 		MongoPersistentProperty property = entity.getRequiredPersistentProperty("dbRefToConcreteTypeWithPropertyAccess");
@@ -505,7 +512,8 @@ public void shouldNotEagerlyResolveIdPropertyWithPropertyAccess() {
 	}
 
 	@Test // DATAMONGO-1076
-	public void shouldNotTriggerResolvingOfLazyLoadedProxyWhenFinalizeMethodIsInvoked() throws Exception {
+	@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg; ArrayList require to open java.util.")
+	void shouldNotTriggerResolvingOfLazyLoadedProxyWhenFinalizeMethodIsInvoked() throws Exception {
 
 		MongoPersistentEntity<?> entity = mappingContext
 				.getRequiredPersistentEntity(WithObjectMethodOverrideLazyDbRefs.class);
@@ -523,7 +531,8 @@ public void shouldNotTriggerResolvingOfLazyLoadedProxyWhenFinalizeMethodIsInvoke
 	}
 
 	@Test // DATAMONGO-1194
-	public void shouldBulkFetchListOfReferences() {
+	@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg; ArrayList require to open java.util.")
+	void shouldBulkFetchListOfReferences() {
 
 		String id1 = "1";
 		String id2 = "2";
@@ -551,7 +560,7 @@ public void shouldBulkFetchListOfReferences() {
 	}
 
 	@Test // DATAMONGO-1666
-	public void shouldBulkFetchSetOfReferencesForConstructorCreation() {
+	void shouldBulkFetchSetOfReferencesForConstructorCreation() {
 
 		String id1 = "1";
 		String id2 = "2";
@@ -573,7 +582,8 @@ public void shouldBulkFetchSetOfReferencesForConstructorCreation() {
 	}
 
 	@Test // DATAMONGO-1194
-	public void shouldFallbackToOneByOneFetchingWhenElementsInListOfReferencesPointToDifferentCollections() {
+	@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg; ArrayList require to open java.util.")
+	void shouldFallbackToOneByOneFetchingWhenElementsInListOfReferencesPointToDifferentCollections() {
 
 		String id1 = "1";
 		String id2 = "2";
@@ -601,7 +611,7 @@ public void shouldFallbackToOneByOneFetchingWhenElementsInListOfReferencesPointT
 	}
 
 	@Test // DATAMONGO-1194
-	public void shouldBulkFetchMapOfReferences() {
+	void shouldBulkFetchMapOfReferences() {
 
 		MapDBRefVal val1 = new MapDBRefVal();
 		val1.id = BigInteger.ONE;
@@ -633,7 +643,7 @@ public void shouldBulkFetchMapOfReferences() {
 	}
 
 	@Test // DATAMONGO-1194
-	public void shouldBulkFetchLazyMapOfReferences() {
+	void shouldBulkFetchLazyMapOfReferences() {
 
 		MapDBRefVal val1 = new MapDBRefVal();
 		val1.id = BigInteger.ONE;
@@ -720,15 +730,15 @@ static class LazyDbRefTarget implements Serializable {
 		@Id String id;
 		String value;
 
-		public LazyDbRefTarget() {
+		LazyDbRefTarget() {
 			this(null);
 		}
 
-		public LazyDbRefTarget(String id) {
+		LazyDbRefTarget(String id) {
 			this(id, null);
 		}
 
-		public LazyDbRefTarget(String id, String value) {
+		LazyDbRefTarget(String id, String value) {
 			this.id = id;
 			this.value = value;
 		}
@@ -748,7 +758,7 @@ static class LazyDbRefTargetPropertyAccess implements Serializable {
 
 		@Id @AccessType(Type.PROPERTY) String id;
 
-		public LazyDbRefTargetPropertyAccess(String id) {
+		LazyDbRefTargetPropertyAccess(String id) {
 			this.id = id;
 		}
 
@@ -764,8 +774,8 @@ static class LazyDbRefTargetWithPeristenceConstructor extends LazyDbRefTarget {
 
 		public LazyDbRefTargetWithPeristenceConstructor() {}
 
-		@PersistenceConstructor
-		public LazyDbRefTargetWithPeristenceConstructor(String id, String value) {
+		@PersistenceCreator
+		LazyDbRefTargetWithPeristenceConstructor(String id, String value) {
 			super(id, value);
 			this.persistenceConstructorCalled = true;
 		}
@@ -780,8 +790,8 @@ static class LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor e
 
 		boolean persistenceConstructorCalled;
 
-		@PersistenceConstructor
-		public LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor(String id, String value) {
+		@PersistenceCreator
+		LazyDbRefTargetWithPeristenceConstructorWithoutDefaultConstructor(String id, String value) {
 			super(id, value);
 			this.persistenceConstructorCalled = true;
 		}
@@ -795,7 +805,7 @@ static class SerializableLazyDbRefTarget extends LazyDbRefTarget implements Seri
 
 		public SerializableLazyDbRefTarget() {}
 
-		public SerializableLazyDbRefTarget(String id, String value) {
+		SerializableLazyDbRefTarget(String id, String value) {
 			super(id, value);
 		}
 
@@ -808,14 +818,10 @@ static class ToStringObjectMethodOverrideLazyDbRefTarget extends LazyDbRefTarget
 
 		public ToStringObjectMethodOverrideLazyDbRefTarget() {}
 
-		public ToStringObjectMethodOverrideLazyDbRefTarget(String id, String value) {
+		ToStringObjectMethodOverrideLazyDbRefTarget(String id, String value) {
 			super(id, value);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return this.id + ":" + this.value;
@@ -828,7 +834,7 @@ static class EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget extends LazyDb
 
 		public EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget() {}
 
-		public EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget(String id, String value) {
+		EqualsAndHashCodeObjectMethodOverrideLazyDbRefTarget(String id, String value) {
 			super(id, value);
 		}
 
@@ -842,7 +848,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 			if (this == obj)
 				return true;
 			if (obj == null)
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverUnitTests.java
index e9dad99f4b..75c7cc4366 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultDbRefResolverUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,7 @@
 package org.springframework.data.mongodb.core.convert;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.util.Arrays;
@@ -25,16 +24,20 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 
 import com.mongodb.DBRef;
 import com.mongodb.client.FindIterable;
@@ -47,19 +50,21 @@
  * @author Christoph Strobl
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultDbRefResolverUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class DefaultDbRefResolverUnitTests {
 
-	@Mock MongoDbFactory factoryMock;
+	@Mock MongoDatabaseFactory factoryMock;
 	@Mock MongoDatabase dbMock;
 	@Mock MongoCollection<Document> collectionMock;
 	@Mock FindIterable<Document> cursorMock;
-	DefaultDbRefResolver resolver;
+	private DefaultDbRefResolver resolver;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		when(factoryMock.getDb()).thenReturn(dbMock);
+		when(factoryMock.getMongoDatabase()).thenReturn(dbMock);
+		when(factoryMock.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
 		when(dbMock.getCollection(anyString(), any(Class.class))).thenReturn(collectionMock);
 		when(collectionMock.find(any(Document.class))).thenReturn(cursorMock);
 
@@ -68,7 +73,7 @@ public void setUp() {
 
 	@Test // DATAMONGO-1194
 	@SuppressWarnings("unchecked")
-	public void bulkFetchShouldLoadDbRefsCorrectly() {
+	void bulkFetchShouldLoadDbRefsCorrectly() {
 
 		DBRef ref1 = new DBRef("collection-1", new ObjectId());
 		DBRef ref2 = new DBRef("collection-1", new ObjectId());
@@ -85,25 +90,26 @@ public void bulkFetchShouldLoadDbRefsCorrectly() {
 		assertThat($in).hasSize(2);
 	}
 
-	@Test(expected = InvalidDataAccessApiUsageException.class) // DATAMONGO-1194
-	public void bulkFetchShouldThrowExceptionWhenUsingDifferntCollectionsWithinSetOfReferences() {
+	@Test // DATAMONGO-1194
+	void bulkFetchShouldThrowExceptionWhenUsingDifferntCollectionsWithinSetOfReferences() {
 
 		DBRef ref1 = new DBRef("collection-1", new ObjectId());
 		DBRef ref2 = new DBRef("collection-2", new ObjectId());
 
-		resolver.bulkFetch(Arrays.asList(ref1, ref2));
+		assertThatThrownBy(() -> resolver.bulkFetch(Arrays.asList(ref1, ref2)))
+				.isInstanceOf(InvalidDataAccessApiUsageException.class);
 	}
 
 	@Test // DATAMONGO-1194
-	public void bulkFetchShouldReturnEarlyForEmptyLists() {
+	void bulkFetchShouldReturnEarlyForEmptyLists() {
 
-		resolver.bulkFetch(Collections.<DBRef> emptyList());
+		resolver.bulkFetch(Collections.emptyList());
 
 		verify(collectionMock, never()).find(Mockito.any(Document.class));
 	}
 
 	@Test // DATAMONGO-1194
-	public void bulkFetchShouldRestoreOriginalOrder() {
+	void bulkFetchShouldRestoreOriginalOrder() {
 
 		Document o1 = new Document("_id", new ObjectId());
 		Document o2 = new Document("_id", new ObjectId());
@@ -117,7 +123,7 @@ public void bulkFetchShouldRestoreOriginalOrder() {
 	}
 
 	@Test // DATAMONGO-1765
-	public void bulkFetchContainsDuplicates() {
+	void bulkFetchContainsDuplicates() {
 
 		Document document = new Document("_id", new ObjectId());
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapperUnitTests.java
index f45858da74..75fca5b267 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DefaultMongoTypeMapperUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,8 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.convert.ConfigurableTypeInformationMapper;
 import org.springframework.data.convert.SimpleTypeInformationMapper;
@@ -42,7 +42,7 @@ public class DefaultMongoTypeMapperUnitTests {
 
 	DefaultMongoTypeMapper typeMapper;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		configurableTypeInformationMapper = new ConfigurableTypeInformationMapper(
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DocumentAccessorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DocumentAccessorUnitTests.java
index b953ec7db3..4f46283b74 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DocumentAccessorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DocumentAccessorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 import org.bson.BsonDocument;
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.mapping.Field;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DocumentPointerFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DocumentPointerFactoryUnitTests.java
new file mode 100644
index 0000000000..ce6cfc6517
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/DocumentPointerFactoryUnitTests.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.List;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.mongodb.core.convert.DocumentPointerFactory.LinkageDocument;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+
+/**
+ * @author Christoph Strobl
+ */
+public class DocumentPointerFactoryUnitTests {
+
+	@Test // GH-3602
+	void errorsOnMongoOperatorUsage() {
+
+		LinkageDocument source = LinkageDocument.from("{ '_id' : { '$eq' : 1 } }");
+
+		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
+				.isThrownBy(() -> getPointerValue(source, new Book())) //
+				.withMessageContaining("$eq");
+	}
+
+	@Test // GH-3602
+	void computesStaticPointer() {
+
+		LinkageDocument source = LinkageDocument.from("{ '_id' : 1 }");
+
+		assertThat(getPointerValue(source, new Book())).isEqualTo(new Document("_id", 1));
+	}
+
+	@Test // GH-3602
+	void computesPointerWithIdValuePlaceholder() {
+
+		LinkageDocument source = LinkageDocument.from("{ '_id' : ?#{id} }");
+
+		assertThat(getPointerValue(source, new Book("book-1", null, null))).isEqualTo(new Document("id", "book-1"));
+	}
+
+	@Test // GH-3602
+	void computesPointerForNonIdValuePlaceholder() {
+
+		LinkageDocument source = LinkageDocument.from("{ 'title' : ?#{book_title} }");
+
+		assertThat(getPointerValue(source, new Book("book-1", "Living With A Seal", null)))
+				.isEqualTo(new Document("book_title", "Living With A Seal"));
+	}
+
+	@Test // GH-3602
+	void computesPlaceholderFromNestedPathValue() {
+
+		LinkageDocument source = LinkageDocument.from("{ 'metadata.pages' : ?#{p} } }");
+
+		assertThat(getPointerValue(source, new Book("book-1", "Living With A Seal", null, new Metadata(272))))
+				.isEqualTo(new Document("p", 272));
+	}
+
+	@Test // GH-3602
+	void computesNestedPlaceholderPathValue() {
+
+		LinkageDocument source = LinkageDocument.from("{ 'metadata' : { 'pages' : ?#{metadata.pages} } }");
+
+		assertThat(getPointerValue(source, new Book("book-1", "Living With A Seal", null, new Metadata(272))))
+				.isEqualTo(new Document("metadata", new Document("pages", 272)));
+	}
+
+	Object getPointerValue(LinkageDocument linkageDocument, Object value) {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		MongoPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(value.getClass());
+		return linkageDocument
+				.getDocumentPointer(mappingContext, persistentEntity, persistentEntity.getPropertyPathAccessor(value))
+				.getPointer();
+	}
+
+	static class Book {
+
+		String id;
+		String title;
+		List<Author> author;
+		Metadata metadata;
+
+		public Book() {}
+
+		public Book(String id, String title, List<Author> author) {
+			this.id = id;
+			this.title = title;
+			this.author = author;
+		}
+
+		public Book(String id, String title, List<Author> author, Metadata metadata) {
+			this.id = id;
+			this.title = title;
+			this.author = author;
+			this.metadata = metadata;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getTitle() {
+			return this.title;
+		}
+
+		public List<Author> getAuthor() {
+			return this.author;
+		}
+
+		public Metadata getMetadata() {
+			return this.metadata;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setTitle(String title) {
+			this.title = title;
+		}
+
+		public void setAuthor(List<Author> author) {
+			this.author = author;
+		}
+
+		public void setMetadata(Metadata metadata) {
+			this.metadata = metadata;
+		}
+
+		public String toString() {
+			return "DocumentPointerFactoryUnitTests.Book(id=" + this.getId() + ", title=" + this.getTitle() + ", author="
+					+ this.getAuthor() + ", metadata=" + this.getMetadata() + ")";
+		}
+	}
+
+	static class Metadata {
+
+		int pages;
+
+		public Metadata(int pages) {
+			this.pages = pages;
+		}
+
+		public int getPages() {
+			return pages;
+		}
+
+		public void setPages(int pages) {
+			this.pages = pages;
+		}
+	}
+
+	static class Author {
+
+		String id;
+		String firstname;
+		String lastname;
+
+		public Author() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public String toString() {
+			return "DocumentPointerFactoryUnitTests.Author(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ", lastname=" + this.getLastname() + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoConvertersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoConvertersUnitTests.java
index cdc34841d8..84a494f9d8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoConvertersUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoConvertersUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Circle;
@@ -69,7 +69,7 @@ public void convertsCircleToDocumentAndBackCorrectlyNeutralDistance() {
 	@Test // DATAMONGO-858
 	public void convertsCircleToDocumentAndBackCorrectlyMilesDistance() {
 
-		Distance radius = new Distance(3, Metrics.MILES);
+		Distance radius = Distance.of(3, Metrics.MILES);
 		Circle circle = new Circle(new Point(1, 2), radius);
 
 		Document document = CircleToDocumentConverter.INSTANCE.convert(circle);
@@ -106,7 +106,7 @@ public void convertsSphereToDocumentAndBackCorrectlyWithNeutralDistance() {
 	@Test // DATAMONGO-858
 	public void convertsSphereToDocumentAndBackCorrectlyWithKilometerDistance() {
 
-		Distance radius = new Distance(3, Metrics.KILOMETERS);
+		Distance radius = Distance.of(3, Metrics.KILOMETERS);
 		Sphere sphere = new Sphere(new Point(1, 2), radius);
 
 		Document document = SphereToDocumentConverter.INSTANCE.convert(sphere);
@@ -160,7 +160,7 @@ public void convertsCircleCorrectlyWhenUsingNonDoubleForCoordinates() {
 		circle.put("radius", 3L);
 
 		assertThat(DocumentToCircleConverter.INSTANCE.convert(circle))
-				.isEqualTo(new Circle(new Point(1, 2), new Distance(3)));
+				.isEqualTo(new Circle(new Point(1, 2), Distance.of(3)));
 	}
 
 	@Test // DATAMONGO-1607
@@ -171,7 +171,7 @@ public void convertsSphereCorrectlyWhenUsingNonDoubleForCoordinates() {
 		sphere.put("radius", 3L);
 
 		assertThat(DocumentToSphereConverter.INSTANCE.convert(sphere))
-				.isEqualTo(new Sphere(new Point(1, 2), new Distance(3)));
+				.isEqualTo(new Sphere(new Point(1, 2), Distance.of(3)));
 	}
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoJsonConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoJsonConverterUnitTests.java
index d9b52cd4ee..36d69d5c71 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoJsonConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/GeoJsonConverterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import java.util.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingInterceptorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingInterceptorUnitTests.java
index 46ebc0bcbb..43ea9f3a64 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingInterceptorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingInterceptorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,15 +18,15 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.support.PersistenceExceptionTranslator;
 import org.springframework.data.mongodb.LazyLoadingException;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.LazyLoadingInterceptor;
+import org.springframework.data.mongodb.core.convert.LazyLoadingProxyFactory.LazyLoadingInterceptor;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 
 import com.mongodb.DBRef;
@@ -36,21 +36,21 @@
  *
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class LazyLoadingInterceptorUnitTests {
+@ExtendWith(MockitoExtension.class)
+class LazyLoadingInterceptorUnitTests {
 
 	@Mock MongoPersistentProperty propertyMock;
 	@Mock DBRef dbrefMock;
 	@Mock DbRefResolverCallback callbackMock;
 
 	@Test // DATAMONGO-1437
-	public void shouldPreserveCauseForNonTranslatableExceptions() throws Throwable {
+	void shouldPreserveCauseForNonTranslatableExceptions() throws Throwable {
 
 		NullPointerException npe = new NullPointerException("Some Exception we did not think about.");
 		when(callbackMock.resolve(propertyMock)).thenThrow(npe);
 
 		assertThatExceptionOfType(LazyLoadingException.class).isThrownBy(() -> {
-			new LazyLoadingInterceptor(propertyMock, dbrefMock, new NullExceptionTranslator(), callbackMock).intercept(null,
+			new LazyLoadingInterceptor(propertyMock, callbackMock, dbrefMock, new NullExceptionTranslator()).intercept(null,
 					LazyLoadingProxy.class.getMethod("getTarget"), null, null);
 		}).withCause(npe);
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingTestUtils.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingTestUtils.java
index 9b123514b1..54f82f6921 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingTestUtils.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/LazyLoadingTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,10 +16,13 @@
 package org.springframework.data.mongodb.core.convert;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.convert.LazyLoadingProxyFactory.*;
+
+import java.util.function.Consumer;
 
 import org.springframework.aop.framework.Advised;
 import org.springframework.cglib.proxy.Factory;
-import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver.LazyLoadingInterceptor;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 import org.springframework.test.util.ReflectionTestUtils;
 
 /**
@@ -49,8 +52,36 @@ public static void assertProxyIsResolved(Object target, boolean expected) {
 		}
 	}
 
+	public static void assertProxy(Object proxy, Consumer<LazyLoadingProxyValueRetriever> verification) {
+
+		LazyLoadingInterceptor interceptor = (LazyLoadingInterceptor) (proxy instanceof Advised
+				? ((Advised) proxy).getAdvisors()[0].getAdvice()
+				: ((Factory) proxy).getCallback(0));
+
+		verification.accept(new LazyLoadingProxyValueRetriever(interceptor));
+	}
+
 	private static LazyLoadingInterceptor extractInterceptor(Object proxy) {
 		return (LazyLoadingInterceptor) (proxy instanceof Advised ? ((Advised) proxy).getAdvisors()[0].getAdvice()
 				: ((Factory) proxy).getCallback(0));
 	}
+
+	public static class LazyLoadingProxyValueRetriever {
+
+		LazyLoadingInterceptor interceptor;
+
+		public LazyLoadingProxyValueRetriever(LazyLoadingInterceptor interceptor) {
+			this.interceptor = interceptor;
+		}
+
+		public boolean isResolved() {
+			return (boolean) ReflectionTestUtils.getField(interceptor, "resolved");
+		}
+
+		@Unwrapped.Nullable
+		public Object currentValue() {
+			return ReflectionTestUtils.getField(interceptor, "result");
+		}
+
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterTests.java
index 2f8b7a6154..1ce58eeb47 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,60 +18,80 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.any;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.ZoneId;
+import java.time.temporal.ChronoUnit;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.MongoDbFactory;
-import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions.MongoConverterConfigurationAdapter;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 
 import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
 
 /**
  * Integration tests for {@link MappingMongoConverter}.
  *
  * @author Christoph Strobl
  */
+@ExtendWith(MongoClientExtension.class)
 public class MappingMongoConverterTests {
 
-	MongoClient client;
+	private static final String DATABASE = "mapping-converter-tests";
+
+	private static @Client MongoClient client;
+
+	private MongoDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(client, DATABASE);
 
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
-	DbRefResolver dbRefResolver;
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
+	private DbRefResolver dbRefResolver;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		client = MongoTestUtils.client();
-		client.getDatabase("mapping-converter-tests").drop();
+		MongoDatabase database = client.getDatabase(DATABASE);
 
-		MongoDbFactory factory = new SimpleMongoClientDbFactory(client, "mapping-converter-tests");
+		database.getCollection("samples").deleteMany(new Document());
+		database.getCollection("java-time-types").deleteMany(new Document());
 
 		dbRefResolver = spy(new DefaultDbRefResolver(factory));
+
 		mappingContext = new MongoMappingContext();
+		mappingContext.setSimpleTypeHolder(new MongoCustomConversions(Collections.emptyList()).getSimpleTypeHolder());
+		mappingContext.setInitialEntitySet(Set.of(WithLazyDBRefAsConstructorArg.class, WithLazyDBRef.class, WithJavaTimeTypes.class));
+		mappingContext.setAutoIndexCreation(false);
 		mappingContext.afterPropertiesSet();
 
 		converter = new MappingMongoConverter(dbRefResolver, mappingContext);
+		converter.afterPropertiesSet();
 	}
 
 	@Test // DATAMONGO-2004
-	public void resolvesLazyDBRefOnAccess() {
+	void resolvesLazyDBRefOnAccess() {
 
-		client.getDatabase("mapping-converter-tests").getCollection("samples")
+		client.getDatabase(DATABASE).getCollection("samples")
 				.insertMany(Arrays.asList(new Document("_id", "sample-1").append("value", "one"),
 						new Document("_id", "sample-2").append("value", "two")));
 
@@ -81,7 +101,6 @@ public void resolvesLazyDBRefOnAccess() {
 		WithLazyDBRef target = converter.read(WithLazyDBRef.class, source);
 
 		verify(dbRefResolver).resolveDbRef(any(), isNull(), any(), any());
-		verifyNoMoreInteractions(dbRefResolver);
 
 		assertThat(target.lazyList).isInstanceOf(LazyLoadingProxy.class);
 		assertThat(target.getLazyList()).contains(new Sample("sample-1", "one"), new Sample("sample-2", "two"));
@@ -89,10 +108,102 @@ public void resolvesLazyDBRefOnAccess() {
 		verify(dbRefResolver).bulkFetch(any());
 	}
 
+	@Test // GH-4312
+	void conversionShouldAllowReadingAlreadyResolvedReferences() {
+
+		Document sampleSource = new Document("_id", "sample-1").append("value", "one");
+		Document source = new Document("_id", "id-1").append("sample", sampleSource);
+
+		WithSingleValueDbRef read = converter.read(WithSingleValueDbRef.class, source);
+
+		assertThat(read.sample).isEqualTo(converter.read(Sample.class, sampleSource));
+		verifyNoInteractions(dbRefResolver);
+	}
+
+	@Test // GH-4312
+	void conversionShouldAllowReadingAlreadyResolvedListOfReferences() {
+
+		Document sample1Source = new Document("_id", "sample-1").append("value", "one");
+		Document sample2Source = new Document("_id", "sample-2").append("value", "two");
+		Document source = new Document("_id", "id-1").append("lazyList", List.of(sample1Source, sample2Source));
+
+		WithLazyDBRef read = converter.read(WithLazyDBRef.class, source);
+
+		assertThat(read.lazyList).containsExactly(converter.read(Sample.class, sample1Source),
+				converter.read(Sample.class, sample2Source));
+		verifyNoInteractions(dbRefResolver);
+	}
+
+	@Test // GH-4312
+	void conversionShouldAllowReadingAlreadyResolvedMapOfReferences() {
+
+		Document sample1Source = new Document("_id", "sample-1").append("value", "one");
+		Document sample2Source = new Document("_id", "sample-2").append("value", "two");
+		Document source = new Document("_id", "id-1").append("sampleMap",
+				new Document("s1", sample1Source).append("s2", sample2Source));
+
+		WithMapValueDbRef read = converter.read(WithMapValueDbRef.class, source);
+
+		assertThat(read.sampleMap) //
+				.containsEntry("s1", converter.read(Sample.class, sample1Source)) //
+				.containsEntry("s2", converter.read(Sample.class, sample2Source));
+		verifyNoInteractions(dbRefResolver);
+	}
+
+	@Test // GH-4312
+	void conversionShouldAllowReadingAlreadyResolvedMapOfLazyReferences() {
+
+		Document sample1Source = new Document("_id", "sample-1").append("value", "one");
+		Document sample2Source = new Document("_id", "sample-2").append("value", "two");
+		Document source = new Document("_id", "id-1").append("sampleMapLazy",
+				new Document("s1", sample1Source).append("s2", sample2Source));
+
+		WithMapValueDbRef read = converter.read(WithMapValueDbRef.class, source);
+
+		assertThat(read.sampleMapLazy) //
+				.containsEntry("s1", converter.read(Sample.class, sample1Source)) //
+				.containsEntry("s2", converter.read(Sample.class, sample2Source));
+		verifyNoInteractions(dbRefResolver);
+	}
+
+	@Test // GH-4312
+	void resolvesLazyDBRefMapOnAccess() {
+
+		client.getDatabase(DATABASE).getCollection("samples")
+				.insertMany(Arrays.asList(new Document("_id", "sample-1").append("value", "one"),
+						new Document("_id", "sample-2").append("value", "two")));
+
+		Document source = new Document("_id", "id-1").append("sampleMapLazy",
+				new Document("s1", new com.mongodb.DBRef("samples", "sample-1")).append("s2",
+						new com.mongodb.DBRef("samples", "sample-2")));
+
+		WithMapValueDbRef target = converter.read(WithMapValueDbRef.class, source);
+
+		verify(dbRefResolver).resolveDbRef(any(), isNull(), any(), any());
+
+		assertThat(target.sampleMapLazy).isInstanceOf(LazyLoadingProxy.class);
+		assertThat(target.getSampleMapLazy()).containsEntry("s1", new Sample("sample-1", "one")).containsEntry("s2",
+				new Sample("sample-2", "two"));
+
+		verify(dbRefResolver).bulkFetch(any());
+	}
+
+	@Test // GH-4312
+	void conversionShouldAllowReadingAlreadyResolvedLazyReferences() {
+
+		Document sampleSource = new Document("_id", "sample-1").append("value", "one");
+		Document source = new Document("_id", "id-1").append("sampleLazy", sampleSource);
+
+		WithSingleValueDbRef read = converter.read(WithSingleValueDbRef.class, source);
+
+		assertThat(read.sampleLazy).isEqualTo(converter.read(Sample.class, sampleSource));
+		verifyNoInteractions(dbRefResolver);
+	}
+
 	@Test // DATAMONGO-2004
-	public void resolvesLazyDBRefConstructorArgOnAccess() {
+	void resolvesLazyDBRefConstructorArgOnAccess() {
 
-		client.getDatabase("mapping-converter-tests").getCollection("samples")
+		client.getDatabase(DATABASE).getCollection("samples")
 				.insertMany(Arrays.asList(new Document("_id", "sample-1").append("value", "one"),
 						new Document("_id", "sample-2").append("value", "two")));
 
@@ -102,7 +213,6 @@ public void resolvesLazyDBRefConstructorArgOnAccess() {
 		WithLazyDBRefAsConstructorArg target = converter.read(WithLazyDBRefAsConstructorArg.class, source);
 
 		verify(dbRefResolver).resolveDbRef(any(), isNull(), any(), any());
-		verifyNoMoreInteractions(dbRefResolver);
 
 		assertThat(target.lazyList).isInstanceOf(LazyLoadingProxy.class);
 		assertThat(target.getLazyList()).contains(new Sample("sample-1", "one"), new Sample("sample-2", "two"));
@@ -110,16 +220,121 @@ public void resolvesLazyDBRefConstructorArgOnAccess() {
 		verify(dbRefResolver).bulkFetch(any());
 	}
 
+	@Test // DATAMONGO-2400
+	void readJavaTimeValuesWrittenViaCodec() {
+
+		configureConverterWithNativeJavaTimeCodec();
+		MongoCollection<Document> mongoCollection = client.getDatabase(DATABASE).getCollection("java-time-types");
+
+		Instant now = Instant.now().truncatedTo(ChronoUnit.MILLIS);
+		WithJavaTimeTypes source = WithJavaTimeTypes.withJavaTimeTypes(now);
+		source.id = "id-1";
+
+		mongoCollection.insertOne(source.toDocument());
+
+		assertThat(converter.read(WithJavaTimeTypes.class, mongoCollection.find(new Document("_id", source.id)).first()))
+				.isEqualTo(source);
+	}
+
+	void configureConverterWithNativeJavaTimeCodec() {
+
+		converter = new MappingMongoConverter(dbRefResolver, mappingContext);
+		converter.setCustomConversions(
+				MongoCustomConversions.create(MongoConverterConfigurationAdapter::useNativeDriverJavaTimeCodecs));
+		converter.afterPropertiesSet();
+	}
+
 	public static class WithLazyDBRef {
 
 		@Id String id;
 		@DBRef(lazy = true) List<Sample> lazyList;
 
-		public List<Sample> getLazyList() {
+		List<Sample> getLazyList() {
 			return lazyList;
 		}
 	}
 
+	public static class WithSingleValueDbRef {
+
+		@Id //
+		String id;
+
+		@DBRef //
+		Sample sample;
+
+		@DBRef(lazy = true) //
+		Sample sampleLazy;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Sample getSample() {
+			return this.sample;
+		}
+
+		public Sample getSampleLazy() {
+			return this.sampleLazy;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setSample(Sample sample) {
+			this.sample = sample;
+		}
+
+		public void setSampleLazy(Sample sampleLazy) {
+			this.sampleLazy = sampleLazy;
+		}
+
+		public String toString() {
+			return "MappingMongoConverterTests.WithSingleValueDbRef(id=" + this.getId() + ", sample=" + this.getSample()
+					+ ", sampleLazy=" + this.getSampleLazy() + ")";
+		}
+	}
+
+	public static class WithMapValueDbRef {
+
+		@Id String id;
+
+		@DBRef //
+		Map<String, Sample> sampleMap;
+
+		@DBRef(lazy = true) //
+		Map<String, Sample> sampleMapLazy;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Map<String, Sample> getSampleMap() {
+			return this.sampleMap;
+		}
+
+		public Map<String, Sample> getSampleMapLazy() {
+			return this.sampleMapLazy;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setSampleMap(Map<String, Sample> sampleMap) {
+			this.sampleMap = sampleMap;
+		}
+
+		public void setSampleMapLazy(Map<String, Sample> sampleMapLazy) {
+			this.sampleMapLazy = sampleMapLazy;
+		}
+
+		public String toString() {
+			return "MappingMongoConverterTests.WithMapValueDbRef(id=" + this.getId() + ", sampleMap=" + this.getSampleMap()
+					+ ", sampleMapLazy=" + this.getSampleMapLazy() + ")";
+		}
+	}
+
 	public static class WithLazyDBRefAsConstructorArg {
 
 		@Id String id;
@@ -131,17 +346,138 @@ public WithLazyDBRefAsConstructorArg(String id, List<Sample> lazyList) {
 			this.lazyList = lazyList;
 		}
 
-		public List<Sample> getLazyList() {
+		List<Sample> getLazyList() {
 			return lazyList;
 		}
 	}
 
-	@Data
-	@AllArgsConstructor
-	@NoArgsConstructor
 	static class Sample {
 
 		@Id String id;
 		String value;
+
+		public Sample(String id, String value) {
+
+			this.id = id;
+			this.value = value;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Sample sample = (Sample) o;
+			return Objects.equals(id, sample.id) && Objects.equals(value, sample.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "MappingMongoConverterTests.Sample(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
+	}
+
+	static class WithJavaTimeTypes {
+
+		@Id String id;
+		LocalDate localDate;
+		LocalTime localTime;
+		LocalDateTime localDateTime;
+
+		public WithJavaTimeTypes() {}
+
+		static WithJavaTimeTypes withJavaTimeTypes(Instant instant) {
+
+			WithJavaTimeTypes instance = new WithJavaTimeTypes();
+
+			instance.localDate = LocalDate.from(instant.atZone(ZoneId.of("CET")));
+			instance.localTime = LocalTime.from(instant.atZone(ZoneId.of("CET")));
+			instance.localDateTime = LocalDateTime.from(instant.atZone(ZoneId.of("CET")));
+
+			return instance;
+		}
+
+		Document toDocument() {
+			return new Document("_id", id).append("localDate", localDate).append("localTime", localTime)
+					.append("localDateTime", localDateTime);
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public LocalDate getLocalDate() {
+			return this.localDate;
+		}
+
+		public LocalTime getLocalTime() {
+			return this.localTime;
+		}
+
+		public LocalDateTime getLocalDateTime() {
+			return this.localDateTime;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setLocalDate(LocalDate localDate) {
+			this.localDate = localDate;
+		}
+
+		public void setLocalTime(LocalTime localTime) {
+			this.localTime = localTime;
+		}
+
+		public void setLocalDateTime(LocalDateTime localDateTime) {
+			this.localDateTime = localDateTime;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithJavaTimeTypes that = (WithJavaTimeTypes) o;
+			return Objects.equals(id, that.id) && Objects.equals(localDate, that.localDate)
+					&& Objects.equals(localTime, that.localTime) && Objects.equals(localDateTime, that.localDateTime);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, localDate, localTime, localDateTime);
+		}
+
+		public String toString() {
+			return "MappingMongoConverterTests.WithJavaTimeTypes(id=" + this.getId() + ", localDate=" + this.getLocalDate()
+					+ ", localTime=" + this.getLocalTime() + ", localDateTime=" + this.getLocalDateTime() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
index b0567b77aa..6f1c7439c0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,42 +16,66 @@
 package org.springframework.data.mongodb.core.convert;
 
 import static java.time.ZoneId.*;
-import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.DocumentTestUtils.*;
-
-import lombok.EqualsAndHashCode;
-import lombok.RequiredArgsConstructor;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.URL;
+import java.nio.ByteBuffer;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
-
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.assertj.core.api.Assertions;
+import org.assertj.core.data.Percentage;
+import org.bson.BsonDouble;
+import org.bson.BsonUndefined;
+import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
-import org.joda.time.LocalDate;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.jspecify.annotations.NonNull;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.beans.ConversionNotSupportedException;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.convert.ConverterNotFoundException;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.annotation.TypeAlias;
+import org.springframework.data.convert.ConverterBuilder;
 import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.convert.PropertyValueConverter;
+import org.springframework.data.convert.PropertyValueConverterFactory;
 import org.springframework.data.convert.ReadingConverter;
+import org.springframework.data.convert.ValueConverter;
 import org.springframework.data.convert.WritingConverter;
+import org.springframework.data.domain.Vector;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
@@ -60,6 +84,7 @@
 import org.springframework.data.geo.Polygon;
 import org.springframework.data.geo.Shape;
 import org.springframework.data.mapping.MappingException;
+import org.springframework.data.mapping.callback.EntityCallbacks;
 import org.springframework.data.mapping.model.MappingInstantiationException;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.convert.DocumentAccessorUnitTests.NestedType;
@@ -68,15 +93,24 @@
 import org.springframework.data.mongodb.core.geo.Sphere;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.FieldName.Type;
 import org.springframework.data.mongodb.core.mapping.FieldType;
+import org.springframework.data.mongodb.core.mapping.MongoField;
+import org.springframework.data.mongodb.core.mapping.MongoId;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
 import org.springframework.data.mongodb.core.mapping.PersonPojoStringId;
 import org.springframework.data.mongodb.core.mapping.TextScore;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
+import org.springframework.data.mongodb.core.mapping.event.AfterConvertCallback;
+import org.springframework.data.projection.EntityProjection;
+import org.springframework.data.projection.EntityProjectionIntrospector;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.mongodb.BasicDBList;
+import com.mongodb.BasicDBObject;
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
 
 /**
@@ -86,19 +120,23 @@
  * @author Patrik Wasik
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Roman Puchkovskiy
+ * @author Heesu Jung
+ * @author Julia Lee
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MappingMongoConverterUnitTests {
+@ExtendWith(MockitoExtension.class)
+class MappingMongoConverterUnitTests {
 
-	MappingMongoConverter converter;
-	MongoMappingContext mappingContext;
+	private MappingMongoConverter converter;
+	private MongoMappingContext mappingContext;
 	@Mock ApplicationContext context;
 	@Mock DbRefResolver resolver;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void beforeEach() {
 
-		MongoCustomConversions conversions = new MongoCustomConversions();
+		MongoCustomConversions conversions = new MongoCustomConversions(
+				Arrays.asList(new ByteBufferToDoubleHolderConverter()));
 
 		mappingContext = new MongoMappingContext();
 		mappingContext.setApplicationContext(context);
@@ -113,7 +151,7 @@ public void setUp() {
 	}
 
 	@Test
-	public void convertsAddressCorrectly() {
+	void convertsAddressCorrectly() {
 
 		Address address = new Address();
 		address.city = "New York";
@@ -124,39 +162,11 @@ public void convertsAddressCorrectly() {
 		converter.write(address, document);
 
 		assertThat(document.get("city").toString()).isEqualTo("New York");
-		assertThat(document.get("street").toString()).isEqualTo("Broadway");
-	}
-
-	@Test
-	public void convertsJodaTimeTypesCorrectly() {
-
-		converter = new MappingMongoConverter(resolver, mappingContext);
-		converter.afterPropertiesSet();
-
-		Person person = new Person();
-		person.birthDate = new LocalDate();
-
-		org.bson.Document document = new org.bson.Document();
-		converter.write(person, document);
-
-		assertThat(document.get("birthDate")).isInstanceOf(Date.class);
-
-		Person result = converter.read(Person.class, document);
-		assertThat(result.birthDate).isNotNull();
-	}
-
-	@Test
-	public void convertsCustomTypeOnConvertToMongoType() {
-
-		converter = new MappingMongoConverter(resolver, mappingContext);
-		converter.afterPropertiesSet();
-
-		LocalDate date = new LocalDate();
-		converter.convertToMongoType(date);
+		assertThat(document.get("s").toString()).isEqualTo("Broadway");
 	}
 
 	@Test // DATAMONGO-130
-	public void writesMapTypeCorrectly() {
+	void writesMapTypeCorrectly() {
 
 		Map<Locale, String> map = Collections.singletonMap(Locale.US, "Foo");
 
@@ -167,7 +177,7 @@ public void writesMapTypeCorrectly() {
 	}
 
 	@Test // DATAMONGO-130
-	public void readsMapWithCustomKeyTypeCorrectly() {
+	void readsMapWithCustomKeyTypeCorrectly() {
 
 		org.bson.Document mapObject = new org.bson.Document(Locale.US.toString(), "Value");
 		org.bson.Document document = new org.bson.Document("map", mapObject);
@@ -177,27 +187,27 @@ public void readsMapWithCustomKeyTypeCorrectly() {
 	}
 
 	@Test // DATAMONGO-128
-	public void usesDocumentsStoredTypeIfSubtypeOfRequest() {
+	void usesDocumentsStoredTypeIfSubtypeOfRequest() {
 
 		org.bson.Document document = new org.bson.Document();
-		document.put("birthDate", new LocalDate());
+		document.put("birthDate", new Date());
 		document.put(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Person.class.getName());
 
 		assertThat(converter.read(Contact.class, document)).isInstanceOf(Person.class);
 	}
 
 	@Test // DATAMONGO-128
-	public void ignoresDocumentsStoredTypeIfCompletelyDifferentTypeRequested() {
+	void ignoresDocumentsStoredTypeIfCompletelyDifferentTypeRequested() {
 
 		org.bson.Document document = new org.bson.Document();
-		document.put("birthDate", new LocalDate());
+		document.put("birthDate", new Date());
 		document.put(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Person.class.getName());
 
 		assertThat(converter.read(BirthDateContainer.class, document)).isInstanceOf(BirthDateContainer.class);
 	}
 
 	@Test
-	public void writesTypeDiscriminatorIntoRootObject() {
+	void writesTypeDiscriminatorIntoRootObject() {
 
 		Person person = new Person();
 
@@ -209,7 +219,7 @@ public void writesTypeDiscriminatorIntoRootObject() {
 	}
 
 	@Test // DATAMONGO-136
-	public void writesEnumsCorrectly() {
+	void writesEnumsCorrectly() {
 
 		ClassWithEnumProperty value = new ClassWithEnumProperty();
 		value.sampleEnum = SampleEnum.FIRST;
@@ -222,7 +232,7 @@ public void writesEnumsCorrectly() {
 	}
 
 	@Test // DATAMONGO-209
-	public void writesEnumCollectionCorrectly() {
+	void writesEnumCollectionCorrectly() {
 
 		ClassWithEnumProperty value = new ClassWithEnumProperty();
 		value.enums = Arrays.asList(SampleEnum.FIRST);
@@ -238,7 +248,7 @@ public void writesEnumCollectionCorrectly() {
 	}
 
 	@Test // DATAMONGO-136
-	public void readsEnumsCorrectly() {
+	void readsEnumsCorrectly() {
 		org.bson.Document document = new org.bson.Document("sampleEnum", "FIRST");
 		ClassWithEnumProperty result = converter.read(ClassWithEnumProperty.class, document);
 
@@ -246,7 +256,7 @@ public void readsEnumsCorrectly() {
 	}
 
 	@Test // DATAMONGO-209
-	public void readsEnumCollectionsCorrectly() {
+	void readsEnumCollectionsCorrectly() {
 
 		BasicDBList enums = new BasicDBList();
 		enums.add("FIRST");
@@ -260,7 +270,7 @@ public void readsEnumCollectionsCorrectly() {
 	}
 
 	@Test // DATAMONGO-144
-	public void considersFieldNameWhenWriting() {
+	void considersFieldNameWhenWriting() {
 
 		Person person = new Person();
 		person.firstname = "Oliver";
@@ -273,7 +283,7 @@ public void considersFieldNameWhenWriting() {
 	}
 
 	@Test // DATAMONGO-144
-	public void considersFieldNameWhenReading() {
+	void considersFieldNameWhenReading() {
 
 		org.bson.Document document = new org.bson.Document("foo", "Oliver");
 		Person result = converter.read(Person.class, document);
@@ -282,7 +292,7 @@ public void considersFieldNameWhenReading() {
 	}
 
 	@Test
-	public void resolvesNestedComplexTypeForConstructorCorrectly() {
+	void resolvesNestedComplexTypeForConstructorCorrectly() {
 
 		org.bson.Document address = new org.bson.Document("street", "110 Southwark Street");
 		address.put("city", "London");
@@ -298,7 +308,7 @@ public void resolvesNestedComplexTypeForConstructorCorrectly() {
 	}
 
 	@Test // DATAMONGO-145
-	public void writesCollectionWithInterfaceCorrectly() {
+	void writesCollectionWithInterfaceCorrectly() {
 
 		Person person = new Person();
 		person.firstname = "Oliver";
@@ -318,7 +328,7 @@ public void writesCollectionWithInterfaceCorrectly() {
 	}
 
 	@Test // DATAMONGO-145
-	public void readsCollectionWithInterfaceCorrectly() {
+	void readsCollectionWithInterfaceCorrectly() {
 
 		org.bson.Document person = new org.bson.Document(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY, Person.class.getName());
 		person.put("foo", "Oliver");
@@ -335,7 +345,7 @@ public void readsCollectionWithInterfaceCorrectly() {
 	}
 
 	@Test
-	public void convertsLocalesOutOfTheBox() {
+	void convertsLocalesOutOfTheBox() {
 		LocaleWrapper wrapper = new LocaleWrapper();
 		wrapper.locale = Locale.US;
 
@@ -351,7 +361,7 @@ public void convertsLocalesOutOfTheBox() {
 	}
 
 	@Test // DATAMONGO-161
-	public void readsNestedMapsCorrectly() {
+	void readsNestedMapsCorrectly() {
 
 		Map<String, String> secondLevel = new HashMap<String, String>();
 		secondLevel.put("key1", "value1");
@@ -375,7 +385,7 @@ public void readsNestedMapsCorrectly() {
 	}
 
 	@Test // DATACMNS-42, DATAMONGO-171
-	public void writesClassWithBigDecimal() {
+	void writesClassWithBigDecimal() {
 
 		BigDecimalContainer container = new BigDecimalContainer();
 		container.value = BigDecimal.valueOf(2.5d);
@@ -390,7 +400,7 @@ public void writesClassWithBigDecimal() {
 	}
 
 	@Test // DATACMNS-42, DATAMONGO-171
-	public void readsClassWithBigDecimal() {
+	void readsClassWithBigDecimal() {
 
 		org.bson.Document document = new org.bson.Document("value", "2.5");
 		document.put("map", new org.bson.Document("foo", "2.5"));
@@ -406,7 +416,7 @@ public void readsClassWithBigDecimal() {
 	}
 
 	@Test
-	public void writesNestedCollectionsCorrectly() {
+	void writesNestedCollectionsCorrectly() {
 
 		CollectionWrapper wrapper = new CollectionWrapper();
 		wrapper.strings = Arrays.asList(Arrays.asList("Foo"));
@@ -422,7 +432,7 @@ public void writesNestedCollectionsCorrectly() {
 	}
 
 	@Test // DATAMONGO-192
-	public void readsEmptySetsCorrectly() {
+	void readsEmptySetsCorrectly() {
 
 		Person person = new Person();
 		person.addresses = Collections.emptySet();
@@ -433,7 +443,7 @@ public void readsEmptySetsCorrectly() {
 	}
 
 	@Test
-	public void convertsObjectIdStringsToObjectIdCorrectly() {
+	void convertsObjectIdStringsToObjectIdCorrectly() {
 		PersonPojoStringId p1 = new PersonPojoStringId("1234567890", "Text-1");
 		org.bson.Document doc1 = new org.bson.Document();
 
@@ -448,7 +458,7 @@ public void convertsObjectIdStringsToObjectIdCorrectly() {
 	}
 
 	@Test // DATAMONGO-207
-	public void convertsCustomEmptyMapCorrectly() {
+	void convertsCustomEmptyMapCorrectly() {
 
 		org.bson.Document map = new org.bson.Document();
 		org.bson.Document wrapper = new org.bson.Document("map", map);
@@ -460,12 +470,12 @@ public void convertsCustomEmptyMapCorrectly() {
 	}
 
 	@Test // DATAMONGO-211
-	public void maybeConvertHandlesNullValuesCorrectly() {
+	void maybeConvertHandlesNullValuesCorrectly() {
 		assertThat(converter.convertToMongoType(null)).isNull();
 	}
 
 	@Test // DATAMONGO-1509
-	public void writesGenericTypeCorrectly() {
+	void writesGenericTypeCorrectly() {
 
 		GenericType<Address> type = new GenericType<Address>();
 		type.content = new Address();
@@ -480,7 +490,7 @@ public void writesGenericTypeCorrectly() {
 	}
 
 	@Test
-	public void readsGenericTypeCorrectly() {
+	void readsGenericTypeCorrectly() {
 
 		org.bson.Document address = new org.bson.Document("_class", Address.class.getName());
 		address.put("city", "London");
@@ -490,7 +500,7 @@ public void readsGenericTypeCorrectly() {
 	}
 
 	@Test // DATAMONGO-228
-	public void writesNullValuesForMaps() {
+	void writesNullValuesForMaps() {
 
 		ClassWithMapProperty foo = new ClassWithMapProperty();
 		foo.map = Collections.singletonMap(Locale.US, null);
@@ -504,7 +514,7 @@ public void writesNullValuesForMaps() {
 	}
 
 	@Test
-	public void writesBigIntegerIdCorrectly() {
+	void writesBigIntegerIdCorrectly() {
 
 		ClassWithBigIntegerId foo = new ClassWithBigIntegerId();
 		foo.id = BigInteger.valueOf(23L);
@@ -515,14 +525,15 @@ public void writesBigIntegerIdCorrectly() {
 		assertThat(result.get("_id")).isInstanceOf(String.class);
 	}
 
-	public void convertsObjectsIfNecessary() {
+	@Test
+	void convertsObjectsIfNecessary() {
 
 		ObjectId id = new ObjectId();
 		assertThat(converter.convertToMongoType(id)).isEqualTo(id);
 	}
 
 	@Test // DATAMONGO-235
-	public void writesMapOfListsCorrectly() {
+	void writesMapOfListsCorrectly() {
 
 		ClassWithMapProperty input = new ClassWithMapProperty();
 		input.mapOfLists = Collections.singletonMap("Foo", Arrays.asList("Bar"));
@@ -543,7 +554,7 @@ public void writesMapOfListsCorrectly() {
 	}
 
 	@Test // DATAMONGO-235
-	public void readsMapListValuesCorrectly() {
+	void readsMapListValuesCorrectly() {
 
 		BasicDBList list = new BasicDBList();
 		list.add("Bar");
@@ -554,7 +565,7 @@ public void readsMapListValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-235
-	public void writesMapsOfObjectsCorrectly() {
+	void writesMapsOfObjectsCorrectly() {
 
 		ClassWithMapProperty input = new ClassWithMapProperty();
 		input.mapOfObjects = new HashMap<String, Object>();
@@ -568,15 +579,15 @@ public void writesMapsOfObjectsCorrectly() {
 
 		org.bson.Document map = (org.bson.Document) field;
 		Object foo = map.get("Foo");
-		assertThat(foo).isInstanceOf(BasicDBList.class);
+		assertThat(foo).isInstanceOf(List.class);
 
-		BasicDBList value = (BasicDBList) foo;
+		List value = (List) foo;
 		assertThat(value.size()).isEqualTo(1);
 		assertThat(value.get(0)).isEqualTo("Bar");
 	}
 
 	@Test // DATAMONGO-235
-	public void readsMapOfObjectsListValuesCorrectly() {
+	void readsMapOfObjectsListValuesCorrectly() {
 
 		BasicDBList list = new BasicDBList();
 		list.add("Bar");
@@ -587,7 +598,7 @@ public void readsMapOfObjectsListValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-245
-	public void readsMapListNestedValuesCorrectly() {
+	void readsMapListNestedValuesCorrectly() {
 
 		BasicDBList list = new BasicDBList();
 		list.add(new org.bson.Document("Hello", "World"));
@@ -600,7 +611,7 @@ public void readsMapListNestedValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-245
-	public void readsMapDoublyNestedValuesCorrectly() {
+	void readsMapDoublyNestedValuesCorrectly() {
 
 		org.bson.Document nested = new org.bson.Document();
 		org.bson.Document doubly = new org.bson.Document();
@@ -617,7 +628,7 @@ public void readsMapDoublyNestedValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-245
-	public void readsMapListDoublyNestedValuesCorrectly() {
+	void readsMapListDoublyNestedValuesCorrectly() {
 
 		BasicDBList list = new BasicDBList();
 		org.bson.Document nested = new org.bson.Document();
@@ -636,7 +647,7 @@ public void readsMapListDoublyNestedValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-259
-	public void writesListOfMapsCorrectly() {
+	void writesListOfMapsCorrectly() {
 
 		Map<String, Locale> map = Collections.singletonMap("Foo", Locale.ENGLISH);
 
@@ -657,7 +668,7 @@ public void writesListOfMapsCorrectly() {
 	}
 
 	@Test // DATAMONGO-259
-	public void readsListOfMapsCorrectly() {
+	void readsListOfMapsCorrectly() {
 
 		org.bson.Document map = new org.bson.Document("Foo", "en");
 
@@ -674,8 +685,146 @@ public void readsListOfMapsCorrectly() {
 		assertThat(wrapper.listOfMaps.get(0).get("Foo")).isEqualTo(Locale.ENGLISH);
 	}
 
+	@ParameterizedTest(name = "{4}") // GH-4571
+	@MethodSource("listMapSetReadingSource")
+	<T> void initializesListMapSetPropertiesIfRequiredOnRead(org.bson.Document source, Class<T> type,
+			Function<T, Object> valueFunction, Object expectedValue, String displayName) {
+
+		T target = converter.read(type, source);
+		assertThat(target).extracting(valueFunction).isEqualTo(expectedValue);
+	}
+
+	private static Stream<Arguments> listMapSetReadingSource() {
+
+		Stream<Arguments> initialList = fixtureFor("contacts", CollectionWrapper.class, CollectionWrapper::getContacts,
+				builder -> {
+
+					builder.onValue(Collections.emptyList()).expect(Collections.emptyList());
+					builder.onNull().expect(null);
+					builder.onEmpty().expect(null);
+				});
+
+		Stream<Arguments> initializedList = fixtureFor("autoInitList", CollectionWrapper.class,
+				CollectionWrapper::getAutoInitList, builder -> {
+
+					builder.onValue(Collections.emptyList()).expect(Collections.emptyList());
+					builder.onNull().expect(null);
+					builder.onEmpty().expect(Collections.singletonList("spring"));
+				});
+
+		Stream<Arguments> initialSet = fixtureFor("contactsSet", CollectionWrapper.class, CollectionWrapper::getContactsSet,
+				builder -> {
+
+					builder.onValue(Collections.emptyList()).expect(Collections.emptySet());
+					builder.onNull().expect(null);
+					builder.onEmpty().expect(null);
+				});
+
+		Stream<Arguments> initialMap = fixtureFor("map", ClassWithMapProperty.class, ClassWithMapProperty::getMap,
+				builder -> {
+
+					builder.onValue(new org.bson.Document()).expect(Collections.emptyMap());
+					builder.onNull().expect(null);
+					builder.onEmpty().expect(null);
+				});
+
+		Stream<Arguments> initializedMap = fixtureFor("autoInitMap", ClassWithMapProperty.class,
+				ClassWithMapProperty::getAutoInitMap, builder -> {
+
+					builder.onValue(new org.bson.Document()).expect(Collections.emptyMap());
+					builder.onNull().expect(null);
+					builder.onEmpty().expect(Collections.singletonMap("spring", "data"));
+				});
+
+		return Stream.of(initialList, initializedList, initialSet, initialMap, initializedMap).flatMap(Function.identity());
+	}
+
+	static <T> Stream<Arguments> fixtureFor(String field, Class<T> type, Function<T, Object> valueFunction,
+			Consumer<FixtureBuilder> builderConsumer) {
+
+		FixtureBuilder builder = new FixtureBuilder(field, type, valueFunction);
+
+		builderConsumer.accept(builder);
+
+		return builder.fixtures.stream();
+	}
+
+	/**
+	 * Builder for fixtures.
+	 */
+	static class FixtureBuilder {
+
+		private final String field;
+		private final Class<?> typeUnderTest;
+		private final Function<?, Object> valueMappingFunction;
+		final List<Arguments> fixtures = new ArrayList<>();
+
+		FixtureBuilder(String field, Class<?> typeUnderTest, Function<?, Object> valueMappingFunction) {
+			this.field = field;
+			this.typeUnderTest = typeUnderTest;
+			this.valueMappingFunction = valueMappingFunction;
+		}
+
+		/**
+		 * If the document value is {@code null}.
+		 */
+		FixtureStep onNull() {
+			return new FixtureStep(false, null);
+		}
+
+		/**
+		 * If the document value is {@code value}.
+		 */
+		FixtureStep onValue(@Nullable Object value) {
+			return new FixtureStep(false, value);
+		}
+
+		/**
+		 * If the document does not contain the field.
+		 */
+		FixtureStep onEmpty() {
+			return new FixtureStep(true, null);
+		}
+
+		class FixtureStep {
+
+			private final boolean empty;
+			private final @Nullable Object documentValue;
+
+			public FixtureStep(boolean empty, @Nullable Object documentValue) {
+				this.empty = empty;
+				this.documentValue = documentValue;
+			}
+
+			/**
+			 * Then expect {@code expectedValue}.
+			 *
+			 * @param expectedValue
+			 */
+			void expect(@Nullable Object expectedValue) {
+
+				Arguments fixture;
+				if (empty) {
+					fixture = Arguments.of(new org.bson.Document(), typeUnderTest, valueMappingFunction, expectedValue,
+							"Empty document expecting '%s' at type %s".formatted(expectedValue, typeUnderTest.getSimpleName()));
+				} else {
+
+					String valueDescription = (documentValue == null ? "null"
+							: (documentValue + " (" + documentValue.getClass().getSimpleName()) + ")");
+
+					fixture = Arguments.of(new org.bson.Document(field, documentValue), typeUnderTest, valueMappingFunction,
+							expectedValue, "Field '%s' with value %s expecting '%s' at type %s".formatted(field, valueDescription,
+									expectedValue, typeUnderTest.getSimpleName()));
+				}
+
+				fixtures.add(fixture);
+			}
+		}
+
+	}
+
 	@Test // DATAMONGO-259
-	public void writesPlainMapOfCollectionsCorrectly() {
+	void writesPlainMapOfCollectionsCorrectly() {
 
 		Map<String, List<Locale>> map = Collections.singletonMap("Foo", Arrays.asList(Locale.US));
 		org.bson.Document result = new org.bson.Document();
@@ -683,9 +832,9 @@ public void writesPlainMapOfCollectionsCorrectly() {
 
 		assertThat(result.containsKey("Foo")).isTrue();
 		assertThat(result.get("Foo")).isNotNull();
-		assertThat(result.get("Foo")).isInstanceOf(BasicDBList.class);
+		assertThat(result.get("Foo")).isInstanceOf(List.class);
 
-		BasicDBList list = (BasicDBList) result.get("Foo");
+		List list = (List) result.get("Foo");
 
 		assertThat(list.size()).isEqualTo(1);
 		assertThat(list.get(0)).isEqualTo(Locale.US.toString());
@@ -693,7 +842,7 @@ public void writesPlainMapOfCollectionsCorrectly() {
 
 	@Test // DATAMONGO-285
 	@SuppressWarnings({ "unchecked", "rawtypes" })
-	public void testSaveMapWithACollectionAsValue() {
+	void testSaveMapWithACollectionAsValue() {
 
 		Map<String, Object> keyValues = new HashMap<String, Object>();
 		keyValues.put("string", "hello");
@@ -718,7 +867,7 @@ public void testSaveMapWithACollectionAsValue() {
 
 	@Test // DATAMONGO-309
 	@SuppressWarnings({ "unchecked" })
-	public void writesArraysAsMapValuesCorrectly() {
+	void writesArraysAsMapValuesCorrectly() {
 
 		ClassWithMapProperty wrapper = new ClassWithMapProperty();
 		wrapper.mapOfObjects = new HashMap<String, Object>();
@@ -732,7 +881,7 @@ public void writesArraysAsMapValuesCorrectly() {
 
 		org.bson.Document map = (org.bson.Document) mapObject;
 		Object valueObject = map.get("foo");
-		assertThat(valueObject).isInstanceOf(BasicDBList.class);
+		assertThat(valueObject).isInstanceOf(List.class);
 
 		List<Object> list = (List<Object>) valueObject;
 		assertThat(list.size()).isEqualTo(1);
@@ -740,7 +889,7 @@ public void writesArraysAsMapValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-324
-	public void writesDocumentCorrectly() {
+	void writesDocumentCorrectly() {
 
 		org.bson.Document document = new org.bson.Document();
 		document.put("foo", "bar");
@@ -754,7 +903,7 @@ public void writesDocumentCorrectly() {
 	}
 
 	@Test // DATAMONGO-324
-	public void readsDocumentCorrectly() {
+	void readsDocumentCorrectly() {
 
 		org.bson.Document document = new org.bson.Document();
 		document.put("foo", "bar");
@@ -765,7 +914,7 @@ public void readsDocumentCorrectly() {
 	}
 
 	@Test // DATAMONGO-329
-	public void writesMapAsGenericFieldCorrectly() {
+	void writesMapAsGenericFieldCorrectly() {
 
 		Map<String, A<String>> objectToSave = new HashMap<String, A<String>>();
 		objectToSave.put("test", new A<String>("testValue"));
@@ -789,7 +938,7 @@ public void writesMapAsGenericFieldCorrectly() {
 	}
 
 	@Test
-	public void writesIntIdCorrectly() {
+	void writesIntIdCorrectly() {
 
 		ClassWithIntId value = new ClassWithIntId();
 		value.id = 5;
@@ -802,7 +951,7 @@ public void writesIntIdCorrectly() {
 
 	@Test // DATAMONGO-368
 	@SuppressWarnings("unchecked")
-	public void writesNullValuesForCollection() {
+	void writesNullValuesForCollection() {
 
 		CollectionWrapper wrapper = new CollectionWrapper();
 		wrapper.contacts = Arrays.asList(new Person(), null);
@@ -817,7 +966,7 @@ public void writesNullValuesForCollection() {
 	}
 
 	@Test // DATAMONGO-379
-	public void considersDefaultingExpressionsAtConstructorArguments() {
+	void considersDefaultingExpressionsAtConstructorArguments() {
 
 		org.bson.Document document = new org.bson.Document("foo", "bar");
 		document.put("foobar", 2.5);
@@ -827,7 +976,7 @@ public void considersDefaultingExpressionsAtConstructorArguments() {
 	}
 
 	@Test // DATAMONGO-379
-	public void usesDocumentFieldIfReferencedInAtValue() {
+	void usesDocumentFieldIfReferencedInAtValue() {
 
 		org.bson.Document document = new org.bson.Document("foo", "bar");
 		document.put("something", 37);
@@ -837,16 +986,17 @@ public void usesDocumentFieldIfReferencedInAtValue() {
 		assertThat(result.bar).isEqualTo(37);
 	}
 
-	@Test(expected = MappingInstantiationException.class) // DATAMONGO-379
-	public void rejectsNotFoundConstructorParameterForPrimitiveType() {
+	@Test // DATAMONGO-379
+	void rejectsNotFoundConstructorParameterForPrimitiveType() {
 
 		org.bson.Document document = new org.bson.Document("foo", "bar");
 
-		converter.read(DefaultedConstructorArgument.class, document);
+		assertThatThrownBy(() -> converter.read(DefaultedConstructorArgument.class, document))
+				.isInstanceOf(MappingInstantiationException.class);
 	}
 
 	@Test // DATAMONGO-358
-	public void writesListForObjectPropertyCorrectly() {
+	void writesListForObjectPropertyCorrectly() {
 
 		Attribute attribute = new Attribute();
 		attribute.key = "key";
@@ -872,13 +1022,13 @@ public void writesListForObjectPropertyCorrectly() {
 	}
 
 	@Test // DATAMONGO-380
-	public void rejectsMapWithKeyContainingDotsByDefault() {
+	void rejectsMapWithKeyContainingDotsByDefault() {
 		assertThatExceptionOfType(MappingException.class)
 				.isThrownBy(() -> converter.write(Collections.singletonMap("foo.bar", "foobar"), new org.bson.Document()));
 	}
 
 	@Test // DATAMONGO-380
-	public void escapesDotInMapKeysIfReplacementConfigured() {
+	void escapesDotInMapKeysIfReplacementConfigured() {
 
 		converter.setMapKeyDotReplacement("~");
 
@@ -891,7 +1041,7 @@ public void escapesDotInMapKeysIfReplacementConfigured() {
 
 	@Test // DATAMONGO-380
 	@SuppressWarnings("unchecked")
-	public void unescapesDotInMapKeysIfReplacementConfigured() {
+	void unescapesDotInMapKeysIfReplacementConfigured() {
 
 		converter.setMapKeyDotReplacement("~");
 
@@ -903,14 +1053,14 @@ public void unescapesDotInMapKeysIfReplacementConfigured() {
 	}
 
 	@Test // DATAMONGO-382
-	@Ignore("mongo3 - no longer supported")
-	public void convertsSetToBasicDBList() {
+	@Disabled("mongo3 - no longer supported")
+	void convertsSetToBasicDBList() {
 
 		Address address = new Address();
 		address.city = "London";
 		address.street = "Foo";
 
-		Object result = converter.convertToMongoType(Collections.singleton(address), ClassTypeInformation.OBJECT);
+		Object result = converter.convertToMongoType(Collections.singleton(address), TypeInformation.OBJECT);
 		assertThat(result).isInstanceOf(List.class);
 
 		Set<?> readResult = converter.read(Set.class, (org.bson.Document) result);
@@ -918,10 +1068,11 @@ public void convertsSetToBasicDBList() {
 		assertThat(readResult.iterator().next()).isInstanceOf(Address.class);
 	}
 
-	@Test // DATAMONGO-402
-	public void readsMemberClassCorrectly() {
+	@Test // DATAMONGO-402, GH-3702
+	void readsMemberClassCorrectly() {
 
-		org.bson.Document document = new org.bson.Document("inner", new org.bson.Document("value", "FOO!"));
+		org.bson.Document document = new org.bson.Document("inner",
+				new LinkedHashMap<>(new org.bson.Document("value", "FOO!")));
 
 		Outer outer = converter.read(Outer.class, document);
 		assertThat(outer.inner).isNotNull();
@@ -930,7 +1081,7 @@ public void readsMemberClassCorrectly() {
 	}
 
 	@Test // DATAMONGO-458
-	public void readEmptyCollectionIsModifiable() {
+	void readEmptyCollectionIsModifiable() {
 
 		org.bson.Document document = new org.bson.Document("contactsSet", new BasicDBList());
 		CollectionWrapper wrapper = converter.read(CollectionWrapper.class, document);
@@ -940,7 +1091,7 @@ public void readEmptyCollectionIsModifiable() {
 	}
 
 	@Test // DATAMONGO-424
-	public void readsPlainDBRefObject() {
+	void readsPlainDBRefObject() {
 
 		DBRef dbRef = new DBRef("foo", 2);
 		org.bson.Document document = new org.bson.Document("ref", dbRef);
@@ -950,7 +1101,7 @@ public void readsPlainDBRefObject() {
 	}
 
 	@Test // DATAMONGO-424
-	public void readsCollectionOfDBRefs() {
+	void readsCollectionOfDBRefs() {
 
 		DBRef dbRef = new DBRef("foo", 2);
 		BasicDBList refs = new BasicDBList();
@@ -964,7 +1115,7 @@ public void readsCollectionOfDBRefs() {
 	}
 
 	@Test // DATAMONGO-424
-	public void readsDBRefMap() {
+	void readsDBRefMap() {
 
 		DBRef dbRef = mock(DBRef.class);
 		org.bson.Document refMap = new org.bson.Document("foo", dbRef);
@@ -978,7 +1129,7 @@ public void readsDBRefMap() {
 
 	@Test // DATAMONGO-424
 	@SuppressWarnings({ "rawtypes", "unchecked" })
-	public void resolvesDBRefMapValue() {
+	void resolvesDBRefMapValue() {
 
 		when(resolver.fetch(Mockito.any(DBRef.class))).thenReturn(new org.bson.Document());
 		DBRef dbRef = mock(DBRef.class);
@@ -993,7 +1144,7 @@ public void resolvesDBRefMapValue() {
 	}
 
 	@Test // DATAMONGO-462
-	public void writesURLsAsStringOutOfTheBox() throws Exception {
+	void writesURLsAsStringOutOfTheBox() throws Exception {
 
 		URLWrapper wrapper = new URLWrapper();
 		wrapper.url = new URL("https://springsource.org");
@@ -1005,14 +1156,14 @@ public void writesURLsAsStringOutOfTheBox() throws Exception {
 	}
 
 	@Test // DATAMONGO-462
-	public void readsURLFromStringOutOfTheBox() throws Exception {
+	void readsURLFromStringOutOfTheBox() throws Exception {
 		org.bson.Document document = new org.bson.Document("url", "https://springsource.org");
 		URLWrapper result = converter.read(URLWrapper.class, document);
 		assertThat(result.url).isEqualTo(new URL("https://springsource.org"));
 	}
 
 	@Test // DATAMONGO-485
-	public void writesComplexIdCorrectly() {
+	void writesComplexIdCorrectly() {
 
 		ComplexId id = new ComplexId();
 		id.innerId = 4711L;
@@ -1030,7 +1181,7 @@ public void writesComplexIdCorrectly() {
 	}
 
 	@Test // DATAMONGO-485
-	public void readsComplexIdCorrectly() {
+	void readsComplexIdCorrectly() {
 
 		org.bson.Document innerId = new org.bson.Document("innerId", 4711L);
 		org.bson.Document entity = new org.bson.Document("_id", innerId);
@@ -1042,7 +1193,7 @@ public void readsComplexIdCorrectly() {
 	}
 
 	@Test // DATAMONGO-489
-	public void readsArraysAsMapValuesCorrectly() {
+	void readsArraysAsMapValuesCorrectly() {
 
 		BasicDBList list = new BasicDBList();
 		list.add("Foo");
@@ -1060,7 +1211,7 @@ public void readsArraysAsMapValuesCorrectly() {
 	}
 
 	@Test // DATAMONGO-497
-	public void readsEmptyCollectionIntoConstructorCorrectly() {
+	void readsEmptyCollectionIntoConstructorCorrectly() {
 
 		org.bson.Document source = new org.bson.Document("attributes", new BasicDBList());
 
@@ -1068,6 +1219,27 @@ public void readsEmptyCollectionIntoConstructorCorrectly() {
 		assertThat(result.attributes).isNotNull();
 	}
 
+	@Test // DATAMONGO-2400
+	void writeJavaTimeValuesViaCodec() {
+
+		configureConverterWithNativeJavaTimeCodec();
+		TypeWithLocalDateTime source = new TypeWithLocalDateTime();
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThat(target).containsEntry("date", source.date);
+	}
+
+	void configureConverterWithNativeJavaTimeCodec() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+
+		converter.setCustomConversions(MongoCustomConversions
+				.create(MongoCustomConversions.MongoConverterConfigurationAdapter::useNativeDriverJavaTimeCodecs));
+		converter.afterPropertiesSet();
+	}
+
 	private static void assertSyntheticFieldValueOf(Object target, Object expected) {
 
 		for (int i = 0; i < 10; i++) {
@@ -1079,11 +1251,11 @@ private static void assertSyntheticFieldValueOf(Object target, Object expected)
 			}
 		}
 
-		fail(String.format("Didn't find synthetic field on %s!", target));
+		fail(String.format("Didn't find synthetic field on %s", target));
 	}
 
 	@Test // DATAMGONGO-508
-	public void eagerlyReturnsDBRefObjectIfTargetAlreadyIsOne() {
+	void eagerlyReturnsDBRefObjectIfTargetAlreadyIsOne() {
 
 		DBRef dbRef = new DBRef("collection", "id");
 
@@ -1093,7 +1265,7 @@ public void eagerlyReturnsDBRefObjectIfTargetAlreadyIsOne() {
 	}
 
 	@Test // DATAMONGO-523, DATAMONGO-1509
-	public void considersTypeAliasAnnotation() {
+	void considersTypeAliasAnnotation() {
 
 		Aliased aliased = new Aliased();
 		aliased.name = "foo";
@@ -1105,7 +1277,7 @@ public void considersTypeAliasAnnotation() {
 	}
 
 	@Test // DATAMONGO-533
-	public void marshalsThrowableCorrectly() {
+	void marshalsThrowableCorrectly() {
 
 		ThrowableWrapper wrapper = new ThrowableWrapper();
 		wrapper.throwable = new Exception();
@@ -1115,7 +1287,7 @@ public void marshalsThrowableCorrectly() {
 	}
 
 	@Test // DATAMONGO-592
-	public void recursivelyConvertsSpELReadValue() {
+	void recursivelyConvertsSpELReadValue() {
 
 		org.bson.Document input = org.bson.Document.parse(
 				"{ \"_id\" : { \"$oid\" : \"50ca271c4566a2b08f2d667a\" }, \"_class\" : \"com.recorder.TestRecorder2$ObjectContainer\", \"property\" : { \"property\" : 100 } }");
@@ -1124,7 +1296,7 @@ public void recursivelyConvertsSpELReadValue() {
 	}
 
 	@Test // DATAMONGO-724
-	public void mappingConsidersCustomConvertersNotWritingTypeInformation() {
+	void mappingConsidersCustomConvertersNotWritingTypeInformation() {
 
 		Person person = new Person();
 		person.firstname = "Dave";
@@ -1182,7 +1354,7 @@ public Person convert(org.bson.Document source) {
 	}
 
 	@Test // DATAMONGO-743, DATAMONGO-2198
-	public void readsIntoStringsOutOfTheBox() {
+	void readsIntoStringsOutOfTheBox() {
 
 		String target = converter.read(String.class, new org.bson.Document("firstname", "Dave"));
 
@@ -1193,7 +1365,7 @@ public void readsIntoStringsOutOfTheBox() {
 	}
 
 	@Test // DATAMONGO-766
-	public void writesProjectingTypeCorrectly() {
+	void writesProjectingTypeCorrectly() {
 
 		NestedType nested = new NestedType();
 		nested.c = "C";
@@ -1213,14 +1385,14 @@ public void writesProjectingTypeCorrectly() {
 	}
 
 	@Test // DATAMONGO-812, DATAMONGO-893, DATAMONGO-1509
-	public void convertsListToBasicDBListAndRetainsTypeInformationForComplexObjects() {
+	void convertsListToBasicDBListAndRetainsTypeInformationForComplexObjects() {
 
 		Address address = new Address();
 		address.city = "London";
 		address.street = "Foo";
 
 		Object result = converter.convertToMongoType(Collections.singletonList(address),
-				ClassTypeInformation.from(InterfaceType.class));
+				TypeInformation.of(InterfaceType.class));
 
 		assertThat(result).isInstanceOf(List.class);
 
@@ -1230,7 +1402,7 @@ public void convertsListToBasicDBListAndRetainsTypeInformationForComplexObjects(
 	}
 
 	@Test // DATAMONGO-812
-	public void convertsListToBasicDBListWithoutTypeInformationForSimpleTypes() {
+	void convertsListToBasicDBListWithoutTypeInformationForSimpleTypes() {
 
 		Object result = converter.convertToMongoType(Collections.singletonList("foo"));
 
@@ -1242,13 +1414,13 @@ public void convertsListToBasicDBListWithoutTypeInformationForSimpleTypes() {
 	}
 
 	@Test // DATAMONGO-812, DATAMONGO-1509
-	public void convertsArrayToBasicDBListAndRetainsTypeInformationForComplexObjects() {
+	void convertsArrayToBasicDBListAndRetainsTypeInformationForComplexObjects() {
 
 		Address address = new Address();
 		address.city = "London";
 		address.street = "Foo";
 
-		Object result = converter.convertToMongoType(new Address[] { address }, ClassTypeInformation.OBJECT);
+		Object result = converter.convertToMongoType(new Address[] { address }, TypeInformation.OBJECT);
 
 		assertThat(result).isInstanceOf(List.class);
 
@@ -1258,7 +1430,7 @@ public void convertsArrayToBasicDBListAndRetainsTypeInformationForComplexObjects
 	}
 
 	@Test // DATAMONGO-812
-	public void convertsArrayToBasicDBListWithoutTypeInformationForSimpleTypes() {
+	void convertsArrayToBasicDBListWithoutTypeInformationForSimpleTypes() {
 
 		Object result = converter.convertToMongoType(new String[] { "foo" });
 
@@ -1270,7 +1442,7 @@ public void convertsArrayToBasicDBListWithoutTypeInformationForSimpleTypes() {
 	}
 
 	@Test // DATAMONGO-833
-	public void readsEnumSetCorrectly() {
+	void readsEnumSetCorrectly() {
 
 		BasicDBList enumSet = new BasicDBList();
 		enumSet.add("SECOND");
@@ -1284,7 +1456,7 @@ public void readsEnumSetCorrectly() {
 	}
 
 	@Test // DATAMONGO-833
-	public void readsEnumMapCorrectly() {
+	void readsEnumMapCorrectly() {
 
 		org.bson.Document enumMap = new org.bson.Document("FIRST", "Dave");
 		ClassWithEnumProperty result = converter.read(ClassWithEnumProperty.class,
@@ -1296,7 +1468,7 @@ public void readsEnumMapCorrectly() {
 	}
 
 	@Test // DATAMONGO-887
-	public void readsTreeMapCorrectly() {
+	void readsTreeMapCorrectly() {
 
 		org.bson.Document person = new org.bson.Document("foo", "Dave");
 		org.bson.Document treeMapOfPerson = new org.bson.Document("key", person);
@@ -1310,7 +1482,7 @@ public void readsTreeMapCorrectly() {
 	}
 
 	@Test // DATAMONGO-887
-	public void writesTreeMapCorrectly() {
+	void writesTreeMapCorrectly() {
 
 		Person person = new Person();
 		person.firstname = "Dave";
@@ -1329,7 +1501,7 @@ public void writesTreeMapCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldWriteEntityWithGeoBoxCorrectly() {
+	void shouldWriteEntityWithGeoBoxCorrectly() {
 
 		ClassWithGeoBox object = new ClassWithGeoBox();
 		object.box = new Box(new Point(1, 2), new Point(3, 4));
@@ -1348,7 +1520,7 @@ private static org.bson.Document toDocument(Point point) {
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldReadEntityWithGeoBoxCorrectly() {
+	void shouldReadEntityWithGeoBoxCorrectly() {
 
 		ClassWithGeoBox object = new ClassWithGeoBox();
 		object.box = new Box(new Point(1, 2), new Point(3, 4));
@@ -1363,7 +1535,7 @@ public void shouldReadEntityWithGeoBoxCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldWriteEntityWithGeoPolygonCorrectly() {
+	void shouldWriteEntityWithGeoPolygonCorrectly() {
 
 		ClassWithGeoPolygon object = new ClassWithGeoPolygon();
 		object.polygon = new Polygon(new Point(1, 2), new Point(3, 4), new Point(4, 5));
@@ -1385,7 +1557,7 @@ public void shouldWriteEntityWithGeoPolygonCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldReadEntityWithGeoPolygonCorrectly() {
+	void shouldReadEntityWithGeoPolygonCorrectly() {
 
 		ClassWithGeoPolygon object = new ClassWithGeoPolygon();
 		object.polygon = new Polygon(new Point(1, 2), new Point(3, 4), new Point(4, 5));
@@ -1400,7 +1572,7 @@ public void shouldReadEntityWithGeoPolygonCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldWriteEntityWithGeoCircleCorrectly() {
+	void shouldWriteEntityWithGeoCircleCorrectly() {
 
 		ClassWithGeoCircle object = new ClassWithGeoCircle();
 		Circle circle = new Circle(new Point(1, 2), 3);
@@ -1414,11 +1586,11 @@ public void shouldWriteEntityWithGeoCircleCorrectly() {
 		assertThat(document.get("circle")).isInstanceOf(org.bson.Document.class);
 		assertThat(document.get("circle")).isEqualTo((Object) new org.bson.Document("center",
 				new org.bson.Document("x", circle.getCenter().getX()).append("y", circle.getCenter().getY()))
-						.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
+				.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldReadEntityWithGeoCircleCorrectly() {
+	void shouldReadEntityWithGeoCircleCorrectly() {
 
 		ClassWithGeoCircle object = new ClassWithGeoCircle();
 		object.circle = new Circle(new Point(1, 2), 3);
@@ -1433,7 +1605,7 @@ public void shouldReadEntityWithGeoCircleCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldWriteEntityWithGeoSphereCorrectly() {
+	void shouldWriteEntityWithGeoSphereCorrectly() {
 
 		ClassWithGeoSphere object = new ClassWithGeoSphere();
 		Sphere sphere = new Sphere(new Point(1, 2), 3);
@@ -1447,14 +1619,14 @@ public void shouldWriteEntityWithGeoSphereCorrectly() {
 		assertThat(document.get("sphere")).isInstanceOf(org.bson.Document.class);
 		assertThat(document.get("sphere")).isEqualTo((Object) new org.bson.Document("center",
 				new org.bson.Document("x", sphere.getCenter().getX()).append("y", sphere.getCenter().getY()))
-						.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
+				.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldWriteEntityWithGeoSphereWithMetricDistanceCorrectly() {
+	void shouldWriteEntityWithGeoSphereWithMetricDistanceCorrectly() {
 
 		ClassWithGeoSphere object = new ClassWithGeoSphere();
-		Sphere sphere = new Sphere(new Point(1, 2), new Distance(3, Metrics.KILOMETERS));
+		Sphere sphere = new Sphere(new Point(1, 2), Distance.of(3, Metrics.KILOMETERS));
 		Distance radius = sphere.getRadius();
 		object.sphere = sphere;
 
@@ -1465,11 +1637,11 @@ public void shouldWriteEntityWithGeoSphereWithMetricDistanceCorrectly() {
 		assertThat(document.get("sphere")).isInstanceOf(org.bson.Document.class);
 		assertThat(document.get("sphere")).isEqualTo((Object) new org.bson.Document("center",
 				new org.bson.Document("x", sphere.getCenter().getX()).append("y", sphere.getCenter().getY()))
-						.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
+				.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldReadEntityWithGeoSphereCorrectly() {
+	void shouldReadEntityWithGeoSphereCorrectly() {
 
 		ClassWithGeoSphere object = new ClassWithGeoSphere();
 		object.sphere = new Sphere(new Point(1, 2), 3);
@@ -1484,7 +1656,7 @@ public void shouldReadEntityWithGeoSphereCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void shouldWriteEntityWithGeoShapeCorrectly() {
+	void shouldWriteEntityWithGeoShapeCorrectly() {
 
 		ClassWithGeoShape object = new ClassWithGeoShape();
 		Sphere sphere = new Sphere(new Point(1, 2), 3);
@@ -1498,12 +1670,12 @@ public void shouldWriteEntityWithGeoShapeCorrectly() {
 		assertThat(document.get("shape")).isInstanceOf(org.bson.Document.class);
 		assertThat(document.get("shape")).isEqualTo((Object) new org.bson.Document("center",
 				new org.bson.Document("x", sphere.getCenter().getX()).append("y", sphere.getCenter().getY()))
-						.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
+				.append("radius", radius.getNormalizedValue()).append("metric", radius.getMetric().toString()));
 	}
 
 	@Test // DATAMONGO-858
-	@Ignore
-	public void shouldReadEntityWithGeoShapeCorrectly() {
+	@Disabled
+	void shouldReadEntityWithGeoShapeCorrectly() {
 
 		ClassWithGeoShape object = new ClassWithGeoShape();
 		Sphere sphere = new Sphere(new Point(1, 2), 3);
@@ -1519,7 +1691,7 @@ public void shouldReadEntityWithGeoShapeCorrectly() {
 	}
 
 	@Test // DATAMONGO-976
-	public void shouldIgnoreTextScorePropertyWhenWriting() {
+	void shouldIgnoreTextScorePropertyWhenWriting() {
 
 		ClassWithTextScoreProperty source = new ClassWithTextScoreProperty();
 		source.score = Float.MAX_VALUE;
@@ -1531,7 +1703,7 @@ public void shouldIgnoreTextScorePropertyWhenWriting() {
 	}
 
 	@Test // DATAMONGO-976
-	public void shouldIncludeTextScorePropertyWhenReading() {
+	void shouldIncludeTextScorePropertyWhenReading() {
 
 		ClassWithTextScoreProperty entity = converter.read(ClassWithTextScoreProperty.class,
 				new org.bson.Document("score", 5F));
@@ -1539,7 +1711,7 @@ public void shouldIncludeTextScorePropertyWhenReading() {
 	}
 
 	@Test // DATAMONGO-1001, DATAMONGO-1509
-	public void shouldWriteCglibProxiedClassTypeInformationCorrectly() {
+	void shouldWriteCglibProxiedTypeInformationCorrectly() {
 
 		ProxyFactory factory = new ProxyFactory();
 		factory.setTargetClass(GenericType.class);
@@ -1553,7 +1725,7 @@ public void shouldWriteCglibProxiedClassTypeInformationCorrectly() {
 	}
 
 	@Test // DATAMONGO-1001
-	public void shouldUseTargetObjectOfLazyLoadingProxyWhenWriting() {
+	void shouldUseTargetObjectOfLazyLoadingProxyWhenWriting() {
 
 		LazyLoadingProxy mock = mock(LazyLoadingProxy.class);
 
@@ -1564,13 +1736,13 @@ public void shouldUseTargetObjectOfLazyLoadingProxyWhenWriting() {
 	}
 
 	@Test // DATAMONGO-1034
-	public void rejectsBasicDbListToBeConvertedIntoComplexType() {
+	void rejectsBasicDbListToBeConvertedIntoComplexType() {
 
-		List<Object> inner = new ArrayList<Object>();
+		List<Object> inner = new ArrayList<>();
 		inner.add("key");
 		inner.add("value");
 
-		List<Object> outer = new ArrayList<Object>();
+		List<Object> outer = new ArrayList<>();
 		outer.add(inner);
 		outer.add(inner);
 
@@ -1580,7 +1752,7 @@ public void rejectsBasicDbListToBeConvertedIntoComplexType() {
 	}
 
 	@Test // DATAMONGO-1058
-	public void readShouldRespectExplicitFieldNameForDbRef() {
+	void readShouldRespectExplicitFieldNameForDbRef() {
 
 		org.bson.Document source = new org.bson.Document();
 		source.append("explict-name-for-db-ref", new DBRef("foo", "1"));
@@ -1592,7 +1764,7 @@ public void readShouldRespectExplicitFieldNameForDbRef() {
 	}
 
 	@Test // DATAMONGO-1050
-	public void writeShouldUseExplicitFieldnameForIdPropertyWhenAnnotated() {
+	void writeShouldUseExplicitFieldnameForIdPropertyWhenAnnotated() {
 
 		RootForClassWithExplicitlyRenamedIdField source = new RootForClassWithExplicitlyRenamedIdField();
 		source.id = "rootId";
@@ -1607,7 +1779,7 @@ public void writeShouldUseExplicitFieldnameForIdPropertyWhenAnnotated() {
 	}
 
 	@Test // DATAMONGO-1050
-	public void readShouldUseExplicitFieldnameForIdPropertyWhenAnnotated() {
+	void readShouldUseExplicitFieldnameForIdPropertyWhenAnnotated() {
 
 		org.bson.Document source = new org.bson.Document().append("_id", "rootId").append("nested",
 				new org.bson.Document("id", "nestedId"));
@@ -1621,7 +1793,7 @@ public void readShouldUseExplicitFieldnameForIdPropertyWhenAnnotated() {
 	}
 
 	@Test // DATAMONGO-1050
-	public void namedIdFieldShouldExtractValueFromUnderscoreIdField() {
+	void namedIdFieldShouldExtractValueFromUnderscoreIdField() {
 
 		org.bson.Document document = new org.bson.Document().append("_id", "A").append("id", "B");
 
@@ -1631,7 +1803,7 @@ public void namedIdFieldShouldExtractValueFromUnderscoreIdField() {
 	}
 
 	@Test // DATAMONGO-1050
-	public void explicitlyRenamedIfFieldShouldExtractValueFromIdField() {
+	void explicitlyRenamedIfFieldShouldExtractValueFromIdField() {
 
 		org.bson.Document document = new org.bson.Document().append("_id", "A").append("id", "B");
 
@@ -1642,7 +1814,7 @@ public void explicitlyRenamedIfFieldShouldExtractValueFromIdField() {
 	}
 
 	@Test // DATAMONGO-1050
-	public void annotatedIdFieldShouldExtractValueFromUnderscoreIdField() {
+	void annotatedIdFieldShouldExtractValueFromUnderscoreIdField() {
 
 		org.bson.Document document = new org.bson.Document().append("_id", "A").append("id", "B");
 
@@ -1652,7 +1824,7 @@ public void annotatedIdFieldShouldExtractValueFromUnderscoreIdField() {
 	}
 
 	@Test // DATAMONGO-1102
-	public void convertsJava8DateTimeTypesToDateAndBack() {
+	void convertsJava8DateTimeTypesToDateAndBack() {
 
 		TypeWithLocalDateTime source = new TypeWithLocalDateTime();
 		LocalDateTime reference = source.date;
@@ -1661,11 +1833,13 @@ public void convertsJava8DateTimeTypesToDateAndBack() {
 		converter.write(source, result);
 
 		assertThat(result.get("date")).isInstanceOf(Date.class);
-		assertThat(converter.read(TypeWithLocalDateTime.class, result).date).isEqualTo(reference);
+		assertThat(converter.read(TypeWithLocalDateTime.class, result).date)
+				.isEqualTo(reference.truncatedTo(ChronoUnit.MILLIS));
 	}
 
 	@Test // DATAMONGO-1128
-	public void writesOptionalsCorrectly() {
+	@Disabled("really we should find a solution for this")
+	void writesOptionalsCorrectly() {
 
 		TypeWithOptional type = new TypeWithOptional();
 		type.localDateTime = Optional.of(LocalDateTime.now());
@@ -1681,8 +1855,8 @@ public void writesOptionalsCorrectly() {
 	}
 
 	@Test // DATAMONGO-1128
-	@Ignore("Broken by DATAMONGO-1992 - In fact, storing Optional fields seems an anti-pattern.")
-	public void readsOptionalsCorrectly() {
+	@Disabled("Broken by DATAMONGO-1992 - In fact, storing Optional fields seems an anti-pattern.")
+	void readsOptionalsCorrectly() {
 
 		LocalDateTime now = LocalDateTime.now();
 		Date reference = Date.from(now.atZone(systemDefault()).toInstant());
@@ -1697,7 +1871,7 @@ public void readsOptionalsCorrectly() {
 	}
 
 	@Test // DATAMONGO-1118
-	public void convertsMapKeyUsingCustomConverterForAndBackwards() {
+	void convertsMapKeyUsingCustomConverterForAndBackwards() {
 
 		MappingMongoConverter converter = new MappingMongoConverter(resolver, mappingContext);
 		converter.setCustomConversions(
@@ -1715,7 +1889,7 @@ public void convertsMapKeyUsingCustomConverterForAndBackwards() {
 	}
 
 	@Test // DATAMONGO-1118
-	public void writesMapKeyUsingCustomConverter() {
+	void writesMapKeyUsingCustomConverter() {
 
 		MappingMongoConverter converter = new MappingMongoConverter(resolver, mappingContext);
 		converter.setCustomConversions(new MongoCustomConversions(Arrays.asList(new FooBarEnumToStringConverter())));
@@ -1736,7 +1910,7 @@ public void writesMapKeyUsingCustomConverter() {
 	}
 
 	@Test // DATAMONGO-1118
-	public void readsMapKeyUsingCustomConverter() {
+	void readsMapKeyUsingCustomConverter() {
 
 		MappingMongoConverter converter = new MappingMongoConverter(resolver, mappingContext);
 		converter.setCustomConversions(new MongoCustomConversions(Arrays.asList(new StringToFooNumConverter())));
@@ -1750,12 +1924,12 @@ public void readsMapKeyUsingCustomConverter() {
 	}
 
 	@Test // DATAMONGO-1471
-	public void readsDocumentWithPrimitiveIdButNoValue() {
+	void readsDocumentWithPrimitiveIdButNoValue() {
 		assertThat(converter.read(ClassWithIntId.class, new org.bson.Document())).isNotNull();
 	}
 
 	@Test // DATAMONGO-1497
-	public void readsPropertyFromNestedFieldCorrectly() {
+	void readsPropertyFromNestedFieldCorrectly() {
 
 		org.bson.Document source = new org.bson.Document("nested", new org.bson.Document("sample", "value"));
 		TypeWithPropertyInNestedField result = converter.read(TypeWithPropertyInNestedField.class, source);
@@ -1764,7 +1938,7 @@ public void readsPropertyFromNestedFieldCorrectly() {
 	}
 
 	@Test // DATAMONGO-1525
-	public void readsEmptyEnumSet() {
+	void readsEmptyEnumSet() {
 
 		org.bson.Document source = new org.bson.Document("enumSet", Collections.emptyList());
 
@@ -1772,7 +1946,7 @@ public void readsEmptyEnumSet() {
 	}
 
 	@Test // DATAMONGO-1757
-	public void failsReadingDocumentIntoSimpleType() {
+	void failsReadingDocumentIntoSimpleType() {
 
 		org.bson.Document nested = new org.bson.Document("key", "value");
 		org.bson.Document source = new org.bson.Document("map", new org.bson.Document("key", nested));
@@ -1782,7 +1956,7 @@ public void failsReadingDocumentIntoSimpleType() {
 	}
 
 	@Test // DATAMONGO-1831
-	public void shouldConvertArrayInConstructorCorrectly() {
+	void shouldConvertArrayInConstructorCorrectly() {
 
 		org.bson.Document source = new org.bson.Document("array", Collections.emptyList());
 
@@ -1790,7 +1964,7 @@ public void shouldConvertArrayInConstructorCorrectly() {
 	}
 
 	@Test // DATAMONGO-1831
-	public void shouldConvertNullForArrayInConstructorCorrectly() {
+	void shouldConvertNullForArrayInConstructorCorrectly() {
 
 		org.bson.Document source = new org.bson.Document();
 
@@ -1798,7 +1972,7 @@ public void shouldConvertNullForArrayInConstructorCorrectly() {
 	}
 
 	@Test // DATAMONGO-1898
-	public void writesInterfaceBackedEnumsToSimpleNameByDefault() {
+	void writesInterfaceBackedEnumsToSimpleNameByDefault() {
 
 		org.bson.Document document = new org.bson.Document();
 
@@ -1814,7 +1988,7 @@ public void writesInterfaceBackedEnumsToSimpleNameByDefault() {
 	}
 
 	@Test // DATAMONGO-1898
-	public void rejectsConversionFromStringToEnumBackedInterface() {
+	void rejectsConversionFromStringToEnumBackedInterface() {
 
 		org.bson.Document document = new org.bson.Document("property", InterfacedEnum.INSTANCE.name());
 
@@ -1823,7 +1997,7 @@ public void rejectsConversionFromStringToEnumBackedInterface() {
 	}
 
 	@Test // DATAMONGO-1898
-	public void readsInterfacedEnumIfConverterIsRegistered() {
+	void readsInterfacedEnumIfConverterIsRegistered() {
 
 		org.bson.Document document = new org.bson.Document("property", InterfacedEnum.INSTANCE.name());
 
@@ -1835,7 +2009,7 @@ public SomeInterface convert(String source) {
 			}
 		};
 
-		converter.setCustomConversions(new MongoCustomConversions(Arrays.asList(enumConverter)));
+		converter.setCustomConversions(new MongoCustomConversions(Collections.singletonList(enumConverter)));
 		converter.afterPropertiesSet();
 
 		DocWithInterfacedEnum result = converter.read(DocWithInterfacedEnum.class, document);
@@ -1844,20 +2018,19 @@ public SomeInterface convert(String source) {
 	}
 
 	@Test // DATAMONGO-1904
-	public void readsNestedArraysCorrectly() {
+	void readsNestedArraysCorrectly() {
 
-		List<List<List<Float>>> floats = Arrays.asList(Arrays.asList(Arrays.asList(1.0f, 2.0f)));
+		List<List<List<Float>>> floats = Collections.singletonList(Collections.singletonList(Arrays.asList(1.0f, 2.0f)));
 
 		org.bson.Document document = new org.bson.Document("nestedFloats", floats);
 
 		WithNestedLists result = converter.read(WithNestedLists.class, document);
 
-		assertThat(result.nestedFloats).hasSize(1);
-		assertThat(result.nestedFloats).isEqualTo(new float[][][] { { { 1.0f, 2.0f } } });
+		assertThat(result.nestedFloats).hasDimensions(1, 1).isEqualTo(new float[][][] { { { 1.0f, 2.0f } } });
 	}
 
 	@Test // DATAMONGO-1992
-	public void readsImmutableObjectCorrectly() {
+	void readsImmutableObjectCorrectly() {
 
 		org.bson.Document document = new org.bson.Document("_id", "foo");
 
@@ -1868,7 +2041,7 @@ public void readsImmutableObjectCorrectly() {
 	}
 
 	@Test // DATAMONGO-2026
-	public void readsImmutableObjectWithConstructorIdPropertyCorrectly() {
+	void readsImmutableObjectWithConstructorIdPropertyCorrectly() {
 
 		org.bson.Document source = new org.bson.Document("_id", "spring").append("value", "data");
 
@@ -1880,7 +2053,7 @@ public void readsImmutableObjectWithConstructorIdPropertyCorrectly() {
 	}
 
 	@Test // DATAMONGO-2011
-	public void readsNestedListsToObjectCorrectly() {
+	void readsNestedListsToObjectCorrectly() {
 
 		List<String> values = Arrays.asList("ONE", "TWO");
 		org.bson.Document source = new org.bson.Document("value", Collections.singletonList(values));
@@ -1889,7 +2062,7 @@ public void readsNestedListsToObjectCorrectly() {
 	}
 
 	@Test // DATAMONGO-2043
-	public void omitsTypeHintWhenWritingSimpleTypes() {
+	void omitsTypeHintWhenWritingSimpleTypes() {
 
 		org.bson.Document target = new org.bson.Document();
 		converter.write(new org.bson.Document("value", "FitzChivalry"), target);
@@ -1898,28 +2071,28 @@ public void omitsTypeHintWhenWritingSimpleTypes() {
 	}
 
 	@Test // DATAMONGO-1798
-	public void convertStringIdThatIsAnObjectIdHexToObjectIdIfTargetIsObjectId() {
+	void convertStringIdThatIsAnObjectIdHexToObjectIdIfTargetIsObjectId() {
 
 		ObjectId source = new ObjectId();
 		assertThat(converter.convertId(source.toHexString(), ObjectId.class)).isEqualTo(source);
 	}
 
 	@Test // DATAMONGO-1798
-	public void donNotConvertStringIdThatIsAnObjectIdHexToObjectIdIfTargetIsString() {
+	void donNotConvertStringIdThatIsAnObjectIdHexToObjectIdIfTargetIsString() {
 
 		ObjectId source = new ObjectId();
 		assertThat(converter.convertId(source.toHexString(), String.class)).isEqualTo(source.toHexString());
 	}
 
 	@Test // DATAMONGO-1798
-	public void donNotConvertStringIdThatIsAnObjectIdHexToObjectIdIfTargetIsObject() {
+	void donNotConvertStringIdThatIsAnObjectIdHexToObjectIdIfTargetIsObject() {
 
 		ObjectId source = new ObjectId();
 		assertThat(converter.convertId(source.toHexString(), Object.class)).isEqualTo(source.toHexString());
 	}
 
 	@Test // DATAMONGO-2135
-	public void addsEqualObjectsToCollection() {
+	void addsEqualObjectsToCollection() {
 
 		org.bson.Document itemDocument = new org.bson.Document("itemKey", "123");
 		org.bson.Document orderDocument = new org.bson.Document("items",
@@ -1931,7 +2104,7 @@ public void addsEqualObjectsToCollection() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void mapsValueToExplicitTargetType() {
+	void mapsValueToExplicitTargetType() {
 
 		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
 		source.script = "if (a > b) a else b";
@@ -1943,7 +2116,7 @@ public void mapsValueToExplicitTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void readsScriptAsStringWhenAnnotatedWithFieldTargetType() {
+	void readsScriptAsStringWhenAnnotatedWithFieldTargetType() {
 
 		String reference = "if (a > b) a else b";
 		WithExplicitTargetTypes target = converter.read(WithExplicitTargetTypes.class,
@@ -1953,7 +2126,7 @@ public void readsScriptAsStringWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void mapsCollectionValueToExplicitTargetType() {
+	void mapsCollectionValueToExplicitTargetType() {
 
 		String script = "if (a > b) a else b";
 		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
@@ -1966,7 +2139,7 @@ public void mapsCollectionValueToExplicitTargetType() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void mapsBigDecimalToDecimal128WhenAnnotatedWithFieldTargetType() {
+	void mapsBigDecimalToDecimal128WhenAnnotatedWithFieldTargetType() {
 
 		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
 		source.bigDecimal = BigDecimal.valueOf(3.14159D);
@@ -1978,7 +2151,7 @@ public void mapsBigDecimalToDecimal128WhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void mapsDateToLongWhenAnnotatedWithFieldTargetType() {
+	void mapsDateToLongWhenAnnotatedWithFieldTargetType() {
 
 		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
 		source.dateAsLong = new Date();
@@ -1990,7 +2163,7 @@ public void mapsDateToLongWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void readsLongAsDateWhenAnnotatedWithFieldTargetType() {
+	void readsLongAsDateWhenAnnotatedWithFieldTargetType() {
 
 		Date reference = new Date();
 		WithExplicitTargetTypes target = converter.read(WithExplicitTargetTypes.class,
@@ -2000,7 +2173,7 @@ public void readsLongAsDateWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void mapsLongToDateWhenAnnotatedWithFieldTargetType() {
+	void mapsLongToDateWhenAnnotatedWithFieldTargetType() {
 
 		Date date = new Date();
 		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
@@ -2013,7 +2186,7 @@ public void mapsLongToDateWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void readsDateAsLongWhenAnnotatedWithFieldTargetType() {
+	void readsDateAsLongWhenAnnotatedWithFieldTargetType() {
 
 		Date reference = new Date();
 		WithExplicitTargetTypes target = converter.read(WithExplicitTargetTypes.class,
@@ -2023,7 +2196,7 @@ public void readsDateAsLongWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void mapsStringAsBooleanWhenAnnotatedWithFieldTargetType() {
+	void mapsStringAsBooleanWhenAnnotatedWithFieldTargetType() {
 
 		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
 		source.stringAsBoolean = "true";
@@ -2035,7 +2208,7 @@ public void mapsStringAsBooleanWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void readsBooleanAsStringWhenAnnotatedWithFieldTargetType() {
+	void readsBooleanAsStringWhenAnnotatedWithFieldTargetType() {
 
 		WithExplicitTargetTypes target = converter.read(WithExplicitTargetTypes.class,
 				new org.bson.Document("stringAsBoolean", true));
@@ -2044,7 +2217,7 @@ public void readsBooleanAsStringWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void mapsDateAsObjectIdWhenAnnotatedWithFieldTargetType() {
+	void mapsDateAsObjectIdWhenAnnotatedWithFieldTargetType() {
 
 		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
 		source.dateAsObjectId = new Date();
@@ -2058,7 +2231,7 @@ public void mapsDateAsObjectIdWhenAnnotatedWithFieldTargetType() {
 	}
 
 	@Test // DATAMONGO-2328
-	public void readsObjectIdAsDateWhenAnnotatedWithFieldTargetType() {
+	void readsObjectIdAsDateWhenAnnotatedWithFieldTargetType() {
 
 		ObjectId reference = new ObjectId();
 		WithExplicitTargetTypes target = converter.read(WithExplicitTargetTypes.class,
@@ -2067,466 +2240,2421 @@ public void readsObjectIdAsDateWhenAnnotatedWithFieldTargetType() {
 		assertThat(target.dateAsObjectId).isEqualTo(new Date(reference.getTimestamp()));
 	}
 
-	static class GenericType<T> {
-		T content;
-	}
+	@Test // DATAMONGO-2410
+	void shouldAllowReadingBackDbObject() {
 
-	static class ClassWithEnumProperty {
+		assertThat(converter.read(BasicDBObject.class, new org.bson.Document("property", "value")))
+				.isEqualTo(new BasicDBObject("property", "value"));
+		assertThat(converter.read(DBObject.class, new org.bson.Document("property", "value")))
+				.isEqualTo(new BasicDBObject("property", "value"));
+	}
 
-		SampleEnum sampleEnum;
-		List<SampleEnum> enums;
-		EnumSet<SampleEnum> enumSet;
-		EnumMap<SampleEnum, String> enumMap;
+	@Test // DATAMONGO-2479
+	void entityCallbacksAreNotSetByDefault() {
+		assertThat(ReflectionTestUtils.getField(converter, "entityCallbacks")).isNull();
 	}
 
-	enum SampleEnum {
-		FIRST {
-			@Override
-			void method() {}
-		},
-		SECOND {
-			@Override
-			void method() {}
-		};
+	@Test // DATAMONGO-2479
+	void entityCallbacksShouldBeInitiatedOnSettingApplicationContext() {
 
-		abstract void method();
+		ApplicationContext ctx = new StaticApplicationContext();
+		converter.setApplicationContext(ctx);
+
+		assertThat(ReflectionTestUtils.getField(converter, "entityCallbacks")).isNotNull();
 	}
 
-	interface InterfaceType {
+	@Test // DATAMONGO-2479
+	void setterForEntityCallbackOverridesContextInitializedOnes() {
 
-	}
+		ApplicationContext ctx = new StaticApplicationContext();
+		converter.setApplicationContext(ctx);
 
-	static class Address implements InterfaceType {
-		String street;
-		String city;
+		EntityCallbacks callbacks = EntityCallbacks.create();
+		converter.setEntityCallbacks(callbacks);
+
+		assertThat(ReflectionTestUtils.getField(converter, "entityCallbacks")).isSameAs(callbacks);
 	}
 
-	interface Contact {
+	@Test // DATAMONGO-2479
+	void setterForApplicationContextShouldNotOverrideAlreadySetEntityCallbacks() {
 
-	}
+		EntityCallbacks callbacks = EntityCallbacks.create();
+		ApplicationContext ctx = new StaticApplicationContext();
 
-	static class Person implements Contact {
+		converter.setEntityCallbacks(callbacks);
+		converter.setApplicationContext(ctx);
 
-		@Id String id;
+		assertThat(ReflectionTestUtils.getField(converter, "entityCallbacks")).isSameAs(callbacks);
+	}
 
-		LocalDate birthDate;
+	@Test // DATAMONGO-2479
+	void resolveDBRefMapValueShouldInvokeCallbacks() {
 
-		@Field("foo") String firstname;
-		String lastname;
+		AfterConvertCallback<Person> afterConvertCallback = spy(new ReturningAfterConvertCallback());
+		converter.setEntityCallbacks(EntityCallbacks.create(afterConvertCallback));
 
-		Set<Address> addresses;
+		when(resolver.fetch(Mockito.any(DBRef.class))).thenReturn(new org.bson.Document());
+		DBRef dbRef = mock(DBRef.class);
 
-		public Person() {
+		org.bson.Document refMap = new org.bson.Document("foo", dbRef);
+		org.bson.Document document = new org.bson.Document("personMap", refMap);
 
-		}
+		DBRefWrapper result = converter.read(DBRefWrapper.class, document);
 
-		@PersistenceConstructor
-		public Person(Set<Address> addresses) {
-			this.addresses = addresses;
-		}
+		verify(afterConvertCallback).onAfterConvert(eq(result.personMap.get("foo")), eq(new org.bson.Document()), any());
 	}
 
-	static class ClassWithSortedMap {
-		SortedMap<String, String> map;
-	}
+	@Test // DATAMONGO-2300
+	void readAndConvertDBRefNestedByMapCorrectly() {
 
-	static class ClassWithMapProperty {
-		Map<Locale, String> map;
-		Map<String, List<String>> mapOfLists;
-		Map<String, Object> mapOfObjects;
-		Map<String, String[]> mapOfStrings;
-		Map<String, Person> mapOfPersons;
-		TreeMap<String, Person> treeMapOfPersons;
-	}
+		org.bson.Document cluster = new org.bson.Document("_id", 100L);
+		DBRef dbRef = new DBRef("clusters", 100L);
 
-	static class ClassWithNestedMaps {
-		Map<String, Map<String, Map<String, String>>> nestedMaps;
-	}
+		org.bson.Document data = new org.bson.Document("_id", 3L);
+		data.append("cluster", dbRef);
 
-	static class BirthDateContainer {
-		LocalDate birthDate;
-	}
+		MappingMongoConverter spyConverter = spy(converter);
+		Mockito.doReturn(cluster).when(spyConverter).readRef(dbRef);
 
-	static class BigDecimalContainer {
-		BigDecimal value;
-		Map<String, BigDecimal> map;
-		List<BigDecimal> collection;
-	}
+		Map<Object, Object> result = spyConverter.readMap(spyConverter.getConversionContext(ObjectPath.ROOT), data,
+				TypeInformation.MAP);
 
-	static class CollectionWrapper {
-		List<Contact> contacts;
-		List<List<String>> strings;
-		List<Map<String, Locale>> listOfMaps;
-		Set<Contact> contactsSet;
+		assertThat(((Map) result.get("cluster")).get("_id")).isEqualTo(100L);
 	}
 
-	static class LocaleWrapper {
-		Locale locale;
-	}
+	@Test // GH-3546
+	void readFlattensNestedDocumentToStringIfNecessary() {
 
-	static class ClassWithBigIntegerId {
-		@Id BigInteger id;
+		org.bson.Document source = new org.bson.Document("s",
+				new org.bson.Document("json", "string").append("_id", UUID.randomUUID()));
+
+		Address target = converter.read(Address.class, source);
+		assertThat(target.street).isNotNull();
 	}
 
-	static class A<T> {
+	@Test // DATAMONGO-1902
+	void writeFlattensUnwrappedType() {
 
-		String valueType;
-		T value;
+		WithNullableUnwrapped source = new WithNullableUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = new EmbeddableType();
+		source.embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		source.embeddableValue.stringValue = "string-val";
+		source.embeddableValue.transientValue = "must-not-be-written";
+		source.embeddableValue.atFieldAnnotatedValue = "@Field";
 
-		public A(T value) {
-			this.valueType = value.getClass().getName();
-			this.value = value;
-		}
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThat(target).containsEntry("_id", "id-1") //
+				.containsEntry("stringValue", "string-val") //
+				.containsEntry("listValue", Arrays.asList("list-val-1", "list-val-2")) //
+				.containsEntry("with-at-field-annotation", "@Field") //
+				.doesNotContainKey("embeddableValue") //
+				.doesNotContainKey("transientValue");
 	}
 
-	static class ClassWithIntId {
+	@Test // DATAMONGO-1902
+	void writePrefixesUnwrappedType() {
 
-		@Id int id;
+		WithPrefixedNullableUnwrapped source = new WithPrefixedNullableUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = new EmbeddableType();
+		source.embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		source.embeddableValue.stringValue = "string-val";
+		source.embeddableValue.transientValue = "must-not-be-written";
+		source.embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThat(target).containsEntry("_id", "id-1") //
+				.containsEntry("prefix-stringValue", "string-val") //
+				.containsEntry("prefix-listValue", Arrays.asList("list-val-1", "list-val-2")) //
+				.containsEntry("prefix-with-at-field-annotation", "@Field") //
+				.doesNotContainKey("embeddableValue") //
+				.doesNotContainKey("transientValue") //
+				.doesNotContainKey("prefix-transientValue");
 	}
 
-	static class DefaultedConstructorArgument {
+	@Test // DATAMONGO-1902
+	void writeNullUnwrappedType() {
 
-		String foo;
-		int bar;
-		double foobar;
+		WithNullableUnwrapped source = new WithNullableUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = null;
 
-		DefaultedConstructorArgument(String foo, @Value("#root.something ?: -1") int bar, double foobar) {
-			this.foo = foo;
-			this.bar = bar;
-			this.foobar = foobar;
-		}
-	}
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
 
-	static class Item {
-		List<Attribute> attributes;
+		assertThat(target) //
+				.doesNotContainKey("prefix-stringValue").doesNotContainKey("prefix-listValue")
+				.doesNotContainKey("embeddableValue");
 	}
 
-	static class Attribute {
-		String key;
-		Object value;
-	}
+	@Test // DATAMONGO-1902
+	void writeDeepNestedUnwrappedType() {
 
-	static class Outer {
+		WrapperAroundWithUnwrapped source = new WrapperAroundWithUnwrapped();
+		source.someValue = "root-level-value";
+		source.nullableEmbedded = new WithNullableUnwrapped();
+		source.nullableEmbedded.id = "id-1";
+		source.nullableEmbedded.embeddableValue = new EmbeddableType();
+		source.nullableEmbedded.embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		source.nullableEmbedded.embeddableValue.stringValue = "string-val";
+		source.nullableEmbedded.embeddableValue.transientValue = "must-not-be-written";
+		source.nullableEmbedded.embeddableValue.atFieldAnnotatedValue = "@Field";
 
-		class Inner {
-			String value;
-		}
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
 
-		Inner inner;
+		assertThat(target).containsEntry("someValue", "root-level-value") //
+				.containsEntry("nullableEmbedded", new org.bson.Document("_id", "id-1").append("stringValue", "string-val") //
+						.append("listValue", Arrays.asList("list-val-1", "list-val-2")) //
+						.append("with-at-field-annotation", "@Field")); //
 	}
 
-	static class DBRefWrapper {
+	@Test // DATAMONGO-1902
+	void readUnwrappedType() {
 
-		DBRef ref;
-		List<DBRef> refs;
-		Map<String, DBRef> refMap;
-		Map<String, Person> personMap;
-	}
+		org.bson.Document source = new org.bson.Document("_id", "id-1") //
+				.append("stringValue", "string-val") //
+				.append("listValue", Arrays.asList("list-val-1", "list-val-2")) //
+				.append("with-at-field-annotation", "@Field");
 
-	static class URLWrapper {
-		URL url;
+		EmbeddableType embeddableValue = new EmbeddableType();
+		embeddableValue.stringValue = "string-val";
+		embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		WithNullableUnwrapped target = converter.read(WithNullableUnwrapped.class, source);
+		assertThat(target.embeddableValue).isEqualTo(embeddableValue);
 	}
 
-	static class ClassWithComplexId {
+	@Test // DATAMONGO-1902
+	void readPrefixedUnwrappedType() {
 
-		@Id ComplexId complexId;
-	}
+		org.bson.Document source = new org.bson.Document("_id", "id-1") //
+				.append("prefix-stringValue", "string-val") //
+				.append("prefix-listValue", Arrays.asList("list-val-1", "list-val-2")) //
+				.append("prefix-with-at-field-annotation", "@Field");
 
-	static class ComplexId {
-		Long innerId;
+		EmbeddableType embeddableValue = new EmbeddableType();
+		embeddableValue.stringValue = "string-val";
+		embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		WithPrefixedNullableUnwrapped target = converter.read(WithPrefixedNullableUnwrapped.class, source);
+		assertThat(target.embeddableValue).isEqualTo(embeddableValue);
 	}
 
-	static class TypWithCollectionConstructor {
+	@Test // DATAMONGO-1902
+	void readNullableUnwrappedTypeWhenSourceDoesNotContainValues() {
 
-		List<Attribute> attributes;
+		org.bson.Document source = new org.bson.Document("_id", "id-1");
 
-		public TypWithCollectionConstructor(List<Attribute> attributes) {
-			this.attributes = attributes;
-		}
+		WithNullableUnwrapped target = converter.read(WithNullableUnwrapped.class, source);
+		assertThat(target.embeddableValue).isNull();
 	}
 
-	@TypeAlias("_")
-	static class Aliased {
-		String name;
-	}
+	@Test // DATAMONGO-1902
+	void readEmptyUnwrappedTypeWhenSourceDoesNotContainValues() {
 
-	static class ThrowableWrapper {
+		org.bson.Document source = new org.bson.Document("_id", "id-1");
 
-		Throwable throwable;
+		WithEmptyUnwrappedType target = converter.read(WithEmptyUnwrappedType.class, source);
+		assertThat(target.embeddableValue).isNotNull();
 	}
 
-	@Document
-	static class PrimitiveContainer {
+	@Test // DATAMONGO-1902
+	void readDeepNestedUnwrappedType() {
 
-		@Field("property") private int m_property;
+		org.bson.Document source = new org.bson.Document("someValue", "root-level-value").append("nullableEmbedded",
+				new org.bson.Document("_id", "id-1").append("stringValue", "string-val") //
+						.append("listValue", Arrays.asList("list-val-1", "list-val-2")) //
+						.append("with-at-field-annotation", "@Field"));
 
-		@PersistenceConstructor
-		public PrimitiveContainer(@Value("#root.property") int a_property) {
-			m_property = a_property;
-		}
+		WrapperAroundWithUnwrapped target = converter.read(WrapperAroundWithUnwrapped.class, source);
 
-		public int property() {
-			return m_property;
-		}
+		EmbeddableType embeddableValue = new EmbeddableType();
+		embeddableValue.stringValue = "string-val";
+		embeddableValue.listValue = Arrays.asList("list-val-1", "list-val-2");
+		embeddableValue.atFieldAnnotatedValue = "@Field";
+
+		assertThat(target.someValue).isEqualTo("root-level-value");
+		assertThat(target.nullableEmbedded).isNotNull();
+		assertThat(target.nullableEmbedded.embeddableValue).isEqualTo(embeddableValue);
 	}
 
-	@Document
-	static class ObjectContainer {
+	@Test // DATAMONGO-1902
+	void readUnwrappedTypeWithComplexValue() {
 
-		@Field("property") private PrimitiveContainer m_property;
+		org.bson.Document source = new org.bson.Document("_id", "id-1").append("address",
+				new org.bson.Document("s", "1007 Mountain Drive").append("city", "Gotham"));
 
-		@PersistenceConstructor
-		public ObjectContainer(@Value("#root.property") PrimitiveContainer a_property) {
-			m_property = a_property;
-		}
+		WithNullableUnwrapped target = converter.read(WithNullableUnwrapped.class, source);
 
-		public PrimitiveContainer property() {
-			return m_property;
-		}
+		Address expected = new Address();
+		expected.city = "Gotham";
+		expected.street = "1007 Mountain Drive";
+
+		assertThat(target.embeddableValue.address) //
+				.isEqualTo(expected);
 	}
 
-	class ClassWithGeoBox {
+	@Test // GH-4491
+	void readUnwrappedTypeWithComplexValueUsingConstructor() {
 
-		Box box;
-	}
+		org.bson.Document source = new org.bson.Document("_id", "id-1").append("stringValue", "hello").append("address",
+				new org.bson.Document("s", "1007 Mountain Drive").append("city", "Gotham"));
 
-	class ClassWithGeoCircle {
+		WithUnwrappedConstructor target = converter.read(WithUnwrappedConstructor.class, source);
 
-		Circle circle;
+		Address expected = new Address();
+		expected.city = "Gotham";
+		expected.street = "1007 Mountain Drive";
+
+		assertThat(target.embeddableValue.stringValue) //
+				.isEqualTo("hello");
+		assertThat(target.embeddableValue.address) //
+				.isEqualTo(expected);
 	}
 
-	class ClassWithGeoSphere {
+	@Test // GH-4491
+	void readUnwrappedTypeWithComplexValueUsingConstructorWhenUnwrappedPropertiesNotPresent() {
 
-		Sphere sphere;
+		org.bson.Document source = new org.bson.Document("_id", "id-1");
+
+		WithUnwrappedConstructor target = converter.read(WithUnwrappedConstructor.class, source);
+
+		assertThat(target.id).isEqualTo("id-1");
+		assertThat(target.embeddableValue).isNotNull(); // it's defined as Empty
+		assertThat(target.embeddableValue.stringValue) //
+				.isNull();
+		assertThat(target.embeddableValue.address) //
+				.isNull();
+	}
+
+	@Test // DATAMONGO-1902
+	void writeUnwrappedTypeWithComplexValue() {
+
+		WithNullableUnwrapped source = new WithNullableUnwrapped();
+		source.id = "id-1";
+		source.embeddableValue = new EmbeddableType();
+		source.embeddableValue.address = new Address();
+		source.embeddableValue.address.city = "Gotham";
+		source.embeddableValue.address.street = "1007 Mountain Drive";
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThat(target) //
+				.containsEntry("address", new org.bson.Document("s", "1007 Mountain Drive").append("city", "Gotham")) //
+				.doesNotContainKey("street") //
+				.doesNotContainKey("city"); //
+
+		// use exact key matching, do not dive into nested documents
+		Assertions.assertThat(target) //
+				.doesNotContainKey("address.s") //
+				.doesNotContainKey("address.city");
+	}
+
+	@Test // GH-3580
+	void shouldFallbackToConfiguredCustomConversionTargetOnRead() {
+
+		GenericTypeConverter genericTypeConverter = spy(new GenericTypeConverter());
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(genericTypeConverter);
+		}));
+		converter.afterPropertiesSet();
+
+		org.bson.Document source = new org.bson.Document("_class", SubTypeOfGenericType.class.getName()).append("value",
+				"v1");
+		GenericType target = converter.read(GenericType.class, source);
+
+		assertThat(target).isInstanceOf(GenericType.class);
+		assertThat(target.content).isEqualTo("v1");
+
+		verify(genericTypeConverter).convert(eq(source));
+	}
+
+	@Test // GH-3580
+	void shouldUseMostConcreteCustomConversionTargetOnRead() {
+
+		GenericTypeConverter genericTypeConverter = spy(new GenericTypeConverter());
+		SubTypeOfGenericTypeConverter subTypeOfGenericTypeConverter = spy(new SubTypeOfGenericTypeConverter());
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(genericTypeConverter);
+			it.registerConverter(subTypeOfGenericTypeConverter);
+		}));
+		converter.afterPropertiesSet();
+
+		org.bson.Document source = new org.bson.Document("_class", SubTypeOfGenericType.class.getName()).append("value",
+				"v1");
+		GenericType target = converter.read(GenericType.class, source);
+
+		assertThat(target).isInstanceOf(SubTypeOfGenericType.class);
+		assertThat(target.content).isEqualTo("v1_s");
+
+		verify(genericTypeConverter, never()).convert(any());
+		verify(subTypeOfGenericTypeConverter).convert(eq(source));
+	}
+
+	@Test // GH-3660
+	void usesCustomConverterForMapTypesOnWrite() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(new TypeImplementingMapToDocumentConverter());
+		}));
+		converter.afterPropertiesSet();
+
+		TypeImplementingMap source = new TypeImplementingMap("one", 2);
+		org.bson.Document target = new org.bson.Document();
+
+		converter.write(source, target);
+
+		assertThat(target).containsEntry("1st", "one").containsEntry("2nd", 2);
+	}
+
+	@Test // GH-3660
+	void usesCustomConverterForTypesImplementingMapOnWrite() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(new TypeImplementingMapToDocumentConverter());
+		}));
+		converter.afterPropertiesSet();
+
+		TypeImplementingMap source = new TypeImplementingMap("one", 2);
+		org.bson.Document target = new org.bson.Document();
+
+		converter.write(source, target);
+
+		assertThat(target).containsEntry("1st", "one").containsEntry("2nd", 2);
+	}
+
+	@Test // GH-3660
+	void usesCustomConverterForTypesImplementingMapOnRead() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(new DocumentToTypeImplementingMapConverter());
+		}));
+		converter.afterPropertiesSet();
+
+		org.bson.Document source = new org.bson.Document("1st", "one").append("2nd", 2).append("_class",
+				TypeImplementingMap.class.getName());
+
+		TypeImplementingMap target = converter.read(TypeImplementingMap.class, source);
+
+		assertThat(target).isEqualTo(new TypeImplementingMap("one", 2));
+	}
+
+	@Test // GH-3660
+	void usesCustomConverterForPropertiesUsingTypesThatImplementMapOnWrite() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(new TypeImplementingMapToDocumentConverter());
+		}));
+		converter.afterPropertiesSet();
+
+		TypeWrappingTypeImplementingMap source = new TypeWrappingTypeImplementingMap();
+		source.typeImplementingMap = new TypeImplementingMap("one", 2);
+		org.bson.Document target = new org.bson.Document();
+
+		converter.write(source, target);
+
+		assertThat(target).containsEntry("typeImplementingMap", new org.bson.Document("1st", "one").append("2nd", 2));
+	}
+
+	@Test // GH-3660
+	void usesCustomConverterForPropertiesUsingTypesImplementingMapOnRead() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(new DocumentToTypeImplementingMapConverter());
+		}));
+		converter.afterPropertiesSet();
+
+		org.bson.Document source = new org.bson.Document("typeImplementingMap",
+				new org.bson.Document("1st", "one").append("2nd", 2))
+				.append("_class", TypeWrappingTypeImplementingMap.class.getName());
+
+		TypeWrappingTypeImplementingMap target = converter.read(TypeWrappingTypeImplementingMap.class, source);
+
+		assertThat(target.typeImplementingMap).isEqualTo(new TypeImplementingMap("one", 2));
+	}
+
+	@Test // GH-3407
+	void shouldWriteNullPropertyCorrectly() {
+
+		WithFieldWrite fieldWrite = new WithFieldWrite();
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(fieldWrite, document);
+
+		assertThat(document).containsEntry("writeAlways", null).doesNotContainKey("writeNonNull");
+		assertThat(document).containsEntry("writeAlwaysPersonDBRef", null).doesNotContainKey("writeNonNullPersonDBRef");
+	}
+
+	@Test // GH-4710
+	void shouldWriteSimplePropertyCorrectlyAfterConversionReturnsNull() {
+
+		MongoCustomConversions conversions = new MongoCustomConversions(ConverterBuilder
+				.writing(Integer.class, String.class, it -> null).andReading(it -> null).getConverters().stream().toList());
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(conversions);
+		converter.afterPropertiesSet();
+
+		WithFieldWrite fieldWrite = new WithFieldWrite();
+		fieldWrite.writeAlways = 10;
+		fieldWrite.writeNonNull = 20;
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(fieldWrite, document);
+
+		assertThat(document).containsEntry("writeAlways", null).doesNotContainKey("writeNonNull");
+	}
+
+	@Test // GH-4710
+	void shouldWriteComplexPropertyCorrectlyAfterConversionReturnsNull() {
+
+		MongoCustomConversions conversions = new MongoCustomConversions(ConverterBuilder
+				.writing(Person.class, String.class, it -> null).andReading(it -> null).getConverters().stream().toList());
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(conversions);
+		converter.afterPropertiesSet();
+
+		WithFieldWrite fieldWrite = new WithFieldWrite();
+		fieldWrite.writeAlwaysPerson = new Person();
+		fieldWrite.writeNonNullPerson = new Person();
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(fieldWrite, document);
+
+		assertThat(document).containsEntry("writeAlwaysPerson", null).doesNotContainKey("writeNonNullPerson");
+	}
+
+	@Test // GH-4710
+	void shouldDelegateWriteOfDBRefToCustomConversionIfConfigured() {
+
+		MongoCustomConversions conversions = new MongoCustomConversions(
+				ConverterBuilder.writing(Person.class, DBRef.class, it -> new DBRef("persons", "n/a")).andReading(it -> null)
+						.getConverters().stream().toList());
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(conversions);
+		converter.afterPropertiesSet();
+
+		WithFieldWrite fieldWrite = new WithFieldWrite();
+		fieldWrite.writeAlwaysPersonDBRef = new Person();
+		fieldWrite.writeNonNullPersonDBRef = new Person();
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(fieldWrite, document);
+
+		assertThat(document).containsEntry("writeAlwaysPersonDBRef", new DBRef("persons", "n/a"));// .doesNotContainKey("writeNonNullPersonDBRef");
+	}
+
+	@Test // GH-4710
+	void shouldDelegateWriteOfDBRefToCustomConversionIfConfiguredAndCheckNulls() {
+
+		MongoCustomConversions conversions = new MongoCustomConversions(ConverterBuilder
+				.writing(Person.class, DBRef.class, it -> null).andReading(it -> null).getConverters().stream().toList());
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(conversions);
+		converter.afterPropertiesSet();
+
+		WithFieldWrite fieldWrite = new WithFieldWrite();
+		fieldWrite.writeAlwaysPersonDBRef = new Person();
+		fieldWrite.writeNonNullPersonDBRef = new Person();
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(fieldWrite, document);
+
+		assertThat(document).containsEntry("writeAlwaysPersonDBRef", null).doesNotContainKey("writeNonNullPersonDBRef");
+	}
+
+	@Test // GH-4710
+	void shouldApplyNullConversionToPropertyValueConverters() {
+
+		MongoCustomConversions conversions = new MongoCustomConversions(
+				MongoCustomConversions.MongoConverterConfigurationAdapter.from(Collections.emptyList())
+						.configurePropertyConversions(registrar -> {
+							registrar.registerConverter(Person.class, "firstname", new MongoValueConverter<String, String>() {
+								@Override
+								public String readNull(MongoConversionContext context) {
+									return "NULL";
+								}
+
+								@Override
+								public String writeNull(MongoConversionContext context) {
+									return "NULL";
+								}
+
+								@Override
+								public String read(String value, MongoConversionContext context) {
+									return "";
+								}
+
+								@Override
+								public String write(String value, MongoConversionContext context) {
+									return "";
+								}
+							});
+						}));
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(conversions);
+		converter.afterPropertiesSet();
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(new Person(), document);
+
+		assertThat(document).containsEntry("foo", "NULL");
+
+		document = new org.bson.Document("foo", null);
+		Person result = converter.read(Person.class, document);
+
+		assertThat(result.firstname).isEqualTo("NULL");
+	}
+
+	@Test // GH-3686
+	void readsCollectionContainingNullValue() {
+
+		org.bson.Document source = new org.bson.Document("items",
+				Arrays.asList(new org.bson.Document("itemKey", "i1"), null, new org.bson.Document("itemKey", "i3")));
+
+		Order target = converter.read(Order.class, source);
+
+		assertThat(target.items).map(it -> it != null ? it.itemKey : null).containsExactly("i1", null, "i3");
+	}
+
+	@Test // GH-3686
+	void readsArrayContainingNullValue() {
+
+		org.bson.Document source = new org.bson.Document("arrayOfStrings", Arrays.asList("i1", null, "i3"));
+
+		WithArrays target = converter.read(WithArrays.class, source);
+
+		assertThat(target.arrayOfStrings).containsExactly("i1", null, "i3");
+	}
+
+	@Test // GH-3686
+	void readsMapContainingNullValue() {
+
+		org.bson.Document source = new org.bson.Document("mapOfObjects",
+				new org.bson.Document("item1", "i1").append("item2", null).append("item3", "i3"));
+
+		ClassWithMapProperty target = converter.read(ClassWithMapProperty.class, source);
+
+		assertThat(target.mapOfObjects).containsEntry("item1", "i1").containsEntry("item2", null).containsEntry("item3",
+				"i3");
+	}
+
+	@Test // GH-3670
+	void appliesCustomConverterEvenToSimpleTypes() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerConverter(new MongoSimpleTypeConverter());
+		}));
+		converter.afterPropertiesSet();
+
+		org.bson.Document source = new org.bson.Document("content", new Binary(new byte[] { 0x00, 0x42 }));
+
+		GenericType<Object> target = converter.read(GenericType.class, source);
+		assertThat(target.content).isInstanceOf(byte[].class);
+	}
+
+	@Test // GH-3702
+	void readsRawDocument() {
+
+		org.bson.Document source = new org.bson.Document("_id", "id-1").append("raw",
+				new org.bson.Document("simple", 1).append("document", new org.bson.Document("inner-doc", 1)));
+
+		WithRawDocumentProperties target = converter.read(WithRawDocumentProperties.class, source);
+
+		assertThat(target.raw).isInstanceOf(org.bson.Document.class)
+				.isEqualTo(new org.bson.Document("simple", 1).append("document", new org.bson.Document("inner-doc", 1)));
+	}
+
+	@Test // GH-3702
+	void readsListOfRawDocument() {
+
+		org.bson.Document source = new org.bson.Document("_id", "id-1").append("listOfRaw",
+				Arrays.asList(new org.bson.Document("simple", 1).append("document", new org.bson.Document("inner-doc", 1))));
+
+		WithRawDocumentProperties target = converter.read(WithRawDocumentProperties.class, source);
+
+		assertThat(target.listOfRaw)
+				.containsExactly(new org.bson.Document("simple", 1).append("document", new org.bson.Document("inner-doc", 1)));
+	}
+
+	@Test // GH-3692
+	void readsMapThatDoesNotComeAsDocument() {
+
+		org.bson.Document source = new org.bson.Document("_id", "id-1").append("mapOfObjects",
+				Collections.singletonMap("simple", 1));
+
+		ClassWithMapProperty target = converter.read(ClassWithMapProperty.class, source);
+
+		assertThat(target.mapOfObjects).containsEntry("simple", 1);
+	}
+
+	@Test // GH-3851
+	void associationMappingShouldFallBackToDefaultIfNoAtReferenceAnnotationPresent/* as done via jmolecules */() {
+
+		UUID id = UUID.randomUUID();
+		Person sourceValue = new Person();
+		sourceValue.id = id.toString();
+
+		DocumentAccessor accessor = new DocumentAccessor(new org.bson.Document());
+		MongoPersistentProperty persistentProperty = mock(MongoPersistentProperty.class);
+		when(persistentProperty.isAssociation()).thenReturn(true);
+		when(persistentProperty.getMongoField()).thenReturn(MongoField.fromKey("pName"));
+		doReturn(TypeInformation.of(Person.class)).when(persistentProperty).getTypeInformation();
+		doReturn(Person.class).when(persistentProperty).getType();
+		doReturn(Person.class).when(persistentProperty).getRawType();
+
+		converter.writePropertyInternal(sourceValue, accessor, persistentProperty, null);
+
+		assertThat(accessor.getDocument())
+				.isEqualTo(new org.bson.Document("pName", new org.bson.Document("_id", id.toString())));
+	}
+
+	@Test // GH-2860
+	void projectShouldReadSimpleInterfaceProjection() {
+
+		org.bson.Document source = new org.bson.Document("birthDate",
+				Date.from(LocalDate.of(1999, 12, 1).atStartOfDay(systemDefault()).toInstant())).append("foo", "Walter");
+
+		EntityProjectionIntrospector discoverer = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		EntityProjection<PersonProjection, Person> projection = discoverer.introspect(PersonProjection.class, Person.class);
+		PersonProjection person = converter.project(projection, source);
+
+		assertThat(person.getBirthDate()).isEqualTo(LocalDate.of(1999, 12, 1));
+		assertThat(person.getFirstname()).isEqualTo("Walter");
+	}
+
+	@Test // GH-2860
+	void projectShouldReadSimpleDtoProjection() {
+
+		org.bson.Document source = new org.bson.Document("birthDate",
+				Date.from(LocalDate.of(1999, 12, 1).atStartOfDay(systemDefault()).toInstant())).append("foo", "Walter");
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		EntityProjection<PersonDto, Person> projection = introspector.introspect(PersonDto.class, Person.class);
+		PersonDto person = converter.project(projection, source);
+
+		assertThat(person.getBirthDate()).isEqualTo(LocalDate.of(1999, 12, 1));
+		assertThat(person.getFirstname()).isEqualTo("Walter");
+	}
+
+	@Test // GH-2860
+	void projectShouldReadNestedProjection() {
+
+		org.bson.Document source = new org.bson.Document("addresses",
+				Collections.singletonList(new org.bson.Document("s", "hwy")));
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		EntityProjection<WithNestedProjection, Person> projection = introspector.introspect(WithNestedProjection.class,
+				Person.class);
+		WithNestedProjection person = converter.project(projection, source);
+
+		assertThat(person.getAddresses()).extracting(AddressProjection::getStreet).hasSize(1).containsOnly("hwy");
+	}
+
+	@Test // GH-4609
+	void projectShouldReadNestedInterfaceProjection() {
+
+		org.bson.Document source = new org.bson.Document("foo", "spring").append("address",
+				new org.bson.Document("s", "data").append("city", "mongodb"));
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		EntityProjection<WithNestedInterfaceProjection, Person> projection = introspector
+				.introspect(WithNestedInterfaceProjection.class, Person.class);
+		WithNestedInterfaceProjection person = converter.project(projection, source);
+
+		assertThat(person.getFirstname()).isEqualTo("spring");
+		assertThat(person.getAddress().getStreet()).isEqualTo("data");
+	}
+
+	@Test // GH-4609
+	void projectShouldReadNestedDtoProjection() {
+
+		org.bson.Document source = new org.bson.Document("foo", "spring").append("address",
+				new org.bson.Document("s", "data").append("city", "mongodb"));
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		EntityProjection<WithNestedDtoProjection, Person> projection = introspector
+				.introspect(WithNestedDtoProjection.class, Person.class);
+		WithNestedDtoProjection person = converter.project(projection, source);
+
+		assertThat(person.getFirstname()).isEqualTo("spring");
+		assertThat(person.getAddress().getStreet()).isEqualTo("data");
+	}
+
+	@Test // GH-4626
+	void projectShouldReadDtoProjectionPropertiesOnlyOnce() {
+
+		ByteBuffer number = ByteBuffer.allocate(8);
+		number.putDouble(1.2d);
+		number.flip();
+
+		org.bson.Document source = new org.bson.Document("number", number);
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		EntityProjection<DoubleHolderDto, WithDoubleHolder> projection = introspector.introspect(DoubleHolderDto.class,
+				WithDoubleHolder.class);
+		DoubleHolderDto result = converter.project(projection, source);
+
+		assertThat(result.number.number).isCloseTo(1.2, Percentage.withPercentage(1));
+	}
+
+	@Test // GH-2860
+	void projectShouldReadProjectionWithNestedEntity() {
+
+		org.bson.Document source = new org.bson.Document("addresses",
+				Collections.singletonList(new org.bson.Document("s", "hwy")));
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		EntityProjection<ProjectionWithNestedEntity, Person> projection = introspector
+				.introspect(ProjectionWithNestedEntity.class, Person.class);
+		ProjectionWithNestedEntity person = converter.project(projection, source);
+
+		assertThat(person.getAddresses()).extracting(Address::getStreet).hasSize(1).containsOnly("hwy");
+	}
+
+	@Test // GH-3998
+	void shouldReadOpenProjection() {
+
+		org.bson.Document author = new org.bson.Document("firstName", "Walter").append("lastName", "White");
+		org.bson.Document book = new org.bson.Document("_id", "foo").append("name", "my-book").append("author", author);
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		BookProjection projection = converter.project(introspector.introspect(BookProjection.class, Book.class), book);
+
+		assertThat(projection.getName()).isEqualTo("my-book by Walter White");
+	}
+
+	@Test // GH-4120
+	void shouldReadDtoProjection() {
+
+		org.bson.Document author = new org.bson.Document("firstName", "Walter").append("lastName", "White");
+		org.bson.Document book = new org.bson.Document("_id", "foo").append("name", "my-book").append("author", author);
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		AuthorOnly projection = converter.project(introspector.introspect(AuthorOnly.class, Book.class), book);
+
+		assertThat(projection.getAuthor().getFirstName()).isEqualTo("Walter");
+		assertThat(projection.getAuthor().getLastName()).isEqualTo("White");
+	}
+
+	@Test // GH-3596
+	void simpleConverter() {
+
+		WithValueConverters wvc = new WithValueConverters();
+		wvc.converterWithDefaultCtor = "spring";
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(wvc, target);
+
+		assertThat(target).containsEntry("converterWithDefaultCtor", new org.bson.Document("foo", "spring"));
+
+		WithValueConverters read = converter.read(WithValueConverters.class, target);
+		assertThat(read.converterWithDefaultCtor).startsWith("spring");
+	}
+
+	@Test // GH-3596
+	void enumConverter() {
+
+		WithValueConverters wvc = new WithValueConverters();
+		wvc.converterEnum = "spring";
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(wvc, target);
+
+		assertThat(target).containsEntry("converterEnum", new org.bson.Document("bar", "spring"));
+
+		WithValueConverters read = converter.read(WithValueConverters.class, target);
+		assertThat(read.converterEnum).isEqualTo("spring");
+	}
+
+	@Test // GH-3596
+	void beanConverter() {
+
+		DefaultListableBeanFactory defaultListableBeanFactory = new DefaultListableBeanFactory();
+		defaultListableBeanFactory.registerBeanDefinition("someDependency",
+				BeanDefinitionBuilder.rootBeanDefinition(SomeDependency.class).getBeanDefinition());
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+			it.registerPropertyValueConverterFactory(
+					PropertyValueConverterFactory.beanFactoryAware(defaultListableBeanFactory));
+		}));
+		converter.afterPropertiesSet();
+
+		WithContextValueConverters wvc = new WithContextValueConverters();
+		wvc.converterBean = "spring";
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(wvc, target);
+
+		assertThat(target.get("converterBean", org.bson.Document.class)).satisfies(it -> {
+			assertThat(it).containsKey("ooo");
+			assertThat((String) it.get("ooo")).startsWith("spring - ");
+		});
+
+		WithContextValueConverters read = converter.read(WithContextValueConverters.class, target);
+		assertThat(read.converterBean).startsWith("spring -");
+	}
+
+	@Test // GH-3596
+	void pathConfiguredConverter/*no annotation required*/() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+
+		converter.setCustomConversions(MongoCustomConversions.create(it -> {
+
+			it.configurePropertyConversions(registrar -> {
+				registrar.registerConverter(WithValueConverters.class, "viaRegisteredConverter",
+						new PropertyValueConverter<String, org.bson.Document, MongoConversionContext>() {
+
+							@Override
+							public @Nullable String read(org.bson.@Nullable Document nativeValue, MongoConversionContext context) {
+								return nativeValue.getString("bar");
+							}
+
+
+							@Override
+							public org.bson.@Nullable Document write(@Nullable String domainValue, MongoConversionContext context) {
+								return new org.bson.Document("bar", domainValue);
+							}
+						});
+			});
+		}));
+
+		WithValueConverters wvc = new WithValueConverters();
+		wvc.viaRegisteredConverter = "spring";
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(wvc, target);
+
+		assertThat(target).containsEntry("viaRegisteredConverter", new org.bson.Document("bar", "spring"));
+
+		WithValueConverters read = converter.read(WithValueConverters.class, target);
+		assertThat(read.viaRegisteredConverter).isEqualTo("spring");
+	}
+
+	@Test // GH-4098
+	void resolvesCyclicNonAssociationValueFromSource/* and does not attempt to be smart and look up id values in context */() {
+
+		org.bson.Document source = new org.bson.Document("_id", "id-1").append("value", "v1").append("cycle",
+				new org.bson.Document("_id", "id-1").append("value", "v2"));
+
+		assertThat(converter.read(Cyclic.class, source).cycle.value).isEqualTo("v2");
+	}
+
+	@Test // GH-4371
+	void shouldConvertTypesToStringTargetType() {
+
+		org.bson.Document source = org.bson.Document.parse("""
+				{
+				  city : ["Gotham", "Metropolis"]
+				}
+				""");
+
+		assertThat(converter.read(Address.class, source).city).isEqualTo("Gotham,Metropolis");
+	}
+
+	@Test // GH-2350
+	void shouldConvertBsonUndefinedToNull() {
+
+		org.bson.Document source = new org.bson.Document("s", "hallway drive").append("city", new BsonUndefined());
+		assertThat(converter.read(Address.class, source).city).isNull();
+	}
+
+	@Test // GH-4464
+	void shouldNotSplitKeyNamesWithDotOnWriteIfFieldTypeIsKey() {
+
+		WithPropertyHavingDotsInFieldName source = new WithPropertyHavingDotsInFieldName();
+		source.value = "A";
+
+		assertThat(write(source)).containsEntry("field.name.with.dots", "A");
+	}
+
+	@Test // GH-4464
+	void shouldNotSplitKeyNamesWithDotOnReadIfFieldTypeIsKey() {
+
+		org.bson.Document source = new org.bson.Document("field.name.with.dots", "A");
+
+		WithPropertyHavingDotsInFieldName target = converter.read(WithPropertyHavingDotsInFieldName.class, source);
+		assertThat(target.value).isEqualTo("A");
+	}
+
+	@Test // GH-4464
+	void shouldNotSplitKeyNamesWithDotOnWriteOfNestedPropertyIfFieldTypeIsKey() {
+
+		WrapperForTypeWithPropertyHavingDotsInFieldName source = new WrapperForTypeWithPropertyHavingDotsInFieldName();
+		source.nested = new WithPropertyHavingDotsInFieldName();
+		source.nested.value = "A";
+
+		assertThat(write(source).get("nested", org.bson.Document.class)).containsEntry("field.name.with.dots", "A");
+	}
+
+	@Test // GH-4464
+	void shouldNotSplitKeyNamesWithDotOnReadOfNestedIfFieldTypeIsKey() {
+
+		org.bson.Document source = new org.bson.Document("nested", new org.bson.Document("field.name.with.dots", "A"));
+
+		WrapperForTypeWithPropertyHavingDotsInFieldName target = converter
+				.read(WrapperForTypeWithPropertyHavingDotsInFieldName.class, source);
+		assertThat(target.nested).isNotNull();
+		assertThat(target.nested.value).isEqualTo("A");
+	}
+
+	@Test // GH-4464
+	void writeShouldAllowDotsInMapKeyNameIfConfigured() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.preserveMapKeys(true);
+		converter.afterPropertiesSet();
+
+		Person person = new Person();
+		person.firstname = "bart";
+		person.lastname = "simpson";
+
+		ClassWithMapProperty source = new ClassWithMapProperty();
+		source.mapOfPersons = Map.of("map.key.with.dots", person);
+
+		assertThat(write(source).get("mapOfPersons", org.bson.Document.class)).containsKey("map.key.with.dots");
+	}
+
+	@Test // GH-4464
+	void readShouldAllowDotsInMapKeyNameIfConfigured() {
+
+		converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.preserveMapKeys(true);
+		converter.afterPropertiesSet();
+
+		Person person = new Person();
+		person.firstname = "bart";
+		person.lastname = "simpson";
+
+		org.bson.Document source = new org.bson.Document("mapOfPersons",
+				new org.bson.Document("map.key.with.dots", write(person)));
+
+		ClassWithMapProperty target = converter.read(ClassWithMapProperty.class, source);
+
+		assertThat(target.mapOfPersons).containsEntry("map.key.with.dots", person);
+	}
+
+	@ValueSource(classes = { ComplexIdAndNoAnnotation.class, ComplexIdAndIdAnnotation.class,
+			ComplexIdAndMongoIdAnnotation.class, ComplexIdAndFieldAnnotation.class })
+	@ParameterizedTest // GH-4524
+	void projectShouldReadComplexIdType(Class<?> projectionTargetType) {
+
+		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
+				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
+						.and((target, underlyingType) -> !converter.conversions.isSimpleType(target)),
+				mappingContext);
+
+		ComplexId idValue = ComplexId.of(101L);
+		org.bson.Document source = new org.bson.Document("_id", new org.bson.Document("innerId", idValue.innerId))
+				.append("value", "abc").append("_class", ComplexIdAndNoAnnotation.class.getName());
+
+		EntityProjection<?, ComplexIdAndNoAnnotation> projection = introspector.introspect(projectionTargetType,
+				ComplexIdAndNoAnnotation.class);
+
+		assertThat(converter.project(projection, source)) //
+				.isInstanceOf(projectionTargetType) //
+				.extracting("id").isEqualTo(idValue);
+	}
+
+	@Test // GH-4877
+	void shouldReadNonIdFieldCalledIdFromSource() {
+
+		WithRenamedIdPropertyAndAnotherPropertyNamedId source = new WithRenamedIdPropertyAndAnotherPropertyNamedId();
+		source.abc = "actual-id-value";
+		source.id = "just-a-field";
+
+		org.bson.Document document = write(source);
+		assertThat(document).containsEntry("_id", source.abc).containsEntry("id", source.id);
+
+		WithRenamedIdPropertyAndAnotherPropertyNamedId target = converter
+				.read(WithRenamedIdPropertyAndAnotherPropertyNamedId.class, document);
+		assertThat(target.abc).isEqualTo(source.abc);
+		assertThat(target.id).isEqualTo(source.id);
+	}
+
+	@Test // GH-4706
+	void shouldWriteVectorValues() {
+
+		WithVector source = new WithVector();
+		source.embeddings = Vector.of(1.1d, 2.2d, 3.3d);
+
+		org.bson.Document document = write(source);
+		assertThat(document.getList("embeddings", BsonDouble.class)).hasSize(3);
+	}
+
+	@Test // GH-4706
+	void shouldReadVectorValues() {
+
+		org.bson.Document document = new org.bson.Document("embeddings", List.of(1.1d, 2.2d, 3.3d));
+		WithVector withVector = converter.read(WithVector.class, document);
+		assertThat(withVector.embeddings.toDoubleArray()).contains(1.1d, 2.2d, 3.3d);
+	}
+
+	@Test // GH-4706
+	void writesByteArrayAsIsIfNoFieldInstructionsGiven() {
+
+		WithArrays source = new WithArrays();
+		source.arrayOfPrimitiveBytes = new byte[] { 0, 1, 2 };
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThat(target.get("arrayOfPrimitiveBytes", byte[].class)).isSameAs(source.arrayOfPrimitiveBytes);
+	}
+
+	@Test // GH-3444
+	void convertsBigIntegerToDecimal128IfFieldTypeIndicatesConversion() {
+
+		WithExplicitTargetTypes source = new WithExplicitTargetTypes();
+		source.bigInteger = BigInteger.valueOf(101);
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+
+		assertThat(target.get("bigInteger")).isEqualTo(new Decimal128(source.bigInteger.longValueExact()));
+	}
+
+	@Test // GH-3444
+	void usesDecimal128NumericFormat() {
+
+		MappingMongoConverter converter = createConverter(MongoCustomConversions.BigDecimalRepresentation.DECIMAL128);
+
+		BigDecimalContainer container = new BigDecimalContainer();
+		container.value = BigDecimal.valueOf(2.5d);
+		container.map = Collections.singletonMap("foo", container.value);
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(container, document);
+
+		assertThat(document.get("value")).isInstanceOf(Decimal128.class);
+		assertThat(((org.bson.Document) document.get("map")).get("foo")).isInstanceOf(Decimal128.class);
+	}
+
+	@Test // GH-3444
+	void usesStringNumericFormat() {
+
+		MappingMongoConverter converter = createConverter(MongoCustomConversions.BigDecimalRepresentation.STRING);
+
+		BigDecimalContainer container = new BigDecimalContainer();
+		container.value = BigDecimal.valueOf(2.5d);
+		container.map = Collections.singletonMap("foo", container.value);
+
+		org.bson.Document document = new org.bson.Document();
+		converter.write(container, document);
+
+		assertThat(document).containsEntry("value", "2.5");
+		assertThat(document).containsEntry("map.foo", "2.5");
+	}
+
+	private MappingMongoConverter createConverter(
+			MongoCustomConversions.BigDecimalRepresentation bigDecimalRepresentation) {
+
+		MongoCustomConversions conversions = MongoCustomConversions.create(
+				it -> it.registerConverter(new ByteBufferToDoubleHolderConverter()).bigDecimal(bigDecimalRepresentation));
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setApplicationContext(context);
+		mappingContext.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
+		mappingContext.afterPropertiesSet();
+
+		mappingContext.getPersistentEntity(Address.class);
+
+		MappingMongoConverter converter = new MappingMongoConverter(resolver, mappingContext);
+		converter.setCustomConversions(conversions);
+		converter.afterPropertiesSet();
+
+		return converter;
+	}
+
+	org.bson.Document write(Object source) {
+
+		org.bson.Document target = new org.bson.Document();
+		converter.write(source, target);
+		return target;
+	}
+
+	static class WithVector {
+
+		Vector embeddings;
+	}
+
+	static class GenericType<T> {
+		T content;
+	}
+
+	static class ClassWithEnumProperty {
+
+		SampleEnum sampleEnum;
+		List<SampleEnum> enums;
+		EnumSet<SampleEnum> enumSet;
+		EnumMap<SampleEnum, String> enumMap;
+	}
+
+	enum SampleEnum {
+		FIRST {
+			@Override
+			void method() {}
+		},
+		SECOND {
+			@Override
+			void method() {}
+		};
+
+		abstract void method();
+	}
+
+	interface InterfaceType {
+
+	}
+
+	static class Address implements InterfaceType {
+
+		@Field("s") String street;
+		String city;
+
+		public String getStreet() {
+			return street;
+		}
+
+		public String getCity() {
+			return city;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Address address = (Address) o;
+			return Objects.equals(street, address.street) && Objects.equals(city, address.city);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(street, city);
+		}
+	}
+
+	interface Contact {
+
+	}
+
+	static class Person implements Contact {
+
+		@Id String id;
+
+		Date birthDate;
+
+		@Field("foo") String firstname;
+		String lastname;
+
+		Set<Address> addresses;
+		Address address;
+
+		Person() {
+
+		}
+
+		@PersistenceCreator
+		public Person(Set<Address> addresses) {
+			this.addresses = addresses;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(birthDate, person.birthDate)
+					&& Objects.equals(firstname, person.firstname) && Objects.equals(lastname, person.lastname)
+					&& Objects.equals(addresses, person.addresses);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, birthDate, firstname, lastname, addresses);
+		}
+	}
+
+	interface PersonProjection {
+
+		LocalDate getBirthDate();
+
+		String getFirstname();
+	}
+
+	interface WithNestedProjection {
+
+		Set<AddressProjection> getAddresses();
+	}
+
+	interface WithNestedInterfaceProjection {
+		String getFirstname();
+
+		AddressProjection getAddress();
+	}
+
+	interface WithNestedDtoProjection {
+		String getFirstname();
+
+		AddressDto getAddress();
+	}
+
+	interface ProjectionWithNestedEntity {
+
+		Set<Address> getAddresses();
+	}
+
+	interface AddressProjection {
+
+		String getStreet();
+	}
+
+	class AddressDto {
+
+		String street;
+
+		public String getStreet() {
+			return street;
+		}
+
+		public void setStreet(String street) {
+			this.street = street;
+		}
+	}
+
+	static class PersonDto {
+
+		LocalDate birthDate;
+
+		@Field("foo") String firstname;
+		String lastname;
+
+		public PersonDto(LocalDate birthDate, String firstname, String lastname) {
+			this.birthDate = birthDate;
+			this.firstname = firstname;
+			this.lastname = lastname;
+		}
+
+		public LocalDate getBirthDate() {
+			return birthDate;
+		}
+
+		public String getFirstname() {
+			return firstname;
+		}
+
+		public String getLastname() {
+			return lastname;
+		}
+	}
+
+	static class ClassWithSortedMap {
+		SortedMap<String, String> map;
+	}
+
+	static class ClassWithMapProperty {
+		Map<Locale, String> map;
+		Map<String, String> autoInitMap = Collections.singletonMap("spring", "data");
+		Map<String, List<String>> mapOfLists;
+		Map<String, Object> mapOfObjects;
+		Map<String, String[]> mapOfStrings;
+		Map<String, Person> mapOfPersons;
+		TreeMap<String, Person> treeMapOfPersons;
+
+		public Map<Locale, String> getMap() {
+			return map;
+		}
+
+		public Map<String, String> getAutoInitMap() {
+			return this.autoInitMap;
+		}
+	}
+
+	static class ClassWithNestedMaps {
+		Map<String, Map<String, Map<String, String>>> nestedMaps;
+	}
+
+	static class BirthDateContainer {
+		Date birthDate;
+	}
+
+	static class BigDecimalContainer {
+		BigDecimal value;
+		Map<String, BigDecimal> map;
+		List<BigDecimal> collection;
+	}
+
+	static class CollectionWrapper {
+		List<Contact> contacts;
+		List<List<String>> strings;
+		List<Map<String, Locale>> listOfMaps;
+		Set<Contact> contactsSet;
+		List<String> autoInitList = Collections.singletonList("spring");
+
+		public List<Contact> getContacts() {
+			return contacts;
+		}
+
+		public Set<Contact> getContactsSet() {
+			return contactsSet;
+		}
+
+		public List<String> getAutoInitList() {
+			return autoInitList;
+		}
+	}
+
+	static class LocaleWrapper {
+		Locale locale;
+	}
+
+	static class ClassWithBigIntegerId {
+		@Id BigInteger id;
+	}
+
+	static class A<T> {
+
+		String valueType;
+		T value;
+
+		A(T value) {
+			this.valueType = value.getClass().getName();
+			this.value = value;
+		}
+	}
+
+	static class ClassWithIntId {
+
+		@Id int id;
+	}
+
+	static class DefaultedConstructorArgument {
+
+		String foo;
+		int bar;
+		double foobar;
+
+		DefaultedConstructorArgument(String foo, @Value("#root.something ?: -1") int bar, double foobar) {
+			this.foo = foo;
+			this.bar = bar;
+			this.foobar = foobar;
+		}
+	}
+
+	static class Item {
+		List<Attribute> attributes;
+	}
+
+	static class Attribute {
+		String key;
+		Object value;
+	}
+
+	static class Outer {
+
+		class Inner {
+			String value;
+		}
+
+		Inner inner;
+	}
+
+	static class DBRefWrapper {
+
+		DBRef ref;
+		List<DBRef> refs;
+		Map<String, DBRef> refMap;
+		Map<String, Person> personMap;
+	}
+
+	static class URLWrapper {
+		URL url;
+	}
+
+	static class ClassWithComplexId {
+
+		@Id ComplexId complexId;
+	}
+
+	static class ComplexId {
+
+		Long innerId;
+
+		static ComplexId of(Long value) {
+
+			ComplexId id = new ComplexId();
+			id.innerId = value;
+			return id;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ComplexId complexId = (ComplexId) o;
+			return Objects.equals(innerId, complexId.innerId);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(innerId);
+		}
+	}
+
+	static class TypWithCollectionConstructor {
+
+		List<Attribute> attributes;
+
+		public TypWithCollectionConstructor(List<Attribute> attributes) {
+			this.attributes = attributes;
+		}
+	}
+
+	@TypeAlias("_")
+	static class Aliased {
+		String name;
+	}
+
+	static class ThrowableWrapper {
+
+		Throwable throwable;
+	}
+
+	@Document
+	static class PrimitiveContainer {
+
+		@Field("property") private int m_property;
+
+		@PersistenceCreator
+		public PrimitiveContainer(@Value("#root.property") int a_property) {
+			m_property = a_property;
+		}
+
+		public int property() {
+			return m_property;
+		}
+	}
+
+	@Document
+	static class ObjectContainer {
+
+		@Field("property") private PrimitiveContainer m_property;
+
+		@PersistenceCreator
+		public ObjectContainer(@Value("#root.property") PrimitiveContainer a_property) {
+			m_property = a_property;
+		}
+
+		public PrimitiveContainer property() {
+			return m_property;
+		}
+	}
+
+	class ClassWithGeoBox {
+
+		Box box;
+	}
+
+	class ClassWithGeoCircle {
+
+		Circle circle;
+	}
+
+	class ClassWithGeoSphere {
+
+		Sphere sphere;
+	}
+
+	class ClassWithGeoPolygon {
+
+		Polygon polygon;
+	}
+
+	class ClassWithGeoShape {
+
+		Shape shape;
+	}
+
+	class ClassWithTextScoreProperty {
+
+		@TextScore Float score;
+	}
+
+	class ClassWithExplicitlyNamedDBRefProperty {
+
+		@Field("explict-name-for-db-ref") //
+		@org.springframework.data.mongodb.core.mapping.DBRef //
+		ClassWithIntId dbRefProperty;
+
+		public ClassWithIntId getDbRefProperty() {
+			return dbRefProperty;
+		}
+	}
+
+	static class RootForClassWithExplicitlyRenamedIdField {
+
+		@Id String id;
+		ClassWithExplicitlyRenamedField nested;
+	}
+
+	static class ClassWithExplicitlyRenamedField {
+
+		@Field("id") String id;
+	}
+
+	static class RootForClassWithNamedIdField {
+
+		String id;
+		ClassWithNamedIdField nested;
+	}
+
+	static class ClassWithNamedIdField {
+
+		String id;
+	}
+
+	static class ClassWithAnnotatedIdField {
+
+		@Id String key;
+	}
+
+	static class TypeWithLocalDateTime {
+
+		LocalDateTime date;
+
+		TypeWithLocalDateTime() {
+			this.date = LocalDateTime.now();
+		}
+	}
+
+	static class TypeWithOptional {
+
+		Optional<String> string = Optional.empty();
+		Optional<LocalDateTime> localDateTime = Optional.empty();
+	}
+
+	static class ClassWithMapUsingEnumAsKey {
+
+		enum FooBarEnum {
+			FOO, BAR
+		}
+
+		Map<FooBarEnum, String> map;
+	}
+
+	@WritingConverter
+	static class FooBarEnumToStringConverter implements Converter<FooBarEnum, String> {
+
+		@Override
+		public String convert(FooBarEnum source) {
+
+			if (source == null) {
+				return null;
+			}
+
+			return FooBarEnum.FOO.equals(source) ? "foo-enum-value" : "bar-enum-value";
+		}
+	}
+
+	@ReadingConverter
+	static class StringToFooNumConverter implements Converter<String, FooBarEnum> {
+
+		@Override
+		public FooBarEnum convert(String source) {
+
+			if (source == null) {
+				return null;
+			}
+
+			if ("foo-enum-value".equals(source)) {
+				return FooBarEnum.FOO;
+			}
+			if ("bar-enum-value".equals(source)) {
+				return FooBarEnum.BAR;
+			}
+
+			throw new ConversionNotSupportedException(source, String.class, null);
+		}
+	}
+
+	static class TypeWithPropertyInNestedField {
+		@Field("nested.sample") String sample;
+	}
+
+	static class TypeWithMapOfLongValues {
+		Map<String, Long> map;
+	}
+
+	static class WithArrayInConstructor {
+
+		final String[] array;
+
+		public WithArrayInConstructor(String[] array) {
+			this.array = array;
+		}
+	}
+
+	static class WithArrays {
+		String[] arrayOfStrings;
+		byte[] arrayOfPrimitiveBytes;
+	}
+
+	// DATAMONGO-1898
+
+	// DATACMNS-1278
+	static interface SomeInterface {}
+
+	static enum InterfacedEnum implements SomeInterface {
+		INSTANCE;
+	}
+
+	static class DocWithInterfacedEnum {
+		SomeInterface property;
+	}
+
+	// DATAMONGO-1904
+
+	static class WithNestedLists {
+		float[][][] nestedFloats;
+	}
+
+	static class ImmutableObject {
+
+		final String id;
+		final String name;
+		final boolean witherUsed;
+
+		private ImmutableObject(String id) {
+			this.id = id;
+			this.name = null;
+			this.witherUsed = false;
+		}
+
+		private ImmutableObject(String id, String name, boolean witherUsed) {
+			this.id = id;
+			this.name = name;
+			this.witherUsed = witherUsed;
+		}
+
+		public ImmutableObject() {
+			this.id = null;
+			this.name = null;
+			witherUsed = false;
+		}
+
+		public ImmutableObject withId(String id) {
+			return new ImmutableObject(id, name, true);
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public boolean isWitherUsed() {
+			return witherUsed;
+		}
+	}
+
+	static class ImmutableObjectWithIdConstructorPropertyAndNoIdWitherMethod {
+
+		final @Id String id;
+		String value;
+
+		public ImmutableObjectWithIdConstructorPropertyAndNoIdWitherMethod(String id) {
+			this.id = id;
+		}
+	}
+
+	// DATAMONGO-2135
+	static class SomeItem {
+
+		String itemKey;
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			SomeItem someItem = (SomeItem) o;
+			return Objects.equals(itemKey, someItem.itemKey);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(itemKey);
+		}
+	}
+
+	static class Order {
+		Collection<SomeItem> items = new ArrayList<>();
+	}
+
+	static class WithExplicitTargetTypes {
+
+		@Field(targetType = FieldType.SCRIPT) //
+		String script;
+
+		@Field(targetType = FieldType.SCRIPT) //
+		List<String> scripts;
+
+		@Field(targetType = FieldType.DECIMAL128) //
+		BigDecimal bigDecimal;
+
+		@Field(targetType = FieldType.DECIMAL128) BigInteger bigInteger;
+
+		@Field(targetType = FieldType.INT64) //
+		Date dateAsLong;
+
+		@Field(targetType = FieldType.DATE_TIME) //
+		Long longAsDate;
+
+		@Field(targetType = FieldType.BOOLEAN) //
+		String stringAsBoolean;
+
+		@Field(targetType = FieldType.OBJECT_ID) //
+		Date dateAsObjectId;
+	}
+
+	static class WrapperAroundWithUnwrapped {
+
+		String someValue;
+		WithNullableUnwrapped nullableEmbedded;
+		WithEmptyUnwrappedType emptyEmbedded;
+		WithPrefixedNullableUnwrapped prefixedEmbedded;
+	}
+
+	static class WithNullableUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable EmbeddableType embeddableValue;
+	}
+
+	static class WithUnwrappedConstructor {
+
+		private final String id;
+
+		private final @Unwrapped.Empty EmbeddableType embeddableValue;
+
+		public WithUnwrappedConstructor(String id, EmbeddableType embeddableValue) {
+			this.id = id;
+			this.embeddableValue = embeddableValue;
+		}
+	}
+
+	static class WithPrefixedNullableUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable("prefix-") EmbeddableType embeddableValue;
+	}
+
+	static class WithEmptyUnwrappedType {
+
+		String id;
+
+		@Unwrapped.Empty EmbeddableType embeddableValue;
+	}
+
+	static class EmbeddableType {
+
+		String stringValue;
+		List<String> listValue;
+
+		@Field("with-at-field-annotation") //
+		String atFieldAnnotatedValue;
+
+		@Transient //
+		String transientValue;
+
+		Address address;
+
+		@Override
+		public boolean equals(Object o) {
+
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			EmbeddableType that = (EmbeddableType) o;
+			return Objects.equals(stringValue, that.stringValue) && Objects.equals(listValue, that.listValue)
+					&& Objects.equals(atFieldAnnotatedValue, that.atFieldAnnotatedValue)
+					&& Objects.equals(transientValue, that.transientValue) && Objects.equals(address, that.address);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(stringValue, listValue, atFieldAnnotatedValue, transientValue, address);
+		}
+	}
+
+	static class ReturningAfterConvertCallback implements AfterConvertCallback<Person> {
+
+		@Override
+		public Person onAfterConvert(Person entity, org.bson.Document document, String collection) {
+
+			return entity;
+		}
+	}
+
+	static class SubTypeOfGenericType extends GenericType<String> {
+
+	}
+
+	@ReadingConverter
+	static class GenericTypeConverter implements Converter<org.bson.Document, GenericType<?>> {
+
+		@Override
+		public GenericType<?> convert(org.bson.Document source) {
+
+			GenericType<Object> target = new GenericType<>();
+			target.content = source.get("value");
+			return target;
+		}
+	}
+
+	@ReadingConverter
+	static class SubTypeOfGenericTypeConverter implements Converter<org.bson.Document, SubTypeOfGenericType> {
+
+		@Override
+		public SubTypeOfGenericType convert(org.bson.Document source) {
+
+			SubTypeOfGenericType target = new SubTypeOfGenericType();
+			target.content = source.getString("value") + "_s";
+			return target;
+		}
+	}
+
+	@WritingConverter
+	static class TypeImplementingMapToDocumentConverter implements Converter<TypeImplementingMap, org.bson.Document> {
+
+
+		@Override
+		public org.bson.@Nullable Document convert(TypeImplementingMap source) {
+			return new org.bson.Document("1st", source.val1).append("2nd", source.val2);
+		}
+	}
+
+	@ReadingConverter
+	static class DocumentToTypeImplementingMapConverter implements Converter<org.bson.Document, TypeImplementingMap> {
+
+		@Override
+		public @Nullable TypeImplementingMap convert(org.bson.Document source) {
+			return new TypeImplementingMap(source.getString("1st"), source.getInteger("2nd"));
+		}
+	}
+
+	@ReadingConverter
+	public static class MongoSimpleTypeConverter implements Converter<Binary, Object> {
+
+		@Override
+		public byte[] convert(Binary source) {
+			return source.getData();
+		}
+	}
+
+	static class TypeWrappingTypeImplementingMap {
+
+		String id;
+		TypeImplementingMap typeImplementingMap;
 	}
 
-	class ClassWithGeoPolygon {
+	static class TypeImplementingMap implements Map<String, String> {
+
+		String val1;
+		int val2;
+
+		TypeImplementingMap(String val1, int val2) {
+			this.val1 = val1;
+			this.val2 = val2;
+		}
+
+		@Override
+		public int size() {
+			return 0;
+		}
+
+		@Override
+		public boolean isEmpty() {
+			return false;
+		}
 
-		Polygon polygon;
-	}
+		@Override
+		public boolean containsKey(Object key) {
+			return false;
+		}
 
-	class ClassWithGeoShape {
+		@Override
+		public boolean containsValue(Object value) {
+			return false;
+		}
 
-		Shape shape;
-	}
+		@Override
+		public String get(Object key) {
+			return null;
+		}
 
-	class ClassWithTextScoreProperty {
+		@Nullable
+		@Override
+		public String put(String key, String value) {
+			return null;
+		}
 
-		@TextScore Float score;
-	}
+		@Override
+		public String remove(Object key) {
+			return null;
+		}
 
-	class ClassWithExplicitlyNamedDBRefProperty {
+		@Override
+		public void putAll(@NonNull Map<? extends String, ? extends String> m) {
 
-		@Field("explict-name-for-db-ref") //
-		@org.springframework.data.mongodb.core.mapping.DBRef //
-		ClassWithIntId dbRefProperty;
+		}
+
+		@Override
+		public void clear() {
 
-		public ClassWithIntId getDbRefProperty() {
-			return dbRefProperty;
 		}
-	}
 
-	static class RootForClassWithExplicitlyRenamedIdField {
+		@NonNull
+		@Override
+		public Set<String> keySet() {
+			return null;
+		}
 
-		@Id String id;
-		ClassWithExplicitlyRenamedField nested;
-	}
+		@NonNull
+		@Override
+		public Collection<String> values() {
+			return null;
+		}
 
-	static class ClassWithExplicitlyRenamedField {
+		@NonNull
+		@Override
+		public Set<Entry<String, String>> entrySet() {
+			return null;
+		}
 
-		@Field("id") String id;
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			TypeImplementingMap that = (TypeImplementingMap) o;
+			return val2 == that.val2 && Objects.equals(val1, that.val1);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(val1, val2);
+		}
 	}
 
-	static class RootForClassWithNamedIdField {
+	static class WithRawDocumentProperties {
 
 		String id;
-		ClassWithNamedIdField nested;
+		org.bson.Document raw;
+		List<org.bson.Document> listOfRaw;
 	}
 
-	static class ClassWithNamedIdField {
+	static class WithFieldWrite {
 
-		String id;
-	}
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.NON_NULL) Integer writeNonNull;
 
-	static class ClassWithAnnotatedIdField {
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.ALWAYS) Integer writeAlways;
+
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.NON_NULL) Person writeNonNullPerson;
+
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.ALWAYS) Person writeAlwaysPerson;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.NON_NULL) Person writeNonNullPersonDBRef;
+
+		@org.springframework.data.mongodb.core.mapping.DBRef
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.ALWAYS) Person writeAlwaysPersonDBRef;
 
-		@Id String key;
 	}
 
-	static class TypeWithLocalDateTime {
+	static class WithValueConverters {
 
-		LocalDateTime date;
+		@ValueConverter(Converter1.class) String converterWithDefaultCtor;
 
-		TypeWithLocalDateTime() {
-			this.date = LocalDateTime.now();
-		}
+		@ValueConverter(Converter2.class) String converterEnum;
+
+		String viaRegisteredConverter;
 	}
 
-	static class TypeWithOptional {
+	static class WithContextValueConverters {
 
-		Optional<String> string = Optional.empty();
-		Optional<LocalDateTime> localDateTime = Optional.empty();
+		@ValueConverter(Converter3.class) String converterBean;
+
+		String viaRegisteredConverter;
 	}
 
-	static class ClassWithMapUsingEnumAsKey {
+	static class Converter3 implements MongoValueConverter<Object, org.bson.Document> {
 
-		enum FooBarEnum {
-			FOO, BAR
+		private final SomeDependency someDependency;
+
+		public Converter3(@Autowired SomeDependency someDependency) {
+			this.someDependency = someDependency;
 		}
 
-		Map<FooBarEnum, String> map;
+		@Override
+		public Object read(org.bson.Document value, MongoConversionContext context) {
+			return value.get("ooo");
+		}
+
+		@Override
+		public org.bson.Document write(Object value, MongoConversionContext context) {
+			return new org.bson.Document("ooo", value + " - " + someDependency.toString());
+		}
 	}
 
-	@WritingConverter
-	static class FooBarEnumToStringConverter implements Converter<FooBarEnum, String> {
+	static class SomeDependency {
+
+	}
+
+	enum Converter2 implements MongoValueConverter<String, org.bson.Document> {
+
+		INSTANCE;
 
 		@Override
-		public String convert(FooBarEnum source) {
+		public @Nullable String read(org.bson.@Nullable Document value, MongoConversionContext context) {
+			return value.getString("bar");
+		}
 
-			if (source == null) {
-				return null;
-			}
 
-			return FooBarEnum.FOO.equals(source) ? "foo-enum-value" : "bar-enum-value";
+		@Override
+		public org.bson.@Nullable Document write(@Nullable String value, MongoConversionContext context) {
+			return new org.bson.Document("bar", value);
 		}
 	}
 
-	@ReadingConverter
-	static class StringToFooNumConverter implements Converter<String, FooBarEnum> {
+	static class Converter1 implements MongoValueConverter<String, org.bson.Document> {
 
 		@Override
-		public FooBarEnum convert(String source) {
-
-			if (source == null) {
-				return null;
-			}
+		public @Nullable String read(org.bson.@Nullable Document value, MongoConversionContext context) {
+			return value.getString("foo");
+		}
 
-			if ("foo-enum-value".equals(source)) {
-				return FooBarEnum.FOO;
-			}
-			if ("bar-enum-value".equals(source)) {
-				return FooBarEnum.BAR;
-			}
 
-			throw new ConversionNotSupportedException(source, String.class, null);
+		@Override
+		public org.bson.@Nullable Document write(@Nullable String value, MongoConversionContext context) {
+			return new org.bson.Document("foo", value);
 		}
 	}
 
-	static class TypeWithPropertyInNestedField {
-		@Field("nested.sample") String sample;
-	}
+	interface BookProjection {
 
-	static class TypeWithMapOfLongValues {
-		Map<String, Long> map;
+		@Value("#{target.name + ' by ' + target.author.firstName + ' ' + target.author.lastName}")
+		String getName();
 	}
 
-	@RequiredArgsConstructor
-	static class WithArrayInConstructor {
+	static class AuthorOnly {
 
-		final String[] array;
+		final AuthorNameOnly author;
+
+		public AuthorOnly(AuthorNameOnly author) {
+			this.author = author;
+		}
 
+		public AuthorNameOnly getAuthor() {
+			return author;
+		}
 	}
 
-	// DATAMONGO-1898
+	static class AuthorNameOnly {
 
-	// DATACMNS-1278
-	static interface SomeInterface {}
+		final String firstName;
 
-	static enum InterfacedEnum implements SomeInterface {
-		INSTANCE;
-	}
+		final String lastName;
 
-	static class DocWithInterfacedEnum {
-		SomeInterface property;
-	}
+		public AuthorNameOnly(String firstName, String lastName) {
+			this.firstName = firstName;
+			this.lastName = lastName;
+		}
 
-	// DATAMONGO-1904
+		public String getFirstName() {
+			return firstName;
+		}
 
-	static class WithNestedLists {
-		float[][][] nestedFloats;
+		public String getLastName() {
+			return lastName;
+		}
 	}
 
-	static class ImmutableObject {
+	static class Book {
 
-		final String id;
-		final String name;
-		final boolean witherUsed;
+		@Id String id;
 
-		private ImmutableObject(String id) {
-			this.id = id;
-			this.name = null;
-			this.witherUsed = false;
+		String name;
+
+		Author author = new Author();
+
+		public String getId() {
+			return id;
 		}
 
-		private ImmutableObject(String id, String name, boolean witherUsed) {
+		public void setId(String id) {
 			this.id = id;
+		}
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
 			this.name = name;
-			this.witherUsed = witherUsed;
 		}
 
-		public ImmutableObject() {
-			this.id = null;
-			this.name = null;
-			witherUsed = false;
+		public Author getAuthor() {
+			return author;
 		}
 
-		public ImmutableObject withId(String id) {
-			return new ImmutableObject(id, name, true);
+		public void setAuthor(Author author) {
+			this.author = author;
 		}
+	}
+
+	static class Author {
+
+		@Id String id;
+
+		String firstName;
+
+		String lastName;
 
 		public String getId() {
 			return id;
 		}
 
-		public String getName() {
-			return name;
+		public void setId(String id) {
+			this.id = id;
 		}
 
-		public boolean isWitherUsed() {
-			return witherUsed;
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
 		}
 	}
 
-	@RequiredArgsConstructor
-	static class ImmutableObjectWithIdConstructorPropertyAndNoIdWitherMethod {
+	static class Cyclic {
 
-		final @Id String id;
+		@Id String id;
+		String value;
+		Cyclic cycle;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getValue() {
+			return value;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		public Cyclic getCycle() {
+			return cycle;
+		}
+
+		public void setCycle(Cyclic cycle) {
+			this.cycle = cycle;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Cyclic cyclic = (Cyclic) o;
+			return Objects.equals(id, cyclic.id) && Objects.equals(value, cyclic.value)
+					&& Objects.equals(cycle, cyclic.cycle);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value, cycle);
+		}
+	}
+
+	static class WrapperForTypeWithPropertyHavingDotsInFieldName {
+
+		WithPropertyHavingDotsInFieldName nested;
+	}
+
+	static class WithPropertyHavingDotsInFieldName {
+
+		@Field(name = "field.name.with.dots", nameType = Type.KEY) String value;
+	}
+
+	static class ComplexIdAndFieldAnnotation {
+
+		@Field("_id") //
+		ComplexId id;
 		String value;
 	}
 
-	// DATAMONGO-2135
+	static class ComplexIdAndMongoIdAnnotation {
 
-	@EqualsAndHashCode // equality check by fields
-	static class SomeItem {
-		String itemKey;
+		@MongoId //
+		ComplexId id;
+		String value;
 	}
 
-	static class Order {
-		Collection<SomeItem> items = new ArrayList<>();
+	static class ComplexIdAndIdAnnotation {
+
+		@Id //
+		ComplexId id;
+		String value;
 	}
 
-	static class WithExplicitTargetTypes {
+	static class ComplexIdAndNoAnnotation {
 
-		@Field(targetType = FieldType.SCRIPT) //
-		String script;
+		ComplexId id;
+		String value;
+	}
 
-		@Field(targetType = FieldType.SCRIPT) //
-		List<String> scripts;
+	@ReadingConverter
+	static class ByteBufferToDoubleHolderConverter implements Converter<ByteBuffer, DoubleHolder> {
 
-		@Field(targetType = FieldType.DECIMAL128) //
-		BigDecimal bigDecimal;
+		@Override
+		public DoubleHolder convert(ByteBuffer source) {
+			return new DoubleHolder(source.getDouble());
+		}
+	}
 
-		@Field(targetType = FieldType.INT64) //
-		Date dateAsLong;
+	record DoubleHolder(double number) {
 
-		@Field(targetType = FieldType.DATE_TIME) //
-		Long longAsDate;
+	}
 
-		@Field(targetType = FieldType.BOOLEAN) //
-		String stringAsBoolean;
+	static class WithDoubleHolder {
+		DoubleHolder number;
+	}
 
-		@Field(targetType = FieldType.OBJECT_ID) //
-		Date dateAsObjectId;
+	static class DoubleHolderDto {
+		DoubleHolder number;
+
+		public DoubleHolderDto(DoubleHolder number) {
+			this.number = number;
+		}
+	}
+
+	static class WithRenamedIdPropertyAndAnotherPropertyNamedId {
+
+		@Id String abc;
+		String id;
 	}
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java
index 0e12ca6569..a1c2fc0897 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,22 +19,26 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
+import java.util.Arrays;
+import java.util.Objects;
 import java.util.UUID;
 
+import org.bson.BinaryVector;
 import org.bson.types.Binary;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.domain.Vector;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.MongoVector;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
+import org.springframework.util.ObjectUtils;
 
 /**
  * Integration tests for {@link MongoConverters}.
@@ -43,17 +47,17 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
+@ExtendWith(MongoTemplateExtension.class)
 public class MongoConvertersIntegrationTests {
 
 	static final String COLLECTION = "converter-tests";
 
-	@Autowired MongoOperations template;
+	@Template //
+	static MongoTestTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
-		template.dropCollection(COLLECTION);
+		template.flush(COLLECTION);
 	}
 
 	@Test // DATAMONGO-422
@@ -102,6 +106,80 @@ public void shouldReadBinaryType() {
 		assertThat(template.findOne(query(where("id").is(wbd.id)), WithBinaryDataType.class)).isEqualTo(wbd);
 	}
 
+	@Test // GH-4706
+	public void shouldReadAndWriteVectors() {
+
+		WithVectors source = new WithVectors();
+		source.vector = Vector.of(1.1, 2.2, 3.3);
+
+		template.save(source);
+
+		WithVectors loaded = template.findOne(query(where("id").is(source.id)), WithVectors.class);
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4706
+	public void shouldReadAndWriteFloatVectors() {
+
+		WithVectors source = new WithVectors();
+		source.vector = Vector.of(1.1f, 2.2f, 3.3f);
+
+		template.save(source);
+
+		WithVectors loaded = template.findOne(query(where("id").is(source.id)), WithVectors.class);
+
+		// top-level arrays are converted into doubles by MongoDB with all their conversion imprecisions
+		assertThat(loaded.vector.getClass().getName()).contains("DoubleVector");
+		assertThat(loaded.vector).isNotEqualTo(source.vector);
+	}
+
+	@Test // GH-4706
+	public void shouldReadAndWriteBinFloat32Vectors() {
+
+		WithVectors source = new WithVectors();
+		source.binVector = BinaryVector.floatVector(new float[] { 1.1f, 2.2f, 3.3f });
+		source.vector = MongoVector.ofFloat(new float[] { 1.1f, 2.2f, 3.3f });
+
+		template.save(source);
+
+		WithVectors loaded = template.findOne(query(where("id").is(source.id)), WithVectors.class);
+
+		assertThat(loaded.vector).isEqualTo(source.vector);
+		assertThat(loaded.binVector).isEqualTo(source.binVector);
+		assertThat(loaded.binVector).isEqualTo(source.vector.getSource());
+	}
+
+	@Test // GH-4706
+	public void shouldReadAndWriteBinInt8Vectors() {
+
+		WithVectors source = new WithVectors();
+		source.binVector = BinaryVector.int8Vector(new byte[] { 1, 2, 3 });
+		source.vector = MongoVector.ofInt8(new byte[] { 1, 2, 3 });
+
+		template.save(source);
+
+		WithVectors loaded = template.findOne(query(where("id").is(source.id)), WithVectors.class);
+
+		assertThat(loaded.vector).isEqualTo(source.vector);
+		assertThat(loaded.binVector).isEqualTo(source.binVector);
+		assertThat(loaded.binVector).isEqualTo(source.vector.getSource());
+	}
+
+	@Test // GH-4706
+	public void shouldReadAndWriteBinPackedVectors() {
+
+		WithVectors source = new WithVectors();
+		source.binVector = BinaryVector.packedBitVector(new byte[] { 1, 2, 3 }, (byte) 1);
+		source.vector = MongoVector.of(source.binVector);
+
+		template.save(source);
+
+		WithVectors loaded = template.findOne(query(where("id").is(source.id)), WithVectors.class);
+
+		assertThat(loaded.vector).isEqualTo(source.vector);
+		assertThat(loaded.binVector).isEqualTo(source.binVector);
+	}
+
 	@Document(COLLECTION)
 	static class Wrapper {
 
@@ -109,19 +187,123 @@ static class Wrapper {
 		UUID uuid;
 	}
 
-	@Data
+	@Document(COLLECTION)
+	static class WithVectors {
+
+		ObjectId id;
+		Vector vector;
+		BinaryVector binVector;
+
+		@Override
+		public boolean equals(Object o) {
+			if (!(o instanceof WithVectors that)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(id, that.id)) {
+				return false;
+			}
+			if (!ObjectUtils.nullSafeEquals(vector, that.vector)) {
+				return false;
+			}
+			return ObjectUtils.nullSafeEquals(binVector, that.binVector);
+		}
+
+		@Override
+		public int hashCode() {
+			return ObjectUtils.nullSafeHash(id, vector, binVector);
+		}
+	}
+
 	@Document(COLLECTION)
 	static class WithBinaryDataInArray {
 
 		@Id String id;
 		byte[] data;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public byte[] getData() {
+			return this.data;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setData(byte[] data) {
+			this.data = data;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithBinaryDataInArray that = (WithBinaryDataInArray) o;
+			return Objects.equals(id, that.id) && Arrays.equals(data, that.data);
+		}
+
+		@Override
+		public int hashCode() {
+			int result = Objects.hash(id);
+			result = 31 * result + Arrays.hashCode(data);
+			return result;
+		}
+
+		public String toString() {
+			return "MongoConvertersIntegrationTests.WithBinaryDataInArray(id=" + this.getId() + ", data="
+					+ java.util.Arrays.toString(this.getData()) + ")";
+		}
 	}
 
-	@Data
 	@Document(COLLECTION)
 	static class WithBinaryDataType {
 
 		@Id String id;
 		Binary data;
+
+		public WithBinaryDataType() {}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Binary getData() {
+			return this.data;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setData(Binary data) {
+			this.data = data;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithBinaryDataType that = (WithBinaryDataType) o;
+			return Objects.equals(id, that.id) && Objects.equals(data, that.data);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, data);
+		}
+
+		public String toString() {
+			return "MongoConvertersIntegrationTests.WithBinaryDataType(id=" + this.getId() + ", data=" + this.getData() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java
index d08fc9d877..72cd807d3b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoConvertersUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,14 @@
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
 import java.util.Currency;
+import java.util.UUID;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.assertj.core.data.TemporalUnitLessThanOffset;
 import org.bson.BsonTimestamp;
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.convert.support.ConfigurableConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.data.geo.Box;
@@ -41,6 +42,7 @@
 import org.springframework.data.mongodb.core.convert.MongoConverters.BigDecimalToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.BsonTimestampToInstantConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.CurrencyToStringConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverters.DocumentToStringConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.IntegerToAtomicIntegerConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.LongToAtomicLongConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverters.StringToBigDecimalConverter;
@@ -54,10 +56,10 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  */
-public class MongoConvertersUnitTests {
+class MongoConvertersUnitTests {
 
 	@Test
-	public void convertsBigDecimalToStringAndBackCorrectly() {
+	void convertsBigDecimalToStringAndBackCorrectly() {
 
 		BigDecimal bigDecimal = BigDecimal.valueOf(254, 1);
 		String value = BigDecimalToStringConverter.INSTANCE.convert(bigDecimal);
@@ -68,7 +70,7 @@ public void convertsBigDecimalToStringAndBackCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void convertsBoxToDocumentAndBackCorrectly() {
+	void convertsBoxToDocumentAndBackCorrectly() {
 
 		Box box = new Box(new Point(1, 2), new Point(3, 4));
 
@@ -79,7 +81,7 @@ public void convertsBoxToDocumentAndBackCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void convertsCircleToDocumentAndBackCorrectly() {
+	void convertsCircleToDocumentAndBackCorrectly() {
 
 		Circle circle = new Circle(new Point(1, 2), 3);
 
@@ -90,7 +92,7 @@ public void convertsCircleToDocumentAndBackCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void convertsPolygonToDocumentAndBackCorrectly() {
+	void convertsPolygonToDocumentAndBackCorrectly() {
 
 		Polygon polygon = new Polygon(new Point(1, 2), new Point(2, 3), new Point(3, 4), new Point(5, 6));
 
@@ -101,7 +103,7 @@ public void convertsPolygonToDocumentAndBackCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void convertsSphereToDocumentAndBackCorrectly() {
+	void convertsSphereToDocumentAndBackCorrectly() {
 
 		Sphere sphere = new Sphere(new Point(1, 2), 3);
 
@@ -112,7 +114,7 @@ public void convertsSphereToDocumentAndBackCorrectly() {
 	}
 
 	@Test // DATAMONGO-858
-	public void convertsPointToListAndBackCorrectly() {
+	void convertsPointToListAndBackCorrectly() {
 
 		Point point = new Point(1, 2);
 
@@ -123,44 +125,44 @@ public void convertsPointToListAndBackCorrectly() {
 	}
 
 	@Test // DATAMONGO-1372
-	public void convertsCurrencyToStringCorrectly() {
+	void convertsCurrencyToStringCorrectly() {
 		assertThat(CurrencyToStringConverter.INSTANCE.convert(Currency.getInstance("USD"))).isEqualTo("USD");
 	}
 
 	@Test // DATAMONGO-1372
-	public void convertsStringToCurrencyCorrectly() {
+	void convertsStringToCurrencyCorrectly() {
 		assertThat(StringToCurrencyConverter.INSTANCE.convert("USD")).isEqualTo(Currency.getInstance("USD"));
 	}
 
 	@Test // DATAMONGO-1416
-	public void convertsAtomicLongToLongCorrectly() {
+	void convertsAtomicLongToLongCorrectly() {
 		assertThat(AtomicLongToLongConverter.INSTANCE.convert(new AtomicLong(100L))).isEqualTo(100L);
 	}
 
 	@Test // DATAMONGO-1416
-	public void convertsAtomicIntegerToIntegerCorrectly() {
+	void convertsAtomicIntegerToIntegerCorrectly() {
 		assertThat(AtomicIntegerToIntegerConverter.INSTANCE.convert(new AtomicInteger(100))).isEqualTo(100);
 	}
 
 	@Test // DATAMONGO-1416
-	public void convertsLongToAtomicLongCorrectly() {
+	void convertsLongToAtomicLongCorrectly() {
 		assertThat(LongToAtomicLongConverter.INSTANCE.convert(100L)).isInstanceOf(AtomicLong.class);
 	}
 
 	@Test // DATAMONGO-1416
-	public void convertsIntegerToAtomicIntegerCorrectly() {
+	void convertsIntegerToAtomicIntegerCorrectly() {
 		assertThat(IntegerToAtomicIntegerConverter.INSTANCE.convert(100)).isInstanceOf(AtomicInteger.class);
 	}
 
 	@Test // DATAMONGO-2113
-	public void convertsBsonTimestampToInstantCorrectly() {
+	void convertsBsonTimestampToInstantCorrectly() {
 
 		assertThat(BsonTimestampToInstantConverter.INSTANCE.convert(new BsonTimestamp(6615900307735969796L)))
 				.isCloseTo(Instant.ofEpochSecond(1540384327), new TemporalUnitLessThanOffset(100, ChronoUnit.MILLIS));
 	}
 
 	@Test // DATAMONGO-2210
-	public void convertsUrisToString() {
+	void convertsUrisToString() {
 
 		MongoCustomConversions conversions = new MongoCustomConversions();
 
@@ -172,4 +174,12 @@ public void convertsUrisToString() {
 		assertThat(conversionService.convert(URI.create("/segment"), String.class)).isEqualTo("/segment");
 		assertThat(conversionService.convert("/segment", URI.class)).isEqualTo(URI.create("/segment"));
 	}
+
+	@Test // GH-3546
+	void convertsDocumentWithUUidToString() {
+
+		UUID uuid = UUID.randomUUID();
+		assertThat(DocumentToStringConverter.INSTANCE.convert(new Document("_id", uuid)))
+				.isEqualTo("{\"_id\": \"" + uuid.toString() + "\"}");
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoCustomConversionsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoCustomConversionsUnitTests.java
index 37a9623a86..9382b835ea 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoCustomConversionsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoCustomConversionsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,23 +16,28 @@
 package org.springframework.data.mongodb.core.convert;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.time.ZonedDateTime;
 import java.util.Collections;
 import java.util.Date;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.PropertyValueConverter;
+import org.springframework.data.mapping.PersistentEntity;
+import org.springframework.data.mapping.PersistentProperty;
+import org.springframework.data.mongodb.core.convert.QueryMapperUnitTests.Foo;
 
 /**
  * Unit tests for {@link MongoCustomConversions}.
  *
  * @author Christoph Strobl
  */
-public class MongoCustomConversionsUnitTests {
+class MongoCustomConversionsUnitTests {
 
 	@Test // DATAMONGO-2349
-	public void nonAnnotatedConverterForJavaTimeTypeShouldOnlyBeRegisteredAsReadingConverter() {
+	void nonAnnotatedConverterForJavaTimeTypeShouldOnlyBeRegisteredAsReadingConverter() {
 
 		MongoCustomConversions conversions = new MongoCustomConversions(
 				Collections.singletonList(new DateToZonedDateTimeConverter()));
@@ -41,6 +46,34 @@ public void nonAnnotatedConverterForJavaTimeTypeShouldOnlyBeRegisteredAsReadingC
 		assertThat(conversions.hasCustomWriteTarget(Date.class)).isFalse();
 	}
 
+	@Test // GH-3596
+	void propertyValueConverterRegistrationWorksAsExpected() {
+
+		PersistentProperty<?> persistentProperty = mock(PersistentProperty.class);
+		PersistentEntity owner = mock(PersistentEntity.class);
+		when(persistentProperty.getName()).thenReturn("name");
+		when(persistentProperty.getOwner()).thenReturn(owner);
+		when(owner.getType()).thenReturn(Foo.class);
+
+		MongoCustomConversions conversions = MongoCustomConversions.create(config -> {
+
+			config.configurePropertyConversions(
+					registry -> registry.registerConverter(Foo.class, "name", mock(PropertyValueConverter.class)));
+		});
+
+		assertThat(conversions.getPropertyValueConversions().hasValueConverter(persistentProperty)).isTrue();
+	}
+
+	@Test // GH-4390
+	void doesNotReturnConverterForNativeTimeTimeIfUsingDriverCodec() {
+
+		MongoCustomConversions conversions = MongoCustomConversions.create(config -> {
+			config.useNativeDriverJavaTimeCodecs();
+		});
+
+		assertThat(conversions.getCustomWriteTarget(Date.class)).isEmpty();
+	}
+
 	static class DateToZonedDateTimeConverter implements Converter<Date, ZonedDateTime> {
 
 		@Override
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoExampleMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoExampleMapperUnitTests.java
index 4284f16884..16b198004c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoExampleMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoExampleMapperUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,24 +27,22 @@
 import java.util.regex.Pattern;
 
 import org.bson.conversions.Bson;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.ExampleMatcher;
-import org.springframework.data.domain.ExampleMatcher.*;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.convert.QueryMapperUnitTests.ClassWithGeoTypes;
 import org.springframework.data.mongodb.core.convert.QueryMapperUnitTests.WithDBRef;
+import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 import org.springframework.data.mongodb.core.query.UntypedExampleMatcher;
 import org.springframework.data.util.TypeInformation;
 
@@ -52,28 +50,26 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoExampleMapperUnitTests {
-
-	MongoExampleMapper mapper;
-	MongoMappingContext context;
-	MappingMongoConverter converter;
+@ExtendWith(MockitoExtension.class)
+class MongoExampleMapperUnitTests {
 
-	@Mock MongoDbFactory factory;
+	private MongoExampleMapper mapper;
+	private MongoMappingContext context;
+	private MappingMongoConverter converter;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		this.context = new MongoMappingContext();
 
-		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), context);
+		this.converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
 		this.converter.afterPropertiesSet();
 
 		this.mapper = new MongoExampleMapper(converter);
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIdIsSet() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenIdIsSet() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.id = "steelheart";
@@ -83,7 +79,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIdIsSet() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenMultipleValuesSet() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenMultipleValuesSet() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.id = "steelheart";
@@ -97,7 +93,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenMultipleValuesSet() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIdIsNotSet() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenIdIsNotSet() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -109,7 +105,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIdIsNotSet() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenListHasValues() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenListHasValues() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.listOfString = Arrays.asList("Prof", "Tia", "David");
@@ -121,7 +117,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenListHasValues() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenFieldNameIsCustomized() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenFieldNameIsCustomized() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.customNamedField = "Mitosis";
@@ -131,7 +127,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenFieldNameIsCustomized()
 	}
 
 	@Test // DATAMONGO-1245
-	public void typedExampleShouldContainTypeRestriction() {
+	void typedExampleShouldContainTypeRestriction() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -145,7 +141,7 @@ public void typedExampleShouldContainTypeRestriction() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedAsFlatMapWhenGivenNestedElementsWithLenientMatchMode() {
+	void exampleShouldBeMappedAsFlatMapWhenGivenNestedElementsWithLenientMatchMode() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -156,7 +152,7 @@ public void exampleShouldBeMappedAsFlatMapWhenGivenNestedElementsWithLenientMatc
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedAsExactObjectWhenGivenNestedElementsWithStrictMatchMode() {
+	void exampleShouldBeMappedAsExactObjectWhenGivenNestedElementsWithStrictMatchMode() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -169,7 +165,7 @@ public void exampleShouldBeMappedAsExactObjectWhenGivenNestedElementsWithStrictM
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsStarting() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsStarting() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -183,7 +179,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsStarti
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeContainingDotsWhenStringMatchModeIsStarting() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeContainingDotsWhenStringMatchModeIsStarting() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "fire.ight";
@@ -197,7 +193,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeContainingDotsWhenStringMat
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsEnding() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsEnding() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -211,7 +207,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeIsEnding
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeRegex() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeRegex() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -225,7 +221,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenStringMatchModeRegex()
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIgnoreCaseEnabledAndMatchModeSet() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenIgnoreCaseEnabledAndMatchModeSet() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -239,7 +235,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIgnoreCaseEnabledAndMat
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIgnoreCaseEnabled() {
+	void exampleShouldBeMappedCorrectlyForFlatTypeWhenIgnoreCaseEnabled() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -254,7 +250,7 @@ public void exampleShouldBeMappedCorrectlyForFlatTypeWhenIgnoreCaseEnabled() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedWhenContainingDBRef() {
+	void exampleShouldBeMappedWhenContainingDBRef() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "steelheart";
@@ -270,7 +266,7 @@ public void exampleShouldBeMappedWhenContainingDBRef() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedWhenDBRefIsNull() {
+	void exampleShouldBeMappedWhenDBRefIsNull() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "steelheart";
@@ -282,7 +278,7 @@ public void exampleShouldBeMappedWhenDBRefIsNull() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyWhenContainingLegacyPoint() {
+	void exampleShouldBeMappedCorrectlyWhenContainingLegacyPoint() {
 
 		ClassWithGeoTypes probe = new ClassWithGeoTypes();
 		probe.legacyPoint = new Point(10D, 20D);
@@ -295,7 +291,7 @@ public void exampleShouldBeMappedCorrectlyWhenContainingLegacyPoint() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void mappingShouldExcludeFieldWithCustomNameCorrectly() {
+	void mappingShouldExcludeFieldWithCustomNameCorrectly() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.customNamedField = "foo";
@@ -310,7 +306,7 @@ public void mappingShouldExcludeFieldWithCustomNameCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void mappingShouldExcludeFieldCorrectly() {
+	void mappingShouldExcludeFieldCorrectly() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.customNamedField = "foo";
@@ -325,7 +321,7 @@ public void mappingShouldExcludeFieldCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void mappingShouldExcludeNestedFieldCorrectly() {
+	void mappingShouldExcludeNestedFieldCorrectly() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -341,7 +337,7 @@ public void mappingShouldExcludeNestedFieldCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void mappingShouldExcludeNestedFieldWithCustomNameCorrectly() {
+	void mappingShouldExcludeNestedFieldWithCustomNameCorrectly() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -357,7 +353,7 @@ public void mappingShouldExcludeNestedFieldWithCustomNameCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void mappingShouldFavorFieldSpecificationStringMatcherOverDefaultStringMatcher() {
+	void mappingShouldFavorFieldSpecificationStringMatcherOverDefaultStringMatcher() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -371,7 +367,7 @@ public void mappingShouldFavorFieldSpecificationStringMatcherOverDefaultStringMa
 	}
 
 	@Test // DATAMONGO-1245
-	public void mappingShouldIncludePropertiesFromHierarchicalDocument() {
+	void mappingShouldIncludePropertiesFromHierarchicalDocument() {
 
 		HierachicalDocument probe = new HierachicalDocument();
 		probe.stringValue = "firefight";
@@ -385,7 +381,7 @@ public void mappingShouldIncludePropertiesFromHierarchicalDocument() {
 	}
 
 	@Test // DATAMONGO-1459
-	public void mapsAnyMatchingExampleCorrectly() {
+	void mapsAnyMatchingExampleCorrectly() {
 
 		FlatDocument probe = new FlatDocument();
 		probe.stringValue = "firefight";
@@ -397,7 +393,7 @@ public void mapsAnyMatchingExampleCorrectly() {
 	}
 
 	@Test // DATAMONGO-1768
-	public void allowIgnoringTypeRestrictionBySettingUpTypeKeyAsAnIgnoredPath() {
+	void allowIgnoringTypeRestrictionBySettingUpTypeKeyAsAnIgnoredPath() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -410,13 +406,13 @@ public void allowIgnoringTypeRestrictionBySettingUpTypeKeyAsAnIgnoredPath() {
 	}
 
 	@Test // DATAMONGO-1768
-	public void allowIgnoringTypeRestrictionBySettingUpTypeKeyAsAnIgnoredPathWhenUsingCustomTypeMapper() {
+	void allowIgnoringTypeRestrictionBySettingUpTypeKeyAsAnIgnoredPathWhenUsingCustomTypeMapper() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
 		probe.flatDoc.stringValue = "conflux";
 
-		MappingMongoConverter mappingMongoConverter = new MappingMongoConverter(new DefaultDbRefResolver(factory), context);
+		MappingMongoConverter mappingMongoConverter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
 		mappingMongoConverter.setTypeMapper(new DefaultMongoTypeMapper() {
 
 			@Override
@@ -444,7 +440,7 @@ public void writeType(TypeInformation<?> info, Bson sink) {
 	}
 
 	@Test // DATAMONGO-1768
-	public void untypedExampleShouldNotInferTypeRestriction() {
+	void untypedExampleShouldNotInferTypeRestriction() {
 
 		WrapperDocument probe = new WrapperDocument();
 		probe.flatDoc = new FlatDocument();
@@ -454,6 +450,60 @@ public void untypedExampleShouldNotInferTypeRestriction() {
 		assertThat(document).doesNotContainKey("_class");
 	}
 
+	@Test // DATAMONGO-1902
+	void mapsUnwrappedType() {
+
+		WithUnwrapped probe = new WithUnwrapped();
+		probe.unwrappedValue = new UnwrappableType();
+		probe.unwrappedValue.atFieldAnnotatedValue = "@Field";
+		probe.unwrappedValue.stringValue = "string-value";
+
+		org.bson.Document document = mapper.getMappedExample(Example.of(probe, UntypedExampleMatcher.matching()));
+		assertThat(document).containsEntry("stringValue", "string-value").containsEntry("with-at-field-annotation",
+				"@Field");
+	}
+
+	@Test // DATAMONGO-1902
+	void mapsPrefixedUnwrappedType() {
+
+		WithUnwrapped probe = new WithUnwrapped();
+		probe.prefixedUnwrappedValue = new UnwrappableType();
+		probe.prefixedUnwrappedValue.atFieldAnnotatedValue = "@Field";
+		probe.prefixedUnwrappedValue.stringValue = "string-value";
+
+		org.bson.Document document = mapper.getMappedExample(Example.of(probe, UntypedExampleMatcher.matching()));
+		assertThat(document).containsEntry("prefix-stringValue", "string-value")
+				.containsEntry("prefix-with-at-field-annotation", "@Field");
+	}
+
+	@Test // DATAMONGO-1902
+	void mapsNestedUnwrappedType() {
+
+		WrapperAroundWithUnwrapped probe = new WrapperAroundWithUnwrapped();
+		probe.withUnwrapped = new WithUnwrapped();
+		probe.withUnwrapped.unwrappedValue = new UnwrappableType();
+		probe.withUnwrapped.unwrappedValue.atFieldAnnotatedValue = "@Field";
+		probe.withUnwrapped.unwrappedValue.stringValue = "string-value";
+
+		org.bson.Document document = mapper.getMappedExample(Example.of(probe, UntypedExampleMatcher.matching()));
+		assertThat(document).containsEntry("withUnwrapped.stringValue", "string-value")
+				.containsEntry("withUnwrapped.with-at-field-annotation", "@Field");
+	}
+
+	@Test // DATAMONGO-1902
+	void mapsNestedPrefixedUnwrappedType() {
+
+		WrapperAroundWithUnwrapped probe = new WrapperAroundWithUnwrapped();
+		probe.withUnwrapped = new WithUnwrapped();
+		probe.withUnwrapped.prefixedUnwrappedValue = new UnwrappableType();
+		probe.withUnwrapped.prefixedUnwrappedValue.atFieldAnnotatedValue = "@Field";
+		probe.withUnwrapped.prefixedUnwrappedValue.stringValue = "string-value";
+
+		org.bson.Document document = mapper.getMappedExample(Example.of(probe, UntypedExampleMatcher.matching()));
+		assertThat(document).containsEntry("withUnwrapped.prefix-stringValue", "string-value")
+				.containsEntry("withUnwrapped.prefix-with-at-field-annotation", "@Field");
+	}
+
 	static class FlatDocument {
 
 		@Id String id;
@@ -481,4 +531,29 @@ static class ReferenceDocument {
 		@Id String id;
 		String value;
 	}
+
+	@Document
+	static class WrapperAroundWithUnwrapped {
+
+		String id;
+		WithUnwrapped withUnwrapped;
+	}
+
+	@Document
+	static class WithUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable UnwrappableType unwrappedValue;
+		@Unwrapped.Nullable("prefix-") UnwrappableType prefixedUnwrappedValue;
+	}
+
+	static class UnwrappableType {
+
+		@Indexed String stringValue;
+
+		@Indexed //
+		@Field("with-at-field-annotation") //
+		String atFieldAnnotatedValue;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapperUnitTests.java
index 64addf98f8..558c0d65ec 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MongoJsonSchemaMapperUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
@@ -105,7 +105,7 @@ public class MongoJsonSchemaMapperUnitTests {
 			"         }" + //
 			"      } }";
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		mapper = new MongoJsonSchemaMapper(new MappingMongoConverter(mock(DbRefResolver.class), new MongoMappingContext()));
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NamedMongoScriptConvertsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NamedMongoScriptConvertsUnitTests.java
index a92e9da3de..fb19ecf3b6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NamedMongoScriptConvertsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NamedMongoScriptConvertsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 import org.bson.Document;
 import org.bson.types.Code;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NumberToNumberConverterFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NumberToNumberConverterFactoryUnitTests.java
index 271c43bedd..9df15a674a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NumberToNumberConverterFactoryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/NumberToNumberConverterFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ObjectPathUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ObjectPathUnitTests.java
index 6dd2cf8737..9e58693faa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ObjectPathUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ObjectPathUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,12 +18,12 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.TypeInformation;
 
 /**
  * Unit tests for {@link ObjectPath}.
@@ -36,12 +36,12 @@ public class ObjectPathUnitTests {
 	MongoPersistentEntity<EntityTwo> two;
 	MongoPersistentEntity<EntityThree> three;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		one = new BasicMongoPersistentEntity<>(ClassTypeInformation.from(EntityOne.class));
-		two = new BasicMongoPersistentEntity<>(ClassTypeInformation.from(EntityTwo.class));
-		three = new BasicMongoPersistentEntity<>(ClassTypeInformation.from(EntityThree.class));
+		one = new BasicMongoPersistentEntity<>(TypeInformation.of(EntityOne.class));
+		two = new BasicMongoPersistentEntity<>(TypeInformation.of(EntityTwo.class));
+		three = new BasicMongoPersistentEntity<>(TypeInformation.of(EntityThree.class));
 	}
 
 	@Test // DATAMONGO-1703
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
index 3f2ed4f531..72d0055389 100755
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/QueryMapperUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.springframework.data.mongodb.core.convert;
 
 import static org.springframework.data.mongodb.core.DocumentTestUtils.*;
+import static org.springframework.data.mongodb.core.aggregation.AggregationExpressionCriteria.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
@@ -27,38 +28,52 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TreeMap;
+import java.util.regex.Pattern;
 
+import org.bson.BsonRegularExpression;
+import org.bson.conversions.Bson;
 import org.bson.types.Code;
 import org.bson.types.ObjectId;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.convert.ValueConverter;
+import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.Person;
+import org.springframework.data.mongodb.core.aggregation.ComparisonOperators;
+import org.springframework.data.mongodb.core.aggregation.ConditionalOperators;
+import org.springframework.data.mongodb.core.aggregation.EvaluationOperators;
+import org.springframework.data.mongodb.core.aggregation.EvaluationOperators.Expr;
+import org.springframework.data.mongodb.core.aggregation.TypeBasedAggregationOperationContext;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.geo.GeoJsonPolygon;
-import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.FieldName.Type;
 import org.springframework.data.mongodb.core.mapping.FieldType;
+import org.springframework.data.mongodb.core.mapping.MongoId;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.TextScore;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.TextQuery;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.DBObject;
-import com.mongodb.QueryBuilder;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.model.Filters;
 
 /**
  * Unit tests for {@link QueryMapper}.
@@ -68,40 +83,42 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author David Julia
+ * @author Gyungrai Wang
  */
-@ExtendWith(MockitoExtension.class)
 public class QueryMapperUnitTests {
 
-	QueryMapper mapper;
-	MongoMappingContext context;
-	MappingMongoConverter converter;
-
-	@Mock MongoDbFactory factory;
+	private QueryMapper mapper;
+	private MongoMappingContext context;
+	private MappingMongoConverter converter;
 
 	@BeforeEach
-	public void beforeEach() {
+	void beforeEach() {
 
+		MongoCustomConversions conversions = new MongoCustomConversions();
 		this.context = new MongoMappingContext();
+		this.context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 
-		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), context);
+		this.converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
+		this.converter.setCustomConversions(conversions);
 		this.converter.afterPropertiesSet();
 
 		this.mapper = new QueryMapper(converter);
 	}
 
 	@Test
-	public void translatesIdPropertyIntoIdKey() {
+	void translatesIdPropertyIntoIdKey() {
 
 		org.bson.Document query = new org.bson.Document("foo", "value");
 		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(Sample.class);
 
 		org.bson.Document result = mapper.getMappedObject(query, entity);
-		assertThat(result.get("_id")).isNotNull();
-		assertThat(result.get("foo")).isNull();
+		assertThat(result).containsKey("_id");
+		assertThat(result).doesNotContainKey("foo");
 	}
 
 	@Test
-	public void convertsStringIntoObjectId() {
+	void convertsStringIntoObjectId() {
 
 		org.bson.Document query = new org.bson.Document("_id", new ObjectId().toString());
 		org.bson.Document result = mapper.getMappedObject(query, context.getPersistentEntity(IdWrapper.class));
@@ -109,24 +126,98 @@ public void convertsStringIntoObjectId() {
 	}
 
 	@Test
-	public void handlesBigIntegerIdsCorrectly() {
+	void handlesBigIntegerIdsCorrectly() {
 
 		org.bson.Document document = new org.bson.Document("id", new BigInteger("1"));
 		org.bson.Document result = mapper.getMappedObject(document, context.getPersistentEntity(IdWrapper.class));
-		assertThat(result.get("_id")).isEqualTo("1");
+		assertThat(result).containsEntry("_id", "1");
 	}
 
 	@Test
-	public void handlesObjectIdCapableBigIntegerIdsCorrectly() {
+	void handlesObjectIdCapableBigIntegerIdsCorrectly() {
 
 		ObjectId id = new ObjectId();
 		org.bson.Document document = new org.bson.Document("id", new BigInteger(id.toString(), 16));
 		org.bson.Document result = mapper.getMappedObject(document, context.getPersistentEntity(IdWrapper.class));
-		assertThat(result.get("_id")).isEqualTo(id);
+		assertThat(result).containsEntry("_id", id);
+	}
+
+	@Test // GH-4490
+	void translates$GtCorrectly() {
+
+		Criteria criteria = where("id").gt(new ObjectId().toString());
+
+		org.bson.Document query = new org.bson.Document("id", new ObjectId().toString());
+		org.bson.Document result = mapper.getMappedObject(criteria.getCriteriaObject(),
+				context.getPersistentEntity(IdWrapper.class));
+		Object object = result.get("_id");
+		assertThat(object).isInstanceOf(org.bson.Document.class);
+		org.bson.Document document = (org.bson.Document) object;
+		assertThat(document.get("$gt")).isInstanceOf(ObjectId.class);
+	}
+
+	@Test // GH-4490
+	void translates$GteCorrectly() {
+
+		Criteria criteria = where("id").gte(new ObjectId().toString());
+
+		org.bson.Document query = new org.bson.Document("id", new ObjectId().toString());
+		org.bson.Document result = mapper.getMappedObject(criteria.getCriteriaObject(),
+				context.getPersistentEntity(IdWrapper.class));
+		Object object = result.get("_id");
+		assertThat(object).isInstanceOf(org.bson.Document.class);
+		org.bson.Document document = (org.bson.Document) object;
+		assertThat(document.get("$gte")).isInstanceOf(ObjectId.class);
+	}
+
+	@Test // GH-4490
+	void translates$LteCorrectly() {
+
+		Criteria criteria = where("id").lte(new ObjectId().toString());
+
+		org.bson.Document query = new org.bson.Document("id", new ObjectId().toString());
+		org.bson.Document result = mapper.getMappedObject(criteria.getCriteriaObject(),
+				context.getPersistentEntity(IdWrapper.class));
+		Object object = result.get("_id");
+		assertThat(object).isInstanceOf(org.bson.Document.class);
+		org.bson.Document document = (org.bson.Document) object;
+		assertThat(document.get("$lte")).isInstanceOf(ObjectId.class);
+	}
+
+	@Test // GH-4490
+	void translates$LtCorrectly() {
+
+		Criteria criteria = where("id").lt(new ObjectId().toString());
+
+		org.bson.Document query = new org.bson.Document("id", new ObjectId().toString());
+		org.bson.Document result = mapper.getMappedObject(criteria.getCriteriaObject(),
+				context.getPersistentEntity(IdWrapper.class));
+		Object object = result.get("_id");
+		assertThat(object).isInstanceOf(org.bson.Document.class);
+		org.bson.Document document = (org.bson.Document) object;
+		assertThat(document.get("$lt")).isInstanceOf(ObjectId.class);
+	}
+
+	@Test // GH-4490
+	void translatesMultipleCompareOperatorsCorrectly() {
+
+		Criteria criteria = where("id").lt(new ObjectId().toString()).lte(new ObjectId().toString())
+				.gt(new ObjectId().toString()).gte(new ObjectId().toString());
+
+		org.bson.Document query = new org.bson.Document("id", new ObjectId().toString());
+		org.bson.Document result = mapper.getMappedObject(criteria.getCriteriaObject(),
+				context.getPersistentEntity(IdWrapper.class));
+		Object object = result.get("_id");
+		assertThat(object).isInstanceOf(org.bson.Document.class);
+		org.bson.Document document = (org.bson.Document) object;
+		assertThat(document.get("$lt")).isInstanceOf(ObjectId.class);
+		assertThat(document.get("$lte")).isInstanceOf(ObjectId.class);
+		assertThat(document.get("$gt")).isInstanceOf(ObjectId.class);
+		assertThat(document.get("$gte")).isInstanceOf(ObjectId.class);
 	}
 
 	@Test // DATAMONGO-278
-	public void translates$NeCorrectly() {
+	void translates$NeCorrectly() {
 
 		Criteria criteria = where("foo").ne(new ObjectId().toString());
 
@@ -139,7 +230,7 @@ public void handlesObjectIdCapableBigIntegerIdsCorrectly() {
 	}
 
 	@Test // DATAMONGO-326
-	public void handlesEnumsCorrectly() {
+	void handlesEnumsCorrectly() {
 		Query query = query(where("foo").is(Enum.INSTANCE));
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(), Optional.empty());
 
@@ -148,7 +239,7 @@ public void handlesEnumsCorrectly() {
 	}
 
 	@Test
-	public void handlesEnumsInNotEqualCorrectly() {
+	void handlesEnumsInNotEqualCorrectly() {
 		Query query = query(where("foo").ne(Enum.INSTANCE));
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(), Optional.empty());
 
@@ -156,12 +247,11 @@ public void handlesEnumsInNotEqualCorrectly() {
 		assertThat(object).isInstanceOf(org.bson.Document.class);
 
 		Object ne = ((org.bson.Document) object).get("$ne");
-		assertThat(ne).isInstanceOf(String.class);
-		assertThat(ne.toString()).isEqualTo(Enum.INSTANCE.name());
+		assertThat(ne).isInstanceOf(String.class).hasToString(Enum.INSTANCE.name());
 	}
 
 	@Test
-	public void handlesEnumsIn$InCorrectly() {
+	void handlesEnumsIn$InCorrectly() {
 
 		Query query = query(where("foo").in(Enum.INSTANCE));
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(), Optional.empty());
@@ -174,30 +264,30 @@ public void handlesEnumsInNotEqualCorrectly() {
 
 		List list = (List) in;
 		assertThat(list).hasSize(1);
-		assertThat(list.get(0)).isInstanceOf(String.class);
-		assertThat(list.get(0).toString()).isEqualTo(Enum.INSTANCE.name());
+		assertThat(list.get(0)).isInstanceOf(String.class).hasToString(Enum.INSTANCE.name());
 	}
 
 	@Test // DATAMONGO-373
-	public void handlesNativelyBuiltQueryCorrectly() {
+	void handlesNativelyBuiltQueryCorrectly() {
 
-		DBObject query = new QueryBuilder().or(new BasicDBObject("foo", "bar")).get();
-		mapper.getMappedObject(new org.bson.Document(query.toMap()), Optional.empty());
+		Bson query = new BasicDBObject(Filters.or(new BasicDBObject("foo", "bar")).toBsonDocument(org.bson.Document.class,
+				MongoClientSettings.getDefaultCodecRegistry()));
+		mapper.getMappedObject(query, Optional.empty());
 	}
 
 	@Test // DATAMONGO-369
-	public void handlesAllPropertiesIfDocument() {
+	void handlesAllPropertiesIfDocument() {
 
 		org.bson.Document query = new org.bson.Document();
 		query.put("foo", new org.bson.Document("$in", Arrays.asList(1, 2)));
 		query.put("bar", new Person());
 
 		org.bson.Document result = mapper.getMappedObject(query, Optional.empty());
-		assertThat(result.get("bar")).isNotNull();
+		assertThat(result).containsKey("bar");
 	}
 
 	@Test // DATAMONGO-429
-	public void transformsArraysCorrectly() {
+	void transformsArraysCorrectly() {
 
 		Query query = new BasicQuery("{ 'tags' : { '$all' : [ 'green', 'orange']}}");
 
@@ -206,7 +296,7 @@ public void transformsArraysCorrectly() {
 	}
 
 	@Test
-	public void doesHandleNestedFieldsWithDefaultIdNames() {
+	void doesHandleNestedFieldsWithDefaultIdNames() {
 
 		org.bson.Document document = new org.bson.Document("id", new ObjectId().toString());
 		document.put("nested", new org.bson.Document("id", new ObjectId().toString()));
@@ -219,7 +309,7 @@ public void doesHandleNestedFieldsWithDefaultIdNames() {
 	}
 
 	@Test // DATAMONGO-493
-	public void doesNotTranslateNonIdPropertiesFor$NeCriteria() {
+	void doesNotTranslateNonIdPropertiesFor$NeCriteria() {
 
 		ObjectId accidentallyAnObjectId = new ObjectId();
 
@@ -231,12 +321,12 @@ public void doesHandleNestedFieldsWithDefaultIdNames() {
 		assertThat(document.get("publishers")).isInstanceOf(org.bson.Document.class);
 
 		org.bson.Document publishers = (org.bson.Document) document.get("publishers");
-		assertThat(publishers.containsKey("$ne")).isTrue();
+		assertThat(publishers).containsKey("$ne");
 		assertThat(publishers.get("$ne")).isInstanceOf(String.class);
 	}
 
 	@Test // DATAMONGO-494
-	public void usesEntityMetadataInOr() {
+	void usesEntityMetadataInOr() {
 
 		Query query = query(new Criteria().orOperator(where("foo").is("bar")));
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(),
@@ -248,44 +338,43 @@ public void usesEntityMetadataInOr() {
 		assertThat(ors).hasSize(1);
 		org.bson.Document criterias = getAsDocument(ors, 0);
 		assertThat(criterias.keySet()).hasSize(1).doesNotContain("foo");
-		assertThat(criterias.get("_id")).isNotNull();
+		assertThat(criterias).containsKey("_id");
 	}
 
 	@Test
-	public void translatesPropertyReferenceCorrectly() {
+	void translatesPropertyReferenceCorrectly() {
 
 		Query query = query(where("field").is(new CustomizedField()));
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(),
 				context.getPersistentEntity(CustomizedField.class));
 
-		assertThat(result.containsKey("foo")).isTrue();
-		assertThat(result.keySet()).hasSize(1);
+		assertThat(result).containsKey("foo").hasSize(1);
 	}
 
 	@Test
-	public void translatesNestedPropertyReferenceCorrectly() {
+	void translatesNestedPropertyReferenceCorrectly() {
 
 		Query query = query(where("field.field").is(new CustomizedField()));
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(),
 				context.getPersistentEntity(CustomizedField.class));
 
-		assertThat(result.containsKey("foo.foo")).isTrue();
+		assertThat(result).containsKey("foo.foo");
 		assertThat(result.keySet()).hasSize(1);
 	}
 
 	@Test
-	public void returnsOriginalKeyIfNoPropertyReference() {
+	void returnsOriginalKeyIfNoPropertyReference() {
 
 		Query query = query(where("bar").is(new CustomizedField()));
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(),
 				context.getPersistentEntity(CustomizedField.class));
 
-		assertThat(result.containsKey("bar")).isTrue();
+		assertThat(result).containsKey("bar");
 		assertThat(result.keySet()).hasSize(1);
 	}
 
 	@Test
-	public void convertsAssociationCorrectly() {
+	void convertsAssociationCorrectly() {
 
 		Reference reference = new Reference();
 		reference.id = 5L;
@@ -300,7 +389,7 @@ public void convertsAssociationCorrectly() {
 	}
 
 	@Test
-	public void convertsNestedAssociationCorrectly() {
+	void convertsNestedAssociationCorrectly() {
 
 		Reference reference = new Reference();
 		reference.id = 5L;
@@ -315,7 +404,7 @@ public void convertsNestedAssociationCorrectly() {
 	}
 
 	@Test
-	public void convertsInKeywordCorrectly() {
+	void convertsInKeywordCorrectly() {
 
 		Reference first = new Reference();
 		first.id = 5L;
@@ -336,7 +425,7 @@ public void convertsInKeywordCorrectly() {
 	}
 
 	@Test // DATAMONGO-570
-	public void correctlyConvertsNullReference() {
+	void correctlyConvertsNullReference() {
 
 		Query query = query(where("reference").is(null));
 		org.bson.Document object = mapper.getMappedObject(query.getQueryObject(),
@@ -346,20 +435,20 @@ public void correctlyConvertsNullReference() {
 	}
 
 	@Test // DATAMONGO-629
-	public void doesNotMapIdIfNoEntityMetadataAvailable() {
+	void doesNotMapIdIfNoEntityMetadataAvailable() {
 
 		String id = new ObjectId().toString();
 		Query query = query(where("id").is(id));
 
 		org.bson.Document object = mapper.getMappedObject(query.getQueryObject(), Optional.empty());
 
-		assertThat(object.containsKey("id")).isTrue();
-		assertThat(object.get("id")).isEqualTo(id);
-		assertThat(object.containsKey("_id")).isFalse();
+		assertThat(object).containsKey("id");
+		assertThat(object).containsEntry("id", id);
+		assertThat(object).doesNotContainKey("_id");
 	}
 
 	@Test // DATAMONGO-677
-	public void handleMapWithDBRefCorrectly() {
+	void handleMapWithDBRefCorrectly() {
 
 		org.bson.Document mapDocument = new org.bson.Document();
 		mapDocument.put("test", new com.mongodb.DBRef("test", "test"));
@@ -368,47 +457,47 @@ public void handleMapWithDBRefCorrectly() {
 
 		org.bson.Document mapped = mapper.getMappedObject(document, context.getPersistentEntity(WithMapDBRef.class));
 
-		assertThat(mapped.containsKey("mapWithDBRef")).isTrue();
+		assertThat(mapped).containsKey("mapWithDBRef");
 		assertThat(mapped.get("mapWithDBRef")).isInstanceOf(org.bson.Document.class);
-		assertThat(((org.bson.Document) mapped.get("mapWithDBRef")).containsKey("test")).isTrue();
+		assertThat(((org.bson.Document) mapped.get("mapWithDBRef"))).containsKey("test");
 		assertThat(((org.bson.Document) mapped.get("mapWithDBRef")).get("test")).isInstanceOf(com.mongodb.DBRef.class);
 	}
 
 	@Test
-	public void convertsUnderscoreIdValueWithoutMetadata() {
+	void convertsUnderscoreIdValueWithoutMetadata() {
 
 		org.bson.Document document = new org.bson.Document().append("_id", new ObjectId().toString());
 
 		org.bson.Document mapped = mapper.getMappedObject(document, Optional.empty());
-		assertThat(mapped.containsKey("_id")).isTrue();
+		assertThat(mapped).containsKey("_id");
 		assertThat(mapped.get("_id")).isInstanceOf(ObjectId.class);
 	}
 
 	@Test // DATAMONGO-705
-	public void convertsDBRefWithExistsQuery() {
+	void convertsDBRefWithExistsQuery() {
 
 		Query query = query(where("reference").exists(false));
 
-		BasicMongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(WithDBRef.class);
+		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(WithDBRef.class);
 		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(), entity);
 
 		org.bson.Document reference = getAsDocument(mappedObject, "reference");
-		assertThat(reference.containsKey("$exists")).isTrue();
-		assertThat(reference.get("$exists")).isEqualTo(false);
+		assertThat(reference).containsKey("$exists");
+		assertThat(reference).containsEntry("$exists", false);
 	}
 
 	@Test // DATAMONGO-706
-	public void convertsNestedDBRefsCorrectly() {
+	void convertsNestedDBRefsCorrectly() {
 
 		Reference reference = new Reference();
 		reference.id = 5L;
 
 		Query query = query(where("someString").is("foo").andOperator(where("reference").in(reference)));
 
-		BasicMongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(WithDBRef.class);
+		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(WithDBRef.class);
 		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(), entity);
 
-		assertThat(mappedObject.get("someString")).isEqualTo("foo");
+		assertThat(mappedObject).containsEntry("someString", "foo");
 
 		List<Object> andClause = getAsDBList(mappedObject, "$and");
 		assertThat(andClause).hasSize(1);
@@ -418,46 +507,125 @@ public void convertsNestedDBRefsCorrectly() {
 		assertThat(inClause.get(0)).isInstanceOf(com.mongodb.DBRef.class);
 	}
 
+	@Test // GH-3853
+	void convertsDocumentReferenceOnIdPropertyCorrectly() {
+
+		Sample reference = new Sample();
+		reference.foo = "s1";
+
+		Query query = query(where("sample").is(reference));
+		org.bson.Document mappedQuery = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedQuery).containsEntry("sample", "s1");
+	}
+
+	@Test // GH-4033
+	void convertsNestedPathToIdPropertyOfDocumentReferenceCorrectly() {
+
+		Query query = query(where("sample.foo").is("s1"));
+		org.bson.Document mappedQuery = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedQuery).containsEntry("sample", "s1");
+	}
+
+	@Test // GH-4033
+	void convertsNestedPathToIdPropertyOfDocumentReferenceCorrectlyWhenItShouldBeConvertedToObjectId() {
+
+		ObjectId id = new ObjectId();
+		Query query = query(where("sample.foo").is(id.toHexString()));
+		org.bson.Document mappedQuery = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedQuery.get("sample")).satisfies(it -> {
+
+			assertThat(it).isInstanceOf(ObjectId.class);
+			assertThat(((ObjectId) it).toHexString()).isEqualTo(id.toHexString());
+		});
+	}
+
+	@Test // GH-3853
+	void convertsListDocumentReferenceOnIdPropertyCorrectly() {
+
+		Sample reference = new Sample();
+		reference.foo = "s1";
+
+		Query query = query(where("samples").is(Arrays.asList(reference)));
+		org.bson.Document mappedQuery = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedQuery).containsEntry("samples", Arrays.asList("s1"));
+	}
+
+	@Test // GH-3853
+	void convertsDocumentReferenceOnNonIdPropertyCorrectly() {
+
+		Customer reference = new Customer();
+		reference.id = new ObjectId();
+		reference.name = "c1";
+
+		Query query = query(where("customer").is(reference));
+		org.bson.Document mappedQuery = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedQuery).containsEntry("customer", "c1");
+	}
+
+	@Test // GH-3853
+	void convertsListDocumentReferenceOnNonIdPropertyCorrectly() {
+
+		Customer reference = new Customer();
+		reference.id = new ObjectId();
+		reference.name = "c1";
+
+		Query query = query(where("customers").is(Arrays.asList(reference)));
+		org.bson.Document mappedQuery = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedQuery).containsEntry("customers", Arrays.asList("c1"));
+	}
+
 	@Test // DATAMONGO-752
-	public void mapsSimpleValuesStartingWith$Correctly() {
+	void mapsSimpleValuesStartingWith$Correctly() {
 
 		Query query = query(where("myvalue").is("$334"));
 
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(), Optional.empty());
 
 		assertThat(result.keySet()).hasSize(1);
-		assertThat(result.get("myvalue")).isEqualTo("$334");
+		assertThat(result).containsEntry("myvalue", "$334");
 	}
 
 	@Test // DATAMONGO-752
-	public void mapsKeywordAsSimpleValuesCorrectly() {
+	void mapsKeywordAsSimpleValuesCorrectly() {
 
 		Query query = query(where("myvalue").is("$center"));
 
 		org.bson.Document result = mapper.getMappedObject(query.getQueryObject(), Optional.empty());
 
 		assertThat(result.keySet()).hasSize(1);
-		assertThat(result.get("myvalue")).isEqualTo("$center");
+		assertThat(result).containsEntry("myvalue", "$center");
 	}
 
 	@Test // DATAMONGO-805
-	public void shouldExcludeDBRefAssociation() {
+	void shouldExcludeDBRefAssociation() {
 
 		Query query = query(where("someString").is("foo"));
 		query.fields().exclude("reference");
 
-		BasicMongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(WithDBRef.class);
+		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(WithDBRef.class);
 		org.bson.Document queryResult = mapper.getMappedObject(query.getQueryObject(), entity);
 		org.bson.Document fieldsResult = mapper.getMappedObject(query.getFieldsObject(), entity);
 
-		assertThat(queryResult.get("someString")).isEqualTo("foo");
-		assertThat(fieldsResult.get("reference")).isEqualTo(0);
+		assertThat(queryResult).containsEntry("someString", "foo");
+		assertThat(fieldsResult).containsEntry("reference", 0);
 	}
 
 	@Test // DATAMONGO-686
-	public void queryMapperShouldNotChangeStateInGivenQueryObjectWhenIdConstrainedByInList() {
+	void queryMapperShouldNotChangeStateInGivenQueryObjectWhenIdConstrainedByInList() {
 
-		BasicMongoPersistentEntity<?> persistentEntity = context.getRequiredPersistentEntity(Sample.class);
+		MongoPersistentEntity<?> persistentEntity = context.getRequiredPersistentEntity(Sample.class);
 		String idPropertyName = persistentEntity.getIdProperty().getName();
 		org.bson.Document queryObject = query(where(idPropertyName).in("42")).getQueryObject();
 
@@ -469,11 +637,11 @@ public void queryMapperShouldNotChangeStateInGivenQueryObjectWhenIdConstrainedBy
 	}
 
 	@Test // DATAMONGO-821
-	public void queryMapperShouldNotTryToMapDBRefListPropertyIfNestedInsideDocumentWithinDocument() {
+	void queryMapperShouldNotTryToMapDBRefListPropertyIfNestedInsideDocumentWithinDocument() {
 
 		org.bson.Document queryObject = query(
 				where("referenceList").is(new org.bson.Document("$nested", new org.bson.Document("$keys", 0L))))
-						.getQueryObject();
+				.getQueryObject();
 
 		org.bson.Document mappedObject = mapper.getMappedObject(queryObject,
 				context.getPersistentEntity(WithDBRefList.class));
@@ -484,7 +652,7 @@ public void queryMapperShouldNotTryToMapDBRefListPropertyIfNestedInsideDocumentW
 	}
 
 	@Test // DATAMONGO-821
-	public void queryMapperShouldNotTryToMapDBRefPropertyIfNestedInsideDocumentWithinDocument() {
+	void queryMapperShouldNotTryToMapDBRefPropertyIfNestedInsideDocumentWithinDocument() {
 
 		org.bson.Document queryObject = query(
 				where("reference").is(new org.bson.Document("$nested", new org.bson.Document("$keys", 0L)))).getQueryObject();
@@ -497,7 +665,7 @@ public void queryMapperShouldNotTryToMapDBRefPropertyIfNestedInsideDocumentWithi
 	}
 
 	@Test // DATAMONGO-821
-	public void queryMapperShouldMapDBRefPropertyIfNestedInDocument() {
+	void queryMapperShouldMapDBRefPropertyIfNestedInDocument() {
 
 		Reference sample = new Reference();
 		sample.id = 321L;
@@ -513,9 +681,9 @@ public void queryMapperShouldMapDBRefPropertyIfNestedInDocument() {
 	}
 
 	@Test // DATAMONGO-773
-	public void queryMapperShouldBeAbleToProcessQueriesThatIncludeDbRefFields() {
+	void queryMapperShouldBeAbleToProcessQueriesThatIncludeDbRefFields() {
 
-		BasicMongoPersistentEntity<?> persistentEntity = context.getRequiredPersistentEntity(WithDBRef.class);
+		MongoPersistentEntity<?> persistentEntity = context.getRequiredPersistentEntity(WithDBRef.class);
 
 		Query qry = query(where("someString").is("abc"));
 		qry.fields().include("reference");
@@ -525,7 +693,7 @@ public void queryMapperShouldBeAbleToProcessQueriesThatIncludeDbRefFields() {
 	}
 
 	@Test // DATAMONGO-893
-	public void classInformationShouldNotBePresentInDocumentUsedInFinderMethods() {
+	void classInformationShouldNotBePresentInDocumentUsedInFinderMethods() {
 
 		EmbeddedClass embedded = new EmbeddedClass();
 		embedded.id = "1";
@@ -539,7 +707,7 @@ public void classInformationShouldNotBePresentInDocumentUsedInFinderMethods() {
 	}
 
 	@Test // DATAMONGO-1406
-	public void shouldMapQueryForNestedCustomizedPropertiesUsingConfiguredFieldNames() {
+	void shouldMapQueryForNestedCustomizedPropertiesUsingConfiguredFieldNames() {
 
 		EmbeddedClass embeddedClass = new EmbeddedClass();
 		embeddedClass.customizedField = "hello";
@@ -558,7 +726,7 @@ public void shouldMapQueryForNestedCustomizedPropertiesUsingConfiguredFieldNames
 	}
 
 	@Test // DATAMONGO-647
-	public void customizedFieldNameShouldBeMappedCorrectlyWhenApplyingSort() {
+	void customizedFieldNameShouldBeMappedCorrectlyWhenApplyingSort() {
 
 		Query query = query(where("field").is("bar")).with(Sort.by(Direction.DESC, "field"));
 		org.bson.Document document = mapper.getMappedObject(query.getSortObject(),
@@ -567,7 +735,7 @@ public void customizedFieldNameShouldBeMappedCorrectlyWhenApplyingSort() {
 	}
 
 	@Test // DATAMONGO-973
-	public void getMappedFieldsAppendsTextScoreFieldProperlyCorrectlyWhenNotPresent() {
+	void getMappedFieldsAppendsTextScoreFieldProperlyCorrectlyWhenNotPresent() {
 
 		Query query = new Query();
 
@@ -579,7 +747,7 @@ public void getMappedFieldsAppendsTextScoreFieldProperlyCorrectlyWhenNotPresent(
 	}
 
 	@Test // DATAMONGO-973
-	public void getMappedFieldsReplacesTextScoreFieldProperlyCorrectlyWhenPresent() {
+	void getMappedFieldsReplacesTextScoreFieldProperlyCorrectlyWhenPresent() {
 
 		Query query = new Query();
 		query.fields().include("textScore");
@@ -592,7 +760,7 @@ public void getMappedFieldsReplacesTextScoreFieldProperlyCorrectlyWhenPresent()
 	}
 
 	@Test // DATAMONGO-973
-	public void getMappedSortAppendsTextScoreProperlyWhenSortedByScore() {
+	void getMappedSortAppendsTextScoreProperlyWhenSortedByScore() {
 
 		Query query = new Query().with(Sort.by("textScore"));
 
@@ -604,7 +772,7 @@ public void getMappedSortAppendsTextScoreProperlyWhenSortedByScore() {
 	}
 
 	@Test // DATAMONGO-973
-	public void getMappedSortIgnoresTextScoreWhenNotSortedByScore() {
+	void getMappedSortIgnoresTextScoreWhenNotSortedByScore() {
 
 		Query query = new Query().with(Sort.by("id"));
 
@@ -615,20 +783,20 @@ public void getMappedSortIgnoresTextScoreWhenNotSortedByScore() {
 	}
 
 	@Test // DATAMONGO-1070, DATAMONGO-1798
-	public void mapsIdReferenceToDBRefCorrectly() {
+	void mapsIdReferenceToDBRefCorrectly() {
 
 		ObjectId id = new ObjectId();
 
 		org.bson.Document query = new org.bson.Document("reference.id", new com.mongodb.DBRef("reference", id));
 		org.bson.Document result = mapper.getMappedObject(query, context.getPersistentEntity(WithDBRef.class));
 
-		assertThat(result.containsKey("reference")).isTrue();
+		assertThat(result).containsKey("reference");
 		com.mongodb.DBRef reference = getTypedValue(result, "reference", com.mongodb.DBRef.class);
 		assertThat(reference.getId()).isInstanceOf(ObjectId.class);
 	}
 
 	@Test // DATAMONGO-1050
-	public void shouldUseExplicitlySetFieldnameForIdPropertyCandidates() {
+	void shouldUseExplicitlySetFieldnameForIdPropertyCandidates() {
 
 		Query query = query(where("nested.id").is("bar"));
 
@@ -639,7 +807,7 @@ public void shouldUseExplicitlySetFieldnameForIdPropertyCandidates() {
 	}
 
 	@Test // DATAMONGO-1050
-	public void shouldUseExplicitlySetFieldnameForIdPropertyCandidatesUsedInSortClause() {
+	void shouldUseExplicitlySetFieldnameForIdPropertyCandidatesUsedInSortClause() {
 
 		Query query = new Query().with(Sort.by("nested.id"));
 
@@ -650,7 +818,7 @@ public void shouldUseExplicitlySetFieldnameForIdPropertyCandidatesUsedInSortClau
 	}
 
 	@Test // DATAMONGO-1135
-	public void nearShouldUseGeoJsonRepresentationOnUnmappedProperty() {
+	void nearShouldUseGeoJsonRepresentationOnUnmappedProperty() {
 
 		Query query = query(where("foo").near(new GeoJsonPoint(100, 50)));
 
@@ -663,7 +831,7 @@ public void nearShouldUseGeoJsonRepresentationOnUnmappedProperty() {
 	}
 
 	@Test // DATAMONGO-1135
-	public void nearShouldUseGeoJsonRepresentationWhenMappingToGoJsonType() {
+	void nearShouldUseGeoJsonRepresentationWhenMappingToGoJsonType() {
 
 		Query query = query(where("geoJsonPoint").near(new GeoJsonPoint(100, 50)));
 
@@ -674,7 +842,7 @@ public void nearShouldUseGeoJsonRepresentationWhenMappingToGoJsonType() {
 	}
 
 	@Test // DATAMONGO-1135
-	public void nearSphereShouldUseGeoJsonRepresentationWhenMappingToGoJsonType() {
+	void nearSphereShouldUseGeoJsonRepresentationWhenMappingToGoJsonType() {
 
 		Query query = query(where("geoJsonPoint").nearSphere(new GeoJsonPoint(100, 50)));
 
@@ -685,7 +853,7 @@ public void nearSphereShouldUseGeoJsonRepresentationWhenMappingToGoJsonType() {
 	}
 
 	@Test // DATAMONGO-1135
-	public void shouldMapNameCorrectlyForGeoJsonType() {
+	void shouldMapNameCorrectlyForGeoJsonType() {
 
 		Query query = query(where("namedGeoJsonPoint").nearSphere(new GeoJsonPoint(100, 50)));
 
@@ -696,7 +864,7 @@ public void shouldMapNameCorrectlyForGeoJsonType() {
 	}
 
 	@Test // DATAMONGO-1135
-	public void withinShouldUseGeoJsonPolygonWhenMappingPolygonOn2DSphereIndex() {
+	void withinShouldUseGeoJsonPolygonWhenMappingPolygonOn2DSphereIndex() {
 
 		Query query = query(where("geoJsonPoint")
 				.within(new GeoJsonPolygon(new Point(0, 0), new Point(100, 100), new Point(100, 0), new Point(0, 0))));
@@ -708,7 +876,7 @@ public void withinShouldUseGeoJsonPolygonWhenMappingPolygonOn2DSphereIndex() {
 	}
 
 	@Test // DATAMONGO-1134
-	public void intersectsShouldUseGeoJsonRepresentationCorrectly() {
+	void intersectsShouldUseGeoJsonRepresentationCorrectly() {
 
 		Query query = query(where("geoJsonPoint")
 				.intersects(new GeoJsonPolygon(new Point(0, 0), new Point(100, 100), new Point(100, 0), new Point(0, 0))));
@@ -721,29 +889,51 @@ public void intersectsShouldUseGeoJsonRepresentationCorrectly() {
 	}
 
 	@Test // DATAMONGO-1269
-	public void mappingShouldRetainNumericMapKey() {
+	void mappingShouldRetainNumericMapKey() {
 
 		Query query = query(where("map.1.stringProperty").is("ba'alzamon"));
 
 		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
 				context.getPersistentEntity(EntityWithComplexValueTypeMap.class));
 
-		assertThat(document.containsKey("map.1.stringProperty")).isTrue();
+		assertThat(document).containsKey("map.1.stringProperty");
+	}
+
+	@Test // GH-3688
+	void mappingShouldRetainNestedNumericMapKeys() {
+
+		Query query = query(where("outerMap.1.map.2.stringProperty").is("ba'alzamon"));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(EntityWithIntKeyedMapOfMap.class));
+
+		assertThat(document).containsKey("outerMap.1.map.2.stringProperty");
+	}
+
+	@Test // GH-3688
+	void mappingShouldAllowSettingEntireNestedNumericKeyedMapValue() {
+
+		Query query = query(where("outerMap.1.map").is(null)); // newEntityWithComplexValueTypeMap()
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(EntityWithIntKeyedMapOfMap.class));
+
+		assertThat(document).containsKey("outerMap.1.map");
 	}
 
 	@Test // DATAMONGO-1269
-	public void mappingShouldRetainNumericPositionInList() {
+	void mappingShouldRetainNumericPositionInList() {
 
 		Query query = query(where("list.1.stringProperty").is("ba'alzamon"));
 
 		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
 				context.getPersistentEntity(EntityWithComplexValueTypeList.class));
 
-		assertThat(document.containsKey("list.1.stringProperty")).isTrue();
+		assertThat(document).containsKey("list.1.stringProperty");
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectly() {
+	void exampleShouldBeMappedCorrectly() {
 
 		Foo probe = new Foo();
 		probe.embedded = new EmbeddedClass();
@@ -757,7 +947,7 @@ public void exampleShouldBeMappedCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void exampleShouldBeMappedCorrectlyWhenContainingLegacyPoint() {
+	void exampleShouldBeMappedCorrectlyWhenContainingLegacyPoint() {
 
 		ClassWithGeoTypes probe = new ClassWithGeoTypes();
 		probe.legacyPoint = new Point(10D, 20D);
@@ -767,12 +957,26 @@ public void exampleShouldBeMappedCorrectlyWhenContainingLegacyPoint() {
 		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
 				context.getPersistentEntity(WithDBRef.class));
 
-		assertThat(document.get("legacyPoint.x")).isEqualTo(10D);
-		assertThat(document.get("legacyPoint.y")).isEqualTo(20D);
+		assertThat(document).containsEntry("legacyPoint.x", 10D);
+		assertThat(document).containsEntry("legacyPoint.y", 20D);
+	}
+
+	@Test // GH-3544
+	void exampleWithCombinedCriteriaShouldBeMappedCorrectly() {
+
+		Foo probe = new Foo();
+		probe.embedded = new EmbeddedClass();
+		probe.embedded.id = "conflux";
+
+		Query query = query(byExample(probe).and("listOfItems").exists(true));
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(), context.getPersistentEntity(Foo.class));
+
+		assertThat(document).containsEntry("embedded\\._id", "conflux").containsEntry("my_items",
+				new org.bson.Document("$exists", true));
 	}
 
 	@Test // DATAMONGO-1988
-	public void mapsStringObjectIdRepresentationToObjectIdWhenReferencingIdProperty() {
+	void mapsStringObjectIdRepresentationToObjectIdWhenReferencingIdProperty() {
 
 		Query query = query(where("sample.foo").is(new ObjectId().toHexString()));
 		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
@@ -782,7 +986,7 @@ public void mapsStringObjectIdRepresentationToObjectIdWhenReferencingIdProperty(
 	}
 
 	@Test // DATAMONGO-1988
-	public void matchesExactFieldNameToIdProperty() {
+	void matchesExactFieldNameToIdProperty() {
 
 		Query query = query(where("sample.iid").is(new ObjectId().toHexString()));
 		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
@@ -792,7 +996,7 @@ public void matchesExactFieldNameToIdProperty() {
 	}
 
 	@Test // DATAMONGO-1988
-	public void leavesNonObjectIdStringIdRepresentationUntouchedWhenReferencingIdProperty() {
+	void leavesNonObjectIdStringIdRepresentationUntouchedWhenReferencingIdProperty() {
 
 		Query query = query(where("sample.foo").is("id-1"));
 		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
@@ -802,7 +1006,7 @@ public void leavesNonObjectIdStringIdRepresentationUntouchedWhenReferencingIdPro
 	}
 
 	@Test // DATAMONGO-2168
-	public void getMappedObjectShouldNotMapTypeHint() {
+	void getMappedObjectShouldNotMapTypeHint() {
 
 		converter.setTypeMapper(new DefaultMongoTypeMapper("className"));
 
@@ -813,7 +1017,7 @@ public void getMappedObjectShouldNotMapTypeHint() {
 	}
 
 	@Test // DATAMONGO-2168
-	public void getMappedObjectShouldIgnorePathsLeadingToJavaLangClassProperties/* like Class#getName() */() {
+	void getMappedObjectShouldIgnorePathsLeadingToJavaLangClassProperties/* like Class#getName() */() {
 
 		org.bson.Document update = new org.bson.Document("className", "foo");
 		org.bson.Document mappedObject = mapper.getMappedObject(update, context.getPersistentEntity(UserEntity.class));
@@ -822,7 +1026,7 @@ public void getMappedObjectShouldNotMapTypeHint() {
 	}
 
 	@Test // DATAMONGO-2193
-	public void shouldNotConvertHexStringToObjectIdForRenamedNestedIdField() {
+	void shouldNotConvertHexStringToObjectIdForRenamedNestedIdField() {
 
 		String idHex = new ObjectId().toHexString();
 		Query query = new Query(where("nested.id").is(idHex));
@@ -834,7 +1038,7 @@ public void shouldNotConvertHexStringToObjectIdForRenamedNestedIdField() {
 	}
 
 	@Test // DATAMONGO-2221
-	public void shouldNotConvertHexStringToObjectIdForRenamedDeeplyNestedIdField() {
+	void shouldNotConvertHexStringToObjectIdForRenamedDeeplyNestedIdField() {
 
 		String idHex = new ObjectId().toHexString();
 		Query query = new Query(where("nested.deeplyNested.id").is(idHex));
@@ -846,7 +1050,7 @@ public void shouldNotConvertHexStringToObjectIdForRenamedDeeplyNestedIdField() {
 	}
 
 	@Test // DATAMONGO-2221
-	public void shouldNotConvertHexStringToObjectIdForUnresolvablePath() {
+	void shouldNotConvertHexStringToObjectIdForUnresolvablePath() {
 
 		String idHex = new ObjectId().toHexString();
 		Query query = new Query(where("nested.unresolvablePath.id").is(idHex));
@@ -858,7 +1062,7 @@ public void shouldNotConvertHexStringToObjectIdForUnresolvablePath() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void shouldConvertPropertyWithExplicitTargetType() {
+	void shouldConvertPropertyWithExplicitTargetType() {
 
 		String script = "if (a > b) a else b";
 		Query query = new Query(where("script").is(script));
@@ -870,7 +1074,7 @@ public void shouldConvertPropertyWithExplicitTargetType() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void shouldConvertCollectionPropertyWithExplicitTargetType() {
+	void shouldConvertCollectionPropertyWithExplicitTargetType() {
 
 		String script = "if (a > b) a else b";
 		Query query = new Query(where("scripts").is(script));
@@ -881,8 +1085,39 @@ public void shouldConvertCollectionPropertyWithExplicitTargetType() {
 		assertThat(document).isEqualTo(new org.bson.Document("scripts", new Code(script)));
 	}
 
+	@Test // GH-4649
+	void shouldRetainRegexPattern() {
+
+		Query query = new Query(where("text").regex("foo"));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithExplicitTargetTypes.class));
+
+		assertThat(document.get("text")).isInstanceOf(Pattern.class);
+
+		query = new Query(where("text").regex(new BsonRegularExpression("foo")));
+		document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithExplicitTargetTypes.class));
+		assertThat(document.get("text")).isInstanceOf(BsonRegularExpression.class);
+	}
+
+	@Test // GH-4674
+	void shouldRetainRegexPatternForIdProperty() {
+
+		org.bson.Document javaRegex = mapper.getMappedObject(query(where("id").regex("^1234$")).getQueryObject(),
+				context.getPersistentEntity(WithStringId.class));
+
+		assertThat(javaRegex.get("_id")).isInstanceOf(Pattern.class);
+
+		org.bson.Document bsonRegex = mapper.getMappedObject(
+				query(where("id").regex(new BsonRegularExpression("^1234$"))).getQueryObject(),
+				context.getPersistentEntity(WithStringId.class));
+
+		assertThat(bsonRegex.get("_id")).isInstanceOf(BsonRegularExpression.class);
+	}
+
 	@Test // DATAMONGO-2339
-	public void findByIdUsesMappedIdFieldNameWithUnderscoreCorrectly() {
+	void findByIdUsesMappedIdFieldNameWithUnderscoreCorrectly() {
 
 		org.bson.Document target = mapper.getMappedObject(new org.bson.Document("with_underscore", "id-1"),
 				context.getPersistentEntity(WithIdPropertyContainingUnderscore.class));
@@ -891,7 +1126,7 @@ public void findByIdUsesMappedIdFieldNameWithUnderscoreCorrectly() {
 	}
 
 	@Test // DATAMONGO-2394
-	public void leavesDistanceUntouchedWhenUsingGeoJson() {
+	void leavesDistanceUntouchedWhenUsingGeoJson() {
 
 		Query query = query(where("geoJsonPoint").near(new GeoJsonPoint(27.987901, 86.9165379)).maxDistance(1000));
 
@@ -901,18 +1136,611 @@ public void leavesDistanceUntouchedWhenUsingGeoJson() {
 		assertThat(document).containsEntry("geoJsonPoint.$near.$maxDistance", 1000.0D);
 	}
 
+	@Test // DATAMONGO-2440
+	void convertsInWithNonIdFieldAndObjectIdTypeHintCorrectly() {
+
+		String id = new ObjectId().toHexString();
+		NonIdFieldWithObjectIdTargetType source = new NonIdFieldWithObjectIdTargetType();
+
+		source.stringAsOid = id;
+
+		org.bson.Document target = mapper.getMappedObject(query(where("stringAsOid").in(id)).getQueryObject(),
+				context.getPersistentEntity(NonIdFieldWithObjectIdTargetType.class));
+		assertThat(target).isEqualTo(org.bson.Document.parse("{\"stringAsOid\": {\"$in\": [{\"$oid\": \"" + id + "\"}]}}"));
+	}
+
+	@Test // DATAMONGO-2440
+	void convertsInWithIdFieldAndObjectIdTypeHintCorrectly() {
+
+		String id = new ObjectId().toHexString();
+		NonIdFieldWithObjectIdTargetType source = new NonIdFieldWithObjectIdTargetType();
+
+		source.id = id;
+
+		org.bson.Document target = mapper.getMappedObject(query(where("id").in(id)).getQueryObject(),
+				context.getPersistentEntity(NonIdFieldWithObjectIdTargetType.class));
+		assertThat(target).isEqualTo(org.bson.Document.parse("{\"_id\": {\"$in\": [{\"$oid\": \"" + id + "\"}]}}"));
+	}
+
+	@Test // DATAMONGO-2488
+	void mapsNestedArrayPathCorrectlyForNonMatchingPath() {
+
+		org.bson.Document target = mapper.getMappedObject(
+				query(where("array.$[some_item].nested.$[other_item]").is("value")).getQueryObject(),
+				context.getPersistentEntity(Foo.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("array.$[some_item].nested.$[other_item]", "value"));
+	}
+
+	@Test // DATAMONGO-2488
+	void mapsNestedArrayPathCorrectlyForObjectTargetArray() {
+
+		org.bson.Document target = mapper.getMappedObject(
+				query(where("arrayObj.$[some_item].nested.$[other_item]").is("value")).getQueryObject(),
+				context.getPersistentEntity(WithNestedArray.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("arrayObj.$[some_item].nested.$[other_item]", "value"));
+	}
+
+	@Test // DATAMONGO-2488
+	void mapsNestedArrayPathCorrectlyForStringTargetArray() {
+
+		org.bson.Document target = mapper.getMappedObject(
+				query(where("arrayString.$[some_item].nested.$[other_item]").is("value")).getQueryObject(),
+				context.getPersistentEntity(WithNestedArray.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("arrayString.$[some_item].nested.$[other_item]", "value"));
+	}
+
+	@Test // DATAMONGO-2488
+	void mapsCustomFieldNamesForNestedArrayPathCorrectly() {
+
+		org.bson.Document target = mapper.getMappedObject(
+				query(where("arrayCustomName.$[some_item].nested.$[other_item]").is("value")).getQueryObject(),
+				context.getPersistentEntity(WithNestedArray.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("arrayCustomName.$[some_item].nes-ted.$[other_item]", "value"));
+	}
+
+	@Test // DATAMONGO-2502
+	void shouldAllowDeeplyNestedPlaceholders() {
+
+		org.bson.Document target = mapper.getMappedObject(
+				query(where("level0.$[some_item].arrayObj.$[other_item].nested").is("value")).getQueryObject(),
+				context.getPersistentEntity(WithDeepArrayNesting.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("level0.$[some_item].arrayObj.$[other_item].nested", "value"));
+	}
+
+	@Test // DATAMONGO-2502
+	void shouldAllowDeeplyNestedPlaceholdersWithCustomName() {
+
+		org.bson.Document target = mapper.getMappedObject(
+				query(where("level0.$[some_item].arrayCustomName.$[other_item].nested").is("value")).getQueryObject(),
+				context.getPersistentEntity(WithDeepArrayNesting.class));
+
+		assertThat(target)
+				.isEqualTo(new org.bson.Document("level0.$[some_item].arrayCustomName.$[other_item].nes-ted", "value"));
+	}
+
+	@Test // DATAMONGO-2517
+	void shouldParseNestedKeywordWithArgumentMatchingTheSourceEntitiesConstructorCorrectly() {
+
+		TextQuery source = new TextQuery("test");
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WithSingleStringArgConstructor.class));
+		assertThat(target).isEqualTo(org.bson.Document.parse("{\"$text\" : { \"$search\" : \"test\" }}"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersQueryOnUnwrappedObjectCorrectly() {
+
+		UnwrappableType unwrappableType = new UnwrappableType();
+		unwrappableType.stringValue = "test";
+
+		Query source = query(Criteria.where("unwrappedValue").is(unwrappableType));
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("stringValue", "test"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersQueryOnUnwrappedCorrectly() {
+
+		Query source = query(Criteria.where("unwrappedValue.stringValue").is("test"));
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("stringValue", "test"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersQueryOnPrefixedUnwrappedCorrectly() {
+
+		Query source = query(Criteria.where("unwrappedValue.stringValue").is("test"));
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WithPrefixedUnwrapped.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("prefix-stringValue", "test"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersQueryOnNestedUnwrappedObjectCorrectly() {
+
+		UnwrappableType unwrappableType = new UnwrappableType();
+		unwrappableType.stringValue = "test";
+		Query source = query(Criteria.where("withUnwrapped.unwrappedValue").is(unwrappableType));
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithUnwrapped.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("withUnwrapped", new org.bson.Document("stringValue", "test")));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersQueryOnNestedPrefixedUnwrappedObjectCorrectly() {
+
+		UnwrappableType unwrappableType = new UnwrappableType();
+		unwrappableType.stringValue = "test";
+		Query source = query(Criteria.where("withPrefixedUnwrapped.unwrappedValue").is(unwrappableType));
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithUnwrapped.class));
+
+		assertThat(target)
+				.isEqualTo(new org.bson.Document("withPrefixedUnwrapped", new org.bson.Document("prefix-stringValue", "test")));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersQueryOnNestedUnwrappedCorrectly() {
+
+		Query source = query(Criteria.where("withUnwrapped.unwrappedValue.stringValue").is("test"));
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithUnwrapped.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("withUnwrapped.stringValue", "test"));
+	}
+
+	@Test // DATAMONGO-1902
+	void rendersQueryOnNestedPrefixedUnwrappedCorrectly() {
+
+		Query source = query(Criteria.where("withPrefixedUnwrapped.unwrappedValue.stringValue").is("test"));
+
+		org.bson.Document target = mapper.getMappedObject(source.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithUnwrapped.class));
+
+		assertThat(target).isEqualTo(new org.bson.Document("withPrefixedUnwrapped.prefix-stringValue", "test"));
+	}
+
+	@Test // DATAMONGO-1902
+	void sortByUnwrappedIsEmpty() {
+
+		Query query = new Query().with(Sort.by("unwrappedValue"));
+
+		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(document).isEqualTo(
+				new org.bson.Document("stringValue", 1).append("listValue", 1).append("with-at-field-annotation", 1));
+	}
+
+	@Test // DATAMONGO-1902
+	void sortByUnwrappedValue() {
+
+		// atFieldAnnotatedValue
+		Query query = new Query().with(Sort.by("unwrappedValue.stringValue"));
+
+		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("stringValue", 1));
+	}
+
+	@Test // DATAMONGO-1902
+	void sortByUnwrappedValueWithFieldAnnotation() {
+
+		Query query = new Query().with(Sort.by("unwrappedValue.atFieldAnnotatedValue"));
+
+		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("with-at-field-annotation", 1));
+	}
+
+	@Test // DATAMONGO-1902
+	void sortByPrefixedUnwrappedValueWithFieldAnnotation() {
+
+		Query query = new Query().with(Sort.by("unwrappedValue.atFieldAnnotatedValue"));
+
+		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
+				context.getPersistentEntity(WithPrefixedUnwrapped.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("prefix-with-at-field-annotation", 1));
+	}
+
+	@Test // DATAMONGO-1902
+	void sortByNestedUnwrappedValueWithFieldAnnotation() {
+
+		Query query = new Query().with(Sort.by("withUnwrapped.unwrappedValue.atFieldAnnotatedValue"));
+
+		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
+				context.getPersistentEntity(WrapperAroundWithUnwrapped.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("withUnwrapped.with-at-field-annotation", 1));
+	}
+
+	@Test // DATAMONGO-1902
+	void sortByNestedPrefixedUnwrappedValueWithFieldAnnotation() {
+
+		Query query = new Query().with(Sort.by("withPrefixedUnwrapped.unwrappedValue.atFieldAnnotatedValue"));
+
+		org.bson.Document document = mapper.getMappedSort(query.getSortObject(),
+				context.getPersistentEntity(WrapperAroundWithUnwrapped.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("withPrefixedUnwrapped.prefix-with-at-field-annotation", 1));
+	}
+
+	@Test // DATAMONGO-1902
+	void projectOnUnwrappedUsesFields() {
+
+		Query query = new Query();
+		query.fields().include("unwrappedValue");
+
+		org.bson.Document document = mapper.getMappedFields(query.getFieldsObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(document).isEqualTo(
+				new org.bson.Document("stringValue", 1).append("listValue", 1).append("with-at-field-annotation", 1));
+	}
+
+	@Test // DATAMONGO-1902
+	void projectOnUnwrappedValue() {
+
+		Query query = new Query();
+		query.fields().include("unwrappedValue.stringValue");
+
+		org.bson.Document document = mapper.getMappedFields(query.getFieldsObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("stringValue", 1));
+	}
+
+	@Test // GH-3601
+	void resolvesFieldnameWithUnderscoresCorrectly() {
+
+		Query query = query(where("fieldname_with_underscores").exists(true));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithPropertyUsingUnderscoreInName.class));
+
+		assertThat(document)
+				.isEqualTo(new org.bson.Document("fieldname_with_underscores", new org.bson.Document("$exists", true)));
+	}
+
+	@Test // GH-3601
+	void resolvesMappedFieldnameWithUnderscoresCorrectly() {
+
+		Query query = query(where("renamed_fieldname_with_underscores").exists(true));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WithPropertyUsingUnderscoreInName.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("renamed", new org.bson.Document("$exists", true)));
+	}
+
+	@Test // GH-3601
+	void resolvesSimpleNestedFieldnameWithUnderscoresCorrectly() {
+
+		Query query = query(where("simple.fieldname_with_underscores").exists(true));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithPropertyUsingUnderscoreInName.class));
+
+		assertThat(document)
+				.isEqualTo(new org.bson.Document("simple.fieldname_with_underscores", new org.bson.Document("$exists", true)));
+	}
+
+	@Test // GH-3601
+	void resolvesSimpleNestedMappedFieldnameWithUnderscoresCorrectly() {
+
+		Query query = query(where("simple.renamed_fieldname_with_underscores").exists(true));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithPropertyUsingUnderscoreInName.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("simple.renamed", new org.bson.Document("$exists", true)));
+	}
+
+	@Test // GH-3601
+	void resolvesFieldNameWithUnderscoreOnNestedFieldnameWithUnderscoresCorrectly() {
+
+		Query query = query(where("double_underscore.fieldname_with_underscores").exists(true));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithPropertyUsingUnderscoreInName.class));
+
+		assertThat(document).isEqualTo(
+				new org.bson.Document("double_underscore.fieldname_with_underscores", new org.bson.Document("$exists", true)));
+	}
+
+	@Test // GH-3601
+	void resolvesFieldNameWithUnderscoreOnNestedMappedFieldnameWithUnderscoresCorrectly() {
+
+		Query query = query(where("double_underscore.renamed_fieldname_with_underscores").exists(true));
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(WrapperAroundWithPropertyUsingUnderscoreInName.class));
+
+		assertThat(document)
+				.isEqualTo(new org.bson.Document("double_underscore.renamed", new org.bson.Document("$exists", true)));
+	}
+
+	@Test // GH-3633
+	void mapsNullValueForFieldWithCustomTargetType() {
+
+		Query query = query(where("stringAsOid").isNull());
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(NonIdFieldWithObjectIdTargetType.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("stringAsOid", null));
+	}
+
+	@Test // GH-3633
+	void mapsNullBsonTypeForFieldWithCustomTargetType() {
+
+		Query query = query(where("stringAsOid").isNullValue());
+
+		org.bson.Document document = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(NonIdFieldWithObjectIdTargetType.class));
+
+		assertThat(document).isEqualTo(new org.bson.Document("stringAsOid", new org.bson.Document("$type", 10)));
+	}
+
+	@Test // GH-3635
+	void $floorKeywordDoesNotMatch$or$norPattern() {
+
+		Query query = new BasicQuery(" { $expr: { $gt: [ \"$spent\" , { $floor : \"$budget\" } ] } }");
+		assertThatNoException()
+				.isThrownBy(() -> mapper.getMappedObject(query.getQueryObject(), context.getPersistentEntity(Foo.class)));
+	}
+
+	@Test // GH-3659
+	void allowsUsingFieldPathsForPropertiesHavingCustomConversionRegistered() {
+
+		Query query = query(where("address.street").is("1007 Mountain Drive"));
+
+		MongoCustomConversions mongoCustomConversions = new MongoCustomConversions(
+				Collections.singletonList(new MyAddressToDocumentConverter()));
+
+		this.context = new MongoMappingContext();
+		this.context.setSimpleTypeHolder(mongoCustomConversions.getSimpleTypeHolder());
+		this.context.afterPropertiesSet();
+
+		this.converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
+		this.converter.setCustomConversions(mongoCustomConversions);
+		this.converter.afterPropertiesSet();
+
+		this.mapper = new QueryMapper(converter);
+
+		assertThat(mapper.getMappedSort(query.getQueryObject(), context.getPersistentEntity(Customer.class)))
+				.isEqualTo(new org.bson.Document("address.street", "1007 Mountain Drive"));
+	}
+
+	@Test // GH-3790
+	void shouldAcceptExprAsCriteriaDefinition() {
+
+		EvaluationOperators.Expr expr = EvaluationOperators
+				.valueOf(ConditionalOperators.ifNull("customizedField").then(true)).expr();
+
+		Query query = query(
+				expr.toCriteriaDefinition(new TypeBasedAggregationOperationContext(EmbeddedClass.class, context, mapper)));
+
+		org.bson.Document mappedQuery = mapper.getMappedObject(query.getQueryObject(),
+				context.getRequiredPersistentEntity(EmbeddedClass.class));
+
+		assertThat(mappedQuery).isEqualTo("{ $expr : { $ifNull : [\"$fancy_custom_name\", true] } }");
+	}
+
+	@Test // GH-3668
+	void mapStringIdFieldProjection() {
+
+		org.bson.Document mappedFields = mapper.getMappedFields(new org.bson.Document("id", 1),
+				context.getPersistentEntity(WithStringId.class));
+		assertThat(mappedFields).containsEntry("_id", 1);
+	}
+
+	@Test // GH-3783
+	void retainsId$InWithStringArray() {
+
+		org.bson.Document mappedQuery = mapper.getMappedObject(
+				org.bson.Document.parse("{ _id : { $in: [\"5b8bedceb1e0bfc07b008828\"]}}"),
+				context.getPersistentEntity(WithExplicitStringId.class));
+		assertThat(mappedQuery.get("_id")).isEqualTo(org.bson.Document.parse("{ $in: [\"5b8bedceb1e0bfc07b008828\"]}"));
+	}
+
+	@Test // GH-3783
+	void mapsId$InInToObjectIds() {
+
+		org.bson.Document mappedQuery = mapper.getMappedObject(
+				org.bson.Document.parse("{ _id : { $in: [\"5b8bedceb1e0bfc07b008828\"]}}"),
+				context.getPersistentEntity(ClassWithDefaultId.class));
+		assertThat(mappedQuery.get("_id"))
+				.isEqualTo(org.bson.Document.parse("{ $in: [ {$oid: \"5b8bedceb1e0bfc07b008828\" } ]}"));
+	}
+
+	@Test // GH-3596
+	void considersValueConverterWhenPresent() {
+
+		org.bson.Document mappedObject = mapper.getMappedObject(new org.bson.Document("text", "value"),
+				context.getPersistentEntity(WithPropertyValueConverter.class));
+		assertThat(mappedObject).isEqualTo(new org.bson.Document("text", "eulav"));
+	}
+
+	@Test // GH-2750
+	void mapsAggregationExpression() {
+
+		Query query = query(whereExpr(ComparisonOperators.valueOf("field").greaterThan("budget")));
+		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(CustomizedField.class));
+		assertThat(mappedObject).isEqualTo("{ $expr : { $gt : [ '$foo', '$budget'] } }");
+	}
+
+	@Test // GH-2750
+	void unwrapsAggregationExpressionExprObjectWrappedInExpressionCriteria() {
+
+		Query query = query(whereExpr(Expr.valueOf(ComparisonOperators.valueOf("field").greaterThan("budget"))));
+		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(CustomizedField.class));
+		assertThat(mappedObject).isEqualTo("{ $expr : { $gt : [ '$foo', '$budget'] } }");
+	}
+
+	@Test // GH-2750
+	void mapsMongoExpressionToFieldsIfItsAnAggregationExpression() {
+
+		Query query = query(expr(ComparisonOperators.valueOf("field").greaterThan("budget")));
+		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(CustomizedField.class));
+		assertThat(mappedObject).isEqualTo("{ $expr : { $gt : [ '$foo', '$budget'] } }");
+	}
+
+	@Test // GH-2750
+	void usageOfMongoExpressionOnCriteriaDoesNotUnwrapAnExprAggregationExpression() {
+
+		Query query = query(expr(Expr.valueOf(ComparisonOperators.valueOf("field").greaterThan("budget"))));
+		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(CustomizedField.class));
+		assertThat(mappedObject).isEqualTo("{ $expr : { $expr : { $gt : [ '$foo', '$budget'] } } }");
+	}
+
+	@Test // GH-4687
+	void usageOfUntypedAggregationShouldRenderOperationsAsIs() {
+
+		Query query = query(expr(Expr.valueOf(ComparisonOperators.valueOf("field").greaterThan("budget"))));
+		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(),
+			context.getPersistentEntity(Object.class));
+		assertThat(mappedObject).isEqualTo("{ $expr : { $expr : { $gt : [ '$field', '$budget'] } } }");
+	}
+
+	@Test // GH-2750
+	void usesMongoExpressionDocumentAsIsIfItIsNotAnAggregationExpression() {
+
+		Query query = query(expr(() -> org.bson.Document.parse("{ $gt : [ '$field', '$budget'] }")));
+		org.bson.Document mappedObject = mapper.getMappedObject(query.getQueryObject(),
+				context.getPersistentEntity(CustomizedField.class));
+		assertThat(mappedObject).isEqualTo("{ $expr : { $gt : [ '$field', '$budget'] } }");
+	}
+
+	@Test // GH-4080
+	void convertsListOfValuesForPropertyThatHasValueConverterButIsNotCollectionLikeOneByOne() {
+
+		org.bson.Document mappedObject = mapper.getMappedObject(query(where("text").in("spring", "data")).getQueryObject(),
+				context.getPersistentEntity(WithPropertyValueConverter.class));
+
+		assertThat(mappedObject).isEqualTo("{ 'text' : { $in : ['gnirps', 'atad'] } }");
+	}
+
+	@Test // GH-4464
+	void usesKeyNameWithDotsIfFieldNameTypeIsKey() {
+
+		org.bson.Document mappedObject = mapper.getMappedObject(query(where("value").is("A")).getQueryObject(),
+				context.getPersistentEntity(WithPropertyHavingDotsInFieldName.class));
+		assertThat(mappedObject).isEqualTo("{ 'field.name.with.dots' : 'A' }");
+	}
+
+	@Test // GH-4577
+	void mappingShouldRetainMapKeyOrder() {
+
+		TreeMap<String, String> sourceMap = new TreeMap<>(Map.of("test1", "123", "test2", "456"));
+
+		org.bson.Document target = mapper.getMappedObject(query(where("simpleMap").is(sourceMap)).getQueryObject(),
+				context.getPersistentEntity(WithSimpleMap.class));
+		assertThat(target.get("simpleMap", Map.class)).containsExactlyEntriesOf(sourceMap);
+	}
+
+	@Test // GH-4510
+	void convertsNestedOperatorValueForPropertyThatHasValueConverter() {
+
+		org.bson.Document mappedObject = mapper.getMappedObject(
+				query(where("text").gt("spring").lt("data")).getQueryObject(),
+				context.getPersistentEntity(WithPropertyValueConverter.class));
+
+		assertThat(mappedObject).isEqualTo("{ 'text' : {  $gt : 'gnirps', $lt : 'atad' } }");
+	}
+
+	@Test // GH-4510
+	void convertsNestedOperatorValueForPropertyContainingListThatHasValueConverter() {
+
+		org.bson.Document mappedObject = mapper.getMappedObject(
+				query(where("text").gt("spring").in("data")).getQueryObject(),
+				context.getPersistentEntity(WithPropertyValueConverter.class));
+
+		assertThat(mappedObject).isEqualTo("{ 'text' : {  $gt : 'gnirps', $in : [ 'atad' ] } }");
+	}
+
+	@Test // GH-4736
+	void allOperatorShouldConvertIdCollection() {
+
+		ObjectId oid = ObjectId.get();
+		Criteria criteria = new Criteria().andOperator(where("name").isNull().and("id").all(List.of(oid.toString())));
+
+		org.bson.Document mappedObject = mapper.getMappedObject(criteria.getCriteriaObject(),
+			context.getPersistentEntity(Customer.class));
+
+		assertThat(mappedObject).containsEntry("$and.[0]._id.$all", List.of(oid));
+	}
+
+	class WithSimpleMap {
+		Map<String, String> simpleMap;
+	}
+
+	class WithDeepArrayNesting {
+
+		List<WithNestedArray> level0;
+	}
+
+	class WithNestedArray {
+
+		List<NestedArrayOfObj> arrayObj;
+		List<NestedArrayOfString> arrayString;
+		List<NestedArrayOfObjCustomFieldName> arrayCustomName;
+	}
+
+	class NestedArrayOfObj {
+		List<ArrayObj> nested;
+	}
+
+	class NestedArrayOfObjCustomFieldName {
+
+		@Field("nes-ted") List<ArrayObj> nested;
+	}
+
+	class NestedArrayOfString {
+		List<String> nested;
+	}
+
+	class ArrayObj {
+		String foo;
+	}
+
 	@Document
-	public class Foo {
+	class Foo {
 		@Id private ObjectId id;
 		EmbeddedClass embedded;
 
 		@Field("my_items") List<EmbeddedClass> listOfItems;
 	}
 
-	public class EmbeddedClass {
-		public String id;
+	class EmbeddedClass {
+		String id;
 
-		@Field("fancy_custom_name") public String customizedField;
+		@Field("fancy_custom_name") String customizedField;
 	}
 
 	class IdWrapper {
@@ -935,6 +1763,18 @@ class Sample {
 		@Id private String foo;
 	}
 
+	class WithStringId {
+
+		@MongoId String id;
+		String name;
+	}
+
+	class WithExplicitStringId {
+
+		@MongoId(FieldType.STRING) String id;
+		String name;
+	}
+
 	class BigIntegerId {
 
 		@Id private BigInteger id;
@@ -981,10 +1821,26 @@ class WithMapDBRef {
 		@DBRef Map<String, Sample> mapWithDBRef;
 	}
 
+	static class WithDocumentReference {
+
+		private ObjectId id;
+
+		private String name;
+
+		@DocumentReference(lookup = "{ 'name' : ?#{#target} }") private Customer customer;
+
+		@DocumentReference(lookup = "{ 'name' : ?#{#target} }") private List<Customer> customers;
+
+		@DocumentReference private Sample sample;
+
+		@DocumentReference private List<Sample> samples;
+	}
+
 	class WithTextScoreProperty {
 
 		@Id String id;
-		@TextScore @Field("score") Float textScore;
+		@TextScore
+		@Field("score") Float textScore;
 	}
 
 	static class RootForClassWithExplicitlyRenamedIdField {
@@ -1011,18 +1867,22 @@ static class ClassWithGeoTypes {
 		@Field("geoJsonPointWithNameViaFieldAnnotation") GeoJsonPoint namedGeoJsonPoint;
 	}
 
-	static class SimpeEntityWithoutId {
+	static class SimpleEntityWithoutId {
 
 		String stringProperty;
 		Integer integerProperty;
 	}
 
 	static class EntityWithComplexValueTypeMap {
-		Map<Integer, SimpeEntityWithoutId> map;
+		Map<Integer, SimpleEntityWithoutId> map;
+	}
+
+	static class EntityWithIntKeyedMapOfMap {
+		Map<Integer, EntityWithComplexValueTypeMap> outerMap;
 	}
 
 	static class EntityWithComplexValueTypeList {
-		List<SimpeEntityWithoutId> list;
+		List<SimpleEntityWithoutId> list;
 	}
 
 	static class WithExplicitTargetTypes {
@@ -1030,6 +1890,9 @@ static class WithExplicitTargetTypes {
 		@Field(targetType = FieldType.SCRIPT) //
 		String script;
 
+		@Field(targetType = FieldType.STRING) //
+		String text;
+
 		@Field(targetType = FieldType.SCRIPT) //
 		List<String> scripts;
 	}
@@ -1037,4 +1900,102 @@ static class WithExplicitTargetTypes {
 	static class WithIdPropertyContainingUnderscore {
 		@Id String with_underscore;
 	}
+
+	static class NonIdFieldWithObjectIdTargetType {
+
+		String id;
+		@Field(targetType = FieldType.OBJECT_ID) String stringAsOid;
+	}
+
+	@Document
+	static class WithSingleStringArgConstructor {
+
+		String value;
+
+		public WithSingleStringArgConstructor() {}
+
+		public WithSingleStringArgConstructor(String value) {
+			this.value = value;
+		}
+	}
+
+	static class WrapperAroundWithUnwrapped {
+
+		String someValue;
+		WithUnwrapped withUnwrapped;
+		WithPrefixedUnwrapped withPrefixedUnwrapped;
+	}
+
+	static class WithUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable UnwrappableType unwrappedValue;
+	}
+
+	static class WithPrefixedUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable("prefix-") UnwrappableType unwrappedValue;
+	}
+
+	static class UnwrappableType {
+
+		String stringValue;
+		List<String> listValue;
+
+		@Field("with-at-field-annotation") //
+		String atFieldAnnotatedValue;
+
+		@Transient //
+		String transientValue;
+	}
+
+	static class WrapperAroundWithPropertyUsingUnderscoreInName {
+
+		WithPropertyUsingUnderscoreInName simple;
+		WithPropertyUsingUnderscoreInName double_underscore;
+	}
+
+	static class WithPropertyUsingUnderscoreInName {
+
+		String fieldname_with_underscores;
+
+		@Field("renamed") String renamed_fieldname_with_underscores;
+	}
+
+	@Document
+	static class Customer {
+
+		@Id private ObjectId id;
+		private String name;
+		private MyAddress address;
+	}
+
+	static class MyAddress {
+		private String street;
+	}
+
+	static class WithPropertyValueConverter {
+
+		@ValueConverter(ReversingValueConverter.class) String text;
+	}
+
+	@WritingConverter
+	public static class MyAddressToDocumentConverter implements Converter<MyAddress, org.bson.Document> {
+
+		@Override
+		public org.bson.Document convert(MyAddress address) {
+			org.bson.Document doc = new org.bson.Document();
+			doc.put("street", address.street);
+			return doc;
+		}
+	}
+
+	static class WithPropertyHavingDotsInFieldName {
+
+		@Field(name = "field.name.with.dots", nameType = Type.KEY) String value;
+
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegateUnitTests.java
new file mode 100644
index 0000000000..384cffaad4
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReferenceLookupDelegateUnitTests.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2021-2025 the original author 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.convert;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Collections;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.model.SpELContext;
+import org.springframework.data.mongodb.core.convert.ReferenceResolver.MongoEntityReader;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.expression.EvaluationContext;
+
+/**
+ * Unit tests for {@link ReferenceLookupDelegate}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+class ReferenceLookupDelegateUnitTests {
+
+	@Mock MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext;
+	@Mock SpELContext spELContext;
+	@Mock EvaluationContext evaluationContext;
+	@Mock MongoEntityReader entityReader;
+
+	private ReferenceLookupDelegate lookupDelegate;
+
+	@BeforeEach
+	void beforeEach() {
+		lookupDelegate = new ReferenceLookupDelegate(mappingContext, spELContext);
+	}
+
+	@Test // GH-3842
+	void shouldComputePlainStringTargetCollection() {
+
+		DocumentReference documentReference = mock(DocumentReference.class);
+		MongoPersistentEntity entity = mock(MongoPersistentEntity.class);
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
+
+		doReturn(entity).when(mappingContext).getRequiredPersistentEntity((Class) any());
+
+		when(property.isDocumentReference()).thenReturn(true);
+		when(property.getDocumentReference()).thenReturn(documentReference);
+		when(documentReference.collection()).thenReturn("collection1");
+
+		lookupDelegate.readReference(property, Collections.singletonList("one"), (referenceQuery, referenceCollection) -> {
+
+			assertThat(referenceCollection.getCollection()).isEqualTo("collection1");
+			return Collections.emptyList();
+		}, entityReader);
+	}
+
+	@Test // GH-4612
+	void shouldResolveEmptyListOnEmptyTargetCollection() {
+
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
+		ReferenceLookupDelegate.LookupFunction lookupFunction = mock(ReferenceLookupDelegate.LookupFunction.class);
+
+		when(property.isCollectionLike()).thenReturn(true);
+		lookupDelegate.readReference(property, Collections.emptyList(), lookupFunction, entityReader);
+		verify(lookupFunction, never()).apply(any(), any());
+	}
+
+	@Test // GH-4612
+	void shouldResolveEmptyMapOnEmptyTargetCollection() {
+
+		MongoPersistentProperty property = mock(MongoPersistentProperty.class);
+		ReferenceLookupDelegate.LookupFunction lookupFunction = mock(ReferenceLookupDelegate.LookupFunction.class);
+
+		when(property.isMap()).thenReturn(true);
+		lookupDelegate.readReference(property, Collections.emptyMap(), lookupFunction, entityReader);
+		verify(lookupFunction, never()).apply(any(), any());
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReversingValueConverter.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReversingValueConverter.java
new file mode 100644
index 0000000000..0fe791784d
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/ReversingValueConverter.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2022-2025 the original author 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.convert;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * @author Christoph Strobl
+ */
+class ReversingValueConverter implements MongoValueConverter<String, String> {
+
+	@Nullable
+	@Override
+	public String read(@Nullable String value, MongoConversionContext context) {
+		return reverse(value);
+	}
+
+	@Nullable
+	@Override
+	public String write(@Nullable String value, MongoConversionContext context) {
+		return reverse(value);
+	}
+
+	private String reverse(String source) {
+
+		if (source == null) {
+			return null;
+		}
+
+		return new StringBuilder(source).reverse().toString();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/TermToStringConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/TermToStringConverterUnitTests.java
index 671a08c3e1..873a49232c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/TermToStringConverterUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/TermToStringConverterUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.mockito.Mockito.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.convert.MongoConverters.TermToStringConverter;
 import org.springframework.data.mongodb.core.query.Term;
 import org.springframework.data.mongodb.core.query.Term.Type;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java
index 44f70c4227..c646af5539 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,10 +19,6 @@
 import static org.springframework.data.mongodb.core.DocumentTestUtils.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.Collections;
@@ -31,25 +27,29 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.Transient;
 import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.convert.ValueConverter;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.data.mapping.MappingException;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
@@ -65,20 +65,21 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  * @author Pavel Vodrazka
+ * @author David Julia
+ * @author Divya Srivastava
  */
-@RunWith(MockitoJUnitRunner.class)
-public class UpdateMapperUnitTests {
+@ExtendWith(MockitoExtension.class)
+class UpdateMapperUnitTests {
 
-	@Mock MongoDbFactory factory;
-	MappingMongoConverter converter;
-	MongoMappingContext context;
-	UpdateMapper mapper;
+	private MappingMongoConverter converter;
+	private MongoMappingContext context;
+	private UpdateMapper mapper;
 
 	private Converter<NestedEntity, Document> writingConverterSpy;
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings("unchecked")
-	public void setUp() {
+	void setUp() {
 
 		this.writingConverterSpy = Mockito.spy(new NestedEntityWriteConverter());
 		CustomConversions conversions = new MongoCustomConversions(Collections.singletonList(writingConverterSpy));
@@ -87,7 +88,7 @@ public void setUp() {
 		this.context.setSimpleTypeHolder(conversions.getSimpleTypeHolder());
 		this.context.initialize();
 
-		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(factory), context);
+		this.converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
 		this.converter.setCustomConversions(conversions);
 		this.converter.afterPropertiesSet();
 
@@ -95,7 +96,7 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-721
-	public void updateMapperRetainsTypeInformationForCollectionField() {
+	void updateMapperRetainsTypeInformationForCollectionField() {
 
 		Update update = new Update().push("list", new ConcreteChildClass("2", "BAR"));
 
@@ -109,7 +110,7 @@ public void updateMapperRetainsTypeInformationForCollectionField() {
 	}
 
 	@Test // DATAMONGO-807
-	public void updateMapperShouldRetainTypeInformationForNestedEntities() {
+	void updateMapperShouldRetainTypeInformationForNestedEntities() {
 
 		Update update = Update.update("model", new ModelImpl(1));
 		UpdateMapper mapper = new UpdateMapper(converter);
@@ -123,7 +124,7 @@ public void updateMapperShouldRetainTypeInformationForNestedEntities() {
 	}
 
 	@Test // DATAMONGO-807
-	public void updateMapperShouldNotPersistTypeInformationForKnownSimpleTypes() {
+	void updateMapperShouldNotPersistTypeInformationForKnownSimpleTypes() {
 
 		Update update = Update.update("model.value", 1);
 		UpdateMapper mapper = new UpdateMapper(converter);
@@ -136,7 +137,7 @@ public void updateMapperShouldNotPersistTypeInformationForKnownSimpleTypes() {
 	}
 
 	@Test // DATAMONGO-807
-	public void updateMapperShouldNotPersistTypeInformationForNullValues() {
+	void updateMapperShouldNotPersistTypeInformationForNullValues() {
 
 		Update update = Update.update("model", null);
 		UpdateMapper mapper = new UpdateMapper(converter);
@@ -149,7 +150,7 @@ public void updateMapperShouldNotPersistTypeInformationForNullValues() {
 	}
 
 	@Test // DATAMONGO-407
-	public void updateMapperShouldRetainTypeInformationForNestedCollectionElements() {
+	void updateMapperShouldRetainTypeInformationForNestedCollectionElements() {
 
 		Update update = Update.update("list.$", new ConcreteChildClass("42", "bubu"));
 
@@ -163,7 +164,7 @@ public void updateMapperShouldRetainTypeInformationForNestedCollectionElements()
 	}
 
 	@Test // DATAMONGO-407
-	public void updateMapperShouldSupportNestedCollectionElementUpdates() {
+	void updateMapperShouldSupportNestedCollectionElementUpdates() {
 
 		Update update = Update.update("list.$.value", "foo").set("list.$.otherValue", "bar");
 
@@ -177,7 +178,7 @@ public void updateMapperShouldSupportNestedCollectionElementUpdates() {
 	}
 
 	@Test // DATAMONGO-407
-	public void updateMapperShouldWriteTypeInformationForComplexNestedCollectionElementUpdates() {
+	void updateMapperShouldWriteTypeInformationForComplexNestedCollectionElementUpdates() {
 
 		Update update = Update.update("list.$.value", "foo").set("list.$.someObject", new ConcreteChildClass("42", "bubu"));
 
@@ -195,7 +196,7 @@ public void updateMapperShouldWriteTypeInformationForComplexNestedCollectionElem
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Test // DATAMONGO-812
-	public void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingSimpleTypes() {
+	void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingSimpleTypes() {
 
 		Update update = new Update().push("values").each("spring", "data", "mongodb");
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Model.class));
@@ -211,7 +212,7 @@ public void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingSimpleT
 	}
 
 	@Test // DATAMONGO-812
-	public void updateMapperShouldConvertPushWhithoutAddingClassInformationWhenUsedWithEvery() {
+	void updateMapperShouldConvertPushWhithoutAddingClassInformationWhenUsedWithEvery() {
 
 		Update update = new Update().push("values").each("spring", "data", "mongodb");
 
@@ -225,7 +226,7 @@ public void updateMapperShouldConvertPushWhithoutAddingClassInformationWhenUsedW
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Test // DATAMONGO-812
-	public void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingCustomTypes() {
+	void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingCustomTypes() {
 
 		Update update = new Update().push("models").each(new ListModel("spring", "data", "mongodb"));
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -240,7 +241,7 @@ public void updateMapperShouldConvertPushCorrectlyWhenCalledWithEachUsingCustomT
 	}
 
 	@Test // DATAMONGO-812
-	public void updateMapperShouldRetainClassInformationForPushCorrectlyWhenCalledWithEachUsingCustomTypes() {
+	void updateMapperShouldRetainClassInformationForPushCorrectlyWhenCalledWithEachUsingCustomTypes() {
 
 		Update update = new Update().push("models").each(new ListModel("spring", "data", "mongodb"));
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -254,7 +255,7 @@ public void updateMapperShouldRetainClassInformationForPushCorrectlyWhenCalledWi
 	}
 
 	@Test // DATAMONGO-812
-	public void testUpdateShouldAllowMultiplePushEachForDifferentFields() {
+	void testUpdateShouldAllowMultiplePushEachForDifferentFields() {
 
 		Update update = new Update().push("category").each("spring", "data").push("type").each("mongodb");
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(Object.class));
@@ -265,7 +266,7 @@ public void testUpdateShouldAllowMultiplePushEachForDifferentFields() {
 	}
 
 	@Test // DATAMONGO-943
-	public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositiveIndexParameter() {
+	void updatePushEachAtPositionWorksCorrectlyWhenGivenPositiveIndexParameter() {
 
 		Update update = new Update().push("key").atPosition(2).each(Arrays.asList("Arya", "Arry", "Weasel"));
 
@@ -280,7 +281,7 @@ public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositiveIndexParamete
 	}
 
 	@Test // DATAMONGO-943, DATAMONGO-2055
-	public void updatePushEachAtNegativePositionWorksCorrectly() {
+	void updatePushEachAtNegativePositionWorksCorrectly() {
 
 		Update update = new Update().push("key").atPosition(-2).each(Arrays.asList("Arya", "Arry", "Weasel"));
 
@@ -294,7 +295,7 @@ public void updatePushEachAtNegativePositionWorksCorrectly() {
 	}
 
 	@Test // DATAMONGO-943
-	public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionFirst() {
+	void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionFirst() {
 
 		Update update = new Update().push("key").atPosition(Position.FIRST).each(Arrays.asList("Arya", "Arry", "Weasel"));
 
@@ -309,7 +310,7 @@ public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionFirst() {
 	}
 
 	@Test // DATAMONGO-943
-	public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionLast() {
+	void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionLast() {
 
 		Update update = new Update().push("key").atPosition(Position.LAST).each(Arrays.asList("Arya", "Arry", "Weasel"));
 
@@ -323,7 +324,7 @@ public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionLast() {
 	}
 
 	@Test // DATAMONGO-943
-	public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionNull() {
+	void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionNull() {
 
 		Update update = new Update().push("key").atPosition(null).each(Arrays.asList("Arya", "Arry", "Weasel"));
 
@@ -337,7 +338,7 @@ public void updatePushEachAtPositionWorksCorrectlyWhenGivenPositionNull() {
 	}
 
 	@Test // DATAMONGO-832
-	public void updatePushEachWithSliceShouldRenderCorrectly() {
+	void updatePushEachWithSliceShouldRenderCorrectly() {
 
 		Update update = new Update().push("key").slice(5).each(Arrays.asList("Arya", "Arry", "Weasel"));
 
@@ -351,7 +352,7 @@ public void updatePushEachWithSliceShouldRenderCorrectly() {
 	}
 
 	@Test // DATAMONGO-832
-	public void updatePushEachWithSliceShouldRenderWhenUsingMultiplePushCorrectly() {
+	void updatePushEachWithSliceShouldRenderWhenUsingMultiplePushCorrectly() {
 
 		Update update = new Update().push("key").slice(5).each(Arrays.asList("Arya", "Arry", "Weasel")).push("key-2")
 				.slice(-2).each("The Beggar King", "Viserys III Targaryen");
@@ -371,7 +372,7 @@ public void updatePushEachWithSliceShouldRenderWhenUsingMultiplePushCorrectly()
 	}
 
 	@Test // DATAMONGO-1141
-	public void updatePushEachWithValueSortShouldRenderCorrectly() {
+	void updatePushEachWithValueSortShouldRenderCorrectly() {
 
 		Update update = new Update().push("scores").sort(Direction.DESC).each(42, 23, 68);
 
@@ -387,7 +388,7 @@ public void updatePushEachWithValueSortShouldRenderCorrectly() {
 	}
 
 	@Test // DATAMONGO-1141
-	public void updatePushEachWithDocumentSortShouldRenderCorrectly() {
+	void updatePushEachWithDocumentSortShouldRenderCorrectly() {
 
 		Update update = new Update().push("list")
 				.sort(Sort.by(new Order(Direction.ASC, "value"), new Order(Direction.ASC, "field")))
@@ -405,7 +406,7 @@ public void updatePushEachWithDocumentSortShouldRenderCorrectly() {
 	}
 
 	@Test // DATAMONGO-1141
-	public void updatePushEachWithSortShouldRenderCorrectlyWhenUsingMultiplePush() {
+	void updatePushEachWithSortShouldRenderCorrectlyWhenUsingMultiplePush() {
 
 		Update update = new Update().push("authors").sort(Direction.ASC).each("Harry").push("chapters")
 				.sort(Sort.by(Direction.ASC, "order")).each(Collections.emptyList());
@@ -427,20 +428,20 @@ public void updatePushEachWithSortShouldRenderCorrectlyWhenUsingMultiplePush() {
 	}
 
 	@Test // DATAMONGO-410
-	public void testUpdateMapperShouldConsiderCustomWriteTarget() {
+	void testUpdateMapperShouldConsiderCustomWriteTarget() {
 
 		List<NestedEntity> someValues = Arrays.asList(new NestedEntity("spring"), new NestedEntity("data"),
 				new NestedEntity("mongodb"));
 		NestedEntity[] array = new NestedEntity[someValues.size()];
 
-		Update update = new Update().pushAll("collectionOfNestedEntities", someValues.toArray(array));
+		Update update = new Update().push("collectionOfNestedEntities").each(someValues.toArray(array));
 		mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(DomainEntity.class));
 
 		verify(writingConverterSpy, times(3)).convert(Mockito.any(NestedEntity.class));
 	}
 
 	@Test // DATAMONGO-404
-	public void createsDbRefForEntityIdOnPulls() {
+	void createsDbRefForEntityIdOnPulls() {
 
 		Update update = new Update().pull("dbRefAnnotatedList.id", "2");
 
@@ -452,7 +453,7 @@ public void createsDbRefForEntityIdOnPulls() {
 	}
 
 	@Test // DATAMONGO-404
-	public void createsDbRefForEntityOnPulls() {
+	void createsDbRefForEntityOnPulls() {
 
 		Entity entity = new Entity();
 		entity.id = "5";
@@ -465,15 +466,16 @@ public void createsDbRefForEntityOnPulls() {
 		assertThat(pullClause.get("dbRefAnnotatedList")).isEqualTo(new DBRef("entity", entity.id));
 	}
 
-	@Test(expected = MappingException.class) // DATAMONGO-404
-	public void rejectsInvalidFieldReferenceForDbRef() {
+	@Test // DATAMONGO-404
+	void rejectsInvalidFieldReferenceForDbRef() {
 
 		Update update = new Update().pull("dbRefAnnotatedList.name", "NAME");
-		mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(DocumentWithDBRefCollection.class));
+		assertThatThrownBy(() -> mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(DocumentWithDBRefCollection.class))).isInstanceOf(MappingException.class);
 	}
 
 	@Test // DATAMONGO-404
-	public void rendersNestedDbRefCorrectly() {
+	void rendersNestedDbRefCorrectly() {
 
 		Update update = new Update().pull("nested.dbRefAnnotatedList.id", "2");
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -484,7 +486,7 @@ public void rendersNestedDbRefCorrectly() {
 	}
 
 	@Test // DATAMONGO-468
-	public void rendersUpdateOfDbRefPropertyWithDomainObjectCorrectly() {
+	void rendersUpdateOfDbRefPropertyWithDomainObjectCorrectly() {
 
 		Entity entity = new Entity();
 		entity.id = "5";
@@ -498,7 +500,7 @@ public void rendersUpdateOfDbRefPropertyWithDomainObjectCorrectly() {
 	}
 
 	@Test // DATAMONGO-862
-	public void rendersUpdateAndPreservesKeyForPathsNotPointingToProperty() {
+	void rendersUpdateAndPreservesKeyForPathsNotPointingToProperty() {
 
 		Update update = new Update().set("listOfInterface.$.value", "expected-value");
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -509,7 +511,7 @@ public void rendersUpdateAndPreservesKeyForPathsNotPointingToProperty() {
 	}
 
 	@Test // DATAMONGO-863
-	public void doesNotConvertRawDocuments() {
+	void doesNotConvertRawDocuments() {
 
 		Update update = new Update();
 		update.pull("options",
@@ -528,7 +530,7 @@ public void doesNotConvertRawDocuments() {
 
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	@Test // DATAMONG0-471
-	public void testUpdateShouldApply$addToSetCorrectlyWhenUsedWith$each() {
+	void testUpdateShouldApply$addToSetCorrectlyWhenUsedWith$each() {
 
 		Update update = new Update().addToSet("values").each("spring", "data", "mongodb");
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -542,7 +544,7 @@ public void doesNotConvertRawDocuments() {
 	}
 
 	@Test // DATAMONG0-471
-	public void testUpdateShouldRetainClassTypeInformationWhenUsing$addToSetWith$eachForCustomTypes() {
+	void testUpdateShouldRetainTypeInformationWhenUsing$addToSetWith$eachForCustomTypes() {
 
 		Update update = new Update().addToSet("models").each(new ModelImpl(2014), new ModelImpl(1), new ModelImpl(28));
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -559,7 +561,7 @@ public void doesNotConvertRawDocuments() {
 	}
 
 	@Test // DATAMONGO-897
-	public void updateOnDbrefPropertyOfInterfaceTypeWithoutExplicitGetterForIdShouldBeMappedCorrectly() {
+	void updateOnDbrefPropertyOfInterfaceTypeWithoutExplicitGetterForIdShouldBeMappedCorrectly() {
 
 		Update update = new Update().set("referencedDocument", new InterfaceDocumentDefinitionImpl("1", "Foo"));
 		Document mappedObject = mapper.getMappedObject(update.getUpdateObject(),
@@ -573,7 +575,7 @@ public void updateOnDbrefPropertyOfInterfaceTypeWithoutExplicitGetterForIdShould
 	}
 
 	@Test // DATAMONGO-847
-	public void updateMapperConvertsNestedQueryCorrectly() {
+	void updateMapperConvertsNestedQueryCorrectly() {
 
 		Update update = new Update().pull("list", Query.query(Criteria.where("value").in("foo", "bar")));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -588,7 +590,7 @@ public void updateMapperConvertsNestedQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-847
-	public void updateMapperConvertsPullWithNestedQuerfyOnDBRefCorrectly() {
+	void updateMapperConvertsPullWithNestedQuerfyOnDBRefCorrectly() {
 
 		Update update = new Update().pull("dbRefAnnotatedList", Query.query(Criteria.where("id").is("1")));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -601,7 +603,7 @@ public void updateMapperConvertsPullWithNestedQuerfyOnDBRefCorrectly() {
 	}
 
 	@Test // DATAMONGO-1077
-	public void shouldNotRemovePositionalParameter() {
+	void shouldNotRemovePositionalParameter() {
 
 		Update update = new Update();
 		update.unset("dbRefAnnotatedList.$");
@@ -615,7 +617,7 @@ public void shouldNotRemovePositionalParameter() {
 	}
 
 	@Test // DATAMONGO-1210
-	public void mappingEachOperatorShouldNotAddTypeInfoForNonInterfaceNonAbstractTypes() {
+	void mappingEachOperatorShouldNotAddTypeInfoForNonInterfaceNonAbstractTypes() {
 
 		Update update = new Update().addToSet("nestedDocs").each(new NestedDocument("nested-1"),
 				new NestedDocument("nested-2"));
@@ -628,7 +630,7 @@ public void mappingEachOperatorShouldNotAddTypeInfoForNonInterfaceNonAbstractTyp
 	}
 
 	@Test // DATAMONGO-1210
-	public void mappingEachOperatorShouldAddTypeHintForInterfaceTypes() {
+	void mappingEachOperatorShouldAddTypeHintForInterfaceTypes() {
 
 		Update update = new Update().addToSet("models").each(new ModelImpl(1), new ModelImpl(2));
 
@@ -640,7 +642,7 @@ public void mappingEachOperatorShouldAddTypeHintForInterfaceTypes() {
 	}
 
 	@Test // DATAMONGO-1210
-	public void mappingEachOperatorShouldAddTypeHintForAbstractTypes() {
+	void mappingEachOperatorShouldAddTypeHintForAbstractTypes() {
 
 		Update update = new Update().addToSet("list").each(new ConcreteChildClass("foo", "one"),
 				new ConcreteChildClass("bar", "two"));
@@ -653,7 +655,7 @@ public void mappingEachOperatorShouldAddTypeHintForAbstractTypes() {
 	}
 
 	@Test // DATAMONGO-1210
-	public void mappingShouldOnlyRemoveTypeHintFromTopLevelTypeInCaseOfNestedDocument() {
+	void mappingShouldOnlyRemoveTypeHintFromTopLevelTypeInCaseOfNestedDocument() {
 
 		WrapperAroundInterfaceType wait = new WrapperAroundInterfaceType();
 		wait.interfaceType = new ModelImpl(1);
@@ -670,7 +672,7 @@ public void mappingShouldOnlyRemoveTypeHintFromTopLevelTypeInCaseOfNestedDocumen
 	}
 
 	@Test // DATAMONGO-1210
-	public void mappingShouldRetainTypeInformationOfNestedListWhenUpdatingConcreteyParentType() {
+	void mappingShouldRetainTypeInformationOfNestedListWhenUpdatingConcreteyParentType() {
 
 		ListModelWrapper lmw = new ListModelWrapper();
 		lmw.models = Collections.singletonList(new ModelImpl(1));
@@ -685,7 +687,7 @@ public void mappingShouldRetainTypeInformationOfNestedListWhenUpdatingConcreteyP
 	}
 
 	@Test // DATAMONGO-1809
-	public void pathShouldIdentifyPositionalParameterWithMoreThanOneDigit() {
+	void pathShouldIdentifyPositionalParameterWithMoreThanOneDigit() {
 
 		Document at2digitPosition = mapper.getMappedObject(new Update()
 				.addToSet("concreteInnerList.10.concreteTypeList", new SomeInterfaceImpl("szeth")).getUpdateObject(),
@@ -702,7 +704,7 @@ public void pathShouldIdentifyPositionalParameterWithMoreThanOneDigit() {
 	}
 
 	@Test // DATAMONGO-1236
-	public void mappingShouldRetainTypeInformationForObjectValues() {
+	void mappingShouldRetainTypeInformationForObjectValues() {
 
 		Update update = new Update().set("value", new NestedDocument("kaladin"));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -713,7 +715,7 @@ public void mappingShouldRetainTypeInformationForObjectValues() {
 	}
 
 	@Test // DATAMONGO-1236
-	public void mappingShouldNotRetainTypeInformationForConcreteValues() {
+	void mappingShouldNotRetainTypeInformationForConcreteValues() {
 
 		Update update = new Update().set("concreteValue", new NestedDocument("shallan"));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -724,7 +726,7 @@ public void mappingShouldNotRetainTypeInformationForConcreteValues() {
 	}
 
 	@Test // DATAMONGO-1236
-	public void mappingShouldRetainTypeInformationForObjectValuesWithAlias() {
+	void mappingShouldRetainTypeInformationForObjectValuesWithAlias() {
 
 		Update update = new Update().set("value", new NestedDocument("adolin"));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -735,7 +737,7 @@ public void mappingShouldRetainTypeInformationForObjectValuesWithAlias() {
 	}
 
 	@Test // DATAMONGO-1236
-	public void mappingShouldRetrainTypeInformationWhenValueTypeOfMapDoesNotMatchItsDeclaration() {
+	void mappingShouldRetrainTypeInformationWhenValueTypeOfMapDoesNotMatchItsDeclaration() {
 
 		Map<Object, Object> map = Collections.singletonMap("szeth", new NestedDocument("son-son-vallano"));
 
@@ -748,7 +750,7 @@ public void mappingShouldRetrainTypeInformationWhenValueTypeOfMapDoesNotMatchIts
 	}
 
 	@Test // DATAMONGO-1236
-	public void mappingShouldNotContainTypeInformationWhenValueTypeOfMapMatchesDeclaration() {
+	void mappingShouldNotContainTypeInformationWhenValueTypeOfMapMatchesDeclaration() {
 
 		Map<Object, NestedDocument> map = Collections.singletonMap("jasnah", new NestedDocument("kholin"));
 
@@ -760,9 +762,21 @@ public void mappingShouldNotContainTypeInformationWhenValueTypeOfMapMatchesDecla
 		assertThat(mappedUpdate).doesNotContainKey("$set.concreteMap.jasnah._class");
 	}
 
+	@Test // GH-4567
+	void updateShouldAllowNullValuesInMap() {
+
+		Map<Object, NestedDocument> map = Collections.singletonMap("jasnah", new NestedDocument("kholin"));
+
+		Update update = new Update().set("concreteMap", Collections.singletonMap("jasnah", null));
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithObjectMap.class));
+
+		assertThat(mappedUpdate).isEqualTo(new Document("$set", new Document("concreteMap", Collections.singletonMap("jasnah", null))));
+	}
+
 	@Test // DATAMONGO-1250
 	@SuppressWarnings("unchecked")
-	public void mapsUpdateWithBothReadingAndWritingConverterRegistered() {
+	void mapsUpdateWithBothReadingAndWritingConverterRegistered() {
 
 		CustomConversions conversions = new MongoCustomConversions(Arrays.asList(
 				ClassWithEnum.AllocationToStringConverter.INSTANCE, ClassWithEnum.StringToAllocationConverter.INSTANCE));
@@ -785,7 +799,7 @@ public void mapsUpdateWithBothReadingAndWritingConverterRegistered() {
 	}
 
 	@Test // DATAMONGO-1251
-	public void mapsNullValueCorrectlyForSimpleTypes() {
+	void mapsNullValueCorrectlyForSimpleTypes() {
 
 		Update update = new Update().set("value", null);
 
@@ -797,7 +811,7 @@ public void mapsNullValueCorrectlyForSimpleTypes() {
 	}
 
 	@Test // DATAMONGO-1251
-	public void mapsNullValueCorrectlyForJava8Date() {
+	void mapsNullValueCorrectlyForJava8Date() {
 
 		Update update = new Update().set("date", null);
 
@@ -809,7 +823,7 @@ public void mapsNullValueCorrectlyForJava8Date() {
 	}
 
 	@Test // DATAMONGO-1251
-	public void mapsNullValueCorrectlyForCollectionTypes() {
+	void mapsNullValueCorrectlyForCollectionTypes() {
 
 		Update update = new Update().set("values", null);
 
@@ -821,7 +835,7 @@ public void mapsNullValueCorrectlyForCollectionTypes() {
 	}
 
 	@Test // DATAMONGO-1251
-	public void mapsNullValueCorrectlyForPropertyOfNestedDocument() {
+	void mapsNullValueCorrectlyForPropertyOfNestedDocument() {
 
 		Update update = new Update().set("concreteValue.name", null);
 
@@ -834,7 +848,7 @@ public void mapsNullValueCorrectlyForPropertyOfNestedDocument() {
 	}
 
 	@Test // DATAMONGO-1288
-	public void mapsAtomicIntegerToIntegerCorrectly() {
+	void mapsAtomicIntegerToIntegerCorrectly() {
 
 		Update update = new Update().set("intValue", new AtomicInteger(10));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -845,7 +859,7 @@ public void mapsAtomicIntegerToIntegerCorrectly() {
 	}
 
 	@Test // DATAMONGO-1288
-	public void mapsAtomicIntegerToPrimitiveIntegerCorrectly() {
+	void mapsAtomicIntegerToPrimitiveIntegerCorrectly() {
 
 		Update update = new Update().set("primIntValue", new AtomicInteger(10));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -856,7 +870,7 @@ public void mapsAtomicIntegerToPrimitiveIntegerCorrectly() {
 	}
 
 	@Test // DATAMONGO-1404
-	public void mapsMinCorrectly() {
+	void mapsMinCorrectly() {
 
 		Update update = new Update().min("minfield", 10);
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -866,7 +880,7 @@ public void mapsMinCorrectly() {
 	}
 
 	@Test // DATAMONGO-1404
-	public void mapsMaxCorrectly() {
+	void mapsMaxCorrectly() {
 
 		Update update = new Update().max("maxfield", 999);
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -877,7 +891,7 @@ public void mapsMaxCorrectly() {
 
 	@Test // DATAMONGO-1423, DATAMONGO-2155
 	@SuppressWarnings("unchecked")
-	public void mappingShouldConsiderCustomConvertersForEnumMapKeys() {
+	void mappingShouldConsiderCustomConvertersForEnumMapKeys() {
 
 		CustomConversions conversions = new MongoCustomConversions(Arrays.asList(
 				ClassWithEnum.AllocationToStringConverter.INSTANCE, ClassWithEnum.StringToAllocationConverter.INSTANCE));
@@ -904,7 +918,7 @@ public void mappingShouldConsiderCustomConvertersForEnumMapKeys() {
 	}
 
 	@Test // DATAMONGO-1176
-	public void mappingShouldPrepareUpdateObjectForMixedOperatorsAndFields() {
+	void mappingShouldPrepareUpdateObjectForMixedOperatorsAndFields() {
 
 		Document document = new Document("key", "value").append("$set", new Document("a", "b").append("x", "y"));
 
@@ -915,7 +929,7 @@ public void mappingShouldPrepareUpdateObjectForMixedOperatorsAndFields() {
 	}
 
 	@Test // DATAMONGO-1176
-	public void mappingShouldReturnReplaceObject() {
+	void mappingShouldReturnReplaceObject() {
 
 		Document document = new Document("key", "value").append("a", "b").append("x", "y");
 
@@ -928,7 +942,7 @@ public void mappingShouldReturnReplaceObject() {
 	}
 
 	@Test // DATAMONGO-1176
-	public void mappingShouldReturnUpdateObject() {
+	void mappingShouldReturnUpdateObject() {
 
 		Document document = new Document("$push", new Document("x", "y")).append("$set", new Document("a", "b"));
 
@@ -940,7 +954,7 @@ public void mappingShouldReturnUpdateObject() {
 	}
 
 	@Test // DATAMONGO-1486, DATAMONGO-2155
-	public void mappingShouldConvertMapKeysToString() {
+	void mappingShouldConvertMapKeysToString() {
 
 		Update update = new Update().set("map", Collections.singletonMap(25, "#StarTrek50"));
 		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
@@ -956,7 +970,7 @@ public void mappingShouldConvertMapKeysToString() {
 	}
 
 	@Test // DATAMONGO-1772
-	public void mappingShouldAddTypeKeyInListOfInterfaceTypeContainedInConcreteObjectCorrectly() {
+	void mappingShouldAddTypeKeyInListOfInterfaceTypeContainedInConcreteObjectCorrectly() {
 
 		ConcreteInner inner = new ConcreteInner();
 		inner.interfaceTypeList = Collections.singletonList(new SomeInterfaceImpl());
@@ -970,7 +984,7 @@ public void mappingShouldAddTypeKeyInListOfInterfaceTypeContainedInConcreteObjec
 	}
 
 	@Test // DATAMONGO-1772
-	public void mappingShouldAddTypeKeyInListOfAbstractTypeContainedInConcreteObjectCorrectly() {
+	void mappingShouldAddTypeKeyInListOfAbstractTypeContainedInConcreteObjectCorrectly() {
 
 		ConcreteInner inner = new ConcreteInner();
 		inner.abstractTypeList = Collections.singletonList(new SomeInterfaceImpl());
@@ -984,7 +998,7 @@ public void mappingShouldAddTypeKeyInListOfAbstractTypeContainedInConcreteObject
 	}
 
 	@Test // DATAMONGO-2155
-	public void shouldPreserveFieldNamesOfMapProperties() {
+	void shouldPreserveFieldNamesOfMapProperties() {
 
 		Update update = Update
 				.fromDocument(new Document("concreteMap", new Document("Name", new Document("name", "fooo"))));
@@ -996,7 +1010,7 @@ public void shouldPreserveFieldNamesOfMapProperties() {
 	}
 
 	@Test // DATAMONGO-2155
-	public void shouldPreserveExplicitFieldNamesInsideMapProperties() {
+	void shouldPreserveExplicitFieldNamesInsideMapProperties() {
 
 		Update update = Update
 				.fromDocument(new Document("map", new Document("Value", new Document("renamed-value", "fooo"))));
@@ -1009,7 +1023,7 @@ public void shouldPreserveExplicitFieldNamesInsideMapProperties() {
 	}
 
 	@Test // DATAMONGO-2155
-	public void shouldMapAliasedFieldNamesInMapsCorrectly() {
+	void shouldMapAliasedFieldNamesInMapsCorrectly() {
 
 		Update update = Update
 				.fromDocument(new Document("map", Collections.singletonMap("Value", new Document("value", "fooo"))));
@@ -1022,7 +1036,7 @@ public void shouldMapAliasedFieldNamesInMapsCorrectly() {
 	}
 
 	@Test // DATAMONGO-2174
-	public void mappingUpdateDocumentWithExplicitFieldNameShouldBePossible() {
+	void mappingUpdateDocumentWithExplicitFieldNameShouldBePossible() {
 
 		Document mappedUpdate = mapper.getMappedObject(new Document("AValue", "a value"),
 				context.getPersistentEntity(TypeWithFieldNameThatCannotBeDecapitalized.class));
@@ -1031,7 +1045,7 @@ public void mappingUpdateDocumentWithExplicitFieldNameShouldBePossible() {
 	}
 
 	@Test // DATAMONGO-2054
-	public void mappingShouldAllowPositionAllParameter() {
+	void mappingShouldAllowPositionAllParameter() {
 
 		Update update = new Update().inc("grades.$[]", 10);
 
@@ -1042,7 +1056,7 @@ public void mappingShouldAllowPositionAllParameter() {
 	}
 
 	@Test // DATAMONGO-2054
-	public void mappingShouldAllowPositionAllParameterWhenPropertyHasExplicitFieldName() {
+	void mappingShouldAllowPositionAllParameterWhenPropertyHasExplicitFieldName() {
 
 		Update update = new Update().inc("list.$[]", 10);
 
@@ -1053,7 +1067,7 @@ public void mappingShouldAllowPositionAllParameterWhenPropertyHasExplicitFieldNa
 	}
 
 	@Test // DATAMONGO-2215
-	public void mappingShouldAllowPositionParameterWithIdentifier() {
+	void mappingShouldAllowPositionParameterWithIdentifier() {
 
 		Update update = new Update().set("grades.$[element]", 10) //
 				.filterArray(Criteria.where("element").gte(100));
@@ -1065,7 +1079,7 @@ public void mappingShouldAllowPositionParameterWithIdentifier() {
 	}
 
 	@Test // DATAMONGO-2215
-	public void mappingShouldAllowPositionParameterWithIdentifierWhenFieldHasExplicitFieldName() {
+	void mappingShouldAllowPositionParameterWithIdentifierWhenFieldHasExplicitFieldName() {
 
 		Update update = new Update().set("list.$[element]", 10) //
 				.filterArray(Criteria.where("element").gte(100));
@@ -1077,7 +1091,7 @@ public void mappingShouldAllowPositionParameterWithIdentifierWhenFieldHasExplici
 	}
 
 	@Test // DATAMONGO-2215
-	public void mappingShouldAllowNestedPositionParameterWithIdentifierWhenFieldHasExplicitFieldName() {
+	void mappingShouldAllowNestedPositionParameterWithIdentifierWhenFieldHasExplicitFieldName() {
 
 		Update update = new Update().set("list.$[element].value", 10) //
 				.filterArray(Criteria.where("element").gte(100));
@@ -1088,6 +1102,266 @@ public void mappingShouldAllowNestedPositionParameterWithIdentifierWhenFieldHasE
 		assertThat(mappedUpdate).isEqualTo(new Document("$set", new Document("aliased.$[element].value", 10)));
 	}
 
+	@Test // DATAMONGO-1902
+	void mappingShouldConsiderValueOfUnwrappedType() {
+
+		Update update = new Update().set("unwrappedValue.stringValue", "updated");
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(mappedUpdate).isEqualTo(new Document("$set", new Document("stringValue", "updated")));
+	}
+
+	@Test // DATAMONGO-1902
+	void mappingShouldConsiderUnwrappedType() {
+
+		UnwrappableType unwrappableType = new UnwrappableType();
+		unwrappableType.stringValue = "updated";
+		unwrappableType.listValue = Arrays.asList("val-1", "val-2");
+		Update update = new Update().set("unwrappedValue", unwrappableType);
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithUnwrapped.class));
+
+		assertThat(mappedUpdate).isEqualTo(new Document("$set",
+				new Document("stringValue", "updated").append("listValue", Arrays.asList("val-1", "val-2"))));
+	}
+
+	@Test // DATAMONGO-1902
+	void mappingShouldConsiderValueOfPrefixedUnwrappedType() {
+
+		Update update = new Update().set("unwrappedValue.stringValue", "updated");
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithPrefixedUnwrapped.class));
+
+		assertThat(mappedUpdate).isEqualTo(new Document("$set", new Document("prefix-stringValue", "updated")));
+	}
+
+	@Test // DATAMONGO-1902
+	void mappingShouldConsiderPrefixedUnwrappedType() {
+
+		UnwrappableType unwrappableType = new UnwrappableType();
+		unwrappableType.stringValue = "updated";
+		unwrappableType.listValue = Arrays.asList("val-1", "val-2");
+
+		Update update = new Update().set("unwrappedValue", unwrappableType);
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithPrefixedUnwrapped.class));
+
+		assertThat(mappedUpdate).isEqualTo(new Document("$set",
+				new Document("prefix-stringValue", "updated").append("prefix-listValue", Arrays.asList("val-1", "val-2"))));
+	}
+
+	@Test // DATAMONGO-1902
+	void mappingShouldConsiderNestedPrefixedUnwrappedType() {
+
+		UnwrappableType unwrappableType = new UnwrappableType();
+		unwrappableType.stringValue = "updated";
+		unwrappableType.listValue = Arrays.asList("val-1", "val-2");
+
+		Update update = new Update().set("withPrefixedUnwrapped.unwrappedValue", unwrappableType);
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WrapperAroundWithUnwrapped.class));
+
+		assertThat(mappedUpdate).isEqualTo(new Document("$set", new Document("withPrefixedUnwrapped",
+				new Document("prefix-stringValue", "updated").append("prefix-listValue", Arrays.asList("val-1", "val-2")))));
+	}
+
+	@Test // GH-3552
+	void numericKeyForMap() {
+
+		Update update = new Update().set("map.601218778970110001827396", "testing");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithObjectMap.class));
+
+		assertThat(mappedUpdate).isEqualTo("{\"$set\": {\"map.601218778970110001827396\": \"testing\"}}");
+	}
+
+	@Test // GH-3552
+	void numericKeyInMapOfNestedPath() {
+
+		Update update = new Update().set("map.601218778970110001827396.value", "testing");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithObjectMap.class));
+
+		assertThat(mappedUpdate).isEqualTo("{\"$set\": {\"map.601218778970110001827396.value\": \"testing\"}}");
+	}
+
+	@Test // GH-3688
+	void multipleNumericKeysInNestedPath() {
+
+		Update update = new Update().set("intKeyedMap.12345.map.0", "testing");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithIntKeyedMap.class));
+
+		assertThat(mappedUpdate).isEqualTo("{\"$set\": {\"intKeyedMap.12345.map.0\": \"testing\"}}");
+	}
+
+	@Test // GH-3566
+	void mapsObjectClassPropertyFieldInMapValueTypeAsKey() {
+
+		Update update = new Update().set("map.class", "value");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithObjectMap.class));
+
+		assertThat(mappedUpdate).isEqualTo("{\"$set\": {\"map.class\": \"value\"}}");
+	}
+
+	@Test // GH-3775
+	void mapNestedStringFieldCorrectly() {
+
+		Update update = new Update().set("levelOne.a.b.d", "e");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithNestedMap.class));
+
+		assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("levelOne.a.b.d", "e")));
+	}
+
+	@ParameterizedTest // GH-3775, GH-4426
+	@ValueSource(strings = {"levelOne.0.1.3", "levelOne.0.1.32", "levelOne2.0.1.32", "levelOne2.0.1.320"})
+	void mapNestedIntegerFieldCorrectly(String path) {
+
+		Update update = new Update().set(path, "4");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithNestedMap.class));
+
+		assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document(path, "4")));
+	}
+
+	@ParameterizedTest // GH-3775, GH-4426
+	@ValueSource(strings = {"levelOne.0.1.c", "levelOne.0.1.c.32", "levelOne2.0.1.32.c", "levelOne2.0.1.c.320"})
+	void mapNestedMixedStringIntegerFieldCorrectly(String path) {
+
+		Update update = new Update().set(path, "4");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithNestedMap.class));
+
+		assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document(path, "4")));
+	}
+
+	@Test // GH-3775
+	void mapNestedMixedStringIntegerWithStartNumberFieldCorrectly() {
+
+		Update update = new Update().set("levelOne.0a.1b.3c", "4");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithNestedMap.class));
+
+		assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("levelOne.0a.1b.3c", "4")));
+	}
+
+	@Test // GH-3688
+	void multipleKeysStartingWithANumberInNestedPath() {
+
+		Update update = new Update().set("intKeyedMap.1a.map.0b", "testing");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithIntKeyedMap.class));
+
+		assertThat(mappedUpdate).isEqualTo("{\"$set\": {\"intKeyedMap.1a.map.0b\": \"testing\"}}");
+	}
+
+	@Test // GH-3853
+	void updateWithDocuRefOnId() {
+
+		Sample sample = new Sample();
+		sample.foo = "s1";
+
+		Update update = new Update().set("sample", sample);
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("sample", "s1")));
+	}
+
+	@Test // GH-3853
+	void updateListWithDocuRefOnId() {
+
+		Sample sample = new Sample();
+		sample.foo = "s1";
+
+		Update update = new Update().set("samples", Arrays.asList(sample));
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedUpdate)
+				.isEqualTo(new org.bson.Document("$set", new org.bson.Document("samples", Arrays.asList("s1"))));
+	}
+
+	@Test // GH-3853
+	void updateWithDocuRefOnProperty() {
+
+		Customer customer = new Customer();
+		customer.id = new ObjectId();
+		customer.name = "c-name";
+
+		Update update = new Update().set("customer", customer);
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedUpdate).isEqualTo(new org.bson.Document("$set", new org.bson.Document("customer", "c-name")));
+	}
+
+	@Test // GH-3853
+	void updateListWithDocuRefOnProperty() {
+
+		Customer customer = new Customer();
+		customer.id = new ObjectId();
+		customer.name = "c-name";
+
+		Update update = new Update().set("customers", Arrays.asList(customer));
+
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(WithDocumentReference.class));
+
+		assertThat(mappedUpdate)
+				.isEqualTo(new org.bson.Document("$set", new org.bson.Document("customers", Arrays.asList("c-name"))));
+	}
+
+	@Test // GH-3921
+	void mapNumericKeyInPathHavingComplexMapValyeTypes() {
+
+		Update update = new Update().set("testInnerData.testMap.1.intValue", "4");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(TestData.class));
+
+		assertThat(mappedUpdate).isEqualTo("{ $set: { 'testInnerData.testMap.1.intValue': '4' }}");
+	}
+
+	@Test // GH-3921
+	void mapNumericKeyInPathNotMatchingExistingProperties() {
+
+		Update update = new Update().set("testInnerData.imaginaryMap.1.nonExistingProperty", "4");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(TestData.class));
+
+		assertThat(mappedUpdate).isEqualTo("{ $set: { 'testInnerData.imaginaryMap.1.nonExistingProperty': '4' }}");
+	}
+
+	@Test // GH-3921
+	void mapNumericKeyInPathPartiallyMatchingExistingProperties() {
+
+		Update update = new Update().set("testInnerData.testMap.1.nonExistingProperty.2.someValue", "4");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(TestData.class));
+
+		assertThat(mappedUpdate).isEqualTo("{ $set: { 'testInnerData.testMap.1.nonExistingProperty.2.someValue': '4' }}");
+	}
+
+	@Test // GH-3596
+	void updateConsidersValueConverterWhenPresent() {
+
+		Update update = new Update().set("text", "value");
+		Document mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), context.getPersistentEntity(WithPropertyValueConverter.class));
+
+		assertThat(mappedUpdate).isEqualTo("{ $set : { 'text' : 'eulav' } }");
+	}
+
 	static class DomainTypeWrappingConcreteyTypeHavingListOfInterfaceTypeAttributes {
 		ListModelWrapper concreteTypeWithListAttributeOfInterfaceType;
 	}
@@ -1119,7 +1393,7 @@ static class InterfaceDocumentDefinitionImpl implements InterfaceDocumentDefinit
 		@Id String id;
 		String value;
 
-		public InterfaceDocumentDefinitionImpl(String id, String value) {
+		InterfaceDocumentDefinitionImpl(String id, String value) {
 
 			this.id = id;
 			this.value = value;
@@ -1163,7 +1437,7 @@ interface Model {}
 	static class ModelImpl implements Model {
 		public int value;
 
-		public ModelImpl(int value) {
+		ModelImpl(int value) {
 			this.value = value;
 		}
 
@@ -1188,7 +1462,7 @@ static class ListModel {
 
 		List<String> values;
 
-		public ListModel(String... values) {
+		ListModel(String... values) {
 			this.values = Arrays.asList(values);
 		}
 	}
@@ -1217,7 +1491,7 @@ static abstract class AbstractChildClass {
 		String otherValue;
 		AbstractChildClass someObject;
 
-		public AbstractChildClass(String id, String value) {
+		AbstractChildClass(String id, String value) {
 			this.id = id;
 			this.value = value;
 			this.otherValue = "other_" + value;
@@ -1226,7 +1500,7 @@ public AbstractChildClass(String id, String value) {
 
 	static class ConcreteChildClass extends AbstractChildClass {
 
-		public ConcreteChildClass(String id, String value) {
+		ConcreteChildClass(String id, String value) {
 			super(id, value);
 		}
 	}
@@ -1242,7 +1516,7 @@ public List<NestedEntity> getCollectionOfNestedEntities() {
 	static class NestedEntity {
 		String name;
 
-		public NestedEntity(String name) {
+		NestedEntity(String name) {
 			super();
 			this.name = name;
 		}
@@ -1288,7 +1562,7 @@ static class NestedDocument {
 
 		String name;
 
-		public NestedDocument(String name) {
+		NestedDocument(String name) {
 			super();
 			this.name = name;
 		}
@@ -1324,6 +1598,10 @@ static class EntityWithObjectMap {
 		Map<Object, NestedDocument> concreteMap;
 	}
 
+	static class EntityWithIntKeyedMap {
+		Map<Integer, EntityWithObjectMap> intKeyedMap;
+	}
+
 	static class ClassWithEnum {
 
 		Allocation allocation;
@@ -1401,20 +1679,155 @@ static abstract class SomeAbstractType {
 
 	}
 
-	@AllArgsConstructor
-	@NoArgsConstructor
 	static class SomeInterfaceImpl extends SomeAbstractType implements SomeInterfaceType {
 
 		String value;
+
+		public SomeInterfaceImpl() {}
+
+		public SomeInterfaceImpl(String value) {
+			this.value = value;
+		}
 	}
 
-	@Data
 	static class TypeWithFieldNameThatCannotBeDecapitalized {
 
 		@Id protected String id;
 
 		@Field("AValue") private Long aValue = 0L;
 
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public Long getaValue() {
+			return aValue;
+		}
+
+		public void setaValue(Long aValue) {
+			this.aValue = aValue;
+		}
+	}
+
+	static class WrapperAroundWithUnwrapped {
+
+		String someValue;
+		WithUnwrapped withUnwrapped;
+		WithPrefixedUnwrapped withPrefixedUnwrapped;
 	}
 
+	static class WithUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable UnwrappableType unwrappedValue;
+	}
+
+	static class WithPrefixedUnwrapped {
+
+		String id;
+
+		@Unwrapped.Nullable("prefix-") UnwrappableType unwrappedValue;
+	}
+
+	static class UnwrappableType {
+
+		String stringValue;
+		List<String> listValue;
+
+		@Field("with-at-field-annotation") //
+		String atFieldAnnotatedValue;
+
+		@Transient //
+		String transientValue;
+	}
+
+	static class EntityWithNestedMap {
+		Map<String, Map<String, Map<String, Object>>> levelOne;
+		Map<String, Map<String, Map<String, Object>>> levelOne2;
+	}
+
+	static class Customer {
+
+		@Id private ObjectId id;
+		private String name;
+	}
+
+	static class Sample {
+
+		@Id private String foo;
+	}
+
+	static class WithDocumentReference {
+
+		private ObjectId id;
+
+		private String name;
+
+		@DocumentReference(lookup = "{ 'name' : ?#{#target} }") private Customer customer;
+
+		@DocumentReference(lookup = "{ 'name' : ?#{#target} }") private List<Customer> customers;
+
+		@DocumentReference private Sample sample;
+
+		@DocumentReference private List<Sample> samples;
+	}
+
+	private static class TestData {
+
+		@Id private String id;
+		private TestInnerData testInnerData;
+
+		public String getId() {
+			return id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public TestInnerData getTestInnerData() {
+			return testInnerData;
+		}
+
+		public void setTestInnerData(TestInnerData testInnerData) {
+			this.testInnerData = testInnerData;
+		}
+	}
+
+	private static class TestInnerData {
+
+		private Map<Integer, TestValue> testMap;
+
+		public Map<Integer, TestValue> getTestMap() {
+			return testMap;
+		}
+
+		public void setTestMap(Map<Integer, TestValue> testMap) {
+			this.testMap = testMap;
+		}
+	}
+
+	private static class TestValue {
+
+		private int intValue;
+
+		public int getIntValue() {
+			return intValue;
+		}
+
+		public void setIntValue(int intValue) {
+			this.intValue = intValue;
+		}
+	}
+
+	static class WithPropertyValueConverter {
+
+		@ValueConverter(ReversingValueConverter.class)
+		String text;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/AbstractEncryptionTestBase.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/AbstractEncryptionTestBase.java
new file mode 100644
index 0000000000..083221053d
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/AbstractEncryptionTestBase.java
@@ -0,0 +1,756 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.EncryptionAlgorithms.*;
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import java.security.SecureRandom;
+import java.time.LocalDate;
+import java.time.Month;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+import org.assertj.core.api.Assertions;
+import org.bson.BsonBinary;
+import org.bson.Document;
+import org.bson.types.Binary;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.dao.PermissionDeniedDataAccessException;
+import org.springframework.data.convert.PropertyValueConverterFactory;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions.MongoConverterConfigurationAdapter;
+import org.springframework.data.mongodb.core.convert.encryption.MongoEncryptionConverter;
+import org.springframework.data.mongodb.core.mapping.ExplicitEncrypted;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.util.Lazy;
+
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.Indexes;
+import com.mongodb.client.model.vault.DataKeyOptions;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+
+/**
+ * @author Christoph Strobl
+ * @author Julia Lee
+ */
+public abstract class AbstractEncryptionTestBase {
+
+	@Autowired MongoTemplate template;
+
+	@Test // GH-4284
+	void encryptAndDecryptSimpleValue() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.ssn = "mySecretSSN";
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("ssn")).isInstanceOf(Binary.class)) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4432
+	void encryptAndDecryptJavaTime() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.today = LocalDate.of(1979, Month.SEPTEMBER, 18);
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("today")).isInstanceOf(Binary.class)) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4284
+	void encryptAndDecryptComplexValue() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.address = new Address();
+		source.address.city = "NYC";
+		source.address.street = "4th Ave.";
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("address")).isInstanceOf(Binary.class)) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4284
+	void encryptAndDecryptValueWithinComplexOne() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.encryptedZip = new AddressWithEncryptedZip();
+		source.encryptedZip.city = "Boston";
+		source.encryptedZip.street = "central square";
+		source.encryptedZip.zip = "1234567890";
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> {
+					assertThat(it.get("encryptedZip")).isInstanceOf(Document.class);
+					assertThat(it.get("encryptedZip", Document.class).get("city")).isInstanceOf(String.class);
+					assertThat(it.get("encryptedZip", Document.class).get("street")).isInstanceOf(String.class);
+					assertThat(it.get("encryptedZip", Document.class).get("zip")).isInstanceOf(Binary.class);
+				}) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4284
+	void encryptAndDecryptListOfSimpleValue() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.listOfString = Arrays.asList("spring", "data", "mongodb");
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("listOfString")).isInstanceOf(Binary.class)) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4284
+	void encryptAndDecryptListOfComplexValue() {
+
+		Person source = new Person();
+		source.id = "id-1";
+
+		Address address = new Address();
+		address.city = "SFO";
+		address.street = "---";
+
+		source.listOfComplex = Collections.singletonList(address);
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("listOfComplex")).isInstanceOf(Binary.class)) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4284
+	void encryptAndDecryptMapOfSimpleValues() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.mapOfString = Map.of("k1", "v1", "k2", "v2");
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("mapOfString")).isInstanceOf(Binary.class)) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4284
+	void encryptAndDecryptMapOfComplexValues() {
+
+		Person source = new Person();
+		source.id = "id-1";
+
+		Address address1 = new Address();
+		address1.city = "SFO";
+		address1.street = "---";
+
+		Address address2 = new Address();
+		address2.city = "NYC";
+		address2.street = "---";
+
+		source.mapOfComplex = Map.of("a1", address1, "a2", address2);
+
+		template.save(source);
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("mapOfComplex")).isInstanceOf(Binary.class)) //
+				.loadedIsEqualToSource();
+	}
+
+	@Test // GH-4284
+	void canQueryDeterministicallyEncrypted() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.ssn = "mySecretSSN";
+
+		template.save(source);
+
+		Person loaded = template.query(Person.class).matching(where("ssn").is(source.ssn)).firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4284
+	void cannotQueryRandomlyEncrypted() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.wallet = "secret-wallet-id";
+
+		template.save(source);
+
+		Person loaded = template.query(Person.class).matching(where("wallet").is(source.wallet)).firstValue();
+		assertThat(loaded).isNull();
+	}
+
+	@Test // GH-4284
+	void updateSimpleTypeEncryptedFieldWithNewValue() {
+
+		Person source = new Person();
+		source.id = "id-1";
+
+		template.save(source);
+
+		template.update(Person.class).matching(where("id").is(source.id)).apply(Update.update("ssn", "secret-value"))
+				.first();
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("ssn")).isInstanceOf(Binary.class)) //
+				.loadedMatches(it -> assertThat(it.getSsn()).isEqualTo("secret-value"));
+	}
+
+	@Test // GH-4284
+	void updateComplexTypeEncryptedFieldWithNewValue() {
+
+		Person source = new Person();
+		source.id = "id-1";
+
+		template.save(source);
+
+		Address address = new Address();
+		address.city = "SFO";
+		address.street = "---";
+
+		template.update(Person.class).matching(where("id").is(source.id)).apply(Update.update("address", address)).first();
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> assertThat(it.get("address")).isInstanceOf(Binary.class)) //
+				.loadedMatches(it -> assertThat(it.getAddress()).isEqualTo(address));
+	}
+
+	@Test // GH-4284
+	void updateEncryptedFieldInNestedElementWithNewValue() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.encryptedZip = new AddressWithEncryptedZip();
+		source.encryptedZip.city = "Boston";
+		source.encryptedZip.street = "central square";
+
+		template.save(source);
+
+		template.update(Person.class).matching(where("id").is(source.id)).apply(Update.update("encryptedZip.zip", "179"))
+				.first();
+
+		verifyThat(source) //
+				.identifiedBy(Person::getId) //
+				.wasSavedMatching(it -> {
+					assertThat(it.get("encryptedZip")).isInstanceOf(Document.class);
+					assertThat(it.get("encryptedZip", Document.class).get("city")).isInstanceOf(String.class);
+					assertThat(it.get("encryptedZip", Document.class).get("street")).isInstanceOf(String.class);
+					assertThat(it.get("encryptedZip", Document.class).get("zip")).isInstanceOf(Binary.class);
+				}) //
+				.loadedMatches(it -> assertThat(it.getEncryptedZip().getZip()).isEqualTo("179"));
+	}
+
+	@Test
+	void aggregationWithMatch() {
+
+		Person person = new Person();
+		person.id = "id-1";
+		person.name = "p1-name";
+		person.ssn = "mySecretSSN";
+
+		template.save(person);
+
+		AggregationResults<Person> aggregationResults = template.aggregateAndReturn(Person.class)
+				.by(newAggregation(Person.class, Aggregation.match(where("ssn").is(person.ssn)))).all();
+		assertThat(aggregationResults.getMappedResults()).containsExactly(person);
+	}
+
+	@Test
+	void altKeyDetection(@Autowired CachingMongoClientEncryption mongoClientEncryption) throws InterruptedException {
+
+		BsonBinary user1key = mongoClientEncryption.getClientEncryption().createDataKey("local",
+				new DataKeyOptions().keyAltNames(Collections.singletonList("user-1")));
+
+		BsonBinary user2key = mongoClientEncryption.getClientEncryption().createDataKey("local",
+				new DataKeyOptions().keyAltNames(Collections.singletonList("user-2")));
+
+		Person p1 = new Person();
+		p1.id = "id-1";
+		p1.name = "user-1";
+		p1.ssn = "ssn";
+		p1.viaAltKeyNameField = "value-1";
+
+		Person p2 = new Person();
+		p2.id = "id-2";
+		p2.name = "user-2";
+		p2.viaAltKeyNameField = "value-1";
+
+		Person p3 = new Person();
+		p3.id = "id-3";
+		p3.name = "user-1";
+		p3.viaAltKeyNameField = "value-1";
+
+		template.save(p1);
+		template.save(p2);
+		template.save(p3);
+
+		template.execute(Person.class, collection -> {
+			collection.find(new Document());
+			return null;
+		});
+
+		// remove the key and invalidate encrypted data
+		mongoClientEncryption.getClientEncryption().deleteKey(user2key);
+
+		// clear the 60 second key cache within the mongo client
+		mongoClientEncryption.destroy();
+
+		assertThat(template.query(Person.class).matching(where("id").is(p1.id)).firstValue()).isEqualTo(p1);
+
+		assertThatExceptionOfType(PermissionDeniedDataAccessException.class)
+				.isThrownBy(() -> template.query(Person.class).matching(where("id").is(p2.id)).firstValue());
+	}
+
+	<T> SaveAndLoadAssert<T> verifyThat(T source) {
+		return new SaveAndLoadAssert<>(source);
+	}
+
+	class SaveAndLoadAssert<T> {
+
+		T source;
+		Function<T, ?> idProvider;
+
+		SaveAndLoadAssert(T source) {
+			this.source = source;
+		}
+
+		SaveAndLoadAssert<T> identifiedBy(Function<T, ?> idProvider) {
+			this.idProvider = idProvider;
+			return this;
+		}
+
+		SaveAndLoadAssert<T> wasSavedAs(Document expected) {
+			return wasSavedMatching(it -> Assertions.assertThat(it).isEqualTo(expected));
+		}
+
+		SaveAndLoadAssert<T> wasSavedMatching(Consumer<Document> saved) {
+			AbstractEncryptionTestBase.this.assertSaved(source, idProvider, saved);
+			return this;
+		}
+
+		SaveAndLoadAssert<T> loadedMatches(Consumer<T> expected) {
+			AbstractEncryptionTestBase.this.assertLoaded(source, idProvider, expected);
+			return this;
+		}
+
+		SaveAndLoadAssert<T> loadedIsEqualToSource() {
+			return loadedIsEqualTo(source);
+		}
+
+		SaveAndLoadAssert<T> loadedIsEqualTo(T expected) {
+			return loadedMatches(it -> Assertions.assertThat(it).isEqualTo(expected));
+		}
+
+	}
+
+	<T> void assertSaved(T source, Function<T, ?> idProvider, Consumer<Document> dbValue) {
+
+		Document savedDocument = template.execute(Person.class, collection -> {
+
+			MongoNamespace namespace = collection.getNamespace();
+
+			try (MongoClient rawClient = MongoClients.create()) {
+				return rawClient.getDatabase(namespace.getDatabaseName()).getCollection(namespace.getCollectionName())
+						.find(new Document("_id", idProvider.apply(source))).first();
+			}
+		});
+		dbValue.accept(savedDocument);
+	}
+
+	<T> void assertLoaded(T source, Function<T, ?> idProvider, Consumer<T> loadedValue) {
+
+		T loaded = template.query((Class<T>) source.getClass()).matching(where("id").is(idProvider.apply(source)))
+				.firstValue();
+
+		loadedValue.accept(loaded);
+	}
+
+	protected static class EncryptionConfig extends AbstractMongoClientConfiguration {
+
+		@Autowired ApplicationContext applicationContext;
+
+		@Override
+		protected String getDatabaseName() {
+			return "fle-test";
+		}
+
+		@Bean
+		public MongoClient mongoClient() {
+			return super.mongoClient();
+		}
+
+		@Override
+		protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
+
+			converterConfigurationAdapter
+					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
+					.useNativeDriverJavaTimeCodecs();
+		}
+
+		@Bean
+		MongoEncryptionConverter encryptingConverter(MongoClientEncryption mongoClientEncryption) {
+
+			Lazy<BsonBinary> dataKey = Lazy.of(() -> mongoClientEncryption.getClientEncryption().createDataKey("local",
+					new DataKeyOptions().keyAltNames(Collections.singletonList("mySuperSecretKey"))));
+
+			return new MongoEncryptionConverter(mongoClientEncryption,
+					EncryptionKeyResolver.annotated((ctx) -> EncryptionKey.keyId(dataKey.get())));
+		}
+
+		@Bean
+		CachingMongoClientEncryption clientEncryption(ClientEncryptionSettings encryptionSettings) {
+			return new CachingMongoClientEncryption(() -> ClientEncryptions.create(encryptionSettings));
+		}
+
+		@Bean
+		ClientEncryptionSettings encryptionSettings(MongoClient mongoClient) {
+
+			MongoNamespace keyVaultNamespace = new MongoNamespace("encryption.testKeyVault");
+			MongoCollection<Document> keyVaultCollection = mongoClient.getDatabase(keyVaultNamespace.getDatabaseName())
+					.getCollection(keyVaultNamespace.getCollectionName());
+			keyVaultCollection.drop();
+			// Ensure that two data keys cannot share the same keyAltName.
+			keyVaultCollection.createIndex(Indexes.ascending("keyAltNames"),
+					new IndexOptions().unique(true).partialFilterExpression(Filters.exists("keyAltNames")));
+
+			MongoCollection<Document> collection = mongoClient.getDatabase(getDatabaseName()).getCollection("test");
+			collection.drop(); // Clear old data
+
+			byte[] localMasterKey = new byte[96];
+			new SecureRandom().nextBytes(localMasterKey);
+			Map<String, Map<String, Object>> kmsProviders = Map.of("local", Map.of("key", localMasterKey));
+
+			// Create the ClientEncryption instance
+			return ClientEncryptionSettings.builder() //
+					.keyVaultMongoClientSettings(
+							MongoClientSettings.builder().applyConnectionString(new ConnectionString("mongodb://localhost")).build()) //
+					.keyVaultNamespace(keyVaultNamespace.getFullName()) //
+					.kmsProviders(kmsProviders) //
+					.build();
+		}
+	}
+
+	static class CachingMongoClientEncryption extends MongoClientEncryption implements DisposableBean {
+
+		static final AtomicReference<ClientEncryption> cache = new AtomicReference<>();
+
+		CachingMongoClientEncryption(Supplier<ClientEncryption> source) {
+			super(() -> {
+
+				if (cache.get() != null) {
+					return cache.get();
+				}
+
+				ClientEncryption clientEncryption = source.get();
+				cache.set(clientEncryption);
+
+				return clientEncryption;
+			});
+		}
+
+		@Override
+		public void destroy() {
+
+			ClientEncryption clientEncryption = cache.get();
+			if (clientEncryption != null) {
+				clientEncryption.close();
+				cache.set(null);
+			}
+		}
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document("test")
+	static class Person {
+
+		String id;
+		String name;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic) //
+		String ssn;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random, keyAltName = "mySuperSecretKey") //
+		String wallet;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) // full document must be random
+		Address address;
+
+		AddressWithEncryptedZip encryptedZip;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) // lists must be random
+		List<String> listOfString;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) // lists must be random
+		List<Address> listOfComplex;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random, keyAltName = "/name") //
+		String viaAltKeyNameField;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) //
+		Map<String, String> mapOfString;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) //
+		Map<String, Address> mapOfComplex;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) //
+		LocalDate today;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public String getSsn() {
+			return this.ssn;
+		}
+
+		public String getWallet() {
+			return this.wallet;
+		}
+
+		public Address getAddress() {
+			return this.address;
+		}
+
+		public AddressWithEncryptedZip getEncryptedZip() {
+			return this.encryptedZip;
+		}
+
+		public List<String> getListOfString() {
+			return this.listOfString;
+		}
+
+		public List<Address> getListOfComplex() {
+			return this.listOfComplex;
+		}
+
+		public String getViaAltKeyNameField() {
+			return this.viaAltKeyNameField;
+		}
+
+		public Map<String, String> getMapOfString() {
+			return this.mapOfString;
+		}
+
+		public Map<String, Address> getMapOfComplex() {
+			return this.mapOfComplex;
+		}
+
+		public LocalDate getToday() {
+			return today;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public void setSsn(String ssn) {
+			this.ssn = ssn;
+		}
+
+		public void setWallet(String wallet) {
+			this.wallet = wallet;
+		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
+		public void setEncryptedZip(AddressWithEncryptedZip encryptedZip) {
+			this.encryptedZip = encryptedZip;
+		}
+
+		public void setListOfString(List<String> listOfString) {
+			this.listOfString = listOfString;
+		}
+
+		public void setListOfComplex(List<Address> listOfComplex) {
+			this.listOfComplex = listOfComplex;
+		}
+
+		public void setViaAltKeyNameField(String viaAltKeyNameField) {
+			this.viaAltKeyNameField = viaAltKeyNameField;
+		}
+
+		public void setMapOfString(Map<String, String> mapOfString) {
+			this.mapOfString = mapOfString;
+		}
+
+		public void setMapOfComplex(Map<String, Address> mapOfComplex) {
+			this.mapOfComplex = mapOfComplex;
+		}
+
+		public void setToday(LocalDate today) {
+			this.today = today;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(name, person.name) && Objects.equals(ssn, person.ssn)
+					&& Objects.equals(wallet, person.wallet) && Objects.equals(address, person.address)
+					&& Objects.equals(encryptedZip, person.encryptedZip) && Objects.equals(listOfString, person.listOfString)
+					&& Objects.equals(listOfComplex, person.listOfComplex)
+					&& Objects.equals(viaAltKeyNameField, person.viaAltKeyNameField)
+					&& Objects.equals(mapOfString, person.mapOfString) && Objects.equals(mapOfComplex, person.mapOfComplex)
+					&& Objects.equals(today, person.today);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, name, ssn, wallet, address, encryptedZip, listOfString, listOfComplex, viaAltKeyNameField,
+					mapOfString, mapOfComplex, today);
+		}
+
+		public String toString() {
+			return "EncryptionTests.Person(id=" + this.getId() + ", name=" + this.getName() + ", ssn=" + this.getSsn()
+					+ ", wallet=" + this.getWallet() + ", address=" + this.getAddress() + ", encryptedZip="
+					+ this.getEncryptedZip() + ", listOfString=" + this.getListOfString() + ", listOfComplex="
+					+ this.getListOfComplex() + ", viaAltKeyNameField=" + this.getViaAltKeyNameField() + ", mapOfString="
+					+ this.getMapOfString() + ", mapOfComplex=" + this.getMapOfComplex() + ", today=" + this.getToday() + ")";
+		}
+	}
+
+	static class Address {
+		String city;
+		String street;
+
+		public Address() {}
+
+		public String getCity() {
+			return this.city;
+		}
+
+		public String getStreet() {
+			return this.street;
+		}
+
+		public void setCity(String city) {
+			this.city = city;
+		}
+
+		public void setStreet(String street) {
+			this.street = street;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Address address = (Address) o;
+			return Objects.equals(city, address.city) && Objects.equals(street, address.street);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(city, street);
+		}
+
+		public String toString() {
+			return "EncryptionTests.Address(city=" + this.getCity() + ", street=" + this.getStreet() + ")";
+		}
+	}
+
+	static class AddressWithEncryptedZip extends Address {
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) String zip;
+
+		@Override
+		public String toString() {
+			return "AddressWithEncryptedZip{" + "zip='" + zip + '\'' + ", city='" + getCity() + '\'' + ", street='"
+					+ getStreet() + '\'' + '}';
+		}
+
+		public String getZip() {
+			return this.zip;
+		}
+
+		public void setZip(String zip) {
+			this.zip = zip;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/BypassAutoEncryptionTest.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/BypassAutoEncryptionTest.java
new file mode 100644
index 0000000000..3aab3a7485
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/BypassAutoEncryptionTest.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.MongoClientSettings.Builder;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+/**
+ * Encryption tests for client having {@link AutoEncryptionSettings#isBypassAutoEncryption()}.
+ *
+ * @author Christoph Strobl
+ * @author Julia Lee
+ */
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = BypassAutoEncryptionTest.Config.class)
+public class BypassAutoEncryptionTest extends AbstractEncryptionTestBase {
+
+	@Disabled
+	@Override
+	void altKeyDetection(@Autowired CachingMongoClientEncryption mongoClientEncryption) throws InterruptedException {
+		super.altKeyDetection(mongoClientEncryption);
+	}
+
+	@Configuration
+	static class Config extends EncryptionConfig {
+
+		@Override
+		protected void configureClientSettings(Builder builder) {
+
+			MongoClient mongoClient = MongoClients.create();
+			ClientEncryptionSettings clientEncryptionSettings = encryptionSettings(mongoClient);
+			mongoClient.close();
+
+			builder.autoEncryptionSettings(AutoEncryptionSettings.builder() //
+					.kmsProviders(clientEncryptionSettings.getKmsProviders()) //
+					.keyVaultNamespace(clientEncryptionSettings.getKeyVaultNamespace()) //
+					.bypassAutoEncryption(true).build());
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyResolverUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyResolverUnitTests.java
new file mode 100644
index 0000000000..eeb4df2275
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyResolverUnitTests.java
@@ -0,0 +1,248 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.EncryptionAlgorithms.*;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.function.Function;
+
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.data.mongodb.core.mapping.Encrypted;
+import org.springframework.data.mongodb.core.mapping.ExplicitEncrypted;
+import org.springframework.data.mongodb.test.util.MongoTestMappingContext;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+
+/**
+ * Unit tests for {@link EncryptionKeyResolver}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class EncryptionKeyResolverUnitTests {
+
+	@Mock //
+	EncryptionKeyResolver fallbackKeyResolver;
+
+	MongoTestMappingContext mappingContext = MongoTestMappingContext.newTestContext().init();
+
+	EncryptionKey defaultEncryptionKey = EncryptionKey
+			.keyId(new BsonBinary("super-secret".getBytes(StandardCharsets.UTF_8)));
+
+	@BeforeEach
+	void beforeEach() {
+		when(fallbackKeyResolver.getKey(any())).thenReturn(defaultEncryptionKey);
+	}
+
+	@Test // GH-4284
+	void usesDefaultKeyIfNoAnnotationPresent() {
+
+		EncryptionContext ctx = prepareEncryptionContext(AnnotatedWithExplicitlyEncrypted.class,
+				AnnotatedWithExplicitlyEncrypted::getNotAnnotated);
+
+		EncryptionKey key = EncryptionKeyResolver.annotated(fallbackKeyResolver).getKey(ctx);
+
+		assertThat(key).isSameAs(defaultEncryptionKey);
+	}
+
+	@Test // GH-4284
+	void usesDefaultKeyIfAnnotatedValueIsEmpty() {
+
+		EncryptionContext ctx = prepareEncryptionContext(AnnotatedWithExplicitlyEncrypted.class,
+				AnnotatedWithExplicitlyEncrypted::getAlgorithm);
+
+		EncryptionKey key = EncryptionKeyResolver.annotated(fallbackKeyResolver).getKey(ctx);
+
+		assertThat(key).isSameAs(defaultEncryptionKey);
+	}
+
+	@Test // GH-4284
+	void usesDefaultAltKeyNameIfPresent() {
+
+		EncryptionContext ctx = prepareEncryptionContext(AnnotatedWithExplicitlyEncrypted.class,
+				AnnotatedWithExplicitlyEncrypted::getAlgorithmAndAltKeyName);
+
+		EncryptionKey key = EncryptionKeyResolver.annotated(fallbackKeyResolver).getKey(ctx);
+
+		assertThat(key).isEqualTo(EncryptionKey.keyAltName("sec-key-name"));
+	}
+
+	@Test // GH-4284
+	void readsAltKeyNameFromContextIfReferencingPropertyValue() {
+
+		EncryptionContext ctx = prepareEncryptionContext(AnnotatedWithExplicitlyEncrypted.class,
+				AnnotatedWithExplicitlyEncrypted::getAlgorithmAndAltKeyNameFromPropertyValue);
+		when(ctx.lookupValue(eq("notAnnotated"))).thenReturn("born-to-be-wild");
+
+		EncryptionKey key = EncryptionKeyResolver.annotated(fallbackKeyResolver).getKey(ctx);
+
+		assertThat(key).isEqualTo(EncryptionKey.keyAltName("born-to-be-wild"));
+	}
+
+	@Test // GH-4284
+	void readsKeyIdFromEncryptedAnnotationIfNoBetterCandidateAvailable() {
+
+		EncryptionContext ctx = prepareEncryptionContext(
+				AnnotatedWithExplicitlyEncryptedHavingDefaultAlgorithmServedViaAnnotationOnType.class,
+				AnnotatedWithExplicitlyEncryptedHavingDefaultAlgorithmServedViaAnnotationOnType::getKeyIdFromDomainType);
+
+		EncryptionKey key = EncryptionKeyResolver.annotated(fallbackKeyResolver).getKey(ctx);
+
+		assertThat(key).isEqualTo(EncryptionKey.keyId(
+				new BsonBinary(BsonBinarySubType.UUID_STANDARD, Base64.getDecoder().decode("xKVup8B1Q+CkHaVRx+qa+g=="))));
+	}
+
+	@Test // GH-4284
+	void ignoresKeyIdFromEncryptedAnnotationWhenBetterCandidateAvailable() {
+
+		EncryptionContext ctx = prepareEncryptionContext(KeyIdFromSpel.class, KeyIdFromSpel::getKeyIdFromDomainType);
+
+		StandardEvaluationContext evaluationContext = new StandardEvaluationContext();
+		evaluationContext.setVariable("myKeyId", "xKVup8B1Q+CkHaVRx+qa+g==");
+
+		when(ctx.getEvaluationContext(any())).thenReturn(evaluationContext);
+
+		EncryptionKey key = EncryptionKeyResolver.annotated(fallbackKeyResolver).getKey(ctx);
+
+		assertThat(key).isEqualTo(EncryptionKey.keyId(
+				new BsonBinary(BsonBinarySubType.UUID_STANDARD, Base64.getDecoder().decode("xKVup8B1Q+CkHaVRx+qa+g=="))));
+	}
+
+	private <T> EncryptionContext prepareEncryptionContext(Class<T> type, Function<T, ?> property) {
+
+		EncryptionContext encryptionContext = mock(EncryptionContext.class);
+		when(encryptionContext.getProperty()).thenReturn(mappingContext.getPersistentPropertyFor(type, property));
+		return encryptionContext;
+	}
+
+	class AnnotatedWithExplicitlyEncrypted {
+
+		String notAnnotated;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) //
+		String algorithm;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random, keyAltName = "sec-key-name") //
+		String algorithmAndAltKeyName;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random, keyAltName = "/notAnnotated") //
+		String algorithmAndAltKeyNameFromPropertyValue;
+
+		public String getNotAnnotated() {
+			return this.notAnnotated;
+		}
+
+		public String getAlgorithm() {
+			return this.algorithm;
+		}
+
+		public String getAlgorithmAndAltKeyName() {
+			return this.algorithmAndAltKeyName;
+		}
+
+		public String getAlgorithmAndAltKeyNameFromPropertyValue() {
+			return this.algorithmAndAltKeyNameFromPropertyValue;
+		}
+
+		public void setNotAnnotated(String notAnnotated) {
+			this.notAnnotated = notAnnotated;
+		}
+
+		public void setAlgorithm(String algorithm) {
+			this.algorithm = algorithm;
+		}
+
+		public void setAlgorithmAndAltKeyName(String algorithmAndAltKeyName) {
+			this.algorithmAndAltKeyName = algorithmAndAltKeyName;
+		}
+
+		public void setAlgorithmAndAltKeyNameFromPropertyValue(String algorithmAndAltKeyNameFromPropertyValue) {
+			this.algorithmAndAltKeyNameFromPropertyValue = algorithmAndAltKeyNameFromPropertyValue;
+		}
+
+		public String toString() {
+			return "EncryptionKeyResolverUnitTests.AnnotatedWithExplicitlyEncrypted(notAnnotated=" + this.getNotAnnotated()
+					+ ", algorithm=" + this.getAlgorithm() + ", algorithmAndAltKeyName=" + this.getAlgorithmAndAltKeyName()
+					+ ", algorithmAndAltKeyNameFromPropertyValue=" + this.getAlgorithmAndAltKeyNameFromPropertyValue() + ")";
+		}
+	}
+
+	@Encrypted(keyId = "xKVup8B1Q+CkHaVRx+qa+g==")
+	class AnnotatedWithExplicitlyEncryptedHavingDefaultAlgorithmServedViaAnnotationOnType {
+
+		@ExplicitEncrypted //
+		String keyIdFromDomainType;
+
+		@ExplicitEncrypted(keyAltName = "sec-key-name") //
+		String altKeyNameFromPropertyIgnoringKeyIdFromDomainType;
+
+		public AnnotatedWithExplicitlyEncryptedHavingDefaultAlgorithmServedViaAnnotationOnType() {}
+
+		public String getKeyIdFromDomainType() {
+			return this.keyIdFromDomainType;
+		}
+
+		public String getAltKeyNameFromPropertyIgnoringKeyIdFromDomainType() {
+			return this.altKeyNameFromPropertyIgnoringKeyIdFromDomainType;
+		}
+
+		public void setKeyIdFromDomainType(String keyIdFromDomainType) {
+			this.keyIdFromDomainType = keyIdFromDomainType;
+		}
+
+		public void setAltKeyNameFromPropertyIgnoringKeyIdFromDomainType(
+				String altKeyNameFromPropertyIgnoringKeyIdFromDomainType) {
+			this.altKeyNameFromPropertyIgnoringKeyIdFromDomainType = altKeyNameFromPropertyIgnoringKeyIdFromDomainType;
+		}
+
+		public String toString() {
+			return "EncryptionKeyResolverUnitTests.AnnotatedWithExplicitlyEncryptedHavingDefaultAlgorithmServedViaAnnotationOnType(keyIdFromDomainType="
+					+ this.getKeyIdFromDomainType() + ", altKeyNameFromPropertyIgnoringKeyIdFromDomainType="
+					+ this.getAltKeyNameFromPropertyIgnoringKeyIdFromDomainType() + ")";
+		}
+	}
+
+	@Encrypted(keyId = "#{#myKeyId}")
+	class KeyIdFromSpel {
+
+		@ExplicitEncrypted //
+		String keyIdFromDomainType;
+
+		public String getKeyIdFromDomainType() {
+			return this.keyIdFromDomainType;
+		}
+
+		public void setKeyIdFromDomainType(String keyIdFromDomainType) {
+			this.keyIdFromDomainType = keyIdFromDomainType;
+		}
+
+		public String toString() {
+			return "EncryptionKeyResolverUnitTests.KeyIdFromSpel(keyIdFromDomainType=" + this.getKeyIdFromDomainType() + ")";
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyUnitTests.java
new file mode 100644
index 0000000000..40b0753b80
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionKeyUnitTests.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.UUID;
+
+import org.bson.BsonBinary;
+import org.bson.UuidRepresentation;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link EncryptionKey}.
+ *
+ * @author Christoph Strobl
+ */
+class EncryptionKeyUnitTests {
+
+	@Test // GH-4284
+	void keyIdToStringDoesNotRevealEntireKey() {
+
+		UUID uuid = UUID.randomUUID();
+
+		assertThat(EncryptionKey.keyId(new BsonBinary(uuid, UuidRepresentation.STANDARD)).toString())
+				.contains(uuid.toString().substring(0, 6) + "***");
+	}
+
+	@Test // GH-4284
+	void altKeyNameToStringDoesNotRevealEntireKey() {
+
+		assertThat(EncryptionKey.keyAltName("s").toString()).contains("***");
+		assertThat(EncryptionKey.keyAltName("su").toString()).contains("***");
+		assertThat(EncryptionKey.keyAltName("sup").toString()).contains("***");
+		assertThat(EncryptionKey.keyAltName("super-secret-key").toString()).contains("sup***");
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionTests.java
new file mode 100644
index 0000000000..3e840ed858
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionTests.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+/**
+ * @author Christoph Strobl
+ * @author Julia Lee
+ */
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = AbstractEncryptionTestBase.EncryptionConfig.class)
+public class EncryptionTests extends AbstractEncryptionTestBase {
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoClientEncryptionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoClientEncryptionUnitTests.java
new file mode 100644
index 0000000000..825645d86c
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoClientEncryptionUnitTests.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.EncryptionAlgorithms.*;
+
+import java.util.function.Supplier;
+
+import org.bson.BsonBinary;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.client.vault.ClientEncryption;
+
+/**
+ * Unit tests for {@link MongoClientEncryption}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+class MongoClientEncryptionUnitTests {
+
+	@Mock //
+	ClientEncryption clientEncryption;
+
+	@Test // GH-4284
+	void delegatesDecrypt() {
+
+		MongoClientEncryption mce = MongoClientEncryption.just(clientEncryption);
+		mce.decrypt(new BsonBinary(new byte[0]));
+
+		verify(clientEncryption).decrypt(Mockito.any());
+	}
+
+	@Test // GH-4284
+	void delegatesEncrypt() {
+
+		MongoClientEncryption mce = MongoClientEncryption.just(clientEncryption);
+		mce.encrypt(new BsonBinary(new byte[0]),
+				new EncryptionOptions(AEAD_AES_256_CBC_HMAC_SHA_512_Random, EncryptionKey.keyAltName("sec-key-name")));
+
+		ArgumentCaptor<EncryptOptions> options = ArgumentCaptor.forClass(EncryptOptions.class);
+		verify(clientEncryption).encrypt(any(), options.capture());
+		assertThat(options.getValue().getAlgorithm()).isEqualTo(AEAD_AES_256_CBC_HMAC_SHA_512_Random);
+		assertThat(options.getValue().getKeyAltName()).isEqualTo("sec-key-name");
+	}
+
+	@Test // GH-4284
+	void refreshObtainsNextInstanceFromSupplier() {
+
+		ClientEncryption next = mock(ClientEncryption.class);
+
+		MongoClientEncryption mce = new MongoClientEncryption(new Supplier<>() {
+
+			int counter = 0;
+
+			@Override
+			public ClientEncryption get() {
+				return counter++ % 2 == 0 ? clientEncryption : next;
+			}
+		});
+
+		assertThat(mce.getClientEncryption()).isSameAs(clientEncryption);
+		assertThat(mce.getClientEncryption()).isSameAs(next);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoEncryptionConverterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoEncryptionConverterUnitTests.java
new file mode 100644
index 0000000000..4e76346e56
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoEncryptionConverterUnitTests.java
@@ -0,0 +1,373 @@
+/*
+ * Copyright 2023-2025 the original author 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.encryption;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.core.EncryptionAlgorithms.*;
+
+import java.util.List;
+import java.util.Map;
+
+import org.bson.BsonArray;
+import org.bson.BsonBinary;
+import org.bson.BsonString;
+import org.bson.BsonValue;
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.data.mongodb.core.convert.MongoConversionContext;
+import org.springframework.data.mongodb.core.convert.encryption.MongoEncryptionConverter;
+import org.springframework.data.mongodb.core.mapping.ExplicitEncrypted;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.mongodb.test.util.MongoTestMappingContext;
+
+/**
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MongoEncryptionConverterUnitTests {
+
+	@Mock //
+	Encryption<BsonValue, BsonBinary> encryption;
+
+	@Mock //
+	EncryptionKeyResolver fallbackKeyResolver;
+
+	@Mock //
+	MongoConversionContext conversionContext;
+
+	MongoTestMappingContext mappingContext = MongoTestMappingContext.newTestContext();
+	EncryptionKeyResolver keyResolver;
+	MongoEncryptionConverter converter;
+
+	@Captor ArgumentCaptor<EncryptionOptions> encryptionOptions;
+
+	@Captor ArgumentCaptor<BsonValue> valueToBeEncrypted;
+
+	@BeforeEach
+	void beforeEach() {
+
+		when(fallbackKeyResolver.getKey(any())).thenReturn(EncryptionKey.keyAltName("default"));
+		when(encryption.encrypt(valueToBeEncrypted.capture(), encryptionOptions.capture()))
+				.thenReturn(new BsonBinary(new byte[0]));
+		keyResolver = EncryptionKeyResolver.annotated(fallbackKeyResolver);
+		converter = new MongoEncryptionConverter(encryption, keyResolver);
+	}
+
+	@Test // GH-4284
+	void delegatesConversionOfSimpleValueWithDefaultEncryptionKeyFromKeyResolver() {
+
+		when(conversionContext.getProperty())
+				.thenReturn(mappingContext.getPersistentPropertyFor(Type.class, Type::getStringValueWithAlgorithmOnly));
+
+		converter.write("foo", conversionContext);
+
+		assertThat(valueToBeEncrypted.getValue()).isEqualTo(new BsonString("foo"));
+		assertThat(encryptionOptions.getValue()).isEqualTo(
+				new EncryptionOptions(AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic, EncryptionKey.keyAltName("default")));
+	}
+
+	@Test // GH-4284
+	void favorsAltKeyNameIfPresent() {
+
+		when(conversionContext.getProperty()).thenReturn(
+				mappingContext.getPersistentPropertyFor(Type.class, Type::getStringValueWithAlgorithmAndAltKeyName));
+
+		converter.write("foo", conversionContext);
+
+		assertThat(encryptionOptions.getValue()).isEqualTo(
+				new EncryptionOptions(AEAD_AES_256_CBC_HMAC_SHA_512_Random, EncryptionKey.keyAltName("sec-key-name")));
+	}
+
+	@Test // GH-4284
+	void readsAltKeyNameFromProperty() {
+
+		when(conversionContext.getProperty()).thenReturn(mappingContext.getPersistentPropertyFor(Type.class,
+				Type::getStringValueWithAlgorithmAndAltKeyNameFromPropertyValue));
+
+		ArgumentCaptor<String> path = ArgumentCaptor.forClass(String.class);
+		when(conversionContext.getValue(path.capture())).thenReturn("(ツ)");
+
+		converter.write("foo", conversionContext);
+		assertThat(path.getValue()).isEqualTo("notAnnotated");
+
+		assertThat(encryptionOptions.getValue())
+				.isEqualTo(new EncryptionOptions(AEAD_AES_256_CBC_HMAC_SHA_512_Random, EncryptionKey.keyAltName("(ツ)")));
+	}
+
+	@Test // GH-4284
+	void delegatesConversionOfEntityTypes() {
+
+		Document convertedValue = new Document("unencryptedValue", "nested-unencrypted");
+		MongoPersistentProperty property = mappingContext.getPersistentPropertyFor(Type.class,
+				Type::getNestedFullyEncrypted);
+		when(conversionContext.getProperty()).thenReturn(property);
+		doReturn(convertedValue).when(conversionContext).write(any(), eq(property.getTypeInformation()));
+
+		ArgumentCaptor<String> path = ArgumentCaptor.forClass(String.class);
+		when(conversionContext.getValue(path.capture())).thenReturn("(ツ)");
+
+		JustATypeWithAnUnencryptedField source = new JustATypeWithAnUnencryptedField();
+		source.unencryptedValue = "nested-unencrypted";
+
+		converter.write(source, conversionContext);
+
+		assertThat(valueToBeEncrypted.getValue()).isEqualTo(convertedValue.toBsonDocument());
+	}
+
+	@Test // GH-4284
+	void listsOfSimpleTypesAreConvertedEntirely() {
+
+		MongoPersistentProperty property = mappingContext.getPersistentPropertyFor(Type.class, Type::getListOfString);
+		when(conversionContext.getProperty()).thenReturn(property);
+
+		converter.write(List.of("one", "two"), conversionContext);
+
+		assertThat(valueToBeEncrypted.getValue())
+				.isEqualTo(new BsonArray(List.of(new BsonString("one"), new BsonString("two"))));
+	}
+
+	@Test // GH-4284
+	void listsOfComplexTypesAreConvertedEntirely() {
+
+		Document convertedValue1 = new Document("unencryptedValue", "nested-unencrypted-1");
+		Document convertedValue2 = new Document("unencryptedValue", "nested-unencrypted-2");
+
+		MongoPersistentProperty property = mappingContext.getPersistentPropertyFor(Type.class, Type::getListOfComplex);
+		when(conversionContext.getProperty()).thenReturn(property);
+		doReturn(convertedValue1, convertedValue2).when(conversionContext).write(any(), eq(property.getTypeInformation()));
+
+		JustATypeWithAnUnencryptedField source1 = new JustATypeWithAnUnencryptedField();
+		source1.unencryptedValue = "nested-unencrypted-1";
+
+		JustATypeWithAnUnencryptedField source2 = new JustATypeWithAnUnencryptedField();
+		source2.unencryptedValue = "nested-unencrypted-1";
+
+		converter.write(List.of(source1, source2), conversionContext);
+
+		assertThat(valueToBeEncrypted.getValue())
+				.isEqualTo(new BsonArray(List.of(convertedValue1.toBsonDocument(), convertedValue2.toBsonDocument())));
+	}
+
+	@Test // GH-4284
+	void simpleMapsAreConvertedEntirely() {
+
+		MongoPersistentProperty property = mappingContext.getPersistentPropertyFor(Type.class, Type::getMapOfString);
+		when(conversionContext.getProperty()).thenReturn(property);
+		doReturn(new Document("k1", "v1").append("k2", "v2")).when(conversionContext).write(any(),
+				eq(property.getTypeInformation()));
+
+		converter.write(Map.of("k1", "v1", "k2", "v2"), conversionContext);
+
+		assertThat(valueToBeEncrypted.getValue())
+				.isEqualTo(new Document("k1", new BsonString("v1")).append("k2", new BsonString("v2")).toBsonDocument());
+	}
+
+	@Test // GH-4284
+	void complexMapsAreConvertedEntirely() {
+
+		Document convertedValue1 = new Document("unencryptedValue", "nested-unencrypted-1");
+		Document convertedValue2 = new Document("unencryptedValue", "nested-unencrypted-2");
+
+		MongoPersistentProperty property = mappingContext.getPersistentPropertyFor(Type.class, Type::getMapOfComplex);
+		when(conversionContext.getProperty()).thenReturn(property);
+		doReturn(new Document("k1", convertedValue1).append("k2", convertedValue2)).when(conversionContext).write(any(),
+				eq(property.getTypeInformation()));
+
+		JustATypeWithAnUnencryptedField source1 = new JustATypeWithAnUnencryptedField();
+		source1.unencryptedValue = "nested-unencrypted-1";
+
+		JustATypeWithAnUnencryptedField source2 = new JustATypeWithAnUnencryptedField();
+		source2.unencryptedValue = "nested-unencrypted-1";
+
+		converter.write(Map.of("k1", source1, "k2", source2), conversionContext);
+
+		assertThat(valueToBeEncrypted.getValue()).isEqualTo(new Document("k1", convertedValue1.toBsonDocument())
+				.append("k2", convertedValue2.toBsonDocument()).toBsonDocument());
+	}
+
+	static class Type {
+
+		String notAnnotated;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic) //
+		String stringValueWithAlgorithmOnly;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random, keyAltName = "sec-key-name") //
+		String stringValueWithAlgorithmAndAltKeyName;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random, keyAltName = "/notAnnotated") //
+		String stringValueWithAlgorithmAndAltKeyNameFromPropertyValue;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) // full document must be random
+		JustATypeWithAnUnencryptedField nestedFullyEncrypted;
+
+		NestedWithEncryptedField nestedWithEncryptedField;
+
+		// Client-Side Field Level Encryption does not support encrypting individual array elements
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) //
+		List<String> listOfString;
+
+		// Client-Side Field Level Encryption does not support encrypting individual array elements
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) // lists must be random
+		List<JustATypeWithAnUnencryptedField> listOfComplex;
+
+		// just as it was a domain type encrypt the entire thing here
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) //
+		Map<String, String> mapOfString;
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Random) //
+		Map<String, JustATypeWithAnUnencryptedField> mapOfComplex;
+
+		RecordWithEncryptedValue recordWithEncryptedValue;
+
+		List<RecordWithEncryptedValue> listOfRecordWithEncryptedValue;
+
+		public String getNotAnnotated() {
+			return this.notAnnotated;
+		}
+
+		public String getStringValueWithAlgorithmOnly() {
+			return this.stringValueWithAlgorithmOnly;
+		}
+
+		public String getStringValueWithAlgorithmAndAltKeyName() {
+			return this.stringValueWithAlgorithmAndAltKeyName;
+		}
+
+		public String getStringValueWithAlgorithmAndAltKeyNameFromPropertyValue() {
+			return this.stringValueWithAlgorithmAndAltKeyNameFromPropertyValue;
+		}
+
+		public JustATypeWithAnUnencryptedField getNestedFullyEncrypted() {
+			return this.nestedFullyEncrypted;
+		}
+
+		public NestedWithEncryptedField getNestedWithEncryptedField() {
+			return this.nestedWithEncryptedField;
+		}
+
+		public List<String> getListOfString() {
+			return this.listOfString;
+		}
+
+		public List<JustATypeWithAnUnencryptedField> getListOfComplex() {
+			return this.listOfComplex;
+		}
+
+		public Map<String, String> getMapOfString() {
+			return this.mapOfString;
+		}
+
+		public Map<String, JustATypeWithAnUnencryptedField> getMapOfComplex() {
+			return this.mapOfComplex;
+		}
+
+		public RecordWithEncryptedValue getRecordWithEncryptedValue() {
+			return this.recordWithEncryptedValue;
+		}
+
+		public List<RecordWithEncryptedValue> getListOfRecordWithEncryptedValue() {
+			return this.listOfRecordWithEncryptedValue;
+		}
+
+		public void setNotAnnotated(String notAnnotated) {
+			this.notAnnotated = notAnnotated;
+		}
+
+		public void setStringValueWithAlgorithmOnly(String stringValueWithAlgorithmOnly) {
+			this.stringValueWithAlgorithmOnly = stringValueWithAlgorithmOnly;
+		}
+
+		public void setStringValueWithAlgorithmAndAltKeyName(String stringValueWithAlgorithmAndAltKeyName) {
+			this.stringValueWithAlgorithmAndAltKeyName = stringValueWithAlgorithmAndAltKeyName;
+		}
+
+		public void setStringValueWithAlgorithmAndAltKeyNameFromPropertyValue(
+				String stringValueWithAlgorithmAndAltKeyNameFromPropertyValue) {
+			this.stringValueWithAlgorithmAndAltKeyNameFromPropertyValue = stringValueWithAlgorithmAndAltKeyNameFromPropertyValue;
+		}
+
+		public void setNestedFullyEncrypted(JustATypeWithAnUnencryptedField nestedFullyEncrypted) {
+			this.nestedFullyEncrypted = nestedFullyEncrypted;
+		}
+
+		public void setNestedWithEncryptedField(NestedWithEncryptedField nestedWithEncryptedField) {
+			this.nestedWithEncryptedField = nestedWithEncryptedField;
+		}
+
+		public void setListOfString(List<String> listOfString) {
+			this.listOfString = listOfString;
+		}
+
+		public void setListOfComplex(List<JustATypeWithAnUnencryptedField> listOfComplex) {
+			this.listOfComplex = listOfComplex;
+		}
+
+		public void setMapOfString(Map<String, String> mapOfString) {
+			this.mapOfString = mapOfString;
+		}
+
+		public void setMapOfComplex(Map<String, JustATypeWithAnUnencryptedField> mapOfComplex) {
+			this.mapOfComplex = mapOfComplex;
+		}
+
+		public void setRecordWithEncryptedValue(RecordWithEncryptedValue recordWithEncryptedValue) {
+			this.recordWithEncryptedValue = recordWithEncryptedValue;
+		}
+
+		public void setListOfRecordWithEncryptedValue(List<RecordWithEncryptedValue> listOfRecordWithEncryptedValue) {
+			this.listOfRecordWithEncryptedValue = listOfRecordWithEncryptedValue;
+		}
+
+		public String toString() {
+			return "MongoEncryptionConverterUnitTests.Type(notAnnotated=" + this.getNotAnnotated()
+					+ ", stringValueWithAlgorithmOnly=" + this.getStringValueWithAlgorithmOnly()
+					+ ", stringValueWithAlgorithmAndAltKeyName=" + this.getStringValueWithAlgorithmAndAltKeyName()
+					+ ", stringValueWithAlgorithmAndAltKeyNameFromPropertyValue="
+					+ this.getStringValueWithAlgorithmAndAltKeyNameFromPropertyValue() + ", nestedFullyEncrypted="
+					+ this.getNestedFullyEncrypted() + ", nestedWithEncryptedField=" + this.getNestedWithEncryptedField()
+					+ ", listOfString=" + this.getListOfString() + ", listOfComplex=" + this.getListOfComplex() + ", mapOfString="
+					+ this.getMapOfString() + ", mapOfComplex=" + this.getMapOfComplex() + ", recordWithEncryptedValue="
+					+ this.getRecordWithEncryptedValue() + ", listOfRecordWithEncryptedValue="
+					+ this.getListOfRecordWithEncryptedValue() + ")";
+		}
+	}
+
+	static class JustATypeWithAnUnencryptedField {
+
+		String unencryptedValue;
+	}
+
+	static class NestedWithEncryptedField extends JustATypeWithAnUnencryptedField {
+
+		@ExplicitEncrypted(algorithm = AEAD_AES_256_CBC_HMAC_SHA_512_Deterministic) //
+		String encryptedValue;
+	}
+
+	record RecordWithEncryptedValue(@ExplicitEncrypted String value) {
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoQueryableEncryptionCollectionCreationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoQueryableEncryptionCollectionCreationTests.java
new file mode 100644
index 0000000000..dd9e459e78
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/MongoQueryableEncryptionCollectionCreationTests.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2025 the original author 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.encryption;
+
+import static org.springframework.data.mongodb.core.schema.JsonSchemaProperty.*;
+import static org.springframework.data.mongodb.core.schema.QueryCharacteristics.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Stream;
+
+import org.bson.BsonBinary;
+import org.bson.Document;
+import org.bson.UuidRepresentation;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.CollectionOptions;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.schema.JsonSchemaProperty;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Integration tests for creating collections with encrypted fields.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
+@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+@ContextConfiguration
+public class MongoQueryableEncryptionCollectionCreationTests {
+
+	public static final String COLLECTION_NAME = "enc-collection";
+	static @Client MongoClient mongoClient;
+
+	@Configuration
+	static class Config extends AbstractMongoClientConfiguration {
+
+		@Override
+		public MongoClient mongoClient() {
+			return mongoClient;
+		}
+
+		@Override
+		protected String getDatabaseName() {
+			return "encryption-schema-tests";
+		}
+
+	}
+
+	@Autowired MongoTemplate template;
+
+	@BeforeEach
+	void beforeEach() {
+		template.dropCollection(COLLECTION_NAME);
+	}
+
+	@ParameterizedTest // GH-4185
+	@MethodSource("collectionOptions")
+	public void createsCollectionWithEncryptedFieldsCorrectly(CollectionOptions collectionOptions) {
+
+		template.createCollection(COLLECTION_NAME, collectionOptions);
+
+		Document encryptedFields = readEncryptedFieldsFromDatabase(COLLECTION_NAME);
+		assertThat(encryptedFields).containsKey("fields");
+
+		List<Document> fields = encryptedFields.get("fields", List.of());
+		assertThat(fields.get(0)).containsEntry("path", "encryptedInt") //
+				.containsEntry("bsonType", "int") //
+				.containsEntry("queries", List
+						.of(Document.parse("{'queryType': 'range', 'contention': { '$numberLong' : '1' }, 'min': 5, 'max': 100}")));
+
+		assertThat(fields.get(1)).containsEntry("path", "nested.encryptedLong") //
+				.containsEntry("bsonType", "long") //
+				.containsEntry("queries", List.of(Document.parse(
+						"{'queryType': 'range', 'contention': { '$numberLong' : '0' }, 'min': { '$numberLong' : '-1' }, 'max': { '$numberLong' : '1' }}")));
+	}
+
+	private static Stream<Arguments> collectionOptions() {
+
+		BsonBinary key1 = new BsonBinary(UUID.randomUUID(), UuidRepresentation.STANDARD);
+		BsonBinary key2 = new BsonBinary(UUID.randomUUID(), UuidRepresentation.STANDARD);
+
+		CollectionOptions manualOptions = CollectionOptions.encryptedCollection(options -> options //
+				.queryable(encrypted(int32("encryptedInt")).keys(key1), range().min(5).max(100).contention(1)) //
+				.queryable(encrypted(JsonSchemaProperty.int64("nested.encryptedLong")).keys(key2),
+						range().min(-1L).max(1L).contention(0)));
+
+		CollectionOptions schemaOptions = CollectionOptions.encryptedCollection(MongoJsonSchema.builder()
+				.property(
+						queryable(encrypted(int32("encryptedInt")).keyId(key1), List.of(range().min(5).max(100).contention(1))))
+				.property(queryable(encrypted(int64("nested.encryptedLong")).keyId(key2),
+						List.of(range().min(-1L).max(1L).contention(0))))
+				.build());
+
+		return Stream.of(Arguments.of(manualOptions), Arguments.of(schemaOptions));
+	}
+
+	Document readEncryptedFieldsFromDatabase(String collectionName) {
+
+		Document collectionInfo = template
+				.executeCommand(new Document("listCollections", 1).append("filter", new Document("name", collectionName)));
+
+		if (collectionInfo.containsKey("cursor")) {
+			collectionInfo = (Document) collectionInfo.get("cursor", Document.class).get("firstBatch", List.class).iterator()
+					.next();
+		}
+
+		if (!collectionInfo.containsKey("options")) {
+			return new Document();
+		}
+
+		return collectionInfo.get("options", Document.class).get("encryptedFields", Document.class);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java
new file mode 100644
index 0000000000..e4e760cc91
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/RangeEncryptionTests.java
@@ -0,0 +1,573 @@
+/*
+ * Copyright 2024-2025 the original author 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.encryption;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import java.security.SecureRandom;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Supplier;
+
+import org.assertj.core.api.Assumptions;
+import org.bson.BsonBinary;
+import org.bson.BsonDocument;
+import org.bson.BsonInt32;
+import org.bson.BsonString;
+import org.bson.Document;
+import org.junit.Before;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.data.convert.PropertyValueConverterFactory;
+import org.springframework.data.convert.ValueConverter;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.CollectionOptions;
+import org.springframework.data.mongodb.core.CollectionOptions.EncryptedFieldsOptions;
+import org.springframework.data.mongodb.core.MongoJsonSchemaCreator;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions.MongoConverterConfigurationAdapter;
+import org.springframework.data.mongodb.core.convert.encryption.MongoEncryptionConverter;
+import org.springframework.data.mongodb.core.mapping.Encrypted;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Queryable;
+import org.springframework.data.mongodb.core.mapping.RangeEncrypted;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.util.MongoClientVersion;
+import org.springframework.data.util.Lazy;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.AutoEncryptionSettings;
+import com.mongodb.ClientEncryptionSettings;
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.MongoNamespace;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+import com.mongodb.client.MongoCollection;
+import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.model.CreateCollectionOptions;
+import com.mongodb.client.model.CreateEncryptedCollectionParams;
+import com.mongodb.client.model.Filters;
+import com.mongodb.client.model.IndexOptions;
+import com.mongodb.client.model.Indexes;
+import com.mongodb.client.model.vault.EncryptOptions;
+import com.mongodb.client.model.vault.RangeOptions;
+import com.mongodb.client.result.UpdateResult;
+import com.mongodb.client.vault.ClientEncryption;
+import com.mongodb.client.vault.ClientEncryptions;
+
+/**
+ * @author Ross Lawley
+ * @author Christoph Strobl
+ */
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
+@EnableIfMongoServerVersion(isGreaterThanEqual = "8.0")
+@EnableIfReplicaSetAvailable
+@ContextConfiguration(classes = RangeEncryptionTests.EncryptionConfig.class)
+class RangeEncryptionTests {
+
+	@Autowired MongoTemplate template;
+	@Autowired MongoClientEncryption clientEncryption;
+	@Autowired EncryptionKeyHolder keyHolder;
+
+	@BeforeEach
+	void clientVersionCheck() {
+		Assumptions.assumeThat(MongoClientVersion.isVersion5orNewer()).isTrue();
+	}
+
+	@AfterEach
+	void tearDown() {
+		template.getDb().getCollection("test").deleteMany(new BsonDocument());
+	}
+
+	@Test // GH-4185
+	void manuallyEncryptedValuesCanBeSavedAndRetrievedCorrectly() {
+
+		EncryptOptions encryptOptions = new EncryptOptions("Range").contentionFactor(1L)
+				.keyId(keyHolder.getEncryptionKey("encryptedInt"))
+				.rangeOptions(new RangeOptions().min(new BsonInt32(0)).max(new BsonInt32(200)).sparsity(1L));
+
+		EncryptOptions encryptExpressionOptions = new EncryptOptions("Range").contentionFactor(1L)
+				.rangeOptions(new RangeOptions().min(new BsonInt32(0)).max(new BsonInt32(200)))
+				.keyId(keyHolder.getEncryptionKey("encryptedInt")).queryType("range");
+
+		EncryptOptions equalityEncOptions = new EncryptOptions("Indexed").contentionFactor(0L)
+				.keyId(keyHolder.getEncryptionKey("age"));
+		;
+
+		EncryptOptions equalityEncOptionsString = new EncryptOptions("Indexed").contentionFactor(0L)
+				.keyId(keyHolder.getEncryptionKey("name"));
+		;
+
+		Document source = new Document("_id", "id-1");
+
+		source.put("name",
+				clientEncryption.getClientEncryption().encrypt(new BsonString("It's a Me, Mario!"), equalityEncOptionsString));
+		source.put("age", clientEncryption.getClientEncryption().encrypt(new BsonInt32(101), equalityEncOptions));
+		source.put("encryptedInt", clientEncryption.getClientEncryption().encrypt(new BsonInt32(101), encryptOptions));
+		source.put("_class", Person.class.getName());
+
+		template.execute(Person.class, col -> col.insertOne(source));
+
+		Document result = template.execute(Person.class, col -> {
+
+			BsonDocument filterSource = new BsonDocument("encryptedInt", new BsonDocument("$gte", new BsonInt32(100)));
+			BsonDocument filter = clientEncryption.getClientEncryption()
+					.encryptExpression(new Document("$and", List.of(filterSource)), encryptExpressionOptions);
+
+			return col.find(filter).first();
+		});
+
+		assertThat(result).containsEntry("encryptedInt", 101);
+	}
+
+	@Test // GH-4185
+	void canLesserThanEqualMatchRangeEncryptedField() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		Person loaded = template.query(Person.class).matching(where("encryptedInt").lte(source.encryptedInt)).firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4185
+	void canQueryMixOfEqualityEncryptedAndUnencrypted() {
+
+		Person source = template.insert(createPerson());
+
+		Person loaded = template.query(Person.class)
+				.matching(where("name").is(source.name).and("unencryptedValue").is(source.unencryptedValue)).firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4185
+	void canQueryMixOfRangeEncryptedAndUnencrypted() {
+
+		Person source = template.insert(createPerson());
+
+		Person loaded = template.query(Person.class)
+				.matching(where("encryptedInt").lte(source.encryptedInt).and("unencryptedValue").is(source.unencryptedValue))
+				.firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4185
+	void canQueryEqualityEncryptedField() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		Person loaded = template.query(Person.class).matching(where("age").is(source.age)).firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4185
+	void canExcludeSafeContentFromResult() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		Query q = Query.query(where("encryptedLong").lte(1001L).gte(1001L));
+		q.fields().exclude("__safeContent__");
+
+		Person loaded = template.query(Person.class).matching(q).firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4185
+	void canRangeMatchRangeEncryptedField() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		Query q = Query.query(where("encryptedLong").lte(1001L).gte(1001L));
+		Person loaded = template.query(Person.class).matching(q).firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4185
+	void canReplaceEntityWithRangeEncryptedField() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		source.encryptedInt = 123;
+		source.encryptedLong = 9999L;
+		template.save(source);
+
+		Person loaded = template.query(Person.class).matching(where("id").is(source.id)).firstValue();
+		assertThat(loaded).isEqualTo(source);
+	}
+
+	@Test // GH-4185
+	void canUpdateRangeEncryptedField() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		UpdateResult updateResult = template.update(Person.class).matching(where("id").is(source.id))
+				.apply(Update.update("encryptedLong", 5000L)).first();
+		assertThat(updateResult.getModifiedCount()).isOne();
+
+		Person loaded = template.query(Person.class).matching(where("id").is(source.id)).firstValue();
+		assertThat(loaded.encryptedLong).isEqualTo(5000L);
+	}
+
+	@Test // GH-4185
+	void errorsWhenUsingNonRangeOperatorEqOnRangeEncryptedField() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		assertThatThrownBy(
+				() -> template.query(Person.class).matching(where("encryptedInt").is(source.encryptedInt)).firstValue())
+				.isInstanceOf(AssertionError.class)
+				.hasMessageStartingWith("Not a valid range query. Querying a range encrypted field but "
+						+ "the query operator '$eq' for field path 'encryptedInt' is not a range query.");
+	}
+
+	@Test // GH-4185
+	void errorsWhenUsingNonRangeOperatorInOnRangeEncryptedField() {
+
+		Person source = createPerson();
+		template.insert(source);
+
+		assertThatThrownBy(
+				() -> template.query(Person.class).matching(where("encryptedLong").in(1001L, 9999L)).firstValue())
+				.isInstanceOf(AssertionError.class)
+				.hasMessageStartingWith("Not a valid range query. Querying a range encrypted field but "
+						+ "the query operator '$in' for field path 'encryptedLong' is not a range query.");
+	}
+
+	private Person createPerson() {
+
+		Person source = new Person();
+		source.id = "id-1";
+		source.unencryptedValue = "y2k";
+		source.name = "it's a me mario!";
+		source.age = 42;
+		source.encryptedInt = 101;
+		source.encryptedLong = 1001L;
+		source.nested = new NestedWithQEFields();
+		source.nested.value = "Luigi time!";
+		return source;
+	}
+
+	protected static class EncryptionConfig extends AbstractMongoClientConfiguration {
+
+		private static final String LOCAL_KMS_PROVIDER = "local";
+
+		private static final Lazy<Map<String, Map<String, Object>>> LAZY_KMS_PROVIDERS = Lazy.of(() -> {
+			byte[] localMasterKey = new byte[96];
+			new SecureRandom().nextBytes(localMasterKey);
+			return Map.of(LOCAL_KMS_PROVIDER, Map.of("key", localMasterKey));
+		});
+
+		@Autowired ApplicationContext applicationContext;
+
+		@Override
+		protected String getDatabaseName() {
+			return "qe-test";
+		}
+
+		@Bean
+		public MongoClient mongoClient() {
+			return super.mongoClient();
+		}
+
+		@Override
+		protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
+			converterConfigurationAdapter
+					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
+					.useNativeDriverJavaTimeCodecs();
+		}
+
+		@Bean
+		EncryptionKeyHolder keyHolder(MongoClientEncryption mongoClientEncryption) {
+
+			Lazy<Map<String, BsonBinary>> lazyDataKeyMap = Lazy.of(() -> {
+				try (MongoClient client = mongoClient()) {
+
+					MongoDatabase database = client.getDatabase(getDatabaseName());
+					database.getCollection("test").drop();
+
+					ClientEncryption clientEncryption = mongoClientEncryption.getClientEncryption();
+
+					MongoJsonSchema personSchema = MongoJsonSchemaCreator.create(new MongoMappingContext()) // init schema creator
+							.filter(MongoJsonSchemaCreator.encryptedOnly()) //
+							.createSchemaFor(Person.class); //
+
+					Document encryptedFields = CollectionOptions.encryptedCollection(personSchema) //
+							.getEncryptedFieldsOptions() //
+							.map(EncryptedFieldsOptions::toDocument) //
+							.orElseThrow();
+
+					CreateCollectionOptions createCollectionOptions = new CreateCollectionOptions()
+							.encryptedFields(encryptedFields);
+
+					BsonDocument local = clientEncryption.createEncryptedCollection(database, "test", createCollectionOptions,
+							new CreateEncryptedCollectionParams(LOCAL_KMS_PROVIDER));
+
+					Map<String, BsonBinary> keyMap = new LinkedHashMap<>();
+					for (Object o : local.getArray("fields")) {
+						if (o instanceof BsonDocument db) {
+							String path = db.getString("path").getValue();
+							BsonBinary binary = db.getBinary("keyId");
+							for (String part : path.split("\\.")) {
+								keyMap.put(part, binary);
+							}
+						}
+					}
+					return keyMap;
+				}
+			});
+
+			return new EncryptionKeyHolder(lazyDataKeyMap);
+		}
+
+		@Bean
+		MongoEncryptionConverter encryptingConverter(MongoClientEncryption mongoClientEncryption,
+				EncryptionKeyHolder keyHolder) {
+			return new MongoEncryptionConverter(mongoClientEncryption, EncryptionKeyResolver.annotated((ctx) -> {
+
+				String path = ctx.getProperty().getFieldName();
+
+				if (ctx.getProperty().getMongoField().getName().isPath()) {
+					path = StringUtils.arrayToDelimitedString(ctx.getProperty().getMongoField().getName().parts(), ".");
+				}
+				if (ctx.getOperatorContext() != null) {
+					path = ctx.getOperatorContext().path();
+				}
+				return EncryptionKey.keyId(keyHolder.getEncryptionKey(path));
+			}));
+		}
+
+		@Bean
+		CachingMongoClientEncryption clientEncryption(ClientEncryptionSettings encryptionSettings) {
+			return new CachingMongoClientEncryption(() -> ClientEncryptions.create(encryptionSettings));
+		}
+
+		@Override
+		protected void configureClientSettings(MongoClientSettings.Builder builder) {
+			try (MongoClient client = MongoClients.create()) {
+				ClientEncryptionSettings clientEncryptionSettings = encryptionSettings(client);
+
+				builder.autoEncryptionSettings(AutoEncryptionSettings.builder() //
+						.kmsProviders(clientEncryptionSettings.getKmsProviders()) //
+						.keyVaultNamespace(clientEncryptionSettings.getKeyVaultNamespace()) //
+						.bypassQueryAnalysis(true).build());
+			}
+		}
+
+		@Bean
+		ClientEncryptionSettings encryptionSettings(MongoClient mongoClient) {
+			MongoNamespace keyVaultNamespace = new MongoNamespace("encryption.testKeyVault");
+			MongoCollection<Document> keyVaultCollection = mongoClient.getDatabase(keyVaultNamespace.getDatabaseName())
+					.getCollection(keyVaultNamespace.getCollectionName());
+			keyVaultCollection.drop();
+			// Ensure that two data keys cannot share the same keyAltName.
+			keyVaultCollection.createIndex(Indexes.ascending("keyAltNames"),
+					new IndexOptions().unique(true).partialFilterExpression(Filters.exists("keyAltNames")));
+
+			mongoClient.getDatabase(getDatabaseName()).getCollection("test").drop(); // Clear old data
+
+			// Create the ClientEncryption instance
+			return ClientEncryptionSettings.builder() //
+					.keyVaultMongoClientSettings(
+							MongoClientSettings.builder().applyConnectionString(new ConnectionString("mongodb://localhost")).build()) //
+					.keyVaultNamespace(keyVaultNamespace.getFullName()) //
+					.kmsProviders(LAZY_KMS_PROVIDERS.get()) //
+					.build();
+		}
+	}
+
+	static class CachingMongoClientEncryption extends MongoClientEncryption implements DisposableBean {
+
+		static final AtomicReference<ClientEncryption> cache = new AtomicReference<>();
+
+		CachingMongoClientEncryption(Supplier<ClientEncryption> source) {
+			super(() -> {
+				ClientEncryption clientEncryption = cache.get();
+				if (clientEncryption == null) {
+					clientEncryption = source.get();
+					cache.set(clientEncryption);
+				}
+
+				return clientEncryption;
+			});
+		}
+
+		@Override
+		public void destroy() {
+			ClientEncryption clientEncryption = cache.get();
+			if (clientEncryption != null) {
+				clientEncryption.close();
+				cache.set(null);
+			}
+		}
+	}
+
+	static class EncryptionKeyHolder {
+
+		Supplier<Map<String, BsonBinary>> lazyDataKeyMap;
+
+		public EncryptionKeyHolder(Supplier<Map<String, BsonBinary>> lazyDataKeyMap) {
+			this.lazyDataKeyMap = Lazy.of(lazyDataKeyMap);
+		}
+
+		BsonBinary getEncryptionKey(String path) {
+			return lazyDataKeyMap.get().get(path);
+		}
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document("test")
+	static class Person {
+
+		String id;
+
+		String unencryptedValue;
+
+		@ValueConverter(MongoEncryptionConverter.class)
+		@Encrypted(algorithm = "Indexed") //
+		@Queryable(queryType = "equality", contentionFactor = 0) //
+		String name;
+
+		@ValueConverter(MongoEncryptionConverter.class)
+		@Encrypted(algorithm = "Indexed") //
+		@Queryable(queryType = "equality", contentionFactor = 0) //
+		Integer age;
+
+		@ValueConverter(MongoEncryptionConverter.class)
+		@RangeEncrypted(contentionFactor = 0L,
+				rangeOptions = "{\"min\": 0, \"max\": 200, \"trimFactor\": 1, \"sparsity\": 1}") //
+		Integer encryptedInt;
+
+		@ValueConverter(MongoEncryptionConverter.class)
+		@RangeEncrypted(contentionFactor = 0L,
+				rangeOptions = "{\"min\": {\"$numberLong\": \"1000\"}, \"max\": {\"$numberLong\": \"9999\"}, \"trimFactor\": 1, \"sparsity\": 1}") //
+		Long encryptedLong;
+
+		NestedWithQEFields nested;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String getName() {
+			return this.name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public Integer getEncryptedInt() {
+			return this.encryptedInt;
+		}
+
+		public void setEncryptedInt(Integer encryptedInt) {
+			this.encryptedInt = encryptedInt;
+		}
+
+		public Long getEncryptedLong() {
+			return this.encryptedLong;
+		}
+
+		public void setEncryptedLong(Long encryptedLong) {
+			this.encryptedLong = encryptedLong;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(unencryptedValue, person.unencryptedValue)
+					&& Objects.equals(name, person.name) && Objects.equals(age, person.age)
+					&& Objects.equals(encryptedInt, person.encryptedInt) && Objects.equals(encryptedLong, person.encryptedLong);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, unencryptedValue, name, age, encryptedInt, encryptedLong);
+		}
+
+		@Override
+		public String toString() {
+			return "Person{" + "id='" + id + '\'' + ", unencryptedValue='" + unencryptedValue + '\'' + ", name='" + name
+					+ '\'' + ", age=" + age + ", encryptedInt=" + encryptedInt + ", encryptedLong=" + encryptedLong + '}';
+		}
+	}
+
+	static class NestedWithQEFields {
+
+		@ValueConverter(MongoEncryptionConverter.class)
+		@Encrypted(algorithm = "Indexed") //
+		@Queryable(queryType = "equality", contentionFactor = 0) //
+		String value;
+
+		@Override
+		public String toString() {
+			return "NestedWithQEFields{" + "value='" + value + '\'' + '}';
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			NestedWithQEFields that = (NestedWithQEFields) o;
+			return Objects.equals(value, that.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(value);
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java
index 8355c60f31..ed5ab78cdc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/AbstractGeoSpatialTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,11 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
+import java.util.Collections;
+import java.util.Date;
 import java.util.List;
+import java.util.Set;
 
-import org.joda.time.LocalDate;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -34,15 +36,16 @@
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Polygon;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.TestEntities;
 import org.springframework.data.mongodb.core.Venue;
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.WriteConcern;
 import com.mongodb.client.MongoClient;
@@ -51,12 +54,12 @@
  * @author Christoph Strobl
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public abstract class AbstractGeoSpatialTests {
 
 	@Configuration
-	static class TestConfig extends AbstractMongoClientConfiguration {
+	static class TestConfig extends MongoClientClosingTestConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
@@ -67,6 +70,11 @@ protected String getDatabaseName() {
 		public MongoClient mongoClient() {
 			return MongoTestUtils.client();
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired MongoTemplate template;
@@ -102,13 +110,13 @@ protected void removeVenues() {
 	}
 
 	protected void addVenues() {
-		template.insertAll(TestEntities.geolocation().newYork());
+		template.bulkOps(BulkMode.UNORDERED, Venue.class).insert(TestEntities.geolocation().newYork()).execute();
 	}
 
 	@Test
 	public void geoNear() {
 
-		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).num(10).maxDistance(150);
+		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).limit(10).maxDistance(150);
 
 		GeoResults<Venue> result = template.geoNear(geoNear, Venue.class);
 
@@ -179,7 +187,7 @@ public void nearSphere() {
 	@Test // DATAMONGO-1360
 	public void mapsQueryContainedInNearQuery() {
 
-		Query query = query(where("openingDate").lt(LocalDate.now()));
+		Query query = query(where("openingDate").lt(new Date()));
 		template.geoNear(NearQuery.near(1.5, 1.7).spherical(true).query(query), Venue.class);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonModuleUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonModuleUnitTests.java
index b0deca1010..e65101177c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonModuleUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonModuleUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,8 +20,8 @@
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.geo.Point;
 
@@ -36,7 +36,7 @@ public class GeoJsonModuleUnitTests {
 
 	ObjectMapper mapper;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		mapper = new ObjectMapper();
@@ -52,8 +52,8 @@ public void shouldDeserializeJsonPointCorrectly() throws JsonParseException, Jso
 	}
 
 	@Test // DATAMONGO-1181
-	public void shouldDeserializeGeoJsonLineStringCorrectly() throws JsonParseException, JsonMappingException,
-			IOException {
+	public void shouldDeserializeGeoJsonLineStringCorrectly()
+			throws JsonParseException, JsonMappingException, IOException {
 
 		String json = "{ \"type\": \"LineString\", \"coordinates\": [ [10.0, 20.0], [30.0, 40.0], [50.0, 60.0] ]}";
 
@@ -62,8 +62,8 @@ public void shouldDeserializeGeoJsonLineStringCorrectly() throws JsonParseExcept
 	}
 
 	@Test // DATAMONGO-1181
-	public void shouldDeserializeGeoJsonMultiPointCorrectly() throws JsonParseException, JsonMappingException,
-			IOException {
+	public void shouldDeserializeGeoJsonMultiPointCorrectly()
+			throws JsonParseException, JsonMappingException, IOException {
 
 		String json = "{ \"type\": \"MultiPoint\", \"coordinates\": [ [10.0, 20.0], [30.0, 40.0], [50.0, 60.0] ]}";
 
@@ -73,8 +73,8 @@ public void shouldDeserializeGeoJsonMultiPointCorrectly() throws JsonParseExcept
 
 	@Test // DATAMONGO-1181
 	@SuppressWarnings("unchecked")
-	public void shouldDeserializeGeoJsonMultiLineStringCorrectly() throws JsonParseException, JsonMappingException,
-			IOException {
+	public void shouldDeserializeGeoJsonMultiLineStringCorrectly()
+			throws JsonParseException, JsonMappingException, IOException {
 
 		String json = "{ \"type\": \"MultiLineString\", \"coordinates\": [ [ [10.0, 20.0], [30.0, 40.0] ], [ [50.0, 60.0] , [70.0, 80.0] ] ]}";
 
@@ -92,8 +92,8 @@ public void shouldDeserializeGeoJsonPolygonCorrectly() throws JsonParseException
 	}
 
 	@Test // DATAMONGO-1181
-	public void shouldDeserializeGeoJsonMultiPolygonCorrectly() throws JsonParseException, JsonMappingException,
-			IOException {
+	public void shouldDeserializeGeoJsonMultiPolygonCorrectly()
+			throws JsonParseException, JsonMappingException, IOException {
 
 		String json = "{ \"type\": \"Polygon\", \"coordinates\": ["
 				+ "[[[102.0, 2.0], [103.0, 2.0], [103.0, 3.0], [102.0, 3.0], [102.0, 2.0]]],"
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersUnitTests.java
new file mode 100644
index 0000000000..43ea3945f0
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonSerializersUnitTests.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2021-2025 the original author 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.geo;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.geo.Point;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Unit tests for {@link GeoJsonSerializersModule}.
+ *
+ * @author Bjorn Harvold
+ * @author Christoph Strobl
+ */
+class GeoJsonSerializersUnitTests {
+
+	private ObjectMapper mapper;
+
+	@BeforeEach
+	void beforeEach() {
+
+		mapper = new ObjectMapper();
+		mapper.registerModule(new GeoJsonSerializersModule());
+	}
+
+	@Test // GH-3517
+	void shouldSerializeJsonPointCorrectly() throws IOException {
+
+		GeoJsonPoint geoJsonPoint = new GeoJsonPoint(10D, 20D);
+
+		assertThat(mapper.writeValueAsString(geoJsonPoint)).isEqualTo("{\"type\":\"Point\",\"coordinates\":[10.0,20.0]}");
+	}
+
+	@Test // GH-3517
+	void shouldSerializeGeoJsonLineStringCorrectly() throws IOException {
+
+		GeoJsonLineString lineString = new GeoJsonLineString(
+				Arrays.asList(new Point(10, 20), new Point(30, 40), new Point(50, 60)));
+
+		assertThat(mapper.writeValueAsString(lineString))
+				.isEqualTo("{\"type\":\"LineString\",\"coordinates\":[[10.0,20.0],[30.0,40.0],[50.0,60.0]]}");
+	}
+
+	@Test // GH-3517
+	void shouldSerializeGeoJsonMultiPointCorrectly() throws IOException {
+
+		GeoJsonMultiPoint multiPoint = new GeoJsonMultiPoint(
+				Arrays.asList(new Point(10, 20), new Point(30, 40), new Point(50, 60)));
+
+		assertThat(mapper.writeValueAsString(multiPoint))
+				.isEqualTo("{\"type\":\"MultiPoint\",\"coordinates\":[[10.0,20.0],[30.0,40.0],[50.0,60.0]]}");
+	}
+
+	@Test // GH-3517
+	void shouldSerializeJsonMultiLineStringCorrectly() throws IOException {
+
+		GeoJsonMultiLineString multiLineString = new GeoJsonMultiLineString(
+				Arrays.asList(new Point(10, 20), new Point(30, 40)), Arrays.asList(new Point(50, 60), new Point(70, 80)));
+
+		assertThat(mapper.writeValueAsString(multiLineString)).isEqualTo(
+				"{\"type\":\"MultiLineString\",\"coordinates\":[[[10.0,20.0],[30.0,40.0]],[[50.0,60.0],[70.0,80.0]]]}");
+	}
+
+	@Test // GH-3517
+	void shouldSerializeGeoJsonPolygonCorrectly() throws IOException {
+
+		List<Point> points = Arrays.asList(new Point(100, 0), new Point(101, 0), new Point(101, 1), new Point(100, 1),
+				new Point(100, 0));
+		GeoJsonPolygon polygon = new GeoJsonPolygon(points);
+
+		assertThat(mapper.writeValueAsString(polygon)).isEqualTo(
+				"{\"type\":\"Polygon\",\"coordinates\":[[[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]]]}");
+	}
+
+	@Test // GH-3517
+	void shouldSerializeGeoJsonMultiPolygonCorrectly() throws IOException {
+
+		String json = "{\"type\":\"MultiPolygon\",\"coordinates\":[" + "[" + "["
+				+ "[102.0,2.0],[103.0,2.0],[103.0,3.0],[102.0,3.0],[102.0,2.0]" + "]" + "]," + "[" + "["
+				+ "[100.0,0.0],[101.0,0.0],[101.0,1.0],[100.0,1.0],[100.0,0.0]" + "]" + "]," + "[" + "["
+				+ "[100.2,0.2],[100.8,0.2],[100.8,0.8],[100.2,0.8],[100.2,0.2]" + "]" + "]" + "]" + "}";
+
+		GeoJsonMultiPolygon multiPolygon = new GeoJsonMultiPolygon(Arrays.asList(
+				new GeoJsonPolygon(Arrays.asList(new Point(102, 2), new Point(103, 2), new Point(103, 3), new Point(102, 3),
+						new Point(102, 2))),
+				new GeoJsonPolygon(Arrays.asList(new Point(100, 0), new Point(101, 0), new Point(101, 1), new Point(100, 1),
+						new Point(100, 0))),
+				new GeoJsonPolygon(Arrays.asList(new Point(100.2, 0.2), new Point(100.8, 0.2), new Point(100.8, 0.8),
+						new Point(100.2, 0.8), new Point(100.2, 0.2)))));
+
+		assertThat(mapper.writeValueAsString(multiPolygon)).isEqualTo(json);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonTests.java
index 7350b84a42..96c685275f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoJsonTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author 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,25 +19,26 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import org.assertj.core.data.Percentage;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.CollectionCallback;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
@@ -47,23 +48,26 @@
 import org.springframework.data.mongodb.core.query.NearQuery;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.test.util.BasicDbListBuilder;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.MongoException;
-import com.mongodb.WriteConcern;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Ivan Volzhev
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
 public class GeoJsonTests {
 
+	static @Client MongoClient mongoClient;
+
 	@Configuration
 	static class TestConfig extends AbstractMongoClientConfiguration {
 
@@ -74,22 +78,34 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
+		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Set.of(Venue2DSphere.class, VenueWithDistanceField.class, OpenGeoJson.class,
+					DocumentWithPropertyUsingGeoJsonType.class);
 		}
 	}
 
 	@Autowired MongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		template.setWriteConcern(WriteConcern.JOURNALED);
+		// template.setWriteConcern(WriteConcern.JOURNALED);
+
+		// createIndex();
+		// addVenues();
+	}
+
+	private void createIndexAndAddVenues() {
 
 		createIndex();
 		addVenues();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 
 		dropIndex();
@@ -99,7 +115,9 @@ public void tearDown() {
 	@Test // DATAMONGO-1135, DATAMONGO-2264
 	public void geoNear() {
 
-		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).num(10).maxDistance(150);
+		createIndexAndAddVenues();
+
+		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).limit(10).maxDistance(150);
 
 		GeoResults<Venue2DSphere> result = template.geoNear(geoNear, Venue2DSphere.class);
 
@@ -111,7 +129,9 @@ public void geoNear() {
 	@Test // DATAMONGO-2264
 	public void geoNearShouldNotOverridePropertyWithDefaultNameForCalculatedDistance/* namely "dis" */() {
 
-		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).num(10).maxDistance(150);
+		createIndexAndAddVenues();
+
+		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).limit(10).maxDistance(150);
 
 		GeoResults<VenueWithDistanceField> result = template.geoNear(geoNear, VenueWithDistanceField.class);
 
@@ -128,7 +148,9 @@ public void geoNear() {
 	@Test // DATAMONGO-2264
 	public void geoNearShouldAllowToReadBackCalculatedDistanceIntoTargetTypeProperty/* namely "dis" */() {
 
-		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).num(10).maxDistance(150);
+		createIndexAndAddVenues();
+
+		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.KILOMETERS).limit(10).maxDistance(150);
 
 		GeoResults<VenueWithDistanceField> result = template.geoNear(geoNear, Venue2DSphere.class,
 				template.getCollectionName(Venue2DSphere.class), VenueWithDistanceField.class);
@@ -146,7 +168,8 @@ public void geoNear() {
 	@Test // DATAMONGO-1148
 	public void geoNearShouldReturnDistanceCorrectlyUsingGeoJson/*which is using the meters*/() {
 
-		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73.99171, 40.738868), Metrics.KILOMETERS).num(10)
+		createIndexAndAddVenues();
+		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73.99171, 40.738868), Metrics.KILOMETERS).limit(10)
 				.maxDistance(0.4);
 
 		GeoResults<Venue2DSphere> result = template.geoNear(geoNear, Venue2DSphere.class);
@@ -161,7 +184,8 @@ public void geoNear() {
 	@Test // DATAMONGO-1348
 	public void geoNearShouldReturnDistanceCorrectly/*which is using the meters*/() {
 
-		NearQuery geoNear = NearQuery.near(new Point(-73.99171, 40.738868), Metrics.KILOMETERS).num(10).maxDistance(0.4);
+		createIndexAndAddVenues();
+		NearQuery geoNear = NearQuery.near(new Point(-73.99171, 40.738868), Metrics.KILOMETERS).limit(10).maxDistance(0.4);
 
 		GeoResults<Venue2DSphere> result = template.geoNear(geoNear, Venue2DSphere.class);
 
@@ -175,7 +199,8 @@ public void geoNear() {
 	@Test // DATAMONGO-1135
 	public void geoNearWithMiles() {
 
-		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.MILES).num(10).maxDistance(93.2057);
+		createIndexAndAddVenues();
+		NearQuery geoNear = NearQuery.near(new GeoJsonPoint(-73, 40), Metrics.MILES).limit(10).maxDistance(93.2057);
 
 		GeoResults<Venue2DSphere> result = template.geoNear(geoNear, Venue2DSphere.class);
 
@@ -186,6 +211,8 @@ public void geoNearWithMiles() {
 	@Test // DATAMONGO-1135
 	public void withinPolygon() {
 
+		createIndexAndAddVenues();
+
 		Point first = new Point(-73.99756, 40.73083);
 		Point second = new Point(-73.99756, 40.741404);
 		Point third = new Point(-73.988135, 40.741404);
@@ -200,6 +227,8 @@ public void withinPolygon() {
 	@Test // DATAMONGO-1135
 	public void nearPoint() {
 
+		createIndexAndAddVenues();
+
 		GeoJsonPoint point = new GeoJsonPoint(-73.99171, 40.738868);
 
 		Query query = query(where("location").near(point).maxDistance(0.01));
@@ -210,6 +239,8 @@ public void nearPoint() {
 	@Test // DATAMONGO-1135
 	public void nearSphere() {
 
+		createIndexAndAddVenues();
+
 		GeoJsonPoint point = new GeoJsonPoint(-73.99171, 40.738868);
 
 		Query query = query(where("location").nearSphere(point).maxDistance(0.003712240453784));
@@ -296,6 +327,21 @@ public void shouldSaveAndRetrieveDocumentWithGeoJsonMultiPointTypeCorrectly() {
 		assertThat(result.geoJsonMultiPoint).isEqualTo(obj.geoJsonMultiPoint);
 	}
 
+	@Test // DATAMONGO-3776
+	public void shouldSaveAndRetrieveDocumentWithGeoJsonMultiPointTypeWithOnePointCorrectly() {
+
+		DocumentWithPropertyUsingGeoJsonType obj = new DocumentWithPropertyUsingGeoJsonType();
+		obj.id = "geoJsonMultiPoint";
+		obj.geoJsonMultiPoint = new GeoJsonMultiPoint(new Point(0, 0));
+
+		template.save(obj);
+
+		DocumentWithPropertyUsingGeoJsonType result = template.findOne(query(where("id").is(obj.id)),
+				DocumentWithPropertyUsingGeoJsonType.class);
+
+		assertThat(result.geoJsonMultiPoint).isEqualTo(obj.geoJsonMultiPoint);
+	}
+
 	@Test // DATAMONGO-1137
 	public void shouldSaveAndRetrieveDocumentWithGeoJsonMultiPolygonTypeCorrectly() {
 
@@ -331,6 +377,8 @@ public void shouldSaveAndRetrieveDocumentWithGeoJsonGeometryCollectionTypeCorrec
 	@Test // DATAMONGO-1110
 	public void nearWithMinDistance() {
 
+		createIndexAndAddVenues();
+
 		Point point = new GeoJsonPoint(-73.99171, 40.738868);
 		List<Venue2DSphere> venues = template.find(query(where("location").near(point).minDistance(0.01)),
 				Venue2DSphere.class);
@@ -341,6 +389,8 @@ public void nearWithMinDistance() {
 	@Test // DATAMONGO-1110
 	public void nearSphereWithMinDistance() {
 
+		createIndexAndAddVenues();
+
 		Point point = new GeoJsonPoint(-73.99171, 40.738868);
 		List<Venue2DSphere> venues = template.find(query(where("location").nearSphere(point).minDistance(0.01)),
 				Venue2DSphere.class);
@@ -351,6 +401,8 @@ public void nearSphereWithMinDistance() {
 	@Test // DATAMONGO-1135
 	public void nearWithMinAndMaxDistance() {
 
+		createIndexAndAddVenues();
+
 		GeoJsonPoint point = new GeoJsonPoint(-73.99171, 40.738868);
 
 		Query query = query(where("location").near(point).minDistance(0.01).maxDistance(100));
@@ -440,18 +492,22 @@ public void readGeoJsonBasedOnEmbeddedTypeInformation() {
 
 	private void addVenues() {
 
-		template.insert(new Venue2DSphere("Penn Station", -73.99408, 40.75057));
-		template.insert(new Venue2DSphere("10gen Office", -73.99171, 40.738868));
-		template.insert(new Venue2DSphere("Flatiron Building", -73.988135, 40.741404));
-		template.insert(new Venue2DSphere("Players Club", -73.997812, 40.739128));
-		template.insert(new Venue2DSphere("City Bakery ", -73.992491, 40.738673));
-		template.insert(new Venue2DSphere("Splash Bar", -73.992491, 40.738673));
-		template.insert(new Venue2DSphere("Momofuku Milk Bar", -73.985839, 40.731698));
-		template.insert(new Venue2DSphere("Shake Shack", -73.98820, 40.74164));
-		template.insert(new Venue2DSphere("Penn Station", -73.99408, 40.75057));
-		template.insert(new Venue2DSphere("Empire State Building", -73.98602, 40.74894));
-		template.insert(new Venue2DSphere("Ulaanbaatar, Mongolia", 106.9154, 47.9245));
-		template.insert(new Venue2DSphere("Maplewood, NJ", -74.2713, 40.73137));
+		List<Venue2DSphere> venues = new ArrayList<>();
+
+		venues.add(new Venue2DSphere("Penn Station", -73.99408, 40.75057));
+		venues.add(new Venue2DSphere("10gen Office", -73.99171, 40.738868));
+		venues.add(new Venue2DSphere("Flatiron Building", -73.988135, 40.741404));
+		venues.add(new Venue2DSphere("Players Club", -73.997812, 40.739128));
+		venues.add(new Venue2DSphere("City Bakery ", -73.992491, 40.738673));
+		venues.add(new Venue2DSphere("Splash Bar", -73.992491, 40.738673));
+		venues.add(new Venue2DSphere("Momofuku Milk Bar", -73.985839, 40.731698));
+		venues.add(new Venue2DSphere("Shake Shack", -73.98820, 40.74164));
+		venues.add(new Venue2DSphere("Penn Station", -73.99408, 40.75057));
+		venues.add(new Venue2DSphere("Empire State Building", -73.98602, 40.74894));
+		venues.add(new Venue2DSphere("Ulaanbaatar, Mongolia", 106.9154, 47.9245));
+		venues.add(new Venue2DSphere("Maplewood, NJ", -74.2713, 40.73137));
+
+		template.bulkOps(BulkMode.UNORDERED, Venue2DSphere.class).insert(venues).execute();
 	}
 
 	protected void createIndex() {
@@ -480,7 +536,7 @@ static class Venue2DSphere {
 		private String name;
 		private @GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE) double[] location;
 
-		@PersistenceConstructor
+		@PersistenceCreator
 		public Venue2DSphere(String name, double[] location) {
 			this.name = name;
 			this.location = location;
@@ -534,18 +590,58 @@ static class DocumentWithPropertyUsingGeoJsonType {
 		GeoJsonGeometryCollection geoJsonGeometryCollection;
 	}
 
-	@Data
 	@Document("geo-json-shapes")
 	static class ConcreteGeoJson {
+
 		String id;
 		GeoJsonPolygon shape;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public GeoJsonPolygon getShape() {
+			return this.shape;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setShape(GeoJsonPolygon shape) {
+			this.shape = shape;
+		}
+
+		public String toString() {
+			return "GeoJsonTests.ConcreteGeoJson(id=" + this.getId() + ", shape=" + this.getShape() + ")";
+		}
 	}
 
-	@Data
 	@Document("geo-json-shapes")
 	static class OpenGeoJson {
+
 		String id;
 		GeoJson shape;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public GeoJson getShape() {
+			return this.shape;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setShape(GeoJson shape) {
+			this.shape = shape;
+		}
+
+		public String toString() {
+			return "GeoJsonTests.OpenGeoJson(id=" + this.getId() + ", shape=" + this.getShape() + ")";
+		}
 	}
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DSphereTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DSphereTests.java
index 1240bcdaf8..1774c36493 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DSphereTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DSphereTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,10 @@
 
 import java.util.List;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.geo.GeoResults;
-import org.springframework.data.geo.Metric;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.Venue;
@@ -64,12 +62,12 @@ public void indexInfoIsCorrect() {
 	@Test // DATAMONGO-1110
 	public void geoNearWithMinDistance() {
 
-		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).num(10).minDistance(1);
+		NearQuery geoNear = NearQuery.near(-73, 40, Metrics.KILOMETERS).limit(10).minDistance(1);
 
 		GeoResults<Venue> result = template.geoNear(geoNear, Venue.class);
 
 		assertThat(result.getContent().size()).isNotEqualTo(0);
-		assertThat(result.getAverageDistance().getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(result.getAverageDistance().getMetric()).isEqualTo(Metrics.KILOMETERS);
 	}
 
 	@Test // DATAMONGO-1110
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DTests.java
index 1adb751f55..15c3a89dab 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatial2DTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatialIndexTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatialIndexTests.java
index 1e97934d1a..37ae08dff4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatialIndexTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/geo/GeoSpatialIndexTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,8 +21,10 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.assertj.core.api.Assumptions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.geo.Point;
@@ -35,6 +37,8 @@
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.data.mongodb.core.index.IndexOperations;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.util.MongoClientVersion;
 
 import com.mongodb.MongoException;
 import com.mongodb.WriteConcern;
@@ -52,7 +56,7 @@ public class GeoSpatialIndexTests extends AbstractIntegrationTests {
 
 	@Autowired private MongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		template.setWriteConcern(WriteConcern.JOURNALED);
@@ -82,8 +86,11 @@ public void test2dSphereIndex() {
 	}
 
 	@Test // DATAMONGO-778
+	@EnableIfMongoServerVersion(isLessThan = "5.0")
 	public void testHaystackIndex() {
 
+		Assumptions.assumeThat(MongoClientVersion.isVersion5orNewer()).isFalse();
+
 		try {
 			template.save(new GeoSpatialEntityHaystack(45.2, 4.6, "Paris"));
 			assertThat(hasIndexOfType(GeoSpatialEntityHaystack.class, "geoHaystack")).isTrue();
@@ -115,8 +122,8 @@ public void useGeneratedNameShouldGenerateAnIndexName() {
 	/**
 	 * Returns whether an index with the given name exists for the given entity type.
 	 *
-	 * @param indexName
 	 * @param entityType
+	 * @param type
 	 * @return
 	 */
 	private boolean hasIndexOfType(Class<?> entityType, final String type) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexFieldUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexFieldUnitTests.java
index 5cff0feaba..6f505289e6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexFieldUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexFieldUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.domain.Sort.Direction;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexInfoUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexInfoUnitTests.java
index c1051d63f3..12fc967c83 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexInfoUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexInfoUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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.Arrays;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.Sort.Direction;
 
 /**
@@ -29,16 +29,29 @@
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Stefan Tirea
  */
-public class IndexInfoUnitTests {
+class IndexInfoUnitTests {
 
 	static final String ID_INDEX = "{ \"v\" : 2, \"key\" : { \"_id\" : 1 }, \"name\" : \"_id_\", \"ns\" : \"db.collection\" }";
 	static final String INDEX_WITH_PARTIAL_FILTER = "{ \"v\" : 2, \"key\" : { \"k3y\" : 1 }, \"name\" : \"partial-filter-index\", \"ns\" : \"db.collection\", \"partialFilterExpression\" : { \"quantity\" : { \"$gte\" : 10 } } }";
 	static final String INDEX_WITH_EXPIRATION_TIME = "{ \"v\" : 2, \"key\" : { \"lastModifiedDate\" : 1 },\"name\" : \"expire-after-last-modified\", \"ns\" : \"db.collectio\", \"expireAfterSeconds\" : 3600 }";
 	static final String HASHED_INDEX = "{ \"v\" : 2, \"key\" : { \"score\" : \"hashed\" }, \"name\" : \"score_hashed\", \"ns\" : \"db.collection\" }";
+	static final String WILDCARD_INDEX = "{ \"v\" : 2, \"key\" : { \"$**\" : 1 }, \"name\" : \"$**_1\", \"wildcardProjection\" : { \"fieldA\" : 0, \"fieldB.fieldC\" : 0 } }";
+	static final String INDEX_WITH_COLLATION = "{ \"v\" : 2, \"key\" : { \"_id\" : 1 }, \"name\" : \"projectName\", \"collation\": { \"locale\": \"en_US\", \"strength\": 2 } }";
+	static final String HIDDEN_INDEX = """
+				{
+			      "v" : 2,
+			      "key" : {
+			         "borough" : 1
+			      },
+			      "name" : "borough_1",
+			      "hidden" : true
+			   }
+			""";
 
 	@Test
-	public void isIndexForFieldsCorrectly() {
+	void isIndexForFieldsCorrectly() {
 
 		IndexField fooField = IndexField.create("foo", Direction.ASC);
 		IndexField barField = IndexField.create("bar", Direction.DESC);
@@ -48,29 +61,29 @@ public void isIndexForFieldsCorrectly() {
 	}
 
 	@Test // DATAMONGO-2170
-	public void partialFilterExpressionShouldBeNullIfNotSetInSource() {
+	void partialFilterExpressionShouldBeNullIfNotSetInSource() {
 		assertThat(getIndexInfo(ID_INDEX).getPartialFilterExpression()).isNull();
 	}
 
 	@Test // DATAMONGO-2170
-	public void partialFilterExpressionShouldMatchSource() {
+	void partialFilterExpressionShouldMatchSource() {
 
 		assertThat(Document.parse(getIndexInfo(INDEX_WITH_PARTIAL_FILTER).getPartialFilterExpression()))
 				.isEqualTo(Document.parse("{ \"quantity\" : { \"$gte\" : 10 } }"));
 	}
 
 	@Test // DATAMONGO-2081
-	public void expireAfterIsParsedCorrectly() {
+	void expireAfterIsParsedCorrectly() {
 		assertThat(getIndexInfo(INDEX_WITH_EXPIRATION_TIME).getExpireAfter()).contains(Duration.ofHours(1));
 	}
 
 	@Test // DATAMONGO-2081
-	public void expireAfterIsEmptyIfNotSet() {
+	void expireAfterIsEmptyIfNotSet() {
 		assertThat(getIndexInfo(ID_INDEX).getExpireAfter()).isEmpty();
 	}
 
 	@Test // DATAMONGO-1183
-	public void readsHashedIndexCorrectly() {
+	void readsHashedIndexCorrectly() {
 		assertThat(getIndexInfo(HASHED_INDEX).getIndexFields()).containsExactly(IndexField.hashed("score"));
 	}
 
@@ -79,6 +92,30 @@ public void hashedIndexIsMarkedAsSuch() {
 		assertThat(getIndexInfo(HASHED_INDEX).isHashed()).isTrue();
 	}
 
+	@Test // GH-3225
+	void identifiesWildcardIndexCorrectly() {
+		assertThat(getIndexInfo(WILDCARD_INDEX).isWildcard()).isTrue();
+	}
+
+	@Test // GH-3225
+	void readsWildcardIndexProjectionCorrectly() {
+		assertThat(getIndexInfo(WILDCARD_INDEX).getWildcardProjection())
+				.contains(new Document("fieldA", 0).append("fieldB.fieldC", 0));
+	}
+
+	@Test // GH-3002
+	void collationParsedCorrectly() {
+		assertThat(getIndexInfo(INDEX_WITH_COLLATION).getCollation())
+				.contains(Document.parse("{ \"locale\": \"en_US\", \"strength\": 2 }"));
+	}
+
+	@Test // GH-4348
+	void hiddenInfoSetCorrectly() {
+
+		assertThat(getIndexInfo(ID_INDEX).isHidden()).isFalse();
+		assertThat(getIndexInfo(HIDDEN_INDEX).isHidden()).isTrue();
+	}
+
 	private static IndexInfo getIndexInfo(String documentJson) {
 		return IndexInfo.indexInfoOf(Document.parse(documentJson));
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexOptionsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexOptionsUnitTests.java
new file mode 100644
index 0000000000..3a193f0133
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexOptionsUnitTests.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 2024-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
+
+import java.time.Duration;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.index.IndexOptions.Unique;
+
+/**
+ * @author Christoph Strobl
+ */
+class IndexOptionsUnitTests {
+
+	@Test // GH-4851
+	void noneIsEmpty() {
+
+		IndexOptions options = IndexOptions.none();
+
+		assertThat(options.getExpire()).isNull();
+		assertThat(options.getUnique()).isNull();
+		assertThat(options.isHidden()).isNull();
+		assertThat(options.toDocument()).isEqualTo(new Document());
+	}
+
+	@Test // GH-4851
+	void uniqueSetsFlag() {
+
+		IndexOptions options = IndexOptions.unique();
+
+		assertThat(options.getUnique()).isEqualTo(Unique.YES);
+		assertThat(options.toDocument()).containsEntry("unique", true);
+
+		options.setUnique(Unique.NO);
+		assertThat(options.toDocument()).containsEntry("unique", false);
+
+		options.setUnique(Unique.PREPARE);
+		assertThat(options.toDocument()).containsEntry("prepareUnique", true);
+	}
+
+	@Test // GH-4851
+	void hiddenSetsFlag() {
+
+		IndexOptions options = IndexOptions.hidden();
+
+		assertThat(options.isHidden()).isTrue();
+		assertThat(options.toDocument()).containsEntry("hidden", true);
+	}
+
+	@Test // GH-4851
+	void expireAfterSetsExpiration() {
+
+		Duration duration = Duration.ofMinutes(2);
+		IndexOptions options = IndexOptions.expireAfter(duration);
+
+		assertThat(options.getExpire()).isEqualTo(duration);
+		assertThat(options.toDocument()).containsEntry("expireAfterSeconds", duration.toSeconds());
+	}
+
+	@Test // GH-4851
+	void expireAfterForZeroAndNegativeDuration() {
+
+		assertThat(IndexOptions.expireAfter(Duration.ZERO).toDocument()).containsEntry("expireAfterSeconds", 0L);
+		assertThat(IndexOptions.expireAfter(Duration.ofSeconds(-1)).toDocument()).isEmpty();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java
index 8be30857e1..caa40e96c0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/IndexingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,29 +17,27 @@
 
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
+import java.time.Instant;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
-import org.junit.After;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.MongoCollectionUtils;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
-import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -47,10 +45,13 @@
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.core.mapping.TimeSeries;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 
@@ -61,13 +62,16 @@
  * @author Christoph Strobl
  * @author Jordi Llach
  * @author Mark Paluch
+ * @author Ben Foster
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
 public class IndexingIntegrationTests {
 
+	static @Client MongoClient mongoClient;
+
 	@Autowired MongoOperations operations;
-	@Autowired MongoDbFactory mongoDbFactory;
+	@Autowired MongoDatabaseFactory mongoDbFactory;
 	@Autowired ConfigurableApplicationContext context;
 
 	@Configuration
@@ -75,7 +79,7 @@ static class Config extends AbstractMongoClientConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Override
@@ -87,11 +91,22 @@ protected String getDatabaseName() {
 		TimeoutResolver myTimeoutResolver() {
 			return new TimeoutResolver("11s");
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
+
+		@Override
+		protected boolean autoIndexCreation() {
+			return true;
+		}
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		operations.dropCollection(IndexedPerson.class);
+		operations.dropCollection(TimeSeriesWithSpelIndexTimeout.class);
 	}
 
 	@Test // DATAMONGO-237
@@ -142,7 +157,33 @@ public void evaluatesTimeoutSpelExpresssionWithBeanReference() {
 		});
 
 		assertThat(indexInfo).isPresent();
-		assertThat(indexInfo.get()).containsEntry("expireAfterSeconds", 11L);
+		assertThat(indexInfo.get()).hasEntrySatisfying("expireAfterSeconds", timeout -> {
+
+			// MongoDB 5 returns int not long
+			assertThat(timeout).isIn(11, 11L);
+		});
+	}
+
+	@Test // GH-4099
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "6.0")
+	@DirtiesContext
+	public void evaluatesTimeSeriesTimeoutSpelExpresssionWithBeanReference() {
+
+		operations.createCollection(TimeSeriesWithSpelIndexTimeout.class);
+
+		final Optional<org.bson.Document> collectionInfo = operations.execute(db -> {
+			return db.listCollections().into(new ArrayList<>())
+					.stream()
+					.filter(c -> "timeSeriesWithSpelIndexTimeout".equals(c.get("name")))
+					.findFirst();
+		});
+
+		assertThat(collectionInfo).isPresent();
+		assertThat(collectionInfo.get()).hasEntrySatisfying("options", options -> {
+			final org.bson.Document optionsDoc = (org.bson.Document) options;
+			// MongoDB 5 returns int not long
+			assertThat(optionsDoc.get("expireAfterSeconds")).isIn(11, 11L);
+		});
 	}
 
 	@Target({ ElementType.FIELD })
@@ -158,10 +199,16 @@ class IndexedPerson {
 		@Field("_lastname") @IndexedFieldAnnotation String lastname;
 	}
 
-	@RequiredArgsConstructor
-	@Getter
 	static class TimeoutResolver {
 		final String timeout;
+
+		public TimeoutResolver(String timeout) {
+			this.timeout = timeout;
+		}
+
+		public String getTimeout() {
+			return this.timeout;
+		}
 	}
 
 	@Document
@@ -169,6 +216,11 @@ class WithSpelIndexTimeout {
 		@Indexed(expireAfter = "#{@myTimeoutResolver?.timeout}") String someString;
 	}
 
+	@TimeSeries(expireAfter = "#{@myTimeoutResolver?.timeout}", timeField = "timestamp")
+	class TimeSeriesWithSpelIndexTimeout {
+		Instant timestamp;
+	}
+
 	/**
 	 * Returns whether an index with the given name exists for the given entity type.
 	 *
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorIntegrationTests.java
index b5f2d01c21..a506decf67 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,6 +27,7 @@
 import org.junit.rules.ExpectedException;
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -42,9 +43,10 @@
 import org.springframework.data.mongodb.test.util.MongoVersionRule;
 import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.MongoCommandException;
+import com.mongodb.client.MongoClient;
 
 /**
  * Integration tests for {@link MongoPersistentEntityIndexCreator}.
@@ -53,7 +55,7 @@
  * @author Christoph Strobl
  * @author Thomas Darimont
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class MongoPersistentEntityIndexCreatorIntegrationTests {
 
@@ -98,16 +100,18 @@ public void createIndexShouldThrowMeaningfulExceptionWhenIndexCreationFails() {
 		expectedException.expectMessage("lastname");
 		expectedException.expectCause(IsInstanceOf.<Throwable> instanceOf(MongoCommandException.class));
 
-		MongoTemplate mongoTemplate = new MongoTemplate(MongoTestUtils.client(), "issue");
+		try (MongoClient client = MongoTestUtils.client()) {
+			MongoTemplate mongoTemplate = new MongoTemplate(client, "issue");
 
-		MongoPersistentEntityIndexCreator indexCreator = new MongoPersistentEntityIndexCreator(new MongoMappingContext(),
-				mongoTemplate);
+			MongoPersistentEntityIndexCreator indexCreator = new MongoPersistentEntityIndexCreator(new MongoMappingContext(),
+					mongoTemplate);
 
-		indexCreator.createIndex(new IndexDefinitionHolder("dalinar.kohlin",
-				new Index().named("stormlight").on("lastname", Direction.ASC).unique(), "datamongo-1125"));
+			indexCreator.createIndex(new IndexDefinitionHolder("dalinar.kohlin",
+					new Index().named("stormlight").on("lastname", Direction.ASC).unique(), "datamongo-1125"));
 
-		indexCreator.createIndex(new IndexDefinitionHolder("dalinar.kohlin",
-				new Index().named("stormlight").on("lastname", Direction.ASC).sparse(), "datamongo-1125"));
+			indexCreator.createIndex(new IndexDefinitionHolder("dalinar.kohlin",
+					new Index().named("stormlight").on("lastname", Direction.ASC).sparse(), "datamongo-1125"));
+		}
 	}
 
 	@Document(RECURSIVE_TYPE_COLLECTION_NAME)
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorUnitTests.java
index 617b46eae4..0e48b39e56 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexCreatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,19 @@
 import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mapping.context.MappingContextEvent;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -55,26 +58,27 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class MongoPersistentEntityIndexCreatorUnitTests {
 
-	private @Mock MongoDbFactory factory;
+	private @Mock MongoDatabaseFactory factory;
 	private @Mock MongoDatabase db;
 	private @Mock MongoCollection<org.bson.Document> collection;
 	private MongoTemplate mongoTemplate;
 
-	ArgumentCaptor<org.bson.Document> keysCaptor;
-	ArgumentCaptor<IndexOptions> optionsCaptor;
-	ArgumentCaptor<String> collectionCaptor;
+	private ArgumentCaptor<org.bson.Document> keysCaptor;
+	private ArgumentCaptor<IndexOptions> optionsCaptor;
+	private ArgumentCaptor<String> collectionCaptor;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		keysCaptor = ArgumentCaptor.forClass(org.bson.Document.class);
 		optionsCaptor = ArgumentCaptor.forClass(IndexOptions.class);
 		collectionCaptor = ArgumentCaptor.forClass(String.class);
 
-		when(factory.getDb()).thenReturn(db);
+		when(factory.getMongoDatabase()).thenReturn(db);
 		when(factory.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
 		when(db.getCollection(collectionCaptor.capture(), eq(org.bson.Document.class)))
 				.thenReturn((MongoCollection) collection);
@@ -85,7 +89,7 @@ public void setUp() {
 	}
 
 	@Test
-	public void buildsIndexDefinitionUsingFieldName() {
+	void buildsIndexDefinitionUsingFieldName() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(Person.class);
 
@@ -98,7 +102,7 @@ public void buildsIndexDefinitionUsingFieldName() {
 	}
 
 	@Test
-	public void doesNotCreateIndexForEntityComingFromDifferentMappingContext() {
+	void doesNotCreateIndexForEntityComingFromDifferentMappingContext() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		MongoMappingContext personMappingContext = prepareMappingContext(Person.class);
@@ -111,11 +115,11 @@ public void doesNotCreateIndexForEntityComingFromDifferentMappingContext() {
 
 		creator.onApplicationEvent(event);
 
-		verifyZeroInteractions(collection);
+		verifyNoInteractions(collection);
 	}
 
 	@Test // DATAMONGO-530
-	public void isIndexCreatorForMappingContextHandedIntoConstructor() {
+	void isIndexCreatorForMappingContextHandedIntoConstructor() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.initialize();
@@ -126,7 +130,7 @@ public void isIndexCreatorForMappingContextHandedIntoConstructor() {
 	}
 
 	@Test // DATAMONGO-554
-	public void triggersBackgroundIndexingIfConfigured() {
+	void triggersBackgroundIndexingIfConfigured() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(AnotherPerson.class);
 		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
@@ -138,7 +142,7 @@ public void triggersBackgroundIndexingIfConfigured() {
 	}
 
 	@Test // DATAMONGO-544
-	public void expireAfterSecondsIfConfigured() {
+	void expireAfterSecondsIfConfigured() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(Milk.class);
 		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
@@ -148,7 +152,7 @@ public void expireAfterSecondsIfConfigured() {
 	}
 
 	@Test // DATAMONGO-899
-	public void createsNotNestedGeoSpatialIndexCorrectly() {
+	void createsNotNestedGeoSpatialIndexCorrectly() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(Wrapper.class);
 		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
@@ -163,7 +167,7 @@ public void createsNotNestedGeoSpatialIndexCorrectly() {
 	}
 
 	@Test // DATAMONGO-827
-	public void autoGeneratedIndexNameShouldGenerateNoName() {
+	void autoGeneratedIndexNameShouldGenerateNoName() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(EntityWithGeneratedIndexName.class);
 		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
@@ -173,7 +177,7 @@ public void autoGeneratedIndexNameShouldGenerateNoName() {
 	}
 
 	@Test // DATAMONGO-367
-	public void indexCreationShouldNotCreateNewCollectionForNestedGeoSpatialIndexStructures() {
+	void indexCreationShouldNotCreateNewCollectionForNestedGeoSpatialIndexStructures() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(Wrapper.class);
 		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
@@ -185,7 +189,7 @@ public void indexCreationShouldNotCreateNewCollectionForNestedGeoSpatialIndexStr
 	}
 
 	@Test // DATAMONGO-367
-	public void indexCreationShouldNotCreateNewCollectionForNestedIndexStructures() {
+	void indexCreationShouldNotCreateNewCollectionForNestedIndexStructures() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(IndexedDocumentWrapper.class);
 		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
@@ -196,26 +200,28 @@ public void indexCreationShouldNotCreateNewCollectionForNestedIndexStructures()
 		assertThat(collectionNameCapturer.getValue()).isEqualTo("indexedDocumentWrapper");
 	}
 
-	@Test(expected = DataAccessException.class) // DATAMONGO-1125
-	public void createIndexShouldUsePersistenceExceptionTranslatorForNonDataIntegrityConcerns() {
+	@Test // DATAMONGO-1125
+	void createIndexShouldUsePersistenceExceptionTranslatorForNonDataIntegrityConcerns() {
 
 		doThrow(new MongoException(6, "HostUnreachable")).when(collection).createIndex(any(org.bson.Document.class),
 				any(IndexOptions.class));
 
 		MongoMappingContext mappingContext = prepareMappingContext(Person.class);
 
-		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
+		assertThatThrownBy(() -> new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate))
+				.isInstanceOf(DataAccessException.class);
 	}
 
-	@Test(expected = ClassCastException.class) // DATAMONGO-1125
-	public void createIndexShouldNotConvertUnknownExceptionTypes() {
+	@Test // DATAMONGO-1125
+	void createIndexShouldNotConvertUnknownExceptionTypes() {
 
 		doThrow(new ClassCastException("o_O")).when(collection).createIndex(any(org.bson.Document.class),
 				any(IndexOptions.class));
 
 		MongoMappingContext mappingContext = prepareMappingContext(Person.class);
 
-		new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate);
+		assertThatThrownBy(() -> new MongoPersistentEntityIndexCreator(mappingContext, mongoTemplate))
+				.isInstanceOf(ClassCastException.class);
 	}
 
 	private static MongoMappingContext prepareMappingContext(Class<?> type) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolverUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolverUnitTests.java
index 89e5081e14..dda16f7849 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolverUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/MongoPersistentEntityIndexResolverUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,16 +22,20 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Collections;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 import org.springframework.core.annotation.AliasFor;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.geo.Point;
+import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolver.IndexDefinitionHolder;
 import org.springframework.data.mongodb.core.index.MongoPersistentEntityIndexResolverUnitTests.CompoundIndexResolutionTests;
@@ -47,13 +51,16 @@
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
+import org.springframework.data.util.TypeInformation;
 
 /**
  * Tests for {@link MongoPersistentEntityIndexResolver}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Dave Perryman
+ * @author Stefan Tirea
  */
 @RunWith(Suite.class)
 @SuiteClasses({ IndexResolutionTests.class, GeoSpatialIndexResolutionTests.class, CompoundIndexResolutionTests.class,
@@ -214,6 +221,15 @@ public void shouldResolveTimeoutFromString() {
 			assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("expireAfterSeconds", 600L);
 		}
 
+		@Test // GH-4844
+		public void shouldResolveZeroTimeoutFromString() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+				WithExpireAfterZeroSecondsAsPlainString.class);
+
+			assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("expireAfterSeconds", 0L);
+		}
+
 		@Test // DATAMONGO-2112
 		public void shouldResolveTimeoutFromIso8601String() {
 
@@ -270,47 +286,58 @@ public void resolveExpressionIndexName() {
 			assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("name", "my1st");
 		}
 
+		@Test // DATAMONGO-1569
+		public void resolvesPartialFilter() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WithPartialFilter.class);
+
+			assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("partialFilterExpression",
+					org.bson.Document.parse("{'value': {'$exists': true}}"));
+		}
+
 		@Document("Zero")
-		static class IndexOnLevelZero {
+		class IndexOnLevelZero {
 			@Indexed String indexedProperty;
 		}
 
 		@Document("One")
-		static class IndexOnLevelOne {
+		class IndexOnLevelOne {
 			IndexOnLevelZero zero;
 		}
 
 		@Document("Two")
-		static class IndexOnLevelTwo {
+		class IndexOnLevelTwo {
 			IndexOnLevelOne one;
 		}
 
 		@Document("WithOptionsOnIndexedProperty")
-		static class WithOptionsOnIndexedProperty {
+		class WithOptionsOnIndexedProperty {
 
-			@Indexed(background = true, direction = IndexDirection.DESCENDING, dropDups = true, expireAfterSeconds = 10,
-					sparse = true, unique = true) //
+			@Indexed(background = true, direction = IndexDirection.DESCENDING, expireAfterSeconds = 10, sparse = true,
+					unique = true) //
 			String indexedProperty;
 		}
 
 		@Document
-		static class IndexOnLevelOneWithExplicitlyNamedField {
+		class IndexOnLevelOneWithExplicitlyNamedField {
 
 			@Field("customZero") IndexOnLevelZeroWithExplicityNamedField zero;
 		}
 
-		static class IndexOnLevelZeroWithExplicityNamedField {
+		class IndexOnLevelZeroWithExplicityNamedField {
 
-			@Indexed @Field("customFieldName") String namedProperty;
+			@Indexed
+			@Field("customFieldName") String namedProperty;
 		}
 
 		@Document
-		static class WrapperOfWithDbRef {
+		class WrapperOfWithDbRef {
 			WithDbRef nested;
 		}
 
 		@Document
-		static class WithDbRef {
+		class WithDbRef {
 
 			@Indexed //
 			@DBRef //
@@ -318,12 +345,12 @@ static class WithDbRef {
 		}
 
 		@Document("no-index")
-		static class NoIndex {
+		class NoIndex {
 			@Id String id;
 		}
 
 		@Document
-		static class IndexedDocumentWithComposedAnnotations {
+		class IndexedDocumentWithComposedAnnotations {
 
 			@Id String id;
 			@CustomIndexedAnnotation String fieldWithDifferentIndexName;
@@ -361,22 +388,27 @@ static class IndexedDocumentWithComposedAnnotations {
 		}
 
 		@Document
-		static class WithExpireAfterAsPlainString {
+		class WithExpireAfterAsPlainString {
 			@Indexed(expireAfter = "10m") String withTimeout;
 		}
 
+		@Document
+		class WithExpireAfterZeroSecondsAsPlainString {
+			@Indexed(expireAfter = "0s") String withTimeout;
+		}
+
 		@Document
 		class WithIso8601Style {
 			@Indexed(expireAfter = "P1D") String withTimeout;
 		}
 
 		@Document
-		static class WithExpireAfterAsExpression {
+		class WithExpireAfterAsExpression {
 			@Indexed(expireAfter = "#{10 + 1 + 's'}") String withTimeout;
 		}
 
 		@Document
-		static class WithExpireAfterAsExpressionResultingInDuration {
+		class WithExpireAfterAsExpressionResultingInDuration {
 			@Indexed(expireAfter = "#{T(java.time.Duration).ofSeconds(100)}") String withTimeout;
 		}
 
@@ -391,9 +423,14 @@ class WithDuplicateExpiry {
 		}
 
 		@Document
-		static class WithIndexNameAsExpression {
+		class WithIndexNameAsExpression {
 			@Indexed(name = "#{'my' + 1 + 'st'}") String spelIndexName;
 		}
+
+		@Document
+		class WithPartialFilter {
+			@Indexed(partialFilter = "{'value': {'$exists': true}}") String withPartialFilter;
+		}
 	}
 
 	@Target({ ElementType.FIELD })
@@ -403,8 +440,9 @@ static class WithIndexNameAsExpression {
 	}
 
 	@Document
-	static class IndexOnMetaAnnotatedField {
-		@Field("_name") @IndexedFieldAnnotation String lastname;
+	class IndexOnMetaAnnotatedField {
+		@Field("_name")
+		@IndexedFieldAnnotation String lastname;
 	}
 
 	/**
@@ -467,7 +505,7 @@ public void resolvesComposedAnnotationIndexDefinitionOptionsCorrectly() {
 			assertThat(indexDefinition.getIndexKeys()).containsEntry("location", "geoHaystack").containsEntry("What light?",
 					1);
 			assertThat(indexDefinition.getIndexOptions()).containsEntry("name", "my_geo_index_name")
-					.containsEntry("bucketSize", 2.0);
+					.doesNotContainKey("bucketSize");
 		}
 
 		@Test // DATAMONGO-2112
@@ -480,29 +518,29 @@ public void resolveExpressionIndexNameForGeoIndex() {
 		}
 
 		@Document("Zero")
-		static class GeoSpatialIndexOnLevelZero {
+		class GeoSpatialIndexOnLevelZero {
 			@GeoSpatialIndexed Point geoIndexedProperty;
 		}
 
 		@Document("One")
-		static class GeoSpatialIndexOnLevelOne {
+		class GeoSpatialIndexOnLevelOne {
 			GeoSpatialIndexOnLevelZero zero;
 		}
 
 		@Document("Two")
-		static class GeoSpatialIndexOnLevelTwo {
+		class GeoSpatialIndexOnLevelTwo {
 			GeoSpatialIndexOnLevelOne one;
 		}
 
 		@Document("WithOptionsOnGeoSpatialIndexProperty")
-		static class WithOptionsOnGeoSpatialIndexProperty {
+		class WithOptionsOnGeoSpatialIndexProperty {
 
 			@GeoSpatialIndexed(bits = 2, max = 100, min = 1, type = GeoSpatialIndexType.GEO_2D) //
 			Point location;
 		}
 
 		@Document("WithComposedAnnotation")
-		static class GeoSpatialIndexedDocumentWithComposedAnnotation {
+		class GeoSpatialIndexedDocumentWithComposedAnnotation {
 
 			@ComposedGeoSpatialIndexed //
 			Point location;
@@ -519,15 +557,12 @@ static class GeoSpatialIndexedDocumentWithComposedAnnotation {
 			@AliasFor(annotation = GeoSpatialIndexed.class, attribute = "additionalField")
 			String theAdditionalFieldINeedToDefine() default "What light?";
 
-			@AliasFor(annotation = GeoSpatialIndexed.class, attribute = "bucketSize")
-			double size() default 2;
-
 			@AliasFor(annotation = GeoSpatialIndexed.class, attribute = "type")
 			GeoSpatialIndexType indexType() default GeoSpatialIndexType.GEO_HAYSTACK;
 		}
 
 		@Document
-		static class GeoIndexWithNameAsExpression {
+		class GeoIndexWithNameAsExpression {
 			@GeoSpatialIndexed(name = "#{'my' + 1 + 'st'}") Point spelIndexName;
 		}
 
@@ -659,17 +694,71 @@ public void shouldIdentifyRepeatedAnnotationCorrectly() {
 			assertThat(indexDefinitions).hasSize(2);
 			assertIndexPathAndCollection(new String[] { "firstname", "lastname" }, "repeatedCompoundIndex",
 					indexDefinitions.get(0));
-			assertIndexPathAndCollection(new String[] { "address.city", "address.street" }, "repeatedCompoundIndex", indexDefinitions.get(1));
+			assertIndexPathAndCollection(new String[] { "address.city", "address.street" }, "repeatedCompoundIndex",
+					indexDefinitions.get(1));
+		}
+
+		@Test // DATAMONGO-1569
+		public void singleIndexWithPartialFilter() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					SingleCompoundIndexWithPartialFilter.class);
+
+			assertThat(indexDefinitions).hasSize(1);
+			assertThat(indexDefinitions.get(0).getIndexKeys()).containsEntry("foo", 1).containsEntry("bar", -1);
+			assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("name", "compound_index_with_partial")
+					.containsEntry("unique", true).containsEntry("background", true);
+			assertThat(indexDefinitions.get(0).getIndexOptions()).containsEntry("partialFilterExpression",
+					org.bson.Document.parse("{'value': {'$exists': true}}"));
+		}
+
+		@Test // GH-3002
+		public void compoundIndexWithCollation() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					CompoundIndexWithCollation.class);
+
+			IndexDefinition indexDefinition = indexDefinitions.get(0).getIndexDefinition();
+			assertThat(indexDefinition.getIndexOptions())
+					.isEqualTo(new org.bson.Document().append("name", "compound_index_with_collation").append("collation",
+							new org.bson.Document().append("locale", "en_US").append("strength", 2)));
+			assertThat(indexDefinition.getIndexKeys()).isEqualTo(new org.bson.Document().append("foo", 1));
+		}
+
+		@Test // GH-3002
+		public void compoundIndexWithCollationFromDocumentAnnotation() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WithCompoundCollationFromDocument.class);
+
+			IndexDefinition indexDefinition = indexDefinitions.get(0).getIndexDefinition();
+			assertThat(indexDefinition.getIndexOptions())
+					.isEqualTo(new org.bson.Document().append("name", "compound_index_with_collation").append("collation",
+							new org.bson.Document().append("locale", "en_US").append("strength", 2)));
+			assertThat(indexDefinition.getIndexKeys()).isEqualTo(new org.bson.Document().append("foo", 1));
+		}
+
+		@Test // GH-3002
+		public void compoundIndexWithEvaluatedCollationFromAnnotation() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WithEvaluatedCollationFromCompoundIndex.class);
+
+			IndexDefinition indexDefinition = indexDefinitions.get(0).getIndexDefinition();
+			assertThat(indexDefinition.getIndexOptions())
+					.isEqualTo(new org.bson.Document().append("name", "compound_index_with_collation").append("collation",
+							new org.bson.Document().append("locale", "de_AT")));
+			assertThat(indexDefinition.getIndexKeys()).isEqualTo(new org.bson.Document().append("foo", 1));
 		}
 
 		@Document("CompoundIndexOnLevelOne")
-		static class CompoundIndexOnLevelOne {
+		class CompoundIndexOnLevelOne {
 
 			CompoundIndexOnLevelZero zero;
 		}
 
 		@Document("CompoundIndexOnLevelZeroWithEmptyIndexDef")
-		static class CompoundIndexOnLevelOneWithEmptyIndexDefinition {
+		class CompoundIndexOnLevelOneWithEmptyIndexDefinition {
 
 			CompoundIndexOnLevelZeroWithEmptyIndexDef zero;
 		}
@@ -677,26 +766,26 @@ static class CompoundIndexOnLevelOneWithEmptyIndexDefinition {
 		@Document("CompoundIndexOnLevelZero")
 		@CompoundIndexes({ @CompoundIndex(name = "compound_index", def = "{'foo': 1, 'bar': -1}", background = true,
 				sparse = true, unique = true) })
-		static class CompoundIndexOnLevelZero {}
+		class CompoundIndexOnLevelZero {}
 
 		@CompoundIndexes({ @CompoundIndex(name = "compound_index", background = true, sparse = true, unique = true) })
-		static class CompoundIndexOnLevelZeroWithEmptyIndexDef {}
+		class CompoundIndexOnLevelZeroWithEmptyIndexDef {}
 
 		@Document("CompoundIndexOnLevelZero")
 		@CompoundIndex(name = "compound_index", def = "{'foo': 1, 'bar': -1}", background = true, sparse = true,
 				unique = true)
-		static class SingleCompoundIndex {}
+		class SingleCompoundIndex {}
 
-		static class IndexDefinedOnSuperClass extends CompoundIndexOnLevelZero {}
+		class IndexDefinedOnSuperClass extends CompoundIndexOnLevelZero {}
 
 		@Document("ComountIndexWithAutogeneratedName")
 		@CompoundIndexes({ @CompoundIndex(useGeneratedName = true, def = "{'foo': 1, 'bar': -1}", background = true,
 				sparse = true, unique = true) })
-		static class ComountIndexWithAutogeneratedName {}
+		class ComountIndexWithAutogeneratedName {}
 
 		@Document("WithComposedAnnotation")
 		@ComposedCompoundIndex
-		static class CompoundIndexDocumentWithComposedAnnotation {}
+		class CompoundIndexDocumentWithComposedAnnotation {}
 
 		@Retention(RetentionPolicy.RUNTIME)
 		@Target({ ElementType.TYPE })
@@ -722,16 +811,35 @@ static class CompoundIndexDocumentWithComposedAnnotation {}
 
 		@Document
 		@CompoundIndex(name = "#{'cmp' + 2 + 'name'}", def = "{'foo': 1, 'bar': -1}")
-		static class CompoundIndexWithNameExpression {}
+		class CompoundIndexWithNameExpression {}
 
 		@Document
 		@CompoundIndex(def = "#{T(org.bson.Document).parse(\"{ 'foo': 1, 'bar': -1 }\")}")
-		static class CompoundIndexWithDefExpression {}
+		class CompoundIndexWithDefExpression {}
 
 		@Document
 		@CompoundIndex(name = "cmp-idx-one", def = "{'firstname': 1, 'lastname': -1}")
 		@CompoundIndex(name = "cmp-idx-two", def = "{'address.city': -1, 'address.street': 1}")
-		static class RepeatedCompoundIndex {}
+		class RepeatedCompoundIndex {}
+
+		@Document("SingleCompoundIndexWithPartialFilter")
+		@CompoundIndex(name = "compound_index_with_partial", def = "{'foo': 1, 'bar': -1}", background = true,
+				unique = true, partialFilter = "{'value': {'$exists': true}}")
+		class SingleCompoundIndexWithPartialFilter {}
+
+		@Document
+		@CompoundIndex(name = "compound_index_with_collation", def = "{'foo': 1}",
+				collation = "{'locale': 'en_US', 'strength': 2}")
+		class CompoundIndexWithCollation {}
+
+		@Document(collation = "{'locale': 'en_US', 'strength': 2}")
+		@CompoundIndex(name = "compound_index_with_collation", def = "{'foo': 1}")
+		class WithCompoundCollationFromDocument {}
+
+		@Document(collation = "{'locale': 'en_US', 'strength': 2}")
+		@CompoundIndex(name = "compound_index_with_collation", def = "{'foo': 1}",
+				collation = "#{{ 'locale' : 'de' + '_' + 'AT' }}")
+		class WithEvaluatedCollationFromCompoundIndex {}
 	}
 
 	public static class TextIndexedResolutionTests {
@@ -867,7 +975,7 @@ public void shouldResolveComposedAnnotationCorrectly() {
 		}
 
 		@Document
-		static class TextIndexOnSinglePropertyInRoot {
+		class TextIndexOnSinglePropertyInRoot {
 
 			String foo;
 
@@ -875,13 +983,13 @@ static class TextIndexOnSinglePropertyInRoot {
 		}
 
 		@Document(collation = "de_AT")
-		static class TextIndexWithCollation {
+		class TextIndexWithCollation {
 
 			@TextIndexed String foo;
 		}
 
 		@Document
-		static class TextIndexOnMultiplePropertiesInRoot {
+		class TextIndexOnMultiplePropertiesInRoot {
 
 			@TextIndexed String foo;
 
@@ -889,48 +997,48 @@ static class TextIndexOnMultiplePropertiesInRoot {
 		}
 
 		@Document
-		static class TextIndexOnNestedRoot {
+		class TextIndexOnNestedRoot {
 
 			String bar;
 
 			@TextIndexed TextIndexOnNested nested;
 		}
 
-		static class TextIndexOnNested {
+		class TextIndexOnNested {
 
 			String foo;
 		}
 
 		@Document
-		static class TextIndexOnNestedWithWeightRoot {
+		class TextIndexOnNestedWithWeightRoot {
 
 			@TextIndexed(weight = 5) TextIndexOnNested nested;
 		}
 
 		@Document
-		static class TextIndexOnNestedWithMostSpecificValueRoot {
+		class TextIndexOnNestedWithMostSpecificValueRoot {
 			@TextIndexed(weight = 5) TextIndexOnNestedWithMostSpecificValue nested;
 		}
 
-		static class TextIndexOnNestedWithMostSpecificValue {
+		class TextIndexOnNestedWithMostSpecificValue {
 
 			String foo;
 			@TextIndexed(weight = 10) String bar;
 		}
 
 		@Document(language = "spanish")
-		static class DocumentWithDefaultLanguage {
+		class DocumentWithDefaultLanguage {
 			@TextIndexed String foo;
 		}
 
 		@Document
-		static class DocumentWithLanguageOverrideOnNestedElement {
+		class DocumentWithLanguageOverrideOnNestedElement {
 
 			DocumentWithLanguageOverride nested;
 		}
 
 		@Document
-		static class DocumentWithLanguageOverride {
+		class DocumentWithLanguageOverride {
 
 			@TextIndexed String foo;
 
@@ -938,19 +1046,19 @@ static class DocumentWithLanguageOverride {
 		}
 
 		@Document
-		static class DocumentWithNoTextIndexPropertyButReservedFieldLanguage {
+		class DocumentWithNoTextIndexPropertyButReservedFieldLanguage {
 
 			String language;
 		}
 
 		@Document
-		static class DocumentWithNoTextIndexPropertyButReservedFieldLanguageAnnotated {
+		class DocumentWithNoTextIndexPropertyButReservedFieldLanguageAnnotated {
 
 			@Field("language") String lang;
 		}
 
 		@Document
-		static class DocumentWithOverlappingLanguageProps {
+		class DocumentWithOverlappingLanguageProps {
 
 			@TextIndexed String foo;
 			String language;
@@ -958,7 +1066,7 @@ static class DocumentWithOverlappingLanguageProps {
 		}
 
 		@Document
-		static class TextIndexedDocumentWithComposedAnnotation {
+		class TextIndexedDocumentWithComposedAnnotation {
 
 			@ComposedTextIndexedAnnotation String foo;
 			String lang;
@@ -1074,7 +1182,7 @@ public void shouldNotDetectCycleWhenTypeIsUsedMoreThanOnce() {
 		@SuppressWarnings({ "rawtypes", "unchecked" })
 		public void shouldCatchCyclicReferenceExceptionOnRoot() {
 
-			MongoPersistentEntity entity = new BasicMongoPersistentEntity<>(ClassTypeInformation.from(Object.class));
+			MongoPersistentEntity entity = new BasicMongoPersistentEntity<>(TypeInformation.of(Object.class));
 
 			MongoPersistentProperty propertyMock = mock(MongoPersistentProperty.class);
 			when(propertyMock.isEntity()).thenReturn(true);
@@ -1083,7 +1191,7 @@ public void shouldCatchCyclicReferenceExceptionOnRoot() {
 					new MongoPersistentEntityIndexResolver.CyclicPropertyReferenceException("foo", Object.class, "bar"));
 
 			MongoPersistentEntity<SelfCyclingViaCollectionType> selfCyclingEntity = new BasicMongoPersistentEntity<>(
-					ClassTypeInformation.from(SelfCyclingViaCollectionType.class));
+					TypeInformation.of(SelfCyclingViaCollectionType.class));
 
 			new MongoPersistentEntityIndexResolver(prepareMappingContext(SelfCyclingViaCollectionType.class))
 					.resolveIndexForEntity(selfCyclingEntity);
@@ -1246,105 +1354,253 @@ public void hashedIndexAndIndexViaComposedAnnotation() {
 			});
 		}
 
+		@Test // DATAMONGO-1902
+		public void resolvedIndexOnUnwrappedType() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(WithUnwrapped.class,
+					UnwrappableType.class);
+
+			assertThat(indexDefinitions).hasSize(2);
+			assertThat(indexDefinitions.get(0)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("stringValue", 1);
+			});
+			assertThat(indexDefinitions.get(1)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("with-at-field-annotation", 1);
+			});
+		}
+
+		@Test // DATAMONGO-1902
+		public void resolvedIndexOnNestedUnwrappedType() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WrapperAroundWithUnwrapped.class, WithUnwrapped.class, UnwrappableType.class);
+
+			assertThat(indexDefinitions).hasSize(2);
+			assertThat(indexDefinitions.get(0)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("withEmbedded.stringValue", 1);
+			});
+			assertThat(indexDefinitions.get(1)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("withEmbedded.with-at-field-annotation", 1);
+			});
+		}
+
+		@Test // DATAMONGO-1902
+		public void errorsOnIndexOnEmbedded() {
+
+			assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
+					.isThrownBy(() -> prepareMappingContextAndResolveIndexForType(InvalidIndexOnUnwrapped.class));
+
+		}
+
+		@Test // GH-3225
+		public void resolvesWildcardOnRoot() {
+
+			List<IndexDefinitionHolder> indices = prepareMappingContextAndResolveIndexForType(
+					WithWildCardIndexOnEntity.class);
+			assertThat(indices).hasSize(1);
+			assertThat(indices.get(0)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("$**", 1);
+				assertThat(it.getIndexOptions()).isEmpty();
+			});
+		}
+
+		@Test // GH-3225
+		public void resolvesWildcardWithProjectionOnRoot() {
+
+			List<IndexDefinitionHolder> indices = prepareMappingContextAndResolveIndexForType(
+					WithWildCardIndexHavingProjectionOnEntity.class);
+			assertThat(indices).hasSize(1);
+			assertThat(indices.get(0)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("$**", 1);
+				assertThat(it.getIndexOptions()).containsEntry("wildcardProjection",
+						org.bson.Document.parse("{'_id' : 1, 'value' : 0}"));
+			});
+		}
+
+		@Test // GH-3225
+		public void resolvesWildcardOnProperty() {
+
+			List<IndexDefinitionHolder> indices = prepareMappingContextAndResolveIndexForType(
+					WithWildCardIndexOnProperty.class);
+			assertThat(indices).hasSize(3);
+			assertThat(indices.get(0)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("value.$**", 1);
+			});
+			assertThat(indices.get(1)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("the_field.$**", 1);
+			});
+			assertThat(indices.get(2)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("withOptions.$**", 1);
+				assertThat(it.getIndexOptions()).containsEntry("name", "withOptions.idx")
+						.containsEntry("collation", new org.bson.Document("locale", "en_US"))
+						.containsEntry("partialFilterExpression", new org.bson.Document("$eq", 1));
+			});
+		}
+
+		@Test // GH-3225
+		public void resolvesWildcardTypeOfNestedProperty() {
+
+			List<IndexDefinitionHolder> indices = prepareMappingContextAndResolveIndexForType(
+					WithWildCardOnEntityOfNested.class);
+			assertThat(indices).hasSize(1);
+			assertThat(indices.get(0)).satisfies(it -> {
+				assertThat(it.getIndexKeys()).containsEntry("value.$**", 1);
+				assertThat(it.getIndexOptions()).hasSize(1).containsKey("name");
+			});
+		}
+
+		@Test // GH-3225
+		public void rejectsWildcardProjectionOnNestedPaths() {
+
+			assertThatExceptionOfType(MappingException.class).isThrownBy(() -> {
+				prepareMappingContextAndResolveIndexForType(WildcardIndexedProjectionOnNestedPath.class);
+			});
+		}
+
+		@Test // GH-3914
+		public void shouldSkipMapStructuresUnlessAnnotatedWithWildcardIndex() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WithMapStructures.class);
+
+			assertThat(indexDefinitions).hasSize(1);
+		}
+
+		@Test // GH-3002
+		public void indexedWithCollation() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WithCollationFromIndexedAnnotation.class);
+
+			IndexDefinition indexDefinition = indexDefinitions.get(0).getIndexDefinition();
+			assertThat(indexDefinition.getIndexOptions())
+					.isEqualTo(new org.bson.Document().append("name", "value").append("unique", true).append("collation",
+							new org.bson.Document().append("locale", "en_US").append("strength", 2)));
+		}
+
+		@Test // GH-3002
+		public void indexedWithCollationFromDocumentAnnotation() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WithCollationFromDocumentAnnotation.class);
+
+			IndexDefinition indexDefinition = indexDefinitions.get(0).getIndexDefinition();
+			assertThat(indexDefinition.getIndexOptions())
+					.isEqualTo(new org.bson.Document().append("name", "value").append("unique", true).append("collation",
+							new org.bson.Document().append("locale", "en_US").append("strength", 2)));
+		}
+
+		@Test // GH-3002
+		public void indexedWithEvaluatedCollation() {
+
+			List<IndexDefinitionHolder> indexDefinitions = prepareMappingContextAndResolveIndexForType(
+					WithEvaluatedCollationFromIndexedAnnotation.class);
+
+			IndexDefinition indexDefinition = indexDefinitions.get(0).getIndexDefinition();
+			assertThat(indexDefinition.getIndexOptions()).isEqualTo(new org.bson.Document().append("name", "value")
+					.append("collation", new org.bson.Document().append("locale", "de_AT")));
+		}
+
 		@Document
-		static class MixedIndexRoot {
+		class MixedIndexRoot {
 
 			@Indexed String first;
 			NestedGeoIndex nestedGeo;
 		}
 
-		static class NestedGeoIndex {
+		class NestedGeoIndex {
 
 			@GeoSpatialIndexed Point location;
 		}
 
 		@Document
-		static class Outer {
+		class Outer {
 
 			@DBRef Inner inner;
 		}
 
 		@Document
-		static class Inner {
+		class Inner {
 
 			@Indexed Outer outer;
 		}
 
 		@Document
-		static class CycleLevelZero {
+		class CycleLevelZero {
 
 			@Indexed String indexedProperty;
 			CycleLevelZero cyclicReference;
 		}
 
 		@Document
-		static class CycleOnLevelOne {
+		class CycleOnLevelOne {
 
 			CycleOnLevelOneReferenced reference;
 		}
 
-		static class CycleOnLevelOneReferenced {
+		class CycleOnLevelOneReferenced {
 
 			@Indexed String indexedProperty;
 			CycleOnLevelOne cyclicReference;
 		}
 
 		@Document
-		public static class CycleStartingInBetween {
+		static class CycleStartingInBetween {
 
 			CycleOnLevelOne referenceToCycleStart;
 		}
 
 		@Document
-		static class NoCycleButIdenticallyNamedProperties {
+		class NoCycleButIdenticallyNamedProperties {
 
 			@Indexed String foo;
 			NoCycleButIdenticallyNamedPropertiesNested reference;
 		}
 
-		static class NoCycleButIdenticallyNamedPropertiesNested {
+		class NoCycleButIdenticallyNamedPropertiesNested {
 
 			@Indexed String foo;
 			NoCycleButIndenticallNamedPropertiesDeeplyNested deep;
 		}
 
-		static class NoCycleButIndenticallNamedPropertiesDeeplyNested {
+		class NoCycleButIndenticallNamedPropertiesDeeplyNested {
 
 			@Indexed String foo;
 		}
 
 		@Document("rules")
-		static class NoCycleManyPathsToDeepValueObject {
+		class NoCycleManyPathsToDeepValueObject {
 
 			private NoCycleLevel3 l3;
 			private NoCycleLevel2 l2;
 		}
 
-		static class NoCycleLevel2 {
+		class NoCycleLevel2 {
 			private NoCycleLevel3 l3;
 		}
 
-		static class NoCycleLevel3 {
+		class NoCycleLevel3 {
 			private ValueObject valueObject;
 		}
 
-		static class ValueObject {
+		class ValueObject {
 			@Indexed private String value;
 		}
 
 		@Document
-		static class SimilarityHolingBean {
+		class SimilarityHolingBean {
 
-			@Indexed @Field("norm") String normalProperty;
+			@Indexed
+			@Field("norm") String normalProperty;
 			@Field("similarityL") private List<SimilaritySibling> listOfSimilarilyNamedEntities = null;
 		}
 
-		static class SimilaritySibling {
+		class SimilaritySibling {
 			@Field("similarity") private String similarThoughNotEqualNamedProperty;
 		}
 
 		@Document
-		static class MultipleObjectsOfSameType {
+		class MultipleObjectsOfSameType {
 
 			SelfCyclingViaCollectionType cycleOne;
 
@@ -1352,7 +1608,7 @@ static class MultipleObjectsOfSameType {
 		}
 
 		@Document
-		static class SelfCyclingViaCollectionType {
+		class SelfCyclingViaCollectionType {
 
 			List<SelfCyclingViaCollectionType> cyclic;
 
@@ -1360,55 +1616,55 @@ static class SelfCyclingViaCollectionType {
 
 		@Document
 		@CompoundIndex(name = "c_index", def = "{ foo:1, bar:1 }")
-		static class DocumentWithNamedCompoundIndex {
+		class DocumentWithNamedCompoundIndex {
 
 			String property;
 		}
 
 		@Document
-		static class DocumentWithNamedIndex {
+		class DocumentWithNamedIndex {
 
 			@Indexed(name = "property_index") String property;
 		}
 
-		static class TypeWithNamedIndex {
+		class TypeWithNamedIndex {
 
 			@Indexed(name = "property_index") String property;
 		}
 
 		@Document
-		static class DocumentWithNestedDocumentHavingNamedCompoundIndex {
+		class DocumentWithNestedDocumentHavingNamedCompoundIndex {
 
 			DocumentWithNamedCompoundIndex propertyOfTypeHavingNamedCompoundIndex;
 		}
 
 		@CompoundIndex(name = "c_index", def = "{ foo:1, bar:1 }")
-		static class TypeWithNamedCompoundIndex {
+		class TypeWithNamedCompoundIndex {
 			String property;
 		}
 
 		@Document
-		static class DocumentWithNestedTypeHavingNamedCompoundIndex {
+		class DocumentWithNestedTypeHavingNamedCompoundIndex {
 
 			TypeWithNamedCompoundIndex propertyOfTypeHavingNamedCompoundIndex;
 		}
 
 		@Document
-		static class DocumentWithNestedDocumentHavingNamedIndex {
+		class DocumentWithNestedDocumentHavingNamedIndex {
 
 			DocumentWithNamedIndex propertyOfTypeHavingNamedIndex;
 		}
 
 		@Document
-		static class DocumentWithNestedTypeHavingNamedIndex {
+		class DocumentWithNestedTypeHavingNamedIndex {
 
 			TypeWithNamedIndex propertyOfTypeHavingNamedIndex;
 		}
 
 		@Document
-		public class MultiplePropertiesOfSameTypeWithMatchingStartLetters {
+		class MultiplePropertiesOfSameTypeWithMatchingStartLetters {
 
-			public class NameComponent {
+			class NameComponent {
 
 				@Indexed String component;
 			}
@@ -1418,9 +1674,9 @@ public class NameComponent {
 		}
 
 		@Document
-		public class MultiplePropertiesOfSameTypeWithMatchingStartLettersOnNestedProperty {
+		class MultiplePropertiesOfSameTypeWithMatchingStartLettersOnNestedProperty {
 
-			public class NameComponent {
+			class NameComponent {
 
 				@Indexed String nameLast;
 				@Indexed String name;
@@ -1430,39 +1686,128 @@ public class NameComponent {
 		}
 
 		@Document
-		public static class OuterDocumentReferingToIndexedPropertyViaDifferentNonCyclingPaths {
+		static class OuterDocumentReferingToIndexedPropertyViaDifferentNonCyclingPaths {
 
 			NoCycleButIndenticallNamedPropertiesDeeplyNested path1;
 			AlternatePathToNoCycleButIndenticallNamedPropertiesDeeplyNestedDocument path2;
 		}
 
-		public static class AlternatePathToNoCycleButIndenticallNamedPropertiesDeeplyNestedDocument {
+		@Document
+		static class WrapperAroundWithUnwrapped {
+
+			String id;
+			WithUnwrapped withEmbedded;
+		}
+
+		@Document
+		static class WithUnwrapped {
+
+			String id;
+
+			@Unwrapped.Nullable UnwrappableType unwrappableType;
+		}
+
+		@Document
+		class InvalidIndexOnUnwrapped {
+
+			@Indexed //
+			@Unwrapped.Nullable //
+			UnwrappableType unwrappableType;
+
+		}
+
+		static class UnwrappableType {
+
+			@Indexed String stringValue;
+
+			List<String> listValue;
+
+			@Indexed //
+			@Field("with-at-field-annotation") //
+			String atFieldAnnotatedValue;
+		}
+
+		static class AlternatePathToNoCycleButIndenticallNamedPropertiesDeeplyNestedDocument {
 			NoCycleButIndenticallNamedPropertiesDeeplyNested propertyWithIndexedStructure;
 		}
 
-		static class GenericEntityWrapper<T> {
+		class GenericEntityWrapper<T> {
 			T entity;
 		}
 
 		@Document
-		static class EntityWithGenericTypeWrapperAsElement {
+		class WithMapStructures {
+			Map<String, ValueObject> rootMap;
+			NestedInMapWithStructures nested;
+			ValueObject plainValue;
+		}
+
+		class NestedInMapWithStructures {
+			Map<String, ValueObject> nestedMap;
+		}
+
+		@Document
+		class EntityWithGenericTypeWrapperAsElement {
 			List<GenericEntityWrapper<DocumentWithNamedIndex>> listWithGeneircTypeElement;
 		}
 
 		@Document
-		static class WithHashedIndexOnId {
+		class WithHashedIndexOnId {
 
-			@HashIndexed @Id String id;
+			@HashIndexed
+			@Id String id;
 		}
 
 		@Document
-		static class WithHashedIndex {
+		class WithHashedIndex {
 
 			@HashIndexed String value;
 		}
 
 		@Document
-		static class WithHashedIndexAndIndex {
+		@WildcardIndexed
+		class WithWildCardIndexOnEntity {
+
+			String value;
+		}
+
+		@Document
+		@WildcardIndexed(wildcardProjection = "{'_id' : 1, 'value' : 0}")
+		class WithWildCardIndexHavingProjectionOnEntity {
+
+			String value;
+		}
+
+		@Document
+		class WithWildCardIndexOnProperty {
+
+			@WildcardIndexed //
+			Map<String, String> value;
+
+			@WildcardIndexed //
+			@Field("the_field") //
+			Map<String, String> renamedField;
+
+			@WildcardIndexed(name = "idx", partialFilter = "{ '$eq' : 1 }", collation = "en_US") //
+			Map<String, String> withOptions;
+
+		}
+
+		@Document
+		class WildcardIndexedProjectionOnNestedPath {
+
+			@WildcardIndexed(wildcardProjection = "{}") String foo;
+		}
+
+		@Document
+		class WithWildCardOnEntityOfNested {
+
+			WithWildCardIndexHavingProjectionOnEntity value;
+
+		}
+
+		@Document
+		class WithHashedIndexAndIndex {
 
 			@Indexed //
 			@HashIndexed //
@@ -1470,11 +1815,32 @@ static class WithHashedIndexAndIndex {
 		}
 
 		@Document
-		static class WithComposedHashedIndexAndIndex {
+		class WithComposedHashedIndexAndIndex {
 
 			@ComposedHashIndexed(name = "idx-name") String value;
 		}
 
+		@Document
+		class WithCollationFromIndexedAnnotation {
+
+			@Indexed(collation = "{'locale': 'en_US', 'strength': 2}", unique = true) //
+			private String value;
+		}
+
+		@Document(collation = "{'locale': 'en_US', 'strength': 2}")
+		class WithCollationFromDocumentAnnotation {
+
+			@Indexed(unique = true) //
+			private String value;
+		}
+
+		@Document(collation = "en_US")
+		class WithEvaluatedCollationFromIndexedAnnotation {
+
+			@Indexed(collation = "#{{'locale' :  'de' + '_' + 'AT'}}") //
+			private String value;
+		}
+
 		@HashIndexed
 		@Indexed
 		@Retention(RetentionPolicy.RUNTIME)
@@ -1485,17 +1851,17 @@ static class WithComposedHashedIndexAndIndex {
 		}
 	}
 
-	private static List<IndexDefinitionHolder> prepareMappingContextAndResolveIndexForType(Class<?> type) {
+	private static List<IndexDefinitionHolder> prepareMappingContextAndResolveIndexForType(Class<?>... types) {
 
-		MongoMappingContext mappingContext = prepareMappingContext(type);
+		MongoMappingContext mappingContext = prepareMappingContext(types);
 		MongoPersistentEntityIndexResolver resolver = new MongoPersistentEntityIndexResolver(mappingContext);
-		return resolver.resolveIndexForEntity(mappingContext.getRequiredPersistentEntity(type));
+		return resolver.resolveIndexForEntity(mappingContext.getRequiredPersistentEntity(types[0]));
 	}
 
-	private static MongoMappingContext prepareMappingContext(Class<?> type) {
+	private static MongoMappingContext prepareMappingContext(Class<?>... types) {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.setInitialEntitySet(Collections.singleton(type));
+		mappingContext.setInitialEntitySet(new LinkedHashSet<>(Arrays.asList(types)));
 		mappingContext.initialize();
 
 		return mappingContext;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/PathUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/PathUnitTests.java
index 6ed88814b3..d8f6b9b698 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/PathUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/PathUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java
index b236902165..4b4693ed75 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/ReactiveMongoPersistentEntityIndexCreatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,15 @@
 import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
@@ -47,26 +50,28 @@
  * Unit tests for {@link ReactiveMongoPersistentEntityIndexCreator}.
  *
  * @author Mark Paluch
+ * @author Mathieu Ouellet
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ReactiveMongoPersistentEntityIndexCreatorUnitTests {
 
-	ReactiveIndexOperations indexOperations;
+	private ReactiveIndexOperations indexOperations;
 
 	@Mock ReactiveMongoDatabaseFactory factory;
 	@Mock MongoDatabase db;
 	@Mock MongoCollection<org.bson.Document> collection;
 
-	ArgumentCaptor<org.bson.Document> keysCaptor;
-	ArgumentCaptor<IndexOptions> optionsCaptor;
-	ArgumentCaptor<String> collectionCaptor;
+	private ArgumentCaptor<org.bson.Document> keysCaptor;
+	private ArgumentCaptor<IndexOptions> optionsCaptor;
+	private ArgumentCaptor<String> collectionCaptor;
 
-	@Before
+	@BeforeEach
 	@SuppressWarnings("unchecked")
-	public void setUp() {
+	void setUp() {
 
 		when(factory.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
-		when(factory.getMongoDatabase()).thenReturn(db);
+		when(factory.getMongoDatabase()).thenReturn(Mono.just(db));
 		when(db.getCollection(any(), any(Class.class))).thenReturn(collection);
 
 		indexOperations = new ReactiveMongoTemplate(factory).indexOps("foo");
@@ -79,13 +84,13 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1928
-	public void buildsIndexDefinitionUsingFieldName() {
+	void buildsIndexDefinitionUsingFieldName() {
 
 		MongoMappingContext mappingContext = prepareMappingContext(Person.class);
 
 		Mono<Void> publisher = checkForIndexes(mappingContext);
 
-		verifyZeroInteractions(collection);
+		verifyNoInteractions(collection);
 
 		publisher.as(StepVerifier::create).verifyComplete();
 
@@ -96,7 +101,7 @@ public void buildsIndexDefinitionUsingFieldName() {
 	}
 
 	@Test // DATAMONGO-1928
-	public void createIndexShouldUsePersistenceExceptionTranslatorForNonDataIntegrityConcerns() {
+	void createIndexShouldUsePersistenceExceptionTranslatorForNonDataIntegrityConcerns() {
 
 		when(collection.createIndex(any(org.bson.Document.class), any(IndexOptions.class)))
 				.thenReturn(Mono.error(new MongoException(6, "HostUnreachable")));
@@ -109,7 +114,7 @@ public void createIndexShouldUsePersistenceExceptionTranslatorForNonDataIntegrit
 	}
 
 	@Test // DATAMONGO-1928
-	public void createIndexShouldNotConvertUnknownExceptionTypes() {
+	void createIndexShouldNotConvertUnknownExceptionTypes() {
 
 		when(collection.createIndex(any(org.bson.Document.class), any(IndexOptions.class)))
 				.thenReturn(Mono.error(new ClassCastException("o_O")));
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/SampleEntity.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/SampleEntity.java
index a099c4cb08..e419a75012 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/SampleEntity.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/SampleEntity.java
@@ -6,9 +6,7 @@
 @Document
 public class SampleEntity {
 
-	@Id
-	String id;
+	@Id String id;
 
-	@Indexed
-	String prop;
+	@Indexed String prop;
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/SearchIndexInfoUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/SearchIndexInfoUnitTests.java
new file mode 100644
index 0000000000..1d7e5b63b6
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/SearchIndexInfoUnitTests.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * @author Christoph Strobl
+ */
+class SearchIndexInfoUnitTests {
+
+	@ParameterizedTest
+	@ValueSource(strings = { """
+			{
+			  "id": "679b7637a580c270015ef6fb",
+			  "name": "vector_index",
+			  "type": "vectorSearch",
+			  "status": "READY",
+			  "queryable": true,
+			  "latestVersion": 0,
+			  "latestDefinition": {
+			    "fields": [
+			      {
+			        "type": "vector",
+			        "path": "plot_embedding",
+			        "numDimensions": 1536,
+			        "similarity": "euclidean"
+			      }
+			    ]
+			  }
+			}""", """
+			{
+			  id: '648b4ad4d697b73bf9d2e5e1',
+			  name: 'search-index',
+			  status: 'PENDING',
+			  queryable: false,
+			  latestDefinition: {
+			    mappings: { dynamic: false, fields: { text: { type: 'string' } } }
+			  }
+			}""", """
+			{
+			  name: 'search-index-not-yet-created',
+			  definition: {
+			    mappings: { dynamic: false, fields: { text: { type: 'string' } } }
+			  }
+			}""", """
+			{
+			  name: 'vector-index-with-filter',
+			  type: "vectorSearch",
+			  definition: {
+			    fields: [
+			      {
+			        type: "vector",
+			        path: "plot_embedding",
+			        numDimensions: 1536,
+			        similarity: "euclidean"
+			      }, {
+			        type: "filter",
+			        path: "year"
+			      }
+			    ]
+			  }
+			}""" })
+	void parsesIndexInfo(String indexInfoSource) {
+
+		SearchIndexInfo indexInfo = SearchIndexInfo.parse(indexInfoSource);
+
+		if (indexInfo.getId() != null) {
+			assertThat(indexInfo.getId()).isInstanceOf(String.class);
+		}
+		assertThat(indexInfo.getStatus()).isNotNull();
+		assertThat(indexInfo.getIndexDefinition()).isNotNull();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/TextIndexTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/TextIndexTests.java
index e0ffc0b893..aa37b8bced 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/TextIndexTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/TextIndexTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,41 +19,37 @@
 
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.config.AbstractIntegrationTests;
 import org.springframework.data.mongodb.core.CollectionOptions;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.mapping.Language;
 import org.springframework.data.mongodb.core.query.Collation;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
-
-import com.mongodb.WriteConcern;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class TextIndexTests extends AbstractIntegrationTests {
+@ExtendWith(MongoTemplateExtension.class)
+public class TextIndexTests {
 
-	public static @ClassRule MongoVersionRule version = MongoVersionRule.atLeast(new Version(2, 6));
+	@Template(initialEntitySet = TextIndexedDocumentRoot.class)
+	static MongoTestTemplate template;
 
-	private @Autowired MongoTemplate template;
 	private IndexOperations indexOps;
 
-	@Before
-	public void setUp() throws Exception {
+	@BeforeEach
+	public void beforeEach() throws Exception {
 
-		template.setWriteConcern(WriteConcern.JOURNALED);
 		this.indexOps = template.indexOps(TextIndexedDocumentRoot.class);
 
-		template.dropCollection(TextIndexedDocumentRoot.class);
+		template.dropDatabase();
+
 		template.createCollection(TextIndexedDocumentRoot.class,
 				CollectionOptions.empty().collation(Collation.of("de_AT")));
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/VectorIndexIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/VectorIndexIntegrationTests.java
new file mode 100644
index 0000000000..387f075cb5
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/index/VectorIndexIntegrationTests.java
@@ -0,0 +1,222 @@
+/*
+ * Copyright 2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.mongodb.core.index;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.awaitility.Awaitility.*;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
+
+import java.util.List;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+import org.springframework.data.annotation.Id;
+import org.springframework.data.mongodb.core.index.VectorIndex.SimilarityFunction;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.test.util.AtlasContainer;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.MongoTestUtils;
+
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.client.AggregateIterable;
+
+/**
+ * Integration tests for vector index creation.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+@Testcontainers(disabledWithoutDocker = true)
+class VectorIndexIntegrationTests {
+
+	private static final @Container AtlasContainer atlasLocal = AtlasContainer.bestMatch();
+
+	MongoTestTemplate template = new MongoTestTemplate(cfg -> {
+		cfg.configureDatabaseFactory(ctx -> {
+			ctx.client(MongoTestUtils.client(new ConnectionString(atlasLocal.getConnectionString())));
+		});
+		cfg.configureMappingContext(ctx -> {
+			ctx.initialEntitySet(Movie.class);
+		});
+	});
+
+	SearchIndexOperations indexOps;
+
+	@BeforeEach
+	void init() {
+		template.createCollection(Movie.class);
+		indexOps = template.searchIndexOps(Movie.class);
+	}
+
+	@AfterEach
+	void cleanup() {
+
+		template.searchIndexOps(Movie.class).dropAllIndexes();
+		template.dropCollection(Movie.class);
+	}
+
+	@ParameterizedTest // GH-4706
+	@ValueSource(strings = { "euclidean", "cosine", "dotProduct" })
+	void createsSimpleVectorIndex(String similarityFunction) {
+
+		VectorIndex idx = new VectorIndex("vector_index").addVector("plotEmbedding",
+				builder -> builder.dimensions(1536).similarity(similarityFunction));
+
+		indexOps.createIndex(idx);
+
+		await().untilAsserted(() -> {
+			Document raw = readRawIndexInfo(idx.getName());
+			assertThat(raw).containsEntry("name", idx.getName()) //
+					.containsEntry("type", "vectorSearch") //
+					.containsEntry("latestDefinition.fields.[0].type", "vector") //
+					.containsEntry("latestDefinition.fields.[0].path", "plot_embedding") //
+					.containsEntry("latestDefinition.fields.[0].numDimensions", 1536) //
+					.containsEntry("latestDefinition.fields.[0].similarity", similarityFunction); //
+		});
+	}
+
+	@Test // GH-4706
+	void dropIndex() {
+
+		VectorIndex idx = new VectorIndex("vector_index").addVector("plotEmbedding",
+				builder -> builder.dimensions(1536).similarity("cosine"));
+
+		indexOps.createIndex(idx);
+
+		template.awaitIndexCreation(Movie.class, idx.getName());
+
+		indexOps.dropIndex(idx.getName());
+
+		assertThat(readRawIndexInfo(idx.getName())).isNull();
+	}
+
+	@Test // GH-4706
+	void statusChanges() throws InterruptedException {
+
+		String indexName = "vector_index";
+		assertThat(indexOps.status(indexName)).isEqualTo(SearchIndexStatus.DOES_NOT_EXIST);
+
+		VectorIndex idx = new VectorIndex(indexName).addVector("plotEmbedding",
+				builder -> builder.dimensions(1536).similarity("cosine"));
+
+		indexOps.createIndex(idx);
+
+		// without synchronization, the container might crash.
+		Thread.sleep(500);
+
+		assertThat(indexOps.status(indexName)).isIn(SearchIndexStatus.PENDING, SearchIndexStatus.BUILDING,
+				SearchIndexStatus.READY);
+	}
+
+	@Test // GH-4706
+	void exists() throws InterruptedException {
+
+		String indexName = "vector_index";
+		assertThat(indexOps.exists(indexName)).isFalse();
+
+		VectorIndex idx = new VectorIndex(indexName).addVector("plotEmbedding",
+				builder -> builder.dimensions(1536).similarity("cosine"));
+
+		indexOps.createIndex(idx);
+
+		// without synchronization, the container might crash.
+		Thread.sleep(500);
+
+		assertThat(indexOps.exists(indexName)).isTrue();
+	}
+
+	@Test // GH-4706
+	void updatesVectorIndex() throws InterruptedException {
+
+		String indexName = "vector_index";
+		VectorIndex idx = new VectorIndex(indexName).addVector("plotEmbedding",
+				builder -> builder.dimensions(1536).similarity("cosine"));
+
+		indexOps.createIndex(idx);
+
+		// without synchronization, the container might crash.
+		Thread.sleep(500);
+
+		await().untilAsserted(() -> {
+			Document raw = readRawIndexInfo(idx.getName());
+			assertThat(raw).containsEntry("name", idx.getName()) //
+					.containsEntry("type", "vectorSearch") //
+					.containsEntry("latestDefinition.fields.[0].type", "vector") //
+					.containsEntry("latestDefinition.fields.[0].path", "plot_embedding") //
+					.containsEntry("latestDefinition.fields.[0].numDimensions", 1536) //
+					.containsEntry("latestDefinition.fields.[0].similarity", "cosine"); //
+		});
+
+		VectorIndex updatedIdx = new VectorIndex(indexName).addVector("plotEmbedding",
+				builder -> builder.dimensions(1536).similarity(SimilarityFunction.DOT_PRODUCT));
+
+		// updating vector index does currently not work, one needs to delete and recreat
+		assertThatRuntimeException().isThrownBy(() -> indexOps.updateIndex(updatedIdx));
+	}
+
+	@Test // GH-4706
+	void createsVectorIndexWithFilters() throws InterruptedException {
+
+		VectorIndex idx = new VectorIndex("vector_index")
+				.addVector("plotEmbedding", builder -> builder.dimensions(1536).cosine()).addFilter("description")
+				.addFilter("year");
+
+		indexOps.createIndex(idx);
+
+		// without synchronization, the container might crash.
+		Thread.sleep(500);
+
+		await().untilAsserted(() -> {
+			Document raw = readRawIndexInfo(idx.getName());
+			assertThat(raw).containsEntry("name", idx.getName()) //
+					.containsEntry("type", "vectorSearch") //
+					.containsEntry("latestDefinition.fields.[0].type", "vector") //
+					.containsEntry("latestDefinition.fields.[1].type", "filter") //
+					.containsEntry("latestDefinition.fields.[1].path", "plot") //
+					.containsEntry("latestDefinition.fields.[2].type", "filter") //
+					.containsEntry("latestDefinition.fields.[2].path", "year"); //
+		});
+	}
+
+	private @Nullable Document readRawIndexInfo(String name) {
+
+		AggregateIterable<Document> indexes = template.execute(Movie.class, collection -> {
+			return collection.aggregate(List.of(new Document("$listSearchIndexes", new Document("name", name))));
+		});
+
+		return indexes.first();
+	}
+
+	static class Movie {
+
+		@Id String id;
+		String title;
+
+		@Field("plot") String description;
+		int year;
+
+		@Field("plot_embedding") Double[] plotEmbedding;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Account.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Account.java
index 8d94b834d4..d9d59c081b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Account.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Account.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/AccountPojo.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/AccountPojo.java
index b5574d0f97..e50bffc1fc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/AccountPojo.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/AccountPojo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Address.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Address.java
index 27a5889498..ed7ba975ff 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Address.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,8 +20,7 @@
  */
 public class Address implements Comparable<Address> {
 
-	@SuppressWarnings("unused")
-	private String id;
+	@SuppressWarnings("unused") private String id;
 	private String[] lines;
 	private String city;
 	private String provinceOrState;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasePerson.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasePerson.java
index c7d5bae3fe..3f3a326873 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasePerson.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasePerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 
 /**
  * {@link QuerySupertype} is necessary for Querydsl 2.2.0-beta4 to compile the query classes directly. Can be removed as
- * soon as <a href="https://bugs.launchpad.net/querydsl/+bug/776219">https://bugs.launchpad.net/querydsl/+bug/776219</a> is fixed.
+ * soon as <a href="https://bugs.launchpad.net/querydsl/+bug/776219">https://bugs.launchpad.net/querydsl/+bug/776219</a>
+ * is fixed.
  *
  * @see <a href="https://bugs.launchpad.net/querydsl/+bug/776219">https://bugs.launchpad.net/querydsl/+bug/776219</a>
  * @author Jon Brisbin
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java
index 1071d9fc7b..9a39042349 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentEntityUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,59 +22,65 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.SetSystemProperty;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.annotation.AliasFor;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.data.mapping.MappingException;
+import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.spel.ExtensionAwareEvaluationContextProvider;
 import org.springframework.data.spel.spi.EvaluationContextExtension;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.mock.env.MockEnvironment;
 
 /**
  * Unit tests for {@link BasicMongoPersistentEntity}.
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class BasicMongoPersistentEntityUnitTests {
 
 	@Mock ApplicationContext context;
 	@Mock MongoPersistentProperty propertyMock;
 
 	@Test
-	public void subclassInheritsAtDocumentAnnotation() {
+	void subclassInheritsAtDocumentAnnotation() {
 
-		BasicMongoPersistentEntity<Person> entity = new BasicMongoPersistentEntity<Person>(
-				ClassTypeInformation.from(Person.class));
+		BasicMongoPersistentEntity<Person> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(Person.class));
 		assertThat(entity.getCollection()).isEqualTo("contacts");
 	}
 
 	@Test
-	public void evaluatesSpELExpression() {
+	void evaluatesSpELExpression() {
 
-		MongoPersistentEntity<Company> entity = new BasicMongoPersistentEntity<Company>(
-				ClassTypeInformation.from(Company.class));
+		MongoPersistentEntity<Company> entity = new BasicMongoPersistentEntity<>(TypeInformation.of(Company.class));
 		assertThat(entity.getCollection()).isEqualTo("35");
 	}
 
 	@Test // DATAMONGO-65, DATAMONGO-1108
-	public void collectionAllowsReferencingSpringBean() {
+	void collectionAllowsReferencingSpringBean() {
 
 		CollectionProvider provider = new CollectionProvider();
 		provider.collectionName = "reference";
 
 		when(context.getBean("myBean")).thenReturn(provider);
 
-		BasicMongoPersistentEntity<DynamicallyMapped> entity = new BasicMongoPersistentEntity<DynamicallyMapped>(
-				ClassTypeInformation.from(DynamicallyMapped.class));
+		BasicMongoPersistentEntity<DynamicallyMapped> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(DynamicallyMapped.class));
 		entity.setEvaluationContextProvider(new ExtensionAwareEvaluationContextProvider(context));
 
 		assertThat(entity.getCollection()).isEqualTo("reference");
@@ -83,36 +89,49 @@ public void collectionAllowsReferencingSpringBean() {
 		assertThat(entity.getCollection()).isEqualTo("otherReference");
 	}
 
+	@Test // GH-2764
+	void collectionAllowsReferencingProperties() {
+
+		MockEnvironment environment = new MockEnvironment();
+		environment.setProperty("collectionName", "reference");
+
+		BasicMongoPersistentEntity<DynamicallyMappedUsingPropertyPlaceholder> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(DynamicallyMappedUsingPropertyPlaceholder.class));
+		entity.setEnvironment(environment);
+
+		assertThat(entity.getCollection()).isEqualTo("reference_cat");
+	}
+
 	@Test // DATAMONGO-937
-	public void shouldDetectLanguageCorrectly() {
+	void shouldDetectLanguageCorrectly() {
 
-		BasicMongoPersistentEntity<DocumentWithLanguage> entity = new BasicMongoPersistentEntity<DocumentWithLanguage>(
-				ClassTypeInformation.from(DocumentWithLanguage.class));
+		BasicMongoPersistentEntity<DocumentWithLanguage> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(DocumentWithLanguage.class));
 
 		assertThat(entity.getLanguage()).isEqualTo("spanish");
 	}
 
 	@Test // DATAMONGO-1053
-	public void verifyShouldThrowExceptionForInvalidTypeOfExplicitLanguageProperty() {
+	void verifyShouldThrowExceptionForInvalidTypeOfExplicitLanguageProperty() {
 
 		doReturn(true).when(propertyMock).isExplicitLanguageProperty();
 		doReturn(Number.class).when(propertyMock).getActualType();
 
-		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
-				ClassTypeInformation.from(AnyDocument.class));
+		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(AnyDocument.class));
 		entity.addPersistentProperty(propertyMock);
 
-		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> entity.verify());
+		assertThatExceptionOfType(MappingException.class).isThrownBy(entity::verify);
 	}
 
 	@Test // DATAMONGO-1053
-	public void verifyShouldPassForStringAsExplicitLanguageProperty() {
+	void verifyShouldPassForStringAsExplicitLanguageProperty() {
 
 		doReturn(true).when(propertyMock).isExplicitLanguageProperty();
 		doReturn(String.class).when(propertyMock).getActualType();
 
-		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
-				ClassTypeInformation.from(AnyDocument.class));
+		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(AnyDocument.class));
 		entity.addPersistentProperty(propertyMock);
 
 		entity.verify();
@@ -122,10 +141,10 @@ public void verifyShouldPassForStringAsExplicitLanguageProperty() {
 	}
 
 	@Test // DATAMONGO-1053
-	public void verifyShouldIgnoreNonExplicitLanguageProperty() {
+	void verifyShouldIgnoreNonExplicitLanguageProperty() {
 
-		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
-				ClassTypeInformation.from(AnyDocument.class));
+		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(AnyDocument.class));
 		when(propertyMock.isExplicitLanguageProperty()).thenReturn(false);
 		entity.addPersistentProperty(propertyMock);
 
@@ -136,7 +155,7 @@ public void verifyShouldIgnoreNonExplicitLanguageProperty() {
 	}
 
 	@Test // DATAMONGO-1157
-	public void verifyShouldThrowErrorForLazyDBRefOnFinalClass() {
+	void verifyShouldThrowErrorForLazyDBRefOnFinalClass() {
 
 		org.springframework.data.mongodb.core.mapping.DBRef dbRefMock = mock(
 				org.springframework.data.mongodb.core.mapping.DBRef.class);
@@ -146,15 +165,15 @@ public void verifyShouldThrowErrorForLazyDBRefOnFinalClass() {
 		doReturn(dbRefMock).when(propertyMock).getDBRef();
 		doReturn(true).when(dbRefMock).lazy();
 
-		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
-				ClassTypeInformation.from(AnyDocument.class));
+		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(AnyDocument.class));
 		entity.addPersistentProperty(propertyMock);
 
-		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> entity.verify());
+		assertThatExceptionOfType(MappingException.class).isThrownBy(entity::verify);
 	}
 
 	@Test // DATAMONGO-1157
-	public void verifyShouldThrowErrorForLazyDBRefArray() {
+	void verifyShouldThrowErrorForLazyDBRefArray() {
 
 		org.springframework.data.mongodb.core.mapping.DBRef dbRefMock = mock(
 				org.springframework.data.mongodb.core.mapping.DBRef.class);
@@ -164,15 +183,15 @@ public void verifyShouldThrowErrorForLazyDBRefArray() {
 		doReturn(dbRefMock).when(propertyMock).getDBRef();
 		doReturn(true).when(dbRefMock).lazy();
 
-		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
-				ClassTypeInformation.from(AnyDocument.class));
+		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(AnyDocument.class));
 		entity.addPersistentProperty(propertyMock);
 
-		assertThatExceptionOfType(MappingException.class).isThrownBy(() -> entity.verify());
+		assertThatExceptionOfType(MappingException.class).isThrownBy(entity::verify);
 	}
 
 	@Test // DATAMONGO-1157
-	public void verifyShouldPassForLazyDBRefOnNonArrayNonFinalClass() {
+	void verifyShouldPassForLazyDBRefOnNonArrayNonFinalClass() {
 
 		org.springframework.data.mongodb.core.mapping.DBRef dbRefMock = mock(
 				org.springframework.data.mongodb.core.mapping.DBRef.class);
@@ -182,8 +201,8 @@ public void verifyShouldPassForLazyDBRefOnNonArrayNonFinalClass() {
 		doReturn(dbRefMock).when(propertyMock).getDBRef();
 		doReturn(true).when(dbRefMock).lazy();
 
-		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
-				ClassTypeInformation.from(AnyDocument.class));
+		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(AnyDocument.class));
 		entity.addPersistentProperty(propertyMock);
 		entity.verify();
 
@@ -191,7 +210,7 @@ public void verifyShouldPassForLazyDBRefOnNonArrayNonFinalClass() {
 	}
 
 	@Test // DATAMONGO-1157
-	public void verifyShouldPassForNonLazyDBRefOnFinalClass() {
+	void verifyShouldPassForNonLazyDBRefOnFinalClass() {
 
 		org.springframework.data.mongodb.core.mapping.DBRef dbRefMock = mock(
 				org.springframework.data.mongodb.core.mapping.DBRef.class);
@@ -200,8 +219,8 @@ public void verifyShouldPassForNonLazyDBRefOnFinalClass() {
 		doReturn(dbRefMock).when(propertyMock).getDBRef();
 		doReturn(false).when(dbRefMock).lazy();
 
-		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<AnyDocument>(
-				ClassTypeInformation.from(AnyDocument.class));
+		BasicMongoPersistentEntity<AnyDocument> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(AnyDocument.class));
 		entity.addPersistentProperty(propertyMock);
 		entity.verify();
 
@@ -209,52 +228,107 @@ public void verifyShouldPassForNonLazyDBRefOnFinalClass() {
 	}
 
 	@Test // DATAMONGO-1291
-	public void metaInformationShouldBeReadCorrectlyFromInheritedDocumentAnnotation() {
+	void metaInformationShouldBeReadCorrectlyFromInheritedDocumentAnnotation() {
 
-		BasicMongoPersistentEntity<DocumentWithCustomAnnotation> entity = new BasicMongoPersistentEntity<DocumentWithCustomAnnotation>(
-				ClassTypeInformation.from(DocumentWithCustomAnnotation.class));
+		BasicMongoPersistentEntity<DocumentWithCustomAnnotation> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(DocumentWithCustomAnnotation.class));
 
 		assertThat(entity.getCollection()).isEqualTo("collection-1");
 	}
 
 	@Test // DATAMONGO-1373
-	public void metaInformationShouldBeReadCorrectlyFromComposedDocumentAnnotation() {
+	void metaInformationShouldBeReadCorrectlyFromComposedDocumentAnnotation() {
 
-		BasicMongoPersistentEntity<DocumentWithComposedAnnotation> entity = new BasicMongoPersistentEntity<DocumentWithComposedAnnotation>(
-				ClassTypeInformation.from(DocumentWithComposedAnnotation.class));
+		BasicMongoPersistentEntity<DocumentWithComposedAnnotation> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(DocumentWithComposedAnnotation.class));
 
 		assertThat(entity.getCollection()).isEqualTo("custom-collection");
 	}
 
 	@Test // DATAMONGO-1874
-	public void usesEvaluationContextExtensionInDynamicDocumentName() {
+	void usesEvaluationContextExtensionInDynamicDocumentName() {
 
 		BasicMongoPersistentEntity<MappedWithExtension> entity = new BasicMongoPersistentEntity<>(
-				ClassTypeInformation.from(MappedWithExtension.class));
+				TypeInformation.of(MappedWithExtension.class));
 		entity.setEvaluationContextProvider(
-				new ExtensionAwareEvaluationContextProvider(Arrays.asList(new SampleExtension())));
+				new ExtensionAwareEvaluationContextProvider(Collections.singletonList(new SampleExtension())));
+
+		assertThat(entity.getCollection()).isEqualTo("collectionName");
+	}
+
+	@Test // GH-4634
+	@SetSystemProperty(key = "mongo.entity.collection", value = "collectionName")
+	void readsCollectionNameFromSystemProperty() {
+
+		BasicMongoPersistentEntity<MappedWithExtensionPropertyPlaceholderStyle> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(MappedWithExtensionPropertyPlaceholderStyle.class));
+		entity.setEnvironment(new StandardEnvironment());
 
 		assertThat(entity.getCollection()).isEqualTo("collectionName");
 	}
 
 	@Test // DATAMONGO-1854
-	public void readsSimpleCollation() {
+	void readsSimpleCollation() {
 
 		BasicMongoPersistentEntity<WithSimpleCollation> entity = new BasicMongoPersistentEntity<>(
-				ClassTypeInformation.from(WithSimpleCollation.class));
+				TypeInformation.of(WithSimpleCollation.class));
 
 		assertThat(entity.getCollation()).isEqualTo(org.springframework.data.mongodb.core.query.Collation.of("en_US"));
 	}
 
 	@Test // DATAMONGO-1854
-	public void readsDocumentCollation() {
+	void readsDocumentCollation() {
 
 		BasicMongoPersistentEntity<WithDocumentCollation> entity = new BasicMongoPersistentEntity<>(
-				ClassTypeInformation.from(WithDocumentCollation.class));
+				TypeInformation.of(WithDocumentCollation.class));
 
 		assertThat(entity.getCollation()).isEqualTo(org.springframework.data.mongodb.core.query.Collation.of("en_US"));
 	}
 
+	@Test // DATAMONGO-2565
+	void usesCorrectExpressionsForCollectionAndCollation() {
+
+		BasicMongoPersistentEntity<WithCollectionAndCollationFromSpEL> entity = new BasicMongoPersistentEntity<>(
+				TypeInformation.of(WithCollectionAndCollationFromSpEL.class));
+		entity.setEvaluationContextProvider(
+				new ExtensionAwareEvaluationContextProvider(Collections.singletonList(new SampleExtension())));
+
+		assertThat(entity.getCollection()).isEqualTo("collectionName");
+		assertThat(entity.getCollation()).isEqualTo(Collation.of("en_US"));
+	}
+
+	@Test // DATAMONGO-2341
+	void detectsShardedEntityCorrectly() {
+
+		assertThat(entityOf(WithDefaultShardKey.class).isSharded()).isTrue();
+		assertThat(entityOf(Contact.class).isSharded()).isFalse();
+	}
+
+	@Test // DATAMONGO-2341
+	void readsDefaultShardKey() {
+
+		assertThat(entityOf(WithDefaultShardKey.class).getShardKey().getDocument())
+				.isEqualTo(new org.bson.Document("_id", 1));
+	}
+
+	@Test // DATAMONGO-2341
+	void readsSingleShardKey() {
+
+		assertThat(entityOf(WithSingleShardKey.class).getShardKey().getDocument())
+				.isEqualTo(new org.bson.Document("country", 1));
+	}
+
+	@Test // DATAMONGO-2341
+	void readsMultiShardKey() {
+
+		assertThat(entityOf(WithMultiShardKey.class).getShardKey().getDocument())
+				.isEqualTo(new org.bson.Document("country", 1).append("userid", 1));
+	}
+
+	static <T> BasicMongoPersistentEntity<T> entityOf(Class<T> type) {
+		return new BasicMongoPersistentEntity<>(TypeInformation.of(type));
+	}
+
 	@Document("contacts")
 	class Contact {}
 
@@ -266,6 +340,9 @@ class Company {}
 	@Document("#{@myBean.collectionName}")
 	class DynamicallyMapped {}
 
+	@Document("${collectionName}_cat")
+	class DynamicallyMappedUsingPropertyPlaceholder {}
+
 	class CollectionProvider {
 		String collectionName;
 
@@ -277,13 +354,13 @@ public String getCollectionName() {
 	@Document(language = "spanish")
 	static class DocumentWithLanguage {}
 
-	static class AnyDocument {}
+	private static class AnyDocument {}
 
 	@CustomDocumentAnnotation
-	static class DocumentWithCustomAnnotation {}
+	private static class DocumentWithCustomAnnotation {}
 
 	@ComposedDocumentAnnotation
-	static class DocumentWithComposedAnnotation {}
+	private static class DocumentWithComposedAnnotation {}
 
 	@Retention(RetentionPolicy.RUNTIME)
 	@Target({ ElementType.TYPE })
@@ -304,30 +381,40 @@ static class DocumentWithComposedAnnotation {}
 	@Document("#{myProperty}")
 	class MappedWithExtension {}
 
+	@Document("${mongo.entity.collection}")
+	class MappedWithExtensionPropertyPlaceholderStyle {}
+
+	@Document("${value.from.file}")
+	class MappedWithValue {}
+
 	@Document(collation = "#{myCollation}")
 	class WithCollationFromSpEL {}
 
+	@Document(collection = "#{myProperty}", collation = "#{myCollation}")
+	class WithCollectionAndCollationFromSpEL {}
+
 	@Document(collation = "en_US")
 	class WithSimpleCollation {}
 
 	@Document(collation = "{ 'locale' : 'en_US' }")
 	class WithDocumentCollation {}
 
+	@Sharded
+	private class WithDefaultShardKey {}
+
+	@Sharded("country")
+	private class WithSingleShardKey {}
+
+	@Sharded({ "country", "userid" })
+	private class WithMultiShardKey {}
+
 	static class SampleExtension implements EvaluationContextExtension {
 
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.spel.spi.EvaluationContextExtension#getExtensionId()
-		 */
 		@Override
 		public String getExtensionId() {
 			return "sampleExtension";
 		}
 
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.spel.spi.EvaluationContextExtension#getProperties()
-		 */
 		@Override
 		public Map<String, Object> getProperties() {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java
index 72f4be2be3..1037ba4f19 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/BasicMongoPersistentPropertyUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,10 +26,11 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-
+import org.jmolecules.ddd.annotation.Identity;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mapping.MappingException;
@@ -38,7 +39,7 @@
 import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -47,25 +48,26 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Divya Srivastava
  */
 public class BasicMongoPersistentPropertyUnitTests {
 
-	MongoPersistentEntity<Person> entity;
+	private MongoPersistentEntity<Person> entity;
 
-	@Before
-	public void setup() {
-		entity = new BasicMongoPersistentEntity<Person>(ClassTypeInformation.from(Person.class));
+	@BeforeEach
+	void setup() {
+		entity = new BasicMongoPersistentEntity<>(TypeInformation.of(Person.class));
 	}
 
 	@Test
-	public void usesAnnotatedFieldName() {
+	void usesAnnotatedFieldName() {
 
 		Field field = ReflectionUtils.findField(Person.class, "firstname");
 		assertThat(getPropertyFor(field).getFieldName()).isEqualTo("foo");
 	}
 
 	@Test
-	public void returns_IdForIdProperty() {
+	void returns_IdForIdProperty() {
 		Field field = ReflectionUtils.findField(Person.class, "id");
 		MongoPersistentProperty property = getPropertyFor(field);
 		assertThat(property.isIdProperty()).isTrue();
@@ -73,31 +75,31 @@ public void returns_IdForIdProperty() {
 	}
 
 	@Test
-	public void returnsPropertyNameForUnannotatedProperties() {
+	void returnsPropertyNameForUnannotatedProperties() {
 
 		Field field = ReflectionUtils.findField(Person.class, "lastname");
 		assertThat(getPropertyFor(field).getFieldName()).isEqualTo("lastname");
 	}
 
 	@Test
-	public void preventsNegativeOrder() {
+	void preventsNegativeOrder() {
 		getPropertyFor(ReflectionUtils.findField(Person.class, "ssn"));
 	}
 
 	@Test // DATAMONGO-553
-	public void usesPropertyAccessForThrowableCause() {
+	void usesPropertyAccessForThrowableCause() {
 
 		BasicMongoPersistentEntity<Throwable> entity = new BasicMongoPersistentEntity<>(
-				ClassTypeInformation.from(Throwable.class));
+				TypeInformation.of(Throwable.class));
 		MongoPersistentProperty property = getPropertyFor(entity, "cause");
 
 		assertThat(property.usePropertyAccess()).isTrue();
 	}
 
 	@Test // DATAMONGO-607
-	public void usesCustomFieldNamingStrategyByDefault() throws Exception {
+	void usesCustomFieldNamingStrategyByDefault() throws Exception {
 
-		ClassTypeInformation<Person> type = ClassTypeInformation.from(Person.class);
+		TypeInformation<Person> type = TypeInformation.of(Person.class);
 		Field field = ReflectionUtils.findField(Person.class, "lastname");
 
 		MongoPersistentProperty property = new BasicMongoPersistentProperty(Property.of(type, field), entity,
@@ -112,9 +114,9 @@ public void usesCustomFieldNamingStrategyByDefault() throws Exception {
 	}
 
 	@Test // DATAMONGO-607
-	public void rejectsInvalidValueReturnedByFieldNamingStrategy() {
+	void rejectsInvalidValueReturnedByFieldNamingStrategy() {
 
-		ClassTypeInformation<Person> type = ClassTypeInformation.from(Person.class);
+		TypeInformation<Person> type = TypeInformation.of(Person.class);
 		Field field = ReflectionUtils.findField(Person.class, "lastname");
 
 		MongoPersistentProperty property = new BasicMongoPersistentProperty(Property.of(type, field), entity,
@@ -125,42 +127,42 @@ public void rejectsInvalidValueReturnedByFieldNamingStrategy() {
 	}
 
 	@Test // DATAMONGO-937
-	public void shouldDetectAnnotatedLanguagePropertyCorrectly() {
+	void shouldDetectAnnotatedLanguagePropertyCorrectly() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithLanguageProperty.class, "lang");
 		assertThat(property.isLanguageProperty()).isTrue();
 	}
 
 	@Test // DATAMONGO-937
-	public void shouldDetectImplicitLanguagePropertyCorrectly() {
+	void shouldDetectImplicitLanguagePropertyCorrectly() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithImplicitLanguageProperty.class, "language");
 		assertThat(property.isLanguageProperty()).isTrue();
 	}
 
 	@Test // DATAMONGO-976
-	public void shouldDetectTextScorePropertyCorrectly() {
+	void shouldDetectTextScorePropertyCorrectly() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithTextScoreProperty.class, "score");
 		assertThat(property.isTextScoreProperty()).isTrue();
 	}
 
 	@Test // DATAMONGO-976
-	public void shouldDetectTextScoreAsReadOnlyProperty() {
+	void shouldDetectTextScoreAsReadOnlyProperty() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithTextScoreProperty.class, "score");
 		assertThat(property.isWritable()).isFalse();
 	}
 
 	@Test // DATAMONGO-1050
-	public void shouldNotConsiderExplicitlyNameFieldAsIdProperty() {
+	void shouldNotConsiderExplicitlyNameFieldAsIdProperty() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithExplicitlyRenamedIdProperty.class, "id");
 		assertThat(property.isIdProperty()).isFalse();
 	}
 
 	@Test // DATAMONGO-1050
-	public void shouldConsiderPropertyAsIdWhenExplicitlyAnnotatedWithIdEvenWhenExplicitlyNamePresent() {
+	void shouldConsiderPropertyAsIdWhenExplicitlyAnnotatedWithIdEvenWhenExplicitlyNamePresent() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithExplicitlyRenamedIdPropertyHavingIdAnnotation.class,
 				"id");
@@ -168,7 +170,7 @@ public void shouldConsiderPropertyAsIdWhenExplicitlyAnnotatedWithIdEvenWhenExpli
 	}
 
 	@Test // DATAMONGO-1373
-	public void shouldConsiderComposedAnnotationsForIdField() {
+	void shouldConsiderComposedAnnotationsForIdField() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithComposedAnnotations.class, "myId");
 		assertThat(property.isIdProperty()).isTrue();
@@ -176,17 +178,17 @@ public void shouldConsiderComposedAnnotationsForIdField() {
 	}
 
 	@Test // DATAMONGO-1373
-	public void shouldConsiderComposedAnnotationsForFields() {
+	void shouldConsiderComposedAnnotationsForFields() {
 
 		MongoPersistentProperty property = getPropertyFor(DocumentWithComposedAnnotations.class, "myField");
 		assertThat(property.getFieldName()).isEqualTo("myField");
 	}
 
 	@Test // DATAMONGO-1737
-	public void honorsFieldOrderWhenIteratingOverProperties() {
+	void honorsFieldOrderWhenIteratingOverProperties() {
 
 		MongoMappingContext context = new MongoMappingContext();
-		BasicMongoPersistentEntity<?> entity = context.getPersistentEntity(Sample.class);
+		MongoPersistentEntity<?> entity = context.getPersistentEntity(Sample.class);
 
 		List<String> properties = new ArrayList<>();
 
@@ -195,40 +197,65 @@ public void honorsFieldOrderWhenIteratingOverProperties() {
 		assertThat(properties).containsExactly("first", "second", "third");
 	}
 
+	@Test // GH-3407
+	void shouldDetectWritability() {
+
+		assertThat(getPropertyFor(WithFieldWrite.class, "fieldWithDefaults").writeNullValues()).isFalse();
+		assertThat(getPropertyFor(WithFieldWrite.class, "fieldWithField").writeNullValues()).isFalse();
+		assertThat(getPropertyFor(WithFieldWrite.class, "writeNonNull").writeNullValues()).isFalse();
+		assertThat(getPropertyFor(WithFieldWrite.class, "writeAlways").writeNullValues()).isTrue();
+	}
+
 	@Test // DATAMONGO-1798
-	public void fieldTypeShouldReturnActualTypeForNonIdProperties() {
+	void fieldTypeShouldReturnActualTypeForNonIdProperties() {
 
 		MongoPersistentProperty property = getPropertyFor(Person.class, "lastname");
 		assertThat(property.getFieldType()).isEqualTo(String.class);
 	}
 
 	@Test // DATAMONGO-1798
-	public void fieldTypeShouldBeObjectIdForPropertiesAnnotatedWithCommonsId() {
+	void fieldTypeShouldBeObjectIdForPropertiesAnnotatedWithCommonsId() {
 
 		MongoPersistentProperty property = getPropertyFor(Person.class, "id");
 		assertThat(property.getFieldType()).isEqualTo(ObjectId.class);
 	}
 
 	@Test // DATAMONGO-1798
-	public void fieldTypeShouldBeImplicitForPropertiesAnnotatedWithMongoId() {
+	void fieldTypeShouldBeImplicitForPropertiesAnnotatedWithMongoId() {
 
 		MongoPersistentProperty property = getPropertyFor(WithStringMongoId.class, "id");
 		assertThat(property.getFieldType()).isEqualTo(String.class);
 	}
 
 	@Test // DATAMONGO-1798
-	public void fieldTypeShouldBeObjectIdForPropertiesAnnotatedWithMongoIdAndTargetTypeObjectId() {
+	void fieldTypeShouldBeObjectIdForPropertiesAnnotatedWithMongoIdAndTargetTypeObjectId() {
 
 		MongoPersistentProperty property = getPropertyFor(WithStringMongoIdMappedToObjectId.class, "id");
 		assertThat(property.getFieldType()).isEqualTo(ObjectId.class);
 	}
 
+	@Test // DATAMONGO-2460
+	void fieldTypeShouldBeDocumentForPropertiesAnnotatedIdWhenAComplexTypeAndFieldTypeImplicit() {
+
+		MongoPersistentProperty property = getPropertyFor(WithComplexId.class, "id");
+		assertThat(property.getFieldType()).isEqualTo(Document.class);
+	}
+
+	@Test // GH-3803
+	void considersJMoleculesIdentityExplicitlyAnnotatedIdentifier() {
+
+		MongoPersistentProperty property = getPropertyFor(WithJMoleculesIdentity.class, "identifier");
+
+		assertThat(property.isIdProperty()).isTrue();
+		assertThat(property.isExplicitIdProperty()).isTrue();
+	}
+
 	private MongoPersistentProperty getPropertyFor(Field field) {
 		return getPropertyFor(entity, field);
 	}
 
 	private static <T> MongoPersistentProperty getPropertyFor(Class<T> type, String fieldname) {
-		return getPropertyFor(new BasicMongoPersistentEntity<T>(ClassTypeInformation.from(type)), fieldname);
+		return getPropertyFor(new BasicMongoPersistentEntity<>(TypeInformation.of(type)), fieldname);
 	}
 
 	private static MongoPersistentProperty getPropertyFor(MongoPersistentEntity<?> entity, String fieldname) {
@@ -236,8 +263,12 @@ private static MongoPersistentProperty getPropertyFor(MongoPersistentEntity<?> e
 	}
 
 	private static MongoPersistentProperty getPropertyFor(MongoPersistentEntity<?> entity, Field field) {
-		return new BasicMongoPersistentProperty(Property.of(entity.getTypeInformation(), field), entity,
-				SimpleTypeHolder.DEFAULT, PropertyNameFieldNamingStrategy.INSTANCE);
+		BasicMongoPersistentProperty property = new BasicMongoPersistentProperty(
+				Property.of(entity.getTypeInformation(), field), entity, SimpleTypeHolder.DEFAULT,
+				PropertyNameFieldNamingStrategy.INSTANCE);
+
+		entity.addPersistentProperty(property);
+		return property;
 	}
 
 	class Person {
@@ -289,6 +320,18 @@ static class DocumentWithTextScoreProperty {
 		@TextScore Float score;
 	}
 
+	static class WithFieldWrite {
+
+		int fieldWithDefaults;
+		@org.springframework.data.mongodb.core.mapping.Field int fieldWithField;
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.NON_NULL) Integer writeNonNull;
+
+		@org.springframework.data.mongodb.core.mapping.Field(
+				write = org.springframework.data.mongodb.core.mapping.Field.Write.ALWAYS) Integer writeAlways;
+
+	}
+
 	static class DocumentWithExplicitlyRenamedIdProperty {
 
 		@org.springframework.data.mongodb.core.mapping.Field("id") String id;
@@ -296,12 +339,14 @@ static class DocumentWithExplicitlyRenamedIdProperty {
 
 	static class DocumentWithExplicitlyRenamedIdPropertyHavingIdAnnotation {
 
-		@Id @org.springframework.data.mongodb.core.mapping.Field("id") String id;
+		@Id
+		@org.springframework.data.mongodb.core.mapping.Field("id") String id;
 	}
 
 	static class DocumentWithComposedAnnotations {
 
-		@ComposedIdAnnotation @ComposedFieldAnnotation String myId;
+		@ComposedIdAnnotation
+		@ComposedFieldAnnotation String myId;
 		@ComposedFieldAnnotation(name = "myField") String myField;
 	}
 
@@ -329,4 +374,19 @@ static class WithStringMongoIdMappedToObjectId {
 
 		@MongoId(FieldType.OBJECT_ID) String id;
 	}
+
+	static class ComplexId {
+
+		String value;
+	}
+
+	static class WithComplexId {
+
+		@Id
+		@org.springframework.data.mongodb.core.mapping.Field ComplexId id;
+	}
+
+	static class WithJMoleculesIdentity {
+		@Identity ObjectId identifier;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/CustomCollectionWithIndex.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/CustomCollectionWithIndex.java
index 1eab700876..44727cd81a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/CustomCollectionWithIndex.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/CustomCollectionWithIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,10 +24,8 @@
 @Document("foobar")
 public class CustomCollectionWithIndex {
 
-	@Id
-	private String id;
-	@Indexed
-	private String name;
+	@Id private String id;
+	@Indexed private String name;
 
 	public CustomCollectionWithIndex(String name) {
 		this.name = name;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/DetectedCollectionWithIndex.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/DetectedCollectionWithIndex.java
index 7f34cec888..1eb2628c75 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/DetectedCollectionWithIndex.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/DetectedCollectionWithIndex.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,10 +24,8 @@
 @Document
 public class DetectedCollectionWithIndex {
 
-	@Id
-	private String id;
-	@Indexed
-	private String name;
+	@Id private String id;
+	@Indexed private String name;
 
 	public DetectedCollectionWithIndex(String name) {
 		this.name = name;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeneratedId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeneratedId.java
index 619680435b..8259e3ed95 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeneratedId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeneratedId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import org.bson.types.ObjectId;
+
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -25,10 +25,8 @@
 @Document
 public class GeneratedId {
 
-	@Id
-	private ObjectId id;
-	@SuppressWarnings("unused")
-	private String name;
+	@Id private ObjectId id;
+	@SuppressWarnings("unused") private String name;
 
 	public GeneratedId(String name) {
 		this.name = name;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java
index a08823b67f..7933dbb70f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GenericMappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,11 +20,11 @@
 import java.util.Collections;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -35,16 +35,16 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class GenericMappingTests {
+@ExtendWith(MockitoExtension.class)
+class GenericMappingTests {
 
-	MongoMappingContext context;
-	MongoConverter converter;
+	private MongoMappingContext context;
+	private MongoConverter converter;
 
 	@Mock DbRefResolver resolver;
 
-	@Before
-	public void setUp() throws Exception {
+	@BeforeEach
+	void setUp() throws Exception {
 
 		context = new MongoMappingContext();
 		context.setInitialEntitySet(Collections.singleton(StringWrapper.class));
@@ -54,11 +54,11 @@ public void setUp() throws Exception {
 	}
 
 	@Test
-	public void writesGenericTypeCorrectly() {
+	void writesGenericTypeCorrectly() {
 
 		StringWrapper wrapper = new StringWrapper();
-		wrapper.container = new Container<String>();
-		wrapper.container.content = "Foo!";
+		wrapper.container = new Container<>();
+		wrapper.container.content = "Foo";
 
 		Document document = new Document();
 		converter.write(wrapper, document);
@@ -69,21 +69,21 @@ public void writesGenericTypeCorrectly() {
 
 		Object content = ((Document) container).get("content");
 		assertThat(content instanceof String).isTrue();
-		assertThat((String) content).isEqualTo("Foo!");
+		assertThat((String) content).isEqualTo("Foo");
 	}
 
 	@Test
-	public void readsGenericTypeCorrectly() {
+	void readsGenericTypeCorrectly() {
 
-		Document content = new Document("content", "Foo!");
+		Document content = new Document("content", "Foo");
 		Document container = new Document("container", content);
 
 		StringWrapper result = converter.read(StringWrapper.class, container);
 		assertThat(result.container).isNotNull();
-		assertThat(result.container.content).isEqualTo("Foo!");
+		assertThat(result.container.content).isEqualTo("Foo");
 	}
 
-	static class StringWrapper extends Wrapper<String> {
+	private static class StringWrapper extends Wrapper<String> {
 
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedAppConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedAppConfig.java
index 03ee8c6964..0f58e6ace5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedAppConfig.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedAppConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,18 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
+
 import org.springframework.context.annotation.Bean;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.mapping.event.LoggingEventListener;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 
 import com.mongodb.client.MongoClient;
 
-public class GeoIndexedAppConfig extends AbstractMongoClientConfiguration {
+public class GeoIndexedAppConfig extends MongoClientClosingTestConfiguration {
 
 	public static String GEO_DB = "database";
 	public static String GEO_COLLECTION = "geolocation";
@@ -39,12 +43,22 @@ public MongoClient mongoClient() {
 	}
 
 	@Override
-	public String getMappingBasePackage() {
-		return "org.springframework.data.mongodb.core.core.mapping";
+	protected Collection<String> getMappingBasePackages() {
+		return Collections.singleton("org.springframework.data.mongodb.core.core.mapping");
 	}
 
 	@Bean
 	public LoggingEventListener mappingEventsListener() {
 		return new LoggingEventListener();
 	}
+
+	@Override
+	protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+		return Collections.emptySet();
+	}
+
+	@Override
+	protected boolean autoIndexCreation() {
+		return true;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedTests.java
index bf4fc5cfe8..1e1978853f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoIndexedTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoClient;
@@ -44,7 +44,7 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration(classes = GeoIndexedAppConfig.class)
 public class GeoIndexedTests {
 
@@ -66,11 +66,13 @@ public void cleanUp() {
 
 	private void cleanDb() {
 
-		MongoClient mongo = MongoTestUtils.client();
-		MongoDatabase db = mongo.getDatabase(GeoIndexedAppConfig.GEO_DB);
+		try (MongoClient mongo = MongoTestUtils.client()) {
 
-		for (String coll : collectionsToDrop) {
-			db.getCollection(coll).drop();
+			MongoDatabase db = mongo.getDatabase(GeoIndexedAppConfig.GEO_DB);
+
+			for (String coll : collectionsToDrop) {
+				db.getCollection(coll).drop();
+			}
 		}
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoLocation.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoLocation.java
index e63a6d8ad0..e1032e6d84 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoLocation.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/GeoLocation.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import org.bson.types.ObjectId;
+
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexed;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -26,10 +26,8 @@
 @Document("geolocation")
 public class GeoLocation {
 
-	@Id
-	private ObjectId id;
-	@GeoSpatialIndexed
-	private double[] location;
+	@Id private ObjectId id;
+	@GeoSpatialIndexed private double[] location;
 
 	public GeoLocation(double[] location) {
 		this.location = location;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Location.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Location.java
index f9ab9e94b3..d9626343aa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Location.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Location.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import org.bson.types.ObjectId;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
index 1fea7176eb..eee407701c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MappingTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,22 +29,29 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.MongoCollectionUtils;
-import org.springframework.data.mongodb.config.AbstractIntegrationTests;
 import org.springframework.data.mongodb.core.CollectionCallback;
-import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 import com.mongodb.MongoException;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 
 /**
@@ -53,9 +60,23 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-public class MappingTests extends AbstractIntegrationTests {
+@ExtendWith(MongoTemplateExtension.class)
+public class MappingTests {
+
+	static final String DB_NAME = "mapping-tests";
+
+	static @Client MongoClient client;
 
-	@Autowired MongoOperations template;
+	@Template(database = DB_NAME,
+			initialEntitySet = { PersonWithDbRef.class, GeoLocation.class, PersonPojoStringId.class, Account.class,
+					DetectedCollectionWithIndex.class, Item.class, Container.class, Person.class, PersonCustomCollection1.class,
+					GeneratedId.class, PersonWithObjectId.class, PersonCustomIdName.class, PersonMapProperty.class }) //
+	static MongoTestTemplate template;
+
+	@AfterEach
+	void afterEach() {
+		template.flush();
+	}
 
 	@Test
 	public void testGeneratedId() {
@@ -164,10 +185,15 @@ public void testWriteEntity() {
 		assertThat(result.get(0).getAccounts()).isNotNull();
 	}
 
-	@Test(expected = DuplicateKeyException.class)
+	@Test
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public void testUniqueIndex() {
 
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setAutoIndexCreation(true);
+
+		MongoTemplate template = new MongoTemplate(new SimpleMongoClientDatabaseFactory(client, DB_NAME), new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext));
+
 		Address addr = new Address();
 		addr.setLines(new String[] { "1234 W. 1st Street", "Apt. 12" });
 		addr.setCity("Anytown");
@@ -177,7 +203,7 @@ public void testUniqueIndex() {
 		Person p1 = new Person(1234567890, "John", "Doe", 37, addr);
 		Person p2 = new Person(1234567890, "Jane", "Doe", 38, addr);
 
-		template.insertAll(Arrays.asList(p1, p2));
+		assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(() -> template.insertAll(Arrays.asList(p1, p2)));
 	}
 
 	@Test
@@ -206,6 +232,13 @@ public void testPrimitivesAndCustomCollectionName() {
 
 	@Test
 	public void testIndexesCreatedInRightCollection() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		mappingContext.setAutoIndexCreation(true);
+
+		MongoTemplate template = new MongoTemplate(new SimpleMongoClientDatabaseFactory(client, DB_NAME), new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext));
+
+
 		CustomCollectionWithIndex ccwi = new CustomCollectionWithIndex("test");
 		template.insert(ccwi);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
index ac45be0e9d..4a4dd54717 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoMappingContextUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,15 +17,17 @@
 
 import static org.assertj.core.api.Assertions.*;
 
+import java.time.temporal.ChronoUnit;
 import java.util.AbstractMap;
 import java.util.Collections;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Optional;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.data.annotation.Id;
@@ -43,13 +45,13 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MongoMappingContextUnitTests {
 
 	@Mock ApplicationContext applicationContext;
 
 	@Test
-	public void addsSelfReferencingPersistentEntityCorrectly() throws Exception {
+	void addsSelfReferencingPersistentEntityCorrectly() throws Exception {
 
 		MongoMappingContext context = new MongoMappingContext();
 
@@ -58,21 +60,21 @@ public void addsSelfReferencingPersistentEntityCorrectly() throws Exception {
 	}
 
 	@Test
-	public void doesNotReturnPersistentEntityForMongoSimpleType() {
+	void doesNotReturnPersistentEntityForMongoSimpleType() {
 
 		MongoMappingContext context = new MongoMappingContext();
 		assertThat(context.getPersistentEntity(DBRef.class)).isNull();
 	}
 
 	@Test // DATAMONGO-638
-	public void doesNotCreatePersistentEntityForAbstractMap() {
+	void doesNotCreatePersistentEntityForAbstractMap() {
 
 		MongoMappingContext context = new MongoMappingContext();
 		assertThat(context.getPersistentEntity(AbstractMap.class)).isNull();
 	}
 
 	@Test // DATAMONGO-607
-	public void populatesPersistentPropertyWithCustomFieldNamingStrategy() {
+	void populatesPersistentPropertyWithCustomFieldNamingStrategy() {
 
 		MongoMappingContext context = new MongoMappingContext();
 		context.setApplicationContext(applicationContext);
@@ -88,7 +90,7 @@ public String getFieldName(PersistentProperty<?> property) {
 	}
 
 	@Test // DATAMONGO-607
-	public void rejectsClassWithAmbiguousFieldMappings() {
+	void rejectsClassWithAmbiguousFieldMappings() {
 
 		MongoMappingContext context = new MongoMappingContext();
 		context.setApplicationContext(applicationContext);
@@ -99,7 +101,7 @@ public void rejectsClassWithAmbiguousFieldMappings() {
 	}
 
 	@Test // DATAMONGO-694
-	public void doesNotConsiderOverrridenAccessorANewField() {
+	void doesNotConsiderOverrridenAccessorANewField() {
 
 		MongoMappingContext context = new MongoMappingContext();
 		context.setApplicationContext(applicationContext);
@@ -107,49 +109,51 @@ public void doesNotConsiderOverrridenAccessorANewField() {
 	}
 
 	@Test // DATAMONGO-688
-	public void mappingContextShouldAcceptClassWithImplicitIdProperty() {
+	void mappingContextShouldAcceptClassWithImplicitIdProperty() {
 
 		MongoMappingContext context = new MongoMappingContext();
-		BasicMongoPersistentEntity<?> pe = context.getRequiredPersistentEntity(ClassWithImplicitId.class);
+		MongoPersistentEntity<?> pe = context.getRequiredPersistentEntity(ClassWithImplicitId.class);
 
 		assertThat(pe).isNotNull();
 		assertThat(pe.isIdProperty(pe.getRequiredPersistentProperty("id"))).isTrue();
 	}
 
 	@Test // DATAMONGO-688
-	public void mappingContextShouldAcceptClassWithExplicitIdProperty() {
+	void mappingContextShouldAcceptClassWithExplicitIdProperty() {
 
 		MongoMappingContext context = new MongoMappingContext();
-		BasicMongoPersistentEntity<?> pe = context.getRequiredPersistentEntity(ClassWithExplicitId.class);
+		MongoPersistentEntity<?> pe = context.getRequiredPersistentEntity(ClassWithExplicitId.class);
 
 		assertThat(pe).isNotNull();
 		assertThat(pe.isIdProperty(pe.getRequiredPersistentProperty("myId"))).isTrue();
 	}
 
 	@Test // DATAMONGO-688
-	public void mappingContextShouldAcceptClassWithExplicitAndImplicitIdPropertyByGivingPrecedenceToExplicitIdProperty() {
+	void mappingContextShouldAcceptClassWithExplicitAndImplicitIdPropertyByGivingPrecedenceToExplicitIdProperty() {
 
 		MongoMappingContext context = new MongoMappingContext();
-		BasicMongoPersistentEntity<?> pe = context.getRequiredPersistentEntity(ClassWithExplicitIdAndImplicitId.class);
+		MongoPersistentEntity<?> pe = context.getRequiredPersistentEntity(ClassWithExplicitIdAndImplicitId.class);
 		assertThat(pe).isNotNull();
 	}
 
-	@Test(expected = MappingException.class) // DATAMONGO-688
-	public void rejectsClassWithAmbiguousExplicitIdPropertyFieldMappings() {
+	@Test // DATAMONGO-688
+	void rejectsClassWithAmbiguousExplicitIdPropertyFieldMappings() {
 
 		MongoMappingContext context = new MongoMappingContext();
-		context.getPersistentEntity(ClassWithMultipleExplicitIds.class);
+		assertThatThrownBy(() -> context.getPersistentEntity(ClassWithMultipleExplicitIds.class))
+				.isInstanceOf(MappingException.class);
 	}
 
-	@Test(expected = MappingException.class) // DATAMONGO-688
-	public void rejectsClassWithAmbiguousImplicitIdPropertyFieldMappings() {
+	@Test // DATAMONGO-688
+	void rejectsClassWithAmbiguousImplicitIdPropertyFieldMappings() {
 
 		MongoMappingContext context = new MongoMappingContext();
-		context.getPersistentEntity(ClassWithMultipleImplicitIds.class);
+		assertThatThrownBy(() -> context.getPersistentEntity(ClassWithMultipleImplicitIds.class))
+				.isInstanceOf(MappingException.class);
 	}
 
 	@Test // DATAMONGO-976
-	public void shouldRejectClassWithInvalidTextScoreProperty() {
+	void shouldRejectClassWithInvalidTextScoreProperty() {
 
 		MongoMappingContext context = new MongoMappingContext();
 
@@ -158,6 +162,38 @@ public void shouldRejectClassWithInvalidTextScoreProperty() {
 				.withMessageContaining("score").withMessageContaining("Float").withMessageContaining("Double");
 	}
 
+	@Test // DATAMONGO-2599
+	void shouldNotCreateEntityForEnum() {
+
+		MongoMappingContext context = new MongoMappingContext();
+
+		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(ClassWithChronoUnit.class);
+
+		assertThat(entity.getPersistentProperty("unit").isEntity()).isFalse();
+		assertThat(context.hasPersistentEntityFor(ChronoUnit.class)).isFalse();
+		assertThat(context.getPersistentEntity(ChronoUnit.class)).isNull();
+	}
+
+	@Test // GH-3656
+	void shouldNotCreateEntityForOptionalGetter() {
+
+		MongoMappingContext context = new MongoMappingContext();
+		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(InterfaceWithMethodReturningOptional.class);
+
+		assertThat(context.getPersistentEntities()).map(it -> it.getType()).doesNotContain((Class)
+				Optional.class).contains((Class)Person.class);
+	}
+
+	@Test // GH-3656
+	void shouldNotCreateEntityForOptionalField() {
+
+		MongoMappingContext context = new MongoMappingContext();
+		MongoPersistentEntity<?> entity = context.getRequiredPersistentEntity(ClassWithOptionalField.class);
+
+		assertThat(context.getPersistentEntities()).map(it -> it.getType()).doesNotContain((Class)
+				Optional.class).contains((Class)Person.class);
+	}
+
 	public class SampleClass {
 
 		Map<String, SampleClass> children;
@@ -224,4 +260,18 @@ class ClassWithInvalidTextScoreProperty {
 
 		@TextScore Locale score;
 	}
+
+	class ClassWithChronoUnit {
+
+		ChronoUnit unit;
+	}
+
+	interface InterfaceWithMethodReturningOptional {
+
+		Optional<Person> getPerson();
+	}
+
+	class ClassWithOptionalField {
+		Optional<Person> person;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoPersistentPropertyComparatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoPersistentPropertyComparatorUnitTests.java
index cdc5fa9bd4..9ebeb68ceb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoPersistentPropertyComparatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoPersistentPropertyComparatorUnitTests.java
@@ -7,10 +7,10 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity.MongoPersistentPropertyComparator;
 
@@ -19,20 +19,17 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoPersistentPropertyComparatorUnitTests {
+@ExtendWith(MockitoExtension.class)
+class MongoPersistentPropertyComparatorUnitTests {
 
-	@Mock
-	MongoPersistentProperty firstName;
+	@Mock MongoPersistentProperty firstName;
 
-	@Mock
-	MongoPersistentProperty lastName;
+	@Mock MongoPersistentProperty lastName;
 
-	@Mock
-	MongoPersistentProperty ssn;
+	@Mock MongoPersistentProperty ssn;
 
 	@Test
-	public void ordersPropertiesCorrectly() {
+	void ordersPropertiesCorrectly() {
 
 		when(ssn.getFieldOrder()).thenReturn(10);
 		when(firstName.getFieldOrder()).thenReturn(20);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoVectorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoVectorUnitTests.java
new file mode 100644
index 0000000000..31eeebdb83
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/MongoVectorUnitTests.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2025 the original author 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.mapping;
+
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import org.bson.BinaryVector;
+import org.bson.Float32BinaryVector;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.data.domain.Vector;
+
+/**
+ * Unit tests for {@link MongoVector}.
+ *
+ * @author Mark Paluch
+ */
+class MongoVectorUnitTests {
+
+	@Test // GH-4706
+	void shouldReturnInt8AsFloatingPoints() {
+
+		MongoVector vector = MongoVector.ofInt8(new byte[] { 1, 2, 3 });
+
+		assertThat(vector.toDoubleArray()).contains(1, 2, 3);
+		assertThat(vector.toFloatArray()).contains(1, 2, 3);
+	}
+
+	@Test // GH-4706
+	void shouldReturnFloatAsFloatingPoints() {
+
+		MongoVector vector = MongoVector.ofFloat(1f, 2f, 3f);
+
+		assertThat(vector.toDoubleArray()).contains(1, 2, 3);
+		assertThat(vector.toFloatArray()).contains(1, 2, 3);
+	}
+
+	@Test // GH-4706
+	void ofFloatIsNotEqualToVectorOf() {
+
+		MongoVector mv = MongoVector.ofFloat(1f, 2f, 3f);
+		Vector v = Vector.of(1f, 2f, 3f);
+
+		assertThat(v).isNotEqualTo(mv);
+	}
+
+	@Test // GH-4706
+	void mongoVectorCanAdaptToFloatVector() {
+
+		Vector v = Vector.of(1f, 2f, 3f);
+		MongoVector mv = MongoVector.fromFloat(v);
+
+		assertThat(mv.toFloatArray()).isEqualTo(v.toFloatArray());
+		assertThat(mv.getSource()).isInstanceOf(Float32BinaryVector.class);
+	}
+
+	@Test // GH-4706
+	void shouldNotReturnFloatsForPackedBit() {
+
+		MongoVector vector = MongoVector.of(BinaryVector.packedBitVector(new byte[] { 1, 2, 3 }, (byte) 1));
+
+		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(vector::toFloatArray);
+		assertThatExceptionOfType(UnsupportedOperationException.class).isThrownBy(vector::toDoubleArray);
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Person.java
index cd85adc8a6..eaed01fc3b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Person.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,13 +18,11 @@
 import java.util.List;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.annotation.Transient;
 import org.springframework.data.mongodb.core.index.CompoundIndex;
 import org.springframework.data.mongodb.core.index.CompoundIndexes;
 import org.springframework.data.mongodb.core.index.Indexed;
-import org.springframework.data.mongodb.core.mapping.DBRef;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -33,25 +31,20 @@
 @CompoundIndexes({ @CompoundIndex(name = "age_idx", def = "{'lastName': 1, 'age': -1}") })
 public class Person<T extends Address> {
 
-	@Id
-	private String id;
-	@Indexed(unique = true)
-	private Integer ssn;
+	@Id private String id;
+	@Indexed(unique = true) private Integer ssn;
 	private String firstName;
-	@Indexed
-	private String lastName;
+	@Indexed private String lastName;
 	private Integer age;
-	@Transient
-	private Integer accountTotal;
-	@DBRef
-	private List<Account> accounts;
+	@Transient private Integer accountTotal;
+	@DBRef private List<Account> accounts;
 	private T address;
 
 	public Person(Integer ssn) {
 		this.ssn = ssn;
 	}
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	public Person(Integer ssn, String firstName, String lastName, Integer age, T address) {
 		this.ssn = ssn;
 		this.firstName = firstName;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection1.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection1.java
index 52075480a8..f45c07984a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection1.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection1.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
 @Document("person1")
 public class PersonCustomCollection1 extends BasePerson {
 
-	@Id
-	private String id;
+	@Id private String id;
 
 	public PersonCustomCollection1(Integer ssn, String firstName, String lastName) {
 		super(ssn, firstName, lastName);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection2.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection2.java
index 7d15f55139..581c56ca7a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection2.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomCollection2.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,7 @@
 @Document("person2")
 public class PersonCustomCollection2 extends BasePerson {
 
-	@Id
-	private String id;
+	@Id private String id;
 
 	public PersonCustomCollection2(Integer ssn, String firstName, String lastName) {
 		super(ssn, firstName, lastName);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomIdName.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomIdName.java
index 1457eaff61..4a4f7fb126 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomIdName.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonCustomIdName.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -30,7 +30,7 @@ public PersonCustomIdName(Integer ssn, String firstName) {
 		this.firstName = firstName;
 	}
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	public PersonCustomIdName(Integer ssn, String firstName, String lastName) {
 		this.ssn = ssn;
 		this.firstName = firstName;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMapProperty.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMapProperty.java
index 26d8beaf45..ce746eed10 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMapProperty.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMapProperty.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,6 @@
 import java.util.Map;
 
 import org.bson.types.ObjectId;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiCollection.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiCollection.java
index e35479dc4d..6ce07bbae8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiCollection.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiCollection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiDimArrays.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiDimArrays.java
index bfad65e8f2..d98c617c1f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiDimArrays.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonMultiDimArrays.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonNullProperties.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonNullProperties.java
index 1a4a9b9de1..8846fb161a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonNullProperties.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonNullProperties.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import org.bson.types.ObjectId;
+
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -25,11 +25,9 @@
 @Document
 public class PersonNullProperties extends BasePerson {
 
-	@Id
-	private ObjectId id;
+	@Id private ObjectId id;
 
-	public PersonNullProperties() {
-	}
+	public PersonNullProperties() {}
 
 	public ObjectId getId() {
 		return id;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoIntId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoIntId.java
index 6305ef2385..6133f8f5a9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoIntId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoIntId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoLongId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoLongId.java
index 8fcfc9e5bc..e3034e0f73 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoLongId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoLongId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoStringId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoStringId.java
index 350fe10b65..29d8682355 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoStringId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonPojoStringId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonSimpleList.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonSimpleList.java
index 8cf3a72629..e228c5b832 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonSimpleList.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonSimpleList.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithDbRef.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithDbRef.java
index b116b0b81e..86baa78a2b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithDbRef.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithDbRef.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.core.mapping;
 
-
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
  */
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithObjectId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithObjectId.java
index 3114c00440..68cfa2653b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithObjectId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PersonWithObjectId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PrimitiveId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PrimitiveId.java
index ca75d0cc3a..f21e1ade23 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PrimitiveId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/PrimitiveId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.core.mapping;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.mapping.Document;
 
 /**
  * @author Jon Brisbin <jbrisbin@vmware.com>
@@ -24,8 +23,7 @@
 @Document
 public class PrimitiveId {
 
-	@Id
-	int id;
+	@Id int id;
 	String text;
 
 	public PrimitiveId(Integer id) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java
index f52acbc5b1..7ce3a8b9c4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AbstractMongoEventListenerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,15 +17,18 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.bson.Document;
-import org.junit.Test;
+import java.time.Instant;
 
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.data.mongodb.core.mapping.Account;
 import org.springframework.data.mongodb.repository.Contact;
 import org.springframework.data.mongodb.repository.Person;
 
+import com.mongodb.BasicDBObject;
+
 /**
  * Unit tests for {@link AbstractMongoEventListener}.
  *
@@ -154,6 +157,14 @@ public void donInvokePersonCallbackForUntypedEvent() {
 		assertThat(listener.invokedOnBeforeDelete).isFalse();
 	}
 
+	@Test // GH-3968
+	public void debugLogShouldNotFailMongoDBCodecError() {
+
+		MongoMappingEvent<BasicDBObject> event = new BeforeConvertEvent<>(new BasicDBObject("date", Instant.now()), "collection-1");
+		UntypedEventListener listener = new UntypedEventListener();
+		listener.onApplicationEvent(event);
+	}
+
 	class SamplePersonEventListener extends AbstractMongoEventListener<Person> {
 
 		boolean invokedOnBeforeConvert;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveListener.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveListener.java
index d325996811..bef2ae92fa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveListener.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AfterSaveListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,11 +20,11 @@
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationListener;
 
-public class AfterSaveListener implements ApplicationListener<AfterSaveEvent<Object>> {
+public class AfterSaveListener implements ApplicationListener<AfterSaveEvent<? extends Object>> {
 
 	public final ArrayList<ApplicationEvent> seenEvents = new ArrayList<ApplicationEvent>();
 
-	public void onApplicationEvent(AfterSaveEvent<Object> event) {
+	public void onApplicationEvent(AfterSaveEvent<? extends Object> event) {
 		this.seenEvents.add(event);
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java
index 8e0a04e269..1d44bff5ad 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,21 +20,16 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import com.mongodb.client.MongoClients;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -46,7 +41,9 @@
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
 import org.springframework.data.mongodb.repository.support.QuerydslMongoPredicateExecutor;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.test.annotation.DirtiesContext;
 
 import com.mongodb.WriteConcern;
 import com.mongodb.client.MongoClient;
@@ -60,6 +57,7 @@
  * @author Jordi Llach
  * @author Mark Paluch
  */
+@ExtendWith({ MongoClientExtension.class })
 public class ApplicationContextEventTests {
 
 	private static final String COLLECTION_NAME = "personPojoStringId";
@@ -69,17 +67,13 @@ public class ApplicationContextEventTests {
 	private final String[] collectionsToDrop = new String[] { COLLECTION_NAME, ROOT_COLLECTION_NAME,
 			RELATED_COLLECTION_NAME };
 
-	private static MongoClient mongo;
-	private ApplicationContext applicationContext;
+	static @Client MongoClient mongoClient;
+
+	private ConfigurableApplicationContext applicationContext;
 	private MongoTemplate template;
 	private SimpleMappingEventListener listener;
 
-	@BeforeClass
-	public static void beforeClass() {
-		mongo = MongoTestUtils.client();
-	}
-
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		cleanDb();
@@ -90,14 +84,16 @@ public void setUp() {
 		listener = applicationContext.getBean(SimpleMappingEventListener.class);
 	}
 
-	@After
+	@AfterEach
 	public void cleanUp() {
+
 		cleanDb();
+		applicationContext.close();
 	}
 
 	private void cleanDb() {
 
-		MongoDatabase db = mongo.getDatabase("database");
+		MongoDatabase db = mongoClient.getDatabase("database");
 		for (String coll : collectionsToDrop) {
 			db.getCollection(coll).drop();
 		}
@@ -164,6 +160,22 @@ public void loadAndConvertEvents() {
 		assertThat(listener.onAfterConvertEvents.get(0).getCollectionName()).isEqualTo(COLLECTION_NAME);
 	}
 
+	@Test // GH-4107
+	@DirtiesContext
+	public void configurationShouldDisableLifecycleEvents() {
+
+		template.setEntityLifecycleEventsEnabled(false);
+
+		PersonPojoStringId entity = new PersonPojoStringId("1", "Text");
+		template.insert(entity);
+
+		template.findOne(query(where("id").is(entity.getId())), PersonPojoStringId.class);
+
+		assertThat(listener.onAfterLoadEvents).isEmpty();
+		assertThat(listener.onBeforeConvertEvents).isEmpty();
+		assertThat(listener.onAfterConvertEvents).isEmpty();
+	}
+
 	@Test // DATAMONGO-1256
 	public void loadEventsOnAggregation() {
 
@@ -396,7 +408,8 @@ public void publishesEventsForQuerydslFindQueries() {
 		template.save(new Person("Boba", "Fett", 40));
 
 		MongoRepositoryFactory factory = new MongoRepositoryFactory(template);
-		MongoEntityInformation<Person, String> entityInformation = factory.getEntityInformation(Person.class);
+		MongoEntityInformation<Person, String> entityInformation = factory
+				.getEntityInformation(Person.class);
 		QuerydslMongoPredicateExecutor executor = new QuerydslMongoPredicateExecutor<>(entityInformation, template);
 
 		executor.findOne(QPerson.person.lastname.startsWith("Fe"));
@@ -421,7 +434,6 @@ private void comparePersonAndDocument(PersonPojoStringId p, PersonPojoStringId p
 		assertTypeHint(document, PersonPojoStringId.class);
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document
 	public static class Root {
 
@@ -435,14 +447,100 @@ public static class Root {
 
 		@DBRef Map<String, Related> mapOfReferences;
 		@DBRef(lazy = true) Map<String, Related> lazyMapOfReferences;
+
+		public Long getId() {
+			return this.id;
+		}
+
+		public Related getReference() {
+			return this.reference;
+		}
+
+		public Related getLazyReference() {
+			return this.lazyReference;
+		}
+
+		public List<Related> getListOfReferences() {
+			return this.listOfReferences;
+		}
+
+		public List<Related> getLazyListOfReferences() {
+			return this.lazyListOfReferences;
+		}
+
+		public Map<String, Related> getMapOfReferences() {
+			return this.mapOfReferences;
+		}
+
+		public Map<String, Related> getLazyMapOfReferences() {
+			return this.lazyMapOfReferences;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public void setReference(Related reference) {
+			this.reference = reference;
+		}
+
+		public void setLazyReference(Related lazyReference) {
+			this.lazyReference = lazyReference;
+		}
+
+		public void setListOfReferences(List<Related> listOfReferences) {
+			this.listOfReferences = listOfReferences;
+		}
+
+		public void setLazyListOfReferences(List<Related> lazyListOfReferences) {
+			this.lazyListOfReferences = lazyListOfReferences;
+		}
+
+		public void setMapOfReferences(Map<String, Related> mapOfReferences) {
+			this.mapOfReferences = mapOfReferences;
+		}
+
+		public void setLazyMapOfReferences(Map<String, Related> lazyMapOfReferences) {
+			this.lazyMapOfReferences = lazyMapOfReferences;
+		}
+
+		public String toString() {
+			return "ApplicationContextEventTests.Root(id=" + this.getId() + ", reference=" + this.getReference()
+					+ ", lazyReference=" + this.getLazyReference() + ", listOfReferences=" + this.getListOfReferences()
+					+ ", lazyListOfReferences=" + this.getLazyListOfReferences() + ", mapOfReferences="
+					+ this.getMapOfReferences() + ", lazyMapOfReferences=" + this.getLazyMapOfReferences() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
 	@org.springframework.data.mongodb.core.mapping.Document
 	public static class Related {
 
 		@Id Long id;
 		String description;
+
+		public Related(Long id, String description) {
+			this.id = id;
+			this.description = description;
+		}
+
+		public Long getId() {
+			return this.id;
+		}
+
+		public String getDescription() {
+			return this.description;
+		}
+
+		public void setId(Long id) {
+			this.id = id;
+		}
+
+		public void setDescription(String description) {
+			this.description = description;
+		}
+
+		public String toString() {
+			return "ApplicationContextEventTests.Related(id=" + this.getId() + ", description=" + this.getDescription() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTestsAppConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTestsAppConfig.java
index e0aadffce2..8c5aad8b1a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTestsAppConfig.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ApplicationContextEventTestsAppConfig.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,14 +17,13 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
-import org.springframework.data.mongodb.config.AbstractMongoConfiguration;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
+import org.springframework.data.mongodb.test.util.MongoTestUtils;
 
 import com.mongodb.client.MongoClient;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
 
 @Configuration
-public class ApplicationContextEventTestsAppConfig extends AbstractMongoClientConfiguration {
+public class ApplicationContextEventTestsAppConfig extends MongoClientClosingTestConfiguration {
 
 	@Override
 	public String getDatabaseName() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallbackUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallbackUnitTests.java
index 9ea5267506..7d01c30345 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallbackUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEntityCallbackUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,20 +19,14 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import lombok.Value;
-import lombok.experimental.Wither;
-
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Objects;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.AdditionalAnswers;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.core.Ordered;
 import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
@@ -40,39 +34,38 @@
 import org.springframework.data.auditing.IsNewAwareAuditingHandler;
 import org.springframework.data.mapping.context.PersistentEntities;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 
 /**
  * Unit tests for {@link AuditingEntityCallback}.
  *
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class AuditingEntityCallbackUnitTests {
 
-	IsNewAwareAuditingHandler handler;
-	AuditingEntityCallback callback;
+	private final MongoMappingContext mappingContext = new MongoMappingContext();
+
+	private IsNewAwareAuditingHandler handler;
+	private AuditingEntityCallback callback;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		MongoMappingContext mappingContext = new MongoMappingContext();
 		mappingContext.getPersistentEntity(Sample.class);
 
 		handler = spy(new IsNewAwareAuditingHandler(new PersistentEntities(Arrays.asList(mappingContext))));
 
-		doAnswer(AdditionalAnswers.returnsArgAt(0)).when(handler).markCreated(any());
-		doAnswer(AdditionalAnswers.returnsArgAt(0)).when(handler).markModified(any());
-
 		callback = new AuditingEntityCallback(() -> handler);
 	}
 
 	@Test // DATAMONGO-2261
-	public void rejectsNullAuditingHandler() {
+	void rejectsNullAuditingHandler() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new AuditingEntityCallback(null));
 	}
 
 	@Test // DATAMONGO-2261
-	public void triggersCreationMarkForObjectWithEmptyId() {
+	void triggersCreationMarkForObjectWithEmptyId() {
 
 		Sample sample = new Sample();
 		callback.onBeforeConvert(sample, "foo");
@@ -82,7 +75,7 @@ public void triggersCreationMarkForObjectWithEmptyId() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void triggersModificationMarkForObjectWithSetId() {
+	void triggersModificationMarkForObjectWithSetId() {
 
 		Sample sample = new Sample();
 		sample.id = "id";
@@ -93,14 +86,14 @@ public void triggersModificationMarkForObjectWithSetId() {
 	}
 
 	@Test // DATAMONGO-2261
-	public void hasExplicitOrder() {
+	void hasExplicitOrder() {
 
 		assertThat(callback).isInstanceOf(Ordered.class);
 		assertThat(callback.getOrder()).isEqualTo(100);
 	}
 
 	@Test // DATAMONGO-2261
-	public void propagatesChangedInstanceToEvent() {
+	void propagatesChangedInstanceToEvent() {
 
 		ImmutableSample sample = new ImmutableSample();
 
@@ -114,6 +107,21 @@ public void propagatesChangedInstanceToEvent() {
 		assertThat(result).isSameAs(newSample);
 	}
 
+	@Test // GH-4732
+	void shouldApplyAuditingToUnwrappedImmutableObject() {
+
+		WithUnwrapped sample = new WithUnwrapped();
+		sample.auditingData = new MyAuditingData(null, null);
+
+		IsNewAwareAuditingHandler handler = new IsNewAwareAuditingHandler(PersistentEntities.of(mappingContext));
+
+		AuditingEntityCallback listener = new AuditingEntityCallback(() -> handler);
+		WithUnwrapped result = (WithUnwrapped) listener.onBeforeConvert(sample, "foo");
+
+		assertThat(result.auditingData.created).isNotNull();
+		assertThat(result.auditingData.modified).isNotNull();
+	}
+
 	static class Sample {
 
 		@Id String id;
@@ -121,14 +129,79 @@ static class Sample {
 		@LastModifiedDate Date modified;
 	}
 
-	@Value
-	@Wither
-	@AllArgsConstructor
-	@NoArgsConstructor(force = true)
-	static class ImmutableSample {
+	static class WithUnwrapped {
 
 		@Id String id;
-		@CreatedDate Date created;
-		@LastModifiedDate Date modified;
+
+		@Unwrapped(onEmpty = Unwrapped.OnEmpty.USE_NULL) MyAuditingData auditingData;
+
+	}
+
+	record MyAuditingData(@CreatedDate Date created, @LastModifiedDate Date modified) {
+
+	}
+
+	private static final class ImmutableSample {
+
+		@Id private final String id;
+		@CreatedDate private final Date created;
+		@LastModifiedDate private final Date modified;
+
+		public ImmutableSample() {
+			this(null, null, null);
+		}
+
+		public ImmutableSample(String id, Date created, Date modified) {
+			this.id = id;
+			this.created = created;
+			this.modified = modified;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Date getCreated() {
+			return this.created;
+		}
+
+		public Date getModified() {
+			return this.modified;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ImmutableSample that = (ImmutableSample) o;
+			return Objects.equals(id, that.id) && Objects.equals(created, that.created)
+					&& Objects.equals(modified, that.modified);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, created, modified);
+		}
+
+		public String toString() {
+			return "AuditingEntityCallbackUnitTests.ImmutableSample(id=" + this.getId() + ", created=" + this.getCreated()
+					+ ", modified=" + this.getModified() + ")";
+		}
+
+		public ImmutableSample withId(String id) {
+			return this.id == id ? this : new ImmutableSample(id, this.created, this.modified);
+		}
+
+		public ImmutableSample withCreated(Date created) {
+			return this.created == created ? this : new ImmutableSample(this.id, created, this.modified);
+		}
+
+		public ImmutableSample withModified(Date modified) {
+			return this.modified == modified ? this : new ImmutableSample(this.id, this.created, modified);
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java
deleted file mode 100644
index 3dc3931a2c..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/AuditingEventListenerUnitTests.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright 2012-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.mapping.event;
-
-import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import lombok.Value;
-import lombok.experimental.Wither;
-
-import java.util.Arrays;
-import java.util.Date;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.AdditionalAnswers;
-import org.mockito.junit.MockitoJUnitRunner;
-
-import org.springframework.core.Ordered;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.auditing.IsNewAwareAuditingHandler;
-import org.springframework.data.mapping.context.PersistentEntities;
-import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
-
-/**
- * Unit tests for {@link AuditingEventListener}.
- *
- * @author Oliver Gierke
- * @author Thomas Darimont
- */
-@RunWith(MockitoJUnitRunner.class)
-public class AuditingEventListenerUnitTests {
-
-	IsNewAwareAuditingHandler handler;
-	AuditingEventListener listener;
-
-	@Before
-	public void setUp() {
-
-		MongoMappingContext mappingContext = new MongoMappingContext();
-		mappingContext.getPersistentEntity(Sample.class);
-
-		handler = spy(new IsNewAwareAuditingHandler(new PersistentEntities(Arrays.asList(mappingContext))));
-
-		doAnswer(AdditionalAnswers.returnsArgAt(0)).when(handler).markCreated(any());
-		doAnswer(AdditionalAnswers.returnsArgAt(0)).when(handler).markModified(any());
-
-		listener = new AuditingEventListener(() -> handler);
-	}
-
-	@Test // DATAMONGO-577
-	public void rejectsNullAuditingHandler() {
-		assertThatIllegalArgumentException().isThrownBy(() -> new AuditingEventListener(null));
-	}
-
-	@Test // DATAMONGO-577
-	public void triggersCreationMarkForObjectWithEmptyId() {
-
-		Sample sample = new Sample();
-		listener.onApplicationEvent(new BeforeConvertEvent<Object>(sample, "collection-1"));
-
-		verify(handler, times(1)).markCreated(sample);
-		verify(handler, times(0)).markModified(any());
-	}
-
-	@Test // DATAMONGO-577
-	public void triggersModificationMarkForObjectWithSetId() {
-
-		Sample sample = new Sample();
-		sample.id = "id";
-		listener.onApplicationEvent(new BeforeConvertEvent<Object>(sample, "collection-1"));
-
-		verify(handler, times(0)).markCreated(any());
-		verify(handler, times(1)).markModified(sample);
-	}
-
-	@Test
-	public void hasExplicitOrder() {
-
-		assertThat(listener).isInstanceOf(Ordered.class);
-		assertThat(listener.getOrder()).isEqualTo(100);
-	}
-
-	@Test // DATAMONGO-1992
-	public void propagatesChangedInstanceToEvent() {
-
-		ImmutableSample sample = new ImmutableSample();
-		BeforeConvertEvent<Object> event = new BeforeConvertEvent<>(sample, "collection");
-
-		ImmutableSample newSample = new ImmutableSample();
-		IsNewAwareAuditingHandler handler = mock(IsNewAwareAuditingHandler.class);
-		doReturn(newSample).when(handler).markAudited(eq(sample));
-
-		AuditingEventListener listener = new AuditingEventListener(() -> handler);
-		listener.onApplicationEvent(event);
-
-		assertThat(event.getSource()).isSameAs(newSample);
-	}
-
-	static class Sample {
-
-		@Id String id;
-		@CreatedDate Date created;
-		@LastModifiedDate Date modified;
-	}
-
-	@Value
-	@Wither
-	@AllArgsConstructor
-	@NoArgsConstructor(force = true)
-	static class ImmutableSample {
-
-		@Id String id;
-		@CreatedDate Date created;
-		@LastModifiedDate Date modified;
-	}
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListenerTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListenerTests.java
index 7c08e38584..772ed3cecb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListenerTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/LoggingEventListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,9 @@
 import ch.qos.logback.core.read.ListAppender;
 
 import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.LoggerFactory;
 
 /**
@@ -39,10 +39,10 @@ public class LoggingEventListenerTests {
 	ch.qos.logback.classic.Logger logger;
 	LoggingEventListener listener;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		appender = new ListAppender<ILoggingEvent>();
+		appender = new ListAppender<>();
 
 		// set log level for LoggingEventListener to "info" and set up an appender capturing events.
 		logger = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(LoggingEventListener.class);
@@ -56,7 +56,7 @@ public void setUp() {
 		listener = new LoggingEventListener();
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 
 		// cleanup
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java
index d5ecd765a6..e05efb6a45 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/PersonBeforeSaveListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,6 @@ public class PersonBeforeSaveListener extends AbstractMongoEventListener<PersonP
 
 	public final List<ApplicationEvent> seenEvents = new ArrayList<ApplicationEvent>();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener#onBeforeSave(java.lang.Object, com.mongodb.Document)
-	 */
 	@Override
 	public void onBeforeSave(BeforeSaveEvent<PersonPojoStringId> event) {
 		seenEvents.add(event);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ReactiveValidatingEntityCallbackUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ReactiveValidatingEntityCallbackUnitTests.java
new file mode 100644
index 0000000000..c0db92a3d9
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ReactiveValidatingEntityCallbackUnitTests.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2025 the original author 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.mapping.event;
+
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import reactor.test.StepVerifier;
+
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ReactiveValidatingEntityCallback}.
+ *
+ * @author Mark Paluch
+ * @author Rene Felgenträger
+ */
+class ReactiveValidatingEntityCallbackUnitTests {
+
+	private ReactiveValidatingEntityCallback callback;
+
+	@BeforeEach
+	void setUp() {
+		try (ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			callback = new ReactiveValidatingEntityCallback(factory.getValidator());
+		}
+	}
+
+	@Test // GH-4910
+	void validationThrowsException() {
+
+		Coordinates coordinates = new Coordinates(-1, -1);
+
+		callback.onBeforeSave(coordinates, coordinates.toDocument(), "coordinates") //
+				.as(StepVerifier::create) //
+				.verifyError(ConstraintViolationException.class);
+	}
+
+	@Test // GH-4910
+	void validateSuccessful() {
+
+		Coordinates coordinates = new Coordinates(0, 0);
+
+		callback.onBeforeSave(coordinates, coordinates.toDocument(), "coordinates") //
+				.as(StepVerifier::create) //
+				.expectNext(coordinates) //
+				.verifyComplete();
+	}
+
+	record Coordinates(@NotNull @Min(0) Integer x, @NotNull @Min(0) Integer y) {
+
+		Document toDocument() {
+			return Document.parse("""
+					{
+					  "x": %d,
+					  "y": %d
+					}
+					""".formatted(x, y));
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/SimpleMappingEventListener.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/SimpleMappingEventListener.java
index bf79fdfbf4..1d77bb0e2f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/SimpleMappingEventListener.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/SimpleMappingEventListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java
index 696249f07d..8727f1dfe2 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.data.mongodb.core.mapping.event;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.Size;
 
 /**
  * Class used to test JSR-303 validation
@@ -26,11 +26,9 @@
  */
 public class User {
 
-	@Size(min = 10)
-	private String name;
+	@Size(min = 10) private String name;
 
-	@Min(18)
-	private Integer age;
+	@Min(18) private Integer age;
 
 	public User(String name, Integer age) {
 		this.name = name;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingEntityCallbackUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingEntityCallbackUnitTests.java
new file mode 100644
index 0000000000..e20da176b3
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingEntityCallbackUnitTests.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2025 the original author 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.mapping.event;
+
+import static org.assertj.core.api.Assertions.*;
+
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link ValidatingEntityCallback}.
+ *
+ * @author Rene Felgenträger
+ * @author Mark Paluch
+ */
+class ValidatingEntityCallbackUnitTests {
+
+	private ValidatingEntityCallback callback;
+
+	@BeforeEach
+	void setUp() {
+		try (ValidatorFactory factory = Validation.buildDefaultValidatorFactory()) {
+			callback = new ValidatingEntityCallback(factory.getValidator());
+		}
+	}
+
+	@Test // GH-4910
+	void validationThrowsException() {
+
+		Coordinates coordinates = new Coordinates(-1, -1);
+
+		assertThatExceptionOfType(ConstraintViolationException.class).isThrownBy(
+						() -> callback.onBeforeSave(coordinates, coordinates.toDocument(), "coordinates"))
+				.satisfies(e -> assertThat(e.getConstraintViolations()).hasSize(2));
+	}
+
+	@Test // GH-4910
+	void validateSuccessful() {
+
+		Coordinates coordinates = new Coordinates(0, 0);
+		Object entity = callback.onBeforeSave(coordinates, coordinates.toDocument(), "coordinates");
+
+		assertThat(entity).isEqualTo(coordinates);
+	}
+
+	record Coordinates(@NotNull @Min(0) Integer x, @NotNull @Min(0) Integer y) {
+
+		Document toDocument() {
+			return Document.parse("""
+					{
+					  "x": %d,
+					  "y": %d
+					}
+					""".formatted(x, y));
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java
index ebaaf7d07b..a1253bf98a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapping/event/ValidatingMongoEventListenerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,18 +17,15 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
 
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration test for {@link ValidatingMongoEventListener}.
@@ -37,16 +34,14 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
-public class ValidatingMongoEventListenerTests {
-
-	public static @ClassRule MongoVersionRule version = MongoVersionRule.atLeast(new Version(2, 6));
+class ValidatingMongoEventListenerTests {
 
 	@Autowired MongoTemplate mongoTemplate;
 
 	@Test // DATAMONGO-36
-	public void shouldThrowConstraintViolationException() {
+	void shouldThrowConstraintViolationException() {
 
 		User user = new User("john", 17);
 
@@ -57,7 +52,7 @@ public void shouldThrowConstraintViolationException() {
 	}
 
 	@Test
-	public void shouldNotThrowAnyExceptions() {
+	void shouldNotThrowAnyExceptions() {
 		mongoTemplate.save(new User("john smith", 18));
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java
deleted file mode 100644
index fb09d45477..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/GroupByTests.java
+++ /dev/null
@@ -1,174 +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.core.mapreduce;
-
-import static org.assertj.core.api.Assertions.*;
-import static org.assertj.core.data.Offset.offset;
-import static org.springframework.data.mongodb.core.mapreduce.GroupBy.*;
-import static org.springframework.data.mongodb.core.query.Criteria.*;
-
-import org.bson.Document;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.mongodb.client.MongoCollection;
-
-/**
- * Integration tests for group-by operations.
- *
- * @author Mark Pollack
- * @author Oliver Gierke
- * @author Christoph Strobl
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
-public class GroupByTests {
-
-	public static @ClassRule MongoVersionRule REQUIRES_AT_MOST_4_0 = MongoVersionRule.atMost(Version.parse("4.0.999"));
-
-	@Autowired MongoTemplate mongoTemplate;
-
-	@Before
-	public void setUp() {
-		cleanDb();
-	}
-
-	@After
-	public void cleanUp() {
-		cleanDb();
-	}
-
-	protected void cleanDb() {
-		mongoTemplate.dropCollection(mongoTemplate.getCollectionName(XObject.class));
-		mongoTemplate.dropCollection("group_test_collection");
-	}
-
-	@Test
-	public void singleKeyCreation() {
-
-		Document gc = new GroupBy("a").getGroupByObject();
-
-		assertThat(gc).isEqualTo(Document.parse("{ \"key\" : { \"a\" : 1} , \"$reduce\" :  null  , \"initial\" :  null }"));
-	}
-
-	@Test
-	public void multipleKeyCreation() {
-
-		Document gc = GroupBy.key("a", "b").getGroupByObject();
-
-		assertThat(gc).isEqualTo(
-				Document.parse("{ \"key\" : { \"a\" : 1 , \"b\" : 1} , \"$reduce\" :  null  , \"initial\" :  null }"));
-	}
-
-	@Test
-	public void keyFunctionCreation() {
-
-		Document gc = GroupBy.keyFunction("classpath:keyFunction.js").getGroupByObject();
-
-		assertThat(gc).isEqualTo(
-				Document.parse("{ \"$keyf\" : \"classpath:keyFunction.js\" , \"$reduce\" :  null  , \"initial\" :  null }"));
-	}
-
-	@Test
-	public void simpleGroupFunction() {
-
-		createGroupByData();
-		GroupByResults<XObject> results = mongoTemplate.group("group_test_collection", GroupBy.key("x")
-				.initialDocument(new Document("count", 0)).reduceFunction("function(doc, prev) { prev.count += 1 }"),
-				XObject.class);
-
-		assertMapReduceResults(results);
-	}
-
-	@Test
-	public void simpleGroupWithKeyFunction() {
-
-		createGroupByData();
-		GroupByResults<XObject> results = mongoTemplate
-				.group(
-						"group_test_collection", GroupBy.keyFunction("function(doc) { return { x : doc.x }; }")
-								.initialDocument("{ count: 0 }").reduceFunction("function(doc, prev) { prev.count += 1 }"),
-						XObject.class);
-
-		assertMapReduceResults(results);
-	}
-
-	@Test
-	public void simpleGroupWithFunctionsAsResources() {
-
-		createGroupByData();
-		GroupByResults<XObject> results = mongoTemplate.group("group_test_collection",
-				GroupBy.keyFunction("classpath:keyFunction.js").initialDocument("{ count: 0 }")
-						.reduceFunction("classpath:groupReduce.js"),
-				XObject.class);
-
-		assertMapReduceResults(results);
-	}
-
-	@Test
-	public void simpleGroupWithQueryAndFunctionsAsResources() {
-
-		createGroupByData();
-		GroupByResults<XObject> results = mongoTemplate.group(where("x").gt(0), "group_test_collection",
-				keyFunction("classpath:keyFunction.js").initialDocument("{ count: 0 }")
-						.reduceFunction("classpath:groupReduce.js"),
-				XObject.class);
-
-		assertMapReduceResults(results);
-	}
-
-	private void assertMapReduceResults(GroupByResults<XObject> results) {
-
-		int numResults = 0;
-		for (XObject xObject : results) {
-			if (xObject.getX() == 1) {
-				assertThat(xObject.getCount()).isCloseTo(2, offset(0.001f));
-			}
-			if (xObject.getX() == 2) {
-				assertThat(xObject.getCount()).isCloseTo(1, offset(0.001f));
-			}
-			if (xObject.getX() == 3) {
-				assertThat(xObject.getCount()).isCloseTo(3, offset(0.001f));
-			}
-			numResults++;
-		}
-		assertThat(numResults).isEqualTo(3);
-		assertThat(results.getKeys()).isEqualTo(3);
-		assertThat(results.getCount()).isCloseTo(6, offset(0.001));
-	}
-
-	private void createGroupByData() {
-
-		MongoCollection<Document> c = mongoTemplate.getDb().getCollection("group_test_collection", Document.class);
-
-		c.insertOne(new Document("x", 1));
-		c.insertOne(new Document("x", 1));
-		c.insertOne(new Document("x", 2));
-		c.insertOne(new Document("x", 3));
-		c.insertOne(new Document("x", 3));
-		c.insertOne(new Document("x", 3));
-	}
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCountsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCountsUnitTests.java
index 76a6ada2cb..687786456c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCountsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceCountsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link MapReduceCounts}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptionsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptionsTests.java
index c873fd45c7..a3a2161845 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptionsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceOptionsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Mark Pollack
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResultsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResultsUnitTests.java
index 99ee2faa3e..c34fa32be0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResultsUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceResultsUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 import java.util.Collections;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link MapReduceResults}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java
index 3a36943ae9..c265a9b739 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/MapReduceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,6 @@
 import org.bson.Document;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +35,7 @@
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.client.MongoCollection;
 
@@ -48,7 +47,7 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class MapReduceTests {
 
@@ -76,20 +75,7 @@ protected void cleanDb() {
 		template.dropCollection("jmr1_out");
 		template.dropCollection("jmr1");
 		template.dropCollection("jmrWithGeo");
-		template.getMongoDbFactory().getDb("jmr1-out-db").drop();
-	}
-
-	@Test // DATADOC-7
-	@Ignore
-	public void testForDocs() {
-
-		createMapReduceData();
-		MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", MAP_FUNCTION, REDUCE_FUNCTION,
-				ValueObject.class);
-
-		for (ValueObject valueObject : results) {
-			System.out.println(valueObject);
-		}
+		template.getMongoDatabaseFactory().getMongoDatabase("jmr1-out-db").drop();
 	}
 
 	@Test // DATAMONGO-260
@@ -167,8 +153,9 @@ public void mapReduceWithOutputDatabaseShouldWorkCorrectly() {
 		mongoTemplate.mapReduce("jmr1", MAP_FUNCTION, REDUCE_FUNCTION,
 				options().outputDatabase("jmr1-out-db").outputCollection("jmr1-out"), ValueObject.class);
 
-		assertThat(template.getMongoDbFactory().getDb("jmr1-out-db").listCollectionNames().into(new ArrayList<>()))
-				.contains("jmr1-out");
+		assertThat(
+				template.getMongoDatabaseFactory().getMongoDatabase("jmr1-out-db").listCollectionNames().into(new ArrayList<>()))
+						.contains("jmr1-out");
 	}
 
 	@Test // DATADOC-7
@@ -187,7 +174,7 @@ public void testMapReduceInlineWithScope() {
 		String mapWithExcludeFunction = "function(){ for ( var i=0; i<this.x.length; i++ ){ if(this.x[i] != exclude) emit( this.x[i] , 1 ); } }";
 
 		MapReduceResults<ValueObject> results = mongoTemplate.mapReduce("jmr1", mapWithExcludeFunction, REDUCE_FUNCTION,
-				new MapReduceOptions().scopeVariables(scopeVariables).outputTypeInline(), ValueObject.class);
+				new MapReduceOptions().scopeVariables(scopeVariables), ValueObject.class);
 
 		assertThat(copyToMap(results)) //
 				.hasSize(3) //
@@ -326,7 +313,7 @@ private void createContentAndVersionData() {
 		{ "_id" : 3, "document_id" : "Resume", "author" : "Author", "content" : "...", "version" : 6 }
 		{ "_id" : 4, "document_id" : "Schema", "author" : "Someone Else", "content" : "...", "version" : 0.9 }
 		{ "_id" : 5, "document_id" : "Schema", "author" : "Someone Else", "content" : "...", "version" : 1 }
-		
+
 		 */
 		ContentAndVersion cv1 = new ContentAndVersion();
 		cv1.setDocumentId("mongoDB How-To");
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ReactiveMapReduceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ReactiveMapReduceTests.java
index 6ad1e44ec0..5bd7b284f5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ReactiveMapReduceTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ReactiveMapReduceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,6 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.Data;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.Arrays;
@@ -37,17 +34,17 @@
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import com.mongodb.reactivestreams.client.MongoCollection;
-import com.mongodb.reactivestreams.client.Success;
+import com.mongodb.reactivestreams.client.MongoDatabase;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Mathieu Ouellet
  * @currentRead Beyond the Shadows - Brent Weeks
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:reactive-infrastructure.xml")
 public class ReactiveMapReduceTests {
 
@@ -63,7 +60,8 @@ public void setUp() {
 		template.dropCollection(ValueObject.class) //
 				.mergeWith(template.dropCollection("jmr1")) //
 				.mergeWith(template.dropCollection("jmr1_out")) //
-				.mergeWith(Mono.from(factory.getMongoDatabase("reactive-jrm1-out-db").drop()).then()).as(StepVerifier::create) //
+				.mergeWith(factory.getMongoDatabase("reactive-jrm1-out-db").map(MongoDatabase::drop).then()) //
+				.as(StepVerifier::create) //
 				.verifyComplete();
 	}
 
@@ -125,8 +123,7 @@ public void mapReduceWithOutputCollection() {
 		template
 				.mapReduce(new Query(), ValueObject.class, "jmr1", ValueObject.class, mapFunction, reduceFunction,
 						MapReduceOptions.options().outputCollection("jmr1_out"))
-				.as(StepVerifier::create)
-				.expectNextCount(4).verifyComplete();
+				.as(StepVerifier::create).expectNextCount(4).verifyComplete();
 
 		template.find(new Query(), ValueObject.class, "jmr1_out").buffer(4).as(StepVerifier::create) //
 				.consumeNextWith(result -> {
@@ -144,10 +141,9 @@ public void mapReduceWithOutputDatabase() {
 		template
 				.mapReduce(new Query(), ValueObject.class, "jmr1", ValueObject.class, mapFunction, reduceFunction,
 						MapReduceOptions.options().outputDatabase("reactive-jrm1-out-db").outputCollection("jmr1_out"))
-				.as(StepVerifier::create)
-				.expectNextCount(4).verifyComplete();
+				.as(StepVerifier::create).expectNextCount(4).verifyComplete();
 
-		Flux.from(factory.getMongoDatabase("reactive-jrm1-out-db").listCollectionNames()).buffer(10)
+		factory.getMongoDatabase("reactive-jrm1-out-db").flatMapMany(MongoDatabase::listCollectionNames).buffer(10)
 				.map(list -> list.contains("jmr1_out")).as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
@@ -186,25 +182,37 @@ public void mapReduceWithInlineFilterQueryAndExtractedCollection() {
 	@Test // DATAMONGO-1890
 	public void throwsExceptionWhenTryingToLoadFunctionsFromDisk() {
 
-		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> template.mapReduce(new Query(), Person.class,
-				"foo", ValueObject.class, "classpath:map.js", "classpath:reduce.js", MapReduceOptions.options()))
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> template.mapReduce(new Query(),
+				Person.class, "foo", ValueObject.class, "classpath:map.js", "classpath:reduce.js", MapReduceOptions.options()))
 				.withMessageContaining("classpath:map.js");
 	}
 
 	private void createMapReduceData() {
 
-		MongoCollection<Document> collection = factory.getMongoDatabase().getCollection("jmr1", Document.class);
-
-		StepVerifier
-				.create(collection.insertMany(Arrays.asList(new Document("x", Arrays.asList("a", "b")),
-						new Document("x", Arrays.asList("b", "c")), new Document("x", Arrays.asList("c", "d")))))
-				.expectNext(Success.SUCCESS).verifyComplete();
+		factory.getMongoDatabase()
+				.flatMapMany(db -> db.getCollection("jmr1", Document.class)
+						.insertMany(Arrays.asList(new Document("x", Arrays.asList("a", "b")),
+								new Document("x", Arrays.asList("b", "c")), new Document("x", Arrays.asList("c", "d")))))
+				.as(StepVerifier::create) //
+				.expectNextCount(1) //
+				.verifyComplete();
 	}
 
 	@org.springframework.data.mongodb.core.mapping.Document("jmr1")
-	@Data
 	static class MappedFieldsValueObject {
 
 		@Field("x") String[] values;
+
+		public String[] getValues() {
+			return this.values;
+		}
+
+		public void setValues(String[] values) {
+			this.values = values;
+		}
+
+		public String toString() {
+			return "ReactiveMapReduceTests.MappedFieldsValueObject(values=" + Arrays.deepToString(this.getValues()) + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ValueObject.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ValueObject.java
index 54c3241bee..34753e2172 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ValueObject.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/mapreduce/ValueObject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,27 +15,61 @@
  */
 package org.springframework.data.mongodb.core.mapreduce;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import java.util.Objects;
 
 /**
  * @author Mark Pollack
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
 public class ValueObject {
 
 	private String id;
 
 	private float value;
 
+	public ValueObject() {}
+
+	public ValueObject(String id, float value) {
+		this.id = id;
+		this.value = value;
+	}
+
+	public String getId() {
+		return this.id;
+	}
+
+	public float getValue() {
+		return this.value;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public void setValue(float value) {
+		this.value = value;
+	}
+
 	@Override
 	public String toString() {
 		return "ValueObject [id=" + id + ", value=" + value + "]";
 	}
 
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		ValueObject that = (ValueObject) o;
+		return Float.compare(that.value, value) == 0 && Objects.equals(id, that.id);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(id, value);
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTaskUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTaskUnitTests.java
index 71ee90638c..12b57ca47d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTaskUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTaskUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,12 +22,11 @@
 import org.bson.BsonDocument;
 import org.bson.BsonString;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -39,22 +38,27 @@
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
+import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
 
 /**
+ * Unit tests for {@link ChangeStreamTask}.
+ *
  * @author Christoph Strobl
+ * @author Myroslav Kosinskyi
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ChangeStreamTaskUnitTests {
+@ExtendWith(MockitoExtension.class)
+@SuppressWarnings({ "unchecked", "rawtypes" })
+class ChangeStreamTaskUnitTests {
 
-	ChangeStreamTask task;
 	@Mock MongoTemplate template;
 	@Mock MongoDatabase mongoDatabase;
 	@Mock MongoCollection<Document> mongoCollection;
 	@Mock ChangeStreamIterable<Document> changeStreamIterable;
+
 	MongoConverter converter;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		MongoMappingContext mappingContext = new MongoMappingContext();
 		converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
@@ -63,18 +67,15 @@ public void setUp() {
 		when(template.getDb()).thenReturn(mongoDatabase);
 
 		when(mongoDatabase.getCollection(any())).thenReturn(mongoCollection);
-
 		when(mongoCollection.watch(eq(Document.class))).thenReturn(changeStreamIterable);
-
-		when(changeStreamIterable.startAfter(any())).thenReturn(changeStreamIterable);
-		when(changeStreamIterable.resumeAfter(any())).thenReturn(changeStreamIterable);
 		when(changeStreamIterable.fullDocument(any())).thenReturn(changeStreamIterable);
 	}
 
 	@Test // DATAMONGO-2258
-	public void shouldNotBreakLovelaceBehavior() {
+	void shouldNotBreakLovelaceBehavior() {
 
 		BsonDocument resumeToken = new BsonDocument("token", new BsonString(UUID.randomUUID().toString()));
+		when(changeStreamIterable.resumeAfter(any())).thenReturn(changeStreamIterable);
 
 		ChangeStreamRequest request = ChangeStreamRequest.builder() //
 				.collection("start-wars") //
@@ -84,11 +85,13 @@ public void shouldNotBreakLovelaceBehavior() {
 
 		initTask(request, Document.class);
 
-		verify(changeStreamIterable).resumeAfter(eq(resumeToken));
+		verify(changeStreamIterable).resumeAfter(resumeToken);
 	}
 
 	@Test // DATAMONGO-2258
-	public void shouldApplyResumeAfterToChangeStream() {
+	void shouldApplyResumeAfterToChangeStream() {
+
+		when(changeStreamIterable.resumeAfter(any())).thenReturn(changeStreamIterable);
 
 		BsonDocument resumeToken = new BsonDocument("token", new BsonString(UUID.randomUUID().toString()));
 
@@ -100,11 +103,13 @@ public void shouldApplyResumeAfterToChangeStream() {
 
 		initTask(request, Document.class);
 
-		verify(changeStreamIterable).resumeAfter(eq(resumeToken));
+		verify(changeStreamIterable).resumeAfter(resumeToken);
 	}
 
 	@Test // DATAMONGO-2258
-	public void shouldApplyStartAfterToChangeStream() {
+	void shouldApplyStartAfterToChangeStream() {
+
+		when(changeStreamIterable.startAfter(any())).thenReturn(changeStreamIterable);
 
 		BsonDocument resumeToken = new BsonDocument("token", new BsonString(UUID.randomUUID().toString()));
 
@@ -116,7 +121,23 @@ public void shouldApplyStartAfterToChangeStream() {
 
 		initTask(request, Document.class);
 
-		verify(changeStreamIterable).startAfter(eq(resumeToken));
+		verify(changeStreamIterable).startAfter(resumeToken);
+	}
+
+	@Test // GH-4495
+	void shouldApplyFullDocumentBeforeChangeToChangeStream() {
+
+		when(changeStreamIterable.fullDocumentBeforeChange(any())).thenReturn(changeStreamIterable);
+
+		ChangeStreamRequest request = ChangeStreamRequest.builder() //
+				.collection("start-wars") //
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.REQUIRED) //
+				.publishTo(message -> {}) //
+				.build();
+
+		initTask(request, Document.class);
+
+		verify(changeStreamIterable).fullDocumentBeforeChange(FullDocumentBeforeChange.REQUIRED);
 	}
 
 	private MongoCursor<ChangeStreamDocument<Document>> initTask(ChangeStreamRequest request, Class<?> targetType) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
index bc12daed05..53d093897e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,12 +21,10 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
+import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
@@ -34,26 +32,33 @@
 
 import org.bson.BsonDocument;
 import org.bson.Document;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.TestRule;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junitpioneer.jupiter.RepeatFailedTest;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.ChangeStreamOptions;
+import org.springframework.data.mongodb.core.CollectionOptions;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest.ChangeStreamRequestOptions;
 import org.springframework.data.mongodb.core.messaging.ChangeStreamTask.ChangeStreamEventMessage;
 import org.springframework.data.mongodb.core.messaging.Message.MessageProperties;
-import org.springframework.data.mongodb.core.messaging.SubscriptionUtils.*;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Update;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.MongoVersion;
+import org.springframework.data.mongodb.test.util.Template;
 
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
 import com.mongodb.client.model.changestream.FullDocument;
+import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
 
 /**
  * Integration test for subscribing to a {@link com.mongodb.operation.ChangeStreamBatchCursor} inside the
@@ -61,28 +66,31 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Myroslav Kosinskyi
  */
-public class ChangeStreamTests {
+@ExtendWith({ MongoTemplateExtension.class })
+@EnableIfReplicaSetAvailable
+class ChangeStreamTests {
+
+	private static ThreadPoolExecutor executor;
 
-	public static @ClassRule TestRule replSet = ReplicaSet.required();
+	@Template(initialEntitySet = User.class, replicaSet = true) //
+	private static MongoTestTemplate template;
 
-	static ThreadPoolExecutor executor;
-	MongoTemplate template;
-	MessageListenerContainer container;
+	private MessageListenerContainer container;
 
-	User jellyBelly;
-	User huffyFluffy;
-	User sugarSplashy;
+	private User jellyBelly;
+	private User huffyFluffy;
+	private User sugarSplashy;
 
-	@BeforeClass
-	public static void beforeClass() {
+	@BeforeAll
+	static void beforeClass() {
 		executor = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, new LinkedBlockingDeque<>());
 	}
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
-		template = new MongoTemplate(MongoTestUtils.replSetClient(), "change-stream-tests");
 		template.dropCollection(User.class);
 
 		container = new DefaultMessageListenerContainer(template, executor);
@@ -104,21 +112,22 @@ public void setUp() {
 		sugarSplashy.age = 5;
 	}
 
-	@After
-	public void tearDown() {
+	@AfterEach
+	void tearDown() {
 		container.stop();
 	}
 
-	@AfterClass
-	public static void afterClass() {
+	@AfterAll
+	static void afterClass() {
 		executor.shutdown();
 	}
 
 	@Test // DATAMONGO-1803
-	public void readsPlainDocumentMessageCorrectly() throws InterruptedException {
+	void readsPlainDocumentMessageCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, Document> messageListener = new CollectingMessageListener<>();
-		ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(messageListener, () -> "user");
+		ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(messageListener,
+				new ChangeStreamRequestOptions(null, "user", Duration.ofMillis(10), ChangeStreamOptions.builder().build()));
 
 		Subscription subscription = container.register(request, Document.class);
 		awaitSubscription(subscription);
@@ -137,12 +146,13 @@ public void readsPlainDocumentMessageCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1803
-	public void useSimpleAggregationToFilterMessages() throws InterruptedException {
+	void useSimpleAggregationToFilterMessages() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder(messageListener) //
 				.collection("user") //
 				.filter(newAggregation(match(where("age").is(7)))) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -161,13 +171,15 @@ public void useSimpleAggregationToFilterMessages() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1803
-	public void useAggregationToFilterMessages() throws InterruptedException {
+	@MongoVersion(asOf = "4.0")
+	void useAggregationToFilterMessages() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder(messageListener) //
 				.collection("user") //
 				.filter(newAggregation(match(
 						new Criteria().orOperator(where("user_name").is("huffyFluffy"), where("user_name").is("jellyBelly"))))) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -185,8 +197,8 @@ public void useAggregationToFilterMessages() throws InterruptedException {
 		assertThat(messageBodies).hasSize(2).doesNotContain(sugarSplashy);
 	}
 
-	@Test // DATAMONGO-1803
-	public void mapsTypedAggregationToFilterMessages() throws InterruptedException {
+	@RepeatFailedTest(3) // DATAMONGO-1803
+	void mapsTypedAggregationToFilterMessages() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
@@ -194,6 +206,7 @@ public void mapsTypedAggregationToFilterMessages() throws InterruptedException {
 				.publishTo(messageListener) //
 				.filter(newAggregation(User.class,
 						match(new Criteria().orOperator(where("userName").is("huffyFluffy"), where("userName").is("jellyBelly"))))) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -203,7 +216,7 @@ public void mapsTypedAggregationToFilterMessages() throws InterruptedException {
 		template.save(sugarSplashy);
 		template.save(huffyFluffy);
 
-		awaitMessages(messageListener);
+		awaitMessages(messageListener, 2);
 
 		List<User> messageBodies = messageListener.getMessages().stream().map(Message::getBody)
 				.collect(Collectors.toList());
@@ -212,13 +225,14 @@ public void mapsTypedAggregationToFilterMessages() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1803
-	public void mapsReservedWordsCorrectly() throws InterruptedException {
+	void mapsReservedWordsCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
 				.collection("user") //
 				.publishTo(messageListener) //
 				.filter(newAggregation(User.class, match(where("operationType").is("replace")))) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -234,7 +248,7 @@ public void mapsReservedWordsCorrectly() throws InterruptedException {
 
 		template.save(replacement);
 
-		awaitMessages(messageListener);
+		awaitMessages(messageListener, 1);
 
 		List<User> messageBodies = messageListener.getMessages().stream().map(Message::getBody)
 				.collect(Collectors.toList());
@@ -243,13 +257,14 @@ public void mapsReservedWordsCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1803
-	public void plainAggregationPipelineToFilterMessages() throws InterruptedException {
+	void plainAggregationPipelineToFilterMessages() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
 				.collection("user") //
 				.publishTo(messageListener) //
 				.filter(new Document("$match", new Document("fullDocument.user_name", "sugarSplashy"))) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -259,7 +274,7 @@ public void plainAggregationPipelineToFilterMessages() throws InterruptedExcepti
 		template.save(sugarSplashy);
 		template.save(huffyFluffy);
 
-		awaitMessages(messageListener);
+		awaitMessages(messageListener, 1);
 
 		List<User> messageBodies = messageListener.getMessages().stream().map(Message::getBody)
 				.collect(Collectors.toList());
@@ -268,10 +283,12 @@ public void plainAggregationPipelineToFilterMessages() throws InterruptedExcepti
 	}
 
 	@Test // DATAMONGO-1803
-	public void resumesCorrectly() throws InterruptedException {
+	void resumesCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener1 = new CollectingMessageListener<>();
-		Subscription subscription1 = container.register(new ChangeStreamRequest<>(messageListener1, () -> "user"),
+		Subscription subscription1 = container.register(
+				new ChangeStreamRequest<>(messageListener1,
+						new ChangeStreamRequestOptions(null, "user", Duration.ofMillis(10), ChangeStreamOptions.builder().build())),
 				User.class);
 
 		awaitSubscription(subscription1);
@@ -286,12 +303,12 @@ public void resumesCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener2 = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> subSequentRequest = ChangeStreamRequest.builder().collection("user")
-				.publishTo(messageListener2).resumeToken(resumeToken).build();
+				.publishTo(messageListener2).resumeToken(resumeToken).maxAwaitTime(Duration.ofMillis(10)).build();
 
 		Subscription subscription2 = container.register(subSequentRequest, User.class);
 		awaitSubscription(subscription2);
 
-		awaitMessages(messageListener2);
+		awaitMessages(messageListener2, 2);
 
 		List<User> messageBodies = messageListener2.getMessages().stream().map(Message::getBody)
 				.collect(Collectors.toList());
@@ -300,10 +317,11 @@ public void resumesCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1803
-	public void readsAndConvertsMessageBodyCorrectly() throws InterruptedException {
+	void readsAndConvertsMessageBodyCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
-		ChangeStreamRequest<User> request = new ChangeStreamRequest<>(messageListener, () -> "user");
+		ChangeStreamRequest<User> request = new ChangeStreamRequest<>(messageListener,
+				new ChangeStreamRequestOptions(null, "user", Duration.ofMillis(10), ChangeStreamOptions.builder().build()));
 
 		Subscription subscription = container.register(request, User.class);
 		awaitSubscription(subscription);
@@ -321,10 +339,11 @@ public void readsAndConvertsMessageBodyCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1803
-	public void readsAndConvertsUpdateMessageBodyCorrectly() throws InterruptedException {
+	void readsAndConvertsUpdateMessageBodyCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
-		ChangeStreamRequest<User> request = new ChangeStreamRequest<>(messageListener, () -> "user");
+		ChangeStreamRequest<User> request = new ChangeStreamRequest<>(messageListener,
+				new ChangeStreamRequestOptions(null, "user", Duration.ofMillis(10), ChangeStreamOptions.builder().build()));
 
 		Subscription subscription = container.register(request, User.class);
 		awaitSubscription(subscription);
@@ -340,10 +359,11 @@ public void readsAndConvertsUpdateMessageBodyCorrectly() throws InterruptedExcep
 	}
 
 	@Test // DATAMONGO-1803
-	public void readsOnlyDiffForUpdateWhenNotMappedToDomainType() throws InterruptedException {
+	void readsOnlyDiffForUpdateWhenNotMappedToDomainType() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, Document> messageListener = new CollectingMessageListener<>();
-		ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(messageListener, () -> "user");
+		ChangeStreamRequest<Document> request = new ChangeStreamRequest<>(messageListener,
+				new ChangeStreamRequestOptions(null, "user", Duration.ofMillis(10), ChangeStreamOptions.builder().build()));
 
 		Subscription subscription = container.register(request, Document.class);
 		awaitSubscription(subscription);
@@ -360,12 +380,13 @@ public void readsOnlyDiffForUpdateWhenNotMappedToDomainType() throws Interrupted
 	}
 
 	@Test // DATAMONGO-1803
-	public void readsOnlyDiffForUpdateWhenOptionsDeclareDefaultExplicitly() throws InterruptedException {
+	void readsOnlyDiffForUpdateWhenOptionsDeclareDefaultExplicitly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
 				.collection("user") //
 				.fullDocumentLookup(FullDocument.DEFAULT) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.publishTo(messageListener).build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -382,12 +403,14 @@ public void readsOnlyDiffForUpdateWhenOptionsDeclareDefaultExplicitly() throws I
 	}
 
 	@Test // DATAMONGO-1803
-	public void readsFullDocumentForUpdateWhenNotMappedToDomainTypeButLookupSpecified() throws InterruptedException {
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+	void readsFullDocumentForUpdateWhenNotMappedToDomainTypeButLookupSpecified() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, Document> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<Document> request = ChangeStreamRequest.builder() //
 				.collection("user") //
 				.fullDocumentLookup(FullDocument.UPDATE_LOOKUP) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.publishTo(messageListener).build();
 
 		Subscription subscription = container.register(request, Document.class);
@@ -406,10 +429,13 @@ public void readsFullDocumentForUpdateWhenNotMappedToDomainTypeButLookupSpecifie
 	}
 
 	@Test // DATAMONGO-2012, DATAMONGO-2113
-	public void resumeAtTimestampCorrectly() throws InterruptedException {
+	@MongoVersion(asOf = "4.0")
+	void resumeAtTimestampCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener1 = new CollectingMessageListener<>();
-		Subscription subscription1 = container.register(new ChangeStreamRequest<>(messageListener1, () -> "user"),
+		Subscription subscription1 = container.register(
+				new ChangeStreamRequest<>(messageListener1,
+						new ChangeStreamRequestOptions(null, "user", Duration.ofMillis(10), ChangeStreamOptions.builder().build())),
 				User.class);
 
 		awaitSubscription(subscription1);
@@ -433,12 +459,13 @@ public void resumeAtTimestampCorrectly() throws InterruptedException {
 				.collection("user") //
 				.resumeAt(resumeAt) //
 				.publishTo(messageListener2) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.build();
 
 		Subscription subscription2 = container.register(subSequentRequest, User.class);
 		awaitSubscription(subscription2);
 
-		awaitMessages(messageListener2);
+		awaitMessages(messageListener2, 2);
 
 		List<User> messageBodies = messageListener2.getMessages().stream().map(Message::getBody)
 				.collect(Collectors.toList());
@@ -447,12 +474,13 @@ public void resumeAtTimestampCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1996
-	public void filterOnNestedElementWorksCorrectly() throws InterruptedException {
+	void filterOnNestedElementWorksCorrectly() throws InterruptedException {
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder(messageListener) //
 				.collection("user") //
 				.filter(newAggregation(User.class, match(where("address.street").is("flower street")))) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -477,7 +505,7 @@ public void filterOnNestedElementWorksCorrectly() throws InterruptedException {
 	}
 
 	@Test // DATAMONGO-1996
-	public void filterOnUpdateDescriptionElement() throws InterruptedException {
+	void filterOnUpdateDescriptionElement() throws InterruptedException {
 
 		template.save(jellyBelly);
 		template.save(sugarSplashy);
@@ -487,6 +515,7 @@ public void filterOnUpdateDescriptionElement() throws InterruptedException {
 		ChangeStreamRequest<User> request = ChangeStreamRequest.builder(messageListener) //
 				.collection("user") //
 				.filter(newAggregation(User.class, match(where("updateDescription.updatedFields.address").exists(true)))) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
 				.fullDocumentLookup(FullDocument.UPDATE_LOOKUP).build();
 
 		Subscription subscription = container.register(request, User.class);
@@ -509,7 +538,192 @@ public void filterOnUpdateDescriptionElement() throws InterruptedException {
 		assertThat(messageBodies).hasSize(2);
 	}
 
-	@Data
+	@Test // GH-4187
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "6.0")
+	void readsFullDocumentBeforeChangeWhenOptionDeclaredWhenAvailable() throws InterruptedException {
+
+		createUserCollectionWithChangeStreamPreAndPostImagesEnabled();
+
+		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
+		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
+				.collection("user") //
+				.fullDocumentLookup(FullDocument.WHEN_AVAILABLE) //
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.WHEN_AVAILABLE) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
+				.publishTo(messageListener).build();
+
+		Subscription subscription = container.register(request, User.class);
+		awaitSubscription(subscription);
+
+		template.save(jellyBelly);
+
+		template.update(User.class).matching(query(where("id").is(jellyBelly.id))).apply(Update.update("age", 8)).first();
+
+		awaitMessages(messageListener, 2);
+
+		assertThat(messageListener.getFirstMessage().getBodyBeforeChange()).isNull();
+		assertThat(messageListener.getFirstMessage().getBody()).isEqualTo(jellyBelly);
+
+		assertThat(messageListener.getLastMessage().getBodyBeforeChange()).isEqualTo(jellyBelly);
+		assertThat(messageListener.getLastMessage().getBody()).isEqualTo(jellyBelly.withAge(8));
+	}
+
+	@Test // GH-4187
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "6.0")
+	void readsFullDocumentBeforeChangeWhenOptionDeclaredRequired() throws InterruptedException {
+
+		createUserCollectionWithChangeStreamPreAndPostImagesEnabled();
+
+		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
+		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
+				.collection("user") //
+				.fullDocumentLookup(FullDocument.WHEN_AVAILABLE) //
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.REQUIRED) //
+				.maxAwaitTime(Duration.ofMillis(10)) //
+				.publishTo(messageListener).build();
+
+		Subscription subscription = container.register(request, User.class);
+		awaitSubscription(subscription);
+
+		template.save(jellyBelly);
+
+		template.update(User.class).matching(query(where("id").is(jellyBelly.id))).apply(Update.update("age", 8)).first();
+
+		awaitMessages(messageListener, 2);
+
+		assertThat(messageListener.getFirstMessage().getBodyBeforeChange()).isNull();
+		assertThat(messageListener.getFirstMessage().getBody()).isEqualTo(jellyBelly);
+
+		assertThat(messageListener.getLastMessage().getBodyBeforeChange()).isEqualTo(jellyBelly);
+		assertThat(messageListener.getLastMessage().getBody()).isEqualTo(jellyBelly.withAge(8));
+	}
+
+	@Test // GH-4187
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "6.0")
+	void readsFullDocumentBeforeChangeWhenOptionIsNotDeclared() throws InterruptedException {
+
+		createUserCollectionWithChangeStreamPreAndPostImagesEnabled();
+
+		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
+		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
+				.collection("user") //
+				.maxAwaitTime(Duration.ofMillis(10)) //
+				.publishTo(messageListener).build();
+
+		Subscription subscription = container.register(request, User.class);
+		awaitSubscription(subscription);
+
+		template.save(jellyBelly);
+
+		template.update(User.class).matching(query(where("id").is(jellyBelly.id))).apply(Update.update("age", 8)).first();
+
+		awaitMessages(messageListener, 2);
+
+		assertThat(messageListener.getFirstMessage().getBodyBeforeChange()).isNull();
+		assertThat(messageListener.getLastMessage().getBodyBeforeChange()).isNull();
+	}
+
+	@Test // GH-4187
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "6.0")
+	void readsFullDocumentBeforeChangeWhenOptionDeclaredDefault() throws InterruptedException {
+
+		createUserCollectionWithChangeStreamPreAndPostImagesEnabled();
+
+		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
+		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
+				.collection("user") //
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.DEFAULT).maxAwaitTime(Duration.ofMillis(10)) //
+				.publishTo(messageListener).build();
+
+		Subscription subscription = container.register(request, User.class);
+		awaitSubscription(subscription);
+
+		template.save(jellyBelly);
+
+		template.update(User.class).matching(query(where("id").is(jellyBelly.id))).apply(Update.update("age", 8)).first();
+
+		awaitMessages(messageListener, 2);
+
+		assertThat(messageListener.getFirstMessage().getBodyBeforeChange()).isNull();
+		assertThat(messageListener.getLastMessage().getBodyBeforeChange()).isNull();
+	}
+
+	@Test // GH-4187
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "6.0")
+	void readsFullDocumentBeforeChangeWhenOptionDeclaredOff() throws InterruptedException {
+
+		createUserCollectionWithChangeStreamPreAndPostImagesEnabled();
+
+		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
+		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
+				.collection("user") //
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.OFF).maxAwaitTime(Duration.ofMillis(10)) //
+				.publishTo(messageListener).build();
+
+		Subscription subscription = container.register(request, User.class);
+		awaitSubscription(subscription);
+
+		template.save(jellyBelly);
+
+		template.update(User.class).matching(query(where("id").is(jellyBelly.id))).apply(Update.update("age", 8)).first();
+
+		awaitMessages(messageListener, 2);
+
+		assertThat(messageListener.getFirstMessage().getBodyBeforeChange()).isNull();
+		assertThat(messageListener.getLastMessage().getBodyBeforeChange()).isNull();
+	}
+
+	@Test // GH-4187
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "6.0")
+	void readsFullDocumentBeforeChangeWhenOptionDeclaredWhenAvailableAndChangeStreamPreAndPostImagesDisabled()
+			throws InterruptedException {
+
+		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
+		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
+				.collection("user") //
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.WHEN_AVAILABLE).maxAwaitTime(Duration.ofMillis(10)) //
+				.publishTo(messageListener).build();
+
+		Subscription subscription = container.register(request, User.class);
+		awaitSubscription(subscription);
+
+		template.save(jellyBelly);
+
+		template.update(User.class).matching(query(where("id").is(jellyBelly.id))).apply(Update.update("age", 8)).first();
+
+		awaitMessages(messageListener, 2);
+
+		assertThat(messageListener.getFirstMessage().getBodyBeforeChange()).isNull();
+		assertThat(messageListener.getLastMessage().getBodyBeforeChange()).isNull();
+	}
+
+	@Test // GH-4187
+	@Disabled("Flakey test failing occasionally due to timing issues")
+	void readsFullDocumentBeforeChangeWhenOptionDeclaredRequiredAndMongoVersionIsLessThan6() throws InterruptedException {
+
+		CollectingMessageListener<ChangeStreamDocument<Document>, User> messageListener = new CollectingMessageListener<>();
+		ChangeStreamRequest<User> request = ChangeStreamRequest.builder() //
+				.collection("user") //
+				.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.REQUIRED).maxAwaitTime(Duration.ofMillis(10)) //
+				.publishTo(messageListener).build();
+
+		Subscription subscription = container.register(request, User.class);
+		awaitSubscription(subscription);
+
+		template.save(jellyBelly);
+
+		template.update(User.class).matching(query(where("id").is(jellyBelly.id))).apply(Update.update("age", 8)).first();
+
+		awaitMessages(messageListener, 2);
+
+		assertThat(messageListener.getFirstMessage().getBodyBeforeChange()).isNull();
+		assertThat(messageListener.getLastMessage().getBodyBeforeChange()).isNull();
+	}
+
+	private void createUserCollectionWithChangeStreamPreAndPostImagesEnabled() {
+		template.createCollection(User.class, CollectionOptions.emitChangedRevisions());
+	}
+
 	static class User {
 
 		@Id String id;
@@ -517,14 +731,111 @@ static class User {
 		int age;
 
 		Address address;
+
+		User withAge(int age) {
+
+			User user = new User();
+			user.id = id;
+			user.userName = userName;
+			user.age = age;
+
+			return user;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getUserName() {
+			return this.userName;
+		}
+
+		public int getAge() {
+			return this.age;
+		}
+
+		public Address getAddress() {
+			return this.address;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			User user = (User) o;
+			return age == user.age && Objects.equals(id, user.id) && Objects.equals(userName, user.userName)
+					&& Objects.equals(address, user.address);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, userName, age, address);
+		}
+
+		public String toString() {
+			return "ChangeStreamTests.User(id=" + this.getId() + ", userName=" + this.getUserName() + ", age=" + this.getAge()
+					+ ", address=" + this.getAddress() + ")";
+		}
 	}
 
-	@Data
-	@AllArgsConstructor
-	@NoArgsConstructor
 	static class Address {
 
 		@Field("s") String street;
+
+		public Address(String street) {
+			this.street = street;
+		}
+
+		public Address() {}
+
+		public String getStreet() {
+			return this.street;
+		}
+
+		public void setStreet(String street) {
+			this.street = street;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Address address = (Address) o;
+			return Objects.equals(street, address.street);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(street);
+		}
+
+		public String toString() {
+			return "ChangeStreamTests.Address(street=" + this.getStreet() + ")";
+		}
 	}
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/CursorReadingTaskUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/CursorReadingTaskUnitTests.java
index 91fcb4c871..5e9acbdcda 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/CursorReadingTaskUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/CursorReadingTaskUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,15 @@
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
 import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
@@ -46,7 +49,8 @@
  *
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class CursorReadingTaskUnitTests {
 
 	@Mock MongoDatabase db;
@@ -59,7 +63,7 @@ public class CursorReadingTaskUnitTests {
 
 	ValueCapturingTaskStub task;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		when(request.getRequestOptions()).thenReturn(options);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerTests.java
index 35fc3463b7..9373845a89 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,9 +20,8 @@
 import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.messaging.SubscriptionUtils.*;
 
-import lombok.Data;
-
 import java.time.Duration;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
@@ -33,15 +32,21 @@
 import org.springframework.core.task.SimpleAsyncTaskExecutor;
 import org.springframework.dao.DataAccessException;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.ChangeStreamOptions;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
+import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest.ChangeStreamRequestOptions;
 import org.springframework.data.mongodb.core.messaging.SubscriptionRequest.RequestOptions;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
 import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
 import org.springframework.data.mongodb.test.util.MongoServerCondition;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.Template;
 import org.springframework.util.ErrorHandler;
 
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.model.CreateCollectionOptions;
 import com.mongodb.client.model.changestream.ChangeStreamDocument;
@@ -51,44 +56,47 @@
  *
  * @author Christoph Strobl
  */
-@ExtendWith(MongoServerCondition.class)
+@ExtendWith({ MongoTemplateExtension.class, MongoServerCondition.class })
 public class DefaultMessageListenerContainerTests {
 
-	public static final String DATABASE_NAME = "change-stream-events";
-	public static final String COLLECTION_NAME = "collection-1";
-	public static final String COLLECTION_2_NAME = "collection-2";
+	static final String DATABASE_NAME = "change-stream-events";
+	static final String COLLECTION_NAME = "collection-1";
+	static final String COLLECTION_2_NAME = "collection-2";
+	static final String COLLECTION_3_NAME = "collection-3";
+
+	static final Duration TIMEOUT = Duration.ofSeconds(2);
+
+	@Client static MongoClient client;
 
-	public static final Duration TIMEOUT = Duration.ofSeconds(2);
+	@Template(database = DATABASE_NAME, initialEntitySet = Person.class) //
+	static MongoTemplate template;
 
-	MongoDbFactory dbFactory;
-	MongoCollection<Document> collection;
-	MongoCollection<Document> collection2;
+	MongoDatabaseFactory dbFactory = template.getMongoDatabaseFactory();
+
+	MongoCollection<Document> collection = template.getCollection(COLLECTION_NAME);
+	MongoCollection<Document> collection2 = template.getCollection(COLLECTION_2_NAME);
 
 	private CollectingMessageListener<Object, Object> messageListener;
-	private MongoTemplate template;
 
 	@BeforeEach
-	void beforeEach() {
-
-		dbFactory = new SimpleMongoClientDbFactory(MongoTestUtils.client(), DATABASE_NAME);
-		template = new MongoTemplate(dbFactory);
+	void beforeEach() throws InterruptedException {
 
-		template.dropCollection(COLLECTION_NAME);
-		template.dropCollection(COLLECTION_2_NAME);
+		MongoTestUtils.dropCollectionNow(DATABASE_NAME, COLLECTION_NAME, client);
+		MongoTestUtils.dropCollectionNow(DATABASE_NAME, COLLECTION_2_NAME, client);
+		MongoTestUtils.dropCollectionNow(DATABASE_NAME, COLLECTION_3_NAME, client);
 
-		collection = template.getCollection(COLLECTION_NAME);
-		collection2 = template.getCollection(COLLECTION_2_NAME);
+		Thread.sleep(100);
 
 		messageListener = new CollectingMessageListener<>();
 	}
 
 	@Test // DATAMONGO-1803
 	@EnableIfReplicaSetAvailable
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 	public void shouldCollectMappedChangeStreamMessagesCorrectly() throws InterruptedException {
 
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
-		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, () -> COLLECTION_NAME),
-				Person.class);
+		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, options()), Person.class);
 		container.start();
 
 		awaitSubscription(subscription, TIMEOUT);
@@ -113,13 +121,13 @@ public void shouldNotifyErrorHandlerOnErrorInListener() throws InterruptedExcept
 
 			try {
 				if (thrownException.compareAndSet(false, true)) {
-					throw new IllegalStateException("Boom!");
+					throw new IllegalStateException("Boom");
 				}
 			} finally {
 				messageListener.onMessage(message);
 			}
 
-		}, () -> COLLECTION_NAME), Person.class, errorHandler);
+		}, options()), Person.class, errorHandler);
 		container.start();
 
 		awaitSubscription(subscription, TIMEOUT);
@@ -138,8 +146,7 @@ public void shouldNotifyErrorHandlerOnErrorInListener() throws InterruptedExcept
 	public void shouldNoLongerReceiveMessagesWhenContainerStopped() throws InterruptedException {
 
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
-		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, () -> COLLECTION_NAME),
-				Document.class);
+		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, options()), Document.class);
 		container.start();
 
 		awaitSubscription(subscription, TIMEOUT);
@@ -168,8 +175,7 @@ public void shouldReceiveMessagesWhenAddingRequestToAlreadyStartedContainer() th
 		Document unexpected = new Document("_id", "id-1").append("value", "foo");
 		collection.insertOne(unexpected);
 
-		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, () -> COLLECTION_NAME),
-				Document.class);
+		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, options()), Document.class);
 
 		awaitSubscription(subscription, TIMEOUT);
 
@@ -188,8 +194,7 @@ public void shouldReceiveMessagesWhenAddingRequestToAlreadyStartedContainer() th
 	public void shouldStartReceivingMessagesWhenContainerStarts() throws InterruptedException {
 
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
-		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, () -> COLLECTION_NAME),
-				Document.class);
+		Subscription subscription = container.register(new ChangeStreamRequest(messageListener, options()), Document.class);
 
 		collection.insertOne(new Document("_id", "id-1").append("value", "foo"));
 
@@ -213,7 +218,7 @@ public void shouldStartReceivingMessagesWhenContainerStarts() throws Interrupted
 	@Test // DATAMONGO-1803
 	public void tailableCursor() throws InterruptedException {
 
-		dbFactory.getDb().createCollection(COLLECTION_NAME,
+		dbFactory.getMongoDatabase().createCollection(COLLECTION_NAME,
 				new CreateCollectionOptions().capped(true).maxDocuments(10000).sizeInBytes(10000));
 
 		collection.insertOne(new Document("_id", "id-1").append("value", "foo"));
@@ -221,8 +226,8 @@ public void tailableCursor() throws InterruptedException {
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
 		container.start();
 
-		awaitSubscription(
-				container.register(new TailableCursorRequest(messageListener, () -> COLLECTION_NAME), Document.class), TIMEOUT);
+		awaitSubscription(container.register(new TailableCursorRequest(messageListener, options()), Document.class),
+				TIMEOUT);
 
 		collection.insertOne(new Document("_id", "id-2").append("value", "bar"));
 
@@ -235,14 +240,14 @@ public void tailableCursor() throws InterruptedException {
 	@Test // DATAMONGO-1803
 	public void tailableCursorOnEmptyCollection() throws InterruptedException {
 
-		dbFactory.getDb().createCollection(COLLECTION_NAME,
+		dbFactory.getMongoDatabase().createCollection(COLLECTION_NAME,
 				new CreateCollectionOptions().capped(true).maxDocuments(10000).sizeInBytes(10000));
 
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
 		container.start();
 
-		awaitSubscription(
-				container.register(new TailableCursorRequest(messageListener, () -> COLLECTION_NAME), Document.class), TIMEOUT);
+		awaitSubscription(container.register(new TailableCursorRequest(messageListener, options()), Document.class),
+				TIMEOUT);
 
 		collection.insertOne(new Document("_id", "id-1").append("value", "foo"));
 		collection.insertOne(new Document("_id", "id-2").append("value", "bar"));
@@ -256,7 +261,7 @@ public void tailableCursorOnEmptyCollection() throws InterruptedException {
 	@Test // DATAMONGO-1803
 	public void abortsSubscriptionOnError() throws InterruptedException {
 
-		dbFactory.getDb().createCollection(COLLECTION_NAME,
+		dbFactory.getMongoDatabase().createCollection(COLLECTION_NAME,
 				new CreateCollectionOptions().capped(true).maxDocuments(10000).sizeInBytes(10000));
 
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
@@ -264,7 +269,7 @@ public void abortsSubscriptionOnError() throws InterruptedException {
 
 		collection.insertOne(new Document("_id", "id-1").append("value", "foo"));
 
-		Subscription subscription = container.register(new TailableCursorRequest(messageListener, () -> COLLECTION_NAME),
+		Subscription subscription = container.register(new TailableCursorRequest(messageListener, options()),
 				Document.class);
 
 		awaitSubscription(subscription);
@@ -284,7 +289,7 @@ public void abortsSubscriptionOnError() throws InterruptedException {
 	@Test // DATAMONGO-1803
 	public void callsDefaultErrorHandlerOnError() throws InterruptedException {
 
-		dbFactory.getDb().createCollection(COLLECTION_NAME,
+		dbFactory.getMongoDatabase().createCollection(COLLECTION_3_NAME,
 				new CreateCollectionOptions().capped(true).maxDocuments(10000).sizeInBytes(10000));
 
 		collection.insertOne(new Document("_id", "id-1").append("value", "foo"));
@@ -297,14 +302,11 @@ public void callsDefaultErrorHandlerOnError() throws InterruptedException {
 		try {
 			container.start();
 
-			Subscription subscription = container.register(new TailableCursorRequest(messageListener, () -> COLLECTION_NAME),
+			Subscription subscription = container.register(new TailableCursorRequest(messageListener, options()),
 					Document.class);
 
 			SubscriptionUtils.awaitSubscription(subscription);
-
-			template.dropCollection(COLLECTION_NAME);
-
-			Thread.sleep(20);
+			dbFactory.getMongoDatabase().drop();
 
 			verify(errorHandler, atLeast(1)).handleError(any(DataAccessException.class));
 		} finally {
@@ -316,19 +318,19 @@ public void callsDefaultErrorHandlerOnError() throws InterruptedException {
 	@EnableIfReplicaSetAvailable
 	public void runsMoreThanOneTaskAtOnce() throws InterruptedException {
 
-		dbFactory.getDb().createCollection(COLLECTION_NAME,
+		dbFactory.getMongoDatabase().createCollection(COLLECTION_NAME,
 				new CreateCollectionOptions().capped(true).maxDocuments(10000).sizeInBytes(10000));
 
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
 		container.start();
 
 		CollectingMessageListener<Document, Document> tailableListener = new CollectingMessageListener<>();
-		Subscription tailableSubscription = container
-				.register(new TailableCursorRequest(tailableListener, () -> COLLECTION_NAME), Document.class);
+		Subscription tailableSubscription = container.register(new TailableCursorRequest(tailableListener, options()),
+				Document.class);
 
 		CollectingMessageListener<ChangeStreamDocument<Document>, Document> changeStreamListener = new CollectingMessageListener<>();
-		Subscription changeStreamSubscription = container
-				.register(new ChangeStreamRequest(changeStreamListener, () -> COLLECTION_NAME), Document.class);
+		Subscription changeStreamSubscription = container.register(new ChangeStreamRequest(changeStreamListener, options()),
+				Document.class);
 
 		awaitSubscriptions(tailableSubscription, changeStreamSubscription);
 
@@ -346,6 +348,7 @@ public void runsMoreThanOneTaskAtOnce() throws InterruptedException {
 
 	@Test // DATAMONGO-2012
 	@EnableIfReplicaSetAvailable
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 	public void databaseLevelWatch() throws InterruptedException {
 
 		MessageListenerContainer container = new DefaultMessageListenerContainer(template);
@@ -369,8 +372,8 @@ public void databaseLevelWatch() throws InterruptedException {
 						new Person("col-2-id-1", "bar"), new Person("col-2-id-2", "foo"));
 	}
 
-	@Data
 	static class Person {
+
 		@Id String id;
 		private String firstname;
 		private String lastname;
@@ -381,5 +384,57 @@ public Person(String id, String firstname) {
 			this.id = id;
 			this.firstname = firstname;
 		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Person person = (Person) o;
+			return Objects.equals(id, person.id) && Objects.equals(firstname, person.firstname)
+					&& Objects.equals(lastname, person.lastname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname);
+		}
+
+		public String toString() {
+			return "DefaultMessageListenerContainerTests.Person(id=" + this.getId() + ", firstname=" + this.getFirstname()
+					+ ", lastname=" + this.getLastname() + ")";
+		}
+	}
+
+	static ChangeStreamRequestOptions options() {
+		return new ChangeStreamRequestOptions(DATABASE_NAME, COLLECTION_NAME, Duration.ofMillis(10),
+				ChangeStreamOptions.builder().build());
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerUnitTests.java
index 8c479c8121..4df47b1c51 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/DefaultMessageListenerContainerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,11 +22,12 @@
 
 import java.time.Duration;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.dao.DataAccessResourceFailureException;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.util.ErrorHandler;
@@ -36,46 +37,46 @@
  *
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class DefaultMessageListenerContainerUnitTests {
+@ExtendWith(MockitoExtension.class)
+class DefaultMessageListenerContainerUnitTests {
 
 	@Mock MongoTemplate template;
 	@Mock ErrorHandler errorHandler;
 
-	DefaultMessageListenerContainer container;
+	private DefaultMessageListenerContainer container;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		container = new DefaultMessageListenerContainer(template);
 	}
 
 	@Test // DATAMONGO-1803
-	public void throwsErrorOnNullTemplate() {
+	void throwsErrorOnNullTemplate() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new DefaultMessageListenerContainer(null));
 	}
 
 	@Test // DATAMONGO-1803
-	public void startStopContainer() throws Throwable {
+	void startStopContainer() throws Throwable {
 		runOnce(new MultithreadedStartStopContainer(container));
 	}
 
 	@Test // DATAMONGO-1803
-	public void subscribeToContainerBeforeStartup() throws Throwable {
+	void subscribeToContainerBeforeStartup() throws Throwable {
 		runOnce(new MultithreadedSubscribeBeforeStartup(container));
 	}
 
 	@Test // DATAMONGO-1803
-	public void subscribeToContainerAfterStartup() throws Throwable {
+	void subscribeToContainerAfterStartup() throws Throwable {
 		runOnce(new MultithreadedSubscribeAfterStartup(container));
 	}
 
 	@Test // DATAMONGO-1803
-	public void stopSubscriptionWhileRunning() throws Throwable {
+	void stopSubscriptionWhileRunning() throws Throwable {
 		runOnce(new StopSubscriptionWhileRunning(container));
 	}
 
 	@Test // DATAMONGO-1803
-	public void removeSubscriptionWhileRunning() throws Throwable {
+	void removeSubscriptionWhileRunning() throws Throwable {
 		runOnce(new RemoveSubscriptionWhileRunning(container));
 	}
 
@@ -84,7 +85,7 @@ private static class RemoveSubscriptionWhileRunning extends MultithreadedTestCas
 		DefaultMessageListenerContainer container;
 		Subscription subscription;
 
-		public RemoveSubscriptionWhileRunning(DefaultMessageListenerContainer container) {
+		RemoveSubscriptionWhileRunning(DefaultMessageListenerContainer container) {
 			this.container = container;
 			subscription = container.register(new MockSubscriptionRequest(), new MockTask());
 		}
@@ -114,7 +115,7 @@ private static class StopSubscriptionWhileRunning extends MultithreadedTestCase
 		DefaultMessageListenerContainer container;
 		Subscription subscription;
 
-		public StopSubscriptionWhileRunning(DefaultMessageListenerContainer container) {
+		StopSubscriptionWhileRunning(DefaultMessageListenerContainer container) {
 			this.container = container;
 			subscription = container.register(new MockSubscriptionRequest(), new MockTask());
 		}
@@ -144,7 +145,7 @@ private static class MultithreadedSubscribeAfterStartup extends MultithreadedTes
 
 		DefaultMessageListenerContainer container;
 
-		public MultithreadedSubscribeAfterStartup(DefaultMessageListenerContainer container) {
+		MultithreadedSubscribeAfterStartup(DefaultMessageListenerContainer container) {
 			this.container = container;
 		}
 
@@ -174,7 +175,7 @@ private static class MultithreadedSubscribeBeforeStartup extends MultithreadedTe
 
 		DefaultMessageListenerContainer container;
 
-		public MultithreadedSubscribeBeforeStartup(DefaultMessageListenerContainer container) {
+		MultithreadedSubscribeBeforeStartup(DefaultMessageListenerContainer container) {
 			this.container = container;
 		}
 
@@ -207,7 +208,7 @@ private static class MultithreadedStartStopContainer extends MultithreadedTestCa
 
 		DefaultMessageListenerContainer container;
 
-		public MultithreadedStartStopContainer(DefaultMessageListenerContainer container) {
+		MultithreadedStartStopContainer(DefaultMessageListenerContainer container) {
 			this.container = container;
 		}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/SubscriptionUtils.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/SubscriptionUtils.java
index 0a4142d501..7cfe859e8e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/SubscriptionUtils.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/SubscriptionUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ static void awaitSubscription(Subscription subscription) throws InterruptedExcep
 	 * Wait for all {@link Subscription Subscriptions} to {@link Subscription#isActive() become active} but not longer
 	 * than {@link #DEFAULT_TIMEOUT}.
 	 *
-	 * @param subscription
+	 * @param subscriptions
 	 * @throws InterruptedException
 	 */
 	static void awaitSubscriptions(Subscription... subscriptions) throws InterruptedException {
@@ -131,7 +131,8 @@ static void awaitMessages(CollectingMessageListener listener, int nrMessages, Du
 	/**
 	 * {@link MessageListener} implementation collecting received {@link Message messages}.
 	 *
-	 * @param <M>
+	 * @param <S> source message type.
+	 * @param <T> target message type.
 	 */
 	static class CollectingMessageListener<S, T> implements MessageListener<S, T> {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequestUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequestUnitTests.java
index 20c5f60a74..f9d4c71eda 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequestUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorRequestUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,8 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.data.mongodb.core.messaging.DefaultMessageListenerContainerTests.Person;
 import org.springframework.data.mongodb.core.query.Query;
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorTests.java
index 3ee84d5e64..60d9153212 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TailableCursorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,27 +20,28 @@
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.Data;
-
+import java.util.Objects;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
 import org.bson.Document;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.CollectionOptions;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.messaging.Message.MessageProperties;
 import org.springframework.data.mongodb.core.messaging.TailableCursorRequest.TailableCursorRequestOptions;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 
-import com.mongodb.MongoClient;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import com.mongodb.client.MongoClient;
 
 /**
  * Integration test for subscribing to a capped {@link com.mongodb.client.MongoCollection} inside the
@@ -49,10 +50,12 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
+@ExtendWith({ MongoClientExtension.class })
 public class TailableCursorTests {
 
 	static final String COLLECTION_NAME = "user";
 
+	static @Client MongoClient mongoClient;
 	static ThreadPoolExecutor executor;
 	MongoTemplate template;
 	MessageListenerContainer container;
@@ -61,15 +64,15 @@ public class TailableCursorTests {
 	User huffyFluffy;
 	User sugarSplashy;
 
-	@BeforeClass
+	@BeforeAll
 	public static void beforeClass() {
 		executor = new ThreadPoolExecutor(2, 2, 1, TimeUnit.SECONDS, new LinkedBlockingDeque<>());
 	}
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
-		template = new MongoTemplate(MongoTestUtils.client(), "tailable-cursor-tests");
+		template = new MongoTemplate(mongoClient, "tailable-cursor-tests");
 
 		template.dropCollection(User.class);
 		template.createCollection(User.class, CollectionOptions.empty().capped().maxDocuments(10000).size(10000));
@@ -93,12 +96,12 @@ public void setUp() {
 		sugarSplashy.age = 5;
 	}
 
-	@After
+	@AfterEach
 	public void tearDown() {
 		container.stop();
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void afterClass() {
 		executor.shutdown();
 	}
@@ -158,7 +161,7 @@ public void filtersMessagesCorrectly() throws InterruptedException {
 		template.save(sugarSplashy);
 		template.save(huffyFluffy);
 
-		awaitMessages(messageListener);
+		awaitMessages(messageListener, 2);
 
 		assertThat(messageListener.getMessages().stream().map(Message::getBody)).hasSize(2).doesNotContain(sugarSplashy);
 	}
@@ -179,7 +182,7 @@ public void mapsFilterToDomainType() throws InterruptedException {
 		template.save(sugarSplashy);
 		template.save(huffyFluffy);
 
-		awaitMessages(messageListener);
+		awaitMessages(messageListener, 1);
 
 		assertThat(messageListener.getMessages().stream().map(Message::getBody)).hasSize(1).containsExactly(sugarSplashy);
 	}
@@ -197,17 +200,62 @@ public void emitsFromStart() throws InterruptedException {
 
 		template.save(sugarSplashy);
 
-		awaitMessages(messageListener);
+		awaitMessages(messageListener, 3);
 
 		assertThat(messageListener.getMessages().stream().map(Message::getBody)).hasSize(3).containsExactly(jellyBelly,
 				huffyFluffy, sugarSplashy);
 	}
 
-	@Data
 	static class User {
 
 		@Id String id;
 		@Field("user_name") String userName;
 		int age;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getUserName() {
+			return this.userName;
+		}
+
+		public int getAge() {
+			return this.age;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setUserName(String userName) {
+			this.userName = userName;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			User user = (User) o;
+			return age == user.age && Objects.equals(id, user.id) && Objects.equals(userName, user.userName);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, userName, age);
+		}
+
+		public String toString() {
+			return "TailableCursorTests.User(id=" + this.getId() + ", userName=" + this.getUserName() + ", age="
+					+ this.getAge() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TaskFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TaskFactoryUnitTests.java
index ecfe498d6d..6888f9101c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TaskFactoryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/TaskFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,12 +18,13 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.messaging.ChangeStreamRequest.ChangeStreamRequestOptions;
@@ -35,30 +36,30 @@
  *
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class TaskFactoryUnitTests {
+@ExtendWith(MockitoExtension.class)
+class TaskFactoryUnitTests {
 
 	@Mock MongoConverter converter;
 	@Mock MongoTemplate template;
 	@Mock MessageListener<Object, Object> messageListener;
 	@Mock ErrorHandler errorHandler;
 
-	TaskFactory factory;
-
-	@Before
-	public void setUp() {
+	private TaskFactory factory;
 
-		when(template.getConverter()).thenReturn(converter);
+	@BeforeEach
+	void setUp() {
 		factory = new TaskFactory(template);
 	}
 
 	@Test // DATAMONGO-1803
-	public void requestMustNotBeNull() {
+	void requestMustNotBeNull() {
 		assertThatIllegalArgumentException().isThrownBy(() -> factory.forRequest(null, Object.class, errorHandler));
 	}
 
 	@Test // DATAMONGO-1803
-	public void createsChangeStreamRequestCorrectly() {
+	void createsChangeStreamRequestCorrectly() {
+
+		when(template.getConverter()).thenReturn(converter);
 
 		ChangeStreamRequestOptions options = Mockito.mock(ChangeStreamRequestOptions.class);
 		Task task = factory.forRequest(new ChangeStreamRequest(messageListener, options), Object.class, errorHandler);
@@ -67,7 +68,9 @@ public void createsChangeStreamRequestCorrectly() {
 	}
 
 	@Test // DATAMONGO-1803
-	public void createsTailableRequestCorrectly() {
+	void createsTailableRequestCorrectly() {
+
+		when(template.getConverter()).thenReturn(converter);
 
 		RequestOptions options = Mockito.mock(RequestOptions.class);
 		when(options.getCollectionName()).thenReturn("collection-1");
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicQueryUnitTests.java
index f9f7969166..70bd6dc3d9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,10 @@
 import nl.jqno.equalsverifier.Warning;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 
@@ -64,6 +66,7 @@ public void overridesSortCorrectly() {
 	}
 
 	@Test // DATAMONGO-1093
+	@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "EqualsVerifier uses reflection on Optional")
 	public void equalsContract() {
 
 		BasicQuery query1 = new BasicQuery("{ \"name\" : \"Thomas\"}", "{\"name\":1, \"age\":1}");
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicUpdateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicUpdateUnitTests.java
new file mode 100644
index 0000000000..dacc270230
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/BasicUpdateUnitTests.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2025 the original author 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.query;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.CsvSource;
+import org.junit.jupiter.params.provider.MethodSource;
+
+import org.springframework.data.mongodb.core.query.Update.Position;
+
+/**
+ * Unit tests for {@link BasicUpdate}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+class BasicUpdateUnitTests {
+
+	@Test // GH-4918
+	void setOperationValueShouldAppendsOpsCorrectly() {
+
+		BasicUpdate basicUpdate = new BasicUpdate("{}");
+		basicUpdate.setOperationValue("$set", "key1", "alt");
+		basicUpdate.setOperationValue("$set", "key2", "nps");
+		basicUpdate.setOperationValue("$unset", "key3", "x");
+
+		assertThat(basicUpdate.getUpdateObject())
+				.isEqualTo("{ '$set' : { 'key1' : 'alt', 'key2' : 'nps' }, '$unset' : { 'key3' : 'x' } }");
+	}
+
+	@Test // GH-4918
+	void setOperationErrorsOnNonMapType() {
+
+		BasicUpdate basicUpdate = new BasicUpdate("{ '$set' : 1 }");
+		assertThatExceptionOfType(IllegalStateException.class)
+				.isThrownBy(() -> basicUpdate.setOperationValue("$set", "k", "v"));
+	}
+
+	@ParameterizedTest // GH-4918
+	@CsvSource({ //
+			"{ }, k1, false", //
+			"{ '$set' : { 'k1' : 'v1' } }, k1, true", //
+			"{ '$set' : { 'k1' : 'v1' } }, k2, false", //
+			"{ '$set' : { 'k1.k2' : 'v1' } }, k1, false", //
+			"{ '$set' : { 'k1.k2' : 'v1' } }, k1.k2, true", //
+			"{ '$set' : { 'k1' : 'v1' } }, '', false", //
+			"{ '$inc' : { 'k1' : 1 } }, k1, true" })
+	void modifiesLooksUpKeyCorrectly(String source, String key, boolean modified) {
+
+		BasicUpdate basicUpdate = new BasicUpdate(source);
+		assertThat(basicUpdate.modifies(key)).isEqualTo(modified);
+	}
+
+	@ParameterizedTest // GH-4918
+	@MethodSource("updateOpArgs")
+	void updateOpsShouldNotOverrideExistingValues(String operator, Function<BasicUpdate, Update> updateFunction) {
+
+		Document source = Document.parse("{ '%s' : { 'key-1' : 'value-1' } }".formatted(operator));
+		Update update = updateFunction.apply(new BasicUpdate(source));
+
+		assertThat(update.getUpdateObject()).containsEntry("%s.key-1".formatted(operator), "value-1")
+				.containsKey("%s.key-2".formatted(operator));
+	}
+
+	@Test // GH-4918
+	void shouldNotOverridePullAll() {
+
+		Document source = Document.parse("{ '$pullAll' : { 'key-1' : ['value-1'] } }");
+		Update update = new BasicUpdate(source).pullAll("key-1", new String[] { "value-2" }).pullAll("key-2",
+				new String[] { "value-3" });
+
+		assertThat(update.getUpdateObject()).containsEntry("$pullAll.key-1", Arrays.asList("value-1", "value-2"))
+				.containsEntry("$pullAll.key-2", List.of("value-3"));
+	}
+
+	static Stream<Arguments> updateOpArgs() {
+		return Stream.of( //
+				Arguments.of("$set", (Function<BasicUpdate, Update>) update -> update.set("key-2", "value-2")),
+				Arguments.of("$unset", (Function<BasicUpdate, Update>) update -> update.unset("key-2")),
+				Arguments.of("$inc", (Function<BasicUpdate, Update>) update -> update.inc("key-2", 1)),
+				Arguments.of("$push", (Function<BasicUpdate, Update>) update -> update.push("key-2", "value-2")),
+				Arguments.of("$addToSet", (Function<BasicUpdate, Update>) update -> update.addToSet("key-2", "value-2")),
+				Arguments.of("$pop", (Function<BasicUpdate, Update>) update -> update.pop("key-2", Position.FIRST)),
+				Arguments.of("$pull", (Function<BasicUpdate, Update>) update -> update.pull("key-2", "value-2")),
+				Arguments.of("$pullAll",
+						(Function<BasicUpdate, Update>) update -> update.pullAll("key-2", new String[] { "value-2" })),
+				Arguments.of("$rename", (Function<BasicUpdate, Update>) update -> update.rename("key-2", "value-2")));
+	};
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java
index 566628a942..72f42db9b5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,23 +19,17 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import com.mongodb.client.MongoClients;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 import java.util.Arrays;
+import java.util.Base64;
 
 import org.bson.types.Binary;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.util.Base64Utils;
-
-import com.mongodb.client.MongoClient;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 /**
  * Integration tests for {@link Criteria} usage as part of a {@link Query}.
@@ -43,10 +37,11 @@
  * @author Christoph Strobl
  * @author Andreas Zink
  */
-public class CriteriaTests {
+@ExtendWith(MongoTemplateExtension.class)
+class CriteriaTests {
 
-	MongoOperations ops;
-	MongoClient client;
+	@Template(initialEntitySet = { DocumentWithBitmask.class }) //
+	static MongoTestTemplate ops;
 
 	static final DocumentWithBitmask FIFTY_FOUR/*00110110*/ = new DocumentWithBitmask("1", Integer.valueOf(54),
 			Integer.toBinaryString(54));
@@ -55,15 +50,12 @@ public class CriteriaTests {
 	static final DocumentWithBitmask TWENTY_FLOAT/*00010100*/ = new DocumentWithBitmask("3", Float.valueOf(20),
 			Integer.toBinaryString(20));
 	static final DocumentWithBitmask ONE_HUNDRED_TWO/*01100110*/ = new DocumentWithBitmask("4",
-			new Binary(Base64Utils.decodeFromString("Zg==")), "01100110");
+			new Binary(Base64.getDecoder().decode("Zg==")), "01100110");
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void beforeEach() {
 
-		client = MongoTestUtils.client();
-		ops = new MongoTemplate(client, "criteria-tests");
-
-		ops.dropCollection(DocumentWithBitmask.class);
+		ops.flush();
 
 		ops.insert(FIFTY_FOUR);
 		ops.insert(TWENTY_INT);
@@ -72,96 +64,162 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllClearWithBitPositions() {
+	void bitsAllClearWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().allClear(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllClearWithNumericBitmask() {
+	void bitsAllClearWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allClear(35)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllClearWithStringBitmask() {
+	void bitsAllClearWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allClear("ID==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllSetWithBitPositions() {
+	void bitsAllSetWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().allSet(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllSetWithNumericBitmask() {
+	void bitsAllSetWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allSet(50)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAllSetWithStringBitmask() {
+	void bitsAllSetWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().allSet("MC==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnyClearWithBitPositions() {
+	void bitsAnyClearWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().anyClear(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnyClearWithNumericBitmask() {
+	void bitsAnyClearWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anyClear(35)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnyClearWithStringBitmask() {
+	void bitsAnyClearWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anyClear("MC==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnySetWithBitPositions() {
+	void bitsAnySetWithBitPositions() {
 
 		assertThat(ops.find(query(where("value").bits().anySet(Arrays.asList(1, 5))), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnySetWithNumericBitmask() {
+	void bitsAnySetWithNumericBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anySet(35)), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, ONE_HUNDRED_TWO);
 	}
 
 	@Test // DATAMONGO-1808
-	public void bitsAnySetWithStringBitmask() {
+	void bitsAnySetWithStringBitmask() {
 
 		assertThat(ops.find(query(where("value").bits().anySet("MC==")), DocumentWithBitmask.class))
 				.containsExactlyInAnyOrder(FIFTY_FOUR, TWENTY_INT, TWENTY_FLOAT, ONE_HUNDRED_TWO);
 	}
 
-	@Data
-	@EqualsAndHashCode(exclude = "value")
-	@AllArgsConstructor
 	static class DocumentWithBitmask {
 
 		@Id String id;
 		Object value;
 		String binaryValue;
+
+		public DocumentWithBitmask(String id, Object value, String binaryValue) {
+
+			this.id = id;
+			this.value = value;
+			this.binaryValue = binaryValue;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Object getValue() {
+			return this.value;
+		}
+
+		public String getBinaryValue() {
+			return this.binaryValue;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(Object value) {
+			this.value = value;
+		}
+
+		public void setBinaryValue(String binaryValue) {
+			this.binaryValue = binaryValue;
+		}
+
+		public String toString() {
+			return "CriteriaTests.DocumentWithBitmask(id=" + this.getId() + ", value=" + this.getValue() + ", binaryValue="
+					+ this.getBinaryValue() + ")";
+		}
+
+		public boolean equals(final Object o) {
+			if (o == this)
+				return true;
+			if (!(o instanceof DocumentWithBitmask))
+				return false;
+			final DocumentWithBitmask other = (DocumentWithBitmask) o;
+			if (!other.canEqual((Object) this))
+				return false;
+			final Object this$id = this.getId();
+			final Object other$id = other.getId();
+			if (this$id == null ? other$id != null : !this$id.equals(other$id))
+				return false;
+			final Object this$binaryValue = this.getBinaryValue();
+			final Object other$binaryValue = other.getBinaryValue();
+			if (this$binaryValue == null ? other$binaryValue != null : !this$binaryValue.equals(other$binaryValue))
+				return false;
+			return true;
+		}
+
+		protected boolean canEqual(final Object other) {
+			return other instanceof DocumentWithBitmask;
+		}
+
+		public int hashCode() {
+			final int PRIME = 59;
+			int result = 1;
+			final Object $id = this.getId();
+			result = result * PRIME + ($id == null ? 43 : $id.hashCode());
+			final Object $binaryValue = this.getBinaryValue();
+			result = result * PRIME + ($binaryValue == null ? 43 : $binaryValue.hashCode());
+			return result;
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaUnitTests.java
index 13af8b0449..e734dd6aba 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/CriteriaUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,39 +18,84 @@
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.regex.Pattern;
 
+import org.bson.BsonRegularExpression;
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
+import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
 import org.springframework.data.mongodb.core.schema.MongoJsonSchema;
 
 /**
+ * Unit tests for {@link Criteria}.
+ *
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Andreas Zink
+ * @author Ziemowit Stolarczyk
+ * @author Clément Petit
+ * @author Mark Paluch
+ * @author James McNee
  */
-public class CriteriaUnitTests {
+class CriteriaUnitTests {
 
 	@Test
-	public void testSimpleCriteria() {
+	void testSimpleCriteria() {
 		Criteria c = new Criteria("name").is("Bubba");
-		assertThat(c.getCriteriaObject()).isEqualTo(Document.parse("{ \"name\" : \"Bubba\"}"));
+		assertThat(c.getCriteriaObject()).isEqualTo("{ \"name\" : \"Bubba\"}");
+	}
+
+	@Test // GH-4850
+	void testCombiningSimpleCriteria() {
+
+		Document expected = Document.parse("{ name : { $eq : 123, $type : ['long'] } }");
+
+		Criteria c = Criteria.where("name") //
+				.is(123) //
+				.type(Type.INT_64);
+
+		assertThat(c.getCriteriaObject()).isEqualTo(expected);
+
+		c = Criteria.where("name") //
+				.type(Type.INT_64).is(123);
+
+		assertThat(c.getCriteriaObject()).isEqualTo(expected);
+	}
+
+	@Test // GH-4850
+	void testCombiningBsonRegexCriteria() {
+
+		Criteria c = Criteria.where("name").regex(new BsonRegularExpression("^spring$")).type(Type.INT_64);
+
+		assertThat(c.getCriteriaObject())
+				.isEqualTo(Document.parse("{ name : { $regex : RegExp('^spring$'), $type : ['long'] } }"));
+	}
+
+	@Test // GH-4850
+	void testCombiningRegexCriteria() {
+
+		Criteria c = Criteria.where("name").regex("^spring$").type(Type.INT_64);
+
+		assertThat(c.getCriteriaObject()).hasEntrySatisfying("name.$regex",
+				it -> assertThat(it).isInstanceOf(Pattern.class));
 	}
 
 	@Test
-	public void testNotEqualCriteria() {
+	void testNotEqualCriteria() {
 		Criteria c = new Criteria("name").ne("Bubba");
-		assertThat(c.getCriteriaObject()).isEqualTo(Document.parse("{ \"name\" : { \"$ne\" : \"Bubba\"}}"));
+		assertThat(c.getCriteriaObject()).isEqualTo("{ \"name\" : { \"$ne\" : \"Bubba\"}}");
 	}
 
 	@Test
-	public void buildsIsNullCriteriaCorrectly() {
+	void buildsIsNullCriteriaCorrectly() {
 
 		Document reference = new Document("name", null);
 
@@ -59,19 +104,20 @@ public void buildsIsNullCriteriaCorrectly() {
 	}
 
 	@Test
-	public void testChainedCriteria() {
+	void testChainedCriteria() {
 		Criteria c = new Criteria("name").is("Bubba").and("age").lt(21);
-		assertThat(c.getCriteriaObject()).isEqualTo(Document.parse("{ \"name\" : \"Bubba\" , \"age\" : { \"$lt\" : 21}}"));
+		assertThat(c.getCriteriaObject()).isEqualTo("{ \"name\" : \"Bubba\" , \"age\" : { \"$lt\" : 21}}");
 	}
 
-	@Test(expected = InvalidMongoDbApiUsageException.class)
-	public void testCriteriaWithMultipleConditionsForSameKey() {
+	@Test
+	void testCriteriaWithMultipleConditionsForSameKey() {
 		Criteria c = new Criteria("name").gte("M").and("name").ne("A");
-		c.getCriteriaObject();
+
+		assertThatExceptionOfType(InvalidMongoDbApiUsageException.class).isThrownBy(c::getCriteriaObject);
 	}
 
 	@Test
-	public void equalIfCriteriaMatches() {
+	void equalIfCriteriaMatches() {
 
 		Criteria left = new Criteria("name").is("Foo").and("lastname").is("Bar");
 		Criteria right = new Criteria("name").is("Bar").and("lastname").is("Bar");
@@ -80,39 +126,91 @@ public void equalIfCriteriaMatches() {
 		assertThat(right).isNotEqualTo(left);
 	}
 
+	@Test // GH-3286
+	void shouldBuildCorrectAndOperator() {
+
+		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
+				Criteria.where("z").is("value"));
+
+		Criteria criteria = Criteria.where("foo").is("bar").andOperator(operatorCriteria);
+
+		assertThat(criteria.getCriteriaObject())
+				.isEqualTo("{\"$and\":[{\"x\":true}, {\"y\":42}, {\"z\":\"value\"}], \"foo\":\"bar\"}");
+	}
+
+	@Test // GH-3286
+	void shouldBuildCorrectOrOperator() {
+
+		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
+				Criteria.where("z").is("value"));
+
+		Criteria criteria = Criteria.where("foo").is("bar").orOperator(operatorCriteria);
+
+		assertThat(criteria.getCriteriaObject())
+				.isEqualTo("{\"$or\":[{\"x\":true}, {\"y\":42}, {\"z\":\"value\"}], \"foo\":\"bar\"}");
+	}
+
+	@Test // GH-3286
+	void shouldBuildCorrectNorOperator() {
+
+		Collection<Criteria> operatorCriteria = Arrays.asList(Criteria.where("x").is(true), Criteria.where("y").is(42),
+				Criteria.where("z").is("value"));
+
+		Criteria criteria = Criteria.where("foo").is("bar").norOperator(operatorCriteria);
+
+		assertThat(criteria.getCriteriaObject())
+				.isEqualTo("{\"$nor\":[{\"x\":true}, {\"y\":42}, {\"z\":\"value\"}], \"foo\":\"bar\"}");
+	}
+
 	@Test // DATAMONGO-507
-	public void shouldThrowExceptionWhenTryingToNegateAndOperation() {
+	void shouldThrowExceptionWhenTryingToNegateAndOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new Criteria() //
 				.not() //
 				.andOperator(Criteria.where("delete").is(true).and("_id").is(42)));
 	}
 
 	@Test // DATAMONGO-507
-	public void shouldThrowExceptionWhenTryingToNegateOrOperation() {
+	void shouldThrowExceptionWhenTryingToNegateOrOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new Criteria() //
 				.not() //
 				.orOperator(Criteria.where("delete").is(true).and("_id").is(42)));
 	}
 
 	@Test // DATAMONGO-507
-	public void shouldThrowExceptionWhenTryingToNegateNorOperation() {
+	void shouldThrowExceptionWhenTryingToNegateNorOperation() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new Criteria() //
 				.not() //
 				.norOperator(Criteria.where("delete").is(true).and("_id").is(42)));
 	}
 
 	@Test // DATAMONGO-507
-	public void shouldNegateFollowingSimpleExpression() {
+	void shouldNegateFollowingSimpleExpression() {
 
 		Criteria c = Criteria.where("age").not().gt(18).and("status").is("student");
 		Document co = c.getCriteriaObject();
 
 		assertThat(co).isNotNull();
-		assertThat(co).isEqualTo(Document.parse("{ \"age\" : { \"$not\" : { \"$gt\" : 18}} , \"status\" : \"student\"}"));
+		assertThat(co).isEqualTo("{ \"age\" : { \"$not\" : { \"$gt\" : 18}} , \"status\" : \"student\"}");
+	}
+
+	@Test // GH-3726
+	void shouldBuildCorrectSampleRateOperation() {
+		Criteria c = new Criteria().sampleRate(0.4);
+		assertThat(c.getCriteriaObject()).isEqualTo("{ \"$sampleRate\" : 0.4 }");
+	}
+
+	@Test // GH-3726
+	void shouldThrowExceptionWhenSampleRateIsNegative() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new Criteria().sampleRate(-1));
+	}
+
+	@Test // GH-3726
+	void shouldThrowExceptionWhenSampleRateIsGreatedThanOne() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new Criteria().sampleRate(1.01));
 	}
 
 	@Test // DATAMONGO-1068
-	public void getCriteriaObjectShouldReturnEmptyDocumentWhenNoCriteriaSpecified() {
+	void getCriteriaObjectShouldReturnEmptyDocumentWhenNoCriteriaSpecified() {
 
 		Document document = new Criteria().getCriteriaObject();
 
@@ -120,7 +218,7 @@ public void getCriteriaObjectShouldReturnEmptyDocumentWhenNoCriteriaSpecified()
 	}
 
 	@Test // DATAMONGO-1068
-	public void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresent() {
+	void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresent() {
 
 		Document document = new Criteria().lt("foo").getCriteriaObject();
 
@@ -128,7 +226,7 @@ public void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresent() {
 	}
 
 	@Test // DATAMONGO-1068
-	public void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresentButMultipleCriteriasPresent() {
+	void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresentButMultipleCriteriasPresent() {
 
 		Document document = new Criteria().lt("foo").gt("bar").getCriteriaObject();
 
@@ -136,15 +234,23 @@ public void getCriteriaObjectShouldUseCritieraValuesWhenNoKeyIsPresentButMultipl
 	}
 
 	@Test // DATAMONGO-1068
-	public void getCriteriaObjectShouldRespectNotWhenNoKeyPresent() {
+	void getCriteriaObjectShouldRespectNotWhenNoKeyPresent() {
 
 		Document document = new Criteria().lt("foo").not().getCriteriaObject();
 
 		assertThat(document).isEqualTo(new Document().append("$not", new Document("$lt", "foo")));
 	}
 
+	@Test // GH-4220
+	void usesCorrectBsonType() {
+
+		Document document = new Criteria("foo").type(Type.BOOLEAN).getCriteriaObject();
+
+		assertThat(document).containsEntry("foo.$type", Collections.singletonList("bool"));
+	}
+
 	@Test // DATAMONGO-1135
-	public void geoJsonTypesShouldBeWrappedInGeometry() {
+	void geoJsonTypesShouldBeWrappedInGeometry() {
 
 		Document document = new Criteria("foo").near(new GeoJsonPoint(100, 200)).getCriteriaObject();
 
@@ -152,7 +258,7 @@ public void geoJsonTypesShouldBeWrappedInGeometry() {
 	}
 
 	@Test // DATAMONGO-1135
-	public void legacyCoordinateTypesShouldNotBeWrappedInGeometry() {
+	void legacyCoordinateTypesShouldNotBeWrappedInGeometry() {
 
 		Document document = new Criteria("foo").near(new Point(100, 200)).getCriteriaObject();
 
@@ -160,7 +266,7 @@ public void legacyCoordinateTypesShouldNotBeWrappedInGeometry() {
 	}
 
 	@Test // DATAMONGO-1135
-	public void maxDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
+	void maxDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
 
 		Document document = new Criteria("foo").near(new GeoJsonPoint(100, 200)).maxDistance(50D).getCriteriaObject();
 
@@ -168,7 +274,7 @@ public void maxDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
 	}
 
 	@Test // DATAMONGO-1135
-	public void maxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
+	void maxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
 
 		Document document = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).maxDistance(50D).getCriteriaObject();
 
@@ -176,7 +282,7 @@ public void maxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonTyp
 	}
 
 	@Test // DATAMONGO-1110
-	public void minDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
+	void minDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
 
 		Document document = new Criteria("foo").near(new GeoJsonPoint(100, 200)).minDistance(50D).getCriteriaObject();
 
@@ -184,7 +290,7 @@ public void minDistanceShouldBeMappedInsideNearWhenUsedAlongWithGeoJsonType() {
 	}
 
 	@Test // DATAMONGO-1110
-	public void minDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
+	void minDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
 
 		Document document = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).minDistance(50D).getCriteriaObject();
 
@@ -192,7 +298,7 @@ public void minDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonTyp
 	}
 
 	@Test // DATAMONGO-1110
-	public void minAndMaxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
+	void minAndMaxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJsonType() {
 
 		Document document = new Criteria("foo").nearSphere(new GeoJsonPoint(100, 200)).minDistance(50D).maxDistance(100D)
 				.getCriteriaObject();
@@ -202,12 +308,12 @@ public void minAndMaxDistanceShouldBeMappedInsideNearSphereWhenUsedAlongWithGeoJ
 	}
 
 	@Test // DATAMONGO-1134
-	public void intersectsShouldThrowExceptionWhenCalledWihtNullValue() {
+	void intersectsShouldThrowExceptionWhenCalledWihtNullValue() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new Criteria("foo").intersects(null));
 	}
 
 	@Test // DATAMONGO-1134
-	public void intersectsShouldWrapGeoJsonTypeInGeometryCorrectly() {
+	void intersectsShouldWrapGeoJsonTypeInGeometryCorrectly() {
 
 		GeoJsonLineString lineString = new GeoJsonLineString(new Point(0, 0), new Point(10, 10));
 		Document document = new Criteria("foo").intersects(lineString).getCriteriaObject();
@@ -216,7 +322,7 @@ public void intersectsShouldWrapGeoJsonTypeInGeometryCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void extractsJsonSchemaInChainCorrectly() {
+	void extractsJsonSchemaInChainCorrectly() {
 
 		MongoJsonSchema schema = MongoJsonSchema.builder().required("name").build();
 		Criteria criteria = Criteria.where("foo").is("bar").andDocumentStructureMatches(schema);
@@ -226,7 +332,7 @@ public void extractsJsonSchemaInChainCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void extractsJsonSchemaFromFactoryMethodCorrectly() {
+	void extractsJsonSchemaFromFactoryMethodCorrectly() {
 
 		MongoJsonSchema schema = MongoJsonSchema.builder().required("name").build();
 		Criteria criteria = Criteria.matchingDocumentStructure(schema);
@@ -236,83 +342,138 @@ public void extractsJsonSchemaFromFactoryMethodCorrectly() {
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAllClearWithIntBitmaskCorrectly() {
+	void shouldAppendBitsAllClearWithIntBitmaskCorrectly() {
 
 		Criteria numericBitmaskCriteria = new Criteria("field").bits().allClear(0b101);
 
-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAllClear\" : 5} }"));
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAllClear\" : 5} }");
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAllClearWithPositionListCorrectly() {
+	void shouldAppendBitsAllClearWithPositionListCorrectly() {
 
 		Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().allClear(Arrays.asList(0, 2));
 
 		assertThat(bitPositionsBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAllClear\" : [ 0, 2 ]} }"));
+				.isEqualTo("{ \"field\" : { \"$bitsAllClear\" : [ 0, 2 ]} }");
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAllSetWithIntBitmaskCorrectly() {
+	void shouldAppendBitsAllSetWithIntBitmaskCorrectly() {
 
 		Criteria numericBitmaskCriteria = new Criteria("field").bits().allSet(0b101);
 
-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAllSet\" : 5} }"));
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAllSet\" : 5} }");
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAllSetWithPositionListCorrectly() {
+	void shouldAppendBitsAllSetWithPositionListCorrectly() {
 
 		Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().allSet(Arrays.asList(0, 2));
 
 		assertThat(bitPositionsBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAllSet\" : [ 0, 2 ]} }"));
+				.isEqualTo("{ \"field\" : { \"$bitsAllSet\" : [ 0, 2 ]} }");
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAnyClearWithIntBitmaskCorrectly() {
+	void shouldAppendBitsAnyClearWithIntBitmaskCorrectly() {
 
 		Criteria numericBitmaskCriteria = new Criteria("field").bits().anyClear(0b101);
 
-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAnyClear\" : 5} }"));
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAnyClear\" : 5} }");
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAnyClearWithPositionListCorrectly() {
+	void shouldAppendBitsAnyClearWithPositionListCorrectly() {
 
 		Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().anyClear(Arrays.asList(0, 2));
 
 		assertThat(bitPositionsBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAnyClear\" : [ 0, 2 ]} }"));
+				.isEqualTo("{ \"field\" : { \"$bitsAnyClear\" : [ 0, 2 ]} }");
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAnySetWithIntBitmaskCorrectly() {
+	void shouldAppendBitsAnySetWithIntBitmaskCorrectly() {
 
 		Criteria numericBitmaskCriteria = new Criteria("field").bits().anySet(0b101);
 
-		assertThat(numericBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAnySet\" : 5} }"));
+		assertThat(numericBitmaskCriteria.getCriteriaObject()).isEqualTo("{ \"field\" : { \"$bitsAnySet\" : 5} }");
 	}
 
 	@Test // DATAMONGO-1808
-	public void shouldAppendBitsAnySetWithPositionListCorrectly() {
+	void shouldAppendBitsAnySetWithPositionListCorrectly() {
 
 		Criteria bitPositionsBitmaskCriteria = new Criteria("field").bits().anySet(Arrays.asList(0, 2));
 
 		assertThat(bitPositionsBitmaskCriteria.getCriteriaObject())
-				.isEqualTo(Document.parse("{ \"field\" : { \"$bitsAnySet\" : [ 0, 2 ]} }"));
+				.isEqualTo("{ \"field\" : { \"$bitsAnySet\" : [ 0, 2 ]} }");
+	}
+
+	@Test // DATAMONGO-2002
+	void shouldEqualForSamePattern() {
+
+		Criteria left = new Criteria("field").regex("foo");
+		Criteria right = new Criteria("field").regex("foo");
+
+		assertThat(left).isEqualTo(right);
+	}
+
+	@Test // DATAMONGO-2002
+	void shouldEqualForDocument() {
+
+		assertThat(new Criteria("field").is(new Document("one", 1).append("two", "two").append("null", null)))
+				.isEqualTo(new Criteria("field").is(new Document("one", 1).append("two", "two").append("null", null)));
+
+		assertThat(new Criteria("field").is(new Document("one", 1).append("two", "two").append("null", null)))
+				.isNotEqualTo(new Criteria("field").is(new Document("one", 1).append("two", "two")));
+
+		assertThat(new Criteria("field").is(new Document("one", 1).append("two", "two")))
+				.isNotEqualTo(new Criteria("field").is(new Document("one", 1).append("two", "two").append("null", null)));
+
+		assertThat(new Criteria("field").is(new Document("one", 1).append("null", null).append("two", "two")))
+				.isNotEqualTo(new Criteria("field").is(new Document("one", 1).append("two", "two").append("null", null)));
+
+		assertThat(new Criteria("field").is(new Document())).isNotEqualTo(new Criteria("field").is("foo"));
+		assertThat(new Criteria("field").is("foo")).isNotEqualTo(new Criteria("field").is(new Document()));
 	}
 
 	@Test // DATAMONGO-2002
-	public void shouldEqualForSamePattern() {
+	void shouldEqualForCollection() {
+
+		assertThat(new Criteria("field").is(Arrays.asList("foo", "bar")))
+				.isEqualTo(new Criteria("field").is(Arrays.asList("foo", "bar")));
+
+		assertThat(new Criteria("field").is(Arrays.asList("foo", 1)))
+				.isNotEqualTo(new Criteria("field").is(Arrays.asList("foo", "bar")));
+
+		assertThat(new Criteria("field").is(Collections.singletonList("foo")))
+				.isNotEqualTo(new Criteria("field").is(Arrays.asList("foo", "bar")));
+
+		assertThat(new Criteria("field").is(Arrays.asList("foo", "bar")))
+				.isNotEqualTo(new Criteria("field").is(Collections.singletonList("foo")));
+
+		assertThat(new Criteria("field").is(Arrays.asList("foo", "bar"))).isNotEqualTo(new Criteria("field").is("foo"));
+
+		assertThat(new Criteria("field").is("foo")).isNotEqualTo(new Criteria("field").is(Arrays.asList("foo", "bar")));
+	}
+
+	@Test // GH-3414
+	void shouldEqualForSamePatternAndFlags() {
 
 		Criteria left = new Criteria("field").regex("foo", "iu");
 		Criteria right = new Criteria("field").regex("foo");
 
 		assertThat(left).isNotEqualTo(right);
 	}
+
+	@Test // GH-3414
+	void shouldEqualForNestedPattern() {
+
+		Criteria left = new Criteria("a").orOperator(new Criteria("foo").regex("value", "i"),
+				new Criteria("bar").regex("value"));
+		Criteria right = new Criteria("a").orOperator(new Criteria("foo").regex("value", "i"),
+				new Criteria("bar").regex("value"));
+
+		assertThat(left).isEqualTo(right);
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/FieldUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/FieldUnitTests.java
index c4fd71da30..5299ac08d6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/FieldUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/FieldUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,29 +15,43 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
+import java.util.List;
 
 /**
- * Unit tests for {@link DocumentField}.
+ * Unit tests for {@link Field}.
  *
  * @author Oliver Gierke
+ * @author Owen Q
+ * @author Mark Paluch
+ * @author Kirill Egorov
  */
-public class FieldUnitTests {
+class FieldUnitTests {
 
 	@Test
-	public void sameObjectSetupCreatesEqualField() {
+	void sameObjectSetupCreatesEqualField() {
 
 		Field left = new Field().elemMatch("key", Criteria.where("foo").is("bar"));
 		Field right = new Field().elemMatch("key", Criteria.where("foo").is("bar"));
 
 		assertThat(left).isEqualTo(right);
 		assertThat(right).isEqualTo(left);
+		assertThat(left.getFieldsObject()).isEqualTo("{key: { $elemMatch: {foo:\"bar\"}}}");
+	}
+
+	@Test // DATAMONGO-2294
+	void rendersInclusionCorrectly() {
+
+		Field fields = new Field().include("foo", "bar").include("baz");
+
+		assertThat(fields.getFieldsObject()).isEqualTo("{foo:1, bar:1, baz:1}");
 	}
 
 	@Test
-	public void differentObjectSetupCreatesEqualField() {
+	void differentObjectSetupCreatesEqualField() {
 
 		Field left = new Field().elemMatch("key", Criteria.where("foo").is("bar"));
 		Field right = new Field().elemMatch("key", Criteria.where("foo").is("foo"));
@@ -45,4 +59,30 @@ public void differentObjectSetupCreatesEqualField() {
 		assertThat(left).isNotEqualTo(right);
 		assertThat(right).isNotEqualTo(left);
 	}
+
+	@Test // DATAMONGO-2294
+	void rendersExclusionCorrectly() {
+
+		Field fields = new Field().exclude("foo", "bar").exclude("baz");
+
+		assertThat(fields.getFieldsObject()).isEqualTo("{foo:0, bar:0, baz:0}");
+	}
+
+	@Test // GH-4625
+	void overriddenInclusionMethodsCreateEqualFields() {
+
+		Field left = new Field().include("foo", "bar");
+		Field right = new Field().include(List.of("foo", "bar"));
+
+		assertThat(left).isEqualTo(right);
+	}
+
+	@Test // GH-4625
+	void overriddenExclusionMethodsCreateEqualFields() {
+
+		Field left = new Field().exclude("foo", "bar");
+		Field right = new Field().exclude(List.of("foo", "bar"));
+
+		assertThat(left).isEqualTo(right);
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/IndexUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/IndexUnitTests.java
index 5552214e3f..2ec31e49bc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/IndexUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/IndexUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
@@ -80,9 +80,9 @@ public void testGeospatialIndex2DSphere() {
 	public void testGeospatialIndexGeoHaystack() {
 
 		GeospatialIndex i = new GeospatialIndex("location").typed(GeoSpatialIndexType.GEO_HAYSTACK)
-				.withAdditionalField("name").withBucketSize(40);
+				.withAdditionalField("name");
 		assertThat(i.getIndexKeys()).isEqualTo(Document.parse("{ \"location\" : \"geoHaystack\" , \"name\" : 1}"));
-		assertThat(i.getIndexOptions()).isEqualTo(Document.parse("{ \"bucketSize\" : 40.0}"));
+		assertThat(i.getIndexOptions()).isEqualTo(Document.parse("{ }"));
 	}
 
 	@Test
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MetricConversionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MetricConversionUnitTests.java
index ee785fa0e8..fdfa840d58 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MetricConversionUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MetricConversionUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,9 +17,10 @@
 package org.springframework.data.mongodb.core.query;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.data.Offset.*;
 import static org.assertj.core.data.Offset.offset;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
@@ -34,7 +35,7 @@ public class MetricConversionUnitTests {
 	@Test // DATAMONGO-1348
 	public void shouldConvertMilesToMeters() {
 
-		Distance distance = new Distance(1, Metrics.MILES);
+		Distance distance = Distance.of(1, Metrics.MILES);
 		double distanceInMeters = MetricConversion.getDistanceInMeters(distance);
 
 		assertThat(distanceInMeters).isCloseTo(1609.3438343d, offset(0.000000001));
@@ -43,7 +44,7 @@ public void shouldConvertMilesToMeters() {
 	@Test // DATAMONGO-1348
 	public void shouldConvertKilometersToMeters() {
 
-		Distance distance = new Distance(1, Metrics.KILOMETERS);
+		Distance distance = Distance.of(1, Metrics.KILOMETERS);
 		double distanceInMeters = MetricConversion.getDistanceInMeters(distance);
 
 		assertThat(distanceInMeters).isCloseTo(1000, offset(0.000000001));
@@ -65,4 +66,20 @@ public void shouldCalculateMetersToMilesMultiplier() {
 		assertThat(multiplier).isCloseTo(0.00062137, offset(0.000000001));
 	}
 
+	@Test // GH-4004
+	void shouldConvertMetersToRadians/* on an earth like sphere with r=6378.137km */() {
+		assertThat(MetricConversion.metersToRadians(1000)).isCloseTo(0.000156785594d, offset(0.000000001));
+	}
+
+	@Test // GH-4004
+	void shouldConvertKilometersToRadians/* on an earth like sphere with r=6378.137km */() {
+		assertThat(MetricConversion.toRadians(Distance.of(1, Metrics.KILOMETERS))).isCloseTo(0.000156785594d,
+				offset(0.000000001));
+	}
+
+	@Test // GH-4004
+	void shouldConvertMilesToRadians/* on an earth like sphere with r=6378.137km */() {
+		assertThat(MetricConversion.toRadians(Distance.of(1, Metrics.MILES))).isCloseTo(0.000252321328d,
+				offset(0.000000001));
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java
index 16aea6e311..d6bceea5d0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/MongoRegexCreatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,13 +66,23 @@ public void testSpecialCases() {
 		parameter.check();
 	}
 
-	@lombok.RequiredArgsConstructor(staticName = "test")
 	static class TestParameter {
 
 		private final String source;
 		private final MatchMode mode;
 		private final String expectedResult, comment;
 
+		private TestParameter(String source, MatchMode mode, String expectedResult, String comment) {
+			this.source = source;
+			this.mode = mode;
+			this.expectedResult = expectedResult;
+			this.comment = comment;
+		}
+
+		public static TestParameter test(String source, MatchMode mode, String expectedResult, String comment) {
+			return new TestParameter(source, mode, expectedResult, comment);
+		}
+
 		void check() {
 
 			assertThat(MongoRegexCreator.INSTANCE.toRegularExpression(source, mode))//
@@ -80,10 +90,6 @@ void check() {
 					.isEqualTo(expectedResult);
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return String.format("Mode: %s, %s", mode, comment);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/NearQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/NearQueryUnitTests.java
index d0ec24062f..2b600988db 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/NearQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/NearQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,16 +20,19 @@
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Metric;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.mongodb.ReadConcern;
+import com.mongodb.ReadPreference;
 
 /**
  * Unit tests for {@link NearQuery}.
@@ -41,7 +44,7 @@
  */
 public class NearQueryUnitTests {
 
-	private static final Distance ONE_FIFTY_KILOMETERS = new Distance(150, Metrics.KILOMETERS);
+	private static final Distance ONE_FIFTY_KILOMETERS = Distance.of(150, Metrics.KILOMETERS);
 
 	@Test
 	public void rejectsNullPoint() {
@@ -54,7 +57,7 @@ public void settingUpNearWithMetricRecalculatesDistance() {
 		NearQuery query = NearQuery.near(2.5, 2.5, Metrics.KILOMETERS).maxDistance(150);
 
 		assertThat(query.getMaxDistance()).isEqualTo(ONE_FIFTY_KILOMETERS);
-		assertThat(query.getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(query.getMetric()).isEqualTo(Metrics.KILOMETERS);
 		assertThat(query.isSpherical()).isTrue();
 	}
 
@@ -65,27 +68,27 @@ public void settingMetricRecalculatesMaxDistance() {
 
 		query.inMiles();
 
-		assertThat(query.getMetric()).isEqualTo((Metric) Metrics.MILES);
+		assertThat(query.getMetric()).isEqualTo(Metrics.MILES);
 	}
 
 	@Test
 	public void configuresResultMetricCorrectly() {
 
 		NearQuery query = NearQuery.near(2.5, 2.1);
-		assertThat(query.getMetric()).isEqualTo((Metric) Metrics.NEUTRAL);
+		assertThat(query.getMetric()).isEqualTo(Metrics.NEUTRAL);
 
 		query = query.maxDistance(ONE_FIFTY_KILOMETERS);
-		assertThat(query.getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(query.getMetric()).isEqualTo(Metrics.KILOMETERS);
 		assertThat(query.getMaxDistance()).isEqualTo(ONE_FIFTY_KILOMETERS);
 		assertThat(query.isSpherical()).isTrue();
 
 		query = query.in(Metrics.MILES);
-		assertThat(query.getMetric()).isEqualTo((Metric) Metrics.MILES);
+		assertThat(query.getMetric()).isEqualTo(Metrics.MILES);
 		assertThat(query.getMaxDistance()).isEqualTo(ONE_FIFTY_KILOMETERS);
 		assertThat(query.isSpherical()).isTrue();
 
-		query = query.maxDistance(new Distance(200, Metrics.KILOMETERS));
-		assertThat(query.getMetric()).isEqualTo((Metric) Metrics.MILES);
+		query = query.maxDistance(Distance.of(200, Metrics.KILOMETERS));
+		assertThat(query.getMetric()).isEqualTo(Metrics.MILES);
 	}
 
 	@Test // DATAMONGO-445, DATAMONGO-2264
@@ -140,7 +143,7 @@ public void numShouldNotBeAlteredByQueryWithoutPageable() {
 
 		long num = 100;
 		NearQuery query = NearQuery.near(new Point(1, 2));
-		query.num(num);
+		query.limit(num);
 		query.query(Query.query(Criteria.where("foo").is("bar")));
 
 		assertThat(DocumentTestUtils.getTypedValue(query.toDocument(), "num", Long.class)).isEqualTo(num);
@@ -197,7 +200,7 @@ public void shouldUseMetersForGeoJsonData() {
 	public void shouldUseMetersForGeoJsonDataWhenDistanceInKilometers() {
 
 		NearQuery query = NearQuery.near(new GeoJsonPoint(27.987901, 86.9165379));
-		query.maxDistance(new Distance(1, Metrics.KILOMETERS));
+		query.maxDistance(Distance.of(1, Metrics.KILOMETERS));
 
 		assertThat(query.toDocument()).containsEntry("maxDistance", 1000D).containsEntry("distanceMultiplier", 0.001D);
 	}
@@ -206,7 +209,7 @@ public void shouldUseMetersForGeoJsonDataWhenDistanceInKilometers() {
 	public void shouldUseMetersForGeoJsonDataWhenDistanceInMiles() {
 
 		NearQuery query = NearQuery.near(new GeoJsonPoint(27.987901, 86.9165379));
-		query.maxDistance(new Distance(1, Metrics.MILES));
+		query.maxDistance(Distance.of(1, Metrics.MILES));
 
 		assertThat(query.toDocument()).containsEntry("maxDistance", 1609.3438343D).containsEntry("distanceMultiplier",
 				0.00062137D);
@@ -216,7 +219,7 @@ public void shouldUseMetersForGeoJsonDataWhenDistanceInMiles() {
 	public void shouldUseKilometersForDistanceWhenMaxDistanceInMiles() {
 
 		NearQuery query = NearQuery.near(new GeoJsonPoint(27.987901, 86.9165379));
-		query.maxDistance(new Distance(1, Metrics.MILES)).in(Metrics.KILOMETERS);
+		query.maxDistance(Distance.of(1, Metrics.MILES)).in(Metrics.KILOMETERS);
 
 		assertThat(query.toDocument()).containsEntry("maxDistance", 1609.3438343D).containsEntry("distanceMultiplier",
 				0.001D);
@@ -226,8 +229,62 @@ public void shouldUseKilometersForDistanceWhenMaxDistanceInMiles() {
 	public void shouldUseMilesForDistanceWhenMaxDistanceInKilometers() {
 
 		NearQuery query = NearQuery.near(new GeoJsonPoint(27.987901, 86.9165379));
-		query.maxDistance(new Distance(1, Metrics.KILOMETERS)).in(Metrics.MILES);
+		query.maxDistance(Distance.of(1, Metrics.KILOMETERS)).in(Metrics.MILES);
 
 		assertThat(query.toDocument()).containsEntry("maxDistance", 1000D).containsEntry("distanceMultiplier", 0.00062137D);
 	}
+
+	@Test // GH-4277
+	void fetchesReadPreferenceFromUnderlyingQueryObject() {
+
+		NearQuery nearQuery = NearQuery.near(new Point(0, 0))
+				.query(new Query().withReadPreference(ReadPreference.nearest()));
+
+		assertThat(nearQuery.getReadPreference()).isEqualTo(ReadPreference.nearest());
+	}
+
+	@Test // GH-4277
+	void fetchesReadConcernFromUnderlyingQueryObject() {
+
+		NearQuery nearQuery = NearQuery.near(new Point(0, 0)).query(new Query().withReadConcern(ReadConcern.SNAPSHOT));
+
+		assertThat(nearQuery.getReadConcern()).isEqualTo(ReadConcern.SNAPSHOT);
+	}
+
+	@Test // GH-4277
+	void usesReadPreferenceFromNearQueryIfUnderlyingQueryDoesNotDefineAny() {
+
+		NearQuery nearQuery = NearQuery.near(new Point(0, 0)).withReadPreference(ReadPreference.nearest())
+				.query(new Query());
+
+		assertThat(((Query) ReflectionTestUtils.getField(nearQuery, "query")).getReadPreference()).isNull();
+		assertThat(nearQuery.getReadPreference()).isEqualTo(ReadPreference.nearest());
+	}
+
+	@Test // GH-4277
+	void usesReadConcernFromNearQueryIfUnderlyingQueryDoesNotDefineAny() {
+
+		NearQuery nearQuery = NearQuery.near(new Point(0, 0)).withReadConcern(ReadConcern.SNAPSHOT).query(new Query());
+
+		assertThat(((Query) ReflectionTestUtils.getField(nearQuery, "query")).getReadConcern()).isNull();
+		assertThat(nearQuery.getReadConcern()).isEqualTo(ReadConcern.SNAPSHOT);
+	}
+
+	@Test // GH-4277
+	void readPreferenceFromUnderlyingQueryOverridesNearQueryOne() {
+
+		NearQuery nearQuery = NearQuery.near(new Point(0, 0)).withReadPreference(ReadPreference.nearest())
+				.query(new Query().withReadPreference(ReadPreference.primary()));
+
+		assertThat(nearQuery.getReadPreference()).isEqualTo(ReadPreference.primary());
+	}
+
+	@Test // GH-4277
+	void readConcernFromUnderlyingQueryOverridesNearQueryOne() {
+
+		NearQuery nearQuery = NearQuery.near(new Point(0, 0)).withReadConcern(ReadConcern.SNAPSHOT)
+				.query(new Query().withReadConcern(ReadConcern.MAJORITY));
+
+		assertThat(nearQuery.getReadConcern()).isEqualTo(ReadConcern.MAJORITY);
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java
index baddb1a37e..fa7a8516ca 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/QueryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,8 +20,10 @@
 import static org.springframework.data.mongodb.core.query.Query.*;
 
 import org.bson.Document;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
@@ -38,17 +40,17 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class QueryTests {
+class QueryTests {
 
 	@Test
-	public void testSimpleQuery() {
+	void testSimpleQuery() {
 
 		Query q = new Query(where("name").is("Thomas").and("age").lt(80));
 		assertThat(q.getQueryObject()).isEqualTo(Document.parse("{ \"name\" : \"Thomas\" , \"age\" : { \"$lt\" : 80}}"));
 	}
 
 	@Test
-	public void testQueryWithNot() {
+	void testQueryWithNot() {
 
 		Query q = new Query(where("name").is("Thomas").and("age").not().mod(10, 0));
 		assertThat(q.getQueryObject())
@@ -56,14 +58,14 @@ public void testQueryWithNot() {
 	}
 
 	@Test
-	public void testInvalidQueryWithNotIs() {
+	void testInvalidQueryWithNotIs() {
 
 		assertThatExceptionOfType(InvalidMongoDbApiUsageException.class)
 				.isThrownBy(() -> new Query(where("name").not().is("Thomas")));
 	}
 
 	@Test
-	public void testOrQuery() {
+	void testOrQuery() {
 
 		Query q = new Query(new Criteria().orOperator(where("name").is("Sven").and("age").lt(50), where("age").lt(50),
 				where("name").is("Thomas")));
@@ -72,7 +74,7 @@ public void testOrQuery() {
 	}
 
 	@Test
-	public void testAndQuery() {
+	void testAndQuery() {
 
 		Query q = new Query(new Criteria().andOperator(where("name").is("Sven"), where("age").lt(50)));
 		Document expected = Document.parse("{ \"$and\" : [ { \"name\" : \"Sven\"} , { \"age\" : { \"$lt\" : 50}}]}");
@@ -80,7 +82,7 @@ public void testAndQuery() {
 	}
 
 	@Test
-	public void testNorQuery() {
+	void testNorQuery() {
 
 		Query q = new Query(
 				new Criteria().norOperator(where("name").is("Sven"), where("age").lt(50), where("name").is("Thomas")));
@@ -88,8 +90,8 @@ public void testNorQuery() {
 				.parse("{ \"$nor\" : [ { \"name\" : \"Sven\"} , { \"age\" : { \"$lt\" : 50}} , { \"name\" : \"Thomas\"}]}"));
 	}
 
-	@Test
-	public void testQueryWithLimit() {
+	@Test // GH-4584
+	void testQueryWithLimit() {
 
 		Query q = new Query(where("name").gte("M").lte("T").and("age").not().gt(22));
 		q.limit(50);
@@ -97,10 +99,25 @@ public void testQueryWithLimit() {
 		assertThat(q.getQueryObject()).isEqualTo(Document
 				.parse("{ \"name\" : { \"$gte\" : \"M\" , \"$lte\" : \"T\"} , \"age\" : { \"$not\" : { \"$gt\" : 22}}}"));
 		assertThat(q.getLimit()).isEqualTo(50);
+
+		q.limit(Limit.unlimited());
+		assertThat(q.getLimit()).isZero();
+		assertThat(q.isLimited()).isFalse();
+
+		q.limit(Limit.of(10));
+		assertThat(q.getLimit()).isEqualTo(10);
+		assertThat(q.isLimited()).isTrue();
+
+		q.limit(Limit.of(-1));
+		assertThat(q.getLimit()).isZero();
+		assertThat(q.isLimited()).isFalse();
+
+		Query other = new Query(where("name").gte("M")).limit(Limit.of(10));
+		assertThat(new Query(where("name").gte("M")).limit(10)).isEqualTo(other).hasSameHashCodeAs(other);
 	}
 
 	@Test
-	public void testQueryWithFieldsAndSlice() {
+	void testQueryWithFieldsAndSlice() {
 
 		Query q = new Query(where("name").gte("M").lte("T").and("age").not().gt(22));
 		q.fields().exclude("address").include("name").slice("orders", 10);
@@ -113,7 +130,7 @@ public void testQueryWithFieldsAndSlice() {
 	}
 
 	@Test // DATAMONGO-652
-	public void testQueryWithFieldsElemMatchAndPositionalOperator() {
+	void testQueryWithFieldsElemMatchAndPositionalOperator() {
 
 		Query query = query(where("name").gte("M").lte("T").and("age").not().gt(22));
 		query.fields().elemMatch("products", where("name").is("milk")).position("comments", 2);
@@ -125,14 +142,14 @@ public void testQueryWithFieldsElemMatchAndPositionalOperator() {
 	}
 
 	@Test
-	public void testSimpleQueryWithChainedCriteria() {
+	void testSimpleQueryWithChainedCriteria() {
 
 		Query q = new Query(where("name").is("Thomas").and("age").lt(80));
 		assertThat(q.getQueryObject()).isEqualTo(Document.parse("{ \"name\" : \"Thomas\" , \"age\" : { \"$lt\" : 80}}"));
 	}
 
 	@Test
-	public void testComplexQueryWithMultipleChainedCriteria() {
+	void testComplexQueryWithMultipleChainedCriteria() {
 
 		Query q = new Query(
 				where("name").regex("^T.*").and("age").gt(20).lt(80).and("city").in("Stockholm", "London", "New York"));
@@ -143,22 +160,22 @@ public void testComplexQueryWithMultipleChainedCriteria() {
 	}
 
 	@Test
-	public void testAddCriteriaWithComplexQueryWithMultipleChainedCriteria() {
+	void testAddCriteriaWithComplexQueryWithMultipleChainedCriteria() {
 
 		Query q1 = new Query(
 				where("name").regex("^T.*").and("age").gt(20).lt(80).and("city").in("Stockholm", "London", "New York"));
 		Query q2 = new Query(where("name").regex("^T.*").and("age").gt(20).lt(80))
 				.addCriteria(where("city").in("Stockholm", "London", "New York"));
 
-		assertThat(q1.getQueryObject().toString()).isEqualTo(q2.getQueryObject().toString());
+		assertThat(q1.getQueryObject()).hasToString(q2.getQueryObject().toString());
 
 		Query q3 = new Query(where("name").regex("^T.*")).addCriteria(where("age").gt(20).lt(80))
 				.addCriteria(where("city").in("Stockholm", "London", "New York"));
-		assertThat(q1.getQueryObject().toString()).isEqualTo(q3.getQueryObject().toString());
+		assertThat(q1.getQueryObject()).hasToString(q3.getQueryObject().toString());
 	}
 
 	@Test
-	public void testQueryWithElemMatch() {
+	void testQueryWithElemMatch() {
 
 		Query q = new Query(where("openingHours").elemMatch(where("dayOfWeek").is("Monday").and("open").lte("1800")));
 		assertThat(q.getQueryObject()).isEqualTo(Document.parse(
@@ -166,14 +183,14 @@ public void testQueryWithElemMatch() {
 	}
 
 	@Test
-	public void testQueryWithIn() {
+	void testQueryWithIn() {
 
 		Query q = new Query(where("state").in("NY", "NJ", "PA"));
 		assertThat(q.getQueryObject()).isEqualTo(Document.parse("{ \"state\" : { \"$in\" : [ \"NY\" , \"NJ\" , \"PA\"]}}"));
 	}
 
 	@Test
-	public void testQueryWithRegex() {
+	void testQueryWithRegex() {
 
 		Query q = new Query(where("name").regex("b.*"));
 		assertThat(q.getQueryObject().toJson())
@@ -181,28 +198,28 @@ public void testQueryWithRegex() {
 	}
 
 	@Test
-	public void testQueryWithRegexAndOption() {
+	void testQueryWithRegexAndOption() {
 		Query q = new Query(where("name").regex("b.*", "i"));
 		assertThat(q.getQueryObject().toJson())
 				.isEqualTo(Document.parse("{ \"name\" : { \"$regex\" : \"b.*\" , \"$options\" : \"i\"}}").toJson());
 	}
 
 	@Test // DATAMONGO-538
-	public void addsSortCorrectly() {
+	void addsSortCorrectly() {
 
 		Query query = new Query().with(Sort.by(Direction.DESC, "foo"));
 		assertThat(query.getSortObject()).isEqualTo(Document.parse("{ \"foo\" : -1}"));
 	}
 
 	@Test
-	public void rejectsOrderWithIgnoreCase() {
+	void rejectsOrderWithIgnoreCase() {
 
 		assertThatExceptionOfType(IllegalArgumentException.class)
 				.isThrownBy(() -> new Query().with(Sort.by(Order.asc("foo").ignoreCase())));
 	}
 
 	@Test // DATAMONGO-709, DATAMONGO-1735, // DATAMONGO-2198
-	public void shouldReturnClassHierarchyOfRestrictedTypes() {
+	void shouldReturnClassHierarchyOfRestrictedTypes() {
 
 		Query query = new Query(where("name").is("foo")).restrict(SpecialDoc.class);
 
@@ -210,7 +227,7 @@ public void shouldReturnClassHierarchyOfRestrictedTypes() {
 	}
 
 	@Test // DATAMONGO-1421
-	public void addCriteriaForSamePropertyMultipleTimesShouldThrowAndSafelySerializeErrorMessage() {
+	void addCriteriaForSamePropertyMultipleTimesShouldThrowAndSafelySerializeErrorMessage() {
 
 		assertThatExceptionOfType(InvalidMongoDbApiUsageException.class).isThrownBy(() -> {
 
@@ -222,44 +239,41 @@ public void addCriteriaForSamePropertyMultipleTimesShouldThrowAndSafelySerialize
 	}
 
 	@Test // DATAMONGO-1783
-	public void queryOfShouldCreateNewQueryWithEqualBehaviour() {
+	void queryOfShouldCreateNewQueryWithEqualBehaviour() {
 
 		Query source = new Query();
-		source.addCriteria(where("This you must ken!").is(EnumType.VAL_1));
+		source.addCriteria(where("This you must ken").is(EnumType.VAL_1));
 
 		compareQueries(Query.of(source), source);
 	}
 
 	@Test // DATAMONGO-1783
-	public void clonedQueryShouldNotDependOnCriteriaFromSource() {
+	void clonedQueryShouldNotDependOnCriteriaFromSource() {
 
 		Query source = new Query();
 		source.addCriteria(where("From one make ten").is("and two let be."));
 		Query target = Query.of(source);
 
-		compareQueries(target, source);
-		source.addCriteria(where("Make even three").is("then rich you'll be."));
-
-		assertThat(target.getQueryObject()).isEqualTo(new Document("From one make ten", "and two let be."))
-				.isNotEqualTo(source.getQueryObject());
+		assertThat(target.getQueryObject()).containsAllEntriesOf(new Document("From one make ten", "and two let be."))
+				.isNotSameAs(source.getQueryObject());
 	}
 
 	@Test // DATAMONGO-1783
-	public void clonedQueryShouldAppendCriteria() {
+	void clonedQueryShouldAppendCriteria() {
 
 		Query source = new Query();
-		source.addCriteria(where("Skip o'er the four!").is("From five and six"));
+		source.addCriteria(where("Skip o'er the four").is("From five and six"));
 		Query target = Query.of(source);
 
 		compareQueries(target, source);
 		target.addCriteria(where("the Witch's tricks").is("make seven and eight"));
 
 		assertThat(target.getQueryObject()).isEqualTo(
-				new Document("Skip o'er the four!", "From five and six").append("the Witch's tricks", "make seven and eight"));
+				new Document("Skip o'er the four", "From five and six").append("the Witch's tricks", "make seven and eight"));
 	}
 
 	@Test // DATAMONGO-1783
-	public void clonedQueryShouldNotDependOnCollationFromSource() {
+	void clonedQueryShouldNotDependOnCollationFromSource() {
 
 		Query source = new Query().collation(Collation.simple());
 		Query target = Query.of(source);
@@ -271,7 +285,7 @@ public void clonedQueryShouldNotDependOnCollationFromSource() {
 	}
 
 	@Test // DATAMONGO-1783
-	public void clonedQueryShouldNotDependOnSortFromSource() {
+	void clonedQueryShouldNotDependOnSortFromSource() {
 
 		Query source = new Query().with(Sort.by("And nine is one"));
 		Query target = Query.of(source);
@@ -284,27 +298,27 @@ public void clonedQueryShouldNotDependOnSortFromSource() {
 	}
 
 	@Test // DATAMONGO-1783
-	public void clonedQueryShouldNotDependOnFieldsFromSource() {
+	void clonedQueryShouldNotDependOnFieldsFromSource() {
 
 		Query source = new Query();
-		source.fields().include("That is the witch's one-time-one!");
+		source.fields().include("That is the witch's one-time-one");
 		Query target = Query.of(source);
 
 		compareQueries(target, source);
 		source.fields().exclude("Goethe");
 
-		assertThat(target.getFieldsObject()).isEqualTo(new Document("That is the witch's one-time-one!", 1))
+		assertThat(target.getFieldsObject()).isEqualTo(new Document("That is the witch's one-time-one", 1))
 				.isNotEqualTo(source.getFieldsObject());
 	}
 
-	@Test // DATAMONGO-1783
-	public void clonedQueryShouldNotDependOnMetaFromSource() {
+	@Test // DATAMONGO-1783, DATAMONGO-2572
+	void clonedQueryShouldNotDependOnMetaFromSource() {
 
 		Query source = new Query().maxTimeMsec(100);
 		Query target = Query.of(source);
 
 		compareQueries(target, source);
-		source.slaveOk();
+		source.allowSecondaryReads();
 
 		Meta meta = new Meta();
 		meta.setMaxTimeMsec(100);
@@ -312,7 +326,7 @@ public void clonedQueryShouldNotDependOnMetaFromSource() {
 	}
 
 	@Test // DATAMONGO-1783
-	public void clonedQueryShouldNotDependOnRestrictedTypesFromSource() {
+	void clonedQueryShouldNotDependOnRestrictedTypesFromSource() {
 
 		Query source = new Query();
 		source.restrict(EnumType.class);
@@ -325,7 +339,7 @@ public void clonedQueryShouldNotDependOnRestrictedTypesFromSource() {
 	}
 
 	@Test // DATAMONGO-1783
-	public void clonedQueryShouldApplyRestrictionsFromBasicQuery() {
+	void clonedQueryShouldApplyRestrictionsFromBasicQuery() {
 
 		BasicQuery source = new BasicQuery("{ 'foo' : 'bar'}");
 		Query target = Query.of(source);
@@ -337,12 +351,40 @@ public void clonedQueryShouldApplyRestrictionsFromBasicQuery() {
 				.isNotEqualTo(source.getQueryObject());
 	}
 
+	@Test // DATAMONGO-2478
+	void queryOfShouldWorkOnProxiedObjects() {
+
+		BasicQuery source = new BasicQuery("{ 'foo' : 'bar'}", "{ '_id' : -1, 'foo' : 1 }");
+		source.withHint("the hint");
+		source.limit(10);
+		source.setSortObject(new Document("_id", 1));
+
+		ProxyFactory proxyFactory = new ProxyFactory(source);
+		proxyFactory.setInterfaces(new Class[0]);
+
+		Query target = Query.of((Query) proxyFactory.getProxy());
+
+		compareQueries(target, source);
+	}
+
+	@Test // GH-4771
+	void appliesSortOfUnpagedPageable() {
+
+		Query query = new Query();
+		query.with(Pageable.unpaged(Sort.by("sortMe")));
+
+		assertThat(query.isSorted()).isTrue();
+	}
+
 	private void compareQueries(Query actual, Query expected) {
 
 		assertThat(actual.getCollation()).isEqualTo(expected.getCollation());
-		assertThat(actual.getSortObject()).isEqualTo(expected.getSortObject());
-		assertThat(actual.getFieldsObject()).isEqualTo(expected.getFieldsObject());
-		assertThat(actual.getQueryObject()).isEqualTo(expected.getQueryObject());
+		assertThat(actual.getSortObject()).hasSameSizeAs(expected.getSortObject())
+				.containsAllEntriesOf(expected.getSortObject());
+		assertThat(actual.getFieldsObject()).hasSameSizeAs(expected.getFieldsObject())
+				.containsAllEntriesOf(expected.getFieldsObject());
+		assertThat(actual.getQueryObject()).hasSameSizeAs(expected.getQueryObject())
+				.containsAllEntriesOf(expected.getQueryObject());
 		assertThat(actual.getHint()).isEqualTo(expected.getHint());
 		assertThat(actual.getLimit()).isEqualTo(expected.getLimit());
 		assertThat(actual.getSkip()).isEqualTo(expected.getSkip());
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/SortTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/SortTests.java
index 14f8061af6..1cf4d8b027 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/SortTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/SortTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextCriteriaUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextCriteriaUnitTests.java
index be6a4b6c29..b5da29f5e2 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextCriteriaUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextCriteriaUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 
@@ -26,83 +26,106 @@
  * Unit tests for {@link TextCriteria}.
  *
  * @author Christoph Strobl
+ * @author Daniel Debray
  */
-public class TextCriteriaUnitTests {
+class TextCriteriaUnitTests {
 
 	@Test // DATAMONGO-850
-	public void shouldNotHaveLanguageField() {
+	void shouldNotHaveLanguageField() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage();
+
 		assertThat(criteria.getCriteriaObject()).isEqualTo(searchObject("{ }"));
 	}
 
 	@Test // DATAMONGO-850
-	public void shouldNotHaveLanguageForNonDefaultLanguageField() {
+	void shouldNotHaveLanguageForNonDefaultLanguageField() {
 
 		TextCriteria criteria = TextCriteria.forLanguage("spanish");
+
 		assertThat(criteria.getCriteriaObject()).isEqualTo(searchObject("{ \"$language\" : \"spanish\" }"));
 	}
 
 	@Test // DATAMONGO-850
-	public void shouldCreateSearchFieldForSingleTermCorrectly() {
+	void shouldCreateSearchFieldForSingleTermCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("cake");
+
 		assertThat(criteria.getCriteriaObject()).isEqualTo(searchObject("{ \"$search\" : \"cake\" }"));
 	}
 
 	@Test // DATAMONGO-850
-	public void shouldCreateSearchFieldCorrectlyForMultipleTermsCorrectly() {
+	void shouldCreateSearchFieldCorrectlyForMultipleTermsCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingAny("bake", "coffee", "cake");
+
 		assertThat(criteria.getCriteriaObject()).isEqualTo(searchObject("{ \"$search\" : \"bake coffee cake\" }"));
 	}
 
 	@Test // DATAMONGO-850
-	public void shouldCreateSearchFieldForPhraseCorrectly() {
+	void shouldCreateSearchFieldForPhraseCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingPhrase("coffee cake");
+
 		assertThat(DocumentTestUtils.getAsDocument(criteria.getCriteriaObject(), "$text"))
 				.isEqualTo(new Document("$search", "\"coffee cake\""));
 	}
 
 	@Test // DATAMONGO-850
-	public void shouldCreateNotFieldCorrectly() {
+	void shouldCreateNotFieldCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatching("cake");
+
 		assertThat(criteria.getCriteriaObject()).isEqualTo(searchObject("{ \"$search\" : \"-cake\" }"));
 	}
 
 	@Test // DATAMONGO-850
-	public void shouldCreateSearchFieldCorrectlyForNotMultipleTermsCorrectly() {
+	void shouldCreateSearchFieldCorrectlyForNotMultipleTermsCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatchingAny("bake", "coffee", "cake");
+
 		assertThat(criteria.getCriteriaObject()).isEqualTo(searchObject("{ \"$search\" : \"-bake -coffee -cake\" }"));
 	}
 
 	@Test // DATAMONGO-850
-	public void shouldCreateSearchFieldForNotPhraseCorrectly() {
+	void shouldCreateSearchFieldForNotPhraseCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().notMatchingPhrase("coffee cake");
+
 		assertThat(DocumentTestUtils.getAsDocument(criteria.getCriteriaObject(), "$text"))
 				.isEqualTo(new Document("$search", "-\"coffee cake\""));
 	}
 
 	@Test // DATAMONGO-1455
-	public void caseSensitiveOperatorShouldBeSetCorrectly() {
+	void caseSensitiveOperatorShouldBeSetCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("coffee").caseSensitive(true);
+
 		assertThat(DocumentTestUtils.getAsDocument(criteria.getCriteriaObject(), "$text"))
 				.isEqualTo(new Document("$search", "coffee").append("$caseSensitive", true));
 	}
 
 	@Test // DATAMONGO-1456
-	public void diacriticSensitiveOperatorShouldBeSetCorrectly() {
+	void diacriticSensitiveOperatorShouldBeSetCorrectly() {
 
 		TextCriteria criteria = TextCriteria.forDefaultLanguage().matching("coffee").diacriticSensitive(true);
+
 		assertThat(DocumentTestUtils.getAsDocument(criteria.getCriteriaObject(), "$text"))
 				.isEqualTo(new Document("$search", "coffee").append("$diacriticSensitive", true));
 	}
 
+	@Test // DATAMONGO-2504
+	void twoIdenticalCriteriaShouldBeEqual() {
+
+		TextCriteria criteriaOne = TextCriteria.forDefaultLanguage().matching("coffee");
+		TextCriteria criteriaTwo = TextCriteria.forDefaultLanguage().matching("coffee");
+
+		assertThat(criteriaOne).isEqualTo(criteriaTwo);
+		assertThat(criteriaOne).hasSameHashCodeAs(criteriaTwo);
+		assertThat(criteriaOne).isNotEqualTo(criteriaTwo.diacriticSensitive(false));
+		assertThat(criteriaOne.hashCode()).isNotEqualTo(criteriaTwo.diacriticSensitive(false).hashCode());
+	}
+
 	private Document searchObject(String json) {
 		return new Document("$text", Document.parse(json));
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryTests.java
index 732879e9a4..b12b83fe3a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,36 +18,31 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 
-import lombok.ToString;
-
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.mongodb.config.AbstractIntegrationTests;
-import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexOperations;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.Language;
 import org.springframework.data.mongodb.core.mapping.TextScore;
 import org.springframework.data.mongodb.core.query.TextQueryTests.FullTextDoc.FullTextDocBuilder;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-public class TextQueryTests extends AbstractIntegrationTests {
-
-	public static @ClassRule MongoVersionRule version = MongoVersionRule.atLeast(new Version(2, 6));
+@ExtendWith(MongoTemplateExtension.class)
+public class TextQueryTests {
 
 	private static final FullTextDoc BAKE = new FullTextDocBuilder().headline("bake").build();
 	private static final FullTextDoc COFFEE = new FullTextDocBuilder().subHeadline("coffee").build();
@@ -58,11 +53,14 @@ public class TextQueryTests extends AbstractIntegrationTests {
 	private static final FullTextDoc FRENCH_MILK = new FullTextDocBuilder().headline("leche").lanugage("french").build();
 	private static final FullTextDoc MILK_AND_SUGAR = new FullTextDocBuilder().headline("milk and sugar").build();
 
-	private @Autowired MongoOperations template;
+	@Template(initialEntitySet = FullTextDoc.class) //
+	static MongoTestTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
+		template.flush();
+
 		IndexOperations indexOps = template.indexOps(FullTextDoc.class);
 		indexOps.dropAllIndexes();
 
@@ -203,8 +201,8 @@ public void shouldApplyPaginationCorrectly() {
 		initWithDefaultDocuments();
 
 		// page 1
-		List<FullTextDoc> result = template
-				.find(new TextQuery("bake coffee cake").sortByScore().with(PageRequest.of(0, 2)), FullTextDoc.class);
+		List<FullTextDoc> result = template.find(new TextQuery("bake coffee cake").sortByScore().with(PageRequest.of(0, 2)),
+				FullTextDoc.class);
 		assertThat(result).hasSize(2);
 		assertThat(result).containsExactly(BAKE, COFFEE);
 
@@ -226,7 +224,6 @@ private void initWithDefaultDocuments() {
 	}
 
 	@org.springframework.data.mongodb.core.mapping.Document(collection = "fullTextDoc")
-	@ToString
 	static class FullTextDoc {
 
 		@Id String id;
@@ -252,7 +249,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 			if (this == obj) {
 				return true;
 			}
@@ -301,6 +298,10 @@ public boolean equals(Object obj) {
 			return true;
 		}
 
+		public String toString() {
+			return "TextQueryTests.FullTextDoc(id=" + this.id + ", language=" + this.language + ", headline=" + this.headline + ", subheadline=" + this.subheadline + ", body=" + this.body + ", score=" + this.score + ")";
+		}
+
 		static class FullTextDocBuilder {
 
 			private FullTextDoc instance;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryUnitTests.java
index 9141d8ada0..155fcd3f99 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/TextQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,9 @@
  */
 package org.springframework.data.mongodb.core.query;
 
-import static org.springframework.data.mongodb.test.util.Assertions.*;
-
-import org.junit.Test;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
+import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 
@@ -94,4 +93,28 @@ public void shouldUseCustomFieldnameForScoring() {
 		assertThat(query.getSortObject()).containsKey("customFieldForScore");
 	}
 
+	@Test // GH-3896
+	public void retainsSortOrderWhenUsingScore() {
+
+		TextQuery query = new TextQuery(QUERY);
+		query.with(Sort.by(Direction.DESC, "one"));
+		query.sortByScore();
+		query.with(Sort.by(Direction.DESC, "two"));
+
+		assertThat(query.getSortObject().keySet().stream()).containsExactly("one", "score", "two");
+
+		query = new TextQuery(QUERY);
+		query.with(Sort.by(Direction.DESC, "one"));
+		query.sortByScore();
+
+		assertThat(query.getSortObject().keySet().stream()).containsExactly("one", "score");
+
+		query = new TextQuery(QUERY);
+		query.sortByScore();
+		query.with(Sort.by(Direction.DESC, "one"));
+		query.with(Sort.by(Direction.DESC, "two"));
+
+		assertThat(query.getSortObject().keySet().stream()).containsExactly("score", "one", "two");
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcherUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcherUnitTests.java
index 74babbc6fb..91a0e43ee9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcherUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UntypedExampleMatcherUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,9 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.domain.ExampleMatcher.NullHandler;
 import org.springframework.data.domain.ExampleMatcher.StringMatcher;
@@ -30,7 +31,7 @@ public class UntypedExampleMatcherUnitTests {
 
 	ExampleMatcher matcher;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		matcher = UntypedExampleMatcher.matching();
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java
index cf045bded6..f5b8684687 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/query/UpdateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,8 +22,7 @@
 import java.util.Map;
 
 import org.bson.Document;
-import org.joda.time.DateTime;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.query.Update.Position;
 
@@ -91,30 +90,6 @@ public void testPush() {
 		assertThat(u.getUpdateObject()).isEqualTo(Document.parse("{ \"$push\" : { \"authors\" : { \"name\" : \"Sven\"}}}"));
 	}
 
-	@Test
-	public void testPushAll() {
-
-		Map<String, String> m1 = Collections.singletonMap("name", "Sven");
-		Map<String, String> m2 = Collections.singletonMap("name", "Maria");
-
-		Update u = new Update().pushAll("authors", new Object[] { m1, m2 });
-		assertThat(u.getUpdateObject()).isEqualTo(
-				Document.parse("{ \"$pushAll\" : { \"authors\" : [ { \"name\" : \"Sven\"} , { \"name\" : \"Maria\"}]}}"));
-	}
-
-	@Test // DATAMONGO-354
-	public void testMultiplePushAllShouldBePossibleWhenUsingDifferentFields() {
-
-		Map<String, String> m1 = Collections.singletonMap("name", "Sven");
-		Map<String, String> m2 = Collections.singletonMap("name", "Maria");
-
-		Update u = new Update().pushAll("authors", new Object[] { m1, m2 });
-		u.pushAll("books", new Object[] { "Spring in Action" });
-
-		assertThat(u.getUpdateObject()).isEqualTo(Document.parse(
-				"{ \"$pushAll\" : { \"authors\" : [ { \"name\" : \"Sven\"} , { \"name\" : \"Maria\"}] , \"books\" : [ \"Spring in Action\"]}}"));
-	}
-
 	@Test
 	public void testAddToSet() {
 
@@ -246,8 +221,8 @@ public void testAddingMultiFieldOperationThrowsExceptionWhenCalledWithNullKey()
 
 	@Test // DATAMONGO-853
 	public void testAddingSingleFieldOperationThrowsExceptionWhenCalledWithNullKey() {
-		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new Update().addFieldOperation("$op", null, "exprected to throw IllegalArgumentException."));
+		assertThatIllegalArgumentException().isThrownBy(
+				() -> new Update().addMultiFieldOperation("$op", null, "exprected to throw IllegalArgumentException."));
 	}
 
 	@Test // DATAMONGO-853
@@ -257,7 +232,6 @@ public void testCreatingUpdateWithNullKeyThrowsException() {
 
 	@Test // DATAMONGO-953
 	public void testEquality() {
-
 		Update actualUpdate = new Update() //
 				.inc("size", 1) //
 				.set("nl", null) //
@@ -348,7 +322,7 @@ public void getUpdateObjectShouldReturnCurrentDateCorrectlyWhenUsingMixedDateAnd
 	@Test // DATAMONGO-1002
 	public void toStringWorksForUpdateWithComplexObject() {
 
-		Update update = new Update().addToSet("key", new DateTime());
+		Update update = new Update().addToSet("key", new Date());
 		assertThat(update.toString()).isNotNull();
 	}
 
@@ -479,8 +453,7 @@ public void toStringShouldPrettyPrintModifiers() {
 	@Test // DATAMONGO-1777, DATAMONGO-2198
 	public void toStringConsidersIsolated() {
 
-		assertThat(new Update().set("key", "value").isolated().toString())
-				.contains("\"$isolated\"");
+		assertThat(new Update().set("key", "value").isolated().toString()).contains("\"$isolated\"");
 	}
 
 	@Test // DATAMONGO-1778
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaObjectUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaObjectUnitTests.java
index 1b57d2dff5..0c411dcb4f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaObjectUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaObjectUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,6 +18,7 @@
 import static org.springframework.data.domain.Range.from;
 import static org.springframework.data.domain.Range.Bound.*;
 import static org.springframework.data.mongodb.core.schema.JsonSchemaObject.*;
+import static org.springframework.data.mongodb.core.schema.JsonSchemaObject.array;
 import static org.springframework.data.mongodb.core.schema.JsonSchemaObject.of;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
@@ -30,7 +31,7 @@
 import java.util.Set;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.*;
 
@@ -39,15 +40,16 @@
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Michał Kurcius
  */
-public class JsonSchemaObjectUnitTests {
+class JsonSchemaObjectUnitTests {
 
 	// -----------------
 	// type from class
 	// -----------------
 
 	@Test // DATAMONGO-1849
-	public void primitiveType() {
+	void primitiveType() {
 
 		assertThat(JsonSchemaObject.of(boolean.class).getTypes()).containsExactly(Type.booleanType());
 		assertThat(JsonSchemaObject.of(int.class).getTypes()).containsExactly(Type.intType());
@@ -58,7 +60,7 @@ public void primitiveType() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void objectType() {
+	void objectType() {
 
 		assertThat(JsonSchemaObject.of(Object.class).getTypes()).containsExactly(Type.objectType());
 		assertThat(JsonSchemaObject.of(Map.class).getTypes()).containsExactly(Type.objectType());
@@ -66,12 +68,12 @@ public void objectType() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void binaryData() {
+	void binaryData() {
 		assertThat(JsonSchemaObject.of(byte[].class).getTypes()).containsExactly(Type.binaryType());
 	}
 
 	@Test // DATAMONGO-1849
-	public void collectionType() {
+	void collectionType() {
 
 		assertThat(JsonSchemaObject.of(Object[].class).getTypes()).containsExactly(Type.arrayType());
 		assertThat(JsonSchemaObject.of(Collection.class).getTypes()).containsExactly(Type.arrayType());
@@ -80,7 +82,7 @@ public void collectionType() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void dateType() {
+	void dateType() {
 		assertThat(JsonSchemaObject.of(Date.class).getTypes()).containsExactly(Type.dateType());
 	}
 
@@ -89,14 +91,14 @@ public void dateType() {
 	// -----------------
 
 	@Test // DATAMONGO-1835
-	public void objectObjectShouldRenderTypeCorrectly() {
+	void objectObjectShouldRenderTypeCorrectly() {
 
 		assertThat(object().generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "object").append("description", "Must be an object."));
 	}
 
 	@Test // DATAMONGO-1835
-	public void objectObjectShouldRenderNrPropertiesCorrectly() {
+	void objectObjectShouldRenderNrPropertiesCorrectly() {
 
 		assertThat(object().propertiesCount(from(inclusive(10)).to(inclusive(20))).generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "object").append("description", "Must be an object with [10-20] properties.")
@@ -104,7 +106,7 @@ public void objectObjectShouldRenderNrPropertiesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void objectObjectShouldRenderRequiredPropertiesCorrectly() {
+	void objectObjectShouldRenderRequiredPropertiesCorrectly() {
 
 		assertThat(object().required("spring", "data", "mongodb").generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "object")
@@ -113,7 +115,7 @@ public void objectObjectShouldRenderRequiredPropertiesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void objectObjectShouldRenderAdditionalPropertiesCorrectlyWhenBoolean() {
+	void objectObjectShouldRenderAdditionalPropertiesCorrectlyWhenBoolean() {
 
 		assertThat(object().additionalProperties(true).generatedDescription().toDocument()).isEqualTo(
 				new Document("type", "object").append("description", "Must be an object allowing additional properties.")
@@ -125,7 +127,7 @@ public void objectObjectShouldRenderAdditionalPropertiesCorrectlyWhenBoolean() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void objectObjectShouldRenderPropertiesCorrectly() {
+	void objectObjectShouldRenderPropertiesCorrectly() {
 
 		Document expected = new Document("type", "object")
 				.append("description", "Must be an object defining restrictions for name, active.").append("properties",
@@ -140,7 +142,7 @@ public void objectObjectShouldRenderPropertiesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void objectObjectShouldRenderNestedObjectPropertiesCorrectly() {
+	void objectObjectShouldRenderNestedObjectPropertiesCorrectly() {
 
 		Document expected = new Document("type", "object")
 				.append("description", "Must be an object defining restrictions for address.")
@@ -156,7 +158,7 @@ public void objectObjectShouldRenderNestedObjectPropertiesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void objectObjectShouldRenderPatternPropertiesCorrectly() {
+	void objectObjectShouldRenderPatternPropertiesCorrectly() {
 
 		Document expected = new Document("type", "object")
 				.append("description", "Must be an object defining restrictions for patterns na.*.")
@@ -168,7 +170,7 @@ public void objectObjectShouldRenderPatternPropertiesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void objectShouldIncludeRequiredNestedCorrectly() {
+	void objectShouldIncludeRequiredNestedCorrectly() {
 
 		assertThat(object() //
 				.properties( //
@@ -183,21 +185,21 @@ public void objectShouldIncludeRequiredNestedCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1835
-	public void stringObjectShouldRenderTypeCorrectly() {
+	void stringObjectShouldRenderTypeCorrectly() {
 
 		assertThat(string().generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "string").append("description", "Must be a string."));
 	}
 
 	@Test // DATAMONGO-1835
-	public void stringObjectShouldRenderDescriptionCorrectly() {
+	void stringObjectShouldRenderDescriptionCorrectly() {
 
 		assertThat(string().description("error msg").toDocument())
 				.isEqualTo(new Document("type", "string").append("description", "error msg"));
 	}
 
 	@Test // DATAMONGO-1835
-	public void stringObjectShouldRenderRangeCorrectly() {
+	void stringObjectShouldRenderRangeCorrectly() {
 
 		assertThat(string().length(from(inclusive(10)).to(inclusive(20))).generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "string").append("description", "Must be a string with length [10-20].")
@@ -205,7 +207,7 @@ public void stringObjectShouldRenderRangeCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void stringObjectShouldRenderPatternCorrectly() {
+	void stringObjectShouldRenderPatternCorrectly() {
 
 		assertThat(string().matching("^spring$").generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "string").append("description", "Must be a string matching ^spring$.")
@@ -217,7 +219,7 @@ public void stringObjectShouldRenderPatternCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1835
-	public void numberObjectShouldRenderMultipleOfCorrectly() {
+	void numberObjectShouldRenderMultipleOfCorrectly() {
 
 		assertThat(number().multipleOf(3.141592F).generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "number").append("description", "Must be a numeric value multiple of 3.141592.")
@@ -225,7 +227,7 @@ public void numberObjectShouldRenderMultipleOfCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void numberObjectShouldRenderMaximumCorrectly() {
+	void numberObjectShouldRenderMaximumCorrectly() {
 
 		assertThat(
 				number().within(Range.of(Bound.unbounded(), Bound.inclusive(3.141592F))).generatedDescription().toDocument())
@@ -241,7 +243,7 @@ public void numberObjectShouldRenderMaximumCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void numberObjectShouldRenderMinimumCorrectly() {
+	void numberObjectShouldRenderMinimumCorrectly() {
 
 		assertThat(
 				number().within(Range.of(Bound.inclusive(3.141592F), Bound.unbounded())).generatedDescription().toDocument())
@@ -261,35 +263,42 @@ public void numberObjectShouldRenderMinimumCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1835
-	public void arrayObjectShouldRenderItemsCorrectly() {
+	void arrayObjectShouldRenderItemsCorrectly() {
 
 		assertThat(array().items(Arrays.asList(string(), bool())).toDocument()).isEqualTo(new Document("type", "array")
 				.append("items", Arrays.asList(new Document("type", "string"), new Document("type", "boolean"))));
 	}
 
+	@Test // DATAMONGO-2613
+	void arrayObjectShouldRenderItemsCorrectlyAsObjectIfContainsOnlyOneElement() {
+
+		assertThat(array().items(Collections.singletonList(string())).toDocument())
+				.isEqualTo(new Document("type", "array").append("items", new Document("type", "string")));
+	}
+
 	@Test // DATAMONGO-1835
-	public void arrayObjectShouldRenderMaxItemsCorrectly() {
+	void arrayObjectShouldRenderMaxItemsCorrectly() {
 
 		assertThat(array().maxItems(5).generatedDescription().toDocument()).isEqualTo(new Document("type", "array")
 				.append("description", "Must be an array having size unbounded-5].").append("maxItems", 5));
 	}
 
 	@Test // DATAMONGO-1835
-	public void arrayObjectShouldRenderMinItemsCorrectly() {
+	void arrayObjectShouldRenderMinItemsCorrectly() {
 
 		assertThat(array().minItems(5).generatedDescription().toDocument()).isEqualTo(new Document("type", "array")
 				.append("description", "Must be an array having size [5-unbounded.").append("minItems", 5));
 	}
 
 	@Test // DATAMONGO-1835
-	public void arrayObjectShouldRenderUniqueItemsCorrectly() {
+	void arrayObjectShouldRenderUniqueItemsCorrectly() {
 
 		assertThat(array().uniqueItems(true).generatedDescription().toDocument()).isEqualTo(new Document("type", "array")
 				.append("description", "Must be an array of unique values.").append("uniqueItems", true));
 	}
 
 	@Test // DATAMONGO-1835
-	public void arrayObjectShouldRenderAdditionalItemsItemsCorrectly() {
+	void arrayObjectShouldRenderAdditionalItemsItemsCorrectly() {
 
 		assertThat(array().additionalItems(true).generatedDescription().toDocument())
 				.isEqualTo(new Document("type", "array").append("description", "Must be an array with additional items.")
@@ -304,10 +313,10 @@ public void arrayObjectShouldRenderAdditionalItemsItemsCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1835
-	public void booleanShouldRenderCorrectly() {
+	void booleanShouldRenderCorrectly() {
 
 		assertThat(bool().generatedDescription().toDocument())
-				.isEqualTo(new Document("type", "boolean").append("description", "Must be a boolean."));
+				.isEqualTo(new Document("type", "boolean").append("description", "Must be a boolean"));
 	}
 
 	// -----------------
@@ -315,10 +324,10 @@ public void booleanShouldRenderCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1835
-	public void nullShouldRenderCorrectly() {
+	void nullShouldRenderCorrectly() {
 
 		assertThat(nil().generatedDescription().toDocument())
-				.isEqualTo(new Document("type", "null").append("description", "Must be null."));
+				.isEqualTo(new Document("type", "null").append("description", "Must be null"));
 	}
 
 	// -----------------
@@ -326,10 +335,10 @@ public void nullShouldRenderCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1877
-	public void dateShouldRenderCorrectly() {
+	void dateShouldRenderCorrectly() {
 
 		assertThat(date().generatedDescription().toDocument())
-				.isEqualTo(new Document("bsonType", "date").append("description", "Must be a date."));
+				.isEqualTo(new Document("bsonType", "date").append("description", "Must be a date"));
 	}
 
 	// -----------------
@@ -337,10 +346,10 @@ public void dateShouldRenderCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1877
-	public void timestampShouldRenderCorrectly() {
+	void timestampShouldRenderCorrectly() {
 
 		assertThat(timestamp().generatedDescription().toDocument())
-				.isEqualTo(new Document("bsonType", "timestamp").append("description", "Must be a timestamp."));
+				.isEqualTo(new Document("bsonType", "timestamp").append("description", "Must be a timestamp"));
 	}
 
 	// -----------------
@@ -348,35 +357,35 @@ public void timestampShouldRenderCorrectly() {
 	// -----------------
 
 	@Test // DATAMONGO-1835
-	public void typedObjectShouldRenderEnumCorrectly() {
+	void typedObjectShouldRenderEnumCorrectly() {
 
 		assertThat(of(String.class).possibleValues(Arrays.asList("one", "two")).toDocument())
 				.isEqualTo(new Document("type", "string").append("enum", Arrays.asList("one", "two")));
 	}
 
 	@Test // DATAMONGO-1835
-	public void typedObjectShouldRenderAllOfCorrectly() {
+	void typedObjectShouldRenderAllOfCorrectly() {
 
 		assertThat(of(Object.class).allOf(Arrays.asList(string())).toDocument())
 				.isEqualTo(new Document("type", "object").append("allOf", Arrays.asList(new Document("type", "string"))));
 	}
 
 	@Test // DATAMONGO-1835
-	public void typedObjectShouldRenderAnyOfCorrectly() {
+	void typedObjectShouldRenderAnyOfCorrectly() {
 
 		assertThat(of(String.class).anyOf(Arrays.asList(string())).toDocument())
 				.isEqualTo(new Document("type", "string").append("anyOf", Arrays.asList(new Document("type", "string"))));
 	}
 
 	@Test // DATAMONGO-1835
-	public void typedObjectShouldRenderOneOfCorrectly() {
+	void typedObjectShouldRenderOneOfCorrectly() {
 
 		assertThat(of(String.class).oneOf(Arrays.asList(string())).toDocument())
 				.isEqualTo(new Document("type", "string").append("oneOf", Arrays.asList(new Document("type", "string"))));
 	}
 
 	@Test // DATAMONGO-1835
-	public void typedObjectShouldRenderNotCorrectly() {
+	void typedObjectShouldRenderNotCorrectly() {
 
 		assertThat(untyped().notMatch(string()).toDocument())
 				.isEqualTo(new Document("not", new Document("type", "string")));
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaPropertyUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaPropertyUnitTests.java
index 6c7121576d..c9f6934d9b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaPropertyUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/JsonSchemaPropertyUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type;
 
 /**
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaTests.java
index d5b259eebc..a7cf75366f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,16 +17,13 @@
 
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.Data;
-
 import java.util.Collections;
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
@@ -35,11 +32,10 @@
 import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
 import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.validation.Validator;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoDatabase;
@@ -53,29 +49,30 @@
  *
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
 public class MongoJsonSchemaTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_6_0 = MongoVersionRule.atLeast(Version.parse("3.6.0"));
+	static @Client MongoClient mongoClient;
 
 	@Configuration
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
 		@Override
 		protected String getDatabaseName() {
 			return "json-schema-tests";
 		}
+
 	}
 
 	@Autowired MongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		template.dropCollection(Person.class);
@@ -182,7 +179,6 @@ Document readSchemaFromDatabase(String collectionName) {
 		return collectionInfo.get("options", Document.class).get("validator", Document.class);
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = "persons")
 	static class Person {
 
@@ -190,6 +186,34 @@ static class Person {
 		String lastname;
 		Address address;
 
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public Address getAddress() {
+			return this.address;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
+		public String toString() {
+			return "MongoJsonSchemaTests.Person(firstname=" + this.getFirstname() + ", lastname=" + this.getLastname()
+					+ ", address=" + this.getAddress() + ")";
+		}
 	}
 
 	static class Address {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaUnitTests.java
index f10b457db3..1691305617 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/MongoJsonSchemaUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,17 +15,20 @@
  */
 package org.springframework.data.mongodb.core.schema;
 
+import static org.springframework.data.mongodb.core.schema.IdentifiableJsonSchemaProperty.EncryptedJsonSchemaProperty.*;
 import static org.springframework.data.mongodb.core.schema.JsonSchemaProperty.*;
+import static org.springframework.data.mongodb.core.schema.JsonSchemaProperty.encrypted;
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 import java.util.UUID;
 
 import org.bson.Document;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * Unit tests for {@link MongoJsonSchema}.
@@ -33,11 +36,11 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoJsonSchemaUnitTests {
+@ExtendWith(MockitoExtension.class)
+class MongoJsonSchemaUnitTests {
 
 	@Test // DATAMONGO-1835
-	public void toDocumentRendersSchemaCorrectly() {
+	void toDocumentRendersSchemaCorrectly() {
 
 		MongoJsonSchema schema = MongoJsonSchema.builder() //
 				.required("firstname", "lastname") //
@@ -48,7 +51,7 @@ public void toDocumentRendersSchemaCorrectly() {
 	}
 
 	@Test // DATAMONGO-1835
-	public void rendersDocumentBasedSchemaCorrectly() {
+	void rendersDocumentBasedSchemaCorrectly() {
 
 		Document document = MongoJsonSchema.builder() //
 				.required("firstname", "lastname") //
@@ -61,7 +64,7 @@ public void rendersDocumentBasedSchemaCorrectly() {
 	}
 
 	@Test // DATAMONGO-1849
-	public void rendersRequiredPropertiesCorrectly() {
+	void rendersRequiredPropertiesCorrectly() {
 
 		MongoJsonSchema schema = MongoJsonSchema.builder() //
 				.required("firstname") //
@@ -75,7 +78,7 @@ public void rendersRequiredPropertiesCorrectly() {
 	}
 
 	@Test // DATAMONGO-2306
-	public void rendersEncryptedPropertyCorrectly() {
+	void rendersEncryptedPropertyCorrectly() {
 
 		MongoJsonSchema schema = MongoJsonSchema.builder().properties( //
 				encrypted(string("ssn")) //
@@ -90,7 +93,7 @@ public void rendersEncryptedPropertyCorrectly() {
 	}
 
 	@Test // DATAMONGO-2306
-	public void rendersEncryptedPropertyWithKeyIdCorrectly() {
+	void rendersEncryptedPropertyWithKeyIdCorrectly() {
 
 		UUID uuid = UUID.randomUUID();
 		MongoJsonSchema schema = MongoJsonSchema.builder().properties( //
@@ -105,13 +108,44 @@ public void rendersEncryptedPropertyWithKeyIdCorrectly() {
 								.append("algorithm", "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic").append("bsonType", "string"))))));
 	}
 
+	@Test // GH-4185
+	void rendersQueryablePropertyCorrectly() {
+
+		MongoJsonSchema schema = MongoJsonSchema.builder().properties( //
+				queryable(rangeEncrypted(number("ssn")),
+						List.of(QueryCharacteristics.range().contention(0).trimFactor(1).sparsity(1).min(0).max(200))))
+				.build();
+
+		assertThat(schema.toDocument().get("$jsonSchema", Document.class)).isEqualTo("""
+				{
+					"type": "object",
+					"properties": {
+						"ssn": {
+							"encrypt": {
+								"bsonType": "long",
+								"algorithm": "Range",
+								"queries": [{
+									"queryType": "range",
+									"contention": {$numberLong: "0"},
+									"trimFactor": 1,
+									"sparsity": {$numberLong: "1"},
+									"min": 0,
+									"max": 200
+									}]
+							}
+						}
+					}
+				}
+				""");
+	}
+
 	@Test // DATAMONGO-1835
-	public void throwsExceptionOnNullRoot() {
+	void throwsExceptionOnNullRoot() {
 		assertThatIllegalArgumentException().isThrownBy(() -> MongoJsonSchema.of((JsonSchemaObject) null));
 	}
 
 	@Test // DATAMONGO-1835
-	public void throwsExceptionOnNullDocument() {
+	void throwsExceptionOnNullDocument() {
 		assertThatIllegalArgumentException().isThrownBy(() -> MongoJsonSchema.of((Document) null));
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java
index e333adf348..4615568d10 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/ReactiveMongoJsonSchemaTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,62 +17,65 @@
 
 import static org.springframework.data.mongodb.test.util.Assertions.*;
 
-import lombok.Data;
 import reactor.test.StepVerifier;
 
 import java.time.Duration;
+import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.DataRetrievalFailureException;
-import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.CollectionOptions;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.convert.MongoJsonSchemaMapper;
 import org.springframework.data.mongodb.core.mapping.Field;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * Integration tests for {@link MongoJsonSchema} using reactive infrastructure.
  *
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 @ContextConfiguration
 public class ReactiveMongoJsonSchemaTests {
 
-	public static @ClassRule MongoVersionRule REQUIRES_AT_LEAST_3_6_0 = MongoVersionRule.atLeast(Version.parse("3.6.0"));
+	static @Client MongoClient mongoClient;
 
 	@Configuration
-	static class Config extends AbstractReactiveMongoConfiguration {
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
+			return mongoClient;
 		}
 
 		@Override
 		protected String getDatabaseName() {
 			return "json-schema-tests";
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired ReactiveMongoTemplate template;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		template.dropCollection(Person.class).as(StepVerifier::create).verifyComplete();
 	}
@@ -121,7 +124,6 @@ Document readSchemaFromDatabase(String collectionName) {
 		return collectionInfo.get("options", Document.class).get("validator", Document.class);
 	}
 
-	@Data
 	@org.springframework.data.mongodb.core.mapping.Document(collection = "persons")
 	static class Person {
 
@@ -129,6 +131,34 @@ static class Person {
 		String lastname;
 		Address address;
 
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public Address getAddress() {
+			return this.address;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public void setAddress(Address address) {
+			this.address = address;
+		}
+
+		public String toString() {
+			return "ReactiveMongoJsonSchemaTests.Person(firstname=" + this.getFirstname() + ", lastname=" + this.getLastname()
+					+ ", address=" + this.getAddress() + ")";
+		}
 	}
 
 	static class Address {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/TypeUnifyingMergeFunctionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/TypeUnifyingMergeFunctionUnitTests.java
new file mode 100644
index 0000000000..6db26a1250
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/schema/TypeUnifyingMergeFunctionUnitTests.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright 2022-2025 the original author 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.schema;
+
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema.ConflictResolutionFunction;
+import org.springframework.data.mongodb.core.schema.MongoJsonSchema.ConflictResolutionFunction.Resolution;
+
+/**
+ * Unit tests for {@link TypeUnifyingMergeFunction}.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith(MockitoExtension.class)
+public class TypeUnifyingMergeFunctionUnitTests {
+
+	@Mock ConflictResolutionFunction crf;
+
+	TypeUnifyingMergeFunction mergeFunction;
+
+	@BeforeEach
+	void beforeEach() {
+		mergeFunction = new TypeUnifyingMergeFunction(crf);
+	}
+
+	@Test // GH-3870
+	void nonOverlapping() {
+
+		Map<String, Object> a = new LinkedHashMap<>();
+		a.put("a", "a-value");
+		Map<String, Object> b = new LinkedHashMap<>();
+		b.put("b", "b-value");
+
+		Document target = mergeFunction.apply(a, b);
+		assertThat(target).containsEntry("a", "a-value").containsEntry("b", "b-value");
+	}
+
+	@Test // GH-3870
+	void resolvesNonConflictingTypeKeys/* type vs bsonType */() {
+
+		Map<String, Object> a = new LinkedHashMap<>();
+		a.put("type", "string");
+		Map<String, Object> b = new LinkedHashMap<>();
+		b.put("bsonType", "string");
+
+		Document target = mergeFunction.apply(a, b);
+		assertThat(target).containsEntry("type", "string").doesNotContainKey("bsonType");
+	}
+
+	@Test // GH-3870
+	void nonOverlappingNestedMap() {
+
+		Map<String, Object> a = new LinkedHashMap<>();
+		a.put("a", Collections.singletonMap("nested", "value"));
+		Map<String, Object> b = new LinkedHashMap<>();
+		b.put("b", "b-value");
+
+		Document target = mergeFunction.apply(a, b);
+		assertThat(target).containsEntry("a", Collections.singletonMap("nested", "value")).containsEntry("b", "b-value");
+	}
+
+	@Test // GH-3870
+	void nonOverlappingNestedMaps() {
+
+		Map<String, Object> a = new LinkedHashMap<>();
+		a.put("nested", Collections.singletonMap("a", "a-value"));
+		Map<String, Object> b = new LinkedHashMap<>();
+		b.put("nested", Collections.singletonMap("b", "b-value"));
+
+		Document target = mergeFunction.apply(a, b);
+		assertThat(target).containsEntry("nested.a", "a-value").containsEntry("nested.b", "b-value");
+	}
+
+	@Test // GH-3870
+	void delegatesConflictToResolutionFunction() {
+
+		ArgumentCaptor<Object> aValueCaptor = ArgumentCaptor.forClass(Object.class);
+		ArgumentCaptor<Object> bValueCaptor = ArgumentCaptor.forClass(Object.class);
+
+		when(crf.resolveConflict(any(), aValueCaptor.capture(), bValueCaptor.capture())).thenReturn(Resolution.ofValue("nested", "from-function"));
+
+		Map<String, Object> a = new LinkedHashMap<>();
+		a.put("nested", Collections.singletonMap("a", "a-value"));
+		Map<String, Object> b = new LinkedHashMap<>();
+		b.put("nested", "b-value");
+
+		Document target = mergeFunction.apply(a, b);
+		assertThat(target).containsEntry("nested", "from-function") //
+				.doesNotContainKey("nested.a");
+
+		assertThat(aValueCaptor.getValue()).isEqualTo(a);
+		assertThat(bValueCaptor.getValue()).isEqualTo(b);
+	}
+
+	@Test // GH-3870
+	void skipsConflictItemsWhenAdvised() {
+
+		ArgumentCaptor<Object> aValueCaptor = ArgumentCaptor.forClass(Object.class);
+		ArgumentCaptor<Object> bValueCaptor = ArgumentCaptor.forClass(Object.class);
+
+		when(crf.resolveConflict(any(), aValueCaptor.capture(), bValueCaptor.capture())).thenReturn(Resolution.SKIP);
+
+		Map<String, Object> a = new LinkedHashMap<>();
+		a.put("nested", Collections.singletonMap("a", "a-value"));
+		a.put("some", "value");
+		Map<String, Object> b = new LinkedHashMap<>();
+		b.put("nested", "b-value");
+
+		Document target = mergeFunction.apply(a, b);
+		assertThat(target).hasSize(1).containsEntry("some", "value");
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/ExecutableMongoScriptUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/ExecutableMongoScriptUnitTests.java
index 341be5a5e9..c2f31b829f 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/ExecutableMongoScriptUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/ExecutableMongoScriptUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,55 +17,32 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import org.springframework.util.ObjectUtils;
+import org.junit.jupiter.api.Test;
 
 /**
  * @author Christoph Strobl
  */
-public class ExecutableMongoScriptUnitTests {
-
-	public @Rule ExpectedException expectedException = ExpectedException.none();
+class ExecutableMongoScriptUnitTests {
 
 	@Test // DATAMONGO-479
-	public void constructorShouldThrowExceptionWhenRawScriptIsNull() {
-
-		expectException(IllegalArgumentException.class, "must not be", "null");
-
-		new ExecutableMongoScript(null);
+	void constructorShouldThrowExceptionWhenRawScriptIsNull() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new ExecutableMongoScript(null))
+				.withMessageContaining("must not be").withMessageContaining("null");
 	}
 
 	@Test // DATAMONGO-479
-	public void constructorShouldThrowExceptionWhenRawScriptIsEmpty() {
-
-		expectException(IllegalArgumentException.class, "must not be", "empty");
-
-		new ExecutableMongoScript("");
+	void constructorShouldThrowExceptionWhenRawScriptIsEmpty() {
+		assertThatIllegalArgumentException().isThrownBy(() -> new ExecutableMongoScript(""))
+				.withMessageContaining("must not be").withMessageContaining("empty");
 	}
 
 	@Test // DATAMONGO-479
-	public void getCodeShouldReturnCodeRepresentationOfRawScript() {
+	void getCodeShouldReturnCodeRepresentationOfRawScript() {
 
 		String jsFunction = "function(x) { return x; }";
 
 		ExecutableMongoScript script = new ExecutableMongoScript(jsFunction);
 
-		assertThat(script.getCode()).isNotNull();
-		assertThat(script.getCode().toString()).isEqualTo(jsFunction);
+		assertThat(script.getCode()).isNotNull().hasToString(jsFunction);
 	}
-
-	private void expectException(Class<?> type, String... messageFragments) {
-
-		expectedException.expect(IllegalArgumentException.class);
-
-		if (!ObjectUtils.isEmpty(messageFragments)) {
-			for (String fragment : messageFragments) {
-				expectedException.expectMessage(fragment);
-			}
-		}
-	}
-
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/NamedMongoScriptUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/NamedMongoScriptUnitTests.java
index dc7a97b1ac..3eca8e90b5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/NamedMongoScriptUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/script/NamedMongoScriptUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link NamedMongoScript}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/spel/ExpressionNodeUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/spel/ExpressionNodeUnitTests.java
index 169f0d23f9..b9b2f18c73 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/spel/ExpressionNodeUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/spel/ExpressionNodeUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,11 +20,11 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.SpelNode;
@@ -38,8 +38,8 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ExpressionNodeUnitTests {
+@ExtendWith(MockitoExtension.class)
+class ExpressionNodeUnitTests {
 
 	@Mock ExpressionState state;
 
@@ -48,15 +48,15 @@ public class ExpressionNodeUnitTests {
 	@Mock OpDivide divide;
 	@Mock OpMultiply multiply;
 
-	Collection<? extends SpelNode> operators;
+	private Collection<? extends SpelNode> operators;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		this.operators = Arrays.asList(minus, plus, divide, multiply);
 	}
 
 	@Test // DATAMONGO-774
-	public void createsOperatorNodeForOperations() {
+	void createsOperatorNodeForOperations() {
 
 		for (SpelNode operator : operators) {
 			assertThat(ExpressionNode.from(operator, state)).isInstanceOf(OperatorNode.class);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/validation/CriteriaValidatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/validation/CriteriaValidatorUnitTests.java
index 902416422c..f044646037 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/validation/CriteriaValidatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/validation/CriteriaValidatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 import static org.assertj.core.api.Assertions.*;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.data.mongodb.core.query.Criteria;
 
 /**
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/MongoApplication.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/MongoApplication.java
new file mode 100644
index 0000000000..c68dc5018f
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/MongoApplication.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2023-2025 the original author 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.
+ */
+// tag::file[]
+package org.springframework.data.mongodb.example;
+
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+
+import com.mongodb.client.MongoClients;
+
+public class MongoApplication {
+
+	public static void main(String[] args) throws Exception {
+
+		MongoOperations mongoOps = new MongoTemplate(MongoClients.create(), "database");
+		mongoOps.insert(new Person("Joe", 34));
+
+		System.out.println(mongoOps.query(Person.class).matching(where("name").is("Joe")).firstValue());
+
+		mongoOps.dropCollection("person");
+	}
+}
+//end::file[]
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/Person.java
new file mode 100644
index 0000000000..8c1e9e4d81
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/Person.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2023-2025 the original author 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.
+ */
+// tag::file[]
+package org.springframework.data.mongodb.example;
+
+// tag::class[]
+public class Person {
+
+	private String id;
+	private String name;
+	private int age;
+
+	public Person(String name, int age) {
+		this.name = name;
+		this.age = age;
+	}
+
+	public String getId() {
+		return id;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	@Override
+	public String toString() {
+		return "Person [id=" + id + ", name=" + name + ", age=" + age + "]";
+	}
+}
+// end::class[]
+// end::file[]
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/ReactiveMongoApplication.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/ReactiveMongoApplication.java
new file mode 100644
index 0000000000..8022f45ab7
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example/ReactiveMongoApplication.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2023-2025 the original author 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.
+ */
+// tag::file[]
+package org.springframework.data.mongodb.example;
+
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+
+import com.mongodb.reactivestreams.client.MongoClients;
+
+public class ReactiveMongoApplication {
+
+	public static void main(String[] args) throws Exception {
+
+		ReactiveMongoOperations mongoOps = new ReactiveMongoTemplate(MongoClients.create(), "database");
+
+		mongoOps.insert(new Person("Joe", 34))
+			.then(mongoOps.query(Person.class).matching(where("name").is("Joe")).first())
+			.doOnNext(System.out::println)
+			.block();
+
+		mongoOps.dropCollection("person").block();
+	}
+}
+// end::file[]
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/AntPathUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/AntPathUnitTests.java
index 88c6842538..516a1890bb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/AntPathUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/AntPathUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 import java.util.regex.Pattern;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Unit tests for {@link AntPath}.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/BinaryStreamAdaptersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/BinaryStreamAdaptersUnitTests.java
deleted file mode 100644
index 7d46d4c468..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/BinaryStreamAdaptersUnitTests.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import static org.assertj.core.api.Assertions.*;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-import java.io.IOException;
-import java.nio.ByteBuffer;
-
-import org.junit.Test;
-
-import org.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferUtils;
-import org.springframework.core.io.buffer.DefaultDataBufferFactory;
-import org.springframework.util.StreamUtils;
-
-import com.mongodb.reactivestreams.client.gridfs.AsyncInputStream;
-import com.mongodb.reactivestreams.client.gridfs.helpers.AsyncStreamHelper;
-
-/**
- * Unit tests for {@link BinaryStreamAdapters}.
- *
- * @author Mark Paluch
- */
-public class BinaryStreamAdaptersUnitTests {
-
-	@Test // DATAMONGO-1855
-	public void shouldAdaptAsyncInputStreamToDataBufferPublisher() throws IOException {
-
-		ClassPathResource resource = new ClassPathResource("gridfs/gridfs.xml");
-
-		byte[] content = StreamUtils.copyToByteArray(resource.getInputStream());
-		AsyncInputStream inputStream = AsyncStreamHelper.toAsyncInputStream(resource.getInputStream());
-
-		Flux<DataBuffer> dataBuffers = BinaryStreamAdapters.toPublisher(inputStream, new DefaultDataBufferFactory(), 256);
-
-		DataBufferUtils.join(dataBuffers) //
-				.as(StepVerifier::create) //
-				.consumeNextWith(actual -> {
-
-					byte[] actualContent = new byte[actual.readableByteCount()];
-					actual.read(actualContent);
-					assertThat(actualContent).isEqualTo(content);
-				}) //
-				.verifyComplete();
-	}
-
-	@Test // DATAMONGO-1855
-	public void shouldAdaptBinaryPublisherToAsyncInputStream() throws IOException {
-
-		ClassPathResource resource = new ClassPathResource("gridfs/gridfs.xml");
-
-		byte[] content = StreamUtils.copyToByteArray(resource.getInputStream());
-
-		Flux<DataBuffer> dataBuffers = DataBufferUtils.readInputStream(resource::getInputStream,
-				new DefaultDataBufferFactory(), 10);
-
-		AsyncInputStream inputStream = BinaryStreamAdapters.toAsyncInputStream(dataBuffers).block();
-		ByteBuffer complete = readBuffer(inputStream);
-
-		assertThat(complete).isEqualTo(ByteBuffer.wrap(content));
-	}
-
-	static ByteBuffer readBuffer(AsyncInputStream inputStream) {
-
-		ByteBuffer complete = ByteBuffer.allocate(1024);
-
-		boolean hasData = true;
-		while (hasData) {
-
-			ByteBuffer chunk = ByteBuffer.allocate(100);
-
-			Integer bytesRead = Mono.from(inputStream.read(chunk)).block();
-
-			chunk.flip();
-			complete.put(chunk);
-
-			hasData = bytesRead > -1;
-		}
-
-		complete.flip();
-
-		return complete;
-	}
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapterUnitTests.java
deleted file mode 100644
index 26eaebc6c2..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/DataBufferPublisherAdapterUnitTests.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.gridfs;
-
-import static org.mockito.Mockito.*;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-
-import org.junit.Test;
-
-import org.springframework.core.io.buffer.DataBuffer;
-import org.springframework.core.io.buffer.DataBufferFactory;
-import org.springframework.core.io.buffer.DefaultDataBufferFactory;
-
-/**
- * Unit tests for {@link DataBufferPublisherAdapter}.
- *
- * @author Mark Paluch
- */
-public class DataBufferPublisherAdapterUnitTests {
-
-	DataBufferFactory factory = new DefaultDataBufferFactory();
-
-	@Test // DATAMONGO-2230
-	public void adapterShouldPropagateErrors() {
-
-		AsyncInputStreamAdapter asyncInput = mock(AsyncInputStreamAdapter.class);
-
-		when(asyncInput.read(any())).thenReturn(Mono.just(1), Mono.error(new IllegalStateException()));
-		when(asyncInput.close()).thenReturn(Mono.empty());
-
-		Flux<DataBuffer> binaryStream = DataBufferPublisherAdapter.createBinaryStream(asyncInput, factory, 256);
-
-		StepVerifier.create(binaryStream, 0) //
-				.thenRequest(1) //
-				.expectNextCount(1) //
-				.thenRequest(1) //
-				.verifyError(IllegalStateException.class);
-	}
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsResourceUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsResourceUnitTests.java
index cbd5eb5c88..708ec4967c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsResourceUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsResourceUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,7 @@
 
 import org.bson.BsonObjectId;
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import com.mongodb.MongoGridFSException;
 import com.mongodb.client.gridfs.model.GridFSFile;
@@ -39,7 +39,7 @@ public class GridFsResourceUnitTests {
 	public void shouldReadContentTypeCorrectly() {
 
 		Document metadata = new Document(GridFsResource.CONTENT_TYPE_FIELD, "text/plain");
-		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), "foo", metadata);
+		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), metadata);
 		GridFsResource resource = new GridFsResource(file);
 
 		assertThat(resource.getContentType()).isEqualTo("text/plain");
@@ -48,7 +48,7 @@ public void shouldReadContentTypeCorrectly() {
 	@Test // DATAMONGO-2240
 	public void shouldReturnGridFSFile() {
 
-		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), "foo", new Document());
+		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), new Document());
 		GridFsResource resource = new GridFsResource(file);
 
 		assertThat(resource.getGridFSFile()).isSameAs(file);
@@ -57,7 +57,7 @@ public void shouldReturnGridFSFile() {
 	@Test // DATAMONGO-1850
 	public void shouldThrowExceptionOnEmptyContentType() {
 
-		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), "foo", null);
+		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), null);
 		GridFsResource resource = new GridFsResource(file);
 
 		assertThatThrownBy(resource::getContentType).isInstanceOf(MongoGridFSException.class);
@@ -66,7 +66,7 @@ public void shouldThrowExceptionOnEmptyContentType() {
 	@Test // DATAMONGO-1850
 	public void shouldThrowExceptionOnEmptyContentTypeInMetadata() {
 
-		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), "foo", new Document());
+		GridFSFile file = new GridFSFile(new BsonObjectId(), "foo", 0, 0, new Date(), new Document());
 		GridFsResource resource = new GridFsResource(file);
 
 		assertThatThrownBy(resource::getContentType).isInstanceOf(MongoGridFSException.class);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIntegrationTests.java
index 4ddef14181..f6c96e44a4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,37 +20,37 @@
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.gridfs.GridFsCriteria.*;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-import java.util.UUID;
+import java.util.stream.Stream;
 
 import org.bson.BsonObjectId;
+import org.bson.BsonString;
 import org.bson.Document;
 import org.bson.types.ObjectId;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.StreamUtils;
 
 import com.mongodb.MongoGridFSException;
 import com.mongodb.client.gridfs.GridFSFindIterable;
 import com.mongodb.client.gridfs.model.GridFSFile;
-import com.mongodb.gridfs.GridFS;
-import com.mongodb.gridfs.GridFSInputFile;
 
 /**
  * Integration tests for {@link GridFsTemplate}.
@@ -61,15 +61,16 @@
  * @author Martin Baumgartner
  * @author Hartmut Lang
  * @author Mark Paluch
+ * @author Denis Zavedeev
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:gridfs/gridfs.xml")
 public class GridFsTemplateIntegrationTests {
 
 	Resource resource = new ClassPathResource("gridfs/gridfs.xml");
 
 	@Autowired GridFsOperations operations;
-	@Autowired SimpleMongoDbFactory mongoClient;
+	@Autowired SimpleMongoClientDatabaseFactory mongoClient;
 
 	@Before
 	public void setUp() {
@@ -88,23 +89,23 @@ public void storesAndFindsSimpleDocument() throws IOException {
 		assertThat(((BsonObjectId) files.get(0).getId()).getValue()).isEqualTo(reference);
 	}
 
-	@Test // DATAMONGO-2392
-	public void storesAndFindsByUUID() throws IOException {
-
-		UUID uuid = UUID.randomUUID();
-
-		GridFS fs = new GridFS(mongoClient.getLegacyDb());
-		GridFSInputFile in = fs.createFile(resource.getInputStream(), "gridfs.xml");
-
-		in.put("_id", uuid);
-		in.put("contentType", "application/octet-stream");
-		in.save();
-
-		GridFSFile file = operations.findOne(query(where("_id").is(uuid)));
-		GridFsResource resource = operations.getResource(file);
-
-		assertThat(resource.exists()).isTrue();
-	}
+	// @Test // DATAMONGO-2392
+	// public void storesAndFindsByUUID() throws IOException {
+	//
+	// UUID uuid = UUID.randomUUID();
+	//
+	// GridFSFile fs = new GridFSFile(new BsonObjectId(new ObjectId(uuid.to))
+	// GridFSInputFile in = fs.createFile(resource.getInputStream(), "gridfs.xml");
+	//
+	// in.put("_id", uuid);
+	// in.put("contentType", "application/octet-stream");
+	// in.save();
+	//
+	// GridFSFile file = operations.findOne(query(where("_id").is(uuid)));
+	// GridFsResource resource = operations.getResource(file);
+	//
+	// assertThat(resource.exists()).isTrue();
+	// }
 
 	@Test // DATAMONGO-6
 	public void writesMetadataCorrectly() throws IOException {
@@ -289,6 +290,46 @@ public void getResourceShouldRetrieveContentByIdentity() throws IOException {
 		}
 	}
 
+	@Test // DATAMONGO-625
+	public void storeSavesGridFsUploadWithGivenIdCorrectly() throws IOException {
+
+		String id = "id-1";
+
+		GridFsUpload<String> upload = GridFsUpload.fromStream(resource.getInputStream()) //
+				.id(id) //
+				.filename("gridFsUpload.xml") //
+				.contentType("xml") //
+				.build();
+
+		assertThat(operations.store(upload)).isEqualTo(id);
+
+		GridFsResource fsFile = operations.getResource(operations.findOne(query(where("_id").is(id))));
+		byte[] content = StreamUtils.copyToByteArray(fsFile.getInputStream());
+
+		assertThat(content).isEqualTo(StreamUtils.copyToByteArray(resource.getInputStream()));
+		assertThat(fsFile.getFilename()).isEqualTo("gridFsUpload.xml");
+		assertThat(fsFile.getId()).isEqualTo(new BsonString(id));
+		assertThat(fsFile.getFileId()).isEqualTo(id);
+		assertThat(fsFile.getContentType()).isEqualTo("xml");
+	}
+
+	@Test // DATAMONGO-765
+	public void considersSkipLimitWhenQueryingFiles() {
+
+		Stream.of("a", "aa", "aaa", //
+				"b", "bb", "bb", //
+				"c", "cc", "ccc", //
+				"d", "dd", "ddd") //
+				.forEach(filename -> operations.store(new ByteArrayInputStream(new byte[0]), filename));
+
+		PageRequest pageRequest = PageRequest.of(2, 3, Direction.ASC, "filename");
+		List<String> filenames = operations.find(new Query().with(pageRequest)) //
+				.map(GridFSFile::getFilename) //
+				.into(new ArrayList<>());
+
+		assertThat(filenames).containsExactly("c", "cc", "ccc");
+	}
+
 	class Metadata {
 		String version;
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateUnitTests.java
new file mode 100644
index 0000000000..25693d10b7
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/GridFsTemplateUnitTests.java
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2020-2025 the original author 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.gridfs;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+
+/**
+ * @author Christoph Strobl
+ */
+class GridFsTemplateUnitTests {
+
+	private GridFsTemplateStub template;
+
+	@BeforeEach
+	void beforeEach() {
+		template = new GridFsTemplateStub();
+	}
+
+	@Test // DATAMONGO-2574
+	void contentMetadataDoesNotOverrideContentTypeIfSet() {
+
+		template.onStoreReturn(new ObjectId());
+		template.store(new ByteArrayInputStream(new byte[] {}), "filename", "json", new Document("meta", "data"));
+
+		assertThat(template.capturedUpload().getOptions().getContentType()).isEqualTo("json");
+		assertThat(template.capturedUpload().getOptions().getMetadata()).containsEntry("meta", "data");
+	}
+
+	private static class GridFsTemplateStub extends GridFsTemplate {
+
+		private Object onStoreResult;
+		private GridFsObject<?, InputStream> capturedUpload;
+
+		GridFsTemplateStub() {
+			super(mock(MongoDatabaseFactory.class), mock(MongoConverter.class));
+		}
+
+		@Override
+		public <T> T store(GridFsObject<T, InputStream> upload) {
+
+			this.capturedUpload = upload;
+			return (T) onStoreResult;
+		}
+
+		GridFsTemplateStub onStoreReturn(Object result) {
+
+			this.onStoreResult = result;
+			return this;
+		}
+
+		GridFsObject<?, InputStream> capturedUpload() {
+			return capturedUpload;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResourceUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResourceUnitTests.java
new file mode 100644
index 0000000000..ca408bb502
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsResourceUnitTests.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2020-2025 the original author 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.gridfs;
+
+import static org.assertj.core.api.Assertions.*;
+
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.nio.ByteBuffer;
+
+import org.junit.jupiter.api.Test;
+import org.reactivestreams.Publisher;
+import org.reactivestreams.Subscriber;
+import org.reactivestreams.Subscription;
+
+import com.mongodb.client.gridfs.model.GridFSFile;
+import com.mongodb.reactivestreams.client.gridfs.GridFSDownloadPublisher;
+
+/**
+ * Unit tests for {@link ReactiveGridFsResource}.
+ *
+ * @author Christoph Strobl
+ */
+class ReactiveGridFsResourceUnitTests {
+
+	@Test // DATAMONGO-2427
+	void streamCanOnlyBeConsumedOnce() {
+
+		ReactiveGridFsResource resource = new ReactiveGridFsResource("file.name", new StubGridFSDownloadPublisher());
+
+		assertThat(resource.exists()).isTrue();
+
+		resource.getInputStream().as(StepVerifier::create).verifyComplete();
+		resource.getInputStream().as(StepVerifier::create).verifyError(IllegalStateException.class);
+		resource.getDownloadStream().as(StepVerifier::create).verifyError(IllegalStateException.class);
+	}
+
+	@Test // DATAMONGO-2427
+	void existReturnsFalseForNullPublisher() {
+
+		ReactiveGridFsResource resource = new ReactiveGridFsResource("file.name", null);
+
+		assertThat(resource.exists()).isFalse();
+	}
+
+	@Test // DATAMONGO-2427
+	void nonExistingResourceProducesEmptyDownloadStream() {
+
+		ReactiveGridFsResource resource = new ReactiveGridFsResource("file.name", null);
+
+		resource.getInputStream().as(StepVerifier::create).verifyComplete();
+		resource.getInputStream().as(StepVerifier::create).verifyComplete();
+		resource.getDownloadStream().as(StepVerifier::create).verifyComplete();
+	}
+
+	private static class StubGridFSDownloadPublisher implements GridFSDownloadPublisher {
+
+		@Override
+		public Publisher<GridFSFile> getGridFSFile() {
+			return Mono.empty();
+		}
+
+		@Override
+		public GridFSDownloadPublisher bufferSizeBytes(int bufferSizeBytes) {
+			return null;
+		}
+
+		@Override
+		public void subscribe(Subscriber<? super ByteBuffer> s) {
+
+			s.onSubscribe(new Subscription() {
+				@Override
+				public void request(long n) {
+					s.onComplete();
+				}
+
+				@Override
+				public void cancel() {
+
+				}
+			});
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplateTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplateTests.java
index 9914443c8d..d0b87cf5fd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplateTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplateTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,13 +21,15 @@
 import static org.springframework.data.mongodb.gridfs.GridFsCriteria.*;
 
 import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.ByteBuffer;
-import java.util.UUID;
 
 import org.bson.BsonObjectId;
+import org.bson.BsonString;
 import org.bson.Document;
 import org.bson.types.ObjectId;
 import org.junit.Before;
@@ -36,23 +38,25 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.core.io.buffer.DataBufferFactory;
 import org.springframework.core.io.buffer.DataBufferUtils;
 import org.springframework.core.io.buffer.DefaultDataBuffer;
 import org.springframework.core.io.buffer.DefaultDataBufferFactory;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.FileCopyUtils;
 import org.springframework.util.StreamUtils;
 
-import com.mongodb.gridfs.GridFS;
-import com.mongodb.gridfs.GridFSInputFile;
+import com.mongodb.client.gridfs.model.GridFSFile;
 import com.mongodb.internal.HexUtils;
-import com.mongodb.reactivestreams.client.gridfs.AsyncInputStream;
-import com.mongodb.reactivestreams.client.gridfs.helpers.AsyncStreamHelper;
 
 /**
  * Integration tests for {@link ReactiveGridFsTemplate}.
@@ -60,6 +64,7 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  * @author Nick Stolwijk
+ * @author Denis Zavedeev
  */
 @RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:gridfs/reactive-gridfs.xml")
@@ -68,7 +73,7 @@ public class ReactiveGridFsTemplateTests {
 	Resource resource = new ClassPathResource("gridfs/gridfs.xml");
 
 	@Autowired ReactiveGridFsOperations operations;
-	@Autowired SimpleMongoDbFactory mongoClient;
+	@Autowired SimpleMongoClientDatabaseFactory mongoClient;
 	@Autowired ReactiveMongoDatabaseFactory dbFactory;
 	@Autowired MongoConverter mongoConverter;
 
@@ -136,33 +141,13 @@ public void storesAndLoadsLargeFileCorrectly() {
 				}).verifyComplete();
 	}
 
-	@Test // DATAMONGO-2392
-	public void storesAndFindsByUUID() throws IOException {
-
-		UUID uuid = UUID.randomUUID();
-
-		GridFS fs = new GridFS(mongoClient.getLegacyDb());
-		GridFSInputFile in = fs.createFile(resource.getInputStream(), "gridfs.xml");
-
-		in.put("_id", uuid);
-		in.put("contentType", "application/octet-stream");
-		in.save();
-
-		operations.findOne(query(where("_id").is(uuid))).flatMap(operations::getResource)
-				.flatMapMany(ReactiveGridFsResource::getDownloadStream) //
-				.transform(DataBufferUtils::join) //
-				.doOnNext(DataBufferUtils::release).as(StepVerifier::create) //
-				.expectNextCount(1).verifyComplete();
-	}
-
 	@Test // DATAMONGO-1855
 	public void writesMetadataCorrectly() throws IOException {
 
 		Document metadata = new Document("key", "value");
 
-		AsyncInputStream stream = AsyncStreamHelper.toAsyncInputStream(resource.getInputStream());
-
-		ObjectId reference = operations.store(stream, "foo.xml", "binary/octet-stream", metadata).block();
+		Flux<DataBuffer> source = DataBufferUtils.read(resource, new DefaultDataBufferFactory(), 256);
+		ObjectId reference = operations.store(source, "foo.xml", "binary/octet-stream", metadata).block();
 
 		operations.find(query(whereMetaData("key").is("value"))) //
 				.as(StepVerifier::create) //
@@ -173,14 +158,13 @@ public void writesMetadataCorrectly() throws IOException {
 	}
 
 	@Test // DATAMONGO-1855
-	public void marshalsComplexMetadata() throws IOException {
+	public void marshalsComplexMetadata() {
 
 		Metadata metadata = new Metadata();
 		metadata.version = "1.0";
 
-		AsyncInputStream stream = AsyncStreamHelper.toAsyncInputStream(resource.getInputStream());
-
-		ObjectId reference = operations.store(stream, "foo.xml", "binary/octet-stream", metadata).block();
+		Flux<DataBuffer> source = DataBufferUtils.read(resource, new DefaultDataBufferFactory(), 256);
+		ObjectId reference = operations.store(source, "foo.xml", "binary/octet-stream", metadata).block();
 
 		operations.find(query(whereMetaData("version").is("1.0"))) //
 				.as(StepVerifier::create) //
@@ -195,9 +179,8 @@ public void marshalsComplexMetadata() throws IOException {
 	public void getResourceShouldRetrieveContentByIdentity() throws IOException {
 
 		byte[] content = StreamUtils.copyToByteArray(resource.getInputStream());
-		AsyncInputStream upload = AsyncStreamHelper.toAsyncInputStream(resource.getInputStream());
-
-		ObjectId reference = operations.store(upload, "foo.xml", null, null).block();
+		Flux<DataBuffer> source = DataBufferUtils.read(resource, new DefaultDataBufferFactory(), 256);
+		ObjectId reference = operations.store(source, "foo.xml", null, null).block();
 
 		operations.findOne(query(where("_id").is(reference))).flatMap(operations::getResource)
 				.flatMapMany(ReactiveGridFsResource::getDownloadStream) //
@@ -216,9 +199,9 @@ public void getResourceShouldRetrieveContentByIdentity() throws IOException {
 	@Test // DATAMONGO-1855, DATAMONGO-2240
 	public void shouldEmitFirstEntryWhenFindFirstRetrievesMoreThanOneResult() throws IOException {
 
-		AsyncInputStream upload1 = AsyncStreamHelper.toAsyncInputStream(resource.getInputStream());
-		AsyncInputStream upload2 = AsyncStreamHelper
-				.toAsyncInputStream(new ClassPathResource("gridfs/another-resource.xml").getInputStream());
+		Flux<DataBuffer> upload1 = DataBufferUtils.read(resource, new DefaultDataBufferFactory(), 256);
+		Flux<DataBuffer> upload2 = DataBufferUtils.read(new ClassPathResource("gridfs/another-resource.xml"),
+				new DefaultDataBufferFactory(), 256);
 
 		operations.store(upload1, "foo.xml", null, null).block();
 		operations.store(upload2, "foo2.xml", null, null).block();
@@ -240,16 +223,16 @@ public void shouldReturnNoGridFsFileWhenAbsent() {
 				.assertNext(actual -> {
 
 					assertThat(actual.exists()).isFalse();
-					assertThat(actual.getGridFSFile()).isNull();
+					assertThat(actual.getGridFSFile()).isEqualTo(Mono.empty());
 				}).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1855
 	public void shouldEmitErrorWhenFindOneRetrievesMoreThanOneResult() throws IOException {
 
-		AsyncInputStream upload1 = AsyncStreamHelper.toAsyncInputStream(resource.getInputStream());
-		AsyncInputStream upload2 = AsyncStreamHelper
-				.toAsyncInputStream(new ClassPathResource("gridfs/another-resource.xml").getInputStream());
+		Flux<DataBuffer> upload1 = DataBufferUtils.read(resource, new DefaultDataBufferFactory(), 256);
+		Flux<DataBuffer> upload2 = DataBufferUtils.read(new ClassPathResource("gridfs/another-resource.xml"),
+				new DefaultDataBufferFactory(), 256);
 
 		operations.store(upload1, "foo.xml", null, null).block();
 		operations.store(upload2, "foo2.xml", null, null).block();
@@ -264,7 +247,7 @@ public void shouldEmitErrorWhenFindOneRetrievesMoreThanOneResult() throws IOExce
 	public void getResourcesByPattern() throws IOException {
 
 		byte[] content = StreamUtils.copyToByteArray(resource.getInputStream());
-		AsyncInputStream upload = AsyncStreamHelper.toAsyncInputStream(resource.getInputStream());
+		Flux<DataBuffer> upload = DataBufferUtils.read(resource, new DefaultDataBufferFactory(), 256);
 
 		operations.store(upload, "foo.xml", null, null).block();
 
@@ -282,7 +265,72 @@ public void getResourcesByPattern() throws IOException {
 				.verifyComplete();
 	}
 
+	@Test // DATAMONGO-625
+	public void storeSavesGridFsUploadWithGivenIdCorrectly() throws IOException {
+
+		String id = "id-1";
+		byte[] content = StreamUtils.copyToByteArray(resource.getInputStream());
+		Flux<DataBuffer> data = DataBufferUtils.read(resource, new DefaultDataBufferFactory(), 256);
+
+		ReactiveGridFsUpload<String> upload = ReactiveGridFsUpload.fromPublisher(data) //
+				.id(id) //
+				.filename("gridFsUpload.xml") //
+				.contentType("xml") //
+				.build();
+
+		operations.store(upload).as(StepVerifier::create).expectNext(id).verifyComplete();
+
+		operations.findOne(query(where("_id").is(id))).flatMap(operations::getResource)
+				.flatMapMany(ReactiveGridFsResource::getDownloadStream) //
+				.transform(DataBufferUtils::join) //
+				.as(StepVerifier::create) //
+				.consumeNextWith(dataBuffer -> {
+
+					byte[] actual = new byte[dataBuffer.readableByteCount()];
+					dataBuffer.read(actual);
+
+					assertThat(actual).isEqualTo(content);
+				}) //
+				.verifyComplete();
+
+		operations.findOne(query(where("_id").is(id))).as(StepVerifier::create).consumeNextWith(it -> {
+			assertThat(it.getFilename()).isEqualTo("gridFsUpload.xml");
+			assertThat(it.getId()).isEqualTo(new BsonString(id));
+			assertThat(it.getMetadata()).containsValue("xml");
+		}).verifyComplete();
+	}
+
+	@Test // DATAMONGO-765
+	public void considersSkipLimitWhenQueryingFiles() {
+
+		DataBufferFactory bufferFactory = new DefaultDataBufferFactory();
+		DataBuffer buffer = bufferFactory.allocateBuffer(0);
+		Flux.just("a", "aa", "aaa", //
+				"b", "bb", "bbb", //
+				"c", "cc", "ccc", //
+				"d", "dd", "ddd") //
+				.flatMap(fileName -> operations.store(Mono.just(buffer), fileName)) //
+				.as(StepVerifier::create) //
+				.expectNextCount(12) //
+				.verifyComplete();
+
+		PageRequest pageRequest = PageRequest.of(2, 3, Sort.Direction.ASC, "filename");
+		operations.find(new Query().with(pageRequest)) //
+				.map(GridFSFile::getFilename) //
+				.as(StepVerifier::create) //
+				.expectNext("c", "cc", "ccc") //
+				.verifyComplete();
+	}
+
 	static class Metadata {
 		String version;
 	}
+
+	public static String readToString(DataBuffer dataBuffer) {
+		try {
+			return FileCopyUtils.copyToString(new InputStreamReader(dataBuffer.asInputStream()));
+		} catch (IOException e) {
+			return e.getMessage();
+		}
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplateUnitTests.java
new file mode 100644
index 0000000000..b8f0ab98a4
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/gridfs/ReactiveGridFsTemplateUnitTests.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2020-2025 the original author 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.gridfs;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.reactivestreams.Publisher;
+import org.springframework.core.io.buffer.DataBuffer;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+
+/**
+ * @author Christoph Strobl
+ */
+class ReactiveGridFsTemplateUnitTests {
+
+	private ReactiveGridFsTemplateStub template;
+
+	@BeforeEach
+	void beforeEach() {
+		template = new ReactiveGridFsTemplateStub();
+	}
+
+	@Test // DATAMONGO-2574
+	void contentMetadataDoesNotOverrideContentTypeIfSet() {
+
+		template.onStoreReturn(new ObjectId());
+		template.store(Flux.empty(), "filename", "json", new Document("meta", "data"));
+
+		assertThat(template.capturedUpload().getOptions().getContentType()).isEqualTo("json");
+		assertThat(template.capturedUpload().getOptions().getMetadata()).containsEntry("meta", "data");
+	}
+
+	private static class ReactiveGridFsTemplateStub extends ReactiveGridFsTemplate {
+
+		private Object onStoreResult;
+		private GridFsObject<?, Publisher<DataBuffer>> capturedUpload;
+
+		ReactiveGridFsTemplateStub() {
+			super(mock(ReactiveMongoDatabaseFactory.class), mock(MongoConverter.class));
+		}
+
+		@Override
+		public <T> Mono<T> store(GridFsObject<T, Publisher<DataBuffer>> upload) {
+
+			capturedUpload = upload;
+			return Mono.just((T) onStoreResult);
+		}
+
+		ReactiveGridFsTemplateStub onStoreReturn(Object result) {
+
+			this.onStoreResult = result;
+			return this;
+		}
+
+		GridFsObject<?, Publisher<DataBuffer>> capturedUpload() {
+			return capturedUpload;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/monitor/MongoMonitorIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/monitor/MongoMonitorIntegrationTests.java
deleted file mode 100644
index 27c2ecd68a..0000000000
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/monitor/MongoMonitorIntegrationTests.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright 2002-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.monitor;
-
-import static org.assertj.core.api.Assertions.*;
-
-import java.net.UnknownHostException;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.mongodb.MongoClient;
-
-/**
- * This test class assumes that you are already running the MongoDB server.
- *
- * @author Mark Pollack
- * @author Thomas Darimont
- * @author Mark Paluch
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
-public class MongoMonitorIntegrationTests {
-
-	@Autowired MongoClient mongoClient;
-
-	@Test
-	public void serverInfo() {
-		ServerInfo serverInfo = new ServerInfo(mongoClient);
-		serverInfo.getVersion();
-	}
-
-	@Test // DATAMONGO-685
-	public void getHostNameShouldReturnServerNameReportedByMongo() throws UnknownHostException {
-
-		ServerInfo serverInfo = new ServerInfo(mongoClient);
-
-		String hostName = null;
-		try {
-			hostName = serverInfo.getHostName();
-		} catch (UnknownHostException e) {
-			throw e;
-		}
-
-		assertThat(hostName).isNotNull();
-		assertThat(hostName).isEqualTo("127.0.0.1:27017");
-	}
-
-	@Test
-	public void operationCounters() {
-		OperationCounters operationCounters = new OperationCounters(mongoClient);
-		operationCounters.getInsertCount();
-	}
-}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/ImperativeIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/ImperativeIntegrationTests.java
new file mode 100644
index 0000000000..c1b1b4851e
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/ImperativeIntegrationTests.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2013-2025 the original author 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.observability;
+
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.exporter.FinishedSpan;
+import io.micrometer.tracing.test.SampleTestRunner;
+
+import java.util.List;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.PersonRepository;
+import org.springframework.data.mongodb.util.MongoClientVersion;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+/**
+ * Collection of tests that log metrics and tracing with an external tracing tool.
+ *
+ * @author Greg Turnquist
+ * @author Mark Paluch
+ */
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = TestConfig.class)
+public class ImperativeIntegrationTests extends SampleTestRunner {
+
+	@Autowired PersonRepository repository;
+
+	ImperativeIntegrationTests() {
+		super(SampleRunnerConfig.builder().build());
+	}
+
+	@Override
+	protected MeterRegistry createMeterRegistry() {
+		return TestConfig.METER_REGISTRY;
+	}
+
+	@Override
+	protected ObservationRegistry createObservationRegistry() {
+		return TestConfig.OBSERVATION_REGISTRY;
+	}
+
+	@Override
+	public SampleTestRunnerConsumer yourCode() {
+
+		return (tracer, meterRegistry) -> {
+
+			repository.deleteAll();
+			repository.save(new Person("Dave", "Matthews", 42));
+			List<Person> people = repository.findByLastname("Matthews");
+
+			assertThat(people).hasSize(1);
+			assertThat(people.get(0)).extracting("firstname", "lastname").containsExactly("Dave", "Matthews");
+
+			repository.deleteAll();
+
+			System.out.println(((SimpleMeterRegistry) meterRegistry).getMetersAsString());
+
+			assertThat(tracer.getFinishedSpans()).hasSize(5).extracting(FinishedSpan::getName).contains("person.delete",
+					"person.update", "person.find");
+
+			for (FinishedSpan span : tracer.getFinishedSpans()) {
+
+				assertThat(span.getTags()).containsEntry("db.system", "mongodb").containsEntry("net.transport", "IP.TCP");
+
+				if (MongoClientVersion.isVersion5orNewer()) {
+					assertThat(span.getTags()).containsKeys("db.connection_string", "db.name", "db.operation",
+							"db.mongodb.collection", "net.peer.name", "net.peer.port");
+				} else {
+					assertThat(span.getTags()).containsKeys("db.connection_string", "db.name", "db.operation",
+						"db.mongodb.collection", "net.peer.name", "net.peer.port", "net.sock.peer.addr", "net.sock.peer.port");
+				}
+			}
+		};
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MongoObservationCommandListenerTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MongoObservationCommandListenerTests.java
new file mode 100644
index 0000000000..5c2cb0b701
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/MongoObservationCommandListenerTests.java
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2002-2025 the original author 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.observability;
+
+import static io.micrometer.core.tck.MeterRegistryAssert.*;
+import static org.mockito.Mockito.*;
+
+import io.micrometer.common.KeyValues;
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
+
+import org.bson.BsonDocument;
+import org.bson.BsonString;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.observability.MongoObservation.LowCardinalityCommandKeyNames;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.RequestContext;
+import com.mongodb.ServerAddress;
+import com.mongodb.client.SynchronousContextProvider;
+import com.mongodb.connection.ClusterId;
+import com.mongodb.connection.ConnectionDescription;
+import com.mongodb.connection.ServerId;
+import com.mongodb.event.CommandFailedEvent;
+import com.mongodb.event.CommandStartedEvent;
+import com.mongodb.event.CommandSucceededEvent;
+
+/**
+ * Series of test cases exercising {@link MongoObservationCommandListener}.
+ *
+ * @author Marcin Grzejszczak
+ * @author Greg Turnquist
+ * @author Mark Paluch
+ * @author François Kha
+ */
+class MongoObservationCommandListenerTests {
+
+	ObservationRegistry observationRegistry;
+	MeterRegistry meterRegistry;
+
+	MongoObservationCommandListener listener;
+
+	@BeforeEach
+	void setup() {
+
+		this.meterRegistry = new SimpleMeterRegistry();
+		this.observationRegistry = ObservationRegistry.create();
+		this.observationRegistry.observationConfig().observationHandler(new DefaultMeterObservationHandler(meterRegistry));
+
+		this.listener = new MongoObservationCommandListener(observationRegistry);
+	}
+
+	@Test
+	void commandStartedShouldNotInstrumentWhenAdminDatabase() {
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(null, 0, 0, null, "admin", "", null));
+
+		// then
+		assertThat(meterRegistry).hasNoMetrics();
+	}
+
+	@Test
+	void commandStartedShouldNotInstrumentWhenNoRequestContext() {
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(null, 0, 0, null, "some name", "", null));
+
+		// then
+		assertThat(meterRegistry).hasNoMetrics();
+	}
+
+	@Test
+	void commandStartedShouldNotInstrumentWhenNoParentSampleInRequestContext() {
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(new MapRequestContext(), 0, 0, null, "some name", "", null));
+
+		// then
+		assertThat(meterRegistry).hasMeterWithName("spring.data.mongodb.command.active");
+	}
+
+	@Test
+	void successfullyCompletedCommandShouldCreateTimerWhenParentSampleInRequestContext() {
+
+		// given
+		Observation parent = Observation.start("name", observationRegistry);
+		RequestContext traceRequestContext = getContext();
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(traceRequestContext, 0, 0, //
+				new ConnectionDescription( //
+						new ServerId( //
+								new ClusterId("description"), //
+								new ServerAddress("localhost", 1234))), "database", "insert", //
+				new BsonDocument("collection", new BsonString("user"))));
+		listener.commandSucceeded(new CommandSucceededEvent(traceRequestContext, 0, 0, null, "insert", null, null, 0));
+
+		// then
+		assertThatTimerRegisteredWithTags();
+	}
+
+	@Test
+	void successfullyCompletedCommandWithCollectionHavingCommandNameShouldCreateTimerWhenParentSampleInRequestContext() {
+
+		// given
+		Observation parent = Observation.start("name", observationRegistry);
+		RequestContext traceRequestContext = getContext();
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(traceRequestContext, 0, 0, //
+				new ConnectionDescription( //
+						new ServerId( //
+								new ClusterId("description"), //
+								new ServerAddress("localhost", 1234))), //
+				"database", "aggregate", //
+				new BsonDocument("aggregate", new BsonString("user"))));
+		listener.commandSucceeded(new CommandSucceededEvent(traceRequestContext, 0, 0, null, "aggregate", null, null, 0));
+
+		// then
+		assertThatTimerRegisteredWithTags();
+	}
+
+	@Test
+	void successfullyCompletedCommandWithoutClusterInformationShouldCreateTimerWhenParentSampleInRequestContext() {
+
+		// given
+		Observation parent = Observation.start("name", observationRegistry);
+		RequestContext traceRequestContext = getContext();
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(traceRequestContext, 0, 0, null, "database", "insert",
+				new BsonDocument("collection", new BsonString("user"))));
+		listener.commandSucceeded(new CommandSucceededEvent(traceRequestContext, 0, 0, null, "insert", null, null, 0));
+
+		assertThat(meterRegistry).hasTimerWithNameAndTags(MongoObservation.MONGODB_COMMAND_OBSERVATION.getName(),
+				KeyValues.of(LowCardinalityCommandKeyNames.MONGODB_COLLECTION.withValue("user"),
+						LowCardinalityCommandKeyNames.DB_NAME.withValue("database"),
+						LowCardinalityCommandKeyNames.MONGODB_COMMAND.withValue("insert"),
+						LowCardinalityCommandKeyNames.DB_SYSTEM.withValue("mongodb")).and("error", "none"));
+	}
+
+	@Test
+	void commandWithErrorShouldCreateTimerWhenParentSampleInRequestContext() {
+
+		// given
+		Observation parent = Observation.start("name", observationRegistry);
+		RequestContext traceRequestContext = getContext();
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(traceRequestContext, 0, 0, //
+				new ConnectionDescription( //
+						new ServerId( //
+								new ClusterId("description"), //
+								new ServerAddress("localhost", 1234))), //
+				"database", "insert", //
+				new BsonDocument("collection", new BsonString("user"))));
+		listener.commandFailed( //
+				new CommandFailedEvent(traceRequestContext, 0, 0, null, "db", "insert", 0, new IllegalAccessException()));
+
+		// then
+		assertThatTimerRegisteredWithTags();
+	}
+
+	@Test // GH-4481
+	void completionShouldIgnoreIncompatibleObservationContext() {
+
+		// given
+		RequestContext traceRequestContext = getContext();
+
+		Observation observation = mock(Observation.class);
+		traceRequestContext.put(ObservationThreadLocalAccessor.KEY, observation);
+
+		// when
+		listener.commandSucceeded(new CommandSucceededEvent(traceRequestContext, 0, 0, null, "insert", null, null, 0));
+
+		verify(observation).getContext();
+		verifyNoMoreInteractions(observation);
+	}
+
+	@Test // GH-4481
+	void failureShouldIgnoreIncompatibleObservationContext() {
+
+		// given
+		RequestContext traceRequestContext = getContext();
+
+		Observation observation = mock(Observation.class);
+		traceRequestContext.put(ObservationThreadLocalAccessor.KEY, observation);
+
+		// when
+		listener.commandFailed(new CommandFailedEvent(traceRequestContext, 0, 0, null, "db", "insert", 0, null));
+
+		verify(observation).getContext();
+		verifyNoMoreInteractions(observation);
+	}
+
+	@Test // GH-4321
+	void shouldUseObservationConvention() {
+
+		// given
+		MongoHandlerObservationConvention customObservationConvention = new MongoHandlerObservationConvention() {
+			@Override
+			public boolean supportsContext(Observation.Context context) {
+				return MongoHandlerObservationConvention.super.supportsContext(context);
+			}
+
+			@Override
+			public String getName() {
+				return "custom.name";
+			}
+		};
+		this.listener = new MongoObservationCommandListener(observationRegistry, mock(ConnectionString.class),
+				customObservationConvention);
+
+		// when
+		listener.commandStarted(new CommandStartedEvent(new MapRequestContext(), 0, 0, null, "some name", "", null));
+
+		// then
+		assertThat(meterRegistry).hasMeterWithName("custom.name.active");
+	}
+
+	private RequestContext getContext() {
+		return ((SynchronousContextProvider) ContextProviderFactory.create(observationRegistry)).getContext();
+	}
+
+	private void assertThatTimerRegisteredWithTags() {
+
+		assertThat(meterRegistry) //
+				.hasTimerWithNameAndTags(MongoObservation.MONGODB_COMMAND_OBSERVATION.getName(),
+						KeyValues.of(LowCardinalityCommandKeyNames.MONGODB_COLLECTION.withValue("user")));
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/ReactiveIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/ReactiveIntegrationTests.java
new file mode 100644
index 0000000000..9bfe5a8ce2
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/ReactiveIntegrationTests.java
@@ -0,0 +1,89 @@
+/*
+ * Copyright 2013-2025 the original author 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.observability;
+
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.ReactivePersonRepository;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.observation.Observation;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
+import io.micrometer.tracing.exporter.FinishedSpan;
+import io.micrometer.tracing.test.SampleTestRunner;
+import reactor.test.StepVerifier;
+import reactor.util.context.Context;
+
+/**
+ * Collection of tests that log metrics and tracing with an external tracing tool.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration(classes = TestConfig.class)
+public class ReactiveIntegrationTests extends SampleTestRunner {
+
+	@Autowired ReactivePersonRepository repository;
+
+	ReactiveIntegrationTests() {
+		super(SampleRunnerConfig.builder().build());
+	}
+
+	@Override
+	protected MeterRegistry createMeterRegistry() {
+		return TestConfig.METER_REGISTRY;
+	}
+
+	@Override
+	protected ObservationRegistry createObservationRegistry() {
+		return TestConfig.OBSERVATION_REGISTRY;
+	}
+
+	@Override
+	public SampleTestRunnerConsumer yourCode() {
+
+		return (tracer, meterRegistry) -> {
+
+			Observation intermediate = Observation.start("intermediate", createObservationRegistry());
+
+			repository.deleteAll() //
+					.then(repository.save(new Person("Dave", "Matthews", 42))) //
+					.contextWrite(Context.of(ObservationThreadLocalAccessor.KEY, intermediate)) //
+					.as(StepVerifier::create).expectNextCount(1)//
+					.verifyComplete();
+
+			repository.findByLastname("Matthews") //
+					.contextWrite(Context.of(ObservationThreadLocalAccessor.KEY, intermediate)) //
+					.as(StepVerifier::create).assertNext(actual -> {
+
+						assertThat(actual).extracting("firstname", "lastname").containsExactly("Dave", "Matthews");
+					}).verifyComplete();
+
+			intermediate.stop();
+			System.out.println(((SimpleMeterRegistry) meterRegistry).getMetersAsString());
+
+			assertThat(tracer.getFinishedSpans()).hasSize(5).extracting(FinishedSpan::getName).contains("person.delete",
+					"person.update", "person.find");
+		};
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/TestConfig.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/TestConfig.java
new file mode 100644
index 0000000000..7e7e2c636c
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/observability/TestConfig.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright 2022-2025 the original author 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.observability;
+
+import java.util.Properties;
+
+import org.springframework.beans.factory.config.PropertiesFactoryBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
+import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.PersonRepository;
+import org.springframework.data.mongodb.repository.ReactivePersonRepository;
+import org.springframework.data.mongodb.repository.SampleEvaluationContextExtension;
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactoryBean;
+import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactoryBean;
+import org.springframework.data.repository.core.support.PropertiesBasedNamedQueries;
+
+import com.mongodb.ConnectionString;
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.MongoClients;
+
+import io.micrometer.core.instrument.MeterRegistry;
+import io.micrometer.core.instrument.observation.DefaultMeterObservationHandler;
+import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
+import io.micrometer.observation.ObservationRegistry;
+import io.micrometer.tracing.Tracer;
+import io.micrometer.tracing.test.simple.SimpleTracer;
+
+/**
+ * @author Mark Paluch
+ */
+@Configuration
+class TestConfig {
+
+	static final MeterRegistry METER_REGISTRY = new SimpleMeterRegistry();
+	static final ObservationRegistry OBSERVATION_REGISTRY = ObservationRegistry.create();
+
+	static {
+		OBSERVATION_REGISTRY.observationConfig().observationHandler(new DefaultMeterObservationHandler(METER_REGISTRY));
+	}
+
+	@Bean
+	MongoDatabaseFactory mongoDatabaseFactory(MongoClientSettings settings) {
+		return new SimpleMongoClientDatabaseFactory(MongoClients.create(settings), "observable");
+	}
+
+	@Bean
+	ReactiveMongoDatabaseFactory reactiveMongoDatabaseFactory(MongoClientSettings settings) {
+		return new SimpleReactiveMongoDatabaseFactory(com.mongodb.reactivestreams.client.MongoClients.create(settings),
+				"observable");
+	}
+
+	@Bean
+	MongoClientSettings mongoClientSettings(ObservationRegistry observationRegistry) {
+
+		ConnectionString connectionString = new ConnectionString(
+				String.format("mongodb://%s:%s/?w=majority&uuidrepresentation=javaLegacy", "127.0.0.1", 27017));
+
+		MongoClientSettings settings = MongoClientSettings.builder() //
+				.addCommandListener(new MongoObservationCommandListener(observationRegistry, connectionString)) //
+				.contextProvider(ContextProviderFactory.create(observationRegistry)) //
+				.applyConnectionString(connectionString) //
+				.build();
+
+		return settings;
+	}
+
+	@Bean
+	MappingMongoConverter mongoConverter(MongoMappingContext mappingContext, MongoDatabaseFactory factory) {
+		return new MappingMongoConverter(new DefaultDbRefResolver(factory), mappingContext);
+	}
+
+	@Bean
+	MongoMappingContext mappingContext() {
+		return new MongoMappingContext();
+	}
+
+	@Bean
+	MongoTemplate mongoTemplate(MongoDatabaseFactory mongoDatabaseFactory, MongoConverter mongoConverter) {
+
+		MongoTemplate template = new MongoTemplate(mongoDatabaseFactory, mongoConverter);
+		return template;
+	}
+
+	@Bean
+	ReactiveMongoTemplate reactiveMongoTemplate(ReactiveMongoDatabaseFactory mongoDatabaseFactory,
+			MongoConverter mongoConverter) {
+
+		ReactiveMongoTemplate template = new ReactiveMongoTemplate(mongoDatabaseFactory, mongoConverter);
+		return template;
+	}
+
+	@Bean
+	public PropertiesFactoryBean namedQueriesProperties() {
+
+		PropertiesFactoryBean bean = new PropertiesFactoryBean();
+		bean.setLocation(new ClassPathResource("META-INF/mongo-named-queries.properties"));
+		return bean;
+	}
+
+	@Bean
+	MongoRepositoryFactoryBean<PersonRepository, Person, String> personRepositoryFactoryBean(MongoOperations operations,
+			Properties namedQueriesProperties) {
+
+		MongoRepositoryFactoryBean<PersonRepository, Person, String> factoryBean = new MongoRepositoryFactoryBean<>(
+				PersonRepository.class);
+		factoryBean.setNamedQueries(new PropertiesBasedNamedQueries(namedQueriesProperties));
+		factoryBean.setMongoOperations(operations);
+		factoryBean.setCreateIndexesForQueryMethods(true);
+		return factoryBean;
+	}
+
+	@Bean
+	ReactiveMongoRepositoryFactoryBean<ReactivePersonRepository, Person, String> reactivePersonRepositoryFactoryBean(
+			ReactiveMongoOperations operations, Properties namedQueriesProperties) {
+
+		ReactiveMongoRepositoryFactoryBean<ReactivePersonRepository, Person, String> factoryBean = new ReactiveMongoRepositoryFactoryBean<>(
+				ReactivePersonRepository.class);
+		factoryBean.setNamedQueries(new PropertiesBasedNamedQueries(namedQueriesProperties));
+		factoryBean.setReactiveMongoOperations(operations);
+		factoryBean.setCreateIndexesForQueryMethods(true);
+		return factoryBean;
+	}
+
+	@Bean
+	SampleEvaluationContextExtension contextExtension() {
+		return new SampleEvaluationContextExtension();
+	}
+
+	@Bean
+	ObservationRegistry registry() {
+		return OBSERVATION_REGISTRY;
+	}
+
+	@Bean
+	Tracer tracer() {
+		return new SimpleTracer();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java
index 6d877de3a2..fb8cedd9b1 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/PerformanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,12 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.Constants;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
@@ -73,19 +73,19 @@ public class PerformanceTests {
 	PersonRepository repository;
 	MongoConverter converter;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 
 		this.mongo = MongoClients.create();
 
-		SimpleMongoClientDbFactory mongoDbFactory = new SimpleMongoClientDbFactory(this.mongo, DATABASE_NAME);
+		SimpleMongoClientDatabaseFactory mongoDbFactory = new SimpleMongoClientDatabaseFactory(this.mongo, DATABASE_NAME);
 
 		MongoMappingContext context = new MongoMappingContext();
 		context.setInitialEntitySet(Collections.singleton(Person.class));
 		context.afterPropertiesSet();
 
 		this.converter = new MappingMongoConverter(new DefaultDbRefResolver(mongoDbFactory), context);
-		this.operations = new MongoTemplate(new SimpleMongoClientDbFactory(this.mongo, DATABASE_NAME), converter);
+		this.operations = new MongoTemplate(new SimpleMongoClientDatabaseFactory(this.mongo, DATABASE_NAME), converter);
 
 		MongoRepositoryFactoryBean<PersonRepository, Person, ObjectId> factory = new MongoRepositoryFactoryBean<PersonRepository, Person, ObjectId>(
 				PersonRepository.class);
@@ -93,7 +93,10 @@ public void setUp() throws Exception {
 		factory.afterPropertiesSet();
 
 		this.repository = factory.getObject();
+	}
 
+	void afterEach() {
+		mongo.close();
 	}
 
 	@Test
@@ -451,7 +454,7 @@ public Address(String zipCode, String city) {
 			this(zipCode, city, new HashSet<AddressType>(pickRandomNumerOfItemsFrom(Arrays.asList(AddressType.values()))));
 		}
 
-		@PersistenceConstructor
+		@PersistenceCreator
 		public Address(String zipCode, String city, Set<AddressType> types) {
 			this.zipCode = zipCode;
 			this.city = city;
@@ -509,7 +512,7 @@ public Order(List<LineItem> lineItems, Date createdAt) {
 			this.status = Status.ORDERED;
 		}
 
-		@PersistenceConstructor
+		@PersistenceCreator
 		public Order(List<LineItem> lineItems, Date createdAt, Status status) {
 			this.lineItems = lineItems;
 			this.createdAt = createdAt;
@@ -584,7 +587,7 @@ public Document toDocument() {
 
 	private static <T> List<T> pickRandomNumerOfItemsFrom(List<T> source) {
 
-		Assert.isTrue(!source.isEmpty(), "Source must not be empty!");
+		Assert.isTrue(!source.isEmpty(), "Source must not be empty");
 
 		Random random = new Random();
 		int numberOfItems = random.nextInt(source.size());
@@ -798,10 +801,6 @@ public String print(double referenceAverage, double referenceMedian) {
 					String.format(" %s%%", DEVIATION_FORMAT.format(getMediaDeviationFrom(referenceMedian)))) + '\n';
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return times.isEmpty() ? ""
@@ -857,10 +856,6 @@ public String print() {
 			return builder.toString();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java
index 72c898f93a..a7fba9a046 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/performance/ReactivePerformanceTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,10 +28,12 @@
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.core.Constants;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
@@ -40,6 +42,7 @@
 import org.springframework.data.mongodb.core.convert.DbRefResolverCallback;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.ReferenceLookupDelegate;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
@@ -82,7 +85,7 @@ public class ReactivePerformanceTests {
 	ReactivePersonRepository repository;
 	MongoConverter converter;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws Exception {
 
 		mongo = MongoClients.create();
@@ -95,6 +98,13 @@ public void setUp() throws Exception {
 		context.afterPropertiesSet();
 
 		converter = new MappingMongoConverter(new DbRefResolver() {
+
+			@Override
+			public @Nullable Object resolveReference(MongoPersistentProperty property, Object source,
+					ReferenceLookupDelegate referenceLookupDelegate, MongoEntityReader entityReader) {
+				return null;
+			}
+
 			@Override
 			public Object resolveDbRef(MongoPersistentProperty property, DBRef dbref, DbRefResolverCallback callback,
 					DbRefProxyHandler proxyHandler) {
@@ -116,6 +126,7 @@ public Document fetch(DBRef dbRef) {
 			public List<Document> bulkFetch(List<DBRef> dbRefs) {
 				return null;
 			}
+
 		}, context);
 		operations = new ReactiveMongoTemplate(mongoDbFactory, converter);
 
@@ -123,6 +134,11 @@ public List<Document> bulkFetch(List<DBRef> dbRefs) {
 		repository = factory.getRepository(ReactivePersonRepository.class);
 	}
 
+	@AfterEach
+	void afterEach() {
+		mongo.close();
+	}
+
 	@Test // DATAMONGO-1444
 	public void writeWithWriteConcerns() {
 		executeWithWriteConcerns((constantName, concern) -> {
@@ -496,7 +512,7 @@ public Address(String zipCode, String city) {
 			this(zipCode, city, new HashSet<AddressType>(pickRandomNumerOfItemsFrom(Arrays.asList(AddressType.values()))));
 		}
 
-		@PersistenceConstructor
+		@PersistenceCreator
 		public Address(String zipCode, String city, Set<AddressType> types) {
 			this.zipCode = zipCode;
 			this.city = city;
@@ -554,7 +570,7 @@ public Order(List<LineItem> lineItems, Date createdAt) {
 			this.status = Status.ORDERED;
 		}
 
-		@PersistenceConstructor
+		@PersistenceCreator
 		public Order(List<LineItem> lineItems, Date createdAt, Status status) {
 			this.lineItems = lineItems;
 			this.createdAt = createdAt;
@@ -629,7 +645,7 @@ public Document toDocument() {
 
 	private static <T> List<T> pickRandomNumerOfItemsFrom(List<T> source) {
 
-		Assert.isTrue(!source.isEmpty(), "Source must not be empty!");
+		Assert.isTrue(!source.isEmpty(), "Source must not be empty");
 
 		Random random = new Random();
 		int numberOfItems = random.nextInt(source.size());
@@ -843,10 +859,6 @@ public String print(double referenceAverage, double referenceMedian) {
 					String.format(" %s%%", DEVIATION_FORMAT.format(getMediaDeviationFrom(referenceMedian)))) + '\n';
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 			return times.isEmpty() ? ""
@@ -902,10 +914,6 @@ public String print() {
 			return builder.toString();
 		}
 
-		/*
-		 * (non-Javadoc)
-		 * @see java.lang.Object#toString()
-		 */
 		@Override
 		public String toString() {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
index 993ee6d934..c2cb6cacf8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,11 +17,13 @@
 
 import static java.util.Arrays.*;
 import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assumptions.*;
 import static org.springframework.data.geo.Metrics.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -31,39 +33,42 @@
 import java.util.stream.IntStream;
 import java.util.stream.Stream;
 
+import org.assertj.core.api.Assertions;
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Range;
-import org.springframework.data.domain.Slice;
-import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.*;
+import org.springframework.data.domain.ExampleMatcher.GenericPropertyMatcher;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoPage;
 import org.springframework.data.geo.GeoResults;
-import org.springframework.data.geo.Metric;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Polygon;
+import org.springframework.data.mongodb.core.BulkOperations.BulkMode;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.data.mongodb.repository.Person.Sex;
 import org.springframework.data.mongodb.repository.SampleEvaluationContextExtension.SampleSecurityContextHolder;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension.DirtiesState;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension.ProvidesState;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
 import org.springframework.data.querydsl.QSort;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.util.ReflectionTestUtils;
 
 /**
@@ -76,8 +81,9 @@
  * @author Fırat KÜÇÜK
  * @author Edward Prentice
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-public abstract class AbstractPersonRepositoryIntegrationTests {
+@ExtendWith({ SpringExtension.class, DirtiesStateExtension.class })
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+public abstract class AbstractPersonRepositoryIntegrationTests implements DirtiesStateExtension.StateFunctions {
 
 	@Autowired protected PersonRepository repository;
 
@@ -88,8 +94,11 @@ public abstract class AbstractPersonRepositoryIntegrationTests {
 
 	List<Person> all;
 
-	@Before
-	public void setUp() throws InterruptedException {
+	public void clear() {
+		repository.deleteAll();
+	}
+
+	public void setupState() {
 
 		repository.deleteAll();
 
@@ -97,40 +106,46 @@ public void setUp() throws InterruptedException {
 		oliver = new Person("Oliver August", "Matthews", 4);
 		carter = new Person("Carter", "Beauford", 49);
 		carter.setSkills(Arrays.asList("Drums", "percussion", "vocals"));
-		Thread.sleep(10);
+
 		boyd = new Person("Boyd", "Tinsley", 45);
 		boyd.setSkills(Arrays.asList("Violin", "Electric Violin", "Viola", "Mandolin", "Vocals", "Guitar"));
 		stefan = new Person("Stefan", "Lessard", 34);
 		leroi = new Person("Leroi", "Moore", 41);
-
 		alicia = new Person("Alicia", "Keys", 30, Sex.FEMALE);
-
 		person = new QPerson("person");
 
-		all = repository.saveAll(Arrays.asList(oliver, dave, carter, boyd, stefan, leroi, alicia));
+		Arrays.asList(boyd, stefan, leroi, alicia).forEach(it -> {
+			it.createdAt = new Date(dave.createdAt.getTime() + 1000L);
+		});
+
+		List<Person> toSave = asList(oliver, dave, carter, boyd, stefan, leroi, alicia);
+		toSave.forEach(it -> it.setId(null));
+
+		all = repository.saveAll(toSave);
 	}
 
 	@Test
-	public void findsPersonById() {
+	void findsPersonById() {
 
 		assertThat(repository.findById(dave.getId())).contains(dave);
 	}
 
 	@Test
-	public void findsAllMusicians() {
+	void findsAllMusicians() {
 		List<Person> result = repository.findAll();
 		assertThat(result).hasSameSizeAs(all).containsAll(all);
 	}
 
 	@Test
-	public void findsAllWithGivenIds() {
+	void findsAllWithGivenIds() {
 
 		Iterable<Person> result = repository.findAllById(asList(dave.id, boyd.id));
 		assertThat(result).contains(dave, boyd).doesNotContain(oliver, carter, stefan, leroi, alicia);
 	}
 
 	@Test
-	public void deletesPersonCorrectly() {
+	@DirtiesState
+	void deletesPersonCorrectly() {
 
 		repository.delete(dave);
 
@@ -140,9 +155,10 @@ public void deletesPersonCorrectly() {
 	}
 
 	@Test
-	public void deletesPersonByIdCorrectly() {
+	@DirtiesState
+	void deletesPersonByIdCorrectly() {
 
-		repository.deleteById(dave.getId().toString());
+		repository.deleteById(dave.getId());
 
 		List<Person> result = repository.findAll();
 
@@ -150,14 +166,14 @@ public void deletesPersonByIdCorrectly() {
 	}
 
 	@Test
-	public void findsPersonsByLastname() {
+	void findsPersonsByLastname() {
 
 		List<Person> result = repository.findByLastname("Beauford");
 		assertThat(result).hasSize(1).contains(carter);
 	}
 
 	@Test
-	public void findsPersonsByFirstname() {
+	void findsPersonsByFirstname() {
 
 		List<Person> result = repository.findByThePersonsFirstname("Leroi");
 		assertThat(result).hasSize(1).contains(leroi);
@@ -165,20 +181,20 @@ public void findsPersonsByFirstname() {
 	}
 
 	@Test
-	public void findsPersonsByFirstnameLike() {
+	void findsPersonsByFirstnameLike() {
 
 		List<Person> result = repository.findByFirstnameLike("Bo*");
 		assertThat(result).hasSize(1).contains(boyd);
 	}
 
 	@Test // DATAMONGO-1608
-	public void findByFirstnameLikeWithNull() {
+	void findByFirstnameLikeWithNull() {
 
 		assertThatIllegalArgumentException().isThrownBy(() -> repository.findByFirstnameLike(null));
 	}
 
 	@Test
-	public void findsPagedPersons() {
+	void findsPagedPersons() {
 
 		Page<Person> result = repository.findAll(PageRequest.of(1, 2, Direction.ASC, "lastname", "firstname"));
 		assertThat(result.isFirst()).isFalse();
@@ -186,8 +202,42 @@ public void findsPagedPersons() {
 		assertThat(result).contains(dave, stefan);
 	}
 
+	@Test // GH-4308
+	void appliesScrollPositionCorrectly() {
+
+		Window<Person> page = repository.findTop2ByLastnameLikeOrderByLastnameAscFirstnameAsc("*a*",
+				ScrollPosition.keyset());
+
+		assertThat(page.isLast()).isFalse();
+		assertThat(page.size()).isEqualTo(2);
+		assertThat(page).contains(carter);
+	}
+
+	@Test // GH-4397
+	void appliesLimitToScrollingCorrectly() {
+
+		Window<Person> page = repository.findByLastnameLikeOrderByLastnameAscFirstnameAsc("*a*",
+				ScrollPosition.keyset(), Limit.of(2));
+
+		assertThat(page.isLast()).isFalse();
+		assertThat(page.size()).isEqualTo(2);
+		assertThat(page).contains(carter);
+	}
+
+	@Test // GH-4308
+	void appliesScrollPositionWithProjectionCorrectly() {
+
+		Window<PersonSummaryDto> page = repository.findCursorProjectionByLastnameLike("*a*",
+				PageRequest.of(0, 2, Sort.by(Direction.ASC, "lastname", "firstname")));
+
+		assertThat(page.isLast()).isFalse();
+		assertThat(page.size()).isEqualTo(2);
+
+		assertThat(page).element(0).isEqualTo(new PersonSummaryDto(carter.getFirstname(), carter.getLastname()));
+	}
+
 	@Test
-	public void executesPagedFinderCorrectly() {
+	void executesPagedFinderCorrectly() {
 
 		Page<Person> page = repository.findByLastnameLike("*a*",
 				PageRequest.of(0, 2, Direction.ASC, "lastname", "firstname"));
@@ -197,8 +247,16 @@ public void executesPagedFinderCorrectly() {
 		assertThat(page).contains(carter, stefan);
 	}
 
+	@Test // GH-4397
+	void executesFinderCorrectlyWithSortAndLimit() {
+
+		List<Person> page = repository.findByLastnameLike("*a*", Sort.by(Direction.ASC, "lastname", "firstname"), Limit.of(2));
+
+		assertThat(page).containsExactly(carter, stefan);
+	}
+
 	@Test
-	public void executesPagedFinderWithAnnotatedQueryCorrectly() {
+	void executesPagedFinderWithAnnotatedQueryCorrectly() {
 
 		Page<Person> page = repository.findByLastnameLikeWithPageable(".*a.*",
 				PageRequest.of(0, 2, Direction.ASC, "lastname", "firstname"));
@@ -209,14 +267,14 @@ public void executesPagedFinderWithAnnotatedQueryCorrectly() {
 	}
 
 	@Test
-	public void findsPersonInAgeRangeCorrectly() {
+	void findsPersonInAgeRangeCorrectly() {
 
 		List<Person> result = repository.findByAgeBetween(40, 45);
 		assertThat(result).hasSize(2).contains(dave, leroi);
 	}
 
 	@Test
-	public void findsPersonByShippingAddressesCorrectly() {
+	void findsPersonByShippingAddressesCorrectly() {
 
 		Address address = new Address("Foo Street 1", "C0123", "Bar");
 		dave.setShippingAddresses(new HashSet<Address>(asList(address)));
@@ -226,7 +284,7 @@ public void findsPersonByShippingAddressesCorrectly() {
 	}
 
 	@Test
-	public void findsPersonByAddressCorrectly() {
+	void findsPersonByAddressCorrectly() {
 
 		Address address = new Address("Foo Street 1", "C0123", "Bar");
 		dave.setAddress(address);
@@ -237,7 +295,7 @@ public void findsPersonByAddressCorrectly() {
 	}
 
 	@Test
-	public void findsPeopleByZipCode() {
+	void findsPeopleByZipCode() {
 
 		Address address = new Address("Foo Street 1", "C0123", "Bar");
 		dave.setAddress(address);
@@ -248,14 +306,14 @@ public void findsPeopleByZipCode() {
 	}
 
 	@Test
-	public void findsPeopleByQueryDslLastnameSpec() {
+	void findsPeopleByQueryDslLastnameSpec() {
 
 		Iterable<Person> result = repository.findAll(person.lastname.eq("Matthews"));
 		assertThat(result).contains(dave).doesNotContain(carter, boyd, stefan, leroi, alicia);
 	}
 
 	@Test
-	public void findsPeopleByzipCodePredicate() {
+	void findsPeopleByzipCodePredicate() {
 
 		Address address = new Address("Foo Street 1", "C0123", "Bar");
 		dave.setAddress(address);
@@ -266,7 +324,7 @@ public void findsPeopleByzipCodePredicate() {
 	}
 
 	@Test
-	public void findsPeopleByLocationNear() {
+	void findsPeopleByLocationNear() {
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave);
@@ -276,7 +334,7 @@ public void findsPeopleByLocationNear() {
 	}
 
 	@Test // DATAMONGO-1588
-	public void findsPeopleByLocationNearUsingGeoJsonType() {
+	void findsPeopleByLocationNearUsingGeoJsonType() {
 
 		GeoJsonPoint point = new GeoJsonPoint(-73.99171, 40.738868);
 		dave.setLocation(point);
@@ -287,7 +345,7 @@ public void findsPeopleByLocationNearUsingGeoJsonType() {
 	}
 
 	@Test
-	public void findsPeopleByLocationWithinCircle() {
+	void findsPeopleByLocationWithinCircle() {
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave);
@@ -297,7 +355,7 @@ public void findsPeopleByLocationWithinCircle() {
 	}
 
 	@Test
-	public void findsPeopleByLocationWithinBox() {
+	void findsPeopleByLocationWithinBox() {
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave);
@@ -309,7 +367,7 @@ public void findsPeopleByLocationWithinBox() {
 	}
 
 	@Test
-	public void findsPeopleByLocationWithinPolygon() {
+	void findsPeopleByLocationWithinPolygon() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
@@ -325,7 +383,7 @@ public void findsPeopleByLocationWithinPolygon() {
 	}
 
 	@Test
-	public void findsPagedPeopleByPredicate() {
+	void findsPagedPeopleByPredicate() {
 
 		Page<Person> page = repository.findAll(person.lastname.contains("a"),
 				PageRequest.of(0, 2, Direction.ASC, "lastname"));
@@ -337,7 +395,7 @@ public void findsPagedPeopleByPredicate() {
 	}
 
 	@Test // DATADOC-136
-	public void findsPeopleBySexCorrectly() {
+	void findsPeopleBySexCorrectly() {
 
 		List<Person> females = repository.findBySex(Sex.FEMALE);
 		assertThat(females).hasSize(1);
@@ -345,36 +403,36 @@ public void findsPeopleBySexCorrectly() {
 	}
 
 	@Test // DATAMONGO-446
-	public void findsPeopleBySexPaginated() {
+	void findsPeopleBySexPaginated() {
 
 		List<Person> males = repository.findBySex(Sex.MALE, PageRequest.of(0, 2));
 		assertThat(males).hasSize(2);
 	}
 
 	@Test
-	public void findsPeopleByNamedQuery() {
+	void findsPeopleByNamedQuery() {
 		List<Person> result = repository.findByNamedQuery("Dave");
 		assertThat(result).hasSize(1).contains(dave);
 	}
 
 	@Test // DATADOC-190
-	public void existsWorksCorrectly() {
+	void existsWorksCorrectly() {
 		assertThat(repository.existsById(dave.getId())).isTrue();
 	}
 
-	@Test(expected = DuplicateKeyException.class)
-	public void rejectsDuplicateEmailAddressOnSave() {
+	@Test
+	void rejectsDuplicateEmailAddressOnSave() {
 
-		assertThat(dave.getEmail()).isEqualTo("dave@dmband.com");
+		assumeThat(repository.findById(dave.getId()).map(Person::getEmail)).contains("dave@dmband.com");
 
 		Person daveSyer = new Person("Dave", "Syer");
 		assertThat(daveSyer.getEmail()).isEqualTo("dave@dmband.com");
 
-		repository.save(daveSyer);
+		Assertions.assertThatExceptionOfType(DuplicateKeyException.class).isThrownBy(() -> repository.save(daveSyer));
 	}
 
 	@Test // DATADOC-236
-	public void findsPeopleByLastnameAndOrdersCorrectly() {
+	void findsPeopleByLastnameAndOrdersCorrectly() {
 		List<Person> result = repository.findByLastnameOrderByFirstnameAsc("Matthews");
 		assertThat(result).hasSize(2);
 		assertThat(result.get(0)).isEqualTo(dave);
@@ -382,7 +440,7 @@ public void findsPeopleByLastnameAndOrdersCorrectly() {
 	}
 
 	@Test // DATADOC-236
-	public void appliesStaticAndDynamicSorting() {
+	void appliesStaticAndDynamicSorting() {
 		List<Person> result = repository.findByFirstnameLikeOrderByLastnameAsc("*e*", Sort.by("age"));
 		assertThat(result).hasSize(5);
 		assertThat(result.get(0)).isEqualTo(carter);
@@ -393,34 +451,34 @@ public void appliesStaticAndDynamicSorting() {
 	}
 
 	@Test
-	public void executesGeoNearQueryForResultsCorrectly() {
+	void executesGeoNearQueryForResultsCorrectly() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave);
 
 		GeoResults<Person> results = repository.findByLocationNear(new Point(-73.99, 40.73),
-				new Distance(2000, Metrics.KILOMETERS));
+				Distance.of(2000, Metrics.KILOMETERS));
 		assertThat(results.getContent()).isNotEmpty();
 	}
 
 	@Test
-	public void executesGeoPageQueryForResultsCorrectly() {
+	void executesGeoPageQueryForResultsCorrectly() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave);
 
 		GeoPage<Person> results = repository.findByLocationNear(new Point(-73.99, 40.73),
-				new Distance(2000, Metrics.KILOMETERS), PageRequest.of(0, 20));
+				Distance.of(2000, Metrics.KILOMETERS), PageRequest.of(0, 20));
 		assertThat(results.getContent()).isNotEmpty();
 
 		// DATAMONGO-607
-		assertThat(results.getAverageDistance().getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(results.getAverageDistance().getMetric()).isEqualTo(Metrics.KILOMETERS);
 	}
 
 	@Test // DATAMONGO-323
-	public void considersSortForAnnotatedQuery() {
+	void considersSortForAnnotatedQuery() {
 
 		List<Person> result = repository.findByAgeLessThan(60, Sort.by("firstname"));
 
@@ -435,7 +493,7 @@ public void considersSortForAnnotatedQuery() {
 	}
 
 	@Test // DATAMONGO-347
-	public void executesQueryWithDBRefReferenceCorrectly() {
+	void executesQueryWithDBRefReferenceCorrectly() {
 
 		operations.remove(new Query(), User.class);
 
@@ -452,49 +510,49 @@ public void executesQueryWithDBRefReferenceCorrectly() {
 	}
 
 	@Test // DATAMONGO-425
-	public void bindsDateParameterForLessThanPredicateCorrectly() {
+	void bindsDateParameterForLessThanPredicateCorrectly() {
 
 		List<Person> result = repository.findByCreatedAtLessThan(boyd.createdAt);
 		assertThat(result).hasSize(3).contains(dave, oliver, carter);
 	}
 
 	@Test // DATAMONGO-425
-	public void bindsDateParameterForGreaterThanPredicateCorrectly() {
+	void bindsDateParameterForGreaterThanPredicateCorrectly() {
 
 		List<Person> result = repository.findByCreatedAtGreaterThan(carter.createdAt);
 		assertThat(result).hasSize(4).contains(boyd, stefan, leroi, alicia);
 	}
 
 	@Test // DATAMONGO-427
-	public void bindsDateParameterToBeforePredicateCorrectly() {
+	void bindsDateParameterToBeforePredicateCorrectly() {
 
 		List<Person> result = repository.findByCreatedAtBefore(boyd.createdAt);
 		assertThat(result).hasSize(3).contains(dave, oliver, carter);
 	}
 
 	@Test // DATAMONGO-427
-	public void bindsDateParameterForAfterPredicateCorrectly() {
+	void bindsDateParameterForAfterPredicateCorrectly() {
 
 		List<Person> result = repository.findByCreatedAtAfter(carter.createdAt);
 		assertThat(result).hasSize(4).contains(boyd, stefan, leroi, alicia);
 	}
 
 	@Test // DATAMONGO-425
-	public void bindsDateParameterForManuallyDefinedQueryCorrectly() {
+	void bindsDateParameterForManuallyDefinedQueryCorrectly() {
 
 		List<Person> result = repository.findByCreatedAtLessThanManually(boyd.createdAt);
 		assertThat(result).isNotEmpty();
 	}
 
 	@Test // DATAMONGO-472
-	public void findsPeopleUsingNotPredicate() {
+	void findsPeopleUsingNotPredicate() {
 
 		List<Person> result = repository.findByLastnameNot("Matthews");
 		assertThat(result).doesNotContain(dave).hasSize(5);
 	}
 
 	@Test // DATAMONGO-521
-	public void executesAndQueryCorrectly() {
+	void executesAndQueryCorrectly() {
 
 		List<Person> result = repository.findByFirstnameAndLastname("Dave", "Matthews");
 
@@ -506,7 +564,7 @@ public void executesAndQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-600
-	public void readsDocumentsWithNestedPolymorphismCorrectly() {
+	void readsDocumentsWithNestedPolymorphismCorrectly() {
 
 		UsernameAndPassword usernameAndPassword = new UsernameAndPassword();
 		usernameAndPassword.username = "dave";
@@ -521,48 +579,48 @@ public void readsDocumentsWithNestedPolymorphismCorrectly() {
 	}
 
 	@Test // DATAMONGO-636
-	public void executesDerivedCountProjection() {
+	void executesDerivedCountProjection() {
 		assertThat(repository.countByLastname("Matthews")).isEqualTo(2L);
 	}
 
 	@Test // DATAMONGO-636
-	public void executesDerivedCountProjectionToInt() {
+	void executesDerivedCountProjectionToInt() {
 		assertThat(repository.countByFirstname("Oliver August")).isEqualTo(1);
 	}
 
 	@Test // DATAMONGO-636
-	public void executesAnnotatedCountProjection() {
+	void executesAnnotatedCountProjection() {
 		assertThat(repository.someCountQuery("Matthews")).isEqualTo(2L);
 	}
 
 	@Test // DATAMONGO-1454
-	public void executesDerivedExistsProjectionToBoolean() {
+	void executesDerivedExistsProjectionToBoolean() {
 
 		assertThat(repository.existsByFirstname("Oliver August")).isTrue();
 		assertThat(repository.existsByFirstname("Hans Peter")).isFalse();
 	}
 
 	@Test // DATAMONGO-1454
-	public void executesAnnotatedExistProjection() {
+	void executesAnnotatedExistProjection() {
 		assertThat(repository.someExistQuery("Matthews")).isTrue();
 	}
 
 	@Test // DATAMONGO-701
-	public void executesDerivedStartsWithQueryCorrectly() {
+	void executesDerivedStartsWithQueryCorrectly() {
 
 		List<Person> result = repository.findByLastnameStartsWith("Matt");
 		assertThat(result).hasSize(2).contains(dave, oliver);
 	}
 
 	@Test // DATAMONGO-701
-	public void executesDerivedEndsWithQueryCorrectly() {
+	void executesDerivedEndsWithQueryCorrectly() {
 
 		List<Person> result = repository.findByLastnameEndsWith("thews");
 		assertThat(result).hasSize(2).contains(dave, oliver);
 	}
 
 	@Test // DATAMONGO-445
-	public void executesGeoPageQueryForWithPageRequestForPageInBetween() {
+	void executesGeoPageQueryForWithPageRequestForPageInBetween() {
 
 		Point farAway = new Point(-73.9, 40.7);
 		Point here = new Point(-73.99, 40.73);
@@ -576,18 +634,18 @@ public void executesGeoPageQueryForWithPageRequestForPageInBetween() {
 		repository.saveAll(Arrays.asList(dave, oliver, carter, boyd, leroi));
 
 		GeoPage<Person> results = repository.findByLocationNear(new Point(-73.99, 40.73),
-				new Distance(2000, Metrics.KILOMETERS), PageRequest.of(1, 2));
+				Distance.of(2000, Metrics.KILOMETERS), PageRequest.of(1, 2));
 
 		assertThat(results.getContent()).isNotEmpty();
 		assertThat(results.getNumberOfElements()).isEqualTo(2);
 		assertThat(results.isFirst()).isFalse();
 		assertThat(results.isLast()).isFalse();
-		assertThat(results.getAverageDistance().getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(results.getAverageDistance().getMetric()).isEqualTo(Metrics.KILOMETERS);
 		assertThat(results.getAverageDistance().getNormalizedValue()).isEqualTo(0.0);
 	}
 
 	@Test // DATAMONGO-445
-	public void executesGeoPageQueryForWithPageRequestForPageAtTheEnd() {
+	void executesGeoPageQueryForWithPageRequestForPageAtTheEnd() {
 
 		Point point = new Point(-73.99171, 40.738868);
 
@@ -598,55 +656,55 @@ public void executesGeoPageQueryForWithPageRequestForPageAtTheEnd() {
 		repository.saveAll(Arrays.asList(dave, oliver, carter));
 
 		GeoPage<Person> results = repository.findByLocationNear(new Point(-73.99, 40.73),
-				new Distance(2000, Metrics.KILOMETERS), PageRequest.of(1, 2));
+				Distance.of(2000, Metrics.KILOMETERS), PageRequest.of(1, 2));
 		assertThat(results.getContent()).isNotEmpty();
 		assertThat(results.getNumberOfElements()).isEqualTo(1);
 		assertThat(results.isFirst()).isFalse();
 		assertThat(results.isLast()).isTrue();
-		assertThat(results.getAverageDistance().getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(results.getAverageDistance().getMetric()).isEqualTo(Metrics.KILOMETERS);
 	}
 
 	@Test // DATAMONGO-445
-	public void executesGeoPageQueryForWithPageRequestForJustOneElement() {
+	void executesGeoPageQueryForWithPageRequestForJustOneElement() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave);
 
 		GeoPage<Person> results = repository.findByLocationNear(new Point(-73.99, 40.73),
-				new Distance(2000, Metrics.KILOMETERS), PageRequest.of(0, 2));
+				Distance.of(2000, Metrics.KILOMETERS), PageRequest.of(0, 2));
 
 		assertThat(results.getContent()).isNotEmpty();
 		assertThat(results.getNumberOfElements()).isEqualTo(1);
 		assertThat(results.isFirst()).isTrue();
 		assertThat(results.isLast()).isTrue();
-		assertThat(results.getAverageDistance().getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(results.getAverageDistance().getMetric()).isEqualTo(Metrics.KILOMETERS);
 	}
 
 	@Test // DATAMONGO-445
-	public void executesGeoPageQueryForWithPageRequestForJustOneElementEmptyPage() {
+	void executesGeoPageQueryForWithPageRequestForJustOneElementEmptyPage() {
 
 		dave.setLocation(new Point(-73.99171, 40.738868));
 		repository.save(dave);
 
 		GeoPage<Person> results = repository.findByLocationNear(new Point(-73.99, 40.73),
-				new Distance(2000, Metrics.KILOMETERS), PageRequest.of(1, 2));
+				Distance.of(2000, Metrics.KILOMETERS), PageRequest.of(1, 2));
 
 		assertThat(results.getContent()).isEmpty();
 		assertThat(results.getNumberOfElements()).isEqualTo(0);
 		assertThat(results.isFirst()).isFalse();
 		assertThat(results.isLast()).isTrue();
-		assertThat(results.getAverageDistance().getMetric()).isEqualTo((Metric) Metrics.KILOMETERS);
+		assertThat(results.getAverageDistance().getMetric()).isEqualTo(Metrics.KILOMETERS);
 	}
 
 	@Test // DATAMONGO-1608
-	public void findByFirstNameIgnoreCaseWithNull() {
+	void findByFirstNameIgnoreCaseWithNull() {
 
 		assertThatIllegalArgumentException().isThrownBy(() -> repository.findByFirstnameIgnoreCase(null));
 	}
 
 	@Test // DATAMONGO-770
-	public void findByFirstNameIgnoreCase() {
+	void findByFirstNameIgnoreCase() {
 
 		List<Person> result = repository.findByFirstnameIgnoreCase("dave");
 
@@ -655,7 +713,7 @@ public void findByFirstNameIgnoreCase() {
 	}
 
 	@Test // DATAMONGO-770
-	public void findByFirstnameNotIgnoreCase() {
+	void findByFirstnameNotIgnoreCase() {
 
 		List<Person> result = repository.findByFirstnameNotIgnoreCase("dave");
 
@@ -663,7 +721,7 @@ public void findByFirstnameNotIgnoreCase() {
 	}
 
 	@Test // DATAMONGO-770
-	public void findByFirstnameStartingWithIgnoreCase() {
+	void findByFirstnameStartingWithIgnoreCase() {
 
 		List<Person> result = repository.findByFirstnameStartingWithIgnoreCase("da");
 		assertThat(result).hasSize(1);
@@ -671,7 +729,7 @@ public void findByFirstnameStartingWithIgnoreCase() {
 	}
 
 	@Test // DATAMONGO-770
-	public void findByFirstnameEndingWithIgnoreCase() {
+	void findByFirstnameEndingWithIgnoreCase() {
 
 		List<Person> result = repository.findByFirstnameEndingWithIgnoreCase("VE");
 		assertThat(result).hasSize(1);
@@ -679,7 +737,7 @@ public void findByFirstnameEndingWithIgnoreCase() {
 	}
 
 	@Test // DATAMONGO-770
-	public void findByFirstnameContainingIgnoreCase() {
+	void findByFirstnameContainingIgnoreCase() {
 
 		List<Person> result = repository.findByFirstnameContainingIgnoreCase("AV");
 		assertThat(result).hasSize(1);
@@ -687,7 +745,7 @@ public void findByFirstnameContainingIgnoreCase() {
 	}
 
 	@Test // DATAMONGO-870
-	public void findsSliceOfPersons() {
+	void findsSliceOfPersons() {
 
 		Slice<Person> result = repository.findByAgeGreaterThan(40, PageRequest.of(0, 2, Direction.DESC, "firstname"));
 
@@ -695,7 +753,7 @@ public void findsSliceOfPersons() {
 	}
 
 	@Test // DATAMONGO-871
-	public void findsPersonsByFirstnameAsArray() {
+	void findsPersonsByFirstnameAsArray() {
 
 		Person[] result = repository.findByThePersonsFirstnameAsArray("Leroi");
 
@@ -703,7 +761,8 @@ public void findsPersonsByFirstnameAsArray() {
 	}
 
 	@Test // DATAMONGO-821
-	public void findUsingAnnotatedQueryOnDBRef() {
+	@DirtiesState
+	void findUsingAnnotatedQueryOnDBRef() {
 
 		operations.remove(new org.springframework.data.mongodb.core.query.Query(), User.class);
 
@@ -721,7 +780,8 @@ public void findUsingAnnotatedQueryOnDBRef() {
 	}
 
 	@Test // DATAMONGO-566
-	public void deleteByShouldReturnListOfDeletedElementsWhenRetunTypeIsCollectionLike() {
+	@DirtiesState
+	void deleteByShouldReturnListOfDeletedElementsWhenRetunTypeIsCollectionLike() {
 
 		List<Person> result = repository.deleteByLastname("Beauford");
 
@@ -729,7 +789,8 @@ public void deleteByShouldReturnListOfDeletedElementsWhenRetunTypeIsCollectionLi
 	}
 
 	@Test // DATAMONGO-566
-	public void deleteByShouldRemoveElementsMatchingDerivedQuery() {
+	@DirtiesState
+	void deleteByShouldRemoveElementsMatchingDerivedQuery() {
 
 		repository.deleteByLastname("Beauford");
 
@@ -737,22 +798,34 @@ public void deleteByShouldRemoveElementsMatchingDerivedQuery() {
 	}
 
 	@Test // DATAMONGO-566
-	public void deleteByShouldReturnNumberOfDocumentsRemovedIfReturnTypeIsLong() {
+	@DirtiesState
+	void deleteByShouldReturnNumberOfDocumentsRemovedIfReturnTypeIsLong() {
 		assertThat(repository.deletePersonByLastname("Beauford")).isEqualTo(1L);
 	}
 
+	@Test // DATAMONGO-1997
+	@DirtiesState
+	void deleteByShouldResultWrappedInOptionalCorrectly() {
+
+		assertThat(repository.deleteOptionalByLastname("Beauford")).isPresent();
+		assertThat(repository.deleteOptionalByLastname("dorfuaeB")).isNotPresent();
+	}
+
 	@Test // DATAMONGO-566
-	public void deleteByShouldReturnZeroInCaseNoDocumentHasBeenRemovedAndReturnTypeIsNumber() {
+	@DirtiesState
+	void deleteByShouldReturnZeroInCaseNoDocumentHasBeenRemovedAndReturnTypeIsNumber() {
 		assertThat(repository.deletePersonByLastname("dorfuaeB")).isEqualTo(0L);
 	}
 
 	@Test // DATAMONGO-566
-	public void deleteByShouldReturnEmptyListInCaseNoDocumentHasBeenRemovedAndReturnTypeIsCollectionLike() {
+	@DirtiesState
+	void deleteByShouldReturnEmptyListInCaseNoDocumentHasBeenRemovedAndReturnTypeIsCollectionLike() {
 		assertThat(repository.deleteByLastname("dorfuaeB")).isEmpty();
 	}
 
 	@Test // DATAMONGO-566
-	public void deleteByUsingAnnotatedQueryShouldReturnListOfDeletedElementsWhenRetunTypeIsCollectionLike() {
+	@DirtiesState
+	void deleteByUsingAnnotatedQueryShouldReturnListOfDeletedElementsWhenRetunTypeIsCollectionLike() {
 
 		List<Person> result = repository.removeByLastnameUsingAnnotatedQuery("Beauford");
 
@@ -760,7 +833,8 @@ public void deleteByUsingAnnotatedQueryShouldReturnListOfDeletedElementsWhenRetu
 	}
 
 	@Test // DATAMONGO-566
-	public void deleteByUsingAnnotatedQueryShouldRemoveElementsMatchingDerivedQuery() {
+	@DirtiesState
+	void deleteByUsingAnnotatedQueryShouldRemoveElementsMatchingDerivedQuery() {
 
 		repository.removeByLastnameUsingAnnotatedQuery("Beauford");
 
@@ -768,12 +842,14 @@ public void deleteByUsingAnnotatedQueryShouldRemoveElementsMatchingDerivedQuery(
 	}
 
 	@Test // DATAMONGO-566
-	public void deleteByUsingAnnotatedQueryShouldReturnNumberOfDocumentsRemovedIfReturnTypeIsLong() {
+	@DirtiesState
+	void deleteByUsingAnnotatedQueryShouldReturnNumberOfDocumentsRemovedIfReturnTypeIsLong() {
 		assertThat(repository.removePersonByLastnameUsingAnnotatedQuery("Beauford")).isEqualTo(1L);
 	}
 
 	@Test // DATAMONGO-893
-	public void findByNestedPropertyInCollectionShouldFindMatchingDocuments() {
+	@ProvidesState
+	void findByNestedPropertyInCollectionShouldFindMatchingDocuments() {
 
 		Person p = new Person("Mary", "Poppins");
 		Address adr = new Address("some", "2", "where");
@@ -787,7 +863,8 @@ public void findByNestedPropertyInCollectionShouldFindMatchingDocuments() {
 	}
 
 	@Test // DATAMONGO-745
-	public void findByCustomQueryFirstnamesInListAndLastname() {
+	@ProvidesState
+	void findByCustomQueryFirstnamesInListAndLastname() {
 
 		repository.save(new Person("foo", "bar"));
 		repository.save(new Person("bar", "bar"));
@@ -803,7 +880,8 @@ public void findByCustomQueryFirstnamesInListAndLastname() {
 	}
 
 	@Test // DATAMONGO-745
-	public void findByCustomQueryLastnameAndStreetInList() {
+	@ProvidesState
+	void findByCustomQueryLastnameAndStreetInList() {
 
 		repository.save(new Person("foo", "bar").withAddress(new Address("street1", "1", "SB")));
 		repository.save(new Person("bar", "bar").withAddress(new Address("street2", "1", "SB")));
@@ -820,7 +898,8 @@ public void findByCustomQueryLastnameAndStreetInList() {
 	}
 
 	@Test // DATAMONGO-950
-	public void shouldLimitCollectionQueryToMaxResultsWhenPresent() {
+	@ProvidesState
+	void shouldLimitCollectionQueryToMaxResultsWhenPresent() {
 
 		repository.saveAll(Arrays.asList(new Person("Bob-1", "Dylan"), new Person("Bob-2", "Dylan"),
 				new Person("Bob-3", "Dylan"), new Person("Bob-4", "Dylan"), new Person("Bob-5", "Dylan")));
@@ -829,7 +908,8 @@ public void shouldLimitCollectionQueryToMaxResultsWhenPresent() {
 	}
 
 	@Test // DATAMONGO-950, DATAMONGO-1464
-	public void shouldNotLimitPagedQueryWhenPageRequestWithinBounds() {
+	@ProvidesState
+	void shouldNotLimitPagedQueryWhenPageRequestWithinBounds() {
 
 		repository.saveAll(Arrays.asList(new Person("Bob-1", "Dylan"), new Person("Bob-2", "Dylan"),
 				new Person("Bob-3", "Dylan"), new Person("Bob-4", "Dylan"), new Person("Bob-5", "Dylan")));
@@ -839,7 +919,8 @@ public void shouldNotLimitPagedQueryWhenPageRequestWithinBounds() {
 	}
 
 	@Test // DATAMONGO-950
-	public void shouldLimitPagedQueryWhenPageRequestExceedsUpperBoundary() {
+	@ProvidesState
+	void shouldLimitPagedQueryWhenPageRequestExceedsUpperBoundary() {
 
 		repository.saveAll(Arrays.asList(new Person("Bob-1", "Dylan"), new Person("Bob-2", "Dylan"),
 				new Person("Bob-3", "Dylan"), new Person("Bob-4", "Dylan"), new Person("Bob-5", "Dylan")));
@@ -848,7 +929,8 @@ public void shouldLimitPagedQueryWhenPageRequestExceedsUpperBoundary() {
 	}
 
 	@Test // DATAMONGO-950, DATAMONGO-1464
-	public void shouldReturnEmptyWhenPageRequestedPageIsTotallyOutOfScopeForLimit() {
+	@ProvidesState
+	void shouldReturnEmptyWhenPageRequestedPageIsTotallyOutOfScopeForLimit() {
 
 		repository.saveAll(Arrays.asList(new Person("Bob-1", "Dylan"), new Person("Bob-2", "Dylan"),
 				new Person("Bob-3", "Dylan"), new Person("Bob-4", "Dylan"), new Person("Bob-5", "Dylan")));
@@ -858,7 +940,7 @@ public void shouldReturnEmptyWhenPageRequestedPageIsTotallyOutOfScopeForLimit()
 	}
 
 	@Test // DATAMONGO-996, DATAMONGO-950, DATAMONGO-1464
-	public void gettingNonFirstPageWorksWithoutLimitBeingSet() {
+	void gettingNonFirstPageWorksWithoutLimitBeingSet() {
 
 		Page<Person> slice = repository.findByLastnameLike("Matthews", PageRequest.of(1, 1));
 
@@ -869,7 +951,8 @@ public void gettingNonFirstPageWorksWithoutLimitBeingSet() {
 	}
 
 	@Test // DATAMONGO-972
-	public void shouldExecuteFindOnDbRefCorrectly() {
+	@DirtiesState
+	void shouldExecuteFindOnDbRefCorrectly() {
 
 		operations.remove(new org.springframework.data.mongodb.core.query.Query(), User.class);
 
@@ -885,12 +968,27 @@ public void shouldExecuteFindOnDbRefCorrectly() {
 	}
 
 	@Test // DATAMONGO-969
-	public void shouldFindPersonsWhenUsingQueryDslPerdicatedOnIdProperty() {
+	void shouldFindPersonsWhenUsingQueryDslPerdicatedOnIdProperty() {
 		assertThat(repository.findAll(person.id.in(Arrays.asList(dave.id, carter.id)))).contains(dave, carter);
 	}
 
+	@Test // DATAMONGO-969
+	void shouldScrollPersonsWhenUsingQueryDslPerdicatedOnIdProperty() {
+
+		Window<Person> scroll = repository.findBy(person.id.in(asList(dave.id, carter.id, boyd.id)), //
+				q -> q.limit(2).sortBy(Sort.by("firstname")).scroll(ScrollPosition.keyset()));
+
+		assertThat(scroll).containsExactly(boyd, carter);
+
+		ScrollPosition resumeFrom = scroll.positionAt(scroll.size() - 1);
+		scroll = repository.findBy(person.id.in(asList(dave.id, carter.id, boyd.id)), //
+				q -> q.limit(2).sortBy(Sort.by("firstname")).scroll(resumeFrom));
+
+		assertThat(scroll).containsOnly(dave);
+	}
+
 	@Test // DATAMONGO-1030
-	public void executesSingleEntityQueryWithProjectionCorrectly() {
+	void executesSingleEntityQueryWithProjectionCorrectly() {
 
 		PersonSummaryDto result = repository.findSummaryByLastname("Beauford");
 
@@ -900,9 +998,8 @@ public void executesSingleEntityQueryWithProjectionCorrectly() {
 	}
 
 	@Test // DATAMONGO-1057
-	public void sliceShouldTraverseElementsWithoutSkippingOnes() {
-
-		repository.deleteAll();
+	@ProvidesState
+	void sliceShouldTraverseElementsWithoutSkippingOnes() {
 
 		List<Person> persons = new ArrayList<Person>(100);
 		for (int i = 0; i < 100; i++) {
@@ -910,7 +1007,7 @@ public void sliceShouldTraverseElementsWithoutSkippingOnes() {
 			persons.add(new Person(String.format("%03d", i), "ln" + 1, 100));
 		}
 
-		repository.saveAll(persons);
+		operations.bulkOps(BulkMode.UNORDERED, Person.class).insert(persons).execute();
 
 		Slice<Person> slice = repository.findByAgeGreaterThan(50, PageRequest.of(0, 20, Direction.ASC, "firstname"));
 		assertThat(slice).containsExactlyElementsOf(persons.subList(0, 20));
@@ -920,7 +1017,7 @@ public void sliceShouldTraverseElementsWithoutSkippingOnes() {
 	}
 
 	@Test // DATAMONGO-1072
-	public void shouldBindPlaceholdersUsedAsKeysCorrectly() {
+	void shouldBindPlaceholdersUsedAsKeysCorrectly() {
 
 		List<Person> persons = repository.findByKeyValue("firstname", alicia.getFirstname());
 
@@ -928,7 +1025,7 @@ public void shouldBindPlaceholdersUsedAsKeysCorrectly() {
 	}
 
 	@Test // DATAMONGO-1105
-	public void returnsOrderedResultsForQuerydslOrderSpecifier() {
+	void returnsOrderedResultsForQuerydslOrderSpecifier() {
 
 		Iterable<Person> result = repository.findAll(person.firstname.asc());
 
@@ -936,7 +1033,8 @@ public void returnsOrderedResultsForQuerydslOrderSpecifier() {
 	}
 
 	@Test // DATAMONGO-1085
-	public void shouldSupportSortingByQueryDslOrderSpecifier() {
+	@ProvidesState
+	void shouldSupportSortingByQueryDslOrderSpecifier() {
 
 		repository.deleteAll();
 
@@ -959,9 +1057,8 @@ public void shouldSupportSortingByQueryDslOrderSpecifier() {
 	}
 
 	@Test // DATAMONGO-1085
-	public void shouldSupportSortingWithQSortByQueryDslOrderSpecifier() {
-
-		repository.deleteAll();
+	@ProvidesState
+	void shouldSupportSortingWithQSortByQueryDslOrderSpecifier() {
 
 		List<Person> persons = new ArrayList<Person>();
 
@@ -981,9 +1078,8 @@ public void shouldSupportSortingWithQSortByQueryDslOrderSpecifier() {
 	}
 
 	@Test // DATAMONGO-1085
-	public void shouldSupportSortingWithQSort() {
-
-		repository.deleteAll();
+	@ProvidesState
+	void shouldSupportSortingWithQSort() {
 
 		List<Person> persons = new ArrayList<Person>();
 
@@ -1002,7 +1098,7 @@ public void shouldSupportSortingWithQSort() {
 	}
 
 	@Test // DATAMONGO-1165
-	public void shouldAllowReturningJava8StreamInCustomQuery() {
+	void shouldAllowReturningJava8StreamInCustomQuery() {
 
 		Stream<Person> result = repository.findByCustomQueryWithStreamingCursorByFirstnames(Arrays.asList("Dave"));
 
@@ -1014,20 +1110,21 @@ public void shouldAllowReturningJava8StreamInCustomQuery() {
 	}
 
 	@Test // DATAMONGO-1110
-	public void executesGeoNearQueryForResultsCorrectlyWhenGivenMinAndMaxDistance() {
+	@DirtiesState
+	void executesGeoNearQueryForResultsCorrectlyWhenGivenMinAndMaxDistance() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave);
 
-		Range<Distance> range = Distance.between(new Distance(0.01, KILOMETERS), new Distance(2000, KILOMETERS));
+		Range<Distance> range = Distance.between(Distance.of(0.01, KILOMETERS), Distance.of(2000, KILOMETERS));
 
 		GeoResults<Person> results = repository.findPersonByLocationNear(new Point(-73.99, 40.73), range);
 		assertThat(results.getContent()).isNotEmpty();
 	}
 
 	@Test // DATAMONGO-990
-	public void shouldFindByFirstnameForSpELExpressionWithParameterIndexOnly() {
+	void shouldFindByFirstnameForSpELExpressionWithParameterIndexOnly() {
 
 		List<Person> users = repository.findWithSpelByFirstnameForSpELExpressionWithParameterIndexOnly("Dave");
 
@@ -1036,7 +1133,7 @@ public void shouldFindByFirstnameForSpELExpressionWithParameterIndexOnly() {
 	}
 
 	@Test // DATAMONGO-990
-	public void shouldFindByFirstnameAndCurrentUserWithCustomQuery() {
+	void shouldFindByFirstnameAndCurrentUserWithCustomQuery() {
 
 		SampleSecurityContextHolder.getCurrent().setPrincipal(dave);
 		List<Person> users = repository.findWithSpelByFirstnameAndCurrentUserWithCustomQuery("Dave");
@@ -1046,7 +1143,7 @@ public void shouldFindByFirstnameAndCurrentUserWithCustomQuery() {
 	}
 
 	@Test // DATAMONGO-990
-	public void shouldFindByFirstnameForSpELExpressionWithParameterVariableOnly() {
+	void shouldFindByFirstnameForSpELExpressionWithParameterVariableOnly() {
 
 		List<Person> users = repository.findWithSpelByFirstnameForSpELExpressionWithParameterVariableOnly("Dave");
 
@@ -1055,7 +1152,8 @@ public void shouldFindByFirstnameForSpELExpressionWithParameterVariableOnly() {
 	}
 
 	@Test // DATAMONGO-1911
-	public void findByUUIDShouldReturnCorrectResult() {
+	@DirtiesState
+	void findByUUIDShouldReturnCorrectResult() {
 
 		dave.setUniqueId(UUID.randomUUID());
 		repository.save(dave);
@@ -1066,7 +1164,7 @@ public void findByUUIDShouldReturnCorrectResult() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findByExampleShouldResolveStuffCorrectly() {
+	void findByExampleShouldResolveStuffCorrectly() {
 
 		Person sample = new Person();
 		sample.setLastname("Matthews");
@@ -1081,7 +1179,7 @@ public void findByExampleShouldResolveStuffCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldResolveStuffCorrectly() {
+	void findAllByExampleShouldResolveStuffCorrectly() {
 
 		Person sample = new Person();
 		sample.setLastname("Matthews");
@@ -1095,8 +1193,35 @@ public void findAllByExampleShouldResolveStuffCorrectly() {
 		assertThat(result).hasSize(2);
 	}
 
+	@Test // GH-4308
+	void scrollByExampleShouldReturnCorrectResult() {
+
+		Person sample = new Person();
+		sample.setLastname("M");
+
+		// needed to tweak stuff a bit since some field are automatically set - so we need to undo this
+		ReflectionTestUtils.setField(sample, "id", null);
+		ReflectionTestUtils.setField(sample, "createdAt", null);
+		ReflectionTestUtils.setField(sample, "email", null);
+
+		Window<Person> result = repository.findBy(
+				Example.of(sample, ExampleMatcher.matching().withMatcher("lastname", GenericPropertyMatcher::startsWith)),
+				q -> q.limit(2).sortBy(Sort.by("firstname")).scroll(ScrollPosition.keyset()));
+
+		assertThat(result).containsOnly(dave, leroi);
+		assertThat(result.hasNext()).isTrue();
+
+		ScrollPosition position = result.positionAt(result.size() - 1);
+		result = repository.findBy(
+				Example.of(sample, ExampleMatcher.matching().withMatcher("lastname", GenericPropertyMatcher::startsWith)),
+				q -> q.limit(2).sortBy(Sort.by("firstname")).scroll(position));
+
+		assertThat(result).containsOnly(oliver);
+		assertThat(result.hasNext()).isFalse();
+	}
+
 	@Test // DATAMONGO-1425
-	public void findsPersonsByFirstnameNotContains() {
+	void findsPersonsByFirstnameNotContains() {
 
 		List<Person> result = repository.findByFirstnameNotContains("Boyd");
 		assertThat(result).hasSize((int) (repository.count() - 1));
@@ -1104,14 +1229,14 @@ public void findsPersonsByFirstnameNotContains() {
 	}
 
 	@Test // DATAMONGO-1425
-	public void findBySkillsContains() {
+	void findBySkillsContains() {
 
 		List<Person> result = repository.findBySkillsContains(asList("Drums"));
 		assertThat(result).hasSize(1).contains(carter);
 	}
 
 	@Test // DATAMONGO-1425
-	public void findBySkillsNotContains() {
+	void findBySkillsNotContains() {
 
 		List<Person> result = repository.findBySkillsNotContains(Arrays.asList("Drums"));
 		assertThat(result).hasSize((int) (repository.count() - 1));
@@ -1119,7 +1244,7 @@ public void findBySkillsNotContains() {
 	}
 
 	@Test // DATAMONGO-1424
-	public void findsPersonsByFirstnameNotLike() {
+	void findsPersonsByFirstnameNotLike() {
 
 		List<Person> result = repository.findByFirstnameNotLike("Bo*");
 		assertThat(result).hasSize((int) (repository.count() - 1));
@@ -1127,12 +1252,13 @@ public void findsPersonsByFirstnameNotLike() {
 	}
 
 	@Test // DATAMONGO-1539
-	public void countsPersonsByFirstname() {
+	void countsPersonsByFirstname() {
 		assertThat(repository.countByThePersonsFirstname("Dave")).isEqualTo(1L);
 	}
 
 	@Test // DATAMONGO-1539
-	public void deletesPersonsByFirstname() {
+	@DirtiesState
+	void deletesPersonsByFirstname() {
 
 		repository.deleteByThePersonsFirstname("Dave");
 
@@ -1140,50 +1266,50 @@ public void deletesPersonsByFirstname() {
 	}
 
 	@Test // DATAMONGO-1752
-	public void readsOpenProjection() {
+	void readsOpenProjection() {
 		assertThat(repository.findOpenProjectionBy()).isNotEmpty();
 	}
 
 	@Test // DATAMONGO-1752
-	public void readsClosedProjection() {
+	void readsClosedProjection() {
 		assertThat(repository.findClosedProjectionBy()).isNotEmpty();
 	}
 
 	@Test // DATAMONGO-1865
-	public void findFirstEntityReturnsFirstResultEvenForNonUniqueMatches() {
+	void findFirstEntityReturnsFirstResultEvenForNonUniqueMatches() {
 		assertThat(repository.findFirstBy()).isNotNull();
 	}
 
 	@Test // DATAMONGO-1865
-	public void findSingleEntityThrowsErrorWhenNotUnique() {
+	void findSingleEntityThrowsErrorWhenNotUnique() {
 		assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class)
 				.isThrownBy(() -> repository.findPersonByLastnameLike(dave.getLastname()));
 	}
 
 	@Test // DATAMONGO-1865
-	public void findOptionalSingleEntityThrowsErrorWhenNotUnique() {
+	void findOptionalSingleEntityThrowsErrorWhenNotUnique() {
 		assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class)
 				.isThrownBy(() -> repository.findOptionalPersonByLastnameLike(dave.getLastname()));
 	}
 
 	@Test // DATAMONGO-1979
-	public void findAppliesAnnotatedSort() {
+	void findAppliesAnnotatedSort() {
 		assertThat(repository.findByAgeGreaterThan(40)).containsExactly(carter, boyd, dave, leroi);
 	}
 
 	@Test // DATAMONGO-1979
-	public void findWithSortOverwritesAnnotatedSort() {
+	void findWithSortOverwritesAnnotatedSort() {
 		assertThat(repository.findByAgeGreaterThan(40, Sort.by(Direction.ASC, "age"))).containsExactly(leroi, dave, boyd,
 				carter);
 	}
 
 	@Test // DATAMONGO-2003
-	public void findByRegexWithPattern() {
+	void findByRegexWithPattern() {
 		assertThat(repository.findByFirstnameRegex(Pattern.compile(alicia.getFirstname()))).hasSize(1);
 	}
 
 	@Test // DATAMONGO-2003
-	public void findByRegexWithPatternAndOptions() {
+	void findByRegexWithPatternAndOptions() {
 
 		String fn = alicia.getFirstname().toUpperCase();
 
@@ -1192,7 +1318,8 @@ public void findByRegexWithPatternAndOptions() {
 	}
 
 	@Test // DATAMONGO-2149
-	public void annotatedQueryShouldAllowSliceInFieldsProjectionWithDbRef() {
+	@DirtiesState
+	void annotatedQueryShouldAllowSliceInFieldsProjectionWithDbRef() {
 
 		operations.remove(new Query(), User.class);
 
@@ -1215,7 +1342,8 @@ public void annotatedQueryShouldAllowSliceInFieldsProjectionWithDbRef() {
 	}
 
 	@Test // DATAMONGO-2149
-	public void annotatedQueryShouldAllowPositionalParameterInFieldsProjection() {
+	@DirtiesState
+	void annotatedQueryShouldAllowPositionalParameterInFieldsProjection() {
 
 		Set<Address> addressList = IntStream.range(0, 10).mapToObj(it -> new Address("street-" + it, "zip", "lnz"))
 				.collect(Collectors.toSet());
@@ -1230,7 +1358,8 @@ public void annotatedQueryShouldAllowPositionalParameterInFieldsProjection() {
 	}
 
 	@Test // DATAMONGO-2149, DATAMONGO-2154, DATAMONGO-2199
-	public void annotatedQueryShouldAllowPositionalParameterInFieldsProjectionWithDbRef() {
+	@DirtiesState
+	void annotatedQueryShouldAllowPositionalParameterInFieldsProjectionWithDbRef() {
 
 		List<User> userList = IntStream.range(0, 10).mapToObj(it -> {
 
@@ -1253,19 +1382,34 @@ public void annotatedQueryShouldAllowPositionalParameterInFieldsProjectionWithDb
 	}
 
 	@Test // DATAMONGO-2153
-	public void findListOfSingleValue() {
+	void findListOfSingleValue() {
 
-		assertThat(repository.findAllLastnames()) //
-				.contains("Lessard") //
-				.contains("Keys") //
-				.contains("Tinsley") //
-				.contains("Beauford") //
-				.contains("Moore") //
-				.contains("Matthews"); //
+		assertThat(repository.findAllLastnames()).contains("Lessard", "Keys", "Tinsley", "Beauford", "Moore", "Matthews");
+	}
+
+	@Test // GH-3543
+	void findStreamOfSingleValue() {
+
+		try (Stream<String> lastnames = repository.findAllLastnamesAsStream()) {
+			assertThat(lastnames) //
+					.contains("Lessard", "Keys", "Tinsley", "Beauford", "Moore", "Matthews");
+		}
+	}
+
+	@Test // DATAMONGO-4841
+	void annotatedAggregationStreamWithPlaceholderValue() {
+
+		assertThat(repository.groupStreamByLastnameAnd("firstname"))
+				.contains(new PersonAggregate("Lessard", Collections.singletonList("Stefan"))) //
+				.contains(new PersonAggregate("Keys", Collections.singletonList("Alicia"))) //
+				.contains(new PersonAggregate("Tinsley", Collections.singletonList("Boyd"))) //
+				.contains(new PersonAggregate("Beauford", Collections.singletonList("Carter"))) //
+				.contains(new PersonAggregate("Moore", Collections.singletonList("Leroi"))) //
+				.contains(new PersonAggregate("Matthews", Arrays.asList("Dave", "Oliver August")));
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithPlaceholderValue() {
+	void annotatedAggregationWithPlaceholderValue() {
 
 		assertThat(repository.groupByLastnameAnd("firstname"))
 				.contains(new PersonAggregate("Lessard", Collections.singletonList("Stefan"))) //
@@ -1276,8 +1420,16 @@ public void annotatedAggregationWithPlaceholderValue() {
 				.contains(new PersonAggregate("Matthews", Arrays.asList("Dave", "Oliver August")));
 	}
 
+	@Test // GH-3543
+	void annotatedAggregationWithPlaceholderAsSlice() {
+
+		Slice<PersonAggregate> slice = repository.groupByLastnameAndAsSlice("firstname", Pageable.ofSize(5));
+		assertThat(slice).hasSize(5);
+		assertThat(slice.hasNext()).isTrue();
+	}
+
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithSort() {
+	void annotatedAggregationWithSort() {
 
 		assertThat(repository.groupByLastnameAnd("firstname", Sort.by("lastname"))) //
 				.containsSequence( //
@@ -1290,7 +1442,7 @@ public void annotatedAggregationWithSort() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithPageable() {
+	void annotatedAggregationWithPageable() {
 
 		assertThat(repository.groupByLastnameAnd("firstname", PageRequest.of(1, 2, Sort.by("lastname")))) //
 				.containsExactly( //
@@ -1299,12 +1451,12 @@ public void annotatedAggregationWithPageable() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithSingleSimpleResult() {
+	void annotatedAggregationWithSingleSimpleResult() {
 		assertThat(repository.sumAge()).isEqualTo(245);
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithAggregationResultAsReturnType() {
+	void annotatedAggregationWithAggregationResultAsReturnType() {
 
 		assertThat(repository.sumAgeAndReturnAggregationResultWrapper()) //
 				.isInstanceOf(AggregationResults.class) //
@@ -1312,17 +1464,224 @@ public void annotatedAggregationWithAggregationResultAsReturnType() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithAggregationResultAsReturnTypeAndProjection() {
+	void annotatedAggregationWithAggregationResultAsReturnTypeAndProjection() {
 
 		assertThat(repository.sumAgeAndReturnAggregationResultWrapperWithConcreteType()) //
 				.isInstanceOf(AggregationResults.class) //
 				.containsExactly(new SumAge(245L));
 	}
 
+	@Test // GH-4839
+	void annotatedAggregationWithAggregationResultAsClosedInterfaceProjection() {
+
+		assertThat(repository.findAggregatedClosedInterfaceProjectionBy()).allSatisfy(it -> {
+			assertThat(it.getFirstname()).isIn(dave.getFirstname(), oliver.getFirstname());
+			assertThat(it.getLastname()).isEqualTo(dave.getLastname());
+		});
+	}
+
 	@Test // DATAMONGO-2374
-	public void findsWithNativeProjection() {
+	void findsWithNativeProjection() {
 
 		assertThat(repository.findDocumentById(dave.getId()).get()).containsEntry("firstname", dave.getFirstname())
 				.containsEntry("lastname", dave.getLastname());
 	}
+
+	@Test // DATAMONGO-1677
+	@DirtiesState
+	void findWithMoreThan10Arguments() {
+
+		alicia.setSkills(Arrays.asList("musician", "singer", "composer", "actress", "pianist"));
+		alicia.setAddress(new Address("street", "zipCode", "city"));
+		alicia.setUniqueId(UUID.randomUUID());
+		UsernameAndPassword credentials = new UsernameAndPassword();
+		credentials.password = "keys";
+		credentials.username = "alicia";
+		alicia.credentials = credentials;
+
+		alicia = repository.save(this.alicia);
+
+		assertThat(repository.findPersonByManyArguments(this.alicia.getFirstname(), this.alicia.getLastname(),
+				this.alicia.getEmail(), this.alicia.getAge(), Sex.FEMALE, this.alicia.createdAt, alicia.getSkills(), "street",
+				"zipCode", "city", alicia.getUniqueId(), credentials.username, credentials.password)).isNotNull();
+	}
+
+	@Test // DATAMONGO-1894
+	void spelExpressionArgumentsGetReevaluatedOnEveryInvocation() {
+
+		assertThat(repository.findWithSpelByFirstnameForSpELExpressionWithParameterIndexOnly("Dave")).containsExactly(dave);
+		assertThat(repository.findWithSpelByFirstnameForSpELExpressionWithParameterIndexOnly("Carter"))
+				.containsExactly(carter);
+	}
+
+	@Test // DATAMONGO-1902
+	@DirtiesState
+	void findByValueInsideUnwrapped() {
+
+		Person bart = new Person("bart", "simpson");
+		User user = new User();
+		user.setUsername("bartman");
+		user.setId("84r1m4n");
+		bart.setUnwrappedUser(user);
+
+		operations.save(bart);
+
+		List<Person> result = repository.findByUnwrappedUserUsername(user.getUsername());
+
+		assertThat(result).hasSize(1);
+		assertThat(result.get(0).getId().equals(bart.getId()));
+	}
+
+	@Test // DATAMONGO-1902
+	@DirtiesState
+	void findByUnwrapped() {
+
+		Person bart = new Person("bart", "simpson");
+		User user = new User();
+		user.setUsername("bartman");
+		user.setId("84r1m4n");
+		bart.setUnwrappedUser(user);
+
+		operations.save(bart);
+
+		List<Person> result = repository.findByUnwrappedUser(user);
+
+		assertThat(result).hasSize(1);
+		assertThat(result.get(0).getId().equals(bart.getId()));
+	}
+
+	@Test // GH-3395, GH-4404
+	void caseInSensitiveInClause() {
+
+		assertThat(repository.findByLastnameIgnoreCaseIn("bEAuFoRd", "maTTheWs")).hasSize(3);
+
+		repository.save(new Person("the-first", "The First"));
+		repository.save(new Person("the-first-one", "The First One"));
+		repository.save(new Person("the-second", "The Second"));
+
+		assertThat(repository.findByLastnameIgnoreCaseIn("tHE fIRsT")).hasSize(1);
+	}
+
+	@Test // GH-3395
+	void caseInSensitiveInClauseQuotesExpressions() {
+		assertThat(repository.findByLastnameIgnoreCaseIn(".*")).isEmpty();
+	}
+
+	@Test // GH-3395
+	void caseSensitiveInClauseIgnoresExpressions() {
+		assertThat(repository.findByFirstnameIn(".*")).isEmpty();
+	}
+
+	@Test // GH-3583
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.4")
+	void annotatedQueryShouldAllowAggregationInProjection() {
+
+		Person target = repository.findWithAggregationInProjection(alicia.getId());
+		assertThat(target.getFirstname()).isEqualTo(alicia.getFirstname().toUpperCase());
+	}
+
+	@Test // GH-3633
+	@DirtiesState
+	void annotatedQueryWithNullEqualityCheckShouldWork() {
+
+		operations.updateFirst(Query.query(Criteria.where("id").is(dave.getId())), Update.update("age", null),
+				Person.class);
+
+		Person byQueryWithNullEqualityCheck = repository.findByQueryWithNullEqualityCheck();
+		assertThat(byQueryWithNullEqualityCheck.getId()).isEqualTo(dave.getId());
+	}
+
+	@Test // GH-3602
+	@DirtiesState
+	void executesQueryWithDocumentReferenceCorrectly() {
+
+		Person josh = new Person("Josh", "Long");
+		User dave = new User();
+		dave.id = "dave";
+
+		josh.setSpiritAnimal(dave);
+
+		operations.save(josh);
+
+		List<Person> result = repository.findBySpiritAnimal(dave);
+		assertThat(result).map(Person::getId).containsExactly(josh.getId());
+	}
+
+	@Test // GH-3656
+	@DirtiesState
+	void resultProjectionWithOptionalIsExcecutedCorrectly() {
+
+		carter.setAddress(new Address("batman", "robin", "gotham"));
+		repository.save(carter);
+
+		PersonSummaryWithOptional result = repository.findSummaryWithOptionalByLastname("Beauford");
+
+		assertThat(result).isNotNull();
+		assertThat(result.getAddress()).isPresent();
+		assertThat(result.getFirstname()).contains("Carter");
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void shouldAllowToUpdateAllElements() {
+		assertThat(repository.findAndUpdateViaMethodArgAllByLastname("Matthews", new Update().inc("visits", 1337)))
+				.isEqualTo(2);
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void annotatedUpdateIsAppliedCorrectly() {
+
+		assertThat(repository.findAndIncrementVisitsByLastname("Matthews", 1337)).isEqualTo(2);
+
+		assertThat(repository.findByLastname("Matthews")).extracting(Person::getVisits).allMatch(it -> it.equals(1337));
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void mixAnnotatedUpdateWithAnnotatedQuery() {
+
+		assertThat(repository.updateAllByLastname("Matthews", 1337)).isEqualTo(2);
+
+		assertThat(repository.findByLastname("Matthews")).extracting(Person::getVisits).allMatch(it -> it.equals(1337));
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void annotatedUpdateWithSpELIsAppliedCorrectly() {
+
+		assertThat(repository.findAndIncrementVisitsUsingSpELByLastname("Matthews", 1337)).isEqualTo(2);
+
+		assertThat(repository.findByLastname("Matthews")).extracting(Person::getVisits).allMatch(it -> it.equals(1337));
+	}
+
+	@Test // GH-2107
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	@DirtiesState
+	void annotatedAggregationUpdateIsAppliedCorrectly() {
+
+		repository.findAndIncrementVisitsViaPipelineByLastname("Matthews", 1337);
+
+		assertThat(repository.findByLastname("Matthews")).extracting(Person::getVisits).allMatch(it -> it.equals(1337));
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void shouldAllowToUpdateAllElementsWithVoidReturn() {
+
+		repository.findAndUpdateViaMethodArgAllByLastname("Matthews", new Update().inc("visits", 1337));
+
+		assertThat(repository.findByLastname("Matthews")).extracting(Person::getVisits).allMatch(visits -> visits == 1337);
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void allowsToUseComplexTypesInUpdate() {
+
+		Address address = new Address("1007 Mountain Drive", "53540", "Gotham");
+
+		assertThat(repository.findAndPushShippingAddressByEmail(dave.getEmail(), address)).isEqualTo(1);
+		assertThat(repository.findById(dave.getId()).map(Person::getShippingAddresses))
+				.contains(Collections.singleton(address));
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Address.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Address.java
index 07cc231314..be5be2d9ba 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Address.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Address.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 package org.springframework.data.mongodb.repository;
+import org.jspecify.annotations.Nullable;
+import org.springframework.util.ObjectUtils;
 
 import com.querydsl.core.annotations.QueryEmbeddable;
 
@@ -32,9 +34,9 @@ protected Address() {
 	}
 
 	/**
-	 * @param string
-	 * @param string2
-	 * @param string3
+	 * @param street
+	 * @param zipcode
+	 * @param city
 	 */
 	public Address(String street, String zipcode, String city) {
 		this.street = street;
@@ -83,4 +85,28 @@ public String getCity() {
 	public void setCity(String city) {
 		this.city = city;
 	}
+
+	@Override
+	public boolean equals(@Nullable Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		Address address = (Address) o;
+
+		if (!ObjectUtils.nullSafeEquals(street, address.street)) {
+			return false;
+		}
+		if (!ObjectUtils.nullSafeEquals(zipCode, address.zipCode)) {
+			return false;
+		}
+		return ObjectUtils.nullSafeEquals(city, address.city);
+	}
+
+	@Override
+	public int hashCode() {
+		int result = ObjectUtils.nullSafeHashCode(street);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(zipCode);
+		result = 31 * result + ObjectUtils.nullSafeHashCode(city);
+		return result;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ComplexIdRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ComplexIdRepositoryIntegrationTests.java
index ae7062dc38..a4f533f0be 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ComplexIdRepositoryIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ComplexIdRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,21 +21,21 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersion;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import com.mongodb.client.MongoClient;
 
@@ -44,14 +44,13 @@
  * @author Oliver Gierke
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
 public class ComplexIdRepositoryIntegrationTests {
 
-	public @Rule MongoVersionRule mongoVersionRule = MongoVersionRule.any();
+	static @Client MongoClient mongoClient;
 
 	@Configuration
-	@EnableMongoRepositories
+	@EnableMongoRepositories(includeFilters=@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = UserWithComplexIdRepository.class))
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Override
@@ -61,9 +60,13 @@ protected String getDatabaseName() {
 
 		@Override
 		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
+			return mongoClient;
 		}
 
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.emptySet();
+		}
 	}
 
 	@Autowired UserWithComplexIdRepository repo;
@@ -72,7 +75,7 @@ public MongoClient mongoClient() {
 	MyId id;
 	UserWithComplexId userWithId;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		repo.deleteAll();
@@ -133,12 +136,11 @@ public void composedAnnotationFindQueryShouldWorkWhenUsingComplexId() {
 	}
 
 	@Test // DATAMONGO-1373
-	@MongoVersion(until = "4.0.999")
 	public void composedAnnotationFindMetaShouldWorkWhenUsingComplexId() {
 
 		repo.save(userWithId);
 
-		assertThat(repo.findUsersUsingComposedMetaAnnotationByUserIds(Arrays.asList(id))).hasSize(0);
+		assertThat(repo.findUsersUsingComposedMetaAnnotationByUserIds(Arrays.asList(id))).hasSize(1);
 	}
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Contact.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Contact.java
index fd901ecf8c..a3dbae74c7 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Contact.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Contact.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,8 +27,7 @@
 @Document
 public abstract class Contact {
 
-	@Id
-	protected String id;
+	@Id protected String id;
 
 	public Contact() {
 		this.id = new ObjectId().toString();
@@ -37,4 +36,8 @@ public Contact() {
 	public String getId() {
 		return id;
 	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepository.java
index 4829004bd6..b9a0652d01 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.mongodb.repository;
 
-import org.springframework.data.mongodb.repository.MongoRepository;
-
 /**
  * Simple repository interface managing {@link Contact}s.
  *
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepositoryIntegrationTests.java
index fc5195af51..5f502a22e5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepositoryIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ContactRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Example;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration tests for {@link ContactRepository}. Mostly related to mapping inheritance.
@@ -32,7 +32,7 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("config/MongoNamespaceIntegrationTests-context.xml")
 public class ContactRepositoryIntegrationTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java
index ab47b0e2db..94a77f003a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ConvertingReactiveMongoRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,56 +17,56 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import io.reactivex.Flowable;
-import io.reactivex.Maybe;
-import io.reactivex.observers.TestObserver;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import io.reactivex.rxjava3.core.Observable;
+import io.reactivex.rxjava3.core.Single;
+import io.reactivex.rxjava3.observers.TestObserver;
+import io.reactivex.rxjava3.subscribers.TestSubscriber;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
-import rx.Observable;
-import rx.Single;
 
 import java.util.Arrays;
-import java.util.List;
+import java.util.Objects;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.reactivestreams.Publisher;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
 import org.springframework.data.repository.reactive.ReactiveSortingRepository;
-import org.springframework.data.repository.reactive.RxJava2SortingRepository;
-import org.springframework.stereotype.Repository;
+import org.springframework.data.repository.reactive.RxJava3CrudRepository;
+import org.springframework.data.repository.reactive.RxJava3SortingRepository;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Test for {@link ReactiveMongoRepository} using reactive wrapper type conversion.
  *
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration(classes = ConvertingReactiveMongoRepositoryTests.Config.class)
 public class ConvertingReactiveMongoRepositoryTests {
 
-	@EnableReactiveMongoRepositories(includeFilters = @Filter(value = Repository.class),
+	@EnableReactiveMongoRepositories(
+			includeFilters = { @Filter(value = ReactivePersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE),
+					@Filter(value = RxJava3PersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE),
+					@Filter(value = MixedReactivePersonRepostitory.class, type = FilterType.ASSIGNABLE_TYPE) },
 			considerNestedRepositories = true)
 	@ImportResource("classpath:reactive-infrastructure.xml")
 	static class Config {}
 
 	@Autowired MixedReactivePersonRepostitory reactiveRepository;
 	@Autowired ReactivePersonRepostitory reactivePersonRepostitory;
-	@Autowired RxJava1PersonRepostitory rxJava1PersonRepostitory;
-	@Autowired RxJava2PersonRepostitory rxJava2PersonRepostitory;
+	@Autowired RxJava3PersonRepostitory rxJava3PersonRepostitory;
 
 	ReactivePerson dave, oliver, carter, boyd, stefan, leroi, alicia;
 
@@ -99,108 +99,48 @@ public void reactiveStreamsQueryMethodsShouldWork() {
 		StepVerifier.create(reactivePersonRepostitory.findByLastname(boyd.getLastname())).expectNext(boyd).verifyComplete();
 	}
 
-	@Test // DATAMONGO-1444
-	public void simpleRxJava1MethodsShouldWork() {
-
-		rxJava1PersonRepostitory.existsById(dave.getId()) //
-				.test() //
-				.awaitTerminalEvent() //
-				.assertValue(true) //
-				.assertNoErrors() //
-				.assertCompleted();
-	}
-
-	@Test // DATAMONGO-1444
-	public void existsWithSingleRxJava1IdMethodsShouldWork() {
-
-		rxJava1PersonRepostitory.existsById(Single.just(dave.getId())) //
-				.test() //
-				.awaitTerminalEvent() //
-				.assertValue(true) //
-				.assertNoErrors() //
-				.assertCompleted();
-	}
-
-	@Test // DATAMONGO-1444
-	public void singleRxJava1QueryMethodShouldWork() {
-
-		rxJava1PersonRepostitory.findByFirstnameAndLastname(dave.getFirstname(), dave.getLastname()) //
-				.test() //
-				.awaitTerminalEvent() //
-				.assertValue(dave) //
-				.assertNoErrors() //
-				.assertCompleted();
-	}
-
-	@Test // DATAMONGO-1444
-	public void singleProjectedRxJava1QueryMethodShouldWork() {
-
-		List<ProjectedPerson> people = rxJava1PersonRepostitory.findProjectedByLastname(carter.getLastname()) //
-				.test() //
-				.awaitTerminalEvent() //
-				.assertValueCount(1) //
-				.assertNoErrors() //
-				.assertCompleted() //
-				.getOnNextEvents();
-
-		ProjectedPerson projectedPerson = people.get(0);
-		assertThat(projectedPerson.getFirstname()).isEqualTo(carter.getFirstname());
-	}
-
-	@Test // DATAMONGO-1444
-	public void observableRxJava1QueryMethodShouldWork() {
-
-		rxJava1PersonRepostitory.findByLastname(boyd.getLastname()) //
-				.test() //
-				.awaitTerminalEvent() //
-				.assertValue(boyd) //
-				.assertNoErrors() //
-				.assertCompleted() //
-				.getOnNextEvents();
-	}
+	@Test // DATAMONGO-2558
+	public void simpleRxJava3MethodsShouldWork() throws InterruptedException {
 
-	@Test // DATAMONGO-1610
-	public void simpleRxJava2MethodsShouldWork() {
+		TestObserver<Boolean> testObserver = rxJava3PersonRepostitory.existsById(dave.getId()).test();
 
-		TestObserver<Boolean> testObserver = rxJava2PersonRepostitory.existsById(dave.getId()).test();
-
-		testObserver.awaitTerminalEvent();
+		testObserver.await();
 		testObserver.assertComplete();
 		testObserver.assertNoErrors();
 		testObserver.assertValue(true);
 	}
 
-	@Test // DATAMONGO-1610
-	public void existsWithSingleRxJava2IdMethodsShouldWork() {
+	@Test // DATAMONGO-2558
+	public void existsWithSingleRxJava3IdMethodsShouldWork() throws InterruptedException {
 
-		TestObserver<Boolean> testObserver = rxJava2PersonRepostitory.existsById(io.reactivex.Single.just(dave.getId()))
+		TestObserver<Boolean> testObserver = rxJava3PersonRepostitory.existsById(Single.just(dave.getId()))
 				.test();
 
-		testObserver.awaitTerminalEvent();
+		testObserver.await();
 		testObserver.assertComplete();
 		testObserver.assertNoErrors();
 		testObserver.assertValue(true);
 	}
 
-	@Test // DATAMONGO-1610
-	public void flowableRxJava2QueryMethodShouldWork() {
+	@Test // DATAMONGO-2558
+	public void flowableRxJava3QueryMethodShouldWork() throws InterruptedException {
 
-		io.reactivex.subscribers.TestSubscriber<ReactivePerson> testSubscriber = rxJava2PersonRepostitory
+		TestSubscriber<ReactivePerson> testSubscriber = rxJava3PersonRepostitory
 				.findByFirstnameAndLastname(dave.getFirstname(), dave.getLastname()).test();
 
-		testSubscriber.awaitTerminalEvent();
+		testSubscriber.await();
 		testSubscriber.assertComplete();
 		testSubscriber.assertNoErrors();
 		testSubscriber.assertValue(dave);
 	}
 
-	@Test // DATAMONGO-1610
-	public void singleProjectedRxJava2QueryMethodShouldWork() {
+	@Test // DATAMONGO-2558
+	public void singleProjectedRxJava3QueryMethodShouldWork() throws InterruptedException {
 
-		TestObserver<ProjectedPerson> testObserver = rxJava2PersonRepostitory
-				.findProjectedByLastname(Maybe.just(carter.getLastname())).test();
+		io.reactivex.rxjava3.observers.TestObserver<ProjectedPerson> testObserver = rxJava3PersonRepostitory
+				.findProjectedByLastname(io.reactivex.rxjava3.core.Maybe.just(carter.getLastname())).test();
 
-		testObserver.awaitTerminalEvent();
+		testObserver.await();
 		testObserver.assertComplete();
 		testObserver.assertNoErrors();
 
@@ -210,13 +150,13 @@ public void singleProjectedRxJava2QueryMethodShouldWork() {
 		});
 	}
 
-	@Test // DATAMONGO-1610
-	public void observableProjectedRxJava2QueryMethodShouldWork() {
+	@Test // DATAMONGO-2558
+	public void observableProjectedRxJava3QueryMethodShouldWork() throws InterruptedException {
 
-		TestObserver<ProjectedPerson> testObserver = rxJava2PersonRepostitory
-				.findProjectedByLastname(Single.just(carter.getLastname())).test();
+		io.reactivex.rxjava3.observers.TestObserver<ProjectedPerson> testObserver = rxJava3PersonRepostitory
+				.findProjectedByLastname(io.reactivex.rxjava3.core.Single.just(carter.getLastname())).test();
 
-		testObserver.awaitTerminalEvent();
+		testObserver.await();
 		testObserver.assertComplete();
 		testObserver.assertNoErrors();
 
@@ -226,28 +166,29 @@ public void observableProjectedRxJava2QueryMethodShouldWork() {
 		});
 	}
 
-	@Test // DATAMONGO-1610
-	public void maybeRxJava2QueryMethodShouldWork() {
+	@Test // DATAMONGO-2558
+	public void maybeRxJava3QueryMethodShouldWork() throws InterruptedException {
 
-		TestObserver<ReactivePerson> testObserver = rxJava2PersonRepostitory.findByLastname(boyd.getLastname()).test();
+		io.reactivex.rxjava3.observers.TestObserver<ReactivePerson> testObserver = rxJava3PersonRepostitory
+				.findByLastname(boyd.getLastname()).test();
 
-		testObserver.awaitTerminalEvent();
+		testObserver.await();
 		testObserver.assertComplete();
 		testObserver.assertNoErrors();
 		testObserver.assertValue(boyd);
 	}
 
-	@Test // DATAMONGO-1444
-	public void mixedRepositoryShouldWork() {
-
-		reactiveRepository.findByLastname(boyd.getLastname()) //
-				.test() //
-				.awaitTerminalEvent() //
-				.assertValue(boyd) //
-				.assertNoErrors() //
-				.assertCompleted() //
-				.getOnNextEvents();
-	}
+//	@Test // DATAMONGO-1444
+//	public void mixedRepositoryShouldWork() {
+//
+//		reactiveRepository.findByLastname(boyd.getLastname()) //
+//				.test() //
+//				.awaitTerminalEvent() //
+//				.assertValue(boyd) //
+//				.assertNoErrors() //
+//				.assertCompleted() //
+//				.getOnNextEvents();
+//	}
 
 	@Test // DATAMONGO-1444
 	public void shouldFindOneBySingleOfLastName() {
@@ -266,53 +207,40 @@ public void shouldFindByObservableOfLastNameIn() {
 				.verifyComplete();
 	}
 
-	@Test // DATAMONGO-1444
-	public void shouldFindByPublisherOfLastNameInAndAgeGreater() {
-
-		List<ReactivePerson> people = reactiveRepository
-				.findByLastnameInAndAgeGreaterThan(Flux.just(carter.getLastname(), dave.getLastname()), 41).test() //
-				.awaitTerminalEvent() //
-				.assertValueCount(2) //
-				.assertNoErrors() //
-				.assertCompleted() //
-				.getOnNextEvents();
-
-		assertThat(people).contains(carter, dave);
-	}
-
-	@Repository
-	interface ReactivePersonRepostitory extends ReactiveSortingRepository<ReactivePerson, String> {
+//	@Test // DATAMONGO-1444
+//	public void shouldFindByPublisherOfLastNameInAndAgeGreater() {
+//
+//		List<ReactivePerson> people = reactiveRepository
+//				.findByLastnameInAndAgeGreaterThan(Flux.just(carter.getLastname(), dave.getLastname()), 41).test() //
+//				.awaitTerminalEvent() //
+//				.assertValueCount(2) //
+//				.assertNoErrors() //
+//				.assertCompleted() //
+//				.getOnNextEvents();
+//
+//		assertThat(people).contains(carter, dave);
+//	}
+
+interface ReactivePersonRepostitory
+		extends ReactiveCrudRepository<ReactivePerson, String>, ReactiveSortingRepository<ReactivePerson, String> {
 
 		Publisher<ReactivePerson> findByLastname(String lastname);
 	}
 
-	@Repository
-	interface RxJava1PersonRepostitory extends org.springframework.data.repository.Repository<ReactivePerson, String> {
-
-		Observable<ReactivePerson> findByFirstnameAndLastname(String firstname, String lastname);
+	interface RxJava3PersonRepostitory
+			extends RxJava3CrudRepository<ReactivePerson, String>, RxJava3SortingRepository<ReactivePerson, String> {
 
-		Single<ReactivePerson> findByLastname(String lastname);
+		io.reactivex.rxjava3.core.Flowable<ReactivePerson> findByFirstnameAndLastname(String firstname, String lastname);
 
-		Single<ProjectedPerson> findProjectedByLastname(String lastname);
+		io.reactivex.rxjava3.core.Maybe<ReactivePerson> findByLastname(String lastname);
 
-		Single<Boolean> existsById(String id);
+		io.reactivex.rxjava3.core.Single<ProjectedPerson> findProjectedByLastname(
+				io.reactivex.rxjava3.core.Maybe<String> lastname);
 
-		Single<Boolean> existsById(Single<String> id);
+		io.reactivex.rxjava3.core.Observable<ProjectedPerson> findProjectedByLastname(
+				io.reactivex.rxjava3.core.Single<String> lastname);
 	}
 
-	@Repository
-	interface RxJava2PersonRepostitory extends RxJava2SortingRepository<ReactivePerson, String> {
-
-		Flowable<ReactivePerson> findByFirstnameAndLastname(String firstname, String lastname);
-
-		Maybe<ReactivePerson> findByLastname(String lastname);
-
-		io.reactivex.Single<ProjectedPerson> findProjectedByLastname(Maybe<String> lastname);
-
-		io.reactivex.Observable<ProjectedPerson> findProjectedByLastname(Single<String> lastname);
-	}
-
-	@Repository
 	interface MixedReactivePersonRepostitory extends ReactiveMongoRepository<ReactivePerson, String> {
 
 		Single<ReactivePerson> findByLastname(String lastname);
@@ -327,8 +255,6 @@ interface MixedReactivePersonRepostitory extends ReactiveMongoRepository<Reactiv
 	}
 
 	@Document
-	@Data
-	@NoArgsConstructor
 	static class ReactivePerson {
 
 		@Id String id;
@@ -337,12 +263,69 @@ static class ReactivePerson {
 		String lastname;
 		int age;
 
+		public ReactivePerson() {}
+
 		public ReactivePerson(String firstname, String lastname, int age) {
 
 			this.firstname = firstname;
 			this.lastname = lastname;
 			this.age = age;
 		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public int getAge() {
+			return this.age;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
+			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
+			this.lastname = lastname;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ReactivePerson that = (ReactivePerson) o;
+			return age == that.age && Objects.equals(id, that.id) && Objects.equals(firstname, that.firstname)
+					&& Objects.equals(lastname, that.lastname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname, age);
+		}
+
+		public String toString() {
+			return "ConvertingReactiveMongoRepositoryTests.ReactivePerson(id=" + this.getId() + ", firstname="
+					+ this.getFirstname() + ", lastname=" + this.getLastname() + ", age=" + this.getAge() + ")";
+		}
 	}
 
 	interface ProjectedPerson {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Credentials.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Credentials.java
index ab560ef4c6..24d894625c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Credentials.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Credentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,7 +16,6 @@
 package org.springframework.data.mongodb.repository;
 
 /**
- *
  * @author Oliver Gierke
  */
 public interface Credentials {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MongoRepositoryTextSearchIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MongoRepositoryTextSearchIntegrationTests.java
index 25ff2e9dd1..e0c2caee31 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MongoRepositoryTextSearchIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MongoRepositoryTextSearchIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,35 +20,27 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.index.TextIndexDefinition.TextIndexDefinitionBuilder;
 import org.springframework.data.mongodb.core.index.TextIndexed;
 import org.springframework.data.mongodb.core.mapping.TextScore;
 import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.util.Version;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.util.ClassUtils;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
 import org.springframework.util.ObjectUtils;
 
-import com.mongodb.client.MongoClient;
-
 /**
  * Integration tests for text searches on repository.
  *
@@ -56,11 +48,8 @@
  * @author Oliver Gierke
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class MongoRepositoryTextSearchIntegrationTests {
-
-	public static @ClassRule MongoVersionRule versionRule = MongoVersionRule.atLeast(new Version(2, 6, 0));
+@ExtendWith(MongoTemplateExtension.class)
+class MongoRepositoryTextSearchIntegrationTests {
 
 	private static final FullTextDocument PASSENGER_57 = new FullTextDocument("1", "Passenger 57",
 			"Passenger 57 is an action film that stars Wesley Snipes and Bruce Payne.");
@@ -69,24 +58,25 @@ public class MongoRepositoryTextSearchIntegrationTests {
 	private static final FullTextDocument DROP_ZONE = new FullTextDocument("3", "Drop Zone",
 			"Drop Zone is an action film featuring Wesley Snipes and Gary Busey.");
 
-	@Autowired MongoTemplate template;
-	FullTextRepository repo;
+	@Template(initialEntitySet = FullTextDocument.class) //
+	private static MongoTestTemplate template;
 
-	@Before
-	public void setUp() {
+	private FullTextRepository repo = new MongoRepositoryFactory(this.template).getRepository(FullTextRepository.class);
+
+	@BeforeEach
+	void setUp() {
 
 		template.indexOps(FullTextDocument.class)
 				.ensureIndex(new TextIndexDefinitionBuilder().onField("title").onField("content").build());
-		this.repo = new MongoRepositoryFactory(this.template).getRepository(FullTextRepository.class);
 	}
 
-	@After
-	public void tearDown() {
-		template.dropCollection(FullTextDocument.class);
+	@AfterEach
+	void tearDown() {
+		template.flush();
 	}
 
 	@Test // DATAMONGO-973
-	public void findAllByTextCriteriaShouldReturnMatchingDocuments() {
+	void findAllByTextCriteriaShouldReturnMatchingDocuments() {
 
 		initRepoWithDefaultDocuments();
 
@@ -97,7 +87,7 @@ public void findAllByTextCriteriaShouldReturnMatchingDocuments() {
 	}
 
 	@Test // DATAMONGO-973
-	public void derivedFinderWithTextCriteriaReturnsCorrectResult() {
+	void derivedFinderWithTextCriteriaReturnsCorrectResult() {
 
 		initRepoWithDefaultDocuments();
 		FullTextDocument blade = new FullTextDocument("4", "Blade",
@@ -113,7 +103,7 @@ public void derivedFinderWithTextCriteriaReturnsCorrectResult() {
 	}
 
 	@Test // DATAMONGO-973
-	public void findByWithPaginationWorksCorrectlyWhenUsingTextCriteria() {
+	void findByWithPaginationWorksCorrectlyWhenUsingTextCriteria() {
 
 		initRepoWithDefaultDocuments();
 
@@ -127,7 +117,7 @@ public void findByWithPaginationWorksCorrectlyWhenUsingTextCriteria() {
 	}
 
 	@Test // DATAMONGO-973
-	public void findAllByTextCriteriaWithSortWorksCorrectly() {
+	void findAllByTextCriteriaWithSortWorksCorrectly() {
 
 		initRepoWithDefaultDocuments();
 		FullTextDocument snipes = new FullTextDocument("4", "Snipes", "Wesley Trent Snipes is an actor and film producer.");
@@ -141,7 +131,7 @@ public void findAllByTextCriteriaWithSortWorksCorrectly() {
 	}
 
 	@Test // DATAMONGO-973
-	public void findByWithSortByScoreViaPageRequestTriggersSortingCorrectly() {
+	void findByWithSortByScoreViaPageRequestTriggersSortingCorrectly() {
 
 		initRepoWithDefaultDocuments();
 		FullTextDocument snipes = new FullTextDocument("4", "Snipes", "Wesley Trent Snipes is an actor and film producer.");
@@ -155,7 +145,7 @@ public void findByWithSortByScoreViaPageRequestTriggersSortingCorrectly() {
 	}
 
 	@Test // DATAMONGO-973
-	public void findByWithSortViaPageRequestIgnoresTextScoreWhenSortedByOtherProperty() {
+	void findByWithSortViaPageRequestIgnoresTextScoreWhenSortedByOtherProperty() {
 
 		initRepoWithDefaultDocuments();
 		FullTextDocument snipes = new FullTextDocument("4", "Snipes", "Wesley Trent Snipes is an actor and film producer.");
@@ -169,7 +159,7 @@ public void findByWithSortViaPageRequestIgnoresTextScoreWhenSortedByOtherPropert
 	}
 
 	@Test // DATAMONGO-973
-	public void derivedSortForTextScorePropertyWorksCorrectly() {
+	void derivedSortForTextScorePropertyWorksCorrectly() {
 
 		initRepoWithDefaultDocuments();
 		FullTextDocument snipes = new FullTextDocument("4", "Snipes", "Wesley Trent Snipes is an actor and film producer.");
@@ -180,34 +170,20 @@ public void derivedSortForTextScorePropertyWorksCorrectly() {
 		assertThat(result.get(0)).isEqualTo(snipes);
 	}
 
-	@Test // DATAMONGO-973
-	public void derivedFinderMethodWithoutFullTextShouldNoCauseTroubleWhenHavingEntityWithTextScoreProperty() {
+	@Test // DATAMONGO-973, DATAMONGO-2516
+	void derivedFinderMethodWithoutFullTextShouldNoCauseTroubleWhenHavingEntityWithTextScoreProperty() {
 
 		initRepoWithDefaultDocuments();
 		List<FullTextDocument> result = repo.findByTitle(DROP_ZONE.getTitle());
+
 		assertThat(result.get(0)).isEqualTo(DROP_ZONE);
-		assertThat(result.get(0).score).isEqualTo(0.0F);
+		assertThat(result.get(0).score).isNull();
 	}
 
 	private void initRepoWithDefaultDocuments() {
 		repo.saveAll(Arrays.asList(PASSENGER_57, DEMOLITION_MAN, DROP_ZONE));
 	}
 
-	@org.springframework.context.annotation.Configuration
-	public static class Configuration extends AbstractMongoClientConfiguration {
-
-		@Override
-		protected String getDatabaseName() {
-			return ClassUtils.getShortNameAsProperty(MongoRepositoryTextSearchIntegrationTests.class);
-		}
-
-		@Override
-		public MongoClient mongoClient() {
-			return MongoTestUtils.client();
-		}
-
-	}
-
 	static class FullTextDocument {
 
 		private @Id String id;
@@ -257,7 +233,7 @@ public int hashCode() {
 		}
 
 		@Override
-		public boolean equals(Object obj) {
+		public boolean equals(@Nullable Object obj) {
 			if (this == obj) {
 				return true;
 			}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MyId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MyId.java
index 93b302e0e7..4e589d5892 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MyId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/MyId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,6 +17,7 @@
 
 import java.io.Serializable;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.util.ObjectUtils;
 
 /**
@@ -42,7 +43,7 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (obj == this) {
 			return true;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java
index 9231de1767..eeca60bc3e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/Person.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author 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,13 +21,16 @@
 import java.util.Set;
 import java.util.UUID;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexed;
 import org.springframework.data.mongodb.core.index.Indexed;
 import org.springframework.data.mongodb.core.mapping.DBRef;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.mapping.DocumentReference;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.Unwrapped;
 
 /**
  * Sample domain class.
@@ -46,7 +49,7 @@ public enum Sex {
 
 	private String firstname;
 	private String lastname;
-	@Indexed(unique = true, dropDups = true) private String email;
+	@Indexed(unique = true) private String email;
 	private Integer age;
 	@SuppressWarnings("unused") private Sex sex;
 	Date createdAt;
@@ -70,6 +73,13 @@ public enum Sex {
 
 	Credentials credentials;
 
+	@Unwrapped.Nullable(prefix = "u") //
+	User unwrappedUser;
+
+	@DocumentReference User spiritAnimal;
+
+	int visits;
+
 	public Person() {
 
 		this(null, null);
@@ -257,13 +267,16 @@ public void setCoworker(User coworker) {
 		this.coworker = coworker;
 	}
 
-	/*
-	* (non-Javadoc)
-	*
-	* @see java.lang.Object#equals(java.lang.Object)
-	*/
+	public int getVisits() {
+		return visits;
+	}
+
+	public void setVisits(int visits) {
+		this.visits = visits;
+	}
+
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (this == obj) {
 			return true;
@@ -296,11 +309,22 @@ public List<String> getSkills() {
 		return skills;
 	}
 
-	/*
-	* (non-Javadoc)
-	*
-	* @see java.lang.Object#hashCode()
-	*/
+	public User getUnwrappedUser() {
+		return unwrappedUser;
+	}
+
+	public void setUnwrappedUser(User unwrappedUser) {
+		this.unwrappedUser = unwrappedUser;
+	}
+
+	public User getSpiritAnimal() {
+		return spiritAnimal;
+	}
+
+	public void setSpiritAnimal(User spiritAnimal) {
+		this.spiritAnimal = spiritAnimal;
+	}
+
 	@Override
 	public int hashCode() {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonAggregate.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonAggregate.java
index 69dfb97990..da22801ba6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonAggregate.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonAggregate.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,34 +15,61 @@
  */
 package org.springframework.data.mongodb.repository;
 
-import lombok.Value;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.List;
+import java.util.Objects;
 import java.util.Set;
 
 import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.PersistenceConstructor;
+import org.springframework.data.annotation.PersistenceCreator;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@Value
-class PersonAggregate {
+final class PersonAggregate {
+
+	@Id private final String lastname;
+	private final Set<String> names;
 
-	@Id private String lastname;
-	private Set<String> names;
+	public PersonAggregate(String lastname, String name) {
+		this(lastname, Collections.singletonList(name));
+	}
 
-	@PersistenceConstructor
+	@PersistenceCreator
 	public PersonAggregate(String lastname, Collection<String> names) {
+
 		this.lastname = lastname;
 		this.names = new HashSet<>(names);
 	}
 
-	public PersonAggregate(String lastname, String name) {
-		this(lastname, Collections.singletonList(name));
+	public String getLastname() {
+		return this.lastname;
+	}
+
+	public Set<String> getNames() {
+		return this.names;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		PersonAggregate that = (PersonAggregate) o;
+		return Objects.equals(lastname, that.lastname) && Objects.equals(names, that.names);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(lastname, names);
+	}
+
+	public String toString() {
+		return "PersonAggregate(lastname=" + this.getLastname() + ", names=" + this.getNames() + ")";
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonExcerpt.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonExcerpt.java
index a94608f7ef..e531af2212 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonExcerpt.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonExcerpt.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java
index 009a0f63d1..1f4f682ebc 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,11 +23,16 @@
 import java.util.regex.Pattern;
 import java.util.stream.Stream;
 
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.domain.ScrollPosition;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.Box;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
@@ -36,10 +41,10 @@
 import org.springframework.data.geo.Point;
 import org.springframework.data.geo.Polygon;
 import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.repository.Person.Sex;
 import org.springframework.data.querydsl.QuerydslPredicateExecutor;
 import org.springframework.data.repository.query.Param;
-import org.springframework.lang.Nullable;
 
 /**
  * Sample repository managing {@link Person} entities.
@@ -114,7 +119,30 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	List<Person> findByAgeLessThan(int age, Sort sort);
 
 	/**
-	 * Returns a page of {@link Person}s with a lastname mathing the given one (*-wildcards supported).
+	 * Returns a scroll of {@link Person}s with a lastname matching the given one (*-wildcards supported).
+	 *
+	 * @param lastname
+	 * @param scrollPosition
+	 * @return
+	 */
+	Window<Person> findTop2ByLastnameLikeOrderByLastnameAscFirstnameAsc(String lastname,
+			ScrollPosition scrollPosition);
+
+	Window<Person> findByLastnameLikeOrderByLastnameAscFirstnameAsc(String lastname,
+			ScrollPosition scrollPosition, Limit limit);
+
+	/**
+	 * Returns a scroll of {@link Person}s applying projections with a lastname matching the given one (*-wildcards
+	 * supported).
+	 *
+	 * @param lastname
+	 * @param pageable
+	 * @return
+	 */
+	Window<PersonSummaryDto> findCursorProjectionByLastnameLike(String lastname, Pageable pageable);
+
+	/**
+	 * Returns a page of {@link Person}s with a lastname matching the given one (*-wildcards supported).
 	 *
 	 * @param lastname
 	 * @param pageable
@@ -122,9 +150,13 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	 */
 	Page<Person> findByLastnameLike(String lastname, Pageable pageable);
 
+	List<Person> findByLastnameLike(String lastname, Sort sort, Limit limit);
+
 	@Query("{ 'lastname' : { '$regex' : '?0', '$options' : 'i'}}")
 	Page<Person> findByLastnameLikeWithPageable(String lastname, Pageable pageable);
 
+	List<Person> findByLastnameIgnoreCaseIn(String... lastname);
+
 	/**
 	 * Returns all {@link Person}s with a firstname contained in the given varargs.
 	 *
@@ -264,6 +296,9 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	// DATAMONGO-566
 	Long deletePersonByLastname(String lastname);
 
+	// DATAMONGO-1997
+	Optional<Person> deleteOptionalByLastname(String lastname);
+
 	// DATAMONGO-566
 	@Query(value = "{ 'lastname' : ?0 }", delete = true)
 	List<Person> removeByLastnameUsingAnnotatedQuery(String lastname);
@@ -302,6 +337,8 @@ Page<Person> findByCustomQueryLastnameAndAddressStreetInList(String lastname, Li
 	// DATAMONGO-1030
 	PersonSummaryDto findSummaryByLastname(String lastname);
 
+	PersonSummaryWithOptional findSummaryWithOptionalByLastname(String lastname);
+
 	@Query("{ ?0 : ?1 }")
 	List<Person> findByKeyValue(String key, String value);
 
@@ -361,6 +398,9 @@ Page<Person> findByCustomQueryLastnameAndAddressStreetInList(String lastname, Li
 	@Query(value = "{ 'id' : ?0 }", fields = "{ 'fans': { '$slice': [ ?1, ?2 ] } }")
 	Person findWithSliceInProjection(String id, int skip, int limit);
 
+	@Query(value = "{ 'id' : ?0 }", fields = "{ 'firstname': { '$toUpper': '$firstname' } }")
+	Person findWithAggregationInProjection(String id);
+
 	@Query(value = "{ 'shippingAddresses' : { '$elemMatch' : { 'city' : { '$eq' : 'lnz' } } } }",
 			fields = "{ 'shippingAddresses.$': ?0 }")
 	Person findWithArrayPositionInProjection(int position);
@@ -371,9 +411,18 @@ Page<Person> findByCustomQueryLastnameAndAddressStreetInList(String lastname, Li
 	@Aggregation("{ '$project': { '_id' : '$lastname' } }")
 	List<String> findAllLastnames();
 
+	@Aggregation("{ '$project': { '_id' : '$lastname' } }")
+	Stream<String> findAllLastnamesAsStream();
+
+	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
+	Stream<PersonAggregate> groupStreamByLastnameAnd(String property);
+
 	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
 	List<PersonAggregate> groupByLastnameAnd(String property);
 
+	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
+	Slice<PersonAggregate> groupByLastnameAndAsSlice(String property, Pageable pageable);
+
 	@Aggregation("{ '$group': { '_id' : '$lastname', names : { $addToSet : '$?0' } } }")
 	List<PersonAggregate> groupByLastnameAnd(String property, Sort sort);
 
@@ -389,6 +438,47 @@ Page<Person> findByCustomQueryLastnameAndAddressStreetInList(String lastname, Li
 	@Aggregation(pipeline = "{ '$group' : { '_id' : null, 'total' : { $sum: '$age' } } }")
 	AggregationResults<SumAge> sumAgeAndReturnAggregationResultWrapperWithConcreteType();
 
+	@Aggregation({
+		"{ '$match' :  { 'lastname' :  'Matthews'} }",
+		"{ '$project': { _id : 0, firstname : 1, lastname : 1 } }"
+	})
+	Iterable<PersonSummary> findAggregatedClosedInterfaceProjectionBy();
+
 	@Query(value = "{_id:?0}")
 	Optional<org.bson.Document> findDocumentById(String id);
+
+	@Query(value = "{ 'firstname' : ?0, 'lastname' : ?1, 'email' : ?2 , 'age' : ?3, 'sex' : ?4, "
+			+ "'createdAt' : ?5, 'skills' : ?6, 'address.street' : ?7, 'address.zipCode' : ?8, " //
+			+ "'address.city' : ?9, 'uniqueId' : ?10, 'credentials.username' : ?11, 'credentials.password' : ?12 }")
+	Person findPersonByManyArguments(String firstname, String lastname, String email, Integer age, Sex sex,
+			Date createdAt, List<String> skills, String street, String zipCode, //
+			String city, UUID uniqueId, String username, String password);
+
+	List<Person> findByUnwrappedUserUsername(String username);
+
+	List<Person> findByUnwrappedUser(User user);
+
+	int findAndUpdateViaMethodArgAllByLastname(String lastname, UpdateDefinition update);
+
+	@Update("{ '$inc' : { 'visits' : ?1 } }")
+	int findAndIncrementVisitsByLastname(String lastname, int increment);
+
+	@Query("{ 'lastname' : ?0 }")
+	@Update("{ '$inc' : { 'visits' : ?1 } }")
+	int updateAllByLastname(String lastname, int increment);
+
+	@Update(pipeline = { "{ '$set' : { 'visits' : { '$add' : [ '$visits', ?1 ] } } }" })
+	void findAndIncrementVisitsViaPipelineByLastname(String lastname, int increment);
+
+	@Update("{ '$inc' : { 'visits' : ?#{[1]} } }")
+	int findAndIncrementVisitsUsingSpELByLastname(String lastname, int increment);
+
+	@Update("{ '$push' : { 'shippingAddresses' : ?1 } }")
+	int findAndPushShippingAddressByEmail(String email, Address address);
+
+	@Query("{ 'age' : null }")
+	Person findByQueryWithNullEqualityCheck();
+
+	List<Person> findBySpiritAnimal(User user);
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java
index 877e22ec8e..c407d76276 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryLazyLoadingIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryLazyLoadingIntegrationTests.java
index 51e567e353..f94a52e916 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryLazyLoadingIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryLazyLoadingIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,14 +22,15 @@
 import java.util.Arrays;
 import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.DisabledForJreRange;
+import org.junit.jupiter.api.condition.JRE;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Integration test for {@link PersonRepository} for lazy loading support.
@@ -38,13 +39,13 @@
  * @author Oliver Gierke
  */
 @ContextConfiguration(locations = "PersonRepositoryIntegrationTests-context.xml")
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 public class PersonRepositoryLazyLoadingIntegrationTests {
 
 	@Autowired PersonRepository repository;
 	@Autowired MongoOperations operations;
 
-	@Before
+	@BeforeEach
 	public void setUp() throws InterruptedException {
 
 		repository.deleteAll();
@@ -61,7 +62,6 @@ public void shouldLoadAssociationWithDbRefOnInterfaceAndLazyLoadingEnabled() thr
 		Person person = new Person();
 		person.setFirstname("Oliver");
 		person.setFans(Arrays.asList(thomas));
-		person.setRealFans(new ArrayList<User>(Arrays.asList(thomas)));
 		repository.save(person);
 
 		Person oliver = repository.findById(person.id).get();
@@ -75,7 +75,8 @@ public void shouldLoadAssociationWithDbRefOnInterfaceAndLazyLoadingEnabled() thr
 	}
 
 	@Test // DATAMONGO-348
-	public void shouldLoadAssociationWithDbRefOnConcreteCollectionAndLazyLoadingEnabled() throws Exception {
+	@DisabledForJreRange(min = JRE.JAVA_16, disabledReason = "Class Proxies for eg; ArrayList require to open java.util.")
+	public void shouldLoadAssociationWithDbRefOnConcreteCollectionAndLazyLoadingEnabled() {
 
 		User thomas = new User();
 		thomas.username = "Thomas";
@@ -83,7 +84,6 @@ public void shouldLoadAssociationWithDbRefOnConcreteCollectionAndLazyLoadingEnab
 
 		Person person = new Person();
 		person.setFirstname("Oliver");
-		person.setFans(Arrays.asList(thomas));
 		person.setRealFans(new ArrayList<User>(Arrays.asList(thomas)));
 		repository.save(person);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryTransactionalTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryTransactionalTests.java
index ac8b475d15..b2b350dc4d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryTransactionalTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepositoryTransactionalTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,34 +19,36 @@
 import static org.springframework.data.mongodb.test.util.MongoTestUtils.*;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.ClassRule;
-import org.junit.Test;
-import org.junit.rules.RuleChain;
-import org.junit.runner.RunWith;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.domain.Persistable;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.MongoTransactionManager;
 import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 import org.springframework.data.mongodb.test.util.AfterTransactionAssertion;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.Version;
-import org.springframework.lang.Nullable;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.ReplSetClient;
 import org.springframework.test.annotation.Rollback;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.transaction.AfterTransaction;
 import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,23 +63,22 @@
  * @author Christoph Strobl
  * @currentRead Shadow's Edge - Brent Weeks
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
+@EnableIfReplicaSetAvailable
+@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 @Transactional(transactionManager = "txManager")
 public class PersonRepositoryTransactionalTests {
 
-	public static @ClassRule RuleChain TEST_RULES = RuleChain.outerRule(MongoVersionRule.atLeast(Version.parse("3.7.3")))
-			.around(ReplicaSet.required());
-
 	static final String DB_NAME = "repository-tx-tests";
+	static @ReplSetClient MongoClient mongoClient;
 
 	@Configuration
-	@EnableMongoRepositories
+	@EnableMongoRepositories(includeFilters=@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = PersonRepository.class))
 	static class Config extends AbstractMongoClientConfiguration {
 
 		@Bean
 		public MongoClient mongoClient() {
-			return MongoTestUtils.replSetClient();
+			return mongoClient;
 		}
 
 		@Override
@@ -86,9 +87,14 @@ protected String getDatabaseName() {
 		}
 
 		@Bean
-		MongoTransactionManager txManager(MongoDbFactory dbFactory) {
+		MongoTransactionManager txManager(MongoDatabaseFactory dbFactory) {
 			return new MongoTransactionManager(dbFactory);
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return Collections.singleton(Person.class);
+		}
 	}
 
 	@Autowired MongoClient client;
@@ -101,7 +107,7 @@ MongoTransactionManager txManager(MongoDbFactory dbFactory) {
 
 	List<AfterTransactionAssertion<? extends Persistable<?>>> assertionList;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		assertionList = new CopyOnWriteArrayList<>();
 	}
@@ -110,6 +116,7 @@ public void setUp() {
 	public void beforeTransaction() {
 
 		createOrReplaceCollection(DB_NAME, template.getCollectionName(Person.class), client);
+		createOrReplaceCollection(DB_NAME, template.getCollectionName(User.class), client);
 
 		durzo = new Person("Durzo", "Blint", 700);
 		kylar = new Person("Kylar", "Stern", 21);
@@ -175,13 +182,31 @@ public void shouldHonorRollback() {
 		assertAfterTransaction(hu).isNotPresent();
 	}
 
+	@Test // DATAMONGO-2490
+	public void shouldBeAbleToReadDbRefDuringTransaction() {
+
+		User rat = new User();
+		rat.setUsername("rat");
+
+		template.save(rat);
+
+		Person elene = new Person("Elene", "Cromwyll", 18);
+		elene.setCoworker(rat);
+
+		repository.save(elene);
+
+		Optional<Person> loaded = repository.findById(elene.getId());
+		assertThat(loaded).isPresent();
+		assertThat(loaded.get().getCoworker()).isNotNull();
+		assertThat(loaded.get().getCoworker().getUsername()).isEqualTo(rat.getUsername());
+	}
+
 	private AfterTransactionAssertion assertAfterTransaction(Person person) {
 
 		AfterTransactionAssertion assertion = new AfterTransactionAssertion<>(new Persistable<Object>() {
 
-			@Nullable
 			@Override
-			public Object getId() {
+			public @Nullable Object getId() {
 				return person.id;
 			}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummary.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummary.java
index b64deeb95a..dd6378fc90 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummary.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummary.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummaryDto.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummaryDto.java
index d0e9c03114..621eb3e647 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummaryDto.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummaryDto.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package org.springframework.data.mongodb.repository;
 
+import java.util.Objects;
+
 /**
  * @author Oliver Gierke
  */
@@ -22,4 +24,32 @@ public class PersonSummaryDto {
 
 	String firstname;
 	String lastname;
+
+	public PersonSummaryDto() {}
+
+	public PersonSummaryDto(String firstname, String lastname) {
+		this.firstname = firstname;
+		this.lastname = lastname;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		PersonSummaryDto that = (PersonSummaryDto) o;
+		return Objects.equals(firstname, that.firstname) && Objects.equals(lastname, that.lastname);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(firstname, lastname);
+	}
+
+	public String toString() {
+		return "PersonSummaryDto(firstname=" + this.firstname + ", lastname=" + this.lastname + ")";
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummaryWithOptional.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummaryWithOptional.java
new file mode 100644
index 0000000000..317aea81bd
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonSummaryWithOptional.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2021-2025 the original author 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.repository;
+
+import java.util.Optional;
+
+public interface PersonSummaryWithOptional {
+
+	Optional<Address> getAddress();
+	Optional<String> getFirstname();
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveMongoRepositoryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveMongoRepositoryTests.java
index e5c9574ba2..2a76c0ba6c 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveMongoRepositoryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveMongoRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,27 +16,32 @@
 package org.springframework.data.mongodb.repository;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.springframework.data.domain.Sort.Direction.*;
+import static org.springframework.data.mongodb.core.query.Criteria.*;
+import static org.springframework.data.mongodb.core.query.Query.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
 import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import reactor.core.Disposable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
 
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.reactivestreams.Publisher;
+
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
@@ -44,57 +49,56 @@
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.ScrollPosition;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.domain.Window;
 import org.springframework.data.geo.Circle;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
-import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.CollectionOptions;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.repository.Person.Sex;
 import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactory;
 import org.springframework.data.mongodb.repository.support.SimpleReactiveMongoRepository;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension.DirtiesState;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension.ProvidesState;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
 import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
 import org.springframework.data.repository.Repository;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.mongodb.reactivestreams.client.MongoClient;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 /**
  * Test for {@link ReactiveMongoRepository} query methods.
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class ReactiveMongoRepositoryTests {
+@ExtendWith({ SpringExtension.class, DirtiesStateExtension.class })
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class ReactiveMongoRepositoryTests implements DirtiesStateExtension.StateFunctions {
 
+	private static final int PERSON_COUNT = 7;
 	@Autowired ReactiveMongoTemplate template;
 
 	@Autowired ReactivePersonRepository repository;
 	@Autowired ReactiveContactRepository contactRepository;
 	@Autowired ReactiveCappedCollectionRepository cappedRepository;
 
-	Person dave, oliver, carter, boyd, stefan, leroi, alicia;
-	QPerson person = QPerson.person;
+	private Person dave, oliver, carter, boyd, stefan, leroi, alicia;
+	private QPerson person = QPerson.person;
 
 	@Configuration
-	static class Config extends AbstractReactiveMongoConfiguration {
-
-		@Bean
-		@Override
-		public MongoClient reactiveMongoClient() {
-			return MongoTestUtils.reactiveClient();
-		}
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Override
 		protected String getDatabaseName() {
@@ -108,7 +112,6 @@ ReactiveMongoRepositoryFactory factory(ReactiveMongoOperations template, BeanFac
 			factory.setRepositoryBaseClass(SimpleReactiveMongoRepository.class);
 			factory.setBeanClassLoader(beanFactory.getClass().getClassLoader());
 			factory.setBeanFactory(beanFactory);
-			factory.setEvaluationContextProvider(QueryMethodEvaluationContextProvider.DEFAULT);
 
 			return factory;
 		}
@@ -127,19 +130,20 @@ ReactiveContactRepository reactiveContactRepository(ReactiveMongoRepositoryFacto
 		ReactiveCappedCollectionRepository reactiveCappedCollectionRepository(ReactiveMongoRepositoryFactory factory) {
 			return factory.getRepository(ReactiveCappedCollectionRepository.class);
 		}
-	}
-
-	@BeforeClass
-	public static void cleanDb() {
 
-		MongoClient client = MongoTestUtils.reactiveClient();
+		@Override
+		protected boolean autoIndexCreation() {
+			return true;
+		}
+	}
 
-		MongoTestUtils.createOrReplaceCollectionNow("reactive", "person", client);
-		MongoTestUtils.createOrReplaceCollectionNow("reactive", "capped", client);
+	@Override
+	public void clear() {
+		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 	}
 
-	@Before
-	public void setUp() throws Exception {
+	@Override
+	public void setupState() {
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
@@ -147,7 +151,11 @@ public void setUp() throws Exception {
 		oliver = new Person("Oliver August", "Matthews", 4);
 		carter = new Person("Carter", "Beauford", 49);
 		carter.setSkills(Arrays.asList("Drums", "percussion", "vocals"));
-		Thread.sleep(10);
+		try {
+			Thread.sleep(10);
+		} catch (InterruptedException e) {
+			throw new RuntimeException(e);
+		}
 		boyd = new Person("Boyd", "Tinsley", 45);
 		boyd.setSkills(Arrays.asList("Violin", "Electric Violin", "Viola", "Mandolin", "Vocals", "Guitar"));
 		stefan = new Person("Stefan", "Lessard", 34);
@@ -156,35 +164,35 @@ public void setUp() throws Exception {
 		alicia = new Person("Alicia", "Keys", 30, Sex.FEMALE);
 
 		repository.saveAll(Arrays.asList(oliver, carter, boyd, stefan, leroi, alicia, dave)).as(StepVerifier::create) //
-				.expectNextCount(7) //
+				.expectNextCount(PERSON_COUNT) //
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldFindByLastName() {
+	void shouldFindByLastName() {
 		repository.findByLastname(dave.getLastname()).as(StepVerifier::create).expectNextCount(2).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldFindOneByLastName() {
+	void shouldFindOneByLastName() {
 		repository.findOneByLastname(carter.getLastname()).as(StepVerifier::create).expectNext(carter).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldFindOneByPublisherOfLastName() {
+	void shouldFindOneByPublisherOfLastName() {
 		repository.findByLastname(Mono.just(carter.getLastname())).as(StepVerifier::create).expectNext(carter)
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldFindByPublisherOfLastNameIn() {
+	void shouldFindByPublisherOfLastNameIn() {
 		repository.findByLastnameIn(Flux.just(carter.getLastname(), dave.getLastname())).as(StepVerifier::create) //
 				.expectNextCount(3) //
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldFindByPublisherOfLastNameInAndAgeGreater() {
+	void shouldFindByPublisherOfLastNameInAndAgeGreater() {
 
 		repository.findByLastnameInAndAgeGreaterThan(Flux.just(carter.getLastname(), dave.getLastname()), 41)
 				.as(StepVerifier::create) //
@@ -193,7 +201,7 @@ public void shouldFindByPublisherOfLastNameInAndAgeGreater() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldFindUsingPublishersInStringQuery() {
+	void shouldFindUsingPublishersInStringQuery() {
 
 		repository.findStringQuery(Flux.just("Beauford", "Matthews"), Mono.just(41)).as(StepVerifier::create) //
 				.expectNextCount(2) //
@@ -201,7 +209,7 @@ public void shouldFindUsingPublishersInStringQuery() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldFindByLastNameAndSort() {
+	void shouldFindByLastNameAndSort() {
 
 		repository.findByLastname("Matthews", Sort.by(ASC, "age")).as(StepVerifier::create) //
 				.expectNext(oliver, dave) //
@@ -213,7 +221,7 @@ public void shouldFindByLastNameAndSort() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldUseTailableCursor() throws Exception {
+	void shouldUseTailableCursor() throws Exception {
 
 		template.dropCollection(Capped.class) //
 				.then(template.createCollection(Capped.class, //
@@ -238,7 +246,7 @@ public void shouldUseTailableCursor() throws Exception {
 	}
 
 	@Test // DATAMONGO-1444
-	public void shouldUseTailableCursorWithProjection() throws Exception {
+	void shouldUseTailableCursorWithProjection() throws Exception {
 
 		template.dropCollection(Capped.class) //
 				.then(template.createCollection(Capped.class, //
@@ -269,7 +277,7 @@ public void shouldUseTailableCursorWithProjection() throws Exception {
 	}
 
 	@Test // DATAMONGO-2080
-	public void shouldUseTailableCursorWithDtoProjection() {
+	void shouldUseTailableCursorWithDtoProjection() {
 
 		template.dropCollection(Capped.class) //
 				.then(template.createCollection(Capped.class, //
@@ -281,8 +289,39 @@ public void shouldUseTailableCursorWithDtoProjection() {
 		cappedRepository.findDtoProjectionByKey("value").as(StepVerifier::create).expectNextCount(1).thenCancel().verify();
 	}
 
+	@Test // GH-4308
+	void appliesScrollingCorrectly() {
+
+		Window<Person> scroll = repository
+				.findTop2ByLastnameLikeOrderByFirstnameAscLastnameAsc("*", ScrollPosition.keyset()).block();
+
+		assertThat(scroll).hasSize(2);
+		assertThat(scroll).containsSequence(alicia, boyd);
+		assertThat(scroll.isLast()).isFalse();
+
+		Window<Person> nextScroll = repository
+				.findTop2ByLastnameLikeOrderByFirstnameAscLastnameAsc("*", scroll.positionAt(scroll.size() - 1)).block();
+
+		assertThat(nextScroll).hasSize(2);
+		assertThat(nextScroll).containsSequence(carter, dave);
+		assertThat(nextScroll.isLast()).isFalse();
+	}
+
+	@Test // GH-4308
+	void appliesScrollingWithProjectionCorrectly() {
+
+		repository
+				.findCursorProjectionByLastnameLike("*", PageRequest.of(0, 2, Sort.by(Direction.ASC, "firstname", "lastname"))) //
+				.flatMapIterable(Function.identity()) //
+				.as(StepVerifier::create) //
+				.expectNext(new PersonSummaryDto(alicia.getFirstname(), alicia.getLastname())) //
+				.expectNextCount(1) //
+				.verifyComplete();
+	}
+
 	@Test // DATAMONGO-1444
-	public void findsPeopleByLocationWithinCircle() {
+	@DirtiesState
+	void findsPeopleByLocationWithinCircle() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
@@ -294,7 +333,8 @@ public void findsPeopleByLocationWithinCircle() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void findsPeopleByPageableLocationWithinCircle() {
+	@DirtiesState
+	void findsPeopleByPageableLocationWithinCircle() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
@@ -307,14 +347,15 @@ public void findsPeopleByPageableLocationWithinCircle() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void findsPeopleGeoresultByLocationWithinBox() {
+	@DirtiesState
+	void findsPeopleGeoresultByLocationWithinBox() {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
 		repository.save(dave).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 
 		repository.findByLocationNear(new Point(-73.99, 40.73), //
-				new Distance(2000, Metrics.KILOMETERS)).as(StepVerifier::create).consumeNextWith(actual -> {
+				Distance.of(2000, Metrics.KILOMETERS)).as(StepVerifier::create).consumeNextWith(actual -> {
 
 					assertThat(actual.getDistance().getValue()).isCloseTo(1, offset(1d));
 					assertThat(actual.getContent()).isEqualTo(dave);
@@ -322,7 +363,8 @@ public void findsPeopleGeoresultByLocationWithinBox() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void findsPeoplePageableGeoresultByLocationWithinBox() throws InterruptedException {
+	@DirtiesState
+	void findsPeoplePageableGeoresultByLocationWithinBox() throws InterruptedException {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
@@ -332,7 +374,7 @@ public void findsPeoplePageableGeoresultByLocationWithinBox() throws Interrupted
 		Thread.sleep(500);
 
 		repository.findByLocationNear(new Point(-73.99, 40.73), //
-				new Distance(2000, Metrics.KILOMETERS), //
+				Distance.of(2000, Metrics.KILOMETERS), //
 				PageRequest.of(0, 10)).as(StepVerifier::create) //
 				.consumeNextWith(actual -> {
 
@@ -342,7 +384,8 @@ public void findsPeoplePageableGeoresultByLocationWithinBox() throws Interrupted
 	}
 
 	@Test // DATAMONGO-1444
-	public void findsPeopleByLocationWithinBox() throws InterruptedException {
+	@DirtiesState
+	void findsPeopleByLocationWithinBox() throws InterruptedException {
 
 		Point point = new Point(-73.99171, 40.738868);
 		dave.setLocation(point);
@@ -352,29 +395,29 @@ public void findsPeopleByLocationWithinBox() throws InterruptedException {
 		Thread.sleep(500);
 
 		repository.findPersonByLocationNear(new Point(-73.99, 40.73), //
-				new Distance(2000, Metrics.KILOMETERS)).as(StepVerifier::create) //
+				Distance.of(2000, Metrics.KILOMETERS)).as(StepVerifier::create) //
 				.expectNext(dave) //
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1865
-	public void shouldErrorOnFindOneWithNonUniqueResult() {
+	void shouldErrorOnFindOneWithNonUniqueResult() {
 		repository.findOneByLastname(dave.getLastname()).as(StepVerifier::create)
 				.expectError(IncorrectResultSizeDataAccessException.class).verify();
 	}
 
 	@Test // DATAMONGO-1865
-	public void shouldReturnFirstFindFirstWithMoreResults() {
+	void shouldReturnFirstFindFirstWithMoreResults() {
 		repository.findFirstByLastname(dave.getLastname()).as(StepVerifier::create).expectNextCount(1).verifyComplete();
 	}
 
 	@Test // DATAMONGO-2030
-	public void shouldReturnExistsBy() {
+	void shouldReturnExistsBy() {
 		repository.existsByLastname(dave.getLastname()).as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1979
-	public void findAppliesAnnotatedSort() {
+	void findAppliesAnnotatedSort() {
 
 		repository.findByAgeGreaterThan(40).collectList().as(StepVerifier::create).consumeNextWith(result -> {
 			assertThat(result).containsSequence(carter, boyd, dave, leroi);
@@ -382,7 +425,7 @@ public void findAppliesAnnotatedSort() {
 	}
 
 	@Test // DATAMONGO-1979
-	public void findWithSortOverwritesAnnotatedSort() {
+	void findWithSortOverwritesAnnotatedSort() {
 
 		repository.findByAgeGreaterThan(40, Sort.by(Direction.ASC, "age")).collectList().as(StepVerifier::create)
 				.consumeNextWith(result -> {
@@ -391,11 +434,8 @@ public void findWithSortOverwritesAnnotatedSort() {
 	}
 
 	@Test // DATAMONGO-2181
-	public void considersRepositoryCollectionName() {
-
-		repository.deleteAll() //
-				.as(StepVerifier::create) //
-				.verifyComplete();
+	@ProvidesState
+	void considersRepositoryCollectionName() {
 
 		contactRepository.deleteAll() //
 				.as(StepVerifier::create) //
@@ -420,7 +460,7 @@ public void considersRepositoryCollectionName() {
 	}
 
 	@Test // DATAMONGO-2182
-	public void shouldFindPersonsWhenUsingQueryDslPerdicatedOnIdProperty() {
+	void shouldFindPersonsWhenUsingQueryDslPerdicatedOnIdProperty() {
 
 		repository.findAll(person.id.in(Arrays.asList(dave.id, carter.id))) //
 				.collectList() //
@@ -430,25 +470,40 @@ public void shouldFindPersonsWhenUsingQueryDslPerdicatedOnIdProperty() {
 				}).verifyComplete();
 	}
 
+	@Test // GH-4308
+	void shouldScrollWithId() {
+
+		List<Window<Person>> capture = new ArrayList<>();
+		repository.findBy(person.id.in(Arrays.asList(dave.id, carter.id, boyd.id)), //
+				q -> q.limit(2).sortBy(Sort.by("firstname")).scroll(ScrollPosition.keyset())) //
+				.as(StepVerifier::create) //
+				.recordWith(() -> capture).assertNext(actual -> {
+					assertThat(actual).hasSize(2).containsExactly(boyd, carter);
+				}).verifyComplete();
+
+		Window<Person> scroll = capture.get(0);
+
+		repository.findBy(person.id.in(Arrays.asList(dave.id, carter.id, boyd.id)), //
+				q -> q.limit(2).sortBy(Sort.by("firstname")).scroll(scroll.positionAt(scroll.size() - 1))) //
+				.as(StepVerifier::create) //
+				.recordWith(() -> capture).assertNext(actual -> {
+					assertThat(actual).containsOnly(dave);
+				}).verifyComplete();
+	}
+
 	@Test // DATAMONGO-2153
-	public void findListOfSingleValue() {
+	void findListOfSingleValue() {
 
 		repository.findAllLastnames() //
 				.collectList() //
 				.as(StepVerifier::create) //
 				.assertNext(actual -> {
-					assertThat(actual) //
-							.contains("Lessard") //
-							.contains("Keys") //
-							.contains("Tinsley") //
-							.contains("Beauford") //
-							.contains("Moore") //
-							.contains("Matthews");
+					assertThat(actual).contains("Lessard", "Keys", "Tinsley", "Beauford", "Moore", "Matthews");
 				}).verifyComplete();
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithPlaceholderValue() {
+	void annotatedAggregationWithPlaceholderValue() {
 
 		repository.groupByLastnameAnd("firstname") //
 				.collectList() //
@@ -465,7 +520,7 @@ public void annotatedAggregationWithPlaceholderValue() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithSort() {
+	void annotatedAggregationWithSort() {
 
 		repository.groupByLastnameAnd("firstname", Sort.by("lastname")) //
 				.collectList() //
@@ -484,7 +539,7 @@ public void annotatedAggregationWithSort() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithPageable() {
+	void annotatedAggregationWithPageable() {
 
 		repository.groupByLastnameAnd("firstname", PageRequest.of(1, 2, Sort.by("lastname"))) //
 				.collectList() //
@@ -499,7 +554,7 @@ public void annotatedAggregationWithPageable() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithSingleSimpleResult() {
+	void annotatedAggregationWithSingleSimpleResult() {
 
 		repository.sumAge() //
 				.as(StepVerifier::create) //
@@ -508,7 +563,7 @@ public void annotatedAggregationWithSingleSimpleResult() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithAggregationResultAsReturnType() {
+	void annotatedAggregationWithAggregationResultAsReturnType() {
 
 		repository.sumAgeAndReturnRawResult() //
 				.as(StepVerifier::create) //
@@ -517,7 +572,7 @@ public void annotatedAggregationWithAggregationResultAsReturnType() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithAggregationResultAsReturnTypeAndProjection() {
+	void annotatedAggregationWithAggregationResultAsReturnTypeAndProjection() {
 
 		repository.sumAgeAndReturnSumWrapper() //
 				.as(StepVerifier::create) //
@@ -526,7 +581,7 @@ public void annotatedAggregationWithAggregationResultAsReturnTypeAndProjection()
 	}
 
 	@Test // DATAMONGO-2374
-	public void findsWithNativeProjection() {
+	void findsWithNativeProjection() {
 
 		repository.findDocumentById(dave.getId()) //
 				.as(StepVerifier::create) //
@@ -536,7 +591,7 @@ public void findsWithNativeProjection() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void annotatedAggregationWithAggregationResultAsMap() {
+	void annotatedAggregationWithAggregationResultAsMap() {
 
 		repository.sumAgeAndReturnSumAsMap() //
 				.as(StepVerifier::create) //
@@ -545,8 +600,20 @@ public void annotatedAggregationWithAggregationResultAsMap() {
 				}).verifyComplete();
 	}
 
+	@Test // GH-4839
+	void annotatedAggregationWithAggregationResultAsClosedInterfaceProjection() {
+
+		repository.findAggregatedClosedInterfaceProjectionBy() //
+				.as(StepVerifier::create) //
+				.consumeNextWith(it -> {
+					assertThat(it.getFirstname()).isIn(dave.getFirstname(), oliver.getFirstname());
+					assertThat(it.getLastname()).isEqualTo(dave.getLastname());
+				}).expectNextCount(1).verifyComplete();
+	}
+
 	@Test // DATAMONGO-2403
-	public void annotatedAggregationExtractingSimpleValueIsEmptyForEmptyDocument() {
+	@DirtiesState
+	void annotatedAggregationExtractingSimpleValueIsEmptyForEmptyDocument() {
 
 		Person p = new Person("project-on-lastanme", null);
 		repository.save(p).then().as(StepVerifier::create).verifyComplete();
@@ -557,7 +624,8 @@ public void annotatedAggregationExtractingSimpleValueIsEmptyForEmptyDocument() {
 	}
 
 	@Test // DATAMONGO-2403
-	public void annotatedAggregationSkipsEmptyDocumentsWhenExtractingSimpleValue() {
+	@DirtiesState
+	void annotatedAggregationSkipsEmptyDocumentsWhenExtractingSimpleValue() {
 
 		String firstname = "project-on-lastanme";
 
@@ -575,6 +643,121 @@ public void annotatedAggregationSkipsEmptyDocumentsWhenExtractingSimpleValue() {
 				.expectNext("lastname").verifyComplete();
 	}
 
+	@Test // DATAMONGO-2406
+	@DirtiesState
+	void deleteByShouldHandleVoidResultTypeCorrectly() {
+
+		repository.deleteByLastname(dave.getLastname()) //
+				.as(StepVerifier::create) //
+				.verifyComplete();
+
+		template.find(query(where("lastname").is(dave.getLastname())), Person.class) //
+				.as(StepVerifier::create) //
+				.verifyComplete();
+	}
+
+	@Test // DATAMONGO-1997
+	@DirtiesState
+	void deleteByShouldAllowDeletedCountAsResult() {
+
+		repository.deleteCountByLastname(dave.getLastname()) //
+				.as(StepVerifier::create) //
+				.expectNext(2L) //
+				.verifyComplete();
+	}
+
+	@Test // DATAMONGO-1997
+	@DirtiesState
+	void deleteByShouldAllowSingleDocumentRemovalCorrectly() {
+
+		repository.deleteSinglePersonByLastname(carter.getLastname()) //
+				.as(StepVerifier::create) //
+				.expectNext(carter) //
+				.verifyComplete();
+
+		repository.deleteSinglePersonByLastname("dorfuaeB") //
+				.as(StepVerifier::create) //
+				.verifyComplete();
+	}
+
+	@Test // DATAMONGO-2652
+	@DirtiesState
+	void deleteAllById() {
+
+		repository.deleteAllById(Arrays.asList(carter.id, dave.id)) //
+				.as(StepVerifier::create) //
+				.verifyComplete();
+
+		repository.count().as(StepVerifier::create) //
+				.expectNext(PERSON_COUNT - 2L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void shouldAllowToUpdateAllElements() {
+		repository.findAndUpdateViaMethodArgAllByLastname("Matthews", new Update().inc("visits", 1337))
+				.as(StepVerifier::create).expectNext(2L).verifyComplete();
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void mixAnnotatedUpdateWithAnnotatedQuery() {
+
+		repository.updateAllByLastname("Matthews", 1337).as(StepVerifier::create).expectNext(2L).verifyComplete();
+
+		repository.findByLastname("Matthews").map(Person::getVisits).as(StepVerifier::create).expectNext(1337, 1337)
+				.verifyComplete();
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void annotatedUpdateWithSpELIsAppliedCorrectly() {
+
+		repository.findAndIncrementVisitsUsingSpELByLastname("Matthews", 1337).as(StepVerifier::create).expectNext(2L)
+				.verifyComplete();
+
+		repository.findByLastname("Matthews").map(Person::getVisits).as(StepVerifier::create).expectNext(1337, 1337)
+				.verifyComplete();
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.2")
+	void annotatedAggregationUpdateIsAppliedCorrectly() {
+
+		repository.findAndIncrementVisitsViaPipelineByLastname("Matthews", 1337).as(StepVerifier::create).verifyComplete();
+
+		repository.findByLastname("Matthews").map(Person::getVisits).as(StepVerifier::create).expectNext(1337, 1337)
+				.verifyComplete();
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void shouldAllowToUpdateAllElementsWithVoidReturn() {
+
+		repository.findAndIncrementVisitsByLastname("Matthews", 1337).as(StepVerifier::create).expectNext(2L)
+				.verifyComplete();
+
+		repository.findByLastname("Matthews").map(Person::getVisits).as(StepVerifier::create).expectNext(1337, 1337)
+				.verifyComplete();
+	}
+
+	@Test // GH-2107
+	@DirtiesState
+	void allowsToUseComplexTypesInUpdate() {
+
+		Address address = new Address("1007 Mountain Drive", "53540", "Gotham");
+
+		repository.findAndPushShippingAddressByEmail(dave.getEmail(), address) //
+				.as(StepVerifier::create) //
+				.expectNext(1L) //
+				.verifyComplete();
+
+		repository.findById(dave.getId()).map(Person::getShippingAddresses).as(StepVerifier::create)
+				.consumeNextWith(it -> assertThat(it).containsExactly(address)).verifyComplete();
+	}
+
 	interface ReactivePersonRepository
 			extends ReactiveMongoRepository<Person, String>, ReactiveQuerydslPredicateExecutor<Person> {
 
@@ -595,6 +778,11 @@ interface ReactivePersonRepository
 		@Query("{ lastname: { $in: ?0 }, age: { $gt : ?1 } }")
 		Flux<Person> findStringQuery(Flux<String> lastname, Mono<Integer> age);
 
+		Mono<Window<Person>> findTop2ByLastnameLikeOrderByFirstnameAscLastnameAsc(String lastname,
+				ScrollPosition scrollPosition);
+
+		Mono<Window<PersonSummaryDto>> findCursorProjectionByLastnameLike(String lastname, Pageable pageable);
+
 		Flux<Person> findByLocationWithin(Circle circle);
 
 		Flux<Person> findByLocationWithin(Circle circle, Pageable pageable);
@@ -639,12 +827,41 @@ interface ReactivePersonRepository
 		@Aggregation(pipeline = "{ '$group' : { '_id' : null, 'total' : { $sum: '$age' } } }")
 		Mono<Map> sumAgeAndReturnSumAsMap();
 
+		@Aggregation({ "{ '$match' :  { 'lastname' :  'Matthews'} }",
+				"{ '$project': { _id : 0, firstname : 1, lastname : 1 } }" })
+		Flux<PersonSummary> findAggregatedClosedInterfaceProjectionBy();
+
 		@Aggregation(
 				pipeline = { "{ '$match' : { 'firstname' : '?0' } }", "{ '$project' : { '_id' : 0, 'lastname' : 1 } }" })
 		Mono<String> projectToLastnameAndRemoveId(String firstname);
 
 		@Query(value = "{_id:?0}")
 		Mono<org.bson.Document> findDocumentById(String id);
+
+		Mono<Void> deleteByLastname(String lastname);
+
+		Mono<Long> deleteCountByLastname(String lastname);
+
+		Mono<Person> deleteSinglePersonByLastname(String lastname);
+
+		Mono<Long> findAndUpdateViaMethodArgAllByLastname(String lastname, UpdateDefinition update);
+
+		@org.springframework.data.mongodb.repository.Update("{ '$inc' : { 'visits' : ?1 } }")
+		Mono<Long> findAndIncrementVisitsByLastname(String lastname, int increment);
+
+		@Query("{ 'lastname' : ?0 }")
+		@org.springframework.data.mongodb.repository.Update("{ '$inc' : { 'visits' : ?1 } }")
+		Mono<Long> updateAllByLastname(String lastname, int increment);
+
+		@org.springframework.data.mongodb.repository.Update(
+				pipeline = { "{ '$set' : { 'visits' : { '$add' : [ '$visits', ?1 ] } } }" })
+		Mono<Void> findAndIncrementVisitsViaPipelineByLastname(String lastname, int increment);
+
+		@org.springframework.data.mongodb.repository.Update("{ '$inc' : { 'visits' : ?#{[1]} } }")
+		Mono<Long> findAndIncrementVisitsUsingSpELByLastname(String lastname, int increment);
+
+		@org.springframework.data.mongodb.repository.Update("{ '$push' : { 'shippingAddresses' : ?1 } }")
+		Mono<Long> findAndPushShippingAddressByEmail(String email, Address address);
 	}
 
 	interface ReactiveContactRepository extends ReactiveMongoRepository<Contact, String> {}
@@ -662,14 +879,15 @@ interface ReactiveCappedCollectionRepository extends Repository<Capped, String>
 	}
 
 	@Document
-	@NoArgsConstructor
 	static class Capped {
 
 		String id;
 		String key;
 		double random;
 
-		public Capped(String key, double random) {
+		public Capped() {}
+
+		Capped(String key, double random) {
 			this.key = key;
 			this.random = random;
 		}
@@ -679,9 +897,29 @@ interface CappedProjection {
 		double getRandom();
 	}
 
-	@Data
 	static class DtoProjection {
+
 		String id;
 		double unknown;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public double getUnknown() {
+			return this.unknown;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setUnknown(double unknown) {
+			this.unknown = unknown;
+		}
+
+		public String toString() {
+			return "ReactiveMongoRepositoryTests.DtoProjection(id=" + this.getId() + ", unknown=" + this.getUnknown() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactivePersonRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactivePersonRepository.java
index 15ac417cbd..878d3974c0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactivePersonRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactivePersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,4 +32,5 @@ public interface ReactivePersonRepository extends ReactiveMongoRepository<Person
 	 * @return
 	 */
 	Flux<Person> findByLastname(String lastname);
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveVectorSearchTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveVectorSearchTests.java
new file mode 100644
index 0000000000..14a4749c8a
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/ReactiveVectorSearchTests.java
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2025 the original author 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.repository;
+
+import static org.assertj.core.api.Assertions.*;
+
+import reactor.core.publisher.Flux;
+import reactor.test.StepVerifier;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.SearchResult;
+import org.springframework.data.domain.Similarity;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.TestMongoConfiguration;
+import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.index.VectorIndex;
+import org.springframework.data.mongodb.core.index.VectorIndex.SimilarityFunction;
+import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
+import org.springframework.data.mongodb.test.util.AtlasContainer;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mongodb.MongoDBAtlasLocalContainer;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+/**
+ * Integration tests using reactive Vector Search and Vector Indexes through local MongoDB Atlas.
+ *
+ * @author Mark Paluch
+ */
+@Testcontainers(disabledWithoutDocker = true)
+@SpringJUnitConfig(classes = { ReactiveVectorSearchTests.Config.class })
+public class ReactiveVectorSearchTests {
+
+	Vector VECTOR = Vector.of(0.2001f, 0.32345f, 0.43456f, 0.54567f, 0.65678f);
+
+	private static final MongoDBAtlasLocalContainer atlasLocal = AtlasContainer.bestMatch().withReuse(true);
+	private static final String COLLECTION_NAME = "collection-1";
+
+	static MongoClient client;
+	static MongoTestTemplate template;
+
+	@Autowired ReactiveVectorSearchRepository repository;
+
+	@EnableReactiveMongoRepositories(
+			includeFilters = {
+					@ComponentScan.Filter(value = ReactiveVectorSearchRepository.class, type = FilterType.ASSIGNABLE_TYPE) },
+			considerNestedRepositories = true)
+	static class Config extends TestMongoConfiguration {
+
+		@Override
+		public String getDatabaseName() {
+			return "vector-search-tests";
+		}
+
+		@Override
+		public MongoClient mongoClient() {
+			atlasLocal.start();
+			return MongoClients.create(atlasLocal.getConnectionString());
+		}
+
+		@Bean
+		public com.mongodb.reactivestreams.client.MongoClient reactiveMongoClient() {
+			atlasLocal.start();
+			return com.mongodb.reactivestreams.client.MongoClients.create(atlasLocal.getConnectionString());
+		}
+
+		@Bean
+		ReactiveMongoTemplate reactiveMongoTemplate(MappingMongoConverter mongoConverter) {
+			return new ReactiveMongoTemplate(new SimpleReactiveMongoDatabaseFactory(reactiveMongoClient(), getDatabaseName()),
+					mongoConverter);
+		}
+	}
+
+	@BeforeAll
+	static void beforeAll() throws InterruptedException {
+		atlasLocal.start();
+
+		System.out.println(atlasLocal.getConnectionString());
+		client = MongoClients.create(atlasLocal.getConnectionString());
+		template = new MongoTestTemplate(client, "vector-search-tests");
+
+		template.remove(WithVectorFields.class).all();
+		initDocuments();
+		initIndexes();
+
+		Thread.sleep(500); // just wait a little or the index will be broken
+	}
+
+	@Test
+	void shouldSearchEnnWithAnnotatedFilter() {
+
+		Flux<SearchResult<WithVectorFields>> results = repository.searchAnnotated("de", VECTOR, Score.of(0.4),
+				Limit.of(10));
+
+		results.as(StepVerifier::create).consumeNextWith(actual -> {
+			assertThat(actual.getScore().getValue()).isGreaterThan(0.4);
+			assertThat(actual.getScore()).isInstanceOf(Similarity.class);
+
+		}).expectNextCount(2).verifyComplete();
+	}
+
+	@Test
+	void shouldSearchEnnWithDerivedFilter() {
+
+		Flux<WithVectorFields> results = repository.searchByCountryAndEmbeddingNear("de", VECTOR, Limit.of(10));
+
+		results.as(StepVerifier::create).consumeNextWith(actual -> assertThat(actual).isInstanceOf(WithVectorFields.class))
+				.expectNextCount(2).verifyComplete();
+	}
+
+	static void initDocuments() {
+
+		WithVectorFields w1 = new WithVectorFields("de", "one", Vector.of(0.1001f, 0.22345f, 0.33456f, 0.44567f, 0.55678f));
+		WithVectorFields w2 = new WithVectorFields("de", "two", Vector.of(0.2001f, 0.32345f, 0.43456f, 0.54567f, 0.65678f));
+		WithVectorFields w3 = new WithVectorFields("en", "three",
+				Vector.of(0.9001f, 0.82345f, 0.73456f, 0.64567f, 0.55678f));
+		WithVectorFields w4 = new WithVectorFields("de", "four",
+				Vector.of(0.9001f, 0.92345f, 0.93456f, 0.94567f, 0.95678f));
+
+		template.insertAll(List.of(w1, w2, w3, w4));
+	}
+
+	static void initIndexes() {
+
+		VectorIndex cosIndex = new VectorIndex("cos-index")
+				.addVector("embedding", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5)).addFilter("country");
+
+		template.searchIndexOps(WithVectorFields.class).createIndex(cosIndex);
+
+		VectorIndex euclideanIndex = new VectorIndex("euc-index")
+				.addVector("embedding", it -> it.similarity(SimilarityFunction.EUCLIDEAN).dimensions(5)).addFilter("country");
+
+		VectorIndex inner = new VectorIndex("ip-index")
+				.addVector("embedding", it -> it.similarity(SimilarityFunction.DOT_PRODUCT).dimensions(5)).addFilter("country");
+
+		template.searchIndexOps(WithVectorFields.class).createIndex(cosIndex);
+		template.searchIndexOps(WithVectorFields.class).createIndex(euclideanIndex);
+		template.searchIndexOps(WithVectorFields.class).createIndex(inner);
+		template.awaitIndexCreation(WithVectorFields.class, cosIndex.getName());
+		template.awaitIndexCreation(WithVectorFields.class, euclideanIndex.getName());
+		template.awaitIndexCreation(WithVectorFields.class, inner.getName());
+	}
+
+	interface ReactiveVectorSearchRepository extends CrudRepository<WithVectorFields, String> {
+
+		@VectorSearch(indexName = "cos-index", filter = "{country: ?0}", numCandidates = "#{10+10}",
+				searchType = VectorSearchOperation.SearchType.ANN)
+		Flux<SearchResult<WithVectorFields>> searchAnnotated(String country, Vector vector, Score distance, Limit limit);
+
+		@VectorSearch(indexName = "cos-index")
+		Flux<WithVectorFields> searchByCountryAndEmbeddingNear(String country, Vector vector, Limit limit);
+
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(COLLECTION_NAME)
+	static class WithVectorFields {
+
+		String id;
+		String country;
+		String description;
+
+		Vector embedding;
+
+		public WithVectorFields(String country, String description, Vector embedding) {
+			this.country = country;
+			this.description = description;
+			this.embedding = embedding;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public String getCountry() {
+			return country;
+		}
+
+		public String getDescription() {
+			return description;
+		}
+
+		public Vector getEmbedding() {
+			return embedding;
+		}
+
+		@Override
+		public String toString() {
+			return "WithVectorFields{" + "id='" + id + '\'' + ", country='" + country + '\'' + ", description='" + description
+					+ '\'' + '}';
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsRepository.java
index d47fc21bdf..47594aa985 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsTests.java
index 4a65e5400b..837b6801ea 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RedeclaringRepositoryMethodsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,7 @@
 
 import java.util.List;
 
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -31,12 +30,12 @@
  * @author Mark Paluch
  */
 @ContextConfiguration("config/MongoNamespaceIntegrationTests-context.xml")
-public class RedeclaringRepositoryMethodsTests extends AbstractPersonRepositoryIntegrationTests {
+class RedeclaringRepositoryMethodsTests extends AbstractPersonRepositoryIntegrationTests {
 
 	@Autowired RedeclaringRepositoryMethodsRepository repository;
 
 	@Test // DATAMONGO-760
-	public void adjustedWellKnownPagedFindAllMethodShouldReturnOnlyTheUserWithFirstnameOliverAugust() {
+	void adjustedWellKnownPagedFindAllMethodShouldReturnOnlyTheUserWithFirstnameOliverAugust() {
 
 		Page<Person> page = repository.findAll(PageRequest.of(0, 2));
 
@@ -45,7 +44,7 @@ public void adjustedWellKnownPagedFindAllMethodShouldReturnOnlyTheUserWithFirstn
 	}
 
 	@Test // DATAMONGO-760
-	public void adjustedWllKnownFindAllMethodShouldReturnAnEmptyList() {
+	void adjustedWllKnownFindAllMethodShouldReturnAnEmptyList() {
 
 		List<Person> result = repository.findAll();
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RepositoryIndexCreationIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RepositoryIndexCreationIntegrationTests.java
index e8017daa23..320f2206b9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RepositoryIndexCreationIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/RepositoryIndexCreationIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.index.IndexInfo;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoCollection;
@@ -42,7 +42,7 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class RepositoryIndexCreationIntegrationTests {
 
@@ -78,6 +78,7 @@ public void testname() {
 
 		assertHasIndexForField(indexInfo, "lastname");
 		assertHasIndexForField(indexInfo, "firstname");
+		assertHasIndexForField(indexInfo, "add");
 	}
 
 	private static void assertHasIndexForField(List<IndexInfo> indexInfo, String... fields) {
@@ -88,6 +89,6 @@ private static void assertHasIndexForField(List<IndexInfo> indexInfo, String...
 			}
 		}
 
-		fail(String.format("Did not find index for field(s) %s in %s!", fields, indexInfo));
+		fail(String.format("Did not find index for field(s) %s in %s", fields, indexInfo));
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SampleEvaluationContextExtension.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SampleEvaluationContextExtension.java
index 1bcc5f09b8..4f28d2efb9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SampleEvaluationContextExtension.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SampleEvaluationContextExtension.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SimpleReactiveMongoRepositoryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SimpleReactiveMongoRepositoryTests.java
index 24e10cb062..751fc51ded 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SimpleReactiveMongoRepositoryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SimpleReactiveMongoRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,18 +18,19 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.springframework.data.domain.ExampleMatcher.*;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.Arrays;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
+import java.util.Objects;
+import java.util.stream.Stream;
+
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.RepeatedTest;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
@@ -38,15 +39,20 @@
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Example;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
+import org.springframework.data.mongodb.ReactiveMongoTransactionManager;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactory;
 import org.springframework.data.mongodb.repository.support.SimpleReactiveMongoRepository;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.transaction.TransactionDefinition;
+import org.springframework.transaction.reactive.TransactionalOperator;
 import org.springframework.util.ClassUtils;
 
 /**
@@ -55,19 +61,22 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  * @author Ruben J Garcia
+ * @author Clément Petit
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration("classpath:reactive-infrastructure.xml")
 public class SimpleReactiveMongoRepositoryTests implements BeanClassLoaderAware, BeanFactoryAware {
 
 	@Autowired private ReactiveMongoTemplate template;
 
-	ReactiveMongoRepositoryFactory factory;
-	ClassLoader classLoader;
-	BeanFactory beanFactory;
-	ReactivePersonRepostitory repository;
+	private ReactiveMongoRepositoryFactory factory;
+	private ClassLoader classLoader;
+	private BeanFactory beanFactory;
+	private ReactivePersonRepository repository;
+	private ReactiveImmutablePersonRepository immutableRepository;
 
 	private ReactivePerson dave, oliver, carter, boyd, stefan, leroi, alicia;
+	private ImmutableReactivePerson keith, james, mariah;
 
 	@Override
 	public void setBeanClassLoader(ClassLoader classLoader) {
@@ -79,18 +88,19 @@ public void setBeanFactory(BeanFactory beanFactory) throws BeansException {
 		this.beanFactory = beanFactory;
 	}
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		factory = new ReactiveMongoRepositoryFactory(template);
 		factory.setRepositoryBaseClass(SimpleReactiveMongoRepository.class);
 		factory.setBeanClassLoader(classLoader);
 		factory.setBeanFactory(beanFactory);
-		factory.setEvaluationContextProvider(QueryMethodEvaluationContextProvider.DEFAULT);
 
-		repository = factory.getRepository(ReactivePersonRepostitory.class);
+		repository = factory.getRepository(ReactivePersonRepository.class);
+		immutableRepository = factory.getRepository(ReactiveImmutablePersonRepository.class);
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
+		immutableRepository.deleteAll().as(StepVerifier::create).verifyComplete();
 
 		dave = new ReactivePerson("Dave", "Matthews", 42);
 		oliver = new ReactivePerson("Oliver August", "Matthews", 4);
@@ -99,6 +109,9 @@ public void setUp() {
 		stefan = new ReactivePerson("Stefan", "Lessard", 34);
 		leroi = new ReactivePerson("Leroi", "Moore", 41);
 		alicia = new ReactivePerson("Alicia", "Keys", 30);
+		keith = new ImmutableReactivePerson(null, "Keith", "Urban", 53);
+		james = new ImmutableReactivePerson(null, "James", "Arthur", 33);
+		mariah = new ImmutableReactivePerson(null, "Mariah", "Carey", 51);
 
 		repository.saveAll(Arrays.asList(oliver, dave, carter, boyd, stefan, leroi, alicia)).as(StepVerifier::create) //
 				.expectNextCount(7) //
@@ -106,78 +119,78 @@ public void setUp() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void existsByIdShouldReturnTrueForExistingObject() {
+	void existsByIdShouldReturnTrueForExistingObject() {
 		repository.existsById(dave.id).as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void existsByIdShouldReturnFalseForAbsentObject() {
+	void existsByIdShouldReturnFalseForAbsentObject() {
 		repository.existsById("unknown").as(StepVerifier::create).expectNext(false).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void existsByMonoOfIdShouldReturnTrueForExistingObject() {
+	void existsByMonoOfIdShouldReturnTrueForExistingObject() {
 		repository.existsById(Mono.just(dave.id)).as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1712
-	public void existsByFluxOfIdShouldReturnTrueForExistingObject() {
+	void existsByFluxOfIdShouldReturnTrueForExistingObject() {
 		repository.existsById(Flux.just(dave.id, oliver.id)).as(StepVerifier::create).expectNext(true).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void existsByEmptyMonoOfIdShouldReturnEmptyMono() {
+	void existsByEmptyMonoOfIdShouldReturnEmptyMono() {
 		repository.existsById(Mono.empty()).as(StepVerifier::create).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findByIdShouldReturnObject() {
+	void findByIdShouldReturnObject() {
 		repository.findById(dave.id).as(StepVerifier::create).expectNext(dave).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findByIdShouldCompleteWithoutValueForAbsentObject() {
+	void findByIdShouldCompleteWithoutValueForAbsentObject() {
 		repository.findById("unknown").as(StepVerifier::create).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findByIdByMonoOfIdShouldReturnTrueForExistingObject() {
+	void findByIdByMonoOfIdShouldReturnTrueForExistingObject() {
 		repository.findById(Mono.just(dave.id)).as(StepVerifier::create).expectNext(dave).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1712
-	public void findByIdByFluxOfIdShouldReturnTrueForExistingObject() {
+	void findByIdByFluxOfIdShouldReturnTrueForExistingObject() {
 		repository.findById(Flux.just(dave.id, oliver.id)).as(StepVerifier::create).expectNext(dave).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findByIdByEmptyMonoOfIdShouldReturnEmptyMono() {
+	void findByIdByEmptyMonoOfIdShouldReturnEmptyMono() {
 		repository.findById(Mono.empty()).as(StepVerifier::create).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findAllShouldReturnAllResults() {
+	void findAllShouldReturnAllResults() {
 		repository.findAll().as(StepVerifier::create).expectNextCount(7).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findAllByIterableOfIdShouldReturnResults() {
+	void findAllByIterableOfIdShouldReturnResults() {
 		repository.findAllById(Arrays.asList(dave.id, boyd.id)).as(StepVerifier::create).expectNextCount(2)
 				.verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findAllByPublisherOfIdShouldReturnResults() {
+	void findAllByPublisherOfIdShouldReturnResults() {
 		repository.findAllById(Flux.just(dave.id, boyd.id)).as(StepVerifier::create).expectNextCount(2).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findAllByEmptyPublisherOfIdShouldReturnResults() {
+	void findAllByEmptyPublisherOfIdShouldReturnResults() {
 		repository.findAllById(Flux.empty()).as(StepVerifier::create).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void findAllWithSortShouldReturnResults() {
+	void findAllWithSortShouldReturnResults() {
 
 		repository.findAll(Sort.by(new Order(Direction.ASC, "age"))).as(StepVerifier::create) //
 				.expectNextCount(7) //
@@ -185,12 +198,12 @@ public void findAllWithSortShouldReturnResults() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void countShouldReturnNumberOfRecords() {
+	void countShouldReturnNumberOfRecords() {
 		repository.count().as(StepVerifier::create).expectNext(7L).verifyComplete();
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertEntityShouldInsertEntity() {
+	void insertEntityShouldInsertEntity() {
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
@@ -202,7 +215,7 @@ public void insertEntityShouldInsertEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertShouldDeferredWrite() {
+	void insertShouldDeferredWrite() {
 
 		ReactivePerson person = new ReactivePerson("Homer", "Simpson", 36);
 
@@ -212,7 +225,7 @@ public void insertShouldDeferredWrite() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertIterableOfEntitiesShouldInsertEntity() {
+	void insertIterableOfEntitiesShouldInsertEntity() {
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
@@ -230,7 +243,7 @@ public void insertIterableOfEntitiesShouldInsertEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void insertPublisherOfEntitiesShouldInsertEntity() {
+	void insertPublisherOfEntitiesShouldInsertEntity() {
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
@@ -246,7 +259,7 @@ public void insertPublisherOfEntitiesShouldInsertEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void saveEntityShouldUpdateExistingEntity() {
+	void saveEntityShouldUpdateExistingEntity() {
 
 		dave.setFirstname("Hello, Dave");
 		dave.setLastname("Bowman");
@@ -263,7 +276,7 @@ public void saveEntityShouldUpdateExistingEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void saveEntityShouldInsertNewEntity() {
+	void saveEntityShouldInsertNewEntity() {
 
 		ReactivePerson person = new ReactivePerson("Homer", "Simpson", 36);
 
@@ -277,7 +290,7 @@ public void saveEntityShouldInsertNewEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void saveIterableOfNewEntitiesShouldInsertEntity() {
+	void saveIterableOfNewEntitiesShouldInsertEntity() {
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
@@ -293,7 +306,7 @@ public void saveIterableOfNewEntitiesShouldInsertEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void saveIterableOfMixedEntitiesShouldInsertEntity() {
+	void saveIterableOfMixedEntitiesShouldInsertEntity() {
 
 		ReactivePerson person = new ReactivePerson("Homer", "Simpson", 36);
 
@@ -309,7 +322,7 @@ public void saveIterableOfMixedEntitiesShouldInsertEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void savePublisherOfEntitiesShouldInsertEntity() {
+	void savePublisherOfEntitiesShouldInsertEntity() {
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
@@ -324,8 +337,44 @@ public void savePublisherOfEntitiesShouldInsertEntity() {
 		assertThat(boyd.getId()).isNotNull();
 	}
 
+	@RepeatedTest(10) // GH-4838
+	@EnableIfReplicaSetAvailable
+	void transactionalSaveAllForStuffThatIsConsideredAnUpdateOfExistingData() {
+
+		ReactiveMongoTransactionManager txmgr = new ReactiveMongoTransactionManager(template.getMongoDatabaseFactory());
+		TransactionalOperator.create(txmgr, TransactionDefinition.withDefaults()).execute(callback -> {
+			return repository.saveAll(Arrays.asList(oliver, dave, carter, boyd, stefan, leroi, alicia));
+		}).as(StepVerifier::create) //
+				.expectNext(oliver, dave, carter, boyd, stefan, leroi, alicia).verifyComplete();
+	}
+
+	@RepeatedTest(10) // GH-4838
+	@EnableIfReplicaSetAvailable
+	void transactionalSaveAllWithPublisherForStuffThatIsConsideredAnUpdateOfExistingData() {
+
+		ReactiveMongoTransactionManager txmgr = new ReactiveMongoTransactionManager(template.getMongoDatabaseFactory());
+		Flux<ReactivePerson> personFlux = Flux.fromStream(Stream.of(oliver, dave, carter, boyd, stefan, leroi, alicia));
+
+		TransactionalOperator.create(txmgr, TransactionDefinition.withDefaults()).execute(callback -> {
+				return repository.saveAll(personFlux);
+			}).as(StepVerifier::create) //
+				.expectNextCount(7).verifyComplete();
+	}
+
+	@Test // GH-3609
+	void savePublisherOfImmutableEntitiesShouldInsertEntity() {
+
+		immutableRepository.deleteAll().as(StepVerifier::create).verifyComplete();
+
+		immutableRepository.saveAll(Flux.just(keith)).as(StepVerifier::create) //
+				.consumeNextWith(actual -> {
+					assertThat(actual.id).isNotNull();
+				}) //
+				.verifyComplete();
+	}
+
 	@Test // DATAMONGO-1444
-	public void deleteAllShouldRemoveEntities() {
+	void deleteAllShouldRemoveEntities() {
 
 		repository.deleteAll().as(StepVerifier::create).verifyComplete();
 
@@ -333,7 +382,7 @@ public void deleteAllShouldRemoveEntities() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void deleteByIdShouldRemoveEntity() {
+	void deleteByIdShouldRemoveEntity() {
 
 		repository.deleteById(dave.id).as(StepVerifier::create).verifyComplete();
 
@@ -341,7 +390,7 @@ public void deleteByIdShouldRemoveEntity() {
 	}
 
 	@Test // DATAMONGO-1712
-	public void deleteByIdUsingMonoShouldRemoveEntity() {
+	void deleteByIdUsingMonoShouldRemoveEntity() {
 
 		repository.deleteById(Mono.just(dave.id)).as(StepVerifier::create).verifyComplete();
 
@@ -349,7 +398,7 @@ public void deleteByIdUsingMonoShouldRemoveEntity() {
 	}
 
 	@Test // DATAMONGO-1712
-	public void deleteByIdUsingFluxShouldRemoveEntity() {
+	void deleteByIdUsingFluxShouldRemoveEntity() {
 
 		repository.deleteById(Flux.just(dave.id, oliver.id)).as(StepVerifier::create).verifyComplete();
 
@@ -358,7 +407,7 @@ public void deleteByIdUsingFluxShouldRemoveEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void deleteShouldRemoveEntity() {
+	void deleteShouldRemoveEntity() {
 
 		repository.delete(dave).as(StepVerifier::create).verifyComplete();
 
@@ -367,7 +416,7 @@ public void deleteShouldRemoveEntity() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void deleteIterableOfEntitiesShouldRemoveEntities() {
+	void deleteIterableOfEntitiesShouldRemoveEntities() {
 
 		repository.deleteAll(Arrays.asList(dave, boyd)).as(StepVerifier::create).verifyComplete();
 
@@ -377,7 +426,7 @@ public void deleteIterableOfEntitiesShouldRemoveEntities() {
 	}
 
 	@Test // DATAMONGO-1444
-	public void deletePublisherOfEntitiesShouldRemoveEntities() {
+	void deletePublisherOfEntitiesShouldRemoveEntities() {
 
 		repository.deleteAll(Flux.just(dave, boyd)).as(StepVerifier::create).verifyComplete();
 
@@ -387,7 +436,7 @@ public void deletePublisherOfEntitiesShouldRemoveEntities() {
 	}
 
 	@Test // DATAMONGO-1619
-	public void findOneByExampleShouldReturnObject() {
+	void findOneByExampleShouldReturnObject() {
 
 		Example<ReactivePerson> example = Example.of(dave);
 
@@ -395,7 +444,7 @@ public void findOneByExampleShouldReturnObject() {
 	}
 
 	@Test // DATAMONGO-1619
-	public void findAllByExampleShouldReturnObjects() {
+	void findAllByExampleShouldReturnObjects() {
 
 		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
 
@@ -403,7 +452,7 @@ public void findAllByExampleShouldReturnObjects() {
 	}
 
 	@Test // DATAMONGO-1619
-	public void findAllByExampleAndSortShouldReturnObjects() {
+	void findAllByExampleAndSortShouldReturnObjects() {
 
 		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
 
@@ -412,7 +461,7 @@ public void findAllByExampleAndSortShouldReturnObjects() {
 	}
 
 	@Test // DATAMONGO-1619
-	public void countByExampleShouldCountObjects() {
+	void countByExampleShouldCountObjects() {
 
 		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
 
@@ -420,7 +469,7 @@ public void countByExampleShouldCountObjects() {
 	}
 
 	@Test // DATAMONGO-1619
-	public void existsByExampleShouldReturnExisting() {
+	void existsByExampleShouldReturnExisting() {
 
 		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
 
@@ -428,7 +477,7 @@ public void existsByExampleShouldReturnExisting() {
 	}
 
 	@Test // DATAMONGO-1619
-	public void existsByExampleShouldReturnNonExisting() {
+	void existsByExampleShouldReturnNonExisting() {
 
 		Example<ReactivePerson> example = Example.of(new ReactivePerson("foo", "bar", -1));
 
@@ -436,7 +485,7 @@ public void existsByExampleShouldReturnNonExisting() {
 	}
 
 	@Test // DATAMONGO-1619
-	public void findOneShouldEmitIncorrectResultSizeDataAccessExceptionWhenMoreThanOneElementFound() {
+	void findOneShouldEmitIncorrectResultSizeDataAccessExceptionWhenMoreThanOneElementFound() {
 
 		Example<ReactivePerson> example = Example.of(new ReactivePerson(null, "Matthews", -1),
 				matching().withIgnorePaths("age"));
@@ -445,21 +494,194 @@ public void findOneShouldEmitIncorrectResultSizeDataAccessExceptionWhenMoreThanO
 	}
 
 	@Test // DATAMONGO-1907
-	public void findOneByExampleWithoutResultShouldCompleteEmpty() {
+	void findOneByExampleWithoutResultShouldCompleteEmpty() {
 
 		Example<ReactivePerson> example = Example.of(new ReactivePerson("foo", "bar", -1));
 
 		repository.findOne(example).as(StepVerifier::create).verifyComplete();
 	}
 
-	interface ReactivePersonRepostitory extends ReactiveMongoRepository<ReactivePerson, String> {
+	@Test // GH-3757
+	void findByShouldReturnFirstResult() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setFirstname(oliver.getFirstname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::first) //
+				.as(StepVerifier::create) //
+				.expectNext(oliver) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	void findByShouldReturnOneResult() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setFirstname(oliver.getFirstname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::one) //
+				.as(StepVerifier::create) //
+				.expectNext(oliver) //
+				.verifyComplete();
+
+		probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::one) //
+				.as(StepVerifier::create) //
+				.verifyError(IncorrectResultSizeDataAccessException.class);
+	}
+
+	@Test // GH-3757
+	void findByShouldReturnAll() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::all) //
+				.as(StepVerifier::create) //
+				.expectNextCount(2) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	void findByShouldApplySortAll() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), it -> it.sortBy(Sort.by("firstname")).all()) //
+				.as(StepVerifier::create) //
+				.expectNext(dave, oliver) //
+				.verifyComplete();
+
+		repository
+				.findBy(Example.of(probe, matching().withIgnorePaths("age")),
+						it -> it.sortBy(Sort.by(Direction.DESC, "firstname")).all()) //
+				.as(StepVerifier::create) //
+				.expectNext(oliver, dave) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	void findByShouldApplyProjection() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), it -> it.project("firstname").first()) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.getFirstname()).isNotNull();
+					assertThat(it.getLastname()).isNull();
+				}).verifyComplete();
+	}
+
+	@Test // GH-3757
+	void findByShouldApplyPagination() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository
+				.findBy(Example.of(probe, matching().withIgnorePaths("age")),
+						it -> it.page(PageRequest.of(0, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.getTotalElements()).isEqualTo(2);
+					assertThat(it.getContent()).contains(dave);
+				}).verifyComplete();
+
+		repository
+				.findBy(Example.of(probe, matching().withIgnorePaths("age")),
+						it -> it.page(PageRequest.of(1, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.getTotalElements()).isEqualTo(2);
+					assertThat(it.getContent()).contains(oliver);
+				}).verifyComplete();
+	}
+
+	@Test // GH-4889
+	void findByShouldApplySlice() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository
+				.findBy(Example.of(probe, matching().withIgnorePaths("age")),
+						it -> it.slice(PageRequest.of(0, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.hasNext()).isTrue();
+					assertThat(it.getContent()).contains(dave);
+				}).verifyComplete();
+
+		repository
+				.findBy(Example.of(probe, matching().withIgnorePaths("age")),
+						it -> it.slice(PageRequest.of(1, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.hasNext()).isFalse();
+					assertThat(it.getContent()).contains(oliver);
+				}).verifyComplete();
+	}
+
+	@Test // GH-3757
+	void findByShouldCount() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::count) //
+				.as(StepVerifier::create) //
+				.expectNext(2L) //
+				.verifyComplete();
+
+		probe = new ReactivePerson();
+		probe.setLastname("foo");
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::count) //
+				.as(StepVerifier::create) //
+				.expectNext(0L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	void findByShouldReportExists() {
+
+		ReactivePerson probe = new ReactivePerson();
+		probe.setLastname(oliver.getLastname());
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::exists) //
+				.as(StepVerifier::create) //
+				.expectNext(true) //
+				.verifyComplete();
+
+		probe = new ReactivePerson();
+		probe.setLastname("foo");
+
+		repository.findBy(Example.of(probe, matching().withIgnorePaths("age")), FluentQuery.ReactiveFluentQuery::exists) //
+				.as(StepVerifier::create) //
+				.expectNext(false) //
+				.verifyComplete();
+	}
+
+	interface ReactivePersonRepository extends ReactiveMongoRepository<ReactivePerson, String> {
 
 		Flux<ReactivePerson> findByLastname(String lastname);
 
 	}
 
-	@Data
-	@NoArgsConstructor
+	interface ReactiveImmutablePersonRepository extends ReactiveMongoRepository<ImmutableReactivePerson, String> {
+
+	}
+
 	static class ReactivePerson {
 
 		@Id String id;
@@ -468,11 +690,143 @@ static class ReactivePerson {
 		String lastname;
 		int age;
 
-		public ReactivePerson(String firstname, String lastname, int age) {
+		public ReactivePerson() {}
+
+		ReactivePerson(String firstname, String lastname, int age) {
+
+			this.firstname = firstname;
+			this.lastname = lastname;
+			this.age = age;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public int getAge() {
+			return this.age;
+		}
 
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setFirstname(String firstname) {
 			this.firstname = firstname;
+		}
+
+		public void setLastname(String lastname) {
 			this.lastname = lastname;
+		}
+
+		public void setAge(int age) {
 			this.age = age;
 		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ReactivePerson that = (ReactivePerson) o;
+			return age == that.age && Objects.equals(id, that.id) && Objects.equals(firstname, that.firstname)
+					&& Objects.equals(lastname, that.lastname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname, age);
+		}
+
+		public String toString() {
+			return "SimpleReactiveMongoRepositoryTests.ReactivePerson(id=" + this.getId() + ", firstname="
+					+ this.getFirstname() + ", lastname=" + this.getLastname() + ", age=" + this.getAge() + ")";
+		}
 	}
+
+	static final class ImmutableReactivePerson {
+
+		@Id private final String id;
+
+		private final String firstname;
+		private final String lastname;
+		private final int age;
+
+		ImmutableReactivePerson(@Nullable String id, String firstname, String lastname, int age) {
+
+			this.id = id;
+			this.firstname = firstname;
+			this.lastname = lastname;
+			this.age = age;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getFirstname() {
+			return this.firstname;
+		}
+
+		public String getLastname() {
+			return this.lastname;
+		}
+
+		public int getAge() {
+			return this.age;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			ImmutableReactivePerson that = (ImmutableReactivePerson) o;
+			return age == that.age && Objects.equals(id, that.id) && Objects.equals(firstname, that.firstname)
+					&& Objects.equals(lastname, that.lastname);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, firstname, lastname, age);
+		}
+
+		public String toString() {
+			return "SimpleReactiveMongoRepositoryTests.ImmutableReactivePerson(id=" + this.getId() + ", firstname="
+					+ this.getFirstname() + ", lastname=" + this.getLastname() + ", age=" + this.getAge() + ")";
+		}
+
+		public ImmutableReactivePerson withId(String id) {
+			return this.id == id ? this : new ImmutableReactivePerson(id, this.firstname, this.lastname, this.age);
+		}
+
+		public ImmutableReactivePerson withFirstname(String firstname) {
+			return this.firstname == firstname ? this
+					: new ImmutableReactivePerson(this.id, firstname, this.lastname, this.age);
+		}
+
+		public ImmutableReactivePerson withLastname(String lastname) {
+			return this.lastname == lastname ? this
+					: new ImmutableReactivePerson(this.id, this.firstname, lastname, this.age);
+		}
+
+		public ImmutableReactivePerson withAge(int age) {
+			return this.age == age ? this : new ImmutableReactivePerson(this.id, this.firstname, this.lastname, age);
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SumAge.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SumAge.java
index ce4b41d81e..abbfac5943 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SumAge.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/SumAge.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,41 @@
  */
 package org.springframework.data.mongodb.repository;
 
-import lombok.Value;
+import java.util.Objects;
 
 /**
  * @author Christoph Strobl
  */
-@Value
-class SumAge {
+final class SumAge {
 
-	private Long total;
+	private final Long total;
+
+	public SumAge(Long total) {
+		this.total = total;
+	}
+
+	public Long getTotal() {
+		return this.total;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		SumAge sumAge = (SumAge) o;
+		return Objects.equals(total, sumAge.total);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(total);
+	}
+
+	public String toString() {
+		return "SumAge(total=" + this.getTotal() + ")";
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java
index e50b5614ba..123f7a4889 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/User.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexId.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexId.java
index 383dd2d383..c3bb9cb724 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexId.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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.repository;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.util.ObjectUtils;
@@ -40,7 +41,7 @@ public int hashCode() {
 	}
 
 	@Override
-	public boolean equals(Object obj) {
+	public boolean equals(@Nullable Object obj) {
 
 		if (obj == this) {
 			return true;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexIdRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexIdRepository.java
index 49b4bdd5cb..332eeff8ea 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexIdRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UserWithComplexIdRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ public interface UserWithComplexIdRepository extends CrudRepository<UserWithComp
 	@Meta
 	@interface ComposedMetaAnnotation {
 
-		@AliasFor(annotation = Meta.class, attribute = "maxScanDocuments")
-		long scanDocuments() default 1;
+		@AliasFor(annotation = Meta.class, attribute = "maxExecutionTimeMs")
+		long execTime() default -1;
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UsernameAndPassword.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UsernameAndPassword.java
index e655b0e5c6..f7a6396b8d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UsernameAndPassword.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/UsernameAndPassword.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VectorSearchTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VectorSearchTests.java
new file mode 100644
index 0000000000..a224481da1
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VectorSearchTests.java
@@ -0,0 +1,285 @@
+/*
+ * Copyright 2025 the original author 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.repository;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.List;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.SearchResult;
+import org.springframework.data.domain.SearchResults;
+import org.springframework.data.domain.Similarity;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.mongodb.core.TestMongoConfiguration;
+import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation;
+import org.springframework.data.mongodb.core.index.VectorIndex;
+import org.springframework.data.mongodb.core.index.VectorIndex.SimilarityFunction;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+import org.springframework.data.mongodb.test.util.AtlasContainer;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+import org.testcontainers.junit.jupiter.Testcontainers;
+import org.testcontainers.mongodb.MongoDBAtlasLocalContainer;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
+
+/**
+ * Integration tests using Vector Search and Vector Indexes through local MongoDB Atlas.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+@Testcontainers(disabledWithoutDocker = true)
+@SpringJUnitConfig(classes = { VectorSearchTests.Config.class })
+public class VectorSearchTests {
+
+	Vector VECTOR = Vector.of(0.2001f, 0.32345f, 0.43456f, 0.54567f, 0.65678f);
+
+	private static final MongoDBAtlasLocalContainer atlasLocal = AtlasContainer.bestMatch().withReuse(true);
+	private static final String COLLECTION_NAME = "collection-1";
+
+	static MongoClient client;
+	static MongoTestTemplate template;
+
+	@Autowired VectorSearchRepository repository;
+
+	@EnableMongoRepositories(
+			includeFilters = {
+					@ComponentScan.Filter(value = VectorSearchRepository.class, type = FilterType.ASSIGNABLE_TYPE) },
+			considerNestedRepositories = true)
+	static class Config extends TestMongoConfiguration {
+
+		@Override
+		public String getDatabaseName() {
+			return "vector-search-tests";
+		}
+
+		@Override
+		public MongoClient mongoClient() {
+			return MongoClients.create(atlasLocal.getConnectionString());
+		}
+	}
+
+	@BeforeAll
+	static void beforeAll() throws InterruptedException {
+
+		atlasLocal.start();
+
+		client = MongoClients.create(atlasLocal.getConnectionString());
+		template = new MongoTestTemplate(client, "vector-search-tests");
+
+		template.remove(WithVectorFields.class).all();
+		initDocuments();
+		initIndexes();
+
+		Thread.sleep(500); // just wait a little or the index will be broken
+	}
+
+	@Test
+	void shouldSearchEnnWithAnnotatedFilter() {
+
+		SearchResults<WithVectorFields> results = repository.searchAnnotated("de", VECTOR,
+				Score.of(0.4), Limit.of(10));
+
+		assertThat(results).extracting(SearchResult::getScore).hasOnlyElementsOfType(Similarity.class);
+		assertThat(results).hasSize(3);
+	}
+
+	@Test
+	void shouldSearchEnnWithDerivedFilter() {
+
+		SearchResults<WithVectorFields> results = repository.searchCosineByCountryAndEmbeddingNear("de", VECTOR,
+				Similarity.of(0.98),
+				Limit.of(10));
+
+		assertThat(results).extracting(SearchResult::getScore).hasOnlyElementsOfType(Similarity.class);
+		assertThat(results).hasSize(2).extracting(SearchResult::getContent).extracting(WithVectorFields::getCountry)
+				.containsOnly("de", "de");
+
+		assertThat(results).extracting(SearchResult::getContent).extracting(WithVectorFields::getDescription)
+				.containsExactlyInAnyOrder("two", "one");
+	}
+
+	@Test
+	void shouldSearchEnnWithDerivedFilterWithoutScore() {
+
+		SearchResults<WithVectorFields> de = repository.searchCosineByCountryAndEmbeddingNear("de", VECTOR,
+				Similarity.of(0.4), Limit.of(10));
+
+		assertThat(de).hasSizeGreaterThanOrEqualTo(2);
+
+		assertThat(repository.searchCosineByCountryAndEmbeddingNear("de", VECTOR, Similarity.of(0.999), Limit.of(10)))
+				.hasSize(1);
+	}
+
+	@Test
+	void shouldSearchAsListEnnWithDerivedFilterWithoutScore() {
+
+		List<WithVectorFields> de = repository.searchAsListByCountryAndEmbeddingNear("de", VECTOR, Limit.of(10));
+
+		assertThat(de).hasOnlyElementsOfType(WithVectorFields.class);
+	}
+
+	@Test
+	void shouldSearchEuclideanWithDerivedFilter() {
+
+		SearchResults<WithVectorFields> results = repository.searchEuclideanByCountryAndEmbeddingNear("de", VECTOR,
+				Limit.of(2));
+
+		assertThat(results).hasSize(2).extracting(SearchResult::getContent).extracting(WithVectorFields::getCountry)
+				.containsOnly("de", "de");
+
+		assertThat(results).extracting(SearchResult::getContent).extracting(WithVectorFields::getDescription)
+				.containsExactlyInAnyOrder("two", "one");
+	}
+
+	@Test
+	void shouldSearchEnnWithDerivedFilterWithin() {
+
+		SearchResults<WithVectorFields> results = repository.searchByCountryAndEmbeddingWithin("de", VECTOR,
+				Similarity.between(0.93, 0.98));
+
+		assertThat(results).hasSize(1);
+		for (SearchResult<WithVectorFields> result : results) {
+			assertThat(result.getScore().getValue()).isBetween(0.93, 0.98);
+		}
+	}
+
+	@Test
+	void shouldSearchEnnWithDerivedAndLimitedFilterWithin() {
+
+		SearchResults<WithVectorFields> results = repository.searchTop1ByCountryAndEmbeddingWithin("de", VECTOR,
+				Similarity.between(0.8, 1));
+
+		assertThat(results).hasSize(1);
+
+		for (SearchResult<WithVectorFields> result : results) {
+			assertThat(result.getScore().getValue()).isBetween(0.8, 1.0);
+		}
+	}
+
+	static void initDocuments() {
+
+		WithVectorFields w1 = new WithVectorFields("de", "one", Vector.of(0.1001f, 0.22345f, 0.33456f, 0.44567f, 0.55678f));
+		WithVectorFields w2 = new WithVectorFields("de", "two", Vector.of(0.2001f, 0.32345f, 0.43456f, 0.54567f, 0.65678f));
+		WithVectorFields w3 = new WithVectorFields("en", "three",
+				Vector.of(0.9001f, 0.82345f, 0.73456f, 0.64567f, 0.55678f));
+		WithVectorFields w4 = new WithVectorFields("de", "four",
+				Vector.of(0.9001f, 0.92345f, 0.93456f, 0.94567f, 0.95678f));
+
+		template.insertAll(List.of(w1, w2, w3, w4));
+	}
+
+	static void initIndexes() {
+
+		VectorIndex cosIndex = new VectorIndex("cos-index")
+				.addVector("embedding", it -> it.similarity(SimilarityFunction.COSINE).dimensions(5)).addFilter("country");
+
+		template.searchIndexOps(WithVectorFields.class).createIndex(cosIndex);
+
+		VectorIndex euclideanIndex = new VectorIndex("euc-index")
+				.addVector("embedding", it -> it.similarity(SimilarityFunction.EUCLIDEAN).dimensions(5)).addFilter("country");
+
+		VectorIndex inner = new VectorIndex("ip-index")
+				.addVector("embedding", it -> it.similarity(SimilarityFunction.DOT_PRODUCT).dimensions(5)).addFilter("country");
+
+		template.searchIndexOps(WithVectorFields.class).createIndex(cosIndex);
+		template.searchIndexOps(WithVectorFields.class).createIndex(euclideanIndex);
+		template.searchIndexOps(WithVectorFields.class).createIndex(inner);
+		template.awaitIndexCreation(WithVectorFields.class, cosIndex.getName());
+		template.awaitIndexCreation(WithVectorFields.class, euclideanIndex.getName());
+		template.awaitIndexCreation(WithVectorFields.class, inner.getName());
+	}
+
+	interface VectorSearchRepository extends CrudRepository<WithVectorFields, String> {
+
+		@VectorSearch(indexName = "cos-index", filter = "{country: ?0}", numCandidates = "#{10+10}",
+				searchType = VectorSearchOperation.SearchType.ANN)
+		SearchResults<WithVectorFields> searchAnnotated(String country, Vector vector,
+				Score distance, Limit limit);
+
+		@VectorSearch(indexName = "cos-index")
+		SearchResults<WithVectorFields> searchCosineByCountryAndEmbeddingNear(String country, Vector vector,
+				Score similarity, Limit limit);
+
+		@VectorSearch(indexName = "cos-index")
+		List<WithVectorFields> searchAsListByCountryAndEmbeddingNear(String country, Vector vector, Limit limit);
+
+		@VectorSearch(indexName = "euc-index")
+		SearchResults<WithVectorFields> searchEuclideanByCountryAndEmbeddingNear(String country, Vector vector,
+				Limit limit);
+
+		@VectorSearch(indexName = "cos-index", limit = "10")
+		SearchResults<WithVectorFields> searchByCountryAndEmbeddingWithin(String country, Vector vector,
+				Range<Similarity> distance);
+
+		@VectorSearch(indexName = "cos-index")
+		SearchResults<WithVectorFields> searchTop1ByCountryAndEmbeddingWithin(String country, Vector vector,
+				Range<Similarity> distance);
+
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(COLLECTION_NAME)
+	static class WithVectorFields {
+
+		String id;
+		String country;
+		String description;
+
+		Vector embedding;
+
+		public WithVectorFields(String country, String description, Vector embedding) {
+			this.country = country;
+			this.description = description;
+			this.embedding = embedding;
+		}
+
+		public String getId() {
+			return id;
+		}
+
+		public String getCountry() {
+			return country;
+		}
+
+		public String getDescription() {
+			return description;
+		}
+
+		public Vector getEmbedding() {
+			return embedding;
+		}
+
+		@Override
+		public String toString() {
+			return "WithVectorFields{" + "id='" + id + '\'' + ", country='" + country + '\'' + ", description='" + description
+					+ '\'' + '}';
+		}
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPerson.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPerson.java
index 807ec91dd9..4f1adc714e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPerson.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPerson.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,16 @@
  */
 package org.springframework.data.mongodb.repository;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import java.util.Objects;
 
+import org.jspecify.annotations.Nullable;
 import org.springframework.data.annotation.Version;
 import org.springframework.data.mongodb.core.mapping.Document;
-import org.springframework.lang.Nullable;
 
 /**
  * @author Christoph Strobl
  */
 @Document
-@Data
-@NoArgsConstructor
 public class VersionedPerson extends Contact {
 
 	private String firstname;
@@ -35,6 +32,8 @@ public class VersionedPerson extends Contact {
 
 	private @Version Long version;
 
+	public VersionedPerson() {}
+
 	public VersionedPerson(String firstname) {
 		this(firstname, null);
 	}
@@ -44,4 +43,52 @@ public VersionedPerson(String firstname, @Nullable String lastname) {
 		this.firstname = firstname;
 		this.lastname = lastname;
 	}
+
+	public String getFirstname() {
+		return this.firstname;
+	}
+
+	public @Nullable String getLastname() {
+		return this.lastname;
+	}
+
+	public Long getVersion() {
+		return this.version;
+	}
+
+	public void setFirstname(String firstname) {
+		this.firstname = firstname;
+	}
+
+	public void setLastname(@Nullable String lastname) {
+		this.lastname = lastname;
+	}
+
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+
+		if (o == this) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		VersionedPerson that = (VersionedPerson) o;
+		return Objects.equals(firstname, that.firstname) && Objects.equals(lastname, that.lastname)
+				&& Objects.equals(version, that.version);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(firstname, lastname, version);
+	}
+
+	public String toString() {
+		return "VersionedPerson(firstname=" + this.getFirstname() + ", lastname=" + this.getLastname() + ", version="
+				+ this.getVersion() + ")";
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPersonRepositoryIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPersonRepositoryIntegrationTests.java
new file mode 100644
index 0000000000..917a1094d8
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/VersionedPersonRepositoryIntegrationTests.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2025 the original author 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.repository;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Integration tests for Repositories using optimistic locking.
+ *
+ * @author Christoph Strobl
+ */
+@ExtendWith({ MongoClientExtension.class, SpringExtension.class })
+@ContextConfiguration
+class VersionedPersonRepositoryIntegrationTests {
+
+	static @Client MongoClient mongoClient;
+
+	@Autowired VersionedPersonRepository versionedPersonRepository;
+	@Autowired MongoTemplate template;
+
+	@Configuration
+	@EnableMongoRepositories(considerNestedRepositories = true,
+			includeFilters = @Filter(type = FilterType.ASSIGNABLE_TYPE, classes = VersionedPersonRepository.class))
+	static class Config extends AbstractMongoClientConfiguration {
+
+		@Override
+		protected String getDatabaseName() {
+			return "versioned-person-tests";
+		}
+
+		@Override
+		public MongoClient mongoClient() {
+			return mongoClient;
+		}
+	}
+
+	@BeforeEach
+	void beforeEach() {
+		MongoTestUtils.flushCollection("versioned-person-tests",
+				template.getCollectionName(VersionedPersonWithCounter.class), mongoClient);
+	}
+
+	@Test // GH-4918
+	void updatesVersionedTypeCorrectly() {
+
+		VersionedPerson person = template.insert(VersionedPersonWithCounter.class)
+				.one(new VersionedPersonWithCounter("Donald", "Duckling"));
+
+		int updateCount = versionedPersonRepository.findAndSetFirstnameToLastnameByLastname(person.getLastname());
+
+		assertThat(updateCount).isOne();
+
+		Document document = template.execute(VersionedPersonWithCounter.class, collection -> {
+			return collection.find(new Document("_id", new ObjectId(person.getId()))).first();
+		});
+
+		assertThat(document).containsEntry("firstname", "Duckling").containsEntry("version", 1L);
+	}
+
+	@Test // GH-4918
+	void updatesVersionedTypeCorrectlyWhenUpdateIsUsingInc() {
+
+		VersionedPerson person = template.insert(VersionedPersonWithCounter.class)
+				.one(new VersionedPersonWithCounter("Donald", "Duckling"));
+
+		int updateCount = versionedPersonRepository.findAndIncCounterByLastname(person.getLastname());
+
+		assertThat(updateCount).isOne();
+
+		Document document = template.execute(VersionedPersonWithCounter.class, collection -> {
+			return collection.find(new Document("_id", new ObjectId(person.getId()))).first();
+		});
+
+		assertThat(document).containsEntry("lastname", "Duckling").containsEntry("version", 1L).containsEntry("counter",
+				42);
+	}
+
+	@Test // GH-4918
+	void updatesVersionedTypeCorrectlyWhenUpdateCoversVersionBump() {
+
+		VersionedPerson person = template.insert(VersionedPersonWithCounter.class)
+				.one(new VersionedPersonWithCounter("Donald", "Duckling"));
+
+		int updateCount = versionedPersonRepository.findAndSetFirstnameToLastnameIncVersionByLastname(person.getLastname(),
+				10);
+
+		assertThat(updateCount).isOne();
+
+		Document document = template.execute(VersionedPersonWithCounter.class, collection -> {
+			return collection.find(new Document("_id", new ObjectId(person.getId()))).first();
+		});
+
+		assertThat(document).containsEntry("firstname", "Duckling").containsEntry("version", 10L);
+	}
+
+	interface VersionedPersonRepository extends CrudRepository<VersionedPersonWithCounter, String> {
+
+		@Update("{ '$set': { 'firstname' : ?0 } }")
+		int findAndSetFirstnameToLastnameByLastname(String lastname);
+
+		@Update("{ '$inc': { 'counter' : 42 } }")
+		int findAndIncCounterByLastname(String lastname);
+
+		@Update("""
+				{
+					'$set': { 'firstname' : ?0 },
+					'$inc': { 'version' : ?1 }
+				}""")
+		int findAndSetFirstnameToLastnameIncVersionByLastname(String lastname, int incVersion);
+
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document("versioned-person")
+	static class VersionedPersonWithCounter extends VersionedPerson {
+
+		int counter;
+
+		public VersionedPersonWithCounter(String firstname, @Nullable String lastname) {
+			super(firstname, lastname);
+		}
+
+		public int getCounter() {
+			return counter;
+		}
+
+		public void setCounter(int counter) {
+			this.counter = counter;
+		}
+
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java
new file mode 100644
index 0000000000..b46b1dfb50
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotContributionIntegrationTests.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.*;
+import static org.mockito.Mockito.*;
+
+import example.aot.User;
+import example.aot.UserRepository;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import org.springframework.aot.generate.GeneratedFiles;
+import org.springframework.aot.test.generate.TestGenerationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.aot.ApplicationContextAotGenerator;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.InputStreamSource;
+import org.springframework.data.aot.AotContext;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+import org.springframework.mock.env.MockPropertySource;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Integration tests for AOT processing of imperative repositories.
+ *
+ * @author Mark Paluch
+ */
+class AotContributionIntegrationTests {
+
+	@EnableMongoRepositories(considerNestedRepositories = true, includeFilters = {
+			@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = QuerydslUserRepository.class) })
+	static class AotConfiguration extends AbstractMongoClientConfiguration {
+
+		@Override
+		public MongoClient mongoClient() {
+			return mock(MongoClient.class);
+		}
+
+		@Override
+		protected String getDatabaseName() {
+			return "";
+		}
+	}
+
+	interface QuerydslUserRepository extends UserRepository, QuerydslPredicateExecutor<User> {
+
+	}
+
+	@Test // GH-3830
+	void shouldGenerateMetadataForBaseRepositoryAndQuerydslFragment() throws IOException {
+
+		TestGenerationContext generationContext = generate(AotConfiguration.class);
+
+		InputStreamSource metadata = generationContext.getGeneratedFiles().getGeneratedFile(GeneratedFiles.Kind.RESOURCE,
+				QuerydslUserRepository.class.getName().replace('.', '/') + ".json");
+
+		InputStreamResource isr = new InputStreamResource(metadata);
+		String json = isr.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).isObject() //
+				.containsEntry("name", QuerydslUserRepository.class.getName()) //
+				.containsEntry("module", "MongoDB") //
+				.containsEntry("type", "IMPERATIVE");
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'findBy')].fragment").isArray().first().isObject()
+				.containsEntry("interface", "org.springframework.data.querydsl.QuerydslPredicateExecutor").containsEntry(
+						"fragment", "org.springframework.data.mongodb.repository.support.QuerydslMongoPredicateExecutor");
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'existsById')].fragment").isArray().first().isObject()
+				.containsEntry("fragment", "org.springframework.data.mongodb.repository.support.SimpleMongoRepository");
+	}
+
+	private static TestGenerationContext generate(Class<?>... configurationClasses) {
+
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.getEnvironment().getPropertySources()
+				.addFirst(new MockPropertySource().withProperty(AotContext.GENERATED_REPOSITORIES_ENABLED, "true"));
+		context.register(configurationClasses);
+
+		ApplicationContextAotGenerator generator = new ApplicationContextAotGenerator();
+
+		TestGenerationContext generationContext = new TestGenerationContext();
+		generator.processAheadOfTime(context, generationContext);
+		return generationContext;
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java
new file mode 100644
index 0000000000..eba08ecc2e
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/AotFragmentTestConfigurationSupport.java
@@ -0,0 +1,130 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+import org.springframework.aot.test.generate.TestGenerationContext;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.core.test.tools.TestCompiler;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryFactoryBeanSupport;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * Test Configuration Support Class for generated AOT Repository Fragments based on a Repository Interface.
+ * <p>
+ * This configuration generates the AOT repository, compiles sources and configures a BeanFactory to contain the AOT
+ * fragment. Additionally, the fragment is exposed through a {@code repositoryInterface} JDK proxy forwarding method
+ * invocations to the backing AOT fragment. Note that {@code repositoryInterface} is not a repository proxy.
+ *
+ * @author Christoph Strobl
+ */
+public class AotFragmentTestConfigurationSupport implements BeanFactoryPostProcessor {
+
+	private final Class<?> repositoryInterface;
+	private final TestMongoAotRepositoryContext repositoryContext;
+
+	public AotFragmentTestConfigurationSupport(Class<?> repositoryInterface) {
+
+		this.repositoryInterface = repositoryInterface;
+		this.repositoryContext = new TestMongoAotRepositoryContext(repositoryInterface, null);
+	}
+
+	@Override
+	public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
+
+		TestGenerationContext generationContext = new TestGenerationContext(repositoryInterface);
+
+		new MongoRepositoryContributor(repositoryContext).contribute(generationContext);
+
+		AbstractBeanDefinition aotGeneratedRepository = BeanDefinitionBuilder
+				.genericBeanDefinition(
+						repositoryInterface.getPackageName() + "." + repositoryInterface.getSimpleName() + "Impl__Aot") //
+				.addConstructorArgReference("mongoOperations") //
+				.addConstructorArgValue(getCreationContext(repositoryContext)).getBeanDefinition();
+
+		TestCompiler.forSystem().withCompilerOptions("-parameters").with(generationContext).compile(compiled -> {
+			beanFactory.setBeanClassLoader(compiled.getClassLoader());
+			((BeanDefinitionRegistry) beanFactory).registerBeanDefinition("fragment", aotGeneratedRepository);
+		});
+
+		BeanDefinition fragmentFacade = BeanDefinitionBuilder.rootBeanDefinition((Class) repositoryInterface, () -> {
+
+			Object fragment = beanFactory.getBean("fragment");
+			Object proxy = getFragmentFacadeProxy(fragment);
+
+			return repositoryInterface.cast(proxy);
+		}).getBeanDefinition();
+
+		((BeanDefinitionRegistry) beanFactory).registerBeanDefinition("fragmentFacade", fragmentFacade);
+
+		beanFactory.registerSingleton("generationContext", generationContext);
+	}
+
+	private Object getFragmentFacadeProxy(Object fragment) {
+
+		return Proxy.newProxyInstance(repositoryInterface.getClassLoader(), new Class<?>[] { repositoryInterface },
+				(p, method, args) -> {
+
+					Method target = ReflectionUtils.findMethod(fragment.getClass(), method.getName(), method.getParameterTypes());
+
+					if (target == null) {
+						throw new NoSuchMethodException("Method [%s] is not implemented by [%s]".formatted(method, target));
+					}
+
+					try {
+						return target.invoke(fragment, args);
+					} catch (ReflectiveOperationException e) {
+						ReflectionUtils.handleReflectionException(e);
+					}
+
+					return null;
+				});
+	}
+
+	private RepositoryFactoryBeanSupport.FragmentCreationContext getCreationContext(
+			TestMongoAotRepositoryContext repositoryContext) {
+
+		return new RepositoryFactoryBeanSupport.FragmentCreationContext() {
+
+			@Override
+			public RepositoryMetadata getRepositoryMetadata() {
+				return repositoryContext.getRepositoryInformation();
+			}
+
+			@Override
+			public ValueExpressionDelegate getValueExpressionDelegate() {
+				return ValueExpressionDelegate.create();
+			}
+
+			@Override
+			public ProjectionFactory getProjectionFactory() {
+				return new SpelAwareProxyProjectionFactory();
+			}
+		};
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java
new file mode 100644
index 0000000000..a2840ec268
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorTests.java
@@ -0,0 +1,705 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import static org.assertj.core.api.Assertions.*;
+
+import example.aot.User;
+import example.aot.UserProjection;
+import example.aot.UserRepository;
+import example.aot.UserRepository.UserAggregate;
+
+import java.time.Instant;
+import java.util.List;
+import java.util.Optional;
+
+import org.bson.Document;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.domain.KeysetScrollPosition;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.OffsetScrollPosition;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.ScrollPosition;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Window;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.aggregation.AggregationResults;
+import org.springframework.data.mongodb.test.util.Client;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+import org.springframework.util.StringUtils;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Integration tests for the {@link UserRepository} AOT fragment.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+@ExtendWith(MongoClientExtension.class)
+@SpringJUnitConfig(classes = MongoRepositoryContributorTests.MongoRepositoryContributorConfiguration.class)
+class MongoRepositoryContributorTests {
+
+	private static final String DB_NAME = "aot-repo-tests";
+
+	@Client static MongoClient client;
+	@Autowired UserRepository fragment;
+
+	@Configuration
+	static class MongoRepositoryContributorConfiguration extends AotFragmentTestConfigurationSupport {
+
+		public MongoRepositoryContributorConfiguration() {
+			super(UserRepository.class);
+		}
+
+		@Bean
+		MongoOperations mongoOperations() {
+			return new MongoTemplate(client, DB_NAME);
+		}
+	}
+
+	@BeforeEach
+	void beforeEach() {
+
+		MongoTestUtils.flushCollection(DB_NAME, "user", client);
+		initUsers();
+	}
+
+	@Test
+	void testFindDerivedFinderSingleEntity() {
+
+		User user = fragment.findOneByUsername("yoda");
+		assertThat(user).isNotNull().extracting(User::getUsername).isEqualTo("yoda");
+	}
+
+	@Test
+	void testFindDerivedFinderOptionalEntity() {
+
+		Optional<User> user = fragment.findOptionalOneByUsername("yoda");
+		assertThat(user).isNotNull().containsInstanceOf(User.class)
+				.hasValueSatisfying(it -> assertThat(it).extracting(User::getUsername).isEqualTo("yoda"));
+	}
+
+	@Test
+	void testDerivedCount() {
+
+		assertThat(fragment.countUsersByLastname("Skywalker")).isEqualTo(2L);
+		assertThat(fragment.countUsersAsIntByLastname("Skywalker")).isEqualTo(2);
+	}
+
+	@Test
+	void testDerivedExists() {
+
+		assertThat(fragment.existsUserByLastname("Skywalker")).isTrue();
+	}
+
+	@Test
+	void testDerivedFinderWithoutArguments() {
+
+		List<User> users = fragment.findUserNoArgumentsBy();
+		assertThat(users).hasSize(7).hasOnlyElementsOfType(User.class);
+	}
+
+	@Test
+	void testCountWorksAsExpected() {
+
+		Long value = fragment.countUsersByLastname("Skywalker");
+		assertThat(value).isEqualTo(2L);
+	}
+
+	@Test
+	void testDerivedFinderReturningList() {
+
+		List<User> users = fragment.findByLastnameStartingWith("S");
+		assertThat(users).extracting(User::getUsername).containsExactlyInAnyOrder("luke", "vader", "kylo", "han");
+	}
+
+	@Test
+	void testEndingWith() {
+
+		List<User> users = fragment.findByLastnameEndsWith("er");
+		assertThat(users).extracting(User::getUsername).containsExactlyInAnyOrder("luke", "vader");
+	}
+
+	@Test
+	void testLike() {
+
+		List<User> users = fragment.findByFirstnameLike("ei");
+		assertThat(users).extracting(User::getUsername).containsExactlyInAnyOrder("leia");
+	}
+
+	@Test
+	void testNotLike() {
+
+		List<User> users = fragment.findByFirstnameNotLike("ei");
+		assertThat(users).extracting(User::getUsername).isNotEmpty().doesNotContain("leia");
+	}
+
+	@Test
+	void testIn() {
+
+		List<User> users = fragment.findByUsernameIn(List.of("chewbacca", "kylo"));
+		assertThat(users).extracting(User::getUsername).containsExactlyInAnyOrder("chewbacca", "kylo");
+	}
+
+	@Test
+	void testNotIn() {
+
+		List<User> users = fragment.findByUsernameNotIn(List.of("chewbacca", "kylo"));
+		assertThat(users).extracting(User::getUsername).isNotEmpty().doesNotContain("chewbacca", "kylo");
+	}
+
+	@Test
+	void testAnd() {
+
+		List<User> users = fragment.findByFirstnameAndLastname("Han", "Solo");
+		assertThat(users).extracting(User::getUsername).containsExactly("han");
+	}
+
+	@Test
+	void testOr() {
+
+		List<User> users = fragment.findByFirstnameOrLastname("Han", "Skywalker");
+		assertThat(users).extracting(User::getUsername).containsExactlyInAnyOrder("han", "vader", "luke");
+	}
+
+	@Test
+	void testBetween() {
+
+		List<User> users = fragment.findByVisitsBetween(10, 100);
+		assertThat(users).extracting(User::getUsername).containsExactly("vader");
+	}
+
+	@Test
+	void testTimeValue() {
+
+		List<User> users = fragment.findByLastSeenGreaterThan(Instant.parse("2025-01-01T00:00:00.000Z"));
+		assertThat(users).extracting(User::getUsername).containsExactly("luke");
+	}
+
+	@Test
+	void testNot() {
+
+		List<User> users = fragment.findByLastnameNot("Skywalker");
+		assertThat(users).extracting(User::getUsername).isNotEmpty().doesNotContain("luke", "vader");
+	}
+
+	@Test
+	void testExistsCriteria() {
+
+		List<User> users = fragment.findByVisitsExists(false);
+		assertThat(users).extracting(User::getUsername).contains("kylo");
+	}
+
+	@Test
+	void testLimitedDerivedFinder() {
+
+		List<User> users = fragment.findTop2ByLastnameStartingWith("S");
+		assertThat(users).hasSize(2);
+	}
+
+	@Test
+	void testSortedDerivedFinder() {
+
+		List<User> users = fragment.findByLastnameStartingWithOrderByUsername("S");
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo", "luke", "vader");
+	}
+
+	@Test
+	void testDerivedFinderWithLimitArgument() {
+
+		List<User> users = fragment.findByLastnameStartingWith("S", Limit.of(2));
+		assertThat(users).hasSize(2);
+	}
+
+	@Test
+	void testDerivedFinderWithSort() {
+
+		List<User> users = fragment.findByLastnameStartingWith("S", Sort.by("username"));
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo", "luke", "vader");
+	}
+
+	@Test
+	void testDerivedFinderWithSortAndLimit() {
+
+		List<User> users = fragment.findByLastnameStartingWith("S", Sort.by("username"), Limit.of(2));
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testDerivedFinderReturningListWithPageable() {
+
+		List<User> users = fragment.findByLastnameStartingWith("S", PageRequest.of(0, 2, Sort.by("username")));
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testDerivedFinderReturningPage() {
+
+		Page<User> page = fragment.findPageOfUsersByLastnameStartingWith("S", PageRequest.of(0, 2, Sort.by("username")));
+		assertThat(page.getTotalElements()).isEqualTo(4);
+		assertThat(page.getSize()).isEqualTo(2);
+		assertThat(page.getContent()).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testDerivedFinderReturningSlice() {
+
+		Slice<User> slice = fragment.findSliceOfUserByLastnameStartingWith("S", PageRequest.of(0, 2, Sort.by("username")));
+		assertThat(slice.hasNext()).isTrue();
+		assertThat(slice.getSize()).isEqualTo(2);
+		assertThat(slice.getContent()).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test // GH-4970
+	void testDerivedQueryReturningStream() {
+
+		List<User> results = fragment.streamByLastnameStartingWith("S", Sort.by("username"), Limit.of(2)).toList();
+
+		assertThat(results).hasSize(2);
+		assertThat(results).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test // GH-4970
+	void testDerivedQueryReturningWindowByOffset() {
+
+		Window<User> window1 = fragment.findTop2WindowByLastnameStartingWithOrderByUsername("S", ScrollPosition.offset());
+		assertThat(window1).extracting(User::getUsername).containsExactly("han", "kylo");
+		assertThat(window1.positionAt(1)).isInstanceOf(OffsetScrollPosition.class);
+
+		Window<User> window2 = fragment.findTop2WindowByLastnameStartingWithOrderByUsername("S", window1.positionAt(1));
+		assertThat(window2).extracting(User::getUsername).containsExactly("luke", "vader");
+	}
+
+	@Test // GH-4970
+	void testDerivedQueryReturningWindowByKeyset() {
+
+		Window<User> window1 = fragment.findTop2WindowByLastnameStartingWithOrderByUsername("S", ScrollPosition.keyset());
+		assertThat(window1).extracting(User::getUsername).containsExactly("han", "kylo");
+		assertThat(window1.positionAt(1)).isInstanceOf(KeysetScrollPosition.class);
+
+		Window<User> window2 = fragment.findTop2WindowByLastnameStartingWithOrderByUsername("S", window1.positionAt(1));
+		assertThat(window2).extracting(User::getUsername).containsExactly("luke", "vader");
+	}
+
+	@Test
+	void testAnnotatedFinderReturningSingleValueWithQuery() {
+
+		User user = fragment.findAnnotatedQueryByUsername("yoda");
+		assertThat(user).isNotNull().extracting(User::getUsername).isEqualTo("yoda");
+	}
+
+	@Test
+	void testAnnotatedCount() {
+
+		Long value = fragment.countAnnotatedQueryByLastname("Skywalker");
+		assertThat(value).isEqualTo(2L);
+	}
+
+	@Test
+	void testAnnotatedFinderReturningListWithQuery() {
+
+		List<User> users = fragment.findAnnotatedQueryByLastname("S");
+		assertThat(users).extracting(User::getUsername).containsExactlyInAnyOrder("han", "kylo", "luke", "vader");
+	}
+
+	@Test
+	void testAnnotatedMultilineFinderWithQuery() {
+
+		List<User> users = fragment.findAnnotatedMultilineQueryByLastname("S");
+		assertThat(users).extracting(User::getUsername).containsExactlyInAnyOrder("han", "kylo", "luke", "vader");
+	}
+
+	@Test
+	void testAnnotatedFinderWithQueryAndLimit() {
+
+		List<User> users = fragment.findAnnotatedQueryByLastname("S", Limit.of(2));
+		assertThat(users).hasSize(2);
+	}
+
+	@Test
+	void testAnnotatedFinderWithQueryAndSort() {
+
+		List<User> users = fragment.findAnnotatedQueryByLastname("S", Sort.by("username"));
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo", "luke", "vader");
+	}
+
+	@Test
+	void testAnnotatedFinderWithQueryLimitAndSort() {
+
+		List<User> users = fragment.findAnnotatedQueryByLastname("S", Limit.of(2), Sort.by("username"));
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testAnnotatedFinderReturningListWithPageable() {
+
+		List<User> users = fragment.findAnnotatedQueryByLastname("S", PageRequest.of(0, 2, Sort.by("username")));
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testAnnotatedFinderReturningPage() {
+
+		Page<User> page = fragment.findAnnotatedQueryPageOfUsersByLastname("S", PageRequest.of(0, 2, Sort.by("username")));
+		assertThat(page.getTotalElements()).isEqualTo(4);
+		assertThat(page.getSize()).isEqualTo(2);
+		assertThat(page.getContent()).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testAnnotatedFinderReturningSlice() {
+
+		Slice<User> slice = fragment.findAnnotatedQuerySliceOfUsersByLastname("S",
+				PageRequest.of(0, 2, Sort.by("username")));
+		assertThat(slice.hasNext()).isTrue();
+		assertThat(slice.getSize()).isEqualTo(2);
+		assertThat(slice.getContent()).extracting(User::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testDeleteSingle() {
+
+		User result = fragment.deleteByUsername("yoda");
+
+		assertThat(result).isNotNull().extracting(User::getUsername).isEqualTo("yoda");
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").countDocuments()).isEqualTo(6L);
+	}
+
+	@Test
+	void testDeleteSingleAnnotatedQuery() {
+
+		User result = fragment.deleteAnnotatedQueryByUsername("yoda");
+
+		assertThat(result).isNotNull().extracting(User::getUsername).isEqualTo("yoda");
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").countDocuments()).isEqualTo(6L);
+	}
+
+	@Test
+	void testDerivedDeleteMultipleReturningDeleteCount() {
+
+		Long result = fragment.deleteByLastnameStartingWith("S");
+
+		assertThat(result).isEqualTo(4L);
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").countDocuments()).isEqualTo(3L);
+	}
+
+	@Test
+	void testDerivedDeleteMultipleReturningDeleteCountAnnotatedQuery() {
+
+		Long result = fragment.deleteAnnotatedQueryByLastnameStartingWith("S");
+
+		assertThat(result).isEqualTo(4L);
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").countDocuments()).isEqualTo(3L);
+	}
+
+	@Test
+	void testDerivedDeleteMultipleReturningDeleted() {
+
+		List<User> result = fragment.deleteUsersByLastnameStartingWith("S");
+
+		assertThat(result).extracting(User::getUsername).containsExactlyInAnyOrder("han", "kylo", "luke", "vader");
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").countDocuments()).isEqualTo(3L);
+	}
+
+	@Test
+	void testDerivedDeleteMultipleReturningDeletedAnnotatedQuery() {
+
+		List<User> result = fragment.deleteUsersAnnotatedQueryByLastnameStartingWith("S");
+
+		assertThat(result).extracting(User::getUsername).containsExactlyInAnyOrder("han", "kylo", "luke", "vader");
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").countDocuments()).isEqualTo(3L);
+	}
+
+	@Test
+	void testDerivedFinderWithAnnotatedSort() {
+
+		List<User> users = fragment.findWithAnnotatedSortByLastnameStartingWith("S");
+		assertThat(users).extracting(User::getUsername).containsExactly("han", "kylo", "luke", "vader");
+	}
+
+	@Test
+	void testDerivedFinderWithAnnotatedFieldsProjection() {
+
+		List<User> users = fragment.findWithAnnotatedFieldsProjectionByLastnameStartingWith("S");
+		assertThat(users).allMatch(
+				user -> StringUtils.hasText(user.getUsername()) && user.getLastname() == null && user.getFirstname() == null);
+	}
+
+	@Test
+	void testReadPreferenceAppliedToQuery() {
+
+		// check if it fails when trying to parse the read preference to indicate it would get applied
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> fragment.findWithReadPreferenceByUsername("S"))
+				.withMessageContaining("No match for read preference");
+	}
+
+	@Test
+	void testDerivedFinderReturningListOfProjections() {
+
+		List<UserProjection> users = fragment.findUserProjectionByLastnameStartingWith("S");
+		assertThat(users).extracting(UserProjection::getUsername).containsExactlyInAnyOrder("han", "kylo", "luke", "vader");
+	}
+
+	@Test
+	void testDerivedFinderReturningPageOfProjections() {
+
+		Page<UserProjection> users = fragment.findUserProjectionByLastnameStartingWith("S",
+				PageRequest.of(0, 2, Sort.by("username")));
+		assertThat(users).extracting(UserProjection::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test // GH-4970
+	void testDerivedFinderReturningPageOfDynamicProjections() {
+
+		Page<UserProjection> users = fragment.findUserProjectionByLastnameStartingWith("S",
+				PageRequest.of(0, 2, Sort.by("username")), UserProjection.class);
+		assertThat(users).extracting(UserProjection::getUsername).containsExactly("han", "kylo");
+	}
+
+	@Test
+	void testUpdateWithDerivedQuery() {
+
+		int modifiedCount = fragment.findUserAndIncrementVisitsByLastname("Organa", 42);
+
+		assertThat(modifiedCount).isOne();
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").find(new Document("_id", "id-2")).first().get("visits",
+				Integer.class)).isEqualTo(42);
+	}
+
+	@Test
+	void testUpdateWithAnnotatedQuery() {
+
+		int modifiedCount = fragment.updateAllByLastname("Organa", 42);
+
+		assertThat(modifiedCount).isOne();
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").find(new Document("_id", "id-2")).first().get("visits",
+				Integer.class)).isEqualTo(42);
+	}
+
+	@Test
+	void testAggregationPipelineUpdate() {
+
+		fragment.findAndIncrementVisitsViaPipelineByLastname("Organa", 42);
+
+		assertThat(client.getDatabase(DB_NAME).getCollection("user").find(new Document("_id", "id-2")).first().get("visits",
+				Integer.class)).isEqualTo(42);
+	}
+
+	@Test
+	void testAggregationWithExtractedSimpleResults() {
+
+		List<String> allLastnames = fragment.findAllLastnames();
+		assertThat(allLastnames).containsExactlyInAnyOrder("Skywalker", "Solo", "Organa", "Solo", "Skywalker");
+	}
+
+	@Test
+	void testAggregationWithProjectedResults() {
+
+		List<UserAggregate> allLastnames = fragment.groupByLastnameAnd("first_name");
+		assertThat(allLastnames).containsExactlyInAnyOrder(//
+				new UserAggregate("Skywalker", List.of("Anakin", "Luke")), //
+				new UserAggregate("Organa", List.of("Leia")), //
+				new UserAggregate("Solo", List.of("Han", "Ben")));
+	}
+
+	@Test
+	void testAggregationWithProjectedResultsLimitedByPageable() {
+
+		List<UserAggregate> allLastnames = fragment.groupByLastnameAnd("first_name", PageRequest.of(1, 1, Sort.by("_id")));
+		assertThat(allLastnames).containsExactly(//
+				new UserAggregate("Skywalker", List.of("Anakin", "Luke")) //
+		);
+	}
+
+	@Test
+	void testAggregationWithProjectedResultsAsPage() {
+
+		Slice<UserAggregate> allLastnames = fragment.groupByLastnameAndReturnPage("first_name",
+				PageRequest.of(1, 1, Sort.by("_id")));
+		assertThat(allLastnames.hasPrevious()).isTrue();
+		assertThat(allLastnames.hasNext()).isTrue();
+		assertThat(allLastnames.getContent()).containsExactly(//
+				new UserAggregate("Skywalker", List.of("Anakin", "Luke")) //
+		);
+	}
+
+	@Test
+	void testAggregationWithProjectedResultsWrappedInAggregationResults() {
+
+		AggregationResults<UserAggregate> allLastnames = fragment.groupByLastnameAndAsAggregationResults("first_name");
+		assertThat(allLastnames.getMappedResults()).containsExactlyInAnyOrder(//
+				new UserAggregate("Skywalker", List.of("Anakin", "Luke")), //
+				new UserAggregate("Organa", List.of("Leia")), //
+				new UserAggregate("Solo", List.of("Han", "Ben")));
+	}
+
+	@Test // GH-4970
+	void testAggregationStreamWithProjectedResultsWrappedInAggregationResults() {
+
+		List<UserAggregate> allLastnames = fragment.streamGroupByLastnameAndAsAggregationResults("first_name").toList();
+		assertThat(allLastnames).containsExactlyInAnyOrder(//
+				new UserAggregate("Skywalker", List.of("Anakin", "Luke")), //
+				new UserAggregate("Organa", List.of("Leia")), //
+				new UserAggregate("Solo", List.of("Han", "Ben")));
+	}
+
+	@Test
+	void testAggregationWithSingleResultExtraction() {
+		assertThat(fragment.sumPosts()).isEqualTo(5);
+	}
+
+	@Test
+	void testAggregationWithHint() {
+		assertThatException().isThrownBy(() -> fragment.findAllLastnamesUsingIndex())
+				.withMessageContaining("hint provided does not correspond to an existing index");
+	}
+
+	@Test
+	void testAggregationWithReadPreference() {
+		assertThatException().isThrownBy(() -> fragment.findAllLastnamesWithReadPreference())
+				.withMessageContaining("No match for read preference");
+	}
+
+	@Test
+	void testAggregationWithCollation() {
+		assertThatException().isThrownBy(() -> fragment.findAllLastnamesWithCollation())
+				.withMessageContaining("'locale' is invalid");
+	}
+
+	private static void initUsers() {
+
+		Document luke = Document.parse("""
+				{
+				  "_id": "id-1",
+				  "username": "luke",
+				  "first_name": "Luke",
+				  "last_name": "Skywalker",
+				  "visits" : 2,
+				  "lastSeen" : {
+				    "$date": "2025-04-01T00:00:00.000Z"
+				   },
+				  "posts": [
+				    {
+				      "message": "I have a bad feeling about this.",
+				      "date": {
+				        "$date": "2025-01-15T12:50:33.855Z"
+				      }
+				    }
+				  ],
+				  "_class": "example.springdata.aot.User"
+				}""");
+
+		Document leia = Document.parse("""
+				{
+				  "_id": "id-2",
+				  "username": "leia",
+				  "first_name": "Leia",
+				  "last_name": "Organa",
+				  "_class": "example.springdata.aot.User"
+				}""");
+
+		Document han = Document.parse("""
+				{
+				  "_id": "id-3",
+				  "username": "han",
+				  "first_name": "Han",
+				  "last_name": "Solo",
+				  "posts": [
+				    {
+				      "message": "It's the ship that made the Kessel Run in less than 12 Parsecs.",
+				      "date": {
+				        "$date": "2025-01-15T13:30:33.855Z"
+				      }
+				    }
+				  ],
+				  "_class": "example.springdata.aot.User"
+				}""");
+
+		Document chwebacca = Document.parse("""
+				{
+				  "_id": "id-4",
+				  "username": "chewbacca",
+				  "lastSeen" : {
+				    "$date": "2025-01-01T00:00:00.000Z"
+				   },
+				  "_class": "example.springdata.aot.User"
+				}""");
+
+		Document yoda = Document.parse(
+				"""
+						{
+						  "_id": "id-5",
+						  "username": "yoda",
+						  "visits" : 1000,
+						  "posts": [
+						    {
+						      "message": "Do. Or do not. There is no try.",
+						      "date": {
+						        "$date": "2025-01-15T13:09:33.855Z"
+						      }
+						    },
+						    {
+						      "message": "Decide you must, how to serve them best. If you leave now, help them you could; but you would destroy all for which they have fought, and suffered.",
+						      "date": {
+						        "$date": "2025-01-15T13:53:33.855Z"
+						      }
+						    }
+						  ]
+						}""");
+
+		Document vader = Document.parse("""
+				{
+				  "_id": "id-6",
+				  "username": "vader",
+				  "first_name": "Anakin",
+				  "last_name": "Skywalker",
+				  "visits" : 50,
+				  "posts": [
+				    {
+				      "message": "I am your father",
+				      "date": {
+				        "$date": "2025-01-15T13:46:33.855Z"
+				      }
+				    }
+				  ]
+				}""");
+
+		Document kylo = Document.parse("""
+				{
+				  "_id": "id-7",
+				  "username": "kylo",
+				  "first_name": "Ben",
+				  "last_name": "Solo"
+				}
+				""");
+
+		client.getDatabase(DB_NAME).getCollection("user")
+				.insertMany(List.of(luke, leia, han, chwebacca, yoda, vader, kylo));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java
new file mode 100644
index 0000000000..bc70b4ded7
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryContributorUnitTests.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import static org.mockito.Mockito.*;
+import static org.springframework.data.mongodb.test.util.Assertions.*;
+
+import example.aot.User;
+import example.aot.UserRepository;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.aot.generate.GeneratedFiles;
+import org.springframework.aot.test.generate.TestGenerationContext;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.InputStreamSource;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.repository.Meta;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+/**
+ * Unit tests for the {@link UserRepository} fragment sources via {@link MongoRepositoryContributor}.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(MongoClientExtension.class)
+@SpringJUnitConfig(classes = MongoRepositoryContributorUnitTests.MongoRepositoryContributorConfiguration.class)
+class MongoRepositoryContributorUnitTests {
+
+	@Configuration
+	static class MongoRepositoryContributorConfiguration extends AotFragmentTestConfigurationSupport {
+
+		public MongoRepositoryContributorConfiguration() {
+			super(MetaUserRepository.class);
+		}
+
+		@Bean
+		MongoOperations mongoOperations() {
+			return mock(MongoOperations.class);
+		}
+
+	}
+
+	@Autowired TestGenerationContext generationContext;
+
+	@Test // GH-4970
+	void shouldConsiderMetaAnnotation() throws IOException {
+
+		InputStreamSource aotFragment = generationContext.getGeneratedFiles().getGeneratedFile(GeneratedFiles.Kind.SOURCE,
+				MetaUserRepository.class.getPackageName().replace('.', '/') + "/MetaUserRepositoryImpl__Aot.java");
+
+		String content = new InputStreamResource(aotFragment).getContentAsString(StandardCharsets.UTF_8);
+
+		assertThat(content).contains("filterQuery.maxTimeMsec(555)");
+		assertThat(content).contains("filterQuery.cursorBatchSize(1234)");
+		assertThat(content).contains("filterQuery.comment(\"foo\")");
+	}
+
+	interface MetaUserRepository extends CrudRepository<User, String> {
+
+		@Meta
+		User findAllByLastname(String lastname);
+
+		@Meta(cursorBatchSize = 1234, comment = "foo", maxExecutionTimeMs = 555)
+		User findWithMetaAllByLastname(String lastname);
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryMetadataTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryMetadataTests.java
new file mode 100644
index 0000000000..aa069a2710
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/MongoRepositoryMetadataTests.java
@@ -0,0 +1,192 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.*;
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import example.aot.UserRepository;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.core.io.Resource;
+import org.springframework.core.io.UrlResource;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.test.util.MongoClientExtension;
+import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
+
+/**
+ * Integration tests for the {@link UserRepository} JSON metadata via {@link MongoRepositoryContributor}.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(MongoClientExtension.class)
+@SpringJUnitConfig(classes = MongoRepositoryMetadataTests.MongoRepositoryContributorConfiguration.class)
+class MongoRepositoryMetadataTests {
+
+	@Configuration
+	static class MongoRepositoryContributorConfiguration extends AotFragmentTestConfigurationSupport {
+
+		public MongoRepositoryContributorConfiguration() {
+			super(UserRepository.class);
+		}
+
+		@Bean
+		MongoOperations mongoOperations() {
+			return mock(MongoOperations.class);
+		}
+
+	}
+
+	@Autowired AbstractApplicationContext context;
+
+	@Test // GH-4964
+	void shouldDocumentBase() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).isObject() //
+				.containsEntry("name", UserRepository.class.getName()) //
+				.containsEntry("module", "MongoDB") //
+				.containsEntry("type", "IMPERATIVE");
+	}
+
+	@Test // GH-4964
+	void shouldDocumentDerivedQuery() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'countUsersByLastname')].query").isArray().element(0).isObject()
+				.containsEntry("filter", "{'lastname':?0}");
+	}
+
+	@Test // GH-4964
+	void shouldDocumentSortedQuery() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'findByLastnameStartingWithOrderByUsername')].query") //
+				.isArray().element(0).isObject() //
+				.containsEntry("filter", "{'lastname':{'$regex':/^\\Q?0\\E/}}")
+				.containsEntry("sort", "{'username':{'$numberInt':'1'}}");
+	}
+
+	@Test // GH-4964
+	void shouldDocumentPagedQuery() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'findPageOfUsersByLastnameStartingWith')].query").isArray()
+				.element(0).isObject().containsEntry("filter", "{'lastname':{'$regex':/^\\Q?0\\E/}}");
+	}
+
+	@Test // GH-4964
+	@Disabled("No support for expressions yet")
+	void shouldDocumentQueryWithExpression() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'findValueExpressionNamedByEmailAddress')].query").isArray()
+				.first().isObject().containsEntry("query", "select u from User u where u.emailAddress = :__$synthetic$__1");
+	}
+
+	@Test // GH-4964
+	void shouldDocumentAggregation() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'findAllLastnames')].query").isArray().element(0).isObject()
+				.containsEntry("pipeline",
+						"[{ '$match' : { 'last_name' : { '$ne' : null } } }, { '$project': { '_id' : '$last_name' } }]");
+	}
+
+	@Test // GH-4964
+	void shouldDocumentPipelineUpdate() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'findAndIncrementVisitsViaPipelineByLastname')].query").isArray()
+				.element(0).isObject().containsEntry("filter", "{'lastname':?0}").containsEntry("update-pipeline",
+						"[{ '$set' : { 'visits' : { '$ifNull' : [ {'$add' : [ '$visits', ?1 ] }, ?1 ] } } }]");
+	}
+
+	@Test // GH-4964
+	void shouldDocumentBaseFragment() throws IOException {
+
+		Resource resource = getResource();
+
+		assertThat(resource).isNotNull();
+		assertThat(resource.exists()).isTrue();
+
+		String json = resource.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'existsById')].fragment").isArray().first().isObject()
+				.containsEntry("fragment", "org.springframework.data.mongodb.repository.support.SimpleMongoRepository");
+	}
+
+	private Resource getResource() {
+
+		String location = UserRepository.class.getPackageName().replace('.', '/') + "/"
+				+ UserRepository.class.getSimpleName() + ".json";
+		return new UrlResource(context.getBeanFactory().getBeanClassLoader().getResource(location));
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/ReactiveAotContributionIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/ReactiveAotContributionIntegrationTests.java
new file mode 100644
index 0000000000..24b89345a8
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/ReactiveAotContributionIntegrationTests.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import static net.javacrumbs.jsonunit.assertj.JsonAssertions.assertThatJson;
+import static org.mockito.Mockito.mock;
+
+import example.aot.User;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.aot.generate.GeneratedFiles;
+import org.springframework.aot.test.generate.TestGenerationContext;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.FilterType;
+import org.springframework.context.aot.ApplicationContextAotGenerator;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.core.io.InputStreamSource;
+import org.springframework.data.aot.AotContext;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
+import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.mock.env.MockPropertySource;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Integration tests for AOT processing of reactive repositories.
+ *
+ * @author Mark Paluch
+ */
+class ReactiveAotContributionIntegrationTests {
+
+	@EnableReactiveMongoRepositories(considerNestedRepositories = true, includeFilters = {
+			@ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = ReactiveQuerydslUserRepository.class) })
+	static class AotConfiguration extends AbstractMongoClientConfiguration {
+
+		@Override
+		public MongoClient mongoClient() {
+			return mock(MongoClient.class);
+		}
+
+		@Override
+		protected String getDatabaseName() {
+			return "";
+		}
+	}
+
+	interface ReactiveQuerydslUserRepository
+			extends CrudRepository<User, String>, ReactiveQuerydslPredicateExecutor<User> {
+
+		Flux<User> findUserNoArgumentsBy();
+
+		Mono<User> findOneByUsername(String username);
+
+	}
+
+	@Test // GH-4964
+	void shouldGenerateMetadataForBaseRepositoryAndQuerydslFragment() throws IOException {
+
+		TestGenerationContext generationContext = generate(AotConfiguration.class);
+
+		InputStreamSource metadata = generationContext.getGeneratedFiles().getGeneratedFile(GeneratedFiles.Kind.RESOURCE,
+				ReactiveQuerydslUserRepository.class.getName().replace('.', '/') + ".json");
+
+		InputStreamResource isr = new InputStreamResource(metadata);
+		String json = isr.getContentAsString(StandardCharsets.UTF_8);
+
+		assertThatJson(json).isObject() //
+				.containsEntry("name", ReactiveQuerydslUserRepository.class.getName()) //
+				.containsEntry("module", "MongoDB") //
+				.containsEntry("type", "REACTIVE");
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'findBy')].fragment").isArray().first().isObject()
+				.containsEntry("interface", "org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor")
+				.containsEntry("fragment",
+						"org.springframework.data.mongodb.repository.support.ReactiveQuerydslMongoPredicateExecutor");
+
+		assertThatJson(json).inPath("$.methods[?(@.name == 'existsById')].fragment").isArray().first().isObject()
+				.containsEntry("fragment", "org.springframework.data.mongodb.repository.support.SimpleReactiveMongoRepository");
+	}
+
+	private static TestGenerationContext generate(Class<?>... configurationClasses) {
+
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		context.getEnvironment().getPropertySources()
+				.addFirst(new MockPropertySource().withProperty(AotContext.GENERATED_REPOSITORIES_ENABLED, "true"));
+		context.register(configurationClasses);
+
+		ApplicationContextAotGenerator generator = new ApplicationContextAotGenerator();
+
+		TestGenerationContext generationContext = new TestGenerationContext();
+		generator.processAheadOfTime(context, generationContext);
+		return generationContext;
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/RepositoryRuntimeHintsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/RepositoryRuntimeHintsUnitTests.java
new file mode 100644
index 0000000000..2978c07b64
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/RepositoryRuntimeHintsUnitTests.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2023-2025 the original author 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.repository.aot;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
+import org.springframework.data.mongodb.classloading.HidingClassLoader;
+import org.springframework.data.mongodb.repository.support.CrudMethodMetadata;
+import org.springframework.data.mongodb.repository.support.QuerydslMongoPredicateExecutor;
+import org.springframework.data.mongodb.repository.support.ReactiveQuerydslMongoPredicateExecutor;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * Unit tests for {@link RepositoryRuntimeHints}.
+ *
+ * @author Christoph Strobl
+ */
+class RepositoryRuntimeHintsUnitTests {
+
+	@Test // GH-4244
+	void registersTypesForQuerydslIntegration() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+		new RepositoryRuntimeHints().registerHints(runtimeHints, null);
+
+		assertThat(runtimeHints).matches(RuntimeHintsPredicates.reflection().onType(QuerydslMongoPredicateExecutor.class)
+				.and(RuntimeHintsPredicates.reflection().onType(ReactiveQuerydslMongoPredicateExecutor.class)));
+	}
+
+	@Test // GH-4244
+	void onlyRegistersReactiveTypesForQuerydslIntegrationWhenNoSyncClientPresent() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+		new RepositoryRuntimeHints().registerHints(runtimeHints, HidingClassLoader.hide(MongoClient.class));
+
+		assertThat(runtimeHints).matches(RuntimeHintsPredicates.reflection().onType(QuerydslMongoPredicateExecutor.class)
+				.negate().and(RuntimeHintsPredicates.reflection().onType(ReactiveQuerydslMongoPredicateExecutor.class)));
+	}
+
+	@Test // GH-4244
+	@Disabled("TODO: ReactiveWrappers does not support ClassLoader")
+	void doesNotRegistersReactiveTypesForQuerydslIntegrationWhenReactorNotPresent() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+		new RepositoryRuntimeHints().registerHints(runtimeHints, new HidingClassLoader("reactor.core"));
+
+		assertThat(runtimeHints).matches(RuntimeHintsPredicates.reflection().onType(QuerydslMongoPredicateExecutor.class)
+				.and(RuntimeHintsPredicates.reflection().onType(ReactiveQuerydslMongoPredicateExecutor.class).negate()));
+	}
+
+	@Test // GH-2971, GH-4534
+	void registersProxyForCrudMethodMetadata() {
+
+		RuntimeHints runtimeHints = new RuntimeHints();
+		new RepositoryRuntimeHints().registerHints(runtimeHints, null);
+
+		assertThat(runtimeHints).matches(RuntimeHintsPredicates.proxies().forInterfaces(CrudMethodMetadata.class, //
+				org.springframework.aop.SpringProxy.class, //
+				org.springframework.aop.framework.Advised.class, //
+				org.springframework.core.DecoratingProxy.class));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/StubRepositoryInformation.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/StubRepositoryInformation.java
new file mode 100644
index 0000000000..7092848c33
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/StubRepositoryInformation.java
@@ -0,0 +1,140 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.lang.reflect.Method;
+import java.util.List;
+import java.util.Set;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.data.mongodb.repository.support.SimpleMongoRepository;
+import org.springframework.data.repository.core.CrudMethods;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFragment;
+import org.springframework.data.util.TypeInformation;
+
+/**
+ * @author Christoph Strobl
+ */
+class StubRepositoryInformation implements RepositoryInformation {
+
+	private final RepositoryMetadata metadata;
+	private final RepositoryComposition baseComposition;
+
+	public StubRepositoryInformation(Class<?> repositoryInterface, @Nullable RepositoryComposition composition) {
+
+		this.metadata = AbstractRepositoryMetadata.getMetadata(repositoryInterface);
+		this.baseComposition = composition != null ? composition
+				: RepositoryComposition.of(RepositoryFragment.structural(SimpleMongoRepository.class));
+	}
+
+	@Override
+	public TypeInformation<?> getIdTypeInformation() {
+		return metadata.getIdTypeInformation();
+	}
+
+	@Override
+	public TypeInformation<?> getDomainTypeInformation() {
+		return metadata.getDomainTypeInformation();
+	}
+
+	@Override
+	public Class<?> getRepositoryInterface() {
+		return metadata.getRepositoryInterface();
+	}
+
+	@Override
+	public TypeInformation<?> getReturnType(Method method) {
+		return metadata.getReturnType(method);
+	}
+
+	@Override
+	public Class<?> getReturnedDomainClass(Method method) {
+		return metadata.getReturnedDomainClass(method);
+	}
+
+	@Override
+	public TypeInformation<?> getReturnedDomainTypeInformation(Method method) {
+		return metadata.getReturnedDomainTypeInformation(method);
+	}
+
+	@Override
+	public CrudMethods getCrudMethods() {
+		return metadata.getCrudMethods();
+	}
+
+	@Override
+	public boolean isPagingRepository() {
+		return false;
+	}
+
+	@Override
+	public Set<Class<?>> getAlternativeDomainTypes() {
+		return null;
+	}
+
+	@Override
+	public boolean isReactiveRepository() {
+		return false;
+	}
+
+	@Override
+	public Set<RepositoryFragment<?>> getFragments() {
+		return null;
+	}
+
+	@Override
+	public boolean isBaseClassMethod(Method method) {
+		return baseComposition.findMethod(method).isPresent();
+	}
+
+	@Override
+	public boolean isCustomMethod(Method method) {
+		return false;
+	}
+
+	@Override
+	public boolean isQueryMethod(Method method) {
+		if (isBaseClassMethod(method)) {
+			return false;
+		}
+
+		return true;
+	}
+
+	@Override
+	public List<Method> getQueryMethods() {
+		return null;
+	}
+
+	@Override
+	public Class<?> getRepositoryBaseClass() {
+		return SimpleMongoRepository.class;
+	}
+
+	@Override
+	public Method getTargetClassMethod(Method method) {
+		return null;
+	}
+
+	@Override
+	public RepositoryComposition getRepositoryComposition() {
+		return baseComposition;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/TestMongoAotRepositoryContext.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/TestMongoAotRepositoryContext.java
new file mode 100644
index 0000000000..5f470dd550
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/aot/TestMongoAotRepositoryContext.java
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2025 the original author 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.repository.aot;
+
+import java.io.IOException;
+import java.lang.annotation.Annotation;
+import java.util.List;
+import java.util.Set;
+
+import org.jspecify.annotations.Nullable;
+
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
+import org.springframework.core.annotation.MergedAnnotation;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.test.tools.ClassFile;
+import org.springframework.data.mongodb.core.mapping.Document;
+import org.springframework.data.repository.config.AotRepositoryContext;
+import org.springframework.data.repository.config.RepositoryConfigurationSource;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+
+/**
+ * @author Christoph Strobl
+ */
+public class TestMongoAotRepositoryContext implements AotRepositoryContext {
+
+	private final StubRepositoryInformation repositoryInformation;
+	private final Environment environment = new StandardEnvironment();
+
+	public TestMongoAotRepositoryContext(Class<?> repositoryInterface, @Nullable RepositoryComposition composition) {
+		this.repositoryInformation = new StubRepositoryInformation(repositoryInterface, composition);
+	}
+
+	@Override
+	public ConfigurableListableBeanFactory getBeanFactory() {
+		return null;
+	}
+
+	@Override
+	public TypeIntrospector introspectType(String typeName) {
+		return null;
+	}
+
+	@Override
+	public IntrospectedBeanDefinition introspectBeanDefinition(String beanName) {
+		return null;
+	}
+
+	@Override
+	public String getBeanName() {
+		return "dummyRepository";
+	}
+
+	@Override
+	public String getModuleName() {
+		return "MongoDB";
+	}
+
+	@Override
+	public RepositoryConfigurationSource getConfigurationSource() {
+		return null;
+	}
+
+	@Override
+	public Set<String> getBasePackages() {
+		return Set.of("org.springframework.data.dummy.repository.aot");
+	}
+
+	@Override
+	public Set<Class<? extends Annotation>> getIdentifyingAnnotations() {
+		return Set.of(Document.class);
+	}
+
+	@Override
+	public RepositoryInformation getRepositoryInformation() {
+		return repositoryInformation;
+	}
+
+	@Override
+	public Set<MergedAnnotation<Annotation>> getResolvedAnnotations() {
+		return Set.of();
+	}
+
+	@Override
+	public Set<Class<?>> getResolvedTypes() {
+		return Set.of();
+	}
+
+	public List<ClassFile> getRequiredContextFiles() {
+		return List.of(classFileForType(repositoryInformation.getRepositoryBaseClass()));
+	}
+
+	static ClassFile classFileForType(Class<?> type) {
+
+		String name = type.getName();
+		ClassPathResource cpr = new ClassPathResource(name.replaceAll("\\.", "/") + ".class");
+
+		try {
+			return ClassFile.of(name, cpr.getContentAsByteArray());
+		} catch (IOException e) {
+			throw new IllegalArgumentException("Cannot open [%s].".formatted(cpr.getPath()));
+		}
+	}
+
+	@Override
+	public Environment getEnvironment() {
+		return environment;
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java
index 4dee786e62..90886d7760 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiExtensionIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,12 +17,12 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
 
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.mongodb.repository.Person;
 
@@ -36,7 +36,7 @@ public class CdiExtensionIntegrationTests {
 
 	static SeContainer container;
 
-	@BeforeClass
+	@BeforeAll
 	public static void setUp() {
 
 		container = SeContainerInitializer.newInstance() //
@@ -45,7 +45,7 @@ public static void setUp() {
 				.initialize();
 	}
 
-	@AfterClass
+	@AfterAll
 	public static void tearDown() {
 		container.close();
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiPersonRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiPersonRepository.java
index aad21fae76..0c79530dca 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiPersonRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/CdiPersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java
index c0164b0efa..ca094b9b8e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/MongoTemplateProducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,13 @@
  */
 package org.springframework.data.mongodb.repository.cdi;
 
-import javax.enterprise.context.ApplicationScoped;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Produces;
 
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoClientDbFactory;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-
-import com.mongodb.MongoClient;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 
 /**
@@ -38,7 +35,7 @@ class MongoTemplateProducer {
 	@ApplicationScoped
 	public MongoOperations createMongoTemplate() {
 
-		MongoDbFactory factory = new SimpleMongoClientDbFactory(MongoTestUtils.client(), "database");
+		MongoDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(MongoTestUtils.client(), "database");
 		return new MongoTemplate(factory);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java
index bf776839c9..514ed3e01a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/RepositoryClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  */
 package org.springframework.data.mongodb.repository.cdi;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 /**
  * @author Oliver Gierke
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragment.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragment.java
index f61abb761f..12b59d86a4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragment.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragmentImpl.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragmentImpl.java
index 3737b3f999..09e20b9bf2 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragmentImpl.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonFragmentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonRepository.java
index feb5a0ba23..140cb6ca36 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/cdi/SamplePersonRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java
index d911485f03..5480fe3e1b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,9 +17,8 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import org.junit.Before;
-import org.junit.Test;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionReader;
@@ -40,23 +39,21 @@
  * @author Oliver Gierke
  */
 @ContextConfiguration
-public class MongoNamespaceIntegrationTests extends AbstractPersonRepositoryIntegrationTests {
+class MongoNamespaceIntegrationTests extends AbstractPersonRepositoryIntegrationTests {
 
 	DefaultListableBeanFactory factory;
 	BeanDefinitionReader reader;
 
 	@Autowired ApplicationContext context;
 
-	@Before
-	@Override
+	@BeforeEach
 	public void setUp() throws InterruptedException {
-		super.setUp();
 		factory = new DefaultListableBeanFactory();
 		reader = new XmlBeanDefinitionReader(factory);
 	}
 
 	@Test
-	public void assertDefaultMappingContextIsWired() {
+	void assertDefaultMappingContextIsWired() {
 
 		reader.loadBeanDefinitions(new ClassPathResource("MongoNamespaceIntegrationTests-context.xml", getClass()));
 		BeanDefinition definition = factory.getBeanDefinition("personRepository");
@@ -64,7 +61,7 @@ public void assertDefaultMappingContextIsWired() {
 	}
 
 	@Test // DATAMONGO-581
-	public void exposesPersistentEntity() {
+	void exposesPersistentEntity() {
 
 		Repositories repositories = new Repositories(context);
 		PersistentEntity<?, ?> entity = repositories.getPersistentEntity(Person.class);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrarIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrarIntegrationTests.java
index efccbdebc1..7d116e25e9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrarIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrarIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2025 the original author 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,34 +20,33 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.data.mongodb.core.MongoOperations;
 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.repository.PersonRepository;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import com.mongodb.MongoClient;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration tests for {@link MongoRepositoriesRegistrar}.
  *
  * @author Oliver Gierke
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class MongoRepositoriesRegistrarIntegrationTests {
 
 	@Configuration
-	@EnableMongoRepositories(basePackages = "org.springframework.data.mongodb.repository")
+	@EnableMongoRepositories(basePackages = "org.springframework.data.mongodb.repository", includeFilters=@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = PersonRepository.class))
 	static class Config {
 
 		@Bean
 		public MongoOperations mongoTemplate() throws Exception {
-			return new MongoTemplate(new SimpleMongoClientDbFactory(MongoTestUtils.client(), "database"));
+			return new MongoTemplate(new SimpleMongoClientDatabaseFactory(MongoTestUtils.client(), "database"));
 		}
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrarUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrarUnitTests.java
new file mode 100644
index 0000000000..778ac61db1
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoriesRegistrarUnitTests.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2024-2025 the original author 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.repository.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.context.annotation.AnnotationBeanNameGenerator;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.data.mongodb.repository.PersonRepository;
+
+/**
+ * @author Christoph Strobl
+ */
+class MongoRepositoriesRegistrarUnitTests {
+
+	private BeanDefinitionRegistry registry;
+
+	@BeforeEach
+	void setUp() {
+		registry = new DefaultListableBeanFactory();
+	}
+
+	@ParameterizedTest // GH-499, GH-3440
+	@MethodSource(value = { "args" })
+	void configuresRepositoriesCorrectly(AnnotationMetadata metadata, String[] beanNames) {
+
+		MongoRepositoriesRegistrar registrar = new MongoRepositoriesRegistrar();
+		registrar.setResourceLoader(new DefaultResourceLoader());
+		registrar.setEnvironment(new StandardEnvironment());
+		registrar.registerBeanDefinitions(metadata, registry);
+
+		Iterable<String> names = Arrays.asList(registry.getBeanDefinitionNames());
+		assertThat(names).contains(beanNames);
+	}
+
+	static Stream<Arguments> args() {
+		return Stream.of(
+				Arguments.of(AnnotationMetadata.introspect(Config.class),
+						new String[] { "personRepository", "samplePersonRepository", "contactRepository" }),
+				Arguments.of(AnnotationMetadata.introspect(ConfigWithBeanNameGenerator.class),
+						new String[] { "personREPO", "samplePersonREPO", "contactREPO" }));
+	}
+
+	@EnableMongoRepositories(basePackageClasses = PersonRepository.class)
+	private class Config {
+
+	}
+
+	@EnableMongoRepositories(basePackageClasses = PersonRepository.class, nameGenerator = MyBeanNameGenerator.class)
+	private class ConfigWithBeanNameGenerator {
+
+	}
+
+	static class MyBeanNameGenerator extends AnnotationBeanNameGenerator {
+
+		@Override
+		public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
+			return super.generateBeanName(definition, registry).replaceAll("Repository", "REPO");
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtensionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtensionUnitTests.java
index dafe97a2be..a222deca39 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtensionUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/MongoRepositoryConfigurationExtensionUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 import java.util.Collection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -27,7 +27,7 @@
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.type.StandardAnnotationMetadata;
+import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.repository.MongoRepository;
 import org.springframework.data.repository.Repository;
@@ -43,13 +43,13 @@
  */
 public class MongoRepositoryConfigurationExtensionUnitTests {
 
-	StandardAnnotationMetadata metadata = new StandardAnnotationMetadata(Config.class, true);
+	AnnotationMetadata metadata = AnnotationMetadata.introspect(Config.class);
 	ResourceLoader loader = new PathMatchingResourcePatternResolver();
 	Environment environment = new StandardEnvironment();
 	BeanDefinitionRegistry registry = new DefaultListableBeanFactory();
 
 	RepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
-			EnableMongoRepositories.class, loader, environment, registry);
+			EnableMongoRepositories.class, loader, environment, registry, null);
 
 	@Test // DATAMONGO-1009
 	public void isStrictMatchIfDomainTypeIsAnnotatedWithDocument() {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarIntegrationTests.java
index 201207096c..402f13a47b 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,6 +18,7 @@
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
@@ -25,18 +26,17 @@
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
 import org.springframework.data.mongodb.repository.ReactivePersonRepository;
-import org.springframework.data.mongodb.test.util.MongoTestUtils;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
-import com.mongodb.reactivestreams.client.MongoClients;
+import com.mongodb.reactivestreams.client.MongoClient;
 
 /**
  * Integration tests for {@link ReactiveMongoRepositoriesRegistrar}.
  *
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class ReactiveMongoRepositoriesRegistrarIntegrationTests {
 
@@ -47,7 +47,7 @@ static class Config {
 		@Bean
 		public ReactiveMongoTemplate reactiveMongoTemplate() throws Exception {
 			return new ReactiveMongoTemplate(
-					new SimpleReactiveMongoDatabaseFactory(MongoTestUtils.reactiveClient(), "database"));
+					new SimpleReactiveMongoDatabaseFactory(Mockito.mock(MongoClient.class), "database"));
 		}
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarUnitTests.java
new file mode 100644
index 0000000000..332ff06ee4
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoriesRegistrarUnitTests.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2024-2025 the original author 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.repository.config;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.Arrays;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.context.annotation.AnnotationBeanNameGenerator;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.core.io.DefaultResourceLoader;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.data.mongodb.repository.PersonRepository;
+
+/**
+ * @author Christoph Strobl
+ */
+class ReactiveMongoRepositoriesRegistrarUnitTests {
+
+	private BeanDefinitionRegistry registry;
+
+	@BeforeEach
+	void setUp() {
+		registry = new DefaultListableBeanFactory();
+	}
+
+	@ParameterizedTest // GH-499, GH-3440
+	@MethodSource(value = { "args" })
+	void configuresRepositoriesCorrectly(AnnotationMetadata metadata, String[] beanNames) {
+
+		ReactiveMongoRepositoriesRegistrar registrar = new ReactiveMongoRepositoriesRegistrar();
+		registrar.setResourceLoader(new DefaultResourceLoader());
+		registrar.setEnvironment(new StandardEnvironment());
+		registrar.registerBeanDefinitions(metadata, registry);
+
+		Iterable<String> names = Arrays.asList(registry.getBeanDefinitionNames());
+		assertThat(names).contains(beanNames);
+	}
+
+	static Stream<Arguments> args() {
+		return Stream.of(
+				Arguments.of(AnnotationMetadata.introspect(Config.class), new String[] { "reactivePersonRepository" }),
+				Arguments.of(AnnotationMetadata.introspect(ConfigWithBeanNameGenerator.class),
+						new String[] { "reactivePersonREPO" }));
+	}
+
+	@EnableReactiveMongoRepositories(basePackageClasses = PersonRepository.class)
+	private class Config {
+
+	}
+
+	@EnableReactiveMongoRepositories(basePackageClasses = PersonRepository.class,
+			nameGenerator = MyBeanNameGenerator.class)
+	private class ConfigWithBeanNameGenerator {
+
+	}
+
+	static class MyBeanNameGenerator extends AnnotationBeanNameGenerator {
+
+		@Override
+		public String generateBeanName(BeanDefinition definition, BeanDefinitionRegistry registry) {
+			return super.generateBeanName(definition, registry).replaceAll("Repository", "REPO");
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java
index 3722635eff..2b52204f74 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/ReactiveMongoRepositoryConfigurationExtensionUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 
 import java.util.Collection;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -27,14 +27,14 @@
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.core.io.support.PathMatchingResourcePatternResolver;
-import org.springframework.core.type.StandardAnnotationMetadata;
+import org.springframework.core.type.AnnotationMetadata;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfiguration;
 import org.springframework.data.repository.config.RepositoryConfigurationSource;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
-import org.springframework.data.repository.reactive.RxJava2CrudRepository;
+import org.springframework.data.repository.reactive.RxJava3CrudRepository;
 
 /**
  * Unit tests for {@link ReactiveMongoRepositoryConfigurationExtension}.
@@ -43,13 +43,13 @@
  */
 public class ReactiveMongoRepositoryConfigurationExtensionUnitTests {
 
-	StandardAnnotationMetadata metadata = new StandardAnnotationMetadata(Config.class, true);
+	AnnotationMetadata metadata = AnnotationMetadata.introspect(Config.class);
 	ResourceLoader loader = new PathMatchingResourcePatternResolver();
 	Environment environment = new StandardEnvironment();
 	BeanDefinitionRegistry registry = new DefaultListableBeanFactory();
 
 	RepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
-			EnableReactiveMongoRepositories.class, loader, environment, registry);
+			EnableReactiveMongoRepositories.class, loader, environment, registry, null);
 
 	@Test // DATAMONGO-1444
 	public void isStrictMatchIfDomainTypeIsAnnotatedWithDocument() {
@@ -108,7 +108,7 @@ static class Store {}
 
 	interface SampleRepository extends ReactiveCrudRepository<Sample, Long> {}
 
-	interface UnannotatedRepository extends RxJava2CrudRepository<Store, Long> {}
+	interface UnannotatedRepository extends RxJava3CrudRepository<Store, Long> {}
 
 	interface StoreRepository extends ReactiveMongoRepository<Store, Long> {}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/AllowNestedMongoRepositoriesRepositoryConfigTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/AllowNestedMongoRepositoriesRepositoryConfigTests.java
index dddfced0a1..cc36c6cafb 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/AllowNestedMongoRepositoriesRepositoryConfigTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/AllowNestedMongoRepositoriesRepositoryConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,14 +23,14 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.repository.config.lazy.ClassWithNestedRepository.NestedUserRepository;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration test for repository namespace configuration with nested repositories.
  *
  * @author Thomas Darimont
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("AllowNestedMongoRepositoriesRepositoryConfigTests-context.xml")
 public class AllowNestedMongoRepositoriesRepositoryConfigTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/ClassWithNestedRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/ClassWithNestedRepository.java
index a971e08b52..1827559ffd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/ClassWithNestedRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/ClassWithNestedRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/NestedMongoRepositoriesJavaConfigTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/NestedMongoRepositoriesJavaConfigTests.java
index 9a39c5f272..c64b831270 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/NestedMongoRepositoriesJavaConfigTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/config/lazy/NestedMongoRepositoriesJavaConfigTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author 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,14 +27,14 @@
 import org.springframework.data.mongodb.repository.config.lazy.ClassWithNestedRepository.NestedUserRepository;
 import org.springframework.data.repository.support.Repositories;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration test for the combination of JavaConfig and an {@link Repositories} wrapper.
  *
  * @author Thomas Darimont
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class NestedMongoRepositoriesJavaConfigTests {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepository.java
index b60069c2ba..3693f60780 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepositoryImplementationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepositoryImplementationTests.java
index 04df3d10de..4361be2420 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepositoryImplementationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/ComposedRepositoryImplementationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,23 +20,25 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration tests for composed Repository implementations.
  *
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class ComposedRepositoryImplementationTests {
 
 	@Configuration
-	@EnableMongoRepositories
+	@EnableMongoRepositories(includeFilters=@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ComposedRepository.class))
 	@ImportResource("classpath:infrastructure.xml")
 	static class Config {}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java
index 07a7036f29..21e0cb3914 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java
index 2ccad27360..69654bc7b7 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomMongoRepositoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,10 +25,6 @@
  */
 public class CustomMongoRepositoryImpl implements CustomMongoRepository {
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.custom.CustomMongoRepository#findByFullName()
-	 */
 	@Override
 	public List<User> findByUsernameCustom(String username) {
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java
index 88adedf5dd..d83b53c62a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepository.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,12 @@
 package org.springframework.data.mongodb.repository.custom;
 
 import org.springframework.data.mongodb.repository.User;
-import org.springframework.data.repository.reactive.RxJava2CrudRepository;
+import org.springframework.data.repository.reactive.RxJava3CrudRepository;
 
 /**
  * @author Mark Paluch
  */
 public interface CustomReactiveMongoRepository
-		extends RxJava2CrudRepository<User, String>, CustomReactiveMongoRepositoryCustom {
+		extends RxJava3CrudRepository<User, String>, CustomReactiveMongoRepositoryCustom {
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryCustom.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryCustom.java
index d641a4b9e4..6b650ecaac 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryCustom.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryCustom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryImpl.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryImpl.java
index 13788cff91..4c0a7b78e8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryImpl.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveMongoRepositoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveRepositoryImplementationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveRepositoryImplementationTests.java
index 6e8626f3f5..c7de6e72bf 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveRepositoryImplementationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomReactiveRepositoryImplementationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,24 +23,26 @@
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.data.mongodb.repository.User;
 import org.springframework.data.mongodb.repository.config.EnableReactiveMongoRepositories;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration tests for custom reactive Repository implementations.
  *
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class CustomReactiveRepositoryImplementationTests {
 
 	@Configuration
-	@EnableReactiveMongoRepositories
+	@EnableReactiveMongoRepositories(includeFilters=@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = CustomReactiveMongoRepository.class))
 	@ImportResource("classpath:reactive-infrastructure.xml")
 	static class Config {}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java
index c68a8d2d01..697799d3e8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/CustomRepositoryImplementationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,24 +23,26 @@
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.FilterType;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.data.mongodb.repository.User;
 import org.springframework.data.mongodb.repository.config.EnableMongoRepositories;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 /**
  * Integration tests for custom Repository implementations.
  *
  * @author Thomas Darimont
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class CustomRepositoryImplementationTests {
 
 	@Configuration
-	@EnableMongoRepositories
+	@EnableMongoRepositories(includeFilters=@Filter(type = FilterType.ASSIGNABLE_TYPE, classes = CustomMongoRepository.class))
 	@ImportResource("classpath:infrastructure.xml")
 	static class Config {}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixin.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixin.java
index 8c85a3f504..191e6a6b68 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixin.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixin.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixinImpl.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixinImpl.java
index 36b112197e..be7ec72a91 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixinImpl.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/custom/RepositoryMixinImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractMongoQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractMongoQueryUnitTests.java
index 89d05281a2..dad28ae5aa 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractMongoQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractMongoQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,47 @@
 package org.springframework.data.mongodb.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 import java.util.Optional;
 
 import org.bson.Document;
+import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import org.springframework.context.support.StaticApplicationContext;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.domain.Limit;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.expression.ValueExpressionParser;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.ExecutableFind;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
+import org.springframework.data.mongodb.core.ExecutableRemoveOperation.ExecutableRemove;
+import org.springframework.data.mongodb.core.ExecutableUpdateOperation.ExecutableUpdate;
+import org.springframework.data.mongodb.core.ExecutableUpdateOperation.TerminatingUpdate;
+import org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithQuery;
+import org.springframework.data.mongodb.core.ExecutableUpdateOperation.UpdateWithUpdate;
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.Person;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
@@ -54,16 +67,23 @@
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.Hint;
 import org.springframework.data.mongodb.repository.Meta;
 import org.springframework.data.mongodb.repository.MongoRepository;
+import org.springframework.data.mongodb.repository.ReadPreference;
+import org.springframework.data.mongodb.repository.Update;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
+import com.mongodb.MongoClientSettings;
 import com.mongodb.client.result.DeleteResult;
+import com.mongodb.client.result.UpdateResult;
 
 /**
  * Unit tests for {@link AbstractMongoQuery}.
@@ -72,56 +92,70 @@
  * @author Oliver Gierke
  * @author Thomas Darimont
  * @author Mark Paluch
+ * @author Jorge Rodríguez
  */
-@RunWith(MockitoJUnitRunner.class)
-public class AbstractMongoQueryUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class AbstractMongoQueryUnitTests {
 
 	@Mock MongoOperations mongoOperationsMock;
 	@Mock ExecutableFind<?> executableFind;
 	@Mock FindWithQuery<?> withQueryMock;
+	@Mock ExecutableUpdate executableUpdate;
+	@Mock UpdateWithQuery updateWithQuery;
+	@Mock UpdateWithUpdate updateWithUpdate;
+	@Mock TerminatingUpdate terminatingUpdate;
+	@Mock ExecutableRemove executableRemove;
 	@Mock BasicMongoPersistentEntity<?> persitentEntityMock;
 	@Mock MongoMappingContext mappingContextMock;
 	@Mock DeleteResult deleteResultMock;
+	@Mock UpdateResult updateResultMock;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		doReturn("persons").when(persitentEntityMock).getCollection();
 		doReturn(persitentEntityMock).when(mappingContextMock).getPersistentEntity(Mockito.any(Class.class));
 		doReturn(persitentEntityMock).when(mappingContextMock).getRequiredPersistentEntity(Mockito.any(Class.class));
 		doReturn(Person.class).when(persitentEntityMock).getType();
 
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mock(MongoDbFactory.class));
+		MongoDatabaseFactory mongoDbFactory = mock(MongoDatabaseFactory.class);
+		when(mongoDbFactory.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
+		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mongoDbFactory);
 		MappingMongoConverter converter = new MappingMongoConverter(dbRefResolver, mappingContextMock);
 		converter.afterPropertiesSet();
 
 		doReturn(converter).when(mongoOperationsMock).getConverter();
 		doReturn(executableFind).when(mongoOperationsMock).query(any());
 		doReturn(withQueryMock).when(executableFind).as(any());
-		doReturn(withQueryMock).when(withQueryMock).matching(any());
-
-		when(mongoOperationsMock.remove(any(), any(), anyString())).thenReturn(deleteResultMock);
+		doReturn(withQueryMock).when(withQueryMock).matching(any(Query.class));
+		doReturn(executableUpdate).when(mongoOperationsMock).update(any());
+		doReturn(updateWithQuery).when(executableUpdate).matching(any(Query.class));
+		doReturn(terminatingUpdate).when(updateWithQuery).apply(any(UpdateDefinition.class));
+		doReturn(executableRemove).when(mongoOperationsMock).remove(any());
+		doReturn(executableRemove).when(executableRemove).matching(any(Query.class));
+		when(executableRemove.all()).thenReturn(deleteResultMock);
+		when(mongoOperationsMock.updateMulti(any(), any(), any(), anyString())).thenReturn(updateResultMock);
 	}
 
 	@Test // DATAMONGO-566
-	public void testDeleteExecutionCallsRemoveCorrectly() {
+	void testDeleteExecutionCallsRemoveCorrectly() {
 
 		createQueryForMethod("deletePersonByLastname", String.class).setDeleteQuery(true).execute(new Object[] { "booh" });
 
-		verify(mongoOperationsMock, times(1)).remove(any(), eq(Person.class), eq("persons"));
-		verify(mongoOperationsMock, times(0)).find(any(), any(), any());
+		verify(executableRemove, times(1)).all();
 	}
 
 	@Test // DATAMONGO-566, DATAMONGO-1040
-	public void testDeleteExecutionLoadsListOfRemovedDocumentsWhenReturnTypeIsCollectionLike() {
+	void testDeleteExecutionLoadsListOfRemovedDocumentsWhenReturnTypeIsCollectionLike() {
 
 		createQueryForMethod("deleteByLastname", String.class).setDeleteQuery(true).execute(new Object[] { "booh" });
 
-		verify(mongoOperationsMock, times(1)).findAllAndRemove(any(), eq(Person.class), eq("persons"));
+		verify(executableRemove, times(1)).findAndRemove();
 	}
 
 	@Test // DATAMONGO-566
-	public void testDeleteExecutionReturnsZeroWhenWriteResultIsNull() {
+	void testDeleteExecutionReturnsZeroWhenWriteResultIsNull() {
 
 		MongoQueryFake query = createQueryForMethod("deletePersonByLastname", String.class);
 		query.setDeleteQuery(true);
@@ -130,7 +164,7 @@ public void testDeleteExecutionReturnsZeroWhenWriteResultIsNull() {
 	}
 
 	@Test // DATAMONGO-566, DATAMONGO-978
-	public void testDeleteExecutionReturnsNrDocumentsDeletedFromWriteResult() {
+	void testDeleteExecutionReturnsNrDocumentsDeletedFromWriteResult() {
 
 		when(deleteResultMock.getDeletedCount()).thenReturn(100L);
 		when(deleteResultMock.wasAcknowledged()).thenReturn(true);
@@ -139,11 +173,11 @@ public void testDeleteExecutionReturnsNrDocumentsDeletedFromWriteResult() {
 		query.setDeleteQuery(true);
 
 		assertThat(query.execute(new Object[] { "fake" })).isEqualTo(100L);
-		verify(mongoOperationsMock, times(1)).remove(any(), eq(Person.class), eq("persons"));
+		verify(executableRemove, times(1)).all();
 	}
 
 	@Test // DATAMONGO-957
-	public void metadataShouldNotBeAddedToQueryWhenNotPresent() {
+	void metadataShouldNotBeAddedToQueryWhenNotPresent() {
 
 		MongoQueryFake query = createQueryForMethod("findByFirstname", String.class);
 		query.execute(new Object[] { "fake" });
@@ -158,7 +192,7 @@ public void metadataShouldNotBeAddedToQueryWhenNotPresent() {
 	}
 
 	@Test // DATAMONGO-957
-	public void metadataShouldBeAddedToQueryCorrectly() {
+	void metadataShouldBeAddedToQueryCorrectly() {
 
 		MongoQueryFake query = createQueryForMethod("findByFirstname", String.class, Pageable.class);
 		query.execute(new Object[] { "fake", PageRequest.of(0, 10) });
@@ -172,7 +206,7 @@ public void metadataShouldBeAddedToQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-957
-	public void metadataShouldBeAddedToCountQueryCorrectly() {
+	void metadataShouldBeAddedToCountQueryCorrectly() {
 
 		MongoQueryFake query = createQueryForMethod("findByFirstname", String.class, Pageable.class);
 		query.execute(new Object[] { "fake", PageRequest.of(1, 10) });
@@ -186,7 +220,7 @@ public void metadataShouldBeAddedToCountQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-957, DATAMONGO-1783
-	public void metadataShouldBeAddedToStringBasedQueryCorrectly() {
+	void metadataShouldBeAddedToStringBasedQueryCorrectly() {
 
 		MongoQueryFake query = createQueryForMethod("findByAnnotatedQuery", String.class, Pageable.class);
 		query.execute(new Object[] { "fake", PageRequest.of(0, 10) });
@@ -200,7 +234,7 @@ public void metadataShouldBeAddedToStringBasedQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-1057
-	public void slicedExecutionShouldRetainNrOfElementsToSkip() {
+	void slicedExecutionShouldRetainNrOfElementsToSkip() {
 
 		MongoQueryFake query = createQueryForMethod("findByLastname", String.class, Pageable.class);
 		Pageable page1 = PageRequest.of(0, 10);
@@ -219,7 +253,7 @@ public void slicedExecutionShouldRetainNrOfElementsToSkip() {
 	}
 
 	@Test // DATAMONGO-1057
-	public void slicedExecutionShouldIncrementLimitByOne() {
+	void slicedExecutionShouldIncrementLimitByOne() {
 
 		MongoQueryFake query = createQueryForMethod("findByLastname", String.class, Pageable.class);
 		Pageable page1 = PageRequest.of(0, 10);
@@ -238,7 +272,7 @@ public void slicedExecutionShouldIncrementLimitByOne() {
 	}
 
 	@Test // DATAMONGO-1057
-	public void slicedExecutionShouldRetainSort() {
+	void slicedExecutionShouldRetainSort() {
 
 		MongoQueryFake query = createQueryForMethod("findByLastname", String.class, Pageable.class);
 		Pageable page1 = PageRequest.of(0, 10, Sort.Direction.DESC, "bar");
@@ -258,7 +292,7 @@ public void slicedExecutionShouldRetainSort() {
 	}
 
 	@Test // DATAMONGO-1080
-	public void doesNotTryToPostProcessQueryResultIntoWrapperType() {
+	void doesNotTryToPostProcessQueryResultIntoWrapperType() {
 
 		Person reference = new Person();
 
@@ -270,7 +304,7 @@ public void doesNotTryToPostProcessQueryResultIntoWrapperType() {
 	}
 
 	@Test // DATAMONGO-1865
-	public void limitingSingleEntityQueryCallsFirst() {
+	void limitingSingleEntityQueryCallsFirst() {
 
 		Person reference = new Person();
 
@@ -282,7 +316,7 @@ public void limitingSingleEntityQueryCallsFirst() {
 	}
 
 	@Test // DATAMONGO-1872
-	public void doesNotFixCollectionOnPreparation() {
+	void doesNotFixCollectionOnPreparation() {
 
 		AbstractMongoQuery query = createQueryForMethod(DynamicallyMappedRepository.class, "findBy");
 
@@ -293,7 +327,7 @@ public void doesNotFixCollectionOnPreparation() {
 	}
 
 	@Test // DATAMONGO-1979
-	public void usesAnnotatedSortWhenPresent() {
+	void usesAnnotatedSortWhenPresent() {
 
 		createQueryForMethod("findByAge", Integer.class) //
 				.execute(new Object[] { 1000 });
@@ -304,7 +338,7 @@ public void usesAnnotatedSortWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1979
-	public void usesExplicitSortOverridesAnnotatedSortWhenPresent() {
+	void usesExplicitSortOverridesAnnotatedSortWhenPresent() {
 
 		createQueryForMethod("findByAge", Integer.class, Sort.class) //
 				.execute(new Object[] { 1000, Sort.by(Direction.DESC, "age") });
@@ -315,7 +349,7 @@ public void usesExplicitSortOverridesAnnotatedSortWhenPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyStaticAnnotatedCollation() {
+	void shouldApplyStaticAnnotatedCollation() {
 
 		createQueryForMethod("findWithCollationUsingSpimpleStringValueByFirstName", String.class) //
 				.execute(new Object[] { "dalinar" });
@@ -327,7 +361,7 @@ public void shouldApplyStaticAnnotatedCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyStaticAnnotatedCollationAsDocument() {
+	void shouldApplyStaticAnnotatedCollationAsDocument() {
 
 		createQueryForMethod("findWithCollationUsingDocumentByFirstName", String.class) //
 				.execute(new Object[] { "dalinar" });
@@ -339,7 +373,7 @@ public void shouldApplyStaticAnnotatedCollationAsDocument() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationAsString() {
+	void shouldApplyDynamicAnnotatedCollationAsString() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
 				.execute(new Object[] { "dalinar", "en_US" });
@@ -351,7 +385,7 @@ public void shouldApplyDynamicAnnotatedCollationAsString() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationAsDocument() {
+	void shouldApplyDynamicAnnotatedCollationAsDocument() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
 				.execute(new Object[] { "dalinar", new Document("locale", "en_US") });
@@ -363,7 +397,7 @@ public void shouldApplyDynamicAnnotatedCollationAsDocument() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationAsLocale() {
+	void shouldApplyDynamicAnnotatedCollationAsLocale() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
 				.execute(new Object[] { "dalinar", Locale.US });
@@ -374,20 +408,18 @@ public void shouldApplyDynamicAnnotatedCollationAsLocale() {
 				.contains(Collation.of("en_US").toDocument());
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1854
-	public void shouldThrowExceptionOnNonParsableCollation() {
+	@Test // DATAMONGO-1854
+	void shouldThrowExceptionOnNonParsableCollation() {
 
-		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
-				.execute(new Object[] { "dalinar", 100 });
+		assertThatIllegalArgumentException().isThrownBy(() -> {
 
-		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
-		verify(withQueryMock).matching(captor.capture());
-		assertThat(captor.getValue().getCollation().map(Collation::toDocument))
-				.contains(Collation.of("en_US").toDocument());
+			createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
+					.execute(new Object[] { "dalinar", 100 });
+		});
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationIn() {
+	void shouldApplyDynamicAnnotatedCollationIn() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderInDocumentByFirstName", String.class, String.class) //
 				.execute(new Object[] { "dalinar", "en_US" });
@@ -399,7 +431,7 @@ public void shouldApplyDynamicAnnotatedCollationIn() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyCollationParameter() {
+	void shouldApplyCollationParameter() {
 
 		Collation collation = Collation.of("en_US");
 		createQueryForMethod("findWithCollationParameterByFirstName", String.class, Collation.class) //
@@ -411,7 +443,7 @@ public void shouldApplyCollationParameter() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void collationParameterShouldOverrideAnnotation() {
+	void collationParameterShouldOverrideAnnotation() {
 
 		Collation collation = Collation.of("de_AT");
 		createQueryForMethod("findWithWithCollationParameterAndAnnotationByFirstName", String.class, Collation.class) //
@@ -423,7 +455,7 @@ public void collationParameterShouldOverrideAnnotation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void collationParameterShouldNotBeAppliedWhenNullOverrideAnnotation() {
+	void collationParameterShouldNotBeAppliedWhenNullOverrideAnnotation() {
 
 		createQueryForMethod("findWithWithCollationParameterAndAnnotationByFirstName", String.class, Collation.class) //
 				.execute(new Object[] { "dalinar", null });
@@ -434,6 +466,89 @@ public void collationParameterShouldNotBeAppliedWhenNullOverrideAnnotation() {
 				.contains(Collation.of("en_US").toDocument());
 	}
 
+	@Test // GH-2107
+	void updateExecutionCallsUpdateAllCorrectly() {
+
+		when(terminatingUpdate.all()).thenReturn(updateResultMock);
+
+		createQueryForMethod("findAndIncreaseVisitsByLastname", String.class, int.class) //
+				.execute(new Object[] { "dalinar", 100 });
+
+		ArgumentCaptor<UpdateDefinition> update = ArgumentCaptor.forClass(UpdateDefinition.class);
+		verify(updateWithQuery).apply(update.capture());
+		verify(terminatingUpdate).all();
+
+		assertThat(update.getValue().getUpdateObject()).isEqualTo(Document.parse("{ '$inc' : { 'visits' : 100 } }"));
+	}
+
+	@Test // GH-3230
+	void findShouldApplyHint() {
+
+		createQueryForMethod("findWithHintByFirstname", String.class).execute(new Object[] { "Jasna" });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(withQueryMock).matching(captor.capture());
+		assertThat(captor.getValue().getHint()).isEqualTo("idx-fn");
+	}
+
+	@Test // GH-3230
+	void updateShouldApplyHint() {
+
+		when(terminatingUpdate.all()).thenReturn(updateResultMock);
+
+		createQueryForMethod("findAndIncreaseVisitsByLastname", String.class, int.class) //
+				.execute(new Object[] { "dalinar", 100 });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(executableUpdate).matching(captor.capture());
+		assertThat(captor.getValue().getHint()).isEqualTo("idx-ln");
+	}
+
+	@Test // GH-4397
+	void limitShouldBeAppliedToQuery() {
+
+		createQueryForMethod("findWithLimit", String.class, Limit.class).execute(new Object[] { "dalinar", Limit.of(42) });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(withQueryMock).matching(captor.capture());
+
+		assertThat(captor.getValue().getLimit()).isEqualTo(42);
+	}
+
+	@Test // GH-4397
+	void sortAndLimitShouldBeAppliedToQuery() {
+
+		createQueryForMethod("findWithSortAndLimit", String.class, Sort.class, Limit.class)
+				.execute(new Object[] { "dalinar", Sort.by("fn"), Limit.of(42) });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(withQueryMock).matching(captor.capture());
+
+		assertThat(captor.getValue().getLimit()).isEqualTo(42);
+		assertThat(captor.getValue().getSortObject()).isEqualTo(new Document("fn", 1));
+	}
+
+	@Test // GH-2971
+	void findShouldApplyReadPreference() {
+
+		createQueryForMethod("findWithReadPreferenceByFirstname", String.class).execute(new Object[] { "Jasna" });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(withQueryMock).matching(captor.capture());
+		assertThat(captor.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
+	@Test // GH-2971
+	void findShouldApplyReadPreferenceAtRepository() {
+
+		createQueryForMethod("findWithLimit", String.class, Limit.class).execute(new Object[] { "dalinar", Limit.of(42) });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(withQueryMock).matching(captor.capture());
+		assertThat(captor.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.primaryPreferred());
+	}
+
+
 	private MongoQueryFake createQueryForMethod(String methodName, Class<?>... paramTypes) {
 		return createQueryForMethod(Repo.class, methodName, paramTypes);
 	}
@@ -458,8 +573,12 @@ private static class MongoQueryFake extends AbstractMongoQuery {
 		private boolean isDeleteQuery;
 		private boolean isLimitingQuery;
 
-		public MongoQueryFake(MongoQueryMethod method, MongoOperations operations) {
-			super(method, operations, new SpelExpressionParser(), QueryMethodEvaluationContextProvider.DEFAULT);
+		MongoQueryFake(MongoQueryMethod method, MongoOperations operations) {
+			super(method, operations,
+					new ValueExpressionDelegate(
+							new QueryMethodValueEvaluationContextAccessor(new StandardEnvironment(),
+									Collections.emptySet()),
+							ValueExpressionParser.create(SpelExpressionParser::new)));
 		}
 
 		@Override
@@ -487,18 +606,24 @@ protected boolean isLimiting() {
 			return isLimitingQuery;
 		}
 
-		public MongoQueryFake setDeleteQuery(boolean isDeleteQuery) {
+		MongoQueryFake setDeleteQuery(boolean isDeleteQuery) {
 			this.isDeleteQuery = isDeleteQuery;
 			return this;
 		}
 
-		public MongoQueryFake setLimitingQuery(boolean limitingQuery) {
+		MongoQueryFake setLimitingQuery(boolean limitingQuery) {
 
 			isLimitingQuery = limitingQuery;
 			return this;
 		}
+
+		@Override
+		protected CodecRegistry getCodecRegistry() {
+			return MongoClientSettings.getDefaultCodecRegistry();
+		}
 	}
 
+	@ReadPreference(value = "primaryPreferred")
 	private interface Repo extends MongoRepository<Person, Long> {
 
 		List<Person> deleteByLastname(String lastname);
@@ -543,6 +668,20 @@ private interface Repo extends MongoRepository<Person, Long> {
 
 		@org.springframework.data.mongodb.repository.Query(collation = "{ 'locale' : 'en_US' }")
 		List<Person> findWithWithCollationParameterAndAnnotationByFirstName(String firstname, Collation collation);
+
+		@Hint("idx-ln")
+		@Update("{ '$inc' : { 'visits' : ?1 } }")
+		void findAndIncreaseVisitsByLastname(String lastname, int value);
+
+		@Hint("idx-fn")
+		void findWithHintByFirstname(String firstname);
+
+		List<Person> findWithLimit(String firstname, Limit limit);
+
+		List<Person> findWithSortAndLimit(String firstname, Sort sort, Limit limit);
+
+		@ReadPreference(value = "secondaryPreferred")
+		List<Person> findWithReadPreferenceByFirstname(String firstname);
 	}
 
 	// DATAMONGO-1872
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQueryUnitTests.java
index a117b77e9e..1f3602fc71 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/AbstractReactiveMongoQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,22 +18,36 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import java.lang.reflect.Method;
+import java.util.Collections;
 import java.util.List;
 import java.util.Locale;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.bson.codecs.configuration.CodecRegistry;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import org.springframework.context.support.StaticApplicationContext;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.expression.ValueExpressionParser;
 import org.springframework.data.mongodb.core.Person;
 import org.springframework.data.mongodb.core.ReactiveFindOperation.FindWithQuery;
 import org.springframework.data.mongodb.core.ReactiveFindOperation.ReactiveFind;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.ReactiveUpdateOperation.ReactiveUpdate;
+import org.springframework.data.mongodb.core.ReactiveUpdateOperation.TerminatingUpdate;
+import org.springframework.data.mongodb.core.ReactiveUpdateOperation.UpdateWithQuery;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
@@ -41,19 +55,31 @@
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
+import org.springframework.data.mongodb.repository.Hint;
 import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
+import org.springframework.data.mongodb.repository.ReadPreference;
+import org.springframework.data.mongodb.repository.Update;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
+import com.mongodb.MongoClientSettings;
+import com.mongodb.client.result.UpdateResult;
+
 /**
+ * Unit tests for {@link AbstractReactiveMongoQuery}.
+ *
  * @author Christoph Strobl
- * @currentRead Way of Kings - Brandon Sanderson
+ * @author Mark Paluch
+ * @author Jorge Rodríguez
  */
-@RunWith(MockitoJUnitRunner.class)
-public class AbstractReactiveMongoQueryUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class AbstractReactiveMongoQueryUnitTests {
 
 	@Mock ReactiveMongoOperations mongoOperationsMock;
 	@Mock BasicMongoPersistentEntity<?> persitentEntityMock;
@@ -61,9 +87,12 @@ public class AbstractReactiveMongoQueryUnitTests {
 
 	@Mock ReactiveFind<?> executableFind;
 	@Mock FindWithQuery<?> withQueryMock;
+	@Mock ReactiveUpdate executableUpdate;
+	@Mock UpdateWithQuery updateWithQuery;
+	@Mock TerminatingUpdate terminatingUpdate;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		doReturn("persons").when(persitentEntityMock).getCollection();
 		doReturn(persitentEntityMock).when(mappingContextMock).getPersistentEntity(Mockito.any(Class.class));
@@ -77,14 +106,22 @@ public void setUp() {
 
 		doReturn(executableFind).when(mongoOperationsMock).query(any());
 		doReturn(withQueryMock).when(executableFind).as(any());
-		doReturn(withQueryMock).when(withQueryMock).matching(any());
+		doReturn(withQueryMock).when(withQueryMock).matching(any(Query.class));
+		doReturn(Flux.empty()).when(withQueryMock).all();
+		doReturn(Mono.empty()).when(withQueryMock).first();
+		doReturn(Mono.empty()).when(withQueryMock).one();
+
+		doReturn(executableUpdate).when(mongoOperationsMock).update(any());
+		doReturn(executableUpdate).when(executableUpdate).inCollection(anyString());
+		doReturn(updateWithQuery).when(executableUpdate).matching(any(Query.class));
+		doReturn(terminatingUpdate).when(updateWithQuery).apply(any(UpdateDefinition.class));
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyStaticAnnotatedCollation() {
+	void shouldApplyStaticAnnotatedCollation() {
 
 		createQueryForMethod("findWithCollationUsingSpimpleStringValueByFirstName", String.class) //
-				.execute(new Object[] { "dalinar" });
+				.executeBlocking(new Object[] { "dalinar" });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -93,10 +130,10 @@ public void shouldApplyStaticAnnotatedCollation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyStaticAnnotatedCollationAsDocument() {
+	void shouldApplyStaticAnnotatedCollationAsDocument() {
 
 		createQueryForMethod("findWithCollationUsingDocumentByFirstName", String.class) //
-				.execute(new Object[] { "dalinar" });
+				.executeBlocking(new Object[] { "dalinar" });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -105,10 +142,10 @@ public void shouldApplyStaticAnnotatedCollationAsDocument() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationAsString() {
+	void shouldApplyDynamicAnnotatedCollationAsString() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
-				.execute(new Object[] { "dalinar", "en_US" });
+				.executeBlocking(new Object[] { "dalinar", "en_US" });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -117,10 +154,10 @@ public void shouldApplyDynamicAnnotatedCollationAsString() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationAsDocument() {
+	void shouldApplyDynamicAnnotatedCollationAsDocument() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
-				.execute(new Object[] { "dalinar", new Document("locale", "en_US") });
+				.executeBlocking(new Object[] { "dalinar", new Document("locale", "en_US") });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -129,10 +166,10 @@ public void shouldApplyDynamicAnnotatedCollationAsDocument() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationAsLocale() {
+	void shouldApplyDynamicAnnotatedCollationAsLocale() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
-				.execute(new Object[] { "dalinar", Locale.US });
+				.executeBlocking(new Object[] { "dalinar", Locale.US });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -140,23 +177,20 @@ public void shouldApplyDynamicAnnotatedCollationAsLocale() {
 				.contains(Collation.of("en_US").toDocument());
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1854
-	public void shouldThrowExceptionOnNonParsableCollation() {
-
-		createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
-				.execute(new Object[] { "dalinar", 100 });
+	@Test // DATAMONGO-1854
+	void shouldThrowExceptionOnNonParsableCollation() {
 
-		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
-		verify(withQueryMock).matching(captor.capture());
-		assertThat(captor.getValue().getCollation().map(Collation::toDocument))
-				.contains(Collation.of("en_US").toDocument());
+		assertThatIllegalArgumentException().isThrownBy(() -> {
+			createQueryForMethod("findWithCollationUsingPlaceholderByFirstName", String.class, Object.class) //
+					.executeBlocking(new Object[] { "dalinar", 100 });
+		});
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationIn() {
+	void shouldApplyDynamicAnnotatedCollationIn() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholderInDocumentByFirstName", String.class, String.class) //
-				.execute(new Object[] { "dalinar", "en_US" });
+				.executeBlocking(new Object[] { "dalinar", "en_US" });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -165,11 +199,11 @@ public void shouldApplyDynamicAnnotatedCollationIn() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyDynamicAnnotatedCollationWithMultiplePlaceholders() {
+	void shouldApplyDynamicAnnotatedCollationWithMultiplePlaceholders() {
 
 		createQueryForMethod("findWithCollationUsingPlaceholdersInDocumentByFirstName", String.class, String.class,
 				int.class) //
-						.execute(new Object[] { "dalinar", "en_US", 2 });
+				.executeBlocking(new Object[] { "dalinar", "en_US", 2 });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -178,11 +212,11 @@ public void shouldApplyDynamicAnnotatedCollationWithMultiplePlaceholders() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldApplyCollationParameter() {
+	void shouldApplyCollationParameter() {
 
 		Collation collation = Collation.of("en_US");
 		createQueryForMethod("findWithCollationParameterByFirstName", String.class, Collation.class) //
-				.execute(new Object[] { "dalinar", collation });
+				.executeBlocking(new Object[] { "dalinar", collation });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -190,11 +224,11 @@ public void shouldApplyCollationParameter() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void collationParameterShouldOverrideAnnotation() {
+	void collationParameterShouldOverrideAnnotation() {
 
 		Collation collation = Collation.of("de_AT");
 		createQueryForMethod("findWithWithCollationParameterAndAnnotationByFirstName", String.class, Collation.class) //
-				.execute(new Object[] { "dalinar", collation });
+				.executeBlocking(new Object[] { "dalinar", collation });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -202,10 +236,10 @@ public void collationParameterShouldOverrideAnnotation() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void collationParameterShouldNotBeAppliedWhenNullOverrideAnnotation() {
+	void collationParameterShouldNotBeAppliedWhenNullOverrideAnnotation() {
 
 		createQueryForMethod("findWithWithCollationParameterAndAnnotationByFirstName", String.class, Collation.class) //
-				.execute(new Object[] { "dalinar", null });
+				.executeBlocking(new Object[] { "dalinar", null });
 
 		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
 		verify(withQueryMock).matching(captor.capture());
@@ -213,6 +247,39 @@ public void collationParameterShouldNotBeAppliedWhenNullOverrideAnnotation() {
 				.contains(Collation.of("en_US").toDocument());
 	}
 
+	@Test // GH-3230
+	void findShouldApplyHint() {
+
+		createQueryForMethod("findWithHintByFirstname", String.class).executeBlocking(new Object[] { "Jasna" });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(withQueryMock).matching(captor.capture());
+		assertThat(captor.getValue().getHint()).isEqualTo("idx-fn");
+	}
+
+	@Test // GH-3230
+	void updateShouldApplyHint() {
+
+		when(terminatingUpdate.all()).thenReturn(Mono.just(mock(UpdateResult.class)));
+
+		createQueryForMethod("findAndIncreaseVisitsByLastname", String.class, int.class) //
+				.executeBlocking(new Object[] { "dalinar", 100 });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(executableUpdate).matching(captor.capture());
+		assertThat(captor.getValue().getHint()).isEqualTo("idx-ln");
+	}
+
+	@Test // GH-2971
+	void findShouldApplyReadPreference() {
+
+		createQueryForMethod("findWithReadPreferenceByFirstname", String.class).executeBlocking(new Object[] { "Jasna" });
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(withQueryMock).matching(captor.capture());
+		assertThat(captor.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
 	private ReactiveMongoQueryFake createQueryForMethod(String methodName, Class<?>... paramTypes) {
 		return createQueryForMethod(Repo.class, methodName, paramTypes);
 	}
@@ -237,13 +304,22 @@ private static class ReactiveMongoQueryFake extends AbstractReactiveMongoQuery {
 		private boolean isDeleteQuery;
 		private boolean isLimitingQuery;
 
-		public ReactiveMongoQueryFake(ReactiveMongoQueryMethod method, ReactiveMongoOperations operations) {
-			super(method, operations, new SpelExpressionParser(), QueryMethodEvaluationContextProvider.DEFAULT);
+		ReactiveMongoQueryFake(ReactiveMongoQueryMethod method, ReactiveMongoOperations operations) {
+			super(method, operations,
+					new ValueExpressionDelegate(
+							new QueryMethodValueEvaluationContextAccessor(
+									new StandardEnvironment(),
+									Collections.emptySet()),
+							ValueExpressionParser.create(SpelExpressionParser::new)));
 		}
 
 		@Override
-		protected Query createQuery(ConvertingParameterAccessor accessor) {
-			return new BasicQuery("{'foo':'bar'}");
+		protected Mono<Query> createQuery(ConvertingParameterAccessor accessor) {
+			return Mono.just(new BasicQuery("{'foo':'bar'}"));
+		}
+
+		Object executeBlocking(Object[] parameters) {
+			return Flux.from(super.execute(parameters)).collectList().block();
 		}
 
 		@Override
@@ -276,6 +352,11 @@ public ReactiveMongoQueryFake setLimitingQuery(boolean limitingQuery) {
 			isLimitingQuery = limitingQuery;
 			return this;
 		}
+
+		@Override
+		protected Mono<CodecRegistry> getCodecRegistry() {
+			return Mono.just(MongoClientSettings.getDefaultCodecRegistry());
+		}
 	}
 
 	private interface Repo extends ReactiveMongoRepository<Person, Long> {
@@ -300,5 +381,15 @@ List<Person> findWithCollationUsingPlaceholdersInDocumentByFirstName(String firs
 
 		@org.springframework.data.mongodb.repository.Query(collation = "{ 'locale' : 'en_US' }")
 		List<Person> findWithWithCollationParameterAndAnnotationByFirstName(String firstname, Collation collation);
+
+		@Hint("idx-ln")
+		@Update("{ '$inc' : { 'visits' : ?1 } }")
+		void findAndIncreaseVisitsByLastname(String lastname, int value);
+
+		@Hint("idx-fn")
+		void findWithHintByFirstname(String firstname);
+
+		@ReadPreference(value = "secondaryPreferred")
+		Flux<Person> findWithReadPreferenceByFirstname(String firstname);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessorUnitTests.java
index b89a1f0763..71b2ff7581 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ConvertingParameterAccessorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,13 +21,14 @@
 import java.util.Arrays;
 import java.util.Collection;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.core.MongoExceptionTranslator;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -45,36 +46,37 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class ConvertingParameterAccessorUnitTests {
+@ExtendWith(MockitoExtension.class)
+class ConvertingParameterAccessorUnitTests {
 
-	@Mock MongoDbFactory factory;
+	@Mock MongoDatabaseFactory factory;
 	@Mock MongoParameterAccessor accessor;
 
-	MongoMappingContext context;
-	MappingMongoConverter converter;
-	DbRefResolver resolver;
+	private MongoMappingContext context;
+	private MappingMongoConverter converter;
+	private DbRefResolver resolver;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
+		when(factory.getExceptionTranslator()).thenReturn(new MongoExceptionTranslator());
 		this.context = new MongoMappingContext();
 		this.resolver = new DefaultDbRefResolver(factory);
 		this.converter = new MappingMongoConverter(resolver, context);
 	}
 
 	@Test
-	public void rejectsNullDbRefResolver() {
+	void rejectsNullDbRefResolver() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new MappingMongoConverter((DbRefResolver) null, context));
 	}
 
 	@Test
-	public void rejectsNullContext() {
+	void rejectsNullContext() {
 		assertThatIllegalArgumentException().isThrownBy(() -> new MappingMongoConverter(resolver, null));
 	}
 
 	@Test
-	public void convertsCollectionUponAccess() {
+	void convertsCollectionUponAccess() {
 
 		when(accessor.getBindableValue(0)).thenReturn(Arrays.asList("Foo"));
 
@@ -88,7 +90,7 @@ public void convertsCollectionUponAccess() {
 	}
 
 	@Test // DATAMONGO-505
-	public void convertsAssociationsToDBRef() {
+	void convertsAssociationsToDBRef() {
 
 		Property property = new Property();
 		property.id = 5L;
@@ -102,7 +104,7 @@ public void convertsAssociationsToDBRef() {
 	}
 
 	@Test // DATAMONGO-505
-	public void convertsAssociationsToDBRefForCollections() {
+	void convertsAssociationsToDBRefForCollections() {
 
 		Property property = new Property();
 		property.id = 5L;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MappingMongoEntityInformationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MappingMongoEntityInformationUnitTests.java
index aaa464ea13..19ac837513 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MappingMongoEntityInformationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MappingMongoEntityInformationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,10 @@
 import static org.assertj.core.api.Assertions.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Value;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.repository.Person;
@@ -36,7 +33,7 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MappingMongoEntityInformationUnitTests {
 
 	@Mock MongoPersistentEntity<Person> info;
@@ -67,10 +64,27 @@ public void considersPersistableIsNew() {
 		assertThat(information.isNew(new TypeImplementingPersistable(100L, false))).isFalse();
 	}
 
-	@Value
-	static class TypeImplementingPersistable implements Persistable<Long> {
+	static final class TypeImplementingPersistable implements Persistable<Long> {
+
+		private final Long id;
+		private final boolean isNew;
+
+		public TypeImplementingPersistable(Long id, boolean isNew) {
+			this.id = id;
+			this.isNew = isNew;
+		}
+
+		public Long getId() {
+			return this.id;
+		}
+
+		public boolean isNew() {
+			return this.isNew;
+		}
 
-		Long id;
-		boolean isNew;
+		public String toString() {
+			return "MappingMongoEntityInformationUnitTests.TypeImplementingPersistable(id=" + this.getId() + ", isNew="
+					+ this.isNew() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessorUnitTests.java
index a39b6a063d..f0ffebde20 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersParameterAccessorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,15 +21,19 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
+import org.springframework.data.domain.Score;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Metrics;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
@@ -43,15 +47,15 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  */
-public class MongoParametersParameterAccessorUnitTests {
+class MongoParametersParameterAccessorUnitTests {
 
-	Distance DISTANCE = new Distance(2.5, Metrics.KILOMETERS);
-	RepositoryMetadata metadata = new DefaultRepositoryMetadata(PersonRepository.class);
-	MongoMappingContext context = new MongoMappingContext();
-	ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
+	private Distance DISTANCE = Distance.of(2.5, Metrics.KILOMETERS);
+	private RepositoryMetadata metadata = new DefaultRepositoryMetadata(PersonRepository.class);
+	private MongoMappingContext context = new MongoMappingContext();
+	private ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
 
 	@Test
-	public void returnsUnboundedForDistanceIfNoneAvailable() throws NoSuchMethodException, SecurityException {
+	void returnsUnboundedForDistanceIfNoneAvailable() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class);
 		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
@@ -62,7 +66,7 @@ public void returnsUnboundedForDistanceIfNoneAvailable() throws NoSuchMethodExce
 	}
 
 	@Test
-	public void returnsDistanceIfAvailable() throws NoSuchMethodException, SecurityException {
+	void returnsDistanceIfAvailable() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Distance.class);
 		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
@@ -73,7 +77,7 @@ public void returnsDistanceIfAvailable() throws NoSuchMethodException, SecurityE
 	}
 
 	@Test // DATAMONGO-973
-	public void shouldReturnAsFullTextStringWhenNoneDefinedForMethod() throws NoSuchMethodException, SecurityException {
+	void shouldReturnAsFullTextStringWhenNoneDefinedForMethod() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Distance.class);
 		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
@@ -84,7 +88,7 @@ public void shouldReturnAsFullTextStringWhenNoneDefinedForMethod() throws NoSuch
 	}
 
 	@Test // DATAMONGO-973
-	public void shouldProperlyConvertTextCriteria() throws NoSuchMethodException, SecurityException {
+	void shouldProperlyConvertTextCriteria() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByFirstname", String.class, TextCriteria.class);
 		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
@@ -96,13 +100,13 @@ public void shouldProperlyConvertTextCriteria() throws NoSuchMethodException, Se
 	}
 
 	@Test // DATAMONGO-1110
-	public void shouldDetectMinAndMaxDistance() throws NoSuchMethodException, SecurityException {
+	void shouldDetectMinAndMaxDistance() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Range.class);
 		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
 
-		Distance min = new Distance(10, Metrics.KILOMETERS);
-		Distance max = new Distance(20, Metrics.KILOMETERS);
+		Distance min = Distance.of(10, Metrics.KILOMETERS);
+		Distance max = Distance.of(20, Metrics.KILOMETERS);
 
 		MongoParameterAccessor accessor = new MongoParametersParameterAccessor(queryMethod,
 				new Object[] { new Point(10, 20), Distance.between(min, max) });
@@ -114,7 +118,7 @@ public void shouldDetectMinAndMaxDistance() throws NoSuchMethodException, Securi
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldDetectCollation() throws NoSuchMethodException, SecurityException {
+	void shouldDetectCollation() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByFirstname", String.class, Collation.class);
 		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
@@ -126,6 +130,48 @@ public void shouldDetectCollation() throws NoSuchMethodException, SecurityExcept
 		assertThat(accessor.getCollation()).isEqualTo(collation);
 	}
 
+	@Test // GH-2107
+	void shouldReturnUpdateIfPresent() throws NoSuchMethodException, SecurityException {
+
+		Method method = PersonRepository.class.getMethod("findAndModifyByFirstname", String.class, UpdateDefinition.class);
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
+
+		Update update = new Update();
+		MongoParameterAccessor accessor = new MongoParametersParameterAccessor(queryMethod,
+				new Object[] { "dalinar", update });
+
+		assertThat(accessor.getUpdate()).isSameAs(update);
+	}
+
+	@Test // GH-2107
+	void shouldReturnNullIfNoUpdatePresent() throws NoSuchMethodException, SecurityException {
+
+		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class);
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
+
+		MongoParameterAccessor accessor = new MongoParametersParameterAccessor(queryMethod,
+				new Object[] { new Point(0,0) });
+
+		assertThat(accessor.getUpdate()).isNull();
+	}
+
+	@Test // GH-
+	void shouldReturnRangeFromScore() throws NoSuchMethodException, SecurityException {
+
+		Method method = PersonRepository.class.getMethod("findByFirstname", String.class, Score.class);
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
+
+		MongoParameterAccessor accessor = new MongoParametersParameterAccessor(queryMethod,
+				new Object[] { "foo", Score.of(1) });
+
+		Range<Score> scoreRange = accessor.getScoreRange();
+
+		assertThat(scoreRange).isNotNull();
+		assertThat(scoreRange.getLowerBound().isBounded()).isFalse();
+		assertThat(scoreRange.getUpperBound().isBounded()).isTrue();
+		assertThat(scoreRange.getUpperBound().getValue()).contains(Score.of(1));
+	}
+
 	interface PersonRepository extends Repository<Person, Long> {
 
 		List<Person> findByLocationNear(Point point);
@@ -138,5 +184,9 @@ interface PersonRepository extends Repository<Person, Long> {
 
 		List<Person> findByFirstname(String firstname, Collation collation);
 
+		List<Person> findByFirstname(String firstname, Score score);
+
+		List<Person> findAndModifyByFirstname(String firstname, UpdateDefinition update);
+
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersUnitTests.java
index 9ad082660f..fc1ffb971e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoParametersUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,36 +20,43 @@
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.Vector;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.repository.Near;
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.data.repository.query.Parameter;
+import org.springframework.data.repository.query.ParametersSource;
 
 /**
  * Unit tests for {@link MongoParameters}.
  *
  * @author Oliver Gierke
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoParametersUnitTests {
+@ExtendWith(MockitoExtension.class)
+class MongoParametersUnitTests {
 
 	@Mock MongoQueryMethod queryMethod;
 
 	@Test
-	public void discoversDistanceParameter() throws NoSuchMethodException, SecurityException {
+	void discoversDistanceParameter() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Distance.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 
 		assertThat(parameters.getNumberOfParameters()).isEqualTo(2);
 		assertThat(parameters.getMaxDistanceIndex()).isEqualTo(1);
@@ -62,105 +69,139 @@ public void discoversDistanceParameter() throws NoSuchMethodException, SecurityE
 	}
 
 	@Test
-	public void doesNotConsiderPointAsNearForSimpleQuery() throws Exception {
+	void doesNotConsiderPointAsNearForSimpleQuery() throws Exception {
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Distance.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 
 		assertThat(parameters.getNearIndex()).isEqualTo(-1);
 	}
 
-	@Test(expected = IllegalStateException.class)
-	public void rejectsMultiplePointsForGeoNearMethod() throws Exception {
+	@Test
+	void rejectsMultiplePointsForGeoNearMethod() throws Exception {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNearAndOtherLocation", Point.class, Point.class);
-		new MongoParameters(method, true);
+
+		assertThatIllegalStateException().isThrownBy(() -> new MongoParameters(ParametersSource.of(method), true));
 	}
 
-	@Test(expected = IllegalStateException.class)
-	public void rejectsMultipleDoubleArraysForGeoNearMethod() throws Exception {
+	@Test
+	void rejectsMultipleDoubleArraysForGeoNearMethod() throws Exception {
 
 		Method method = PersonRepository.class.getMethod("invalidDoubleArrays", double[].class, double[].class);
-		new MongoParameters(method, true);
+
+		assertThatIllegalStateException().isThrownBy(() -> new MongoParameters(ParametersSource.of(method), true));
 	}
 
 	@Test
-	public void doesNotRejectMultiplePointsForSimpleQueryMethod() throws Exception {
+	void doesNotRejectMultiplePointsForSimpleQueryMethod() throws Exception {
 
 		Method method = PersonRepository.class.getMethod("someOtherMethod", Point.class, Point.class);
-		new MongoParameters(method, false);
+		new MongoParameters(ParametersSource.of(method), false);
 	}
 
 	@Test
-	public void findsAnnotatedPointForGeoNearQuery() throws Exception {
+	void findsAnnotatedPointForGeoNearQuery() throws Exception {
 
 		Method method = PersonRepository.class.getMethod("findByOtherLocationAndLocationNear", Point.class, Point.class);
-		MongoParameters parameters = new MongoParameters(method, true);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), true);
 		assertThat(parameters.getNearIndex()).isOne();
 	}
 
 	@Test
-	public void findsAnnotatedDoubleArrayForGeoNearQuery() throws Exception {
+	void findsAnnotatedDoubleArrayForGeoNearQuery() throws Exception {
 
 		Method method = PersonRepository.class.getMethod("validDoubleArrays", double[].class, double[].class);
-		MongoParameters parameters = new MongoParameters(method, true);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), true);
 		assertThat(parameters.getNearIndex()).isOne();
 	}
 
 	@Test // DATAMONGO-973
-	public void shouldFindTextCriteriaAtItsIndex() throws SecurityException, NoSuchMethodException {
+	void shouldFindTextCriteriaAtItsIndex() throws SecurityException, NoSuchMethodException {
 
 		Method method = PersonRepository.class.getMethod("findByNameAndText", String.class, TextCriteria.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 		assertThat(parameters.getFullTextParameterIndex()).isOne();
 	}
 
 	@Test // DATAMONGO-973
-	public void shouldTreatTextCriteriaParameterAsSpecialParameter() throws SecurityException, NoSuchMethodException {
+	void shouldTreatTextCriteriaParameterAsSpecialParameter() throws SecurityException, NoSuchMethodException {
 
 		Method method = PersonRepository.class.getMethod("findByNameAndText", String.class, TextCriteria.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 		assertThat(parameters.getParameter(parameters.getFullTextParameterIndex()).isSpecialParameter()).isTrue();
 	}
 
 	@Test // DATAMONGO-1110
-	public void shouldFindMinAndMaxDistanceParameters() throws NoSuchMethodException, SecurityException {
+	void shouldFindMinAndMaxDistanceParameters() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Range.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 
 		assertThat(parameters.getRangeIndex()).isOne();
 		assertThat(parameters.getMaxDistanceIndex()).isEqualTo(-1);
 	}
 
 	@Test // DATAMONGO-1110
-	public void shouldNotHaveMinDistanceIfOnlyOneDistanceParameterPresent()
-			throws NoSuchMethodException, SecurityException {
+	void shouldNotHaveMinDistanceIfOnlyOneDistanceParameterPresent() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Distance.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 
 		assertThat(parameters.getRangeIndex()).isEqualTo(-1);
 		assertThat(parameters.getMaxDistanceIndex()).isOne();
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldReturnMinusOneIfCollationParameterDoesNotExist() throws NoSuchMethodException, SecurityException {
+	void shouldReturnMinusOneIfCollationParameterDoesNotExist() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByLocationNear", Point.class, Distance.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 
 		assertThat(parameters.getCollationParameterIndex()).isEqualTo(-1);
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldReturnIndexOfCollationParameterIfExists() throws NoSuchMethodException, SecurityException {
+	void shouldReturnIndexOfCollationParameterIfExists() throws NoSuchMethodException, SecurityException {
 
 		Method method = PersonRepository.class.getMethod("findByText", String.class, Collation.class);
-		MongoParameters parameters = new MongoParameters(method, false);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
 
 		assertThat(parameters.getCollationParameterIndex()).isOne();
 	}
 
+	@Test // GH-2107
+	void shouldReturnIndexUpdateIfExists() throws NoSuchMethodException, SecurityException {
+
+		Method method = PersonRepository.class.getMethod("findAndModifyByFirstname", String.class, UpdateDefinition.class, Pageable.class);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
+
+		assertThat(parameters.getUpdateIndex()).isOne();
+	}
+
+	@Test // GH-2107
+	void shouldReturnInvalidIndexIfUpdateDoesNotExist() throws NoSuchMethodException, SecurityException {
+
+		Method method = PersonRepository.class.getMethod("someOtherMethod", Point.class, Point.class);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
+
+		assertThat(parameters.getUpdateIndex()).isEqualTo(-1);
+	}
+
+	@Test // GH-2107
+	void shouldOmitVector() throws NoSuchMethodException, SecurityException {
+
+		Method method = PersonRepository.class.getMethod("shouldOmitVector", Vector.class, Score.class,
+				Range.class, String.class);
+		MongoParameters parameters = new MongoParameters(ParametersSource.of(method), false);
+
+		assertThat(parameters.getVectorIndex()).isEqualTo(0);
+		assertThat(parameters.getScoreIndex()).isEqualTo(1);
+		assertThat(parameters.getScoreRangeIndex()).isEqualTo(2);
+
+		MongoParameters bindableParameters = parameters.getBindableParameters();
+		assertThat(bindableParameters).hasSize(3);
+	}
+
 	interface PersonRepository {
 
 		List<Person> findByLocationNear(Point point, Distance distance);
@@ -180,5 +221,10 @@ interface PersonRepository {
 		List<Person> findByLocationNear(Point point, Range<Distance> range);
 
 		List<Person> findByText(String text, Collation collation);
+
+		List<Person> findAndModifyByFirstname(String firstname, UpdateDefinition update, Pageable page);
+
+		List<Person> shouldOmitVector(Vector vector, Score distance, Range<Score> range,
+				String country);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java
index 986aa46f38..55e3df6b43 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryCreatorUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import static org.mockito.Mockito.*;
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 import static org.springframework.data.mongodb.repository.query.StubParameterAccessor.*;
@@ -25,10 +24,12 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.bson.BsonRegularExpression;
 import org.bson.Document;
 import org.bson.types.ObjectId;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
 import org.springframework.data.geo.Distance;
@@ -37,13 +38,11 @@
 import org.springframework.data.geo.Polygon;
 import org.springframework.data.geo.Shape;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.Person;
 import org.springframework.data.mongodb.core.Venue;
-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.MongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.geo.GeoJsonLineString;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.index.GeoSpatialIndexType;
@@ -67,22 +66,20 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  */
-public class MongoQueryCreatorUnitTests {
+class MongoQueryCreatorUnitTests {
 
-	MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context;
-	MongoConverter converter;
+	private MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> context;
+	private MongoConverter converter;
 
 	@BeforeEach
-	public void beforeEach() {
+	void beforeEach() {
 
 		context = new MongoMappingContext();
-
-		DbRefResolver resolver = new DefaultDbRefResolver(mock(MongoDbFactory.class));
-		converter = new MappingMongoConverter(resolver, context);
+		converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
 	}
 
 	@Test
-	public void createsQueryCorrectly() {
+	void createsQueryCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstName", Person.class);
 
@@ -92,7 +89,7 @@ public void createsQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-469
-	public void createsAndQueryCorrectly() {
+	void createsAndQueryCorrectly() {
 
 		Person person = new Person();
 		MongoQueryCreator creator = new MongoQueryCreator(new PartTree("findByFirstNameAndFriend", Person.class),
@@ -103,7 +100,7 @@ public void createsAndQueryCorrectly() {
 	}
 
 	@Test
-	public void createsNotNullQueryCorrectly() {
+	void createsNotNullQueryCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameNotNull", Person.class);
 		Query query = new MongoQueryCreator(tree, getAccessor(converter), context).createQuery();
@@ -112,7 +109,7 @@ public void createsNotNullQueryCorrectly() {
 	}
 
 	@Test
-	public void createsIsNullQueryCorrectly() {
+	void createsIsNullQueryCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameIsNull", Person.class);
 		Query query = new MongoQueryCreator(tree, getAccessor(converter), context).createQuery();
@@ -121,10 +118,10 @@ public void createsIsNullQueryCorrectly() {
 	}
 
 	@Test
-	public void bindsMetricDistanceParameterToNearSphereCorrectly() throws Exception {
+	void bindsMetricDistanceParameterToNearSphereCorrectly() throws Exception {
 
 		Point point = new Point(10, 20);
-		Distance distance = new Distance(2.5, Metrics.KILOMETERS);
+		Distance distance = Distance.of(2.5, Metrics.KILOMETERS);
 
 		Query query = query(
 				where("location").nearSphere(point).maxDistance(distance.getNormalizedValue()).and("firstname").is("Dave"));
@@ -132,10 +129,10 @@ public void bindsMetricDistanceParameterToNearSphereCorrectly() throws Exception
 	}
 
 	@Test
-	public void bindsDistanceParameterToNearCorrectly() throws Exception {
+	void bindsDistanceParameterToNearCorrectly() throws Exception {
 
 		Point point = new Point(10, 20);
-		Distance distance = new Distance(2.5);
+		Distance distance = Distance.of(2.5);
 
 		Query query = query(
 				where("location").near(point).maxDistance(distance.getNormalizedValue()).and("firstname").is("Dave"));
@@ -143,7 +140,7 @@ public void bindsDistanceParameterToNearCorrectly() throws Exception {
 	}
 
 	@Test
-	public void createsLessThanEqualQueryCorrectly() {
+	void createsLessThanEqualQueryCorrectly() {
 
 		PartTree tree = new PartTree("findByAgeLessThanEqual", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, 18), context);
@@ -153,7 +150,7 @@ public void createsLessThanEqualQueryCorrectly() {
 	}
 
 	@Test
-	public void createsGreaterThanEqualQueryCorrectly() {
+	void createsGreaterThanEqualQueryCorrectly() {
 
 		PartTree tree = new PartTree("findByAgeGreaterThanEqual", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, 18), context);
@@ -163,7 +160,7 @@ public void createsGreaterThanEqualQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-338
-	public void createsExistsClauseCorrectly() {
+	void createsExistsClauseCorrectly() {
 
 		PartTree tree = new PartTree("findByAgeExists", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, true), context);
@@ -172,7 +169,7 @@ public void createsExistsClauseCorrectly() {
 	}
 
 	@Test // DATAMONGO-338
-	public void createsRegexClauseCorrectly() {
+	void createsRegexClauseCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameRegex", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, ".*"), context);
@@ -181,7 +178,7 @@ public void createsRegexClauseCorrectly() {
 	}
 
 	@Test // DATAMONGO-338
-	public void createsTrueClauseCorrectly() {
+	void createsTrueClauseCorrectly() {
 
 		PartTree tree = new PartTree("findByActiveTrue", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter), context);
@@ -190,7 +187,7 @@ public void createsTrueClauseCorrectly() {
 	}
 
 	@Test // DATAMONGO-338
-	public void createsFalseClauseCorrectly() {
+	void createsFalseClauseCorrectly() {
 
 		PartTree tree = new PartTree("findByActiveFalse", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter), context);
@@ -199,7 +196,7 @@ public void createsFalseClauseCorrectly() {
 	}
 
 	@Test // DATAMONGO-413
-	public void createsOrQueryCorrectly() {
+	void createsOrQueryCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameOrAge", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "Dave", 42), context);
@@ -209,7 +206,7 @@ public void createsOrQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-347
-	public void createsQueryReferencingADBRefCorrectly() {
+	void createsQueryReferencingADBRefCorrectly() {
 
 		User user = new User();
 		user.id = new ObjectId();
@@ -222,7 +219,7 @@ public void createsQueryReferencingADBRefCorrectly() {
 	}
 
 	@Test // DATAMONGO-418
-	public void createsQueryWithStartingWithPredicateCorrectly() {
+	void createsQueryWithStartingWithPredicateCorrectly() {
 
 		PartTree tree = new PartTree("findByUsernameStartingWith", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "Matt"), context);
@@ -232,7 +229,7 @@ public void createsQueryWithStartingWithPredicateCorrectly() {
 	}
 
 	@Test // DATAMONGO-418
-	public void createsQueryWithEndingWithPredicateCorrectly() {
+	void createsQueryWithEndingWithPredicateCorrectly() {
 
 		PartTree tree = new PartTree("findByUsernameEndingWith", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "ews"), context);
@@ -242,7 +239,7 @@ public void createsQueryWithEndingWithPredicateCorrectly() {
 	}
 
 	@Test // DATAMONGO-418
-	public void createsQueryWithContainingPredicateCorrectly() {
+	void createsQueryWithContainingPredicateCorrectly() {
 
 		PartTree tree = new PartTree("findByUsernameContaining", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "thew"), context);
@@ -268,7 +265,7 @@ private void assertBindsDistanceToQuery(Point point, Distance distance, Query re
 	}
 
 	@Test // DATAMONGO-770
-	public void createsQueryWithFindByIgnoreCaseCorrectly() {
+	void createsQueryWithFindByIgnoreCaseCorrectly() {
 
 		PartTree tree = new PartTree("findByfirstNameIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave"), context);
@@ -277,8 +274,19 @@ public void createsQueryWithFindByIgnoreCaseCorrectly() {
 		assertThat(query).isEqualTo(query(where("firstName").regex("^dave$", "i")));
 	}
 
+	@Test // GH-4404
+	void createsQueryWithFindByInClauseHavingIgnoreCaseCorrectly() {
+
+		PartTree tree = new PartTree("findAllByFirstNameInIgnoreCase", Person.class);
+		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, List.of("da've", "carter")), context);
+
+		Query query = creator.createQuery();
+		assertThat(query).isEqualTo(query(where("firstName")
+				.in(List.of(new BsonRegularExpression("^\\Qda've\\E$", "i"), new BsonRegularExpression("^carter$", "i")))));
+	}
+
 	@Test // DATAMONGO-770
-	public void createsQueryWithFindByNotIgnoreCaseCorrectly() {
+	void createsQueryWithFindByNotIgnoreCaseCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameNotIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave"), context);
@@ -288,7 +296,7 @@ public void createsQueryWithFindByNotIgnoreCaseCorrectly() {
 	}
 
 	@Test // DATAMONGO-770
-	public void createsQueryWithFindByStartingWithIgnoreCaseCorrectly() {
+	void createsQueryWithFindByStartingWithIgnoreCaseCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameStartingWithIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave"), context);
@@ -298,7 +306,7 @@ public void createsQueryWithFindByStartingWithIgnoreCaseCorrectly() {
 	}
 
 	@Test // DATAMONGO-770
-	public void createsQueryWithFindByEndingWithIgnoreCaseCorrectly() {
+	void createsQueryWithFindByEndingWithIgnoreCaseCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameEndingWithIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave"), context);
@@ -308,7 +316,7 @@ public void createsQueryWithFindByEndingWithIgnoreCaseCorrectly() {
 	}
 
 	@Test // DATAMONGO-770
-	public void createsQueryWithFindByContainingIgnoreCaseCorrectly() {
+	void createsQueryWithFindByContainingIgnoreCaseCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameContainingIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave"), context);
@@ -318,7 +326,7 @@ public void createsQueryWithFindByContainingIgnoreCaseCorrectly() {
 	}
 
 	@Test // DATAMONGO-770
-	public void shouldThrowExceptionForQueryWithFindByIgnoreCaseOnNonStringProperty() {
+	void shouldThrowExceptionForQueryWithFindByIgnoreCaseOnNonStringProperty() {
 
 		PartTree tree = new PartTree("findByFirstNameAndAgeIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "foo", 42), context);
@@ -328,7 +336,7 @@ public void shouldThrowExceptionForQueryWithFindByIgnoreCaseOnNonStringProperty(
 	}
 
 	@Test // DATAMONGO-770
-	public void shouldOnlyGenerateLikeExpressionsForStringPropertiesIfAllIgnoreCase() {
+	void shouldOnlyGenerateLikeExpressionsForStringPropertiesIfAllIgnoreCase() {
 
 		PartTree tree = new PartTree("findByFirstNameAndAgeAllIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave", 42), context);
@@ -338,7 +346,7 @@ public void shouldOnlyGenerateLikeExpressionsForStringPropertiesIfAllIgnoreCase(
 	}
 
 	@Test // DATAMONGO-566
-	public void shouldCreateDeleteByQueryCorrectly() {
+	void shouldCreateDeleteByQueryCorrectly() {
 
 		PartTree tree = new PartTree("deleteByFirstName", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave", 42), context);
@@ -350,7 +358,7 @@ public void shouldCreateDeleteByQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-566
-	public void shouldCreateDeleteByQueryCorrectlyForMultipleCriteriaAndCaseExpressions() {
+	void shouldCreateDeleteByQueryCorrectlyForMultipleCriteriaAndCaseExpressions() {
 
 		PartTree tree = new PartTree("deleteByFirstNameAndAgeAllIgnoreCase", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave", 42), context);
@@ -362,7 +370,7 @@ public void shouldCreateDeleteByQueryCorrectlyForMultipleCriteriaAndCaseExpressi
 	}
 
 	@Test // DATAMONGO-1075
-	public void shouldCreateInClauseWhenUsingContainsOnCollectionLikeProperty() {
+	void shouldCreateInClauseWhenUsingContainsOnCollectionLikeProperty() {
 
 		PartTree tree = new PartTree("findByEmailAddressesContaining", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave"), context);
@@ -373,7 +381,7 @@ public void shouldCreateInClauseWhenUsingContainsOnCollectionLikeProperty() {
 	}
 
 	@Test // DATAMONGO-1075
-	public void shouldCreateInClauseWhenUsingNotContainsOnCollectionLikeProperty() {
+	void shouldCreateInClauseWhenUsingNotContainsOnCollectionLikeProperty() {
 
 		PartTree tree = new PartTree("findByEmailAddressesNotContaining", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "dave"), context);
@@ -384,7 +392,7 @@ public void shouldCreateInClauseWhenUsingNotContainsOnCollectionLikeProperty() {
 	}
 
 	@Test // DATAMONGO-1075, DATAMONGO-1425
-	public void shouldCreateRegexWhenUsingNotContainsOnStringProperty() {
+	void shouldCreateRegexWhenUsingNotContainsOnStringProperty() {
 
 		PartTree tree = new PartTree("findByUsernameNotContaining", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "thew"), context);
@@ -395,10 +403,10 @@ public void shouldCreateRegexWhenUsingNotContainsOnStringProperty() {
 	}
 
 	@Test // DATAMONGO-1139
-	public void createsNonSphericalNearForDistanceWithDefaultMetric() {
+	void createsNonSphericalNearForDistanceWithDefaultMetric() {
 
 		Point point = new Point(1.0, 1.0);
-		Distance distance = new Distance(1.0);
+		Distance distance = Distance.of(1.0);
 
 		PartTree tree = new PartTree("findByLocationNear", Venue.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, point, distance), context);
@@ -408,7 +416,7 @@ public void createsNonSphericalNearForDistanceWithDefaultMetric() {
 	}
 
 	@Test // DATAMONGO-1136
-	public void shouldCreateWithinQueryCorrectly() {
+	void shouldCreateWithinQueryCorrectly() {
 
 		Point first = new Point(1, 1);
 		Point second = new Point(2, 2);
@@ -423,7 +431,7 @@ public void shouldCreateWithinQueryCorrectly() {
 	}
 
 	@Test // DATAMONGO-1110
-	public void shouldCreateNearSphereQueryForSphericalProperty() {
+	void shouldCreateNearSphereQueryForSphericalProperty() {
 
 		Point point = new Point(10, 20);
 
@@ -435,10 +443,10 @@ public void shouldCreateNearSphereQueryForSphericalProperty() {
 	}
 
 	@Test // DATAMONGO-1110
-	public void shouldCreateNearSphereQueryForSphericalPropertyHavingDistanceWithDefaultMetric() {
+	void shouldCreateNearSphereQueryForSphericalPropertyHavingDistanceWithDefaultMetric() {
 
 		Point point = new Point(1.0, 1.0);
-		Distance distance = new Distance(1.0);
+		Distance distance = Distance.of(1.0);
 
 		PartTree tree = new PartTree("findByAddress2dSphere_GeoNear", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, point, distance), context);
@@ -448,10 +456,10 @@ public void shouldCreateNearSphereQueryForSphericalPropertyHavingDistanceWithDef
 	}
 
 	@Test // DATAMONGO-1110
-	public void shouldCreateNearQueryForMinMaxDistance() {
+	void shouldCreateNearQueryForMinMaxDistance() {
 
 		Point point = new Point(10, 20);
-		Range<Distance> range = Distance.between(new Distance(10), new Distance(20));
+		Range<Distance> range = Distance.between(Distance.of(10), Distance.of(20));
 
 		PartTree tree = new PartTree("findByAddress_GeoNear", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, point, range), context);
@@ -461,7 +469,7 @@ public void shouldCreateNearQueryForMinMaxDistance() {
 	}
 
 	@Test // DATAMONGO-1229
-	public void appliesIgnoreCaseToLeafProperty() {
+	void appliesIgnoreCaseToLeafProperty() {
 
 		PartTree tree = new PartTree("findByAddressStreetIgnoreCase", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "Street");
@@ -470,7 +478,7 @@ public void appliesIgnoreCaseToLeafProperty() {
 	}
 
 	@Test // DATAMONGO-1232
-	public void ignoreCaseShouldEscapeSource() {
+	void ignoreCaseShouldEscapeSource() {
 
 		PartTree tree = new PartTree("findByUsernameIgnoreCase", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "con.flux+");
@@ -481,7 +489,7 @@ public void ignoreCaseShouldEscapeSource() {
 	}
 
 	@Test // DATAMONGO-1232
-	public void ignoreCaseShouldEscapeSourceWhenUsedForStartingWith() {
+	void ignoreCaseShouldEscapeSourceWhenUsedForStartingWith() {
 
 		PartTree tree = new PartTree("findByUsernameStartingWithIgnoreCase", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "dawns.light+");
@@ -492,7 +500,7 @@ public void ignoreCaseShouldEscapeSourceWhenUsedForStartingWith() {
 	}
 
 	@Test // DATAMONGO-1232
-	public void ignoreCaseShouldEscapeSourceWhenUsedForEndingWith() {
+	void ignoreCaseShouldEscapeSourceWhenUsedForEndingWith() {
 
 		PartTree tree = new PartTree("findByUsernameEndingWithIgnoreCase", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "new.ton+");
@@ -503,7 +511,7 @@ public void ignoreCaseShouldEscapeSourceWhenUsedForEndingWith() {
 	}
 
 	@Test // DATAMONGO-1232
-	public void likeShouldEscapeSourceWhenUsedWithLeadingAndTrailingWildcard() {
+	void likeShouldEscapeSourceWhenUsedWithLeadingAndTrailingWildcard() {
 
 		PartTree tree = new PartTree("findByUsernameLike", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "*fire.fight+*");
@@ -514,7 +522,7 @@ public void likeShouldEscapeSourceWhenUsedWithLeadingAndTrailingWildcard() {
 	}
 
 	@Test // DATAMONGO-1232
-	public void likeShouldEscapeSourceWhenUsedWithLeadingWildcard() {
+	void likeShouldEscapeSourceWhenUsedWithLeadingWildcard() {
 
 		PartTree tree = new PartTree("findByUsernameLike", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "*steel.heart+");
@@ -525,7 +533,7 @@ public void likeShouldEscapeSourceWhenUsedWithLeadingWildcard() {
 	}
 
 	@Test // DATAMONGO-1232
-	public void likeShouldEscapeSourceWhenUsedWithTrailingWildcard() {
+	void likeShouldEscapeSourceWhenUsedWithTrailingWildcard() {
 
 		PartTree tree = new PartTree("findByUsernameLike", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "cala.mity+*");
@@ -535,7 +543,7 @@ public void likeShouldEscapeSourceWhenUsedWithTrailingWildcard() {
 	}
 
 	@Test // DATAMONGO-1232
-	public void likeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
+	void likeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
 
 		PartTree tree = new PartTree("findByUsernameLike", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "*");
@@ -545,7 +553,7 @@ public void likeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
 	}
 
 	@Test // DATAMONGO-1342
-	public void bindsNullValueToContainsClause() {
+	void bindsNullValueToContainsClause() {
 
 		PartTree partTree = new PartTree("emailAddressesContains", User.class);
 
@@ -556,7 +564,7 @@ public void bindsNullValueToContainsClause() {
 	}
 
 	@Test // DATAMONGO-1424
-	public void notLikeShouldEscapeSourceWhenUsedWithLeadingAndTrailingWildcard() {
+	void notLikeShouldEscapeSourceWhenUsedWithLeadingAndTrailingWildcard() {
 
 		PartTree tree = new PartTree("findByUsernameNotLike", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "*fire.fight+*");
@@ -568,7 +576,7 @@ public void notLikeShouldEscapeSourceWhenUsedWithLeadingAndTrailingWildcard() {
 	}
 
 	@Test // DATAMONGO-1424
-	public void notLikeShouldEscapeSourceWhenUsedWithLeadingWildcard() {
+	void notLikeShouldEscapeSourceWhenUsedWithLeadingWildcard() {
 
 		PartTree tree = new PartTree("findByUsernameNotLike", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "*steel.heart+");
@@ -580,7 +588,7 @@ public void notLikeShouldEscapeSourceWhenUsedWithLeadingWildcard() {
 	}
 
 	@Test // DATAMONGO-1424
-	public void notLikeShouldEscapeSourceWhenUsedWithTrailingWildcard() {
+	void notLikeShouldEscapeSourceWhenUsedWithTrailingWildcard() {
 
 		PartTree tree = new PartTree("findByUsernameNotLike", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, "cala.mity+*"), context);
@@ -591,7 +599,7 @@ public void notLikeShouldEscapeSourceWhenUsedWithTrailingWildcard() {
 	}
 
 	@Test // DATAMONGO-1424
-	public void notLikeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
+	void notLikeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
 
 		PartTree tree = new PartTree("findByUsernameNotLike", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, "*");
@@ -602,7 +610,7 @@ public void notLikeShouldBeTreatedCorrectlyWhenUsedWithWildcardOnly() {
 	}
 
 	@Test // DATAMONGO-1588
-	public void queryShouldAcceptSubclassOfDeclaredArgument() {
+	void queryShouldAcceptSubclassOfDeclaredArgument() {
 
 		PartTree tree = new PartTree("findByLocationNear", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter, new GeoJsonPoint(-74.044502D, 40.689247D));
@@ -612,7 +620,7 @@ public void queryShouldAcceptSubclassOfDeclaredArgument() {
 	}
 
 	@Test // DATAMONGO-1588
-	public void queryShouldThrowExceptionWhenArgumentDoesNotMatchDeclaration() {
+	void queryShouldThrowExceptionWhenArgumentDoesNotMatchDeclaration() {
 
 		PartTree tree = new PartTree("findByLocationNear", User.class);
 		ConvertingParameterAccessor accessor = getAccessor(converter,
@@ -623,7 +631,7 @@ public void queryShouldThrowExceptionWhenArgumentDoesNotMatchDeclaration() {
 	}
 
 	@Test // DATAMONGO-2003
-	public void createsRegexQueryForPatternCorrectly() {
+	void createsRegexQueryForPatternCorrectly() {
 
 		PartTree tree = new PartTree("findByFirstNameRegex", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree, getAccessor(converter, Pattern.compile(".*")), context);
@@ -632,7 +640,7 @@ public void createsRegexQueryForPatternCorrectly() {
 	}
 
 	@Test // DATAMONGO-2003
-	public void createsRegexQueryForPatternWithOptionsCorrectly() {
+	void createsRegexQueryForPatternWithOptionsCorrectly() {
 
 		Pattern pattern = Pattern.compile(".*", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
 
@@ -642,7 +650,7 @@ public void createsRegexQueryForPatternWithOptionsCorrectly() {
 	}
 
 	@Test // DATAMONGO-2071
-	public void betweenShouldAllowSingleRageParameter() {
+	void betweenShouldAllowSingleRageParameter() {
 
 		PartTree tree = new PartTree("findByAgeBetween", Person.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree,
@@ -652,12 +660,12 @@ public void betweenShouldAllowSingleRageParameter() {
 	}
 
 	@Test // DATAMONGO-2394
-	public void nearShouldUseMetricDistanceForGeoJsonTypes() {
+	void nearShouldUseMetricDistanceForGeoJsonTypes() {
 
 		GeoJsonPoint point = new GeoJsonPoint(27.987901, 86.9165379);
 		PartTree tree = new PartTree("findByLocationNear", User.class);
 		MongoQueryCreator creator = new MongoQueryCreator(tree,
-				getAccessor(converter, point, new Distance(1, Metrics.KILOMETERS)), context);
+				getAccessor(converter, point, Distance.of(1, Metrics.KILOMETERS)), context);
 
 		assertThat(creator.createQuery()).isEqualTo(query(where("location").nearSphere(point).maxDistance(1000.0D)));
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryExecutionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryExecutionUnitTests.java
index 73acfb68f6..2c0c996bc3 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryExecutionUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryExecutionUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author 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,20 +15,24 @@
  */
 package org.springframework.data.mongodb.repository.query;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.Distance;
@@ -41,6 +45,7 @@
 import org.springframework.data.mongodb.core.ExecutableFindOperation.FindWithQuery;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFind;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.TerminatingFindNear;
+import org.springframework.data.mongodb.core.ExecutableRemoveOperation.ExecutableRemove;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
@@ -56,8 +61,7 @@
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.util.ReflectionUtils;
 
 import com.mongodb.client.result.DeleteResult;
@@ -68,40 +72,40 @@
  * @author Mark Paluch
  * @author Oliver Gierke
  * @author Artyom Gabeev
+ * @author Christoph Strobl
  * @soundtrack U Can't Touch This - MC Hammer
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoQueryExecutionUnitTests {
+@ExtendWith(MockitoExtension.class)
+class MongoQueryExecutionUnitTests {
 
 	@Mock MongoOperations mongoOperationsMock;
 	@Mock ExecutableFind<Object> findOperationMock;
 	@Mock FindWithQuery<Object> operationMock;
 	@Mock TerminatingFind<Object> terminatingMock;
 	@Mock TerminatingFindNear<Object> terminatingGeoMock;
+	@Mock ExecutableRemove<Object> removeMock;
 	@Mock DbRefResolver dbRefResolver;
 
-	SpelExpressionParser EXPRESSION_PARSER = new SpelExpressionParser();
-	Point POINT = new Point(10, 20);
-	Distance DISTANCE = new Distance(2.5, Metrics.KILOMETERS);
-	RepositoryMetadata metadata = new DefaultRepositoryMetadata(PersonRepository.class);
-	MongoMappingContext context = new MongoMappingContext();
-	ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
-	Method method = ReflectionUtils.findMethod(PersonRepository.class, "findByLocationNear", Point.class, Distance.class,
-			Pageable.class);
-	MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
-	MappingMongoConverter converter;
-
-	@Before
+	private Point POINT = new Point(10, 20);
+	private Distance DISTANCE = Distance.of(2.5, Metrics.KILOMETERS);
+	private RepositoryMetadata metadata = new DefaultRepositoryMetadata(PersonRepository.class);
+	private MongoMappingContext context = new MongoMappingContext();
+	private ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
+	private Method method = ReflectionUtils.findMethod(PersonRepository.class, "findByLocationNear", Point.class,
+			Distance.class, Pageable.class);
+	private MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
+	private MappingMongoConverter converter;
+
+	@BeforeEach
 	@SuppressWarnings("unchecked")
-	public void setUp() {
+	void setUp() {
 
 		converter = new MappingMongoConverter(dbRefResolver, context);
-		when(mongoOperationsMock.getConverter()).thenReturn(converter);
-		when(mongoOperationsMock.query(any(Class.class))).thenReturn(findOperationMock);
+
 	}
 
 	@Test // DATAMONGO-1464
-	public void pagedExecutionShouldNotGenerateCountQueryIfQueryReportedNoResults() {
+	void pagedExecutionShouldNotGenerateCountQueryIfQueryReportedNoResults() {
 
 		doReturn(terminatingMock).when(operationMock).matching(any(Query.class));
 		doReturn(Collections.emptyList()).when(terminatingMock).all();
@@ -114,7 +118,7 @@ public void pagedExecutionShouldNotGenerateCountQueryIfQueryReportedNoResults()
 	}
 
 	@Test // DATAMONGO-1464
-	public void pagedExecutionShouldUseCountFromResultWithOffsetAndResultsWithinPageSize() {
+	void pagedExecutionShouldUseCountFromResultWithOffsetAndResultsWithinPageSize() {
 
 		doReturn(terminatingMock).when(operationMock).matching(any(Query.class));
 		doReturn(Arrays.asList(new Person(), new Person(), new Person(), new Person())).when(terminatingMock).all();
@@ -127,7 +131,7 @@ public void pagedExecutionShouldUseCountFromResultWithOffsetAndResultsWithinPage
 	}
 
 	@Test // DATAMONGO-1464
-	public void pagedExecutionRetrievesObjectsForPageableOutOfRange() {
+	void pagedExecutionRetrievesObjectsForPageableOutOfRange() {
 
 		doReturn(terminatingMock).when(operationMock).matching(any(Query.class));
 		doReturn(Collections.emptyList()).when(terminatingMock).all();
@@ -140,17 +144,19 @@ public void pagedExecutionRetrievesObjectsForPageableOutOfRange() {
 	}
 
 	@Test // DATAMONGO-1464
-	public void pagingGeoExecutionShouldUseCountFromResultWithOffsetAndResultsWithinPageSize() {
+	void pagingGeoExecutionShouldUseCountFromResultWithOffsetAndResultsWithinPageSize() {
 
 		GeoResult<Person> result = new GeoResult<>(new Person(), DISTANCE);
+		when(mongoOperationsMock.getConverter()).thenReturn(converter);
+		when(mongoOperationsMock.query(any(Class.class))).thenReturn(findOperationMock);
 		when(findOperationMock.near(any(NearQuery.class))).thenReturn(terminatingGeoMock);
 		doReturn(new GeoResults<>(Arrays.asList(result, result, result, result))).when(terminatingGeoMock).all();
 
 		ConvertingParameterAccessor accessor = new ConvertingParameterAccessor(converter,
 				new MongoParametersParameterAccessor(queryMethod, new Object[] { POINT, DISTANCE, PageRequest.of(0, 10) }));
 
-		PartTreeMongoQuery query = new PartTreeMongoQuery(queryMethod, mongoOperationsMock, EXPRESSION_PARSER,
-				QueryMethodEvaluationContextProvider.DEFAULT);
+		PartTreeMongoQuery query = new PartTreeMongoQuery(queryMethod, mongoOperationsMock,
+				ValueExpressionDelegate.create());
 
 		PagingGeoNearExecution execution = new PagingGeoNearExecution(findOperationMock, queryMethod, accessor, query);
 		execution.execute(new Query());
@@ -159,8 +165,10 @@ public void pagingGeoExecutionShouldUseCountFromResultWithOffsetAndResultsWithin
 	}
 
 	@Test // DATAMONGO-1464
-	public void pagingGeoExecutionRetrievesObjectsForPageableOutOfRange() {
+	void pagingGeoExecutionRetrievesObjectsForPageableOutOfRange() {
 
+		when(mongoOperationsMock.getConverter()).thenReturn(converter);
+		when(mongoOperationsMock.query(any(Class.class))).thenReturn(findOperationMock);
 		when(findOperationMock.near(any(NearQuery.class))).thenReturn(terminatingGeoMock);
 		doReturn(new GeoResults<>(Collections.emptyList())).when(terminatingGeoMock).all();
 		doReturn(terminatingMock).when(findOperationMock).matching(any(Query.class));
@@ -168,8 +176,8 @@ public void pagingGeoExecutionRetrievesObjectsForPageableOutOfRange() {
 		ConvertingParameterAccessor accessor = new ConvertingParameterAccessor(converter,
 				new MongoParametersParameterAccessor(queryMethod, new Object[] { POINT, DISTANCE, PageRequest.of(2, 10) }));
 
-		PartTreeMongoQuery query = new PartTreeMongoQuery(queryMethod, mongoOperationsMock, EXPRESSION_PARSER,
-				QueryMethodEvaluationContextProvider.DEFAULT);
+		PartTreeMongoQuery query = new PartTreeMongoQuery(queryMethod, mongoOperationsMock,
+				ValueExpressionDelegate.create());
 
 		PagingGeoNearExecution execution = new PagingGeoNearExecution(findOperationMock, queryMethod, accessor, query);
 		execution.execute(new Query());
@@ -179,25 +187,46 @@ public void pagingGeoExecutionRetrievesObjectsForPageableOutOfRange() {
 	}
 
 	@Test // DATAMONGO-2351
-	public void acknowledgedDeleteReturnsDeletedCount() {
+	void acknowledgedDeleteReturnsDeletedCount() {
 
-		when(mongoOperationsMock.remove(any(Query.class), any(Class.class), anyString()))
-				.thenReturn(DeleteResult.acknowledged(10));
+		doReturn(removeMock).when(removeMock).matching(any(Query.class));
+		when(removeMock.all()).thenReturn(DeleteResult.acknowledged(10));
+		Method method = ReflectionUtils.findMethod(PersonRepository.class, "deleteAllByLastname", String.class);
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
 
-		assertThat(new DeleteExecution(mongoOperationsMock, queryMethod).execute(new Query())).isEqualTo(10L);
+		assertThat(new DeleteExecution(removeMock, queryMethod).execute(new Query())).isEqualTo(10L);
 	}
 
 	@Test // DATAMONGO-2351
-	public void unacknowledgedDeleteReturnsZeroDeletedCount() {
+	void unacknowledgedDeleteReturnsZeroDeletedCount() {
 
-		when(mongoOperationsMock.remove(any(Query.class), any(Class.class), anyString()))
-				.thenReturn(DeleteResult.unacknowledged());
+		doReturn(removeMock).when(removeMock).matching(any(Query.class));
+		when(removeMock.all()).thenReturn(DeleteResult.unacknowledged());
+		Method method = ReflectionUtils.findMethod(PersonRepository.class, "deleteAllByLastname", String.class);
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
 
-		assertThat(new DeleteExecution(mongoOperationsMock, queryMethod).execute(new Query())).isEqualTo(0L);
+		assertThat(new DeleteExecution(removeMock, queryMethod).execute(new Query())).isEqualTo(0L);
+	}
+
+	@Test // DATAMONGO-1997
+	void deleteExecutionWithEntityReturnTypeTriggersFindAndRemove() {
+
+		Person person = new Person();
+		doReturn(removeMock).when(removeMock).matching(any(Query.class));
+		when(removeMock.findAndRemove()).thenReturn(List.of(person));
+
+		Method method = ReflectionUtils.findMethod(PersonRepository.class, "deleteByLastname", String.class);
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, factory, context);
+
+		assertThat(new DeleteExecution(removeMock, queryMethod).execute(new Query())).isEqualTo(person);
 	}
 
 	interface PersonRepository extends Repository<Person, Long> {
 
 		GeoPage<Person> findByLocationNear(Point point, Distance distance, Pageable pageable);
+
+		Long deleteAllByLastname(String lastname);
+
+		Person deleteByLastname(String lastname);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryMethodUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryMethodUnitTests.java
index 692d202ac3..386d0fa4b5 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryMethodUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/MongoQueryMethodUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,9 +21,8 @@
 import java.util.Collection;
 import java.util.List;
 
-import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.geo.Distance;
@@ -32,12 +31,18 @@
 import org.springframework.data.geo.GeoResults;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.User;
+import org.springframework.data.mongodb.core.aggregation.AggregationUpdate;
+import org.springframework.data.mongodb.core.annotation.Collation;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.query.Update;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.mongodb.repository.Address;
 import org.springframework.data.mongodb.repository.Aggregation;
 import org.springframework.data.mongodb.repository.Contact;
 import org.springframework.data.mongodb.repository.Meta;
 import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.Query;
+import org.springframework.data.mongodb.repository.ReadPreference;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
@@ -49,12 +54,13 @@
  * @author Oliver Gierke
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Jorge Rodríguez
  */
 public class MongoQueryMethodUnitTests {
 
 	MongoMappingContext context;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		context = new MongoMappingContext();
 	}
@@ -106,13 +112,13 @@ public void rejectsGeoPageQueryWithoutPageable() {
 				.isThrownBy(() -> queryMethod(PersonRepository.class, "findByLocationNear", Point.class, Distance.class));
 	}
 
-	@Test(expected = IllegalArgumentException.class)
+	@Test
 	public void rejectsNullMappingContext() throws Exception {
 
 		Method method = PersonRepository.class.getMethod("findByFirstname", String.class, Point.class);
 
-		new MongoQueryMethod(method, new DefaultRepositoryMetadata(PersonRepository.class),
-				new SpelAwareProxyProjectionFactory(), null);
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new MongoQueryMethod(method,
+				new DefaultRepositoryMetadata(PersonRepository.class), new SpelAwareProxyProjectionFactory(), null));
 	}
 
 	@Test
@@ -176,15 +182,6 @@ public void createsMongoQueryMethodWithSpellFixedMaxExecutionTimeCorrectly() thr
 		assertThat(method.getQueryMetaAttributes().getMaxTimeMsec()).isEqualTo(100L);
 	}
 
-	@Test // DATAMONGO-957
-	public void createsMongoQueryMethodWithMaxScanCorrectly() throws Exception {
-
-		MongoQueryMethod method = queryMethod(PersonRepository.class, "metaWithMaxScan");
-
-		assertThat(method.hasQueryMetaAttributes()).isTrue();
-		assertThat(method.getQueryMetaAttributes().getMaxScan()).isEqualTo(10L);
-	}
-
 	@Test // DATAMONGO-957
 	public void createsMongoQueryMethodWithCommentCorrectly() throws Exception {
 
@@ -194,15 +191,6 @@ public void createsMongoQueryMethodWithCommentCorrectly() throws Exception {
 		assertThat(method.getQueryMetaAttributes().getComment()).isEqualTo("foo bar");
 	}
 
-	@Test // DATAMONGO-957
-	public void createsMongoQueryMethodWithSnapshotCorrectly() throws Exception {
-
-		MongoQueryMethod method = queryMethod(PersonRepository.class, "metaWithSnapshotUsage");
-
-		assertThat(method.hasQueryMetaAttributes()).isTrue();
-		assertThat(method.getQueryMetaAttributes().getSnapshot()).isTrue();
-	}
-
 	@Test // DATAMONGO-1480
 	public void createsMongoQueryMethodWithNoCursorTimeoutCorrectly() throws Exception {
 
@@ -213,7 +201,7 @@ public void createsMongoQueryMethodWithNoCursorTimeoutCorrectly() throws Excepti
 				.contains(org.springframework.data.mongodb.core.query.Meta.CursorOption.NO_TIMEOUT);
 	}
 
-	@Test // DATAMONGO-1480
+	@Test // DATAMONGO-1480, DATAMONGO-2572
 	public void createsMongoQueryMethodWithMultipleFlagsCorrectly() throws Exception {
 
 		MongoQueryMethod method = queryMethod(PersonRepository.class, "metaWithMultipleFlags");
@@ -221,7 +209,7 @@ public void createsMongoQueryMethodWithMultipleFlagsCorrectly() throws Exception
 		assertThat(method.hasQueryMetaAttributes()).isTrue();
 		assertThat(method.getQueryMetaAttributes().getFlags()).contains(
 				org.springframework.data.mongodb.core.query.Meta.CursorOption.NO_TIMEOUT,
-				org.springframework.data.mongodb.core.query.Meta.CursorOption.SLAVE_OK);
+				org.springframework.data.mongodb.core.query.Meta.CursorOption.SECONDARY_READS);
 	}
 
 	@Test // DATAMONGO-1266
@@ -237,8 +225,8 @@ public void findsAnnotatedAggregation() throws Exception {
 
 		MongoQueryMethod method = queryMethod(PersonRepository.class, "findByAggregation");
 
-		Assertions.assertThat(method.hasAnnotatedAggregation()).isTrue();
-		Assertions.assertThat(method.getAnnotatedAggregation()).hasSize(1);
+		assertThat(method.hasAnnotatedAggregation()).isTrue();
+		assertThat(method.getAnnotatedAggregation()).hasSize(1);
 	}
 
 	@Test // DATAMONGO-2153
@@ -246,8 +234,138 @@ public void detectsCollationForAggregation() throws Exception {
 
 		MongoQueryMethod method = queryMethod(PersonRepository.class, "findByAggregationWithCollation");
 
-		Assertions.assertThat(method.hasAnnotatedCollation()).isTrue();
-		Assertions.assertThat(method.getAnnotatedCollation()).isEqualTo("de_AT");
+		assertThat(method.hasAnnotatedCollation()).isTrue();
+		assertThat(method.getAnnotatedCollation()).isEqualTo("de_AT");
+	}
+
+	@Test // GH-2107
+	void detectsModifyingQueryByUpdateType() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findAndUpdateBy", String.class, Update.class);
+
+		assertThat(method.isModifyingQuery()).isTrue();
+	}
+
+	@Test // GH-2107
+	void detectsModifyingQueryByUpdateDefinitionType() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findAndUpdateBy", String.class,
+				UpdateDefinition.class);
+
+		assertThat(method.isModifyingQuery()).isTrue();
+	}
+
+	@Test // GH-2107
+	void detectsModifyingQueryByAggregationUpdateDefinitionType() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findAndUpdateBy", String.class,
+				AggregationUpdate.class);
+
+		assertThat(method.isModifyingQuery()).isTrue();
+	}
+
+	@Test // GH-2107
+	void queryCreationFailsOnInvalidUpdate() throws Exception {
+
+		assertThatExceptionOfType(IllegalStateException.class) //
+				.isThrownBy(() -> queryMethod(InvalidUpdateMethodRepo.class, "findAndUpdateByLastname", String.class).verify()) //
+				.withMessageContaining("Update") //
+				.withMessageContaining("findAndUpdateByLastname");
+	}
+
+	@Test // GH-2107
+	void queryCreationForUpdateMethodFailsOnInvalidReturnType() throws Exception {
+
+		assertThatExceptionOfType(IllegalStateException.class) //
+				.isThrownBy(() -> queryMethod(InvalidUpdateMethodRepo.class, "findAndIncrementVisitsByFirstname", String.class)
+						.verify()) //
+				.withMessageContaining("Update") //
+				.withMessageContaining("numeric") //
+				.withMessageContaining("findAndIncrementVisitsByFirstname");
+	}
+
+	@Test // GH-3002
+	void readsCollationFromAtCollationAnnotation() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findWithCollationFromAtCollationByFirstname",
+				String.class);
+
+		assertThat(method.hasAnnotatedCollation()).isTrue();
+		assertThat(method.getAnnotatedCollation()).isEqualTo("en_US");
+	}
+
+	@Test // GH-3002
+	void readsCollationFromAtQueryAnnotation() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findWithCollationFromAtQueryByFirstname",
+				String.class);
+
+		assertThat(method.hasAnnotatedCollation()).isTrue();
+		assertThat(method.getAnnotatedCollation()).isEqualTo("en_US");
+	}
+
+	@Test // GH-3002
+	void annotatedCollationClashSelectsAtCollationAnnotationValue() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class,
+				"findWithMultipleCollationsFromAtQueryAndAtCollationByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedCollation()).isTrue();
+		assertThat(method.getAnnotatedCollation()).isEqualTo("de_AT");
+	}
+
+	@Test // GH-2971
+	void readsReadPreferenceAtQueryAnnotation() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findWithReadPreferenceFromAtReadPreferenceByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
+	@Test // GH-2971
+	void readsReadPreferenceFromAtQueryAnnotation() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findWithReadPreferenceFromAtQueryByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
+	@Test // GH-2971
+	void annotatedReadPreferenceClashSelectsAtReadPreferenceAnnotationValue() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findWithMultipleReadPreferencesFromAtQueryAndAtReadPreferenceByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
+	@Test // GH-2971
+	void readsReadPreferenceAtRepositoryAnnotation() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "deleteByUserName", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("primaryPreferred");
+	}
+
+	@Test // GH-2971
+	void detectsReadPreferenceForAggregation() throws Exception {
+
+		MongoQueryMethod method = queryMethod(PersonRepository.class, "findByAggregationWithReadPreference");
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
+	@Test // GH-4546
+	void errorsOnInvalidAggregation() {
+
+		assertThatIllegalStateException() //
+				.isThrownBy(() -> queryMethod(InvalidAggregationMethodRepo.class, "findByAggregation").verify()) //
+				.withMessageContaining("Invalid aggregation") //
+				.withMessageContaining("findByAggregation");
 	}
 
 	private MongoQueryMethod queryMethod(Class<?> repository, String name, Class<?>... parameters) throws Exception {
@@ -257,6 +375,7 @@ private MongoQueryMethod queryMethod(Class<?> repository, String name, Class<?>.
 		return new MongoQueryMethod(method, new DefaultRepositoryMetadata(repository), factory, context);
 	}
 
+	@ReadPreference(value = "primaryPreferred")
 	interface PersonRepository extends Repository<User, Long> {
 
 		// Misses Pageable
@@ -285,20 +404,14 @@ interface PersonRepository extends Repository<User, Long> {
 		@Meta(maxExecutionTimeMs = 100)
 		List<User> metaWithSpellFixedMaxExecutionTime();
 
-		@Meta(maxScanDocuments = 10)
-		List<User> metaWithMaxScan();
-
 		@Meta(comment = "foo bar")
 		List<User> metaWithComment();
 
-		@Meta(snapshot = true)
-		List<User> metaWithSnapshotUsage();
-
 		@Meta(flags = { org.springframework.data.mongodb.core.query.Meta.CursorOption.NO_TIMEOUT })
 		List<User> metaWithNoCursorTimeout();
 
 		@Meta(flags = { org.springframework.data.mongodb.core.query.Meta.CursorOption.NO_TIMEOUT,
-				org.springframework.data.mongodb.core.query.Meta.CursorOption.SLAVE_OK })
+				org.springframework.data.mongodb.core.query.Meta.CursorOption.SECONDARY_READS })
 		List<User> metaWithMultipleFlags();
 
 		// DATAMONGO-1266
@@ -310,6 +423,35 @@ interface PersonRepository extends Repository<User, Long> {
 		@Aggregation(pipeline = "{'$group': { _id: '$templateId', maxVersion : { $max : '$version'} } }",
 				collation = "de_AT")
 		List<User> findByAggregationWithCollation();
+
+		@Aggregation(pipeline = "{'$group': { _id: '$templateId', maxVersion : { $max : '$version'} } }", readPreference = "secondaryPreferred")
+		List<User> findByAggregationWithReadPreference();
+
+		void findAndUpdateBy(String firstname, Update update);
+
+		void findAndUpdateBy(String firstname, UpdateDefinition update);
+
+		void findAndUpdateBy(String firstname, AggregationUpdate update);
+
+		@Collation("en_US")
+		List<User> findWithCollationFromAtCollationByFirstname(String firstname);
+
+		@Query(collation = "en_US")
+		List<User> findWithCollationFromAtQueryByFirstname(String firstname);
+
+		@Collation("de_AT")
+		@Query(collation = "en_US")
+		List<User> findWithMultipleCollationsFromAtQueryAndAtCollationByFirstname(String firstname);
+
+		@ReadPreference("secondaryPreferred")
+		List<User> findWithReadPreferenceFromAtReadPreferenceByFirstname(String firstname);
+
+		@Query(readPreference = "secondaryPreferred")
+		List<User> findWithReadPreferenceFromAtQueryByFirstname(String firstname);
+
+		@ReadPreference("secondaryPreferred")
+		@Query(readPreference = "primaryPreferred")
+		List<User> findWithMultipleReadPreferencesFromAtQueryAndAtReadPreferenceByFirstname(String firstname);
 	}
 
 	interface SampleRepository extends Repository<Contact, Long> {
@@ -324,6 +466,21 @@ interface SampleRepository2 extends Repository<Contact, Long> {
 		Customer methodReturningAnInterface();
 	}
 
+	interface InvalidUpdateMethodRepo extends Repository<Person, Long> {
+
+		@org.springframework.data.mongodb.repository.Update
+		void findAndUpdateByLastname(String lastname);
+
+		@org.springframework.data.mongodb.repository.Update("{ '$inc' : { 'visits' : 1 } }")
+		Person findAndIncrementVisitsByFirstname(String firstname);
+	}
+
+	interface InvalidAggregationMethodRepo extends Repository<Person, Long> {
+
+		@Aggregation("[{'$group': { _id: '$templateId', maxVersion : { $max : '$version'} } }]")
+		List<User> findByAggregation();
+	}
+
 	interface Customer {
 
 	}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQueryUnitTests.java
index 48c1e19cc6..07c10592d9 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/PartTreeMongoQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author 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,20 +24,18 @@
 
 import org.bson.Document;
 import org.bson.json.JsonParseException;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.data.mongodb.MongoDbFactory;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.ExecutableFind;
 import org.springframework.data.mongodb.core.MongoOperations;
-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.MongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.TextCriteria;
 import org.springframework.data.mongodb.repository.MongoRepository;
@@ -47,8 +45,7 @@
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 
 /**
  * Unit tests for {@link PartTreeMongoQuery}.
@@ -58,34 +55,33 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class PartTreeMongoQueryUnitTests {
+@ExtendWith(MockitoExtension.class)
+class PartTreeMongoQueryUnitTests {
 
 	@Mock MongoOperations mongoOperationsMock;
 	@Mock ExecutableFind<?> findOperationMock;
 
-	MongoMappingContext mappingContext;
+	private MongoMappingContext mappingContext;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		mappingContext = new MongoMappingContext();
-		DbRefResolver dbRefResolver = new DefaultDbRefResolver(mock(MongoDbFactory.class));
-		MongoConverter converter = new MappingMongoConverter(dbRefResolver, mappingContext);
+		MongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
 
 		doReturn(converter).when(mongoOperationsMock).getConverter();
 		doReturn(findOperationMock).when(mongoOperationsMock).query(any());
 	}
 
 	@Test // DATAMOGO-952
-	public void rejectsInvalidFieldSpecification() {
+	void rejectsInvalidFieldSpecification() {
 
 		assertThatIllegalStateException().isThrownBy(() -> deriveQueryFromMethod("findByLastname", "foo"))
 				.withMessageContaining("findByLastname");
 	}
 
 	@Test // DATAMOGO-952
-	public void singleFieldJsonIncludeRestrictionShouldBeConsidered() {
+	void singleFieldJsonIncludeRestrictionShouldBeConsidered() {
 
 		org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findByFirstname", "foo");
 
@@ -93,7 +89,7 @@ public void singleFieldJsonIncludeRestrictionShouldBeConsidered() {
 	}
 
 	@Test // DATAMOGO-952
-	public void multiFieldJsonIncludeRestrictionShouldBeConsidered() {
+	void multiFieldJsonIncludeRestrictionShouldBeConsidered() {
 
 		org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findByFirstnameAndLastname", "foo",
 				"bar");
@@ -102,7 +98,7 @@ public void multiFieldJsonIncludeRestrictionShouldBeConsidered() {
 	}
 
 	@Test // DATAMOGO-952
-	public void multiFieldJsonExcludeRestrictionShouldBeConsidered() {
+	void multiFieldJsonExcludeRestrictionShouldBeConsidered() {
 
 		org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findPersonByFirstnameAndLastname",
 				"foo", "bar");
@@ -111,7 +107,7 @@ public void multiFieldJsonExcludeRestrictionShouldBeConsidered() {
 	}
 
 	@Test // DATAMOGO-973
-	public void shouldAddFullTextParamCorrectlyToDerivedQuery() {
+	void shouldAddFullTextParamCorrectlyToDerivedQuery() {
 
 		org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findPersonByFirstname", "text",
 				TextCriteria.forDefaultLanguage().matching("search"));
@@ -120,19 +116,19 @@ public void shouldAddFullTextParamCorrectlyToDerivedQuery() {
 	}
 
 	@Test // DATAMONGO-1180
-	public void propagatesRootExceptionForInvalidQuery() {
+	void propagatesRootExceptionForInvalidQuery() {
 
 		assertThatExceptionOfType(IllegalStateException.class).isThrownBy(() -> deriveQueryFromMethod("findByAge", 1))
 				.withCauseInstanceOf(JsonParseException.class);
 	}
 
 	@Test // DATAMONGO-1345, DATAMONGO-1735
-	public void doesNotDeriveFieldSpecForNormalDomainType() {
-		assertThat(deriveQueryFromMethod("findPersonBy", new Object[0]).getFieldsObject()).isEqualTo(new Document());
+	void doesNotDeriveFieldSpecForNormalDomainType() {
+		assertThat(deriveQueryFromMethod("findPersonBy", new Object[0]).getFieldsObject()).isEmpty();
 	}
 
 	@Test // DATAMONGO-1345
-	public void restrictsQueryToFieldsRequiredForProjection() {
+	void restrictsQueryToFieldsRequiredForProjection() {
 
 		Document fieldsObject = deriveQueryFromMethod("findPersonProjectedBy", new Object[0]).getFieldsObject();
 
@@ -141,7 +137,7 @@ public void restrictsQueryToFieldsRequiredForProjection() {
 	}
 
 	@Test // DATAMONGO-1345
-	public void restrictsQueryToFieldsRequiredForDto() {
+	void restrictsQueryToFieldsRequiredForDto() {
 
 		Document fieldsObject = deriveQueryFromMethod("findPersonDtoByAge", new Object[] { 42 }).getFieldsObject();
 
@@ -150,7 +146,7 @@ public void restrictsQueryToFieldsRequiredForDto() {
 	}
 
 	@Test // DATAMONGO-1345
-	public void usesDynamicProjection() {
+	void usesDynamicProjection() {
 
 		Document fields = deriveQueryFromMethod("findDynamicallyProjectedBy", ExtendedProjection.class).getFieldsObject();
 
@@ -160,7 +156,7 @@ public void usesDynamicProjection() {
 	}
 
 	@Test // DATAMONGO-1500
-	public void shouldLeaveParameterConversionToQueryMapper() {
+	void shouldLeaveParameterConversionToQueryMapper() {
 
 		org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findBySex", Sex.FEMALE);
 
@@ -169,20 +165,20 @@ public void shouldLeaveParameterConversionToQueryMapper() {
 	}
 
 	@Test // DATAMONGO-1729, DATAMONGO-1735
-	public void doesNotCreateFieldsObjectForOpenProjection() {
+	void doesNotCreateFieldsObjectForOpenProjection() {
 
 		org.springframework.data.mongodb.core.query.Query query = deriveQueryFromMethod("findAllBy");
 
-		assertThat(query.getFieldsObject()).isEqualTo(new Document());
+		assertThat(query.getFieldsObject()).isEmpty();
 	}
 
 	@Test // DATAMONGO-1865
-	public void limitingReturnsTrueIfTreeIsLimiting() {
+	void limitingReturnsTrueIfTreeIsLimiting() {
 		assertThat(createQueryForMethod("findFirstBy").isLimiting()).isTrue();
 	}
 
 	@Test // DATAMONGO-1865
-	public void limitingReturnsFalseIfTreeIsNotLimiting() {
+	void limitingReturnsFalseIfTreeIsNotLimiting() {
 		assertThat(createQueryForMethod("findPersonBy").isLimiting()).isFalse();
 	}
 
@@ -209,8 +205,7 @@ private PartTreeMongoQuery createQueryForMethod(String methodName, Class<?>... p
 			MongoQueryMethod queryMethod = new MongoQueryMethod(method, new DefaultRepositoryMetadata(Repo.class), factory,
 					mappingContext);
 
-			return new PartTreeMongoQuery(queryMethod, mongoOperationsMock, new SpelExpressionParser(),
-					QueryMethodEvaluationContextProvider.DEFAULT);
+			return new PartTreeMongoQuery(queryMethod, mongoOperationsMock, ValueExpressionDelegate.create());
 		} catch (Exception e) {
 			throw new IllegalArgumentException(e.getMessage(), e);
 		}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecutionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecutionUnitTests.java
index 5fb3205795..1fbd60414a 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecutionUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryExecutionUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,9 +16,7 @@
 package org.springframework.data.mongodb.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import reactor.core.publisher.Flux;
@@ -28,12 +26,13 @@
 import java.lang.reflect.Method;
 import java.util.Arrays;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.reactivestreams.Publisher;
+
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
@@ -47,7 +46,7 @@
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.DeleteExecution;
 import org.springframework.data.mongodb.repository.query.ReactiveMongoQueryExecution.GeoNearExecution;
-import org.springframework.data.util.ClassTypeInformation;
+import org.springframework.data.util.TypeInformation;
 import org.springframework.util.ClassUtils;
 
 import com.mongodb.client.result.DeleteResult;
@@ -58,7 +57,7 @@
  * @author Mark Paluch
  * @author Artyom Gabeev
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReactiveMongoQueryExecutionUnitTests {
 
 	@Mock private ReactiveMongoOperations operations;
@@ -72,10 +71,10 @@ public void geoNearExecutionShouldApplyQuerySettings() throws Exception {
 		Query query = new Query();
 		when(parameterAccessor.getGeoNearLocation()).thenReturn(new Point(1, 2));
 		when(parameterAccessor.getDistanceRange())
-				.thenReturn(Range.from(Bound.inclusive(new Distance(10))).to(Bound.inclusive(new Distance(15))));
+				.thenReturn(Range.from(Bound.inclusive(Distance.of(10))).to(Bound.inclusive(Distance.of(15))));
 		when(parameterAccessor.getPageable()).thenReturn(PageRequest.of(1, 10));
 
-		new GeoNearExecution(operations, parameterAccessor, ClassTypeInformation.fromReturnTypeOf(geoNear)).execute(query,
+		new GeoNearExecution(operations, parameterAccessor, TypeInformation.fromReturnTypeOf(geoNear)).execute(query,
 				Person.class, "person");
 
 		ArgumentCaptor<NearQuery> queryArgumentCaptor = ArgumentCaptor.forClass(NearQuery.class);
@@ -84,8 +83,8 @@ public void geoNearExecutionShouldApplyQuerySettings() throws Exception {
 		NearQuery nearQuery = queryArgumentCaptor.getValue();
 		assertThat(nearQuery.toDocument().get("near")).isEqualTo(Arrays.asList(1d, 2d));
 		assertThat(nearQuery.getSkip()).isEqualTo(10L);
-		assertThat(nearQuery.getMinDistance()).isEqualTo(new Distance(10));
-		assertThat(nearQuery.getMaxDistance()).isEqualTo(new Distance(15));
+		assertThat(nearQuery.getMinDistance()).isEqualTo(Distance.of(10));
+		assertThat(nearQuery.getMaxDistance()).isEqualTo(Distance.of(15));
 	}
 
 	@Test // DATAMONGO-1444
@@ -97,7 +96,7 @@ public void geoNearExecutionShouldApplyMinimalSettings() throws Exception {
 		when(parameterAccessor.getGeoNearLocation()).thenReturn(new Point(1, 2));
 		when(parameterAccessor.getDistanceRange()).thenReturn(Range.unbounded());
 
-		new GeoNearExecution(operations, parameterAccessor, ClassTypeInformation.fromReturnTypeOf(geoNear)).execute(query,
+		new GeoNearExecution(operations, parameterAccessor, TypeInformation.fromReturnTypeOf(geoNear)).execute(query,
 				Person.class, "person");
 
 		ArgumentCaptor<NearQuery> queryArgumentCaptor = ArgumentCaptor.forClass(NearQuery.class);
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethodUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethodUnitTests.java
index 90d5a389b1..14cbbc0394 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethodUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethodUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,8 +24,8 @@
 import java.util.List;
 
 import org.assertj.core.api.Assertions;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Page;
@@ -35,12 +35,15 @@
 import org.springframework.data.geo.GeoResult;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.User;
+import org.springframework.data.mongodb.core.annotation.Collation;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.repository.Address;
 import org.springframework.data.mongodb.repository.Aggregation;
 import org.springframework.data.mongodb.repository.Contact;
 import org.springframework.data.mongodb.repository.Meta;
 import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.Query;
+import org.springframework.data.mongodb.repository.ReadPreference;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
@@ -50,12 +53,14 @@
  * Unit test for {@link ReactiveMongoQueryMethod}.
  *
  * @author Mark Paluch
+ * @author Christoph Strobl
+ * @author Jorge Rodríguez
  */
 public class ReactiveMongoQueryMethodUnitTests {
 
 	MongoMappingContext context;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		context = new MongoMappingContext();
 	}
@@ -101,19 +106,19 @@ public void discoversUserAsDomainTypeForGeoPagingQueryMethod() throws Exception
 				.isTrue();
 	}
 
-	@Test(expected = IllegalArgumentException.class) // DATAMONGO-1444
+	@Test // DATAMONGO-1444
 	public void rejectsNullMappingContext() throws Exception {
 
 		Method method = PersonRepository.class.getMethod("findByFirstname", String.class, Point.class);
 
-		new MongoQueryMethod(method, new DefaultRepositoryMetadata(PersonRepository.class),
-				new SpelAwareProxyProjectionFactory(), null);
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> new MongoQueryMethod(method, new DefaultRepositoryMetadata(PersonRepository.class),
+				new SpelAwareProxyProjectionFactory(), null));
 	}
 
 	@Test // DATAMONGO-1444
 	public void rejectsMonoPageableResult() {
 		assertThatIllegalStateException()
-				.isThrownBy(() -> queryMethod(PersonRepository.class, "findMonoByLastname", String.class, Pageable.class));
+				.isThrownBy(() -> queryMethod(PersonRepository.class, "findMonoByLastname", String.class, Pageable.class).verify());
 	}
 
 	@Test // DATAMONGO-1444
@@ -142,13 +147,13 @@ public void createsMongoQueryMethodWithMaxExecutionTimeCorrectly() throws Except
 	@Test // DATAMONGO-1444
 	public void throwsExceptionOnWrappedPage() {
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
-				.isThrownBy(() -> queryMethod(PersonRepository.class, "findMonoPageByLastname", String.class, Pageable.class));
+				.isThrownBy(() -> queryMethod(PersonRepository.class, "findMonoPageByLastname", String.class, Pageable.class).verify());
 	}
 
 	@Test // DATAMONGO-1444
 	public void throwsExceptionOnWrappedSlice() {
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
-				.isThrownBy(() -> queryMethod(PersonRepository.class, "findMonoSliceByLastname", String.class, Pageable.class));
+				.isThrownBy(() -> queryMethod(PersonRepository.class, "findMonoSliceByLastname", String.class, Pageable.class).verify());
 	}
 
 	@Test // DATAMONGO-1444
@@ -177,6 +182,98 @@ public void detectsCollationForAggregation() throws Exception {
 		Assertions.assertThat(method.getAnnotatedCollation()).isEqualTo("de_AT");
 	}
 
+	@Test // GH-2107
+	public void queryCreationFailsOnInvalidUpdate() throws Exception {
+
+		assertThatExceptionOfType(IllegalStateException.class) //
+				.isThrownBy(() -> queryMethod(InvalidUpdateMethodRepo.class, "findAndUpdateByLastname", String.class).verify()) //
+				.withMessageContaining("Update") //
+				.withMessageContaining("findAndUpdateByLastname");
+	}
+
+	@Test // GH-2107
+	public void queryCreationForUpdateMethodFailsOnInvalidReturnType() throws Exception {
+
+		assertThatExceptionOfType(IllegalStateException.class) //
+				.isThrownBy(() -> queryMethod(InvalidUpdateMethodRepo.class, "findAndIncrementVisitsByFirstname", String.class).verify()) //
+				.withMessageContaining("Update") //
+				.withMessageContaining("numeric") //
+				.withMessageContaining("findAndIncrementVisitsByFirstname");
+	}
+
+	@Test // GH-3002
+	void readsCollationFromAtCollationAnnotation() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(MongoQueryMethodUnitTests.PersonRepository.class, "findWithCollationFromAtCollationByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedCollation()).isTrue();
+		assertThat(method.getAnnotatedCollation()).isEqualTo("en_US");
+	}
+
+	@Test // GH-3002
+	void readsCollationFromAtQueryAnnotation() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(MongoQueryMethodUnitTests.PersonRepository.class, "findWithCollationFromAtQueryByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedCollation()).isTrue();
+		assertThat(method.getAnnotatedCollation()).isEqualTo("en_US");
+	}
+
+	@Test // GH-3002
+	void annotatedCollationClashSelectsAtCollationAnnotationValue() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(PersonRepository.class, "findWithMultipleCollationsFromAtQueryAndAtCollationByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedCollation()).isTrue();
+		assertThat(method.getAnnotatedCollation()).isEqualTo("de_AT");
+	}
+
+
+	@Test // GH-2971
+	void readsReadPreferenceAtQueryAnnotation() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(PersonRepository.class, "findWithReadPreferenceFromAtReadPreferenceByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
+	@Test // GH-2971
+	void readsReadPreferenceFromAtQueryAnnotation() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(PersonRepository.class, "findWithReadPreferenceFromAtQueryByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
+	@Test // GH-2971
+	void annotatedReadPreferenceClashSelectsAtReadPreferenceAnnotationValue() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(PersonRepository.class, "findWithMultipleReadPreferencesFromAtQueryAndAtReadPreferenceByFirstname", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
+	@Test // GH-2971
+	void readsReadPreferenceAtRepositoryAnnotation() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(PersonRepository.class, "deleteByUserName", String.class);
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("primaryPreferred");
+	}
+
+	@Test // GH-2971
+	void detectsReadPreferenceForAggregation() throws Exception {
+
+		ReactiveMongoQueryMethod method = queryMethod(MongoQueryMethodUnitTests.PersonRepository.class, "findByAggregationWithReadPreference");
+
+		assertThat(method.hasAnnotatedReadPreference()).isTrue();
+		assertThat(method.getAnnotatedReadPreference()).isEqualTo("secondaryPreferred");
+	}
+
 	private ReactiveMongoQueryMethod queryMethod(Class<?> repository, String name, Class<?>... parameters)
 			throws Exception {
 
@@ -185,6 +282,7 @@ private ReactiveMongoQueryMethod queryMethod(Class<?> repository, String name, C
 		return new ReactiveMongoQueryMethod(method, new DefaultRepositoryMetadata(repository), factory, context);
 	}
 
+	@ReadPreference(value = "primaryPreferred")
 	interface PersonRepository extends Repository<User, Long> {
 
 		Mono<Person> findMonoByLastname(String lastname, Pageable pageRequest);
@@ -218,6 +316,29 @@ interface PersonRepository extends Repository<User, Long> {
 		@Aggregation(pipeline = "{'$group': { _id: '$templateId', maxVersion : { $max : '$version'} } }",
 				collation = "de_AT")
 		Flux<User> findByAggregationWithCollation();
+
+		@Aggregation(pipeline = "{'$group': { _id: '$templateId', maxVersion : { $max : '$version'} } }", readPreference = "secondaryPreferred")
+		Flux<User> findByAggregationWithReadPreference();
+
+		@Collation("en_US")
+		List<User> findWithCollationFromAtCollationByFirstname(String firstname);
+
+		@Query(collation = "en_US")
+		List<User> findWithCollationFromAtQueryByFirstname(String firstname);
+
+		@Collation("de_AT")
+		@Query(collation = "en_US")
+		List<User> findWithMultipleCollationsFromAtQueryAndAtCollationByFirstname(String firstname);
+
+		@ReadPreference("secondaryPreferred")
+		Flux<User> findWithReadPreferenceFromAtReadPreferenceByFirstname(String firstname);
+
+		@Query(readPreference = "secondaryPreferred")
+		Flux<User> findWithReadPreferenceFromAtQueryByFirstname(String firstname);
+
+		@ReadPreference("secondaryPreferred")
+		@Query(readPreference = "primaryPreferred")
+		Flux<User> findWithMultipleReadPreferencesFromAtQueryAndAtReadPreferenceByFirstname(String firstname);
 	}
 
 	interface SampleRepository extends Repository<Contact, Long> {
@@ -232,5 +353,14 @@ interface SampleRepository2 extends Repository<Contact, Long> {
 		Customer methodReturningAnInterface();
 	}
 
+	interface InvalidUpdateMethodRepo extends Repository<Person, Long> {
+
+		@org.springframework.data.mongodb.repository.Update
+		Mono<Void> findAndUpdateByLastname(String lastname);
+
+		@org.springframework.data.mongodb.repository.Update("{ '$inc' : { 'visits' : 1 } }")
+		Mono<Person> findAndIncrementVisitsByFirstname(String firstname);
+	}
+
 	interface Customer {}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregationUnitTests.java
index bea47deee1..b55ee77732 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedAggregationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Value;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
@@ -28,12 +27,14 @@
 import java.util.List;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.reactivestreams.Publisher;
 
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
@@ -49,46 +50,47 @@
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.repository.Aggregation;
+import org.springframework.data.mongodb.repository.Hint;
 import org.springframework.data.mongodb.repository.Meta;
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.reactive.ReactiveCrudRepository;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
 import org.springframework.util.ClassUtils;
 
+import com.mongodb.ReadPreference;
+
 /**
  * Unit tests for {@link ReactiveStringBasedAggregation}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class ReactiveStringBasedAggregationUnitTests {
 
-	SpelExpressionParser PARSER = new SpelExpressionParser();
-
 	@Mock ReactiveMongoOperations operations;
 	@Mock DbRefResolver dbRefResolver;
 	MongoConverter converter;
 
 	private static final String RAW_SORT_STRING = "{ '$sort' : { 'lastname' : -1 } }";
 	private static final String RAW_GROUP_BY_LASTNAME_STRING = "{ '$group': { '_id' : '$lastname', 'names' : { '$addToSet' : '$firstname' } } }";
+	private static final String RAW_OUT = "{ '$out' : 'authors' }";
 	private static final String GROUP_BY_LASTNAME_STRING_WITH_PARAMETER_PLACEHOLDER = "{ '$group': { '_id' : '$lastname', names : { '$addToSet' : '$?0' } } }";
 	private static final String GROUP_BY_LASTNAME_STRING_WITH_SPEL_PARAMETER_PLACEHOLDER = "{ '$group': { '_id' : '$lastname', 'names' : { '$addToSet' : '$?#{[0]}' } } }";
 
 	private static final Document SORT = Document.parse(RAW_SORT_STRING);
 	private static final Document GROUP_BY_LASTNAME = Document.parse(RAW_GROUP_BY_LASTNAME_STRING);
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
 		when(operations.getConverter()).thenReturn(converter);
 		when(operations.aggregate(any(TypedAggregation.class), any())).thenReturn(Flux.empty());
+		when(operations.execute(any())).thenReturn(Flux.empty());
 	}
 
 	@Test // DATAMONGO-2153
@@ -164,6 +166,20 @@ public void aggregateWithCollationParameter() {
 		assertThat(collationOf(invocation)).isEqualTo(Collation.of("en_US"));
 	}
 
+	@Test // DATAMONGO-2557
+	void aggregationRetrievesCodecFromDriverJustOnceForMultipleAggregationOperationsInPipeline() {
+
+		executeAggregation("multiOperationPipeline", "firstname");
+		verify(operations).execute(any());
+	}
+
+	@Test // GH-3230
+	void aggregatePicksUpHintFromAnnotation() {
+
+		AggregationInvocation invocation = executeAggregation("withHint");
+		assertThat(hintOf(invocation)).isEqualTo("idx");
+	}
+
 	private AggregationInvocation executeAggregation(String name, Object... args) {
 
 		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass).toArray(size -> new Class<?>[size]);
@@ -172,21 +188,43 @@ private AggregationInvocation executeAggregation(String name, Object... args) {
 		ArgumentCaptor<TypedAggregation> aggregationCaptor = ArgumentCaptor.forClass(TypedAggregation.class);
 		ArgumentCaptor<Class> targetTypeCaptor = ArgumentCaptor.forClass(Class.class);
 
-		Object result = aggregation.execute(args);
+		Object result = Flux.from((Publisher) aggregation.execute(args)).blockLast();
 
 		verify(operations).aggregate(aggregationCaptor.capture(), targetTypeCaptor.capture());
 
 		return new AggregationInvocation(aggregationCaptor.getValue(), targetTypeCaptor.getValue(), result);
 	}
 
+	@Test // GH-4088
+	void aggregateWithVoidReturnTypeSkipsResultOnOutStage() {
+
+		AggregationInvocation invocation = executeAggregation("outSkipResult");
+
+		assertThat(skipResultsOf(invocation)).isTrue();
+	}
+
+	@Test // GH-4088
+	void aggregateWithOutStageDoesNotSkipResults() {
+
+		AggregationInvocation invocation = executeAggregation("outDoNotSkipResult");
+
+		assertThat(skipResultsOf(invocation)).isFalse();
+	}
+
+	@Test // GH-2971
+	void aggregatePicksUpReadPreferenceFromAnnotation() {
+
+		AggregationInvocation invocation = executeAggregation("withReadPreference");
+		assertThat(readPreferenceOf(invocation)).isEqualTo(ReadPreference.secondaryPreferred());
+	}
+
 	private ReactiveStringBasedAggregation createAggregationForMethod(String name, Class<?>... parameters) {
 
 		Method method = ClassUtils.getMethod(SampleRepository.class, name, parameters);
 		ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
 		ReactiveMongoQueryMethod queryMethod = new ReactiveMongoQueryMethod(method,
 				new DefaultRepositoryMetadata(SampleRepository.class), factory, converter.getMappingContext());
-		return new ReactiveStringBasedAggregation(queryMethod, operations, PARSER,
-				QueryMethodEvaluationContextProvider.DEFAULT);
+		return new ReactiveStringBasedAggregation(queryMethod, operations, ValueExpressionDelegate.create());
 	}
 
 	private List<Document> pipelineOf(AggregationInvocation invocation) {
@@ -201,12 +239,26 @@ private Class<?> inputTypeOf(AggregationInvocation invocation) {
 		return invocation.aggregation.getInputType();
 	}
 
-	@Nullable
-	private Collation collationOf(AggregationInvocation invocation) {
+	private @Nullable Collation collationOf(AggregationInvocation invocation) {
 		return invocation.aggregation.getOptions() != null ? invocation.aggregation.getOptions().getCollation().orElse(null)
 				: null;
 	}
 
+	private @Nullable Object hintOf(AggregationInvocation invocation) {
+		return invocation.aggregation.getOptions() != null
+				? invocation.aggregation.getOptions().getHintObject().orElse(null)
+				: null;
+	}
+
+	private Boolean skipResultsOf(AggregationInvocation invocation) {
+		return invocation.aggregation.getOptions() != null ? invocation.aggregation.getOptions().isSkipResults() : false;
+	}
+
+	@Nullable
+	private ReadPreference readPreferenceOf(AggregationInvocation invocation) {
+		return invocation.aggregation.getOptions() != null ? invocation.aggregation.getOptions().getReadPreference() : null;
+	}
+
 	private Class<?> targetTypeOf(AggregationInvocation invocation) {
 		return invocation.getTargetType();
 	}
@@ -226,22 +278,60 @@ private interface SampleRepository extends ReactiveCrudRepository<Person, Long>
 		@Aggregation(GROUP_BY_LASTNAME_STRING_WITH_SPEL_PARAMETER_PLACEHOLDER)
 		Mono<PersonAggregate> spelParameterReplacementAggregation(String arg0);
 
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, GROUP_BY_LASTNAME_STRING_WITH_SPEL_PARAMETER_PLACEHOLDER })
+		Mono<PersonAggregate> multiOperationPipeline(String arg0);
+
 		@Aggregation(pipeline = RAW_GROUP_BY_LASTNAME_STRING, collation = "de_AT")
 		Mono<PersonAggregate> aggregateWithCollation();
 
 		@Aggregation(pipeline = RAW_GROUP_BY_LASTNAME_STRING, collation = "de_AT")
 		Mono<PersonAggregate> aggregateWithCollation(Collation collation);
+
+		@Hint("idx")
+		@Aggregation(RAW_GROUP_BY_LASTNAME_STRING)
+		String withHint();
+
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, RAW_OUT })
+		Flux<Person> outDoNotSkipResult();
+
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, RAW_OUT })
+		Mono<Void> outSkipResult();
+
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, RAW_OUT }, readPreference = "secondaryPreferred")
+		Mono<PersonAggregate> withReadPreference();
 	}
 
 	static class PersonAggregate {
 
 	}
 
-	@Value
-	static class AggregationInvocation {
+	static final class AggregationInvocation {
+
+		private final TypedAggregation<?> aggregation;
+		private final Class<?> targetType;
+		private final Object result;
+
+		public AggregationInvocation(TypedAggregation<?> aggregation, Class<?> targetType, Object result) {
+			this.aggregation = aggregation;
+			this.targetType = targetType;
+			this.result = result;
+		}
+
+		public TypedAggregation<?> getAggregation() {
+			return this.aggregation;
+		}
+
+		public Class<?> getTargetType() {
+			return this.targetType;
+		}
+
+		public Object getResult() {
+			return this.result;
+		}
 
-		TypedAggregation<?> aggregation;
-		Class<?> targetType;
-		Object result;
+		public String toString() {
+			return "ReactiveStringBasedAggregationUnitTests.AggregationInvocation(aggregation=" + this.getAggregation()
+					+ ", targetType=" + this.getTargetType() + ", result=" + this.getResult() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java
index a80afd7411..7358bf4ce6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/ReactiveStringBasedMongoQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2019 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,16 +23,23 @@
 import reactor.core.publisher.Mono;
 
 import java.lang.reflect.Method;
+import java.util.Base64;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.expression.ValueExpressionParser;
 import org.springframework.data.mongodb.core.ReactiveFindOperation.ReactiveFind;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
@@ -48,9 +55,11 @@
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.data.spel.spi.EvaluationContextExtension;
+import org.springframework.data.spel.spi.ReactiveEvaluationContextExtension;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.util.Base64Utils;
 
 /**
  * Unit tests for {@link ReactiveStringBasedMongoQuery}.
@@ -58,10 +67,12 @@
  * @author Mark Paluch
  * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class ReactiveStringBasedMongoQueryUnitTests {
 
-	SpelExpressionParser PARSER = new SpelExpressionParser();
+	ValueExpressionParser PARSER = ValueExpressionParser.create(SpelExpressionParser::new);
+	StandardEnvironment environment = new StandardEnvironment();
 
 	@Mock ReactiveMongoOperations operations;
 	@Mock DbRefResolver factory;
@@ -69,12 +80,18 @@ public class ReactiveStringBasedMongoQueryUnitTests {
 
 	MongoConverter converter;
 
-	@Before
+	Map<String, Object> properties = new HashMap<>();
+	MapPropertySource propertySource = new MapPropertySource("mock", properties);
+
+	@BeforeEach
 	public void setUp() {
 
-		when(operations.query(any())).thenReturn(reactiveFind);
+		environment.getPropertySources().addFirst(propertySource);
 
 		this.converter = new MappingMongoConverter(factory, new MongoMappingContext());
+
+		when(operations.query(any())).thenReturn(reactiveFind);
+		when(operations.execute(any())).thenReturn(Flux.empty());
 	}
 
 	@Test // DATAMONGO-1444
@@ -83,7 +100,7 @@ public void bindsSimplePropertyCorrectly() throws Exception {
 		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByLastname", String.class);
 		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter, "Matthews");
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : 'Matthews'}");
 
 		assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject());
@@ -101,7 +118,7 @@ public void bindsComplexPropertyCorrectly() throws Exception {
 		converter.write(address, dbObject);
 		dbObject.remove(DefaultMongoTypeMapper.DEFAULT_TYPE_KEY);
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
 		Document queryObject = new Document("address", dbObject);
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery(queryObject);
 
@@ -136,7 +153,7 @@ public void shouldSupportFindByParameterizedCriteriaAndFields() throws Exception
 		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByParameterizedCriteriaAndFields",
 				Document.class, Map.class);
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor).block();
 
 		assertThat(query.getQueryObject())
 				.isEqualTo(new BasicQuery("{ \"firstname\": \"first\", \"lastname\": \"last\"}").getQueryObject());
@@ -150,7 +167,7 @@ public void shouldParseQueryWithParametersInExpression() throws Exception {
 		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithParametersInExpression", int.class,
 				int.class, int.class, int.class);
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor).block();
 
 		assertThat(query.getQueryObject())
 				.isEqualTo(new BasicQuery("{$where: 'return this.date.getUTCMonth() == 3 && this.date.getUTCDay() == 4;'}")
@@ -164,7 +181,7 @@ public void shouldParseJsonKeyReplacementCorrectly() throws Exception {
 				String.class, String.class);
 		ConvertingParameterAccessor parameterAccessor = StubParameterAccessor.getAccessor(converter, "key", "value");
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(parameterAccessor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(parameterAccessor).block();
 
 		assertThat(query.getQueryObject()).isEqualTo(new Document().append("key", "value"));
 	}
@@ -175,20 +192,33 @@ public void shouldSupportExpressionsInCustomQueries() throws Exception {
 		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter, "Matthews");
 		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithExpression", String.class);
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : 'Matthews'}");
 
 		assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject());
 	}
 
+	@Test // GH-3050
+	public void shouldSupportPropertiesInCustomQueries() throws Exception {
+
+		properties.put("foo", "bar");
+		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter);
+		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithProperty");
+
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
+		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : 'bar'}");
+
+		assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject());
+	}
+
 	@Test // DATAMONGO-1444
 	public void shouldSupportExpressionsInCustomQueriesWithNestedObject() throws Exception {
 
-		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter, true, "param1", "param2");
+		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter, true, "param1");
 		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithExpressionAndNestedObject",
 				boolean.class, String.class);
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{ \"id\" : { \"$exists\" : true}}");
 
 		assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject());
@@ -201,7 +231,7 @@ public void shouldSupportExpressionsInCustomQueriesWithMultipleNestedObjects() t
 		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithExpressionAndMultipleNestedObjects",
 				boolean.class, String.class, String.class);
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery(
 				"{ \"id\" : { \"$exists\" : true} , \"foo\" : 42 , \"bar\" : { \"$exists\" : false}}");
 
@@ -215,9 +245,21 @@ public void shouldSupportNonQuotedBinaryDataReplacement() throws Exception {
 		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter, binaryData);
 		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("findByLastnameAsBinary", byte[].class);
 
-		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor);
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : { '$binary' : '"
-				+ Base64Utils.encodeToString(binaryData) + "', '$type' : '" + 0 + "'}}");
+				+ Base64.getEncoder().encodeToString(binaryData) + "', '$type' : '" + 0 + "'}}");
+
+		assertThat(query.getQueryObject().toJson()).isEqualTo(reference.getQueryObject().toJson());
+	}
+
+	@Test // DATAMONGO-1894
+	void shouldConsiderReactiveSpelExtension() throws Exception {
+
+		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter);
+		ReactiveStringBasedMongoQuery mongoQuery = createQueryForMethod("withReactiveSpelExtensions");
+
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accesor).block();
+		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{lastname: true}", "{project: true}");
 
 		assertThat(query.getQueryObject().toJson()).isEqualTo(reference.getQueryObject().toJson());
 	}
@@ -228,8 +270,9 @@ private ReactiveStringBasedMongoQuery createQueryForMethod(String name, Class<?>
 		ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
 		ReactiveMongoQueryMethod queryMethod = new ReactiveMongoQueryMethod(method,
 				new DefaultRepositoryMetadata(SampleRepository.class), factory, converter.getMappingContext());
-		return new ReactiveStringBasedMongoQuery(queryMethod, operations, PARSER,
-				QueryMethodEvaluationContextProvider.DEFAULT);
+		QueryMethodValueEvaluationContextAccessor accessor = new QueryMethodValueEvaluationContextAccessor(environment,
+				Collections.singletonList(ReactiveSpelExtension.INSTANCE));
+		return new ReactiveStringBasedMongoQuery(queryMethod, operations, new ValueExpressionDelegate(accessor, PARSER));
 	}
 
 	private interface SampleRepository extends Repository<Person, Long> {
@@ -261,6 +304,9 @@ private interface SampleRepository extends Repository<Person, Long> {
 		@Query("{'lastname': ?#{[0]} }")
 		Flux<Person> findByQueryWithExpression(String param0);
 
+		@Query("{'lastname': ?${foo} }")
+		Flux<Person> findByQueryWithProperty();
+
 		@Query("{'id':?#{ [0] ? { $exists :true} : [1] }}")
 		Flux<Person> findByQueryWithExpressionAndNestedObject(boolean param0, String param1);
 
@@ -269,5 +315,42 @@ private interface SampleRepository extends Repository<Person, Long> {
 
 		@Query(value = "{ 'lastname' : ?0 }", exists = true)
 		Mono<Boolean> existsByLastname(String lastname);
+
+		@Query(value = "{ 'lastname' : ?#{hasRole()} }", fields = "{project: ?#{hasRole()}}")
+		Mono<Document> withReactiveSpelExtensions();
+	}
+
+	public enum ReactiveSpelExtension implements ReactiveEvaluationContextExtension {
+
+		INSTANCE;
+
+		@Override
+		public Mono<? extends EvaluationContextExtension> getExtension() {
+			return Mono.just(SpelExtension.INSTANCE);
+		}
+
+		@Override
+		public String getExtensionId() {
+			return "sample";
+		}
+	}
+
+	public enum SpelExtension implements EvaluationContextExtension {
+
+		INSTANCE;
+
+		@Override
+		public Object getRootObject() {
+			return this;
+		}
+
+		@Override
+		public String getExtensionId() {
+			return "sample";
+		}
+
+		public boolean hasRole() {
+			return true;
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedAggregationOperationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedAggregationOperationUnitTests.java
new file mode 100644
index 0000000000..32f9092fbf
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedAggregationOperationUnitTests.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2024-2025 the original author 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.repository.query;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.assertj.core.api.Assertions;
+import org.bson.Document;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+
+/**
+ * Unit tests for {@link StringBasedAggregation}.
+ *
+ * @author Christoph Strobl
+ */
+public class StringBasedAggregationOperationUnitTests {
+
+	@ParameterizedTest // GH-4712
+	@ValueSource(strings = { "$project", "'$project'", "\"$project\"" })
+	void extractsAggregationOperatorFromAggregationStringWithoutBindingParameters(String operator) {
+
+		StringAggregationOperation agg = new StringAggregationOperation("{ %s : { 'fn' : 1 } }".formatted(operator),
+				Object.class, (it) -> Assertions.fail("o_O Parameter binding"));
+
+		assertThat(agg.getOperator()).isEqualTo("$project");
+	}
+
+	@Test // GH-4712
+	void fallbackToParameterBindingIfAggregationOperatorCannotBeExtractedFromAggregationStringWithoutBindingParameters() {
+
+		StringAggregationOperation agg = new StringAggregationOperation("{ happy-madison : { 'fn' : 1 } }", Object.class,
+				(it) -> new Document("$project", ""));
+
+		assertThat(agg.getOperator()).isEqualTo("$project");
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedAggregationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedAggregationUnitTests.java
index 102fb432f6..827168007e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedAggregationUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedAggregationUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,23 +19,31 @@
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import lombok.Value;
-
 import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Stream;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.InvalidMongoDbApiUsageException;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.aggregation.AggregationOperationContext;
 import org.springframework.data.mongodb.core.aggregation.AggregationOptions;
@@ -49,51 +57,55 @@
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.repository.Aggregation;
+import org.springframework.data.mongodb.repository.Hint;
 import org.springframework.data.mongodb.repository.Meta;
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.lang.Nullable;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.util.ClassUtils;
 
+import com.mongodb.MongoClientSettings;
+import com.mongodb.ReadPreference;
+
 /**
  * Unit tests for {@link StringBasedAggregation}.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Divya Srivastava
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class StringBasedAggregationUnitTests {
 
-	SpelExpressionParser PARSER = new SpelExpressionParser();
-
 	@Mock MongoOperations operations;
 	@Mock DbRefResolver dbRefResolver;
 	@Mock AggregationResults aggregationResults;
-	MongoConverter converter;
+	private MongoConverter converter;
 
 	private static final String RAW_SORT_STRING = "{ '$sort' : { 'lastname' : -1 } }";
 	private static final String RAW_GROUP_BY_LASTNAME_STRING = "{ '$group': { '_id' : '$lastname', 'names' : { '$addToSet' : '$firstname' } } }";
+	private static final String RAW_OUT = "{ '$out' : 'authors' }";
 	private static final String GROUP_BY_LASTNAME_STRING_WITH_PARAMETER_PLACEHOLDER = "{ '$group': { '_id' : '$lastname', names : { '$addToSet' : '$?0' } } }";
 	private static final String GROUP_BY_LASTNAME_STRING_WITH_SPEL_PARAMETER_PLACEHOLDER = "{ '$group': { '_id' : '$lastname', 'names' : { '$addToSet' : '$?#{[0]}' } } }";
 
 	private static final Document SORT = Document.parse(RAW_SORT_STRING);
 	private static final Document GROUP_BY_LASTNAME = Document.parse(RAW_GROUP_BY_LASTNAME_STRING);
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		converter = new MappingMongoConverter(dbRefResolver, new MongoMappingContext());
 		when(operations.getConverter()).thenReturn(converter);
 		when(operations.aggregate(any(TypedAggregation.class), any())).thenReturn(aggregationResults);
+		when(operations.execute(any())).thenReturn(MongoClientSettings.getDefaultCodecRegistry());
 	}
 
 	@Test // DATAMONGO-2153
-	public void plainStringAggregation() {
+	void plainStringAggregation() {
 
 		AggregationInvocation invocation = executeAggregation("plainStringAggregation");
 
@@ -102,19 +114,20 @@ public void plainStringAggregation() {
 		assertThat(pipelineOf(invocation)).containsExactly(GROUP_BY_LASTNAME, SORT);
 	}
 
-	@Test // DATAMONGO-2153
-	public void plainStringAggregationConsidersMeta() {
+	@Test // DATAMONGO-2153, DATAMONGO-2449
+	void plainStringAggregationConsidersMeta() {
 
 		AggregationInvocation invocation = executeAggregation("plainStringAggregation");
-
 		AggregationOptions options = invocation.aggregation.getOptions();
 
 		assertThat(options.getComment()).contains("expensive-aggregation");
 		assertThat(options.getCursorBatchSize()).isEqualTo(42);
+		assertThat(options.isAllowDiskUse()).isTrue();
+		assertThat(options.getMaxTime()).isEqualTo(Duration.ofMillis(100));
 	}
 
-	@Test // DATAMONGO-2153
-	public void returnSingleObject() {
+	@Test // DATAMONGO-2153, DATAMONGO-2449
+	void returnSingleObject() {
 
 		PersonAggregate expected = new PersonAggregate();
 		when(aggregationResults.getUniqueMappedResult()).thenReturn(Collections.singletonList(expected));
@@ -126,10 +139,12 @@ public void returnSingleObject() {
 
 		assertThat(options.getComment()).isEmpty();
 		assertThat(options.getCursorBatchSize()).isNull();
+		assertThat(options.isAllowDiskUse()).isFalse();
+		assertThat(options.getMaxTime()).isEqualTo(Duration.ZERO);
 	}
 
 	@Test // DATAMONGO-2153
-	public void returnSingleObjectThrowsError() {
+	void returnSingleObjectThrowsError() {
 
 		when(aggregationResults.getUniqueMappedResult()).thenThrow(new IllegalArgumentException("o_O"));
 
@@ -138,7 +153,7 @@ public void returnSingleObjectThrowsError() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void returnCollection() {
+	void returnCollection() {
 
 		List<PersonAggregate> expected = Collections.singletonList(new PersonAggregate());
 		when(aggregationResults.getMappedResults()).thenReturn(expected);
@@ -146,13 +161,21 @@ public void returnCollection() {
 		assertThat(executeAggregation("returnCollection").result).isEqualTo(expected);
 	}
 
+	@Test // GH-3623
+	void returnNullWhenSingleResultIsNotPresent() {
+
+		when(aggregationResults.getMappedResults()).thenReturn(Collections.emptyList());
+
+		assertThat(executeAggregation("simpleReturnType").result).isNull();
+	}
+
 	@Test // DATAMONGO-2153
-	public void returnRawResultType() {
+	void returnRawResultType() {
 		assertThat(executeAggregation("returnRawResultType").result).isEqualTo(aggregationResults);
 	}
 
 	@Test // DATAMONGO-2153
-	public void plainStringAggregationWithSortParameter() {
+	void plainStringAggregationWithSortParameter() {
 
 		AggregationInvocation invocation = executeAggregation("plainStringAggregation",
 				Sort.by(Direction.DESC, "lastname"));
@@ -163,7 +186,7 @@ public void plainStringAggregationWithSortParameter() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void replaceParameter() {
+	void replaceParameter() {
 
 		AggregationInvocation invocation = executeAggregation("parameterReplacementAggregation", "firstname");
 
@@ -173,7 +196,7 @@ public void replaceParameter() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void replaceSpElParameter() {
+	void replaceSpElParameter() {
 
 		AggregationInvocation invocation = executeAggregation("spelParameterReplacementAggregation", "firstname");
 
@@ -183,7 +206,7 @@ public void replaceSpElParameter() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void aggregateWithCollation() {
+	void aggregateWithCollation() {
 
 		AggregationInvocation invocation = executeAggregation("aggregateWithCollation");
 
@@ -191,13 +214,79 @@ public void aggregateWithCollation() {
 	}
 
 	@Test // DATAMONGO-2153
-	public void aggregateWithCollationParameter() {
+	void aggregateWithCollationParameter() {
 
 		AggregationInvocation invocation = executeAggregation("aggregateWithCollation", Collation.of("en_US"));
 
 		assertThat(collationOf(invocation)).isEqualTo(Collation.of("en_US"));
 	}
 
+	@Test // GH-3543
+	void aggregationWithSliceReturnType() {
+
+		StringBasedAggregation sba = createAggregationForMethod("aggregationWithSliceReturnType", Pageable.class);
+
+		Object result = sba.execute(new Object[] { PageRequest.of(0, 1) });
+
+		assertThat(result).isInstanceOf(Slice.class);
+	}
+
+	@Test // GH-3543
+	void aggregationWithStreamReturnType() {
+
+		when(operations.aggregateStream(any(TypedAggregation.class), any())).thenReturn(Stream.empty());
+
+		StringBasedAggregation sba = createAggregationForMethod("aggregationWithStreamReturnType", Pageable.class);
+
+		Object result = sba.execute(new Object[] { PageRequest.of(0, 1) });
+
+		assertThat(result).isInstanceOf(Stream.class);
+	}
+
+	@Test // DATAMONGO-2506
+	void aggregateRaisesErrorOnInvalidReturnType() {
+
+		Method method = ClassUtils.getMethod(UnsupportedRepository.class, "pageIsUnsupported", Pageable.class);
+		ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, new DefaultRepositoryMetadata(SampleRepository.class),
+				factory, converter.getMappingContext());
+
+		assertThatExceptionOfType(InvalidMongoDbApiUsageException.class) //
+				.isThrownBy(() -> new StringBasedAggregation(queryMethod, operations, ValueExpressionDelegate.create())) //
+				.withMessageContaining("pageIsUnsupported") //
+				.withMessageContaining("Page");
+	}
+
+	@Test // GH-3230
+	void aggregatePicksUpHintFromAnnotation() {
+
+		AggregationInvocation invocation = executeAggregation("withHint");
+		assertThat(hintOf(invocation)).isEqualTo("idx");
+	}
+
+	@Test // GH-4088
+	void aggregateWithVoidReturnTypeSkipsResultOnOutStage() {
+
+		AggregationInvocation invocation = executeAggregation("outSkipResult");
+
+		assertThat(skipResultsOf(invocation)).isTrue();
+	}
+
+	@Test // GH-4088
+	void aggregateWithOutStageDoesNotSkipResults() {
+
+		AggregationInvocation invocation = executeAggregation("outDoNotSkipResult");
+
+		assertThat(skipResultsOf(invocation)).isFalse();
+	}
+
+	@Test // GH-2971
+	void aggregatePicksUpReadPreferenceFromAnnotation() {
+
+		AggregationInvocation invocation = executeAggregation("withReadPreference");
+		assertThat(readPreferenceOf(invocation)).isEqualTo(ReadPreference.secondaryPreferred());
+	}
+
 	private AggregationInvocation executeAggregation(String name, Object... args) {
 
 		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass).toArray(Class[]::new);
@@ -219,7 +308,7 @@ private StringBasedAggregation createAggregationForMethod(String name, Class<?>.
 		ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
 		MongoQueryMethod queryMethod = new MongoQueryMethod(method, new DefaultRepositoryMetadata(SampleRepository.class),
 				factory, converter.getMappingContext());
-		return new StringBasedAggregation(queryMethod, operations, PARSER, QueryMethodEvaluationContextProvider.DEFAULT);
+		return new StringBasedAggregation(queryMethod, operations, ValueExpressionDelegate.create());
 	}
 
 	private List<Document> pipelineOf(AggregationInvocation invocation) {
@@ -234,19 +323,33 @@ private Class<?> inputTypeOf(AggregationInvocation invocation) {
 		return invocation.aggregation.getInputType();
 	}
 
-	@Nullable
-	private Collation collationOf(AggregationInvocation invocation) {
+	private @Nullable Collation collationOf(AggregationInvocation invocation) {
 		return invocation.aggregation.getOptions() != null ? invocation.aggregation.getOptions().getCollation().orElse(null)
 				: null;
 	}
 
+	private @Nullable Object hintOf(AggregationInvocation invocation) {
+		return invocation.aggregation.getOptions() != null
+				? invocation.aggregation.getOptions().getHintObject().orElse(null)
+				: null;
+	}
+
+	private Boolean skipResultsOf(AggregationInvocation invocation) {
+		return invocation.aggregation.getOptions() != null ? invocation.aggregation.getOptions().isSkipResults() : false;
+	}
+
+	@Nullable
+	private ReadPreference readPreferenceOf(AggregationInvocation invocation) {
+		return invocation.aggregation.getOptions() != null ? invocation.aggregation.getOptions().getReadPreference() : null;
+	}
+
 	private Class<?> targetTypeOf(AggregationInvocation invocation) {
 		return invocation.getTargetType();
 	}
 
 	private interface SampleRepository extends Repository<Person, Long> {
 
-		@Meta(cursorBatchSize = 42, comment = "expensive-aggregation")
+		@Meta(cursorBatchSize = 42, comment = "expensive-aggregation", allowDiskUse = true, maxExecutionTimeMs = 100)
 		@Aggregation({ RAW_GROUP_BY_LASTNAME_STRING, RAW_SORT_STRING })
 		PersonAggregate plainStringAggregation();
 
@@ -271,22 +374,75 @@ private interface SampleRepository extends Repository<Person, Long> {
 		@Aggregation(GROUP_BY_LASTNAME_STRING_WITH_SPEL_PARAMETER_PLACEHOLDER)
 		PersonAggregate spelParameterReplacementAggregation(String arg0);
 
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, GROUP_BY_LASTNAME_STRING_WITH_SPEL_PARAMETER_PLACEHOLDER })
+		PersonAggregate multiOperationPipeline(String arg0);
+
 		@Aggregation(pipeline = RAW_GROUP_BY_LASTNAME_STRING, collation = "de_AT")
 		PersonAggregate aggregateWithCollation();
 
 		@Aggregation(pipeline = RAW_GROUP_BY_LASTNAME_STRING, collation = "de_AT")
 		PersonAggregate aggregateWithCollation(Collation collation);
+
+		@Aggregation(RAW_GROUP_BY_LASTNAME_STRING)
+		Slice<Person> aggregationWithSliceReturnType(Pageable page);
+
+		@Aggregation(RAW_GROUP_BY_LASTNAME_STRING)
+		Stream<Person> aggregationWithStreamReturnType(Pageable page);
+
+		@Aggregation(RAW_GROUP_BY_LASTNAME_STRING)
+		String simpleReturnType();
+
+		@Hint("idx")
+		@Aggregation(RAW_GROUP_BY_LASTNAME_STRING)
+		String withHint();
+
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, RAW_OUT })
+		List<Person> outDoNotSkipResult();
+
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, RAW_OUT })
+		void outSkipResult();
+
+		@Aggregation(pipeline = { RAW_GROUP_BY_LASTNAME_STRING, RAW_OUT }, readPreference = "secondaryPreferred")
+		void withReadPreference();
+	}
+
+	private interface UnsupportedRepository extends Repository<Person, Long> {
+
+		@Aggregation(RAW_GROUP_BY_LASTNAME_STRING)
+		Page<Person> pageIsUnsupported(Pageable page);
 	}
 
 	static class PersonAggregate {
 
 	}
 
-	@Value
-	static class AggregationInvocation {
+	private static final class AggregationInvocation {
+
+		private final TypedAggregation<?> aggregation;
+		private final Class<?> targetType;
+		private final Object result;
+
+		public AggregationInvocation(TypedAggregation<?> aggregation, Class<?> targetType, Object result) {
+			this.aggregation = aggregation;
+			this.targetType = targetType;
+			this.result = result;
+		}
+
+		public TypedAggregation<?> getAggregation() {
+			return this.aggregation;
+		}
+
+		public Class<?> getTargetType() {
+			return this.targetType;
+		}
+
+		public Object getResult() {
+			return this.result;
+		}
 
-		TypedAggregation<?> aggregation;
-		Class<?> targetType;
-		Object result;
+		public String toString() {
+			return "StringBasedAggregationUnitTests.AggregationInvocation(aggregation=" + this.getAggregation()
+					+ ", targetType=" + this.getTargetType() + ", result=" + this.getResult() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQueryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQueryUnitTests.java
index 68f9e52dc1..51f210f024 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQueryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StringBasedMongoQueryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,20 +23,30 @@
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Base64;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.bson.BSON;
+import org.bson.BsonBinarySubType;
 import org.bson.Document;
+import org.bson.UuidRepresentation;
+import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
+import org.springframework.core.env.MapPropertySource;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.expression.ValueExpressionParser;
+import org.springframework.data.mongodb.core.DbCallback;
 import org.springframework.data.mongodb.core.DocumentTestUtils;
 import org.springframework.data.mongodb.core.ExecutableFindOperation.ExecutableFind;
 import org.springframework.data.mongodb.core.MongoOperations;
@@ -53,9 +63,13 @@
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
 import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.QueryMethodValueEvaluationContextAccessor;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+import org.springframework.expression.EvaluationException;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.util.Base64Utils;
+
+import com.mongodb.MongoClientSettings;
+import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * Unit tests for {@link StringBasedMongoQuery}.
@@ -65,10 +79,12 @@
  * @author Thomas Darimont
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
 public class StringBasedMongoQueryUnitTests {
 
-	SpelExpressionParser PARSER = new SpelExpressionParser();
+	ValueExpressionParser PARSER = ValueExpressionParser.create(SpelExpressionParser::new);
+	StandardEnvironment environment = new StandardEnvironment();
 
 	@Mock MongoOperations operations;
 	@Mock ExecutableFind<Object> findOperation;
@@ -76,12 +92,17 @@ public class StringBasedMongoQueryUnitTests {
 
 	MongoConverter converter;
 
-	@Before
+	Map<String, Object> properties = new HashMap<>();
+	MapPropertySource propertySource = new MapPropertySource("mock", properties);
+
+	@BeforeEach
 	public void setUp() {
 
 		this.converter = new MappingMongoConverter(factory, new MongoMappingContext());
+		environment.getPropertySources().addFirst(propertySource);
 
 		doReturn(findOperation).when(operations).query(any());
+		doReturn(MongoClientSettings.getDefaultCodecRegistry()).when(operations).execute(any());
 	}
 
 	@Test
@@ -283,10 +304,46 @@ public void shouldSupportExpressionsInCustomQueries() {
 		assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject());
 	}
 
+	@Test // GH-3050
+	public void shouldSupportExpressionsAndPropertiesInCustomQueries() {
+
+		ConvertingParameterAccessor accessor = StubParameterAccessor.getAccessor(converter, "Matthews");
+		StringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithExpressionAndProperty", String.class);
+
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor);
+		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery(
+				"{'lastname' : 'Matthews', 'firstname' : 'some-default'}");
+
+		assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject());
+	}
+
+	@Test // GH-3050
+	public void shouldSupportPropertiesInCustomQueries() {
+
+		properties.put("foo", "bar");
+		ConvertingParameterAccessor accessor = StubParameterAccessor.getAccessor(converter);
+		StringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithProperty");
+
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor);
+		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : 'bar'}");
+
+		assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject());
+	}
+
+	@Test // GH-3050
+	public void shouldFailWhenPropertiesWithNoDefaultValueInCustomQueries() {
+		ConvertingParameterAccessor accessor = StubParameterAccessor.getAccessor(converter);
+		StringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithProperty");
+
+		assertThatThrownBy(() -> mongoQuery.createQuery(accessor))
+				.isInstanceOf(EvaluationException.class)
+				.hasMessageContaining("Could not resolve placeholder 'foo' in value \"${foo}\"");
+	}
+
 	@Test // DATAMONGO-1244
 	public void shouldSupportExpressionsInCustomQueriesWithNestedObject() {
 
-		ConvertingParameterAccessor accessor = StubParameterAccessor.getAccessor(converter, true, "param1", "param2");
+		ConvertingParameterAccessor accessor = StubParameterAccessor.getAccessor(converter, true, "param1");
 		StringBasedMongoQuery mongoQuery = createQueryForMethod("findByQueryWithExpressionAndNestedObject", boolean.class,
 				String.class);
 
@@ -319,7 +376,7 @@ public void shouldSupportNonQuotedBinaryDataReplacement() {
 
 		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor);
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : { '$binary' : '"
-				+ Base64Utils.encodeToString(binaryData) + "', '$type' : '" + BSON.B_GENERAL + "'}}");
+				+ Base64.getEncoder().encodeToString(binaryData) + "', '$type' : '" + BsonBinarySubType.BINARY.getValue() + "'}}");
 
 		assertThat(query.getQueryObject().toJson()).isEqualTo(reference.getQueryObject().toJson());
 	}
@@ -334,7 +391,7 @@ public void shouldSupportNonQuotedBinaryCollectionDataReplacement() {
 
 		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor);
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : { $in: [{'$binary' : '"
-				+ Base64Utils.encodeToString(binaryData) + "', '$type' : '" + BSON.B_GENERAL + "'}] }}");
+				+ Base64.getEncoder().encodeToString(binaryData) + "', '$type' : '" + BsonBinarySubType.BINARY.getValue() + "'}] }}");
 
 		assertThat(query.getQueryObject().toJson()).isEqualTo(reference.getQueryObject().toJson());
 	}
@@ -350,7 +407,18 @@ public void shouldSupportNonQuotedUUIDReplacement() {
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery(
 				"{'lastname' : { $binary:\"5PHq4zvkTYa5WbZAgvtjNg==\", $type: \"03\"}}");
 
-		assertThat(query.getQueryObject().toJson()).isEqualTo(reference.getQueryObject().toJson());
+		// CodecRegistry registry =
+		// MongoClientSettings.builder().uuidRepresentation(UuidRepresentation.JAVA_LEGACY).build().getCodecRegistry();
+
+		// TODO: use OverridableUuidRepresentationCodecRegistry instead to save resources
+		CodecRegistry registry = MongoClients
+				.create(MongoClientSettings.builder().uuidRepresentation(UuidRepresentation.JAVA_LEGACY).build())
+				.getDatabase("database").getCodecRegistry();
+
+		// OverridableUuidRepresentationCodecRegistry
+
+		assertThat(query.getQueryObject().toJson(registry.get(Document.class)))
+				.isEqualTo(reference.getQueryObject().toJson());
 	}
 
 	@Test // DATAMONGO-2029
@@ -367,7 +435,36 @@ public void shouldSupportNonQuotedUUIDCollectionReplacement() {
 		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery(
 				"{'lastname' : { $in: [{ $binary : \"5PHq4zvkTYa5WbZAgvtjNg==\", $type : \"03\" }, { $binary : \"5PH+yjvkTYa5WbZAgvtjNg==\", $type : \"03\" }]}}");
 
-		assertThat(query.getQueryObject().toJson()).isEqualTo(reference.getQueryObject().toJson());
+		// TODO: use OverridableUuidRepresentationCodecRegistry instead to save resources
+		CodecRegistry registry = MongoClients
+				.create(MongoClientSettings.builder().uuidRepresentation(UuidRepresentation.JAVA_LEGACY).build())
+				.getDatabase("database").getCodecRegistry();
+		assertThat(query.getQueryObject().toJson(registry.get(Document.class)))
+				.isEqualTo(reference.getQueryObject().toJson());
+	}
+
+	@Test // DATAMONGO-2427
+	public void shouldSupportNonQuotedUUIDCollectionReplacementWhenUsingNonLegacyUUIDCodec() {
+
+		// TODO: use OverridableUuidRepresentationCodecRegistry instead to save resources
+		CodecRegistry registry = MongoClients
+				.create(MongoClientSettings.builder().uuidRepresentation(UuidRepresentation.STANDARD).build())
+				.getDatabase("database").getCodecRegistry();
+		when(operations.execute(any(DbCallback.class))).thenReturn(registry);
+
+		UUID uuid1 = UUID.fromString("864de43b-e3ea-f1e4-3663-fb8240b659b9");
+		UUID uuid2 = UUID.fromString("864de43b-cafe-f1e4-3663-fb8240b659b9");
+
+		ConvertingParameterAccessor accessor = StubParameterAccessor.getAccessor(converter,
+				(Object) Arrays.asList(uuid1, uuid2));
+		StringBasedMongoQuery mongoQuery = createQueryForMethod("findByLastnameAsUUIDIn", List.class);
+
+		org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor);
+		org.springframework.data.mongodb.core.query.Query reference = new BasicQuery(
+				"{'lastname' : { $in: [{ $binary : \"hk3kO+Pq8eQ2Y/uCQLZZuQ==\", $type : \"04\" }, { $binary : \"hk3kO8r+8eQ2Y/uCQLZZuQ==\", $type : \"04\" }]}}");
+
+		assertThat(query.getQueryObject().toJson(registry.get(Document.class)))
+				.isEqualTo(reference.getQueryObject().toJson());
 	}
 
 	@Test // DATAMONGO-1911
@@ -657,7 +754,9 @@ private StringBasedMongoQuery createQueryForMethod(String name, Class<?>... para
 			ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
 			MongoQueryMethod queryMethod = new MongoQueryMethod(method, new DefaultRepositoryMetadata(SampleRepository.class),
 					factory, converter.getMappingContext());
-			return new StringBasedMongoQuery(queryMethod, operations, PARSER, QueryMethodEvaluationContextProvider.DEFAULT);
+			QueryMethodValueEvaluationContextAccessor accessor = new QueryMethodValueEvaluationContextAccessor(
+					environment, Collections.emptySet());
+			return new StringBasedMongoQuery(queryMethod, operations, new ValueExpressionDelegate(accessor, PARSER));
 
 		} catch (Exception e) {
 			throw new IllegalArgumentException(e.getMessage(), e);
@@ -726,6 +825,12 @@ private interface SampleRepository extends Repository<Person, Long> {
 		@Query("{'lastname': ?#{[0]} }")
 		List<Person> findByQueryWithExpression(String param0);
 
+		@Query("{'lastname': ?#{[0]}, 'firstname': ?${absent-property:some-default} }")
+		List<Person> findByQueryWithExpressionAndProperty(String param0);
+
+		@Query("{'lastname': ?${foo} }")
+		List<Person> findByQueryWithProperty();
+
 		@Query("{'id':?#{ [0] ? { $exists :true} : [1] }}")
 		List<Person> findByQueryWithExpressionAndNestedObject(boolean param0, String param1);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java
index 788a2925ca..91f23bb049 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/StubParameterAccessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,19 +17,23 @@
 
 import java.util.Arrays;
 import java.util.Iterator;
-import java.util.Optional;
+
+import org.jspecify.annotations.Nullable;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Range;
 import org.springframework.data.domain.Range.Bound;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.ScrollPosition;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Vector;
 import org.springframework.data.geo.Distance;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.core.convert.MongoWriter;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.TextCriteria;
+import org.springframework.data.mongodb.core.query.UpdateDefinition;
 import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.lang.Nullable;
 
 /**
  * Simple {@link ParameterAccessor} that returns the given parameters unfiltered.
@@ -72,76 +76,60 @@ public StubParameterAccessor(Object... values) {
 		}
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getPageable()
-	 */
+	@Override
+	public Vector getVector() {
+		return null;
+	}
+
+	@Override
+	public @org.jspecify.annotations.Nullable Score getScore() {
+		return null;
+	}
+
+	@Override
+	public @org.jspecify.annotations.Nullable Range<Score> getScoreRange() {
+		return null;
+	}
+
+	@Override
+	public ScrollPosition getScrollPosition() {
+		return null;
+	}
+
 	public Pageable getPageable() {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int)
-	 */
 	public Object getBindableValue(int index) {
 		return values[index];
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#hasBindableNullValue()
-	 */
 	public boolean hasBindableNullValue() {
 		return false;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getSort()
-	 */
 	public Sort getSort() {
 		return Sort.unsorted();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getDistanceRange()
-	 */
 	@Override
 	public Range<Distance> getDistanceRange() {
 		return range;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#iterator()
-	 */
 	public Iterator<Object> iterator() {
 		return Arrays.asList(values).iterator();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoParameterAccessor#getGeoNearLocation()
-	 */
 	public Point getGeoNearLocation() {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getFullText()
-	 */
 	@Override
 	public TextCriteria getFullText() {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getCollation()
-	 */
 	@Override
 	public Collation getCollation() {
 		return this.colllation;
@@ -151,25 +139,17 @@ public Collation getCollation() {
 	 * @see org.springframework.data.mongodb.repository.query.MongoParameterAccessor#getValues()
 	 */
 	@Override
-	public Object[] getValues() {
+	public Object @Nullable[] getValues() {
 		return this.values;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#getDynamicProjection()
-	 */
 	@Override
-	public Optional<Class<?>> getDynamicProjection() {
-		return Optional.empty();
+	public Class<?> findDynamicProjection() {
+		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection()
-	 */
 	@Override
-	public Class<?> findDynamicProjection() {
+	public UpdateDefinition getUpdate() {
 		return null;
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/VectorSearchAggregationUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/VectorSearchAggregationUnitTests.java
new file mode 100644
index 0000000000..819bba5a48
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/VectorSearchAggregationUnitTests.java
@@ -0,0 +1,109 @@
+/*
+ * Copyright 2025 the original author 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.repository.query;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.lang.reflect.Method;
+
+import org.bson.conversions.Bson;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.SearchResults;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.VectorSearch;
+import org.springframework.data.mongodb.repository.query.VectorSearchDelegate.QueryContainer;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+
+/**
+ * Unit tests for {@link VectorSearchAggregation}.
+ *
+ * @author Mark Paluch
+ */
+class VectorSearchAggregationUnitTests {
+
+	MongoOperations operationsMock;
+	MongoMappingContext context;
+	MappingMongoConverter converter;
+
+	@BeforeEach
+	public void setUp() {
+
+		context = new MongoMappingContext();
+		converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, context);
+		operationsMock = Mockito.mock(MongoOperations.class);
+
+		when(operationsMock.getConverter()).thenReturn(converter);
+		when(operationsMock.execute(any())).thenReturn(Bson.DEFAULT_CODEC_REGISTRY);
+	}
+
+	@Test
+	void derivesPrefilter() throws Exception {
+
+		VectorSearchAggregation aggregation = aggregation(SampleRepository.class, "searchByCountryAndEmbeddingNear",
+				String.class, Vector.class, Score.class, Limit.class);
+
+		QueryContainer query = aggregation.createVectorSearchQuery(
+				aggregation.getQueryMethod().getResultProcessor(),
+				new MongoParametersParameterAccessor(aggregation.getQueryMethod(),
+						new Object[] { "de", Vector.of(1f), Score.of(1), Limit.unlimited() }),
+				Object.class);
+
+		assertThat(query.query().getQueryObject()).containsEntry("country", "de");
+	}
+
+	private VectorSearchAggregation aggregation(Class<?> repository, String name, Class<?>... parameters)
+			throws Exception {
+
+		Method method = repository.getMethod(name, parameters);
+		ProjectionFactory factory = new SpelAwareProxyProjectionFactory();
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, new DefaultRepositoryMetadata(repository), factory,
+				context);
+		return new VectorSearchAggregation(queryMethod, operationsMock, ValueExpressionDelegate.create());
+	}
+
+	interface SampleRepository extends CrudRepository<WithVectorFields, String> {
+
+		@VectorSearch(indexName = "cos-index")
+		SearchResults<WithVectorFields> searchByCountryAndEmbeddingNear(String country, Vector vector, Score similarity,
+				Limit limit);
+
+	}
+
+	static class WithVectorFields {
+
+		String id;
+		String country;
+		String description;
+
+		Vector embedding;
+
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/VectorSearchDelegateUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/VectorSearchDelegateUnitTests.java
new file mode 100644
index 0000000000..078c01eece
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/query/VectorSearchDelegateUnitTests.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2025 the original author 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.repository.query;
+
+import static org.mockito.Mockito.mock;
+import static org.springframework.data.mongodb.test.util.Assertions.assertThat;
+
+import java.lang.reflect.Method;
+import java.util.List;
+
+import org.bson.Document;
+import org.jspecify.annotations.Nullable;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.domain.Limit;
+import org.springframework.data.domain.Score;
+import org.springframework.data.domain.SearchResults;
+import org.springframework.data.domain.Vector;
+import org.springframework.data.mapping.model.ValueExpressionEvaluator;
+import org.springframework.data.mongodb.core.aggregation.Aggregation;
+import org.springframework.data.mongodb.core.aggregation.AggregationPipeline;
+import org.springframework.data.mongodb.core.aggregation.VectorSearchOperation;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.VectorSearch;
+import org.springframework.data.mongodb.repository.query.VectorSearchDelegate.QueryContainer;
+import org.springframework.data.mongodb.util.aggregation.TestAggregationContext;
+import org.springframework.data.mongodb.util.json.ParameterBindingContext;
+import org.springframework.data.mongodb.util.json.ParameterBindingDocumentCodec;
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.AnnotationRepositoryMetadata;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
+
+/**
+ * Unit tests for {@link VectorSearchDelegate}.
+ *
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+class VectorSearchDelegateUnitTests {
+
+	MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, new MongoMappingContext());
+
+	@Test
+	void shouldConsiderDerivedLimit() throws ReflectiveOperationException {
+
+		Method method = VectorSearchRepository.class.getMethod("searchTop10ByEmbeddingNear", Vector.class, Score.class);
+
+		MongoQueryMethod queryMethod = getMongoQueryMethod(method);
+		MongoParametersParameterAccessor accessor = getAccessor(queryMethod, Vector.of(1, 2), Score.of(1));
+
+		QueryContainer container = createQueryContainer(queryMethod, accessor);
+
+		assertThat(container.query().getLimit()).isEqualTo(10);
+		assertThat(numCandidates(container.pipeline())).isEqualTo(10 * 20);
+	}
+
+	@Test
+	void shouldNotSetNumCandidates() throws ReflectiveOperationException {
+
+		Method method = VectorSearchRepository.class.getMethod("searchTop10EnnByEmbeddingNear", Vector.class, Score.class);
+
+		MongoQueryMethod queryMethod = getMongoQueryMethod(method);
+		MongoParametersParameterAccessor accessor = getAccessor(queryMethod, Vector.of(1, 2), Score.of(1));
+
+		QueryContainer container = createQueryContainer(queryMethod, accessor);
+
+		assertThat(container.query().getLimit()).isEqualTo(10);
+		assertThat(numCandidates(container.pipeline())).isNull();
+	}
+
+	@Test
+	void shouldConsiderProvidedLimit() throws ReflectiveOperationException {
+
+		Method method = VectorSearchRepository.class.getMethod("searchTop10ByEmbeddingNear", Vector.class, Score.class,
+				Limit.class);
+
+		MongoQueryMethod queryMethod = getMongoQueryMethod(method);
+		MongoParametersParameterAccessor accessor = getAccessor(queryMethod, Vector.of(1, 2), Score.of(1), Limit.of(11));
+
+		QueryContainer container = createQueryContainer(queryMethod, accessor);
+
+		assertThat(container.query().getLimit()).isEqualTo(11);
+		assertThat(numCandidates(container.pipeline())).isEqualTo(11 * 20);
+	}
+
+	@Test
+	void considersDerivedQueryPart() throws ReflectiveOperationException {
+
+		Method method = VectorSearchRepository.class.getMethod("searchTop10ByFirstNameAndEmbeddingNear", String.class,
+				Vector.class, Score.class);
+
+		MongoQueryMethod queryMethod = getMongoQueryMethod(method);
+		MongoParametersParameterAccessor accessor = getAccessor(queryMethod, "spring", Vector.of(1, 2), Score.of(1));
+
+		QueryContainer container = createQueryContainer(queryMethod, accessor);
+
+		assertThat(vectorSearchStageOf(container.pipeline())).containsEntry("$vectorSearch.filter",
+				new Document("first_name", "spring"));
+	}
+
+	@Test
+	void considersDerivedQueryPartInDifferentOrder() throws ReflectiveOperationException {
+
+		Method method = VectorSearchRepository.class.getMethod("searchTop10ByEmbeddingNearAndFirstName", Vector.class,
+				Score.class, String.class);
+
+		MongoQueryMethod queryMethod = getMongoQueryMethod(method);
+		MongoParametersParameterAccessor accessor = getAccessor(queryMethod, Vector.of(1, 2), Score.of(1), "spring");
+
+		QueryContainer container = createQueryContainer(queryMethod, accessor);
+
+		assertThat(vectorSearchStageOf(container.pipeline())).containsEntry("$vectorSearch.filter",
+				new Document("first_name", "spring"));
+	}
+
+	@Test
+	void defaultSortsByScore() throws NoSuchMethodException {
+
+		Method method = VectorSearchRepository.class.getMethod("searchTop10ByEmbeddingNear", Vector.class, Score.class,
+				Limit.class);
+
+		MongoQueryMethod queryMethod = getMongoQueryMethod(method);
+		MongoParametersParameterAccessor accessor = getAccessor(queryMethod, Vector.of(1, 2), Score.of(1), Limit.of(10));
+
+		QueryContainer container = createQueryContainer(queryMethod, accessor);
+
+		List<Document> stages = container.pipeline().lastOperation()
+				.toPipelineStages(TestAggregationContext.contextFor(WithVector.class));
+
+		assertThat(stages).containsExactly(new Document("$sort", new Document("__score__", -1)));
+	}
+
+	@Test
+	void usesDerivedSort() throws NoSuchMethodException {
+
+		Method method = VectorSearchRepository.class.getMethod("searchByEmbeddingNearOrderByFirstName", Vector.class,
+				Score.class, Limit.class);
+
+		MongoQueryMethod queryMethod = getMongoQueryMethod(method);
+		MongoParametersParameterAccessor accessor = getAccessor(queryMethod, Vector.of(1, 2), Score.of(1), Limit.of(11));
+
+		QueryContainer container = createQueryContainer(queryMethod, accessor);
+		AggregationPipeline aggregationPipeline = container.pipeline();
+
+		List<Document> stages = aggregationPipeline.lastOperation()
+				.toPipelineStages(TestAggregationContext.contextFor(WithVector.class));
+
+		assertThat(stages).containsExactly(new Document("$sort", new Document("first_name", 1).append("__score__", -1)));
+	}
+
+	Document vectorSearchStageOf(AggregationPipeline pipeline) {
+		return pipeline.firstOperation().toPipelineStages(TestAggregationContext.contextFor(WithVector.class)).get(0);
+	}
+
+	private QueryContainer createQueryContainer(MongoQueryMethod queryMethod, MongoParametersParameterAccessor accessor) {
+
+		VectorSearchDelegate delegate = new VectorSearchDelegate(queryMethod, converter, ValueExpressionDelegate.create());
+
+		return delegate.createQuery(mock(ValueExpressionEvaluator.class), queryMethod.getResultProcessor(), accessor, null,
+				new ParameterBindingDocumentCodec(), mock(ParameterBindingContext.class));
+	}
+
+	private MongoQueryMethod getMongoQueryMethod(Method method) {
+		RepositoryMetadata metadata = AnnotationRepositoryMetadata.getMetadata(method.getDeclaringClass());
+		return new MongoQueryMethod(method, metadata, new SpelAwareProxyProjectionFactory(), converter.getMappingContext());
+	}
+
+	private static MongoParametersParameterAccessor getAccessor(MongoQueryMethod queryMethod, Object... values) {
+		return new MongoParametersParameterAccessor(queryMethod, values);
+	}
+
+	@Nullable
+	private static Integer numCandidates(AggregationPipeline pipeline) {
+
+		Document $vectorSearch = pipeline.firstOperation().toPipelineStages(Aggregation.DEFAULT_CONTEXT).get(0);
+		if ($vectorSearch.containsKey("$vectorSearch")) {
+			Object value = $vectorSearch.get("$vectorSearch", Document.class).get("numCandidates");
+			return value instanceof Number i ? i.intValue() : null;
+		}
+		return null;
+	}
+
+	interface VectorSearchRepository extends Repository<WithVector, String> {
+
+		@VectorSearch(indexName = "cos-index", searchType = VectorSearchOperation.SearchType.ANN)
+		SearchResults<WithVector> searchTop10ByEmbeddingNear(Vector vector, Score similarity);
+
+		@VectorSearch(indexName = "cos-index", searchType = VectorSearchOperation.SearchType.ANN)
+		SearchResults<WithVector> searchTop10ByFirstNameAndEmbeddingNear(String firstName, Vector vector, Score similarity);
+
+		@VectorSearch(indexName = "cos-index", searchType = VectorSearchOperation.SearchType.ANN)
+		SearchResults<WithVector> searchTop10ByEmbeddingNearAndFirstName(Vector vector, Score similarity, String firstname);
+
+		@VectorSearch(indexName = "cos-index", searchType = VectorSearchOperation.SearchType.ENN)
+		SearchResults<WithVector> searchTop10EnnByEmbeddingNear(Vector vector, Score similarity);
+
+		@VectorSearch(indexName = "cos-index", searchType = VectorSearchOperation.SearchType.ANN)
+		SearchResults<WithVector> searchTop10ByEmbeddingNear(Vector vector, Score similarity, Limit limit);
+
+		@VectorSearch(indexName = "cos-index", searchType = VectorSearchOperation.SearchType.ANN)
+		SearchResults<WithVector> searchByEmbeddingNearOrderByFirstName(Vector vector, Score similarity, Limit limit);
+
+	}
+
+	static class WithVector {
+
+		Vector embedding;
+
+		String lastName;
+
+		@Field("first_name") String firstName;
+
+		public Vector getEmbedding() {
+			return embedding;
+		}
+
+		public void setEmbedding(Vector embedding) {
+			this.embedding = embedding;
+		}
+
+		public String getLastName() {
+			return lastName;
+		}
+
+		public void setLastName(String lastName) {
+			this.lastName = lastName;
+		}
+
+		public String getFirstName() {
+			return firstName;
+		}
+
+		public void setFirstName(String firstName) {
+			this.firstName = firstName;
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/DefaultCrudMethodMetadataUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/DefaultCrudMethodMetadataUnitTests.java
new file mode 100644
index 0000000000..85b487af65
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/DefaultCrudMethodMetadataUnitTests.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2023-2025 the original author 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.repository.support;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.util.Optional;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.ReadPreference;
+import org.springframework.data.mongodb.repository.support.CrudMethodMetadataPostProcessor.DefaultCrudMethodMetadata;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.util.ReflectionUtils;
+
+/**
+ * Unit tests for {@link DefaultCrudMethodMetadata}.
+ *
+ * @author Christoph Strobl
+ */
+class DefaultCrudMethodMetadataUnitTests {
+
+	@Test // GH-4542
+	void detectsReadPreferenceOnRepositoryInterface() {
+
+		DefaultCrudMethodMetadata metadata = new DefaultCrudMethodMetadata(ReadPreferenceAnnotated.class,
+				ReflectionUtils.findMethod(ReadPreferenceAnnotated.class, "findAll"));
+
+		assertThat(metadata.getReadPreference()).hasValue(com.mongodb.ReadPreference.primary());
+	}
+
+	@Test // GH-4542
+	void favorsReadPreferenceOfAnnotatedMethod() {
+
+		DefaultCrudMethodMetadata metadata = new DefaultCrudMethodMetadata(ReadPreferenceAnnotated.class,
+				ReflectionUtils.findMethod(ReadPreferenceAnnotated.class, "findById", Object.class));
+
+		assertThat(metadata.getReadPreference()).hasValue(com.mongodb.ReadPreference.secondary());
+	}
+
+	@ReadPreference("primary")
+	interface ReadPreferenceAnnotated extends CrudRepository<Person, String> {
+
+		@Override
+		@ReadPreference("secondary")
+		Optional<Person> findById(String s);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java
index e5ad2c718f..10c513dda4 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/IndexEnsuringQueryCreationListenerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,18 +16,20 @@
 package org.springframework.data.mongodb.repository.support;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.Mockito.anyString;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.index.IndexDefinition;
 import org.springframework.data.mongodb.core.index.IndexOperations;
@@ -43,10 +45,11 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
-public class IndexEnsuringQueryCreationListenerUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class IndexEnsuringQueryCreationListenerUnitTests {
 
-	IndexEnsuringQueryCreationListener listener;
+	private IndexEnsuringQueryCreationListener listener;
 
 	@Mock IndexOperationsProvider provider;
 	@Mock PartTree partTree;
@@ -55,20 +58,20 @@ public class IndexEnsuringQueryCreationListenerUnitTests {
 	@Mock IndexOperations indexOperations;
 	@Mock MongoEntityMetadata entityInformation;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		this.listener = new IndexEnsuringQueryCreationListener(provider);
 
 		partTreeQuery = mock(PartTreeMongoQuery.class, Answers.RETURNS_MOCKS);
 		when(partTreeQuery.getTree()).thenReturn(partTree);
-		when(provider.indexOps(anyString())).thenReturn(indexOperations);
+		when(provider.indexOps(anyString(), any())).thenReturn(indexOperations);
 		when(queryMethod.getEntityInformation()).thenReturn(entityInformation);
 		when(entityInformation.getCollectionName()).thenReturn("persons");
 	}
 
 	@Test // DATAMONGO-1753
-	public void skipsQueryCreationForMethodWithoutPredicate() {
+	void skipsQueryCreationForMethodWithoutPredicate() {
 
 		when(partTree.hasPredicate()).thenReturn(false);
 
@@ -78,7 +81,7 @@ public void skipsQueryCreationForMethodWithoutPredicate() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void usesCollationWhenPresentAndFixedValue() {
+	void usesCollationWhenPresentAndFixedValue() {
 
 		when(partTree.hasPredicate()).thenReturn(true);
 		when(partTree.getParts()).thenReturn(Streamable.empty());
@@ -97,7 +100,7 @@ public void usesCollationWhenPresentAndFixedValue() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void usesCollationWhenPresentAndFixedDocumentValue() {
+	void usesCollationWhenPresentAndFixedDocumentValue() {
 
 		when(partTree.hasPredicate()).thenReturn(true);
 		when(partTree.getParts()).thenReturn(Streamable.empty());
@@ -116,7 +119,7 @@ public void usesCollationWhenPresentAndFixedDocumentValue() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void skipsCollationWhenPresentButDynamic() {
+	void skipsCollationWhenPresentButDynamic() {
 
 		when(partTree.hasPredicate()).thenReturn(true);
 		when(partTree.getParts()).thenReturn(Streamable.empty());
@@ -135,7 +138,7 @@ public void skipsCollationWhenPresentButDynamic() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void skipsCollationWhenNotPresent() {
+	void skipsCollationWhenNotPresent() {
 
 		when(partTree.hasPredicate()).thenReturn(true);
 		when(partTree.getParts()).thenReturn(Streamable.empty());
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBeanUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBeanUnitTests.java
index c6a61584b0..dcfd57b018 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBeanUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryBeanUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,10 +20,10 @@
 
 import java.util.List;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mongodb.core.MongoOperations;
@@ -37,7 +37,7 @@
  *
  * @author Oliver Gierke
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class MongoRepositoryFactoryBeanUnitTests {
 
 	@Mock MongoOperations operations;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryUnitTests.java
index 78b8f152fa..3d0e468155 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFactoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,67 +19,96 @@
 import static org.mockito.Mockito.*;
 
 import java.io.Serializable;
+import java.util.Optional;
+import java.util.Set;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
-import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.repository.Person;
-import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
-import org.springframework.data.repository.Repository;
+import org.springframework.data.mongodb.repository.ReadPreference;
+import org.springframework.data.repository.ListCrudRepository;
+import org.springframework.data.repository.core.EntityInformation;
 
 /**
  * Unit test for {@link MongoRepositoryFactory}.
  *
  * @author Oliver Gierke
+ * @author Mark Paluch
+ * @author Christoph Strobl
  */
-@RunWith(MockitoJUnitRunner.class)
-public class MongoRepositoryFactoryUnitTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class MongoRepositoryFactoryUnitTests {
 
-	@Mock MongoTemplate template;
+	@Mock MongoOperations template;
 
-	@Mock MongoConverter converter;
+	private MongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, new MongoMappingContext());
 
-	@Mock @SuppressWarnings("rawtypes") MappingContext mappingContext;
-
-	@Mock @SuppressWarnings("rawtypes") MongoPersistentEntity entity;
-
-	@Before
-	@SuppressWarnings("unchecked")
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 		when(template.getConverter()).thenReturn(converter);
-		when(converter.getMappingContext()).thenReturn(mappingContext);
 	}
 
 	@Test
-	@SuppressWarnings("unchecked")
-	public void usesMappingMongoEntityInformationIfMappingContextSet() {
-
-		when(mappingContext.getRequiredPersistentEntity(Person.class)).thenReturn(entity);
+	void usesMappingMongoEntityInformationIfMappingContextSet() {
 
 		MongoRepositoryFactory factory = new MongoRepositoryFactory(template);
-		MongoEntityInformation<Person, Serializable> entityInformation = factory.getEntityInformation(Person.class);
+		EntityInformation<Person, Serializable> entityInformation = factory.getEntityInformation(Person.class);
 		assertThat(entityInformation instanceof MappingMongoEntityInformation).isTrue();
 	}
 
 	@Test // DATAMONGO-385
-	@SuppressWarnings("unchecked")
-	public void createsRepositoryWithIdTypeLong() {
-
-		when(mappingContext.getRequiredPersistentEntity(Person.class)).thenReturn(entity);
+	void createsRepositoryWithIdTypeLong() {
 
 		MongoRepositoryFactory factory = new MongoRepositoryFactory(template);
 		MyPersonRepository repository = factory.getRepository(MyPersonRepository.class);
 		assertThat(repository).isNotNull();
 	}
 
-	interface MyPersonRepository extends Repository<Person, Long> {
+	@Test // GH-2971
+	void considersCrudMethodMetadata() {
+
+		MongoRepositoryFactory factory = new MongoRepositoryFactory(template);
+		MyPersonRepository repository = factory.getRepository(MyPersonRepository.class);
+		repository.findById(42L);
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(template).findOne(captor.capture(), eq(Person.class), eq("person"));
+
+		Query value = captor.getValue();
+		assertThat(value.getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondary());
+	}
+
+	@Test // GH-2971
+	void ignoresCrudMethodMetadataOnNonAnnotatedMethods() {
+
+		MongoRepositoryFactory factory = new MongoRepositoryFactory(template);
+		MyPersonRepository repository = factory.getRepository(MyPersonRepository.class);
+		repository.findAllById(Set.of(42L));
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(template).find(captor.capture(), eq(Person.class), eq("person"));
+
+		Query value = captor.getValue();
+		assertThat(value.getReadPreference()).isNull();
+	}
+
+	interface MyPersonRepository extends ListCrudRepository<Person, Long> {
 
+		@ReadPreference("secondary")
+		Optional<Person> findById(Long id);
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFragmentsContributorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFragmentsContributorUnitTests.java
new file mode 100644
index 0000000000..564115fed0
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/MongoRepositoryFragmentsContributorUnitTests.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025 the original author 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.repository.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Iterator;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.User;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFragment;
+
+/**
+ * Unit tests for {@link MongoRepositoryFragmentsContributor}.
+ *
+ * @author Mark Paluch
+ */
+class MongoRepositoryFragmentsContributorUnitTests {
+
+	@Test // GH-4964
+	void composedContributorShouldCreateFragments() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
+		MongoOperations operations = mock(MongoOperations.class);
+		when(operations.getConverter()).thenReturn(converter);
+
+		MongoRepositoryFragmentsContributor contributor = MongoRepositoryFragmentsContributor.DEFAULT
+				.andThen(MyMongoRepositoryFragmentsContributor.INSTANCE);
+
+		RepositoryComposition.RepositoryFragments fragments = contributor.contribute(
+				AbstractRepositoryMetadata.getMetadata(QuerydslUserRepository.class),
+				new MappingMongoEntityInformation<>(mappingContext.getPersistentEntity(User.class)), operations);
+
+		assertThat(fragments).hasSize(2);
+
+		Iterator<RepositoryFragment<?>> iterator = fragments.iterator();
+
+		RepositoryFragment<?> querydsl = iterator.next();
+		assertThat(querydsl.getImplementationClass()).contains(QuerydslMongoPredicateExecutor.class);
+
+		RepositoryFragment<?> additional = iterator.next();
+		assertThat(additional.getImplementationClass()).contains(MyFragment.class);
+	}
+
+	enum MyMongoRepositoryFragmentsContributor implements MongoRepositoryFragmentsContributor {
+
+		INSTANCE;
+
+		@Override
+		public RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+				MongoEntityInformation<?, ?> entityInformation, MongoOperations operations) {
+			return RepositoryComposition.RepositoryFragments.just(new MyFragment());
+		}
+
+		@Override
+		public RepositoryComposition.RepositoryFragments describe(RepositoryMetadata metadata) {
+			return RepositoryComposition.RepositoryFragments.just(new MyFragment());
+		}
+	}
+
+	static class MyFragment {
+
+	}
+
+	interface QuerydslUserRepository extends Repository<User, Long>, QuerydslPredicateExecutor<User> {}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutorIntegrationTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutorIntegrationTests.java
index 86dad6bcbf..5f0800aba6 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutorIntegrationTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslMongoPredicateExecutorIntegrationTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,12 +24,17 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.dao.PermissionDeniedDataAccessException;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
-import org.springframework.data.mongodb.MongoDbFactory;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.repository.Address;
@@ -39,8 +44,9 @@
 import org.springframework.data.mongodb.repository.QUser;
 import org.springframework.data.mongodb.repository.User;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.MongoException;
 import com.mongodb.client.MongoDatabase;
@@ -54,11 +60,11 @@
  */
 @ContextConfiguration(
 		locations = "/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml")
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 public class QuerydslMongoPredicateExecutorIntegrationTests {
 
 	@Autowired MongoOperations operations;
-	@Autowired MongoDbFactory dbFactory;
+	@Autowired MongoDatabaseFactory dbFactory;
 
 	QuerydslMongoPredicateExecutor<Person> repository;
 
@@ -69,7 +75,8 @@ public class QuerydslMongoPredicateExecutorIntegrationTests {
 	public void setup() {
 
 		MongoRepositoryFactory factory = new MongoRepositoryFactory(operations);
-		MongoEntityInformation<Person, String> entityInformation = factory.getEntityInformation(Person.class);
+		MongoEntityInformation<Person, String> entityInformation = factory
+				.getEntityInformation(Person.class);
 		repository = new QuerydslMongoPredicateExecutor<>(entityInformation, operations);
 
 		operations.dropCollection(Person.class);
@@ -122,6 +129,27 @@ public void findUsingAndShouldWork() {
 						.containsExactly(dave);
 	}
 
+	@Test // GH-3751
+	public void findPage() {
+
+		assertThat(repository
+				.findAll(person.lastname.startsWith(oliver.getLastname()).and(person.firstname.startsWith(dave.getFirstname())),
+						PageRequest.of(0, 10))
+				.getContent()).containsExactly(dave);
+
+		assertThat(repository
+				.findAll(person.lastname.startsWith(oliver.getLastname()).and(person.firstname.startsWith(dave.getFirstname())),
+						Pageable.unpaged())
+				.getContent()).containsExactly(dave);
+	}
+
+	@Test // GH-4771
+	public void findUnpagedPage() {
+
+		assertThat(repository.findAll(person.lastname.isNotNull(), Pageable.unpaged(Sort.by("firstname"))))
+				.containsExactly(carter, dave, oliver);
+	}
+
 	@Test // DATAMONGO-362, DATAMONGO-1848
 	public void springDataMongodbQueryShouldAllowJoinOnDBref() {
 
@@ -219,9 +247,127 @@ protected MongoDatabase doGetDatabase() {
 		};
 
 		MongoRepositoryFactory factory = new MongoRepositoryFactory(ops);
-		MongoEntityInformation<Person, String> entityInformation = factory.getEntityInformation(Person.class);
+		MongoEntityInformation<Person, String> entityInformation = factory
+				.getEntityInformation(Person.class);
 		repository = new QuerydslMongoPredicateExecutor<>(entityInformation, ops);
 
 		repository.findOne(person.firstname.contains("batman"));
 	}
+
+	@Test // GH-3757
+	public void findByShouldReturnFirstResult() {
+
+		Person result = repository.findBy(person.firstname.eq(oliver.getFirstname()),
+				FluentQuery.FetchableFluentQuery::oneValue);
+
+		assertThat(result).isEqualTo(oliver);
+	}
+
+	@Test // GH-3757
+	public void findByShouldReturnOneResult() {
+
+		Person result = repository.findBy(person.firstname.eq(oliver.getFirstname()),
+				FluentQuery.FetchableFluentQuery::oneValue);
+
+		assertThat(result).isEqualTo(oliver);
+
+		assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class).isThrownBy(
+				() -> repository.findBy(person.lastname.eq(oliver.getLastname()), FluentQuery.FetchableFluentQuery::one));
+	}
+
+	@Test // GH-3757
+	public void findByShouldReturnAll() {
+
+		List<Person> result = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				FluentQuery.FetchableFluentQuery::all);
+
+		assertThat(result).hasSize(2);
+	}
+
+	@Test // GH-3757
+	public void findByShouldApplySortAll() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		List<Person> result = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				it -> it.sortBy(Sort.by("firstname")).all());
+		assertThat(result).containsSequence(dave, oliver);
+
+		result = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				it -> it.sortBy(Sort.by(Sort.Direction.DESC, "firstname")).all());
+		assertThat(result).containsSequence(oliver, dave);
+	}
+
+	@Test // GH-3757
+	public void findByShouldApplyProjection() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		Person result = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				it -> it.project("firstname").firstValue());
+
+		assertThat(result.getFirstname()).isNotNull();
+		assertThat(result.getLastname()).isNull();
+	}
+
+	@Test // GH-3757
+	public void findByShouldApplyPagination() {
+
+		Page<Person> first = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				it -> it.page(PageRequest.of(0, 1, Sort.by("firstname"))));
+
+		assertThat(first.getTotalElements()).isEqualTo(2);
+		assertThat(first.getContent()).contains(dave);
+
+		Page<Person> next = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				it -> it.page(PageRequest.of(1, 1, Sort.by("firstname"))));
+
+		assertThat(next.getTotalElements()).isEqualTo(2);
+		assertThat(next.getContent()).contains(oliver);
+	}
+
+	@Test // GH-4889
+	public void findByShouldApplySlice() {
+
+		Slice<Person> first = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				it -> it.slice(PageRequest.of(0, 1, Sort.by("firstname"))));
+
+		assertThat(first.hasNext()).isTrue();
+		assertThat(first.getContent()).contains(dave);
+
+		Slice<Person> next = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				it -> it.slice(PageRequest.of(1, 1, Sort.by("firstname"))));
+
+		assertThat(next.hasNext()).isFalse();
+		assertThat(next.getContent()).contains(oliver);
+	}
+
+	@Test // GH-3757
+	public void findByShouldCount() {
+
+		long count = repository.findBy(person.lastname.eq(oliver.getLastname()), FluentQuery.FetchableFluentQuery::count);
+		assertThat(count).isEqualTo(2L);
+
+		count = repository.findBy(person.lastname.eq("foo"), FluentQuery.FetchableFluentQuery::count);
+		assertThat(count).isEqualTo(0L);
+	}
+
+	@Test // GH-3757
+	public void findByShouldReportExists() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		boolean exists = repository.findBy(person.lastname.eq(oliver.getLastname()),
+				FluentQuery.FetchableFluentQuery::exists);
+		assertThat(exists).isTrue();
+
+		probe = new Person();
+		probe.setLastname("foo");
+
+		exists = repository.findBy(person.lastname.eq("foo"), FluentQuery.FetchableFluentQuery::exists);
+		assertThat(exists).isFalse();
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupportTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupportTests.java
index 6d908df879..89b82f4171 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupportTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/QuerydslRepositorySupportTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,15 +17,13 @@
 
 import static org.assertj.core.api.Assertions.*;
 
-import lombok.Data;
-
 import java.util.Arrays;
+import java.util.Objects;
 
 import org.bson.types.ObjectId;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
@@ -38,7 +36,7 @@
 import org.springframework.data.mongodb.repository.QPerson;
 import org.springframework.data.mongodb.repository.User;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.util.StringUtils;
 
 /**
@@ -48,7 +46,7 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration("classpath:infrastructure.xml")
 public class QuerydslRepositorySupportTests {
 
@@ -272,35 +270,133 @@ public void toStringShouldRenderQuery() {
 				.isEqualTo("find({\"lastname\":\"Matthews\",\"coworker\":{\"$ref\":\"user\",\"$id\":\"id\"}})");
 
 		query = query.orderBy(p.firstname.asc());
-		assertThat(StringUtils.trimAllWhitespace(query.toString()))
-				.isEqualTo(
-						"find({\"lastname\":\"Matthews\",\"coworker\":{\"$ref\":\"user\",\"$id\":\"id\"}}).sort({\"firstname\":1})");
+		assertThat(StringUtils.trimAllWhitespace(query.toString())).isEqualTo(
+				"find({\"lastname\":\"Matthews\",\"coworker\":{\"$ref\":\"user\",\"$id\":\"id\"}}).sort({\"firstname\":1})");
 
 		query = query.offset(1).limit(5);
-		assertThat(StringUtils.trimAllWhitespace(query.toString()))
-				.isEqualTo(
-						"find({\"lastname\":\"Matthews\",\"coworker\":{\"$ref\":\"user\",\"$id\":\"id\"}}).sort({\"firstname\":1}).skip(1).limit(5)");
+		assertThat(StringUtils.trimAllWhitespace(query.toString())).isEqualTo(
+				"find({\"lastname\":\"Matthews\",\"coworker\":{\"$ref\":\"user\",\"$id\":\"id\"}}).sort({\"firstname\":1}).skip(1).limit(5)");
 	}
 
-	@Data
 	@Document
 	public static class Outer {
 
 		@Id String id;
 		Inner inner;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public Inner getInner() {
+			return this.inner;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setInner(Inner inner) {
+			this.inner = inner;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Outer outer = (Outer) o;
+			return Objects.equals(id, outer.id) && Objects.equals(inner, outer.inner);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, inner);
+		}
+
+		public String toString() {
+			return "QuerydslRepositorySupportTests.Outer(id=" + this.getId() + ", inner=" + this.getInner() + ")";
+		}
 	}
 
-	@Data
 	public static class Inner {
 
 		@Id String id;
 		String value;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public String getValue() {
+			return this.value;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			Inner inner = (Inner) o;
+			return Objects.equals(id, inner.id) && Objects.equals(value, inner.value);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id, value);
+		}
+
+		public String toString() {
+			return "QuerydslRepositorySupportTests.Inner(id=" + this.getId() + ", value=" + this.getValue() + ")";
+		}
 	}
 
-	@Data
 	@Document
 	public static class WithMongoId {
 
 		@MongoId(FieldType.STRING) String id;
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (o == this) {
+				return true;
+			}
+			if (o == null || getClass() != o.getClass()) {
+				return false;
+			}
+			WithMongoId that = (WithMongoId) o;
+			return Objects.equals(id, that.id);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(id);
+		}
+
+		public String toString() {
+			return "QuerydslRepositorySupportTests.WithMongoId(id=" + this.getId() + ")";
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryUnitTests.java
new file mode 100644
index 0000000000..57ee473e6e
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFactoryUnitTests.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2023-2025 the original author 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.repository.support;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Set;
+
+import org.springframework.data.repository.reactive.ReactiveCrudRepository;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.Person;
+import org.springframework.data.mongodb.repository.ReadPreference;
+import org.springframework.data.repository.Repository;
+
+/**
+ * Unit test for {@link ReactiveMongoRepositoryFactory}.
+ *
+ * @author Mark Paluch
+ */
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+public class ReactiveMongoRepositoryFactoryUnitTests {
+
+	@Mock ReactiveMongoTemplate template;
+
+	MongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, new MongoMappingContext());
+
+	@BeforeEach
+	public void setUp() {
+		when(template.getConverter()).thenReturn(converter);
+	}
+
+	@Test // GH-2971
+	void considersCrudMethodMetadata() {
+
+		when(template.findOne(any(), any(), anyString())).thenReturn(Mono.empty());
+
+		ReactiveMongoRepositoryFactory factory = new ReactiveMongoRepositoryFactory(template);
+		MyPersonRepository repository = factory.getRepository(MyPersonRepository.class);
+		repository.findById(42L);
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(template).findOne(captor.capture(), eq(Person.class), eq("person"));
+
+		Query value = captor.getValue();
+		assertThat(value.getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondary());
+	}
+
+	@Test // GH-2971
+	void ignoresCrudMethodMetadataOnNonAnnotatedMethods() {
+
+		when(template.find(any(), any(), anyString())).thenReturn(Flux.empty());
+
+		ReactiveMongoRepositoryFactory factory = new ReactiveMongoRepositoryFactory(template);
+		MyPersonRepository repository = factory.getRepository(MyPersonRepository.class);
+		repository.findAllById(Set.of(42L));
+
+		ArgumentCaptor<Query> captor = ArgumentCaptor.forClass(Query.class);
+		verify(template).find(captor.capture(), eq(Person.class), eq("person"));
+
+		Query value = captor.getValue();
+		assertThat(value.getReadPreference()).isNull();
+	}
+
+	interface MyPersonRepository extends ReactiveCrudRepository<Person, Long> {
+
+		@ReadPreference("secondary")
+		Mono<Person> findById(Long id);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFragmentsContributorUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFragmentsContributorUnitTests.java
new file mode 100644
index 0000000000..065ff27654
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveMongoRepositoryFragmentsContributorUnitTests.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025 the original author 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.repository.support;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.Iterator;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.repository.User;
+import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.querydsl.ReactiveQuerydslPredicateExecutor;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryComposition;
+import org.springframework.data.repository.core.support.RepositoryFragment;
+
+/**
+ * Unit tests for {@link ReactiveMongoRepositoryFragmentsContributor}.
+ *
+ * @author Mark Paluch
+ */
+class ReactiveMongoRepositoryFragmentsContributorUnitTests {
+
+	@Test // GH-4964
+	void composedContributorShouldCreateFragments() {
+
+		MongoMappingContext mappingContext = new MongoMappingContext();
+		MappingMongoConverter converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext);
+		ReactiveMongoOperations operations = mock(ReactiveMongoOperations.class);
+		when(operations.getConverter()).thenReturn(converter);
+
+		ReactiveMongoRepositoryFragmentsContributor contributor = ReactiveMongoRepositoryFragmentsContributor.DEFAULT
+				.andThen(MyMongoRepositoryFragmentsContributor.INSTANCE);
+
+		RepositoryComposition.RepositoryFragments fragments = contributor.contribute(
+				AbstractRepositoryMetadata.getMetadata(QuerydslUserRepository.class),
+				new MappingMongoEntityInformation<>(mappingContext.getPersistentEntity(User.class)), operations);
+
+		assertThat(fragments).hasSize(2);
+
+		Iterator<RepositoryFragment<?>> iterator = fragments.iterator();
+
+		RepositoryFragment<?> querydsl = iterator.next();
+		assertThat(querydsl.getImplementationClass()).contains(ReactiveQuerydslMongoPredicateExecutor.class);
+
+		RepositoryFragment<?> additional = iterator.next();
+		assertThat(additional.getImplementationClass()).contains(MyFragment.class);
+	}
+
+	enum MyMongoRepositoryFragmentsContributor implements ReactiveMongoRepositoryFragmentsContributor {
+
+		INSTANCE;
+
+		@Override
+		public RepositoryComposition.RepositoryFragments contribute(RepositoryMetadata metadata,
+				MongoEntityInformation<?, ?> entityInformation, ReactiveMongoOperations operations) {
+			return RepositoryComposition.RepositoryFragments.just(new MyFragment());
+		}
+
+		@Override
+		public RepositoryComposition.RepositoryFragments describe(RepositoryMetadata metadata) {
+			return RepositoryComposition.RepositoryFragments.just(new MyFragment());
+		}
+	}
+
+	static class MyFragment {
+
+	}
+
+	interface QuerydslUserRepository extends Repository<User, Long>, ReactiveQuerydslPredicateExecutor<User> {}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutorTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutorTests.java
index e5cb46d6ed..c807a1bcbd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutorTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/ReactiveQuerydslMongoPredicateExecutorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,16 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
-import org.springframework.data.mongodb.core.query.BasicQuery;
+import static org.assertj.core.api.Assertions.*;
+
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.LinkedHashSet;
+import java.util.Set;
 
 import org.junit.After;
 import org.junit.Before;
@@ -33,12 +36,13 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.dao.PermissionDeniedDataAccessException;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
-import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.repository.Address;
 import org.springframework.data.mongodb.repository.Person;
 import org.springframework.data.mongodb.repository.QAddress;
@@ -47,12 +51,13 @@
 import org.springframework.data.mongodb.repository.User;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
+import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.MongoException;
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 import com.mongodb.reactivestreams.client.MongoDatabase;
 
 /**
@@ -60,6 +65,7 @@
  *
  * @author Mark Paluch
  * @author Christoph Strobl
+ * @author Rocco Lagrotteria
  */
 @RunWith(SpringRunner.class)
 @ContextConfiguration
@@ -74,7 +80,7 @@ public class ReactiveQuerydslMongoPredicateExecutorTests {
 	QPerson person;
 
 	@Configuration
-	static class Config extends AbstractReactiveMongoConfiguration {
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
@@ -85,22 +91,28 @@ public MongoClient reactiveMongoClient() {
 		protected String getDatabaseName() {
 			return "reactive";
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() {
+			return Collections.singleton(Person.class);
+		}
 	}
 
 	@BeforeClass
 	public static void cleanDb() {
 
-		MongoClient client = MongoTestUtils.reactiveClient();
-
-		MongoTestUtils.createOrReplaceCollectionNow("reactive", "person", client);
-		MongoTestUtils.createOrReplaceCollectionNow("reactive", "user", client);
+		try (MongoClient client = MongoTestUtils.reactiveClient()) {
+			MongoTestUtils.createOrReplaceCollectionNow("reactive", "person", client);
+			MongoTestUtils.createOrReplaceCollectionNow("reactive", "user", client);
+		}
 	}
 
 	@Before
 	public void setup() {
 
 		ReactiveMongoRepositoryFactory factory = new ReactiveMongoRepositoryFactory(operations);
-		MongoEntityInformation<Person, String> entityInformation = factory.getEntityInformation(Person.class);
+		MongoEntityInformation<Person, String> entityInformation = factory
+				.getEntityInformation(Person.class);
 		repository = new ReactiveQuerydslMongoPredicateExecutor<>(entityInformation, operations);
 
 		dave = new Person("Dave", "Matthews", 42);
@@ -263,12 +275,11 @@ public void queryShouldTerminateWithUnsupportedOperationOnJoinWithNoResults() {
 				.as(StepVerifier::create) //
 				.expectNextCount(1) //
 				.verifyComplete();
-		;
+
 		operations.save(person2) //
 				.as(StepVerifier::create) //
 				.expectNextCount(1) //
 				.verifyComplete();
-		;
 
 		Flux<Person> result = new ReactiveSpringDataMongodbQuery<>(operations, Person.class).where()
 				.join(person.coworker, QUser.user).on(QUser.user.username.eq("does-not-exist")).fetch();
@@ -316,7 +327,8 @@ protected Mono<MongoDatabase> doGetDatabase() {
 		};
 
 		ReactiveMongoRepositoryFactory factory = new ReactiveMongoRepositoryFactory(ops);
-		MongoEntityInformation<Person, String> entityInformation = factory.getEntityInformation(Person.class);
+		MongoEntityInformation<Person, String> entityInformation = factory
+				.getEntityInformation(Person.class);
 		repository = new ReactiveQuerydslMongoPredicateExecutor<>(entityInformation, ops);
 
 		repository.findOne(person.firstname.contains("batman")) //
@@ -324,4 +336,134 @@ protected Mono<MongoDatabase> doGetDatabase() {
 				.expectError(PermissionDeniedDataAccessException.class) //
 				.verify();
 	}
+
+	@Test // GH-3757
+	public void findByShouldReturnFirstResult() {
+
+		repository.findBy(person.firstname.eq(oliver.getFirstname()), FluentQuery.ReactiveFluentQuery::first) //
+				.as(StepVerifier::create) //
+				.expectNext(oliver) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	public void findByShouldReturnOneResult() {
+
+		repository.findBy(person.firstname.eq(oliver.getFirstname()), FluentQuery.ReactiveFluentQuery::one) //
+				.as(StepVerifier::create) //
+				.expectNext(oliver) //
+				.verifyComplete();
+
+		repository.findBy(person.lastname.eq(oliver.getLastname()), FluentQuery.ReactiveFluentQuery::one) //
+				.as(StepVerifier::create) //
+				.verifyError(IncorrectResultSizeDataAccessException.class);
+	}
+
+	@Test // GH-3757
+	public void findByShouldReturnAll() {
+
+		repository.findBy(person.lastname.eq(oliver.getLastname()), FluentQuery.ReactiveFluentQuery::all) //
+				.as(StepVerifier::create) //
+				.expectNextCount(2) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	public void findByShouldApplySortAll() {
+
+		repository.findBy(person.lastname.eq(oliver.getLastname()), it -> it.sortBy(Sort.by("firstname")).all()) //
+				.as(StepVerifier::create) //
+				.expectNext(dave, oliver) //
+				.verifyComplete();
+
+		repository
+				.findBy(person.lastname.eq(oliver.getLastname()), it -> it.sortBy(Sort.by(Direction.DESC, "firstname")).all()) //
+				.as(StepVerifier::create) //
+				.expectNext(oliver, dave) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	public void findByShouldApplyProjection() {
+
+		repository.findBy(person.lastname.eq(oliver.getLastname()), it -> it.project("firstname").first()) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.getFirstname()).isNotNull();
+					assertThat(it.getLastname()).isNull();
+				}).verifyComplete();
+	}
+
+	@Test // GH-3757
+	public void findByShouldApplyPagination() {
+
+		repository
+				.findBy(person.lastname.eq(oliver.getLastname()), it -> it.page(PageRequest.of(0, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.getTotalElements()).isEqualTo(2);
+					assertThat(it.getContent()).containsOnly(dave);
+				}).verifyComplete();
+
+		repository
+				.findBy(person.lastname.eq(oliver.getLastname()), it -> it.page(PageRequest.of(1, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.getTotalElements()).isEqualTo(2);
+					assertThat(it.getContent()).containsOnly(oliver);
+				}).verifyComplete();
+	}
+
+	@Test // GH-4889
+	public void findByShouldApplySlice() {
+
+		repository
+				.findBy(person.lastname.eq(oliver.getLastname()), it -> it.slice(PageRequest.of(0, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.hasNext()).isTrue();
+					assertThat(it.getContent()).containsOnly(dave);
+				}).verifyComplete();
+
+		repository
+				.findBy(person.lastname.eq(oliver.getLastname()), it -> it.slice(PageRequest.of(1, 1, Sort.by("firstname")))) //
+				.as(StepVerifier::create) //
+				.assertNext(it -> {
+
+					assertThat(it.hasNext()).isFalse();
+					assertThat(it.getContent()).containsOnly(oliver);
+				}).verifyComplete();
+	}
+
+	@Test // GH-3757
+	public void findByShouldCount() {
+
+		repository.findBy(person.lastname.eq(oliver.getLastname()), FluentQuery.ReactiveFluentQuery::count) //
+				.as(StepVerifier::create) //
+				.expectNext(2L) //
+				.verifyComplete();
+
+		repository.findBy(person.lastname.eq("foo"), FluentQuery.ReactiveFluentQuery::count) //
+				.as(StepVerifier::create) //
+				.expectNext(0L) //
+				.verifyComplete();
+	}
+
+	@Test // GH-3757
+	public void findByShouldReportExists() {
+
+		repository.findBy(person.lastname.eq(oliver.getLastname()), FluentQuery.ReactiveFluentQuery::exists) //
+				.as(StepVerifier::create) //
+				.expectNext(true) //
+				.verifyComplete();
+
+		repository.findBy(person.lastname.eq("foo"), FluentQuery.ReactiveFluentQuery::exists) //
+				.as(StepVerifier::create) //
+				.expectNext(false) //
+				.verifyComplete();
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryTests.java
index 8eee93ee0c..60c02ee775 100755
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2019 the original author or authors.
+ * Copyright 2010-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  */
 package org.springframework.data.mongodb.repository.support;
 
+import static java.util.Arrays.*;
 import static org.assertj.core.api.Assertions.*;
-import static org.assertj.core.api.Assumptions.*;
 import static org.springframework.data.domain.ExampleMatcher.*;
+import static org.springframework.data.mongodb.test.util.DirtiesStateExtension.*;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -28,18 +28,20 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestInstance;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.dao.IncorrectResultSizeDataAccessException;
 import org.springframework.data.domain.Example;
+import org.springframework.data.domain.ExampleMatcher;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.ExampleMatcher.*;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.geo.Point;
 import org.springframework.data.mongodb.MongoTransactionManager;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint;
 import org.springframework.data.mongodb.core.mapping.Document;
 import org.springframework.data.mongodb.core.query.Collation;
@@ -48,11 +50,14 @@
 import org.springframework.data.mongodb.repository.Person.Sex;
 import org.springframework.data.mongodb.repository.User;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
-import org.springframework.data.mongodb.test.util.MongoVersion;
-import org.springframework.data.mongodb.test.util.MongoVersionRule;
-import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.data.mongodb.test.util.DirtiesStateExtension;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.EnableIfReplicaSetAvailable;
+import org.springframework.data.mongodb.test.util.MongoServerCondition;
+import org.springframework.data.mongodb.test.util.MongoTemplateExtension;
+import org.springframework.data.mongodb.test.util.MongoTestTemplate;
+import org.springframework.data.mongodb.test.util.Template;
+import org.springframework.data.repository.query.FluentQuery;
 import org.springframework.test.util.ReflectionTestUtils;
 import org.springframework.transaction.support.TransactionTemplate;
 
@@ -61,13 +66,14 @@
  * @author Thomas Darimont
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Jens Schauder
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:infrastructure.xml")
-public class SimpleMongoRepositoryTests {
+@ExtendWith({ MongoTemplateExtension.class, MongoServerCondition.class, DirtiesStateExtension.class })
+@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+class SimpleMongoRepositoryTests implements StateFunctions {
 
-	@Autowired private MongoTemplate template;
-	public @Rule MongoVersionRule mongoVersion = MongoVersionRule.any();
+	@Template(initialEntitySet = Person.class) //
+	private static MongoTestTemplate template;
 
 	private Person oliver, dave, carter, boyd, stefan, leroi, alicia;
 	private List<Person> all;
@@ -75,10 +81,23 @@ public class SimpleMongoRepositoryTests {
 	private MongoEntityInformation<Person, String> personEntityInformation = new CustomizedPersonInformation();
 	private SimpleMongoRepository<Person, String> repository;
 
-	@Before
-	public void setUp() {
-		repository = new SimpleMongoRepository<Person, String>(personEntityInformation, template);
+	@BeforeEach
+	void setUp() {
+		repository = new SimpleMongoRepository<>(personEntityInformation, template);
+	}
+
+	@Override
+	public void clear() {
+
+		if (repository == null) {
+			setUp();
+		}
+
 		repository.deleteAll();
+	}
+
+	@Override
+	public void setupState() {
 
 		oliver = new Person("Oliver August", "Matthews", 4);
 		dave = new Person("Dave", "Matthews", 42);
@@ -88,21 +107,22 @@ public void setUp() {
 		leroi = new Person("Leroi", "Moore", 41);
 		alicia = new Person("Alicia", "Keys", 30, Sex.FEMALE);
 
-		all = repository.saveAll(Arrays.asList(oliver, dave, carter, boyd, stefan, leroi, alicia));
+		all = repository.saveAll(asList(oliver, dave, carter, boyd, stefan, leroi, alicia));
 	}
 
 	@Test
-	public void findALlFromCustomCollectionName() {
-		assertThat(repository.findAll()).hasSize(all.size());
+	void findAllFromCustomCollectionName() {
+		assertThat(repository.findAll()).hasSameSizeAs(all);
 	}
 
 	@Test
-	public void findOneFromCustomCollectionName() {
-		assertThat(repository.findById(dave.getId()).get()).isEqualTo(dave);
+	void findOneFromCustomCollectionName() {
+		assertThat(repository.findById(dave.getId())).contains(dave);
 	}
 
 	@Test
-	public void deleteFromCustomCollectionName() {
+	@DirtiesState
+	void deleteFromCustomCollectionName() {
 
 		repository.delete(dave);
 
@@ -110,7 +130,8 @@ public void deleteFromCustomCollectionName() {
 	}
 
 	@Test
-	public void deleteByIdFromCustomCollectionName() {
+	@DirtiesState
+	void deleteByIdFromCustomCollectionName() {
 
 		repository.deleteById(dave.getId());
 
@@ -118,7 +139,8 @@ public void deleteByIdFromCustomCollectionName() {
 	}
 
 	@Test // DATAMONGO-1054
-	public void shouldInsertSingle() {
+	@DirtiesState
+	void shouldInsertSingle() {
 
 		String randomId = UUID.randomUUID().toString();
 
@@ -129,7 +151,8 @@ public void shouldInsertSingle() {
 	}
 
 	@Test // DATAMONGO-1054
-	public void shouldInsertMultipleFromList() {
+	@DirtiesState
+	void shouldInsertMultipleFromList() {
 
 		String randomId = UUID.randomUUID().toString();
 		Map<String, Person> idToPerson = new HashMap<String, Person>();
@@ -143,12 +166,13 @@ public void shouldInsertMultipleFromList() {
 
 		List<Person> saved = repository.insert(persons);
 
-		assertThat(saved).hasSize(persons.size());
+		assertThat(saved).hasSameSizeAs(persons);
 		assertThatAllReferencePersonsWereStoredCorrectly(idToPerson, saved);
 	}
 
 	@Test // DATAMONGO-1054
-	public void shouldInsertMutlipleFromSet() {
+	@DirtiesState
+	void shouldInsertMutlipleFromSet() {
 
 		String randomId = UUID.randomUUID().toString();
 		Map<String, Person> idToPerson = new HashMap<String, Person>();
@@ -162,12 +186,12 @@ public void shouldInsertMutlipleFromSet() {
 
 		List<Person> saved = repository.insert(persons);
 
-		assertThat(saved).hasSize(persons.size());
+		assertThat(saved).hasSameSizeAs(persons);
 		assertThatAllReferencePersonsWereStoredCorrectly(idToPerson, saved);
 	}
 
 	@Test // DATAMONGO-1245, DATAMONGO-1464
-	public void findByExampleShouldLookUpEntriesCorrectly() {
+	void findByExampleShouldLookUpEntriesCorrectly() {
 
 		Person sample = new Person();
 		sample.setLastname("Matthews");
@@ -179,8 +203,21 @@ public void findByExampleShouldLookUpEntriesCorrectly() {
 		assertThat(result.getTotalPages()).isEqualTo(1);
 	}
 
+	@Test // GH-3751
+	void findByExampleShouldReturnUnpagedResults() {
+
+		Person sample = new Person();
+		sample.setLastname("Matthews");
+		trimDomainType(sample, "id", "createdAt", "email");
+
+		Page<Person> result = repository.findAll(Example.of(sample), Pageable.unpaged());
+
+		assertThat(result.getContent()).hasSize(2).contains(dave, oliver);
+		assertThat(result.getTotalPages()).isEqualTo(1);
+	}
+
 	@Test // DATAMONGO-1464
-	public void findByExampleMultiplePagesShouldLookUpEntriesCorrectly() {
+	void findByExampleMultiplePagesShouldLookUpEntriesCorrectly() {
 
 		Person sample = new Person();
 		sample.setLastname("Matthews");
@@ -193,7 +230,7 @@ public void findByExampleMultiplePagesShouldLookUpEntriesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldLookUpEntriesCorrectly() {
+	void findAllByExampleShouldLookUpEntriesCorrectly() {
 
 		Person sample = new Person();
 		sample.setLastname("Matthews");
@@ -203,7 +240,8 @@ public void findAllByExampleShouldLookUpEntriesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingNestedObject() {
+	@DirtiesState
+	void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingNestedObject() {
 
 		dave.setAddress(new Address("1600 Pennsylvania Ave NW", "20500", "Washington"));
 		repository.save(dave);
@@ -219,7 +257,8 @@ public void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingNestedObject()
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingPartialNestedObject() {
+	@DirtiesState
+	void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingPartialNestedObject() {
 
 		dave.setAddress(new Address("1600 Pennsylvania Ave NW", "20500", "Washington"));
 		repository.save(dave);
@@ -235,7 +274,8 @@ public void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingPartialNestedOb
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldNotFindEntriesWhenUsingPartialNestedObjectInStrictMode() {
+	@DirtiesState
+	void findAllByExampleShouldNotFindEntriesWhenUsingPartialNestedObjectInStrictMode() {
 
 		dave.setAddress(new Address("1600 Pennsylvania Ave NW", "20500", "Washington"));
 		repository.save(dave);
@@ -250,7 +290,8 @@ public void findAllByExampleShouldNotFindEntriesWhenUsingPartialNestedObjectInSt
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingNestedObjectInStrictMode() {
+	@DirtiesState
+	void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingNestedObjectInStrictMode() {
 
 		dave.setAddress(new Address("1600 Pennsylvania Ave NW", "20500", "Washington"));
 		repository.save(dave);
@@ -265,7 +306,7 @@ public void findAllByExampleShouldLookUpEntriesCorrectlyWhenUsingNestedObjectInS
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldRespectStringMatchMode() {
+	void findAllByExampleShouldRespectStringMatchMode() {
 
 		Person sample = new Person();
 		sample.setLastname("Mat");
@@ -277,7 +318,8 @@ public void findAllByExampleShouldRespectStringMatchMode() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldResolveDbRefCorrectly() {
+	@DirtiesState
+	void findAllByExampleShouldResolveDbRefCorrectly() {
 
 		User user = new User();
 		user.setId("c0nf1ux");
@@ -297,7 +339,8 @@ public void findAllByExampleShouldResolveDbRefCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldResolveLegacyCoordinatesCorrectly() {
+	@DirtiesState
+	void findAllByExampleShouldResolveLegacyCoordinatesCorrectly() {
 
 		Person megan = new Person("megan", "tarash");
 		megan.setLocation(new Point(41.85003D, -87.65005D));
@@ -312,7 +355,8 @@ public void findAllByExampleShouldResolveLegacyCoordinatesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldResolveGeoJsonCoordinatesCorrectly() {
+	@DirtiesState
+	void findAllByExampleShouldResolveGeoJsonCoordinatesCorrectly() {
 
 		Person megan = new Person("megan", "tarash");
 		megan.setLocation(new GeoJsonPoint(41.85003D, -87.65005D));
@@ -327,7 +371,8 @@ public void findAllByExampleShouldResolveGeoJsonCoordinatesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findAllByExampleShouldProcessInheritanceCorrectly() {
+	@DirtiesState
+	void findAllByExampleShouldProcessInheritanceCorrectly() {
 
 		PersonExtended reference = new PersonExtended();
 		reference.setLastname("Matthews");
@@ -343,7 +388,7 @@ public void findAllByExampleShouldProcessInheritanceCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void findOneByExampleShouldLookUpEntriesCorrectly() {
+	void findOneByExampleShouldLookUpEntriesCorrectly() {
 
 		Person sample = new Person();
 		sample.setFirstname("Dave");
@@ -354,7 +399,7 @@ public void findOneByExampleShouldLookUpEntriesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void existsByExampleShouldLookUpEntriesCorrectly() {
+	void existsByExampleShouldLookUpEntriesCorrectly() {
 
 		Person sample = new Person();
 		sample.setFirstname("Dave");
@@ -365,7 +410,7 @@ public void existsByExampleShouldLookUpEntriesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1245
-	public void countByExampleShouldLookUpEntriesCorrectly() {
+	void countByExampleShouldLookUpEntriesCorrectly() {
 
 		Person sample = new Person();
 		sample.setLastname("Matthews");
@@ -375,7 +420,8 @@ public void countByExampleShouldLookUpEntriesCorrectly() {
 	}
 
 	@Test // DATAMONGO-1896
-	public void saveAllUsesEntityCollection() {
+	@DirtiesState
+	void saveAllUsesEntityCollection() {
 
 		Person first = new PersonExtended();
 		first.setEmail("foo@bar.com");
@@ -387,18 +433,18 @@ public void saveAllUsesEntityCollection() {
 
 		repository.deleteAll();
 
-		repository.saveAll(Arrays.asList(first, second));
+		repository.saveAll(asList(first, second));
 
 		assertThat(repository.findAll()).containsExactlyInAnyOrder(first, second);
 	}
 
 	@Test // DATAMONGO-2130
-	@MongoVersion(asOf = "4.0")
-	public void countShouldBePossibleInTransaction() {
-
-		assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
+	@EnableIfReplicaSetAvailable
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+	@DirtiesState
+	void countShouldBePossibleInTransaction() {
 
-		MongoTransactionManager txmgr = new MongoTransactionManager(template.getMongoDbFactory());
+		MongoTransactionManager txmgr = new MongoTransactionManager(template.getMongoDatabaseFactory());
 		TransactionTemplate tt = new TransactionTemplate(txmgr);
 		tt.afterPropertiesSet();
 
@@ -418,12 +464,12 @@ public void countShouldBePossibleInTransaction() {
 	}
 
 	@Test // DATAMONGO-2130
-	@MongoVersion(asOf = "4.0")
-	public void existsShouldBePossibleInTransaction() {
+	@EnableIfReplicaSetAvailable
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
+	@DirtiesState
+	void existsShouldBePossibleInTransaction() {
 
-		assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
-
-		MongoTransactionManager txmgr = new MongoTransactionManager(template.getMongoDbFactory());
+		MongoTransactionManager txmgr = new MongoTransactionManager(template.getMongoDatabaseFactory());
 		TransactionTemplate tt = new TransactionTemplate(txmgr);
 		tt.afterPropertiesSet();
 
@@ -440,6 +486,154 @@ public void existsShouldBePossibleInTransaction() {
 		assertThat(exists).isTrue();
 	}
 
+	@Test // DATAMONGO-2652
+	@DirtiesState
+	void deleteAllByIds() {
+
+		repository.deleteAllById(asList(dave.getId(), carter.getId()));
+
+		assertThat(repository.findAll()) //
+				.hasSize(all.size() - 2).doesNotContain(dave, carter);
+	}
+
+	@Test // GH-3757
+	void findByShouldReturnFirstResult() {
+
+		Person probe = new Person();
+		probe.setFirstname(oliver.getFirstname());
+
+		Person result = repository.findBy(Example.of(probe, getMatcher()), FluentQuery.FetchableFluentQuery::firstValue);
+
+		assertThat(result).isEqualTo(oliver);
+	}
+
+	@Test // GH-3757
+	void findByShouldReturnOneResult() {
+
+		Person probe = new Person();
+		probe.setFirstname(oliver.getFirstname());
+
+		Person result = repository.findBy(Example.of(probe, getMatcher()), FluentQuery.FetchableFluentQuery::oneValue);
+
+		assertThat(result).isEqualTo(oliver);
+
+		Person probeByLastname = new Person();
+		probeByLastname.setLastname(oliver.getLastname());
+
+		assertThatExceptionOfType(IncorrectResultSizeDataAccessException.class).isThrownBy(
+				() -> repository.findBy(Example.of(probeByLastname, getMatcher()), FluentQuery.FetchableFluentQuery::one));
+	}
+
+	@Test // GH-3757
+	void findByShouldReturnAll() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		List<Person> result = repository.findBy(Example.of(probe, getMatcher()), FluentQuery.FetchableFluentQuery::all);
+
+		assertThat(result).hasSize(2);
+	}
+
+	@Test // GH-3757
+	void findByShouldApplySortAll() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		List<Person> result = repository.findBy(Example.of(probe, getMatcher()),
+				it -> it.sortBy(Sort.by("firstname")).all());
+		assertThat(result).containsSequence(dave, oliver);
+
+		result = repository.findBy(Example.of(probe, getMatcher()),
+				it -> it.sortBy(Sort.by(Sort.Direction.DESC, "firstname")).all());
+		assertThat(result).containsSequence(oliver, dave);
+	}
+
+	@Test // GH-3757
+	void findByShouldApplyProjection() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		Person result = repository.findBy(Example.of(probe, getMatcher()), it -> it.project("firstname").firstValue());
+
+		assertThat(result.getFirstname()).isNotNull();
+		assertThat(result.getLastname()).isNull();
+	}
+
+	@Test // GH-3757
+	void findByShouldApplyPagination() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		Page<Person> first = repository.findBy(Example.of(probe, getMatcher()),
+				it -> it.page(PageRequest.of(0, 1, Sort.by("firstname"))));
+		assertThat(first.getTotalElements()).isEqualTo(2);
+		assertThat(first.getContent()).contains(dave);
+
+		Page<Person> next = repository.findBy(Example.of(probe, getMatcher()),
+				it -> it.page(PageRequest.of(1, 1, Sort.by("firstname"))));
+
+		assertThat(next.getTotalElements()).isEqualTo(2);
+		assertThat(next.getContent()).contains(oliver);
+	}
+
+	@Test // GH-4889
+	void findByShouldApplySlice() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		Slice<Person> first = repository.findBy(Example.of(probe, getMatcher()),
+				it -> it.slice(PageRequest.of(0, 1, Sort.by("firstname"))));
+		assertThat(first.hasNext()).isTrue();
+		assertThat(first.getContent()).contains(dave);
+
+		Slice<Person> next = repository.findBy(Example.of(probe, getMatcher()),
+				it -> it.slice(PageRequest.of(1, 1, Sort.by("firstname"))));
+
+		assertThat(next.hasNext()).isFalse();
+		assertThat(next.getContent()).contains(oliver);
+	}
+
+	@Test // GH-3757
+	void findByShouldCount() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		long count = repository.findBy(Example.of(probe, getMatcher()), FluentQuery.FetchableFluentQuery::count);
+		assertThat(count).isEqualTo(2L);
+
+		probe = new Person();
+		probe.setLastname("foo");
+
+		count = repository.findBy(Example.of(probe, getMatcher()), FluentQuery.FetchableFluentQuery::count);
+		assertThat(count).isEqualTo(0L);
+	}
+
+	@Test // GH-3757
+	void findByShouldReportExists() {
+
+		Person probe = new Person();
+		probe.setLastname(oliver.getLastname());
+
+		boolean exists = repository.findBy(Example.of(probe, getMatcher()), FluentQuery.FetchableFluentQuery::exists);
+		assertThat(exists).isTrue();
+
+		probe = new Person();
+		probe.setLastname("foo");
+
+		exists = repository.findBy(Example.of(probe, getMatcher()), FluentQuery.FetchableFluentQuery::exists);
+		assertThat(exists).isFalse();
+	}
+
+	private ExampleMatcher getMatcher() {
+		return matching().withIgnorePaths("age", "createdAt", "sex", "email", "id");
+	}
+
 	private void assertThatAllReferencePersonsWereStoredCorrectly(Map<String, Person> references, List<Person> saved) {
 
 		for (Person person : saved) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryUnitTests.java
index 1a5feb0ca9..f784aea6e8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,34 +16,47 @@
 package org.springframework.data.mongodb.repository.support;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.util.function.Consumer;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.ExecutableFindOperation.ExecutableFind;
 import org.springframework.data.mongodb.core.MongoOperations;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.ReadPreference;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.mongodb.repository.support.CrudMethodMetadataPostProcessor.DefaultCrudMethodMetadata;
+import org.springframework.data.repository.query.FluentQuery.FetchableFluentQuery;
 
 /**
+ * Unit tests for {@link SimpleMongoRepository}.
+ *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class SimpleMongoRepositoryUnitTests {
 
 	SimpleMongoRepository<Object, Object> repository;
 	@Mock MongoOperations mongoOperations;
 	@Mock MongoEntityInformation<Object, Object> entityInformation;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 		repository = new SimpleMongoRepository<>(entityInformation, mongoOperations);
 	}
@@ -132,8 +145,98 @@ public void shouldAddDefaultCollationToFindOneForExampleIfPresent() {
 		assertThat(query.getValue().getCollation()).contains(collation);
 	}
 
+	@ParameterizedTest // GH-2971
+	@MethodSource("findAllCalls")
+	void shouldAddReadPreferenceToFindAllMethods(Consumer<SimpleMongoRepository<Object, Object>> findCall)
+			throws NoSuchMethodException {
+
+		repository = new SimpleMongoRepository<>(entityInformation, mongoOperations);
+		repository.setRepositoryMethodMetadata(
+				new DefaultCrudMethodMetadata(TestRepositoryWithReadPreference.class, TestRepositoryWithReadPreference.class.getMethod("dummy")));
+
+		findCall.accept(repository);
+
+		ArgumentCaptor<Query> query = ArgumentCaptor.forClass(Query.class);
+		verify(mongoOperations).find(query.capture(), any(), any());
+
+		assertThat(query.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
+	@Test // GH-2971
+	void shouldAddReadPreferenceToFindOne() throws NoSuchMethodException {
+
+		repository = new SimpleMongoRepository<>(entityInformation, mongoOperations);
+		repository.setRepositoryMethodMetadata(
+				new DefaultCrudMethodMetadata(TestRepositoryWithReadPreference.class, TestRepositoryWithReadPreference.class.getMethod("dummy")));
+
+		repository.findOne(Example.of(new TestDummy()));
+
+		ArgumentCaptor<Query> query = ArgumentCaptor.forClass(Query.class);
+		verify(mongoOperations).findOne(query.capture(), any(), any());
+
+		assertThat(query.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
+	@Test // GH-2971
+	void shouldAddReadPreferenceToFluentFetchable() throws NoSuchMethodException {
+
+		ExecutableFind<Object> finder = mock(ExecutableFind.class);
+		when(mongoOperations.query(any())).thenReturn(finder);
+		when(finder.inCollection(any())).thenReturn(finder);
+		when(finder.matching(any(Query.class))).thenReturn(finder);
+		when(finder.as(any())).thenReturn(finder);
+
+		repository = new SimpleMongoRepository<>(entityInformation, mongoOperations);
+		repository.setRepositoryMethodMetadata(
+				new DefaultCrudMethodMetadata(TestRepositoryWithReadPreferenceMethod.class, TestRepositoryWithReadPreferenceMethod.class.getMethod("dummy")));
+
+		repository.findBy(Example.of(new TestDummy()), FetchableFluentQuery::all);
+
+		ArgumentCaptor<Query> query = ArgumentCaptor.forClass(Query.class);
+		verify(finder).matching(query.capture());
+
+		assertThat(query.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
+	private static Stream<Arguments> findAllCalls() {
+
+		Consumer<SimpleMongoRepository<Object, Object>> findAll = SimpleMongoRepository::findAll;
+		Consumer<SimpleMongoRepository<Object, Object>> findAllWithSort = repo -> repo.findAll(Sort.by("age"));
+		Consumer<SimpleMongoRepository<Object, Object>> findAllWithPage = repo -> repo
+				.findAll(PageRequest.of(1, 20, Sort.by("age")));
+		Consumer<SimpleMongoRepository<Object, Object>> findAllWithExample = repo -> repo
+				.findAll(Example.of(new TestDummy()));
+		Consumer<SimpleMongoRepository<Object, Object>> findAllWithExampleAndSort = repo -> repo
+				.findAll(Example.of(new TestDummy()), Sort.by("age"));
+		Consumer<SimpleMongoRepository<Object, Object>> findAllWithExampleAndPage = repo -> repo
+				.findAll(Example.of(new TestDummy()), PageRequest.of(1, 20, Sort.by("age")));
+
+		return Stream.of(Arguments.of(findAll), //
+				Arguments.of(findAllWithSort), //
+				Arguments.of(findAllWithPage), //
+				Arguments.of(findAllWithExample), //
+				Arguments.of(findAllWithExampleAndSort), //
+				Arguments.of(findAllWithExampleAndPage));
+	}
+
 	static class TestDummy {
 
 	}
 
+	interface TestRepository {
+
+	}
+
+	@ReadPreference("secondaryPreferred")
+	interface TestRepositoryWithReadPreference {
+
+		void dummy();
+	}
+
+	interface TestRepositoryWithReadPreferenceMethod {
+
+		@ReadPreference("secondaryPreferred")
+		void dummy();
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryVersionedEntityTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryVersionedEntityTests.java
index ad797cb513..ad53592b76 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryVersionedEntityTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepositoryVersionedEntityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,40 +20,41 @@
 import static org.springframework.data.mongodb.core.query.Criteria.*;
 import static org.springframework.data.mongodb.core.query.Query.*;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.OptimisticLockingFailureException;
 import org.springframework.data.mongodb.MongoTransactionManager;
-import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.mapping.BasicMongoPersistentEntity;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.repository.VersionedPerson;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.mongodb.test.util.EnableIfMongoServerVersion;
+import org.springframework.data.mongodb.test.util.MongoClientClosingTestConfiguration;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
-import org.springframework.data.mongodb.test.util.MongoVersion;
 import org.springframework.data.mongodb.test.util.ReplicaSet;
-import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@ExtendWith(SpringExtension.class)
 @ContextConfiguration
 public class SimpleMongoRepositoryVersionedEntityTests {
 
 	@Configuration
-	static class Config extends AbstractMongoClientConfiguration {
+	static class Config extends MongoClientClosingTestConfiguration {
 
 		@Override
 		public MongoClient mongoClient() {
@@ -64,17 +65,21 @@ public MongoClient mongoClient() {
 		protected String getDatabaseName() {
 			return "database";
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() throws ClassNotFoundException {
+			return new HashSet<>(Arrays.asList(VersionedPerson.class));
+		}
 	}
 
-	@Autowired //
-	private MongoTemplate template;
+	@Autowired private MongoTemplate template;
 
 	private MongoEntityInformation<VersionedPerson, String> personEntityInformation;
 	private SimpleMongoRepository<VersionedPerson, String> repository;
 
 	private VersionedPerson sarah;
 
-	@Before
+	@BeforeEach
 	public void setUp() {
 
 		MongoPersistentEntity entity = template.getConverter().getMappingContext()
@@ -96,7 +101,7 @@ public void deleteWithMatchingVersion() {
 	}
 
 	@Test // DATAMONGO-2195
-	@MongoVersion(asOf = "4.0")
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 	public void deleteWithMatchingVersionInTx() {
 
 		assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
@@ -125,7 +130,7 @@ public void deleteWithVersionMismatch() {
 	}
 
 	@Test // DATAMONGO-2195
-	@MongoVersion(asOf = "4.0")
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 	public void deleteWithVersionMismatchInTx() {
 
 		assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
@@ -152,7 +157,7 @@ public void deleteNonExisting() {
 	}
 
 	@Test // DATAMONGO-2195
-	@MongoVersion(asOf = "4.0")
+	@EnableIfMongoServerVersion(isGreaterThanEqual = "4.0")
 	public void deleteNonExistingInTx() {
 
 		assumeThat(ReplicaSet.required().runsAsReplicaSet()).isTrue();
@@ -168,7 +173,7 @@ public void deleteNonExistingInTx() {
 
 	TransactionTemplate initTxTemplate() {
 
-		MongoTransactionManager txmgr = new MongoTransactionManager(template.getMongoDbFactory());
+		MongoTransactionManager txmgr = new MongoTransactionManager(template.getMongoDatabaseFactory());
 		TransactionTemplate tt = new TransactionTemplate(txmgr);
 		tt.afterPropertiesSet();
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java
index 64e34255e5..0b172de2cd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryUnitTests.java
@@ -1,21 +1,5 @@
 /*
- * 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.
- */
-
-/*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,49 +16,60 @@
 package org.springframework.data.mongodb.repository.support;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import java.lang.reflect.Method;
+import java.util.Optional;
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.mongodb.core.ReactiveFindOperation.ReactiveFind;
 import org.springframework.data.mongodb.core.ReactiveMongoOperations;
 import org.springframework.data.mongodb.core.query.Collation;
 import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.repository.ReadPreference;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
+import org.springframework.data.repository.query.FluentQuery;
 
 /**
+ * Unit tests for {@link SimpleReactiveMongoRepository}.
+ *
  * @author Christoph Strobl
+ * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class SimpleReactiveMongoRepositoryUnitTests {
+@ExtendWith(MockitoExtension.class)
+class SimpleReactiveMongoRepositoryUnitTests {
 
-	SimpleReactiveMongoRepository<Object, String> repository;
+	private SimpleReactiveMongoRepository<Object, String> repository;
 	@Mock Mono mono;
 	@Mock Flux flux;
 	@Mock ReactiveMongoOperations mongoOperations;
 	@Mock MongoEntityInformation<Object, String> entityInformation;
 
-	@Before
-	public void setUp() {
-
-		when(mongoOperations.count(any(), any(), any())).thenReturn(mono);
-		when(mongoOperations.exists(any(), any(), any())).thenReturn(mono);
-		when(mongoOperations.find(any(), any(), any())).thenReturn(flux);
-
+	@BeforeEach
+	void setUp() {
 		repository = new SimpleReactiveMongoRepository<>(entityInformation, mongoOperations);
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldAddDefaultCollationToCountForExampleIfPresent() {
+	void shouldAddDefaultCollationToCountForExampleIfPresent() {
+
+		when(mongoOperations.count(any(), any(), any())).thenReturn(mono);
 
 		Collation collation = Collation.of("en_US");
 
@@ -88,7 +83,9 @@ public void shouldAddDefaultCollationToCountForExampleIfPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldAddDefaultCollationToExistsForExampleIfPresent() {
+	void shouldAddDefaultCollationToExistsForExampleIfPresent() {
+
+		when(mongoOperations.exists(any(), any(), any())).thenReturn(mono);
 
 		Collation collation = Collation.of("en_US");
 
@@ -102,7 +99,9 @@ public void shouldAddDefaultCollationToExistsForExampleIfPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldAddDefaultCollationToFindForExampleIfPresent() {
+	void shouldAddDefaultCollationToFindForExampleIfPresent() {
+
+		when(mongoOperations.find(any(), any(), any())).thenReturn(flux);
 
 		Collation collation = Collation.of("en_US");
 
@@ -116,7 +115,9 @@ public void shouldAddDefaultCollationToFindForExampleIfPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldAddDefaultCollationToFindWithSortForExampleIfPresent() {
+	void shouldAddDefaultCollationToFindWithSortForExampleIfPresent() {
+
+		when(mongoOperations.find(any(), any(), any())).thenReturn(flux);
 
 		Collation collation = Collation.of("en_US");
 
@@ -130,7 +131,13 @@ public void shouldAddDefaultCollationToFindWithSortForExampleIfPresent() {
 	}
 
 	@Test // DATAMONGO-1854
-	public void shouldAddDefaultCollationToFindOneForExampleIfPresent() {
+	void shouldAddDefaultCollationToFindOneForExampleIfPresent() {
+
+		when(entityInformation.getCollectionName()).thenReturn("testdummy");
+		doReturn(flux).when(mongoOperations).find(any(Query.class), eq(TestDummy.class), eq("testdummy"));
+		when(flux.buffer(anyInt())).thenReturn(flux);
+		when(flux.map(any())).thenReturn(flux);
+		when(flux.next()).thenReturn(mono);
 
 		Collation collation = Collation.of("en_US");
 
@@ -143,7 +150,96 @@ public void shouldAddDefaultCollationToFindOneForExampleIfPresent() {
 		assertThat(query.getValue().getCollation()).contains(collation);
 	}
 
-	static class TestDummy {
+	@ParameterizedTest // GH-2971
+	@MethodSource("findAllCalls")
+	void shouldAddReadPreferenceToFindAllMethods(
+			Function<SimpleReactiveMongoRepository<Object, String>, Flux<Object>> findCall) {
+
+		repository = new SimpleReactiveMongoRepository<>(entityInformation, mongoOperations);
+		repository.setRepositoryMethodMetadata(new CrudMethodMetadata() {
+			@Override
+			public Optional<com.mongodb.ReadPreference> getReadPreference() {
+				return Optional.of(com.mongodb.ReadPreference.secondaryPreferred());
+			}
+		});
+		when(mongoOperations.find(any(), any(), any())).thenReturn(Flux.just("ok"));
+
+		findCall.apply(repository).subscribe();
+
+		ArgumentCaptor<Query> query = ArgumentCaptor.forClass(Query.class);
+		verify(mongoOperations).find(query.capture(), any(), any());
+
+		assertThat(query.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
+	@Test // GH-2971
+	void shouldAddReadPreferenceToFindOne() {
+
+		repository = new SimpleReactiveMongoRepository<>(entityInformation, mongoOperations);
+		repository.setRepositoryMethodMetadata(new CrudMethodMetadata() {
+			@Override
+			public Optional<com.mongodb.ReadPreference> getReadPreference() {
+				return Optional.of(com.mongodb.ReadPreference.secondaryPreferred());
+			}
+		});
+		when(mongoOperations.find(any(), any(), any())).thenReturn(Flux.just("ok"));
+
+		repository.findOne(Example.of(new SimpleMongoRepositoryUnitTests.TestDummy())).subscribe();
+
+		ArgumentCaptor<Query> query = ArgumentCaptor.forClass(Query.class);
+		verify(mongoOperations).find(query.capture(), any(), any());
+
+		assertThat(query.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
+	@Test // GH-2971
+	void shouldAddReadPreferenceToFluentFetchable() {
+
+		ReactiveFind<Object> finder = mock(ReactiveFind.class);
+		when(mongoOperations.query(any())).thenReturn(finder);
+		when(finder.inCollection(any())).thenReturn(finder);
+		when(finder.matching(any(Query.class))).thenReturn(finder);
+		when(finder.as(any())).thenReturn(finder);
+		when(finder.all()).thenReturn(Flux.just("ok"));
+
+		repository = new SimpleReactiveMongoRepository<>(entityInformation, mongoOperations);
+		repository.setRepositoryMethodMetadata(new CrudMethodMetadata() {
+			@Override
+			public Optional<com.mongodb.ReadPreference> getReadPreference() {
+				return Optional.of(com.mongodb.ReadPreference.secondaryPreferred());
+			}
+		});
+
+		repository.findBy(Example.of(new TestDummy()), FluentQuery.ReactiveFluentQuery::all).subscribe();
+
+		ArgumentCaptor<Query> query = ArgumentCaptor.forClass(Query.class);
+		verify(finder).matching(query.capture());
+
+		assertThat(query.getValue().getReadPreference()).isEqualTo(com.mongodb.ReadPreference.secondaryPreferred());
+	}
+
+	private static Stream<Arguments> findAllCalls() {
+
+		Function<SimpleReactiveMongoRepository<Object, String>, Flux<Object>> findAll = SimpleReactiveMongoRepository::findAll;
+		Function<SimpleReactiveMongoRepository<Object, String>, Flux<Object>> findAllWithSort = repo -> repo
+				.findAll(Sort.by("age"));
+		Function<SimpleReactiveMongoRepository<Object, String>, Flux<Object>> findAllWithExample = repo -> repo
+				.findAll(Example.of(new TestDummy()));
+		Function<SimpleReactiveMongoRepository<Object, String>, Flux<Object>> findAllWithExampleAndSort = repo -> repo
+				.findAll(Example.of(new TestDummy()), Sort.by("age"));
+
+		return Stream.of(Arguments.of(findAll), //
+				Arguments.of(findAllWithSort), //
+				Arguments.of(findAllWithExample), //
+				Arguments.of(findAllWithExampleAndSort));
+	}
+
+	private static class TestDummy {
+
+	}
+
+	@ReadPreference("secondaryPreferred")
+	interface TestRepositoryWithReadPreference {
 
 	}
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryVersionedEntityTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryVersionedEntityTests.java
index 0488a417a8..10f5f334a8 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryVersionedEntityTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SimpleReactiveMongoRepositoryVersionedEntityTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,33 +20,35 @@
 
 import reactor.test.StepVerifier;
 
+import java.util.Collections;
+import java.util.Set;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.dao.OptimisticLockingFailureException;
-import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
 import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
 import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
 import org.springframework.data.mongodb.repository.VersionedPerson;
 import org.springframework.data.mongodb.repository.query.MongoEntityInformation;
 import org.springframework.data.mongodb.test.util.MongoTestUtils;
+import org.springframework.data.mongodb.test.util.ReactiveMongoClientClosingTestConfiguration;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.reactivestreams.client.MongoClient;
-import com.mongodb.reactivestreams.client.MongoClients;
 
 /**
  * @author Mark Paluch
  */
-@RunWith(SpringJUnit4ClassRunner.class)
+@RunWith(SpringRunner.class)
 @ContextConfiguration
 public class SimpleReactiveMongoRepositoryVersionedEntityTests {
 
 	@Configuration
-	static class Config extends AbstractReactiveMongoConfiguration {
+	static class Config extends ReactiveMongoClientClosingTestConfiguration {
 
 		@Override
 		public MongoClient reactiveMongoClient() {
@@ -57,6 +59,11 @@ public MongoClient reactiveMongoClient() {
 		protected String getDatabaseName() {
 			return "database";
 		}
+
+		@Override
+		protected Set<Class<?>> getInitialEntitySet() {
+			return Collections.singleton(VersionedPerson.class);
+		}
 	}
 
 	@Autowired //
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java
index 41fedf94c9..56e17b7590 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/support/SpringDataMongodbSerializerUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2019 the original author or authors.
+ * Copyright 2011-2025 the original author 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,28 +20,34 @@
 import static com.querydsl.core.types.dsl.Expressions.*;
 import static org.assertj.core.api.Assertions.*;
 
+import java.util.Arrays;
 import java.util.Collections;
 
 import org.bson.Document;
 import org.bson.types.ObjectId;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+
 import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.convert.WritingConverter;
 import org.springframework.data.mongodb.core.convert.DbRefResolver;
 import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
 import org.springframework.data.mongodb.core.mapping.Field;
+import org.springframework.data.mongodb.core.mapping.MongoId;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.repository.Person.Sex;
 import org.springframework.data.mongodb.repository.QAddress;
 import org.springframework.data.mongodb.repository.QPerson;
+import org.springframework.data.mongodb.repository.User;
 
 import com.querydsl.core.types.Ops;
+import com.querydsl.core.types.Predicate;
 import com.querydsl.core.types.PredicateOperation;
 import com.querydsl.core.types.dsl.BooleanExpression;
 import com.querydsl.core.types.dsl.BooleanOperation;
@@ -56,16 +62,17 @@
  * @author Christoph Strobl
  * @author Mark Paluch
  * @author Mikhail Kaduchka
+ * @author Enrique Leon Molina
  */
-@RunWith(MockitoJUnitRunner.class)
+@ExtendWith(MockitoExtension.class)
 public class SpringDataMongodbSerializerUnitTests {
 
 	@Mock DbRefResolver dbFactory;
-	MongoConverter converter;
-	SpringDataMongodbSerializer serializer;
+	private MongoConverter converter;
+	private SpringDataMongodbSerializer serializer;
 
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() {
 
 		MongoMappingContext context = new MongoMappingContext();
 
@@ -74,21 +81,21 @@ public void setUp() {
 	}
 
 	@Test
-	public void uses_idAsKeyForIdProperty() {
+	void uses_idAsKeyForIdProperty() {
 
 		StringPath path = QPerson.person.id;
 		assertThat(serializer.getKeyForPath(path, path.getMetadata())).isEqualTo("_id");
 	}
 
 	@Test
-	public void buildsNestedKeyCorrectly() {
+	void buildsNestedKeyCorrectly() {
 
 		StringPath path = QPerson.person.address.street;
 		assertThat(serializer.getKeyForPath(path, path.getMetadata())).isEqualTo("street");
 	}
 
 	@Test
-	public void convertsComplexObjectOnSerializing() {
+	void convertsComplexObjectOnSerializing() {
 
 		Address address = new Address();
 		address.street = "Foo";
@@ -104,14 +111,14 @@ public void convertsComplexObjectOnSerializing() {
 	}
 
 	@Test // DATAMONGO-376
-	public void returnsEmptyStringIfNoPathExpressionIsGiven() {
+	void returnsEmptyStringIfNoPathExpressionIsGiven() {
 
 		QAddress address = QPerson.person.shippingAddresses.any();
 		assertThat(serializer.getKeyForPath(address, address.getMetadata())).isEmpty();
 	}
 
 	@Test // DATAMONGO-467, DATAMONGO-1798
-	public void retainsIdPropertyType() {
+	void appliesImplicitIdConversion() {
 
 		ObjectId id = new ObjectId();
 
@@ -119,11 +126,11 @@ public void retainsIdPropertyType() {
 		StringPath idPath = builder.getString("id");
 
 		Document result = (Document) serializer.visit((BooleanOperation) idPath.eq(id.toString()), null);
-		assertThat(result.get("_id")).isNotNull().isInstanceOf(String.class).isEqualTo(id.toString());
+		assertThat(result.get("_id")).isNotNull().isInstanceOf(ObjectId.class);
 	}
 
 	@Test // DATAMONGO-761
-	public void looksUpKeyForNonPropertyPath() {
+	void looksUpKeyForNonPropertyPath() {
 
 		PathBuilder<Address> builder = new PathBuilder<Address>(Address.class, "address");
 		SimplePath<Object> firstElementPath = builder.getArray("foo", String[].class).get(0);
@@ -133,7 +140,7 @@ public void looksUpKeyForNonPropertyPath() {
 	}
 
 	@Test // DATAMONGO-1485
-	public void takesCustomConversionForEnumsIntoAccount() {
+	void takesCustomConversionForEnumsIntoAccount() {
 
 		MongoMappingContext context = new MongoMappingContext();
 
@@ -151,7 +158,7 @@ public void takesCustomConversionForEnumsIntoAccount() {
 	}
 
 	@Test // DATAMONGO-1848, DATAMONGO-1943
-	public void shouldRemarshallListsAndDocuments() {
+	void shouldRemarshallListsAndDocuments() {
 
 		BooleanExpression criteria = QPerson.person.lastname.isNotEmpty()
 				.and(QPerson.person.firstname.containsIgnoreCase("foo")).not();
@@ -161,7 +168,7 @@ public void shouldRemarshallListsAndDocuments() {
 	}
 
 	@Test // DATAMONGO-2228
-	public void retainsOpsInAndExpression() {
+	void retainsOpsInAndExpression() {
 
 		PredicateOperation testExpression = predicate(Ops.AND,
 				predicate(Ops.OR, predicate(Ops.EQ, path(Object.class, "firstname"), constant("John")),
@@ -173,6 +180,110 @@ public void retainsOpsInAndExpression() {
 				"{\"$and\": [{\"$or\": [{\"firstname\": \"John\"}, {\"firstname\": \"Sarah\"}]}, {\"$or\": [{\"lastname\": \"Smith\"}, {\"lastname\": \"Connor\"}]}]}"));
 	}
 
+	@Test // DATAMONGO-2475
+	void chainedOrsInSameDocument() {
+
+		Predicate predicate = QPerson.person.firstname.eq("firstname_value")
+				.or(QPerson.person.lastname.eq("lastname_value")).or(QPerson.person.age.goe(30)).or(QPerson.person.age.loe(20))
+				.or(QPerson.person.uniqueId.isNull());
+
+		assertThat(serializer.handle(predicate)).isEqualTo(Document.parse(
+				"{\"$or\": [{\"firstname\": \"firstname_value\"}, {\"lastname\": \"lastname_value\"}, {\"age\": {\"$gte\": 30}}, {\"age\": {\"$lte\": 20}}, {\"uniqueId\": {\"$exists\": false}}]}"));
+	}
+
+	@Test // DATAMONGO-2475
+	void chainedNestedOrsInSameDocument() {
+
+		Predicate predicate = QPerson.person.firstname.eq("firstname_value")
+				.or(QPerson.person.lastname.eq("lastname_value")).or(QPerson.person.address.street.eq("spring"));
+
+		assertThat(serializer.handle(predicate)).isEqualTo(Document.parse(
+				"{\"$or\": [{\"firstname\": \"firstname_value\"}, {\"lastname\": \"lastname_value\"}, {\"add.street\": \"spring\"}]}"));
+	}
+
+	@Test // DATAMONGO-2475
+	void chainedAndsInSameDocument() {
+
+		Predicate predicate = QPerson.person.firstname.eq("firstname_value")
+				.and(QPerson.person.lastname.eq("lastname_value")).and(QPerson.person.age.goe(30))
+				.and(QPerson.person.age.loe(20)).and(QPerson.person.uniqueId.isNull());
+
+		assertThat(serializer.handle(predicate)).isEqualTo(Document.parse(
+				"{\"$and\": [{\"firstname\": \"firstname_value\", \"lastname\": \"lastname_value\", \"age\": {\"$gte\": 30}, \"uniqueId\": {\"$exists\": false}}, {\"age\": {\"$lte\": 20}}]}"));
+	}
+
+	@Test // DATAMONGO-2475
+	void chainMultipleAndFlattensCorrectly() {
+
+		Document p1doc = Document.parse("{ \"$or\" : [ { \"firstname\" : \"fn\"}, { \"lastname\" : \"ln\" } ] }");
+		Document p2doc = Document
+				.parse("{ \"$or\" : [ { \"age\" : { \"$gte\" : 20 } }, { \"age\" : { \"$lte\" : 30} } ] }");
+		Document p3doc = Document.parse("{ \"$or\" : [ { \"add.city\" : \"c\"}, { \"add.zipCode\" : \"0\" } ] }");
+		Document expected = new Document("$and", Arrays.asList(p1doc, p2doc, p3doc));
+
+		Predicate predicate1 = QPerson.person.firstname.eq("fn").or(QPerson.person.lastname.eq("ln"));
+		Predicate predicate2 = QPerson.person.age.goe(20).or(QPerson.person.age.loe(30));
+		Predicate predicate3 = QPerson.person.address.city.eq("c").or(QPerson.person.address.zipCode.eq("0"));
+		PredicateOperation testExpression = predicate(Ops.AND, predicate1, predicate2, predicate3);
+
+		assertThat(serializer.handle(testExpression)).isEqualTo(expected);
+	}
+
+	@Test // GH-4037
+	void parsesDocumentReference() {
+
+		User user = new User();
+		user.setId("007");
+		Predicate predicate = QPerson.person.spiritAnimal.eq(user);
+
+		assertThat(serializer.handle(predicate)).isEqualTo(Document.parse("{ 'spiritAnimal' : '007' }"));
+	}
+
+	@Test // GH-4037
+	void parsesDocumentReferenceOnId() {
+
+		User user = new User();
+		user.setId("007");
+		Predicate predicate = QPerson.person.spiritAnimal.id.eq("007");
+
+		assertThat(serializer.handle(predicate)).isEqualTo(Document.parse("{ 'spiritAnimal' : '007' }"));
+	}
+
+	@Test // GH-4709
+	void appliesConversionToIdType() {
+
+		Predicate predicate = QSpringDataMongodbSerializerUnitTests_Outer.outer.embeddedObject.id
+				.eq("64268a7b17ac6a00018bf312");
+
+		assertThat(serializer.handle(predicate))
+				.isEqualTo(new Document("embedded_object._id", new ObjectId("64268a7b17ac6a00018bf312")));
+	}
+
+	@Test // GH-4709
+	void appliesConversionToIdTypeForExplicitTypeRef() {
+
+		Predicate predicate = QQuerydslRepositorySupportTests_WithMongoId.withMongoId.id.eq("64268a7b17ac6a00018bf312");
+
+		assertThat(serializer.handle(predicate)).isEqualTo(new Document("_id", "64268a7b17ac6a00018bf312"));
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(collection = "record")
+	class Outer {
+
+		@Id private String id;
+
+		@Field("embedded_object") private Inner embeddedObject;
+	}
+
+	@org.springframework.data.mongodb.core.mapping.Document(collection = "embedded_object")
+	class Inner {
+		@Id private String id;
+	}
+
+	public class WithMongoId {
+		@MongoId private String id;
+	}
+
 	class Address {
 		String id;
 		String street;
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/util/SliceUtilsUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/util/SliceUtilsUnitTests.java
new file mode 100644
index 0000000000..8dc952e8a7
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/util/SliceUtilsUnitTests.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2025 the original author 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.repository.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verifyNoInteractions;
+
+import java.util.stream.Stream;
+
+import org.bson.Document;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.mongodb.core.query.BasicQuery;
+import org.springframework.data.mongodb.core.query.Query;
+
+/**
+ * Unit test for {@link SliceUtils}.
+ *
+ * @author Christoph Strobl
+ */
+class SliceUtilsUnitTests {
+
+	@ParameterizedTest // GH-4889
+	@MethodSource("paged")
+	void pagedPageableModifiesQuery(Pageable page) {
+
+		Query source = new BasicQuery(Document.parse("{ 'spring' : 'data' }"));
+
+		Query target = SliceUtils.limitResult(source, page);
+
+		assertThat(target.getQueryObject()).isEqualTo(source.getQueryObject());
+		assertThat(target).isNotSameAs(source);
+		assertThat(target.isLimited()).isTrue();
+		assertThat(target.getSkip()).isEqualTo(page.getOffset());
+		assertThat(target.getLimit()).isEqualTo(page.toLimit().max() + 1);
+		assertThat(target.getSortObject()).isEqualTo(source.getSortObject());
+	}
+
+	@ParameterizedTest // GH-4889
+	@MethodSource("unpaged")
+	void unpagedPageableDoesNotModifyQuery(Pageable page) {
+
+		Query source = spy(new BasicQuery(Document.parse("{ 'spring' : 'data' }")));
+
+		Query target = SliceUtils.limitResult(source, page);
+
+		verifyNoInteractions(source);
+
+		assertThat(target).isSameAs(source);
+		assertThat(target.isLimited()).isFalse();
+	}
+
+	public static Stream<Arguments> paged() {
+		return Stream.of(Arguments.of(Pageable.ofSize(1)), Arguments.of(PageRequest.of(0, 10)),
+				Arguments.of(PageRequest.of(0, 10, Direction.ASC, "name")));
+	}
+
+	public static Stream<Arguments> unpaged() {
+		return Stream.of(Arguments.of(Pageable.unpaged()), Arguments.of(Pageable.unpaged(Sort.by("name"))));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AfterTransactionAssertion.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AfterTransactionAssertion.java
index cfd05ea171..b0a9b5608d 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AfterTransactionAssertion.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AfterTransactionAssertion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author 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,20 +15,21 @@
  */
 package org.springframework.data.mongodb.test.util;
 
-import lombok.Data;
-
 import org.springframework.data.domain.Persistable;
 
 /**
  * @author Christoph Strobl
  * @currentRead Shadow's Edge - Brent Weeks
  */
-@Data
 public class AfterTransactionAssertion<T extends Persistable> {
 
 	private final T persistable;
 	private boolean expectToBePresent;
 
+	public AfterTransactionAssertion(T persistable) {
+		this.persistable = persistable;
+	}
+
 	public void isPresent() {
 		expectToBePresent = true;
 	}
@@ -44,4 +45,16 @@ public Object getId() {
 	public boolean shouldBePresent() {
 		return expectToBePresent;
 	}
+
+	public T getPersistable() {
+		return this.persistable;
+	}
+
+	public boolean isExpectToBePresent() {
+		return this.expectToBePresent;
+	}
+
+	public void setExpectToBePresent(boolean expectToBePresent) {
+		this.expectToBePresent = expectToBePresent;
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AssertErrors.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AssertErrors.java
index 66b8dc1a7f..9e6eef1e6e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AssertErrors.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AssertErrors.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Assertions.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Assertions.java
index ea0ebcaa8b..7449a66020 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Assertions.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Assertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ private Assertions() {
 	/**
 	 * Create assertion for {@link Document}.
 	 *
-	 * @param actual the actual value.
+	 * @param document the actual value.
 	 * @return the created assertion object.
 	 */
 	public static DocumentAssert assertThat(Document document) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AtlasContainer.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AtlasContainer.java
new file mode 100644
index 0000000000..c3a97a03bc
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/AtlasContainer.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2024 the original author 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.test.util;
+
+import org.springframework.core.env.StandardEnvironment;
+
+import org.testcontainers.mongodb.MongoDBAtlasLocalContainer;
+import org.testcontainers.utility.DockerImageName;
+
+/**
+ * Extension to MongoDBAtlasLocalContainer.
+ *
+ * @author Christoph Strobl
+ */
+public class AtlasContainer extends MongoDBAtlasLocalContainer {
+
+	private static final DockerImageName DEFAULT_IMAGE_NAME = DockerImageName.parse("mongodb/mongodb-atlas-local");
+	private static final String DEFAULT_TAG = "8.0.0";
+	private static final String LATEST = "latest";
+
+	private AtlasContainer(String dockerImageName) {
+		super(DockerImageName.parse(dockerImageName));
+	}
+
+	private AtlasContainer(DockerImageName dockerImageName) {
+		super(dockerImageName);
+	}
+
+	public static AtlasContainer bestMatch() {
+		return tagged(new StandardEnvironment().getProperty("mongodb.atlas.version", DEFAULT_TAG));
+	}
+
+	public static AtlasContainer latest() {
+		return tagged(LATEST);
+	}
+
+	public static AtlasContainer version8() {
+		return tagged(DEFAULT_TAG);
+	}
+
+	public static AtlasContainer tagged(String tag) {
+		return new AtlasContainer(DEFAULT_IMAGE_NAME.withTag(tag));
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/BasicDbListBuilder.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/BasicDbListBuilder.java
index 4eb5fffca0..b3c2361eea 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/BasicDbListBuilder.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/BasicDbListBuilder.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ClassPathExclusions.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ClassPathExclusions.java
new file mode 100644
index 0000000000..94971e8f59
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ClassPathExclusions.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2024-2025 the original author 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.test.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Annotation used to exclude entries from the classpath.
+ * Simplified version of <a href="https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ClassPathExclusions.java">ClassPathExclusions</a>.
+ *
+ * @author Christoph Strobl
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Documented
+@ExtendWith(ClassPathExclusionsExtension.class)
+public @interface ClassPathExclusions {
+
+	/**
+	 * One or more packages that should be excluded from the classpath.
+	 *
+	 * @return the excluded packages
+	 */
+	String[] packages();
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ClassPathExclusionsExtension.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ClassPathExclusionsExtension.java
new file mode 100644
index 0000000000..db2b4730b2
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ClassPathExclusionsExtension.java
@@ -0,0 +1,129 @@
+/*
+ * Copyright 2024-2025 the original author 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.test.util;
+
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.InvocationInterceptor;
+import org.junit.jupiter.api.extension.ReflectiveInvocationContext;
+import org.junit.platform.engine.discovery.DiscoverySelectors;
+import org.junit.platform.launcher.Launcher;
+import org.junit.platform.launcher.LauncherDiscoveryRequest;
+import org.junit.platform.launcher.TestPlan;
+import org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder;
+import org.junit.platform.launcher.core.LauncherFactory;
+import org.junit.platform.launcher.listeners.SummaryGeneratingListener;
+import org.junit.platform.launcher.listeners.TestExecutionSummary;
+import org.springframework.util.CollectionUtils;
+
+/**
+ * Simplified version of <a href="https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java">ModifiedClassPathExtension</a>.
+ *
+ * @author Christoph Strobl
+ */
+class ClassPathExclusionsExtension implements InvocationInterceptor {
+
+	@Override
+	public void interceptBeforeAllMethod(Invocation<Void> invocation,
+			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+		intercept(invocation, extensionContext);
+	}
+
+	@Override
+	public void interceptBeforeEachMethod(Invocation<Void> invocation,
+			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+		intercept(invocation, extensionContext);
+	}
+
+	@Override
+	public void interceptAfterEachMethod(Invocation<Void> invocation,
+			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+		intercept(invocation, extensionContext);
+	}
+
+	@Override
+	public void interceptAfterAllMethod(Invocation<Void> invocation,
+			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+		intercept(invocation, extensionContext);
+	}
+
+	@Override
+	public void interceptTestMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
+			ExtensionContext extensionContext) throws Throwable {
+		interceptMethod(invocation, invocationContext, extensionContext);
+	}
+
+	@Override
+	public void interceptTestTemplateMethod(Invocation<Void> invocation,
+			ReflectiveInvocationContext<Method> invocationContext, ExtensionContext extensionContext) throws Throwable {
+		interceptMethod(invocation, invocationContext, extensionContext);
+	}
+
+	private void interceptMethod(Invocation<Void> invocation, ReflectiveInvocationContext<Method> invocationContext,
+			ExtensionContext extensionContext) throws Throwable {
+
+		if (isModifiedClassPathClassLoader(extensionContext)) {
+			invocation.proceed();
+			return;
+		}
+
+		Class<?> testClass = extensionContext.getRequiredTestClass();
+		Method testMethod = invocationContext.getExecutable();
+		PackageExcludingClassLoader modifiedClassLoader = PackageExcludingClassLoader.get(testClass, testMethod);
+		if (modifiedClassLoader == null) {
+			invocation.proceed();
+			return;
+		}
+		invocation.skip();
+		ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
+		Thread.currentThread().setContextClassLoader(modifiedClassLoader);
+		try {
+			runTest(extensionContext.getUniqueId());
+		} finally {
+			Thread.currentThread().setContextClassLoader(originalClassLoader);
+		}
+	}
+
+	private void runTest(String testId) throws Throwable {
+
+		LauncherDiscoveryRequest request = LauncherDiscoveryRequestBuilder.request()
+				.selectors(DiscoverySelectors.selectUniqueId(testId)).build();
+		Launcher launcher = LauncherFactory.create();
+		TestPlan testPlan = launcher.discover(request);
+		SummaryGeneratingListener listener = new SummaryGeneratingListener();
+		launcher.registerTestExecutionListeners(listener);
+		launcher.execute(testPlan);
+		TestExecutionSummary summary = listener.getSummary();
+		if (!CollectionUtils.isEmpty(summary.getFailures())) {
+			throw summary.getFailures().get(0).getException();
+		}
+	}
+
+	private void intercept(Invocation<Void> invocation, ExtensionContext extensionContext) throws Throwable {
+		if (isModifiedClassPathClassLoader(extensionContext)) {
+			invocation.proceed();
+			return;
+		}
+		invocation.skip();
+	}
+
+	private boolean isModifiedClassPathClassLoader(ExtensionContext extensionContext) {
+		Class<?> testClass = extensionContext.getRequiredTestClass();
+		ClassLoader classLoader = testClass.getClassLoader();
+		return classLoader.getClass().getName().equals(PackageExcludingClassLoader.class.getName());
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java
index e54e92035f..8f28f0fdf0 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDB.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,19 +23,17 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.bson.Document;
 import org.junit.rules.TestRule;
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
-import com.mongodb.DB;
-import com.mongodb.DBCollection;
 import com.mongodb.client.MongoClient;
-import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 
@@ -51,7 +49,7 @@
  */
 public class CleanMongoDB implements TestRule {
 
-	private static final Logger LOGGER = LoggerFactory.getLogger(CleanMongoDB.class);
+	private static final Log LOGGER = LogFactory.getLog(CleanMongoDB.class);
 
 	/**
 	 * Defines contents of MongoDB.
@@ -101,7 +99,7 @@ public CleanMongoDB(MongoClient client) {
 	}
 
 	/**
-	 * Removes everything by dropping every single {@link DB}.
+	 * Removes everything by dropping every single {@link MongoDatabase}.
 	 *
 	 * @return
 	 */
@@ -113,7 +111,7 @@ public static CleanMongoDB everything() {
 	}
 
 	/**
-	 * Removes everything from the databases with given name by dropping the according {@link DB}.
+	 * Removes everything from the databases with given name by dropping the according {@link MongoDatabase}.
 	 *
 	 * @param dbNames
 	 * @return
@@ -127,7 +125,7 @@ public static CleanMongoDB databases(String... dbNames) {
 	}
 
 	/**
-	 * Drops the {@link DBCollection} with given names from every single {@link DB} containing them.
+	 * Drops the {@link MongoCollection} with given names from every single {@link MongoDatabase} containing them.
 	 *
 	 * @param collectionNames
 	 * @return
@@ -137,7 +135,7 @@ public static CleanMongoDB collections(String... collectionNames) {
 	}
 
 	/**
-	 * Drops the {@link DBCollection} with given names from the named {@link DB}.
+	 * Drops the {@link MongoCollection} with given names from the named {@link MongoDatabase}.
 	 *
 	 * @param dbName
 	 * @param collectionNames
@@ -152,7 +150,7 @@ public static CleanMongoDB collections(String dbName, Collection<String> collect
 	}
 
 	/**
-	 * Drops all index structures from every single {@link DBCollection}.
+	 * Drops all index structures from every single {@link MongoCollection}.
 	 *
 	 * @return
 	 */
@@ -161,7 +159,7 @@ public static CleanMongoDB indexes() {
 	}
 
 	/**
-	 * Drops all index structures from every single {@link DBCollection}.
+	 * Drops all index structures from every single {@link MongoCollection}.
 	 *
 	 * @param collectionNames
 	 * @return
@@ -187,7 +185,7 @@ public CleanMongoDB clean(Struct... types) {
 	}
 
 	/**
-	 * Defines the {@link DB}s to be used. <br />
+	 * Defines the {@link MongoDatabase}s to be used. <br />
 	 * Impact along with {@link CleanMongoDB#clean(Struct...)}:
 	 * <ul>
 	 * <li>{@link Struct#DATABASE}: Forces drop of named databases.</li>
@@ -205,7 +203,7 @@ public CleanMongoDB useDatabases(String... dbNames) {
 	}
 
 	/**
-	 * Excludes the given {@link DB}s from being processed.
+	 * Excludes the given {@link MongoDatabase}s from being processed.
 	 *
 	 * @param dbNames
 	 * @return
@@ -216,7 +214,7 @@ public CleanMongoDB preserveDatabases(String... dbNames) {
 	}
 
 	/**
-	 * Defines the {@link DBCollection}s to be used. <br />
+	 * Defines the {@link MongoCollection}s to be used. <br />
 	 * Impact along with {@link CleanMongoDB#clean(Struct...)}:
 	 * <ul>
 	 * <li>{@link Struct#COLLECTION}: Forces drop of named collections.</li>
@@ -235,7 +233,7 @@ private CleanMongoDB useCollections(Collection<String> collectionNames) {
 	}
 
 	/**
-	 * Defines the {@link DBCollection}s and {@link DB} to be used. <br />
+	 * Defines the {@link MongoCollection}s and {@link MongoDatabase} to be used. <br />
 	 * Impact along with {@link CleanMongoDB#clean(Struct...)}:
 	 * <ul>
 	 * <li>{@link Struct#COLLECTION}: Forces drop of named collections in given db.</li>
@@ -261,10 +259,6 @@ Statement apply() {
 		return apply(null, null);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.junit.rules.TestRule#apply(org.junit.runners.model.Statement, org.junit.runner.Description)
-	 */
 	public Statement apply(Statement base, Description description) {
 		return new MongoCleanStatement(base);
 	}
@@ -291,7 +285,9 @@ private boolean dropDbIfRequired(String dbName) {
 		}
 
 		client.getDatabase(dbName).drop();
-		LOGGER.debug("Dropping DB '{}'. ", dbName);
+		if(LOGGER.isDebugEnabled()) {
+			LOGGER.debug(String.format("Dropping DB '%s'; ", dbName));
+		}
 		return true;
 	}
 
@@ -308,10 +304,15 @@ private void dropCollectionsOrIndexIfRequried(MongoDatabase db, Collection<Strin
 
 					if (types.contains(Struct.COLLECTION)) {
 						collection.drop();
-						LOGGER.debug("Dropping collection '{}' for DB '{}'. ", collectionName, db.getName());
+						if(LOGGER.isDebugEnabled()) {
+							LOGGER.debug(String.format("Dropping collection '%s' for DB '%s'; ", collectionName, db.getName()));
+						}
 					} else if (types.contains(Struct.INDEX)) {
 						collection.dropIndexes();
-						LOGGER.debug("Dropping indexes in collection '{}' for DB '{}'. ", collectionName, db.getName());
+						if(LOGGER.isDebugEnabled()) {
+							LOGGER.debug(
+									String.format("Dropping indexes in collection '%s' for DB '%s'; ", collectionName, db.getName()));
+						}
 					}
 				}
 			}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBJunitRunListener.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBJunitRunListener.java
index edc3ea5d70..ecb18d4e04 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBJunitRunListener.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBJunitRunListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBTests.java
index b209bd05e9..17a045b7a1 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CleanMongoDBTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,26 +22,31 @@
 import java.util.Collections;
 
 import org.bson.Document;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.runner.Description;
-import org.junit.runner.RunWith;
 import org.junit.runners.model.Statement;
 import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.junit.jupiter.MockitoSettings;
+import org.mockito.quality.Strictness;
 import org.springframework.data.mongodb.test.util.CleanMongoDB.Struct;
 
+import com.mongodb.client.ListCollectionNamesIterable;
 import com.mongodb.client.ListDatabasesIterable;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
+import com.mongodb.client.MongoIterable;
 
 /**
  * @author Christoph Strobl
  * @author Mark Paluch
  */
-@RunWith(MockitoJUnitRunner.class)
-public class CleanMongoDBTests {
+@ExtendWith(MockitoExtension.class)
+@MockitoSettings(strictness = Strictness.LENIENT)
+class CleanMongoDBTests {
 
 	private CleanMongoDB cleaner;
 
@@ -57,8 +62,8 @@ public class CleanMongoDBTests {
 	private @Mock MongoCollection<Document> db1collection1mock, db1collection2mock, db2collection1mock;
 
 	@SuppressWarnings({ "serial", "unchecked" })
-	@Before
-	public void setUp() {
+	@BeforeEach
+	void setUp() throws ClassNotFoundException {
 
 		// DB setup
 
@@ -69,13 +74,13 @@ public void setUp() {
 		when(mongoClientMock.getDatabase(eq("db2"))).thenReturn(db2mock);
 
 		// collections have to exist
-		ListDatabasesIterable<String> collectionIterable = mock(ListDatabasesIterable.class);
+		MongoIterable<String> collectionIterable = mock(ListCollectionNamesIterable.class);
 		when(collectionIterable.into(any(Collection.class))).thenReturn(Arrays.asList("db1collection1", "db1collection2"));
-		when(db1mock.listCollectionNames()).thenReturn(collectionIterable);
+		doReturn(collectionIterable).when(db1mock).listCollectionNames();
 
-		ListDatabasesIterable<String> collectionIterable2 = mock(ListDatabasesIterable.class);
+		MongoIterable<String> collectionIterable2 = mock(ListCollectionNamesIterable.class);
 		when(collectionIterable2.into(any(Collection.class))).thenReturn(Collections.singletonList("db2collection1"));
-		when(db2mock.listCollectionNames()).thenReturn(collectionIterable2);
+		doReturn(collectionIterable2).when(db2mock).listCollectionNames();
 
 		// return collections according to names
 		when(db1mock.getCollection(eq("db1collection1"))).thenReturn(db1collection1mock);
@@ -86,7 +91,7 @@ public void setUp() {
 	}
 
 	@Test
-	public void preservesSystemDBsCorrectlyWhenCleaningDatabase() throws Throwable {
+	void preservesSystemDBsCorrectlyWhenCleaningDatabase() throws Throwable {
 
 		cleaner.clean(Struct.DATABASE);
 
@@ -96,7 +101,7 @@ public void preservesSystemDBsCorrectlyWhenCleaningDatabase() throws Throwable {
 	}
 
 	@Test
-	public void preservesNamedDBsCorrectlyWhenCleaningDatabase() throws Throwable {
+	void preservesNamedDBsCorrectlyWhenCleaningDatabase() throws Throwable {
 
 		cleaner.clean(Struct.DATABASE);
 		cleaner.preserveDatabases("db1");
@@ -107,7 +112,7 @@ public void preservesNamedDBsCorrectlyWhenCleaningDatabase() throws Throwable {
 	}
 
 	@Test
-	public void dropsAllDBsCorrectlyWhenCleaingDatabaseAndNotExplictDBNamePresent() throws Throwable {
+	void dropsAllDBsCorrectlyWhenCleaingDatabaseAndNotExplictDBNamePresent() throws Throwable {
 
 		cleaner.clean(Struct.DATABASE);
 
@@ -118,7 +123,7 @@ public void dropsAllDBsCorrectlyWhenCleaingDatabaseAndNotExplictDBNamePresent()
 	}
 
 	@Test
-	public void dropsSpecifiedDBsCorrectlyWhenExplicitNameSet() throws Throwable {
+	void dropsSpecifiedDBsCorrectlyWhenExplicitNameSet() throws Throwable {
 
 		cleaner.clean(Struct.DATABASE);
 		cleaner.useDatabases("db2");
@@ -130,7 +135,7 @@ public void dropsSpecifiedDBsCorrectlyWhenExplicitNameSet() throws Throwable {
 	}
 
 	@Test
-	public void doesNotRemoveAnyDBwhenCleaningCollections() throws Throwable {
+	void doesNotRemoveAnyDBwhenCleaningCollections() throws Throwable {
 
 		cleaner.clean(Struct.COLLECTION);
 
@@ -142,7 +147,7 @@ public void doesNotRemoveAnyDBwhenCleaningCollections() throws Throwable {
 	}
 
 	@Test
-	public void doesNotDropCollectionsFromPreservedDBs() throws Throwable {
+	void doesNotDropCollectionsFromPreservedDBs() throws Throwable {
 
 		cleaner.clean(Struct.COLLECTION);
 		cleaner.preserveDatabases("db1");
@@ -155,7 +160,7 @@ public void doesNotDropCollectionsFromPreservedDBs() throws Throwable {
 	}
 
 	@Test
-	public void removesAllCollectionsFromAllDatabasesWhenNotLimitedToSpecificOnes() throws Throwable {
+	void removesAllCollectionsFromAllDatabasesWhenNotLimitedToSpecificOnes() throws Throwable {
 
 		cleaner.clean(Struct.COLLECTION);
 
@@ -167,7 +172,7 @@ public void removesAllCollectionsFromAllDatabasesWhenNotLimitedToSpecificOnes()
 	}
 
 	@Test
-	public void removesOnlyNamedCollectionsWhenSpecified() throws Throwable {
+	void removesOnlyNamedCollectionsWhenSpecified() throws Throwable {
 
 		cleaner.clean(Struct.COLLECTION);
 		cleaner.useCollections("db1collection2");
@@ -180,7 +185,7 @@ public void removesOnlyNamedCollectionsWhenSpecified() throws Throwable {
 	}
 
 	@Test
-	public void removesIndexesCorrectly() throws Throwable {
+	void removesIndexesCorrectly() throws Throwable {
 
 		cleaner.clean(Struct.INDEX);
 
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Client.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Client.java
new file mode 100644
index 0000000000..064c6edf7b
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Client.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * Marks a field or method as to be autowired by JUnit's dependency injection facilities for injection of a MongoDB
+ * client instance. Depends on {@link MongoClientExtension}.
+ *
+ * @author Christoph Strobl
+ * @see com.mongodb.client.MongoClient
+ * @see com.mongodb.reactivestreams.client.MongoClient
+ * @see ReplSetClient
+ * @see MongoClientExtension
+ */
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@ExtendWith(MongoClientExtension.class)
+public @interface Client {
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CollectionInfo.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CollectionInfo.java
new file mode 100644
index 0000000000..2ae41f734d
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/CollectionInfo.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 2022-2025 the original author 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.test.util;
+
+import java.util.List;
+
+import org.bson.Document;
+import org.springframework.util.ObjectUtils;
+
+import com.mongodb.client.model.Collation;
+
+/**
+ * Value Object providing a methods for accessing collection/view information within a raw {@link Document}.
+ * 
+ * @author Christoph Strobl
+ */
+public class CollectionInfo {
+
+	private final Document source;
+
+	public static CollectionInfo from(Document source) {
+		return new CollectionInfo(source);
+	}
+
+	CollectionInfo(Document source) {
+		this.source = source;
+	}
+
+	/**
+	 * @return the collection/view name.
+	 */
+	public String getName() {
+		return source.getString("name");
+	}
+
+	/**
+	 * @return {@literal true} if the {@literal type} equals {@literal view}.
+	 */
+	public boolean isView() {
+		return ObjectUtils.nullSafeEquals("view", source.get("type"));
+	}
+
+	/**
+	 * @return the {@literal options.viewOn} value.
+	 * @throws IllegalStateException if not {@link #isView() a view}.
+	 */
+	public String getViewTarget() {
+
+		if (isView()) {
+			return getOptionValue("viewOn", String.class);
+		}
+		throw new IllegalStateException(getName() + " is not a view");
+	}
+
+	/**
+	 * @return the {@literal options.pipeline} value.
+	 * @throws IllegalStateException if not {@link #isView() a view}.
+	 */
+	public List<Document> getViewPipeline() {
+
+		if (isView()) {
+			return getOptions().getList("pipeline", Document.class);
+		}
+
+		throw new IllegalStateException(getName() + " is not a view");
+	}
+
+	/**
+	 * @return the {@literal options.collation} value.
+	 * @throws IllegalStateException if not {@link #isView() a view}.
+	 */
+	public Collation getCollation() {
+
+		return org.springframework.data.mongodb.core.query.Collation.from(getOptionValue("collation", Document.class))
+				.toMongoCollation();
+	}
+
+	private Document getOptions() {
+		return source.get("options", Document.class);
+	}
+
+	private <T> T getOptionValue(String key, Class<T> type) {
+		return getOptions().get(key, type);
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DirtiesStateExtension.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DirtiesStateExtension.java
new file mode 100644
index 0000000000..2407208fe0
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DirtiesStateExtension.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2022-2025 the original author 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.test.util;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.reflect.Method;
+
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Extension to consider tests that {@code @DirtiesState} and {@code @ProvidesState} through annotations.
+ *
+ * @author Mark Paluch
+ */
+public class DirtiesStateExtension implements BeforeEachCallback, AfterEachCallback {
+
+	/**
+	 * Test method that changes the data state by saving or deleting objects.
+	 */
+	@Retention(RetentionPolicy.RUNTIME)
+	public @interface DirtiesState {
+
+	}
+
+	/**
+	 * Test method that sets up its state within the test method itself.
+	 */
+	@Retention(RetentionPolicy.RUNTIME)
+	public @interface ProvidesState {
+
+	}
+
+	/**
+	 * Interface to be implemented by tests that make use of {@link DirtiesStateExtension}.
+	 */
+	public interface StateFunctions {
+
+		/**
+		 * Clear the state.
+		 */
+		void clear();
+
+		/**
+		 * Setup the test fixture.
+		 */
+		void setupState();
+	}
+
+	static final String STATE_KEY = "state";
+
+	@Override
+	public void beforeEach(ExtensionContext context) throws Exception {
+
+		Method method = context.getTestMethod().orElse(null);
+		Object instance = context.getTestInstance().orElse(null);
+
+		if (method == null || instance == null) {
+			return;
+		}
+
+		if (method.isAnnotationPresent(ProvidesState.class)) {
+			((StateFunctions) instance).clear();
+			return;
+		}
+
+		ExtensionContext.Store mongo = getStore(context);
+		Boolean state = mongo.get(STATE_KEY, Boolean.class);
+
+		if (state == null) {
+
+			((StateFunctions) instance).clear();
+			((StateFunctions) instance).setupState();
+			mongo.put(STATE_KEY, true);
+		}
+	}
+
+	private ExtensionContext.Store getStore(ExtensionContext context) {
+		return context.getParent().get()
+				.getStore(ExtensionContext.Namespace.create("mongo-" + context.getRequiredTestClass().getName()));
+	}
+
+	@Override
+	public void afterEach(ExtensionContext context) throws Exception {
+
+		Method method = context.getTestMethod().orElse(null);
+
+		if (method == null) {
+			return;
+		}
+
+		if (method.isAnnotationPresent(DirtiesState.class) || method.isAnnotationPresent(ProvidesState.class)) {
+			ExtensionContext.Store mongo = getStore(context);
+			mongo.remove(STATE_KEY);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java
index a695b3305f..d4360b4d95 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/DocumentAssert.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,10 +21,6 @@
 import static org.assertj.core.error.ShouldNotContain.*;
 import static org.assertj.core.error.ShouldNotContainKeys.*;
 
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -67,14 +63,10 @@ public class DocumentAssert extends AbstractMapAssert<DocumentAssert, Map<String
 		this.actual = actual;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#containsEntry(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public DocumentAssert containsEntry(String key, Object value) {
 
-		Assert.hasText(key, "The key to look for must not be empty!");
+		Assert.hasText(key, "The key to look for must not be empty");
 
 		Lookup<?> lookup = lookup(key);
 
@@ -107,14 +99,10 @@ public DocumentAssert isEqualTo(String expectedBson) {
 		return myself;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#doesNotContainEntry(java.lang.Object, java.lang.Object)
-	 */
 	@Override
 	public DocumentAssert doesNotContainEntry(String key, Object value) {
 
-		Assert.hasText(key, "The key to look for must not be empty!");
+		Assert.hasText(key, "The key to look for must not be empty");
 
 		Lookup<?> lookup = lookup(key);
 
@@ -125,21 +113,13 @@ public DocumentAssert doesNotContainEntry(String key, Object value) {
 		return myself;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#containsKey(java.lang.Object)
-	 */
 	@Override
 	public DocumentAssert containsKey(String key) {
 		return containsKeys(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#containsKeys(java.lang.Object[])
-	 */
 	@Override
-	public final DocumentAssert containsKeys(String... keys) {
+	protected DocumentAssert containsKeysForProxy(String[] keys) {
 
 		Set<String> notFound = new LinkedHashSet<>();
 
@@ -157,21 +137,13 @@ public final DocumentAssert containsKeys(String... keys) {
 		return myself;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#doesNotContainKey(java.lang.Object)
-	 */
 	@Override
 	public DocumentAssert doesNotContainKey(String key) {
 		return doesNotContainKeys(key);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#doesNotContainKeys(java.lang.Object[])
-	 */
 	@Override
-	public final DocumentAssert doesNotContainKeys(String... keys) {
+	protected DocumentAssert doesNotContainKeysForProxy(String[] keys) {
 
 		Set<String> found = new LinkedHashSet<>();
 		for (String key : keys) {
@@ -191,13 +163,8 @@ public final DocumentAssert doesNotContainKeys(String... keys) {
 	// used in soft assertions which need to be able to proxy method - @SafeVarargs requiring method to be final prevents
 	// using proxies.
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#contains(java.util.Map.Entry[])
-	 */
-	@SafeVarargs
 	@Override
-	public final DocumentAssert contains(Map.Entry<? extends String, ? extends Object>... entries) {
+	protected DocumentAssert containsForProxy(Entry<? extends String, ?>[] entries) {
 
 		// if both actual and values are empty, then assertion passes.
 		if (actual.isEmpty() && entries.length == 0) {
@@ -216,14 +183,8 @@ public final DocumentAssert contains(Map.Entry<? extends String, ? extends Objec
 		return myself;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#containsAnyOf(java.util.Map.Entry[])
-	 */
-	@SafeVarargs
 	@Override
-	public final DocumentAssert containsAnyOf(Map.Entry<? extends String, ? extends Object>... entries) {
-
+	protected DocumentAssert containsAnyOfForProxy(Entry<? extends String, ?>[] entries) {
 		for (Map.Entry<? extends String, ? extends Object> entry : entries) {
 			if (containsEntry(entry)) {
 				return myself;
@@ -233,24 +194,13 @@ public final DocumentAssert containsAnyOf(Map.Entry<? extends String, ? extends
 		throw Failures.instance().failure(info, ShouldContainAnyOf.shouldContainAnyOf(actual, entries));
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#containsOnly(java.util.Map.Entry[])
-	 */
-	@SafeVarargs
 	@Override
-	public final DocumentAssert containsOnly(Map.Entry<? extends String, ? extends Object>... entries) {
+	protected DocumentAssert containsOnlyForProxy(Entry<? extends String, ?>[] entries) {
 		throw new UnsupportedOperationException();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#doesNotContain(java.util.Map.Entry[])
-	 */
-	@SafeVarargs
 	@Override
-	public final DocumentAssert doesNotContain(Map.Entry<? extends String, ? extends Object>... entries) {
-
+	protected DocumentAssert doesNotContainForProxy(Entry<? extends String, ?>[] entries) {
 		Set<Map.Entry<? extends String, ? extends Object>> found = new LinkedHashSet<>();
 
 		for (Map.Entry<? extends String, ? extends Object> entry : entries) {
@@ -265,13 +215,8 @@ public final DocumentAssert doesNotContain(Map.Entry<? extends String, ? extends
 		return myself;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#containsExactly(java.util.Map.Entry[])
-	 */
-	@SafeVarargs
 	@Override
-	public final DocumentAssert containsExactly(Map.Entry<? extends String, ? extends Object>... entries) {
+	protected DocumentAssert containsExactlyForProxy(Entry<? extends String, ?>[] entries) {
 		throw new UnsupportedOperationException();
 	}
 
@@ -352,10 +297,6 @@ else if (current instanceof Map) {
 		return Lookup.notFound();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#hasEntrySatisfying(java.lang.Object, org.assertj.core.api.Condition)
-	 */
 	@Override
 	public DocumentAssert hasEntrySatisfying(String key, Condition<? super Object> valueCondition) {
 
@@ -368,10 +309,6 @@ public DocumentAssert hasEntrySatisfying(String key, Condition<? super Object> v
 		return myself;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.assertj.core.api.AbstractMapAssert#hasEntrySatisfying(java.lang.Object, java.util.function.Consumer)
-	 */
 	@Override
 	public DocumentAssert hasEntrySatisfying(String key, Consumer<? super Object> valueRequirements) {
 
@@ -382,13 +319,16 @@ public DocumentAssert hasEntrySatisfying(String key, Consumer<? super Object> va
 		return myself;
 	}
 
-	@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-	@Getter
 	static class Lookup<T> {
 
 		private final T value;
 		private final boolean pathFound;
 
+		private Lookup(T value, boolean pathFound) {
+			this.value = value;
+			this.pathFound = pathFound;
+		}
+
 		/**
 		 * Factory method to construct a lookup with a hit.
 		 *
@@ -407,5 +347,13 @@ static <T> Lookup<T> found(T value) {
 		static <T> Lookup<T> notFound() {
 			return new Lookup<>(null, false);
 		}
+
+		public T getValue() {
+			return this.value;
+		}
+
+		public boolean isPathFound() {
+			return this.pathFound;
+		}
 	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfMongoServerVersion.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfMongoServerVersion.java
index 8e0d172702..fa56d2c2a1 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfMongoServerVersion.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfMongoServerVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,15 +22,21 @@
 import java.lang.annotation.Target;
 
 import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
+ * {@code @EnableIfMongoServerVersion} is used to signal that the annotated test class or test method is only
+ * <em>enabled</em> if the value of the specified version boundaries {@link #isGreaterThanEqual()} and
+ * {@link #isLessThan()} match the connected MongoDB server version.
+ *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Documented
 @Tag("version-specific")
+@ExtendWith(MongoServerCondition.class)
 public @interface EnableIfMongoServerVersion {
 
 	/**
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfReplicaSetAvailable.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfReplicaSetAvailable.java
index 0df6c532c0..bc22e53569 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfReplicaSetAvailable.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfReplicaSetAvailable.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,18 +22,20 @@
 import java.lang.annotation.Target;
 
 import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
- * {@link EnableIfReplicaSetAvailable} marks a specific test class or method to be only executed against a server running in
- * replicaSet mode. Intended to be used along with {@link MongoServerCondition}.
+ * {@link EnableIfReplicaSetAvailable} marks a specific test class or method to be only executed against a server
+ * running in replicaSet mode. Intended to be used along with {@link MongoServerCondition}.
  *
  * @author Christoph Strobl
- * @since 2.3
+ * @since 3.0
  */
 @Target({ ElementType.TYPE, ElementType.METHOD })
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Tag("replSet")
+@ExtendWith(MongoServerCondition.class)
 public @interface EnableIfReplicaSetAvailable {
 
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfVectorSearchAvailable.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfVectorSearchAvailable.java
new file mode 100644
index 0000000000..da008d9ee4
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/EnableIfVectorSearchAvailable.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 the original author 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.test.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.Tag;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+/**
+ * @author Christoph Strobl
+ */
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Tag("vector-search")
+@ExtendWith(MongoServerCondition.class)
+public @interface EnableIfVectorSearchAvailable {
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ExcludeReactiveClientFromClassPath.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ExcludeReactiveClientFromClassPath.java
new file mode 100644
index 0000000000..894f2ec882
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ExcludeReactiveClientFromClassPath.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024-2025 the original author 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.test.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Christoph Strobl
+ * @see ClassPathExclusions
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Documented
+@ClassPathExclusions(packages = { "com.mongodb.reactivestreams.client" })
+public @interface ExcludeReactiveClientFromClassPath {
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ExcludeSyncClientFromClassPath.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ExcludeSyncClientFromClassPath.java
new file mode 100644
index 0000000000..eba7d228ef
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ExcludeSyncClientFromClassPath.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024-2025 the original author 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.test.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Christoph Strobl
+ * @see ClassPathExclusions
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE, ElementType.METHOD })
+@Documented
+@ClassPathExclusions(packages = { "com.mongodb.client" })
+public @interface ExcludeSyncClientFromClassPath {
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MappingContextConfigurer.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MappingContextConfigurer.java
new file mode 100644
index 0000000000..eda1e501a0
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MappingContextConfigurer.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2021-2025 the original author 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.test.util;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jspecify.annotations.Nullable;
+
+/**
+ * Utility to configure {@link org.springframework.data.mongodb.core.mapping.MongoMappingContext} properties.
+ *
+ * @author Christoph Strobl
+ */
+public class MappingContextConfigurer {
+
+	private @Nullable Set<Class<?>> intitalEntitySet;
+	boolean autocreateIndex = false;
+
+	public void autocreateIndex(boolean autocreateIndex) {
+		this.autocreateIndex = autocreateIndex;
+	}
+
+	public void initialEntitySet(Set<Class<?>> initialEntitySet) {
+		this.intitalEntitySet = initialEntitySet;
+	}
+
+	public void initialEntitySet(Class<?>... initialEntitySet) {
+		this.intitalEntitySet = Set.of(initialEntitySet);
+	}
+
+	Set<Class<?>> initialEntitySet() {
+		return intitalEntitySet != null ? intitalEntitySet : Collections.emptySet();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientClosingTestConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientClosingTestConfiguration.java
new file mode 100644
index 0000000000..c5c23162d1
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientClosingTestConfiguration.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2021-2025 the original author 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.test.util;
+
+import javax.annotation.PreDestroy;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.config.AbstractMongoClientConfiguration;
+import org.springframework.test.util.ReflectionTestUtils;
+
+/**
+ * @author Christoph Strobl
+ */
+public abstract class MongoClientClosingTestConfiguration extends AbstractMongoClientConfiguration {
+
+	@Autowired(required = false) MongoDatabaseFactory dbFactory;
+
+	@PreDestroy
+	public void destroy() {
+
+		if (dbFactory != null) {
+			Object mongo = ReflectionTestUtils.getField(dbFactory, "mongoClient");
+			if (mongo != null) {
+				ReflectionTestUtils.invokeMethod(mongo, "close");
+			}
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientExtension.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientExtension.java
new file mode 100644
index 0000000000..357a87168e
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoClientExtension.java
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import static org.junit.platform.commons.util.AnnotationUtils.*;
+import static org.junit.platform.commons.util.ReflectionUtils.*;
+
+import java.lang.reflect.Field;
+import java.util.function.Predicate;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.junit.jupiter.api.extension.AfterAllCallback;
+import org.junit.jupiter.api.extension.BeforeAllCallback;
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.ParameterResolver;
+import org.junit.platform.commons.util.ExceptionUtils;
+import org.junit.platform.commons.util.ReflectionUtils;
+
+import org.springframework.util.ClassUtils;
+
+import com.mongodb.client.MongoClient;
+
+/**
+ * JUnit {@link Extension} providing parameter resolution for synchronous and reactive MongoDB client instances.
+ *
+ * @author Christoph Strobl
+ * @see Client
+ * @see ReplSetClient
+ */
+public class MongoClientExtension implements Extension, BeforeAllCallback, AfterAllCallback, ParameterResolver {
+
+	private static final Log LOGGER = LogFactory.getLog(MongoClientExtension.class);
+
+	private static final Namespace NAMESPACE = MongoExtensions.Client.NAMESPACE;
+
+	private static final String SYNC_KEY = MongoExtensions.Client.SYNC_KEY;
+	private static final String REACTIVE_KEY = MongoExtensions.Client.REACTIVE_KEY;
+	private static final String SYNC_REPLSET_KEY = MongoExtensions.Client.SYNC_REPLSET_KEY;
+	private static final String REACTIVE_REPLSET_KEY = MongoExtensions.Client.REACTIVE_REPLSET_KEY;
+
+	@Override
+	public void afterAll(ExtensionContext extensionContext) throws Exception {
+
+	}
+
+	@Override
+	public void beforeAll(ExtensionContext context) throws Exception {
+		injectFields(context, null, ReflectionUtils::isStatic);
+	}
+
+	private void injectFields(ExtensionContext context, Object testInstance, Predicate<Field> predicate) {
+
+		findAnnotatedFields(context.getRequiredTestClass(), Client.class, predicate).forEach(field -> {
+			assertValidFieldCandidate(field);
+			try {
+				makeAccessible(field).set(testInstance, getMongoClient(field.getType(), context, false));
+			} catch (Throwable t) {
+				ExceptionUtils.throwAsUncheckedException(t);
+			}
+		});
+
+		findAnnotatedFields(context.getRequiredTestClass(), ReplSetClient.class, predicate).forEach(field -> {
+			assertValidFieldCandidate(field);
+			try {
+				makeAccessible(field).set(testInstance, getMongoClient(field.getType(), context, true));
+			} catch (Throwable t) {
+				ExceptionUtils.throwAsUncheckedException(t);
+			}
+		});
+	}
+
+	protected Object getMongoClient(Class<?> type, ExtensionContext extensionContext, boolean replSet) {
+
+		Store store = extensionContext.getStore(NAMESPACE);
+
+		if (ClassUtils.isAssignable(com.mongodb.client.MongoClient.class, type)) {
+
+			LOGGER.debug("Obtaining sync client from store.");
+			return store.getOrComputeIfAbsent(replSet ? SYNC_REPLSET_KEY : SYNC_KEY, it -> syncClient(replSet),
+					SyncClientHolder.class).client;
+		}
+
+		if (ClassUtils.isAssignable(com.mongodb.reactivestreams.client.MongoClient.class, type)) {
+
+			LOGGER.debug("Obtaining reactive client from store.");
+			return store.getOrComputeIfAbsent(replSet ? REACTIVE_REPLSET_KEY : REACTIVE_KEY, key -> reactiveClient(replSet),
+					ReactiveClientHolder.class).client;
+		}
+
+		throw new IllegalStateException("Damn - something went wrong.");
+	}
+
+	private ReactiveClientHolder reactiveClient(boolean replSet) {
+
+		LOGGER.debug(String.format("Creating new reactive %sclient.", replSet ? "replica set " : ""));
+		return new ReactiveClientHolder(replSet ? MongoTestUtils.reactiveReplSetClient() : MongoTestUtils.reactiveClient());
+	}
+
+	private SyncClientHolder syncClient(boolean replSet) {
+
+		LOGGER.debug(String.format("Creating new sync %sclient.", replSet ? "replica set " : ""));
+		return new SyncClientHolder(replSet ? MongoTestUtils.replSetClient() : MongoTestUtils.client());
+	}
+
+	boolean holdsReplSetClient(ExtensionContext context) {
+
+		Store store = context.getStore(NAMESPACE);
+		return store.get(SYNC_REPLSET_KEY) != null || store.get(REACTIVE_REPLSET_KEY) != null;
+	}
+
+	private void assertValidFieldCandidate(Field field) {
+
+		assertSupportedType("field", field.getType());
+	}
+
+	private void assertSupportedType(String target, Class<?> type) {
+
+		if (type != com.mongodb.client.MongoClient.class && type != com.mongodb.reactivestreams.client.MongoClient.class) {
+			throw new ExtensionConfigurationException(String.format(
+					"Can only resolve @MongoClient %s of type %s or %s but was: %s", target, MongoClient.class.getName(),
+					com.mongodb.reactivestreams.client.MongoClient.class.getName(), type.getName()));
+		}
+	}
+
+	@Override
+	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+			throws ParameterResolutionException {
+		return parameterContext.isAnnotated(Client.class) || parameterContext.isAnnotated(ReplSetClient.class);
+	}
+
+	@Override
+	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+			throws ParameterResolutionException {
+
+		Class<?> parameterType = parameterContext.getParameter().getType();
+		boolean replSet = parameterContext.getParameter().getAnnotation(ReplSetClient.class) != null;
+		return getMongoClient(parameterType, extensionContext, replSet);
+	}
+
+	static class SyncClientHolder implements Store.CloseableResource {
+
+		final MongoClient client;
+
+		SyncClientHolder(MongoClient client) {
+			this.client = client;
+		}
+
+		@Override
+		public void close() {
+			try {
+				client.close();
+			} catch (RuntimeException e) {
+				// so what?
+			}
+		}
+	}
+
+	static class ReactiveClientHolder implements Store.CloseableResource {
+
+		final com.mongodb.reactivestreams.client.MongoClient client;
+
+		ReactiveClientHolder(com.mongodb.reactivestreams.client.MongoClient client) {
+			this.client = client;
+		}
+
+		@Override
+		public void close() {
+
+			try {
+				client.close();
+			} catch (RuntimeException e) {
+				// so what?
+			}
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoConverterConfigurer.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoConverterConfigurer.java
new file mode 100644
index 0000000000..44b7ae3e45
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoConverterConfigurer.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021-2025 the original author 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.test.util;
+
+import java.util.Arrays;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+
+/**
+ * Utility to configure {@link MongoCustomConversions}.
+ *
+ * @author Christoph Strobl
+ */
+public class MongoConverterConfigurer {
+
+	CustomConversions customConversions;
+
+	public void customConversions(CustomConversions customConversions) {
+		this.customConversions = customConversions;
+	}
+
+	public void customConverters(Converter<?, ?>... converters) {
+		customConversions(new MongoCustomConversions(Arrays.asList(converters)));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoExtensions.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoExtensions.java
new file mode 100644
index 0000000000..c90f7e999b
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoExtensions.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import org.junit.jupiter.api.extension.ExtensionContext.Namespace;
+
+/**
+ * @author Christoph Strobl
+ */
+class MongoExtensions {
+
+	static class Client {
+
+		static final Namespace NAMESPACE = Namespace.create(MongoClientExtension.class);
+		static final String SYNC_KEY = "mongo.client.sync";
+		static final String REACTIVE_KEY = "mongo.client.reactive";
+		static final String SYNC_REPLSET_KEY = "mongo.client.replset.sync";
+		static final String REACTIVE_REPLSET_KEY = "mongo.client.replset.reactive";
+	}
+
+	static class Termplate {
+
+		static final Namespace NAMESPACE = Namespace.create(MongoTemplateExtension.class);
+		static final String SYNC = "mongo.template.sync";
+		static final String REACTIVE = "mongo.template.reactive";
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoServerCondition.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoServerCondition.java
index af83b4d321..d811e0a1ef 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoServerCondition.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoServerCondition.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,6 +42,12 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 			}
 		}
 
+		if(context.getTags().contains("vector-search")) {
+			if(!atlasEnvironment(context)) {
+				return ConditionEvaluationResult.disabled("Disabled for servers not supporting Vector Search.");
+			}
+		}
+
 		if (context.getTags().contains("version-specific") && context.getElement().isPresent()) {
 
 			EnableIfMongoServerVersion version = AnnotatedElementUtils.findMergedAnnotation(context.getElement().get(),
@@ -55,7 +61,7 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 				if (!expectedMinVersion.equals(ANY) && !expectedMinVersion.equals(DEFAULT_LOW)) {
 					if (serverVersion.isLessThan(expectedMinVersion)) {
 						return ConditionEvaluationResult.disabled(String
-								.format("Disabled for server version %s. Requires at least %s.", serverVersion, expectedMinVersion));
+								.format("Disabled for server version %s; Requires at least %s.", serverVersion, expectedMinVersion));
 					}
 				}
 
@@ -63,7 +69,7 @@ public ConditionEvaluationResult evaluateExecutionCondition(ExtensionContext con
 				if (!expectedMaxVersion.equals(ANY) && !expectedMaxVersion.equals(DEFAULT_HIGH)) {
 					if (serverVersion.isGreaterThanOrEqualTo(expectedMaxVersion)) {
 						return ConditionEvaluationResult.disabled(String
-								.format("Disabled for server version %s. Only supported until %s.", serverVersion, expectedMaxVersion));
+								.format("Disabled for server version %s; Only supported until %s.", serverVersion, expectedMaxVersion));
 					}
 				}
 			}
@@ -83,4 +89,9 @@ private Version serverVersion(ExtensionContext context) {
 		return context.getStore(NAMESPACE).getOrComputeIfAbsent(Version.class, (key) -> MongoTestUtils.serverVersion(),
 				Version.class);
 	}
+
+	private boolean atlasEnvironment(ExtensionContext context) {
+		return context.getStore(NAMESPACE).getOrComputeIfAbsent(Version.class, (key) -> MongoTestUtils.isVectorSearchEnabled(),
+			Boolean.class);
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTemplateExtension.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTemplateExtension.java
new file mode 100644
index 0000000000..301d1ef499
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTemplateExtension.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import java.lang.reflect.Field;
+import java.util.List;
+import java.util.function.Predicate;
+
+import org.junit.jupiter.api.extension.Extension;
+import org.junit.jupiter.api.extension.ExtensionConfigurationException;
+import org.junit.jupiter.api.extension.ExtensionContext;
+import org.junit.jupiter.api.extension.ExtensionContext.Store;
+import org.junit.jupiter.api.extension.ParameterContext;
+import org.junit.jupiter.api.extension.ParameterResolutionException;
+import org.junit.jupiter.api.extension.TestInstancePostProcessor;
+import org.junit.platform.commons.util.AnnotationUtils;
+import org.junit.platform.commons.util.ExceptionUtils;
+import org.junit.platform.commons.util.ReflectionUtils;
+import org.junit.platform.commons.util.StringUtils;
+
+import org.springframework.data.mongodb.core.MongoOperations;
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.data.mongodb.test.util.MongoExtensions.Termplate;
+import org.springframework.data.util.ParsingUtils;
+import org.springframework.util.ClassUtils;
+
+/**
+ * JUnit {@link Extension} providing parameter resolution for synchronous and reactive MongoDB Template API objects.
+ *
+ * @author Christoph Strobl
+ * @see Template
+ * @see MongoTestTemplate
+ * @see ReactiveMongoTestTemplate
+ */
+public class MongoTemplateExtension extends MongoClientExtension implements TestInstancePostProcessor {
+
+	private static final String DEFAULT_DATABASE = "database";
+
+	@Override
+	public void beforeAll(ExtensionContext context) throws Exception {
+
+		super.beforeAll(context);
+
+		injectFields(context, null, ReflectionUtils::isStatic);
+	}
+
+	@Override
+	public void postProcessTestInstance(Object testInstance, ExtensionContext context) throws Exception {
+		injectFields(context, testInstance, it -> true);
+	}
+
+	@Override
+	public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+			throws ParameterResolutionException {
+		return super.supportsParameter(parameterContext, extensionContext) || parameterContext.isAnnotated(Template.class);
+	}
+
+	@Override
+	public Object resolveParameter(ParameterContext parameterContext, ExtensionContext extensionContext)
+			throws ParameterResolutionException {
+
+		if (parameterContext.getParameter().getAnnotation(Template.class) == null) {
+			return super.resolveParameter(parameterContext, extensionContext);
+		}
+
+		Class<?> parameterType = parameterContext.getParameter().getType();
+		return getMongoTemplate(parameterType, parameterContext.getParameter().getAnnotation(Template.class),
+				extensionContext);
+	}
+
+	private void injectFields(ExtensionContext context, Object testInstance, Predicate<Field> predicate) {
+
+		AnnotationUtils.findAnnotatedFields(context.getRequiredTestClass(), Template.class, predicate).forEach(field -> {
+
+			assertValidFieldCandidate(field);
+
+			try {
+
+				ReflectionUtils.makeAccessible(field).set(testInstance,
+						getMongoTemplate(field.getType(), field.getAnnotation(Template.class), context));
+			} catch (Throwable t) {
+				ExceptionUtils.throwAsUncheckedException(t);
+			}
+		});
+	}
+
+	private void assertValidFieldCandidate(Field field) {
+
+		assertSupportedType("field", field.getType());
+	}
+
+	private void assertSupportedType(String target, Class<?> type) {
+
+		if (!ClassUtils.isAssignable(MongoOperations.class, type)
+				&& !ClassUtils.isAssignable(ReactiveMongoOperations.class, type)) {
+			throw new ExtensionConfigurationException(
+					String.format("Can only resolve @%s %s of type %s or %s but was: %s", Template.class.getSimpleName(), target,
+							MongoOperations.class.getName(), ReactiveMongoOperations.class.getName(), type.getName()));
+		}
+	}
+
+	private Object getMongoTemplate(Class<?> type, Template options, ExtensionContext extensionContext) {
+
+		Store templateStore = extensionContext.getStore(MongoExtensions.Termplate.NAMESPACE);
+
+		boolean replSetClient = holdsReplSetClient(extensionContext) || options.replicaSet();
+
+		String dbName = StringUtils.isNotBlank(options.database()) ? options.database()
+				: extensionContext.getTestClass().map(it -> {
+					List<String> target = ParsingUtils.splitCamelCaseToLower(it.getSimpleName());
+					return org.springframework.util.StringUtils.collectionToDelimitedString(target, "-");
+				}).orElse(DEFAULT_DATABASE);
+
+		if (ClassUtils.isAssignable(MongoOperations.class, type)) {
+
+			String key = Termplate.SYNC + "-" + dbName;
+			return templateStore.getOrComputeIfAbsent(key, it -> {
+
+				com.mongodb.client.MongoClient client = (com.mongodb.client.MongoClient) getMongoClient(
+						com.mongodb.client.MongoClient.class, extensionContext, replSetClient);
+				return new MongoTestTemplate(client, dbName, options.initialEntitySet());
+			});
+		}
+
+		if (ClassUtils.isAssignable(ReactiveMongoOperations.class, type)) {
+
+			String key = Termplate.REACTIVE + "-" + dbName;
+			return templateStore.getOrComputeIfAbsent(key, it -> {
+
+				com.mongodb.reactivestreams.client.MongoClient client = (com.mongodb.reactivestreams.client.MongoClient) getMongoClient(
+						com.mongodb.reactivestreams.client.MongoClient.class, extensionContext, replSetClient);
+				return new ReactiveMongoTestTemplate(client, dbName, options.initialEntitySet());
+			});
+		}
+
+		throw new IllegalStateException("Damn - something went wrong.");
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestMappingContext.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestMappingContext.java
new file mode 100644
index 0000000000..b65d6278fe
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestMappingContext.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2021-2025 the original author 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.test.util;
+
+import java.util.Collections;
+import java.util.Optional;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.springframework.data.mongodb.core.convert.MongoCustomConversions;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity;
+import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty;
+import org.springframework.data.util.MethodInvocationRecorder;
+
+/**
+ * @author Christoph Strobl
+ */
+public class MongoTestMappingContext extends MongoMappingContext {
+
+	private MappingContextConfigurer contextConfigurer;
+	private MongoConverterConfigurer converterConfigurer;
+
+	public static MongoTestMappingContext newTestContext() {
+		return new MongoTestMappingContext(conig -> {}).init();
+	}
+
+	public MongoTestMappingContext(MappingContextConfigurer contextConfig) {
+
+		this.contextConfigurer = contextConfig;
+		this.converterConfigurer = new MongoConverterConfigurer();
+	}
+
+	public MongoTestMappingContext(Consumer<MappingContextConfigurer> contextConfig) {
+
+		this(new MappingContextConfigurer());
+		contextConfig.accept(contextConfigurer);
+	}
+
+	public <T> MongoPersistentProperty getPersistentPropertyFor(Class<T> type, Function<T, ?> property) {
+
+		MongoPersistentEntity<?> persistentEntity = getRequiredPersistentEntity(type);
+		return persistentEntity.getPersistentProperty(MethodInvocationRecorder.forProxyOf(type).record(property).getPropertyPath().get());
+	}
+
+	public MongoTestMappingContext customConversions(MongoConverterConfigurer converterConfig) {
+
+		this.converterConfigurer = converterConfig;
+		return this;
+	}
+
+	public MongoTestMappingContext customConversions(Consumer<MongoConverterConfigurer> converterConfig) {
+
+		converterConfig.accept(converterConfigurer);
+		return this;
+	}
+
+	public MongoTestMappingContext init() {
+
+		setInitialEntitySet(contextConfigurer.initialEntitySet());
+		setAutoIndexCreation(contextConfigurer.autocreateIndex);
+		if (converterConfigurer.customConversions != null) {
+			setSimpleTypeHolder(converterConfigurer.customConversions.getSimpleTypeHolder());
+		} else {
+			setSimpleTypeHolder(new MongoCustomConversions(Collections.emptyList()).getSimpleTypeHolder());
+		}
+
+		super.afterPropertiesSet();
+		return this;
+	}
+
+	@Override
+	public void afterPropertiesSet() {
+		init();
+	}
+
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestTemplate.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestTemplate.java
new file mode 100644
index 0000000000..771c17c4a9
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestTemplate.java
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
+
+import com.mongodb.client.MongoClients;
+import org.bson.Document;
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.mapping.callback.EntityCallbacks;
+import org.springframework.data.mapping.context.PersistentEntities;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.testcontainers.shaded.org.awaitility.Awaitility;
+
+import com.mongodb.MongoWriteException;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoCollection;
+
+/**
+ * A {@link MongoTemplate} with configuration hooks and extension suitable for tests.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public class MongoTestTemplate extends MongoTemplate {
+
+	private final MongoTestTemplateConfiguration cfg;
+
+	public MongoTestTemplate() {
+		this("test");
+	}
+
+	public MongoTestTemplate(String databaseName) {
+		this(MongoClients.create(), databaseName);
+	}
+
+	public MongoTestTemplate(MongoClient client, String database, Class<?>... initialEntities) {
+		this(cfg -> {
+			cfg.configureDatabaseFactory(it -> {
+
+				it.client(client);
+				it.defaultDb(database);
+			});
+
+			cfg.configureMappingContext(it -> {
+
+				it.autocreateIndex(false);
+				it.initialEntitySet(initialEntities);
+			});
+		});
+	}
+
+	public MongoTestTemplate(Consumer<MongoTestTemplateConfiguration> cfg) {
+
+		this(() -> {
+
+			MongoTestTemplateConfiguration config = new MongoTestTemplateConfiguration();
+			cfg.accept(config);
+			return config;
+		});
+	}
+
+	public MongoTestTemplate(Supplier<MongoTestTemplateConfiguration> config) {
+		this(config.get());
+	}
+
+	public MongoTestTemplate(MongoTestTemplateConfiguration config) {
+		super(config.databaseFactory(), config.mongoConverter());
+
+		ApplicationContext applicationContext = config.getApplicationContext();
+		EntityCallbacks callbacks = config.getEntityCallbacks();
+		if (callbacks != null) {
+			setEntityCallbacks(callbacks);
+		}
+		if (applicationContext != null) {
+			setApplicationContext(applicationContext);
+		}
+
+		this.cfg = config;
+	}
+
+	public void flush() {
+		flush(PersistentEntities.of(getConverter().getMappingContext()).stream().map(it -> getCollectionName(it.getType()))
+				.collect(Collectors.toList()));
+	}
+
+	public void flushDatabase() {
+		flush(getDb().listCollectionNames());
+	}
+
+	public void flush(Iterable<String> collections) {
+
+		for (String collection : collections) {
+			MongoCollection<Document> mongoCollection = getCollection(collection);
+			try {
+				mongoCollection.deleteMany(new Document());
+			} catch (MongoWriteException e) {
+				mongoCollection.drop();
+			}
+		}
+	}
+
+	public void flush(Class<?>... entities) {
+		flush(Arrays.stream(entities).map(this::getCollectionName).collect(Collectors.toList()));
+	}
+
+	public void flush(String... collections) {
+		flush(Arrays.asList(collections));
+	}
+
+	public void flush(Object... objects) {
+
+		flush(Arrays.stream(objects).map(it -> {
+
+			if (it instanceof String) {
+				return (String) it;
+			}
+			if (it instanceof Class) {
+				return getCollectionName((Class<?>) it);
+			}
+			return it.toString();
+		}).collect(Collectors.toList()));
+	}
+
+	public void dropDatabase() {
+		getDb().drop();
+	}
+
+	public void dropIndexes(String... collections) {
+		for (String collection : collections) {
+			getCollection(collection).dropIndexes();
+		}
+	}
+
+	public void dropIndexes(Class<?>... entities) {
+		for (Class<?> entity : entities) {
+			getCollection(getCollectionName(entity)).dropIndexes();
+		}
+	}
+
+	public void doInCollection(Class<?> entityClass, Consumer<MongoCollection<Document>> callback) {
+		execute(entityClass, (collection -> {
+			callback.accept(collection);
+			return null;
+		}));
+	}
+
+	public void awaitIndexCreation(Class<?> type, String indexName) {
+		awaitIndexCreation(getCollectionName(type), indexName, Duration.ofSeconds(10));
+	}
+
+	public void awaitIndexCreation(String collectionName, String indexName, Duration timeout) {
+
+		Awaitility.await().atMost(timeout).pollInterval(Duration.ofMillis(200)).until(() -> {
+
+			List<Document> execute = this.execute(collectionName,
+					coll -> coll
+							.aggregate(List.of(Document.parse("{'$listSearchIndexes': { 'name' : '%s'}}".formatted(indexName))))
+							.into(new ArrayList<>()));
+			for (Document doc : execute) {
+				if (doc.getString("name").equals(indexName)) {
+					return doc.getString("status").equals("READY");
+				}
+			}
+			return false;
+		});
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestTemplateConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestTemplateConfiguration.java
new file mode 100644
index 0000000000..8300690ccd
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestTemplateConfiguration.java
@@ -0,0 +1,269 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import org.jspecify.annotations.Nullable;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.data.auditing.IsNewAwareAuditingHandler;
+import org.springframework.data.mapping.callback.EntityCallbacks;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mongodb.MongoDatabaseFactory;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory;
+import org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.convert.DefaultDbRefResolver;
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver;
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
+import org.springframework.data.mongodb.core.mapping.event.AuditingEntityCallback;
+import org.springframework.data.mongodb.core.mapping.event.MongoMappingEvent;
+
+/**
+ * @author Christoph Strobl
+ * @since 3.0
+ */
+public class MongoTestTemplateConfiguration {
+
+	private final DatabaseFactoryConfigurer dbFactoryConfig = new DatabaseFactoryConfigurer();
+	private final MappingContextConfigurer mappingContextConfigurer = new MappingContextConfigurer();
+	private final MongoConverterConfigurer mongoConverterConfigurer = new MongoConverterConfigurer();
+	private final AuditingConfigurer auditingConfigurer = new AuditingConfigurer();
+	private final ApplicationContextConfigurer applicationContextConfigurer = new ApplicationContextConfigurer();
+
+	private MongoMappingContext mappingContext;
+	private MappingMongoConverter converter;
+	private ApplicationContext context;
+
+	private com.mongodb.client.MongoClient syncClient;
+	private com.mongodb.reactivestreams.client.MongoClient reactiveClient;
+	private MongoDatabaseFactory syncFactory;
+	private SimpleReactiveMongoDatabaseFactory reactiveFactory;
+
+	MongoConverter mongoConverter() {
+
+		if (converter == null) {
+
+			if (dbFactoryConfig.syncClient != null || syncClient != null) {
+				converter = new MappingMongoConverter(new DefaultDbRefResolver(databaseFactory()), mappingContext());
+			} else {
+				converter = new MappingMongoConverter(NoOpDbRefResolver.INSTANCE, mappingContext());
+			}
+
+			if (mongoConverterConfigurer.customConversions != null) {
+				converter.setCustomConversions(mongoConverterConfigurer.customConversions);
+			}
+			if (auditingConfigurer.hasAuditingHandler()) {
+				converter.setEntityCallbacks(getEntityCallbacks());
+			}
+			converter.afterPropertiesSet();
+		}
+
+		return converter;
+	}
+
+	EntityCallbacks getEntityCallbacks() {
+
+		EntityCallbacks callbacks = null;
+		if (getApplicationContext() != null) {
+			callbacks = EntityCallbacks.create(getApplicationContext());
+		}
+		if (!auditingConfigurer.hasAuditingHandler()) {
+			return callbacks;
+		}
+		if (callbacks == null) {
+			callbacks = EntityCallbacks.create();
+		}
+
+		callbacks.addEntityCallback(new AuditingEntityCallback(new ObjectFactory<IsNewAwareAuditingHandler>() {
+			@Override
+			public IsNewAwareAuditingHandler getObject() throws BeansException {
+				return auditingConfigurer.auditingHandlerFunction.apply(converter.getMappingContext());
+			}
+		}));
+		return callbacks;
+
+	}
+
+	List<ApplicationListener<?>> getApplicationEventListener() {
+		return new ArrayList<>(applicationContextConfigurer.listeners);
+	}
+
+	@Nullable
+	ApplicationContext getApplicationContext() {
+
+		if (applicationContextConfigurer.applicationContext == null) {
+			return null;
+		}
+
+		if (context != null) {
+			return context;
+		}
+
+		context = applicationContextConfigurer.applicationContext;
+
+		if (context instanceof ConfigurableApplicationContext) {
+
+			ConfigurableApplicationContext configurableApplicationContext = (ConfigurableApplicationContext) this.context;
+			getApplicationEventListener().forEach(configurableApplicationContext::addApplicationListener);
+
+			configurableApplicationContext.refresh();
+		}
+		return context;
+	}
+
+	MongoMappingContext mappingContext() {
+
+		if (mappingContext == null) {
+			mappingContext = new MongoTestMappingContext(mappingContextConfigurer).customConversions(mongoConverterConfigurer)
+					.init();
+		}
+
+		return mappingContext;
+	}
+
+	MongoDatabaseFactory databaseFactory() {
+
+		if (syncFactory == null) {
+			syncFactory = new SimpleMongoClientDatabaseFactory(syncClient(), defaultDatabase());
+		}
+
+		return syncFactory;
+	}
+
+	ReactiveMongoDatabaseFactory reactiveDatabaseFactory() {
+
+		if (reactiveFactory == null) {
+			reactiveFactory = new SimpleReactiveMongoDatabaseFactory(reactiveClient(), defaultDatabase());
+		}
+
+		return reactiveFactory;
+	}
+
+	public MongoTestTemplateConfiguration configureDatabaseFactory(Consumer<DatabaseFactoryConfigurer> dbFactory) {
+
+		dbFactory.accept(dbFactoryConfig);
+		return this;
+	}
+
+	public MongoTestTemplateConfiguration configureMappingContext(
+			Consumer<MappingContextConfigurer> mappingContextConfigurerConsumer) {
+		mappingContextConfigurerConsumer.accept(mappingContextConfigurer);
+		return this;
+	}
+
+	public MongoTestTemplateConfiguration configureApplicationContext(
+			Consumer<ApplicationContextConfigurer> applicationContextConfigurerConsumer) {
+
+		applicationContextConfigurerConsumer.accept(applicationContextConfigurer);
+		return this;
+	}
+
+	public MongoTestTemplateConfiguration configureAuditing(Consumer<AuditingConfigurer> auditingConfigurerConsumer) {
+
+		auditingConfigurerConsumer.accept(auditingConfigurer);
+		return this;
+	}
+
+	public MongoTestTemplateConfiguration configureConversion(
+			Consumer<MongoConverterConfigurer> mongoConverterConfigurerConsumer) {
+
+		mongoConverterConfigurerConsumer.accept(mongoConverterConfigurer);
+		return this;
+	}
+
+	com.mongodb.client.MongoClient syncClient() {
+
+		if (syncClient == null) {
+			syncClient = dbFactoryConfig.syncClient != null ? dbFactoryConfig.syncClient : MongoTestUtils.client();
+		}
+
+		return syncClient;
+	}
+
+	com.mongodb.reactivestreams.client.MongoClient reactiveClient() {
+
+		if (reactiveClient == null) {
+			reactiveClient = dbFactoryConfig.reactiveClient != null ? dbFactoryConfig.reactiveClient
+					: MongoTestUtils.reactiveClient();
+		}
+
+		return reactiveClient;
+	}
+
+	String defaultDatabase() {
+		return dbFactoryConfig.defaultDatabase != null ? dbFactoryConfig.defaultDatabase : "test";
+	}
+
+	public static class DatabaseFactoryConfigurer {
+
+		com.mongodb.client.MongoClient syncClient;
+		com.mongodb.reactivestreams.client.MongoClient reactiveClient;
+		String defaultDatabase;
+
+		public void client(com.mongodb.client.MongoClient client) {
+			this.syncClient = client;
+		}
+
+		public void client(com.mongodb.reactivestreams.client.MongoClient client) {
+			this.reactiveClient = client;
+		}
+
+		public void defaultDb(String defaultDatabase) {
+			this.defaultDatabase = defaultDatabase;
+		}
+	}
+
+	public static class AuditingConfigurer {
+
+		Function<MappingContext, IsNewAwareAuditingHandler> auditingHandlerFunction;
+
+		public void auditingHandler(Function<MappingContext, IsNewAwareAuditingHandler> auditingHandlerFunction) {
+			this.auditingHandlerFunction = auditingHandlerFunction;
+		}
+
+		IsNewAwareAuditingHandler auditingHandlers(MongoMappingContext mongoMappingContext) {
+			return auditingHandlerFunction.apply(mongoMappingContext);
+		}
+
+		boolean hasAuditingHandler() {
+			return auditingHandlerFunction != null;
+		}
+	}
+
+	public static class ApplicationContextConfigurer {
+
+		List<ApplicationListener<MongoMappingEvent<?>>> listeners = new ArrayList<>();
+		ApplicationContext applicationContext;
+
+		public void applicationContext(ApplicationContext context) {
+			this.applicationContext = context;
+		}
+
+		public void addEventListener(ApplicationListener<MongoMappingEvent<?>> listener) {
+			this.listeners.add(listener);
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java
index 7691cb3070..f88caf80dd 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoTestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,20 +17,25 @@
 
 import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
+import reactor.util.retry.Retry;
 
 import java.time.Duration;
 import java.util.List;
 
 import org.bson.Document;
+import org.springframework.core.env.Environment;
+import org.springframework.core.env.StandardEnvironment;
+import org.springframework.data.mongodb.SpringDataMongoDB;
 import org.springframework.data.util.Version;
+import org.springframework.util.ObjectUtils;
 
+import com.mongodb.ConnectionString;
 import com.mongodb.ReadPreference;
 import com.mongodb.WriteConcern;
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.reactivestreams.client.MongoClients;
-import com.mongodb.reactivestreams.client.Success;
 
 /**
  * Utility to create (and reuse) imperative and reactive {@code MongoClient} instances.
@@ -40,9 +45,12 @@
  */
 public class MongoTestUtils {
 
-	public static final String CONNECTION_STRING = "mongodb://localhost:27017/?replicaSet=rs0"; // &readPreference=primary&w=majority
+	private static final Environment ENV = new StandardEnvironment();
+	private static final Duration DEFAULT_TIMEOUT = Duration.ofMillis(10);
 
-	private static final String CONNECTION_STRING_PATTERN = "mongodb://%s:%s/";
+	public static final String CONNECTION_STRING = "mongodb://127.0.0.1:27017/?replicaSet=rs0&w=majority&uuidrepresentation=javaLegacy";
+
+	private static final String CONNECTION_STRING_PATTERN = "mongodb://%s:%s/?w=majority&uuidrepresentation=javaLegacy";
 
 	private static final Version ANY = new Version(9999, 9999, 9999);
 
@@ -52,11 +60,15 @@ public class MongoTestUtils {
 	 * @return new instance of {@link com.mongodb.client.MongoClient}.
 	 */
 	public static MongoClient client() {
-		return client("localhost", 27017);
+		return client("127.0.0.1", 27017);
 	}
 
 	public static MongoClient client(String host, int port) {
-		return com.mongodb.client.MongoClients.create(String.format(CONNECTION_STRING_PATTERN, host, port));
+		return client(new ConnectionString(String.format(CONNECTION_STRING_PATTERN, host, port)));
+	}
+
+	public static MongoClient client(ConnectionString connectionString) {
+		return com.mongodb.client.MongoClients.create(connectionString, SpringDataMongoDB.driverInformation());
 	}
 
 	/**
@@ -65,11 +77,13 @@ public static MongoClient client(String host, int port) {
 	 * @return new instance of {@link com.mongodb.reactivestreams.client.MongoClient}.
 	 */
 	public static com.mongodb.reactivestreams.client.MongoClient reactiveClient() {
-		return reactiveClient("localhost", 27017);
+		return reactiveClient("127.0.0.1", 27017);
 	}
 
 	public static com.mongodb.reactivestreams.client.MongoClient reactiveClient(String host, int port) {
-		return MongoClients.create(String.format(CONNECTION_STRING_PATTERN, host, port));
+
+		ConnectionString connectionString = new ConnectionString(String.format(CONNECTION_STRING_PATTERN, host, port));
+		return MongoClients.create(connectionString, SpringDataMongoDB.driverInformation());
 	}
 
 	/**
@@ -88,16 +102,13 @@ public static MongoCollection<Document> createOrReplaceCollection(String dbName,
 		boolean collectionExists = database.listCollections().filter(new Document("name", collectionName)).first() != null;
 
 		if (collectionExists) {
+
 			database.getCollection(collectionName).drop();
+			giveTheServerALittleTimeToThink();
 		}
 
 		database.createCollection(collectionName);
-
-		try {
-			Thread.sleep(10); // server replication time
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
+		giveTheServerALittleTimeToThink();
 
 		return database.getCollection(collectionName);
 	}
@@ -109,16 +120,16 @@ public static MongoCollection<Document> createOrReplaceCollection(String dbName,
 	 * @param collectionName must not be {@literal null}.
 	 * @param client must not be {@literal null}.
 	 */
-	public static Mono<Success> createOrReplaceCollection(String dbName, String collectionName,
+	public static Mono<Void> createOrReplaceCollection(String dbName, String collectionName,
 			com.mongodb.reactivestreams.client.MongoClient client) {
 
 		com.mongodb.reactivestreams.client.MongoDatabase database = client.getDatabase(dbName)
 				.withWriteConcern(WriteConcern.MAJORITY).withReadPreference(ReadPreference.primary());
 
 		return Mono.from(database.getCollection(collectionName).drop()) //
-				.delayElement(Duration.ofMillis(10)) // server replication time
+				.delayElement(getTimeout()) // server replication time
 				.then(Mono.from(database.createCollection(collectionName))) //
-				.delayElement(Duration.ofMillis(10)); // server replication time
+				.delayElement(getTimeout()); // server replication time
 	}
 
 	/**
@@ -134,7 +145,6 @@ public static void createOrReplaceCollectionNow(String dbName, String collection
 
 		createOrReplaceCollection(dbName, collectionName, client) //
 				.as(StepVerifier::create) //
-				.expectNext(Success.SUCCESS) //
 				.verifyComplete();
 	}
 
@@ -153,12 +163,28 @@ public static void dropCollectionNow(String dbName, String collectionName,
 				.withWriteConcern(WriteConcern.MAJORITY).withReadPreference(ReadPreference.primary());
 
 		Mono.from(database.getCollection(collectionName).drop()) //
-				.retryBackoff(3, Duration.ofMillis(250)) //
+				.delayElement(getTimeout()).retryWhen(Retry.backoff(3, Duration.ofMillis(250))) //
 				.as(StepVerifier::create) //
-				.expectNext(Success.SUCCESS) //
 				.verifyComplete();
 	}
 
+	/**
+	 * Create a {@link com.mongodb.client.MongoCollection} if it does not exist, or drop and recreate it if it does and
+	 * verify operation result.
+	 *
+	 * @param dbName must not be {@literal null}.
+	 * @param collectionName must not be {@literal null}.
+	 * @param client must not be {@literal null}.
+	 */
+	public static void dropCollectionNow(String dbName, String collectionName,
+			com.mongodb.client.MongoClient client) {
+
+		com.mongodb.client.MongoDatabase database = client.getDatabase(dbName)
+				.withWriteConcern(WriteConcern.MAJORITY).withReadPreference(ReadPreference.primary());
+
+		database.getCollection(collectionName).drop();
+	}
+
 	/**
 	 * Remove all documents from the {@link MongoCollection} with given name in the according {@link MongoDatabase
 	 * database}.
@@ -174,15 +200,24 @@ public static void flushCollection(String dbName, String collectionName,
 				.withWriteConcern(WriteConcern.MAJORITY).withReadPreference(ReadPreference.primary());
 
 		Mono.from(database.getCollection(collectionName).deleteMany(new Document())) //
-				.then() //
+				.delayElement(getTimeout()).then() //
 				.as(StepVerifier::create) //
 				.verifyComplete();
 	}
 
+	public static void flushCollection(String dbName, String collectionName,
+			com.mongodb.client.MongoClient client) {
+
+		com.mongodb.client.MongoDatabase database = client.getDatabase(dbName)
+				.withWriteConcern(WriteConcern.MAJORITY).withReadPreference(ReadPreference.primary());
+
+		database.getCollection(collectionName).deleteMany(new Document());
+	}
+
 	/**
-	 * Create a new {@link com.mongodb.MongoClient} with defaults suitable for replica set usage.
+	 * Create a new {@link com.mongodb.client.MongoClient} with defaults suitable for replica set usage.
 	 *
-	 * @return new instance of {@link com.mongodb.MongoClient}.
+	 * @return new instance of {@link com.mongodb.client.MongoClient}.
 	 */
 	public static com.mongodb.client.MongoClient replSetClient() {
 		return com.mongodb.client.MongoClients.create(CONNECTION_STRING);
@@ -199,7 +234,7 @@ public static com.mongodb.reactivestreams.client.MongoClient reactiveReplSetClie
 
 	/**
 	 * @return the server version extracted from buildInfo.
-	 * @since 2.3.0
+	 * @since 3.0
 	 */
 	public static Version serverVersion() {
 
@@ -216,7 +251,7 @@ public static Version serverVersion() {
 
 	/**
 	 * @return check if the server is running as part of a replica set.
-	 * @since 2.3.0
+	 * @since 3.0
 	 */
 	public static boolean serverIsReplSet() {
 
@@ -228,4 +263,46 @@ public static boolean serverIsReplSet() {
 			return false;
 		}
 	}
+
+	@SuppressWarnings("unchecked")
+	public static boolean isVectorSearchEnabled() {
+		try (MongoClient client = MongoTestUtils.client()) {
+
+			return client.getDatabase("admin").runCommand(new Document("getCmdLineOpts", "1")).get("argv", List.class)
+				.stream().anyMatch(it -> {
+					if(it instanceof String cfgString) {
+						return cfgString.startsWith("searchIndexManagementHostAndPort");
+					}
+					return false;
+				});
+		} catch (Exception e) {
+			return false;
+		}
+	}
+
+	public static Duration getTimeout() {
+
+		return ObjectUtils.nullSafeEquals("jenkins", ENV.getProperty("user.name")) ? Duration.ofMillis(100)
+				: DEFAULT_TIMEOUT;
+	}
+
+	private static void giveTheServerALittleTimeToThink() {
+
+		try {
+			Thread.sleep(getTimeout().toMillis()); // server replication time
+		} catch (InterruptedException e) {
+			e.printStackTrace();
+		}
+	}
+
+	public static CollectionInfo readCollectionInfo(MongoDatabase db, String collectionName) {
+
+		List<Document> list = db.runCommand(new Document().append("listCollections", 1).append("filter", new Document("name", collectionName)))
+				.get("cursor", Document.class).get("firstBatch", List.class);
+
+		if(list.isEmpty()) {
+			throw new IllegalStateException(String.format("Collection %s not found.", collectionName));
+		}
+		return CollectionInfo.from(list.get(0));
+	}
 }
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersion.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersion.java
index 8ec4e9f579..c632d0326e 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersion.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersion.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersionRule.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersionRule.java
index bc07a8c034..a680d33a32 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersionRule.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/MongoVersionRule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,15 +25,15 @@
 import org.junit.runner.Description;
 import org.junit.runners.model.Statement;
 import org.springframework.data.util.Version;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.junit4.SpringRunner;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoDatabase;
 
 /**
  * {@link TestRule} verifying server tests are executed against match a given version. This one can be used as
- * {@link ClassRule} eg. in context depending tests run with {@link SpringJUnit4ClassRunner} when the context would fail
- * to start in case of invalid version, or as simple {@link Rule} on specific tests.
+ * {@link ClassRule} eg. in context depending tests run with {@link SpringRunner} when the context would fail to start
+ * in case of invalid version, or as simple {@link Rule} on specific tests.
  *
  * @author Christoph Strobl
  * @author Mark Paluch
@@ -54,7 +54,7 @@ public class MongoVersionRule implements TestRule {
 	private final Version minVersion;
 	private final Version maxVersion;
 
-	private String host = "localhost";
+	private String host = "127.0.0.1";
 	private int port = 27017;
 
 	public MongoVersionRule(Version min, Version max) {
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/PackageExcludingClassLoader.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/PackageExcludingClassLoader.java
new file mode 100644
index 0000000000..caec182aad
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/PackageExcludingClassLoader.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright 2024-2025 the original author 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.test.util;
+
+import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collector;
+import java.util.stream.Stream;
+
+import org.springframework.core.annotation.AnnotatedElementUtils;
+import org.springframework.util.ClassUtils;
+
+/**
+ * Simplified version of <a href="https://github.com/spring-projects/spring-boot/blob/main/spring-boot-project/spring-boot-tools/spring-boot-test-support/src/main/java/org/springframework/boot/testsupport/classpath/ModifiedClassPathClassLoader.java">ModifiedClassPathClassLoader</a>.
+ *
+ * @author Christoph Strobl
+ */
+class PackageExcludingClassLoader extends URLClassLoader {
+
+	private final Set<String> excludedPackages;
+	private final ClassLoader junitLoader;
+
+	PackageExcludingClassLoader(URL[] urls, ClassLoader parent, Collection<String> excludedPackages,
+			ClassLoader junitClassLoader) {
+
+		super(urls, parent);
+		this.excludedPackages = Set.copyOf(excludedPackages);
+		this.junitLoader = junitClassLoader;
+	}
+
+	@Override
+	public Class<?> loadClass(String name) throws ClassNotFoundException {
+
+		if (name.startsWith("org.junit") || name.startsWith("org.hamcrest")) {
+			return Class.forName(name, false, this.junitLoader);
+		}
+
+		String packageName = ClassUtils.getPackageName(name);
+		if (this.excludedPackages.contains(packageName)) {
+			throw new ClassNotFoundException(name);
+		}
+		return super.loadClass(name);
+	}
+
+	static PackageExcludingClassLoader get(Class<?> testClass, Method testMethod) {
+
+		List<String> excludedPackages = readExcludedPackages(testClass, testMethod);
+
+		if (excludedPackages.isEmpty()) {
+			return null;
+		}
+
+		ClassLoader testClassClassLoader = testClass.getClassLoader();
+		Stream<URL> urls = null;
+		if (testClassClassLoader instanceof URLClassLoader urlClassLoader) {
+			urls = Stream.of(urlClassLoader.getURLs());
+		} else {
+			urls = Stream.of(ManagementFactory.getRuntimeMXBean().getClassPath().split(File.pathSeparator))
+					.map(PackageExcludingClassLoader::toURL);
+		}
+
+		return new PackageExcludingClassLoader(urls.toArray(URL[]::new), testClassClassLoader.getParent(), excludedPackages,
+				testClassClassLoader);
+	}
+
+	private static List<String> readExcludedPackages(Class<?> testClass, Method testMethod) {
+
+		return Stream.of( //
+				AnnotatedElementUtils.findMergedAnnotation(testClass, ClassPathExclusions.class),
+				AnnotatedElementUtils.findMergedAnnotation(testMethod, ClassPathExclusions.class) //
+		).filter(Objects::nonNull) //
+				.map(ClassPathExclusions::packages) //
+				.collect(new CombingArrayCollector<String>());
+	}
+
+	private static URL toURL(String entry) {
+		try {
+			return new File(entry).toURI().toURL();
+		} catch (Exception ex) {
+			throw new IllegalArgumentException(ex);
+		}
+	}
+
+	private static class CombingArrayCollector<T> implements Collector<T[], List<T>, List<T>> {
+
+		@Override
+		public Supplier<List<T>> supplier() {
+			return ArrayList::new;
+		}
+
+		@Override
+		public BiConsumer<List<T>, T[]> accumulator() {
+			return (target, values) -> target.addAll(Arrays.asList(values));
+		}
+
+		@Override
+		public BinaryOperator<List<T>> combiner() {
+			return (r1, r2) -> {
+				r1.addAll(r2);
+				return r1;
+			};
+		}
+
+		@Override
+		public Function<List<T>, List<T>> finisher() {
+			return i -> (List<T>) i;
+		}
+
+		@Override
+		public Set<Characteristics> characteristics() {
+			return Collections.unmodifiableSet(EnumSet.of(Characteristics.IDENTITY_FINISH));
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoClientClosingTestConfiguration.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoClientClosingTestConfiguration.java
new file mode 100644
index 0000000000..bc61f81625
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoClientClosingTestConfiguration.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2021-2025 the original author 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.test.util;
+
+import javax.annotation.PreDestroy;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.config.AbstractReactiveMongoConfiguration;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.mongodb.reactivestreams.client.MongoClient;
+
+/**
+ * @author Christoph Strobl
+ */
+public abstract class ReactiveMongoClientClosingTestConfiguration extends AbstractReactiveMongoConfiguration {
+
+	@Autowired(required = false) ReactiveMongoDatabaseFactory dbFactory;
+
+	@PreDestroy
+	public void destroy() {
+
+		if (dbFactory != null) {
+			Object mongo = ReflectionTestUtils.getField(dbFactory, "mongo");
+			if (mongo != null) {
+				((MongoClient) mongo).close();
+			}
+		}
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoTestTemplate.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoTestTemplate.java
new file mode 100644
index 0000000000..9955daa98e
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReactiveMongoTestTemplate.java
@@ -0,0 +1,147 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import java.util.Arrays;
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.bson.Document;
+import org.reactivestreams.Publisher;
+
+import org.springframework.context.ApplicationContext;
+import org.springframework.data.mapping.context.PersistentEntities;
+import org.springframework.data.mongodb.ReactiveMongoDatabaseFactory;
+import org.springframework.data.mongodb.core.ReactiveMongoTemplate;
+
+import com.mongodb.reactivestreams.client.MongoClient;
+import com.mongodb.reactivestreams.client.MongoCollection;
+import com.mongodb.reactivestreams.client.MongoDatabase;
+
+/**
+ * A {@link ReactiveMongoTemplate} with configuration hooks and extension suitable for tests.
+ *
+ * @author Christoph Strobl
+ * @author Mathieu Ouellet
+ * @since 3.0
+ */
+public class ReactiveMongoTestTemplate extends ReactiveMongoTemplate {
+
+	private final MongoTestTemplateConfiguration cfg;
+
+	public ReactiveMongoTestTemplate(MongoClient client, String database, Class<?>... initialEntities) {
+		this(cfg -> {
+			cfg.configureDatabaseFactory(it -> {
+
+				it.client(client);
+				it.defaultDb(database);
+			});
+
+			cfg.configureMappingContext(it -> {
+
+				it.autocreateIndex(false);
+				it.initialEntitySet(initialEntities);
+			});
+		});
+	}
+
+	public ReactiveMongoTestTemplate(Consumer<MongoTestTemplateConfiguration> cfg) {
+
+		this(new Supplier<MongoTestTemplateConfiguration>() {
+			@Override
+			public MongoTestTemplateConfiguration get() {
+
+				MongoTestTemplateConfiguration config = new MongoTestTemplateConfiguration();
+				cfg.accept(config);
+				return config;
+			}
+		});
+	}
+
+	public ReactiveMongoTestTemplate(Supplier<MongoTestTemplateConfiguration> config) {
+		this(config.get());
+	}
+
+	public ReactiveMongoTestTemplate(MongoTestTemplateConfiguration config) {
+		super(config.reactiveDatabaseFactory(), config.mongoConverter());
+
+		ApplicationContext applicationContext = config.getApplicationContext();
+		if (applicationContext != null) {
+			setApplicationContext(applicationContext);
+		}
+
+		this.cfg = config;
+	}
+
+	public ReactiveMongoDatabaseFactory getDatabaseFactory() {
+		return cfg.reactiveDatabaseFactory();
+	}
+
+	public Mono<Void> flush() {
+		return flush(Flux.fromStream(
+				PersistentEntities.of(getConverter().getMappingContext()).stream().map(it -> getCollectionName(it.getType()))));
+	}
+
+	public Mono<Void> flushDatabase() {
+		return flush(getMongoDatabase().flatMapMany(MongoDatabase::listCollectionNames));
+	}
+
+	public Mono<Void> flush(Class<?>... entities) {
+		return flush(Flux.fromStream(Arrays.asList(entities).stream().map(this::getCollectionName)));
+	}
+
+	public Mono<Void> flush(String... collections) {
+		return flush(Flux.fromArray(collections));
+	}
+
+	public Mono<Void> flush(Publisher<String> collectionNames) {
+
+		return Flux.from(collectionNames)
+				.flatMap(collection -> getCollection(collection).flatMapMany(it -> it.deleteMany(new Document())).then()
+						.onErrorResume(it -> getCollection(collection).flatMapMany(MongoCollection::drop).then()))
+				.then();
+	}
+
+	public Mono<Void> flush(Object... objects) {
+
+		return flush(Flux.fromStream(Arrays.asList(objects).stream().map(it -> {
+
+			if (it instanceof String) {
+				return (String) it;
+			}
+			if (it instanceof Class) {
+				return getCollectionName((Class<?>) it);
+			}
+			return it.toString();
+		})));
+	}
+
+	public Mono<Void> dropDatabase() {
+		return getMongoDatabase().map(MongoDatabase::drop).then();
+	}
+
+	public Mono<Void> dropIndexes(String... collections) {
+		return Flux.fromArray(collections).flatMap(it -> getCollection(it).map(MongoCollection::dropIndexes).then()).then();
+	}
+
+	public Mono<Void> dropIndexes(Class<?>... entities) {
+		return Flux.fromArray(entities)
+				.flatMap(it -> getCollection(getCollectionName(it)).map(MongoCollection::dropIndexes).then()).then();
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReplSetClient.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReplSetClient.java
new file mode 100644
index 0000000000..8342c5b5ee
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReplSetClient.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Marks a field or method as to be autowired by JUnit's dependency injection facilities for injection of a MongoDB
+ * client instance connected to a replica set. Depends on {@link MongoClientExtension}.
+ *
+ * @author Christoph Strobl
+ * @see com.mongodb.client.MongoClient
+ * @see com.mongodb.reactivestreams.client.MongoClient
+ * @see Client
+ * @see MongoClientExtension
+ */
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ReplSetClient {
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReplicaSet.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReplicaSet.java
index 96f24751be..d2b770b818 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReplicaSet.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/ReplicaSet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Template.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Template.java
new file mode 100644
index 0000000000..a50497f335
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/test/util/Template.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020-2025 the original author 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.test.util;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.api.extension.ExtensionContext;
+
+/**
+ * Annotation to inject {@link org.springframework.data.mongodb.core.MongoOperations} and
+ * {@link org.springframework.data.mongodb.core.ReactiveMongoOperations} parameters as method arguments and into
+ * {@code static} fields.
+ *
+ * @author Christoph Strobl
+ * @since 3.0
+ * @see MongoTemplateExtension
+ */
+@Target({ ElementType.FIELD, ElementType.PARAMETER })
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@ExtendWith(MongoTemplateExtension.class)
+public @interface Template {
+
+	/**
+	 * @return name of the database to use. Use empty String to generate the database name for the
+	 *         {@link ExtensionContext#getTestClass() test class}.
+	 */
+	String database() default "";
+
+	/**
+	 * Pre-initialize the {@link org.springframework.data.mapping.context.MappingContext} with the given entities.
+	 *
+	 * @return empty by default.
+	 */
+	Class<?>[] initialEntitySet() default {};
+
+	/**
+	 * Use a {@link ReplSetClient} if {@literal true}.
+	 *
+	 * @return false by default.
+	 */
+	boolean replicaSet() default false;
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/MongoClientVersionUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/MongoClientVersionUnitTests.java
new file mode 100644
index 0000000000..053498ebbd
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/MongoClientVersionUnitTests.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2024-2025 the original author 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.util;
+
+import static org.assertj.core.api.Assertions.*;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.data.mongodb.test.util.ClassPathExclusions;
+import org.springframework.util.ClassUtils;
+
+import com.mongodb.internal.build.MongoDriverVersion;
+
+/**
+ * Tests for {@link MongoClientVersion}.
+ *
+ * @author Christoph Strobl
+ */
+class MongoClientVersionUnitTests {
+
+	@Test // GH-4578
+	void parsesClientVersionCorrectly() {
+		assertThat(MongoClientVersion.isVersion5orNewer()).isEqualTo(MongoDriverVersion.VERSION.startsWith("5"));
+	}
+
+	@Test // GH-4578
+	@ClassPathExclusions(packages = { "com.mongodb.internal.build" })
+	void fallsBackToClassLookupIfDriverVersionNotPresent() {
+		assertThat(MongoClientVersion.isVersion5orNewer()).isEqualTo(
+				ClassUtils.isPresent("com.mongodb.internal.connection.StreamFactoryFactory", this.getClass().getClassLoader()));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/SpringJsonWriterUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/SpringJsonWriterUnitTests.java
new file mode 100644
index 0000000000..878623944c
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/SpringJsonWriterUnitTests.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2025 the original author 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.util;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.bson.BsonRegularExpression;
+import org.bson.BsonTimestamp;
+import org.bson.types.Decimal128;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link SpringJsonWriter}.
+ *
+ * @author Christoph Strobl
+ * @since 5.0
+ */
+class SpringJsonWriterUnitTests {
+
+	StringBuffer buffer;
+	SpringJsonWriter writer;
+
+	@BeforeEach
+	void beforeEach() {
+		buffer = new StringBuffer();
+		writer = new SpringJsonWriter(buffer);
+	}
+
+	@Test
+	void writeDocumentWithSingleEntry() {
+
+		writer.writeStartDocument();
+		writer.writeString("key", "value");
+		writer.writeEndDocument();
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("{'key':'value'}");
+	}
+
+	@Test
+	void writeDocumentWithMultipleEntries() {
+
+		writer.writeStartDocument();
+		writer.writeString("key-1", "v1");
+		writer.writeString("key-2", "v2");
+		writer.writeEndDocument();
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("{'key-1':'v1','key-2':'v2'}");
+	}
+
+	@Test
+	void writeInt32() {
+
+		writer.writeInt32("int32", 32);
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'int32':{'$numberInt':'32'}");
+	}
+
+	@Test
+	void writeInt64() {
+
+		writer.writeInt64("int64", 64);
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'int64':{'$numberLong':'64'}");
+	}
+
+	@Test
+	void writeDouble() {
+
+		writer.writeDouble("double", 42.24D);
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'double':{'$numberDouble':'42.24'}");
+	}
+
+	@Test
+	void writeDecimal128() {
+
+		writer.writeDecimal128("decimal128", new Decimal128(128L));
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'decimal128':{'$numberDecimal':'128'}");
+	}
+
+	@Test
+	void writeObjectId() {
+
+		ObjectId objectId = new ObjectId();
+		writer.writeObjectId("_id", objectId);
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'_id':{'$oid':'%s'}".formatted(objectId.toHexString()));
+	}
+
+	@Test
+	void writeRegex() {
+
+		String pattern = "^H";
+		writer.writeRegularExpression("name", new BsonRegularExpression(pattern));
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'name':{'$regex':/%s/}".formatted(pattern));
+	}
+
+	@Test
+	void writeRegexWithOptions() {
+
+		String pattern = "^H";
+		writer.writeRegularExpression("name", new BsonRegularExpression(pattern, "i"));
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'name':{'$regex':/%s/,'$options':'%s'}".formatted(pattern, "i"));
+	}
+
+	@Test
+	void writeTimestamp() {
+
+		writer.writeTimestamp("ts", new BsonTimestamp(1234, 567));
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'ts':{'$timestamp':{'t':1234,'i':567}}");
+	}
+
+	@Test
+	void writeUndefined() {
+
+		writer.writeUndefined("nope");
+
+		assertThat(buffer).isEqualToIgnoringWhitespace("'nope':{'$undefined':true}");
+	}
+
+	@Test
+	void writeArrayWithSingleEntry() {
+
+		writer.writeStartArray();
+		writer.writeInt32(42);
+		writer.writeEndArray();
+
+		assertThat(buffer).isEqualToIgnoringNewLines("[{'$numberInt':'42'}]");
+	}
+
+	@Test
+	void writeArrayWithMultipleEntries() {
+
+		writer.writeStartArray();
+		writer.writeInt32(42);
+		writer.writeInt64(24);
+		writer.writeEndArray();
+
+		assertThat(buffer).isEqualToIgnoringNewLines("[{'$numberInt':'42'},{'$numberLong':'24'}]");
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/BsonUtilsTest.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/BsonUtilsTest.java
new file mode 100644
index 0000000000..1dc7030e70
--- /dev/null
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/BsonUtilsTest.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright 2020-2025 the original author 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.util.json;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.temporal.Temporal;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.stream.Stream;
+
+import org.bson.BsonArray;
+import org.bson.BsonDouble;
+import org.bson.BsonInt32;
+import org.bson.BsonInt64;
+import org.bson.BsonObjectId;
+import org.bson.BsonString;
+import org.bson.Document;
+import org.bson.types.ObjectId;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.springframework.data.mongodb.core.mapping.FieldName;
+import org.springframework.data.mongodb.util.BsonUtils;
+
+import com.mongodb.BasicDBList;
+
+/**
+ * Unit tests for {@link BsonUtils}.
+ *
+ * @author Christoph Strobl
+ * @author Mark Paluch
+ */
+class BsonUtilsTest {
+
+	@Test // DATAMONGO-625
+	void simpleToBsonValue() {
+
+		assertThat(BsonUtils.simpleToBsonValue(Long.valueOf(10))).isEqualTo(new BsonInt64(10));
+		assertThat(BsonUtils.simpleToBsonValue(new Integer(10))).isEqualTo(new BsonInt32(10));
+		assertThat(BsonUtils.simpleToBsonValue(Double.valueOf(0.1D))).isEqualTo(new BsonDouble(0.1D));
+		assertThat(BsonUtils.simpleToBsonValue("value")).isEqualTo(new BsonString("value"));
+	}
+
+	@Test // DATAMONGO-625
+	void primitiveToBsonValue() {
+		assertThat(BsonUtils.simpleToBsonValue(10L)).isEqualTo(new BsonInt64(10));
+	}
+
+	@Test // DATAMONGO-625
+	void objectIdToBsonValue() {
+
+		ObjectId source = new ObjectId();
+		assertThat(BsonUtils.simpleToBsonValue(source)).isEqualTo(new BsonObjectId(source));
+	}
+
+	@Test // DATAMONGO-625
+	void bsonValueToBsonValue() {
+
+		BsonObjectId source = new BsonObjectId(new ObjectId());
+		assertThat(BsonUtils.simpleToBsonValue(source)).isSameAs(source);
+	}
+
+	@Test // DATAMONGO-625
+	void unsupportedToBsonValue() {
+		assertThatExceptionOfType(IllegalArgumentException.class)
+				.isThrownBy(() -> BsonUtils.simpleToBsonValue(new Object()));
+	}
+
+	@Test // GH-3571
+	void removeNullIdIfNull() {
+
+		Document source = new Document("_id", null).append("value", "v-1");
+
+		assertThat(BsonUtils.removeNullId(source)).isTrue();
+		assertThat(source).doesNotContainKey("_id").containsKey("value");
+	}
+
+	@Test // GH-3571
+	void removeNullIdDoesNotTouchNonNullOn() {
+
+		Document source = new Document("_id", "id-value").append("value", "v-1");
+
+		assertThat(BsonUtils.removeNullId(source)).isFalse();
+		assertThat(source).containsKeys("_id", "value");
+	}
+
+	@Test // GH-3571
+	void asCollectionDoesNotModifyCollection() {
+
+		Object source = new ArrayList<>(0);
+
+		assertThat(BsonUtils.asCollection(source)).isSameAs(source);
+	}
+
+	@Test // GH-3571
+	void asCollectionConvertsArrayToCollection() {
+
+		Object source = new String[] { "one", "two" };
+
+		assertThat((Collection) BsonUtils.asCollection(source)).containsExactly("one", "two");
+	}
+
+	@Test // GH-3571
+	void asCollectionConvertsWrapsNonIterable() {
+
+		Object source = 100L;
+
+		assertThat((Collection) BsonUtils.asCollection(source)).containsExactly(source);
+	}
+
+	@Test // GH-3702
+	void supportsBsonShouldReportIfConversionSupported() {
+
+		assertThat(BsonUtils.supportsBson("foo")).isFalse();
+		assertThat(BsonUtils.supportsBson(new Document())).isTrue();
+		assertThat(BsonUtils.supportsBson(new BasicDBList())).isTrue();
+		assertThat(BsonUtils.supportsBson(Collections.emptyMap())).isTrue();
+	}
+
+	@ParameterizedTest // GH-4432
+	@MethodSource("javaTimeInstances")
+	void convertsJavaTimeTypesToBsonDateTime(Temporal source) {
+
+		assertThat(BsonUtils.simpleToBsonValue(source))
+				.isEqualTo(new Document("value", source).toBsonDocument().get("value"));
+	}
+
+	@ParameterizedTest // GH-4432
+	@MethodSource("collectionLikeInstances")
+	void convertsCollectionLikeToBsonArray(Object source) {
+
+		assertThat(BsonUtils.simpleToBsonValue(source))
+				.isEqualTo(new Document("value", source).toBsonDocument().get("value"));
+	}
+
+	@Test // GH-4432
+	void convertsPrimitiveArrayToBsonArray() {
+
+		assertThat(BsonUtils.simpleToBsonValue(new int[] { 1, 2, 3 }))
+				.isEqualTo(new BsonArray(List.of(new BsonInt32(1), new BsonInt32(2), new BsonInt32(3))));
+	}
+
+	@ParameterizedTest
+	@MethodSource("fieldNames")
+	void resolveValueForField(FieldName fieldName, boolean exists) {
+
+		Map<String, Object> source = new LinkedHashMap<>();
+		source.put("a", "a-value"); // top level
+		source.put("b", new Document("a", "b.a-value")); // path
+		source.put("c.a", "c.a-value"); // key
+
+		if(exists) {
+			assertThat(BsonUtils.resolveValue(source, fieldName)).isEqualTo(fieldName.name() + "-value");
+		} else {
+			assertThat(BsonUtils.resolveValue(source, fieldName)).isNull();
+		}
+	}
+
+	@Test
+	void retainsOrderWhenMappingValues() {
+
+		Document source = new Document();
+		source.append("z", "first-entry");
+		source.append("a", "second-entry");
+		source.append("0", "third-entry");
+		source.append("9", "fourth-entry");
+
+		Document target = BsonUtils.mapValues(source, (key, value) -> value);
+		assertThat(source).isNotSameAs(target).containsExactlyEntriesOf(source);
+	}
+
+	@Test
+	void retainsOrderWhenMappingKeys() {
+
+		Document source = new Document();
+		source.append("z", "first-entry");
+		source.append("a", "second-entry");
+
+		Document target = BsonUtils.mapEntries(source, entry -> entry.getKey().toUpperCase(), Entry::getValue);
+		assertThat(target).containsExactly(Map.entry("Z", "first-entry"), Map.entry("A", "second-entry"));
+	}
+
+	@Test
+	void appliesValueMapping() {
+		Document source = new Document();
+		source.append("z", "first-entry");
+		source.append("a", "second-entry");
+
+		Document target = BsonUtils.mapValues(source,
+				(key, value) -> new StringBuilder(value.toString()).reverse().toString());
+		assertThat(target).containsValues("yrtne-tsrif", "yrtne-dnoces");
+	}
+
+	@Test
+	void appliesKeyMapping() {
+
+		Document source = new Document();
+		source.append("z", "first-entry");
+		source.append("a", "second-entry");
+
+		Document target = BsonUtils.mapEntries(source, entry -> entry.getKey().toUpperCase(), Entry::getValue);
+		assertThat(target).containsKeys("Z", "A");
+	}
+
+	static Stream<Arguments> fieldNames() {
+		return Stream.of(//
+				Arguments.of(FieldName.path("a"), true), //
+				Arguments.of(FieldName.path("b.a"), true), //
+				Arguments.of(FieldName.path("c.a"), false), //
+				Arguments.of(FieldName.name("d"), false), //
+				Arguments.of(FieldName.name("b.a"), false), //
+				Arguments.of(FieldName.name("c.a"), true) //
+		);
+	}
+
+	static Stream<Arguments> javaTimeInstances() {
+
+		return Stream.of(Arguments.of(Instant.now()), Arguments.of(LocalDate.now()), Arguments.of(LocalDateTime.now()),
+				Arguments.of(LocalTime.now()));
+	}
+
+	static Stream<Arguments> collectionLikeInstances() {
+
+		return Stream.of(Arguments.of(new String[] { "1", "2", "3" }), Arguments.of(List.of("1", "2", "3")),
+				Arguments.of(new Integer[] { 1, 2, 3 }), Arguments.of(List.of(1, 2, 3)),
+				Arguments.of(new Date[] { new Date() }), Arguments.of(List.of(new Date())),
+				Arguments.of(new LocalDate[] { LocalDate.now() }), Arguments.of(List.of(LocalDate.now())));
+	}
+}
diff --git a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReaderUnitTests.java b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReaderUnitTests.java
index 66fd43fc8a..20b5060f77 100644
--- a/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReaderUnitTests.java
+++ b/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/util/json/ParameterBindingJsonReaderUnitTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author 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,69 +15,120 @@
  */
 package org.springframework.data.mongodb.util.json;
 
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
+import java.util.UUID;
 
+import org.bson.BsonBinary;
+import org.bson.BsonBinarySubType;
+import org.bson.BsonRegularExpression;
 import org.bson.Document;
 import org.bson.codecs.DecoderContext;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.springframework.data.expression.ValueExpressionParser;
+import org.springframework.data.spel.EvaluationContextProvider;
+import org.springframework.data.spel.ExpressionDependencies;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.ParseException;
+import org.springframework.expression.TypedValue;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 /**
  * Unit tests for {@link ParameterBindingJsonReader}.
  *
  * @author Christoph Strobl
+ * @author Mark Paluch
+ * @author Rocco Lagrotteria
  */
-public class ParameterBindingJsonReaderUnitTests {
+class ParameterBindingJsonReaderUnitTests {
 
 	@Test
-	public void bindUnquotedStringValue() {
+	void bindUnquotedStringValue() {
 
 		Document target = parse("{ 'lastname' : ?0 }", "kohlin");
 		assertThat(target).isEqualTo(new Document("lastname", "kohlin"));
 	}
 
 	@Test
-	public void bindQuotedStringValue() {
+	void bindQuotedStringValue() {
 
 		Document target = parse("{ 'lastname' : '?0' }", "kohlin");
 		assertThat(target).isEqualTo(new Document("lastname", "kohlin"));
 	}
 
 	@Test
-	public void bindUnquotedIntegerValue() {
+	void bindUnquotedIntegerValue() {
 
 		Document target = parse("{ 'lastname' : ?0 } ", 100);
 		assertThat(target).isEqualTo(new Document("lastname", 100));
 	}
 
 	@Test
-	public void bindMultiplePlacholders() {
+	void bindMultiplePlacholders() {
 
 		Document target = parse("{ 'lastname' : ?0, 'firstname' : '?1' }", "Kohlin", "Dalinar");
 		assertThat(target).isEqualTo(Document.parse("{ 'lastname' : 'Kohlin', 'firstname' : 'Dalinar' }"));
 	}
 
 	@Test
-	public void bindQuotedIntegerValue() {
+	void bindQuotedIntegerValue() {
 
 		Document target = parse("{ 'lastname' : '?0' }", 100);
 		assertThat(target).isEqualTo(new Document("lastname", "100"));
 	}
 
+	@Test // GH-4806
+	void regexConsidersOptions() {
+
+		Document target = parse("{ 'c': /^true$/i }");
+
+		BsonRegularExpression pattern = target.get("c", BsonRegularExpression.class);
+		assertThat(pattern.getPattern()).isEqualTo("^true$");
+		assertThat(pattern.getOptions()).isEqualTo("i");
+	}
+
+	@Test // GH-4806
+	void regexConsidersBindValueWithOptions() {
+
+		Document target = parse("{ 'c': /^?0$/i }", "foo");
+
+		BsonRegularExpression pattern = target.get("c", BsonRegularExpression.class);
+		assertThat(pattern.getPattern()).isEqualTo("^foo$");
+		assertThat(pattern.getOptions()).isEqualTo("i");
+	}
+
+	@Test // GH-4806
+	void treatsQuotedValueThatLooksLikeRegexAsPlainString() {
+
+		Document target = parse("{ 'c': '/^?0$/i' }", "foo");
+
+		assertThat(target.get("c")).isInstanceOf(String.class);
+	}
+
+	@Test // GH-4806
+	void treatsStringParameterValueThatLooksLikeRegexAsPlainString() {
+
+		Document target = parse("{ 'c': ?0 }", "/^foo$/i");
+
+		assertThat(target.get("c")).isInstanceOf(String.class);
+	}
+
 	@Test
-	public void bindValueToRegex() {
+	void bindValueToRegex() {
 
 		Document target = parse("{ 'lastname' : { '$regex' : '^(?0)'} }", "kohlin");
 		assertThat(target).isEqualTo(Document.parse("{ 'lastname' : { '$regex' : '^(kohlin)'} }"));
 	}
 
 	@Test
-	public void bindValueToMultiRegex() {
+	void bindValueToMultiRegex() {
 
 		Document target = parse(
 				"{'$or' : [{'firstname': {'$regex': '.*?0.*', '$options': 'i'}}, {'lastname' : {'$regex': '.*?0xyz.*', '$options': 'i'}} ]}",
@@ -87,7 +138,7 @@ public void bindValueToMultiRegex() {
 	}
 
 	@Test
-	public void bindMultipleValuesToSingleToken() {
+	void bindMultipleValuesToSingleToken() {
 
 		Document target = parse("{$where: 'return this.date.getUTCMonth() == ?2 && this.date.getUTCDay() == ?3;'}", 0, 1, 2,
 				3, 4);
@@ -96,31 +147,29 @@ public void bindMultipleValuesToSingleToken() {
 	}
 
 	@Test
-	public void bindValueToDbRef() {
+	void bindValueToDbRef() {
 
 		Document target = parse("{ 'reference' : { $ref : 'reference', $id : ?0 }}", "kohlin");
 		assertThat(target).isEqualTo(Document.parse("{ 'reference' : { $ref : 'reference', $id : 'kohlin' }}"));
 	}
 
 	@Test
-	public void bindToKey() {
+	void bindToKey() {
 
 		Document target = parse("{ ?0 : ?1 }", "firstname", "kaladin");
 		assertThat(target).isEqualTo(Document.parse("{ 'firstname' : 'kaladin' }"));
 	}
 
 	@Test
-	public void bindListValue() {
+	void bindListValue() {
 
-		//
 		Document target = parse("{ 'lastname' : { $in : ?0 } }", Arrays.asList("Kohlin", "Davar"));
 		assertThat(target).isEqualTo(Document.parse("{ 'lastname' : { $in : ['Kohlin', 'Davar' ]} }"));
 	}
 
 	@Test
-	public void bindListOfBinaryValue() {
+	void bindListOfBinaryValue() {
 
-		//
 		byte[] value = "Kohlin".getBytes(StandardCharsets.UTF_8);
 		List<byte[]> args = Collections.singletonList(value);
 
@@ -129,40 +178,35 @@ public void bindListOfBinaryValue() {
 	}
 
 	@Test
-	public void bindExtendedExpression() {
+	void bindExtendedExpression() {
 
 		Document target = parse("{'id':?#{ [0] ? { $exists :true} : [1] }}", true, "firstname", "kaladin");
 		assertThat(target).isEqualTo(Document.parse("{ \"id\" : { \"$exists\" : true}}"));
 	}
 
-	// {'id':?#{ [0] ? { $exists :true} : [1] }}
-
 	@Test
-	public void bindDocumentValue() {
+	void bindDocumentValue() {
 
-		//
 		Document target = parse("{ 'lastname' : ?0 }", new Document("$eq", "Kohlin"));
 		assertThat(target).isEqualTo(Document.parse("{ 'lastname' : { '$eq' : 'Kohlin' } }"));
 	}
 
 	@Test
-	public void arrayWithoutBinding() {
+	void arrayWithoutBinding() {
 
-		//
 		Document target = parse("{ 'lastname' : { $in : [\"Kohlin\", \"Davar\"] } }");
 		assertThat(target).isEqualTo(Document.parse("{ 'lastname' : { $in : ['Kohlin', 'Davar' ]} }"));
 	}
 
 	@Test
-	public void bindSpEL() {
+	void bindSpEL() {
 
-		// "{ arg0 : ?#{[0]} }"
 		Document target = parse("{ arg0 : ?#{[0]} }", 100.01D);
 		assertThat(target).isEqualTo(new Document("arg0", 100.01D));
 	}
 
 	@Test // DATAMONGO-2315
-	public void bindDateAsDate() {
+	void bindDateAsDate() {
 
 		Date date = new Date();
 		Document target = parse("{ 'end_date' : { $gte : { $date : ?0 } } }", date);
@@ -171,7 +215,7 @@ public void bindDateAsDate() {
 	}
 
 	@Test // DATAMONGO-2315
-	public void bindQuotedDateAsDate() {
+	void bindQuotedDateAsDate() {
 
 		Date date = new Date();
 		Document target = parse("{ 'end_date' : { $gte : { $date : '?0' } } }", date);
@@ -180,16 +224,15 @@ public void bindQuotedDateAsDate() {
 	}
 
 	@Test // DATAMONGO-2315
-	public void bindStringAsDate() {
+	void bindStringAsDate() {
 
-		Date date = new Date();
 		Document target = parse("{ 'end_date' : { $gte : { $date : ?0 } } }", "2019-07-04T12:19:23.000Z");
 
 		assertThat(target).isEqualTo(Document.parse("{ 'end_date' : { $gte : { $date : '2019-07-04T12:19:23.000Z' } } } "));
 	}
 
 	@Test // DATAMONGO-2315
-	public void bindNumberAsDate() {
+	void bindNumberAsDate() {
 
 		Long time = new Date().getTime();
 		Document target = parse("{ 'end_date' : { $gte : { $date : ?0 } } }", time);
@@ -197,10 +240,460 @@ public void bindNumberAsDate() {
 		assertThat(target).isEqualTo(Document.parse("{ 'end_date' : { $gte : { $date : " + time + " } } } "));
 	}
 
+	@Test // GH-3750
+	public void shouldParseISODate() {
+
+		String json = "{ 'value' : ISODate(\"1970-01-01T00:00:00Z\") }";
+		Date value = parse(json).get("value", Date.class);
+		assertThat(value.getTime()).isZero();
+	}
+
+	@Test // GH-3750
+	public void shouldParseISODateWith24HourTimeSpecification() {
+
+		String json = "{ 'value' : ISODate(\"2013-10-04T12:07:30.443Z\") }";
+		Date value = parse(json).get("value", Date.class);
+		assertThat(value.getTime()).isEqualTo(1380888450443L);
+	}
+
+	@Test // GH-3750
+	public void shouldParse$date() {
+
+		String json = "{ 'value' : { \"$date\" : \"2015-04-16T14:55:57.626Z\" } }";
+		Date value = parse(json).get("value", Date.class);
+		assertThat(value.getTime()).isEqualTo(1429196157626L);
+	}
+
+	@Test // GH-3750
+	public void shouldParse$dateWithTimeOffset() {
+
+		String json = "{ 'value' :{ \"$date\" : \"2015-04-16T16:55:57.626+02:00\" } }";
+		Date value = parse(json).get("value", Date.class);
+		assertThat(value.getTime()).isEqualTo(1429196157626L);
+	}
+
+	@Test // GH-4282
+	public void shouldReturnNullAsSuch() {
+
+		String json = "{ 'value' : ObjectId(?0) }";
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> parse(json, new Object[] { null }))
+				.withMessageContaining("hexString");
+	}
+
+	@Test // DATAMONGO-2418
+	void shouldNotAccessSpElEvaluationContextWhenNoSpElPresentInBindableTarget() {
+
+		Object[] args = new Object[] { "value" };
+		EvaluationContext evaluationContext = new StandardEvaluationContext() {
+
+			@Override
+			public TypedValue getRootObject() {
+				throw new RuntimeException("o_O");
+			}
+		};
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader("{ 'name':'?0' }",
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target).isEqualTo(new Document("name", "value"));
+	}
+
+	@Test // DATAMONGO-2476
+	void bindUnquotedParameterInArray() {
+
+		Document target = parse("{ 'name' : { $in : [?0] } }", "kohlin");
+		assertThat(target).isEqualTo(new Document("name", new Document("$in", Collections.singletonList("kohlin"))));
+	}
+
+	@Test // DATAMONGO-2476
+	void bindMultipleUnquotedParameterInArray() {
+
+		Document target = parse("{ 'name' : { $in : [?0,?1] } }", "dalinar", "kohlin");
+		assertThat(target).isEqualTo(new Document("name", new Document("$in", Arrays.asList("dalinar", "kohlin"))));
+	}
+
+	@Test // DATAMONGO-2476
+	void bindUnquotedParameterInArrayWithSpaces() {
+
+		Document target = parse("{ 'name' : { $in : [ ?0 ] } }", "kohlin");
+		assertThat(target).isEqualTo(new Document("name", new Document("$in", Collections.singletonList("kohlin"))));
+	}
+
+	@Test // DATAMONGO-2476
+	void bindQuotedParameterInArray() {
+
+		Document target = parse("{ 'name' : { $in : ['?0'] } }", "kohlin");
+		assertThat(target).isEqualTo(new Document("name", new Document("$in", Collections.singletonList("kohlin"))));
+	}
+
+	@Test // DATAMONGO-2476
+	void bindQuotedMulitParameterInArray() {
+
+		Document target = parse("{ 'name' : { $in : ['?0,?1'] } }", "dalinar", "kohlin");
+		assertThat(target)
+				.isEqualTo(new Document("name", new Document("$in", Collections.singletonList("dalinar,kohlin"))));
+	}
+
+	@Test // DATAMONGO-1894
+	void discoversNoDependenciesInExpression() {
+
+		String json = "{ $and : [?#{ [0] == null  ? { '$where' : 'true' } : { 'v1' : { '$in' : {[0]} } } }]}";
+
+		ExpressionDependencies expressionDependencies = new ParameterBindingDocumentCodec().captureExpressionDependencies(
+				json, it -> new Object(), ValueExpressionParser.create(SpelExpressionParser::new));
+
+		assertThat(expressionDependencies).isEqualTo(ExpressionDependencies.none());
+	}
+
+	@Test // DATAMONGO-1894
+	void discoversCorrectlyDependenciesInExpression() {
+
+		String json = "{ hello: ?#{hasRole('foo')} }";
+
+		ExpressionDependencies expressionDependencies = new ParameterBindingDocumentCodec().captureExpressionDependencies(
+				json, it -> new Object(), ValueExpressionParser.create(SpelExpressionParser::new));
+
+		assertThat(expressionDependencies).isNotEmpty();
+		assertThat(expressionDependencies.get()).hasSize(1);
+	}
+
+	@Test // DATAMONGO-2523
+	void bindSpelExpressionInArrayCorrectly/* closing bracket must not have leading whitespace! */() {
+
+		Document target = parse("{ $and : [?#{ [0] == null  ? { '$where' : 'true' } : { 'v1' : { '$in' : {[0]} } } }]}", 1);
+
+		assertThat(target).isEqualTo(Document.parse("{\"$and\": [{\"v1\": {\"$in\": [1]}}]}"));
+	}
+
+	@Test // DATAMONGO-2545
+	void shouldABindArgumentsViaIndexInSpelExpressions() {
+
+		Object[] args = new Object[] { "yess", "nooo" };
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(
+				"{ 'isBatman' : ?#{ T(" + this.getClass().getName() + ").isBatman() ? [0] : [1] }}",
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target).isEqualTo(new Document("isBatman", "nooo"));
+	}
+
+	@Test // DATAMONGO-2545
+	void shouldAllowMethodArgumentPlaceholdersInSpelExpressions/*becuase this worked before*/() {
+
+		Object[] args = new Object[] { "yess", "nooo" };
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(
+				"{ 'isBatman' : ?#{ T(" + this.getClass().getName() + ").isBatman() ? '?0' : '?1' }}",
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target).isEqualTo(new Document("isBatman", "nooo"));
+	}
+
+	@Test // DATAMONGO-2545
+	void shouldAllowMethodArgumentPlaceholdersInQuotedSpelExpressions/*because this worked before*/() {
+
+		Object[] args = new Object[] { "yess", "nooo" };
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(
+				"{ 'isBatman' : \"?#{ T(" + this.getClass().getName() + ").isBatman() ? '?0' : '?1' }\" }",
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target).isEqualTo(new Document("isBatman", "nooo"));
+	}
+
+	@Test // DATAMONGO-2545
+	void evaluatesSpelExpressionDefiningEntireQuery() {
+
+		Object[] args = new Object[] {};
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+		evaluationContext.setRootObject(new DummySecurityObject(new DummyWithId("wonderwoman")));
+
+		String json = "?#{  T(" + this.getClass().getName()
+				+ ").isBatman() ? {'_class': { '$eq' : 'region' }} : { '$and' : { {'_class': { '$eq' : 'region' } }, {'user.supervisor':  principal.id } } } }";
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json,
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target)
+				.isEqualTo(new Document("$and", Arrays.asList(new Document("_class", new Document("$eq", "region")),
+						new Document("user.supervisor", "wonderwoman"))));
+	}
+
+	@Test // GH-3871
+	public void capturingExpressionDependenciesShouldNotThrowParseErrorForSpelOnlyJson() {
+
+		Object[] args = new Object[] { "1", "2" };
+		String json = "?#{ true ? { 'name': #name } : { 'name' : #name + 'trouble' } }";
+
+		new ParameterBindingDocumentCodec().captureExpressionDependencies(json, (index) -> args[index],
+				ValueExpressionParser.create(SpelExpressionParser::new));
+	}
+
+	@Test // GH-3871, GH-4089
+	public void bindEntireQueryUsingSpelExpressionWhenEvaluationResultIsDocument() {
+
+		Object[] args = new Object[] { "expected", "unexpected" };
+		String json = "?#{ true ? { 'name': ?0 } : { 'name' : ?1 } }";
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json,
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+		assertThat(target).isEqualTo(new Document("name", "expected"));
+	}
+
+	@Test // GH-3871, GH-4089
+	public void throwsExceptionWhenBindEntireQueryUsingSpelExpressionIsMalFormatted() {
+
+		Object[] args = new Object[] { "expected", "unexpected" };
+		String json = "?#{ true ? { 'name': ?0 { } } : { 'name' : ?1 } }";
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+
+		assertThatExceptionOfType(ParseException.class).isThrownBy(() -> {
+			ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json,
+					new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+
+			new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+		});
+	}
+
+	@Test // GH-3871, GH-4089
+	public void bindEntireQueryUsingSpelExpressionWhenEvaluationResultIsJsonStringContainingUUID() {
+
+		Object[] args = new Object[] { UUID.fromString("cfbca728-4e39-4613-96bc-f920b5c37e16"), "unexpected" };
+		String json = "?#{ true ? { 'name': ?0 } : { 'name' : ?1 } }";
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json,
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target.get("name")).isInstanceOf(UUID.class);
+	}
+
+	@Test // GH-3871
+	void bindEntireQueryUsingSpelExpression() {
+
+		Object[] args = new Object[] { "region" };
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+		evaluationContext.setRootObject(new DummySecurityObject(new DummyWithId("wonderwoman")));
+
+		String json = "?#{  T(" + this.getClass().getName() + ").applyFilterByUser('?0' ,principal.id) }";
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json,
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target)
+				.isEqualTo(new Document("$and", Arrays.asList(new Document("_class", new Document("$eq", "region")),
+						new Document("user.supervisor", "wonderwoman"))));
+	}
+
+	@Test // GH-3871
+	void bindEntireQueryUsingParameter() {
+
+		Object[] args = new Object[] { "{ 'itWorks' : true }" };
+		StandardEvaluationContext evaluationContext = (StandardEvaluationContext) EvaluationContextProvider.DEFAULT
+				.getEvaluationContext(args);
+
+		String json = "?0";
+
+		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json,
+				new ParameterBindingContext((index) -> args[index], new SpelExpressionParser(), () -> evaluationContext));
+		Document target = new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
+
+		assertThat(target).isEqualTo(new Document("itWorks", true));
+	}
+
+	@Test // DATAMONGO-2571
+	void shouldParseRegexCorrectly() {
+
+		Document target = parse("{ $and: [{'fieldA': {$in: [/ABC.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}");
+		assertThat(target)
+				.isEqualTo(Document.parse("{ $and: [{'fieldA': {$in: [/ABC.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}"));
+	}
+
+	@Test // DATAMONGO-2571
+	void shouldParseRegexWithPlaceholderCorrectly() {
+
+		Document target = parse("{ $and: [{'fieldA': {$in: [/?0.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}", "ABC");
+		assertThat(target)
+				.isEqualTo(Document.parse("{ $and: [{'fieldA': {$in: [/ABC.*/, /CDE.*F/]}}, {'fieldB': {$ne: null}}]}"));
+	}
+
+	@Test // DATAMONGO-2633
+	void shouldParseNestedArrays() {
+
+		Document target = parse("{ 'stores.location' : { $geoWithin: { $centerSphere: [ [ ?0, 48.799029 ] , ?1 ] } } }",
+				1.948516D, 0.004D);
+		assertThat(target).isEqualTo(Document
+				.parse("{ 'stores.location' : { $geoWithin: { $centerSphere: [ [ 1.948516, 48.799029 ] , 0.004 ] } } }"));
+	}
+
+	@Test // GH-3633
+	void parsesNullValue() {
+
+		Document target = parse("{ 'parent' : null }");
+		assertThat(target).isEqualTo(new Document("parent", null));
+	}
+
+	@Test // GH-4089
+	void retainsSpelArgumentTypeViaArgumentIndex() {
+
+		String source = "new java.lang.Object()";
+		Document target = parse("{ arg0 : ?#{[0]} }", source);
+		assertThat(target.get("arg0")).isEqualTo(source);
+	}
+
+	@Test // GH-4089
+	void retainsSpelArgumentTypeViaParameterPlaceholder() {
+
+		String source = "new java.lang.Object()";
+		Document target = parse("{ arg0 : :#{?0} }", source);
+		assertThat(target.get("arg0")).isEqualTo(source);
+	}
+
+	@Test // GH-4089
+	void errorsOnNonDocument() {
+
+		String source = "new java.lang.Object()";
+		assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> parse(":#{?0}", source));
+	}
+
+	@Test // GH-4089
+	void bindsFullDocument() {
+
+		Document source = new Document();
+		assertThat(parse(":#{?0}", source)).isSameAs(source);
+	}
+
+	@Test // GH-4089
+	void enforcesStringSpelArgumentTypeViaParameterPlaceholderWhenQuoted() {
+
+		Integer source = 10;
+		Document target = parse("{ arg0 : :#{'?0'} }", source);
+		assertThat(target.get("arg0")).isEqualTo("10");
+	}
+
+	@Test // GH-4089
+	void enforcesSpelArgumentTypeViaParameterPlaceholderWhenQuoted() {
+
+		String source = "new java.lang.Object()";
+		Document target = parse("{ arg0 : :#{'?0'} }", source);
+		assertThat(target.get("arg0")).isEqualTo(source);
+	}
+
+	@Test // GH-4089
+	void retainsSpelArgumentTypeViaParameterPlaceholderWhenValueContainsSingleQuotes() {
+
+		String source = "' + new java.lang.Object() + '";
+		Document target = parse("{ arg0 : :#{?0} }", source);
+		assertThat(target.get("arg0")).isEqualTo(source);
+	}
+
+	@Test // GH-4089
+	void retainsSpelArgumentTypeViaParameterPlaceholderWhenValueContainsDoubleQuotes() {
+
+		String source = "\\\" + new java.lang.Object() + \\\"";
+		Document target = parse("{ arg0 : :#{?0} }", source);
+		assertThat(target.get("arg0")).isEqualTo(source);
+	}
+
+	@Test // GH-3750
+	void shouldParseUUIDasStandardRepresentation() {
+
+		String json = "{ 'value' : UUID(\"b5f21e0c-2a0d-42d6-ad03-d827008d8ab6\") }";
+
+		BsonBinary value = parse(json).get("value", BsonBinary.class);
+		assertThat(value.getType()).isEqualTo(BsonBinarySubType.UUID_STANDARD.getValue());
+	}
+
+	@Test // GH-3750
+	public void shouldParse$uuidAsStandardRepresentation() {
+
+		String json = "{ 'value' : { '$uuid' : \"73ff-d26444b-34c6-990e8e-7d1dfc035d4\" } } }";
+		BsonBinary value = parse(json).get("value", BsonBinary.class);
+		assertThat(value.getType()).isEqualTo(BsonBinarySubType.UUID_STANDARD.getValue());
+	}
+
 	private static Document parse(String json, Object... args) {
 
 		ParameterBindingJsonReader reader = new ParameterBindingJsonReader(json, args);
 		return new ParameterBindingDocumentCodec().decode(reader, DecoderContext.builder().build());
 	}
 
+	// DATAMONGO-2545
+	public static boolean isBatman() {
+		return false;
+	}
+
+	public static String applyFilterByUser(String _class, String username) {
+		switch (username) {
+			case "batman":
+				return "{'_class': { '$eq' : '" + _class + "' }}";
+			default:
+				return "{ '$and' : [ {'_class': { '$eq' : '" + _class + "' } }, {'user.supervisor':  '" + username + "' } ] }";
+		}
+	}
+
+	public static class DummySecurityObject {
+
+		DummyWithId principal;
+
+		public DummySecurityObject(DummyWithId principal) {
+			this.principal = principal;
+		}
+
+		public DummyWithId getPrincipal() {
+			return this.principal;
+		}
+
+		public void setPrincipal(DummyWithId principal) {
+			this.principal = principal;
+		}
+
+		public String toString() {
+			return "ParameterBindingJsonReaderUnitTests.DummySecurityObject(principal=" + this.getPrincipal() + ")";
+		}
+	}
+
+	public static class DummyWithId {
+
+		String id;
+
+		public DummyWithId(String id) {
+			this.id = id;
+		}
+
+		public String getId() {
+			return this.id;
+		}
+
+		public void setId(String id) {
+			this.id = id;
+		}
+
+		public String toString() {
+			return "ParameterBindingJsonReaderUnitTests.DummyWithId(id=" + this.getId() + ")";
+		}
+	}
+
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/BulkOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/BulkOperationExtensionsTests.kt
new file mode 100644
index 0000000000..e5c08c74dc
--- /dev/null
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/BulkOperationExtensionsTests.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2025 the original author 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 io.mockk.mockk
+import io.mockk.verify
+import org.junit.jupiter.api.Test
+import org.springframework.data.mongodb.core.query.Criteria
+import org.springframework.data.mongodb.core.query.Query
+import org.springframework.data.mongodb.core.query.Update
+import org.springframework.data.mongodb.core.query.UpdateDefinition
+import org.springframework.data.util.Pair.of
+
+/**
+ * Unit tests for BulkOperationExtensions.
+ * @author 2tsumo-hitori
+ */
+class BulkOperationExtensionsTests {
+
+	private val bulkOperation = mockk<BulkOperations>(relaxed = true)
+
+	@Test // GH-4911
+	fun `BulkOperation#updateMulti using kotlin#Pair should call its Java counterpart`() {
+
+		val list: MutableList<Pair<Query, UpdateDefinition>> = mutableListOf()
+		list.add(where("value", "v2") to set("value", "v3"))
+
+		bulkOperation.updateMulti(list)
+
+		val expected = list.map { (query, update) -> of(query, update) }
+		verify { bulkOperation.updateMulti(expected) }
+	}
+
+	@Test // GH-4911
+	fun `BulkOperation#upsert using kotlin#Pair should call its Java counterpart`() {
+
+		val list: MutableList<Pair<Query, Update>> = mutableListOf()
+		list.add(where("value", "v2") to set("value", "v3"))
+
+		bulkOperation.upsert(list)
+
+		val expected = list.map { (query, update) -> of(query, update) }
+		verify { bulkOperation.upsert(expected) }
+	}
+
+	@Test // GH-4911
+	fun `BulkOperation#updateOne using kotlin#Pair should call its Java counterpart`() {
+
+		val list: MutableList<Pair<Query, UpdateDefinition>> = mutableListOf()
+		list.add(where("value", "v2") to set("value", "v3"))
+
+		bulkOperation.updateOne(list)
+
+		val expected = list.map { (query, update) -> of(query, update) }
+		verify { bulkOperation.updateOne(expected) }
+	}
+
+	private fun where(field: String, value: String): Query {
+		return Query().addCriteria(Criteria.where(field).`is`(value))
+	}
+
+	private fun set(field: String, value: String): Update {
+		return Update().set(field, value)
+	}
+
+}
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/Entities.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/Entities.kt
index 40331c1328..f29df408b2 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/Entities.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/Entities.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensionsTests.kt
index 841cb403fd..01804af55f 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableAggregationOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,6 @@ class ExecutableAggregationOperationExtensionsTests {
 
 	val operation = mockk<ExecutableAggregationOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `aggregateAndReturn(KClass) extension should call its Java counterpart`() {
-
-		operation.aggregateAndReturn(First::class)
-		verify { operation.aggregateAndReturn(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `aggregateAndReturn() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
index 624f110fb7..516b01793a 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableFindOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.springframework.data.mongodb.core
 
 import example.first.First
+import io.mockk.every
 import io.mockk.mockk
 import io.mockk.verify
 import org.junit.Test
@@ -32,13 +33,9 @@ class ExecutableFindOperationExtensionsTests {
 
 	val distinctWithProjection = mockk<ExecutableFindOperation.DistinctWithProjection>(relaxed = true)
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `ExecutableFindOperation#query(KClass) extension should call its Java counterpart`() {
+	val findDistinct = mockk<ExecutableFindOperation.FindDistinct>(relaxed = true)
 
-		operation.query(First::class)
-		verify { operation.query(First::class.java) }
-	}
+	val executableFind = mockk<ExecutableFindOperation.ExecutableFind<KotlinUser>>(relaxed = true)
 
 	@Test // DATAMONGO-1689
 	fun `ExecutableFindOperation#query() with reified type parameter extension should call its Java counterpart`() {
@@ -47,14 +44,6 @@ class ExecutableFindOperationExtensionsTests {
 		verify { operation.query(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689, DATAMONGO-2086
-	@Suppress("DEPRECATION")
-	fun `ExecutableFindOperation#FindOperationWithProjection#asType(KClass) extension should call its Java counterpart`() {
-
-		operationWithProjection.asType(User::class)
-		verify { operationWithProjection.`as`(User::class.java) }
-	}
-
 	@Test // DATAMONGO-1689, DATAMONGO-2086
 	fun `ExecutableFindOperation#FindOperationWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
@@ -62,18 +51,31 @@ class ExecutableFindOperationExtensionsTests {
 		verify { operationWithProjection.`as`(User::class.java) }
 	}
 
-	@Test // DATAMONGO-1761, DATAMONGO-2086
-	@Suppress("DEPRECATION")
-	fun `ExecutableFindOperation#DistinctWithProjection#asType(KClass) extension should call its Java counterpart`() {
-
-		distinctWithProjection.asType(User::class)
-		verify { distinctWithProjection.`as`(User::class.java) }
-	}
-
 	@Test // DATAMONGO-2086
 	fun `ExecutableFindOperation#DistinctWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
 		distinctWithProjection.asType<User>()
 		verify { distinctWithProjection.`as`(User::class.java) }
 	}
+
+	@Test // DATAMONGO-2417
+	fun `ExecutableFindOperation#distrinct() using KProperty1 should call its Java counterpart`() {
+
+		every { operation.query(KotlinUser::class.java) } returns executableFind
+
+		operation.distinct(KotlinUser::username)
+		verify {
+			operation.query(KotlinUser::class.java)
+			executableFind.distinct("username")
+		}
+	}
+
+	@Test // DATAMONGO-2417
+	fun `ExecutableFindOperation#FindDistinct#field() using KProperty should call its Java counterpart`() {
+
+		findDistinct.distinct(KotlinUser::username)
+		verify { findDistinct.distinct("username") }
+	}
+
+	data class KotlinUser(val username: String)
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
index 1a2d282b2f..27b8063958 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableInsertOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,6 @@ class ExecutableInsertOperationExtensionsTests {
 
 	val operation = mockk<ExecutableInsertOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `insert(KClass) extension should call its Java counterpart`() {
-
-		operation.insert(First::class)
-		verify { operation.insert(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `insert() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
index 242ae08807..8cda511a54 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableMapReduceOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,14 +30,6 @@ class ExecutableMapReduceOperationExtensionsTests {
 
 	val operationWithProjection = mockk<ExecutableMapReduceOperation.MapReduceWithProjection<First>>(relaxed = true)
 
-	@Test // DATAMONGO-1929
-	@Suppress("DEPRECATION")
-	fun `ExecutableMapReduceOperation#mapReduce(KClass) extension should call its Java counterpart`() {
-
-		operation.mapReduce(First::class)
-		verify { operation.mapReduce(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1929
 	fun `ExecutableMapReduceOperation#mapReduce() with reified type parameter extension should call its Java counterpart`() {
 
@@ -45,14 +37,6 @@ class ExecutableMapReduceOperationExtensionsTests {
 		verify { operation.mapReduce(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1929, DATAMONGO-2086
-	@Suppress("DEPRECATION")
-	fun `ExecutableMapReduceOperation#MapReduceWithProjection#asType(KClass) extension should call its Java counterpart`() {
-
-		operationWithProjection.asType(User::class)
-		verify { operationWithProjection.`as`(User::class.java) }
-	}
-
 	@Test // DATAMONGO-1929, DATAMONGO-2086
 	fun `ExecutableMapReduceOperation#MapReduceWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
index 7d1abf20da..81e1702114 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableRemoveOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,14 +28,6 @@ class ExecutableRemoveOperationExtensionsTests {
 
 	val operation = mockk<ExecutableRemoveOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `remove(KClass) extension should call its Java counterpart`() {
-
-		operation.remove(First::class)
-		verify { operation.remove(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `remove() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
index b76ce4b03f..86bddda4c8 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ExecutableUpdateOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,14 +30,6 @@ class ExecutableUpdateOperationExtensionsTests {
 
 	val operation = mockk<ExecutableUpdateOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1719
-	@Suppress("DEPRECATION")
-	fun `update(KClass) extension should call its Java counterpart`() {
-
-		operation.update(First::class)
-		verify { operation.update(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1719
 	fun `update() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
index ee70b344d3..1fc68c85c5 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/MongoOperationsExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,8 +23,6 @@ import org.junit.Test
 import org.springframework.data.mongodb.core.BulkOperations.BulkMode
 import org.springframework.data.mongodb.core.aggregation.Aggregation
 import org.springframework.data.mongodb.core.mapreduce.MapReduceOptions
-import org.springframework.data.mongodb.core.query.Criteria
-import org.springframework.data.mongodb.core.query.NearQuery
 import org.springframework.data.mongodb.core.query.Query
 import org.springframework.data.mongodb.core.query.Update
 
@@ -37,14 +35,6 @@ class MongoOperationsExtensionsTests {
 
 	val operations = mockk<MongoOperations>(relaxed = true)
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `getCollectionName(KClass) extension should call its Java counterpart`() {
-
-		operations.getCollectionName(First::class)
-		verify { operations.getCollectionName(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `getCollectionName() with reified type parameter extension should call its Java counterpart`() {
 
@@ -77,23 +67,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.stream(query, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `createCollection(KClass) extension should call its Java counterpart`() {
-
-		operations.createCollection(First::class)
-		verify { operations.createCollection(First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `createCollection(KClass, CollectionOptions) extension should call its Java counterpart`() {
-
-		val collectionOptions = mockk<CollectionOptions>()
-		operations.createCollection(First::class, collectionOptions)
-		verify { operations.createCollection(First::class.java, collectionOptions) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `createCollection() with reified type parameter extension should call its Java counterpart`() {
 
@@ -109,15 +82,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.createCollection(First::class.java, collectionOptions) }
 	}
 
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `collectionExists(KClass) extension should call its Java counterpart`() {
-
-		operations.collectionExists(First::class)
-		verify { operations.collectionExists(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `collectionExists() with reified type parameter extension should call its Java counterpart`() {
 
@@ -125,14 +89,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.collectionExists(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `dropCollection(KClass) extension should call its Java counterpart`() {
-
-		operations.dropCollection(First::class)
-		verify { operations.dropCollection(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `dropCollection() with reified type parameter extension should call its Java counterpart`() {
 
@@ -140,14 +96,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.dropCollection(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `indexOps(KClass) extension should call its Java counterpart`() {
-
-		operations.indexOps(First::class)
-		verify { operations.indexOps(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `indexOps() with reified type parameter extension should call its Java counterpart`() {
 
@@ -155,27 +103,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.indexOps(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `bulkOps(BulkMode, KClass) extension should call its Java counterpart`() {
-
-		val bulkMode = BulkMode.ORDERED
-
-		operations.bulkOps(bulkMode, First::class)
-		verify { operations.bulkOps(bulkMode, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `bulkOps(BulkMode, KClass, String) extension should call its Java counterpart`() {
-
-		val bulkMode = BulkMode.ORDERED
-		val collectionName = "foo"
-
-		operations.bulkOps(bulkMode, First::class, collectionName)
-		verify { operations.bulkOps(bulkMode, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `bulkOps(BulkMode) with reified type parameter extension should call its Java counterpart`() {
 
@@ -211,37 +138,19 @@ class MongoOperationsExtensionsTests {
 		verify { operations.findAll(First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `group(String, GroupBy) with reified type parameter extension should call its Java counterpart`() {
-
-		val collectionName = "foo"
-		val groupBy = mockk<org.springframework.data.mongodb.core.mapreduce.GroupBy>()
-
-		operations.group<First>(collectionName, groupBy)
-		verify { operations.group(collectionName, groupBy, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `group(Criteria, String, GroupBy) with reified type parameter extension should call its Java counterpart`() {
-
-		val criteria = mockk<Criteria>()
-		val collectionName = "foo"
-		val groupBy = mockk<org.springframework.data.mongodb.core.mapreduce.GroupBy>()
-
-		operations.group<First>(criteria, collectionName, groupBy)
-		verify { operations.group(criteria, collectionName, groupBy, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `aggregate(Aggregation, KClass) with reified type parameter extension should call its Java counterpart`() {
+	@Test // #3508
+	fun `aggregate(Aggregation) with reified type parameter extension should call its Java counterpart`() {
 
 		val aggregation = mockk<Aggregation>()
 
-		operations.aggregate<First>(aggregation, Second::class)
-		verify { operations.aggregate(aggregation, Second::class.java, First::class.java) }
+		operations.aggregate<Second, First>(aggregation)
+		verify {
+			operations.aggregate(
+				aggregation,
+				Second::class.java,
+				First::class.java
+			)
+		}
 	}
 
 	@Test // DATAMONGO-1689
@@ -254,14 +163,19 @@ class MongoOperationsExtensionsTests {
 		verify { operations.aggregate(aggregation, collectionName, First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `aggregateStream(Aggregation, KClass) with reified type parameter extension should call its Java counterpart`() {
+	@Test // #3508
+	fun `aggregateStream(Aggregation) with reified type parameter extension should call its Java counterpart`() {
 
 		val aggregation = mockk<Aggregation>()
 
-		operations.aggregateStream<First>(aggregation, Second::class)
-		verify { operations.aggregateStream(aggregation, Second::class.java, First::class.java) }
+		operations.aggregateStream<Second, First>(aggregation)
+		verify {
+			operations.aggregateStream(
+				aggregation,
+				Second::class.java,
+				First::class.java
+			)
+		}
 	}
 
 	@Test // DATAMONGO-1689
@@ -271,7 +185,13 @@ class MongoOperationsExtensionsTests {
 		val collectionName = "foo"
 
 		operations.aggregateStream<First>(aggregation, collectionName)
-		verify { operations.aggregateStream(aggregation, collectionName, First::class.java) }
+		verify {
+			operations.aggregateStream(
+				aggregation,
+				collectionName,
+				First::class.java
+			)
+		}
 	}
 
 	@Test // DATAMONGO-1689
@@ -322,27 +242,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.mapReduce(query, collectionName, mapFunction, reduceFunction, options, First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `geoNear(Query) with reified type parameter extension should call its Java counterpart`() {
-
-		val query = NearQuery.near(0.0, 0.0)
-
-		operations.geoNear<First>(query)
-		verify { operations.geoNear(query, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `geoNear(Query, String) with reified type parameter extension should call its Java counterpart`() {
-
-		val collectionName = "foo"
-		val query = NearQuery.near(0.0, 0.0)
-
-		operations.geoNear<First>(query, collectionName)
-		verify { operations.geoNear(query, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `findOne(Query) with reified type parameter extension should call its Java counterpart`() {
 
@@ -362,16 +261,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.findOne(query, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `exists(Query, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.exists(query, First::class)
-		verify { operations.exists(query, First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `exists(Query) with reified type parameter extension should call its Java counterpart`() {
 
@@ -487,37 +376,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.count(query, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `count(Query, KClass) with reified type parameter extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.count(query, First::class)
-		verify { operations.count(query, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `count(Query, KClass, String) with reified type parameter extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val collectionName = "foo"
-
-		operations.count(query, First::class, collectionName)
-		verify { operations.count(query, First::class.java, collectionName) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `insert(Collection, KClass) extension should call its Java counterpart`() {
-
-		val collection = listOf(First(), First())
-
-		operations.insert(collection, First::class)
-		verify { operations.insert(collection, First::class.java) }
-	}
-
 	@Test // DATAMONGO-2208
 	fun `insert(Collection) with reified type parameter extension should call its Java counterpart`() {
 
@@ -527,29 +385,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.insert(collection, First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `upsert(Query, Update, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-
-		operations.upsert(query, update, First::class)
-		verify { operations.upsert(query, update, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `upsert(Query, Update, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-		val collectionName = "foo"
-
-		operations.upsert(query, update, First::class, collectionName)
-		verify { operations.upsert(query, update, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `upsert(Query, Update) with reified type parameter extension should call its Java counterpart`() {
 
@@ -571,29 +406,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.upsert(query, update, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateFirst(Query, Update, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-
-		operations.updateFirst(query, update, First::class)
-		verify { operations.updateFirst(query, update, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateFirst(Query, Update, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-		val collectionName = "foo"
-
-		operations.updateFirst(query, update, First::class, collectionName)
-		verify { operations.updateFirst(query, update, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `updateFirst(Query, Update) with reified type parameter extension should call its Java counterpart`() {
 
@@ -615,29 +427,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.updateFirst(query, update, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateMulti(Query, Update, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-
-		operations.updateMulti(query, update, First::class)
-		verify { operations.updateMulti(query, update, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateMulti(Query, Update, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-		val collectionName = "foo"
-
-		operations.updateMulti(query, update, First::class, collectionName)
-		verify { operations.updateMulti(query, update, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `updateMulti(Query, Update) with reified type parameter extension should call its Java counterpart`() {
 
@@ -659,27 +448,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.updateMulti(query, update, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `remove(Query, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.remove(query, First::class)
-		verify { operations.remove(query, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `remove(Query, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val collectionName = "foo"
-
-		operations.remove(query, First::class, collectionName)
-		verify { operations.remove(query, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `remove(Query) with reified type parameter extension should call its Java counterpart`() {
 
@@ -708,34 +476,6 @@ class MongoOperationsExtensionsTests {
 		verify { operations.findAllAndRemove(query, First::class.java) }
 	}
 
-	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(String, KClass) should call java counterpart`() {
-
-		operations.findDistinct<String>("field", First::class)
-		verify { operations.findDistinct("field", First::class.java, String::class.java) }
-	}
-
-	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(Query, String, KClass) should call java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.findDistinct<String>(query, "field", First::class)
-		verify { operations.findDistinct(query, "field", First::class.java, String::class.java) }
-	}
-
-	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(Query, String, String, KClass) should call java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.findDistinct<String>(query, "field", "collection", First::class)
-		verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
-	}
-
 	@Test // DATAMONGO-1761
 	fun `findDistinctImplicit(Query, String) should call java counterpart`() {
 
@@ -753,14 +493,4 @@ class MongoOperationsExtensionsTests {
 		operations.findDistinct<String, First>(query, "field", "collection")
 		verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
 	}
-
-	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(Query, String,  KClass) should call java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.findDistinct<String>(query, "field", First::class)
-		verify { operations.findDistinct(query, "field", First::class.java, String::class.java) }
-	}
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
index 02390898d8..4249b58468 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveAggregationOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,14 +33,6 @@ class ReactiveAggregationOperationExtensionsTests {
 
 	val operation = mockk<ReactiveAggregationOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1719
-	@Suppress("DEPRECATION")
-	fun `aggregateAndReturn(KClass) extension should call its Java counterpart`() {
-
-		operation.aggregateAndReturn(First::class)
-		verify { operation.aggregateAndReturn(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1719
 	fun `aggregateAndReturn() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt
index 1ce0337255..58c071ccb6 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveChangeStreamOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 the original author or authors.
+ * Copyright 2019-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
index 117b95383f..99d57002e4 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveFindOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,13 +42,9 @@ class ReactiveFindOperationExtensionsTests {
 
 	val distinctWithProjection = mockk<ReactiveFindOperation.DistinctWithProjection>(relaxed = true)
 
-	@Test // DATAMONGO-1719
-	@Suppress("DEPRECATION")
-	fun `ReactiveFind#query(KClass) extension should call its Java counterpart`() {
+	val findDistinct = mockk<ReactiveFindOperation.FindDistinct>(relaxed = true)
 
-		operation.query(First::class)
-		verify { operation.query(First::class.java) }
-	}
+	val reactiveFind = mockk<ReactiveFindOperation.ReactiveFind<KotlinUser>>(relaxed = true)
 
 	@Test // DATAMONGO-1719
 	fun `ReactiveFind#query() with reified type parameter extension should call its Java counterpart`() {
@@ -57,14 +53,6 @@ class ReactiveFindOperationExtensionsTests {
 		verify { operation.query(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1719, DATAMONGO-2086
-	@Suppress("DEPRECATION")
-	fun `ReactiveFind#FindOperatorWithProjection#asType(KClass) extension should call its Java counterpart`() {
-
-		operationWithProjection.asType(User::class)
-		verify { operationWithProjection.`as`(User::class.java) }
-	}
-
 	@Test // DATAMONGO-1719, DATAMONGO-2086
 	fun `ReactiveFind#FindOperatorWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
@@ -72,14 +60,6 @@ class ReactiveFindOperationExtensionsTests {
 		verify { operationWithProjection.`as`(User::class.java) }
 	}
 
-	@Test // DATAMONGO-1761, DATAMONGO-2086
-	@Suppress("DEPRECATION")
-	fun `ReactiveFind#DistinctWithProjection#asType(KClass) extension should call its Java counterpart`() {
-
-		distinctWithProjection.asType(User::class)
-		verify { distinctWithProjection.`as`(User::class.java) }
-	}
-
 	@Test // DATAMONGO-2086
 	fun `ReactiveFind#DistinctWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
@@ -87,6 +67,25 @@ class ReactiveFindOperationExtensionsTests {
 		verify { distinctWithProjection.`as`(User::class.java) }
 	}
 
+	@Test // DATAMONGO-2417
+	fun `ReactiveFind#distrinct() using KProperty1 should call its Java counterpart`() {
+
+		every { operation.query(KotlinUser::class.java) } returns reactiveFind
+
+		operation.distinct(KotlinUser::username)
+		verify {
+			operation.query(KotlinUser::class.java)
+			reactiveFind.distinct("username")
+		}
+	}
+
+	@Test // DATAMONGO-2417
+	fun `ReactiveFind#FindDistinct#field() using KProperty should call its Java counterpart`() {
+
+		findDistinct.distinct(KotlinUser::username)
+		verify { findDistinct.distinct("username") }
+	}
+
 	@Test // DATAMONGO-2209
 	fun terminatingFindAwaitOneWithValue() {
 
@@ -271,9 +270,9 @@ class ReactiveFindOperationExtensionsTests {
 	fun terminatingFindNearAllAsFlow() {
 
 		val spec = mockk<ReactiveFindOperation.TerminatingFindNear<String>>()
-		val foo = GeoResult("foo", Distance(0.0))
-		val bar = GeoResult("bar", Distance(0.0))
-		val baz = GeoResult("baz", Distance(0.0))
+		val foo = GeoResult("foo", Distance.of(0.0))
+		val bar = GeoResult("bar", Distance.of(0.0))
+		val baz = GeoResult("baz", Distance.of(0.0))
 		every { spec.all() } returns Flux.just(foo, bar, baz)
 
 		runBlocking {
@@ -299,4 +298,6 @@ class ReactiveFindOperationExtensionsTests {
 			spec.all()
 		}
 	}
+
+	data class KotlinUser(val username: String)
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
index 0a2ab286e2..888d890655 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveInsertOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,14 +34,6 @@ class ReactiveInsertOperationExtensionsTests {
 
 	val operation = mockk<ReactiveInsertOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1719
-	@Suppress("DEPRECATION")
-	fun `insert(KClass) extension should call its Java counterpart`() {
-
-		operation.insert(First::class)
-		verify { operation.insert(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1719
 	fun `insert() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
index e17748ab4a..a71f9d5a70 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMapReduceOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,14 +35,6 @@ class ReactiveMapReduceOperationExtensionsTests {
 
 	val operationWithProjection = mockk<ReactiveMapReduceOperation.MapReduceWithProjection<First>>(relaxed = true)
 
-	@Test // DATAMONGO-1929
-	@Suppress("DEPRECATION")
-	fun `ReactiveMapReduceOperation#mapReduce(KClass) extension should call its Java counterpart`() {
-
-		operation.mapReduce(First::class)
-		verify { operation.mapReduce(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1929
 	fun `ReactiveMapReduceOperation#mapReduce() with reified type parameter extension should call its Java counterpart`() {
 
@@ -50,14 +42,6 @@ class ReactiveMapReduceOperationExtensionsTests {
 		verify { operation.mapReduce(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1929, DATAMONGO-2086
-	@Suppress("DEPRECATION")
-	fun `ReactiveMapReduceOperation#MapReduceWithProjection#asType(KClass) extension should call its Java counterpart`() {
-
-		operationWithProjection.asType(User::class)
-		verify { operationWithProjection.`as`(User::class.java) }
-	}
-
 	@Test // DATAMONGO-1929, DATAMONGO-2086
 	fun `ReactiveMapReduceOperation#MapReduceWithProjection#asType() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
index 6b3d3e1b15..386e1aae56 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveMongoOperationsExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,28 +19,21 @@ import example.first.First
 import io.mockk.mockk
 import io.mockk.verify
 import org.junit.Test
-import org.springframework.data.mongodb.core.query.NearQuery
+import org.springframework.data.mongodb.core.aggregation.Aggregation
+import org.springframework.data.mongodb.core.aggregation.TypedAggregation
 import org.springframework.data.mongodb.core.query.Query
 import org.springframework.data.mongodb.core.query.Update
-import reactor.core.publisher.Mono
 
 /**
  * @author Sebastien Deleuze
  * @author Christoph Strobl
  * @author Mark Paluch
+ * @author Wonwoo Lee
  */
 class ReactiveMongoOperationsExtensionsTests {
 
 	val operations = mockk<ReactiveMongoOperations>(relaxed = true)
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `indexOps(KClass) extension should call its Java counterpart`() {
-
-		operations.indexOps(First::class)
-		verify { operations.indexOps(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `indexOps() with reified type parameter extension should call its Java counterpart`() {
 
@@ -57,24 +50,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.execute(First::class.java, collectionCallback) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `createCollection(KClass) extension should call its Java counterpart`() {
-
-		operations.createCollection(First::class)
-		verify { operations.createCollection(First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `createCollection(KClass, CollectionOptions) extension should call its Java counterpart`() {
-
-		val collectionOptions = mockk<CollectionOptions>()
-
-		operations.createCollection(First::class, collectionOptions)
-		verify { operations.createCollection(First::class.java, collectionOptions) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `createCollection() with reified type parameter extension should call its Java counterpart`() {
 
@@ -91,14 +66,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.createCollection(First::class.java, collectionOptions) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `collectionExists(KClass) extension should call its Java counterpart`() {
-
-		operations.collectionExists(First::class)
-		verify { operations.collectionExists(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `collectionExists() with reified type parameter extension should call its Java counterpart`() {
 
@@ -106,14 +73,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.collectionExists(First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `dropCollection(KClass) extension should call its Java counterpart`() {
-
-		operations.dropCollection(First::class)
-		verify { operations.dropCollection(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `dropCollection() with reified type parameter extension should call its Java counterpart`() {
 
@@ -156,16 +115,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.findOne(query, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `exists(Query, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.exists(query, First::class)
-		verify { operations.exists(query, First::class.java) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `exists(Query) with reified type parameter extension should call its Java counterpart`() {
 
@@ -213,27 +162,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.findById(id, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `geoNear(Query) with reified type parameter extension should call its Java counterpart`() {
-
-		val query = NearQuery.near(0.0, 0.0)
-
-		operations.geoNear<First>(query)
-		verify { operations.geoNear(query, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `geoNear(Query, String) with reified type parameter extension should call its Java counterpart`() {
-
-		val collectionName = "foo"
-		val query = NearQuery.near(0.0, 0.0)
-
-		operations.geoNear<First>(query, collectionName)
-		verify { operations.geoNear(query, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `findAndModify(Query, Update, FindAndModifyOptions) with reified type parameter extension should call its Java counterpart`() {
 
@@ -302,37 +230,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.count(query, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `count(Query, KClass) with reified type parameter extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.count(query, First::class)
-		verify { operations.count(query, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `count(Query, KClass, String) with reified type parameter extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val collectionName = "foo"
-
-		operations.count(query, First::class, collectionName)
-		verify { operations.count(query, First::class.java, collectionName) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `insert(Collection, KClass) extension should call its Java counterpart`() {
-
-		val collection = listOf(First(), First())
-
-		operations.insert(collection, First::class)
-		verify { operations.insert(collection, First::class.java) }
-	}
-
 	@Test // DATAMONGO-2208
 	fun `insert(Collection) with reified type parameter extension should call its Java counterpart`() {
 
@@ -342,39 +239,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.insert(collection, First::class.java) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `insertAll(Mono, KClass) extension should call its Java counterpart`() {
-
-		val collection = Mono.just(listOf(First(), First()))
-
-		operations.insertAll(collection, First::class)
-		verify { operations.insertAll(collection, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `upsert(Query, Update, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-
-		operations.upsert(query, update, First::class)
-		verify { operations.upsert(query, update, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `upsert(Query, Update, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-		val collectionName = "foo"
-
-		operations.upsert(query, update, First::class, collectionName)
-		verify { operations.upsert(query, update, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `upsert(Query, Update) with reified type parameter extension should call its Java counterpart`() {
 
@@ -396,29 +260,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.upsert(query, update, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateFirst(Query, Update, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-
-		operations.updateFirst(query, update, First::class)
-		verify { operations.updateFirst(query, update, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateFirst(Query, Update, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-		val collectionName = "foo"
-
-		operations.updateFirst(query, update, First::class, collectionName)
-		verify { operations.updateFirst(query, update, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `updateFirst(Query, Update) with reified type parameter extension should call its Java counterpart`() {
 
@@ -440,29 +281,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.updateFirst(query, update, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateMulti(Query, Update, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-
-		operations.updateMulti(query, update, First::class)
-		verify { operations.updateMulti(query, update, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `updateMulti(Query, Update, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val update = mockk<Update>()
-		val collectionName = "foo"
-
-		operations.updateMulti(query, update, First::class, collectionName)
-		verify { operations.updateMulti(query, update, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `updateMulti(Query, Update) with reified type parameter extension should call its Java counterpart`() {
 
@@ -484,27 +302,6 @@ class ReactiveMongoOperationsExtensionsTests {
 		verify { operations.updateMulti(query, update, First::class.java, collectionName) }
 	}
 
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `remove(Query, KClass) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-
-		operations.remove(query, First::class)
-		verify { operations.remove(query, First::class.java) }
-	}
-
-	@Test // DATAMONGO-1689
-	@Suppress("DEPRECATION")
-	fun `remove(Query, KClass, String) extension should call its Java counterpart`() {
-
-		val query = mockk<Query>()
-		val collectionName = "foo"
-
-		operations.remove(query, First::class, collectionName)
-		verify { operations.remove(query, First::class.java, collectionName) }
-	}
-
 	@Test // DATAMONGO-1689
 	fun `remove(Query) with reified type parameter extension should call its Java counterpart`() {
 
@@ -553,59 +350,62 @@ class ReactiveMongoOperationsExtensionsTests {
 	}
 
 	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(String, KClass) should call java counterpart`() {
-
-		operations.findDistinct<String>("field", First::class)
-		verify { operations.findDistinct("field", First::class.java, String::class.java) }
-	}
-
-	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(Query, String, KClass) should call java counterpart`() {
+	fun `findDistinctImplicit(Query, String) should call java counterpart`() {
 
 		val query = mockk<Query>()
 
-		operations.findDistinct<String>(query, "field", First::class)
+		operations.findDistinct<String, First>(query, "field")
 		verify { operations.findDistinct(query, "field", First::class.java, String::class.java) }
 	}
 
 	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(Query, String, String, KClass) should call java counterpart`() {
+	fun `findDistinct(Query, String, String) should call java counterpart`() {
 
 		val query = mockk<Query>()
 
-		operations.findDistinct<String>(query, "field", "collection", First::class)
+		operations.findDistinct<String, First>(query, "field", "collection")
 		verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
 	}
 
-	@Test // DATAMONGO-1761
-	fun `findDistinctImplicit(Query, String) should call java counterpart`() {
+	@Test  // #893
+	fun `aggregate(TypedAggregation, String, KClass) should call java counterpart`() {
 
-		val query = mockk<Query>()
+		val aggregation = mockk<TypedAggregation<String>>()
 
-		operations.findDistinct<String, First>(query, "field")
-		verify { operations.findDistinct(query, "field", First::class.java, String::class.java) }
+		operations.aggregate<First>(aggregation, "foo")
+		verify { operations.aggregate(aggregation, "foo", First::class.java) }
 	}
 
-	@Test // DATAMONGO-1761
-	fun `findDistinct(Query, String, String) should call java counterpart`() {
+	@Test // #893
+	fun `aggregate(TypedAggregation, KClass) should call java counterpart`() {
 
-		val query = mockk<Query>()
+		val aggregation = mockk<TypedAggregation<String>>()
 
-		operations.findDistinct<String, First>(query, "field", "collection")
-		verify { operations.findDistinct(query, "field", "collection", First::class.java, String::class.java) }
+		operations.aggregate<First>(aggregation)
+		verify { operations.aggregate(aggregation, First::class.java) }
 	}
 
+	@Test // #893
+	fun `aggregate(Aggregation, KClass) should call java counterpart`() {
 
-	@Test // DATAMONGO-1761
-	@Suppress("DEPRECATION")
-	fun `findDistinct(Query, String,  KClass) should call java counterpart`() {
+		val aggregation = mockk<Aggregation>()
 
-		val query = mockk<Query>()
+		operations.aggregate<String, First>(aggregation)
+		verify {
+			operations.aggregate(
+				aggregation,
+				String::class.java,
+				First::class.java
+			)
+		}
+	}
 
-		operations.findDistinct<String>(query, "field", First::class)
-		verify { operations.findDistinct(query, "field", First::class.java, String::class.java) }
+	@Test // #893
+	fun `aggregate(Aggregation, String) should call java counterpart`() {
+
+		val aggregation = mockk<Aggregation>()
+
+		operations.aggregate<First>(aggregation, "foo")
+		verify { operations.aggregate(aggregation, "foo", First::class.java) }
 	}
 }
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
index 8192722351..c824568418 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveRemoveOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,14 +35,6 @@ class ReactiveRemoveOperationExtensionsTests {
 
 	val operation = mockk<ReactiveRemoveOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1719
-	@Suppress("DEPRECATION")
-	fun `remove(KClass) extension should call its Java counterpart`() {
-
-		operation.remove(First::class)
-		verify { operation.remove(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1719
 	fun `remove() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
index 19f1a1b383..1c376389ea 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/ReactiveUpdateOperationExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,14 +36,6 @@ class ReactiveUpdateOperationExtensionsTests {
 
 	val operation = mockk<ReactiveUpdateOperation>(relaxed = true)
 
-	@Test // DATAMONGO-1719
-	@Suppress("DEPRECATION")
-	fun `update(KClass) extension should call its Java counterpart`() {
-
-		operation.update(First::class)
-		verify { operation.update(First::class.java) }
-	}
-
 	@Test // DATAMONGO-1719
 	fun `update() with reified type parameter extension should call its Java counterpart`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/MappingMongoConverterKtUnitTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/MappingMongoConverterKtUnitTests.kt
new file mode 100644
index 0000000000..797c9d41ff
--- /dev/null
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/MappingMongoConverterKtUnitTests.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024-2025 the original author 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.convert
+
+import org.assertj.core.api.Assertions.assertThat
+import org.bson.Document
+import org.junit.jupiter.api.Test
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext
+
+/**
+ * Kotlin unit tests for [MappingMongoConverter].
+ *
+ * @author Mark Paluch
+ */
+class MappingMongoConverterKtUnitTests {
+
+	@Test // GH-4485
+	fun shouldIgnoreNonReadableProperties() {
+
+		val document = Document.parse("{_id: 'baz', type: 'SOME_VALUE'}")
+		val converter =
+			MappingMongoConverter(NoOpDbRefResolver.INSTANCE, MongoMappingContext())
+
+		val tx = converter.read(SpecialTransaction::class.java, document)
+
+		assertThat(tx.id).isEqualTo("baz")
+		assertThat(tx.type).isEqualTo("SOME_DEFAULT_VALUE")
+	}
+}
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/SpecialTransaction.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/SpecialTransaction.kt
new file mode 100644
index 0000000000..95643dfa70
--- /dev/null
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/convert/SpecialTransaction.kt
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2024-2025 the original author 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.convert
+
+abstract class SomeTransaction() {
+
+	abstract val id: String
+	abstract val type: String
+}
+
+data class SpecialTransaction(override val id: String) : SomeTransaction() {
+	override val type: String = "SOME_DEFAULT_VALUE"
+}
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensionsTests.kt
index ba6378f4c0..a5e20487ff 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/CriteriaExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2025 the original author 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,6 +19,7 @@ import io.mockk.mockk
 import io.mockk.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
+import org.springframework.data.mapping.div
 
 /**
  * @author Sebastien Deleuze
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/KPropertyPathTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/KPropertyPathTests.kt
deleted file mode 100644
index 6df60cf9e7..0000000000
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/KPropertyPathTests.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.mongodb.core.query
-
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
-
-/**
- * @author Tjeu Kayim
- */
-class KPropertyPathTests {
-
-	@Test
-	fun `Convert normal KProperty to field name`() {
-
-		val property = asString(Book::title)
-
-		assertThat(property).isEqualTo("title")
-	}
-
-	@Test
-	fun `Convert nested KProperty to field name`() {
-
-		val property = asString(Book::author / Author::name)
-
-		assertThat(property).isEqualTo("author.name")
-	}
-
-	@Test
-	fun `Convert double nested KProperty to field name`() {
-
-		class Entity(val book: Book)
-
-		val property = asString(Entity::book / Book::author / Author::name)
-
-		assertThat(property).isEqualTo("book.author.name")
-	}
-
-	@Test
-	fun `Convert triple nested KProperty to field name`() {
-
-		class Entity(val book: Book)
-		class AnotherEntity(val entity: Entity)
-
-		val property = asString(AnotherEntity::entity / Entity::book / Book::author / Author::name)
-
-		assertThat(property).isEqualTo("entity.book.author.name")
-	}
-
-	class Book(val title: String, val author: Author)
-	class Author(val name: String)
-}
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt
index 56386da25f..88b2bcf050 100644
--- a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedCriteriaExtensionsTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2019 the original author or authors.
+ * Copyright 2018-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,17 @@ import org.bson.BsonRegularExpression
 import org.junit.Test
 import org.springframework.data.geo.Circle
 import org.springframework.data.geo.Point
+import org.springframework.data.mapping.div
 import org.springframework.data.mongodb.core.geo.GeoJsonPoint
 import org.springframework.data.mongodb.core.schema.JsonSchemaObject.Type
 import java.util.regex.Pattern
 
 /**
+ * Unit tests for [Criteria] extensions.
+ *
  * @author Tjeu Kayim
  * @author Mark Paluch
+ * @author Sangyong Choi
  */
 class TypedCriteriaExtensionsTests {
 
@@ -317,6 +321,54 @@ class TypedCriteriaExtensionsTests {
 		assertThat(typed).isEqualTo(expected)
 	}
 
+	@Test
+	fun `maxDistance() should equal expected criteria with nearSphere`() {
+
+		val point = Point(0.0, 0.0)
+		val typed = Building::location nearSphere point maxDistance 3.0
+		val expected = Criteria("location")
+			.nearSphere(point)
+			.maxDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
+	@Test
+	fun `minDistance() should equal expected criteria with nearSphere`() {
+
+		val point = Point(0.0, 0.0)
+		val typed = Building::location nearSphere point minDistance 3.0
+		val expected = Criteria("location")
+			.nearSphere(point)
+			.minDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
+	@Test
+	fun `maxDistance() should equal expected criteria with near`() {
+
+		val point = Point(0.0, 0.0)
+		val typed = Building::location near point maxDistance 3.0
+		val expected = Criteria("location")
+			.near(point)
+			.maxDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
+	@Test
+	fun `minDistance() should equal expected criteria with near`() {
+
+		val point = Point(0.0, 0.0)
+		val typed = Building::location near point minDistance 3.0
+		val expected = Criteria("location")
+			.near(point)
+			.minDistance(3.0)
+
+		assertThat(typed).isEqualTo(expected)
+	}
+
 	@Test
 	fun `elemMatch() should equal expected criteria`() {
 
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedUpdateExtensionsTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedUpdateExtensionsTests.kt
new file mode 100644
index 0000000000..2d2b2c6847
--- /dev/null
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/core/query/TypedUpdateExtensionsTests.kt
@@ -0,0 +1,251 @@
+/*
+ * Copyright 2024-2025 the original author 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.query
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.springframework.data.mapping.div
+import java.time.Instant
+
+/**
+ * Unit tests for [Update] extensions.
+ *
+ * @author Pawel Matysek
+ */
+class TypedUpdateExtensionsTests {
+
+    @Test // GH-3028
+    fun `update() should equal expected Update`() {
+
+        val typed = update(Book::title, "Moby-Dick")
+        val expected = Update.update("title", "Moby-Dick")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `set() should equal expected Update`() {
+
+        val typed = Update().set(Book::title, "Moby-Dick")
+        val expected = Update().set("title", "Moby-Dick")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `setOnInsert() should equal expected Update`() {
+
+        val typed = Update().setOnInsert(Book::title, "Moby-Dick")
+        val expected = Update().setOnInsert("title", "Moby-Dick")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `unset() should equal expected Update`() {
+
+        val typed = Update().unset(Book::title)
+        val expected = Update().unset("title")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `inc(key, inc) should equal expected Update`() {
+
+        val typed = Update().inc(Book::price, 5)
+        val expected = Update().inc("price", 5)
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `inc(key) should equal expected Update`() {
+
+        val typed = Update().inc(Book::price)
+        val expected = Update().inc("price")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `push(key, value) should equal expected Update`() {
+
+        val typed = Update().push(Book::categories, "someCategory")
+        val expected = Update().push("categories", "someCategory")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `push(key) should equal expected Update`() {
+
+        val typed = Update().push(Book::categories)
+        val expected = Update().push("categories")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `addToSet(key) should equal expected Update`() {
+
+        val typed = Update().addToSet(Book::categories).each("category", "category2")
+        val expected = Update().addToSet("categories").each("category", "category2")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `addToSet(key, value) should equal expected Update`() {
+
+        val typed = Update().addToSet(Book::categories, "someCategory")
+        val expected = Update().addToSet("categories", "someCategory")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `pop() should equal expected Update`() {
+
+        val typed = Update().pop(Book::categories, Update.Position.FIRST)
+        val expected = Update().pop("categories", Update.Position.FIRST)
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `pull() should equal expected Update`() {
+
+        val typed = Update().pull(Book::categories, "someCategory")
+        val expected = Update().pull("categories", "someCategory")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `pullAll() should equal expected Update`() {
+
+        val typed = Update().pullAll(Book::categories, arrayOf("someCategory", "someCategory2"))
+        val expected = Update().pullAll("categories", arrayOf("someCategory", "someCategory2"))
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `currentDate() should equal expected Update`() {
+
+        val typed = Update().currentDate(Book::releaseDate)
+        val expected = Update().currentDate("releaseDate")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `currentTimestamp() should equal expected Update`() {
+
+        val typed = Update().currentTimestamp(Book::releaseDate)
+        val expected = Update().currentTimestamp("releaseDate")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `multiply() should equal expected Update`() {
+
+        val typed = Update().multiply(Book::price, 2)
+        val expected = Update().multiply("price", 2)
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `max() should equal expected Update`() {
+
+        val typed = Update().max(Book::price, 200)
+        val expected = Update().max("price", 200)
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `min() should equal expected Update`() {
+
+        val typed = Update().min(Book::price, 100)
+        val expected = Update().min("price", 100)
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `bitwise() should equal expected Update`() {
+
+        val typed = Update().bitwise(Book::price).and(2)
+        val expected = Update().bitwise("price").and(2)
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `filterArray() should equal expected Update`() {
+
+        val typed = Update().filterArray(Book::categories, "someCategory")
+        val expected = Update().filterArray("categories", "someCategory")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `typed modifies() should equal expected modifies()`() {
+
+        val typed = update(Book::title, "Moby-Dick")
+
+        assertThat(typed.modifies(Book::title)).isEqualTo(typed.modifies("title"))
+        assertThat(typed.modifies(Book::price)).isEqualTo(typed.modifies("price"))
+    }
+
+    @Test // GH-3028
+    fun `One level nested should equal expected Update`() {
+
+        val typed = update(Book::author / Author::name, "Herman Melville")
+        val expected = Update.update("author.name", "Herman Melville")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    @Test // GH-3028
+    fun `Two levels nested should equal expected Update`() {
+
+        data class Entity(val book: Book)
+
+        val typed = update(Entity::book / Book::author / Author::name, "Herman Melville")
+        val expected = Update.update("book.author.name", "Herman Melville")
+
+        assertThat(typed).isEqualTo(expected)
+    }
+
+    data class Book(
+        val title: String = "Moby-Dick",
+        val price: Int = 123,
+        val available: Boolean = true,
+        val categories: List<String> = emptyList(),
+        val author: Author = Author(),
+        val releaseDate: Instant,
+    )
+
+    data class Author(
+		val name: String = "Herman Melville",
+	)
+}
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/CoroutineRepositoryUnitTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/CoroutineRepositoryUnitTests.kt
new file mode 100644
index 0000000000..af3744a900
--- /dev/null
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/CoroutineRepositoryUnitTests.kt
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2020-2025 the original author 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.repository
+
+import com.mongodb.client.result.DeleteResult
+import io.mockk.every
+import io.mockk.mockk
+import kotlinx.coroutines.runBlocking
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.data.annotation.Id
+import org.springframework.data.mongodb.core.ReactiveMongoOperations
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext
+import org.springframework.data.mongodb.repository.support.ReactiveMongoRepositoryFactory
+import org.springframework.data.repository.kotlin.CoroutineCrudRepository
+import reactor.core.publisher.Mono
+
+/**
+ * Unit tests for Kotlin Coroutine repositories.
+ *
+ * @author Mark Paluch
+ */
+class CoroutineRepositoryUnitTests {
+
+	val operations = mockk<ReactiveMongoOperations>(relaxed = true)
+	lateinit var repositoryFactory: ReactiveMongoRepositoryFactory
+
+	@BeforeEach
+	fun before() {
+
+		every { operations.getConverter() } returns MappingMongoConverter(NoOpDbRefResolver.INSTANCE, MongoMappingContext())
+		repositoryFactory = ReactiveMongoRepositoryFactory(operations)
+	}
+
+	@Test // DATAMONGO-2601
+	fun `should discard result of suspended query method without result`() {
+
+		every { operations.remove(any(), any(), any()) } returns Mono.just(DeleteResult.acknowledged(1))
+
+		val repository = repositoryFactory.getRepository(PersonRepository::class.java)
+
+		runBlocking {
+			repository.deleteAllByName("foo")
+		}
+	}
+
+	interface PersonRepository : CoroutineCrudRepository<Person, Long> {
+
+		suspend fun deleteAllByName(name: String)
+	}
+
+	data class Person(@Id var id: Long, var name: String)
+}
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/KotlinRepositoryUnitTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/KotlinRepositoryUnitTests.kt
new file mode 100644
index 0000000000..96e1b679d2
--- /dev/null
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/KotlinRepositoryUnitTests.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2020-2025 the original author 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.repository
+
+import io.mockk.every
+import io.mockk.mockk
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.springframework.data.annotation.Id
+import org.springframework.data.mongodb.core.MongoOperations
+import org.springframework.data.mongodb.core.convert.MappingMongoConverter
+import org.springframework.data.mongodb.core.convert.NoOpDbRefResolver
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext
+import org.springframework.data.mongodb.repository.support.MongoRepositoryFactory
+import org.springframework.data.repository.CrudRepository
+
+/**
+ * Unit tests for Kotlin repositories.
+ *
+ * @author Mark Paluch
+ */
+class KotlinRepositoryUnitTests {
+
+	val operations = mockk<MongoOperations>(relaxed = true)
+	lateinit var repositoryFactory: MongoRepositoryFactory
+
+	@BeforeEach
+	fun before() {
+
+		every { operations.getConverter() } returns MappingMongoConverter(NoOpDbRefResolver.INSTANCE, MongoMappingContext())
+		repositoryFactory = MongoRepositoryFactory(operations)
+	}
+
+	@Test // DATAMONGO-2601
+	fun shouldSupportDeleteMethods() {
+
+		val repository = repositoryFactory.getRepository(PersonRepository::class.java)
+
+		repository.deleteAllByName("foo")
+	}
+
+	interface PersonRepository : CrudRepository<Person, Long> {
+
+		fun deleteAllByName(name: String)
+	}
+
+	data class Person(@Id var id: Long, var name: String)
+}
diff --git a/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethodCoroutineUnitTests.kt b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethodCoroutineUnitTests.kt
new file mode 100644
index 0000000000..b3e5c013b9
--- /dev/null
+++ b/spring-data-mongodb/src/test/kotlin/org/springframework/data/mongodb/repository/query/ReactiveMongoQueryMethodCoroutineUnitTests.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2020-2025 the original author 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.repository.query
+
+import kotlinx.coroutines.flow.Flow
+import org.assertj.core.api.Assertions.assertThat
+import org.assertj.core.api.Assertions.assertThatNoException
+import org.junit.jupiter.api.Test
+import org.springframework.data.mongodb.core.mapping.MongoMappingContext
+import org.springframework.data.mongodb.repository.Person
+import org.springframework.data.mongodb.repository.Update
+import org.springframework.data.projection.SpelAwareProxyProjectionFactory
+import org.springframework.data.repository.core.support.DefaultRepositoryMetadata
+import org.springframework.data.repository.kotlin.CoroutineCrudRepository
+import kotlin.coroutines.Continuation
+
+/**
+ * Unit tests for [ReactiveMongoQueryMethod] using Coroutine repositories.
+ *
+ * @author Mark Paluch
+ */
+class ReactiveMongoQueryMethodCoroutineUnitTests {
+
+	val projectionFactory = SpelAwareProxyProjectionFactory()
+
+	interface PersonRepository : CoroutineCrudRepository<Person, String> {
+
+		suspend fun findSuspendAllByName(): Flow<Person>
+
+		fun findAllByName(): Flow<Person>
+
+		suspend fun findSuspendByName(): List<Person>
+
+		@Update("{ \$inc: { age: 1 } }")
+		suspend fun findAndIncrementAgeByName(name: String)
+	}
+
+	@Test // DATAMONGO-2562
+	internal fun `should consider methods returning Flow as collection queries`() {
+
+		val method = PersonRepository::class.java.getMethod("findAllByName")
+		val queryMethod = ReactiveMongoQueryMethod(method, DefaultRepositoryMetadata(PersonRepository::class.java), projectionFactory, MongoMappingContext())
+
+		assertThat(queryMethod.isCollectionQuery).isTrue()
+	}
+
+	@Test // DATAMONGO-2562
+	internal fun `should consider suspended methods returning Flow as collection queries`() {
+
+		val method = PersonRepository::class.java.getMethod("findSuspendAllByName", Continuation::class.java)
+		val queryMethod = ReactiveMongoQueryMethod(method, DefaultRepositoryMetadata(PersonRepository::class.java), projectionFactory, MongoMappingContext())
+
+		assertThat(queryMethod.isCollectionQuery).isTrue()
+	}
+
+	@Test // DATAMONGO-2630
+	internal fun `should consider suspended methods returning List as collection queries`() {
+
+		val method = PersonRepository::class.java.getMethod("findSuspendByName", Continuation::class.java)
+		val queryMethod = ReactiveMongoQueryMethod(method, DefaultRepositoryMetadata(PersonRepository::class.java), projectionFactory, MongoMappingContext())
+
+		assertThat(queryMethod.isCollectionQuery).isTrue()
+	}
+
+	@Test // GH-4772
+	internal fun `should consider suspended update queries`() {
+
+		val method = PersonRepository::class.java.getMethod("findAndIncrementAgeByName", String::class.java, Continuation::class.java)
+		val queryMethod = ReactiveMongoQueryMethod(method, DefaultRepositoryMetadata(PersonRepository::class.java), projectionFactory, MongoMappingContext())
+
+		assertThatNoException().isThrownBy { queryMethod.verify() }
+	}
+}
diff --git a/spring-data-mongodb/src/test/resources/geospatial.xml b/spring-data-mongodb/src/test/resources/geospatial.xml
index a28863cefe..8937e8f753 100644
--- a/spring-data-mongodb/src/test/resources/geospatial.xml
+++ b/spring-data-mongodb/src/test/resources/geospatial.xml
@@ -5,20 +5,21 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
        http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd">
 
-  <mongo:mongo host="localhost" port="27017"/>
-  
-  <bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
+  <mongo:mongo-client host="127.0.0.1" port="27017"/>
+
+  <bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory">
   	<constructor-arg name="mongo" ref="mongo"/>
   	<constructor-arg name="databaseName" value="database"/>
   </bean>
-  
+
   <mongo:mapping-converter base-package="org.springframework.data.mongodb.core"/>
-  
+
   <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
     <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
     <constructor-arg name="mongoConverter" ref="mappingConverter"/>
+    <property name="writeConcern" value="majority" />
   </bean>
 
-  <bean class="org.springframework.data.mongodb.core.mapping.event.MappingEventListener"/>
+  <bean class="org.springframework.data.mongodb.core.mapping.event.SimpleMappingEventListener"/>
 
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/gridfs/reactive-gridfs.xml b/spring-data-mongodb/src/test/resources/gridfs/reactive-gridfs.xml
index 91e90f010c..bcba3dfb38 100644
--- a/spring-data-mongodb/src/test/resources/gridfs/reactive-gridfs.xml
+++ b/spring-data-mongodb/src/test/resources/gridfs/reactive-gridfs.xml
@@ -32,7 +32,7 @@
 		<property name="port" value="27017"/>
 	</bean>
 
-	<bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
+	<bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory">
 		<constructor-arg name="mongoClient" ref="mongoClient"/>
 		<constructor-arg name="databaseName" value="reactive_gridfs"/>
 	</bean>
diff --git a/spring-data-mongodb/src/test/resources/infrastructure.xml b/spring-data-mongodb/src/test/resources/infrastructure.xml
index 9a8d1fc9ea..500c44e2bf 100644
--- a/spring-data-mongodb/src/test/resources/infrastructure.xml
+++ b/spring-data-mongodb/src/test/resources/infrastructure.xml
@@ -8,13 +8,14 @@
 		<property name="port" value="27017"/>
 	</bean>
 
-	<bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoDbFactory">
+	<bean id="mongoDbFactory" class="org.springframework.data.mongodb.core.SimpleMongoClientDatabaseFactory">
 		<constructor-arg name="mongoClient" ref="mongoClient"/>
 		<constructor-arg name="databaseName" value="database"/>
 	</bean>
 
 	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
 		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+		<property name="writeConcern" value="majority" />
 	</bean>
 
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/logback.xml b/spring-data-mongodb/src/test/resources/logback.xml
index 5296a20451..55e4309a36 100644
--- a/spring-data-mongodb/src/test/resources/logback.xml
+++ b/spring-data-mongodb/src/test/resources/logback.xml
@@ -7,11 +7,20 @@
 		</encoder>
 	</appender>
 
+	<appender name="no-op" class="ch.qos.logback.core.helpers.NOPAppender" />
+
 	<!--
 	<logger name="org.springframework" level="debug" />
 	 -->
 
 	<logger name="org.springframework.data.mongodb.core" level="error"/>
+	<logger name="org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener" level="debug" additivity="false">
+		<appender-ref ref="no-op" />
+	</logger>
+	<logger name="org.springframework.data.mongodb.test.util" level="info"/>
+
+	<!-- AOT Code Generation -->
+	<logger name="org.springframework.data.repository.aot.generate.RepositoryContributor" level="warn" />
 
 	<root level="error">
 		<appender-ref ref="console" />
diff --git a/spring-data-mongodb/src/test/resources/namespace/converter.xml b/spring-data-mongodb/src/test/resources/namespace/converter.xml
index 52238f79e1..1a0106d7bf 100644
--- a/spring-data-mongodb/src/test/resources/namespace/converter.xml
+++ b/spring-data-mongodb/src/test/resources/namespace/converter.xml
@@ -13,6 +13,8 @@
 	
 	<mongo:mapping-converter id="abbreviatingConverter" abbreviate-field-names="true" />
 	
+	<mongo:mapping-converter id="autoIndexCreationConverter" db-factory-ref="factory" auto-index-creation="true" />
+	
 	<bean name="customMongoTypeMapper" class="org.springframework.data.mongodb.config.CustomMongoTypeMapper"/>
 
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/namespace/db-factory-bean-custom-write-concern.xml b/spring-data-mongodb/src/test/resources/namespace/db-factory-bean-custom-write-concern.xml
index 3f75c8b79d..66dba8540a 100644
--- a/spring-data-mongodb/src/test/resources/namespace/db-factory-bean-custom-write-concern.xml
+++ b/spring-data-mongodb/src/test/resources/namespace/db-factory-bean-custom-write-concern.xml
@@ -5,10 +5,10 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<mongo:db-factory id="first" mongo-ref="mongo" write-concern="rack1" />
+	<mongo:db-factory id="first" mongo-client-ref="mongo" write-concern="rack1" />
 
 	<mongo:mongo-client id="mongo">
-		<mongo:client-options />
+		<mongo:client-settings />
 	</mongo:mongo-client>
 	
 	<mongo:db-factory id="second" write-concern="W2" />
diff --git a/spring-data-mongodb/src/test/resources/namespace/db-factory-bean.xml b/spring-data-mongodb/src/test/resources/namespace/db-factory-bean.xml
index ae9f93a645..6f8c1ae0cf 100644
--- a/spring-data-mongodb/src/test/resources/namespace/db-factory-bean.xml
+++ b/spring-data-mongodb/src/test/resources/namespace/db-factory-bean.xml
@@ -5,10 +5,18 @@
 	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
-	<mongo:db-factory id="first" mongo-ref="mongoClient" write-concern="SAFE"/>
+	<mongo:db-factory id="first" mongo-client-ref="mongoClient" write-concern="ACKNOWLEDGED"/>
 
 	<mongo:mongo-client id="mongoClient">
-		<mongo:client-options />
+		<mongo:client-settings />
 	</mongo:mongo-client>
 
+	<mongo:db-factory id="with-connection-string" connection-string="mongodb://username:password@localhost/database" />
+
+	<mongo:db-factory id="with-mongo-client-client-ref" mongo-client-ref="mongo.mongo-client" write-concern="ACKNOWLEDGED" />
+
+    <mongo:mongo-client id="mongo.mongo-client">
+        <mongo:client-settings application-name="spring-data-mongodb"/>
+    </mongo:mongo-client>
+
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/namespace/mongo-bean.xml b/spring-data-mongodb/src/test/resources/namespace/mongo-bean.xml
index be74ee6124..478f95daf0 100644
--- a/spring-data-mongodb/src/test/resources/namespace/mongo-bean.xml
+++ b/spring-data-mongodb/src/test/resources/namespace/mongo-bean.xml
@@ -6,9 +6,11 @@
 		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<mongo:mongo-client id="mongoClient" host="localhost" port="42">
-		<mongo:client-options write-concern="SAFE"/>
+		<mongo:client-settings write-concern="ACKNOWLEDGED"/>
 	</mongo:mongo-client>
 	
-	<mongo:mongo-client id="mongo2" replica-set="127.0.0.1:4711,127.0.0.1:4712" />
+	<mongo:mongo-client id="mongo2" replica-set="rs0">
+		<mongo:client-settings cluster-hosts="127.0.0.1:4711,127.0.0.1:4712" />
+	</mongo:mongo-client>
 
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/namespace/mongoClient-bean.xml b/spring-data-mongodb/src/test/resources/namespace/mongoClient-bean.xml
index 20ade07f36..0659bfb973 100644
--- a/spring-data-mongodb/src/test/resources/namespace/mongoClient-bean.xml
+++ b/spring-data-mongodb/src/test/resources/namespace/mongoClient-bean.xml
@@ -8,16 +8,16 @@
 	<mongo:mongo-client id="mongo-client-with-host-and-port" host="localhost" port="42" />
 	
 	<mongo:mongo-client id="mongo-client-with-options-for-write-concern-and-read-preference">
-		<mongo:client-options write-concern="UNACKNOWLEDGED" read-preference="SECONDARY" />
+		<mongo:client-settings write-concern="UNACKNOWLEDGED" read-preference="SECONDARY" />
 	</mongo:mongo-client>
 	
-	<mongo:mongo-client id="mongo-client-with-credentials" credentials="jon:warg@snow?uri.authMechanism=PLAIN" />
-	
+	<mongo:mongo-client id="mongo-client-with-credentials" credential="jon:warg@snow?uri.authMechanism=PLAIN" />
+
 	<mongo:mongo-client />
 
 	<!-- DATAMONGO-1620 -->
 	<mongo:mongo-client id="mongo-client-with-server-selection-timeout">
-		<mongo:client-options server-selection-timeout="100" />
+		<mongo:client-settings cluster-server-selection-timeout="100" />
 	</mongo:mongo-client>
 
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoClientNamespaceTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoClientNamespaceTests-context.xml
new file mode 100644
index 0000000000..79e5ac40a0
--- /dev/null
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoClientNamespaceTests-context.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:util="http://www.springframework.org/schema/util"
+	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
+		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd
+		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
+
+	<context:property-placeholder
+			location="classpath:/org/springframework/data/mongodb/config/mongo.properties"/>
+
+	<mongo:mongo-client id="client-with-just-host-port" host="${mongo.host}" port="${mongo.port}" />
+
+	<mongo:mongo-client id="client-with-connection-string" connection-string="mongodb://${mongo.host}:${mongo.port}/?replicaSet=rs0" />
+
+	<mongo:mongo-client id="client-with-replica-set" replica-set="${replicaSetName}" />
+
+	<mongo:mongo-client id="client-with-auth" credential="${credential}" />
+
+	<mongo:mongo-client id="client-with-cluster-settings" replica-set="rs0">
+		<mongo:client-settings cluster-connection-mode="MULTIPLE"
+							   cluster-type="REPLICA_SET"
+							   cluster-server-selection-timeout="10"
+							   cluster-local-threshold="5"
+							   cluster-hosts="localhost:27018,localhost:27019,localhost:27020" />
+	</mongo:mongo-client>
+
+	<mongo:mongo-client id="client-with-connection-pool-settings" replica-set="rs0">
+		<mongo:client-settings connection-pool-max-connection-life-time="10"
+							   connection-pool-min-size="10"
+							   connection-pool-max-size="20"
+							   connection-pool-maintenance-frequency="10"
+							   connection-pool-maintenance-initial-delay="11"
+							   connection-pool-max-connection-idle-time="30"
+							   connection-pool-max-wait-time="15" />
+	</mongo:mongo-client>
+
+	<mongo:mongo-client id="client-with-uuid-settings" replica-set="rs0">
+		<mongo:client-settings uuid-representation="STANDARD" />
+	</mongo:mongo-client>
+
+	<mongo:mongo-client id="client-with-server-api-settings" replica-set="rs0">
+		<mongo:client-settings uuid-representation="STANDARD" server-api-version="V1" />
+	</mongo:mongo-client>
+
+</beans>
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests-context.xml
index 5602dcf347..dc86edce2f 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoDbFactoryNoDatabaseRunningTests-context.xml
@@ -8,11 +8,11 @@
 			 http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
 
 	<mongo:mongo-client id="mongo" host="127.0.0.1" port="27117">
-		<mongo:client-options server-selection-timeout="1000" />
+		<mongo:client-settings cluster-server-selection-timeout="1000" />
 	</mongo:mongo-client>
 
 	<mongo:db-factory id="mongoDbFactory"
-					  mongo-ref="mongo"
+					  mongo-client-ref="mongo"
 					  dbname="database"/>
 
 	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests-context.xml
index 247f153bd5..5575248498 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceReplicaSetTests-context.xml
@@ -10,9 +10,13 @@
 	
     <context:property-placeholder location="classpath:replicaSet.properties"/>
 
-    <mongo:mongo-client id="manyReplicaSetMongo" replica-set="${mongo.hosts}"/>
+    <mongo:mongo-client id="manyReplicaSetMongo" replica-set="${mongo.hosts}">
+			<mongo:client-settings cluster-hosts="${mongo.hosts}" />
+	</mongo:mongo-client>
     
-	<mongo:mongo-client id="replicaSetMongo" replica-set="127.0.0.1:10001,localhost:10002"/>
+	<mongo:mongo-client id="replicaSetMongo">
+		<mongo:client-settings cluster-hosts="127.0.0.1:10001,localhost:10002" />
+	</mongo:mongo-client>
 
 <!-- 
 	<mongo:db-factory dbname="database">
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceTests-context.xml
index 430f42a7cf..172c005a72 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/MongoNamespaceTests-context.xml
@@ -13,19 +13,15 @@
 			location="classpath:/org/springframework/data/mongodb/config/mongo.properties"/>
 
 	<mongo:mongo-client host="${mongo.host}" port="${mongo.port}">
-			<mongo:client-options
-					connections-per-host="${mongo.connectionsPerHost}"
-					threads-allowed-to-block-for-connection-multiplier="${mongo.threadsAllowedToBlockForConnectionMultiplier}"
-					connect-timeout="${mongo.connectTimeout}"
-					max-wait-time="${mongo.maxWaitTime}"					
-					socket-keep-alive="${mongo.socketKeepAlive}"
-					socket-timeout="${mongo.socketTimeout}" />
+
+		<mongo:client-settings socket-read-timeout="${mongo.socketTimeout}"
+							  />
 	</mongo:mongo-client>
 	
-	<mongo:db-factory dbname="database" mongo-ref="mongoClient"/>
+	<mongo:db-factory dbname="database" mongo-client-ref="mongoClient"/>
 
 	<mongo:mongo-client id="mongoClientSsl">
-		<mongo:client-options ssl="${mongoSsl.ssl}" />
+		<mongo:client-settings ssl-enabled="${mongoSsl.ssl}" />
 	</mongo:mongo-client>
 
 	<mongo:db-factory id="secondMongoDbFactory"
@@ -37,16 +33,14 @@
 	<mongo:mongo-client id="defaultMongo" host="localhost" port="27017"/>
 
 	<mongo:mongo-client id="mongoSsl" host="localhost" port="27017">
-		<mongo:client-options ssl="${mongoSsl.ssl}"/>
+		<mongo:client-settings ssl-enabled="${mongoSsl.ssl}"/>
 	</mongo:mongo-client>
 
 	<mongo:mongo-client id="mongoSslWithCustomSslFactory" host="localhost" port="27017">
 		<!-- setting a non-null ssl-socket-factory implicitly sets ssl=true -->
-		<mongo:client-options ssl-socket-factory-ref="customSslSocketFactory"/>
+		<mongo:client-settings ssl-enabled="true" ssl-provider="Default"/>
 	</mongo:mongo-client>
 
-	<bean id="customSslSocketFactory" class="javax.net.ssl.SSLSocketFactory" factory-method="getDefault" scope="singleton"/>
-
 	<mongo:mongo-client id="noAttrMongo"/>
 
 	<mongo:mapping-converter>
@@ -61,7 +55,7 @@
 	<bean id="readConverter" class="org.springframework.data.mongodb.core.PersonReadConverter"/>
 
 	<mongo:template id="mongoTemplate" db-factory-ref="mongoDbFactory" converter-ref="mappingConverter"/>
-	<mongo:template id="anotherMongoTemplate" db-factory-ref="mongoDbFactory" write-concern="SAFE" />
+	<mongo:template id="anotherMongoTemplate" db-factory-ref="mongoDbFactory" write-concern="ACKNOWLEDGED" />
 	
 	<mongo:gridFsTemplate/>
 	<mongo:gridFsTemplate id="secondGridFsTemplate" db-factory-ref="mongoDbFactory" converter-ref="mappingConverter"/>
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties
index 4ac86e45af..a79c2c685c 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/config/mongo.properties
@@ -8,7 +8,8 @@ mongo.socketTimeout=1500
 mongo.threadsAllowedToBlockForConnectionMultiplier=4
 mongo.socketKeepAlive=true
 mongo.fsync=true
-mongo.slaveOk=true
 
 mongoSsl.ssl=true
+replicaSetName=rs0
+credential=jon:warg@snow?uri.authMechanism=PLAIN
 
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
index 7d1ccaee17..264d474b56 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/PersonRepositoryIntegrationTests-context.xml
@@ -8,11 +8,14 @@
 		http://www.springframework.org/schema/util https://www.springframework.org/schema/util/spring-util.xsd">
 
 	<mongo:db-factory dbname="repositories" />
-	
+
+	<mongo:mapping-converter auto-index-creation="true" />
+
 	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
 		<constructor-arg ref="mongoDbFactory" />
+		<constructor-arg ref="mappingConverter" />
 		<property name="writeConcern">
-			<util:constant static-field="com.mongodb.WriteConcern.SAFE" />
+			<util:constant static-field="com.mongodb.WriteConcern.JOURNALED" />
 		</property>
 	</bean>
 
@@ -29,5 +32,5 @@
 	</bean>
 
 	<bean class="org.springframework.data.mongodb.repository.SampleEvaluationContextExtension" />
-	
+
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
index b5cd79f2b4..b70efb607c 100644
--- a/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
+++ b/spring-data-mongodb/src/test/resources/org/springframework/data/mongodb/repository/config/MongoNamespaceIntegrationTests-context.xml
@@ -11,13 +11,18 @@
 
 	<mongo:db-factory dbname="repositories"/>
 
+	<mongo:mapping-converter auto-index-creation="true" />
+
 	<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
 		<constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+		<constructor-arg ref="mappingConverter" />
 		<property name="writeConcern">
-			<util:constant static-field="com.mongodb.WriteConcern.SAFE" />
+			<util:constant static-field="com.mongodb.WriteConcern.ACKNOWLEDGED" />
 		</property>
 	</bean>
 
+	<mongo:mapping-converter auto-index-creation="true" />
+
 	<mongo:repositories base-package="org.springframework.data.mongodb.repository">
 		<repository:exclude-filter type="regex" expression=".*MongoRepository"/>
 	</mongo:repositories>
diff --git a/spring-data-mongodb/src/test/resources/reactive-infrastructure.xml b/spring-data-mongodb/src/test/resources/reactive-infrastructure.xml
index 9bd7479755..896bb26812 100644
--- a/spring-data-mongodb/src/test/resources/reactive-infrastructure.xml
+++ b/spring-data-mongodb/src/test/resources/reactive-infrastructure.xml
@@ -15,6 +15,7 @@
 
 	<bean id="reactiveMongoTemplate" class="org.springframework.data.mongodb.core.ReactiveMongoTemplate">
 		<constructor-arg ref="reactiveMongoDbFactory"/>
+		<property name="writeConcern" value="majority" />
 	</bean>
 
 </beans>
diff --git a/spring-data-mongodb/src/test/resources/server-jmx.xml b/spring-data-mongodb/src/test/resources/server-jmx.xml
deleted file mode 100644
index 54f985f4cb..0000000000
--- a/spring-data-mongodb/src/test/resources/server-jmx.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context.xsd">
-
-  <mongo:jmx/>
-
-  <context:mbean-export/>
-
-  <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean"
-        p:port="1099"/>
-
-  <!-- Expose JMX over RMI -->
-  <bean id="serverConnector" class="org.springframework.jmx.support.ConnectorServerFactoryBean" depends-on="registry"
-        p:objectName="connector:name=rmi"
-        p:serviceUrl="service:jmx:rmi://localhost/jndi/rmi://localhost:1099/myconnector"/>
-
-</beans>
\ No newline at end of file
diff --git a/src/main/antora/antora-playbook.yml b/src/main/antora/antora-playbook.yml
new file mode 100644
index 0000000000..497f39ee04
--- /dev/null
+++ b/src/main/antora/antora-playbook.yml
@@ -0,0 +1,40 @@
+# PACKAGES antora@3.2.0-alpha.2 @antora/atlas-extension:1.0.0-alpha.1 @antora/collector-extension@1.0.0-alpha.3 @springio/antora-extensions@1.1.0-alpha.2 @asciidoctor/tabs@1.0.0-alpha.12 @opendevise/antora-release-line-extension@1.0.0-alpha.2
+#
+# The purpose of this Antora playbook is to build the docs in the current branch.
+antora:
+  extensions:
+    - require: '@springio/antora-extensions'
+      root_component_name: 'data-mongodb'
+site:
+  title: Spring Data MongoDB
+  url: https://docs.spring.io/spring-data/mongo/reference
+content:
+  sources:
+    - url: ./../../..
+      branches: HEAD
+      start_path: src/main/antora
+      worktrees: true
+    - url: https://github.com/spring-projects/spring-data-commons
+      # Refname matching:
+      # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
+      branches: [ main, 4.0.x ]
+      start_path: src/main/antora
+asciidoc:
+  attributes:
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+  extensions:
+    - '@asciidoctor/tabs'
+    - '@springio/asciidoctor-extensions'
+    - '@springio/asciidoctor-extensions/javadoc-extension'
+  sourcemap: true
+urls:
+  latest_version_segment: ''
+runtime:
+  log:
+    failure_level: warn
+    format: pretty
+ui:
+  bundle:
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.18/ui-bundle.zip
+    snapshot: true
diff --git a/src/main/antora/antora.yml b/src/main/antora/antora.yml
new file mode 100644
index 0000000000..1a23500e21
--- /dev/null
+++ b/src/main/antora/antora.yml
@@ -0,0 +1,17 @@
+name: data-mongodb
+version: true
+title: Spring Data MongoDB
+nav:
+  - modules/ROOT/nav.adoc
+ext:
+  collector:
+    - run:
+        command: ./mvnw validate process-resources -pl :spring-data-mongodb-distribution -am -Pantora-process-resources
+        local: true
+      scan:
+        dir: spring-data-mongodb-distribution/target/classes/
+    - run:
+        command: ./mvnw package -Pdistribute
+        local: true
+      scan:
+        dir: target/antora
diff --git a/src/main/asciidoc/images/jconsole.png b/src/main/antora/modules/ROOT/assets/images/jconsole.png
similarity index 100%
rename from src/main/asciidoc/images/jconsole.png
rename to src/main/antora/modules/ROOT/assets/images/jconsole.png
diff --git a/src/main/antora/modules/ROOT/examples/example b/src/main/antora/modules/ROOT/examples/example
new file mode 120000
index 0000000000..3195fe72aa
--- /dev/null
+++ b/src/main/antora/modules/ROOT/examples/example
@@ -0,0 +1 @@
+../../../../../../spring-data-mongodb/src/test/java/org/springframework/data/mongodb/example
\ No newline at end of file
diff --git a/src/main/antora/modules/ROOT/nav.adoc b/src/main/antora/modules/ROOT/nav.adoc
new file mode 100644
index 0000000000..6f2d1e2847
--- /dev/null
+++ b/src/main/antora/modules/ROOT/nav.adoc
@@ -0,0 +1,73 @@
+* xref:index.adoc[Overview]
+** xref:commons/upgrade.adoc[]
+** xref:migration-guides.adoc[]
+*** xref:migration-guide/migration-guide-2.x-to-3.x.adoc[]
+*** xref:migration-guide/migration-guide-3.x-to-4.x.adoc[]
+
+* xref:mongodb.adoc[]
+** xref:preface.adoc[]
+** xref:mongodb/getting-started.adoc[]
+** xref:mongodb/configuration.adoc[]
+
+** xref:mongodb/template-api.adoc[]
+*** xref:mongodb/template-config.adoc[]
+*** xref:mongodb/template-collection-management.adoc[]
+*** xref:mongodb/template-crud-operations.adoc[]
+*** xref:mongodb/template-query-operations.adoc[]
+*** xref:mongodb/template-document-count.adoc[]
+*** xref:mongodb/aggregation-framework.adoc[]
+
+** xref:mongodb/template-gridfs.adoc[]
+** xref:mongodb/mapping/mapping.adoc[]
+*** xref:mongodb/mapping/mapping-schema.adoc[]
+*** xref:mongodb/mapping/custom-conversions.adoc[Type based Converter]
+*** xref:mongodb/mapping/property-converters.adoc[]
+*** xref:mongodb/mapping/unwrapping-entities.adoc[]
+*** xref:mongodb/mapping/document-references.adoc[Object References]
+*** xref:mongodb/mapping/mapping-index-management.adoc[]
+
+** xref:mongodb/value-expressions.adoc[]
+** xref:mongodb/lifecycle-events.adoc[]
+** xref:mongodb/auditing.adoc[]
+** xref:mongodb/client-session-transactions.adoc[]
+** xref:mongodb/change-streams.adoc[]
+** xref:mongodb/tailable-cursors.adoc[]
+** xref:mongodb/sharding.adoc[]
+** xref:mongodb/mongo-search-indexes.adoc[]
+** xref:mongodb/mongo-encryption.adoc[]
+
+// Repository
+* xref:repositories.adoc[]
+** xref:repositories/core-concepts.adoc[]
+** xref:repositories/definition.adoc[]
+** xref:mongodb/repositories/repositories.adoc[]
+** xref:repositories/core-extensions.adoc[]
+** xref:repositories/create-instances.adoc[]
+** xref:repositories/query-methods-details.adoc[]
+** xref:mongodb/repositories/query-methods.adoc[]
+** xref:mongodb/repositories/vector-search.adoc[]
+** xref:mongodb/repositories/modifying-methods.adoc[]
+** xref:repositories/projections.adoc[]
+** xref:repositories/custom-implementations.adoc[]
+** xref:repositories/core-domain-events.adoc[]
+** xref:repositories/null-handling.adoc[]
+** xref:mongodb/repositories/cdi-integration.adoc[]
+** xref:repositories/query-keywords-reference.adoc[]
+** xref:repositories/query-return-types-reference.adoc[]
+** xref:mongodb/aot.adoc[]
+
+// Observability
+* xref:observability/observability.adoc[]
+** xref:observability/conventions.adoc[]
+** xref:observability/metrics.adoc[]
+** xref:observability/spans.adoc[]
+
+* xref:kotlin.adoc[]
+** xref:kotlin/requirements.adoc[]
+** xref:kotlin/null-safety.adoc[]
+** xref:kotlin/extensions.adoc[]
+** xref:kotlin/coroutines.adoc[]
+
+* xref:attachment$api/java/index.html[Javadoc,role=link-external,window=_blank]
+* https://github.com/spring-projects/spring-data-commons/wiki[Wiki,role=link-external,window=_blank]
+
diff --git a/src/main/antora/modules/ROOT/pages/commons/upgrade.adoc b/src/main/antora/modules/ROOT/pages/commons/upgrade.adoc
new file mode 100644
index 0000000000..51a9189aa0
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/commons/upgrade.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$upgrade.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/index.adoc b/src/main/antora/modules/ROOT/pages/index.adoc
new file mode 100644
index 0000000000..2a22bd56b4
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/index.adoc
@@ -0,0 +1,22 @@
+[[spring-data-mongodb-reference-documentation]]
+= Spring Data MongoDB
+:revnumber: {version}
+:revdate: {localdate}
+:feature-scroll: true
+
+_Spring Data MongoDB provides support for the MongoDB database.
+It uses familiar Spring concepts such as a template classes for core API usage and lightweight repository style data access to ease development of applications with a consistent programming model._
+
+[horizontal]
+xref:mongodb.adoc[MongoDB] :: MongoDB support and connectivity
+xref:repositories.adoc[Repositories] :: Mongo Repositories
+xref:observability/observability.adoc[Observability] :: Observability Integration
+xref:kotlin.adoc[Kotlin] :: Kotlin support
+// xref:migration-guides.adoc[Migration] :: Migration Guides
+https://github.com/spring-projects/spring-data-commons/wiki[Wiki] :: What's New, Upgrade Notes, Supported Versions, additional cross-version information.
+
+Mark Pollack; Thomas Risberg; Oliver Gierke; Costin Leau; Jon Brisbin; Thomas Darimont; Christoph Strobl; Mark Paluch; Jay Bryant
+
+(C) 2008-{copyright-year} VMware Inc.
+
+Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
diff --git a/src/main/antora/modules/ROOT/pages/kotlin.adoc b/src/main/antora/modules/ROOT/pages/kotlin.adoc
new file mode 100644
index 0000000000..4f01678d84
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/kotlin.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$kotlin.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/kotlin/coroutines.adoc b/src/main/antora/modules/ROOT/pages/kotlin/coroutines.adoc
new file mode 100644
index 0000000000..8f578961cf
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/kotlin/coroutines.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$kotlin/coroutines.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/kotlin/extensions.adoc b/src/main/antora/modules/ROOT/pages/kotlin/extensions.adoc
new file mode 100644
index 0000000000..381a48be13
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/kotlin/extensions.adoc
@@ -0,0 +1,85 @@
+include::{commons}@data-commons::page$kotlin/extensions.adoc[]
+
+To retrieve a list of `SWCharacter` objects in Java, you would normally write the following:
+
+[source,java]
+----
+Flux<SWCharacter> characters = template.query(SWCharacter.class).inTable("star-wars").all()
+----
+
+With Kotlin and the Spring Data extensions, you can instead write the following:
+
+[source,kotlin]
+----
+val characters = template.query<SWCharacter>().inTable("star-wars").all()
+// or (both are equivalent)
+val characters : Flux<SWCharacter> = template.query().inTable("star-wars").all()
+----
+
+As in Java, `characters` in Kotlin is strongly typed, but Kotlin's clever type inference allows for shorter syntax.
+
+[[mongo.query.kotlin-support]]
+== Type-safe Queries for Kotlin
+
+Kotlin embraces domain-specific language creation through its language syntax and its extension system.
+Spring Data MongoDB ships with a Kotlin Extension for `Criteria` using https://kotlinlang.org/docs/reference/reflection.html#property-references[Kotlin property references] to build type-safe queries.
+Queries using this extension are typically benefit from improved readability.
+Most keywords on `Criteria` have a matching Kotlin extension, such as `inValues` and `regex`.
+
+Consider the following example explaining Type-safe Queries:
+
+====
+[source,kotlin]
+----
+import org.springframework.data.mongodb.core.query.*
+
+mongoOperations.find<Book>(
+  Query(Book::title isEqualTo "Moby-Dick")               <1>
+)
+
+mongoOperations.find<Book>(
+  Query(titlePredicate = Book::title exists true)
+)
+
+mongoOperations.find<Book>(
+  Query(
+    Criteria().andOperator(
+      Book::price gt 5,
+      Book::price lt 10
+    ))
+)
+
+// Binary operators
+mongoOperations.find<BinaryMessage>(
+  Query(BinaryMessage::payload bits { allClear(0b101) }) <2>
+)
+
+// Nested Properties (i.e. refer to "book.author")
+mongoOperations.find<Book>(
+  Query(Book::author / Author::name regex "^H")          <3>
+)
+----
+<1> `isEqualTo()` is an infix extension function with receiver type `KProperty<T>` that returns `Criteria`.
+<2> For bitwise operators, pass a lambda argument where you call one of the methods of `Criteria.BitwiseCriteriaOperators`.
+<3> To construct nested properties, use the `/` character (overloaded operator `div`).
+====
+
+[[mongo.update.kotlin-support]]
+== Type-safe Updates for Kotlin
+
+A syntax similar to <<mongo.query.kotlin-support>> can be used to update documents:
+
+====
+[source,kotlin]
+----
+mongoOperations.updateMulti<Book>(
+  Query(Book::title isEqualTo "Moby-Dick"),
+  update(Book:title, "The Whale")                        <1>
+    .inc(Book::price, 100)                               <2>
+    .addToSet(Book::authors, "Herman Melville")          <3>
+)
+----
+<1> `update()` is a factory function with receiver type `KProperty<T>` that returns `Update`.
+<2> Most methods from `Update` have a matching Kotlin extension.
+<3> Functions with `KProperty<T>` can be used as well on collections types
+====
diff --git a/src/main/antora/modules/ROOT/pages/kotlin/null-safety.adoc b/src/main/antora/modules/ROOT/pages/kotlin/null-safety.adoc
new file mode 100644
index 0000000000..6967ddb3f6
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/kotlin/null-safety.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$kotlin/null-safety.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/kotlin/requirements.adoc b/src/main/antora/modules/ROOT/pages/kotlin/requirements.adoc
new file mode 100644
index 0000000000..bb209ab6a4
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/kotlin/requirements.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$kotlin/requirements.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-2.x-to-3.x.adoc b/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-2.x-to-3.x.adoc
new file mode 100644
index 0000000000..c002c1fee5
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-2.x-to-3.x.adoc
@@ -0,0 +1,61 @@
+[[mongodb.migration.2.x-3.x]]
+= Migration Guide from 2.x to 3.x
+
+Spring Data MongoDB 3.x requires the MongoDB Java Driver 4.x +
+To learn more about driver versions please visit the https://www.mongodb.com/docs/drivers/java/sync/current/upgrade/[MongoDB Documentation].
+
+[[dependency-changes]]
+== Dependency Changes
+
+* `org.mongodb:mongo-java-driver` (uber jar) got replaced with:
+** bson-jar
+** core-jar
+** sync-jar
+
+The change in dependencies allows usage of the reactive support without having to pull the synchronous driver.
+NOTE: The new sync driver does no longer support `com.mongodb.DBObject`. Please use `org.bson.Document` instead.
+
+[[signature-changes]]
+== Signature Changes
+
+* `MongoTemplate` no longer supports `com.mongodb.MongoClient` and `com.mongodb.MongoClientOptions`.
+Please use `com.mongodb.client.MongoClient` and `com.mongodb.MongoClientSettings` instead.
+
+In case you're using `AbstractMongoConfiguration` please switch to `AbstractMongoClientConfiguration`.
+
+[[namespace-changes]]
+== Namespace Changes
+
+The switch to `com.mongodb.client.MongoClient` requires an update of your configuration XML if you have one.
+The best way to provide required connection information is by using a connection string.
+Please see the https://docs.mongodb.com/manual/reference/connection-string/[MongoDB Documentation] for details.
+
+
+====
+[source,xml]
+----
+<mongo:mongo.mongo-client id="with-defaults" />
+----
+
+[source,xml]
+----
+<context:property-placeholder location="classpath:..."/>
+
+<mongo:mongo.mongo-client id="client-just-host-port"
+                          host="${mongo.host}" port="${mongo.port}" />
+
+<mongo:mongo.mongo-client id="client-using-connection-string"
+                          connection-string="mongodb://${mongo.host}:${mongo.port}/?replicaSet=rs0" />
+----
+
+[source,xml]
+----
+<mongo:mongo.mongo-client id="client-with-settings" replica-set="rs0">
+		<mongo:client-settings cluster-connection-mode="MULTIPLE"
+							   cluster-type="REPLICA_SET"
+							   cluster-server-selection-timeout="300"
+							   cluster-local-threshold="100"
+							   cluster-hosts="localhost:27018,localhost:27019,localhost:27020" />
+	</mongo:mongo.mongo-client>
+----
+====
diff --git a/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-3.x-to-4.x.adoc b/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-3.x-to-4.x.adoc
new file mode 100644
index 0000000000..aa340a4f24
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/migration-guide/migration-guide-3.x-to-4.x.adoc
@@ -0,0 +1,5 @@
+[[mongodb.migration.3.x-4.x]]
+= Migration Guide from 3.x to 4.x
+
+Spring Data MongoDB 4.x requires the MongoDB Java Driver 4.8.x +
+To learn more about driver versions please visit the https://www.mongodb.com/docs/drivers/java/sync/current/upgrade/[MongoDB Documentation].
diff --git a/src/main/antora/modules/ROOT/pages/migration-guides.adoc b/src/main/antora/modules/ROOT/pages/migration-guides.adoc
new file mode 100644
index 0000000000..3f8e783a16
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/migration-guides.adoc
@@ -0,0 +1,8 @@
+[[mongodb.migration]]
+= Migration Guides
+:page-section-summary-toc: 1
+
+This section contains version-specific migration guides explaining how to upgrade between two versions.
+
+
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb.adoc b/src/main/antora/modules/ROOT/pages/mongodb.adoc
new file mode 100644
index 0000000000..907cbf06be
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb.adoc
@@ -0,0 +1,23 @@
+[[mongodb.core]]
+= MongoDB Support
+:page-section-summary-toc: 1
+
+Spring Data support for MongoDB contains a wide range of features:
+
+* xref:mongodb/template-config.adoc[Spring configuration support] with Java-based `@Configuration` classes or an XML namespace for a Mongo driver instance and replica sets.
+* xref:mongodb/template-api.adoc[`MongoTemplate` helper class] that increases productivity when performing common Mongo operations.
+Includes integrated object mapping between documents and POJOs.
+* xref:mongodb/template-api.adoc#mongo-template.exception-translation[Exception translation] into Spring's portable Data Access Exception hierarchy.
+* Feature-rich xref:mongodb/mapping/mapping.adoc[Object Mapping] integrated with Spring's Conversion Service.
+* xref:mongodb/mapping/mapping.adoc#mapping-usage-annotations[Annotation-based mapping metadata] that is extensible to support other metadata formats.
+* xref:mongodb/lifecycle-events.adoc[Persistence and mapping lifecycle events].
+* xref:mongodb/template-query-operations.adoc[Java-based Query, Criteria, and Update DSLs].
+* Automatic implementation of xref:repositories.adoc[Repository interfaces], including support for custom query methods.
+* xref:repositories/core-extensions.adoc#mongodb.repositories.queries.type-safe[QueryDSL integration] to support type-safe queries.
+* xref:mongodb/client-session-transactions.adoc[Multi-Document Transactions].
+* xref:mongodb/template-query-operations.adoc#mongo.geo-json[GeoSpatial integration].
+
+For most tasks, you should use `MongoTemplate` or the Repository support, which both leverage the rich mapping functionality.
+`MongoTemplate` is the place to look for accessing functionality such as incrementing counters or ad-hoc CRUD operations.
+`MongoTemplate` also provides callback methods so that it is easy for you to get the low-level API artifacts, such as `com.mongodb.client.MongoDatabase`, to communicate directly with MongoDB.
+The goal with naming conventions on various API artifacts is to copy those in the base MongoDB Java driver so you can easily map your existing knowledge onto the Spring APIs.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/aggregation-framework.adoc b/src/main/antora/modules/ROOT/pages/mongodb/aggregation-framework.adoc
new file mode 100644
index 0000000000..81a00683c6
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/aggregation-framework.adoc
@@ -0,0 +1,691 @@
+[[mongo.aggregation]]
+= Aggregation Framework Support
+
+Spring Data MongoDB provides support for the Aggregation Framework introduced to MongoDB in version 2.2.
+
+For further information, see the full https://docs.mongodb.org/manual/aggregation/[reference documentation] of the aggregation framework and other data aggregation tools for MongoDB.
+
+[[mongo.aggregation.basic-concepts]]
+== Basic Concepts
+
+The Aggregation Framework support in Spring Data MongoDB is based on the following key abstractions: javadoc:org.springframework.data.mongodb.core.aggregation.Aggregation[] and javadoc:org.springframework.data.mongodb.core.aggregation.AggregationResults[].
+
+* `Aggregation`
++
+An `Aggregation` represents a MongoDB `aggregate` operation and holds the description of the aggregation pipeline instructions. Aggregations are created by invoking the appropriate `newAggregation(…)` static factory method of the `Aggregation` class, which takes a list of `AggregateOperation` and an optional input class.
++
+The actual aggregate operation is run by the `aggregate` method of the `MongoTemplate`, which takes the desired output class as a parameter.
++
+* `TypedAggregation`
++
+A `TypedAggregation`, just like an `Aggregation`, holds the instructions of the aggregation pipeline and a reference to the input type, that is used for mapping domain properties to actual document fields.
++
+At runtime, field references get checked against the given input type, considering potential `@Field` annotations.
+[NOTE]
+====
+Changed in 3.2 referencing non-existent properties does no longer raise errors. To restore the previous behaviour use the `strictMapping` option of `AggregationOptions`.
+====
+* `AggregationDefinition`
++
+An `AggregationDefinition` represents a MongoDB aggregation pipeline operation and describes the processing that should be performed in this aggregation step. Although you could manually create an `AggregationDefinition`, we recommend using the static factory methods provided by the `Aggregate` class to construct an `AggregateOperation`.
++
+* `AggregationResults`
++
+`AggregationResults` is the container for the result of an aggregate operation. It provides access to the raw aggregation result, in the form of a `Document` to the mapped objects and other information about the aggregation.
++
+The following listing shows the canonical example for using the Spring Data MongoDB support for the MongoDB Aggregation Framework:
++
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+Aggregation agg = newAggregation(
+    pipelineOP1(),
+    pipelineOP2(),
+    pipelineOPn()
+);
+
+AggregationResults<OutputType> results = mongoTemplate.aggregate(agg, "INPUT_COLLECTION_NAME", OutputType.class);
+List<OutputType> mappedResult = results.getMappedResults();
+----
+
+Note that, if you provide an input class as the first parameter to the `newAggregation` method, the `MongoTemplate` derives the name of the input collection from this class. Otherwise, if you do not not specify an input class, you must provide the name of the input collection explicitly. If both an input class and an input collection are provided, the latter takes precedence.
+
+[[mongo.aggregation.supported-aggregation-operations]]
+[[aggregation-stages]]
+.Supported Aggregation Operations & Stages
+[%collapsible]
+====
+The MongoDB Aggregation Framework provides the following types of aggregation stages and operations:
+
+* addFields - `AddFieldsOperation`
+* bucket / bucketAuto - `BucketOperation` / `BucketAutoOperation`
+* count - `CountOperation`
+* densify - `DensifyOperation`
+* facet - `FacetOperation`
+* geoNear - `GeoNearOperation`
+* graphLookup - `GraphLookupOperation`
+* group - `GroupOperation`
+* limit - `LimitOperation`
+* lookup - `LookupOperation`
+* match - `MatchOperation`
+* merge - `MergeOperation`
+* project - `ProjectionOperation`
+* redact - `RedactOperation`
+* replaceRoot - `ReplaceRootOperation`
+* sample - `SampleOperation`
+* set - `SetOperation`
+* setWindowFields - `SetWindowFieldsOperation`
+* skip - `SkipOperation`
+* sort / sortByCount - `SortOperation` / `SortByCountOperation`
+* unionWith - `UnionWithOperation`
+* unset - `UnsetOperation`
+* unwind - `UnwindOperation`
+====
+
+[TIP]
+====
+Unsupported aggregation stages (like https://www.mongodb.com/docs/atlas/atlas-search/query-syntax/[$search] for MongoDB Atlas) can be provided by implementing either `AggregationOperation`.
+`Aggregation.stage` is a shortcut for registering a pipeline stage by providing its JSON or `Bson` representation.
+
+[source,java]
+----
+Aggregation.stage("""
+    { $search : {
+        "near": {
+          "path": "released",
+          "origin": { "$date": { "$numberLong": "..." } } ,
+          "pivot": 7
+        }
+      }
+    }
+""");
+----
+====
+
+At the time of this writing, we provide support for the following Aggregation Operators in Spring Data MongoDB:
+
+.Aggregation Operators currently supported by Spring Data MongoDB
+[cols="2*"]
+|===
+| Set Aggregation Operators
+| `setEquals`, `setIntersection`, `setUnion`, `setDifference`, `setIsSubset`, `anyElementTrue`, `allElementsTrue`
+
+| Group/Accumulator Aggregation Operators
+| `addToSet`, `bottom`, `bottomN`, `covariancePop`, `covarianceSamp`, `expMovingAvg`, `first`, `firstN`, `last`, `lastN` `max`, `maxN`, `min`, `minN`, `avg`, `push`, `sum`, `top`, `topN`, `count` (+++*+++), `median`, `percentile`, `stdDevPop`, `stdDevSamp`
+
+| Arithmetic Aggregation Operators
+| `abs`, `acos`, `acosh`, `add` (+++*+++ via `plus`), `asin`, `asin`, `atan`, `atan2`, `atanh`, `ceil`, `cos`, `cosh`, `derivative`, `divide`, `exp`, `floor`, `integral`, `ln`, `log`, `log10`, `mod`, `multiply`, `pow`, `round`, `sqrt`, `subtract` (+++*+++ via `minus`), `sin`, `sinh`, `tan`, `tanh`, `trunc`
+
+| String Aggregation Operators
+| `concat`, `substr`, `toLower`, `toUpper`, `strcasecmp`, `indexOfBytes`, `indexOfCP`, `regexFind`, `regexFindAll`, `regexMatch`, `replaceAll`, `replaceOne`, split`, `strLenBytes`, `strLenCP`, `substrCP`, `trim`, `ltrim`, `rtim`
+
+| Comparison Aggregation Operators
+| `eq` (+++*+++ via `is`), `gt`, `gte`, `lt`, `lte`, `ne`
+
+| Array Aggregation Operators
+| `arrayElementAt`, `arrayToObject`, `concatArrays`, `filter`, `first`, `in`, `indexOfArray`, `isArray`, `last`, range`, `reverseArray`, `reduce`, `size`, `sortArray`, `slice`, `zip`
+
+| Literal Operators
+| `literal`
+
+| Date Aggregation Operators
+| `dateSubstract`, `dateTrunc`, `dayOfYear`, `dayOfMonth`, `dayOfWeek`, `year`, `month`, `week`, `hour`, `minute`, `second`, `millisecond`, `dateAdd`, `dateDiff`, `dateToString`, `dateFromString`, `dateFromParts`, `dateToParts`, `isoDayOfWeek`, `isoWeek`, `isoWeekYear`, `tsIncrement`, `tsSecond`
+
+| Variable Operators
+| `map`
+
+| Conditional Aggregation Operators
+| `cond`, `ifNull`, `switch`
+
+| Type Aggregation Operators
+| `type`
+
+| Convert Aggregation Operators
+| `convert`, `degreesToRadians`, `toBool`, `toDate`, `toDecimal`, `toDouble`, `toInt`, `toLong`, `toObjectId`, `toString`
+
+| Object Aggregation Operators
+| `objectToArray`, `mergeObjects`, `getField`, `setField`
+
+| Script Aggregation Operators
+| `function`, `accumulator`
+
+|===
+
++++*+++ The operation is mapped or added by Spring Data MongoDB.
+
+Note that the aggregation operations not listed here are currently not supported by Spring Data MongoDB. Comparison aggregation operators are expressed as `Criteria` expressions.
+
+[[mongo.aggregation.projection]]
+== Projection Expressions
+
+Projection expressions are used to define the fields that are the outcome of a particular aggregation step. Projection expressions can be defined through the `project` method of the `Aggregation` class, either by passing a list of `String` objects or an aggregation framework `Fields` object. The projection can be extended with additional fields through a fluent API by using the `and(String)` method and aliased by using the `as(String)` method.
+Note that you can also define fields with aliases by using the `Fields.field` static factory method of the aggregation framework, which you can then use to construct a new `Fields` instance. References to projected fields in later aggregation stages are valid only for the field names of included fields or their aliases (including newly defined fields and their aliases). Fields not included in the projection cannot be referenced in later aggregation stages. The following listings show examples of projection expression:
+
+.Projection expression examples
+====
+[source,java]
+----
+// generates {$project: {name: 1, netPrice: 1}}
+project("name", "netPrice")
+
+// generates {$project: {thing1: $thing2}}
+project().and("thing1").as("thing2")
+
+// generates {$project: {a: 1, b: 1, thing2: $thing1}}
+project("a","b").and("thing1").as("thing2")
+----
+====
+
+.Multi-Stage Aggregation using Projection and Sorting
+====
+[source,java]
+----
+// generates {$project: {name: 1, netPrice: 1}}, {$sort: {name: 1}}
+project("name", "netPrice"), sort(ASC, "name")
+
+// generates {$project: {name: $firstname}}, {$sort: {name: 1}}
+project().and("firstname").as("name"), sort(ASC, "name")
+
+// does not work
+project().and("firstname").as("name"), sort(ASC, "firstname")
+----
+====
+
+More examples for project operations can be found in the `AggregationTests` class. Note that further details regarding the projection expressions can be found in the https://docs.mongodb.org/manual/reference/operator/aggregation/project/#pipe._S_project[corresponding section] of the MongoDB Aggregation Framework reference documentation.
+
+[[mongo.aggregation.facet]]
+== Faceted Classification
+
+As of Version 3.4, MongoDB supports faceted classification by using the Aggregation Framework. A faceted classification uses semantic categories (either general or subject-specific) that are combined to create the full classification entry. Documents flowing through the aggregation pipeline are classified into buckets. A multi-faceted classification enables various aggregations on the same set of input documents, without needing to retrieve the input documents multiple times.
+
+[[buckets]]
+=== Buckets
+
+Bucket operations categorize incoming documents into groups, called buckets, based on a specified expression and bucket boundaries. Bucket operations require a grouping field or a grouping expression. You can define them by using the `bucket()` and `bucketAuto()` methods of the `Aggregate` class. `BucketOperation` and `BucketAutoOperation` can expose accumulations based on aggregation expressions for input documents. You can extend the bucket operation with additional parameters through a fluent API by using the `with…()` methods and the `andOutput(String)` method. You can alias the operation by using the `as(String)` method. Each bucket is represented as a document in the output.
+
+`BucketOperation` takes a defined set of boundaries to group incoming documents into these categories. Boundaries are required to be sorted. The following listing shows some examples of bucket operations:
+
+.Bucket operation examples
+====
+[source,java]
+----
+// generates {$bucket: {groupBy: $price, boundaries: [0, 100, 400]}}
+bucket("price").withBoundaries(0, 100, 400);
+
+// generates {$bucket: {groupBy: $price, default: "Other" boundaries: [0, 100]}}
+bucket("price").withBoundaries(0, 100).withDefault("Other");
+
+// generates {$bucket: {groupBy: $price, boundaries: [0, 100], output: { count: { $sum: 1}}}}
+bucket("price").withBoundaries(0, 100).andOutputCount().as("count");
+
+// generates {$bucket: {groupBy: $price, boundaries: [0, 100], 5, output: { titles: { $push: "$title"}}}
+bucket("price").withBoundaries(0, 100).andOutput("title").push().as("titles");
+----
+====
+
+`BucketAutoOperation` determines boundaries in an attempt to evenly distribute documents into a specified number of buckets. `BucketAutoOperation` optionally takes a granularity value that specifies the https://en.wikipedia.org/wiki/Preferred_number[preferred number] series to use to ensure that the calculated boundary edges end on preferred round numbers or on powers of 10. The following listing shows examples of bucket operations:
+
+.Bucket operation examples
+====
+[source,java]
+----
+// generates {$bucketAuto: {groupBy: $price, buckets: 5}}
+bucketAuto("price", 5)
+
+// generates {$bucketAuto: {groupBy: $price, buckets: 5, granularity: "E24"}}
+bucketAuto("price", 5).withGranularity(Granularities.E24).withDefault("Other");
+
+// generates {$bucketAuto: {groupBy: $price, buckets: 5, output: { titles: { $push: "$title"}}}
+bucketAuto("price", 5).andOutput("title").push().as("titles");
+----
+====
+
+To create output fields in buckets, bucket operations can use `AggregationExpression` through `andOutput()` and xref:mongodb/aggregation-framework.adoc#mongo.aggregation.projection.expressions[SpEL expressions] through `andOutputExpression()`.
+
+Note that further details regarding bucket expressions can be found in the https://docs.mongodb.org/manual/reference/operator/aggregation/bucket/[`$bucket` section] and
+https://docs.mongodb.org/manual/reference/operator/aggregation/bucketAuto/[`$bucketAuto` section] of the MongoDB Aggregation Framework reference documentation.
+
+[[multi-faceted-aggregation]]
+=== Multi-faceted Aggregation
+
+Multiple aggregation pipelines can be used to create multi-faceted aggregations that characterize data across multiple dimensions (or facets) within a single aggregation stage. Multi-faceted aggregations provide multiple filters and categorizations to guide data browsing and analysis. A common implementation of faceting is how many online retailers provide ways to narrow down search results by applying filters on product price, manufacturer, size, and other factors.
+
+You can define a `FacetOperation` by using the `facet()` method of the `Aggregation` class. You can customize it with multiple aggregation pipelines by using the `and()` method. Each sub-pipeline has its own field in the output document where its results are stored as an array of documents.
+
+Sub-pipelines can project and filter input documents prior to grouping. Common use cases include extraction of date parts or calculations before categorization. The following listing shows facet operation examples:
+
+.Facet operation examples
+====
+[source,java]
+----
+// generates {$facet: {categorizedByPrice: [ { $match: { price: {$exists : true}}}, { $bucketAuto: {groupBy: $price, buckets: 5}}]}}
+facet(match(Criteria.where("price").exists(true)), bucketAuto("price", 5)).as("categorizedByPrice"))
+
+// generates {$facet: {categorizedByCountry: [ { $match: { country: {$exists : true}}}, { $sortByCount: "$country"}]}}
+facet(match(Criteria.where("country").exists(true)), sortByCount("country")).as("categorizedByCountry"))
+
+// generates {$facet: {categorizedByYear: [
+//     { $project: { title: 1, publicationYear: { $year: "publicationDate"}}},
+//     { $bucketAuto: {groupBy: $price, buckets: 5, output: { titles: {$push:"$title"}}}
+// ]}}
+facet(project("title").and("publicationDate").extractYear().as("publicationYear"),
+      bucketAuto("publicationYear", 5).andOutput("title").push().as("titles"))
+  .as("categorizedByYear"))
+----
+====
+
+Note that further details regarding facet operation can be found in the https://docs.mongodb.org/manual/reference/operator/aggregation/facet/[`$facet` section] of the MongoDB Aggregation Framework reference documentation.
+
+[[mongo.aggregation.sort-by-count]]
+=== Sort By Count
+
+Sort by count operations group incoming documents based on the value of a specified expression, compute the count of documents in each distinct group, and sort the results by count. It offers a handy shortcut to apply sorting when using xref:mongodb/aggregation-framework.adoc#mongo.aggregation.facet[Faceted Classification]. Sort by count operations require a grouping field or grouping expression. The following listing shows a sort by count example:
+
+.Sort by count example
+====
+[source,java]
+----
+// generates { $sortByCount: "$country" }
+sortByCount("country");
+----
+====
+
+A sort by count operation is equivalent to the following BSON (Binary JSON):
+
+----
+{ $group: { _id: <expression>, count: { $sum: 1 } } },
+{ $sort: { count: -1 } }
+----
+
+[[mongo.aggregation.projection.expressions]]
+=== Spring Expression Support in Projection Expressions
+
+We support the use of SpEL expressions in projection expressions through the `andExpression` method of the `ProjectionOperation` and `BucketOperation` classes. This feature lets you define the desired expression as a SpEL expression. On running a query, the SpEL expression is translated into a corresponding MongoDB projection expression part. This arrangement makes it much easier to express complex calculations.
+
+[[complex-calculations-with-spel-expressions]]
+==== Complex Calculations with SpEL expressions
+
+Consider the following SpEL expression:
+
+[source,java]
+----
+1 + (q + 1) / (q - 1)
+----
+
+The preceding expression is translated into the following projection expression part:
+
+[source,javascript]
+----
+{ "$add" : [ 1, {
+    "$divide" : [ {
+        "$add":["$q", 1]}, {
+        "$subtract":[ "$q", 1]}
+    ]
+}]}
+----
+
+You can see examples in more context in xref:mongodb/aggregation-framework.adoc#mongo.aggregation.examples.example5[Aggregation Framework Example 5] and xref:mongodb/aggregation-framework.adoc#mongo.aggregation.examples.example6[Aggregation Framework Example 6].
+You can find more usage examples for supported SpEL expression constructs in `SpelExpressionTransformerUnitTests`.
+
+.Supported SpEL transformations
+[%collapsible]
+====
+[%header,cols="2"]
+|===
+| SpEL Expression
+| Mongo Expression Part
+| a == b
+| { $eq : [$a, $b] }
+| a != b
+| { $ne : [$a , $b] }
+| a > b
+| { $gt : [$a, $b] }
+| a >= b
+| { $gte : [$a, $b] }
+| a < b
+| { $lt : [$a, $b] }
+| a <= b
+| { $lte : [$a, $b] }
+| a + b
+| { $add : [$a, $b] }
+| a - b
+| { $subtract : [$a, $b] }
+| a * b
+| { $multiply : [$a, $b] }
+| a / b
+| { $divide : [$a, $b] }
+| a^b
+| { $pow : [$a, $b] }
+| a % b
+| { $mod : [$a, $b] }
+| a && b
+| { $and : [$a, $b] }
+| a \|\| b
+| { $or : [$a, $b] }
+| !a
+| { $not : [$a] }
+|===
+====
+
+In addition to the transformations shown in the preceding table, you can use standard SpEL operations such as `new` to (for example) create arrays and reference expressions through their names (followed by the arguments to use in brackets). The following example shows how to create an array in this fashion:
+
+[source,java]
+----
+// { $setEquals : [$a, [5, 8, 13] ] }
+.andExpression("setEquals(a, new int[]{5, 8, 13})");
+----
+
+[[mongo.aggregation.examples]]
+=== Aggregation Framework Examples
+
+The examples in this section demonstrate the usage patterns for the MongoDB Aggregation Framework with Spring Data MongoDB.
+
+[[mongo.aggregation.examples.example1]]
+==== Aggregation Framework Example 1
+
+In this introductory example, we want to aggregate a list of tags to get the occurrence count of a particular tag from a MongoDB collection (called `tags`) sorted by the occurrence count in descending order. This example demonstrates the usage of grouping, sorting, projections (selection), and unwinding (result splitting).
+
+[source,java]
+----
+class TagCount {
+ String tag;
+ int n;
+}
+----
+
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+Aggregation agg = newAggregation(
+    project("tags"),
+    unwind("tags"),
+    group("tags").count().as("n"),
+    project("n").and("tag").previousOperation(),
+    sort(DESC, "n")
+);
+
+AggregationResults<TagCount> results = mongoTemplate.aggregate(agg, "tags", TagCount.class);
+List<TagCount> tagCount = results.getMappedResults();
+----
+
+The preceding listing uses the following algorithm:
+
+. Create a new aggregation by using the `newAggregation` static factory method, to which we pass a list of aggregation operations. These aggregate operations define the aggregation pipeline of our `Aggregation`.
+. Use the `project` operation to select the `tags` field (which is an array of strings) from the input collection.
+. Use the `unwind` operation to generate a new document for each tag within the `tags` array.
+. Use the `group` operation to define a group for each `tags` value for which we aggregate the occurrence count (by using the `count` aggregation operator and collecting the result in a new field called `n`).
+. Select the `n` field and create an alias for the ID field generated from the previous group operation (hence the call to `previousOperation()`) with a name of `tag`.
+. Use the `sort` operation to sort the resulting list of tags by their occurrence count in descending order.
+. Call the `aggregate` method on `MongoTemplate` to let MongoDB perform the actual aggregation operation, with the created `Aggregation` as an argument.
+
+Note that the input collection is explicitly specified as the `tags` parameter to the `aggregate` Method. If the name of the input collection is not specified explicitly, it is derived from the input class passed as the first parameter to the `newAggreation` method.
+
+[[mongo.aggregation.examples.example2]]
+==== Aggregation Framework Example 2
+
+This example is based on the https://docs.mongodb.org/manual/tutorial/aggregation-examples/#largest-and-smallest-cities-by-state[Largest and Smallest Cities by State] example from the MongoDB Aggregation Framework documentation. We added additional sorting to produce stable results with different MongoDB versions. Here we want to return the smallest and largest cities by population for each state by using the aggregation framework. This example demonstrates grouping, sorting, and projections (selection).
+
+[source,java]
+----
+class ZipInfo {
+   String id;
+   String city;
+   String state;
+   @Field("pop") int population;
+   @Field("loc") double[] location;
+}
+
+class City {
+   String name;
+   int population;
+}
+
+class ZipInfoStats {
+   String id;
+   String state;
+   City biggestCity;
+   City smallestCity;
+}
+----
+
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+TypedAggregation<ZipInfo> aggregation = newAggregation(ZipInfo.class,
+    group("state", "city")
+       .sum("population").as("pop"),
+    sort(ASC, "pop", "state", "city"),
+    group("state")
+       .last("city").as("biggestCity")
+       .last("pop").as("biggestPop")
+       .first("city").as("smallestCity")
+       .first("pop").as("smallestPop"),
+    project()
+       .and("state").previousOperation()
+       .and("biggestCity")
+          .nested(bind("name", "biggestCity").and("population", "biggestPop"))
+       .and("smallestCity")
+          .nested(bind("name", "smallestCity").and("population", "smallestPop")),
+    sort(ASC, "state")
+);
+
+AggregationResults<ZipInfoStats> result = mongoTemplate.aggregate(aggregation, ZipInfoStats.class);
+ZipInfoStats firstZipInfoStats = result.getMappedResults().get(0);
+----
+
+Note that the `ZipInfo` class maps the structure of the given input-collection. The `ZipInfoStats` class defines the structure in the desired output format.
+
+The preceding listings use the following algorithm:
+
+. Use the `group` operation to define a group from the input-collection. The grouping criteria is the combination of the `state` and `city` fields, which forms the ID structure of the group. We aggregate the value of the `population` property from the grouped elements by using the `sum` operator and save the result in the `pop` field.
+. Use the `sort` operation to sort the intermediate-result by the `pop`, `state` and `city` fields, in ascending order, such that the smallest city is at the top and the biggest city is at the bottom of the result. Note that the sorting on `state` and `city` is implicitly performed against the group ID fields (which Spring Data MongoDB handled).
+. Use a `group` operation again to group the intermediate result by `state`. Note that `state` again implicitly references a group ID field. We select the name and the population count of the biggest and smallest city with calls to the `last(…)` and `first(...)` operators, respectively, in the `project` operation.
+. Select the `state` field from the previous `group` operation. Note that `state` again implicitly references a group ID field. Because we do not want an implicitly generated ID to appear, we exclude the ID from the previous operation by using `and(previousOperation()).exclude()`. Because we want to populate the nested `City` structures in our output class, we have to emit appropriate sub-documents by using the nested method.
+. Sort the resulting list of `StateStats` by their state name in ascending order in the `sort` operation.
+
+Note that we derive the name of the input collection from the `ZipInfo` class passed as the first parameter to the `newAggregation` method.
+
+[[mongo.aggregation.examples.example3]]
+==== Aggregation Framework Example 3
+
+This example is based on the https://docs.mongodb.org/manual/tutorial/aggregation-examples/#states-with-populations-over-10-million[States with Populations Over 10 Million] example from the MongoDB Aggregation Framework documentation. We added additional sorting to produce stable results with different MongoDB versions. Here we want to return all states with a population greater than 10 million, using the aggregation framework. This example demonstrates grouping, sorting, and matching (filtering).
+
+[source,java]
+----
+class StateStats {
+   @Id String id;
+   String state;
+   @Field("totalPop") int totalPopulation;
+}
+----
+
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+TypedAggregation<ZipInfo> agg = newAggregation(ZipInfo.class,
+    group("state").sum("population").as("totalPop"),
+    sort(ASC, previousOperation(), "totalPop"),
+    match(where("totalPop").gte(10 * 1000 * 1000))
+);
+
+AggregationResults<StateStats> result = mongoTemplate.aggregate(agg, StateStats.class);
+List<StateStats> stateStatsList = result.getMappedResults();
+----
+
+The preceding listings use the following algorithm:
+
+. Group the input collection by the `state` field and calculate the sum of the `population` field and store the result in the new field `"totalPop"`.
+. Sort the intermediate result by the id-reference of the previous group operation in addition to the `"totalPop"` field in ascending order.
+. Filter the intermediate result by using a `match` operation which accepts a `Criteria` query as an argument.
+
+Note that we derive the name of the input collection from the `ZipInfo` class passed as first parameter to the `newAggregation` method.
+
+[[mongo.aggregation.examples.example4]]
+==== Aggregation Framework Example 4
+
+This example demonstrates the use of simple arithmetic operations in the projection operation.
+
+[source,java]
+----
+class Product {
+    String id;
+    String name;
+    double netPrice;
+    int spaceUnits;
+}
+----
+
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+TypedAggregation<Product> agg = newAggregation(Product.class,
+    project("name", "netPrice")
+        .and("netPrice").plus(1).as("netPricePlus1")
+        .and("netPrice").minus(1).as("netPriceMinus1")
+        .and("netPrice").multiply(1.19).as("grossPrice")
+        .and("netPrice").divide(2).as("netPriceDiv2")
+        .and("spaceUnits").mod(2).as("spaceUnitsMod2")
+);
+
+AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
+List<Document> resultList = result.getMappedResults();
+----
+
+Note that we derive the name of the input collection from the `Product` class passed as first parameter to the `newAggregation` method.
+
+[[mongo.aggregation.examples.example5]]
+==== Aggregation Framework Example 5
+
+This example demonstrates the use of simple arithmetic operations derived from SpEL Expressions in the projection operation.
+
+[source,java]
+----
+class Product {
+    String id;
+    String name;
+    double netPrice;
+    int spaceUnits;
+}
+----
+
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+TypedAggregation<Product> agg = newAggregation(Product.class,
+    project("name", "netPrice")
+        .andExpression("netPrice + 1").as("netPricePlus1")
+        .andExpression("netPrice - 1").as("netPriceMinus1")
+        .andExpression("netPrice / 2").as("netPriceDiv2")
+        .andExpression("netPrice * 1.19").as("grossPrice")
+        .andExpression("spaceUnits % 2").as("spaceUnitsMod2")
+        .andExpression("(netPrice * 0.8  + 1.2) * 1.19").as("grossPriceIncludingDiscountAndCharge")
+
+);
+
+AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
+List<Document> resultList = result.getMappedResults();
+----
+
+[[mongo.aggregation.examples.example6]]
+==== Aggregation Framework Example 6
+
+This example demonstrates the use of complex arithmetic operations derived from SpEL Expressions in the projection operation.
+
+Note: The additional parameters passed to the `addExpression` method can be referenced with indexer expressions according to their position. In this example, we reference the first parameter of the parameters array with `[0]`. When the SpEL expression is transformed into a MongoDB aggregation framework expression, external parameter expressions are replaced with their respective values.
+
+[source,java]
+----
+class Product {
+    String id;
+    String name;
+    double netPrice;
+    int spaceUnits;
+}
+----
+
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+double shippingCosts = 1.2;
+
+TypedAggregation<Product> agg = newAggregation(Product.class,
+    project("name", "netPrice")
+        .andExpression("(netPrice * (1-discountRate)  + [0]) * (1+taxRate)", shippingCosts).as("salesPrice")
+);
+
+AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
+List<Document> resultList = result.getMappedResults();
+----
+
+Note that we can also refer to other fields of the document within the SpEL expression.
+
+[[mongo.aggregation.examples.example7]]
+==== Aggregation Framework Example 7
+
+This example uses conditional projection. It is derived from the https://docs.mongodb.com/manual/reference/operator/aggregation/cond/[$cond reference documentation].
+
+[source,java]
+----
+public class InventoryItem {
+
+  @Id int id;
+  String item;
+  String description;
+  int qty;
+}
+
+public class InventoryItemProjection {
+
+  @Id int id;
+  String item;
+  String description;
+  int qty;
+  int discount
+}
+----
+
+[source,java]
+----
+import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
+
+TypedAggregation<InventoryItem> agg = newAggregation(InventoryItem.class,
+  project("item").and("discount")
+    .applyCondition(ConditionalOperator.newBuilder().when(Criteria.where("qty").gte(250))
+      .then(30)
+      .otherwise(20))
+    .and(ifNull("description", "Unspecified")).as("description")
+);
+
+AggregationResults<InventoryItemProjection> result = mongoTemplate.aggregate(agg, "inventory", InventoryItemProjection.class);
+List<InventoryItemProjection> stateStatsList = result.getMappedResults();
+----
+
+This one-step aggregation uses a projection operation with the `inventory` collection. We project the `discount` field by using a conditional operation for all inventory items that have a `qty` greater than or equal to `250`. A second conditional projection is performed for the `description` field. We apply the `Unspecified` description to all items that either do not have a `description` field or items that have a `null` description.
+
+As of MongoDB 3.6, it is possible to exclude fields from the projection by using a conditional expression.
+
+.Conditional aggregation projection
+====
+[source,java]
+----
+TypedAggregation<Book> agg = Aggregation.newAggregation(Book.class,
+  project("title")
+    .and(ConditionalOperators.when(ComparisonOperators.valueOf("author.middle")     <1>
+        .equalToValue(""))                                                          <2>
+        .then("$$REMOVE")                                                           <3>
+        .otherwiseValueOf("author.middle")                                          <4>
+    )
+	.as("author.middle"));
+----
+<1> If the value of the field `author.middle`
+<2> does not contain a value,
+<3> then use https://docs.mongodb.com/manual/reference/aggregation-variables/#variable.REMOVE[``$$REMOVE``] to exclude the field.
+<4> Otherwise, add the field value of `author.middle`.
+====
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/aot.adoc b/src/main/antora/modules/ROOT/pages/mongodb/aot.adoc
new file mode 100644
index 0000000000..16dd2f9ca0
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/aot.adoc
@@ -0,0 +1,85 @@
+= Ahead of Time Optimizations
+
+This chapter covers Spring Data's Ahead of Time (AOT) optimizations that build upon {spring-framework-docs}/core/aot.html[Spring's Ahead of Time Optimizations].
+
+[[aot.hints]]
+== Runtime Hints
+
+Running an application as a native image requires additional information compared to a regular JVM runtime.
+Spring Data contributes {spring-framework-docs}/core/aot.html#aot.hints[Runtime Hints] during AOT processing for native image usage.
+These are in particular hints for:
+
+* Auditing
+* `ManagedTypes` to capture the outcome of class-path scans
+* Repositories
+** Reflection hints for entities, return types, and Spring Data annotations
+** Repository fragments
+** Querydsl `Q` classes
+** Kotlin Coroutine support
+* Web support (Jackson Hints for `PagedModel`)
+
+[[aot.repositories]]
+== Ahead of Time Repositories
+
+AOT Repositories are an extension to AOT processing by pre-generating eligible query method implementations.
+Query methods are opaque to developers regarding their underlying queries being executed in a query method call.
+AOT repositories contribute query method implementations based on derived or annotated queries, updates or aggregations that are known at build-time.
+This optimization moves query method processing from runtime to build-time, which can lead to a significant bootstrap performance improvement as query methods do not need to be analyzed reflectively upon each application start.
+
+The resulting AOT repository fragment follows the naming scheme of `<Repository FQCN>Impl__Aot` and is placed in the same package as the repository interface.
+You can find all queries in their MQL form for generated repository query methods.
+
+[TIP]
+====
+`spring.aot.repositories.enabled` property needs to be set to `true` for repository fragment code generation.
+====
+
+[NOTE]
+====
+Consider AOT repository classes an internal optimization.
+Do not use them directly in your code as generation and implementation details may change in future releases.
+====
+
+=== Running with AOT Repositories
+
+AOT is a mandatory step to transform a Spring application to a native executable, so it is automatically enabled when running in this mode.
+It is also possible to use those optimizations on the JVM by setting the `spring.aot.enabled` and `spring.aot.repositories.enabled` System properties to `true`.
+
+AOT repositories contribute configuration changes to the actual repository bean registration to register the generated repository fragment.
+
+[NOTE]
+====
+When AOT optimizations are included, some decisions that have been taken at build-time are hard-coded in the application setup.
+For instance, profiles that have been enabled at build-time are automatically enabled at runtime as well.
+Also, the Spring Data module implementing a repository is fixed.
+Changing the implementation requires AOT re-processing.
+====
+
+=== Eligible Methods in Data MongoDB
+
+AOT repositories filter methods that are eligible for AOT processing.
+These are typically all query methods that are not backed by an xref:repositories/custom-implementations.adoc[implementation fragment].
+
+**Supported Features**
+
+* Derived `find`, `count`, `exists` and `delete` methods
+* Query methods annotated with `@Query` (excluding those containing SpEL)
+* Methods annotated with `@Aggregation`
+* Methods using `@Update`
+* `@Hint`, `@Meta`, and `@ReadPreference` support
+* `Page`, `Slice`, and `Optional` return types
+* DTO Projections
+
+**Limitations**
+
+* `@Meta.allowDiskUse` and `flags` are not evaluated.
+* Queries / Aggregations / Updates containing `SpEL` cannot be generated.
+* Limited `Collation` detection.
+
+**Excluded methods**
+
+* `CrudRepository` and other base interface methods
+* Querydsl and Query by Example methods
+* Methods whose implementation would be overly complex
+* Query Methods obtaining MQL from a file
+** Geospatial Queries
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/auditing.adoc b/src/main/antora/modules/ROOT/pages/mongodb/auditing.adoc
new file mode 100644
index 0000000000..014dde02ca
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/auditing.adoc
@@ -0,0 +1,47 @@
+[[mongo.auditing]]
+= Auditing
+
+Since Spring Data MongoDB 1.4, auditing can be enabled by annotating a configuration class with the `@EnableMongoAuditing` annotation, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+@EnableMongoAuditing
+class Config {
+
+  @Bean
+  public AuditorAware<AuditableUser> myAuditorProvider() {
+      return new AuditorAwareImpl();
+  }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Configuration
+@EnableReactiveMongoAuditing
+class Config {
+
+  @Bean
+  public ReactiveAuditorAware<AuditableUser> myAuditorProvider() {
+      return new ReactiveAuditorAwareImpl();
+  }
+}
+----
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+<mongo:auditing mapping-context-ref="customMappingContext" auditor-aware-ref="yourAuditorAwareImpl"/>
+----
+======
+
+If you expose a bean of type `AuditorAware` / `ReactiveAuditorAware` to the `ApplicationContext`, the auditing infrastructure picks it up automatically and uses it to determine the current user to be set on domain types.
+If you have multiple implementations registered in the `ApplicationContext`, you can select the one to be used by explicitly setting the `auditorAwareRef` attribute of `@EnableMongoAuditing`.
diff --git a/src/main/asciidoc/reference/change-streams.adoc b/src/main/antora/modules/ROOT/pages/mongodb/change-streams.adoc
similarity index 82%
rename from src/main/asciidoc/reference/change-streams.adoc
rename to src/main/antora/modules/ROOT/pages/mongodb/change-streams.adoc
index 0461370703..1f999500bf 100644
--- a/src/main/asciidoc/reference/change-streams.adoc
+++ b/src/main/antora/modules/ROOT/pages/mongodb/change-streams.adoc
@@ -1,5 +1,5 @@
 [[change-streams]]
-== Change Streams
+= Change Streams
 
 As of MongoDB 3.6, https://docs.mongodb.com/manual/changeStreams/[Change Streams] let applications get notified about changes without having to tail the oplog.
 
@@ -12,11 +12,12 @@ changes from all collections within the database. When subscribing to a database
  suitable type for the event type as conversion might not apply correctly across different entity types.
 In doubt, use `Document`.
 
-=== Change Streams with `MessageListener`
+[[change-streams-with-messagelistener]]
+== Change Streams with `MessageListener`
 
 Listening to a https://docs.mongodb.com/manual/tutorial/change-streams-example/[Change Stream by using a Sync Driver] creates a long running, blocking task that needs to be delegated to a separate component.
-In this case, we need to first create a `MessageListenerContainer`, which will be the main entry point for running the specific `SubscriptionRequest` tasks.
-Spring Data MongoDB already ships with a default implementation that operates on `MongoTemplate` and is capable of creating and executing `Task` instances for a `ChangeStreamRequest`.
+In this case, we need to first create a javadoc:org.springframework.data.mongodb.core.messaging.MessageListenerContainer[] which will be the main entry point for running the specific `SubscriptionRequest` tasks.
+Spring Data MongoDB already ships with a default implementation that operates on `MongoTemplate` and is capable of creating and running `Task` instances for a javadoc:org.springframework.data.mongodb.core.messaging.ChangeStreamRequest[].
 
 The following example shows how to use Change Streams with `MessageListener` instances:
 
@@ -25,21 +26,21 @@ The following example shows how to use Change Streams with `MessageListener` ins
 [source,java]
 ----
 MessageListenerContainer container = new DefaultMessageListenerContainer(template);
-container.start();                                                                                        <1>
+container.start();                                                                                              <1>
 
-MessageListener<ChangeStreamDocument<Document>, User> listener = System.out::println;                     <2>
-ChangeStreamRequestOptions options = new ChangeStreamRequestOptions("user", ChangeStreamOptions.empty()); <3>
+MessageListener<ChangeStreamDocument<Document>, User> listener = System.out::println;                           <2>
+ChangeStreamRequestOptions options = new ChangeStreamRequestOptions("db", "user", ChangeStreamOptions.empty()); <3>
 
-Subscription subscription = container.register(new ChangeStreamRequest<>(listener, options), User.class); <4>
+Subscription subscription = container.register(new ChangeStreamRequest<>(listener, options), User.class);       <4>
 
 // ...
 
-container.stop();                                                                                         <5>
+container.stop();                                                                                               <5>
 ----
 <1> Starting the container initializes the resources and starts `Task` instances for already registered `SubscriptionRequest` instances. Requests added after startup are ran immediately.
 <2> Define the listener called when a `Message` is received. The `Message#getBody()` is converted to the requested domain type. Use `Document` to receive raw results without conversion.
 <3> Set the collection to listen to and provide additional options through `ChangeStreamOptions`.
-<4> Register the request. The returned `Subscription` can be used to check the current `Task` state and cancel its execution to free resources.
+<4> Register the request. The returned `Subscription` can be used to check the current `Task` state and cancel it to free resources.
 <5> Do not forget to stop the container once you are sure you no longer need it. Doing so stops all running `Task` instances within the container.
 ====
 
@@ -49,7 +50,8 @@ Errors while processing are passed on to an `org.springframework.util.ErrorHandl
 Please use `register(request, body, errorHandler)` to provide additional functionality.
 ====
 
-=== Reactive Change Streams
+[[reactive-change-streams]]
+== Reactive Change Streams
 
 Subscribing to Change Streams with the reactive API is a more natural approach to work with streams. Still, the essential building blocks, such as `ChangeStreamOptions`, remain the same. The following example shows how to use Change Streams emitting ``ChangeStreamEvent``s:
 
@@ -67,10 +69,11 @@ Flux<ChangeStreamEvent<User>> flux = reactiveTemplate.changeStream(User.class) <
 <3> Obtain a `Flux` of change stream events. The `ChangeStreamEvent#getBody()` is converted to the requested domain type from (2).
 ====
 
-=== Resuming Change Streams
+[[resuming-change-streams]]
+== Resuming Change Streams
 
 Change Streams can be resumed and resume emitting events where you left. To resume the stream, you need to supply either a resume
-token or the last known server time (in UTC). Use `ChangeStreamOptions` to set the value accordingly.
+token or the last known server time (in UTC). Use javadoc:org.springframework.data.mongodb.core.ChangeStreamOptions[] to set the value accordingly.
 
 The following example shows how to set the resume offset using server time:
 
diff --git a/src/main/asciidoc/reference/client-session-transactions.adoc b/src/main/antora/modules/ROOT/pages/mongodb/client-session-transactions.adoc
similarity index 57%
rename from src/main/asciidoc/reference/client-session-transactions.adoc
rename to src/main/antora/modules/ROOT/pages/mongodb/client-session-transactions.adoc
index 7e345c4969..f825690d7a 100644
--- a/src/main/asciidoc/reference/client-session-transactions.adoc
+++ b/src/main/antora/modules/ROOT/pages/mongodb/client-session-transactions.adoc
@@ -1,22 +1,33 @@
 [[mongo.sessions]]
-= MongoDB Sessions
+= Sessions & Transactions
 
-As of version 3.6, MongoDB supports the concept of sessions. The use of sessions enables MongoDB's https://docs.mongodb.com/manual/core/read-isolation-consistency-recency/#causal-consistency[Causal Consistency] model, which guarantees running operations in an order that respects their causal relationships. Those are split into `ServerSession` instances and `ClientSession` instances. In this section, when we speak of a session, we refer to `ClientSession`.
+As of version 3.6, MongoDB supports the concept of sessions.
+The use of sessions enables MongoDB's https://docs.mongodb.com/manual/core/read-isolation-consistency-recency/#causal-consistency[Causal Consistency] model, which guarantees running operations in an order that respects their causal relationships.
+Those are split into `ServerSession` instances and `ClientSession` instances.
+In this section, when we speak of a session, we refer to `ClientSession`.
 
 WARNING: Operations within a client session are not isolated from operations outside the session.
 
-Both `MongoOperations` and `ReactiveMongoOperations` provide gateway methods for tying a `ClientSession` to the operations. `MongoCollection` and `MongoDatabase` use session proxy objects that implement MongoDB's collection and database interfaces, so you need not add a session on each call. This means that a potential call to `MongoCollection#find()` is delegated to `MongoCollection#find(ClientSession)`.
+Both `MongoOperations` and `ReactiveMongoOperations` provide gateway methods for tying a `ClientSession` to the operations.
+`MongoCollection` and `MongoDatabase` use session proxy objects that implement MongoDB's collection and database interfaces, so you need not add a session on each call.
+This means that a potential call to `MongoCollection#find()` is delegated to `MongoCollection#find(ClientSession)`.
 
-NOTE: Methods such as `(Reactive)MongoOperations#getCollection` return native MongoDB Java Driver gateway objects (such as `MongoCollection`) that themselves offer dedicated methods for `ClientSession`. These methods are *NOT* session-proxied. You should provide the `ClientSession` where needed when interacting directly with a `MongoCollection` or `MongoDatabase` and not through one of the `#execute` callbacks on `MongoOperations`.
+NOTE: Methods such as `(Reactive)MongoOperations#getCollection` return native MongoDB Java Driver gateway objects (such as `MongoCollection`) that themselves offer dedicated methods for `ClientSession`.
+These methods are *NOT* session-proxied.
+You should provide the `ClientSession` where needed when interacting directly with a `MongoCollection` or `MongoDatabase` and not through one of the `#execute` callbacks on `MongoOperations`.
 
 [[mongo.sessions.sync]]
-== Synchronous `ClientSession` support.
+[[mongo.sessions.reactive]]
+== ClientSession support
 
 The following example shows the usage of a session:
 
-.`ClientSession` with `MongoOperations`
+[tabs]
+======
+Imperative::
++
 ====
-[source,java]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
 ClientSessionOptions sessionOptions = ClientSessionOptions.builder()
     .causallyConsistent(true)
@@ -40,31 +51,30 @@ template.withSession(() -> session)
 
 session.close()                                              <4>
 ----
+
 <1> Obtain a new session from the server.
-<2> Use `MongoOperation` methods as before. The `ClientSession` gets applied automatically.
+<2> Use `MongoOperation` methods as before.
+The `ClientSession` gets applied automatically.
 <3> Make sure to close the `ClientSession`.
 <4> Close the session.
-====
-
-WARNING: When dealing with `DBRef` instances, especially lazily loaded ones, it is essential to *not* close the `ClientSession` before all data is loaded. Otherwise, lazy fetch fails.
-
-[[mongo.sessions.reactive]]
-== Reactive `ClientSession` support
 
-The reactive counterpart uses the same building blocks as the imperative one, as the following example shows:
+WARNING: When dealing with `DBRef` instances, especially lazily loaded ones, it is essential to *not* close the `ClientSession` before all data is loaded.
+Otherwise, lazy fetch fails.
+====
 
-.ClientSession with `ReactiveMongoOperations`
+Reactive::
++
 ====
-[source,java]
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
 ClientSessionOptions sessionOptions = ClientSessionOptions.builder()
-    .causallyConsistent(true)
-    .build();
+.causallyConsistent(true)
+.build();
 
 Publisher<ClientSession> session = client.startSession(sessionOptions); <1>
 
 template.withSession(session)
-    .execute(action -> {
+.execute(action -> {
 
         Query query = query(where("name").is("Durzo Blint"));
         return action.findOne(query, Person.class)
@@ -78,32 +88,44 @@ template.withSession(session)
     }, ClientSession::close)                                            <3>
     .subscribe();                                                       <4>
 ----
+
 <1> Obtain a `Publisher` for new session retrieval.
-<2> Use `ReactiveMongoOperation` methods as before. The `ClientSession` is obtained and applied automatically.
+<2> Use `ReactiveMongoOperation` methods as before.
+The `ClientSession` is obtained and applied automatically.
 <3> Make sure to close the `ClientSession`.
-<4> Nothing happens until you subscribe. See https://projectreactor.io/docs/core/release/reference/#reactive.subscribe[the Project Reactor Reference Guide] for details.
-====
+<4> Nothing happens until you subscribe.
+See https://projectreactor.io/docs/core/release/reference/#reactive.subscribe[the Project Reactor Reference Guide] for details.
 
 By using a `Publisher` that provides the actual session, you can defer session acquisition to the point of actual subscription.
-Still, you need to close the session when done, so as to not pollute the server with stale sessions. Use the `doFinally` hook on `execute` to call `ClientSession#close()` when you no longer need the session.
+Still, you need to close the session when done, so as to not pollute the server with stale sessions.
+Use the `doFinally` hook on `execute` to call `ClientSession#close()` when you no longer need the session.
 If you prefer having more control over the session itself, you can obtain the `ClientSession` through the driver and provide it through a `Supplier`.
 
-NOTE: Reactive use of `ClientSession` is limited to Template API usage. There's currently no session integration with reactive repositories.
+NOTE: Reactive use of `ClientSession` is limited to Template API usage.
+There's currently no session integration with reactive repositories.
+====
+======
 
 [[mongo.transactions]]
-= MongoDB Transactions
+== MongoDB Transactions
 
-As of version 4, MongoDB supports https://www.mongodb.com/transactions[Transactions]. Transactions are built on top of <<mongo.sessions,Sessions>> and, consequently, require an active `ClientSession`.
+As of version 4, MongoDB supports https://www.mongodb.com/transactions[Transactions].
+Transactions are built on top of xref:mongodb/client-session-transactions.adoc[Sessions] and, consequently, require an active `ClientSession`.
 
-NOTE: Unless you specify a `MongoTransactionManager` within your application context, transaction support is *DISABLED*. You can use `setSessionSynchronization(ALWAYS)` to participate in ongoing non-native MongoDB transactions.
+NOTE: Unless you specify a `MongoTransactionManager` within your application context, transaction support is *DISABLED*.
+You can use `setSessionSynchronization(ALWAYS)` to participate in ongoing non-native MongoDB transactions.
 
 To get full programmatic control over transactions, you may want to use the session callback on `MongoOperations`.
 
-The following example shows programmatic transaction control within a `SessionCallback`:
+The following example shows programmatic transaction control:
 
 .Programmatic transactions
+[tabs]
+======
+Imperative::
++
 ====
-[source,java]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
 ClientSession session = client.startSession(options);                   <1>
 
@@ -128,24 +150,66 @@ template.withSession(session)
         }
     }, ClientSession::close)                                            <5>
 ----
+
 <1> Obtain a new `ClientSession`.
 <2> Start the transaction.
 <3> If everything works out as expected, commit the changes.
 <4> Something broke, so roll back everything.
 <5> Do not forget to close the session when done.
-====
 
 The preceding example lets you have full control over transactional behavior while using the session scoped `MongoOperations` instance within the callback to ensure the session is passed on to every server call.
 To avoid some of the overhead that comes with this approach, you can use a `TransactionTemplate` to take away some of the noise of manual transaction flow.
+====
+
+Reactive::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Mono<DeleteResult> result = Mono
+    .from(client.startSession())                                                             <1>
+
+    .flatMap(session -> {
+        session.startTransaction();                                                          <2>
+
+        return Mono.from(collection.deleteMany(session, ...))                                <3>
+
+            .onErrorResume(e -> Mono.from(session.abortTransaction()).then(Mono.error(e)))   <4>
+
+            .flatMap(val -> Mono.from(session.commitTransaction()).then(Mono.just(val)))     <5>
+
+            .doFinally(signal -> session.close());                                           <6>
+      });
+----
+
+<1> First we obviously need to initiate the session.
+<2> Once we have the `ClientSession` at hand, start the transaction.
+<3> Operate within the transaction by passing on the `ClientSession` to the operation.
+<4> If the operations completes exceptionally, we need to stop the transaction and preserve the error.
+<5> Or of course, commit the changes in case of success.
+Still preserving the operations result.
+<6> Lastly, we need to make sure to close the session.
+
+The culprit of the above operation is in keeping the main flows `DeleteResult` instead of the transaction outcome published via either `commitTransaction()` or `abortTransaction()`, which leads to a rather complicated setup.
+
+NOTE: Unless you specify a `ReactiveMongoTransactionManager` within your application context, transaction support is *DISABLED*.
+You can use `setSessionSynchronization(ALWAYS)` to participate in ongoing non-native MongoDB transactions.
+====
+======
 
 [[mongo.transactions.transaction-template]]
-== Transactions with `TransactionTemplate`
+[[mongo.transactions.reactive-operator]]
+== Transactions with TransactionTemplate / TransactionalOperator
 
-Spring Data MongoDB transactions support a `TransactionTemplate`. The following example shows how to create and use a `TransactionTemplate`:
+Spring Data MongoDB transactions support both `TransactionTemplate` and `TransactionalOperator`.
 
-.Transactions with `TransactionTemplate`
+.Transactions with `TransactionTemplate` / `TransactionalOperator`
+[tabs]
+======
+Imperative::
++
 ====
-[source,java]
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
 template.setSessionSynchronization(ALWAYS);                                     <1>
 
@@ -164,31 +228,69 @@ txTemplate.execute(new TransactionCallbackWithoutResult() {
         process(step);
 
         template.update(Step.class).apply(Update.set("state", // ...
-    };
+    }
 });
 ----
+
 <1> Enable transaction synchronization during Template API configuration.
 <2> Create the `TransactionTemplate` using the provided `PlatformTransactionManager`.
 <3> Within the callback the `ClientSession` and transaction are already registered.
-====
 
 CAUTION: Changing state of `MongoTemplate` during runtime (as you might think would be possible in item 1 of the preceding listing) can cause threading and visibility issues.
+====
 
-[[mongo.transactions.tx-manager]]
-== Transactions with `MongoTransactionManager`
+Reactive::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+template.setSessionSynchronization(ALWAYS);                                          <1>
 
-`MongoTransactionManager` is the gateway to the well known Spring transaction support. It lets applications use  https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/html/transaction.html[the managed transaction features of Spring].
-The `MongoTransactionManager` binds a `ClientSession` to the thread. `MongoTemplate` detects the session and operates on these resources which are associated with the transaction accordingly. `MongoTemplate` can also participate in other, ongoing transactions. The following example shows how to create and use transactions with a `MongoTransactionManager`:
+// ...
+
+TransactionalOperator rxtx = TransactionalOperator.create(anyTxManager,
+                                   new DefaultTransactionDefinition());              <2>
 
-.Transactions with `MongoTransactionManager`
+
+Step step = // ...;
+template.insert(step);
+
+Mono<Void> process(step)
+    .then(template.update(Step.class).apply(Update.set("state", …))
+    .as(rxtx::transactional)                                                         <3>
+    .then();
+----
+
+<1> Enable transaction synchronization for Transactional participation.
+<2> Create the `TransactionalOperator` using the provided `ReactiveTransactionManager`.
+<3> `TransactionalOperator.transactional(…)` provides transaction management for all upstream operations.
 ====
-[source,java]
+======
+
+[[mongo.transactions.tx-manager]]
+[[mongo.transactions.reactive-tx-manager]]
+== Transactions with MongoTransactionManager & ReactiveMongoTransactionManager
+
+`MongoTransactionManager` / `ReactiveMongoTransactionManager` is the gateway to the well known Spring transaction support.
+It lets applications use link:{springDocsUrl}/data-access.html#transaction[the managed transaction features of Spring].
+The `MongoTransactionManager` binds a `ClientSession` to the thread whereas the `ReactiveMongoTransactionManager` is using the `ReactorContext` for this.
+`MongoTemplate` detects the session and operates on these resources which are associated with the transaction accordingly.
+`MongoTemplate` can also participate in other, ongoing transactions.
+The following example shows how to create and use transactions with a `MongoTransactionManager`:
+
+.Transactions with `MongoTransactionManager` / `ReactiveMongoTransactionManager`
+[tabs]
+======
+Imperative::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
 ----
 @Configuration
-static class Config extends AbstractMongoConfiguration {
+static class Config extends AbstractMongoClientConfiguration {
 
     @Bean
-    MongoTransactionManager transactionManager(MongoDbFactory dbFactory) {  <1>
+    MongoTransactionManager transactionManager(MongoDatabaseFactory dbFactory) {  <1>
         return new MongoTransactionManager(dbFactory);
     }
 
@@ -199,7 +301,7 @@ static class Config extends AbstractMongoConfiguration {
 public class StateService {
 
     @Transactional
-    void someBusinessFunction(Step step) {                                  <2>
+    void someBusinessFunction(Step step) {                                        <2>
 
         template.insert(step);
 
@@ -210,102 +312,24 @@ public class StateService {
 });
 
 ----
+
 <1> Register `MongoTransactionManager` in the application context.
 <2> Mark methods as transactional.
-====
 
 NOTE: `@Transactional(readOnly = true)` advises `MongoTransactionManager` to also start a transaction that adds the
- `ClientSession` to outgoing requests.
-
-[[mongo.transactions.reactive]]
-== Reactive Transactions
-
-Same as with the reactive `ClientSession` support, the `ReactiveMongoTemplate` offers dedicated methods for operating
-within a transaction without having to worry about the commit/abort actions depending on the operations outcome.
-
-NOTE: Unless you specify a `ReactiveMongoTransactionManager` within your application context, transaction support is *DISABLED*. You can use `setSessionSynchronization(ALWAYS)` to participate in ongoing non-native MongoDB transactions.
-
-Using the plain MongoDB reactive driver API a `delete` within a transactional flow may look like this.
-
-.Native driver support
+`ClientSession` to outgoing requests.
 ====
-[source,java]
-----
-Mono<DeleteResult> result = Mono
-    .from(client.startSession())                                                             <1>
 
-    .flatMap(session -> {
-        session.startTransaction();                                                          <2>
-
-        return Mono.from(collection.deleteMany(session, ...))                                <3>
-
-            .onErrorResume(e -> Mono.from(session.abortTransaction()).then(Mono.error(e)))   <4>
-
-            .flatMap(val -> Mono.from(session.commitTransaction()).then(Mono.just(val)))     <5>
-
-            .doFinally(signal -> session.close());                                           <6>
-      });
-----
-<1> First we obviously need to initiate the session.
-<2> Once we have the `ClientSession` at hand, start the transaction.
-<3> Operate within the transaction by passing on the `ClientSession` to the operation.
-<4> If the operations completes exceptionally, we need to abort the transaction and preserve the error.
-<5> Or of course, commit the changes in case of success. Still preserving the operations result.
-<6> Lastly, we need to make sure to close the session.
-====
-
-The culprit of the above operation is in keeping the main flows `DeleteResult` instead of the transaction outcome
-published via either `commitTransaction()` or `abortTransaction()`, which leads to a rather complicated setup.
-
-[[mongo.transactions.reactive-operator]]
-== Transactions with `TransactionalOperator`
-
-Spring Data MongoDB transactions support a `TransactionalOperator`. The following example shows how to create and use a `TransactionalOperator`:
-
-.Transactions with `TransactionalOperator`
+Reactive::
++
 ====
-[source,java]
-----
-template.setSessionSynchronization(ALWAYS);                                          <1>
-
-// ...
-
-TransactionalOperator rxtx = TransactionalOperator.create(anyTxManager,
-                                   new DefaultTransactionDefinition());              <2>
-
-
-Step step = // ...;
-template.insert(step);
-
-Mono<Void> process(step)
-    .then(template.update(Step.class).apply(Update.set("state", …))
-    .as(rxtx::transactional)                                                         <3>
-    .then();
-----
-<1> Enable transaction synchronization for Transactional participation.
-<2> Create the `TransactionalOperator` using the provided `ReactiveTransactionManager`.
-<3> `TransactionalOperator.transactional(…)` provides transaction management for all upstream operations.
-====
-
-[[mongo.transactions.reactive-tx-manager]]
-== Transactions with `ReactiveMongoTransactionManager`
-
-`ReactiveMongoTransactionManager` is the gateway to the well known Spring transaction support.
-It allows applications to leverage https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/html/transaction.html[the managed transaction features of Spring].
-The `ReactiveMongoTransactionManager` binds a `ClientSession` to the subscriber `Context`.
-`ReactiveMongoTemplate` detects the session and operates on these resources which are associated with the transaction accordingly.
-`ReactiveMongoTemplate` can also participate in other, ongoing transactions.
-The following example shows how to create and use transactions with a `ReactiveMongoTransactionManager`:
-
-.Transactions with `ReactiveMongoTransactionManager`
-====
-[source,java]
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
 ----
 @Configuration
-static class Config extends AbstractMongoConfiguration {
+public class Config extends AbstractReactiveMongoConfiguration {
 
     @Bean
-    ReactiveMongoTransactionManager transactionManager(ReactiveDatabaseFactory factory) {  <1>
+    ReactiveMongoTransactionManager transactionManager(ReactiveMongoDatabaseFactory factory) {  <1>
         return new ReactiveMongoTransactionManager(factory);
     }
 
@@ -325,11 +349,57 @@ public class StateService {
 });
 
 ----
+
 <1> Register `ReactiveMongoTransactionManager` in the application context.
 <2> Mark methods as transactional.
-====
 
 NOTE: `@Transactional(readOnly = true)` advises `ReactiveMongoTransactionManager` to also start a transaction that adds the `ClientSession` to outgoing requests.
+====
+======
+
+[[mongo.transaction.options]]
+=== Controlling MongoDB-specific Transaction Options
+
+Transactional service methods can require specific transaction options to run a transaction.
+Spring Data MongoDB's transaction managers support evaluation of transaction labels such as `@Transactional(label = { "mongo:readConcern=available" })`.
+
+By default, the label namespace using the `mongo:` prefix is evaluated by `MongoTransactionOptionsResolver` that is configured by default.
+Transaction labels are provided by `TransactionAttribute` and available to programmatic transaction control through `TransactionTemplate` and `TransactionalOperator`.
+Due to their declarative nature, `@Transactional(label = …)` provides a good starting point that also can serve as documentation.
+
+Currently, the following options are supported:
+
+Max Commit Time::
+
+Controls the maximum execution time on the server for the commitTransaction operation.
+The format of the value corresponds with ISO-8601 duration format as used with `Duration.parse(…)`.
++
+Usage:
+`mongo:maxCommitTime=PT1S`
+
+Read Concern::
+
+Sets the read concern for the transaction.
++
+Usage:
+`mongo:readConcern=LOCAL|MAJORITY|LINEARIZABLE|SNAPSHOT|AVAILABLE`
+
+Read Preference::
+
+Sets the read preference for the transaction.
++
+Usage:
+`mongo:readPreference=PRIMARY|SECONDARY|SECONDARY_PREFERRED|PRIMARY_PREFERRED|NEAREST`
+
+Write Concern::
+
+Sets the write concern for the transaction.
++
+Usage:
+`mongo:writeConcern=ACKNOWLEDGED|W1|W2|W3|UNACKNOWLEDGED|JOURNALED|MAJORITY`
+
+NOTE: Nested transactions that join the outer transaction do not affect the initial transaction options as the transaction is already started.
+Transaction options are only applied when a new transaction is started.
 
 [[mongo.transactions.behavior]]
 == Special behavior inside transactions
@@ -338,39 +408,42 @@ Inside transactions, MongoDB server has a slightly different behavior.
 
 *Connection Settings*
 
-The MongoDB drivers offer a dedicated replica set name configuration option turing the driver into auto detection
-mode. This option helps identifying replica set master nodes and command routing during a transaction.
+The MongoDB drivers offer a dedicated replica set name configuration option turing the driver into auto-detection mode.
+This option helps identify the primary replica set nodes and command routing during a transaction.
 
-NOTE: Make sure to add `replicaSet` to the MongoDB URI. Please refer to https://docs.mongodb.com/manual/reference/connection-string/#connections-connection-options[connection string options] for further details.
+NOTE: Make sure to add `replicaSet` to the MongoDB URI.
+Please refer to https://docs.mongodb.com/manual/reference/connection-string/#connections-connection-options[connection string options] for further details.
 
 *Collection Operations*
 
-MongoDB does *not* support collection operations, such as collection creation, within a transaction. This also
-affects the on the fly collection creation that happens on first usage. Therefore make sure to have all required
-structures in place.
+MongoDB does *not* support collection operations, such as collection creation, within a transaction.
+This also affects the on the fly collection creation that happens on first usage.
+Therefore make sure to have all required structures in place.
 
 *Transient Errors*
 
-MongoDB can add special labels to errors raised during transactional execution. Those may indicate transient failures
-that might vanish by merely retrying the operation.
-We highly recommend https://github.com/spring-projects/spring-retry[Spring Retry] for those purposes. Nevertheless
-one may override `MongoTransactionManager#doCommit(MongoTransactionObject)` to implement a https://docs.mongodb.com/manual/core/transactions/#retry-commit-operation[Retry Commit Operation]
+MongoDB can add special labels to errors raised during transactional operations.
+Those may indicate transient failures that might vanish by merely retrying the operation.
+We highly recommend https://github.com/spring-projects/spring-retry[Spring Retry] for those purposes.
+Nevertheless one may override `MongoTransactionManager#doCommit(MongoTransactionObject)` to implement a https://docs.mongodb.com/manual/core/transactions/#retry-commit-operation[Retry Commit Operation]
 behavior as outlined in the MongoDB reference manual.
 
 *Count*
 
 MongoDB `count` operates upon collection statistics which may not reflect the actual situation within a transaction.
 The server responds with _error 50851_ when issuing a `count` command inside of a multi-document transaction.
-Once `MongoTemplate` detects an active transaction, all exposed `count()` methods are converted and delegated to the
-aggregation framework using `$match` and `$count` operators, preserving `Query` settings, such as `collation`.
+Once `MongoTemplate` detects an active transaction, all exposed `count()` methods are converted and delegated to the aggregation framework using `$match` and `$count` operators, preserving `Query` settings, such as `collation`.
 
-Restrictions apply when using geo commands inside of the aggregation count helper. The following operators cannot be used and must be replaced with a different operator:
+Restrictions apply when using geo commands inside of the aggregation count helper.
+The following operators cannot be used and must be replaced with a different operator:
 
 * `$where` -> `$expr`
 * `$near` -> `$geoWithin` with `$center`
 * `$nearSphere` -> `$geoWithin` with `$centerSphere`
 
-Queries using `Criteria.near(…)` and `Criteria.nearSphere(…)` must be rewritten to `Criteria.within(…)` respective `Criteria.withinSphere(…)`. Same applies for the `near` query keyword in repository query methods that must be changed to `within`. See also MongoDB JIRA ticket https://jira.mongodb.org/browse/DRIVERS-518[DRIVERS-518] for further reference.
+Queries using `Criteria.near(…)` and `Criteria.nearSphere(…)` must be rewritten to `Criteria.within(…)` respective `Criteria.withinSphere(…)`.
+Same applies for the `near` query keyword in repository query methods that must be changed to `within`.
+See also MongoDB JIRA ticket https://jira.mongodb.org/browse/DRIVERS-518[DRIVERS-518] for further reference.
 
 The following snippet shows `count` usage inside the session-bound closure:
 
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/collation.adoc b/src/main/antora/modules/ROOT/pages/mongodb/collation.adoc
new file mode 100644
index 0000000000..0f99995b92
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/collation.adoc
@@ -0,0 +1,90 @@
+[[mongo.collation]]
+= Collations
+
+Since version 3.4, MongoDB supports collations for collection and index creation and various query operations.
+Collations define string comparison rules based on the http://userguide.icu-project.org/collation/concepts[ICU collations].
+A collation document consists of various properties that are encapsulated in `Collation`, as the following listing shows:
+
+====
+[source,java]
+----
+Collation collation = Collation.of("fr")         <1>
+
+  .strength(ComparisonLevel.secondary()          <2>
+    .includeCase())
+
+  .numericOrderingEnabled()                      <3>
+
+  .alternate(Alternate.shifted().punct())        <4>
+
+  .forwardDiacriticSort()                        <5>
+
+  .normalizationEnabled();                       <6>
+----
+<1> `Collation` requires a locale for creation. This can be either a string representation of the locale, a `Locale` (considering language, country, and variant) or a `CollationLocale`. The locale is mandatory for creation.
+<2> Collation strength defines comparison levels that denote differences between characters. You can configure various options (case-sensitivity, case-ordering, and others), depending on the selected strength.
+<3> Specify whether to compare numeric strings as numbers or as strings.
+<4> Specify whether the collation should consider whitespace and punctuation as base characters for purposes of comparison.
+<5> Specify whether strings with diacritics sort from back of the string, such as with some French dictionary ordering.
+<6> Specify whether to check whether text requires normalization and whether to perform normalization.
+====
+
+Collations can be used to create collections and indexes. If you create a collection that specifies a collation, the
+collation is applied to index creation and queries unless you specify a different collation. A collation is valid for a
+whole operation and cannot be specified on a per-field basis.
+
+Like other metadata, collations can be be derived from the domain type via the `collation` attribute of the `@Document`
+annotation and will be applied directly when running queries, creating collections or indexes.
+
+NOTE: Annotated collations will not be used when a collection is auto created by MongoDB on first interaction. This would
+require additional store interaction delaying the entire process. Please use `MongoOperations.createCollection` for those cases.
+
+[source,java]
+----
+Collation french = Collation.of("fr");
+Collation german = Collation.of("de");
+
+template.createCollection(Person.class, CollectionOptions.just(collation));
+
+template.indexOps(Person.class).ensureIndex(new Index("name", Direction.ASC).collation(german));
+----
+
+NOTE: MongoDB uses simple binary comparison if no collation is specified (`Collation.simple()`).
+
+Using collations with collection operations is a matter of specifying a `Collation` instance in your query or operation options, as the following two examples show:
+
+.Using collation with `find`
+====
+[source,java]
+----
+Collation collation = Collation.of("de");
+
+Query query = new Query(Criteria.where("firstName").is("Amél")).collation(collation);
+
+List<Person> results = template.find(query, Person.class);
+----
+====
+
+.Using collation with `aggregate`
+====
+[source,java]
+----
+Collation collation = Collation.of("de");
+
+AggregationOptions options = AggregationOptions.builder().collation(collation).build();
+
+Aggregation aggregation = newAggregation(
+  project("tags"),
+  unwind("tags"),
+  group("tags")
+    .count().as("count")
+).withOptions(options);
+
+AggregationResults<TagCount> results = template.aggregate(aggregation, "tags", TagCount.class);
+----
+====
+
+WARNING: Indexes are only used if the collation used for the operation matches the index collation.
+
+xref:mongodb/repositories/repositories.adoc[MongoDB Repositories] support `Collations` via the `collation` attribute of the `@Query` annotation.
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/configuration.adoc b/src/main/antora/modules/ROOT/pages/mongodb/configuration.adoc
new file mode 100644
index 0000000000..1034acdd79
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/configuration.adoc
@@ -0,0 +1,336 @@
+[[mongodb-connectors]]
+= Connecting to MongoDB
+
+One of the first tasks when using MongoDB and Spring is to create a `MongoClient` object using the IoC container.
+There are two main ways to do this, either by using Java-based bean metadata or by using XML-based bean metadata.
+
+NOTE: For those not familiar with how to configure the Spring container using Java-based bean metadata instead of XML-based metadata, see the high-level introduction in the reference docs https://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/new-in-3.0.html#new-java-configuration[here] as well as the detailed documentation https://docs.spring.io/spring-framework/docs/{springVersion}/reference/html/core.html#beans-java-instantiating-container[here].
+
+[[mongo.mongo-java-config]]
+== Registering a Mongo Instance
+
+The following example shows an example to register an instance of a `MongoClient`:
+
+.Registering `MongoClient`
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+public class AppConfig {
+
+  /*
+   * Use the standard Mongo driver API to create a com.mongodb.client.MongoClient instance.
+   */
+   public @Bean com.mongodb.client.MongoClient mongoClient() {
+       return com.mongodb.client.MongoClients.create("mongodb://localhost:27017");
+   }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Configuration
+public class AppConfig {
+
+  /*
+   * Use the standard Mongo driver API to create a com.mongodb.client.MongoClient instance.
+   */
+   public @Bean com.mongodb.reactivestreams.client.MongoClient mongoClient() {
+       return com.mongodb.reactivestreams.client.MongoClients.create("mongodb://localhost:27017");
+   }
+}
+----
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="third"]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+xsi:schemaLocation=
+"
+http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+http://www.springframework.org/schema/beans
+https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <!-- Default bean name is 'mongo' -->
+    <mongo:mongo-client host="localhost" port="27017"/>
+
+</beans>
+----
+======
+
+This approach lets you use the standard `MongoClient` instance, with the container using Spring's `MongoClientFactoryBean`/`ReactiveMongoClientFactoryBean`.
+As compared to instantiating a `MongoClient` instance directly, the `FactoryBean` has the added advantage of also providing the container with an `ExceptionTranslator` implementation that translates MongoDB exceptions to exceptions in Spring's portable `DataAccessException` hierarchy for data access classes annotated with the `@Repository` annotation.
+This hierarchy and the use of `@Repository` is described in link:{springDocsUrl}/data-access.html[Spring's DAO support features].
+
+The following example shows an example of a Java-based bean metadata that supports exception translation on `@Repository` annotated classes:
+
+.Registering a `MongoClient` via `MongoClientFactoryBean` / `ReactiveMongoClientFactoryBean`
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+public class AppConfig {
+
+    /*
+     * Factory bean that creates the com.mongodb.client.MongoClient instance
+     */
+     public @Bean MongoClientFactoryBean mongo() {
+          MongoClientFactoryBean mongo = new MongoClientFactoryBean();
+          mongo.setHost("localhost");
+          return mongo;
+     }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Configuration
+public class AppConfig {
+
+    /*
+     * Factory bean that creates the com.mongodb.reactivestreams.client.MongoClient instance
+     */
+     public @Bean ReactiveMongoClientFactoryBean mongo() {
+          ReactiveMongoClientFactoryBean mongo = new ReactiveMongoClientFactoryBean();
+          mongo.setHost("localhost");
+          return mongo;
+     }
+}
+----
+======
+
+To access the `MongoClient` object created by the `FactoryBean` in other `@Configuration` classes or your own classes, use a `private @Autowired MongoClient mongoClient;` field.
+
+[[mongo.mongo-db-factory]]
+== The MongoDatabaseFactory Interface
+
+While `MongoClient` is the entry point to the MongoDB driver API, connecting to a specific MongoDB database instance requires additional information, such as the database name and an optional username and password.
+With that information, you can obtain a `MongoDatabase` object and access all the functionality of a specific MongoDB database instance.
+Spring provides the `org.springframework.data.mongodb.core.MongoDatabaseFactory` & `org.springframework.data.mongodb.core.ReactiveMongoDatabaseFactory` interfaces, shown in the following listing, to bootstrap connectivity to the database:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface MongoDatabaseFactory {
+
+  MongoDatabase getDatabase() throws DataAccessException;
+
+  MongoDatabase getDatabase(String dbName) throws DataAccessException;
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface ReactiveMongoDatabaseFactory {
+
+  Mono<MongoDatabase> getDatabase() throws DataAccessException;
+
+  Mono<MongoDatabase> getDatabase(String dbName) throws DataAccessException;
+}
+----
+======
+
+The following sections show how you can use the container with either Java-based or XML-based metadata to configure an instance of the `MongoDatabaseFactory` interface.
+In turn, you can use the `MongoDatabaseFactory` / `ReactiveMongoDatabaseFactory` instance to configure `MongoTemplate` / `ReactiveMongoTemplate`.
+
+Instead of using the IoC container to create an instance of the template, you can use them in standard Java code, as follows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public class MongoApplication {
+
+  public static void main(String[] args) throws Exception {
+
+    MongoOperations mongoOps = new MongoTemplate(new SimpleMongoClientDatabaseFactory(MongoClients.create(), "database"));
+
+    // ...
+  }
+}
+----
+The code in bold highlights the use of `SimpleMongoClientDbFactory` and is the only difference between the listing shown in the xref:mongodb/getting-started.adoc[getting started section].
+Use `SimpleMongoClientDbFactory` when choosing `com.mongodb.client.MongoClient` as the entrypoint of choice.
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public class ReactiveMongoApplication {
+
+  public static void main(String[] args) throws Exception {
+
+    ReactiveMongoOperations mongoOps = new MongoTemplate(new SimpleReactiveMongoDatabaseFactory(MongoClients.create(), "database"));
+
+    // ...
+  }
+}
+----
+======
+
+[[mongo.mongo-db-factory-java]]
+[[mongo.mongo-db-factory.config]]
+== Registering a `MongoDatabaseFactory` / `ReactiveMongoDatabaseFactory`
+
+To register a `MongoDatabaseFactory`/ `ReactiveMongoDatabaseFactory` instance with the container, you write code much like what was highlighted in the previous section.
+The following listing shows a simple example:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+public class MongoConfiguration {
+
+  @Bean
+  public MongoDatabaseFactory mongoDatabaseFactory() {
+    return new SimpleMongoClientDatabaseFactory(MongoClients.create(), "database");
+  }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Configuration
+public class ReactiveMongoConfiguration {
+
+  @Bean
+  public ReactiveMongoDatabaseFactory mongoDatabaseFactory() {
+    return new SimpleReactiveMongoDatabaseFactory(MongoClients.create(), "database");
+  }
+}
+----
+======
+
+MongoDB Server generation 3 changed the authentication model when connecting to the DB.
+Therefore, some of the configuration options available for authentication are no longer valid.
+You should use the `MongoClient`-specific options for setting credentials through `MongoCredential` to provide authentication data, as shown in the following example:
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+public class MongoAppConfig extends AbstractMongoClientConfiguration {
+
+  @Override
+  public String getDatabaseName() {
+    return "database";
+  }
+
+  @Override
+  protected void configureClientSettings(Builder builder) {
+
+    builder
+        .credential(MongoCredential.createCredential("name", "db", "pwd".toCharArray()))
+        .applyToClusterSettings(settings  -> {
+          settings.hosts(singletonList(new ServerAddress("127.0.0.1", 27017)));
+        });
+  }
+}
+----
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+<mongo:db-factory dbname="database" />
+----
+Username and password credentials used in XML-based configuration must be URL-encoded when these contain reserved characters, such as `:`, `%`, `@`, or `,`.
+The following example shows encoded credentials:
+`m0ng0@dmin:mo_res:bw6},Qsdxx@admin@database` -> `m0ng0%40dmin:mo_res%3Abw6%7D%2CQsdxx%40admin@database`
+See https://tools.ietf.org/html/rfc3986#section-2.2[section 2.2 of RFC 3986] for further details.
+======
+
+If you need to configure additional options on the `com.mongodb.client.MongoClient` instance that is used to create a `SimpleMongoClientDbFactory`, you can refer to an existing bean as shown in the following example. To show another common usage pattern, the following listing shows the use of a property placeholder, which lets you parametrize the configuration and the creation of a `MongoTemplate`:
+
+[tabs]
+======
+Java::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+@PropertySource("classpath:/com/myapp/mongodb/config/mongo.properties")
+public class MongoAppConfig extends AbstractMongoClientConfiguration {
+
+  @Autowired
+  Environment env;
+
+  @Override
+  public String getDatabaseName() {
+    return "database";
+  }
+
+  @Override
+  protected void configureClientSettings(Builder builder) {
+
+    builder.applyToClusterSettings(settings -> {
+    settings.hosts(singletonList(
+          new ServerAddress(env.getProperty("mongo.host"), env.getProperty("mongo.port", Integer.class))));
+    });
+
+    builder.applyToConnectionPoolSettings(settings -> {
+
+      settings.maxConnectionLifeTime(env.getProperty("mongo.pool-max-life-time", Integer.class), TimeUnit.MILLISECONDS)
+          .minSize(env.getProperty("mongo.pool-min-size", Integer.class))
+          .maxSize(env.getProperty("mongo.pool-max-size", Integer.class))
+          .maintenanceFrequency(10, TimeUnit.MILLISECONDS)
+          .maintenanceInitialDelay(11, TimeUnit.MILLISECONDS)
+          .maxConnectionIdleTime(30, TimeUnit.SECONDS)
+          .maxWaitTime(15, TimeUnit.MILLISECONDS);
+    });
+  }
+}
+----
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+<context:property-placeholder location="classpath:/com/myapp/mongodb/config/mongo.properties"/>
+
+<mongo:mongo-client host="${mongo.host}" port="${mongo.port}">
+  <mongo:client-settings connection-pool-max-connection-life-time="${mongo.pool-max-life-time}"
+    connection-pool-min-size="${mongo.pool-min-size}"
+    connection-pool-max-size="${mongo.pool-max-size}"
+    connection-pool-maintenance-frequency="10"
+    connection-pool-maintenance-initial-delay="11"
+    connection-pool-max-connection-idle-time="30"
+    connection-pool-max-wait-time="15" />
+</mongo:mongo-client>
+
+<mongo:db-factory dbname="database" mongo-ref="mongoClient"/>
+
+<bean id="anotherMongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+  <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+</bean>
+----
+======
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/converters-type-mapping.adoc b/src/main/antora/modules/ROOT/pages/mongodb/converters-type-mapping.adoc
new file mode 100644
index 0000000000..ea0876aa54
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/converters-type-mapping.adoc
@@ -0,0 +1,125 @@
+[[mongo-template.type-mapping]]
+== Type Mapping
+
+MongoDB collections can contain documents that represent instances of a variety of types.
+This feature can be useful if you store a hierarchy of classes or have a class with a property of type `Object`.In the latter case, the values held inside that property have to be read in correctly when retrieving the object.Thus, we need a mechanism to store type information alongside the actual document.
+
+To achieve that, the `MappingMongoConverter` uses a `MongoTypeMapper` abstraction with `DefaultMongoTypeMapper` as its main implementation.Its default behavior to store the fully qualified classname under `_class` inside the document.Type hints are written for top-level documents as well as for every value (if it is a complex type and a subtype of the declared property type).The following example (with a JSON representation at the end) shows how the mapping works:
+
+.Type mapping
+====
+[source,java]
+----
+class Sample {
+  Contact value;
+}
+
+abstract class Contact { … }
+
+class Person extends Contact { … }
+
+Sample sample = new Sample();
+sample.value = new Person();
+
+mongoTemplate.save(sample);
+
+{
+  "value" : { "_class" : "com.acme.Person" },
+  "_class" : "com.acme.Sample"
+}
+----
+====
+
+Spring Data MongoDB stores the type information as the last field for the actual root class as well as for the nested type (because it is complex and a subtype of `Contact`).So, if you now use `mongoTemplate.findAll(Object.class, "sample")`, you can find out that the document stored is a `Sample` instance.You can also find out that the value property is actually a `Person`.
+
+[[customizing-type-mapping]]
+=== Customizing Type Mapping
+
+If you want to avoid writing the entire Java class name as type information but would rather like to use a key, you can use the `@TypeAlias` annotation on the entity class.If you need to customize the mapping even more, have a look at the `TypeInformationMapper` interface.An instance of that interface can be configured at the `DefaultMongoTypeMapper`, which can, in turn, be configured on `MappingMongoConverter`.The following example shows how to define a type alias for an entity:
+
+.Defining a type alias for an Entity
+====
+[source,java]
+----
+@TypeAlias("pers")
+class Person {
+
+}
+----
+====
+
+Note that the resulting document contains `pers` as the value in the `_class` Field.
+
+[WARNING]
+====
+Type aliases only work if the mapping context is aware of the actual type.
+The required entity metadata is determined either on first save or has to be provided via the configurations initial entity set.
+By default, the configuration class scans the base package for potential candidates.
+
+[source,java]
+----
+@Configuration
+class AppConfig extends AbstractMongoClientConfiguration {
+
+  @Override
+  protected Set<Class<?>> getInitialEntitySet() {
+    return Collections.singleton(Person.class);
+  }
+
+  // ...
+}
+----
+====
+
+[[configuring-custom-type-mapping]]
+=== Configuring Custom Type Mapping
+
+The following example shows how to configure a custom `MongoTypeMapper` in `MappingMongoConverter`:
+
+[source,java]
+----
+class CustomMongoTypeMapper extends DefaultMongoTypeMapper {
+  //implement custom type mapping here
+}
+----
+
+.Configuring a custom `MongoTypeMapper`
+====
+.Java
+[source,java,role="primary"]
+----
+@Configuration
+class SampleMongoConfiguration extends AbstractMongoClientConfiguration {
+
+  @Override
+  protected String getDatabaseName() {
+    return "database";
+  }
+
+  @Bean
+  @Override
+  public MappingMongoConverter mappingMongoConverter(MongoDatabaseFactory databaseFactory,
+			MongoCustomConversions customConversions, MongoMappingContext mappingContext) {
+    MappingMongoConverter mmc = super.mappingMongoConverter();
+    mmc.setTypeMapper(customTypeMapper());
+    return mmc;
+  }
+
+  @Bean
+  public MongoTypeMapper customTypeMapper() {
+    return new CustomMongoTypeMapper();
+  }
+}
+----
+
+.XML
+[source,xml,role="secondary"]
+----
+<mongo:mapping-converter type-mapper-ref="customMongoTypeMapper"/>
+
+<bean name="customMongoTypeMapper" class="com.acme.CustomMongoTypeMapper"/>
+----
+====
+
+Note that the preceding example extends the `AbstractMongoClientConfiguration` class and overrides the bean definition of the `MappingMongoConverter` where we configured our custom `MongoTypeMapper`.
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/geo-json.adoc b/src/main/antora/modules/ROOT/pages/mongodb/geo-json.adoc
new file mode 100644
index 0000000000..a850604594
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/geo-json.adoc
@@ -0,0 +1,40 @@
+TODO: add the following section somewhere
+
+[[mongo.geo-json.jackson-modules]]
+== GeoJSON Jackson Modules
+
+By using the <<core.web>>, Spring Data registers additional Jackson ``Modules``s to the `ObjectMapper` for de-/serializing common Spring Data domain types.
+Please refer to the <<core.web.basic.jackson-mappers>> section to learn more about the infrastructure setup of this feature.
+
+The MongoDB module additionally registers ``JsonDeserializer``s for the following GeoJSON types via its `GeoJsonConfiguration` exposing the `GeoJsonModule`.
+----
+org.springframework.data.mongodb.core.geo.GeoJsonPoint
+org.springframework.data.mongodb.core.geo.GeoJsonMultiPoint
+org.springframework.data.mongodb.core.geo.GeoJsonLineString
+org.springframework.data.mongodb.core.geo.GeoJsonMultiLineString
+org.springframework.data.mongodb.core.geo.GeoJsonPolygon
+org.springframework.data.mongodb.core.geo.GeoJsonMultiPolygon
+----
+
+[NOTE]
+====
+The `GeoJsonModule` only registers ``JsonDeserializer``s! +
+To equip the `ObjectMapper` with a symmetric set of ``JsonSerializer``s you need to either manually configure those for the `ObjectMapper` or provide a custom `SpringDataJacksonModules` configuration exposing  `GeoJsonModule.serializers()` as a Spring Bean.
+
+[source,java]
+----
+class GeoJsonConfiguration implements SpringDataJacksonModules {
+
+	@Bean
+	public Module geoJsonSerializers() {
+		return GeoJsonModule.serializers();
+	}
+}
+----
+====
+
+[WARNING]
+====
+The next major version (`4.0`) will register both, ``JsonDeserializer``s and ``JsonSerializer``s for GeoJSON types by default.
+====
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/getting-started.adoc b/src/main/antora/modules/ROOT/pages/mongodb/getting-started.adoc
new file mode 100644
index 0000000000..a52e336ea3
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/getting-started.adoc
@@ -0,0 +1,62 @@
+[[mongodb-getting-started]]
+= Getting Started
+
+An easy way to bootstrap setting up a working environment is to create a Spring-based project via https://start.spring.io/#!type=maven-project&dependencies=data-mongodb[start.spring.io] or create a Spring project in https://spring.io/tools[Spring Tools].
+
+[[mongo.examples-repo]]
+== Examples Repository
+
+The GitHub https://github.com/spring-projects/spring-data-examples[spring-data-examples repository] hosts several examples that you can download and play around with to get a feel for how the library works.
+
+[[mongodb.hello-world]]
+== Hello World
+
+First, you need to set up a running MongoDB server. Refer to the https://docs.mongodb.org/manual/core/introduction/[MongoDB Quick Start guide] for an explanation on how to startup a MongoDB instance.
+Once installed, starting MongoDB is typically a matter of running the following command: `/bin/mongod`
+
+Then you can create a `Person` class to persist:
+
+====
+[source,java]
+----
+include::example$example/Person.java[tags=file]
+----
+====
+
+You also need a main application to run:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+include::example$example/MongoApplication.java[tags=file]
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+include::example$example/ReactiveMongoApplication.java[tags=file]
+----
+======
+
+When you run the main program, the preceding examples produce the following output:
+
+[source]
+----
+10:01:32,265 DEBUG o.s.data.mongodb.core.MongoTemplate - insert Document containing fields: [_class, age, name] in collection: Person
+10:01:32,765 DEBUG o.s.data.mongodb.core.MongoTemplate - findOne using query: { "name" : "Joe"} in db.collection: database.Person
+Person [id=4ddbba3c0be56b7e1b210166, name=Joe, age=34]
+10:01:32,984 DEBUG o.s.data.mongodb.core.MongoTemplate - Dropped collection [database.person]
+----
+
+Even in this simple example, there are few things to notice:
+
+* You can instantiate the central helper class of Spring Mongo, xref:mongodb/template-api.adoc[`MongoTemplate`], by using the standard or reactive `MongoClient` object and the name of the database to use.
+* The mapper works against standard POJO objects without the need for any additional metadata (though you can optionally provide that information. See xref:mongodb/mapping/mapping.adoc[here]).
+* Conventions are used for handling the `id` field, converting it to be an `ObjectId` when stored in the database.
+* Mapping conventions can use field access. Notice that the `Person` class has only getters.
+* If the constructor argument names match the field names of the stored document, they are used to instantiate the object
+
diff --git a/src/main/asciidoc/reference/jmx.adoc b/src/main/antora/modules/ROOT/pages/mongodb/jmx.adoc
similarity index 74%
rename from src/main/asciidoc/reference/jmx.adoc
rename to src/main/antora/modules/ROOT/pages/mongodb/jmx.adoc
index 27f40a9095..8b98bcebd2 100644
--- a/src/main/asciidoc/reference/jmx.adoc
+++ b/src/main/antora/modules/ROOT/pages/mongodb/jmx.adoc
@@ -1,7 +1,13 @@
 [[mongo.jmx]]
 = JMX support
 
-The JMX support for MongoDB exposes the results of executing the 'serverStatus' command on the admin database for a single MongoDB server instance. It also exposes an administrative MBean, `MongoAdmin`, that lets you perform administrative operations, such as dropping or creating a database. The JMX features build upon the JMX feature set available in the Spring Framework. See https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/integration.html#jmx[here] for more details.
+[NOTE]
+====
+JMX support has been deprecated in 4.5 and will be removed in 5.0. +
+We recommend switching to Spring Boot https://docs.spring.io/spring-boot/reference/actuator/endpoints.html[Actuator Endpoints] and expose those over JMX if needed.
+====
+
+The JMX support for MongoDB exposes the results of running the 'serverStatus' command on the admin database for a single MongoDB server instance. It also exposes an administrative MBean, `MongoAdmin`, that lets you perform administrative operations, such as dropping or creating a database. The JMX features build upon the JMX feature set available in the Spring Framework. See link:{springDocsUrl}/integration.html#jmx[here] for more details.
 
 [[mongodb:jmx-configuration]]
 == MongoDB JMX Configuration
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/lifecycle-events.adoc b/src/main/antora/modules/ROOT/pages/mongodb/lifecycle-events.adoc
new file mode 100644
index 0000000000..e7a41a3426
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/lifecycle-events.adoc
@@ -0,0 +1,147 @@
+[[mongodb.mapping-usage.events]]
+= Lifecycle Events
+
+The MongoDB mapping framework includes several `org.springframework.context.ApplicationEvent` events that your application can respond to by registering special beans in the `ApplicationContext`.
+Being based on Spring's `ApplicationContext` event infrastructure enables other products, such as Spring Integration, to easily receive these events, as they are a well known eventing mechanism in Spring-based applications.
+
+Entity lifecycle events can be costly and you may notice a change in the performance profile when loading large result sets.
+You can disable lifecycle events on the javadoc:org.springframework.data.mongodb.core.MongoTemplate#setEntityLifecycleEventsEnabled(boolean)[Template API].
+
+To intercept an object before it goes through the conversion process (which turns your domain object into a `org.bson.Document`), you can register a subclass of `AbstractMongoEventListener` that overrides the `onBeforeConvert` method.
+When the event is dispatched, your listener is called and passed the domain object before it goes into the converter.
+The following example shows how to do so:
+
+====
+[source,java]
+----
+public class BeforeConvertListener extends AbstractMongoEventListener<Person> {
+  @Override
+  public void onBeforeConvert(BeforeConvertEvent<Person> event) {
+    ... does some auditing manipulation, set timestamps, whatever ...
+  }
+}
+----
+====
+
+To intercept an object before it goes into the database, you can register a subclass of javadoc:org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener[] that overrides the `onBeforeSave` method. When the event is dispatched, your listener is called and passed the domain object and the converted `com.mongodb.Document`. The following example shows how to do so:
+
+====
+[source,java]
+----
+public class BeforeSaveListener extends AbstractMongoEventListener<Person> {
+  @Override
+  public void onBeforeSave(BeforeSaveEvent<Person> event) {
+    … change values, delete them, whatever …
+  }
+}
+----
+====
+
+Declaring these beans in your Spring ApplicationContext causes them to be invoked whenever the event is dispatched.
+
+.Callbacks on `AbstractMappingEventListener`:
+[%collapsible]
+====
+* `onBeforeConvert`: Called in `MongoTemplate` `insert`, `insertList`, and `save` operations before the object is converted to a `Document` by a `MongoConverter`.
+* `onBeforeSave`: Called in `MongoTemplate` `insert`, `insertList`, and `save` operations *before* inserting or saving the `Document` in the database.
+* `onAfterSave`: Called in `MongoTemplate` `insert`, `insertList`, and `save` operations *after* inserting or saving the `Document` in the database.
+* `onAfterLoad`: Called in `MongoTemplate` `find`, `findAndRemove`, `findOne`, and `getCollection` methods after the `Document` has been retrieved from the database.
+* `onAfterConvert`: Called in `MongoTemplate` `find`, `findAndRemove`, `findOne`, and `getCollection` methods after the `Document` has been retrieved from the database was converted to a POJO.
+====
+
+NOTE: Lifecycle events are only emitted for root level types.
+Complex types used as properties within a document root are not subject to event publication unless they are document references annotated with `@DBRef`.
+
+WARNING: Lifecycle events depend on an `ApplicationEventMulticaster`, which in case of the `SimpleApplicationEventMulticaster` can be configured with a `TaskExecutor`, and therefore gives no guarantees when an Event is processed.
+
+include::{commons}@data-commons::page$entity-callbacks.adoc[leveloffset=+1]
+
+[[mongo.entity-callbacks]]
+== Store specific EntityCallbacks
+
+Spring Data MongoDB uses the `EntityCallback` API for its auditing support and reacts on the following callbacks.
+
+.Supported Entity Callbacks
+[%header,cols="4"]
+|===
+| Callback
+| Method
+| Description
+| Order
+
+| `ReactiveBeforeConvertCallback`
+`BeforeConvertCallback`
+| `onBeforeConvert(T entity, String collection)`
+| Invoked before a domain object is converted to `org.bson.Document`.
+| `Ordered.LOWEST_PRECEDENCE`
+
+| `ReactiveAfterConvertCallback`
+`AfterConvertCallback`
+| `onAfterConvert(T entity, org.bson.Document target, String collection)`
+| Invoked after a domain object is loaded. +
+Can modify the domain object after reading it from a `org.bson.Document`.
+| `Ordered.LOWEST_PRECEDENCE`
+
+| `ReactiveAuditingEntityCallback`
+`AuditingEntityCallback`
+| `onBeforeConvert(Object entity, String collection)`
+| Marks an auditable entity _created_ or _modified_
+| 100
+
+| `ReactiveBeforeSaveCallback`
+`BeforeSaveCallback`
+| `onBeforeSave(T entity, org.bson.Document target, String collection)`
+| Invoked before a domain object is saved. +
+Can modify the target, to be persisted, `Document` containing all mapped entity information.
+| `Ordered.LOWEST_PRECEDENCE`
+
+| `ReactiveAfterSaveCallback`
+`AfterSaveCallback`
+| `onAfterSave(T entity, org.bson.Document target, String collection)`
+| Invoked before a domain object is saved. +
+Can modify the domain object, to be returned after save, `Document` containing all mapped entity information.
+| `Ordered.LOWEST_PRECEDENCE`
+
+|===
+
+=== Bean Validation
+
+Spring Data MongoDB supports Bean Validation for MongoDB entities annotated with https://beanvalidation.org/[https://xxx][Jakarta Validation annotations].
+
+You can enable Bean Validation by registering `ValidatingEntityCallback` respectively `ReactiveValidatingEntityCallback` for reactive driver usage in your Spring `ApplicationContext` as shown in the following example:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+class Config {
+
+  @Bean
+  public ValidatingEntityCallback validatingEntityCallback(Validator validator) {
+    return new ValidatingEntityCallback(validator);
+  }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Configuration
+class Config {
+
+  @Bean
+  public ReactiveValidatingEntityCallback validatingEntityCallback(Validator validator) {
+    return new ReactiveValidatingEntityCallback(validator);
+  }
+}
+----
+======
+
+If you're using both, imperative and reactive, then you can enable also both callbacks.
+
+NOTE: When using XML-based configuration, historically, `ValidatingMongoEventListener` is registered through our namespace handlers when configuring `<mongo:mapping-converter>`.
+If you want to use the newer Entity Callback variant, make sure to not use `<mongo:mapping-converter>`, otherwise you'll end up with both, the `ValidatingMongoEventListener` and the `ValidatingEntityCallback` being registered.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mapping/custom-conversions.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/custom-conversions.adoc
new file mode 100644
index 0000000000..4553be1d43
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/custom-conversions.adoc
@@ -0,0 +1,114 @@
+include::{commons}@data-commons::page$custom-conversions.adoc[]
+
+[[mongo.custom-converters]]
+== Type based Converter
+
+The most trivial way of influencing the mapping result is by specifying the desired native MongoDB target type via the `@Field` annotation.
+This allows to work with non MongoDB types like `BigDecimal` in the domain model while persisting values in native `org.bson.types.Decimal128` format.
+
+.Explicit target type mapping
+====
+[source,java]
+----
+public class Payment {
+
+  @Id String id; <1>
+
+  @Field(targetType = FieldType.DECIMAL128) <2>
+  BigDecimal value;
+
+  Date date; <3>
+
+}
+----
+
+[source,java]
+----
+{
+  "_id"   : ObjectId("5ca4a34fa264a01503b36af8"), <1>
+  "value" : NumberDecimal(2.099),                 <2>
+  "date"  : ISODate("2019-04-03T12:11:01.870Z")   <3>
+}
+----
+<1> String _id_ values that represent a valid `ObjectId` are converted automatically. See xref:mongodb/template-crud-operations.adoc#mongo-template.id-handling[How the `_id` Field is Handled in the Mapping Layer]
+for details.
+<2> The desired target type is explicitly defined as `Decimal128` which translates to `NumberDecimal`.
+Otherwise, the
+`BigDecimal` value would have been truned into a `String`.
+<3> `Date` values are handled by the MongoDB driver itself are stored as `ISODate`.
+====
+
+The snippet above is handy for providing simple type hints. To gain more fine-grained control over the mapping process,
+ you can register Spring converters with the `MongoConverter` implementations, such as the `MappingMongoConverter`.
+
+The `MappingMongoConverter` checks to see if any Spring converters can handle a specific class before attempting to map the object itself. To 'hijack' the normal mapping strategies of the `MappingMongoConverter`, perhaps for increased performance or other custom mapping needs, you first need to create an implementation of the Spring `Converter` interface and then register it with the `MappingConverter`.
+
+NOTE: For more information on the Spring type conversion service, see the reference docs link:{springDocsUrl}/core.html#validation[here].
+
+[[mongo.custom-converters.writer]]
+=== Writing Converter
+
+The following example shows an implementation of the `Converter` that converts from a `Person` object to a `org.bson.Document`:
+
+[source,java]
+----
+import org.springframework.core.convert.converter.Converter;
+
+import org.bson.Document;
+
+public class PersonWriteConverter implements Converter<Person, Document> {
+
+  public Document convert(Person source) {
+    Document document = new Document();
+    document.put("_id", source.getId());
+    document.put("name", source.getFirstName());
+    document.put("age", source.getAge());
+    return document;
+  }
+}
+----
+
+[[mongo.custom-converters.reader]]
+=== Reading Converter
+
+The following example shows an implementation of a `Converter` that converts from a `Document` to a `Person` object:
+
+[source,java]
+----
+public class PersonReadConverter implements Converter<Document, Person> {
+
+  public Person convert(Document source) {
+    Person p = new Person((ObjectId) source.get("_id"), (String) source.get("name"));
+    p.setAge((Integer) source.get("age"));
+    return p;
+  }
+}
+----
+
+[[mongo.custom-converters.xml]]
+=== Registering Converters
+
+[source,java]
+----
+class MyMongoConfiguration extends AbstractMongoClientConfiguration {
+
+	@Override
+	public String getDatabaseName() {
+		return "database";
+	}
+
+	@Override
+	protected void configureConverters(MongoConverterConfigurationAdapter adapter) {
+		adapter.registerConverter(new com.example.PersonReadConverter());
+		adapter.registerConverter(new com.example.PersonWriteConverter());
+	}
+}
+----
+
+[[mongo.numeric-conversion]]
+== Big Number Format
+
+MongoDB in its early days did not have support for large numeric values such as `BigDecimal`.
+To persist `BigDecimal` and `BigInteger` values, Spring Data MongoDB converted values their `String` representation.
+With MongoDB Server 3.4, `org.bson.types.Decimal128` offers a native representation for `BigDecimal` and `BigInteger`.
+You can use the to the native representation by either annotating your properties with `@Field(targetType=DECIMAL128)` or by configuring the big decimal representation in `MongoCustomConversions` through `MongoCustomConversions.create(config -> config.bigDecimal(…))`.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mapping/document-references.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/document-references.adoc
new file mode 100644
index 0000000000..1dec452dcf
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/document-references.adoc
@@ -0,0 +1,505 @@
+[[mapping-usage-references]]
+= Using DBRefs
+
+The mapping framework does not have to store child objects embedded within the document.
+You can also store them separately and use a `DBRef` to refer to that document.
+When the object is loaded from MongoDB, those references are eagerly resolved so that you get back a mapped object that looks the same as if it had been stored embedded within your top-level document.
+
+The following example uses a DBRef to refer to a specific document that exists independently of the object in which it is referenced (both classes are shown in-line for brevity's sake):
+
+====
+[source,java]
+----
+@Document
+public class Account {
+
+  @Id
+  private ObjectId id;
+  private Float total;
+}
+
+@Document
+public class Person {
+
+  @Id
+  private ObjectId id;
+  @Indexed
+  private Integer ssn;
+  @DBRef
+  private List<Account> accounts;
+}
+----
+====
+
+You need not use `@OneToMany` or similar mechanisms because the List of objects tells the mapping framework that you want a one-to-many relationship.
+When the object is stored in MongoDB, there is a list of DBRefs rather than the `Account` objects themselves.
+When it comes to loading collections of ``DBRef``s it is advisable to restrict references held in collection types to a specific MongoDB collection.
+This allows bulk loading of all references, whereas references pointing to different MongoDB collections need to be resolved one by one.
+
+IMPORTANT: The mapping framework does not handle cascading saves.
+If you change an `Account` object that is referenced by a `Person` object, you must save the `Account` object separately.
+Calling `save` on the `Person` object does not automatically save the `Account` objects in the `accounts` property.
+
+``DBRef``s can also be resolved lazily.
+In this case the actual `Object` or `Collection` of references is resolved on first access of the property.
+Use the `lazy` attribute of `@DBRef` to specify this.
+Required properties that are also defined as lazy loading ``DBRef`` and used as constructor arguments are also decorated with the lazy loading proxy making sure to put as little pressure on the database and network as possible.
+
+TIP: Lazily loaded ``DBRef``s can be hard to debug.
+Make sure tooling does not accidentally trigger proxy resolution by e.g. calling `toString()` or some inline debug rendering invoking property getters.
+Please consider to enable _trace_ logging for `org.springframework.data.mongodb.core.convert.DefaultDbRefResolver` to gain insight on `DBRef` resolution.
+
+CAUTION: Lazy loading may require class proxies, that in turn, might need access to jdk internals, that are not open, starting with Java 16+, due to https://openjdk.java.net/jeps/396[JEP 396: Strongly Encapsulate JDK Internals by Default].
+For those cases please consider falling back to an interface type (eg. switch from `ArrayList` to `List`) or provide the required `--add-opens` argument.
+
+[[mapping-usage.document-references]]
+== Using Document References
+
+Using `@DocumentReference` offers a flexible way of referencing entities in MongoDB.
+While the goal is the same as when using xref:mongodb/mapping/document-references.adoc[DBRefs], the store representation is different.
+`DBRef` resolves to a document with a fixed structure as outlined in the https://docs.mongodb.com/manual/reference/database-references/[MongoDB Reference documentation]. +
+Document references, do not follow a specific format.
+They can be literally anything, a single value, an entire document, basically everything that can be stored in MongoDB.
+By default, the mapping layer will use the referenced entities _id_ value for storage and retrieval, like in the sample below.
+
+====
+[source,java]
+----
+@Document
+class Account {
+
+  @Id
+  String id;
+  Float total;
+}
+
+@Document
+class Person {
+
+  @Id
+  String id;
+
+  @DocumentReference                                   <1>
+  List<Account> accounts;
+}
+----
+
+[source,java]
+----
+Account account = …
+
+template.insert(account);                               <2>
+
+template.update(Person.class)
+  .matching(where("id").is(…))
+  .apply(new Update().push("accounts").value(account)) <3>
+  .first();
+----
+
+[source,json]
+----
+{
+  "_id" : …,
+  "accounts" : [ "6509b9e" … ]                        <4>
+}
+----
+<1> Mark the collection of `Account` values to be referenced.
+<2> The mapping framework does not handle cascading saves, so make sure to persist the referenced entity individually.
+<3> Add the reference to the existing entity.
+<4> Referenced `Account` entities are represented as an array of their `_id` values.
+====
+
+The sample above uses an ``_id``-based fetch query (`{ '_id' : ?#{#target} }`) for data retrieval and resolves linked entities eagerly.
+It is possible to alter resolution defaults (listed below) using the attributes of `@DocumentReference`
+
+.@DocumentReference defaults
+[cols="2,3,5",options="header"]
+|===
+| Attribute | Description | Default
+
+| `db`
+| The target database name for collection lookup.
+| `MongoDatabaseFactory.getMongoDatabase()`
+
+| `collection`
+| The target collection name.
+| The annotated property's domain type, respectively the value type in case of `Collection` like or `Map` properties, collection name.
+
+| `lookup`
+| The single document lookup query evaluating placeholders via SpEL expressions using `#target` as the marker for a given source value. `Collection` like or `Map` properties combine individual lookups via an `$or` operator.
+| An `_id` field based query (`{ '_id' : ?#{#target} }`) using the loaded source value.
+
+| `sort`
+| Used for sorting result documents on server side.
+| None by default.
+Result order of `Collection` like properties is restored based on the used lookup query on a best-effort basis.
+
+| `lazy`
+| If set to `true` value resolution is delayed upon first access of the property.
+| Resolves properties eagerly by default.
+|===
+
+CAUTION: Lazy loading may require class proxies, that in turn, might need access to jdk internals, that are not open, starting with Java 16+, due to https://openjdk.java.net/jeps/396[JEP 396: Strongly Encapsulate JDK Internals by Default].
+For those cases please consider falling back to an interface type (eg. switch from `ArrayList` to `List`) or provide the required `--add-opens` argument.
+
+`@DocumentReference(lookup)` allows defining filter queries that can be different from the `_id` field and therefore offer a flexible way of defining references between entities as demonstrated in the sample below, where the `Publisher` of a book is referenced by its acronym instead of the internal `id`.
+
+====
+[source,java]
+----
+@Document
+class Book {
+
+  @Id
+  ObjectId id;
+  String title;
+  List<String> author;
+
+  @Field("publisher_ac")
+  @DocumentReference(lookup = "{ 'acronym' : ?#{#target} }") <1>
+  Publisher publisher;
+}
+
+@Document
+class Publisher {
+
+  @Id
+  ObjectId id;
+  String acronym;                                            <1>
+  String name;
+
+  @DocumentReference(lazy = true)                            <2>
+  List<Book> books;
+
+}
+----
+
+.`Book` document
+[source,json]
+----
+{
+  "_id" : 9a48e32,
+  "title" : "The Warded Man",
+  "author" : ["Peter V. Brett"],
+  "publisher_ac" : "DR"
+}
+----
+
+.`Publisher` document
+[source,json]
+----
+{
+  "_id" : 1a23e45,
+  "acronym" : "DR",
+  "name" : "Del Rey",
+  …
+}
+----
+<1> Use the `acronym` field to query for entities in the `Publisher` collection.
+<2> Lazy load back references to the `Book` collection.
+====
+
+The above snippet shows the reading side of things when working with custom referenced objects.
+Writing requires a bit of additional setup as the mapping information do not express where `#target` stems from.
+The mapping layer requires registration of a `Converter` between the target document and `DocumentPointer`, like the one below:
+
+====
+[source,java]
+----
+@WritingConverter
+class PublisherReferenceConverter implements Converter<Publisher, DocumentPointer<String>> {
+
+	@Override
+	public DocumentPointer<String> convert(Publisher source) {
+		return () -> source.getAcronym();
+	}
+}
+----
+====
+
+If no `DocumentPointer` converter is provided the target reference document can be computed based on the given lookup query.
+In this case the association target properties are evaluated as shown in the following sample.
+
+====
+[source,java]
+----
+@Document
+class Book {
+
+  @Id
+  ObjectId id;
+  String title;
+  List<String> author;
+
+  @DocumentReference(lookup = "{ 'acronym' : ?#{acc} }") <1> <2>
+  Publisher publisher;
+}
+
+@Document
+class Publisher {
+
+  @Id
+  ObjectId id;
+  String acronym;                                        <1>
+  String name;
+
+  // ...
+}
+----
+
+[source,json]
+----
+{
+  "_id" : 9a48e32,
+  "title" : "The Warded Man",
+  "author" : ["Peter V. Brett"],
+  "publisher" : {
+    "acc" : "DOC"
+  }
+}
+----
+<1> Use the `acronym` field to query for entities in the `Publisher` collection.
+<2> The field value placeholders of the lookup query (like `acc`) is used to form the reference document.
+====
+
+It is also possible to model relational style _One-To-Many_ references using a combination of `@ReadonlyProperty` and `@DocumentReference`.
+This approach allows link types without storing the linking values within the owning document but rather on the referencing document as shown in the example below.
+
+====
+[source,java]
+----
+@Document
+class Book {
+
+  @Id
+  ObjectId id;
+  String title;
+  List<String> author;
+
+  ObjectId publisherId;                                        <1>
+}
+
+@Document
+class Publisher {
+
+  @Id
+  ObjectId id;
+  String acronym;
+  String name;
+
+  @ReadOnlyProperty                                            <2>
+  @DocumentReference(lookup="{'publisherId':?#{#self._id} }")  <3>
+  List<Book> books;
+}
+----
+
+.`Book` document
+[source,json]
+----
+{
+  "_id" : 9a48e32,
+  "title" : "The Warded Man",
+  "author" : ["Peter V. Brett"],
+  "publisherId" : 8cfb002
+}
+----
+
+.`Publisher` document
+[source,json]
+----
+{
+  "_id" : 8cfb002,
+  "acronym" : "DR",
+  "name" : "Del Rey"
+}
+----
+<1> Set up the link from `Book` (reference) to `Publisher` (owner) by storing the `Publisher.id` within the `Book` document.
+<2> Mark the property holding the references to be readonly.
+This prevents storing references to individual ``Book``s with the `Publisher` document.
+<3> Use the `#self` variable to access values within the `Publisher` document and in this retrieve `Books` with matching `publisherId`.
+====
+
+With all the above in place it is possible to model all kind of associations between entities.
+Have a look at the non-exhaustive list of samples below to get feeling for what is possible.
+
+.Simple Document Reference using _id_ field
+====
+[source,java]
+----
+class Entity {
+  @DocumentReference
+  ReferencedObject ref;
+}
+----
+
+[source,json]
+----
+// entity
+{
+  "_id" : "8cfb002",
+  "ref" : "9a48e32" <1>
+}
+
+// referenced object
+{
+  "_id" : "9a48e32" <1>
+}
+----
+<1> MongoDB simple type can be directly used without further configuration.
+====
+
+.Simple Document Reference using _id_ field with explicit lookup query
+====
+[source,java]
+----
+class Entity {
+  @DocumentReference(lookup = "{ '_id' : '?#{#target}' }") <1>
+  ReferencedObject ref;
+}
+----
+
+[source,json]
+----
+// entity
+{
+  "_id" : "8cfb002",
+  "ref" : "9a48e32"                                        <1>
+}
+
+// referenced object
+{
+  "_id" : "9a48e32"
+}
+----
+<1> _target_ defines the reference value itself.
+====
+
+.Document Reference extracting the `refKey` field for the lookup query
+====
+[source,java]
+----
+class Entity {
+  @DocumentReference(lookup = "{ '_id' : '?#{refKey}' }")  <1> <2>
+  private ReferencedObject ref;
+}
+----
+
+[source,java]
+----
+@WritingConverter
+class ToDocumentPointerConverter implements Converter<ReferencedObject, DocumentPointer<Document>> {
+	public DocumentPointer<Document> convert(ReferencedObject source) {
+		return () -> new Document("refKey", source.id);    <1>
+	}
+}
+----
+
+[source,json]
+----
+// entity
+{
+  "_id" : "8cfb002",
+  "ref" : {
+    "refKey" : "9a48e32"                                   <1>
+  }
+}
+
+// referenced object
+{
+  "_id" : "9a48e32"
+}
+----
+<1> The key used for obtaining the reference value must be the one used during write.
+<2> `refKey` is short for `target.refKey`.
+====
+
+.Document Reference with multiple values forming the lookup query
+====
+[source,java]
+----
+class Entity {
+  @DocumentReference(lookup = "{ 'firstname' : '?#{fn}', 'lastname' : '?#{ln}' }") <1> <2>
+  ReferencedObject ref;
+}
+----
+
+[source,json]
+----
+// entity
+{
+  "_id" : "8cfb002",
+  "ref" : {
+    "fn" : "Josh",           <1>
+    "ln" : "Long"            <1>
+  }
+}
+
+// referenced object
+{
+  "_id" : "9a48e32",
+  "firstname" : "Josh",      <2>
+  "lastname" : "Long",       <2>
+}
+----
+<1> Read/write the keys `fn` & `ln` from/to the linkage document based on the lookup query.
+<2> Use non _id_ fields for the lookup of the target documents.
+====
+
+.Document Reference reading from a target collection
+====
+[source,java]
+----
+class Entity {
+  @DocumentReference(lookup = "{ '_id' : '?#{id}' }", collection = "?#{collection}") <2>
+  private ReferencedObject ref;
+}
+----
+
+[source,java]
+----
+@WritingConverter
+class ToDocumentPointerConverter implements Converter<ReferencedObject, DocumentPointer<Document>> {
+	public DocumentPointer<Document> convert(ReferencedObject source) {
+		return () -> new Document("id", source.id)                                   <1>
+                           .append("collection", … );                                <2>
+	}
+}
+----
+
+[source,json]
+----
+// entity
+{
+  "_id" : "8cfb002",
+  "ref" : {
+    "id" : "9a48e32",                                                                <1>
+    "collection" : "…"                                                               <2>
+  }
+}
+----
+<1> Read/write the keys `_id` from/to the reference document to use them in the lookup query.
+<2> The collection name can be read from the reference document using its key.
+====
+
+[WARNING]
+====
+We know it is tempting to use all kinds of MongoDB query operators in the lookup query and this is fine.
+But there a few aspects to consider:
+
+* Make sure to have indexes in place that support your lookup.
+* Make sure to use the same data types: `@DocumentReference(lookup="{'someRef':?#{#self._id} }")` can easily fail when using `@Id String id` and `String someRef` as ``String @Id``'s are subject to automatic ObjectId conversion (but not other `String` properties containing `ObjectId.toString()`).
+Reference lookup uses values from the resulting `Document` and in that case, it would query a String field using an `ObjectId` yielding no results.
+* Mind that resolution requires a server roundtrip inducing latency, consider a lazy strategy.
+* A collection of document references is bulk loaded using the `$or` operator. +
+The original element order is restored in memory on a best-effort basis.
+Restoring the order is only possible when using equality expressions and cannot be done when using MongoDB query operators.
+In this case results will be ordered as they are received from the store or via the provided `@DocumentReference(sort)` attribute.
+
+A few more general remarks:
+
+* Do you use cyclic references?
+Ask your self if you need them.
+* Lazy document references are hard to debug.
+Make sure tooling does not accidentally trigger proxy resolution by e.g. calling `toString()`.
+* There is no support for reading document references using reactive infrastructure.
+====
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping-index-management.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping-index-management.adoc
new file mode 100644
index 0000000000..b094b925d0
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping-index-management.adoc
@@ -0,0 +1,340 @@
+[[mapping.index-creation]]
+= Index Creation
+
+Spring Data MongoDB can automatically create indexes for entity types annotated with `@Document`.
+Index creation must be explicitly enabled since version 3.0 to prevent undesired effects with collection lifecyle and performance impact.
+Indexes are automatically created for the initial entity set on application startup and when accessing an entity type for the first time while the application runs.
+
+We generally recommend explicit index creation for application-based control of indexes as Spring Data cannot automatically create indexes for collections that were recreated while the application was running.
+
+`IndexResolver` provides an abstraction for programmatic index definition creation if you want to make use of `@Indexed` annotations such as `@GeoSpatialIndexed`, `@TextIndexed`, `@CompoundIndex` and `@WildcardIndexed`.
+You can use index definitions with `IndexOperations` to create indexes.
+A good point in time for index creation is on application startup, specifically after the application context was refreshed, triggered by observing `ContextRefreshedEvent`.
+This event guarantees that the context is fully initialized.
+Note that at this time other components, especially bean factories might have access to the MongoDB database.
+
+[WARNING]
+====
+``Map``-like properties are skipped by the `IndexResolver` unless annotated with `@WildcardIndexed` because the _map key_ must be part of the index definition. Since the purpose of maps is the usage of dynamic keys and values, the keys cannot be resolved from static mapping metadata.
+====
+
+.Programmatic Index Creation for a single Domain Type
+====
+[source,java]
+----
+class MyListener {
+
+  @EventListener(ContextRefreshedEvent.class)
+  public void initIndicesAfterStartup() {
+
+    MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext = mongoTemplate
+                .getConverter().getMappingContext();
+
+    IndexResolver resolver = new MongoPersistentEntityIndexResolver(mappingContext);
+
+    IndexOperations indexOps = mongoTemplate.indexOps(DomainType.class);
+    resolver.resolveIndexFor(DomainType.class).forEach(indexOps::ensureIndex);
+  }
+}
+----
+====
+
+.Programmatic Index Creation for all Initial Entities
+====
+[source,java]
+----
+class MyListener{
+
+  @EventListener(ContextRefreshedEvent.class)
+  public void initIndicesAfterStartup() {
+
+    MappingContext<? extends MongoPersistentEntity<?>, MongoPersistentProperty> mappingContext = mongoTemplate
+        .getConverter().getMappingContext();
+
+    // consider only entities that are annotated with @Document
+    mappingContext.getPersistentEntities()
+                            .stream()
+                            .filter(it -> it.isAnnotationPresent(Document.class))
+                            .forEach(it -> {
+
+    IndexOperations indexOps = mongoTemplate.indexOps(it.getType());
+    resolver.resolveIndexFor(it.getType()).forEach(indexOps::ensureIndex);
+    });
+  }
+}
+----
+====
+
+Alternatively, if you want to ensure index and collection presence before any component is able to access your database from your application, declare a `@Bean` method for `MongoTemplate` and include the code  from above before returning the `MongoTemplate` object.
+
+[NOTE]
+====
+To turn automatic index creation _ON_ please override `autoIndexCreation()` in your configuration.
+[source,java]
+----
+@Configuration
+public class Config extends AbstractMongoClientConfiguration {
+
+  @Override
+  public boolean autoIndexCreation() {
+    return true;
+  }
+
+// ...
+}
+----
+====
+
+IMPORTANT: Automatic index creation is turned _OFF_ by default as of version 3.0.
+
+[[mapping-usage-indexes.compound-index]]
+== Compound Indexes
+
+Compound indexes are also supported. They are defined at the class level, rather than on individual properties.
+
+NOTE: Compound indexes are very important to improve the performance of queries that involve criteria on multiple fields
+
+Here's an example that creates a compound index of `lastName` in ascending order and `age` in descending order:
+
+.Example Compound Index Usage
+====
+[source,java]
+----
+package com.mycompany.domain;
+
+@Document
+@CompoundIndex(name = "age_idx", def = "{'lastName': 1, 'age': -1}")
+public class Person {
+
+  @Id
+  private ObjectId id;
+  private Integer age;
+  private String firstName;
+  private String lastName;
+
+}
+----
+====
+
+[TIP]
+====
+`@CompoundIndex` is repeatable using `@CompoundIndexes` as its container.
+
+[source,java]
+----
+@Document
+@CompoundIndex(name = "cmp-idx-one", def = "{'firstname': 1, 'lastname': -1}")
+@CompoundIndex(name = "cmp-idx-two", def = "{'address.city': -1, 'address.street': 1}")
+public class Person {
+
+  String firstname;
+  String lastname;
+
+  Address address;
+
+  // ...
+}
+----
+====
+
+[[mapping-usage-indexes.hashed-index]]
+== Hashed Indexes
+
+Hashed indexes allow hash based sharding within a sharded cluster.
+Using hashed field values to shard collections results in a more random distribution.
+For details, refer to the https://docs.mongodb.com/manual/core/index-hashed/[MongoDB Documentation].
+
+Here's an example that creates a hashed index for `_id`:
+
+.Example Hashed Index Usage
+====
+[source,java]
+----
+@Document
+public class DomainType {
+
+  @HashIndexed @Id String id;
+
+  // ...
+}
+----
+====
+
+Hashed indexes can be created next to other index definitions like shown below, in that case both indices are created:
+
+.Example Hashed Index Usage togehter with simple index
+====
+[source,java]
+----
+@Document
+public class DomainType {
+
+  @Indexed
+  @HashIndexed
+  String value;
+
+  // ...
+}
+----
+====
+
+In case the example above is too verbose, a compound annotation allows to reduce the number of annotations that need to be declared on a property:
+
+.Example Composed Hashed Index Usage
+====
+[source,java]
+----
+@Document
+public class DomainType {
+
+  @IndexAndHash(name = "idx...")                            <1>
+  String value;
+
+  // ...
+}
+
+@Indexed
+@HashIndexed
+@Retention(RetentionPolicy.RUNTIME)
+public @interface IndexAndHash {
+
+  @AliasFor(annotation = Indexed.class, attribute = "name") <1>
+  String name() default "";
+}
+----
+<1> Potentially register an alias for certain attributes of the meta annotation.
+====
+
+[NOTE]
+====
+Although index creation via annotations comes in handy for many scenarios cosider taking over more control by setting up indices manually via `IndexOperations`.
+
+[source,java]
+----
+mongoOperations.indexOpsFor(Jedi.class)
+  .ensureIndex(HashedIndex.hashed("useTheForce"));
+----
+====
+
+[[mapping-usage-indexes.wildcard-index]]
+== Wildcard Indexes
+
+A `WildcardIndex` is an index that can be used to include all fields or specific ones based a given (wildcard) pattern.
+For details, refer to the https://docs.mongodb.com/manual/core/index-wildcard/[MongoDB Documentation].
+
+The index can be set up programmatically using `WildcardIndex` via `IndexOperations`.
+
+.Programmatic WildcardIndex setup
+====
+[source,java]
+----
+mongoOperations
+    .indexOps(User.class)
+    .ensureIndex(new WildcardIndex("userMetadata"));
+----
+[source,javascript]
+----
+db.user.createIndex({ "userMetadata.$**" : 1 }, {})
+----
+====
+
+The `@WildcardIndex` annotation allows a declarative index setup that can used either with a document type or property.
+
+If placed on a type that is a root level domain entity (one annotated with `@Document`) , the index resolver will create a
+wildcard index for it.
+
+.Wildcard index on domain type
+====
+[source,java]
+----
+@Document
+@WildcardIndexed
+public class Product {
+	// …
+}
+----
+[source,javascript]
+----
+db.product.createIndex({ "$**" : 1 },{})
+----
+====
+
+The `wildcardProjection` can be used to specify keys to in-/exclude in the index.
+
+.Wildcard index with `wildcardProjection`
+====
+[source,java]
+----
+@Document
+@WildcardIndexed(wildcardProjection = "{ 'userMetadata.age' : 0 }")
+public class User {
+    private @Id String id;
+    private UserMetadata userMetadata;
+}
+----
+[source,javascript]
+----
+db.user.createIndex(
+  { "$**" : 1 },
+  { "wildcardProjection" :
+    { "userMetadata.age" : 0 }
+  }
+)
+----
+====
+
+Wildcard indexes can also be expressed by adding the annotation directly to the field.
+Please note that `wildcardProjection` is not allowed on nested paths such as properties.
+Projections on types annotated with `@WildcardIndexed` are omitted during index creation.
+
+.Wildcard index on property
+====
+[source,java]
+----
+@Document
+public class User {
+    private @Id String id;
+
+    @WildcardIndexed
+    private UserMetadata userMetadata;
+}
+----
+[source,javascript]
+----
+db.user.createIndex({ "userMetadata.$**" : 1 }, {})
+----
+====
+
+[[mapping-usage-indexes.text-index]]
+== Text Indexes
+
+NOTE: The text index feature is disabled by default for MongoDB v.2.4.
+
+Creating a text index allows accumulating several fields into a searchable full-text index.
+It is only possible to have one text index per collection, so all fields marked with `@TextIndexed` are combined into this index.
+Properties can be weighted to influence the document score for ranking results.
+The default language for the text index is English.To change the default language, set the `language` attribute to whichever language you want (for example,`@Document(language="spanish")`).
+Using a property called `language` or `@Language` lets you define a language override on a per-document base.
+The following example shows how to created a text index and set the language to Spanish:
+
+.Example Text Index Usage
+====
+[source,java]
+----
+@Document(language = "spanish")
+class SomeEntity {
+
+    @TextIndexed String foo;
+
+    @Language String lang;
+
+    Nested nested;
+}
+
+class Nested {
+
+    @TextIndexed(weight=5) String bar;
+    String roo;
+}
+----
+====
diff --git a/src/main/asciidoc/reference/mongo-json-schema.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping-schema.adoc
similarity index 65%
rename from src/main/asciidoc/reference/mongo-json-schema.adoc
rename to src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping-schema.adoc
index 5a426061a2..6c8e200083 100644
--- a/src/main/asciidoc/reference/mongo-json-schema.adoc
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping-schema.adoc
@@ -1,5 +1,5 @@
 [[mongo.jsonSchema]]
-=== JSON Schema
+= JSON Schema
 
 As of version 3.6, MongoDB supports collections that validate documents against a provided https://docs.mongodb.com/manual/core/schema-validation/#json-schema[JSON Schema].
 The schema itself and both validation action and level can be defined when creating the collection, as the following example shows:
@@ -33,7 +33,7 @@ embedded schema objects that describe properties and subdocuments.
 <2> `required` is a property that describes which properties are required in a document. It can be specified optionally, along with other
 schema constraints. See MongoDB's documentation on https://docs.mongodb.com/manual/reference/operator/query/jsonSchema/#available-keywords[available keywords].
 <3> `properties` is related to a schema object that describes an `object` type. It contains property-specific schema constraints.
-<4> `firstname` specifies constraints for the `firsname` field inside the document. Here, it is a string-based `properties` element declaring
+<4> `firstname` specifies constraints for the `firstname` field inside the document. Here, it is a string-based `properties` element declaring
  possible field values.
 <5> `address` is a subdocument defining a schema for values in its `postCode` field.
 ====
@@ -58,7 +58,7 @@ MongoJsonSchema.builder()                                                    <1>
 <1> Obtain a schema builder to configure the schema with a fluent API.
 <2> Configure required properties either directly as shown here or with more details as in 3.
 <3> Configure the required String-typed `firstname` field, allowing only `luke` and `han` values. Properties can be typed or untyped. Use a static import of  `JsonSchemaProperty` to make the syntax slightly more compact and to get entry points such as `string(…)`.
-<4> Build the schema object. Use the schema to create either a collection or <<mongodb-template-query.criteria,query documents>>.
+<4> Build the schema object.
 ====
 
 There are already some predefined and strongly typed schema objects (`JsonSchemaObject` and `JsonSchemaProperty`) available
@@ -87,14 +87,14 @@ template.createCollection(Person.class, CollectionOptions.empty().schema(schema)
 ====
 
 [[mongo.jsonSchema.generated]]
-==== Generating a Schema
+== Generating a Schema
 
 Setting up a schema can be a time consuming task and we encourage everyone who decides to do so, to really take the time it takes.
 It's important, schema changes can be hard.
 However, there might be times when one does not want to balked with it, and that is where `JsonSchemaCreator` comes into play.
 
 `JsonSchemaCreator` and its default implementation generates a `MongoJsonSchema` out of domain types metadata provided by the mapping infrastructure.
-This means, that <<mapping-usage-annotations, annotated properties>> as well as potential <<mapping-configuration, custom conversions>> are considered.
+This means, that xref:mongodb/mapping/mapping.adoc#mapping-usage-annotations[annotated properties] as well as potential xref:mongodb/mapping/mapping.adoc#mapping-configuration[custom conversions] are considered.
 
 .Generate Json Schema from domain type
 ====
@@ -190,23 +190,105 @@ unless there is more specific information available via the `@MongoId` annotatio
 
 |===
 
-[[mongo.jsonSchema.query]]
-==== Query a collection for matching JSON Schema
+The above example demonstrated how to derive the schema from a very precise typed source.
+Using polymorphic elements within the domain model can lead to inaccurate schema representation for `Object` and generic `<T>` types, which are likely to represented as `{ type : 'object' }` without further specification.
+`MongoJsonSchemaCreator.property(…)` allows defining additional details such as nested document types that should be considered when rendering the schema.
 
-You can use a schema to query any collection for documents that match a given structure defined by a JSON schema, as the following example shows:
+.Specify additional types for properties
+====
+[source,java]
+----
+class Root {
+	Object value;
+}
+
+class A {
+	String aValue;
+}
 
-.Query for Documents matching a `$jsonSchema`
+class B {
+	String bValue;
+}
+MongoJsonSchemaCreator.create()
+    .property("value").withTypes(A.class, B.class) <1>
+----
+
+[source,json]
+----
+{
+    'type' : 'object',
+    'properties' : {
+        'value' : {
+            'type' : 'object',
+            'properties' : {                       <1>
+                'aValue' : { 'type' : 'string' },
+                'bValue' : { 'type' : 'string' }
+            }
+        }
+    }
+}
+----
+<1> Properties of the given types are merged into one element.
+====
+
+MongoDBs schema-free approach allows storing documents of different structure in one collection.
+Those may be modeled having a common base class.
+Regardless of the chosen approach, `MongoJsonSchemaCreator.merge(…)`  can help circumvent the need of merging multiple schema into one.
+
+.Merging multiple Schemas into a single Schema definition
 ====
 [source,java]
 ----
-MongoJsonSchema schema = MongoJsonSchema.builder().required("firstname", "lastname").build();
+abstract class Root {
+	String rootValue;
+}
+
+class A extends Root {
+	String aValue;
+}
 
-template.find(query(matchingDocumentStructure(schema)), Person.class);
+class B extends Root {
+	String bValue;
+}
+
+MongoJsonSchemaCreator.mergedSchemaFor(A.class, B.class) <1>
+----
+
+[source,json]
+----
+{
+    'type' : 'object',
+       'properties' : { <1>
+           'rootValue' : { 'type' : 'string' },
+           'aValue' : { 'type' : 'string' },
+           'bValue' : { 'type' : 'string' }
+       }
+    }
+}
+----
+<1> Properties (and their inherited ones) of the given types are combined into one schema.
+====
+
+[NOTE]
+====
+Properties with the same name need to refer to the same JSON schema in order to be combined.
+The following example shows a definition that cannot be merged automatically because of a data type mismatch.
+In this case a `ConflictResolutionFunction` must be provided to `MongoJsonSchemaCreator`.
+
+[source,java]
+----
+class A extends Root {
+	String value;
+}
+
+class B extends Root {
+	Integer value;
+}
 ----
 ====
 
 [[mongo.jsonSchema.encrypted-fields]]
-==== Encrypted Fields
+== Encrypted Fields
 
 MongoDB 4.2 https://docs.mongodb.com/master/core/security-client-side-encryption/[Field Level Encryption] allows to directly encrypt individual properties.
 
@@ -225,10 +307,84 @@ MongoJsonSchema schema = MongoJsonSchema.builder()
 ----
 ====
 
-NOTE: Make sure to set the drivers `com.mongodb.AutoEncryptionSettings` to use client-side encryption. MongoDB does not support encryption for all field types. Specific data types require deterministic encryption to preserve equality comparison functionality.
+Instead of defining encrypted fields manually it is possible leverage the `@Encrypted` annotation as shown in the snippet below.
+
+.Client-Side Field Level Encryption via Json Schema
+====
+[source,java]
+----
+@Document
+@Encrypted(keyId = "xKVup8B1Q+CkHaVRx+qa+g==", algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Random") <1>
+static class Patient {
+
+    @Id String id;
+    String name;
+
+    @Encrypted <2>
+    String bloodType;
+
+    @Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic") <3>
+    Integer ssn;
+}
+----
+<1> Default encryption settings that will be set for `encryptMetadata`.
+<2> Encrypted field using default encryption settings.
+<3> Encrypted field overriding the default encryption algorithm.
+====
+
+[TIP]
+====
+The `@Encrypted` Annotation supports resolving keyIds via SpEL Expressions.
+To do so additional environment metadata (via the `MappingContext`) is required and must be provided.
+
+[source,java]
+----
+@Document
+@Encrypted(keyId = "#{mongocrypt.keyId(#target)}")
+static class Patient {
+
+    @Id String id;
+    String name;
+
+    @Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Random")
+    String bloodType;
+
+    @Encrypted(algorithm = "AEAD_AES_256_CBC_HMAC_SHA_512-Deterministic")
+    Integer ssn;
+}
+
+MongoJsonSchemaCreator schemaCreator = MongoJsonSchemaCreator.create(mappingContext);
+MongoJsonSchema patientSchema = schemaCreator
+    .filter(MongoJsonSchemaCreator.encryptedOnly())
+    .createSchemaFor(Patient.class);
+----
+
+The `mongocrypt.keyId` function is defined via an `EvaluationContextExtension` as shown in the snippet below.
+Providing a custom extension provides the most flexible way of computing keyIds.
+
+[source,java]
+----
+public class EncryptionExtension implements EvaluationContextExtension {
+
+    @Override
+    public String getExtensionId() {
+        return "mongocrypt";
+    }
+
+    @Override
+    public Map<String, Function> getFunctions() {
+        return Collections.singletonMap("keyId", new Function(getMethod("computeKeyId", String.class), this));
+    }
+
+    public String computeKeyId(String target) {
+        // ... lookup via target element name
+    }
+}
+----
+====
 
 [[mongo.jsonSchema.types]]
-==== JSON Schema Types
+== JSON Schema Types
 
 The following table shows the supported JSON schema types:
 
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc
new file mode 100644
index 0000000000..3b5b4e49fe
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/mapping.adoc
@@ -0,0 +1,717 @@
+[[mapping-chapter]]
+= Object Mapping
+
+Rich mapping support is provided by the `MappingMongoConverter`.
+The converter holds a metadata model that provides a full feature set to map domain objects to MongoDB documents.
+The mapping metadata model is populated by using annotations on your domain objects.
+However, the infrastructure is not limited to using annotations as the only source of metadata information.
+The `MappingMongoConverter` also lets you map objects to documents without providing any additional metadata, by following a set of conventions.
+
+This section describes the features of the `MappingMongoConverter`, including fundamentals, how to use conventions for mapping objects to documents and how to override those conventions with annotation-based mapping metadata.
+
+include::{commons}@data-commons::page$object-mapping.adoc[leveloffset=+1]
+
+[[mapping-conventions]]
+== Convention-based Mapping
+
+`MappingMongoConverter` has a few conventions for mapping objects to documents when no additional mapping metadata is provided.
+The conventions are:
+
+* The short Java class name is mapped to the collection name in the following manner.
+The class `com.bigbank.SavingsAccount` maps to the `savingsAccount` collection name.
+* All nested objects are stored as nested objects in the document and *not* as DBRefs.
+* The converter uses any Spring Converters registered with it to override the default mapping of object properties to document fields and values.
+* The fields of an object are used to convert to and from fields in the document.
+Public `JavaBean` properties are not used.
+* If you have a single non-zero-argument constructor whose constructor argument names match top-level field names of document, that constructor is used.Otherwise, the zero-argument constructor is used.If there is more than one non-zero-argument constructor, an exception will be thrown.
+
+[[mapping.conventions.id-field]]
+=== How the `_id` field is handled in the mapping layer.
+
+MongoDB requires that you have an `_id` field for all documents.If you don't provide one the driver will assign a ObjectId with a generated value.The `_id` field can be of any type, other than arrays, so long as it is unique.The driver naturally supports all primitive types and Dates.When using the `MappingMongoConverter` there are certain rules that govern how properties from the Java class are mapped to the `_id` field.
+
+The following outlines what field will be mapped to the `_id` document field:
+
+* A field annotated with `@Id` (`org.springframework.data.annotation.Id`) will be mapped to the `_id` field. +
+Additionally, the name of the document field can be customized via the `@Field` annotation, in which case the document will not contain a field `_id`.
+* A field without an annotation but named `id` will be mapped to the `_id` field.
+
+[cols="1,2",options="header"]
+.Examples for the translation of `_id` field definitions
+|===
+| Field definition
+| Resulting Id-Fieldname in MongoDB
+
+| `String` id
+| `_id`
+
+| `@Field` `String` id
+| `_id`
+
+| `@Field("x")` `String` id
+| `x`
+
+| `@Id` `String` x
+| `_id`
+
+| `@Field("x")` `@Id` `String` y
+| `_id` (`@Field(name)` is ignored, `@Id` takes precedence)
+|===
+
+The following outlines what type conversion, if any, will be done on the property mapped to the _id document field.
+
+* If a field named `id` is declared as a String or BigInteger in the Java class it will be converted to and stored as an ObjectId if possible.
+ObjectId as a field type is also valid.
+If you specify a value for `id` in your application, the conversion to an ObjectId is done by the MongoDB driver.
+If the specified `id` value cannot be converted to an ObjectId, then the value will be stored as is in the document's `_id` field.
+This also applies if the field is annotated with `@Id`.
+* If a field is annotated with `@MongoId` in the Java class it will be converted to and stored as using its actual type.
+No further conversion happens unless `@MongoId` declares a desired field type.
+If no value is provided for the `id` field, a new `ObjectId` will be created and converted to the properties type.
+* If a field is annotated with `@MongoId(FieldType.…)` in the Java class it will be attempted to convert the value to the declared `FieldType`.
+If no value is provided for the `id` field, a new `ObjectId` will be created and converted to the declared type.
+* If a field named `id` is not declared as a String, BigInteger, or ObjectID in the Java class then you should assign it a value in your application so it can be stored 'as-is' in the document's `_id` field.
+* If no field named `id` is present in the Java class then an implicit `_id` file will be generated by the driver but not mapped to a property or field of the Java class.
+
+When querying and updating `MongoTemplate` will use the converter to handle conversions of the `Query` and `Update` objects that correspond to the above rules for saving documents so field names and types used in your queries will be able to match what is in your domain classes.
+
+[[mapping-conversion]]
+== Data Mapping and Type Conversion
+
+Spring Data MongoDB supports all types that can be represented as BSON, MongoDB's internal document format.
+In addition to these types, Spring Data MongoDB provides a set of built-in converters to map additional types.
+You can provide your own converters to adjust type conversion.
+See xref:mongodb/mapping/custom-conversions.adoc[Custom Conversions - Overriding Default Mapping] for further details.
+
+.Built in Type conversions:
+[%collapsible]
+====
+[cols="3,1,6",options="header"]
+.Type
+|===
+| Type
+| Type conversion
+| Sample
+
+| `String`
+| native
+| `{"firstname" : "Dave"}`
+
+| `double`, `Double`, `float`, `Float`
+| native
+| `{"weight" : 42.5}`
+
+| `int`, `Integer`, `short`, `Short`
+| native +
+32-bit integer
+| `{"height" : 42}`
+
+| `long`, `Long`
+| native +
+64-bit integer
+| `{"height" : 42}`
+
+| `Date`, `Timestamp`
+| native
+| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
+
+| `byte[]`
+| native
+| `{"bin" : { "$binary" : "AQIDBA==", "$type" : "00" }}`
+
+| `java.util.UUID` (Legacy UUID)
+| native
+| `{"uuid" : { "$binary" : "MEaf1CFQ6lSphaa3b9AtlA==", "$type" : "03" }}`
+
+| `Date`
+| native
+| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
+
+| `ObjectId`
+| native
+| `{"_id" : ObjectId("5707a2690364aba3136ab870")}`
+
+| Array, `List`, `BasicDBList`
+| native
+| `{"cookies" : [ … ]}`
+
+| `boolean`, `Boolean`
+| native
+| `{"active" : true}`
+
+| `null`
+| native
+| `{"value" : null}`
+
+| `Document`
+| native
+| `{"value" : { … }}`
+
+| `Decimal128`
+| native
+| `{"value" : NumberDecimal(…)}`
+
+| `AtomicInteger` +
+calling `get()` before the actual conversion
+| converter +
+32-bit integer
+| `{"value" : "741" }`
+
+| `AtomicLong` +
+calling `get()` before the actual conversion
+| converter +
+64-bit integer
+| `{"value" : "741" }`
+
+| `BigInteger`
+| converter +
+`NumberDecimal`, `String`
+| `{"value" : NumberDecimal(741) }`, `{"value" : "741" }`
+
+| `BigDecimal`
+| converter +
+`NumberDecimal`, `String`
+| `{"value" : NumberDecimal(741.99) }`, `{"value" : "741.99" }`
+
+| `URL`
+| converter
+| `{"website" : "https://spring.io/projects/spring-data-mongodb/" }`
+
+| `Locale`
+| converter
+| `{"locale : "en_US" }`
+
+| `char`, `Character`
+| converter
+| `{"char" : "a" }`
+
+| `NamedMongoScript`
+| converter +
+`Code`
+| `{"_id" : "script name", value: (some javascript code)`}
+
+| `java.util.Currency`
+| converter
+| `{"currencyCode" : "EUR"}`
+
+| `Instant` +
+(Java 8)
+| native
+| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
+
+| `Instant` +
+(Joda, JSR310-BackPort)
+| converter
+| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
+
+| `LocalDate` +
+(Joda, Java 8, JSR310-BackPort)
+| converter / native (Java8)footnote:[Uses UTC zone offset. Configure via xref:mongodb/mapping/mapping.adoc#mapping-configuration[MongoConverterConfigurationAdapter]]
+| `{"date" : ISODate("2019-11-12T00:00:00.000Z")}`
+
+| `LocalDateTime`, `LocalTime` +
+(Joda, Java 8, JSR310-BackPort)
+| converter / native (Java8)footnote:[Uses UTC zone offset. Configure via xref:mongodb/mapping/mapping.adoc#mapping-configuration[MongoConverterConfigurationAdapter]]
+| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
+
+| `DateTime` (Joda)
+| converter
+| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
+
+| `ZoneId` (Java 8, JSR310-BackPort)
+| converter
+| `{"zoneId" : "ECT - Europe/Paris"}`
+
+| `Box`
+| converter
+| `{"box" : { "first" : { "x" : 1.0 , "y" : 2.0} , "second" : { "x" : 3.0 , "y" : 4.0}}`
+
+| `Polygon`
+| converter
+| `{"polygon" : { "points" : [ { "x" : 1.0 , "y" : 2.0} , { "x" : 3.0 , "y" : 4.0} , { "x" : 4.0 , "y" : 5.0}]}}`
+
+| `Circle`
+| converter
+| `{"circle" : { "center" : { "x" : 1.0 , "y" : 2.0} , "radius" : 3.0 , "metric" : "NEUTRAL"}}`
+
+| `Point`
+| converter
+| `{"point" : { "x" : 1.0 , "y" : 2.0}}`
+
+| `GeoJsonPoint`
+| converter
+| `{"point" : { "type" : "Point" , "coordinates" : [3.0 , 4.0] }}`
+
+| `GeoJsonMultiPoint`
+| converter
+| `{"geoJsonLineString" : {"type":"MultiPoint", "coordinates": [ [ 0 , 0 ], [ 0 , 1 ], [ 1 , 1 ] ] }}`
+
+| `Sphere`
+| converter
+| `{"sphere" : { "center" : { "x" : 1.0 , "y" : 2.0} , "radius" : 3.0 , "metric" : "NEUTRAL"}}`
+
+| `GeoJsonPolygon`
+| converter
+| `{"polygon" : { "type" : "Polygon", "coordinates" : [[ [ 0 , 0 ], [ 3 , 6 ], [ 6 , 1 ], [ 0 , 0  ] ]] }}`
+
+| `GeoJsonMultiPolygon`
+| converter
+| `{"geoJsonMultiPolygon" : { "type" : "MultiPolygon", "coordinates" : [
+[ [ [ -73.958 , 40.8003 ] , [ -73.9498 , 40.7968 ] ] ],
+[ [ [ -73.973 , 40.7648 ] , [ -73.9588 , 40.8003 ] ] ]
+] }}`
+
+| `GeoJsonLineString`
+| converter
+| `{ "geoJsonLineString" : { "type" : "LineString", "coordinates" : [ [ 40 , 5 ], [ 41 , 6 ] ] }}`
+
+| `GeoJsonMultiLineString`
+| converter
+| `{"geoJsonLineString" : { "type" : "MultiLineString", coordinates: [
+[ [ -73.97162 , 40.78205 ], [ -73.96374 , 40.77715 ] ],
+[ [ -73.97880 , 40.77247 ], [ -73.97036 , 40.76811 ] ]
+] }}`
+|===
+====
+
+.Collection Handling
+[NOTE]
+====
+Collection handling depends on the actual values returned by MongoDB.
+
+* If a document does **not** contain a field mapped to a collection, the mapping will not update the property.
+Which means the value will remain `null`, a java default or any value set during object creation.
+* If a document contains a field to be mapped, but the field holds a `null` value (like: `{ 'list' : null }`), the property value is set to `null`.
+* If a document contains a field to be mapped to a collection which is **not** `null` (like: `{ 'list' : [ ... ] }`), the collection is populated with the mapped values.
+
+Generally, if you use constructor creation, then you can get hold of the value to be set.
+Property population can make use of default initialization values if a property value is not being provided by a query response.
+====
+
+[[mapping-configuration]]
+== Mapping Configuration
+
+Unless explicitly configured, an instance of `MappingMongoConverter` is created by default when you create a `MongoTemplate`.
+You can create your own instance of the `MappingMongoConverter`.
+Doing so lets you dictate where in the classpath your domain classes can be found, so that Spring Data MongoDB can extract metadata and construct indexes.
+Also, by creating your own instance, you can register Spring converters to map specific classes to and from the database.
+
+You can configure the `MappingMongoConverter` as well as `com.mongodb.client.MongoClient` and MongoTemplate by using either Java-based or XML-based metadata.
+The following example shows the configuration:
+
+[tabs]
+======
+Java::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+public class MongoConfig extends AbstractMongoClientConfiguration {
+
+  @Override
+  public String getDatabaseName() {
+    return "database";
+  }
+
+  // the following are optional
+
+  @Override
+  public String getMappingBasePackage() { <1>
+    return "com.bigbank.domain";
+  }
+
+  @Override
+  void configureConverters(MongoConverterConfigurationAdapter adapter) { <2>
+
+  	adapter.registerConverter(new org.springframework.data.mongodb.test.PersonReadConverter());
+  	adapter.registerConverter(new org.springframework.data.mongodb.test.PersonWriteConverter());
+  }
+
+  @Bean
+  public LoggingEventListener<MongoMappingEvent> mappingEventsListener() {
+    return new LoggingEventListener<MongoMappingEvent>();
+  }
+}
+----
+
+<1> The mapping base package defines the root path used to scan for entities used to pre initialize the `MappingContext`.
+By default the configuration classes package is used.
+<2> Configure additional custom converters for specific domain types that replace the default mapping procedure for those types with your custom implementation.
+====
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+  xsi:schemaLocation="
+    http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+    http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+  <!-- Default bean name is 'mongo' -->
+  <mongo:mongo-client host="localhost" port="27017"/>
+
+  <mongo:db-factory dbname="database" mongo-ref="mongoClient"/>
+
+  <!-- by default look for a Mongo object named 'mongo' - default name used for the converter is 'mappingConverter' -->
+  <mongo:mapping-converter base-package="com.bigbank.domain">
+    <mongo:custom-converters>
+      <mongo:converter ref="readConverter"/>
+      <mongo:converter>
+        <bean class="org.springframework.data.mongodb.test.PersonWriteConverter"/>
+      </mongo:converter>
+    </mongo:custom-converters>
+  </mongo:mapping-converter>
+
+  <bean id="readConverter" class="org.springframework.data.mongodb.test.PersonReadConverter"/>
+
+  <!-- set the mapping converter to be used by the MongoTemplate -->
+  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    <constructor-arg name="mongoConverter" ref="mappingConverter"/>
+  </bean>
+
+  <bean class="org.springframework.data.mongodb.core.mapping.event.LoggingEventListener"/>
+
+</beans>
+----
+======
+
+`AbstractMongoClientConfiguration` requires you to implement methods that define a `com.mongodb.client.MongoClient` as well as provide a database name.
+`AbstractMongoClientConfiguration` also has a method named  `getMappingBasePackage(…)` that you can override to tell the converter where to scan for classes annotated with the `@Document` annotation.
+
+You can add additional converters to the converter by overriding the `customConversionsConfiguration` method.
+MongoDB's native JSR-310 support can be enabled through `MongoConverterConfigurationAdapter.useNativeDriverJavaTimeCodecs()`.
+Also shown in the preceding example is a `LoggingEventListener`, which logs `MongoMappingEvent` instances that are posted onto Spring's `ApplicationContextEvent` infrastructure.
+
+[TIP]
+====
+.Java Time Types
+We recommend using MongoDB's native JSR-310 support via `MongoConverterConfigurationAdapter.useNativeDriverJavaTimeCodecs()` as described above as it is using an `UTC` based approach.
+The default JSR-310 support for `java.time` types inherited from Spring Data Commons uses the local machine timezone as reference and should only be used for backwards compatibility.
+====
+
+NOTE: `AbstractMongoClientConfiguration` creates a `MongoTemplate` instance and registers it with the container under the name `mongoTemplate`.
+
+The `base-package` property tells it where to scan for classes annotated with the `@org.springframework.data.mongodb.core.mapping.Document` annotation.
+
+[TIP]
+====
+If you want to rely on https://spring.io/projects/spring-boot[Spring Boot] to bootstrap Data MongoDB, but still want to override certain aspects of the configuration, you may want to expose beans of that type.
+For custom conversions you may eg. choose to register a bean of type `MongoCustomConversions` that will be picked up the by the Boot infrastructure.
+To learn more about this please make sure to read the Spring Boot https://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#data.nosql.mongodb[Reference Documentation].
+====
+
+[[mapping-usage]]
+== Metadata-based Mapping
+
+To take full advantage of the object mapping functionality inside the Spring Data MongoDB support, you should annotate your mapped objects with the `@Document` annotation.
+Although it is not necessary for the mapping framework to have this annotation (your POJOs are mapped correctly, even without any annotations), it lets the classpath scanner find and pre-process your domain objects to extract the necessary metadata.
+If you do not use this annotation, your application takes a slight performance hit the first time you store a domain object, because the mapping framework needs to build up its internal metadata model so that it knows about the properties of your domain object and how to persist them.
+The following example shows a domain object:
+
+.Example domain object
+====
+[source,java]
+----
+package com.mycompany.domain;
+
+@Document
+public class Person {
+
+  @Id
+  private ObjectId id;
+
+  @Indexed
+  private Integer ssn;
+
+  private String firstName;
+
+  @Indexed
+  private String lastName;
+}
+----
+====
+
+IMPORTANT: The `@Id` annotation tells the mapper which property you want to use for the MongoDB `_id` property, and the `@Indexed` annotation tells the mapping framework to call `createIndex(…)` on that property of your document, making searches faster.
+Automatic index creation is only done for types annotated with `@Document`.
+
+WARNING: Auto index creation is **disabled** by default and needs to be enabled through the configuration (see xref:mongodb/mapping/mapping.adoc#mapping.index-creation[Index Creation]).
+
+[[mapping-usage-annotations]]
+=== Mapping Annotation Overview
+
+The MappingMongoConverter can use metadata to drive the mapping of objects to documents.
+The following annotations are available:
+
+* `@Id`: Applied at the field level to mark the field used for identity purpose.
+* `@MongoId`: Applied at the field level to mark the field used for identity purpose.
+Accepts an optional `FieldType` to customize id conversion.
+* `@Document`: Applied at the class level to indicate this class is a candidate for mapping to the database.
+You can specify the name of the collection where the data will be stored.
+* `@DBRef`: Applied at the field to indicate it is to be stored using a com.mongodb.DBRef.
+* `@DocumentReference`: Applied at the field to indicate it is to be stored as a pointer to another document.
+This can be a single value (the _id_ by default), or a `Document` provided via a converter.
+* `@Indexed`: Applied at the field level to describe how to index the field.
+* `@CompoundIndex` (repeatable): Applied at the type level to declare Compound Indexes.
+* `@GeoSpatialIndexed`: Applied at the field level to describe how to geoindex the field.
+* `@TextIndexed`: Applied at the field level to mark the field to be included in the text index.
+* `@HashIndexed`: Applied at the field level for usage within a hashed index to partition data across a sharded cluster.
+* `@Language`: Applied at the field level to set the language override property for text index.
+* `@Transient`: By default, all fields are mapped to the document.
+This annotation excludes the field where it is applied from being stored in the database.
+Transient properties cannot be used within a persistence constructor as the converter cannot materialize a value for the constructor argument.
+* `@PersistenceCreator`: Marks a given constructor or a `static` factory method - even a package protected one - to use when instantiating the object from the database.
+Constructor arguments are mapped by name to the key values in the retrieved Document.
+* `@Value`: This annotation is part of the Spring Framework . Within the mapping framework it can be applied to constructor arguments.
+This lets you use a Spring Expression Language statement to transform a key's value retrieved in the database before it is used to construct a domain object.
+In order to reference a property of a given document one has to use expressions like: `@Value("#root.myProperty")` where `root` refers to the root of the given document.
+* `@Field`: Applied at the field level it allows to describe the name and type of the field as it will be represented in the MongoDB BSON document thus allowing the name and type to be different than the fieldname of the class as well as the property type.
+* `@Version`: Applied at field level is used for optimistic locking and checked for modification on save operations.
+The initial value is `zero` (`one` for primitive types) which is bumped automatically on every update.
+
+The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic.
+Specific subclasses are using in the MongoDB support to support annotation based metadata.
+Other strategies are also possible to put in place if there is demand.
+
+.Here is an example of a more complex mapping
+[%collapsible]
+====
+[source,java]
+----
+@Document
+@CompoundIndex(name = "age_idx", def = "{'lastName': 1, 'age': -1}")
+public class Person<T extends Address> {
+
+  @Id
+  private String id;
+
+  @Indexed(unique = true)
+  private Integer ssn;
+
+  @Field("fName")
+  private String firstName;
+
+  @Indexed
+  private String lastName;
+
+  private Integer age;
+
+  @Transient
+  private Integer accountTotal;
+
+  @DBRef
+  private List<Account> accounts;
+
+  private T address;
+
+  public Person(Integer ssn) {
+    this.ssn = ssn;
+  }
+
+  @PersistenceCreator
+  public Person(Integer ssn, String firstName, String lastName, Integer age, T address) {
+    this.ssn = ssn;
+    this.firstName = firstName;
+    this.lastName = lastName;
+    this.age = age;
+    this.address = address;
+  }
+
+  public String getId() {
+    return id;
+  }
+
+  // no setter for Id.  (getter is only exposed for some unit testing)
+
+  public Integer getSsn() {
+    return ssn;
+  }
+
+// other getters/setters omitted
+}
+----
+====
+
+[TIP]
+====
+`@Field(targetType=...)` can come in handy when the native MongoDB type inferred by the mapping infrastructure does not match the expected one.
+Like for `BigDecimal`, which is represented as `String` instead of `Decimal128`, just because earlier versions of MongoDB Server did not have support for it.
+
+[source,java]
+----
+public class Balance {
+
+  @Field(targetType = DECIMAL128)
+  private BigDecimal value;
+
+  // ...
+}
+----
+
+You may even consider your own, custom annotation.
+
+[source,java]
+----
+@Target(ElementType.FIELD)
+@Retention(RetentionPolicy.RUNTIME)
+@Field(targetType = FieldType.DECIMAL128)
+public @interface Decimal128 { }
+
+// ...
+
+public class Balance {
+
+  @Decimal128
+  private BigDecimal value;
+
+  // ...
+}
+----
+====
+
+=== Special Field Names
+
+Generally speaking MongoDB uses the dot (`.`) character as a path separator for nested documents or arrays.
+This means that in a query (or update statement) a key like `a.b.c` targets an object structure as outlined below:
+
+[source,json]
+----
+{
+    'a' : {
+        'b' : {
+            'c' : …
+        }
+    }
+}
+----
+
+Therefore, up until MongoDB 5.0 field names must not contain dots (`.`). +
+Using a `MappingMongoConverter#setMapKeyDotReplacement` allowed circumvent some of the limitations when storing `Map` structures by substituting dots on write with another character.
+
+[source,java]
+----
+converter.setMapKeyDotReplacement("-");
+// ...
+
+source.map = Map.of("key.with.dot", "value")
+converter.write(source,...) // -> map : { 'key-with-dot', 'value' }
+----
+
+With the release of MongoDB 5.0 this restriction on `Document` field names containing special characters was lifted.
+We highly recommend reading more about limitations on using dots in field names in the https://www.mongodb.com/docs/manual/core/dot-dollar-considerations/[MongoDB Reference]. +
+To allow dots in `Map` structures please set `preserveMapKeys` on the `MappingMongoConverter`.
+
+Using `@Field` allows customizing the field name to consider dots in two ways.
+
+. `@Field(name = "a.b")`: The name is considered to be a path.
+Operations expect a structure of nested objects such as `{ a : { b : … } }`.
+. `@Field(name = "a.b", fieldNameType = KEY)`: The names is considered a name as-is.
+Operations expect a field with the given value as `{ 'a.b' : ….. }`
+
+[WARNING]
+====
+Due to the special nature of the dot character in both MongoDB query and update statements field names containing dots cannot be targeted directly and therefore are excluded from being used in derived query methods.
+Consider the following `Item` having a `categoryId` property that is mapped to the field named `cat.id`.
+
+[source,java]
+----
+public class Item {
+
+	@Field(name = "cat.id", fieldNameType = KEY)
+	String categoryId;
+
+	// ...
+}
+----
+
+Its raw representation will look like
+
+[source,json]
+----
+{
+    'cat.id' : "5b28b5e7-52c2",
+    ...
+}
+----
+
+Since we cannot target the `cat.id` field directly (as this would be interpreted as a path) we need the help of the xref:mongodb/aggregation-framework.adoc#mongo.aggregation[Aggregation Framework].
+
+.Query fields with a dot in its name
+[source,java]
+----
+template.query(Item.class)
+    // $expr : { $eq : [ { $getField : { input : '$$CURRENT', 'cat.id' }, '5b28b5e7-52c2' ] }
+    .matching(expr(ComparisonOperators.valueOf(ObjectOperators.getValueOf("value")).equalToValue("5b28b5e7-52c2"))) <1>
+    .all();
+----
+
+<1> The mapping layer takes care of translating the property name `value` into the actual field name.
+It is absolutely valid to use the target field name here as well.
+
+.Update fields with a dot in its name
+[source,java]
+----
+template.update(Item.class)
+    .matching(where("id").is("r2d2"))
+    // $replaceWith: { $setField : { input: '$$CURRENT', field : 'cat.id', value : 'af29-f87f4e933f97' } }
+    .apply(AggregationUpdate.newUpdate(ReplaceWithOperation.replaceWithValue(ObjectOperators.setValueTo("value", "af29-f87f4e933f97")))) <1>
+    .first();
+----
+
+<1> The mapping layer takes care of translating the property name `value` into the actual field name.
+It is absolutely valid to use the target field name here as well.
+
+The above shows a simple example where the special field is present on the top document level.
+Increased levels of nesting increase the complexity of the aggregation expression required to interact with the field.
+====
+
+[[mapping-custom-object-construction]]
+=== Customized Object Construction
+
+The mapping subsystem allows the customization of the object construction by annotating a constructor with the `@PersistenceCreator` annotation.
+The values to be used for the constructor parameters are resolved in the following way:
+
+* If a parameter is annotated with the `@Value` annotation, the given expression is evaluated and the result is used as the parameter value.
+* If the Java type has a property whose name matches the given field of the input document, then it's property information is used to select the appropriate constructor parameter to pass the input field value to.
+This works only if the parameter name information is present in the java `.class` files which can be achieved by compiling the source with debug information or using the new `-parameters` command-line switch for javac in Java 8.
+* Otherwise, a `MappingException` will be thrown indicating that the given constructor parameter could not be bound.
+
+[source,java]
+----
+class OrderItem {
+
+  private @Id String id;
+  private int quantity;
+  private double unitPrice;
+
+  OrderItem(String id, @Value("#root.qty ?: 0") int quantity, double unitPrice) {
+    this.id = id;
+    this.quantity = quantity;
+    this.unitPrice = unitPrice;
+  }
+
+  // getters/setters ommitted
+}
+
+Document input = new Document("id", "4711");
+input.put("unitPrice", 2.5);
+input.put("qty",5);
+OrderItem item = converter.read(OrderItem.class, input);
+----
+
+NOTE: The SpEL expression in the `@Value` annotation of the `quantity` parameter falls back to the value `0` if the given property path cannot be resolved.
+
+Additional examples for using the `@PersistenceCreator` annotation can be found in the https://github.com/spring-projects/spring-data-mongodb/blob/master/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java[MappingMongoConverterUnitTests] test suite.
+
+[[mapping-usage-events]]
+=== Mapping Framework Events
+
+Events are fired throughout the lifecycle of the mapping process.
+This is described in the xref:mongodb/lifecycle-events.adoc[Lifecycle Events] section.
+
+Declaring these beans in your Spring ApplicationContext causes them to be invoked whenever the event is dispatched.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mapping/property-converters.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/property-converters.adoc
new file mode 100644
index 0000000000..fed1f4c33e
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/property-converters.adoc
@@ -0,0 +1,106 @@
+[[mongo.property-converters]]
+= Property Converters
+
+While xref:mongodb/mapping/custom-conversions.adoc[type-based conversion] already offers ways to influence the conversion and representation of certain types within the target store, it has limitations when only certain values or properties of a particular type should be considered for conversion.
+Property-based converters allow configuring conversion rules on a per-property basis, either declaratively (via `@ValueConverter`) or programmatically (by registering a `PropertyValueConverter` for a specific property).
+
+A `PropertyValueConverter` can transform a given value into its store representation (write) and back (read) as the following listing shows.
+The additional `ValueConversionContext` provides additional information, such as mapping metadata and direct `read` and `write` methods.
+
+.A simple PropertyValueConverter
+====
+[source,java]
+----
+class ReversingValueConverter implements PropertyValueConverter<String, String, ValueConversionContext> {
+
+  @Override
+  public String read(String value, ValueConversionContext context) {
+    return reverse(value);
+  }
+
+  @Override
+  public String write(String value, ValueConversionContext context) {
+    return reverse(value);
+  }
+}
+----
+====
+
+You can obtain `PropertyValueConverter` instances from `CustomConversions#getPropertyValueConverter(…)` by delegating to `PropertyValueConversions`, typically by using a `PropertyValueConverterFactory` to provide the actual converter.
+Depending on your application's needs, you can chain or decorate multiple instances of `PropertyValueConverterFactory` -- for example, to apply caching.
+By default, Spring Data MongoDB uses a caching implementation that can serve types with a default constructor or enum values.
+A set of predefined factories is available through the factory methods in `PropertyValueConverterFactory`.
+You can use `PropertyValueConverterFactory.beanFactoryAware(…)` to obtain a `PropertyValueConverter` instance from an `ApplicationContext`.
+
+You can change the default behavior through `ConverterConfiguration`.
+
+[[mongo.property-converters.declarative]]
+== Declarative Value Converter
+
+The most straight forward usage of a `PropertyValueConverter` is by annotating properties with the `@ValueConverter` annotation that defines the converter type:
+
+.Declarative PropertyValueConverter
+====
+[source,java]
+----
+class Person {
+
+  @ValueConverter(ReversingValueConverter.class)
+  String ssn;
+}
+----
+====
+
+[[mongo.property-converters.programmatic]]
+== Programmatic Value Converter Registration
+
+Programmatic registration registers `PropertyValueConverter` instances for properties within an entity model by using a `PropertyValueConverterRegistrar`, as the following example shows.
+The difference between declarative registration and programmatic registration is that programmatic registration happens entirely outside of the entity model.
+Such an approach is useful if you cannot or do not want to annotate the entity model.
+
+.Programmatic PropertyValueConverter registration
+====
+[source,java]
+----
+PropertyValueConverterRegistrar registrar = new PropertyValueConverterRegistrar();
+
+registrar.registerConverter(Address.class, "street", new PropertyValueConverter() { … }); <1>
+
+// type safe registration
+registrar.registerConverter(Person.class, Person::getSsn())                               <2>
+  .writing(value -> encrypt(value))
+  .reading(value -> decrypt(value));
+----
+
+<1> Register a converter for the field identified by its name.
+<2> Type safe variant that allows to register a converter and its conversion functions.
+This method uses class proxies to determine the property.
+Make sure that neither the class nor the accessors are `final` as otherwise this approach doesn't work.
+====
+
+WARNING: Dot notation (such as `registerConverter(Person.class, "address.street", …)`) for nagivating across properties into subdocuments is *not* supported when registering converters.
+
+TIP: `MongoValueConverter` offers a pre-typed `PropertyValueConverter` interface that uses `MongoConversionContext`.
+
+[[mongocustomconversions-configuration]]
+== MongoCustomConversions configuration
+
+By default, `MongoCustomConversions` can handle declarative value converters, depending on the configured `PropertyValueConverterFactory`.
+`MongoConverterConfigurationAdapter` helps to set up programmatic value conversions or define the `PropertyValueConverterFactory` to be used.
+
+.Configuration Sample
+====
+[source,java]
+----
+MongoCustomConversions.create(configurationAdapter -> {
+
+    SimplePropertyValueConversions valueConversions = new SimplePropertyValueConversions();
+    valueConversions.setConverterFactory(…);
+    valueConversions.setValueConverterRegistry(new PropertyValueConverterRegistrar()
+        .registerConverter(…)
+        .buildRegistry());
+
+    configurationAdapter.setPropertyValueConversions(valueConversions);
+});
+----
+====
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mapping/unwrapping-entities.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mapping/unwrapping-entities.adoc
new file mode 100644
index 0000000000..cff702f179
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mapping/unwrapping-entities.adoc
@@ -0,0 +1,382 @@
+[[unwrapped-entities]]
+= Unwrapping Types
+
+Unwrapped entities are used to design value objects in your Java domain model whose properties are flattened out into the parent's MongoDB Document.
+
+[[unwrapped-entities.mapping]]
+== Unwrapped Types Mapping
+
+Consider the following domain model where `User.name` is annotated with `@Unwrapped`.
+The `@Unwrapped` annotation signals that all properties of `UserName` should be flattened out into the `user` document that owns the `name` property.
+
+.Sample Code of unwrapping objects
+====
+[source,java]
+----
+class User {
+
+    @Id
+    String userId;
+
+    @Unwrapped(onEmpty = USE_NULL) <1>
+    UserName name;
+}
+
+class UserName {
+
+    String firstname;
+
+    String lastname;
+
+}
+----
+
+[source,json]
+----
+{
+  "_id" : "1da2ba06-3ba7",
+  "firstname" : "Emma",
+  "lastname" : "Frost"
+}
+----
+<1> When loading the `name` property its value is set to `null` if both `firstname` and `lastname` are either `null` or not present.
+By using `onEmpty=USE_EMPTY` an empty `UserName`, with potential `null` value for its properties, will be created.
+====
+
+For less verbose embeddable type declarations use `@Unwrapped.Nullable` and `@Unwrapped.Empty` instead `@Unwrapped(onEmpty = USE_NULL)` and `@Unwrapped(onEmpty = USE_EMPTY)`.
+Both annotations are meta-annotated with JSR-305 `@javax.annotation.Nonnull` to aid with nullability inspections.
+
+[WARNING]
+====
+It is possible to use complex types within an unwrapped object.
+However, those must not be, nor contain unwrapped fields themselves.
+====
+
+[[unwrapped-entities.mapping.field-names]]
+== Unwrapped Types field names
+
+A value object can be unwrapped multiple times by using the optional `prefix` attribute of the `@Unwrapped` annotation.
+By dosing so the chosen prefix is prepended to each property or `@Field("…")` name in the unwrapped object.
+Please note that values will overwrite each other if multiple properties render to the same field name.
+
+.Sample Code of unwrapped object with name prefix
+====
+[source,java]
+----
+class User {
+
+    @Id
+    String userId;
+
+    @Unwrapped.Nullable(prefix = "u_") <1>
+    UserName name;
+
+    @Unwrapped.Nullable(prefix = "a_") <2>
+    UserName name;
+}
+
+class UserName {
+
+    String firstname;
+
+    String lastname;
+}
+----
+
+[source,json]
+----
+{
+  "_id" : "a6a805bd-f95f",
+  "u_firstname" : "Jean",             <1>
+  "u_lastname" : "Grey",
+  "a_firstname" : "Something",        <2>
+  "a_lastname" : "Else"
+}
+----
+<1> All properties of `UserName` are prefixed with `u_`.
+<2> All properties of `UserName` are prefixed with `a_`.
+====
+
+While combining the `@Field` annotation with `@Unwrapped` on the very same property does not make sense and therefore leads to an error.
+It is a totally valid approach to use `@Field` on any of the unwrapped types properties.
+
+.Sample Code unwrapping objects with `@Field` annotation
+====
+[source,java]
+----
+public class User {
+
+	@Id
+    private String userId;
+
+    @Unwrapped.Nullable(prefix = "u-") <1>
+    UserName name;
+}
+
+public class UserName {
+
+	@Field("first-name")              <2>
+    private String firstname;
+
+	@Field("last-name")
+    private String lastname;
+}
+----
+
+[source,json]
+----
+{
+  "_id" : "2647f7b9-89da",
+  "u-first-name" : "Barbara",         <2>
+  "u-last-name" : "Gordon"
+}
+----
+<1> All properties of `UserName` are prefixed with `u-`.
+<2> Final field names are a result of concatenating `@Unwrapped(prefix)` and `@Field(name)`.
+====
+
+[[unwrapped-entities.queries]]
+== Query on Unwrapped Objects
+
+Defining queries on unwrapped properties is possible on type- as well as field-level as the provided `Criteria` is matched against the domain type.
+Prefixes and potential custom field names will be considered when rendering the actual query.
+Use the property name of the unwrapped object to match against all contained fields as shown in the sample below.
+
+.Query on unwrapped object
+====
+[source,java]
+----
+UserName userName = new UserName("Carol", "Danvers")
+Query findByUserName = query(where("name").is(userName));
+User user = template.findOne(findByUserName, User.class);
+----
+
+[source,json]
+----
+db.collection.find({
+  "firstname" : "Carol",
+  "lastname" : "Danvers"
+})
+----
+====
+
+It is also possible to address any field of the unwrapped object directly using its property name as shown in the snippet below.
+
+.Query on field of unwrapped object
+====
+[source,java]
+----
+Query findByUserFirstName = query(where("name.firstname").is("Shuri"));
+List<User> users = template.findAll(findByUserFirstName, User.class);
+----
+
+[source,json]
+----
+db.collection.find({
+  "firstname" : "Shuri"
+})
+----
+====
+
+[[unwrapped-entities.queries.sort]]
+=== Sort by unwrapped field.
+
+Fields of unwrapped objects can be used for sorting via their property path as shown in the sample below.
+
+.Sort on unwrapped field
+====
+[source,java]
+----
+Query findByUserLastName = query(where("name.lastname").is("Romanoff"));
+List<User> user = template.findAll(findByUserName.withSort(Sort.by("name.firstname")), User.class);
+----
+
+[source,json]
+----
+db.collection.find({
+  "lastname" : "Romanoff"
+}).sort({ "firstname" : 1 })
+----
+====
+
+[NOTE]
+====
+Though possible, using the unwrapped object itself as sort criteria includes all of its fields in unpredictable order and may result in inaccurate ordering.
+====
+
+[[unwrapped-entities.queries.project]]
+=== Field projection on unwrapped objects
+
+Fields of unwrapped objects can be subject for projection either as a whole or via single fields as shown in the samples below.
+
+.Project on unwrapped object.
+====
+[source,java]
+----
+Query findByUserLastName = query(where("name.firstname").is("Gamora"));
+findByUserLastName.fields().include("name");                             <1>
+List<User> user = template.findAll(findByUserName, User.class);
+----
+
+[source,json]
+----
+db.collection.find({
+  "lastname" : "Gamora"
+},
+{
+  "firstname" : 1,
+  "lastname" : 1
+})
+----
+<1> A field projection on an unwrapped object includes all of its properties.
+====
+
+.Project on a field of an unwrapped object.
+====
+[source,java]
+----
+Query findByUserLastName = query(where("name.lastname").is("Smoak"));
+findByUserLastName.fields().include("name.firstname");                   <1>
+List<User> user = template.findAll(findByUserName, User.class);
+----
+
+[source,json]
+----
+db.collection.find({
+  "lastname" : "Smoak"
+},
+{
+  "firstname" : 1
+})
+----
+<1> A field projection on an unwrapped object includes all of its properties.
+====
+
+[[unwrapped-entities.queries.by-example]]
+=== Query By Example on unwrapped object.
+
+Unwrapped objects can be used within an `Example` probe just as any other type.
+Please review the xref:mongodb/template-query-operations.adoc#mongo.query-by-example[Query By Example] section, to learn more about this feature.
+
+[[unwrapped-entities.queries.repository]]
+=== Repository Queries on unwrapped objects.
+
+The `Repository` abstraction allows deriving queries on fields of unwrapped objects as well as the entire object.
+
+.Repository queries on unwrapped objects.
+====
+[source,java]
+----
+interface UserRepository extends CrudRepository<User, String> {
+
+	List<User> findByName(UserName username);         <1>
+
+	List<User> findByNameFirstname(String firstname); <2>
+}
+----
+<1> Matches against all fields of the unwrapped object.
+<2> Matches against the `firstname`.
+====
+
+[NOTE]
+====
+Index creation for unwrapped objects is suspended even if the repository `create-query-indexes` namespace attribute is set to `true`.
+====
+
+[[unwrapped-entities.update]]
+== Update on Unwrapped Objects
+
+Unwrapped objects can be updated as any other object that is part of the domain model.
+The mapping layer takes care of flattening structures into their surroundings.
+It is possible to update single attributes of the unwrapped object as well as the entire value as shown in the examples below.
+
+.Update a single field of an unwrapped object.
+====
+[source,java]
+----
+Update update = new Update().set("name.firstname", "Janet");
+template.update(User.class).matching(where("id").is("Wasp"))
+   .apply(update).first()
+----
+
+[source,json]
+----
+db.collection.update({
+  "_id" : "Wasp"
+},
+{
+  "$set" { "firstname" : "Janet" }
+},
+{ ... }
+)
+----
+====
+
+.Update an unwrapped object.
+====
+[source,java]
+----
+Update update = new Update().set("name", new Name("Janet", "van Dyne"));
+template.update(User.class).matching(where("id").is("Wasp"))
+   .apply(update).first()
+----
+
+[source,json]
+----
+db.collection.update({
+  "_id" : "Wasp"
+},
+{
+  "$set" {
+    "firstname" : "Janet",
+    "lastname" : "van Dyne",
+  }
+},
+{ ... }
+)
+----
+====
+
+[[unwrapped-entities.aggregations]]
+== Aggregations on Unwrapped Objects
+
+The xref:mongodb/aggregation-framework.adoc[Aggregation Framework] will attempt to map unwrapped values of typed aggregations.
+Please make sure to work with the property path including the wrapper object when referencing one of its values.
+Other than that no special action is required.
+
+[[unwrapped-entities.indexes]]
+== Index on Unwrapped Objects
+
+It is possible to attach the `@Indexed` annotation to properties of an unwrapped type just as it is done with regular objects.
+It is not possible to use `@Indexed` along with the `@Unwrapped` annotation on the owning property.
+
+====
+[source,java]
+----
+public class User {
+
+	@Id
+    private String userId;
+
+    @Unwrapped(onEmpty = USE_NULL)
+    UserName name;                    <1>
+
+    // Invalid -> InvalidDataAccessApiUsageException
+    @Indexed                          <2>
+    @Unwrapped(onEmpty = USE_Empty)
+    Address address;
+}
+
+public class UserName {
+
+    private String firstname;
+
+    @Indexed
+    private String lastname;           <1>
+}
+----
+<1> Index created for `lastname` in `users` collection.
+<2> Invalid `@Indexed` usage along with `@Unwrapped`
+====
+
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mongo-encryption.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mongo-encryption.adoc
new file mode 100644
index 0000000000..14e866cf14
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mongo-encryption.adoc
@@ -0,0 +1,313 @@
+[[mongo.encryption]]
+= Encryption
+
+Client Side Encryption is a feature that encrypts data in your application before it is sent to MongoDB.
+We recommend you get familiar with the concepts, ideally from the https://www.mongodb.com/docs/manual/core/security-in-use-encryption/[MongoDB Documentation] to learn more about its capabilities and restrictions before you continue applying Encryption through Spring Data.
+
+[NOTE]
+====
+Make sure to set the drivers `com.mongodb.AutoEncryptionSettings` to use client-side encryption.
+MongoDB does not support encryption for all field types.
+Specific data types require deterministic encryption to preserve equality comparison functionality.
+====
+
+== Client Side Field Level Encryption (CSFLE)
+
+Choosing CSFLE gives you full flexibility and allows you to use different keys for a single field, eg. in a one key per tenant scenario. +
+Please make sure to consult the https://www.mongodb.com/docs/manual/core/csfle/[MongoDB CSFLE Documentation] before you continue reading.
+
+[[mongo.encryption.automatic]]
+=== Automatic Encryption (CSFLE)
+
+MongoDB supports https://www.mongodb.com/docs/manual/core/csfle/[Client-Side Field Level Encryption] out of the box using the MongoDB driver with its Automatic Encryption feature.
+Automatic Encryption requires a xref:mongodb/mapping/mapping-schema.adoc[JSON Schema] that allows to perform encrypted read and write operations without the need to provide an explicit en-/decryption step.
+
+Please refer to the xref:mongodb/mapping/mapping-schema.adoc#mongo.jsonSchema.encrypted-fields[JSON Schema] section for more information on defining a JSON Schema that holds encryption information.
+
+To make use of a the `MongoJsonSchema` it needs to be combined with `AutoEncryptionSettings` which can be done eg. via a `MongoClientSettingsBuilderCustomizer`.
+
+[source,java]
+----
+@Bean
+MongoClientSettingsBuilderCustomizer customizer(MappingContext mappingContext) {
+    return (builder) -> {
+
+        // ... keyVaultCollection, kmsProvider, ...
+
+        MongoJsonSchemaCreator schemaCreator = MongoJsonSchemaCreator.create(mappingContext);
+        MongoJsonSchema patientSchema = schemaCreator
+            .filter(MongoJsonSchemaCreator.encryptedOnly())
+            .createSchemaFor(Patient.class);
+
+        AutoEncryptionSettings autoEncryptionSettings = AutoEncryptionSettings.builder()
+            .keyVaultNamespace(keyVaultCollection)
+            .kmsProviders(kmsProviders)
+            .extraOptions(extraOpts)
+            .schemaMap(Collections.singletonMap("db.patient", patientSchema.schemaDocument().toBsonDocument()))
+            .build();
+
+        builder.autoEncryptionSettings(autoEncryptionSettings);
+    };
+}
+----
+
+[[mongo.encryption.explicit]]
+=== Explicit Encryption (CSFLE)
+
+Explicit encryption uses the MongoDB driver's encryption library (`org.mongodb:mongodb-crypt`) to perform encryption and decryption tasks.
+The `@ExplicitEncrypted` annotation is a combination of the `@Encrypted` annotation used for xref:mongodb/mapping/mapping-schema.adoc#mongo.jsonSchema.encrypted-fields[JSON Schema creation] and a xref:mongodb/mapping/property-converters.adoc[Property Converter].
+In other words, `@ExplicitEncrypted` uses existing building blocks to combine them for simplified explicit encryption support.
+
+[NOTE]
+====
+Fields annotated with `@ExplicitEncrypted` are always encrypted as whole.
+Consider the following example:
+
+[source,java]
+----
+@ExplicitEncrypted(…)
+String simpleValue;        <1>
+
+@ExplicitEncrypted(…)
+Address address;           <2>
+
+@ExplicitEncrypted(…)
+List<...> list;            <3>
+
+@ExplicitEncrypted(…)
+Map<..., ...> mapOfString; <4>
+----
+
+<1> Encrypts the value of the simple type such as a `String` if not `null`.
+<2> Encrypts the entire `Address` object and all its nested fields as `Document`.
+To only encrypt parts of the `Address`, like `Address#street` the `street` field within `Address` needs to be annotated with `@ExplicitEncrypted`.
+<3> ``Collection``-like fields are encrypted as single value and not per entry.
+<4> ``Map``-like fields are encrypted as single value and not as a key/value entry.
+====
+
+Client-Side Field Level Encryption allows you to choose between a deterministic and a randomized algorithm. Depending on the https://www.mongodb.com/docs/v5.0/reference/security-client-side-automatic-json-schema/#std-label-field-level-encryption-json-schema/[chosen algorithm], https://www.mongodb.com/docs/manual/core/csfle/reference/supported-operations/[different operations] may be supported.
+To pick a certain algorithm use `@ExplicitEncrypted(algorithm)`, see `EncryptionAlgorithms` for algorithm constants.
+Please read the https://www.mongodb.com/docs/manual/core/csfle/fundamentals/encryption-algorithms[Encryption Types] manual for more information on algorithms and their usage.
+
+To perform the actual encryption we require a Data Encryption Key (DEK).
+Please refer to the https://www.mongodb.com/docs/manual/core/csfle/quick-start/#create-a-data-encryption-key[MongoDB Documentation] for more information on how to set up key management and create a Data Encryption Key.
+The DEK can be referenced directly via its `id` or a defined _alternative name_.
+The `@EncryptedField` annotation only allows referencing a DEK via an alternative name.
+It is possible to provide an `EncryptionKeyResolver`, which will be discussed later, to any DEK.
+
+.Reference the Data Encryption Key
+====
+[source,java]
+----
+@EncryptedField(algorithm=…, altKeyName = "secret-key") <1>
+String ssn;
+----
+
+[source,java]
+----
+@EncryptedField(algorithm=…, altKeyName = "/name")      <2>
+String ssn;
+----
+
+<1> Use the DEK stored with the alternative name `secret-key`.
+<2> Uses a field reference that will read the actual field value and use that for key lookup.
+Always requires the full document to be present for save operations.
+Fields cannot be used in queries/aggregations.
+====
+
+By default, the `@ExplicitEncrypted(value=…)` attribute references a `MongoEncryptionConverter`.
+It is possible to change the default implementation and exchange it with any `PropertyValueConverter` implementation by providing the according type reference.
+To learn more about custom `PropertyValueConverters` and the required configuration, please refer to the xref:mongodb/mapping/property-converters.adoc[Property Converters - Mapping specific fields] section.
+
+[[mongo.encryption.queryable]]
+== Queryable Encryption (QE)
+
+Choosing QE enables you to run different types of queries, like _range_ or _equality_, against encrypted fields. +
+Please make sure to consult the https://www.mongodb.com/docs/manual/core/queryable-encryption/[MongoDB QE Documentation] before you continue reading to learn more about QE features and limitations.
+
+=== Collection Setup
+
+Queryable Encryption requires upfront declaration of certain aspects allowed within an actual query against an encrypted field.
+The information covers the algorithm in use as well as allowed query types along with their attributes and must be provided when creating the collection.
+
+`MongoOperations#createCollection(...)` can be used to do the initial setup for collections utilizing QE.
+The configuration for QE via Spring Data uses the same building blocks (a xref:mongodb/mapping/mapping-schema.adoc#mongo.jsonSchema.encrypted-fields[JSON Schema creation]) as CSFLE, converting the schema/properties into the configuration format required by MongoDB.
+
+[tabs]
+======
+Manual Collection Setup::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+CollectionOptions collectionOptions = CollectionOptions.encryptedCollection(options -> options
+	.queryable(encrypted(string("ssn")).algorithm("Indexed"), equality().contention(0))
+	.queryable(encrypted(int32("age")).algorithm("Range"), range().contention(8).min(0).max(150))
+	.queryable(encrypted(int64("address.sign")).algorithm("Range"), range().contention(2).min(-10L).max(10L))
+);
+
+mongoTemplate.createCollection(Patient.class, collectionOptions); <1>
+----
+<1> Using the template to create the collection may prevent capturing generated keyIds. In this case render the `Document` from the options and use the `createEncryptedCollection(...)` method via the encryption library.
+====
+
+Derived Collection Setup::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+class Patient {
+
+    @Id String id;
+
+    @Encrypted(algorithm = "Indexed") //
+    @Queryable(queryType = "equality", contentionFactor = 0)
+    String ssn;
+
+    @RangeEncrypted(contentionFactor = 8, rangeOptions = "{ 'min' : 0, 'max' : 150 }")
+    Integer age;
+
+    Address address;
+}
+
+MongoJsonSchema patientSchema = MongoJsonSchemaCreator.create(mappingContext)
+    .filter(MongoJsonSchemaCreator.encryptedOnly())
+    .createSchemaFor(Patient.class);
+
+CollectionOptions collectionOptions = CollectionOptions.encryptedCollection(patientSchema);
+
+mongoTemplate.createCollection(Patient.class, collectionOptions); <1>
+----
+<1> Using the template to create the collection may prevent capturing generated keyIds. In this case render the `Document` from the options and use the `createEncryptedCollection(...)` method via the encryption library.
+
+The `Queryable` annotation allows to define allowed query types for encrypted fields.
+`@RangeEncrypted` is a combination of `@Encrypted` and `@Queryable` for fields allowing `range` queries.
+It is possible to create custom annotations out of the provided ones.
+====
+
+MongoDB Collection Info::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="thrid"]
+----
+{
+    name: 'patient',
+    type: 'collection',
+    options: {
+      encryptedFields: {
+        escCollection: 'enxcol_.test.esc',
+        ecocCollection: 'enxcol_.test.ecoc',
+        fields: [
+          {
+            keyId: ...,
+            path: 'ssn',
+            bsonType: 'string',
+            queries: [ { queryType: 'equality', contention: Long('0') } ]
+          },
+          {
+            keyId: ...,
+            path: 'age',
+            bsonType: 'int',
+            queries: [ { queryType: 'range', contention: Long('8'), min: 0, max: 150 } ]
+          },
+          {
+            keyId: ...,
+            path: 'address.sign',
+            bsonType: 'long',
+            queries: [ { queryType: 'range', contention: Long('2'), min: Long('-10'), max: Long('10') } ]
+          }
+        ]
+      }
+    }
+}
+----
+====
+======
+
+[NOTE]
+====
+- It is not possible to use both QE and CSFLE within the same collection.
+- It is not possible to query a `range` indexed field with an `equality` operator.
+- It is not possible to query an `equality` indexed field with a `range` operator.
+- It is not possible to set `bypassAutoEncrytion(true)`.
+- It is not possible to use self maintained encryption keys via `@Encrypted` in combination with Queryable Encryption.
+- Contention is only optional on the server side, the clients requires you to set the value (Default us `8`).
+- Additional options for eg. `min` and `max` need to match the actual field type. Make sure to use `$numberLong` etc. to ensure target types when parsing bson String.
+- Queryable Encryption will an extra field `__safeContent__` to each of your documents.
+Unless explicitly excluded the field will be loaded into memory when retrieving results.
+====
+
+[[mongo.encryption.queryable.automatic]]
+=== Automatic Encryption (QE)
+
+MongoDB supports Queryable Encryption out of the box using the MongoDB driver with its Automatic Encryption feature.
+Automatic Encryption requires a xref:mongodb/mapping/mapping-schema.adoc[JSON Schema] that allows to perform encrypted read and write operations without the need to provide an explicit en-/decryption step.
+
+All you need to do is create the collection according to the MongoDB documentation.
+You may utilize techniques to create the required configuration outlined in the section above.
+
+[[mongo.encryption.queryable.manual]]
+=== Explicit Encryption (QE)
+
+Explicit encryption uses the MongoDB driver's encryption library (`org.mongodb:mongodb-crypt`) to perform encryption and decryption tasks based on the meta information provided by annotation within the domain model.
+
+[NOTE]
+====
+There is no official support for using Explicit Queryable Encryption.
+The audacious user may combine `@Encrypted` and `@Queryable` with `@ValueConverter(MongoEncryptionConverter.class)` at their own risk.
+====
+
+[[mongo.encryption.explicit-setup]]
+[[mongo.encryption.converter-setup]]
+== MongoEncryptionConverter Setup
+
+The converter setup for `MongoEncryptionConverter` requires a few steps as several components are involved.
+The bean setup consists of the following:
+
+1. The `ClientEncryption` engine
+2. A `MongoEncryptionConverter` instance configured with `ClientEncryption` and a `EncryptionKeyResolver`.
+3. A `PropertyValueConverterFactory` that uses the registered `MongoEncryptionConverter` bean.
+
+The `EncryptionKeyResolver` uses an `EncryptionContext` providing access to the property allowing for dynamic DEK resolution.
+
+.Sample MongoEncryptionConverter Configuration
+====
+[source,java]
+----
+class Config extends AbstractMongoClientConfiguration {
+
+    @Autowired ApplicationContext appContext;
+
+    @Bean
+    ClientEncryption clientEncryption() {                                                            <1>
+        ClientEncryptionSettings encryptionSettings = ClientEncryptionSettings.builder();
+        // …
+
+        return ClientEncryptions.create(encryptionSettings);
+    }
+
+    @Bean
+    MongoEncryptionConverter encryptingConverter(ClientEncryption clientEncryption) {
+
+        Encryption<BsonValue, BsonBinary> encryption = MongoClientEncryption.just(clientEncryption);
+        EncryptionKeyResolver keyResolver = EncryptionKeyResolver.annotated((ctx) -> …);             <2>
+
+        return new MongoEncryptionConverter(encryption, keyResolver);                                <3>
+    }
+
+    @Override
+    protected void configureConverters(MongoConverterConfigurationAdapter adapter) {
+
+        adapter
+            .registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(appContext)); <4>
+    }
+}
+----
+
+<1> Set up a `Encryption` engine using `com.mongodb.client.vault.ClientEncryption`.
+The instance is stateful and must be closed after usage.
+Spring takes care of this because `ClientEncryption` is ``Closeable``.
+<2> Set up an annotation-based `EncryptionKeyResolver` to determine the `EncryptionKey` from annotations.
+<3> Create the `MongoEncryptionConverter`.
+<4> Enable for a `PropertyValueConverter` lookup from the `BeanFactory`.
+====
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mongo-group.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mongo-group.adoc
new file mode 100644
index 0000000000..e8265b9837
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mongo-group.adoc
@@ -0,0 +1,97 @@
+[[mongo.group]]
+= Group Operations
+
+As an alternative to using Map-Reduce to perform data aggregation, you can use the https://www.mongodb.org/display/DOCS/Aggregation#Aggregation-Group[`group` operation] which feels similar to using SQL's group by query style, so it may feel more approachable vs. using Map-Reduce. Using the group operations does have some limitations, for example it is not supported in a shared environment and it returns the full result set in a single BSON object, so the result should be small, less than 10,000 keys.
+
+Spring provides integration with MongoDB's group operation by providing methods on MongoOperations to simplify the creation and running of group operations. It can convert the results of the group operation to a POJO and also integrates with Spring's https://docs.spring.io/spring-framework/docs/{springVersion}/reference/html/core.html#resources[Resource abstraction] abstraction. This will let you place your JavaScript files on the file system, classpath, http server or any other Spring Resource implementation and then reference the JavaScript resources via an easy URI style syntax, e.g. 'classpath:reduce.js;. Externalizing JavaScript code in files if often preferable to embedding them as Java strings in your code. Note that you can still pass JavaScript code as Java strings if you prefer.
+
+[[mongo.group.example]]
+== Example Usage
+
+In order to understand how group operations work the following example is used, which is somewhat artificial. For a more realistic example consult the book 'MongoDB - The definitive guide'. A collection named `group_test_collection` created with the following rows.
+
+[source]
+----
+{ "_id" : ObjectId("4ec1d25d41421e2015da64f1"), "x" : 1 }
+{ "_id" : ObjectId("4ec1d25d41421e2015da64f2"), "x" : 1 }
+{ "_id" : ObjectId("4ec1d25d41421e2015da64f3"), "x" : 2 }
+{ "_id" : ObjectId("4ec1d25d41421e2015da64f4"), "x" : 3 }
+{ "_id" : ObjectId("4ec1d25d41421e2015da64f5"), "x" : 3 }
+{ "_id" : ObjectId("4ec1d25d41421e2015da64f6"), "x" : 3 }
+----
+
+We would like to group by the only field in each row, the `x` field and aggregate the number of times each specific value of `x` occurs. To do this we need to create an initial document that contains our count variable and also a reduce function which will increment it each time it is encountered. The Java code to run the group operation is shown below
+
+[source,java]
+----
+GroupByResults<XObject> results = mongoTemplate.group("group_test_collection",
+                                                      GroupBy.key("x").initialDocument("{ count: 0 }").reduceFunction("function(doc, prev) { prev.count += 1 }"),
+                                                      XObject.class);
+----
+
+The first argument is the name of the collection to run the group operation over, the second is a fluent API that specifies properties of the group operation via a `GroupBy` class. In this example we are using just the `intialDocument` and `reduceFunction` methods. You can also specify a key-function, as well as a finalizer as part of the fluent API. If you have multiple keys to group by, you can pass in a comma separated list of keys.
+
+The raw results of the group operation is a JSON document that looks like this
+
+[source]
+----
+{
+  "retval" : [ { "x" : 1.0 , "count" : 2.0} ,
+               { "x" : 2.0 , "count" : 1.0} ,
+               { "x" : 3.0 , "count" : 3.0} ] ,
+  "count" : 6.0 ,
+  "keys" : 3 ,
+  "ok" : 1.0
+}
+----
+
+The document under the "retval" field is mapped onto the third argument in the group method, in this case XObject which is shown below.
+
+[source,java]
+----
+public class XObject {
+
+  private float x;
+
+  private float count;
+
+
+  public float getX() {
+    return x;
+  }
+
+  public void setX(float x) {
+    this.x = x;
+  }
+
+  public float getCount() {
+    return count;
+  }
+
+  public void setCount(float count) {
+    this.count = count;
+  }
+
+  @Override
+  public String toString() {
+    return "XObject [x=" + x + " count = " + count + "]";
+  }
+}
+----
+
+You can also obtain the raw result as a `Document` by calling the method `getRawResults` on the `GroupByResults` class.
+
+There is an additional method overload of the group method on `MongoOperations` which lets you specify a `Criteria` object for selecting a subset of the rows. An example which uses a `Criteria` object, with some syntax sugar using static imports, as well as referencing a key-function and reduce function javascript files via a Spring Resource string is shown below.
+
+[source]
+----
+import static org.springframework.data.mongodb.core.mapreduce.GroupBy.keyFunction;
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+
+GroupByResults<XObject> results = mongoTemplate.group(where("x").gt(0),
+                                        "group_test_collection",
+                                        keyFunction("classpath:keyFunction.js").initialDocument("{ count: 0 }").reduceFunction("classpath:groupReduce.js"), XObject.class);
+----
+
+include:../:aggregation-framework.adoc[]
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mongo-mapreduce.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mongo-mapreduce.adoc
new file mode 100644
index 0000000000..bfccec44fa
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mongo-mapreduce.adoc
@@ -0,0 +1,127 @@
+[[mongo.mapreduce]]
+= Map-Reduce Operations
+
+You can query MongoDB by using Map-Reduce, which is useful for batch processing, for data aggregation, and for when the query language does not fulfill your needs.
+
+Spring provides integration with MongoDB's Map-Reduce by providing methods on `MongoOperations` to simplify the creation and running of Map-Reduce operations.It can convert the results of a Map-Reduce operation to a POJO and integrates with Spring's link:{springDocsUrl}/core.html#resources[Resource abstraction].This lets you place your JavaScript files on the file system, classpath, HTTP server, or any other Spring Resource implementation and then reference the JavaScript resources through an easy URI style syntax -- for example, `classpath:reduce.js;`.Externalizing JavaScript code in files is often preferable to embedding them as Java strings in your code.Note that you can still pass JavaScript code as Java strings if you prefer.
+
+[[mongo.mapreduce.example]]
+== Example Usage
+
+To understand how to perform Map-Reduce operations, we use an example from the book, _MongoDB - The Definitive Guide_ footnote:[Kristina Chodorow. _MongoDB - The Definitive Guide_. O'Reilly Media, 2013].In this example, we create three documents that have the values [a,b], [b,c], and [c,d], respectively.The values in each document are associated with the key, 'x', as the following example shows (assume these documents are in a collection named `jmr1`):
+
+[source]
+----
+{ "_id" : ObjectId("4e5ff893c0277826074ec533"), "x" : [ "a", "b" ] }
+{ "_id" : ObjectId("4e5ff893c0277826074ec534"), "x" : [ "b", "c" ] }
+{ "_id" : ObjectId("4e5ff893c0277826074ec535"), "x" : [ "c", "d" ] }
+----
+
+The following map function counts the occurrence of each letter in the array for each document:
+
+[source,java]
+----
+function () {
+    for (var i = 0; i < this.x.length; i++) {
+        emit(this.x[i], 1);
+    }
+}
+----
+
+The follwing reduce function sums up the occurrence of each letter across all the documents:
+
+[source,java]
+----
+function (key, values) {
+    var sum = 0;
+    for (var i = 0; i < values.length; i++)
+        sum += values[i];
+    return sum;
+}
+----
+
+Running the preceding functions result in the following collection:
+
+[source]
+----
+{ "_id" : "a", "value" : 1 }
+{ "_id" : "b", "value" : 2 }
+{ "_id" : "c", "value" : 2 }
+{ "_id" : "d", "value" : 1 }
+----
+
+Assuming that the map and reduce functions are located in `map.js` and `reduce.js` and bundled in your jar so they are available on the classpath, you can run a Map-Reduce operation as follows:
+
+[source,java]
+----
+MapReduceResults<ValueObject> results = mongoOperations.mapReduce("jmr1", "classpath:map.js", "classpath:reduce.js", ValueObject.class);
+for (ValueObject valueObject : results) {
+  System.out.println(valueObject);
+}
+----
+
+The preceding exmaple produces the following output:
+
+[source]
+----
+ValueObject [id=a, value=1.0]
+ValueObject [id=b, value=2.0]
+ValueObject [id=c, value=2.0]
+ValueObject [id=d, value=1.0]
+----
+
+The `MapReduceResults` class implements `Iterable` and provides access to the raw output and timing and count statistics.The following listing shows the `ValueObject` class:
+
+[source,java]
+----
+public class ValueObject {
+
+  private String id;
+  private float value;
+
+  public String getId() {
+    return id;
+  }
+
+  public float getValue() {
+    return value;
+  }
+
+  public void setValue(float value) {
+    this.value = value;
+  }
+
+  @Override
+  public String toString() {
+    return "ValueObject [id=" + id + ", value=" + value + "]";
+  }
+}
+----
+
+By default, the output type of `INLINE` is used so that you need not specify an output collection.To specify additional Map-Reduce options, use an overloaded method that takes an additional `MapReduceOptions` argument.The class `MapReduceOptions` has a fluent API, so adding additional options can be done in a compact syntax.The following example sets the output collection to `jmr1_out` (note that setting only the output collection assumes a default output type of `REPLACE`):
+
+[source,java]
+----
+MapReduceResults<ValueObject> results = mongoOperations.mapReduce("jmr1", "classpath:map.js", "classpath:reduce.js",
+                                                                     new MapReduceOptions().outputCollection("jmr1_out"), ValueObject.class);
+----
+
+There is also a static import (`import static org.springframework.data.mongodb.core.mapreduce.MapReduceOptions.options;`) that can be used to make the syntax slightly more compact, as the following example shows:
+
+[source,java]
+----
+MapReduceResults<ValueObject> results = mongoOperations.mapReduce("jmr1", "classpath:map.js", "classpath:reduce.js",
+                                                                     options().outputCollection("jmr1_out"), ValueObject.class);
+----
+
+You can also specify a query to reduce the set of data that is fed into the Map-Reduce operation.The following example removes the document that contains [a,b] from consideration for Map-Reduce operations:
+
+[source,java]
+----
+Query query = new Query(where("x").ne(new String[] { "a", "b" }));
+MapReduceResults<ValueObject> results = mongoOperations.mapReduce(query, "jmr1", "classpath:map.js", "classpath:reduce.js",
+                                                                     options().outputCollection("jmr1_out"), ValueObject.class);
+----
+
+Note that you can specify additional limit and sort values on the query, but you cannot skip values.
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mongo-search-indexes.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mongo-search-indexes.adoc
new file mode 100644
index 0000000000..7fc51de007
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mongo-search-indexes.adoc
@@ -0,0 +1,122 @@
+[[mongo.search]]
+= MongoDB Search
+
+MongoDB enables users to do keyword or lexical search as well as vector search data using dedicated search indexes.
+
+[[mongo.search.vector]]
+== Vector Search
+
+MongoDB Vector Search uses the `$vectorSearch` aggregation stage to run queries against specialized indexes.
+Please refer to the MongoDB documentation to learn more about requirements and restrictions of `vectorSearch` indexes.
+
+[[mongo.search.vector.index]]
+=== Managing Vector Indexes
+
+`SearchIndexOperationsProvider` implemented by `MongoTemplate` are the entrypoint to `SearchIndexOperations` offering various methods for managing vector indexes.
+
+The following snippet shows how to create a vector index for a collection
+
+.Create a Vector Index
+[tabs]
+======
+Java::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+VectorIndex index = new VectorIndex("vector_index")
+  .addVector("plotEmbedding", vector -> vector.dimensions(1536).similarity(COSINE)) <1>
+  .addFilter("year"); <2>
+
+mongoTemplate.searchIndexOps(Movie.class) <3>
+  .createIndex(index);
+----
+<1> A vector index may cover multiple vector embeddings that can be added via the `addVector` method.
+<2> Vector indexes can contain additional fields to narrow down search results when running queries.
+<3> Obtain `SearchIndexOperations` bound to the `Movie` type which is used for field name mapping.
+====
+
+Mongo Shell::
++
+====
+[source,console,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+db.movie.createSearchIndex("movie", "vector_index",
+  {
+    "fields": [
+      {
+        "type": "vector",
+        "numDimensions": 1536,
+        "path": "plot_embedding", <1>
+        "similarity": "cosine"
+      },
+      {
+        "type": "filter",
+        "path": "year"
+      }
+    ]
+  }
+)
+----
+<1> Field name `plotEmbedding` got mapped to `plot_embedding` considering a `@Field(name = "...")` annotation.
+====
+======
+
+Once created, vector indexes are not immediately ready to use although the `exists` check returns `true`.
+The actual status of a search index can be obtained via `SearchIndexOperations#status(...)`.
+The `READY` state indicates the index is ready to accept queries.
+
+[[mongo.search.vector.query]]
+=== Querying Vector Indexes
+
+Vector indexes can be queried by issuing an aggregation using a `VectorSearchOperation` via `MongoOperations` as shown in the following example
+
+.Query a Vector Index
+[tabs]
+======
+Java::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+VectorSearchOperation search = VectorSearchOperation.search("vector_index") <1>
+  .path("plotEmbedding") <2>
+  .vector( ... )
+  .numCandidates(150)
+  .limit(10)
+  .withSearchScore("score"); <3>
+
+AggregationResults<MovieWithSearchScore> results = mongoTemplate
+  .aggregate(newAggregation(Movie.class, search), MovieWithSearchScore.class);
+----
+<1> Provide the name of the vector index to query since a collection may hold multiple ones.
+<2> The name of the path used for comparison.
+<3> Optionally add the search score with given name to the result document.
+====
+
+Mongo Shell::
++
+====
+[source,console,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+db.embedded_movies.aggregate([
+  {
+    "$vectorSearch": {
+      "index": "vector_index",
+      "path": "plot_embedding", <1>
+      "queryVector": [ ... ],
+      "numCandidates": 150,
+      "limit": 10
+    }
+  },
+  {
+    "$addFields": {
+      "score": { $meta: "vectorSearchScore" }
+    }
+  }
+])
+----
+<1> Field name `plotEmbedding` got mapped to `plot_embedding` considering a `@Field(name = "...")` annotation.
+====
+======
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/mongo-server-side-scripts.adoc b/src/main/antora/modules/ROOT/pages/mongodb/mongo-server-side-scripts.adoc
new file mode 100644
index 0000000000..0cac130b63
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/mongo-server-side-scripts.adoc
@@ -0,0 +1,28 @@
+[[mongo.server-side-scripts]]
+= Script Operations
+
+[WARNING]
+====
+https://docs.mongodb.com/master/release-notes/4.2-compatibility/[MongoDB 4.2] removed support for the `eval` command used
+by `ScriptOperations`. +
+There is no replacement for the removed functionality.
+====
+
+MongoDB allows running JavaScript functions on the server by either directly sending the script or calling a stored one. `ScriptOperations` can be accessed through `MongoTemplate` and provides basic abstraction for `JavaScript` usage. The following example shows how to us the `ScriptOperations` class:
+
+====
+[source,java]
+----
+ScriptOperations scriptOps = template.scriptOps();
+
+ExecutableMongoScript echoScript = new ExecutableMongoScript("function(x) { return x; }");
+scriptOps.execute(echoScript, "directly execute script");     <1>
+
+scriptOps.register(new NamedMongoScript("echo", echoScript)); <2>
+scriptOps.call("echo", "execute script via name");            <3>
+----
+<1> Run the script directly without storing the function on server side.
+<2> Store the script using 'echo' as its name. The given name identifies the script and allows calling it later.
+<3> Run the script with name 'echo' using the provided parameters.
+====
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/repositories/cdi-integration.adoc b/src/main/antora/modules/ROOT/pages/mongodb/repositories/cdi-integration.adoc
new file mode 100644
index 0000000000..06b2a42dc8
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/repositories/cdi-integration.adoc
@@ -0,0 +1,38 @@
+[[mongodb.repositories.misc.cdi-integration]]
+= CDI Integration
+
+Instances of the repository interfaces are usually created by a container, and Spring is the most natural choice when working with Spring Data.
+As of version 1.3.0, Spring Data MongoDB ships with a custom CDI extension that lets you use the repository abstraction in CDI environments.
+The extension is part of the JAR.
+To activate it, drop the Spring Data MongoDB JAR into your classpath.
+You can now set up the infrastructure by implementing a CDI Producer for the `MongoTemplate`, as the following example shows:
+
+[source,java]
+----
+class MongoTemplateProducer {
+
+    @Produces
+    @ApplicationScoped
+    public MongoOperations createMongoTemplate() {
+
+        MongoDatabaseFactory factory = new SimpleMongoClientDatabaseFactory(MongoClients.create(), "database");
+        return new MongoTemplate(factory);
+    }
+}
+----
+
+The Spring Data MongoDB CDI extension picks up the `MongoTemplate` available as a CDI bean and creates a proxy for a Spring Data repository whenever a bean of a repository type is requested by the container.
+Thus, obtaining an instance of a Spring Data repository is a matter of declaring an `@Inject`-ed property, as the following example shows:
+
+[source,java]
+----
+class RepositoryClient {
+
+  @Inject
+  PersonRepository repository;
+
+  public void businessMethod() {
+    List<Person> people = repository.findAll();
+  }
+}
+----
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/repositories/modifying-methods.adoc b/src/main/antora/modules/ROOT/pages/mongodb/repositories/modifying-methods.adoc
new file mode 100644
index 0000000000..3d195ca0a9
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/repositories/modifying-methods.adoc
@@ -0,0 +1,100 @@
+[[mongodb.repositories.queries]]
+= MongoDB-specific Data Manipulation Methods
+
+Next to the xref:mongodb/repositories/query-methods.adoc[query methods] it is possible to update data with specialized methods.
+
+[[mongodb.repositories.queries.update]]
+== Update Methods
+
+You can also use the keywords in the preceding table to create queries that identify matching documents for running updates on them.
+The actual update action is defined by the `@Update` annotation on the method itself, as the following listing shows.
+Note that the naming schema for derived queries starts with `find`.
+Using `update` (as in `updateAllByLastname(...)`) is allowed only in combination with `@Query`.
+
+The update is applied to *all* matching documents and it is *not* possible to limit the scope by passing in a `Page` or by using any of the <<repositories.limit-query-result,limiting keywords>>.
+The return type can be either `void` or a _numeric_ type, such as `long`, to hold the number of modified documents.
+
+.Update Methods
+====
+[source,java]
+----
+public interface PersonRepository extends CrudRepository<Person, String> {
+
+    @Update("{ '$inc' : { 'visits' : 1 } }")
+    long findAndIncrementVisitsByLastname(String lastname); <1>
+
+    @Update("{ '$inc' : { 'visits' : ?1 } }")
+    void findAndIncrementVisitsByLastname(String lastname, int increment); <2>
+
+    @Update("{ '$inc' : { 'visits' : ?#{[1]} } }")
+    long findAndIncrementVisitsUsingSpELByLastname(String lastname, int increment); <3>
+
+    @Update(pipeline = {"{ '$set' : { 'visits' : { '$add' : [ '$visits', ?1 ] } } }"})
+    void findAndIncrementVisitsViaPipelineByLastname(String lastname, int increment); <4>
+
+    @Update("{ '$push' : { 'shippingAddresses' : ?1 } }")
+    long findAndPushShippingAddressByEmail(String email, Address address); <5>
+
+    @Query("{ 'lastname' : ?0 }")
+    @Update("{ '$inc' : { 'visits' : ?1 } }")
+    void updateAllByLastname(String lastname, int increment); <6>
+}
+----
+
+<1> The filter query for the update is derived from the method name.
+The update is "`as is`" and does not bind any parameters.
+<2> The actual increment value is defined by the `increment` method argument that is bound to the `?1` placeholder.
+<3> Use the Spring Expression Language (SpEL) for parameter binding.
+<4> Use the `pipeline` attribute to issue xref:mongodb/template-crud-operations.adoc#mongo-template.aggregation-update[aggregation pipeline updates].
+<5> The update may contain complex objects.
+<6> Combine a xref:mongodb/repositories/repositories.adoc#mongodb.repositories.queries.json-based[string based query] with an update.
+====
+
+WARNING: Repository updates do not emit persistence nor mapping lifecycle events.
+
+[[mongodb.repositories.queries.delete]]
+== Delete Methods
+
+The keywords in the preceding table can be used in conjunction with `delete…By` or `remove…By` to create queries that delete matching documents.
+
+.`Delete…By` Query
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    List <Person> deleteByLastname(String lastname);      <1>
+
+    Long deletePersonByLastname(String lastname);         <2>
+
+    @Nullable
+    Person deleteSingleByLastname(String lastname);       <3>
+
+    Optional<Person> deleteByBirthdate(Date birthdate);   <4>
+}
+----
+<1> Using a return type of `List` retrieves and returns all matching documents before actually deleting them.
+<2> A numeric return type directly removes the matching documents, returning the total number of documents removed.
+<3> A single domain type result retrieves and removes the first matching document.
+<4> Same as in 3 but wrapped in an `Optional` type.
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface PersonRepository extends ReactiveMongoRepository<Person, String> {
+
+    Flux<Person> deleteByLastname(String lastname);      <1>
+
+    Mono<Long> deletePersonByLastname(String lastname);         <2>
+
+    Mono<Person> deleteSingleByLastname(String lastname);       <3>
+}
+----
+<1> Using a return type of `Flux` retrieves and returns all matching documents before actually deleting them.
+<2> A numeric return type directly removes the matching documents, returning the total number of documents removed.
+<3> A single domain type result retrieves and removes the first matching document.
+======
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/repositories/query-methods.adoc b/src/main/antora/modules/ROOT/pages/mongodb/repositories/query-methods.adoc
new file mode 100644
index 0000000000..adb2392f04
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/repositories/query-methods.adoc
@@ -0,0 +1,869 @@
+[[mongodb.repositories.queries]]
+= MongoDB-specific Query Methods
+
+Most of the data access operations you usually trigger on a repository result in a query being executed against the MongoDB databases.
+Defining such a query is a matter of declaring a method on the repository interface, as the following example shows:
+
+.PersonRepository with query methods
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends PagingAndSortingRepository<Person, String> {
+
+    List<Person> findByLastname(String lastname);                      <1>
+
+    Page<Person> findByFirstname(String firstname, Pageable pageable); <2>
+
+    Person findByShippingAddresses(Address address);                   <3>
+
+    Person findFirstByLastname(String lastname);                       <4>
+
+    Stream<Person> findAllBy();                                        <5>
+}
+----
+<1> The `findByLastname` method shows a query for all people with the given last name.
+The query is derived by parsing the method name for constraints that can be concatenated with `And` and `Or`.
+Thus, the method name results in a query expression of `{"lastname" : lastname}`.
+<2> Applies pagination to a query.
+You can equip your method signature with a `Pageable` parameter and let the method return a `Page` instance and Spring Data automatically pages the query accordingly.
+<3> Shows that you can query based on properties that are not primitive types.
+Throws `IncorrectResultSizeDataAccessException` if more than one match is found.
+<4> Uses the `First` keyword to restrict the query to only the first result.
+Unlike <3>, this method does not throw an exception if more than one match is found.
+<5> Uses a Java 8 `Stream` that reads and converts individual elements while iterating the stream.
+
+Reactive::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface ReactivePersonRepository extends ReactiveSortingRepository<Person, String> {
+
+    Flux<Person> findByFirstname(String firstname);                                   <1>
+
+    Flux<Person> findByFirstname(Publisher<String> firstname);                        <2>
+
+    Flux<Person> findByFirstnameOrderByLastname(String firstname, Pageable pageable); <3>
+
+    Mono<Person> findByFirstnameAndLastname(String firstname, String lastname);       <4>
+
+    Mono<Person> findFirstByLastname(String lastname);                                <5>
+}
+----
+<1> The method shows a query for all people with the given `lastname`. The query is derived by parsing the method name for constraints that can be concatenated with `And` and `Or`. Thus, the method name results in a query expression of `{"lastname" : lastname}`.
+<2> The method shows a query for all people with the given `firstname` once the `firstname` is emitted by the given `Publisher`.
+<3> Use `Pageable` to pass offset and sorting parameters to the database.
+<4> Find a single entity for the given criteria. It completes with `IncorrectResultSizeDataAccessException` on non-unique results.
+<5> Unless <4>, the first entity is always emitted even if the query yields more result documents.
+
+WARNING: The `Page` return type (as in `Mono<Page>`) is not supported by reactive repositories.
+
+It is possible to use `Pageable` in derived finder methods, to pass on `sort`, `limit` and `offset` parameters to the query to reduce load and network traffic.
+The returned `Flux` will only emit data within the declared range.
+
+[source,java]
+----
+Pageable page = PageRequest.of(1, 10, Sort.by("lastname"));
+Flux<Person> persons = repository.findByFirstnameOrderByLastname("luke", page);
+----
+====
+======
+
+NOTE: We do not support referring to parameters that are mapped as `DBRef` in the domain class.
+
+.Supported keywords for query methods
+[%collapsible]
+====
+[cols="1,2,3",options="header"]
+|===
+| Keyword
+| Sample
+| Logical result
+
+| `After`
+| `findByBirthdateAfter(Date date)`
+| `{"birthdate" : {"$gt" : date}}`
+
+| `GreaterThan`
+| `findByAgeGreaterThan(int age)`
+| `{"age" : {"$gt" : age}}`
+
+| `GreaterThanEqual`
+| `findByAgeGreaterThanEqual(int age)`
+| `{"age" : {"$gte" : age}}`
+
+| `Before`
+| `findByBirthdateBefore(Date date)`
+| `{"birthdate" : {"$lt" : date}}`
+
+| `LessThan`
+| `findByAgeLessThan(int age)`
+| `{"age" : {"$lt" : age}}`
+
+| `LessThanEqual`
+| `findByAgeLessThanEqual(int age)`
+| `{"age" : {"$lte" : age}}`
+
+| `Between`
+| `findByAgeBetween(int from, int to)` +
+`findByAgeBetween(Range<Integer> range)`
+| `{"age" : {"$gt" : from, "$lt" : to}}` +
+lower / upper bounds (`$gt` / `$gte` & `$lt` / `$lte`) according to `Range`
+
+| `In`
+| `findByAgeIn(Collection ages)`
+| `{"age" : {"$in" : [ages...]}}`
+
+| `NotIn`
+| `findByAgeNotIn(Collection ages)`
+| `{"age" : {"$nin" : [ages...]}}`
+
+| `IsNotNull`, `NotNull`
+| `findByFirstnameNotNull()`
+| `{"firstname" : {"$ne" : null}}`
+
+| `IsNull`, `Null`
+| `findByFirstnameNull()`
+| `{"firstname" : null}`
+
+| `Like`, `StartingWith`, `EndingWith`
+| `findByFirstnameLike(String name)`
+| `{"firstname" : name} (name as regex)`
+
+| `NotLike`, `IsNotLike`
+| `findByFirstnameNotLike(String name)`
+| `{"firstname" : { "$not" : name }} (name as regex)`
+
+| `Containing` on String
+| `findByFirstnameContaining(String name)`
+| `{"firstname" : name} (name as regex)`
+
+| `NotContaining` on String
+| `findByFirstnameNotContaining(String name)`
+| `{"firstname" : { "$not" : name}} (name as regex)`
+
+| `Containing` on Collection
+| `findByAddressesContaining(Address address)`
+| `{"addresses" : { "$in" : address}}`
+
+| `NotContaining` on Collection
+| `findByAddressesNotContaining(Address address)`
+| `{"addresses" : { "$not" : { "$in" : address}}}`
+
+| `Regex`
+| `findByFirstnameRegex(String firstname)`
+| `{"firstname" : {"$regex" : firstname }}`
+
+| `(No keyword)`
+| `findByFirstname(String name)`
+| `{"firstname" : name}`
+
+| `Not`
+| `findByFirstnameNot(String name)`
+| `{"firstname" : {"$ne" : name}}`
+
+| `Near`
+| `findByLocationNear(Point point)`
+| `{"location" : {"$near" : [x,y]}}`
+
+| `Near`
+| `findByLocationNear(Point point, Distance max)`
+| `{"location" : {"$near" : [x,y], "$maxDistance" : max}}`
+
+| `Near`
+| `findByLocationNear(Point point, Distance min, Distance max)`
+| `{"location" : {"$near" : [x,y], "$minDistance" : min, "$maxDistance" : max}}`
+
+| `Within`
+| `findByLocationWithin(Circle circle)`
+| `{"location" : {"$geoWithin" : {"$center" : [ [x, y], distance]}}}`
+
+| `Within`
+| `findByLocationWithin(Box box)`
+| `{"location" : {"$geoWithin" : {"$box" : [ [x1, y1], x2, y2]}}}`
+
+| `IsTrue`, `True`
+| `findByActiveIsTrue()`
+| `{"active" : true}`
+
+| `IsFalse`,  `False`
+| `findByActiveIsFalse()`
+| `{"active" : false}`
+
+| `Exists`
+| `findByLocationExists(boolean exists)`
+| `{"location" : {"$exists" : exists }}`
+
+| `IgnoreCase`
+| `findByUsernameIgnoreCase(String username)`
+| `{"username" : {"$regex" : "^username$", "$options" : "i" }}`
+|===
+====
+
+NOTE: If the property criterion compares a document, the order of the fields and exact equality in the document matters.
+
+[[mongodb.repositories.queries.geo-spatial]]
+== Geo-spatial Queries
+
+As you saw in the preceding table of keywords, a few keywords trigger geo-spatial operations within a MongoDB query.
+The `Near` keyword allows some further modification, as the next few examples show.
+
+The following example shows how to define a `near` query that finds all persons with a given distance of a given point:
+
+.Advanced `Near` queries
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    // { 'location' : { '$near' : [point.x, point.y], '$maxDistance' : distance}}
+    List<Person> findByLocationNear(Point location, Distance distance);
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+interface PersonRepository extends ReactiveMongoRepository<Person, String> {
+
+    // { 'location' : { '$near' : [point.x, point.y], '$maxDistance' : distance}}
+    Flux<Person> findByLocationNear(Point location, Distance distance);
+}
+----
+======
+
+Adding a `Distance` parameter to the query method allows restricting results to those within the given distance.
+If the `Distance` was set up containing a `Metric`, we transparently use `$nearSphere` instead of `$code`, as the following example shows:
+
+.Using `Distance` with `Metrics`
+====
+[source,java]
+----
+Point point = new Point(43.7, 48.8);
+Distance distance = new Distance(200, Metrics.KILOMETERS);
+… = repository.findByLocationNear(point, distance);
+// {'location' : {'$nearSphere' : [43.7, 48.8], '$maxDistance' : 0.03135711885774796}}
+----
+====
+
+NOTE: Reactive Geo-spatial repository queries support the domain type and `GeoResult<T>` results within a reactive wrapper type. `GeoPage` and `GeoResults` are not supported as they contradict the deferred result approach with pre-calculating the average distance. However, you can still pass in a `Pageable` argument to page results yourself.
+
+Using a `Distance` with a `Metric` causes a `$nearSphere` (instead of a plain `$near`) clause to be added.
+Beyond that, the actual distance gets calculated according to the `Metrics` used.
+
+(Note that `Metric` does not refer to metric units of measure.
+It could be miles rather than kilometers.
+Rather, `metric` refers to the concept of a system of measurement, regardless of which system you use.)
+
+NOTE: Using `@GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE)` on the target property forces usage of the `$nearSphere` operator.
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    // {'geoNear' : 'location', 'near' : [x, y] }
+    GeoResults<Person> findByLocationNear(Point location);
+
+    // No metric: {'geoNear' : 'person', 'near' : [x, y], maxDistance : distance }
+    // Metric: {'geoNear' : 'person', 'near' : [x, y], 'maxDistance' : distance,
+    //          'distanceMultiplier' : metric.multiplier, 'spherical' : true }
+    GeoResults<Person> findByLocationNear(Point location, Distance distance);
+
+    // Metric: {'geoNear' : 'person', 'near' : [x, y], 'minDistance' : min,
+    //          'maxDistance' : max, 'distanceMultiplier' : metric.multiplier,
+    //          'spherical' : true }
+    GeoResults<Person> findByLocationNear(Point location, Distance min, Distance max);
+
+    // {'geoNear' : 'location', 'near' : [x, y] }
+    GeoResults<Person> findByLocationNear(Point location);
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+interface PersonRepository extends ReactiveMongoRepository<Person, String>  {
+
+    // {'geoNear' : 'location', 'near' : [x, y] }
+    Flux<GeoResult<Person>> findByLocationNear(Point location);
+
+    // No metric: {'geoNear' : 'person', 'near' : [x, y], maxDistance : distance }
+    // Metric: {'geoNear' : 'person', 'near' : [x, y], 'maxDistance' : distance,
+    //          'distanceMultiplier' : metric.multiplier, 'spherical' : true }
+    Flux<GeoResult<Person>> findByLocationNear(Point location, Distance distance);
+
+    // Metric: {'geoNear' : 'person', 'near' : [x, y], 'minDistance' : min,
+    //          'maxDistance' : max, 'distanceMultiplier' : metric.multiplier,
+    //          'spherical' : true }
+    Flux<GeoResult<Person>> findByLocationNear(Point location, Distance min, Distance max);
+
+    // {'geoNear' : 'location', 'near' : [x, y] }
+    Flux<GeoResult<Person>> findByLocationNear(Point location);
+}
+----
+======
+
+[[mongodb.repositories.queries.json-based]]
+== JSON-based Query Methods and Field Restriction
+
+By adding the `org.springframework.data.mongodb.repository.Query` annotation to your repository query methods, you can specify a MongoDB JSON query string to use instead of having the query be derived from the method name, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    @Query("{ 'firstname' : ?0 }")
+    List<Person> findByThePersonsFirstname(String firstname);
+
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface PersonRepository extends ReactiveMongoRepository<Person, String> {
+
+    @Query("{ 'firstname' : ?0 }")
+    Flux<Person> findByThePersonsFirstname(String firstname);
+
+}
+----
+======
+
+The `?0` placeholder lets you substitute the value from the method arguments into the JSON query string.
+
+NOTE: `String` parameter values are escaped during the binding process, which means that it is not possible to add MongoDB specific operators through the argument.
+
+You can also use the filter property to restrict the set of properties that is mapped into the Java object, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    @Query(value="{ 'firstname' : ?0 }", fields="{ 'firstname' : 1, 'lastname' : 1}")
+    List<Person> findByThePersonsFirstname(String firstname);
+
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface PersonRepository extends ReactiveMongoRepository<Person, String> {
+
+    @Query(value="{ 'firstname' : ?0 }", fields="{ 'firstname' : 1, 'lastname' : 1}")
+    Flux<Person> findByThePersonsFirstname(String firstname);
+
+}
+----
+======
+
+The query in the preceding example returns only the `firstname`, `lastname` and `Id` properties of the `Person` objects.
+The `age` property, a `java.lang.Integer`, is not set and its value is therefore null.
+
+[[mongodb.repositories.queries.json-spel]]
+== JSON-based Queries with SpEL Expressions
+
+Query strings and field definitions can be used together with SpEL expressions to create dynamic queries at runtime.
+SpEL expressions can provide predicate values and can be used to extend predicates with subdocuments.
+
+Expressions expose method arguments through an array that contains all the arguments.
+The following query uses `[0]`
+to declare the predicate value for `lastname` (which is equivalent to the `?0` parameter binding):
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    @Query("{'lastname': ?#{[0]} }")
+    List<Person> findByQueryWithExpression(String param0);
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface PersonRepository extends ReactiveMongoRepository<Person, String> {
+
+    @Query("{'lastname': ?#{[0]} }")
+    Flux<Person> findByQueryWithExpression(String param0);
+}
+----
+======
+
+Expressions can be used to invoke functions, evaluate conditionals, and construct values.
+SpEL expressions used in conjunction with JSON reveal a side-effect, because Map-like declarations inside of SpEL read like JSON, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    @Query("{'id': ?#{ [0] ? {$exists :true} : [1] }}")
+    List<Person> findByQueryWithExpressionAndNestedObject(boolean param0, String param1);
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface PersonRepository extends ReactiveMongoRepository<Person, String> {
+
+    @Query("{'id': ?#{ [0] ? {$exists :true} : [1] }}")
+    Flux<Person> findByQueryWithExpressionAndNestedObject(boolean param0, String param1);
+}
+----
+======
+
+WARNING: SpEL in query strings can be a powerful way to enhance queries.
+However, they can also accept a broad range of unwanted arguments.
+Make sure to sanitize strings before passing them to the query to avoid creation of vulnerabilities or unwanted changes to your query.
+
+Expression support is extensible through the Query SPI: `EvaluationContextExtension` & `ReactiveEvaluationContextExtension`
+The Query SPI can contribute properties and functions and can customize the root object.
+Extensions are retrieved from the application context at the time of SpEL evaluation when the query is built.
+The following example shows how to use an evaluation context extension:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public class SampleEvaluationContextExtension extends EvaluationContextExtensionSupport {
+
+    @Override
+    public String getExtensionId() {
+        return "security";
+    }
+
+    @Override
+    public Map<String, Object> getProperties() {
+        return Collections.singletonMap("principal", SecurityContextHolder.getCurrent().getPrincipal());
+    }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public class SampleEvaluationContextExtension implements ReactiveEvaluationContextExtension {
+
+    @Override
+    public String getExtensionId() {
+        return "security";
+    }
+
+    @Override
+    public Mono<? extends EvaluationContextExtension> getExtension() {
+        return Mono.just(new EvaluationContextExtensionSupport() { ... });
+    }
+}
+----
+======
+
+NOTE: Bootstrapping `MongoRepositoryFactory` yourself is not application context-aware and requires further configuration to pick up Query SPI extensions.
+
+NOTE: Reactive query methods can make use of `org.springframework.data.spel.spi.ReactiveEvaluationContextExtension`.
+
+[[mongodb.repositories.queries.full-text]]
+== Full-text Search Queries
+
+MongoDB's full-text search feature is store-specific and, therefore, can be found on `MongoRepository` rather than on the more general `CrudRepository`.
+We need a document with a full-text index (see "`xref:mongodb/mapping/mapping.adoc#mapping-usage-indexes.text-index[Text Indexes]`" to learn how to create a full-text index).
+
+Additional methods on `MongoRepository` take `TextCriteria` as an input parameter.
+In addition to those explicit methods, it is also possible to add a `TextCriteria`-derived repository method.
+The criteria are added as an additional `AND` criteria.
+Once the entity contains a `@TextScore`-annotated property, the document's full-text score can be retrieved.
+Furthermore, the `@TextScore` annotated also makes it possible to sort by the document's score, as the following example shows:
+
+[source,java]
+----
+@Document
+class FullTextDocument {
+
+  @Id String id;
+  @TextIndexed String title;
+  @TextIndexed String content;
+  @TextScore Float score;
+}
+
+interface FullTextRepository extends Repository<FullTextDocument, String> {
+
+  // Execute a full-text search and define sorting dynamically
+  List<FullTextDocument> findAllBy(TextCriteria criteria, Sort sort);
+
+  // Paginate over a full-text search result
+  Page<FullTextDocument> findAllBy(TextCriteria criteria, Pageable pageable);
+
+  // Combine a derived query with a full-text search
+  List<FullTextDocument> findByTitleOrderByScoreDesc(String title, TextCriteria criteria);
+}
+
+
+Sort sort = Sort.by("score");
+TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingAny("spring", "data");
+List<FullTextDocument> result = repository.findAllBy(criteria, sort);
+
+criteria = TextCriteria.forDefaultLanguage().matching("film");
+Page<FullTextDocument> page = repository.findAllBy(criteria, PageRequest.of(1, 1, sort));
+List<FullTextDocument> result = repository.findByTitleOrderByScoreDesc("mongodb", criteria);
+----
+
+[[mongodb.repositories.queries.aggregation]]
+== Aggregation Methods
+
+The repository layer offers means to interact with xref:mongodb/aggregation-framework.adoc[the aggregation framework] via annotated repository query methods.
+Similar to the xref:mongodb/repositories/repositories.adoc#mongodb.repositories.queries.json-based[JSON based queries], you can define a pipeline using the `org.springframework.data.mongodb.repository.Aggregation` annotation.
+The definition may contain simple placeholders like `?0` as well as link:{springDocsUrl}/core.html#expressions[SpEL expressions] `?#{ … }`.
+
+.Aggregating Repository Method
+====
+[source,java]
+----
+public interface PersonRepository extends CrudRepository<Person, String> {
+
+  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
+  List<PersonAggregate> groupByLastnameAndFirstnames();                            <1>
+
+  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
+  List<PersonAggregate> groupByLastnameAndFirstnames(Sort sort);                   <2>
+
+  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : ?0 } } }")
+  List<PersonAggregate> groupByLastnameAnd(String property);                       <3>
+
+  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : ?0 } } }")
+  Slice<PersonAggregate> groupByLastnameAnd(String property, Pageable page);       <4>
+
+  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
+  Stream<PersonAggregate> groupByLastnameAndFirstnamesAsStream();                  <5>
+
+  @Aggregation(pipeline = {
+      "{ '$match' :  { 'lastname' :  '?0'} }",
+      "{ '$project': { _id : 0, firstname : 1, lastname : 1 } }"
+  })
+  Stream<PersonAggregate> groupByLastnameAndFirstnamesAsStream();                  <6>
+
+  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
+  SumValue sumAgeUsingValueWrapper();                                              <7>
+
+  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
+  Long sumAge();                                                                   <8>
+
+  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
+  AggregationResults<SumValue> sumAgeRaw();                                        <9>
+
+  @Aggregation("{ '$project': { '_id' : '$lastname' } }")
+  List<String> findAllLastnames();                                                 <10>
+
+  @Aggregation(pipeline = {
+		  "{ $group : { _id : '$author', books: { $push: '$title' } } }",
+		  "{ $out : 'authors' }"
+  })
+  void groupAndOutSkippingOutput();                                                <11>
+}
+----
+[source,java]
+----
+public class PersonAggregate {
+
+  private @Id String lastname;                                                     <2>
+  private List<String> names;
+
+  public PersonAggregate(String lastname, List<String> names) {
+     // ...
+  }
+
+  // Getter / Setter omitted
+}
+
+public class SumValue {
+
+  private final Long total;                                                        <6> <8>
+
+  public SumValue(Long total) {
+    // ...
+  }
+
+  // Getter omitted
+}
+
+interface PersonProjection {
+    String getFirstname();
+    String getLastname();
+}
+----
+<1> Aggregation pipeline to group first names by `lastname` in the `Person` collection returning these as `PersonAggregate`.
+<2> If `Sort` argument is present, `$sort` is appended after the declared pipeline stages so that it only affects the order of the final results after having passed all other aggregation stages.
+Therefore, the `Sort` properties are mapped against the methods return type `PersonAggregate` which turns `Sort.by("lastname")` into `{ $sort : { '_id', 1 } }` because `PersonAggregate.lastname` is annotated with `@Id`.
+<3> Replaces `?0` with the given value for `property` for a dynamic aggregation pipeline.
+<4> `$skip`, `$limit` and `$sort` can be passed on via a `Pageable` argument. Same as in <2>, the operators are appended to the pipeline definition. Methods accepting `Pageable` can return `Slice` for easier pagination.
+<5> Aggregation methods can return interface based projections wrapping the resulting `org.bson.Document` behind a proxy, exposing getters delegating to fields within the document.
+<6> Aggregation methods can return `Stream` to consume results directly from an underlying cursor. Make sure to close the stream after consuming it to release the server-side cursor by either calling `close()` or through `try-with-resources`.
+<7> Map the result of an aggregation returning a single `Document` to an instance of a desired `SumValue` target type.
+<8> Aggregations resulting in single document holding just an accumulation result like e.g. `$sum` can be extracted directly from the result `Document`.
+To gain more control, you might consider `AggregationResult` as method return type as shown in <7>.
+<9> Obtain the raw `AggregationResults` mapped to the generic target wrapper type `SumValue` or `org.bson.Document`.
+<10> Like in <6>, a single value can be directly obtained from multiple result ``Document``s.
+<11> Skips the output of the `$out` stage when return type is `void`.
+====
+
+In some scenarios, aggregations might require additional options, such as a maximum run time, additional log comments, or the permission to temporarily write data to disk.
+Use the `@Meta` annotation to set those options via `maxExecutionTimeMs`, `comment` or `allowDiskUse`.
+
+[source,java]
+----
+interface PersonRepository extends CrudRepository<Person, String> {
+
+  @Meta(allowDiskUse = true)
+  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
+  List<PersonAggregate> groupByLastnameAndFirstnames();
+}
+----
+
+Or use `@Meta` to create your own annotation as shown in the sample below.
+
+[source,java]
+----
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.METHOD })
+@Meta(allowDiskUse = true)
+@interface AllowDiskUse { }
+
+interface PersonRepository extends CrudRepository<Person, String> {
+
+  @AllowDiskUse
+  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
+  List<PersonAggregate> groupByLastnameAndFirstnames();
+}
+----
+
+[NOTE]
+====
+Simple-type single-result inspects the returned `Document` and checks for the following:
+
+. Only one entry in the document, return it.
+. Two entries, one is the `_id` value. Return the other.
+. Return for the first value assignable to the return type.
+. Throw an exception if none of the above is applicable.
+====
+
+WARNING: The `Page` return type is not supported for repository methods using `@Aggregation`. However, you can use a
+`Pageable` argument to add `$skip`, `$limit` and `$sort` to the pipeline and let the method return `Slice`.
+
+[[mongodb.repositories.queries.by-example]]
+include::../../repositories/query-by-example.adoc[leveloffset=+1]
+
+[[mongodb.repositories.queries.scroll]]
+include::{commons}@data-commons::page$repositories/scrolling.adoc[leveloffset=+1]
+
+[[mongodb.repositories.queries.sort]]
+== Sorting Results
+
+MongoDB repositories allow various approaches to define sorting order.
+Let's take a look at the following example:
+
+.Sorting Query Results
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+    List<Person> findByFirstnameSortByAgeDesc(String firstname); <1>
+
+    List<Person> findByFirstname(String firstname, Sort sort);   <2>
+
+    @Query(sort = "{ age : -1 }")
+    List<Person> findByFirstname(String firstname);              <3>
+
+    @Query(sort = "{ age : -1 }")
+    List<Person> findByLastname(String lastname, Sort sort);     <4>
+}
+----
+<1> Static sorting derived from method name. `SortByAgeDesc` results in `{ age : -1 }` for the sort parameter.
+<2> Dynamic sorting using a method argument.
+`Sort.by(DESC, "age")` creates `{ age : -1 }` for the sort parameter.
+<3> Static sorting via `Query` annotation.
+Sort parameter applied as stated in the `sort` attribute.
+<4> Default sorting via `Query` annotation combined with dynamic one via a method argument. `Sort.unsorted()`
+results in `{ age : -1 }`.
+Using `Sort.by(ASC, "age")` overrides the defaults and creates `{ age : 1 }`.
+`Sort.by
+(ASC, "firstname")` alters the default and results in `{ age : -1, firstname : 1 }`.
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface PersonRepository extends ReactiveMongoRepository<Person, String> {
+
+    Flux<Person> findByFirstnameSortByAgeDesc(String firstname);
+
+    Flux<Person> findByFirstname(String firstname, Sort sort);
+
+    @Query(sort = "{ age : -1 }")
+    Flux<Person> findByFirstname(String firstname);
+
+    @Query(sort = "{ age : -1 }")
+    Flux<Person> findByLastname(String lastname, Sort sort);
+}
+----
+======
+
+[[mongodb.repositories.index-hint]]
+== Index Hints
+
+The `@Hint` annotation allows to override MongoDB's default index selection and forces the database to use the specified index instead.
+
+.Example of index hints
+====
+[source,java]
+----
+@Hint("lastname-idx")                                          <1>
+List<Person> findByLastname(String lastname);
+
+@Query(value = "{ 'firstname' : ?0 }", hint = "firstname-idx") <2>
+List<Person> findByFirstname(String firstname);
+----
+<1> Use the index with name `lastname-idx`.
+<2> The `@Query` annotation defines the `hint` alias which is equivalent to adding the `@Hint` annotation.
+====
+
+For more information about index creation please refer to the xref:mongodb/template-collection-management.adoc[Collection Management] section.
+
+[[mongo.repositories.collation]]
+== Collation Support
+
+Next to the xref:mongodb/collation.adoc[general Collation Support] repositories allow to define the collation for various operations.
+
+====
+[source,java]
+----
+public interface PersonRepository extends MongoRepository<Person, String> {
+
+  @Query(collation = "en_US")  <1>
+  List<Person> findByFirstname(String firstname);
+
+  @Query(collation = "{ 'locale' : 'en_US' }") <2>
+  List<Person> findPersonByFirstname(String firstname);
+
+  @Query(collation = "?1") <3>
+  List<Person> findByFirstname(String firstname, Object collation);
+
+  @Query(collation = "{ 'locale' : '?1' }") <4>
+  List<Person> findByFirstname(String firstname, String collation);
+
+  List<Person> findByFirstname(String firstname, Collation collation); <5>
+
+  @Query(collation = "{ 'locale' : 'en_US' }")
+  List<Person> findByFirstname(String firstname, @Nullable Collation collation); <6>
+}
+----
+<1> Static collation definition resulting in `{ 'locale' : 'en_US' }`.
+<2> Static collation definition resulting in `{ 'locale' : 'en_US' }`.
+<3> Dynamic collation depending on 2nd method argument. Allowed types include `String` (eg. 'en_US'), `Locacle` (eg. Locacle.US)
+and `Document` (eg. new Document("locale", "en_US"))
+<4> Dynamic collation depending on 2nd method argument.
+<5> Apply the `Collation` method parameter to the query.
+<6> The `Collation` method parameter overrides the default `collation` from `@Query` if not null.
+
+NOTE: In case you enabled the automatic index creation for repository finder methods a potential static collation definition,
+as shown in (1) and (2), will be included when creating the index.
+
+TIP: The most specifc `Collation` outrules potentially defined others. Which means Method argument over query method annotation over domain type annotation.
+====
+
+To streamline usage of collation attributes throughout the codebase it is also possible to use the `@Collation` annotation, which serves as a meta annotation for the ones mentioned above.
+The same rules and locations apply, plus, direct usage of `@Collation` supersedes any collation values defined on `@Query` and other annotations.
+Which means, if a collation is declared via `@Query` and additionally via `@Collation`, then the one from `@Collation` is picked.
+
+.Using `@Collation`
+====
+[source,java]
+----
+@Collation("en_US") <1>
+class Game {
+  // ...
+}
+
+interface GameRepository extends Repository<Game, String> {
+
+  @Collation("en_GB")  <2>
+  List<Game> findByTitle(String title);
+
+  @Collation("de_AT")  <3>
+  @Query(collation="en_GB")
+  List<Game> findByDescriptionContaining(String keyword);
+}
+----
+<1> Instead of `@Document(collation=...)`.
+<2> Instead of `@Query(collation=...)`.
+<3> Favors `@Collation` over meta usage.
+====
+
+== Read Preferences
+
+The `@ReadPreference` annotation allows you to configure MongoDB's ReadPreferences.
+
+.Example of read preferences
+====
+[source,java]
+----
+
+@ReadPreference("primaryPreferred") <1>
+public interface PersonRepository extends CrudRepository<Person, String> {
+
+    @ReadPreference("secondaryPreferred") <2>
+    List<Person> findWithReadPreferenceAnnotationByLastname(String lastname);
+
+    @Query(readPreference = "nearest") <3>
+    List<Person> findWithReadPreferenceAtTagByFirstname(String firstname);
+
+    List<Person> findWithReadPreferenceAtTagByFirstname(String firstname); <4>
+----
+<1> Configure read preference for all repository operations (including inherited, non custom implementation ones) that do not have a query-level definition. Therefore, in this case the read preference mode will be `primaryPreferred`
+<2> Use the read preference mode defined in annotation `ReadPreference`, in this case secondaryPreferred
+<3> The `@Query` annotation defines the `read preference mode` alias which is equivalent to adding the `@ReadPreference` annotation.
+<4> This query will use the read preference mode defined in the repository.
+====
+
+[TIP]
+====
+The `MongoOperations` and `Query` API offer more fine grained control for `ReadPreference`.
+====
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/repositories/repositories.adoc b/src/main/antora/modules/ROOT/pages/mongodb/repositories/repositories.adoc
new file mode 100644
index 0000000000..0746a0909e
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/repositories/repositories.adoc
@@ -0,0 +1,213 @@
+[[mongo.repositories]]
+= MongoDB Repositories
+
+[[mongo-repo-intro]]
+This chapter points out the specialties for repository support for MongoDB.
+This chapter builds on the core repository support explained in xref:repositories/core-concepts.adoc[core concepts].
+You should have a sound understanding of the basic concepts explained there.
+
+[[mongo-repo-usage]]
+== Usage
+
+To access domain entities stored in a MongoDB, you can use our sophisticated repository support that eases implementation quite significantly.
+To do so, create an interface for your repository, as the following example shows:
+
+.Sample Person entity
+====
+[source,java]
+----
+public class Person {
+
+  @Id
+  private String id;
+  private String firstname;
+  private String lastname;
+  private Address address;
+
+  // … getters and setters omitted
+}
+----
+====
+
+Note that the domain type shown in the preceding example has a property named `id` of type `String`.The default serialization mechanism used in `MongoTemplate` (which backs the repository support) regards properties named `id` as the document ID.
+Currently, we support `String`, `ObjectId`, and `BigInteger` as ID types.
+Please see xref:mongodb/template-crud-operations.adoc#mongo-template.id-handling[ID mapping] for more information about on how the `id` field is handled in the mapping layer.
+
+Now that we have a domain object, we can define an interface that uses it, as follows:
+
+.Basic repository interface to persist Person entities
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface PersonRepository extends PagingAndSortingRepository<Person, String> {
+
+    // additional custom query methods go here
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface PersonRepository extends ReactiveSortingRepository<Person, String> {
+
+    // additional custom query methods go here
+}
+----
+======
+
+To start using the repository, use the `@EnableMongoRepositories` annotation.
+That annotation carries the same attributes as the namespace element.
+If no base package is configured, the infrastructure scans the package of the annotated configuration class.
+The following example shows how to configuration your application to use MongoDB repositories:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+@EnableMongoRepositories("com.acme.*.repositories")
+class ApplicationConfig extends AbstractMongoClientConfiguration {
+
+  @Override
+  protected String getDatabaseName() {
+    return "e-store";
+  }
+
+  @Override
+  protected String getMappingBasePackage() {
+    return "com.acme.*.repositories";
+  }
+}
+----
+
+Reactive::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Configuration
+@EnableReactiveMongoRepositories("com.acme.*.repositories")
+class ApplicationConfig extends AbstractReactiveMongoConfiguration {
+
+  @Override
+  protected String getDatabaseName() {
+    return "e-store";
+  }
+
+  @Override
+  protected String getMappingBasePackage() {
+    return "com.acme.*.repositories";
+  }
+}
+----
+
+NOTE: MongoDB uses two different drivers for imperative (synchronous/blocking) and reactive (non-blocking) data access. You must create a connection by using the Reactive Streams driver to provide the required infrastructure for Spring Data's Reactive MongoDB support. Consequently, you must provide a separate configuration for MongoDB's Reactive Streams driver. Note that your application operates on two different connections if you use reactive and blocking Spring Data MongoDB templates and repositories.
+====
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="third"]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans
+    https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://www.springframework.org/schema/data/mongo
+    https://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd">
+
+  <mongo:mongo-client id="mongoClient" />
+
+  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+    <constructor-arg ref="mongoClient" />
+    <constructor-arg value="databaseName" />
+  </bean>
+
+  <mongo:repositories base-package="com.acme.*.repositories" />
+
+</beans>
+----
+======
+
+This namespace element causes the base packages to be scanned for interfaces that extend `MongoRepository` and create Spring beans for each one found.
+By default, the repositories get a `MongoTemplate` Spring bean wired that is called `mongoTemplate`, so you only need to configure `mongo-template-ref` explicitly if you deviate from this convention.
+
+Because our domain repository extends `PagingAndSortingRepository`, it provides you with methods for paginated and sorted access to the entities.
+In the case of reactive repositories only `ReactiveSortingRepository` is available since the notion of a `Page` is not applicable.
+However finder methods still accept a `Sort` and `Limit` parameter.
+
+[NOTE]
+====
+The reactive space offers various reactive composition libraries. The most common libraries are https://github.com/ReactiveX/RxJava[RxJava] and https://projectreactor.io/[Project Reactor].
+
+Spring Data MongoDB is built on top of the https://mongodb.github.io/mongo-java-driver-reactivestreams/[MongoDB Reactive Streams] driver, to provide maximal interoperability by relying on the https://www.reactive-streams.org/[Reactive Streams] initiative. Static APIs, such as `ReactiveMongoOperations`, are provided by using Project Reactor's `Flux` and `Mono` types. Project Reactor offers various adapters to convert reactive wrapper types  (`Flux` to `Observable` and vice versa), but conversion can easily clutter your code.
+
+Spring Data's Reactive Repository abstraction is a dynamic API, mostly defined by you and your requirements as you declare query methods. Reactive MongoDB repositories can be implemented by using either RxJava or Project Reactor wrapper types by extending from one of the following library-specific repository interfaces:
+
+* `ReactiveCrudRepository`
+* `ReactiveSortingRepository`
+* `RxJava3CrudRepository`
+* `RxJava3SortingRepository`
+
+Spring Data converts reactive wrapper types behind the scenes so that you can stick to your favorite composition library.
+====
+
+In case you want to obtain methods for basic CRUD operations also add the `CrudRepository` interface.
+Working with the repository instance is just a matter of dependency injecting it into a client .
+Consequently, accessing the second page of `Person` objects at a page size of 10 would resemble the following code:
+
+.Paging access to Person entities
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration
+class PersonRepositoryTests {
+
+    @Autowired PersonRepository repository;
+
+    @Test
+    void readsFirstPageCorrectly() {
+
+      Page<Person> persons = repository.findAll(PageRequest.of(0, 10));
+      assertThat(persons.isFirstPage()).isTrue();
+    }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@ExtendWith(SpringExtension.class)
+@ContextConfiguration
+class PersonRepositoryTests {
+
+    @Autowired PersonRepository repository;
+
+    @Test
+    void readsFirstPageCorrectly() {
+
+        Flux<Person> persons = repository.findAll(Sort.unsorted(), Limit.of(10));
+
+        persons.as(StepVerifer::create)
+            .expectNextCount(10)
+            .verifyComplete();
+    }
+}
+----
+======
+
+The preceding example creates an application context with Spring's unit test support, which performs annotation-based dependency injection into test cases.
+Inside the test method, we use the repository to query the datastore.
+We hand the repository a `PageRequest` instance that requests the first page of `Person` objects at a page size of 10.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/repositories/vector-search.adoc b/src/main/antora/modules/ROOT/pages/mongodb/repositories/vector-search.adoc
new file mode 100644
index 0000000000..9129c80a21
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/repositories/vector-search.adoc
@@ -0,0 +1,8 @@
+:vector-search-intro-include: partial$vector-search-intro-include.adoc
+:vector-search-model-include: partial$vector-search-model-include.adoc
+:vector-search-repository-include: partial$vector-search-repository-include.adoc
+:vector-search-scoring-include: partial$vector-search-scoring-include.adoc
+:vector-search-method-derived-include: partial$vector-search-method-derived-include.adoc
+:vector-search-method-annotated-include: partial$vector-search-method-annotated-include.adoc
+
+include::partial$/vector-search.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/sharding.adoc b/src/main/antora/modules/ROOT/pages/mongodb/sharding.adoc
new file mode 100644
index 0000000000..8678dc2178
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/sharding.adoc
@@ -0,0 +1,76 @@
+[[sharding]]
+= Sharding
+
+MongoDB supports large data sets via sharding, a method for distributing data across multiple database servers.
+Please refer to the https://docs.mongodb.com/manual/sharding/[MongoDB Documentation] to learn how to set up a sharded cluster, its requirements and limitations.
+
+Spring Data MongoDB uses the `@Sharded` annotation to identify entities stored in sharded collections as shown below.
+
+====
+[source,java]
+----
+@Document("users")
+@Sharded(shardKey = { "country", "userId" }) <1>
+public class User {
+
+	@Id
+	Long id;
+
+	@Field("userid")
+	String userId;
+
+	String country;
+}
+----
+<1> The properties of the shard key get mapped to the actual field names.
+====
+
+[[sharding.sharded-collections]]
+== Sharded Collections
+
+Spring Data MongoDB does not auto set up sharding for collections nor indexes required for it.
+The snippet below shows how to do so using the MongoDB client API.
+
+====
+[source,java]
+----
+MongoDatabase adminDB = template.getMongoDbFactory()
+    .getMongoDatabase("admin");                                     <1>
+
+adminDB.runCommand(new Document("enableSharding", "db"));           <2>
+
+Document shardCmd = new Document("shardCollection", "db.users")     <3>
+	.append("key", new Document("country", 1).append("userid", 1)); <4>
+
+adminDB.runCommand(shardCmd);
+----
+<1> Sharding commands need to be run against the _admin_ database.
+<2> Enable sharding for a specific database if necessary.
+<3> Shard a collection within the database having sharding enabled.
+<4> Specify the shard key.
+This example uses range based sharding.
+====
+
+[[sharding.shard-key]]
+== Shard Key Handling
+
+The shard key consists of a single or multiple properties that must exist in every document in the target collection.
+It is used to distribute documents across shards.
+
+Adding the `@Sharded` annotation to an entity enables Spring Data MongoDB to apply best effort optimisations required for sharded scenarios.
+This means essentially adding required shard key information, if not already present, to `replaceOne` filter queries when upserting entities.
+This may require an additional server round trip to determine the actual value of the current shard key.
+
+TIP: By setting `@Sharded(immutableKey = true)` Spring Data does not attempt to check if an entity shard key was changed.
+
+Please see the https://docs.mongodb.com/manual/reference/method/db.collection.replaceOne/#upsert[MongoDB Documentation] for further details.
+The following list contains which operations are eligible for shard key auto-inclusion:
+
+* `(Reactive)CrudRepository.save(…)`
+* `(Reactive)CrudRepository.saveAll(…)`
+* `(Reactive)MongoTemplate.save(…)`
+
+
+
+
+
diff --git a/src/main/asciidoc/reference/tailable-cursors.adoc b/src/main/antora/modules/ROOT/pages/mongodb/tailable-cursors.adoc
similarity index 91%
rename from src/main/asciidoc/reference/tailable-cursors.adoc
rename to src/main/antora/modules/ROOT/pages/mongodb/tailable-cursors.adoc
index b6233df909..97433e1416 100644
--- a/src/main/asciidoc/reference/tailable-cursors.adoc
+++ b/src/main/antora/modules/ROOT/pages/mongodb/tailable-cursors.adoc
@@ -1,6 +1,6 @@
 // carry over the old bookmarks to prevent external links from failing
 [[tailable-cursors]]
-== [[mongo.reactive.repositories.infinite-streams]] Infinite Streams with Tailable Cursors
+= Tailable Cursors
 
 By default, MongoDB automatically closes a cursor when the client exhausts all results supplied by the cursor.
 Closing a cursor on exhaustion turns a stream into a finite stream. For https://docs.mongodb.com/manual/core/capped-collections/[capped collections],
@@ -14,12 +14,12 @@ reactive variant, as it is less resource-intensive. However, if you cannot use t
 concept that is already prevalent in the Spring ecosystem.
 
 [[tailable-cursors.sync]]
-=== Tailable Cursors with `MessageListener`
+== Tailable Cursors with `MessageListener`
 
 Listening to a capped collection using a Sync Driver creates a long running, blocking task that needs to be delegated to
 a separate component. In this case, we need to first create a `MessageListenerContainer`, which will be the main entry point
 for running the specific `SubscriptionRequest`. Spring Data MongoDB already ships with a default implementation that
-operates on `MongoTemplate` and is capable of creating and executing `Task` instances for a `TailableCursorRequest`.
+operates on `MongoTemplate` and is capable of creating and running `Task` instances for a `TailableCursorRequest`.
 
 The following example shows how to use tailable cursors with `MessageListener` instances:
 
@@ -49,12 +49,12 @@ container.stop();
 <3> Set the collection to listen to.
 <4> Provide an optional filter for documents to receive.
 <5> Set the message listener to publish incoming ``Message``s to.
-<6> Register the request. The returned `Subscription` can be used to check the current `Task` state and cancel its execution to free resources.
-<5> Do not forget to stop the container once you are sure you no longer need it. Doing so stops all running `Task` instances within the container.
+<6> Register the request. The returned `Subscription` can be used to check the current `Task` state and cancel it to free resources.
+<7> Do not forget to stop the container once you are sure you no longer need it. Doing so stops all running `Task` instances within the container.
 ====
 
 [[tailable-cursors.reactive]]
-=== Reactive Tailable Cursors
+== Reactive Tailable Cursors
 
 Using tailable cursors with a reactive data types allows construction of infinite streams. A tailable cursor remains open until it is closed externally. It emits data as new documents arrive in a capped collection.
 
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/template-api.adoc b/src/main/antora/modules/ROOT/pages/mongodb/template-api.adoc
new file mode 100644
index 0000000000..ece61559ec
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/template-api.adoc
@@ -0,0 +1,194 @@
+[[mongo-template]]
+= Template API
+
+The javadoc:org.springframework.data.mongodb.core.MongoTemplate[] and its javadoc:org.springframework.data.mongodb.core.ReactiveMongoTemplate[reactive] counterpart class, located in the `org.springframework.data.mongodb.core` package, is the central class of Spring's MongoDB support and provides a rich feature set for interacting with the database.
+The template offers convenience operations to create, update, delete, and query MongoDB documents and provides a mapping between your domain objects and MongoDB documents.
+
+NOTE: Once configured, `MongoTemplate` is thread-safe and can be reused across multiple instances.
+
+[[mongo-template.convenience-methods]]
+== Convenience Methods
+
+The javadoc:org.springframework.data.mongodb.core.MongoTemplate[] class implements the interface javadoc:org.springframework.data.mongodb.core.MongoOperations[].
+In as much as possible, the methods on `MongoOperations` are named after methods available on the MongoDB driver `Collection` object, to make the API familiar to existing MongoDB developers who are used to the driver API.
+For example, you can find methods such as `find`, `findAndModify`, `findAndReplace`, `findOne`, `insert`, `remove`, `save`, `update`, and `updateMulti`.
+The design goal was to make it as easy as possible to transition between the use of the base MongoDB driver and `MongoOperations`.
+A major difference between the two APIs is that `MongoOperations` can be passed domain objects instead of `Document`.
+Also, `MongoOperations` has fluent APIs for `Query`, `Criteria`, and `Update` operations instead of populating a `Document` to specify the parameters for those operations.
+
+For more information please refer to the xref:mongodb/template-crud-operations.adoc[CRUD] and xref:mongodb/template-query-operations.adoc[Query] sections of the documentation.
+
+NOTE: The preferred way to reference the operations on `MongoTemplate` instance is through its interface, `MongoOperations`.
+
+[[mongo-template.execute-callbacks]]
+== Execute Callbacks
+
+`MongoTemplate` offers many convenience methods to help you easily perform common tasks.
+However, if you need to directly access the MongoDB driver API, you can use one of several `Execute` callback methods.
+The `execute` callbacks gives you a reference to either a `MongoCollection` or a `MongoDatabase` object.
+
+* `<T> T` *execute* `(Class<?> entityClass, CollectionCallback<T> action)`: Runs the given `CollectionCallback` for the entity collection of the specified class.
+
+* `<T> T` *execute* `(String collectionName, CollectionCallback<T> action)`: Runs the given `CollectionCallback` on the collection of the given name.
+
+* `<T> T` *execute* `(DbCallback<T> action)`: Runs a DbCallback, translating any exceptions as necessary.
+Spring Data MongoDB provides support for the Aggregation Framework introduced to MongoDB in version 2.2.
+
+* `<T> T` *execute* `(String collectionName, DbCallback<T> action)`: Runs a `DbCallback` on the collection of the given name translating any exceptions as necessary.
+
+* `<T> T` *executeInSession* `(DbCallback<T> action)`: Runs the given `DbCallback` within the same connection to the database so as to ensure consistency in a write-heavy environment where you may read the data that you wrote.
+
+The following example uses the javadoc:org.springframework.data.mongodb.core.CollectionCallback[] to return information about an index:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+boolean hasIndex = template.execute("geolocation", collection ->
+    Streamable.of(collection.listIndexes(org.bson.Document.class))
+        .stream()
+        .map(document -> document.get("name"))
+        .anyMatch("location_2d"::equals)
+);
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Mono<Boolean> hasIndex = template.execute("geolocation", collection ->
+    Flux.from(collection.listIndexes(org.bson.Document.class))
+        .map(document -> document.get("name"))
+        .filterWhen(name -> Mono.just("location_2d".equals(name)))
+        .map(it -> Boolean.TRUE)
+        .single(Boolean.FALSE)
+    ).next();
+----
+======
+
+[[mongo-template.fluent-api]]
+== Fluent API
+
+Being the central component when it comes to more low-level interaction with MongoDB `MongoTemplate` offers a wide range of methods covering needs from collection creation, index creation, and CRUD operations to more advanced functionality, such as Map-Reduce and aggregations.
+You can find multiple overloads for each method.
+Most of them cover optional or nullable parts of the API.
+
+`FluentMongoOperations` provides a more narrow interface for the common methods of `MongoOperations` and provides a more readable, fluent API.
+The entry points (`insert(…)`, `find(…)`, `update(…)`, and others) follow a natural naming schema based on the operation to be run.
+Moving on from the entry point, the API is designed to offer only context-dependent methods that lead to a terminating method that invokes the actual `MongoOperations` counterpart -- the `all` method in the case of the following example:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+List<Jedi> all = template.query(SWCharacter.class) <1>
+  .inCollection("star-wars") <2>
+  .as(Jedi.class) <3>
+  .matching(query(where("jedi").is(true))) <4>
+  .all();
+----
+
+<1> The type used to map fields used in the query to.
+<2> The collection name to use if not defined on the domain type.
+<3> Result type if not using the original domain type.
+<4> The lookup query.
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Flux<Jedi> all = template.query(SWCharacter.class)
+  .inCollection("star-wars")
+  .as(Jedi.class)
+  .matching(query(where("jedi").is(true)))
+  .all();
+----
+======
+
+NOTE: Using projections allows `MongoTemplate` to optimize result mapping by limiting the actual response to fields required by the projection target type.
+This applies as long as the javadoc:org.springframework.data.mongodb.core.query.Query[] itself does not contain any field restriction and the target type is a closed interface or DTO projection.
+
+WARNING: Projections must not be applied to xref:mongodb/mapping/document-references.adoc[DBRefs].
+
+You can switch between retrieving a single entity and retrieving multiple entities as a `List` or a `Stream` through the terminating methods: `first()`, `one()`, `all()`, or `stream()`.
+
+Results can be contextually post-processed by using a `QueryResultConverter` that has access to both the raw result `Document` and the already mapped object by calling `map(...)` as outlined below.
+
+[source,java]
+====
+----
+List<Optional<Jedi>> result = template.query(Person.class)
+    .as(Jedi.class)
+    .matching(query(where("firstname").is("luke")))
+    .map((document, reader) -> Optional.of(reader.get()))
+    .all();
+----
+====
+
+When writing a geo-spatial query with `near(NearQuery)`, the number of terminating methods is altered to include only the methods that are valid for running a `geoNear` command in MongoDB (fetching entities as a `GeoResult` within `GeoResults`), as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+GeoResults<Jedi> results = template.query(SWCharacter.class)
+  .as(Jedi.class)
+  .near(alderaan) // NearQuery.near(-73.9667, 40.78).maxDis…
+  .all();
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Flux<GeoResult<Jedi>> results = template.query(SWCharacter.class)
+  .as(Jedi.class)
+  .near(alderaan) // NearQuery.near(-73.9667, 40.78).maxDis…
+  .all();
+----
+======
+
+[[mongo-template.exception-translation]]
+== Exception Translation
+
+The Spring framework provides exception translation for a wide variety of database and mapping technologies.
+This has traditionally been for JDBC and JPA.
+The Spring support for MongoDB extends this feature to the MongoDB Database by providing an implementation of the `org.springframework.dao.support.PersistenceExceptionTranslator` interface.
+
+The motivation behind mapping to Spring's link:{springDocsUrl}/data-access.html#dao-exceptions[consistent data access exception hierarchy] is that you are then able to write portable and descriptive exception handling code without resorting to coding against MongoDB error codes.
+All of Spring's data access exceptions are inherited from the root `DataAccessException` class so that you can be sure to catch all database related exception within a single try-catch block.
+Note that not all exceptions thrown by the MongoDB driver inherit from the `MongoException` class.
+The inner exception and message are preserved so that no information is lost.
+
+Some of the mappings performed by the javadoc:org.springframework.data.mongodb.core.MongoExceptionTranslator[] are `com.mongodb.Network` to `DataAccessResourceFailureException` and `MongoException` error codes 1003, 12001, 12010, 12011, and 12012 to `InvalidDataAccessApiUsageException`.
+Look into the implementation for more details on the mapping.
+
+Exception Translation can be configured by setting a customized javadoc:org.springframework.data.mongodb.core.MongoExceptionTranslator[] on your `MongoDatabaseFactory` or its reactive variant.
+You might also want to set the exception translator on the corresponding `MongoClientFactoryBean`.
+
+.Configuring `MongoExceptionTranslator`
+====
+[source,java]
+----
+ConnectionString uri = new ConnectionString("mongodb://username:password@localhost/database");
+SimpleMongoClientDatabaseFactory mongoDbFactory = new SimpleMongoClientDatabaseFactory(uri);
+mongoDbFactory.setExceptionTranslator(myCustomExceptionTranslator);
+----
+====
+
+A motivation to customize exception can be MongoDB's behavior during transactions where some failures (such as write conflicts) can become transient and where a retry could lead to a successful operation.
+In such a case, you could wrap exceptions with a specific MongoDB label and apply a different exception translation stragegy.
+
+[[mongo-template.type-mapping]]
+== Domain Type Mapping
+
+The mapping between MongoDB documents and domain classes is done by delegating to an implementation of the javadoc:org.springframework.data.mongodb.core.convert.MongoConverter[] interface.
+Spring provides javadoc:org.springframework.data.mongodb.core.convert.MappingMongoConverter[], but you can also write your own converter.
+While the `MappingMongoConverter` can use additional metadata to specify the mapping of objects to documents, it can also convert objects that contain no additional metadata by using some conventions for the mapping of IDs and collection names.
+These conventions, as well as the use of mapping annotations, are explained in the xref:mongodb/mapping/mapping.adoc[Mapping] chapter.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/template-collection-management.adoc b/src/main/antora/modules/ROOT/pages/mongodb/template-collection-management.adoc
new file mode 100644
index 0000000000..cdd20b335e
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/template-collection-management.adoc
@@ -0,0 +1,209 @@
+[[mongo-template.index-and-collections]]
+= Index and Collection Management
+
+`MongoTemplate` and `ReactiveMongoTemplate` provide methods for managing indexes and collections.
+These methods are collected into a helper interface called `IndexOperations` respectively `ReactiveIndexOperations`.
+You can access these operations by calling the `indexOps` method and passing in either the collection name or the `java.lang.Class` of your entity (the collection name is derived from the `.class`, either by name or from annotation metadata).
+
+The following listing shows the `IndexOperations` interface:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface IndexOperations {
+
+    String ensureIndex(IndexDefinition indexDefinition);
+
+    void alterIndex(String name, IndexOptions options);
+
+    void dropIndex(String name);
+
+    void dropAllIndexes();
+
+    List<IndexInfo> getIndexInfo();
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public interface ReactiveIndexOperations {
+
+    Mono<String> ensureIndex(IndexDefinition indexDefinition);
+
+    Mono<Void> alterIndex(String name, IndexOptions options);
+
+    Mono<Void> dropIndex(String name);
+
+    Mono<Void> dropAllIndexes();
+
+    Flux<IndexInfo> getIndexInfo();
+----
+======
+
+[[mongo-template.index-and-collections.index]]
+== Methods for Creating an Index
+
+You can create an index on a collection to improve query performance by using the MongoTemplate class, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+template.indexOps(Person.class)
+    .ensureIndex(new Index().on("name",Order.ASCENDING));
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Mono<String> createIndex = template.indexOps(Person.class)
+    .ensureIndex(new Index().on("name",Order.ASCENDING));
+----
+======
+
+`ensureIndex` makes sure that an index for the provided IndexDefinition exists for the collection.
+
+You can create standard, geospatial, and text indexes by using the `IndexDefinition`, `GeoSpatialIndex` and `TextIndexDefinition` classes.
+For example, given the `Venue` class defined in a previous section, you could declare a geospatial query, as the following example shows:
+
+[source,java]
+----
+template.indexOps(Venue.class)
+    .ensureIndex(new GeospatialIndex("location"));
+----
+
+NOTE: `Index` and `GeospatialIndex` support configuration of xref:mongodb/template-query-operations.adoc#mongo.query.collation[collations].
+
+[[mongo-template.index-and-collections.access]]
+== Accessing Index Information
+
+The `IndexOperations` interface has the `getIndexInfo` method that returns a list of `IndexInfo` objects.
+This list contains all the indexes defined on the collection. The following example defines an index on the `Person` class that has an `age` property:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+template.indexOps(Person.class)
+    .ensureIndex(new Index().on("age", Order.DESCENDING).unique());
+
+List<IndexInfo> indexInfoList = template.indexOps(Person.class)
+   .getIndexInfo();
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Mono<String> ageIndex = template.indexOps(Person.class)
+    .ensureIndex(new Index().on("age", Order.DESCENDING).unique());
+
+Flux<IndexInfo> indexInfo = ageIndex.then(template.indexOps(Person.class)
+   .getIndexInfo());
+----
+======
+
+[[mongo-template.index-and-collections.collection]]
+== Methods for Working with a Collection
+
+The following example shows how to create a collection:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+MongoCollection<Document> collection = null;
+if (!template.getCollectionNames().contains("MyNewCollection")) {
+    collection = mongoTemplate.createCollection("MyNewCollection");
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+MongoCollection<Document> collection = template.getCollectionNames().collectList()
+    .flatMap(collectionNames -> {
+        if(!collectionNames.contains("MyNewCollection")) {
+            return template.createCollection("MyNewCollection");
+        }
+        return template.getMongoDatabase().map(db -> db.getCollection("MyNewCollection"));
+    });
+----
+======
+
+NOTE: Collection creation allows customization with `CollectionOptions` and supports xref:mongodb/collation.adoc[collations].
+
+.Methods to interact with MongoCollections
+[%collapsible]
+====
+* *getCollectionNames*: Returns a set of collection names.
+* *collectionExists*: Checks to see if a collection with a given name exists.
+* *createCollection*: Creates an uncapped collection.
+* *dropCollection*: Drops the collection.
+* *getCollection*: Gets a collection by name, creating it if it does not exist.
+====
+
+[[time-series]]
+== Time Series
+
+MongoDB 5.0 introduced https://docs.mongodb.com/manual/core/timeseries-collections/[Time Series] collections that are optimized to efficiently store documents over time such as measurements or events.
+Those collections need to be created as such before inserting any data.
+Collections can be created by either running the `createCollection` command, defining time series collection options or extracting options from a `@TimeSeries` annotation as shown in the examples below.
+
+.Create a Time Series Collection
+====
+.Create a Time Series via the MongoDB Driver
+[source,java]
+----
+template.execute(db -> {
+
+    com.mongodb.client.model.CreateCollectionOptions options = new CreateCollectionOptions();
+    options.timeSeriesOptions(new TimeSeriesOptions("timestamp"));
+
+    db.createCollection("weather", options);
+    return "OK";
+});
+----
+
+.Create a Time Series Collection with `CollectionOptions`
+[source,java]
+----
+template.createCollection("weather", CollectionOptions.timeSeries("timestamp"));
+----
+
+.Create a Time Series Collection derived from an Annotation
+[source,java]
+----
+@TimeSeries(collection="weather", timeField = "timestamp")
+public class Measurement {
+
+    String id;
+    Instant timestamp;
+    // ...
+}
+
+template.createCollection(Measurement.class);
+----
+====
+
+The snippets above can easily be transferred to the reactive API offering the very same methods.
+Make sure to properly _subscribe_ to the returned publishers.
+
+[TIP]
+====
+You can use the `@TimeSeries#expireAfter` option to have MongoDB automatically remove expired buckets.
+The attribute allows different timeout formats like `10s`, `3h`,... as well as expression (`#{@mySpringBean.timeout}`) and property placeholder (`${my.property.timeout}`) syntax.
+====
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/template-config.adoc b/src/main/antora/modules/ROOT/pages/mongodb/template-config.adoc
new file mode 100644
index 0000000000..4d920e1c52
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/template-config.adoc
@@ -0,0 +1,167 @@
+[[mongo-template.instantiating]]
+= Configuration
+
+You can use the following configuration to create and register an instance of `MongoTemplate`, as the following example shows:
+
+.Registering a `MongoClient` object and enabling Spring's exception translation support
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Configuration
+class ApplicationConfiguration {
+
+  @Bean
+  MongoClient mongoClient() {
+      return MongoClients.create("mongodb://localhost:27017");
+  }
+
+  @Bean
+  MongoOperations mongoTemplate(MongoClient mongoClient) {
+      return new MongoTemplate(mongoClient, "geospatial");
+  }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Configuration
+class ReactiveApplicationConfiguration {
+
+  @Bean
+  MongoClient mongoClient() {
+      return MongoClients.create("mongodb://localhost:27017");
+  }
+
+  @Bean
+  ReactiveMongoOperations mongoTemplate(MongoClient mongoClient) {
+      return new ReactiveMongoTemplate(mongoClient, "geospatial");
+  }
+}
+----
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="third"]
+----
+<mongo:mongo-client host="localhost" port="27017" />
+
+<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+  <constructor-arg ref="mongoClient" />
+  <constructor-arg name="databaseName" value="geospatial" />
+</bean>
+----
+======
+
+There are several overloaded constructors of javadoc:org.springframework.data.mongodb.core.MongoTemplate[] and javadoc:org.springframework.data.mongodb.core.ReactiveMongoTemplate[]:
+
+* `MongoTemplate(MongoClient mongo, String databaseName)`: Takes the `MongoClient` object and the default database name to operate against.
+* `MongoTemplate(MongoDatabaseFactory mongoDbFactory)`: Takes a MongoDbFactory object that encapsulated the `MongoClient` object, database name, and username and password.
+* `MongoTemplate(MongoDatabaseFactory mongoDbFactory, MongoConverter mongoConverter)`: Adds a `MongoConverter` to use for mapping.
+
+Other optional properties that you might like to set when creating a `MongoTemplate` / `ReactiveMongoTemplate` are the default `WriteResultCheckingPolicy`, `WriteConcern`, `ReadPreference` and others listed below.
+
+[[mongo-template.read-preference]]
+== Default Read Preference
+
+The default read preference applied to read operations if no other preference was defined via the xref:mongodb/template-query-operations.adoc#mongo.query.read-preference[Query].
+
+[[mongo-template.writeresultchecking]]
+== WriteResultChecking Policy
+
+When in development, it is handy to either log or throw an exception if the `com.mongodb.WriteResult` returned from any MongoDB operation contains an error. It is quite common to forget to do this during development and then end up with an application that looks like it runs successfully when, in fact, the database was not modified according to your expectations. You can set the `WriteResultChecking` property of `MongoTemplate` to one of the following values: `EXCEPTION` or `NONE`, to either throw an `Exception` or do nothing, respectively. The default is to use a `WriteResultChecking` value of `NONE`.
+
+[[mongo-template.writeconcern]]
+== Default WriteConcern
+
+If it has not yet been specified through the driver at a higher level (such as `com.mongodb.client.MongoClient`), you can set the `com.mongodb.WriteConcern` property that the `MongoTemplate` uses for write operations. If the `WriteConcern` property is not set, it defaults to the one set in the MongoDB driver's DB or Collection setting.
+
+[[mongo-template.writeconcernresolver]]
+== WriteConcernResolver
+
+For more advanced cases where you want to set different `WriteConcern` values on a per-operation basis (for remove, update, insert, and save operations), a strategy interface called `WriteConcernResolver` can be configured on `MongoTemplate`. Since `MongoTemplate` is used to persist POJOs, the `WriteConcernResolver` lets you create a policy that can map a specific POJO class to a `WriteConcern` value. The following listing shows the  `WriteConcernResolver` interface:
+
+[source,java]
+----
+public interface WriteConcernResolver {
+  WriteConcern resolve(MongoAction action);
+}
+----
+
+You can use the `MongoAction` argument to determine the `WriteConcern` value or use the value of the Template itself as a default.
+`MongoAction` contains the collection name being written to, the `java.lang.Class` of the POJO, the converted `Document`, the operation (`REMOVE`, `UPDATE`, `INSERT`, `INSERT_LIST`, or `SAVE`), and a few other pieces of contextual information.
+The following example shows two sets of classes getting different `WriteConcern` settings:
+
+[source,java]
+----
+public class MyAppWriteConcernResolver implements WriteConcernResolver {
+
+  @Override
+  public WriteConcern resolve(MongoAction action) {
+    if (action.getEntityType().getSimpleName().contains("Audit")) {
+      return WriteConcern.ACKNOWLEDGED;
+    } else if (action.getEntityType().getSimpleName().contains("Metadata")) {
+      return WriteConcern.JOURNALED;
+    }
+    return action.getDefaultWriteConcern();
+  }
+}
+----
+
+[[mongo-template.entity-lifecycle-events]]
+== Publish entity lifecycle events
+
+The template publishes xref:mongodb/lifecycle-events.adoc#mongodb.mapping-usage.events[lifecycle events].
+In case there are no listeners present, this feature can be disabled.
+
+[source,java]
+----
+@Bean
+MongoOperations mongoTemplate(MongoClient mongoClient) {
+    MongoTemplate template = new MongoTemplate(mongoClient, "geospatial");
+	template.setEntityLifecycleEventsEnabled(false);
+	// ...
+}
+----
+
+[[mongo-template.entity-callbacks-config]]
+== Configure EntityCallbacks
+
+Nest to lifecycle events the template invokes xref:mongodb/lifecycle-events.adoc#mongo.entity-callbacks[EntityCallbacks] which can be (if not auto configured) set via the template API.
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+@Bean
+MongoOperations mongoTemplate(MongoClient mongoClient) {
+    MongoTemplate template = new MongoTemplate(mongoClient, "...");
+	template.setEntityCallbacks(EntityCallbacks.create(...));
+	// ...
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+@Bean
+ReactiveMongoOperations mongoTemplate(MongoClient mongoClient) {
+    ReactiveMongoTemplate template = new ReactiveMongoTemplate(mongoClient, "...");
+	template.setEntityCallbacks(ReactiveEntityCallbacks.create(...));
+	// ...
+}
+----
+======
+
+[[mongo-template.count-documents-config]]
+== Document count configuration
+
+By setting `MongoTemplate#useEstimatedCount(...)` to `true` _MongoTemplate#count(...)_ operations, that use an empty filter query, will be delegated to `estimatedCount`, as long as there is no transaction active and the template is not bound to a xref:mongodb/client-session-transactions.adoc[session].
+Please refer to the xref:mongodb/template-document-count.adoc#mongo.query.count[Counting Documents] section for more information.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/template-crud-operations.adoc b/src/main/antora/modules/ROOT/pages/mongodb/template-crud-operations.adoc
new file mode 100644
index 0000000000..491bb4ab7d
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/template-crud-operations.adoc
@@ -0,0 +1,700 @@
+[[mongo-template.save-update-remove]]
+= Saving, Updating, and Removing Documents
+
+`MongoTemplate` / `ReactiveMongoTemplatge` let you save, update, and delete your domain objects and map those objects to documents stored in MongoDB.
+The API signatures of the imperative and reactive API are mainly the same only differing in their return types.
+While the synchronous API uses `void`, single `Object` and `List` the reactive counterpart consists of `Mono<Void>`, `Mono<Object>` and `Flux`.
+
+Consider the following class:
+
+[source,java]
+----
+include::example$example/Person.java[tags=class]
+----
+
+Given the `Person` class in the preceding example, you can save, update and delete the object, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public class MongoApplication {
+
+  private static final Log log = LogFactory.getLog(MongoApplication.class);
+
+  public static void main(String[] args) {
+
+    MongoOperations template = new MongoTemplate(new SimpleMongoClientDbFactory(MongoClients.create(), "database"));
+
+    Person p = new Person("Joe", 34);
+
+    // Insert is used to initially store the object into the database.
+    template.insert(p);
+    log.info("Insert: " + p);
+
+    // Find
+    p = template.findById(p.getId(), Person.class);
+    log.info("Found: " + p);
+
+    // Update
+    template.updateFirst(query(where("name").is("Joe")), update("age", 35), Person.class);
+    p = template.findOne(query(where("name").is("Joe")), Person.class);
+    log.info("Updated: " + p);
+
+    // Delete
+    template.remove(p);
+
+    // Check that deletion worked
+    List<Person> people =  template.findAll(Person.class);
+    log.info("Number of people = : " + people.size());
+
+
+    template.dropCollection(Person.class);
+  }
+}
+----
+
+The preceding example would produce the following log output (including debug messages from `MongoTemplate`):
+
+[source]
+----
+DEBUG apping.MongoPersistentEntityIndexCreator:  80 - Analyzing class class org.spring.example.Person for index information.
+DEBUG work.data.mongodb.core.MongoTemplate: 632 - insert Document containing fields: [_class, age, name] in collection: person
+INFO               org.spring.example.MongoApp:  30 - Insert: Person [id=4ddc6e784ce5b1eba3ceaf5c, name=Joe, age=34]
+DEBUG work.data.mongodb.core.MongoTemplate:1246 - findOne using query: { "_id" : { "$oid" : "4ddc6e784ce5b1eba3ceaf5c"}} in db.collection: database.person
+INFO               org.spring.example.MongoApp:  34 - Found: Person [id=4ddc6e784ce5b1eba3ceaf5c, name=Joe, age=34]
+DEBUG work.data.mongodb.core.MongoTemplate: 778 - calling update using query: { "name" : "Joe"} and update: { "$set" : { "age" : 35}} in collection: person
+DEBUG work.data.mongodb.core.MongoTemplate:1246 - findOne using query: { "name" : "Joe"} in db.collection: database.person
+INFO               org.spring.example.MongoApp:  39 - Updated: Person [id=4ddc6e784ce5b1eba3ceaf5c, name=Joe, age=35]
+DEBUG work.data.mongodb.core.MongoTemplate: 823 - remove using query: { "id" : "4ddc6e784ce5b1eba3ceaf5c"} in collection: person
+INFO               org.spring.example.MongoApp:  46 - Number of people = : 0
+DEBUG work.data.mongodb.core.MongoTemplate: 376 - Dropped collection [database.person]
+----
+====
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+public class ReactiveMongoApplication {
+
+  private static final Logger log = LoggerFactory.getLogger(ReactiveMongoApplication.class);
+
+  public static void main(String[] args) throws Exception {
+
+    CountDownLatch latch = new CountDownLatch(1);
+
+    ReactiveMongoTemplate template = new ReactiveMongoTemplate(MongoClients.create(), "database");
+
+    template.insert(new Person("Joe", 34)).doOnNext(person -> log.info("Insert: " + person))
+      .flatMap(person -> template.findById(person.getId(), Person.class))
+      .doOnNext(person -> log.info("Found: " + person))
+      .zipWith(person -> template.updateFirst(query(where("name").is("Joe")), update("age", 35), Person.class))
+      .flatMap(tuple -> template.remove(tuple.getT1())).flatMap(deleteResult -> template.findAll(Person.class))
+      .count().doOnSuccess(count -> {
+        log.info("Number of people: " + count);
+        latch.countDown();
+      })
+
+      .subscribe();
+
+    latch.await();
+  }
+}
+----
+======
+
+`MongoConverter` caused implicit conversion between a `String` and an `ObjectId` stored in the database by recognizing (through convention) the `Id` property name.
+
+The preceding example is meant to show the use of save, update, and remove operations on `MongoTemplate` / `ReactiveMongoTemplate` and not to show complex mapping functionality.
+The query syntax used in the preceding example is explained in more detail in the section "`xref:mongodb/template-query-operations.adoc[Querying Documents]`".
+
+IMPORTANT: MongoDB requires that you have an `_id` field for all documents. Please refer to the xref:mongodb/template-crud-operations.adoc[ID handling] section for details on the special treatment of this field.
+
+IMPORTANT: MongoDB collections can contain documents that represent instances of a variety of types. Please refer to the xref:mongodb/converters-type-mapping.adoc[type mapping] for details.
+
+[[mongo-template.save-insert]]
+== Insert / Save
+
+There are several convenient methods on `MongoTemplate` for saving and inserting your objects.
+To have more fine-grained control over the conversion process, you can register Spring converters with the `MappingMongoConverter` -- for example  `Converter<Person, Document>` and `Converter<Document, Person>`.
+
+NOTE: The difference between insert and save operations is that a save operation performs an insert if the object is not already present.
+
+The simple case of using the save operation is to save a POJO.
+In this case, the collection name is determined by name (not fully qualified) of the class.
+You may also call the save operation with a specific collection name. You can use mapping metadata to override the collection in which to store the object.
+
+When inserting or saving, if the `Id` property is not set, the assumption is that its value will be auto-generated by the database.
+Consequently, for auto-generation of an `ObjectId` to succeed, the type of the `Id` property or field in your class must be a `String`, an `ObjectId`, or a `BigInteger`.
+
+The following example shows how to save a document and retrieving its contents:
+
+.Inserting and retrieving documents using the MongoTemplate
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Criteria.query;
+
+//...
+
+template.insert(new Person("Bob", 33));
+
+Person person = template.query(Person.class)
+    .matching(query(where("age").is(33)))
+    .oneValue();
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Criteria.query;
+
+//...
+
+Mono<Person> person = mongoTemplate.insert(new Person("Bob", 33))
+    .then(mongoTemplate.query(Person.class)
+        .matching(query(where("age").is(33)))
+        .one());
+----
+======
+
+The following insert and save operations are available:
+
+* `void` *save* `(Object objectToSave)`: Save the object to the default collection.
+* `void` *save* `(Object objectToSave, String collectionName)`: Save the object to the specified collection.
+
+A similar set of insert operations is also available:
+
+* `void` *insert* `(Object objectToSave)`: Insert the object to the default collection.
+* `void` *insert* `(Object objectToSave, String collectionName)`: Insert the object to the specified collection.
+
+[[mongo-template.id-handling]]
+=== How the `_id` Field is Handled in the Mapping Layer
+
+MongoDB requires that you have an `_id` field for all documents.
+If you do not provide one, the driver assigns an `ObjectId` with a generated value without considering your domain model as the server isn't aware of your identifier type.
+When you use the `MappingMongoConverter`, certain rules govern how properties from the Java class are mapped to this `_id` field:
+
+. A property or field annotated with `@Id` (`org.springframework.data.annotation.Id`) maps to the `_id` field.
+. A property or field without an annotation but named `id` maps to the `_id` field.
+
+The following outlines what type conversion, if any, is done on the property mapped to the `_id` document field when using the `MappingMongoConverter` (the default for `MongoTemplate`).
+
+. If possible, an `id` property or field declared as a `String` in the Java class is converted to and stored as an `ObjectId` by using a Spring `Converter<String, ObjectId>`. Valid conversion rules are delegated to the MongoDB Java driver. If it cannot be converted to an `ObjectId`, then the value is stored as a string in the database.
+. An `id` property or field declared as `BigInteger` in the Java class is converted to and stored as an `ObjectId` by using a Spring `Converter<BigInteger, ObjectId>`.
+
+If no field or property specified in the previous sets of rules is present in the Java class, an implicit `_id` file is generated by the driver but not mapped to a property or field of the Java class.
+
+When querying and updating, `MongoTemplate` uses the converter that corresponds to the preceding rules for saving documents so that field names and types used in your queries can match what is in your domain classes.
+
+Some environments require a customized approach to map `Id` values such as data stored in MongoDB that did not run through the Spring Data mapping layer. Documents can contain `_id` values that can be represented either as `ObjectId` or as `String`.
+Reading documents from the store back to the domain type works just fine. Querying for documents via their `id` can be cumbersome due to the implicit `ObjectId` conversion. Therefore documents cannot be retrieved that way.
+For those cases `@MongoId` provides more control over the actual id mapping attempts.
+
+.`@MongoId` mapping
+====
+[source,java]
+----
+public class PlainStringId {
+  @MongoId String id; <1>
+}
+
+public class PlainObjectId {
+  @MongoId ObjectId id; <2>
+}
+
+public class StringToObjectId {
+  @MongoId(FieldType.OBJECT_ID) String id; <3>
+}
+----
+<1> The id is treated as `String` without further conversion.
+<2> The id is treated as `ObjectId`.
+<3> The id is treated as `ObjectId` if the given `String` is a valid `ObjectId` hex, otherwise as `String`. Corresponds to `@Id` usage.
+====
+
+
+[[mongo-template.save-insert.collection]]
+=== Into Which Collection Are My Documents Saved?
+
+There are two ways to manage the collection name that is used for the documents.
+The default collection name that is used is the class name changed to start with a lower-case letter.
+So a `com.test.Person` class is stored in the `person` collection.
+You can customize this by providing a different collection name with the `@Document` annotation.
+You can also override the collection name by providing your own collection name as the last parameter for the selected `MongoTemplate` method calls.
+
+[[mongo-template.save-insert.individual]]
+=== Inserting or Saving Individual Objects
+
+The MongoDB driver supports inserting a collection of documents in a single operation.
+The following methods in the `MongoOperations` interface support this functionality:
+
+* *insert*: Inserts an object. If there is an existing document with the same `id`, an error is generated.
+* *insertAll*: Takes a `Collection` of objects as the first parameter. This method inspects each object and inserts it into the appropriate collection, based on the rules specified earlier.
+* *save*: Saves the object, overwriting any object that might have the same `id`.
+
+[[mongo-template.save-insert.batch]]
+=== Inserting Several Objects in a Batch
+
+The MongoDB driver supports inserting a collection of documents in one operation.
+The following methods in the `MongoOperations` interface support this functionality via `insert` or a dedicated `BulkOperations` interface.
+
+.Batch Insert
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+Collection<Person> inserted = template.insert(List.of(...), Person.class);
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Flux<Person> inserted = template.insert(List.of(...), Person.class);
+----
+======
+
+.Bulk Insert
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+BulkWriteResult result = template.bulkOps(BulkMode.ORDERED, Person.class)
+    .insert(List.of(...))
+    .execute();
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Mono<BulkWriteResult> result = template.bulkOps(BulkMode.ORDERED, Person.class)
+    .insert(List.of(...))
+    .execute();
+----
+======
+
+[NOTE]
+====
+Server performance of batch and bulk is identical.
+However bulk operations do not publish xref:mongodb/lifecycle-events.adoc[lifecycle events].
+====
+
+[IMPORTANT]
+====
+Any `@Version` property that has not been set prior to calling insert will be auto initialized with `1` (in case of a simple type like `int`) or `0` for wrapper types (eg. `Integer`). +
+Read more in the see xref:mongodb/template-crud-operations.adoc#mongo-template.optimistic-locking[Optimistic Locking] section.
+====
+
+[[mongodb-template-update]]
+== Update
+
+For updates, you can update the first document found by using `MongoOperation.updateFirst` or you can update all documents that were found to match the query by using the `MongoOperation.updateMulti` method or `all` on the fluent API.
+The following example shows an update of all `SAVINGS` accounts where we are adding a one-time $50.00 bonus to the balance by using the `$inc` operator:
+
+.Updating documents by using the `MongoTemplate` / `ReactiveMongoTemplate`
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import org.springframework.data.mongodb.core.query.Update;
+
+// ...
+
+UpdateResult result = template.update(Account.class)
+    .matching(where("accounts.accountType").is(Type.SAVINGS))
+    .apply(new Update().inc("accounts.$.balance", 50.00))
+    .all();
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import org.springframework.data.mongodb.core.query.Update;
+
+// ...
+
+Mono<UpdateResult> result = template.update(Account.class)
+    .matching(where("accounts.accountType").is(Type.SAVINGS))
+    .apply(new Update().inc("accounts.$.balance", 50.00))
+    .all();
+----
+======
+
+In addition to the `Query` discussed earlier, we provide the update definition by using an `Update` object.
+The `Update` class has methods that match the update modifiers available for MongoDB.
+Most methods return the `Update` object to provide a fluent style for the API.
+
+[IMPORTANT]
+====
+`@Version` properties if not included in the `Update` will be automatically incremented.
+Read more in the see xref:mongodb/template-crud-operations.adoc#mongo-template.optimistic-locking[Optimistic Locking] section.
+====
+
+[[mongodb-template-update.methods]]
+=== Methods for Running Updates for Documents
+
+* *updateFirst*: Updates the first document that matches the query document criteria with the updated document.
+* *updateMulti*: Updates all objects that match the query document criteria with the updated document.
+
+WARNING: `updateFirst` does not support ordering for MongoDB Versions below 8.0. Running one of the older versions, please use xref:mongodb/template-crud-operations.adoc#mongo-template.find-and-upsert[findAndModify] to apply `Sort`.
+
+NOTE: Index hints for the update operation can be provided via `Query.withHint(...)`.
+
+[[mongodb-template-update.update]]
+=== Methods in the `Update` Class
+
+You can use a little "'syntax sugar'" with the `Update` class, as its methods are meant to be chained together.
+Also, you can kick-start the creation of a new `Update` instance by using `public static Update update(String key, Object value)` and using static imports.
+
+The `Update` class contains the following methods:
+
+* `Update` *addToSet* `(String key, Object value)` Update using the `$addToSet` update modifier
+* `Update` *currentDate* `(String key)` Update using the `$currentDate` update modifier
+* `Update` *currentTimestamp* `(String key)` Update using the `$currentDate` update modifier with `$type` `timestamp`
+* `Update` *inc* `(String key, Number inc)` Update using the `$inc` update modifier
+* `Update` *max* `(String key, Object max)` Update using the `$max` update modifier
+* `Update` *min* `(String key, Object min)` Update using the `$min` update modifier
+* `Update` *multiply* `(String key, Number multiplier)` Update using the `$mul` update modifier
+* `Update` *pop* `(String key, Update.Position pos)` Update using the `$pop` update modifier
+* `Update` *pull* `(String key, Object value)` Update using the `$pull` update modifier
+* `Update` *pullAll* `(String key, Object[] values)` Update using the `$pullAll` update modifier
+* `Update` *push* `(String key, Object value)` Update using the `$push` update modifier
+* `Update` *pushAll* `(String key, Object[] values)` Update using the `$pushAll` update modifier
+* `Update` *rename* `(String oldName, String newName)` Update using the `$rename` update modifier
+* `Update` *set* `(String key, Object value)` Update using the `$set` update modifier
+* `Update` *setOnInsert* `(String key, Object value)` Update using the `$setOnInsert` update modifier
+* `Update` *unset* `(String key)` Update using the `$unset` update modifier
+
+Some update modifiers, such as `$push` and `$addToSet`, allow nesting of additional operators.
+
+[source,java]
+----
+// { $push : { "category" : { "$each" : [ "spring" , "data" ] } } }
+new Update().push("category").each("spring", "data")
+
+// { $push : { "key" : { "$position" : 0 , "$each" : [ "Arya" , "Arry" , "Weasel" ] } } }
+new Update().push("key").atPosition(Position.FIRST).each(Arrays.asList("Arya", "Arry", "Weasel"));
+
+// { $push : { "key" : { "$slice" : 5 , "$each" : [ "Arya" , "Arry" , "Weasel" ] } } }
+new Update().push("key").slice(5).each(Arrays.asList("Arya", "Arry", "Weasel"));
+
+// { $addToSet : { "values" : { "$each" : [ "spring" , "data" , "mongodb" ] } } }
+new Update().addToSet("values").each("spring", "data", "mongodb");
+----
+
+[[mongo-template.aggregation-update]]
+=== Aggregation Pipeline Updates
+
+Update methods exposed by `MongoOperations` and `ReactiveMongoOperations` also accept an xref:mongodb/aggregation-framework.adoc[Aggregation Pipeline] via `AggregationUpdate`.
+Using `AggregationUpdate` allows leveraging https://docs.mongodb.com/manual/reference/method/db.collection.update/#update-with-aggregation-pipeline[MongoDB 4.2 aggregations] in an update operation.
+Using aggregations in an update allows updating one or more fields by expressing multiple stages and multiple conditions with a single operation.
+
+The update can consist of the following stages:
+
+* `AggregationUpdate.set(...).toValue(...)` -> `$set : { ... }`
+* `AggregationUpdate.unset(...)` -> `$unset : [ ... ]`
+* `AggregationUpdate.replaceWith(...)` -> `$replaceWith : { ... }`
+
+.Update Aggregation
+====
+[source,java]
+----
+AggregationUpdate update = Aggregation.newUpdate()
+    .set("average").toValue(ArithmeticOperators.valueOf("tests").avg())     <1>
+    .set("grade").toValue(ConditionalOperators.switchCases(                 <2>
+        when(valueOf("average").greaterThanEqualToValue(90)).then("A"),
+        when(valueOf("average").greaterThanEqualToValue(80)).then("B"),
+        when(valueOf("average").greaterThanEqualToValue(70)).then("C"),
+        when(valueOf("average").greaterThanEqualToValue(60)).then("D"))
+        .defaultTo("F")
+    );
+
+template.update(Student.class)                                              <3>
+    .apply(update)
+    .all();                                                                 <4>
+----
+[source,javascript]
+----
+db.students.update(                                                         <3>
+   { },
+   [
+     { $set: { average : { $avg: "$tests" } } },                            <1>
+     { $set: { grade: { $switch: {                                          <2>
+                           branches: [
+                               { case: { $gte: [ "$average", 90 ] }, then: "A" },
+                               { case: { $gte: [ "$average", 80 ] }, then: "B" },
+                               { case: { $gte: [ "$average", 70 ] }, then: "C" },
+                               { case: { $gte: [ "$average", 60 ] }, then: "D" }
+                           ],
+                           default: "F"
+     } } } }
+   ],
+   { multi: true }                                                          <4>
+)
+----
+<1> The 1st `$set` stage calculates a new field _average_ based on the average of the _tests_ field.
+<2> The 2nd `$set` stage calculates a new field _grade_ based on the _average_ field calculated by the first aggregation stage.
+<3> The pipeline is run on the _students_ collection and uses `Student` for the aggregation field mapping.
+<4> Apply the update to all matching documents in the collection.
+====
+
+[[mongo-template.upserts]]
+== Upsert
+
+Related to performing an `updateFirst` operation, you can also perform an `upsert` operation, which will perform an insert if no document is found that matches the query.
+The document that is inserted is a combination of the query document and the update document.
+The following example shows how to use the `upsert` method:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+UpdateResult result = template.update(Person.class)
+  .matching(query(where("ssn").is(1111).and("firstName").is("Joe").and("Fraizer").is("Update"))
+  .apply(update("address", addr))
+  .upsert();
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+Mono<UpdateResult> result = template.update(Person.class)
+  .matching(query(where("ssn").is(1111).and("firstName").is("Joe").and("Fraizer").is("Update"))
+  .apply(update("address", addr))
+  .upsert();
+----
+======
+
+WARNING: `upsert` does not support ordering. Please use xref:mongodb/template-crud-operations.adoc#mongo-template.find-and-upsert[findAndModify] to apply `Sort`.
+
+[IMPORTANT]
+====
+`@Version` properties if not included in the `Update` will be automatically initialized.
+Read more in the see xref:mongodb/template-crud-operations.adoc#mongo-template.optimistic-locking[Optimistic Locking] section.
+====
+
+[[mongo-template.replace]]
+=== Replacing Documents in a Collection
+
+The various `replace` methods available via `MongoTemplate` allow to override the first matching Document.
+If no match is found a new one can be upserted (as outlined in the previous section) by providing `ReplaceOptions` with according configuration.
+
+====
+.Replace one
+[source,java]
+----
+Person tom = template.insert(new Person("Motte", 21)); <1>
+Query query = Query.query(Criteria.where("firstName").is(tom.getFirstName())); <2>
+tom.setFirstname("Tom"); <3>
+template.replace(query, tom, ReplaceOptions.none()); <4>
+----
+<1> Insert a new document.
+<2> The query used to identify the single document to replace.
+<3> Set up the replacement document which must hold either the same `_id` as the existing or no `_id` at all.
+<4> Run the replace operation.
+.Replace one with upsert
+[source,java]
+----
+Person tom = new Person("id-123", "Tom", 21) <1>
+Query query = Query.query(Criteria.where("firstName").is(tom.getFirstName()));
+template.replace(query, tom, ReplaceOptions.replaceOptions().upsert()); <2>
+----
+<1> The `_id` value needs to be present for upsert, otherwise MongoDB will create a new potentially with the domain type incompatible `ObjectId`.
+As MongoDB is not aware of your domain type, any `@Field(targetType)` hints are not considered and the resulting `ObjectId` might be not compatible with your domain model.
+<2> Use `upsert` to insert a new document if no match is found
+====
+
+[WARNING]
+====
+It is not possible to change the `_id` of existing documents with a replace operation.
+On `upsert` MongoDB uses 2 ways of determining the new id for the entry:
+* The `_id` is used within the query as in `{"_id" : 1234 }`
+* The `_id` is present in the replacement document.
+If no `_id` is provided in either way, MongoDB will create a new `ObjectId` for the document.
+This may lead to mapping and data lookup malfunctions if the used domain types `id` property has a different type like e.g. `Long`.
+====
+
+[[mongo-template.find-and-upsert]]
+== Find and Modify
+
+The `findAndModify(…)` method on `MongoCollection` can update a document and return either the old or newly updated document in a single operation.
+`MongoTemplate` provides four `findAndModify` overloaded methods that take `Query` and `Update` classes and converts from `Document` to your POJOs:
+
+[source,java]
+----
+<T> T findAndModify(Query query, Update update, Class<T> entityClass);
+
+<T> T findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
+
+<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
+
+<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass, String collectionName);
+----
+
+The following example inserts a few `Person` objects into the container and performs a `findAndUpdate` operation:
+
+[source,java]
+----
+template.insert(new Person("Tom", 21));
+template.insert(new Person("Dick", 22));
+template.insert(new Person("Harry", 23));
+
+Query query = new Query(Criteria.where("firstName").is("Harry"));
+Update update = new Update().inc("age", 1);
+
+Person oldValue = template.update(Person.class)
+  .matching(query)
+  .apply(update)
+  .findAndModifyValue(); // oldValue.age == 23
+
+Person newValue = template.query(Person.class)
+  .matching(query)
+  .findOneValue(); // newValye.age == 24
+
+Person newestValue = template.update(Person.class)
+  .matching(query)
+  .apply(update)
+  .withOptions(FindAndModifyOptions.options().returnNew(true)) // Now return the newly updated document when updating
+  .findAndModifyValue(); // newestValue.age == 25
+----
+
+The `FindAndModifyOptions` method lets you set the options of `returnNew`, `upsert`, and `remove`.
+An example extending from the previous code snippet follows:
+
+[source,java]
+----
+Person upserted = template.update(Person.class)
+  .matching(new Query(Criteria.where("firstName").is("Mary")))
+  .apply(update)
+  .withOptions(FindAndModifyOptions.options().upsert(true).returnNew(true))
+  .findAndModifyValue()
+----
+
+[IMPORTANT]
+====
+`@Version` properties if not included in the `Update` will be automatically incremented.
+Read more in the see xref:mongodb/template-crud-operations.adoc#mongo-template.optimistic-locking[Optimistic Locking] section.
+====
+
+[[mongo-template.find-and-replace]]
+== Find and Replace
+
+The most straight forward method of replacing an entire `Document` is via its `id` using the `save` method.
+However this might not always be feasible.
+`findAndReplace` offers an alternative that allows to identify the document to replace via a simple query.
+
+.Find and Replace Documents
+====
+[source,java]
+----
+Optional<User> result = template.update(Person.class)      <1>
+    .matching(query(where("firstame").is("Tom")))          <2>
+    .replaceWith(new Person("Dick"))
+    .withOptions(FindAndReplaceOptions.options().upsert()) <3>
+    .as(User.class)                                        <4>
+    .findAndReplace();                                     <5>
+----
+<1> Use the fluent update API with the domain type given for mapping the query and deriving the collection name or just use `MongoOperations#findAndReplace`.
+<2> The actual match query mapped against the given domain type. Provide `sort`, `fields` and `collation` settings via the query.
+<3> Additional optional hook to provide options other than the defaults, like `upsert`.
+<4> An optional projection type used for mapping the operation result. If none given the initial domain type is used.
+<5> Trigger the actual processing. Use `findAndReplaceValue` to obtain the nullable result instead of an `Optional`.
+====
+
+IMPORTANT: Please note that the replacement must not hold an `id` itself as the `id` of the existing `Document` will be
+carried over to the replacement by the store itself. Also keep in mind that `findAndReplace` will only replace the first
+document matching the query criteria depending on a potentially given sort order.
+
+[[mongo-template.delete]]
+== Delete
+
+You can use one of five overloaded methods to remove an object from the database:
+
+====
+[source,java]
+----
+template.remove(tywin, "GOT");                                              <1>
+
+template.remove(query(where("lastname").is("lannister")), "GOT");           <2>
+
+template.remove(new Query().limit(3), "GOT");                               <3>
+
+template.findAllAndRemove(query(where("lastname").is("lannister"), "GOT");  <4>
+
+template.findAllAndRemove(new Query().limit(3), "GOT");                     <5>
+----
+<1> Remove a single entity specified by its `_id` from the associated collection.
+<2> Remove all documents that match the criteria of the query from the `GOT` collection.
+<3> Remove the first three documents in the `GOT` collection. Unlike <2>, the documents to remove are identified by their `_id`, running the given query, applying `sort`, `limit`, and `skip` options first, and then removing all at once in a separate step.
+<4> Remove all documents matching the criteria of the query from the `GOT` collection. Unlike <3>, documents do not get deleted in a batch but one by one.
+<5> Remove the first three documents in the `GOT` collection. Unlike <3>, documents do not get deleted in a batch but one by one.
+====
+
+[[mongo-template.optimistic-locking]]
+== Optimistic Locking
+
+The `@Version` annotation provides syntax similar to that of JPA in the context of MongoDB and makes sure updates are only applied to documents with a matching version.
+Therefore, the actual value of the version property is added to the update query in such a way that the update does not have any effect if another operation altered the document in the meantime.
+In that case, an `OptimisticLockingFailureException` is thrown.
+The following example shows these features:
+
+====
+[source,java]
+----
+@Document
+class Person {
+
+  @Id String id;
+  String firstname;
+  String lastname;
+  @Version Long version;
+}
+
+Person daenerys = template.insert(new Person("Daenerys"));                            <1>
+
+Person tmp = template.findOne(query(where("id").is(daenerys.getId())), Person.class); <2>
+
+daenerys.setLastname("Targaryen");
+template.save(daenerys);                                                              <3>
+
+template.save(tmp); // throws OptimisticLockingFailureException                       <4>
+----
+<1> Intially insert document. `version` is set to `0`.
+<2> Load the just inserted document. `version` is still `0`.
+<3> Update the document with `version = 0`. Set the `lastname` and bump `version` to `1`.
+<4> Try to update the previously loaded document that still has `version = 0`. The operation fails with an `OptimisticLockingFailureException`, as the current `version` is `1`.
+====
+
+Only certain CRUD operations on `MongoTemplate` do consider and alter version properties. Please consult `MongoOperations` java doc for detailed information.
+
+IMPORTANT: Optimistic Locking requires to set the `WriteConcern` to `ACKNOWLEDGED`. Otherwise `OptimisticLockingFailureException` can be silently swallowed.
+
+NOTE: As of Version 2.2 `MongoOperations` also includes the `@Version` property when removing an entity from the database.
+To remove a `Document` without version check use `MongoOperations#remove(Query,...)` instead of `MongoOperations#remove(Object)`.
+
+NOTE: As of Version 2.2 repositories check for the outcome of acknowledged deletes when removing versioned entities.
+An `OptimisticLockingFailureException` is raised if a versioned entity cannot be deleted through `CrudRepository.delete(Object)`. In such case, the version was changed or the object was deleted in the meantime. Use `CrudRepository.deleteById(ID)` to bypass optimistic locking functionality and delete objects regardless of their version.
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/template-document-count.adoc b/src/main/antora/modules/ROOT/pages/mongodb/template-document-count.adoc
new file mode 100644
index 0000000000..9372662352
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/template-document-count.adoc
@@ -0,0 +1,48 @@
+[[mongo.query.count]]
+= Counting Documents
+
+The template API offers various methods to count the number of documents matching a given criteria.
+One of them outlined below.
+
+====
+[source,java]
+----
+template.query(Person.class)
+    .matching(query(where("firstname").is("luke")))
+    .count();
+----
+====
+
+In pre-3.x versions of SpringData MongoDB the count operation used MongoDBs internal collection statistics.
+With the introduction of xref:mongodb/client-session-transactions.adoc#mongo.transactions[MongoDB Transactions] this was no longer possible because statistics would not correctly reflect potential changes during a transaction requiring an aggregation-based count approach.
+So in version 2.x `MongoOperations.count()` would use the collection statistics if no transaction was in progress, and the aggregation variant if so.
+
+As of Spring Data MongoDB 3.x any `count` operation uses regardless the existence of filter criteria the aggregation-based count approach via MongoDBs `countDocuments`.
+If the application is fine with the limitations of working upon collection statistics `MongoOperations.estimatedCount()` offers an alternative.
+
+[TIP]
+====
+By setting `MongoTemplate#useEstimatedCount(...)` to `true` _MongoTemplate#count(...)_ operations, that use an empty filter query, will be delegated to `estimatedCount`, as long as there is no transaction active and the template is not bound to a xref:mongodb/client-session-transactions.adoc[session].
+It will still be possible to obtain exact numbers via `MongoTemplate#exactCount`, but may speed up things.
+====
+
+[NOTE]
+====
+MongoDBs native `countDocuments` method and the `$match` aggregation, do not support `$near` and `$nearSphere` but require `$geoWithin` along with `$center` or `$centerSphere` which does not support `$minDistance` (see https://jira.mongodb.org/browse/SERVER-37043).
+
+Therefore a given `Query` will be rewritten for `count` operations using `Reactive`-/`MongoTemplate` to bypass the issue like shown below.
+
+[source,javascript]
+----
+{ location : { $near : [-73.99171, 40.738868], $maxDistance : 1.1 } } <1>
+{ location : { $geoWithin : { $center: [ [-73.99171, 40.738868], 1.1] } } } <2>
+
+{ location : { $near : [-73.99171, 40.738868], $minDistance : 0.1, $maxDistance : 1.1 } } <3>
+{$and :[ { $nor :[ { location :{ $geoWithin :{ $center :[ [-73.99171, 40.738868 ], 0.01] } } } ]}, { location :{ $geoWithin :{ $center :[ [-73.99171, 40.738868 ], 1.1] } } } ] } <4>
+----
+<1> Count source query using `$near`.
+<2> Rewritten query now using `$geoWithin` with `$center`.
+<3> Count source query using `$near` with `$minDistance` and `$maxDistance`.
+<4> Rewritten query now a combination of `$nor` `$geowithin` critierias to work around unsupported `$minDistance`.
+====
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/template-gridfs.adoc b/src/main/antora/modules/ROOT/pages/mongodb/template-gridfs.adoc
new file mode 100644
index 0000000000..c7305b0a71
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/template-gridfs.adoc
@@ -0,0 +1,214 @@
+[[gridfs]]
+= GridFS Support
+
+MongoDB supports storing binary files inside its filesystem, GridFS.
+Spring Data MongoDB provides a javadoc:org.springframework.data.mongodb.gridfs.GridFsOperations[] and javadoc:org.springframework.data.mongodb.gridfs.ReactiveGridFsOperations[] interface as well as the corresponding implementation, `GridFsTemplate` and `ReactiveGridFsTemplate`, to let you interact with the filesystem.
+You can set up a template instance by handing it a `MongoDatabaseFactory`/`ReactiveMongoDatabaseFactory` as well as a `MongoConverter`, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+class GridFsConfiguration extends AbstractMongoClientConfiguration {
+
+  // … further configuration omitted
+
+  @Bean
+  public GridFsTemplate gridFsTemplate() {
+    return new GridFsTemplate(mongoDbFactory(), mappingMongoConverter());
+  }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+class ReactiveGridFsConfiguration extends AbstractReactiveMongoConfiguration {
+
+  // … further configuration omitted
+
+  @Bean
+  public ReactiveGridFsTemplate reactiveGridFsTemplate() {
+    return new ReactiveGridFsTemplate(reactiveMongoDbFactory(), mappingMongoConverter());
+  }
+}
+----
+
+XML::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+xsi:schemaLocation="http://www.springframework.org/schema/data/mongo
+https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
+http://www.springframework.org/schema/beans
+https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+  <mongo:db-factory id="mongoDbFactory" dbname="database" />
+  <mongo:mapping-converter id="converter" />
+
+  <bean class="org.springframework.data.mongodb.gridfs.GridFsTemplate">
+    <constructor-arg ref="mongoDbFactory" />
+    <constructor-arg ref="converter" />
+  </bean>
+
+</beans>
+----
+======
+
+The template can now be injected and used to perform storage and retrieval operations, as the following example shows:
+
+.Using GridFS to store files
+[tabs]
+======
+Imperative::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+class GridFsClient {
+
+  @Autowired
+  GridFsOperations operations;
+
+  @Test
+  public void storeFileToGridFs() {
+
+    FileMetadata metadata = new FileMetadata();
+    // populate metadata
+    Resource file = … // lookup File or Resource
+
+    operations.store(file.getInputStream(), "filename.txt", metadata);
+  }
+}
+----
+The `store(…)` operations take an `InputStream`, a filename, and (optionally) metadata information about the file to store.
+The metadata can be an arbitrary object, which will be marshaled by the `MongoConverter` configured with the `GridFsTemplate`.
+Alternatively, you can also provide a `Document`.
+====
+
+Reactive::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+class ReactiveGridFsClient {
+
+  @Autowired
+  ReactiveGridFsTemplate operations;
+
+  @Test
+  public Mono<ObjectId> storeFileToGridFs() {
+
+    FileMetadata metadata = new FileMetadata();
+    // populate metadata
+    Publisher<DataBuffer> file = … // lookup File or Resource
+
+    return operations.store(file, "filename.txt", metadata);
+  }
+}
+----
+The `store(…)` operations take an `Publisher<DataBuffer>`, a filename, and (optionally) metadata information about the file to store.
+The metadata can be an arbitrary object, which will be marshaled by the `MongoConverter` configured with the `ReactiveGridFsTemplate`.
+Alternatively, you can also provide a `Document`.
+
+The MongoDB's driver uses `AsyncInputStream` and `AsyncOutputStream` interfaces to exchange binary streams.
+Spring Data MongoDB adapts these interfaces to `Publisher<DataBuffer>`.
+Read more about `DataBuffer` in https://docs.spring.io/spring-framework/docs/{springVersion}/reference/html/core.html#databuffers[Spring's reference documentation].
+====
+======
+
+You can read files from the filesystem through either the `find(…)` or the `getResources(…)` methods.
+Let's have a look at the `find(…)` methods first.
+You can either find a single file or multiple files that match a `Query`.
+You can use the `GridFsCriteria` helper class to define queries.
+It provides static factory methods to encapsulate default metadata fields (such as `whereFilename()` and `whereContentType()`) or a custom one through `whereMetaData()`.
+The following example shows how to use the template to query for files:
+
+.Using GridFsTemplate to query for files
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+class GridFsClient {
+
+  @Autowired
+  GridFsOperations operations;
+
+  @Test
+  public void findFilesInGridFs() {
+    GridFSFindIterable result = operations.find(query(whereFilename().is("filename.txt")));
+  }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+class ReactiveGridFsClient {
+
+  @Autowired
+  ReactiveGridFsTemplate operations;
+
+  @Test
+  public Flux<GridFSFile> findFilesInGridFs() {
+    return operations.find(query(whereFilename().is("filename.txt")))
+  }
+}
+----
+======
+
+NOTE: Currently, MongoDB does not support defining sort criteria when retrieving files from GridFS. For this reason, any sort criteria defined on the `Query` instance handed into the `find(…)` method are disregarded.
+
+The other option to read files from the GridFs is to use the methods introduced by the `ResourcePatternResolver` interface.
+They allow handing an Ant path into the method and can thus retrieve files matching the given pattern.
+The following example shows how to use `GridFsTemplate` to read files:
+
+.Using GridFsTemplate to read files
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+class GridFsClient {
+
+  @Autowired
+  GridFsOperations operations;
+
+  public GridFsResources[] readFilesFromGridFs() {
+     return operations.getResources("*.txt");
+  }
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+class ReactiveGridFsClient {
+
+  @Autowired
+  ReactiveGridFsOperations operations;
+
+  public Flux<ReactiveGridFsResource> readFilesFromGridFs() {
+     return operations.getResources("*.txt");
+  }
+}
+----
+======
+
+`GridFsOperations` extends `ResourcePatternResolver` and lets the `GridFsTemplate` (for example) to be plugged into an `ApplicationContext` to read Spring Config files from MongoDB database.
+
+NOTE: By default, `GridFsTemplate` obtains `GridFSBucket` once upon the first GridFS interaction.
+After that, the template instance reuses the cached bucket.
+To use different buckets, from the same Template instance use the constructor accepting `Supplier<GridFSBucket>`.
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/template-query-operations.adoc b/src/main/antora/modules/ROOT/pages/mongodb/template-query-operations.adoc
new file mode 100644
index 0000000000..697af23a9e
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/template-query-operations.adoc
@@ -0,0 +1,945 @@
+[[mongo.query]]
+= Querying Documents
+:page-section-summary-toc: 1
+
+You can use the `Query` and `Criteria` classes to express your queries.
+They have method names that mirror the native MongoDB operator names, such as `lt`, `lte`, `is`, and others.
+The `Query` and `Criteria` classes follow a fluent API style so that you can chain together multiple method criteria and queries while having easy-to-understand code.
+To improve readability, static imports let you avoid using the 'new' keyword for creating `Query` and `Criteria` instances.
+You can also use `BasicQuery` to create `Query` instances from plain JSON Strings, as shown in the following example:
+
+.Creating a Query instance from a plain JSON String
+====
+[source,java]
+----
+BasicQuery query = new BasicQuery("{ age : { $lt : 50 }, accounts.balance : { $gt : 1000.00 }}");
+List<Person> result = mongoTemplate.find(query, Person.class);
+----
+====
+
+[[mongodb-template-query]]
+== Querying Documents in a Collection
+
+Earlier, we saw how to retrieve a single document by using the `findOne` and `findById` methods on `MongoTemplate`.
+These methods return a single domain object right way or using a reactive API a `Mono` emitting a single element.
+We can also query for a collection of documents to be returned as a list of domain objects.
+Assuming that we have a number of `Person` objects with name and age stored as documents in a collection and that each person has an embedded account document with a balance, we can now run a query using the following code:
+
+.Querying for documents using the MongoTemplate
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
+
+// ...
+
+List<Person> result = template.query(Person.class)
+  .matching(query(where("age").lt(50).and("accounts.balance").gt(1000.00d)))
+  .all();
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+import static org.springframework.data.mongodb.core.query.Criteria.where;
+import static org.springframework.data.mongodb.core.query.Query.query;
+
+// ...
+
+Flux<Person> result = template.query(Person.class)
+  .matching(query(where("age").lt(50).and("accounts.balance").gt(1000.00d)))
+  .all();
+----
+======
+
+All find methods take a `Query` object as a parameter.
+This object defines the criteria and options used to perform the query.
+The criteria are specified by using a `Criteria` object that has a static factory method named `where` to instantiate a new `Criteria` object.
+We recommend using static imports for `org.springframework.data.mongodb.core.query.Criteria.where` and `Query.query` to make the query more readable.
+
+The query should return a `List` or `Flux` of `Person` objects that meet the specified criteria.
+The rest of this section lists the methods of the `Criteria` and `Query` classes that correspond to the operators provided in MongoDB.
+Most methods return the `Criteria` object, to provide a fluent style for the API.
+
+[[mongodb-template-query.criteria]]
+.Methods of the Criteria Class
+[%collapsible]
+====
+The `Criteria` class provides the following methods, all of which correspond to operators in MongoDB:
+
+* `Criteria` *all* `(Object o)` Creates a criterion using the `$all` operator
+* `Criteria` *and* `(String key)` Adds a chained `Criteria` with the specified `key` to the current `Criteria` and returns the newly created one
+* `Criteria` *andOperator* `(Criteria... criteria)` Creates an and query using the `$and` operator for all of the provided criteria (requires MongoDB 2.0 or later)
+* `Criteria` *andOperator* `(Collection<Criteria> criteria)` Creates an and query using the `$and` operator for all of the provided criteria (requires MongoDB 2.0 or later)
+* `Criteria` *elemMatch* `(Criteria c)` Creates a criterion using the `$elemMatch` operator
+* `Criteria` *exists* `(boolean b)` Creates a criterion using the `$exists` operator
+* `Criteria` *gt* `(Object o)` Creates a criterion using the `$gt` operator
+* `Criteria` *gte* `(Object o)` Creates a criterion using the `$gte` operator
+* `Criteria` *in* `(Object... o)` Creates a criterion using the `$in` operator for a varargs argument.
+* `Criteria` *in* `(Collection<?> collection)` Creates a criterion using the `$in` operator using a collection
+* `Criteria` *is* `(Object o)` Creates a criterion using field matching (`{ key:value }`). If the specified value is a document, the order of the fields and exact equality in the document matters.
+* `Criteria` *lt* `(Object o)` Creates a criterion using the `$lt` operator
+* `Criteria` *lte* `(Object o)` Creates a criterion using the `$lte` operator
+* `Criteria` *mod* `(Number value, Number remainder)` Creates a criterion using the `$mod` operator
+* `Criteria` *ne* `(Object o)` Creates a criterion using the `$ne` operator
+* `Criteria` *nin* `(Object... o)` Creates a criterion using the `$nin` operator
+* `Criteria` *norOperator* `(Criteria... criteria)` Creates an nor query using the `$nor` operator for all of the provided criteria
+* `Criteria` *norOperator* `(Collection<Criteria> criteria)` Creates an nor query using the `$nor` operator for all of the provided criteria
+* `Criteria` *not* `()` Creates a criterion using the `$not` meta operator which affects the clause directly following
+* `Criteria` *orOperator* `(Criteria... criteria)` Creates an or query using the `$or` operator for all of the provided  criteria
+* `Criteria` *orOperator* `(Collection<Criteria> criteria)` Creates an or query using the `$or` operator for all of the provided  criteria
+* `Criteria` *regex* `(String re)` Creates a criterion using a `$regex`
+* `Criteria` *sampleRate* `(double sampleRate)` Creates a criterion using the `$sampleRate` operator
+* `Criteria` *size* `(int s)` Creates a criterion using the `$size` operator
+* `Criteria` *type* `(int t)` Creates a criterion using the `$type` operator
+* `Criteria` *matchingDocumentStructure* `(MongoJsonSchema schema)` Creates a criterion using the `$jsonSchema` operator for xref:mongodb/mapping/mapping-schema.adoc[JSON schema criteria]. `$jsonSchema` can only be applied on the top level of a query and not property specific. Use the `properties` attribute of the schema to match against nested fields.
+* `Criteria` *bits()* is the gateway to https://docs.mongodb.com/manual/reference/operator/query-bitwise/[MongoDB bitwise query operators] like `$bitsAllClear`.
+
+The Criteria class also provides the following methods for geospatial queries.
+
+* `Criteria` *within* `(Circle circle)` Creates a geospatial criterion using `$geoWithin $center` operators.
+* `Criteria` *within* `(Box box)` Creates a geospatial criterion using a `$geoWithin $box` operation.
+* `Criteria` *withinSphere* `(Circle circle)` Creates a geospatial criterion using `$geoWithin $center` operators.
+* `Criteria` *near* `(Point point)` Creates a geospatial criterion using a `$near` operation
+* `Criteria` *nearSphere* `(Point point)` Creates a geospatial criterion using `$nearSphere$center` operations. This is only available for MongoDB 1.7 and higher.
+* `Criteria` *minDistance* `(double minDistance)` Creates a geospatial criterion using the `$minDistance` operation, for use with $near.
+* `Criteria` *maxDistance* `(double maxDistance)` Creates a geospatial criterion using the `$maxDistance` operation, for use with $near.
+====
+
+The `Query` class has some additional methods that allow to select certain fields as well as to limit and sort the result.
+
+[[mongodb-template-query.query]]
+.Methods of the Query class
+[%collapsible]
+====
+* `Query` *addCriteria* `(Criteria criteria)` used to add additional criteria to the query
+* `Field` *fields* `()` used to define fields to be included in the query results
+* `Query` *limit* `(int limit)` used to limit the size of the returned results to the provided limit (used for paging)
+* `Query` *skip* `(int skip)` used to skip the provided number of documents in the results (used for paging)
+* `Query` *with* `(Sort sort)` used to provide sort definition for the results
+* `Query` *with* `(ScrollPosition position)` used to provide a scroll position (Offset- or Keyset-based pagination) to start or resume a `Scroll`
+====
+
+[[mongo-template.query.result-projection]]
+
+The template API allows direct usage of result projections that enable you to map queries against a given domain type while projecting the operation result onto another one as outlined below.
+
+[source,java]
+----
+class
+
+template.query(SWCharacter.class)
+    .as(Jedi.class)
+----
+
+For more information on result projections please refer to the xref:repositories/projections.adoc[Projections] section of the documentation.
+
+[[mongo-template.querying.field-selection]]
+== Selecting fields
+
+MongoDB supports https://docs.mongodb.com/manual/tutorial/project-fields-from-query-results/[projecting fields] returned by a query.
+A projection can include and exclude fields (the `_id` field is always included unless explicitly excluded) based on their name.
+
+.Selecting result fields
+====
+[source,java]
+----
+public class Person {
+
+    @Id String id;
+    String firstname;
+
+    @Field("last_name")
+    String lastname;
+
+    Address address;
+}
+
+query.fields().include("lastname");              <1>
+
+query.fields().exclude("id").include("lastname") <2>
+
+query.fields().include("address")                <3>
+
+query.fields().include("address.city")           <4>
+----
+<1> Result will contain both `_id` and `last_name` via `{ "last_name" : 1 }`.
+<2> Result will only contain the `last_name` via `{ "_id" : 0, "last_name" : 1 }`.
+<3> Result will contain the `_id` and entire `address` object via `{ "address" : 1 }`.
+<4> Result will contain the `_id` and and `address` object that only contains the `city` field via `{ "address.city" : 1 }`.
+====
+
+Starting with MongoDB 4.4 you can use aggregation expressions for field projections as shown below:
+
+.Computing result fields using expressions
+====
+[source,java]
+----
+query.fields()
+  .project(MongoExpression.create("'$toUpper' : '$last_name'"))         <1>
+  .as("last_name");                                                     <2>
+
+query.fields()
+  .project(StringOperators.valueOf("lastname").toUpper())               <3>
+  .as("last_name");
+
+query.fields()
+  .project(AggregationSpELExpression.expressionOf("toUpper(lastname)")) <4>
+  .as("last_name");
+----
+<1> Use a native expression. The used field name must refer to field names within the database document.
+<2> Assign the field name to which the expression result is projected. The resulting field name is not mapped against the domain model.
+<3> Use an `AggregationExpression`. Other than native `MongoExpression`, field names are mapped to the ones used in the domain model.
+<4> Use SpEL along with an `AggregationExpression` to invoke expression functions. Field names are mapped to the ones used in the domain model.
+====
+
+`@Query(fields="…")` allows usage of expression field projections at `Repository` level as described in xref:mongodb/repositories/repositories.adoc#mongodb.repositories.queries.json-based[MongoDB JSON-based Query Methods and Field Restriction].
+
+[[mongo.query.additional-query-options]]
+== Additional Query Options
+
+MongoDB offers various ways of applying meta information, like a comment or a batch size, to a query.Using the `Query` API
+directly there are several methods for those options.
+
+[[mongo.query.hints]]
+=== Hints
+
+Index hints can be applied in two ways, using the index name or its field definition.
+
+====
+[source,java]
+----
+template.query(Person.class)
+    .matching(query("...").withHint("index-to-use"));
+
+template.query(Person.class)
+    .matching(query("...").withHint("{ firstname : 1 }"));
+----
+====
+
+[[mongo.query.cursor-size]]
+=== Cursor Batch Size
+
+The cursor batch size defines the number of documents to return in each response batch.
+====
+[source,java]
+----
+Query query = query(where("firstname").is("luke"))
+    .cursorBatchSize(100)
+----
+====
+
+[[mongo.query.collation]]
+=== Collations
+
+Using collations with collection operations is a matter of specifying a `Collation` instance in your query or operation options, as the following two examples show:
+
+====
+[source,java]
+----
+Collation collation = Collation.of("de");
+
+Query query = new Query(Criteria.where("firstName").is("Amél"))
+    .collation(collation);
+
+List<Person> results = template.find(query, Person.class);
+----
+====
+
+[[mongo.query.read-preference]]
+=== Read Preference
+
+The `ReadPreference` to use can be set directly on the `Query` object to be run as outlined below.
+
+====
+[source,java]
+----
+template.find(Person.class)
+    .matching(query(where(...)).withReadPreference(ReadPreference.secondary()))
+    .all();
+----
+====
+
+NOTE: The preference set on the `Query` instance will supersede the default `ReadPreference` of `MongoTemplate`.
+
+[[mongo.query.comment]]
+=== Comments
+
+Queries can be equipped with comments which makes them easier to look up in server logs.
+
+====
+[source,java]
+----
+template.find(Person.class)
+    .matching(query(where(...)).comment("Use the force luke!"))
+    .all();
+----
+====
+
+[[mongo-template.query.distinct]]
+== Query Distinct Values
+
+MongoDB provides an operation to obtain distinct values for a single field by using a query from the resulting documents.
+Resulting values are not required to have the same data type, nor is the feature limited to simple types.
+For retrieval, the actual result type does matter for the sake of conversion and typing. The following example shows how to query for distinct values:
+
+.Retrieving distinct values
+====
+[source,java]
+----
+template.query(Person.class)  <1>
+  .distinct("lastname")       <2>
+  .all();                     <3>
+----
+<1> Query the `Person` collection.
+<2> Select distinct  values of the `lastname` field. The field name is mapped according to the domain types property declaration, taking potential `@Field` annotations into account.
+<3> Retrieve all distinct values as a `List` of `Object` (due to no explicit result type being specified).
+====
+
+Retrieving distinct values into a `Collection` of `Object` is the most flexible way, as it tries to determine the property value of the domain type and convert results to the desired type or mapping `Document` structures.
+
+Sometimes, when all values of the desired field are fixed to a certain type, it is more convenient to directly obtain a correctly typed `Collection`, as shown in the following example:
+
+.Retrieving strongly typed distinct values
+====
+[source,java]
+----
+template.query(Person.class)  <1>
+  .distinct("lastname")       <2>
+  .as(String.class)           <3>
+  .all();                     <4>
+----
+<1> Query the collection of `Person`.
+<2> Select distinct values of the `lastname` field. The fieldname is mapped according to the domain types property declaration, taking potential `@Field` annotations into account.
+<3> Retrieved values are converted into the desired target type -- in this case, `String`. It is also possible to map the values to a more complex type if the stored field contains a document.
+<4> Retrieve all distinct values as a `List` of `String`. If the type cannot be converted into the desired target type, this method throws a `DataAccessException`.
+====
+
+[[mongo.geospatial]]
++= GeoSpatial Queries
+
+MongoDB supports GeoSpatial queries through the use of operators such as `$near`, `$within`, `geoWithin`, and `$nearSphere`. Methods specific to geospatial queries are available on the `Criteria` class. There are also a few shape classes (`Box`, `Circle`, and `Point`) that are used in conjunction with geospatial related `Criteria` methods.
+
+NOTE: Using GeoSpatial queries requires attention when used within MongoDB transactions, see xref:mongodb/client-session-transactions.adoc#mongo.transactions.behavior[Special behavior inside transactions].
+
+To understand how to perform GeoSpatial queries, consider the following `Venue` class (taken from the integration tests and relying on the rich `MappingMongoConverter`):
+
+.Venue.java
+[%collapsible]
+====
+[source,java]
+----
+@Document(collection="newyork")
+public class Venue {
+
+  @Id
+  private String id;
+  private String name;
+  private double[] location;
+
+  @PersistenceCreator
+  Venue(String name, double[] location) {
+    super();
+    this.name = name;
+    this.location = location;
+  }
+
+  public Venue(String name, double x, double y) {
+    super();
+    this.name = name;
+    this.location = new double[] { x, y };
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public double[] getLocation() {
+    return location;
+  }
+
+  @Override
+  public String toString() {
+    return "Venue [id=" + id + ", name=" + name + ", location="
+        + Arrays.toString(location) + "]";
+  }
+}
+----
+====
+
+To find locations within a `Circle`, you can use the following query:
+
+[source,java]
+----
+Circle circle = new Circle(-73.99171, 40.738868, 0.01);
+List<Venue> venues =
+    template.find(new Query(Criteria.where("location").within(circle)), Venue.class);
+----
+
+To find venues within a `Circle` using spherical coordinates, you can use the following query:
+
+[source,java]
+----
+Circle circle = new Circle(-73.99171, 40.738868, 0.003712240453784);
+List<Venue> venues =
+    template.find(new Query(Criteria.where("location").withinSphere(circle)), Venue.class);
+----
+
+To find venues within a `Box`, you can use the following query:
+
+[source,java]
+----
+//lower-left then upper-right
+Box box = new Box(new Point(-73.99756, 40.73083), new Point(-73.988135, 40.741404));
+List<Venue> venues =
+    template.find(new Query(Criteria.where("location").within(box)), Venue.class);
+----
+
+To find venues near a `Point`, you can use the following queries:
+
+[source,java]
+----
+Point point = new Point(-73.99171, 40.738868);
+List<Venue> venues =
+    template.find(new Query(Criteria.where("location").near(point).maxDistance(0.01)), Venue.class);
+----
+
+[source,java]
+----
+Point point = new Point(-73.99171, 40.738868);
+List<Venue> venues =
+    template.find(new Query(Criteria.where("location").near(point).minDistance(0.01).maxDistance(100)), Venue.class);
+----
+
+To find venues near a `Point` using spherical coordinates, you can use the following query:
+
+[source,java]
+----
+Point point = new Point(-73.99171, 40.738868);
+List<Venue> venues =
+    template.find(new Query(
+        Criteria.where("location").nearSphere(point).maxDistance(0.003712240453784)),
+        Venue.class);
+----
+
+[[mongo.geo-near]]
+== Geo-near Queries
+
+[WARNING]
+====
+*Changed in 2.2!* +
+https://docs.mongodb.com/master/release-notes/4.2-compatibility/[MongoDB 4.2] removed support for the
+`geoNear` command which had been previously used to run the `NearQuery`.
+
+Spring Data MongoDB 2.2 `MongoOperations#geoNear` uses the `$geoNear` https://docs.mongodb.com/manual/reference/operator/aggregation/geoNear/[aggregation]
+instead of the `geoNear` command to run a `NearQuery`.
+
+The calculated distance (the `dis` when using a geoNear command) previously returned within a wrapper type now is embedded
+into the resulting document.
+If the given domain type already contains a property with that name, the calculated distance
+is named `calculated-distance` with a potentially random postfix.
+
+Target types may contain a property named after the returned distance to (additionally) read it back directly into the domain type as shown below.
+
+[source,java]
+----
+GeoResults<VenueWithDistanceField> = template.query(Venue.class) <1>
+    .as(VenueWithDistanceField.class)                            <2>
+    .near(NearQuery.near(new GeoJsonPoint(-73.99, 40.73), KILOMETERS))
+    .all();
+----
+<1> Domain type used to identify the target collection and potential query mapping.
+<2> Target type containing a `dis` field of type `Number`.
+====
+
+MongoDB supports querying the database for geo locations and calculating the distance from a given origin at the same time. With geo-near queries, you can express queries such as "find all restaurants in the surrounding 10 miles". To let you do so, `MongoOperations` provides `geoNear(…)` methods that take a `NearQuery` as an argument (as well as the already familiar entity type and collection), as shown in the following example:
+
+[source,java]
+----
+Point location = new Point(-73.99171, 40.738868);
+NearQuery query = NearQuery.near(location).maxDistance(new Distance(10, Metrics.MILES));
+
+GeoResults<Restaurant> = operations.geoNear(query, Restaurant.class);
+----
+
+We use the `NearQuery` builder API to set up a query to return all `Restaurant` instances surrounding the given `Point` out to 10 miles.
+The `Metrics` enum used here actually implements an interface so that other metrics could be plugged into a distance as well.
+A `Metric` is backed by a multiplier to transform the distance value of the given metric into native distances.
+The sample shown here would consider the 10 to be miles. Using one of the built-in metrics (miles and kilometers) automatically triggers the spherical flag to be set on the query.
+If you want to avoid that, pass plain `double` values into `maxDistance(…)`.
+For more information, see the Javadoc of javadoc:org.springframework.data.mongodb.core.query.NearQuery[] and `Distance`.
+
+The geo-near operations return a `GeoResults` wrapper object that encapsulates `GeoResult` instances.
+Wrapping `GeoResults` allows accessing the average distance of all results.
+A single `GeoResult` object carries the entity found plus its distance from the origin.
+
+[[mongo.geo-json]]
+== GeoJSON Support
+
+MongoDB supports https://geojson.org/[GeoJSON] and simple (legacy) coordinate pairs for geospatial data. Those formats can both be used for storing as well as querying data. See the https://docs.mongodb.org/manual/core/2dsphere/#geospatial-indexes-store-geojson/[MongoDB manual on GeoJSON support] to learn about requirements and restrictions.
+
+[[mongo.geo-json.domain.classes]]
+== GeoJSON Types in Domain Classes
+
+Usage of https://geojson.org/[GeoJSON] types in domain classes is straightforward. The `org.springframework.data.mongodb.core.geo` package contains types such as `GeoJsonPoint`, `GeoJsonPolygon`, and others. These types are extend the existing `org.springframework.data.geo` types. The following example uses a javadoc:org.springframework.data.mongodb.core.geo.GeoJsonPoint[]:
+
+====
+[source,java]
+----
+public class Store {
+
+	String id;
+
+	/**
+	 * { "type" : "Point", "coordinates" : [ x, y ] }
+	 */
+	GeoJsonPoint location;
+}
+----
+====
+
+[TIP]
+====
+If the `coordinates` of a GeoJSON object represent _latitude_ and _longitude_ pairs, the _longitude_ goes first followed by _latitude_. +
+`GeoJsonPoint` therefore treats `getX()` as _longitude_ and `getY()` as _latitude_.
+====
+
+[[mongo.geo-json.query-methods]]
+== GeoJSON Types in Repository Query Methods
+
+Using GeoJSON types as repository query parameters forces usage of the `$geometry` operator when creating the query, as the following example shows:
+
+====
+[source,java]
+----
+public interface StoreRepository extends CrudRepository<Store, String> {
+
+	List<Store> findByLocationWithin(Polygon polygon);  <1>
+
+}
+
+/*
+ * {
+ *   "location": {
+ *     "$geoWithin": {
+ *       "$geometry": {
+ *         "type": "Polygon",
+ *         "coordinates": [
+ *           [
+ *             [-73.992514,40.758934],
+ *             [-73.961138,40.760348],
+ *             [-73.991658,40.730006],
+ *             [-73.992514,40.758934]
+ *           ]
+ *         ]
+ *       }
+ *     }
+ *   }
+ * }
+ */
+repo.findByLocationWithin(                              <2>
+  new GeoJsonPolygon(
+    new Point(-73.992514, 40.758934),
+    new Point(-73.961138, 40.760348),
+    new Point(-73.991658, 40.730006),
+    new Point(-73.992514, 40.758934)));                 <3>
+
+/*
+ * {
+ *   "location" : {
+ *     "$geoWithin" : {
+ *        "$polygon" : [ [-73.992514,40.758934] , [-73.961138,40.760348] , [-73.991658,40.730006] ]
+ *     }
+ *   }
+ * }
+ */
+repo.findByLocationWithin(                              <4>
+  new Polygon(
+    new Point(-73.992514, 40.758934),
+    new Point(-73.961138, 40.760348),
+    new Point(-73.991658, 40.730006)));
+----
+<1> Repository method definition using the commons type allows calling it with both the GeoJSON and the legacy format.
+<2> Use GeoJSON type to make use of `$geometry` operator.
+<3> Note that GeoJSON polygons need to define a closed ring.
+<4> Use the legacy format `$polygon` operator.
+====
+
+[[mongo.geo-json.metrics]]
+== Metrics and Distance calculation
+
+Then MongoDB `$geoNear` operator allows usage of a GeoJSON Point or legacy coordinate pairs.
+
+====
+[source,java]
+----
+NearQuery.near(new Point(-73.99171, 40.738868))
+----
+[source,json]
+----
+{
+  "$geoNear": {
+    //...
+    "near": [-73.99171, 40.738868]
+  }
+}
+----
+====
+====
+[source,java]
+----
+NearQuery.near(new GeoJsonPoint(-73.99171, 40.738868))
+----
+[source,json]
+----
+{
+  "$geoNear": {
+    //...
+    "near": { "type": "Point", "coordinates": [-73.99171, 40.738868] }
+  }
+}
+
+----
+====
+
+Though syntactically different the server is fine accepting both no matter what format the target Document within the collection
+is using.
+
+WARNING: There is a huge difference in the distance calculation. Using the legacy format operates
+upon _Radians_ on an Earth like sphere, whereas the GeoJSON format uses _Meters_.
+
+To avoid a serious headache make sure to set the `Metric` to the desired unit of measure which ensures the
+distance to be calculated correctly.
+
+In other words:
+
+====
+Assume you've got 5 Documents like the ones below:
+[source,json]
+----
+{
+    "_id" : ObjectId("5c10f3735d38908db52796a5"),
+    "name" : "Penn Station",
+    "location" : { "type" : "Point", "coordinates" : [  -73.99408, 40.75057 ] }
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796a6"),
+    "name" : "10gen Office",
+    "location" : { "type" : "Point", "coordinates" : [ -73.99171, 40.738868 ] }
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796a9"),
+    "name" : "City Bakery ",
+    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796aa"),
+    "name" : "Splash Bar",
+    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796ab"),
+    "name" : "Momofuku Milk Bar",
+    "location" : { "type" : "Point", "coordinates" : [ -73.985839, 40.731698 ] }
+}
+----
+====
+
+Fetching all Documents within a 400 Meter radius from `[-73.99171, 40.738868]` would look like this using
+GeoJSON:
+
+.GeoNear with GeoJSON
+====
+[source,json]
+----
+{
+    "$geoNear": {
+        "maxDistance": 400, <1>
+        "num": 10,
+        "near": { type: "Point", coordinates: [-73.99171, 40.738868] },
+        "spherical":true, <2>
+        "key": "location",
+        "distanceField": "distance"
+    }
+}
+----
+Returning the following 3 Documents:
+[source,json]
+----
+{
+    "_id" : ObjectId("5c10f3735d38908db52796a6"),
+    "name" : "10gen Office",
+    "location" : { "type" : "Point", "coordinates" : [ -73.99171, 40.738868 ] }
+    "distance" : 0.0 <3>
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796a9"),
+    "name" : "City Bakery ",
+    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
+    "distance" : 69.3582262492474 <3>
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796aa"),
+    "name" : "Splash Bar",
+    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
+    "distance" : 69.3582262492474 <3>
+}
+----
+<1> Maximum distance from center point in _Meters_.
+<2> GeoJSON always operates upon a sphere.
+<3> Distance from center point in _Meters_.
+====
+
+Now, when using legacy coordinate pairs one operates upon _Radians_ as discussed before. So we use `Metrics#KILOMETERS
+when constructing the `$geoNear` command. The `Metric` makes sure the distance multiplier is set correctly.
+
+.GeoNear with Legacy Coordinate Pairs
+====
+[source,json]
+----
+{
+    "$geoNear": {
+        "maxDistance": 0.0000627142377, <1>
+        "distanceMultiplier": 6378.137, <2>
+        "num": 10,
+        "near": [-73.99171, 40.738868],
+        "spherical":true, <3>
+        "key": "location",
+        "distanceField": "distance"
+    }
+}
+----
+Returning the 3 Documents just like the GeoJSON variant:
+[source,json]
+----
+{
+    "_id" : ObjectId("5c10f3735d38908db52796a6"),
+    "name" : "10gen Office",
+    "location" : { "type" : "Point", "coordinates" : [ -73.99171, 40.738868 ] }
+    "distance" : 0.0 <4>
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796a9"),
+    "name" : "City Bakery ",
+    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
+    "distance" : 0.0693586286032982 <4>
+}
+{
+    "_id" : ObjectId("5c10f3735d38908db52796aa"),
+    "name" : "Splash Bar",
+    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
+    "distance" : 0.0693586286032982 <4>
+}
+----
+<1> Maximum distance from center point in _Radians_.
+<2> The distance multiplier so we get _Kilometers_ as resulting distance.
+<3> Make sure we operate on a 2d_sphere index.
+<4> Distance from center point in _Kilometers_ - take it times 1000 to match _Meters_ of the GeoJSON variant.
+====
+
+[[mongo.textsearch]]
+== Full-text Search
+
+Since version 2.6 of MongoDB, you can run full-text queries by using the `$text` operator. Methods and operations specific to full-text queries are available in `TextQuery` and `TextCriteria`. When doing full text search, see the https://docs.mongodb.org/manual/reference/operator/query/text/#behavior[MongoDB reference] for its behavior and limitations.
+
+Before you can actually use full-text search, you must set up the search index correctly.
+See xref:mongodb/mapping/mapping.adoc#mapping-usage-indexes.text-index[Text Index] for more detail on how to create index structures.
+The following example shows how to set up a full-text search:
+
+[source,javascript]
+----
+db.foo.createIndex(
+{
+  title : "text",
+  content : "text"
+},
+{
+  weights : {
+              title : 3
+            }
+}
+)
+----
+
+A query searching for `coffee cake` can be defined and run as follows:
+
+.Full Text Query
+====
+[source,java]
+----
+Query query = TextQuery
+  .queryText(new TextCriteria().matchingAny("coffee", "cake"));
+
+List<Document> page = template.find(query, Document.class);
+----
+====
+
+To sort results by relevance according to the `weights` use `TextQuery.sortByScore`.
+
+.Full Text Query - Sort by Score
+====
+[source,java]
+----
+Query query = TextQuery
+  .queryText(new TextCriteria().matchingAny("coffee", "cake"))
+  .sortByScore() <1>
+  .includeScore(); <2>
+
+List<Document> page = template.find(query, Document.class);
+----
+<1> Use the score property for sorting results by relevance which triggers `.sort({'score': {'$meta': 'textScore'}})`.
+<2> Use `TextQuery.includeScore()` to include the calculated relevance in the resulting `Document`.
+====
+
+You can exclude search terms by prefixing the term with `-` or by using `notMatching`, as shown in the following example (note that the two lines have the same effect and are thus redundant):
+
+[source,java]
+----
+// search for 'coffee' and not 'cake'
+TextQuery.queryText(new TextCriteria().matching("coffee").matching("-cake"));
+TextQuery.queryText(new TextCriteria().matching("coffee").notMatching("cake"));
+----
+
+`TextCriteria.matching` takes the provided term as is.
+Therefore, you can define phrases by putting them between double quotation marks (for example, `\"coffee cake\")` or using by `TextCriteria.phrase.`
+The following example shows both ways of defining a phrase:
+
+[source,java]
+----
+// search for phrase 'coffee cake'
+TextQuery.queryText(new TextCriteria().matching("\"coffee cake\""));
+TextQuery.queryText(new TextCriteria().phrase("coffee cake"));
+----
+
+You can set flags for `$caseSensitive` and `$diacriticSensitive` by using the corresponding methods on `TextCriteria`.
+Note that these two optional flags have been introduced in MongoDB 3.2 and are not included in the query unless explicitly set.
+
+[[mongo.query-by-example]]
+== Query by Example
+
+xref:mongodb/repositories/query-methods.adoc#query-by-example[Query by Example] can be used on the Template API level run example queries.
+
+The following snipped shows how to query by example:
+
+.Typed Example Query
+[source,java]
+----
+Person probe = new Person();
+probe.lastname = "stark";
+
+Example example = Example.of(probe);
+
+Query query = new Query(new Criteria().alike(example));
+List<Person> result = template.find(query, Person.class);
+----
+
+By default `Example` is strictly typed. This means that the mapped query has an included type match, restricting it to probe assignable types.
+For example, when sticking with the default type key (`_class`), the query has restrictions such as (`_class : { $in : [ com.acme.Person] }`).
+
+By using the `UntypedExampleMatcher`, it is possible to bypass the default behavior and skip the type restriction. So, as long as field names match, nearly any domain type can be used as the probe for creating the reference, as the following example shows:
+
+.Untyped Example Query
+====
+[source, java]
+----
+
+class JustAnArbitraryClassWithMatchingFieldName {
+  @Field("lastname") String value;
+}
+
+JustAnArbitraryClassWithMatchingFieldNames probe = new JustAnArbitraryClassWithMatchingFieldNames();
+probe.value = "stark";
+
+Example example = Example.of(probe, UntypedExampleMatcher.matching());
+
+Query query = new Query(new Criteria().alike(example));
+List<Person> result = template.find(query, Person.class);
+----
+====
+
+[NOTE]
+====
+When including `null` values in the `ExampleSpec`, Spring Data Mongo uses embedded document matching instead of dot notation property matching.
+Doing so forces exact document matching for all property values and the property order in the embedded document.
+====
+
+[NOTE]
+====
+`UntypedExampleMatcher` is likely the right choice for you if you are storing different entities within a single collection or opted out of writing type hints.
+
+Also, keep in mind that using `@TypeAlias` requires eager initialization of the `MappingContext`. To do so, configure `initialEntitySet` to to ensure proper alias resolution for read operations.
+====
+
+Spring Data MongoDB provides support for different matching options:
+
+.`StringMatcher` options
+[%collapsible]
+====
+[cols="1,2", options="header"]
+|===
+| Matching
+| Logical result
+
+| `DEFAULT` (case-sensitive)
+| `{"firstname" : firstname}`
+
+| `DEFAULT` (case-insensitive)
+| `{"firstname" : { $regex: firstname, $options: 'i'}}`
+
+| `EXACT`  (case-sensitive)
+| `{"firstname" : { $regex: /^firstname$/}}`
+
+| `EXACT` (case-insensitive)
+| `{"firstname" : { $regex: /^firstname$/, $options: 'i'}}`
+
+| `STARTING`  (case-sensitive)
+| `{"firstname" : { $regex: /^firstname/}}`
+
+| `STARTING` (case-insensitive)
+| `{"firstname" : { $regex: /^firstname/, $options: 'i'}}`
+
+| `ENDING`  (case-sensitive)
+| `{"firstname" : { $regex: /firstname$/}}`
+
+| `ENDING` (case-insensitive)
+| `{"firstname" : { $regex: /firstname$/, $options: 'i'}}`
+
+| `CONTAINING`  (case-sensitive)
+| `{"firstname" : { $regex: /.\*firstname.*/}}`
+
+| `CONTAINING` (case-insensitive)
+| `{"firstname" : { $regex: /.\*firstname.*/, $options: 'i'}}`
+
+| `REGEX`  (case-sensitive)
+| `{"firstname" : { $regex: /firstname/}}`
+
+| `REGEX` (case-insensitive)
+| `{"firstname" : { $regex: /firstname/, $options: 'i'}}`
+
+|===
+====
+
+[[mongo.jsonSchema.query]]
+== Query a collection for matching JSON Schema
+
+You can use a schema to query any collection for documents that match a given structure defined by a JSON schema, as the following example shows:
+
+.Query for Documents matching a `$jsonSchema`
+====
+[source,java]
+----
+MongoJsonSchema schema = MongoJsonSchema.builder().required("firstname", "lastname").build();
+
+template.find(query(matchingDocumentStructure(schema)), Person.class);
+----
+====
+
+Please refer to the xref:mongodb/mapping/mapping-schema.adoc[JSON Schema] section to learn more about the schema support in Spring Data MongoDB.
+
+
+
diff --git a/src/main/antora/modules/ROOT/pages/mongodb/value-expressions.adoc b/src/main/antora/modules/ROOT/pages/mongodb/value-expressions.adoc
new file mode 100644
index 0000000000..6356a46265
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/mongodb/value-expressions.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$value-expressions.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/observability/conventions.adoc b/src/main/antora/modules/ROOT/pages/observability/conventions.adoc
new file mode 100644
index 0000000000..6c18493fd0
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/observability/conventions.adoc
@@ -0,0 +1,11 @@
+[[observability-conventions]]
+= Conventions
+
+Below you can find a list of all `GlobalObservationConvention` and `ObservationConvention` declared by this project.
+
+.ObservationConvention implementations
+|===
+|ObservationConvention Class Name | Applicable ObservationContext Class Name
+|`org.springframework.data.mongodb.observability.DefaultMongoHandlerObservationConvention`|`MongoHandlerContext`
+|`org.springframework.data.mongodb.observability.MongoHandlerObservationConvention`|`MongoHandlerContext`
+|===
diff --git a/src/main/antora/modules/ROOT/pages/observability/metrics.adoc b/src/main/antora/modules/ROOT/pages/observability/metrics.adoc
new file mode 100644
index 0000000000..8b5ce92a64
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/observability/metrics.adoc
@@ -0,0 +1,39 @@
+[[observability-metrics]]
+= Metrics
+
+Below you can find a list of all metrics declared by this project.
+
+[[observability-metrics-mongodb-command-observation]]
+== Mongodb Command Observation
+
+____
+Timer created around a MongoDB command execution.
+____
+
+**Metric name** `spring.data.mongodb.command`. **Type** `timer`.
+
+**Metric name** `spring.data.mongodb.command.active`. **Type** `long task timer`.
+
+IMPORTANT: KeyValues that are added after starting the Observation might be missing from the *.active metrics.
+
+IMPORTANT: Micrometer internally uses `nanoseconds` for the baseunit. However, each backend determines the actual baseunit. (i.e. Prometheus uses seconds)
+
+Fully qualified name of the enclosing class `org.springframework.data.mongodb.observability.MongoObservation`.
+
+.Low cardinality Keys
+[cols="a,a"]
+|===
+|Name | Description
+|`db.connection_string` _(required)_|MongoDB connection string.
+|`db.mongodb.collection` _(required)_|MongoDB collection name.
+|`db.name` _(required)_|MongoDB database name.
+|`db.operation` _(required)_|MongoDB command value.
+|`db.system` _(required)_|MongoDB database system.
+|`db.user` _(required)_|MongoDB user.
+|`net.peer.name` _(required)_|Name of the database host.
+|`net.peer.port` _(required)_|Logical remote port number.
+|`net.sock.peer.addr` _(required)_|Mongo peer address.
+|`net.sock.peer.port` _(required)_|Mongo peer port.
+|`net.transport` _(required)_|Network transport.
+|`spring.data.mongodb.cluster_id` _(required)_|MongoDB cluster identifier.
+|===
diff --git a/src/main/antora/modules/ROOT/pages/observability/observability.adoc b/src/main/antora/modules/ROOT/pages/observability/observability.adoc
new file mode 100644
index 0000000000..8a9b0a1eeb
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/observability/observability.adoc
@@ -0,0 +1,42 @@
+:root-target: ../../../../target/
+
+[[mongodb.observability]]
+= Observability
+
+Spring Data MongoDB currently has the most up-to-date code to support Observability in your MongoDB application.
+These changes, however, haven't been picked up by Spring Boot (yet).
+Until those changes are applied, if you wish to use Spring Data MongoDB's flavor of Observability, you must carry out the following steps.
+
+. First of all, you must opt into Spring Data MongoDB's configuration settings by customizing `MongoClientSettings` through either your `@SpringBootApplication` class or one of your configuration classes.
++
+.Registering MongoDB Micrometer customizer setup
+====
+[source,java]
+----
+@Bean
+MongoClientSettingsBuilderCustomizer mongoMetricsSynchronousContextProvider(ObservationRegistry registry) {
+    return (clientSettingsBuilder) -> {
+        clientSettingsBuilder.contextProvider(ContextProviderFactory.create(registry))
+                             .addCommandListener(new MongoObservationCommandListener(registry));
+    };
+}
+----
+====
++
+. Your project must include *Spring Boot Actuator*.
+. Disable Spring Boot's autoconfigured MongoDB command listener and enable tracing manually by adding the following properties to your `application.properties`
++
+.Custom settings to apply
+====
+[source]
+----
+# Disable Spring Boot's autoconfigured tracing
+management.metrics.mongo.command.enabled=false
+# Enable it manually
+management.tracing.enabled=true
+----
+Be sure to add any other relevant settings needed to configure the tracer you are using based upon Micrometer's reference documentation.
+====
+
+This should do it! You are now running with Spring Data MongoDB's usage of Spring Observability's `Observation` API.
+See also https://opentelemetry.io/docs/reference/specification/trace/semantic_conventions/database/#mongodb[OpenTelemetry Semantic Conventions] for further reference.
diff --git a/src/main/antora/modules/ROOT/pages/observability/spans.adoc b/src/main/antora/modules/ROOT/pages/observability/spans.adoc
new file mode 100644
index 0000000000..8e79d33a86
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/observability/spans.adoc
@@ -0,0 +1,30 @@
+[[observability-spans]]
+= Spans
+
+Below you can find a list of all spans declared by this project.
+
+[[observability-spans-mongodb-command-observation]]
+== Mongodb Command Observation Span
+
+> Timer created around a MongoDB command execution.
+
+**Span name** `spring.data.mongodb.command`.
+
+Fully qualified name of the enclosing class `org.springframework.data.mongodb.observability.MongoObservation`.
+
+.Tag Keys
+|===
+|Name | Description
+|`db.connection_string` _(required)_|MongoDB connection string.
+|`db.mongodb.collection` _(required)_|MongoDB collection name.
+|`db.name` _(required)_|MongoDB database name.
+|`db.operation` _(required)_|MongoDB command value.
+|`db.system` _(required)_|MongoDB database system.
+|`db.user` _(required)_|MongoDB user.
+|`net.peer.name` _(required)_|Name of the database host.
+|`net.peer.port` _(required)_|Logical remote port number.
+|`net.sock.peer.addr` _(required)_|Mongo peer address.
+|`net.sock.peer.port` _(required)_|Mongo peer port.
+|`net.transport` _(required)_|Network transport.
+|`spring.data.mongodb.cluster_id` _(required)_|MongoDB cluster identifier.
+|===
diff --git a/src/main/antora/modules/ROOT/pages/preface.adoc b/src/main/antora/modules/ROOT/pages/preface.adoc
new file mode 100644
index 0000000000..d52509c81e
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/preface.adoc
@@ -0,0 +1,105 @@
+[[requirements]]
+= Requirements
+
+The Spring Data MongoDB 4.x binaries require JDK level 17 and above and https://spring.io/docs[Spring Framework] {springVersion} and above.
+
+In terms of database and driver, you need at least version 4.x of https://www.mongodb.org/[MongoDB] and a compatible MongoDB Java Driver (5.2.x).
+
+[[compatibility.matrix]]
+== Compatibility Matrix
+
+The following compatibility matrix summarizes Spring Data versions to MongoDB driver/database versions.
+Database versions show server generations that pass the Spring Data test suite.
+You can use newer server versions unless your application uses functionality that is affected by xref:preface.adoc#compatibility.changes[changes in the MongoDB server].
+See also the https://www.mongodb.com/docs/drivers/java/sync/current/compatibility/[official MongoDB driver compatibility matrix] for driver- and server version compatibility.
+
+====
+[cols="h,m,m,m", options="header"]
+|===
+
+|Spring Data Release Train
+|Spring Data MongoDB
+|Driver Version
+|Database Versions
+
+|2025.0
+|4.5.x
+|5.3.x
+|6.x to 8.x
+
+|2024.1
+|4.4.x
+|5.2.x
+|4.4.x to 8.x
+
+|2024.0
+|4.3.x
+|4.11.x & 5.x
+|4.4.x to 7.x
+
+|2023.1
+|4.2.x
+|4.9.x
+|4.4.x to 7.x
+
+|2023.0 (*)
+|4.1.x
+|4.9.x
+|4.4.x to 6.x
+
+|2022.0 (*)
+|4.0.x
+|4.7.x
+|4.4.x to 6.x
+
+|2021.2 (*)
+|3.4.x
+|4.6.x
+|4.4.x to 5.0.x
+
+|2021.1 (*)
+|3.3.x
+|4.4.x
+|4.4.x to 5.0.x
+
+|2021.0 (*)
+|3.2.x
+|4.1.x
+|4.4.x
+
+|2020.0 (*)
+|3.1.x
+|4.1.x
+|4.4.x
+
+|Neumann (*)
+|3.0.x
+|4.0.x
+|4.4.x
+
+|Moore (*)
+|2.2.x
+|3.11.x/Reactive Streams 1.12.x
+|4.2.x
+
+|Lovelace (*)
+|2.1.x
+|3.8.x/Reactive Streams 1.9.x
+|4.0.x
+
+|===
+(*) https://spring.io/projects/spring-data-mongodb#support[End of OSS Support]
+====
+
+[[compatibility.changes]]
+[[compatibility.changes-4.4]]
+=== Relevant Changes in MongoDB 4.4
+
+* Fields list must not contain text search score property when no `$text` criteria present. See also https://docs.mongodb.com/manual/reference/operator/query/text/[`$text` operator]
+* Sort must not be an empty document when running map reduce.
+
+[[compatibility.changes-4.2]]
+=== Relevant Changes in MongoDB 4.2
+
+* Removal of `geoNear` command. See also https://docs.mongodb.com/manual/release-notes/4.2-compatibility/#remove-support-for-the-geonear-command[Removal of `geoNear`]
+* Removal of `eval` command. See also https://docs.mongodb.com/manual/release-notes/4.2-compatibility/#remove-support-for-the-eval-command[Removal of `eval`]
diff --git a/src/main/antora/modules/ROOT/pages/repositories.adoc b/src/main/antora/modules/ROOT/pages/repositories.adoc
new file mode 100644
index 0000000000..01b79f6c52
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories.adoc
@@ -0,0 +1,8 @@
+[[mongodb.repositories]]
+= Repositories
+:page-section-summary-toc: 1
+
+This chapter explains the basic foundations of Spring Data repositories and MongoDB specifics.
+Before continuing to the MongoDB specifics, make sure you have a sound understanding of the basic concepts.
+
+The goal of the Spring Data repository abstraction is to significantly reduce the amount of boilerplate code required to implement data access layers for various persistence stores.
diff --git a/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc
new file mode 100644
index 0000000000..7d31acb2d4
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/core-concepts.adoc
@@ -0,0 +1,4 @@
+include::{commons}@data-commons::page$repositories/core-concepts.adoc[]
+
+[[mongodb.entity-persistence.state-detection-strategies]]
+include::{commons}@data-commons::page$is-new-state-detection.adoc[leveloffset=+1]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/core-domain-events.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-domain-events.adoc
new file mode 100644
index 0000000000..f84313e9da
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/core-domain-events.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/core-domain-events.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc b/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc
new file mode 100644
index 0000000000..75dcea1e4f
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/core-extensions.adoc
@@ -0,0 +1,242 @@
+[[core.extensions]]
+= Spring Data Extensions
+
+This section documents a set of Spring Data extensions that enable Spring Data usage in a variety of contexts.
+Currently, most of the integration is targeted towards Spring MVC.
+
+include::{commons}@data-commons::page$repositories/core-extensions-querydsl.adoc[leveloffset=1]
+
+[[mongodb.repositories.queries.type-safe]]
+=== Type-safe Query Methods with Querydsl
+
+MongoDB repository and its reactive counterpart integrates with the http://www.querydsl.com/[Querydsl] project, which provides a way to perform type-safe queries.
+
+[quote,Querydsl Team]
+Instead of writing queries as inline strings or externalizing them into XML files they are constructed via a fluent API.
+
+It provides the following features:
+
+* Code completion in the IDE (all properties, methods, and operations can be expanded in your favorite Java IDE).
+* Almost no syntactically invalid queries allowed (type-safe on all levels).
+* Domain types and properties can be referenced safely -- no strings involved!
+* Adapts better to refactoring changes in domain types.
+* Incremental query definition is easier.
+
+See the http://www.querydsl.com/static/querydsl/latest/reference/html/[Querydsl documentation] for how to bootstrap your environment for APT-based code generation using Maven or Ant.
+
+QueryDSL lets you write queries such as the following:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+QPerson person = QPerson.person;
+List<Person> result = repository.findAll(person.address.zipCode.eq("C0123"));
+
+Page<Person> page = repository.findAll(person.lastname.contains("a"),
+                                       PageRequest.of(0, 2, Direction.ASC, "lastname"));
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+QPerson person = QPerson.person;
+
+Flux<Person> result = repository.findAll(person.address.zipCode.eq("C0123"));
+----
+======
+
+`QPerson` is a class that is generated by the Java annotation processor.
+See xref:#mongodb.repositories.queries.type-safe.apt[Setting up Annotation Processing] for how to set up Annotation Processing with your Build System.
+It is a `Predicate` that lets you write type-safe queries.
+Notice that there are no strings in the query other than the `C0123` value.
+
+You can use the generated `Predicate` class by using the `QuerydslPredicateExecutor` / `ReactiveQuerydslPredicateExecutor` interface, which the following listing shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+public interface QuerydslPredicateExecutor<T> {
+
+    Optional<T> findOne(Predicate predicate);
+
+    List<T> findAll(Predicate predicate);
+
+    List<T> findAll(Predicate predicate, Sort sort);
+
+    List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders);
+
+    Page<T> findAll(Predicate predicate, Pageable pageable);
+
+    List<T> findAll(OrderSpecifier<?>... orders);
+
+    long count(Predicate predicate);
+
+    boolean exists(Predicate predicate);
+
+    <S extends T, R> R findBy(Predicate predicate, Function<FluentQuery.FetchableFluentQuery<S>, R> queryFunction);
+}
+----
+
+Reactive::
++
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+interface ReactiveQuerydslPredicateExecutor<T> {
+
+    Mono<T> findOne(Predicate predicate);
+
+    Flux<T> findAll(Predicate predicate);
+
+    Flux<T> findAll(Predicate predicate, Sort sort);
+
+    Flux<T> findAll(Predicate predicate, OrderSpecifier<?>... orders);
+
+    Flux<T> findAll(OrderSpecifier<?>... orders);
+
+    Mono<Long> count(Predicate predicate);
+
+    Mono<Boolean> exists(Predicate predicate);
+
+    <S extends T, R, P extends Publisher<R>> P findBy(Predicate predicate,
+            Function<FluentQuery.ReactiveFluentQuery<S>, P> queryFunction);
+}
+----
+======
+
+To use this in your repository implementation, add it to the list of repository interfaces from which your interface inherits, as the following example shows:
+
+[tabs]
+======
+Imperative::
++
+[source,java,indent=0,subs="verbatim,quotes",role="primary"]
+----
+interface PersonRepository extends MongoRepository<Person, String>, QuerydslPredicateExecutor<Person> {
+
+    // additional query methods go here
+}
+----
+
+Reactive::
++
+====
+[source,java,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+
+interface PersonRepository extends ReactiveMongoRepository<Person, String>, ReactiveQuerydslPredicateExecutor<Person> {
+
+    // additional query methods go here
+}
+----
+
+NOTE: Please note that joins (DBRef's) are not supported with Reactive MongoDB support.
+====
+======
+
+[[mongodb.repositories.queries.type-safe.apt]]
+=== Setting up Annotation Processing
+
+To use Querydsl with Spring Data MongoDB, you need to set up annotation processing in your build system that generates the `Q` classes.
+While you could write the `Q` classes by hand, it is recommended to use the Querydsl annotation processor to generate them for you to keep your `Q` classes in sync with your domain model.
+
+Spring Data MongoDB ships with an annotation processor javadoc:org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor[] that isn't registered by default.
+Typically, annotation processors are registered through Java's service loader via `META-INF/services/javax.annotation.processing.Processor` that also activates these once you have them on the class path.
+Most Spring Data users do not use Querydsl, so it does not make sense to require additional mandatory dependencies for projects that would not benefit from Querydsl.
+Hence, you need to activate annotation processing in your build system.
+
+The following example shows how to set up annotation processing by mentioning dependencies and compiler config changes in Maven and Gradle:
+
+[tabs]
+======
+Maven::
++
+[source,xml,indent=0,subs="verbatim,quotes",role="primary"]
+----
+<dependencies>
+    <dependency>
+        <groupId>org.springframework.data</groupId>
+        <artifactId>spring-data-mongodb</artifactId>
+    </dependency>
+
+    <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-mongodb</artifactId>
+        <version>${querydslVersion}</version>
+
+        <!-- Recommended: Exclude the mongo-java-driver to avoid version conflicts -->
+        <exclusions>
+            <exclusion>
+                <groupId>org.mongodb</groupId>
+                <artifactId>mongo-java-driver</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+
+    <dependency>
+        <groupId>com.querydsl</groupId>
+        <artifactId>querydsl-apt</artifactId>
+        <version>${querydslVersion}</version>
+        <classifier>jakarta</classifier>
+        <scope>provided</scope>
+    </dependency>
+</dependencies>
+
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <annotationProcessors>
+                    <annotationProcessor>
+                        org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor
+                    </annotationProcessor>
+                </annotationProcessors>
+
+                <!-- Recommended: Some IDE's might require this configuration to include generated sources for IDE usage -->
+                <generatedTestSourcesDirectory>target/generated-test-sources</generatedTestSourcesDirectory>
+                <generatedSourcesDirectory>target/generated-sources</generatedSourcesDirectory>
+            </configuration>
+        </plugin>
+    </plugins>
+</build>
+----
+
+Gradle::
++
+====
+[source,groovy,indent=0,subs="verbatim,quotes",role="secondary"]
+----
+dependencies {
+    implementation 'com.querydsl:querydsl-mongodb:${querydslVersion}'
+
+    annotationProcessor 'com.querydsl:querydsl-apt:${querydslVersion}:jakarta'
+    annotationProcessor 'org.springframework.data:spring-data-mongodb'
+
+    testAnnotationProcessor 'com.querydsl:querydsl-apt:${querydslVersion}:jakarta'
+    testAnnotationProcessor 'org.springframework.data:spring-data-mongodb'
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.compilerArgs += [
+            "-processor",
+            "org.springframework.data.mongodb.repository.support.MongoAnnotationProcessor"]
+}
+----
+====
+======
+
+Note that the setup above shows the simplest usage omitting any other options or dependencies that your project might require.
+This way of configuring annotation processing disables Java's annotation processor scanning because MongoDB requires specifying `-processor` by class name.
+If you're using other annotation processors, you need to add them to the list of `-processor`/`annotationProcessors` as well.
+
+include::{commons}@data-commons::page$repositories/core-extensions-web.adoc[leveloffset=1]
+
+include::{commons}@data-commons::page$repositories/core-extensions-populators.adoc[leveloffset=1]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/create-instances.adoc b/src/main/antora/modules/ROOT/pages/repositories/create-instances.adoc
new file mode 100644
index 0000000000..2ae01801b1
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/create-instances.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/create-instances.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/custom-implementations.adoc b/src/main/antora/modules/ROOT/pages/repositories/custom-implementations.adoc
new file mode 100644
index 0000000000..c7615191a6
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/custom-implementations.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/custom-implementations.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/definition.adoc b/src/main/antora/modules/ROOT/pages/repositories/definition.adoc
new file mode 100644
index 0000000000..bd65a8af83
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/definition.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/definition.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/null-handling.adoc b/src/main/antora/modules/ROOT/pages/repositories/null-handling.adoc
new file mode 100644
index 0000000000..081bac9f61
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/null-handling.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/null-handling.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/projections.adoc b/src/main/antora/modules/ROOT/pages/repositories/projections.adoc
new file mode 100644
index 0000000000..9302203c56
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/projections.adoc
@@ -0,0 +1,2 @@
+[[mongodb.projections]]
+include::{commons}@data-commons::page$repositories/projections.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/query-by-example.adoc b/src/main/antora/modules/ROOT/pages/repositories/query-by-example.adoc
new file mode 100644
index 0000000000..6c07119c72
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/query-by-example.adoc
@@ -0,0 +1,25 @@
+include::{commons}@data-commons::query-by-example.adoc[]
+
+[[query-by-example.running]]
+== Running an Example
+
+The following example shows how to query by example when using a repository (of `Person` objects, in this case):
+
+.Query by Example using a repository
+====
+[source, java]
+----
+public interface PersonRepository extends QueryByExampleExecutor<Person> {
+
+}
+
+public class PersonService {
+
+  @Autowired PersonRepository personRepository;
+
+  public List<Person> findPeople(Person probe) {
+    return personRepository.findAll(Example.of(probe));
+  }
+}
+----
+====
diff --git a/src/main/antora/modules/ROOT/pages/repositories/query-keywords-reference.adoc b/src/main/antora/modules/ROOT/pages/repositories/query-keywords-reference.adoc
new file mode 100644
index 0000000000..e495eddc6b
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/query-keywords-reference.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/query-keywords-reference.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/query-methods-details.adoc b/src/main/antora/modules/ROOT/pages/repositories/query-methods-details.adoc
new file mode 100644
index 0000000000..614da0b059
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/query-methods-details.adoc
@@ -0,0 +1,2 @@
+:feature-scroll:
+include::{commons}@data-commons::page$repositories/query-methods-details.adoc[]
diff --git a/src/main/antora/modules/ROOT/pages/repositories/query-return-types-reference.adoc b/src/main/antora/modules/ROOT/pages/repositories/query-return-types-reference.adoc
new file mode 100644
index 0000000000..a73c3201d0
--- /dev/null
+++ b/src/main/antora/modules/ROOT/pages/repositories/query-return-types-reference.adoc
@@ -0,0 +1 @@
+include::{commons}@data-commons::page$repositories/query-return-types-reference.adoc[]
diff --git a/src/main/antora/modules/ROOT/partials/vector-search-intro-include.adoc b/src/main/antora/modules/ROOT/partials/vector-search-intro-include.adoc
new file mode 100644
index 0000000000..355bccf4e3
--- /dev/null
+++ b/src/main/antora/modules/ROOT/partials/vector-search-intro-include.adoc
@@ -0,0 +1 @@
+To use Vector Search with MongoDB, you need a MongoDB Atlas instance that is either running in the cloud or by using https://www.mongodb.com/docs/atlas/cli/current/atlas-cli-deploy-docker/[Docker].
diff --git a/src/main/antora/modules/ROOT/partials/vector-search-method-annotated-include.adoc b/src/main/antora/modules/ROOT/partials/vector-search-method-annotated-include.adoc
new file mode 100644
index 0000000000..252437f0b7
--- /dev/null
+++ b/src/main/antora/modules/ROOT/partials/vector-search-method-annotated-include.adoc
@@ -0,0 +1,23 @@
+Annotated search methods use the `@VectorSearch` annotation to define parameters for the https://www.mongodb.com/docs/upcoming/reference/operator/aggregation/vectorSearch/[`$vectorSearch`] aggregation stage.
+
+.Using `@VectorSearch` Search Methods
+====
+[source,java]
+----
+interface CommentRepository extends Repository<Comment, String> {
+
+  @VectorSearch(indexName = "cos-index", filter = "{country: ?0}", limit="100", numCandidates="2000")
+  SearchResults<Comment> searchAnnotatedByCountryAndEmbeddingWithin(String country, Vector embedding,
+      Score distance);
+
+  @VectorSearch(indexName = "my-index", filter = "{country: ?0}", limit="?3", numCandidates = "#{#limit * 20}",
+				searchType = VectorSearchOperation.SearchType.ANN)
+  List<Comment> findAnnotatedByCountryAndEmbeddingWithin(String country, Vector embedding, Score distance, int limit);
+}
+----
+====
+
+Annotated Search Methods can define `filter` for pre-filter usage.
+
+`filter`, `limit`, and `numCandidates` support xref:page$mongodb/value-expressions.adoc[Value Expressions] allowing references to search method arguments.
+
diff --git a/src/main/antora/modules/ROOT/partials/vector-search-method-derived-include.adoc b/src/main/antora/modules/ROOT/partials/vector-search-method-derived-include.adoc
new file mode 100644
index 0000000000..f2b006b8e4
--- /dev/null
+++ b/src/main/antora/modules/ROOT/partials/vector-search-method-derived-include.adoc
@@ -0,0 +1,21 @@
+MongoDB Search methods must use the `@VectorSearch` annotation to define the index name for the https://www.mongodb.com/docs/upcoming/reference/operator/aggregation/vectorSearch/[`$vectorSearch`] aggregation stage.
+
+.Using `Near` and `Within` Keywords in Repository Search Methods
+====
+[source,java]
+----
+interface CommentRepository extends Repository<Comment, String> {
+
+  @VectorSearch(indexName = "my-index", numCandidates="200")
+  SearchResults<Comment> searchTop10ByEmbeddingNear(Vector vector, Score score);
+
+  @VectorSearch(indexName = "my-index", numCandidates="200")
+  SearchResults<Comment> searchTop10ByEmbeddingWithin(Vector vector, Range<Similarity> range);
+
+  @VectorSearch(indexName = "my-index", numCandidates="200")
+  SearchResults<Comment> searchTop10ByCountryAndEmbeddingWithin(String country, Vector vector, Range<Similarity> range);
+}
+----
+====
+
+Derived Search Methods can define domain model attributes to create the pre-filter for indexed fields.
diff --git a/src/main/antora/modules/ROOT/partials/vector-search-model-include.adoc b/src/main/antora/modules/ROOT/partials/vector-search-model-include.adoc
new file mode 100644
index 0000000000..e657f3aa63
--- /dev/null
+++ b/src/main/antora/modules/ROOT/partials/vector-search-model-include.adoc
@@ -0,0 +1,15 @@
+====
+[source,java]
+----
+class Comment {
+
+  @Id String id;
+  String country;
+  String comment;
+
+  Vector embedding;
+
+  // getters, setters, …
+}
+----
+====
diff --git a/src/main/antora/modules/ROOT/partials/vector-search-repository-include.adoc b/src/main/antora/modules/ROOT/partials/vector-search-repository-include.adoc
new file mode 100644
index 0000000000..0e987fc1c5
--- /dev/null
+++ b/src/main/antora/modules/ROOT/partials/vector-search-repository-include.adoc
@@ -0,0 +1,25 @@
+.Using `SearchResult<T>` in a Repository Search Method
+====
+[source,java]
+----
+interface CommentRepository extends Repository<Comment, String> {
+
+  @VectorSearch(indexName = "my-index", numCandidates="#{#limit.max() * 20}")
+  SearchResults<Comment> searchByCountryAndEmbeddingNear(String country, Vector vector, Score score,
+    Limit limit);
+
+  @VectorSearch(indexName = "my-index", limit="10", numCandidates="200")
+  SearchResults<Comment> searchByCountryAndEmbeddingWithin(String country, Vector embedding,
+      Score score);
+
+}
+
+SearchResults<Comment> results = repository.searchByCountryAndEmbeddingNear("en", Vector.of(…), Score.of(0.9), Limit.of(10));
+----
+====
+
+[TIP]
+====
+The MongoDB https://www.mongodb.com/docs/atlas/atlas-vector-search/vector-search-stage/[vector search aggregation] stage defines a set of required arguments and restrictions.
+Please make sure to follow the guidelines and make sure to provide required arguments like `limit`.
+====
diff --git a/src/main/antora/modules/ROOT/partials/vector-search-scoring-include.adoc b/src/main/antora/modules/ROOT/partials/vector-search-scoring-include.adoc
new file mode 100644
index 0000000000..313d8bf394
--- /dev/null
+++ b/src/main/antora/modules/ROOT/partials/vector-search-scoring-include.adoc
@@ -0,0 +1,32 @@
+MongoDB reports the score directly as similarity value.
+The scoring function must be specified in the index and therefore, Vector search methods do not consider the `Score.scoringFunction`.
+The scoring function defaults to `ScoringFunction.unspecified()` as there is no information inside of search results how the score has been computed.
+
+.Using `Score` and `Similarity` in a Repository Search Methods
+====
+[source,java]
+----
+interface CommentRepository extends Repository<Comment, String> {
+
+  @VectorSearch(…)
+  SearchResults<Comment> searchTop10ByEmbeddingNear(Vector vector, Score similarity);
+
+  @VectorSearch(…)
+  SearchResults<Comment> searchTop10ByEmbeddingNear(Vector vector, Similarity similarity);
+
+  @VectorSearch(…)
+  SearchResults<Comment> searchTop10ByEmbeddingNear(Vector vector, Range<Similarity> range);
+}
+
+repository.searchByEmbeddingNear(Vector.of(…), Score.of(0.9));                <1>
+
+repository.searchByEmbeddingNear(Vector.of(…), Similarity.of(0.9));           <2>
+
+repository.searchByEmbeddingNear(Vector.of(…), Similarity.between(0.5, 1));   <3>
+----
+
+<1> Run a search and return results with a similarity of `0.9` or greater.
+<2> Return results with a similarity of `0.9` or greater.
+<3> Return results with a similarity of between `0.5` and `1.0`  or greater.
+====
+
diff --git a/src/main/antora/modules/ROOT/partials/vector-search.adoc b/src/main/antora/modules/ROOT/partials/vector-search.adoc
new file mode 100644
index 0000000000..15e32dccee
--- /dev/null
+++ b/src/main/antora/modules/ROOT/partials/vector-search.adoc
@@ -0,0 +1,167 @@
+[[vector-search]]
+= Vector Search
+
+With the rise of Generative AI, Vector databases have gained strong traction in the world of databases.
+These databases enable efficient storage and querying of high-dimensional vectors, making them well-suited for tasks such as semantic search, recommendation systems, and natural language understanding.
+
+Vector search is a technique that retrieves semantically similar data by comparing vector representations (also known as embeddings) rather than relying on traditional exact-match queries.
+This approach enables intelligent, context-aware applications that go beyond keyword-based retrieval.
+
+In the context of Spring Data, vector search opens new possibilities for building intelligent, context-aware applications, particularly in domains like natural language processing, recommendation systems, and generative AI.
+By modelling vector-based querying using familiar repository abstractions, Spring Data allows developers to seamlessly integrate similarity-based vector-capable databases with the simplicity and consistency of the Spring Data programming model.
+
+ifdef::vector-search-intro-include[]
+include::{vector-search-intro-include}[]
+endif::[]
+
+[[vector-search.model]]
+== Vector Model
+
+To support vector search in a type-safe and idiomatic way, Spring Data introduces the following core abstractions:
+
+* <<vector-search.model.vector,`Vector`>>
+* <<vector-search.model.search-result,`SearchResults<T>` and `SearchResult<T>`>>
+* <<vector-search.model.scoring,`Score`, `Similarity` and Scoring Functions>>
+
+[[vector-search.model.vector]]
+=== `Vector`
+
+The `Vector` type represents an n-dimensional numerical embedding, typically produced by embedding models.
+In Spring Data, it is defined as a lightweight wrapper around an array of floating-point numbers, ensuring immutability and consistency.
+This type can be used as an input for search queries or as a property on a domain entity to store the associated vector representation.
+
+====
+[source,java]
+----
+Vector vector = Vector.of(0.23f, 0.11f, 0.77f);
+----
+====
+
+Using `Vector` in your domain model removes the need to work with raw arrays or lists of numbers, providing a more type-safe and expressive way to handle vector data.
+This abstraction also allows for easy integration with various vector databases and libraries.
+It also allows for implementing vendor-specific optimizations such as binary or quantized vectors that do not map to a standard floating point (`float` and `double` as of https://en.wikipedia.org/wiki/IEEE_754[IEEE 754]) representation.
+A domain object can have a vector property, which can be used for similarity searches.
+Consider the following example:
+
+ifdef::vector-search-model-include[]
+include::{vector-search-model-include}[]
+endif::[]
+
+NOTE: Associating a vector with a domain object results in the vector being loaded and stored as part of the entity lifecycle, which may introduce additional overhead on retrieval and persistence operations.
+
+[[vector-search.model.search-result]]
+=== Search Results
+
+The `SearchResult<T>` type encapsulates the results of a vector similarity query.
+It includes both the matched domain object and a relevance score that indicates how closely it matches the query vector.
+This abstraction provides a structured way to handle result ranking and enables developers to easily work with both the data and its contextual relevance.
+
+ifdef::vector-search-repository-include[]
+include::{vector-search-repository-include}[]
+endif::[]
+
+In this example, the `searchByCountryAndEmbeddingNear` method returns a `SearchResults<Comment>` object, which contains a list of `SearchResult<Comment>` instances.
+Each result includes the matched `Comment` entity and its relevance score.
+
+Relevance score is a numerical value that indicates how closely the matched vector aligns with the query vector.
+Depending on whether a score represents distance or similarity a higher score can mean a closer match or a more distant one.
+
+The scoring function used to calculate this score can vary based on the underlying database, index or input parameters.
+
+[[vector-search.model.scoring]]
+=== Score, Similarity, and Scoring Functions
+
+The `Score` type holds a numerical value indicating the relevance of a search result.
+It can be used to rank results based on their similarity to the query vector.
+The `Score` type is typically a floating-point number, and its interpretation (higher is better or lower is better) depends on the specific similarity function used.
+Scores are a by-product of vector search and are not required for a successful search operation.
+Score values are not part of a domain model and therefore represented best as out-of-band data.
+
+Generally, a Score is computed by a `ScoringFunction`.
+The actual scoring function used to calculate this score can depends on the underlying database and can be obtained from a search index or input parameters.
+
+Spring Data support declares constants for commonly used functions such as:
+
+Euclidean Distance:: Calculates the straight-line distance in n-dimensional space involving the square root of the sum of squared differences.
+Cosine Similarity:: Measures the angle between two vectors by calculating the Dot product first and then normalizing its result by dividing by the product of their lengths.
+Dot Product:: Computes the sum of element-wise multiplications.
+
+The choice of similarity function can impact both the performance and semantics of the search and is often determined by the underlying database or index being used.
+Spring Data adopts to the database's native scoring function capabilities and whether the score can be used to limit results.
+
+ifdef::vector-search-scoring-include[]
+include::{vector-search-scoring-include}[]
+endif::[]
+
+[[vector-search.methods]]
+== Vector Search Methods
+
+Vector search methods are defined in repositories using the same conventions as standard Spring Data query methods.
+These methods return `SearchResults<T>` and require a `Vector` parameter to define the query vector.
+The actual implementation depends on the actual internals of the underlying data store and its capabilities around vector search.
+
+NOTE: If you are new to Spring Data repositories, make sure to familiarize yourself with the xref:repositories/core-concepts.adoc[basics of repository definitions and query methods].
+
+Generally, you have the choice of declaring a search method using two approaches:
+
+* Query Derivation
+* Declaring a String-based Query
+
+Vector Search methods must declare a `Vector` parameter to define the query vector.
+
+[[vector-search.method.derivation]]
+=== Derived Search Methods
+
+A derived search method uses the name of the method to derive the query.
+Vector Search supports the following keywords to run a Vector search when declaring a search method:
+
+.Query predicate keywords
+[options="header",cols="1,3"]
+|===============
+|Logical keyword|Keyword expressions
+|`NEAR`|`Near`, `IsNear`
+|`WITHIN`|`Within`, `IsWithin`
+|===============
+
+ifdef::vector-search-method-derived-include[]
+include::{vector-search-method-derived-include}[]
+endif::[]
+
+Derived search methods are typically easier to read and maintain, as they rely on the method name to express the query intent.
+However, a derived search method requires either to declare a `Score`, `Range<Score>` or `ScoreFunction` as second argument to the `Near`/`Within` keyword to limit search results by their score.
+
+[[vector-search.method.string]]
+=== Annotated Search Methods
+
+Annotated methods provide full control over the query semantics and parameters.
+Unlike derived methods, they do not rely on method name conventions.
+
+ifdef::vector-search-method-annotated-include[]
+include::{vector-search-method-annotated-include}[]
+endif::[]
+
+With more control over the actual query, Spring Data can make fewer assumptions about the query and its parameters.
+For example, `Similarity` normalization uses the native score function within the query to normalize the given similarity into a score predicate value and vice versa.
+If an annotated query does not define e.g. the score, then the score value in the returned `SearchResult<T>` will be zero.
+
+[[vector-search.method.sorting]]
+=== Sorting
+
+By default, search results are ordered according to their score.
+You can override sorting by using the `Sort` parameter:
+
+.Using `Sort` in Repository Search Methods
+====
+[source,java]
+----
+interface CommentRepository extends Repository<Comment, String> {
+
+  SearchResults<Comment> searchByEmbeddingNearOrderByCountry(Vector vector, Score score);
+
+  SearchResults<Comment> searchByEmbeddingWithin(Vector vector, Score score, Sort sort);
+}
+----
+====
+
+Please note that custom sorting does not allow expressing the score as a sorting criteria.
+You can only refer to domain properties.
diff --git a/src/main/antora/resources/antora-resources/antora.yml b/src/main/antora/resources/antora-resources/antora.yml
new file mode 100644
index 0000000000..857dc03fbe
--- /dev/null
+++ b/src/main/antora/resources/antora-resources/antora.yml
@@ -0,0 +1,23 @@
+version: ${antora-component.version}
+prerelease: ${antora-component.prerelease}
+
+asciidoc:
+  attributes:
+    version: ${project.version}
+    copyright-year: ${current.year}
+    springversionshort: ${spring.short}
+    springversion: ${spring}
+    attribute-missing: 'warn'
+    commons: ${springdata.commons.docs}
+    include-xml-namespaces: false
+    spring-data-commons-docs-url: https://docs.spring.io/spring-data/commons/reference
+    spring-data-commons-javadoc-base: https://docs.spring.io/spring-data/commons/docs/${springdata.commons}/api/
+    springdocsurl: https://docs.spring.io/spring-framework/reference/{springversionshort}
+    springjavadocurl: https://docs.spring.io/spring-framework/docs/${spring}/javadoc-api
+    spring-framework-docs: '{springdocsurl}'
+    spring-framework-javadoc: '{springjavadocurl}'
+    springhateoasversion: ${spring-hateoas}
+    releasetrainversion: ${releasetrain}
+    reactor: ${reactor}
+    mongoversion: ${mongo}
+    store: Mongo
diff --git a/src/main/asciidoc/images/epub-cover.png b/src/main/asciidoc/images/epub-cover.png
deleted file mode 100644
index 7be1d08b3e..0000000000
Binary files a/src/main/asciidoc/images/epub-cover.png and /dev/null differ
diff --git a/src/main/asciidoc/images/epub-cover.svg b/src/main/asciidoc/images/epub-cover.svg
deleted file mode 100644
index 6399a6094a..0000000000
--- a/src/main/asciidoc/images/epub-cover.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="1050px" height="1600px" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-  <image x="20" y="20" width="198" height="197" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMYAAADFCAYAAAAPD43zAAAXsUlEQVR42u2dfZBW1X3Hj86S4UWERV6yS9nd2VVYF4TlLRVd5SEBxVQqs45vHayPTmoca0dsms60Q9NNaupMMs6SP+I4aac+TNM2aUa6pJmECK0PisFGhQVRUXlZIEDFF7BEcEJmtvd7n3Oe3L177vvLOffe32fmYZ/n7PPcPc/lfu/v5fzOOZcMDw8zIj4e29zbbfyYbDxKvEm8Fs8nhTjsUeMxxJ8P8cdZ4zGI5/29m4dCHJNw4ZJhEkYoDAG0sdqFjkfJeOB1q8Iu7WU1wUAsVfw0BHNWYX8yDQnDJ4YQSux3IsAjzJ0/bWBpqoyLxRDKoOoOZQUShgPcIqxl2RKCFx8bjwFWE8sAWRRnSBgWeHxQZjUhLFDdnxSA+1VhNZEMqe6MThReGNwyrGc166AyRlCNEEmFLElBhWGIAVkiCAGCKIJlCMoWVhPIgOqOqKJQwuDWoY/VRJGHmCFpELxXjMfGolmRQgiDZ5T6jMdy1X3JMJuMR19RYpFcC8MQRJmRuxQ3O1hNIFXVHUmSXAqDC6KPFTuYTppcCyRXwuAu00ZGFiJNIJCyaheLJ1TWG/3oi+N4DSq/TFzw8QcIgmKI9ME5P2L8HyAGWa8wSEdCpcxqnkJkMm0x+F0CJ+JR1X0hTDCyDvdqY9p/2LgWhljNdV4YR+nLpWl/gRhPRJnViuZIFPqAFHi/8X8zyN3aVODXgogny3EcM3OuFB+LqDBym3QGMd7zxv/Vd1jNgiTtXq23PF9rex2KTFkM40TjC8NMkiiyAax5otaDH9uabGnlMWckMmExyEpkGrg4SVqPPklbmUW0GtpbDOOEwjSSlcg+sB7VOO7mAn5tyK6LtVGPrbUwjC+O7MZ/MKprygtwefZwlzgOnLJfkd0pLV0p7jqhspMG6vJJP79wQ4972DJRMkqs5mmEQjuLwYMpfCESRb65j4V0rfj41Qhr0XzZLPvbylE6p5UwuIl9npHrVBRw86uGyFr1Mcs10tE4h9216OFRx+aeRyi0EYbxJSrGj37V/SBSBxf489w18oRbmBGDuqs672AtU+ewxrFT7G8PHYQrFwbMovGospppJYrLMzzZ4sWI98BazGlaZD6fO32R/b3ZFAb3FauMUrFEjUe55yCFu9ojrpU/vKZcf7607Qv2jyzn11hglAnDIgoKsgkr90Ec9gvaMi25Tk/LStOFEsTpTikRBvcThxiJgpAjMlZWcVSYJeCGAG6Zf++oD8blTqU+jsFFUWWUeSLcsWasyszuQs37Yzb+MxNHfahj+jy289h2a1MpzB9P1WKQKIiAmOJgtmzl4qbrWXfLjdIPoH1cwzhr0yReOhKI1IRhiSlIFEQQRrjbcKF6Fz/o+oGuaaPcqVLQP5qKMEgURFyUP/dVqQtlZd7MpfYm/SwGZZ+IuFjTec+ILJQTEjerNegoeBoWg4oBicggrvh81x2+3z932kJ7UyCrkagw+GANDd4RkUCBoFdcYWdu0xJ7kx7C4KOUVOZBRALB9p+WHveMK+xcNWO+vSnQKHgiwuC5ZyoIJCKBtKufYFvG1IkzZaXoJb+fj10YlklGBBEaiOKh677mK9h2Yu6M8KPgSVgMiILSskRo4hAFmDfzWntTye9nYxUGLxumDBQRmrhEAXAM2yi477RtbMLgw+60KiARmjhFIZCMgvtyp2IRhmXdJ4IIRRKiAB3TuuxNJT+fi8tiVBjFFURIkhIFkKRtS34+F1kYsllVBOEXpFT/fMW3EhEFkKRtJ/lZfCGSMGSzqgjCL5ivjcE7XLxJ0j5llOhKXp+JajEqjFwoIgSofXpkxROhBu+CgslLNkpenwk9g48vd0IuFBEIxBNrutaxZVfektrfnP3ZUQWFntdtKIshWwmOILxA3ROC7DRFAWCV4LZZ8YozwrpSfYxcKCIAcJ3+YmV/YkG2F+1TOu1NJbf3BxaGbCU4gnACrtOd8/+ErVv2lVTiCSc6pl9jbyq5vT9MjEEuFOELuC93L3kk8ayTH8RqhRZc44xAFoP7ZRRwE66YAXbnPWbWSQdRCOxl6G5xRlCLQdaCcAVTStd2P6CVIAQYzzj56+PWphKrrUcwCt/C4OlZqpwlpCDjdNfCh2UuizZIFmNz3JsjiMXoU/3FCP2A29TTehP74gL9ZzFLxjNKTu/1FWP42NaJKCBIwW5Y/XQmRAGQFbMt+jzJaUcnvxYjrs0EiRwAQayed7eWcYQX7Y1Xs9dOvWRtgjBG7dXnKQzJBuNEQcmyIATNk1rswigxyVwiPxajT/WXIdSSB0EIZjZ22JuCu1K8rJzGLQoIfPElM29gpat7lY5Yx40kayb1hrwsRp/qL0KkC8YhlrQud1xmPw9goM86noFwob93c9X6Hkdh8Ara0Jv7EdkB1qGn7WY2f9Z1uXCXvGia2GIf6BP7ttRxsxgQBVXQ5hSIAdtyYUNHVRWvqpAE4KPiDDdhUIo2Z8BNar+iszCWwQk/AbhUGDzophRthoFFaJ7YypovbzFLrnUu1UgbPwG4k8Uga5ERUJLRbPjMk8dOZVPGTzVFMOuKq3KVSUoC3DjOfPpR/bU9AHcSBgXdihEXvEDMQGucMJ1NmTCDjRszoXCxQZxMGTdthDCYLQAfJQxeO0J1URGwX9RNE2eZF7JAXNxWrrhsRqH9/rTBjebQmbetTW3WFzKLUVbdad1BHnzcmPHmyR1r/BTBHPnx2QE3JxsjAnCZMEqqO60TEAHy3lgDFXd5uvjzgd1iM5swLhkeHq6/4NmoI6o7rRIEZajAxJa4qN+nIDa/GNe7vanRCMDP4ondYhQy6C7yYFeRQSx44bcXrE31ANwujJLqzqYFTgr2TrjxqltJDAUFCRJbAF5cYYi6oGuvXE1uUsHB2A9jI4RR39W1Lgw+ISm3tVEQxKrZt6e+PCShLxgQtVEST6wWo9vPwbIGCSL7fHDuRCJjPJKUbR2rMEqqT0CcIIZYeeVa9vmuO1R3hYjAsQ/eZlMvb07k2JKUbX1SXi6FgamYvYsfpBgiBxw8vS+x5Ii1GsGOuXwOH7/IfHxhLjO/bIPyBYSJeDj/m3PszPn3Ezu+THBi2U5hMTIfX2CuwR/9/noSRI6ovrVZthtSKogF1zItDCwz/6Ub/oZEkSNgLXYefU62emCs2DeUYTykaLC+yBpJboNLqOXlg1tZe2OnspudsBhtqk9EUFDch+UhSRT5ZOfQz81puAowB/mEMDI1/0Jsg0uuUz757zd/ZE4iwtz0pJFsQWaGFQ1Oi9rqClKxyDoR+QSxxfaDA6ZHoHLiFizG5MhHSQkSRf5BJgoVrz3tq1V1oe5KlVSfDD/AfSJR5BuUfiATBRa09KjqhrliSNjtjFMFZvWB6/9adTeIhNm6/wemtYBnkFb8KNnN1QTC0DrGQEqWAu388/ap3fXVAZe2rVDdHb1jDDFOQaLIPz9+fZP5E2U9Osyr19qVWtO1jsYpCsBP926qL7KMSWSqQe2gtq4Uap9oDkX+QVn5tkNbzOfwEDCzUgNMYWhXVYsThIJAIv/8cPdT9eeLm9MLur3Q0pW6s/vL2pwgIjmsLhRYPuc21V2qo50w4ELleTcfoobVhQJI0eq0RKlWwoALtbb7AdXdIBIGZR+VX357RBs2v9QJrYTR03qTVncNIhk2v/a9ESuN62YtgDbCgLXADqFEvtl18Gf2bb60sxZAG2HAWlDAnW8QV/z7vn8Y0dbTslI7a2FwVgthkLXIP7K4Av/vt8y/V3XXRtHfu3lQC2GQtcg/361usO9gZK77pfr//cSZQ9J2LYTxufaVqrtAJMj3dz1p31fbrInSYTG8Ty+el7YrFwbGLTT0MYmYwDRVe7AN7lr4sOquuaJeGE1LVHeBSAhkoP7zwL+NasfNUIcKWnDh4if2ph34R6kwEHxRoWA+kWWggG51cKfOHZe2QxhHVXUKG7cQ+QOiePoX35D+ToeA2wNzqzEIY0hVD7DhI5EvhChsW3iZYN6+DgG3lZPnjtmbBvGPUldK4YR3IgHcRAEX6u4lj6ju4ihkfQXKLAYWONDcpBIBwAofTqIAcKF0yz5CyBLqu7YOqehU+xSaspoX3CwFQBZKNxcKSDJSoO5KnVXRKVXLuxPx4iUK3bJQVg6dfl3WXA++B1V06vcaOxSeEiIOvEQB7luq7yY+MouBOin8VBZj6OZvEsHwI4pVHbdpM5AnQzKG8bF4cqmhkKG0OyTZrIPIEFgczUsU+D/+4oL7VHfVlUNnRgXfde9JbByzl/E1OwnCDZR5yEa0rSCu0H1JVYeM1ChhDLEUhSHZk4DIAFjVw7qAgRNZWD3yxNnDsuYh8UQM8CkJwInsgNJxP6LAfohZWD3y5Nkjsua6DoQwqml2auyY8erOCBEIzLz79nOPSkvH7WCaalaKQg9/5M+VStVizKRUbSbwk3kSYKWP25foPcdCALHbJ04ZHO3v3Vwf0zMtBm9QVmVL6AeC7P4X/sqXKFDe07v4QdVd9s07/7tH1ly1vmiw/ULv/BqROLibYt0nP64TgCiytn/J/hOvyJpHeE0Ntl+QMAoMXCcssixxM6QgLXv/sr/MlCjA4TNvyZqr1hcNTr8gioU5DfXN7/tynYDY1CdrFQwQv321EoOPRSmIoD4fg//iYx/HjsxHn7yn+vwQHLhO//ji35mDdkFFkYW0rJ1Xhv5L1ly1NzTYXg+wFNypM5+cVnJSiJGgtGPTK0/6FgTIsijAG6d3y5qr9oYGyRsozsg5sBI/2/fPbOex7YE+l3VROLhRYMDeILMYzyTdwZP/dyz6QYhQwEr8cM9TTheII1kXBXjh3Z/Imo/KCmlHzPnm4xl7k+7gp789H/0gRCBELPH0rscLKQp8/zffl7pRA7LGBklbxXj0J9lJycoMRIJgNcDtBwcCxRKCPIgC7D220+n7V2SNMmFAQYkKAx3E5PmspfqyBtwm7J/td1zCTl5EAba986ys+ag9TSsYtXwO97cSd6d+5bDKNBEd3HRQDQu3KawoMKK9YfXTuRAFbhB+g25Bg0N7hSVsNQ6d3k+bUMYM/OjqW5vZzqPPhXKbBJh9h4lGWRvRdmLbgR85/ari9AtlwnAo+yVCEiWOsIIq2XXLvqL668QGrIVkCitwdKOAdCVCnp3ynpUSAZh4mHwiGijl+MZPv2SuKh5VFGs678mVKICLtdjo9rkGl99VjEeiO5K/+94+CsBDAJcJWRYElEFTrzIQZN/Z/eXcubYu1gIMuH32kuHhYcdfPra5d8j40ZpUx+HLPrLiiRROUT6IK4awgiD7rkUP5yLItoOZhw7Jhy2GV7TW7bNuFgNUjMffJtVxqJnStt7gHG3d/wNzgCouQQDEE5hglJcg2wpiLpeM3Eavz3sJAwdITBhgx9tbMjMlMm3MPbGPv+DmDoQCrtOarnWZmZ8dFFhWJCIcQNBd9TqGqzAQhBvu1CaWYGHhaydfYrf85t5c3rXCgEI3lEbjvMRpHQR5dp0E//o/G93OXZ+fY3hZDHGgxISBLwC/WfdV65IErtIvD29nr554MZZg2gms4oF9tfN8Exo89gJ74/09Tr/GfKMBP8dxDb4FhtWoGj+WJ/VlYNoxyprn/zA7sAz7T7zM3nhvd+jRab9g62DskqrzOrJxABfq8a0PuVmLrxteUJ+fY/mxGAAHez6pL4QvgvkBeY81kD40xXB6d6KWwUoRrITgn176ezdRwFp4Bt0CXxYDJG01zL9x4xO58n3FeMOh99+MPaPkRVGshMDH8qG+rQXwazEADpqY1QBYoeKrN30nyT+ROOag0unXU3GRZMAt7Wm9qVAxG+IKD1EEshbAt8UAaViNrNXqIHDed/wX7PCHB9jhMwdStQp2sKXX2u4HCjUu5HO1xEDWAgSxGKBsPI4E/EwgsNBXx8EubXPsEAJKWeAeYX2itGIFN1BBsKrzjsK4TQKvDTE5ga0FCGQxgGE1KiyFBROwarYO4tBRCALEEatm367FeUobxG/frW7w467eb1iLStDjB7UYADsNos5kUpJfHIt/jfvMhNQL23QWgqDIggABRLE3jChAYIsBDKvRxxIuFREkbTngox48vU+LGMELjFr3tK8urCBAwGVEV/gp/5ARShjAEAcmeaSyCxNy8XGMceBOc/zDd82s0eGPDsReg5QUCKpvuPIPChdD2AmyLYHBJkMU5bB/K4wrJYBLlWj6VoCFwTDjL2iND04ktpSCW3Tq3DEl6dOwIO26uPl6tnzObYXKMjkRcG1dBNyRNhcPbTGAYTUQ7T+a5glCOnf1vLtHXSyIDbDAwskzRzJlDewgw7R41o2FdpfsPPvqU0FXTXzMsBaBM1FWogpjMqttH5DYZCYnIJAp46eaqxrqHht4gWC6p+1mNn/WdWQdLOBm98yubwW19DsMUZSi/u1IwgCGONCJVFyqPAExzJ2+iC1t+0KuymDiIuTiDnChuuPYuz6yMIAKlyqLIKs0d8YiNm/mtSQGBxAX/vj1SlhXOLILJYgSfFvpY7WxjdRdKt1BzNBliIHcJHeCbnEmYUtcogCxWAxgWI1u48eeyAfKOMgmtTd2srlNS9iClp5ClHtHIaYFHuBCtVl3XY1KbMIAhjiQIgu9UBsuqq5pi8ygumP6NWYbxhwQYLvMylKOiBc6ps/L3RI0SRHziiehB/KciFUYwBAHpg4GXo9qVcdtrHR1r+MdNuxmJ0lB8UI4EENgn4oILpOd2OIKK0kIAyncKvM5Kh50RW0M9GC/OBVgBLr9ik6KFwKCm9rLB7ey1361M+5BVs/1ocISuzAAjzeqzEeh4UPLNgQudUhTHBADxQvBEcWYb5x6NSk3GCvyl+KMK6wkIgzgZ3wjSg0UdgdK4oSLOGfezKVs9mcXkhgCkOLsxdjGK5xITBjAEEeZuezp981bN4W+8HBH+ua2P4uln1YxUPDsD8UlOAvdViqPg7jGMaSgFp67VaMG/+CiRLkbw8dHABzlzoQ+LGldTmJwQVQkY292bEMNEWCrOIUlOPcnLQqQqDCA8SXW84B8xKy/5stbIh+7aWJLYGGIIj2nmEFcCHEybswELTNXuOt/+Ov3zOfiwge4+IGGhZihZuOFIXFhANTFc3HEuq0Axjv8IFbOEGMjJwwXADl0jI9gB9kLF88rLUlH/5onhrtRTB47lZ399ANf71V8p4/KprREAVIRBqfMAqRx4wQXA5ZX8VhiRRnoX/i7s3Z39SSINOkoDJdGP4Q/eFqtxPjGlxcufhL5mLjjE7kndVGA1IQBrOKIYw++k+eOptl9In2UiAKkKgwgxGH49HuR9w4LVp/TcQUPIjaUiQKkLgwgxPHy4W0/D3uMbQeeDftRQn+UigIkOsDnh5fe+cng9bNvDRSQY3P3GIvQCL1ILSXrhnJhgL3HXty6oOWGm/28l0SRa7QQBdBCGOBfdj35tbkzl37daRQahYNxbd9LaAdqn0ppjGj7RRthABQejh8zbkvTZS2XN02cxS5cvGAOXmV8YIpwB+n7sk6iAFoJAxjiaGO1fdJSHwgkUgcjruWkSsejoJ0wAC8fways4ux+UjwC71mRJloKQ8DL1iGQRFdWJ1IF8cTauOdox42ScQy/8AxFifEyEiLzwHVq010UQGuLYYUWdcs0sBJ9SSxakBSZEQbg02UrjBZ2yxI7WC3AHlLdkSBkShiAB+ZYvyqVjWuI0GTOSljJnDAEfMosTnqiu8gSoUAssT5rVsJKZoUhoMyVVmAeQDkLwbUXmRcGsLhXeJBA0ifTbpOMXAhDwEfN+xgNDKaF2EN7o46j11HIlTAEJJDEya0gBLkUhoAEEju5F4Qg18IQcIGUGcUgYUFQDUFU8i4IQSGEYYVnsSAQqt71BoNzsA4DqjuSNoUThoCPg0AgWEaerMjvgHWosJp1GFLdGVUUVhhWDJFAHHgUNRZB7ACrUMnDGEQckDAs8PGQEquJJO+WBJYBYqgW0VXygoThAne3IJASy0fpCWIGIQatppLqBgkjALy6VzwgGp0tCizCIH9UyUUKBgkjAjwN3G154LWKbBcswRB/VPGzyIFzHJAwEoALBg/ELN28WbQJ8Ds3Ee2wvR7iD1DlPweLMq6QNv8PfFlaq3qbcJMAAAAASUVORK5CYII="/>
-  <text x="250" y="92" fill="Black" font-size="72">Spring Data MongoDB</text>
-  <text x="250" y="192" fill="Black" font-size="72">Reference Guide</text>
-  <text x="250" y="420" fill="Black" font-size="36">Mark Pollack, Thomas Risberg,</text>
-  <text x="250" y="466" fill="Black" font-size="36">Oliver Gierke, Costin Leau,</text>
-  <text x="250" y="512" fill="Black" font-size="36">Jon Brisbin, Thomas Darimont,</text>
-  <text x="250" y="558" fill="Black" font-size="36">Christoph Strobl, Mark Paluch,</text>
-  <text x="250" y="604" fill="Black" font-size="36">Jay Bryant</text>
-</svg>
diff --git a/src/main/asciidoc/index.adoc b/src/main/asciidoc/index.adoc
deleted file mode 100644
index 66dfee37cf..0000000000
--- a/src/main/asciidoc/index.adoc
+++ /dev/null
@@ -1,44 +0,0 @@
-= Spring Data MongoDB - Reference Documentation
-Mark Pollack; Thomas Risberg; Oliver Gierke; Costin Leau; Jon Brisbin; Thomas Darimont; Christoph Strobl; Mark Paluch; Jay Bryant
-:revnumber: {version}
-:revdate: {localdate}
-ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]]
-:spring-data-commons-docs: ../../../../../spring-data-commons/src/main/asciidoc
-
-(C) 2008-2019 The original authors.
-
-NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
-
-toc::[]
-
-include::preface.adoc[]
-
-include::new-features.adoc[leveloffset=+1]
-include::{spring-data-commons-docs}/dependencies.adoc[leveloffset=+1]
-include::{spring-data-commons-docs}/repositories.adoc[leveloffset=+1]
-
-[[reference]]
-= Reference Documentation
-
-include::reference/introduction.adoc[leveloffset=+1]
-include::reference/mongodb.adoc[leveloffset=+1]
-include::reference/client-session-transactions.adoc[leveloffset=+1]
-include::reference/reactive-mongodb.adoc[leveloffset=+1]
-include::reference/mongo-repositories.adoc[leveloffset=+1]
-include::reference/reactive-mongo-repositories.adoc[leveloffset=+1]
-include::{spring-data-commons-docs}/auditing.adoc[leveloffset=+1]
-include::reference/mongo-auditing.adoc[leveloffset=+1]
-include::reference/mapping.adoc[leveloffset=+1]
-include::reference/kotlin.adoc[leveloffset=+1]
-include::reference/cross-store.adoc[leveloffset=+1]
-include::reference/jmx.adoc[leveloffset=+1]
-include::reference/mongo-3.adoc[leveloffset=+1]
-
-[[appendix]]
-= Appendix
-
-:numbered!:
-include::{spring-data-commons-docs}/repository-namespace-reference.adoc[leveloffset=+1]
-include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[leveloffset=+1]
-include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[leveloffset=+1]
-include::{spring-data-commons-docs}/repository-query-return-types-reference.adoc[leveloffset=+1]
diff --git a/src/main/asciidoc/new-features.adoc b/src/main/asciidoc/new-features.adoc
deleted file mode 100644
index 4ddf33ac3d..0000000000
--- a/src/main/asciidoc/new-features.adoc
+++ /dev/null
@@ -1,103 +0,0 @@
-[[new-features]]
-= New & Noteworthy
-
-[[new-features.2-3-0]]
-== What's New in Spring Data MongoDB 2.3
-
-* Support for <<mongo-template.aggregation-update,aggregation pipelines in update operations>>.
-
-[[new-features.2-2-0]]
-== What's New in Spring Data MongoDB 2.2
-* Compatibility with MongoDB 4.2 deprecating `eval`, `group` and `geoNear` Template API methods.
-* Extended SpEL aggregation support for MongoDB 3.4 and MongoDB 4.0 operators (see <<mongo.aggregation.projection.expressions>>).
-* <<mongodb.reactive.repositories.queries.type-safe,Querydsl support for reactive repositories>> via `ReactiveQuerydslPredicateExecutor`.
-* <<reactive.gridfs,Reactive GridFS support>>.
-* <<mongodb.repositories.queries.aggregation, Aggregation framework>> support via repository query methods.
-* Declarative reactive transactions using <<mongo.transactions.reactive-tx-manager, @Transactional>>.
-* Template API delete by entity considers the version property in delete queries.
-* Repository deletes now throw `OptimisticLockingFailureException` when a versioned entity cannot be deleted.
-* Support `Range<T>` in repository between queries.
-* Changed behavior of `Reactive/MongoOperations#count` now limiting the range to count matches within by passing on _offset_ & _limit_ to the server.
-* Support of array filters in `Update` operations.
-* <<mongo.jsonSchema.generated, JSON Schema generation>> from domain types.
-* SpEL support in for expressions in `@Indexed`.
-* Support for <<mapping-usage-indexes.hashed-index>>.
-* Annotation-based Collation support through `@Document` and `@Query`.
-* <<mongo.query.kotlin-support,Type-safe Queries for Kotlin>>.
-* Kotlin extension methods accepting `KClass` are deprecated now in favor of `reified` methods.
-* Kotlin <<kotlin.coroutines>> support.
-
-[[new-features.2-1-0]]
-== What's New in Spring Data MongoDB 2.1
-
-* Cursor-based aggregation execution.
-* <<mongo-template.query.distinct,Distinct queries>> for imperative and reactive Template APIs.
-* Support for Map/Reduce through the reactive Template API.
-* <<mongo.mongo-3.validation,`validator` support for collections>>.
-* <<mongo.jsonSchema,`$jsonSchema` support>> for queries and collection creation.
-* <<change-streams, Change Stream support>> for imperative and reactive drivers.
-* <<tailable-cursors.sync, Tailable cursors>> for imperative driver.
-* <<mongo.sessions, MongoDB 3.6 Session>> support for the imperative and reactive Template APIs.
-* <<mongo.transactions, MongoDB 4.0 Transaction>> support and a MongoDB-specific transaction manager implementation.
-* <<mongodb.repositories.queries.sort,Default sort specifications for repository query methods>> using `@Query(sort=…)`.
-* <<mongo-template.find-and-replace,findAndReplace>> support through imperative and reactive Template APIs.
-* Deprecation of `dropDups` in `@Indexed` and `@CompoundIndex` as MongoDB server 3.0 and newer do not support `dropDups` anymore.
-
-[[new-features.2-0-0]]
-== What's New in Spring Data MongoDB 2.0
-* Upgrade to Java 8.
-* Usage of the `Document` API, instead of `DBObject`.
-* <<mongo.reactive>>.
-* <<mongo.reactive.repositories.infinite-streams,Tailable Cursor>> queries.
-* Support for aggregation result streaming by using Java 8 `Stream`.
-* <<mongo.query.fluent-template-api,Fluent Collection API>> for CRUD and aggregation operations.
-* Kotlin extensions for Template and Collection APIs.
-* Integration of collations for collection and index creation and query operations.
-* Query-by-Example support without type matching.
-* Support for isolation `Update` operations.
-* Tooling support for null-safety by using Spring's `@NonNullApi` and `@Nullable` annotations.
-* Deprecated cross-store support and removed Log4j appender.
-
-[[new-features.1-10-0]]
-== What's New in Spring Data MongoDB 1.10
-* Compatible with MongoDB Server 3.4 and the MongoDB Java Driver 3.4.
-* New annotations for `@CountQuery`, `@DeleteQuery`, and `@ExistsQuery`.
-* Extended support for MongoDB 3.2 and MongoDB 3.4 aggregation operators (see <<mongo.aggregation.supported-aggregation-operations>>).
-* Support for partial filter expression when creating indexes.
-* Publishing lifecycle events when loading or converting `DBRef` instances.
-* Added any-match mode for Query By Example.
-* Support for `$caseSensitive` and `$diacriticSensitive` text search.
-* Support for GeoJSON Polygon with hole.
-* Performance improvements by bulk-fetching `DBRef` instances.
-* Multi-faceted aggregations using `$facet`, `$bucket`, and `$bucketAuto` with `Aggregation`.
-
-[[new-features.1-9-0]]
-== What's New in Spring Data MongoDB 1.9
-* The following annotations have been enabled to build your own composed annotations: `@Document`, `@Id`, `@Field`, `@Indexed`, `@CompoundIndex`, `@GeoSpatialIndexed`, `@TextIndexed`, `@Query`, and `@Meta`.
-* Support for <<projections>> in repository query methods.
-* Support for <<query-by-example>>.
-* Out-of-the-box support for `java.util.Currency` in object mapping.
-* Support for the bulk operations introduced in MongoDB 2.6.
-* Upgrade to Querydsl 4.
-* Assert compatibility with MongoDB 3.0 and MongoDB Java Driver 3.2 (see: <<mongo.mongo-3>>).
-
-[[new-features.1-8-0]]
-== What's New in Spring Data MongoDB 1.8
-
-* `Criteria` offers support for creating `$geoIntersects`.
-* Support for https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#expressions[SpEL expressions] in `@Query`.
-* `MongoMappingEvents` expose the collection name for which they are issued.
-* Improved support for `<mongo:mongo-client credentials="..." />`.
-* Improved index creation failure error message.
-
-[[new-features.1-7-0]]
-== What's New in Spring Data MongoDB 1.7
-
-* Assert compatibility with MongoDB 3.0 and MongoDB Java Driver 3-beta3 (see: <<mongo.mongo-3>>).
-* Support JSR-310 and ThreeTen back-port date/time types.
-* Allow `Stream` as a query method return type (see: <<mongodb.repositories.queries>>).
-* https://geojson.org/[GeoJSON] support in both domain types and queries (see: <<mongo.geo-json>>).
-* `QueryDslPredicateExcecutor` now supports `findAll(OrderSpecifier<?>… orders)`.
-* Support calling JavaScript functions with <<mongo.server-side-scripts>>.
-* Improve support for `CONTAINS` keyword on collection-like properties.
-* Support for `$bit`, `$mul`, and `$position` operators to `Update`.
diff --git a/src/main/asciidoc/preface.adoc b/src/main/asciidoc/preface.adoc
deleted file mode 100644
index 448eb5414f..0000000000
--- a/src/main/asciidoc/preface.adoc
+++ /dev/null
@@ -1,60 +0,0 @@
-[[preface]]
-= Preface
-
-The Spring Data MongoDB project applies core Spring concepts to the development of solutions that use the MongoDB document style data store. We provide a "`template`" as a high-level abstraction for storing and querying documents. You may notice similarities to the JDBC support provided by the Spring Framework.
-
-This document is the reference guide for Spring Data - MongoDB Support. It explains MongoDB module concepts and semantics and syntax for various store namespaces.
-
-This section provides some basic introduction to Spring and Document databases. The rest of the document refers only to Spring Data MongoDB features and assumes the user is familiar with MongoDB and Spring concepts.
-
-[[get-started:first-steps:spring]]
-== Learning Spring
-
-Spring Data uses Spring framework's https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html[core] functionality, including:
-
-* https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#beans[IoC] container
-* https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#validation[type conversion system]
-* https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#expressions[expression language]
-* https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/integration.html#jmx[JMX integration]
-* https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/data-access.html#dao-exceptions[DAO exception hierarchy].
-
-While you need not know the Spring APIs, understanding the concepts behind them is important. At a minimum, the idea behind Inversion of Control (IoC) should be familiar, and you should be familiar with whatever IoC container you choose to use.
-
-The core functionality of the MongoDB support can be used directly, with no need to invoke the IoC services of the Spring Container. This is much like `JdbcTemplate`, which can be used "'standalone'" without any other services of the Spring container. To leverage all the features of Spring Data MongoDB, such as the repository support, you need to configure some parts of the library to use Spring.
-
-To learn more about Spring, you can refer to the comprehensive documentation that explains the Spring Framework in detail. There are a lot of articles, blog entries, and books on the subject. See the Spring framework https://spring.io/docs[home page] for more information.
-
-[[get-started:first-steps:nosql]]
-== Learning NoSQL and Document databases
-NoSQL stores have taken the storage world by storm. It is a vast domain with a plethora of solutions, terms, and patterns (to make things worse, even the term itself has multiple https://www.google.com/search?q=nosoql+acronym[meanings]). While some of the principles are common, you must be familiar with MongoDB to some degree. The best way to get acquainted is to read the documentation and follow the examples. It usually does not take more then 5-10 minutes to go through them and, especially if you are coming from an RDMBS-only background, these exercises can be an eye opener.
-
-The starting point for learning about MongoDB is https://www.mongodb.org/[www.mongodb.org]. Here is a list of other useful resources:
-
-* The https://docs.mongodb.org/manual/[manual] introduces MongoDB and contains links to getting started guides, reference documentation, and tutorials.
-* The https://try.mongodb.org/[online shell] provides a convenient way to interact with a MongoDB instance in combination with the online https://docs.mongodb.org/manual/tutorial/getting-started/[tutorial.]
-* MongoDB https://docs.mongodb.org/ecosystem/drivers/java/[Java Language Center].
-* Several https://www.mongodb.org/books[books] you can purchase.
-* Karl Seguin's online book: https://openmymind.net/mongodb.pdf[The Little MongoDB Book].
-
-[[requirements]]
-== Requirements
-
-The Spring Data MongoDB 2.x binaries require JDK level 8.0 and above and https://spring.io/docs[Spring Framework] {springVersion} and above.
-
-In terms of document stores, you need at least version 2.6 of https://www.mongodb.org/[MongoDB].
-
-[[get-started:help]]
-== Additional Help Resources
-
-Learning a new framework is not always straightforward. In this section, we try to provide what we think is an easy-to-follow guide for starting with the Spring Data MongoDB module. However, if you encounter issues or you need advice, feel free to use one of the following links:
-
-[[get-started:help:community]]
-Community Forum :: Spring Data on https://stackoverflow.com/questions/tagged/spring-data[Stack Overflow] is a tag for all Spring Data (not just Document) users to share information and help each other. Note that registration is needed only for posting.
-
-[[get-started:help:professional]]
-Professional Support :: Professional, from-the-source support, with guaranteed response time, is available from https://pivotal.io/[Pivotal Sofware, Inc.], the company behind Spring Data and Spring.
-
-[[get-started:up-to-date]]
-== Following Development
-
-For information on the Spring Data Mongo source code repository, nightly builds, and snapshot artifacts, see the Spring Data Mongo https://projects.spring.io/spring-data-mongodb/[homepage]. You can help make Spring Data best serve the needs of the Spring community by interacting with developers through the Community on https://stackoverflow.com/questions/tagged/spring-data[Stack Overflow]. To follow developer activity, look for the mailing list information on the Spring Data Mongo https://projects.spring.io/spring-data-mongodb/[homepage]. If you encounter a bug or want to suggest an improvement, please create a ticket on the Spring Data issue https://jira.spring.io/browse/DATAMONGO[tracker]. To stay up to date with the latest news and announcements in the Spring eco system, subscribe to the Spring Community https://spring.io[Portal]. You can also follow the Spring https://spring.io/blog[blog] or the project team on Twitter (https://twitter.com/SpringData[SpringData]).
diff --git a/src/main/asciidoc/reference/cross-store.adoc b/src/main/asciidoc/reference/cross-store.adoc
deleted file mode 100644
index 8dafade0b3..0000000000
--- a/src/main/asciidoc/reference/cross-store.adoc
+++ /dev/null
@@ -1,260 +0,0 @@
-[[mongo.cross.store]]
-= Cross Store Support
-
-WARNING: This feature has been deprecated and will be removed without replacement.
-
-Sometimes you need to store data in multiple data stores, and these data stores need to be of different types. One might be relational while the other is a document store. For this use case, we created a separate module in the MongoDB support that handles what we call "`cross-store support`". The current implementation is based on JPA as the driver for the relational database and we let select fields in the Entities be stored in a Mongo database. In addition to letting you store your data in two stores, we also coordinate persistence operations for the non-transactional MongoDB store with the transaction life-cycle for the relational database.
-
-[[mongodb_cross-store-configuration]]
-== Cross Store Configuration
-
-Assuming that you have a working JPA application and would like to add some cross-store persistence for MongoDB, what do you have to add to your configuration?
-
-First, you need to add a dependency on the cross-store module. If you use Maven, you can add the following dependency to your pom:
-
-.Example Maven pom.xml with `spring-data-mongodb-cross-store` dependency
-====
-[source,xml]
-----
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  ...
-
-    <!-- Spring Data -->
-    <dependency>
-      <groupId>org.springframework.data</groupId>
-      <artifactId>spring-data-mongodb-cross-store</artifactId>
-      <version>${spring.data.mongo.version}</version>
-    </dependency>
-
-  ...
-
-</project>
-----
-====
-
-Once you have added the dependency, you need to enable AspectJ for the project. The cross-store support is implemented with AspectJ aspects so, if you enable compile-time AspectJ support, the cross-store features become available to your project. In Maven, you would add an additional plugin to the `<build>` section of the pom, as follows:
-
-.Example Maven pom.xml with AspectJ plugin enabled
-====
-[source,xml]
-----
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  ...
-
-  <build>
-    <plugins>
-
-      …
-
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>aspectj-maven-plugin</artifactId>
-        <version>1.0</version>
-        <dependencies>
-          <!-- NB: You must use Maven 2.0.9 or above or these are ignored (see MNG-2972) -->
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjrt</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-          <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjtools</artifactId>
-            <version>${aspectj.version}</version>
-          </dependency>
-        </dependencies>
-        <executions>
-          <execution>
-            <goals>
-              <goal>compile</goal>
-              <goal>test-compile</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <outxml>true</outxml>
-          <aspectLibraries>
-            <aspectLibrary>
-              <groupId>org.springframework</groupId>
-              <artifactId>spring-aspects</artifactId>
-            </aspectLibrary>
-            <aspectLibrary>
-              <groupId>org.springframework.data</groupId>
-              <artifactId>spring-data-mongodb-cross-store</artifactId>
-            </aspectLibrary>
-          </aspectLibraries>
-          <source>1.6</source>
-          <target>1.6</target>
-        </configuration>
-      </plugin>
-
-      ...
-
-    </plugins>
-  </build>
-
-...
-
-</project>
-----
-====
-
-Finally, you need to configure your project to use MongoDB and also configure which aspects are used. You should add the following XML snippet to your application context:
-
-.Example application context with MongoDB and cross-store aspect support
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:jdbc="http://www.springframework.org/schema/jdbc"
-  xmlns:jpa="http://www.springframework.org/schema/data/jpa"
-  xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-  xsi:schemaLocation="http://www.springframework.org/schema/data/mongo
-    https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
-    http://www.springframework.org/schema/jdbc
-    https://www.springframework.org/schema/jdbc/spring-jdbc-3.0.xsd
-    http://www.springframework.org/schema/beans
-    https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-    http://www.springframework.org/schema/data/jpa
-    https://www.springframework.org/schema/data/jpa/spring-jpa-1.0.xsd">
-
-  ...
-
-  <!--  Mongo config -->
-  <mongo:mongo-client host="localhost" port="27017"/>
-
-  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-    <constructor-arg name="mongoClient" ref="mongoClient"/>
-    <constructor-arg name="databaseName" value="test"/>
-    <constructor-arg name="defaultCollectionName" value="cross-store"/>
-  </bean>
-
-  <bean class="org.springframework.data.mongodb.core.MongoExceptionTranslator"/>
-
-  <!--  Mongo cross-store aspect config -->
-  <bean class="org.springframework.data.persistence.document.mongo.MongoDocumentBacking"
-        factory-method="aspectOf">
-    <property name="changeSetPersister" ref="mongoChangeSetPersister"/>
-  </bean>
-  <bean id="mongoChangeSetPersister"
-      class="org.springframework.data.persistence.document.mongo.MongoChangeSetPersister">
-    <property name="mongoTemplate" ref="mongoTemplate"/>
-    <property name="entityManagerFactory" ref="entityManagerFactory"/>
-  </bean>
-
-  ...
-
-</beans>
-----
-====
-
-[[mongodb_cross-store-application]]
-== Writing the Cross Store Application
-
-We assume that you have a working JPA application, so we cover only the additional steps needed to persist part of your entity in your Mongo database. To do so, you need to identify the field you want to persist. It should be a domain class and follow the general rules for the Mongo mapping support covered in previous chapters. The field you want to persist in MongoDB should be annotated with the `@RelatedDocument` annotation. That is really all you need to do. The cross-store aspects take care of the rest, including:
-
-* Marking the field with `@Transient` so that it will not be persisted by JPA
-* Keeping track of any changes made to the field value and writing them to the database on successful transaction completion
-* Loading the document from MongoDB the first time the value is used in your application.
-
-The following example shows an entity that has a field annotated with `@RelatedDocument`:
-
-.Example of Entity with @RelatedDocument
-====
-[source,java]
-----
-@Entity
-public class Customer {
-
-  @Id
-  @GeneratedValue(strategy = GenerationType.IDENTITY)
-  private Long id;
-
-  private String firstName;
-
-  private String lastName;
-
-  @RelatedDocument
-  private SurveyInfo surveyInfo;
-
-  // getters and setters omitted
-}
-----
-====
-
-The following example shows a domain class that is to be stored as a `Document`:
-
-.Example of a domain class to be stored as a Document
-====
-[source,java]
-----
-public class SurveyInfo {
-
-  private Map<String, String> questionsAndAnswers;
-
-  public SurveyInfo() {
-    this.questionsAndAnswers = new HashMap<String, String>();
-  }
-
-  public SurveyInfo(Map<String, String> questionsAndAnswers) {
-    this.questionsAndAnswers = questionsAndAnswers;
-  }
-
-  public Map<String, String> getQuestionsAndAnswers() {
-    return questionsAndAnswers;
-  }
-
-  public void setQuestionsAndAnswers(Map<String, String> questionsAndAnswers) {
-    this.questionsAndAnswers = questionsAndAnswers;
-  }
-
-  public SurveyInfo addQuestionAndAnswer(String question, String answer) {
-    this.questionsAndAnswers.put(question, answer);
-    return this;
-  }
-}
-----
-====
-
-In the preceding example, once the `SurveyInfo` has been set on the `Customer` object, the `MongoTemplate` that was configured previously is used to save the `SurveyInfo` (along with some metadata about the JPA Entity) in a MongoDB collection named after the fully qualified name of the JPA Entity class. The following code shows how to configure a JPA entity for cross-store persistence with MongoDB:
-
-.Example of code using the JPA Entity configured for cross-store persistence
-====
-[source,java]
-----
-Customer customer = new Customer();
-customer.setFirstName("Sven");
-customer.setLastName("Olafsen");
-SurveyInfo surveyInfo = new SurveyInfo()
-  .addQuestionAndAnswer("age", "22")
-  .addQuestionAndAnswer("married", "Yes")
-  .addQuestionAndAnswer("citizenship", "Norwegian");
-customer.setSurveyInfo(surveyInfo);
-customerRepository.save(customer);
-----
-====
-
-Running the preceding above results in the following JSON document being stored in MongoDB:
-
-.Example of JSON document stored in MongoDB
-====
-[source,javascript]
-----
-{ "_id" : ObjectId( "4d9e8b6e3c55287f87d4b79e" ),
-  "_entity_id" : 1,
-  "_entity_class" : "org.springframework.data.mongodb.examples.custsvc.domain.Customer",
-  "_entity_field_name" : "surveyInfo",
-  "questionsAndAnswers" : { "married" : "Yes",
-    "age" : "22",
-    "citizenship" : "Norwegian" },
-  "_entity_field_class" : "org.springframework.data.mongodb.examples.custsvc.domain.SurveyInfo" }
-----
-====
diff --git a/src/main/asciidoc/reference/introduction.adoc b/src/main/asciidoc/reference/introduction.adoc
deleted file mode 100644
index d7a90227c9..0000000000
--- a/src/main/asciidoc/reference/introduction.adoc
+++ /dev/null
@@ -1,10 +0,0 @@
-[[introduction]]
-= Introduction
-
-== Document Structure
-
-This part of the reference documentation explains the core functionality offered by Spring Data MongoDB.
-
-"`<<mongo.core>>`" introduces the MongoDB module feature set.
-
-"`<<mongo.repositories>>`" introduces the repository support for MongoDB.
diff --git a/src/main/asciidoc/reference/kotlin.adoc b/src/main/asciidoc/reference/kotlin.adoc
deleted file mode 100644
index 73f9a39240..0000000000
--- a/src/main/asciidoc/reference/kotlin.adoc
+++ /dev/null
@@ -1,29 +0,0 @@
-include::../{spring-data-commons-docs}/kotlin.adoc[]
-
-include::../{spring-data-commons-docs}/kotlin-extensions.adoc[leveloffset=+1]
-
-To retrieve a list of `SWCharacter` objects in Java, you would normally write the following:
-
-[source,java]
-----
-Flux<SWCharacter> characters  = template.find(SWCharacter.class).inCollection("star-wars").all()
-----
-
-With Kotlin and the Spring Data extensions, you can instead write the following:
-
-[source,kotlin]
-----
-val characters = template.find<SWCharacter>().inCollection("star-wars").all()
-// or (both are equivalent)
-val characters : Flux<SWCharacter> = template.find().inCollection("star-wars").all()
-----
-
-As in Java, `characters` in Kotlin is strongly typed, but Kotlin's clever type inference allows for shorter syntax.
-
-Spring Data MongoDB provides the following extensions:
-
-* Reified generics support for `MongoOperations`, `ReactiveMongoOperations`, `FluentMongoOperations`, `ReactiveFluentMongoOperations`, and `Criteria`.
-* <<mongo.query.kotlin-support>>
-* <<kotlin.coroutines>> extensions for `ReactiveFluentMongoOperations`.
-
-include::../{spring-data-commons-docs}/kotlin-coroutines.adoc[leveloffset=+1]
diff --git a/src/main/asciidoc/reference/mapping.adoc b/src/main/asciidoc/reference/mapping.adoc
deleted file mode 100644
index da2b7a58c5..0000000000
--- a/src/main/asciidoc/reference/mapping.adoc
+++ /dev/null
@@ -1,804 +0,0 @@
-[[mapping-chapter]]
-= Mapping
-
-Rich mapping support is provided by the `MappingMongoConverter`. `MappingMongoConverter` has a rich metadata model that provides a full feature set to map domain objects to MongoDB documents. The mapping metadata model is populated by using annotations on your domain objects. However, the infrastructure is not limited to using annotations as the only source of metadata information. The `MappingMongoConverter` also lets you map objects to documents without providing any additional metadata, by following a set of conventions.
-
-This section describes the features of the `MappingMongoConverter`, including fundamentals, how to use conventions for mapping objects to documents and how to override those conventions with annotation-based mapping metadata.
-
-include::../{spring-data-commons-docs}/object-mapping.adoc[leveloffset=+1]
-
-[[mapping-conventions]]
-== Convention-based Mapping
-
-`MappingMongoConverter` has a few conventions for mapping objects to documents when no additional mapping metadata is provided. The conventions are:
-
-* The short Java class name is mapped to the collection name in the following manner. The class `com.bigbank.SavingsAccount` maps to the `savingsAccount` collection name.
-* All nested objects are stored as nested objects in the document and *not* as DBRefs.
-* The converter uses any Spring Converters registered with it to override the default mapping of object properties to document fields and values.
-* The fields of an object are used to convert to and from fields in the document. Public `JavaBean` properties are not used.
-* If you have a single non-zero-argument constructor whose constructor argument names match top-level field names of document, that constructor is used. Otherwise, the zero-argument constructor is used. If there is more than one non-zero-argument constructor, an exception will be thrown.
-
-[[mapping.conventions.id-field]]
-=== How the `_id` field is handled in the mapping layer.
-
-MongoDB requires that you have an `_id` field for all documents. If you don't provide one the driver will assign a ObjectId with a generated value. The "_id" field can be of any type the, other than arrays, so long as it is unique. The driver naturally supports all primitive types and Dates. When using the `MappingMongoConverter` there are certain rules that govern how properties from the Java class is mapped to this `_id` field.
-
-The following outlines what field will be mapped to the `_id` document field:
-
-* A field annotated with `@Id` (`org.springframework.data.annotation.Id`) will be mapped to the `_id` field.
-* A field without an annotation but named `id` will be mapped to the `_id` field.
-* The default field name for identifiers is `_id` and can be customized via the `@Field` annotation.
-
-[cols="1,2", options="header"]
-.Examples for the translation of `_id` field definitions
-|===
-| Field definition
-| Resulting Id-Fieldname in MongoDB
-
-| `String` id
-| `_id`
-
-| `@Field` `String` id
-| `_id`
-
-| `@Field("x")` `String` id
-| `x`
-
-| `@Id` `String` x
-| `_id`
-
-| `@Field("x")` `@Id` `String` x
-| `_id`
-|===
-
-The following outlines what type conversion, if any, will be done on the property mapped to the _id document field.
-
-* If a field named `id` is declared as a String or BigInteger in the Java class it will be converted to and stored as an ObjectId if possible. ObjectId as a field type is also valid. If you specify a value for `id` in your application, the conversion to an ObjectId is detected to the MongoDB driver. If the specified `id` value cannot be converted to an ObjectId, then the value will be stored as is in the document's _id field. This also applies if the field is annotated with `@Id`.
-* If a field is annotated with `@MongoId` in the Java class it will be converted to and stored as using its actual type. No further conversion happens unless `@MongoId` declares a desired field type.
-* If a field is annotated with `@MongoId(FieldType.…)` in the Java class it will be attempted to convert the value to the declared `FieldType.`
-* If a field named `id` id field is not declared as a String, BigInteger, or ObjectID in the Java class then you should assign it a value in your application so it can be stored 'as-is' in the document's _id field.
-* If no field named `id` is present in the Java class then an implicit `_id` file will be generated by the driver but not mapped to a property or field of the Java class.
-
-When querying and updating `MongoTemplate` will use the converter to handle conversions of the `Query` and `Update` objects that correspond to the above rules for saving documents so field names and types used in your queries will be able to match what is in your domain classes.
-
-[[mapping-conversion]]
-== Data Mapping and Type Conversion
-
-This section explains how types are mapped to and from a MongoDB representation. Spring Data MongoDB supports all types that can be represented as BSON, MongoDB's internal document format.
-In addition to these types, Spring Data MongoDB provides a set of built-in converters to map additional types. You can provide your own converters to adjust type conversion. See <<mapping-explicit-converters>> for further details.
-
-The following provides samples of each available type conversion:
-
-[cols="3,1,6", options="header"]
-.Type
-|===
-| Type
-| Type conversion
-| Sample
-
-| `String`
-| native
-| `{"firstname" : "Dave"}`
-
-| `double`, `Double`, `float`, `Float`
-| native
-| `{"weight" : 42.5}`
-
-| `int`, `Integer`, `short`, `Short`
-| native +
-32-bit integer
-| `{"height" : 42}`
-
-| `long`, `Long`
-| native +
-64-bit integer
-| `{"height" : 42}`
-
-| `Date`, `Timestamp`
-| native
-| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
-
-| `byte[]`
-| native
-| `{"bin" : { "$binary" : "AQIDBA==", "$type" : "00" }}`
-
-| `java.util.UUID` (Legacy UUID)
-| native
-| `{"uuid" : { "$binary" : "MEaf1CFQ6lSphaa3b9AtlA==", "$type" : "03" }}`
-
-| `Date`
-| native
-| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
-
-| `ObjectId`
-| native
-| `{"_id" : ObjectId("5707a2690364aba3136ab870")}`
-
-| Array, `List`, `BasicDBList`
-| native
-| `{"cookies" : [ … ]}`
-
-| `boolean`, `Boolean`
-| native
-| `{"active" : true}`
-
-| `null`
-| native
-| `{"value" : null}`
-
-| `Document`
-| native
-| `{"value" : { … }}`
-
-| `Decimal128`
-| native
-| `{"value" : NumberDecimal(…)}`
-
-| `AtomicInteger` +
-calling `get()` before the actual conversion
-| converter +
-32-bit integer
-| `{"value" : "741" }`
-
-| `AtomicLong` +
-calling `get()` before the actual conversion
-| converter +
-64-bit integer
-| `{"value" : "741" }`
-
-| `BigInteger`
-| converter +
-`String`
-| `{"value" : "741" }`
-
-| `BigDecimal`
-| converter +
-`String`
-| `{"value" : "741.99" }`
-
-| `URL`
-| converter
-| `{"website" : "https://projects.spring.io/spring-data-mongodb/" }`
-
-| `Locale`
-| converter
-| `{"locale : "en_US" }`
-
-| `char`, `Character`
-| converter
-| `{"char" : "a" }`
-
-| `NamedMongoScript`
-| converter +
-`Code`
-| `{"_id" : "script name", value: (some javascript code)`}
-
-| `java.util.Currency`
-| converter
-| `{"currencyCode" : "EUR"}`
-
-| `LocalDate` +
-(Joda, Java 8, JSR310-BackPort)
-| converter
-| `{"date" : ISODate("2019-11-12T00:00:00.000Z")}`
-
-| `LocalDateTime`, `LocalTime`, `Instant` +
-(Joda, Java 8, JSR310-BackPort)
-| converter
-| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
-
-| `DateTime` (Joda)
-| converter
-| `{"date" : ISODate("2019-11-12T23:00:00.809Z")}`
-
-| `ZoneId` (Java 8, JSR310-BackPort)
-| converter
-| `{"zoneId" : "ECT - Europe/Paris"}`
-
-| `Box`
-| converter
-| `{"box" : { "first" : { "x" : 1.0 , "y" : 2.0} , "second" : { "x" : 3.0 , "y" : 4.0}}`
-
-| `Polygon`
-| converter
-| `{"polygon" : { "points" : [ { "x" : 1.0 , "y" : 2.0} , { "x" : 3.0 , "y" : 4.0} , { "x" : 4.0 , "y" : 5.0}]}}`
-
-| `Circle`
-| converter
-| `{"circle" : { "center" : { "x" : 1.0 , "y" : 2.0} , "radius" : 3.0 , "metric" : "NEUTRAL"}}`
-
-| `Point`
-| converter
-| `{"point" : { "x" : 1.0 , "y" : 2.0}}`
-
-| `GeoJsonPoint`
-| converter
-| `{"point" : { "type" : "Point" , "coordinates" : [3.0 , 4.0] }}`
-
-| `GeoJsonMultiPoint`
-| converter
-| `{"geoJsonLineString" : {"type":"MultiPoint", "coordinates": [ [ 0 , 0 ], [ 0 , 1 ], [ 1 , 1 ] ] }}`
-
-| `Sphere`
-| converter
-| `{"sphere" : { "center" : { "x" : 1.0 , "y" : 2.0} , "radius" : 3.0 , "metric" : "NEUTRAL"}}`
-
-| `GeoJsonPolygon`
-| converter
-| `{"polygon" : { "type" : "Polygon", "coordinates" : [[ [ 0 , 0 ], [ 3 , 6 ], [ 6 , 1 ], [ 0 , 0  ] ]] }}`
-
-| `GeoJsonMultiPolygon`
-| converter
-| `{"geoJsonMultiPolygon" : { "type" : "MultiPolygon", "coordinates" : [
-     [ [ [ -73.958 , 40.8003 ] , [ -73.9498 , 40.7968 ] ] ],
-     [ [ [ -73.973 , 40.7648 ] , [ -73.9588 , 40.8003 ] ] ]
-  ] }}`
-
-| `GeoJsonLineString`
-| converter
-| `{ "geoJsonLineString" : { "type" : "LineString", "coordinates" : [ [ 40 , 5 ], [ 41 , 6 ] ] }}`
-
-| `GeoJsonMultiLineString`
-| converter
-| `{"geoJsonLineString" : { "type" : "MultiLineString", coordinates: [
-     [ [ -73.97162 , 40.78205 ], [ -73.96374 , 40.77715 ] ],
-     [ [ -73.97880 , 40.77247 ], [ -73.97036 , 40.76811 ] ]
-  ] }}`
-|===
-
-
-[[mapping-configuration]]
-== Mapping Configuration
-
-Unless explicitly configured, an instance of `MappingMongoConverter` is created by default when you create a `MongoTemplate`. You can create your own instance of the `MappingMongoConverter`. Doing so lets you dictate where in the classpath your domain classes can be found, so that Spring Data MongoDB can extract metadata and construct indexes. Also, by creating your own instance, you can register Spring converters to map specific classes to and from the database.
-
-You can configure the `MappingMongoConverter` as well as `com.mongodb.MongoClient` and MongoTemplate by using either Java-based or XML-based metadata. The following example uses Spring's Java-based configuration:
-
-.@Configuration class to configure MongoDB mapping support
-====
-[source,java]
-----
-@Configuration
-public class GeoSpatialAppConfig extends AbstractMongoConfiguration {
-
-  @Bean
-  public MongoClient mongoClient() {
-    return new MongoClient("localhost");
-  }
-
-  @Override
-  public String getDatabaseName() {
-    return "database";
-  }
-
-  @Override
-  public String getMappingBasePackage() {
-    return "com.bigbank.domain";
-  }
-
-  // the following are optional
-
-
-  @Bean
-  @Override
-  public CustomConversions customConversions() throws Exception {
-    List<Converter<?, ?>> converterList = new ArrayList<Converter<?, ?>>();
-    converterList.add(new org.springframework.data.mongodb.test.PersonReadConverter());
-    converterList.add(new org.springframework.data.mongodb.test.PersonWriteConverter());
-    return new CustomConversions(converterList);
-  }
-
-  @Bean
-  public LoggingEventListener<MongoMappingEvent> mappingEventsListener() {
-    return new LoggingEventListener<MongoMappingEvent>();
-  }
-}
-----
-====
-
-`AbstractMongoConfiguration` requires you to implement methods that define a `com.mongodb.MongoClient` as well as provide a database name. `AbstractMongoConfiguration` also has a method named  `getMappingBasePackage(…)` that you can override to tell the converter where to scan for classes annotated with the `@Document` annotation.
-
-You can add additional converters to the converter by overriding the `customConversions` method. Also shown in the preceding example is a `LoggingEventListener`, which logs `MongoMappingEvent` instances that are posted onto Spring's `ApplicationContextEvent` infrastructure.
-
-NOTE: `AbstractMongoConfiguration` creates a `MongoTemplate` instance and registers it with the container under the name `mongoTemplate`.
-
-Spring's MongoDB namespace lets you  enable mapping functionality in XML, as the following example shows:
-
-.XML schema to configure MongoDB mapping support
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-  xsi:schemaLocation="http://www.springframework.org/schema/context https://www.springframework.org/schema/context/spring-context-3.0.xsd
-    http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd
-    http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
-  <!-- Default bean name is 'mongo' -->
-  <mongo:mongo-client host="localhost" port="27017"/>
-
-  <mongo:db-factory dbname="database" mongo-ref="mongoClient"/>
-
-  <!-- by default look for a Mongo object named 'mongo' - default name used for the converter is 'mappingConverter' -->
-  <mongo:mapping-converter base-package="com.bigbank.domain">
-    <mongo:custom-converters>
-      <mongo:converter ref="readConverter"/>
-      <mongo:converter>
-        <bean class="org.springframework.data.mongodb.test.PersonWriteConverter"/>
-      </mongo:converter>
-    </mongo:custom-converters>
-  </mongo:mapping-converter>
-
-  <bean id="readConverter" class="org.springframework.data.mongodb.test.PersonReadConverter"/>
-
-  <!-- set the mapping converter to be used by the MongoTemplate -->
-  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-    <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
-    <constructor-arg name="mongoConverter" ref="mappingConverter"/>
-  </bean>
-
-  <bean class="org.springframework.data.mongodb.core.mapping.event.LoggingEventListener"/>
-
-</beans>
-----
-====
-
-The `base-package` property tells it where to scan for classes annotated with the `@org.springframework.data.mongodb.core.mapping.Document` annotation.
-
-[[mapping-usage]]
-== Metadata-based Mapping
-
-To take full advantage of the object mapping functionality inside the Spring Data MongoDB support, you should annotate your mapped objects with the `@Document` annotation. Although it is not necessary for the mapping framework to have this annotation (your POJOs are mapped correctly, even without any annotations), it lets the classpath scanner find and pre-process your domain objects to extract the necessary metadata. If you do not use this annotation, your application takes a slight performance hit the first time you store a domain object, because the mapping framework needs to build up its internal metadata model so that it knows about the properties of your domain object and how to persist them. The following example shows a domain object:
-
-.Example domain object
-====
-[source,java]
-----
-package com.mycompany.domain;
-
-@Document
-public class Person {
-
-  @Id
-  private ObjectId id;
-
-  @Indexed
-  private Integer ssn;
-
-  private String firstName;
-
-  @Indexed
-  private String lastName;
-}
-----
-====
-
-IMPORTANT: The `@Id` annotation tells the mapper which property you want to use for the MongoDB `_id` property, and the `@Indexed` annotation tells the mapping framework to call `createIndex(…)` on that property of your document, making searches faster.
-Automatic index creation is only done for types annotated with `@Document`.
-
-[NOTE]
-====
-To turn automatic index creation _OFF_ please override `autoIndexCreation()` in your configuration.
-[source,java]
-----
-@Configuration
-public class Config extends AbstractMongoClientConfiguration {
-
-  @Override
-  public boolean autoIndexCreation() {
-    return false;
-  }
-
-  // ...
-}
-----
-====
-
-IMPORTANT: Automatic index creation will be turned _OFF_ by default with the release of 3.x.
-We recommend index creation to happen either out of band or as part of the application startup using
-`IndexOperations`.
-
-[[mapping-usage-annotations]]
-=== Mapping Annotation Overview
-
-The MappingMongoConverter can use metadata to drive the mapping of objects to documents. The following annotations are available:
-
-* `@Id`: Applied at the field level to mark the field used for identity purpose.
-* `@MongoId`: Applied at the field level to mark the field used for identity purpose. Accepts an optional `FieldType` to customize id conversion.
-* `@Document`: Applied at the class level to indicate this class is a candidate for mapping to the database. You can specify the name of the collection where the data will be stored.
-* `@DBRef`: Applied at the field to indicate it is to be stored using a com.mongodb.DBRef.
-* `@Indexed`: Applied at the field level to describe how to index the field.
-* `@CompoundIndex` (repeatable): Applied at the type level to declare Compound Indexes.
-* `@GeoSpatialIndexed`: Applied at the field level to describe how to geoindex the field.
-* `@TextIndexed`: Applied at the field level to mark the field to be included in the text index.
-* `@HashIndexed`: Applied at the field level for usage within a hashed index to partition data across a sharded cluster.
-* `@Language`: Applied at the field level to set the language override property for text index.
-* `@Transient`: By default all private fields are mapped to the document, this annotation excludes the field where it is applied from being stored in the database
-* `@PersistenceConstructor`: Marks a given constructor - even a package protected one - to use when instantiating the object from the database. Constructor arguments are mapped by name to the key values in the retrieved Document.
-* `@Value`: This annotation is part of the Spring Framework . Within the mapping framework it can be applied to constructor arguments. This lets you use a Spring Expression Language statement to transform a key's value retrieved in the database before it is used to construct a domain object. In order to reference a property of a given document one has to use expressions like: `@Value("#root.myProperty")` where `root` refers to the root of the given document.
-* `@Field`: Applied at the field level it allows to describe the name and type of the field as it will be represented in the MongoDB BSON document thus allowing the name and type to be different than the fieldname of the class as well as the property type.
-* `@Version`: Applied at field level is used for optimistic locking and checked for modification on save operations. The initial value is `zero` (`one` for primitive types) which is bumped automatically on every update.
-
-The mapping metadata infrastructure is defined in a separate spring-data-commons project that is technology agnostic. Specific subclasses are using in the MongoDB support to support annotation based metadata. Other strategies are also possible to put in place if there is demand.
-
-Here is an example of a more complex mapping.
-
-[source,java]
-----
-@Document
-@CompoundIndex(name = "age_idx", def = "{'lastName': 1, 'age': -1}")
-public class Person<T extends Address> {
-
-  @Id
-  private String id;
-
-  @Indexed(unique = true)
-  private Integer ssn;
-
-  @Field("fName")
-  private String firstName;
-
-  @Indexed
-  private String lastName;
-
-  private Integer age;
-
-  @Transient
-  private Integer accountTotal;
-
-  @DBRef
-  private List<Account> accounts;
-
-  private T address;
-
-  public Person(Integer ssn) {
-    this.ssn = ssn;
-  }
-
-  @PersistenceConstructor
-  public Person(Integer ssn, String firstName, String lastName, Integer age, T address) {
-    this.ssn = ssn;
-    this.firstName = firstName;
-    this.lastName = lastName;
-    this.age = age;
-    this.address = address;
-  }
-
-  public String getId() {
-    return id;
-  }
-
-  // no setter for Id.  (getter is only exposed for some unit testing)
-
-  public Integer getSsn() {
-    return ssn;
-  }
-
-// other getters/setters omitted
-----
-
-[TIP]
-====
-`@Field(targetType=...)` can come in handy when the native MongoDB type inferred by the mapping infrastructure does not
-match the expected one. Like for `BigDecimal`, which is represented as `String` instead of `Decimal128`, just because earlier
-versions of MongoDB Server did not have support for it.
-[source,java]
-----
-public class Balance {
-
-  @Field(targetType = DECIMAL128)
-  private BigDecimal value;
-
-  // ...
-}
-----
-
-You may even consider your own, custom annotation.
-
-[source,java]
-----
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-@Field(targetType = FieldType.DECIMAL128)
-public @interface Decimal128 { }
-
-// ...
-
-public class Balance {
-
-  @Decimal128
-  private BigDecimal value;
-
-  // ...
-}
-----
-====
-
-[[mapping-custom-object-construction]]
-=== Customized Object Construction
-
-The mapping subsystem allows the customization of the object construction by annotating a constructor with the `@PersistenceConstructor` annotation. The values to be used for the constructor parameters are resolved in the following way:
-
-* If a parameter is annotated with the `@Value` annotation, the given expression is evaluated and the result is used as the parameter value.
-* If the Java type has a property whose name matches the given field of the input document, then it's property information is used to select the appropriate constructor parameter to pass the input field value to. This works only if the parameter name information is present in the java `.class` files which can be achieved by compiling the source with debug information or using the new `-parameters` command-line switch for javac in Java 8.
-* Otherwise a `MappingException` will be thrown indicating that the given constructor parameter could not be bound.
-
-[source,java]
-----
-class OrderItem {
-
-  private @Id String id;
-  private int quantity;
-  private double unitPrice;
-
-  OrderItem(String id, @Value("#root.qty ?: 0") int quantity, double unitPrice) {
-    this.id = id;
-    this.quantity = quantity;
-    this.unitPrice = unitPrice;
-  }
-
-  // getters/setters ommitted
-}
-
-Document input = new Document("id", "4711");
-input.put("unitPrice", 2.5);
-input.put("qty",5);
-OrderItem item = converter.read(OrderItem.class, input);
-----
-
-NOTE: The SpEL expression in the `@Value` annotation of the `quantity` parameter falls back to the value `0` if the given property path cannot be resolved.
-
-Additional examples for using the `@PersistenceConstructor` annotation can be found in the https://github.com/spring-projects/spring-data-mongodb/blob/master/spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java[MappingMongoConverterUnitTests] test suite.
-
-[[mapping-usage-indexes.compound-index]]
-=== Compound Indexes
-
-Compound indexes are also supported. They are defined at the class level, rather than on individual properties.
-
-NOTE: Compound indexes are very important to improve the performance of queries that involve criteria on multiple fields
-
-Here's an example that creates a compound index of `lastName` in ascending order and `age` in descending order:
-
-.Example Compound Index Usage
-====
-[source,java]
-----
-package com.mycompany.domain;
-
-@Document
-@CompoundIndex(name = "age_idx", def = "{'lastName': 1, 'age': -1}")
-public class Person {
-
-  @Id
-  private ObjectId id;
-  private Integer age;
-  private String firstName;
-  private String lastName;
-
-}
-----
-====
-
-[TIP]
-====
-`@CompoundIndex` is repeatable using `@CompoundIndexes` as its container.
-
-[source,java]
-----
-@Document
-@CompoundIndex(name = "cmp-idx-one", def = "{'firstname': 1, 'lastname': -1}")
-@CompoundIndex(name = "cmp-idx-two", def = "{'address.city': -1, 'address.street': 1}")
-public class Person {
-
-  String firstname;
-  String lastname;
-
-  Address address;
-
-  // ...
-}
-----
-====
-
-[[mapping-usage-indexes.hashed-index]]
-=== Hashed Indexes
-
-Hashed indexes allow hash based sharding within a sharded cluster.
-Using hashed field values to shard collections results in a more random distribution.
-For details, refer to the https://docs.mongodb.com/manual/core/index-hashed/[MongoDB Documentation].
-
-Here's an example that creates a hashed index for `_id`:
-
-.Example Hashed Index Usage
-====
-[source,java]
-----
-@Document
-public class DomainType {
-
-  @HashIndexed @Id String id;
-
-  // ...
-}
-----
-====
-
-Hashed indexes can be created next to other index definitions like shown below, in that case both indices are created:
-
-.Example Hashed Index Usage togehter with simple index
-====
-[source,java]
-----
-@Document
-public class DomainType {
-
-  @Indexed
-  @HashIndexed
-  String value;
-
-  // ...
-}
-----
-====
-
-In case the example above is too verbose, a compound annotation allows to reduce the number of annotations that need to be declared on a property:
-
-.Example Composed Hashed Index Usage
-====
-[source,java]
-----
-@Document
-public class DomainType {
-
-  @IndexAndHash(name = "idx...")                            <1>
-  String value;
-
-  // ...
-}
-
-@Indexed
-@HashIndexed
-@Retention(RetentionPolicy.RUNTIME)
-public @interface IndexAndHash {
-
-  @AliasFor(annotation = Indexed.class, attribute = "name") <1>
-  String name() default "";
-}
-----
-<1> Potentially register an alias for certain attributes of the meta annotation.
-====
-
-[NOTE]
-====
-Although index creation via annotations comes in handy for many scenarios cosider taking over more control by setting up indices manually via `IndexOperations`.
-
-[source,java]
-----
-mongoOperations.indexOpsFor(Jedi.class)
-  .ensureIndex(HashedIndex.hashed("useTheForce"));
-----
-====
-
-[[mapping-usage-indexes.text-index]]
-=== Text Indexes
-
-NOTE: The text index feature is disabled by default for MongoDB v.2.4.
-
-Creating a text index allows accumulating several fields into a searchable full-text index. It is only possible to have one text index per collection, so all fields marked with `@TextIndexed` are combined into this index. Properties can be weighted to influence the document score for ranking results. The default language for the text index is English. To change the default language, set the `language` attribute to whichever language you want (for example,`@Document(language="spanish")`). Using a property called `language` or `@Language` lets you define a language override on a per document base. The following example shows how to created a text index and set the language to Spanish:
-
-.Example Text Index Usage
-====
-[source,java]
-----
-@Document(language = "spanish")
-class SomeEntity {
-
-    @TextIndexed String foo;
-
-    @Language String lang;
-
-    Nested nested;
-}
-
-class Nested {
-
-    @TextIndexed(weight=5) String bar;
-    String roo;
-}
-----
-====
-
-[[mapping-usage-references]]
-=== Using DBRefs
-
-The mapping framework does not have to store child objects embedded within the document. You can also store them separately and use a DBRef to refer to that document. When the object is loaded from MongoDB, those references are eagerly resolved so that you get back a mapped object that looks the same as if it had been stored embedded within your master document.
-
-The following example uses a DBRef to refer to a specific document that exists independently of the object in which it is referenced (both classes are shown in-line for brevity's sake):
-
-====
-[source,java]
-----
-@Document
-public class Account {
-
-  @Id
-  private ObjectId id;
-  private Float total;
-}
-
-@Document
-public class Person {
-
-  @Id
-  private ObjectId id;
-  @Indexed
-  private Integer ssn;
-  @DBRef
-  private List<Account> accounts;
-}
-----
-====
-
-You need not use `@OneToMany` or similar mechanisms because the List of objects tells the mapping framework that you want a one-to-many relationship. When the object is stored in MongoDB, there is a list of DBRefs rather than the `Account` objects themselves.
-When it comes to loading collections of ``DBRef``s it is advisable to restrict references held in collection types to a specific MongoDB collection. This allows bulk loading of all references, whereas references pointing to different MongoDB collections need to be resolved one by one.
-
-IMPORTANT: The mapping framework does not handle cascading saves. If you change an `Account` object that is referenced by a `Person` object, you must save the `Account` object separately. Calling `save` on the `Person` object does not automatically save the `Account` objects in the `accounts` property.
-
-``DBRef``s can also be resolved lazily. In this case the actual `Object` or `Collection` of references is resolved on first access of the property. Use the `lazy` attribute of `@DBRef` to specify this.
-Required properties that are also defined as lazy loading ``DBRef`` and used as constructor arguments are also decorated with the lazy loading proxy making sure to put as little pressure on the database and network as possible.
-
-TIP: Lazily loaded ``DBRef``s can be hard to debug. Make sure tooling does not accidentally trigger proxy resolution by eg. calling `toString()` or some inline debug rendering invoking property getters.
-Please consider to enable _trace_ logging for `org.springframework.data.mongodb.core.convert.DefaultDbRefResolver` to gain insight on `DBRef` resolution.
-
-[[mapping-usage-events]]
-=== Mapping Framework Events
-
-Events are fired throughout the lifecycle of the mapping process. This is described in the <<mongodb.mapping-usage.events,Lifecycle Events>> section.
-
-Declaring these beans in your Spring ApplicationContext causes them to be invoked whenever the event is dispatched.
-
-[[mapping-explicit-converters]]
-=== Overriding Mapping with Explicit Converters
-
-When storing and querying your objects, it is convenient to have a `MongoConverter` instance handle the mapping of all Java types to `Document` instances. However, sometimes you may want the `MongoConverter` instances do most of the work but let you selectively handle the conversion for a particular type -- perhaps to optimize performance.
-
-To selectively handle the conversion yourself, register one or more one or more `org.springframework.core.convert.converter.Converter` instances with the `MongoConverter`.
-
-NOTE: Spring 3.0 introduced a core.convert package that provides a general type conversion system. This is described in detail in the Spring reference documentation section entitled https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#validation["`Spring Type Conversion`"].
-
-You can use the `customConversions` method in `AbstractMongoConfiguration` to configure converters. The examples <<mapping-configuration, at the beginning of this chapter>> show how to perform the configuration using Java and XML.
-
-The following example of a Spring Converter implementation converts from a `Document` to a `Person` POJO:
-
-[source,java]
-----
-@ReadingConverter
- public class PersonReadConverter implements Converter<Document, Person> {
-
-  public Person convert(Document source) {
-    Person p = new Person((ObjectId) source.get("_id"), (String) source.get("name"));
-    p.setAge((Integer) source.get("age"));
-    return p;
-  }
-}
-----
-
-The following example converts from a `Person` to a `Document`:
-
-[source,java]
-----
-@WritingConverter
-public class PersonWriteConverter implements Converter<Person, Document> {
-
-  public Document convert(Person source) {
-    Document document = new Document();
-    document.put("_id", source.getId());
-    document.put("name", source.getFirstName());
-    document.put("age", source.getAge());
-    return document;
-  }
-}
-----
diff --git a/src/main/asciidoc/reference/mongo-3.adoc b/src/main/asciidoc/reference/mongo-3.adoc
deleted file mode 100644
index 04cc265fa5..0000000000
--- a/src/main/asciidoc/reference/mongo-3.adoc
+++ /dev/null
@@ -1,128 +0,0 @@
-[[mongo.mongo-3]]
-= MongoDB 3.0 Support
-
-Spring Data MongoDB requires MongoDB Java driver generations 3 when connecting to a MongoDB 2.6/3.0 server running MMap.v1 or a MongoDB server 3.0 using MMap.v1 or the WiredTiger storage engine.
-
-NOTE: See the driver- and database-specific documentation for major differences between those engines.
-
-NOTE: Operations that are no longer valid when using a 3.x MongoDB Java driver have been deprecated within Spring Data and will be removed in a subsequent release.
-
-== Using Spring Data MongoDB with MongoDB 3.0
-
-The rest of this section describes how to use Spring Data MongoDB with MongoDB 3.0.
-
-[[mongo.mongo-3.configuration]]
-=== Configuration Options
-
-Some of the configuration options have been changed or removed for the `mongo-java-driver`. The following options are ignored when using the generation 3 driver:
-
- * `autoConnectRetry`
- * `maxAutoConnectRetryTime`
- * `slaveOk`
-
-Generally, you should use the `<mongo:mongo-client ... />` and `<mongo:client-options ... />` elements instead of `<mongo:mongo ... />` when doing XML based configuration, since those elements provide you with attributes that are only valid for the third generation Java driver. The follwoing example shows how to configure a Mongo client connection:
-
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <mongo:mongo-client host="127.0.0.1" port="27017">
-    <mongo:client-options write-concern="NORMAL" />
-  </mongo:mongo-client>
-
-</beans>
-----
-
-[[mongo.mongo-3.write-concern]]
-=== `WriteConcern` and `WriteConcernChecking`
-
-`WriteConcern.NONE`, which had been used as the default by Spring Data MongoDB, was removed in 3.0. Therefore, in a MongoDB 3 environment, the `WriteConcern` defaults to `WriteConcern.UNACKNOWLEGED`. If `WriteResultChecking.EXCEPTION` is enabled, the `WriteConcern` is altered to `WriteConcern.ACKNOWLEDGED` for write operations. Otherwise, errors during execution would not be thrown correctly, since they are not raised by the driver.
-
-[[mongo.mongo-3.authentication]]
-=== Authentication
-
-MongoDB Server generation 3 changed the authentication model when connecting to the DB. Therefore, some of the configuration options available for authentication are no longer valid. You should use the `MongoClient`-specific options when setting credentials with `MongoCredential` to provide authentication data, as the following example shows:
-
-[source,java]
-----
-@Configuration
-public class ApplicationContextEventTestsAppConfig extends AbstractMongoConfiguration {
-
-  @Override
-  public String getDatabaseName() {
-    return "database";
-  }
-
-  @Override
-  @Bean
-  public MongoClient mongoClient() {
-    return new MongoClient(singletonList(new ServerAddress("127.0.0.1", 27017)),
-      singletonList(MongoCredential.createCredential("name", "db", "pwd".toCharArray())));
-  }
-}
-----
-
-In order to use authentication with XML configuration, you can use the `credentials` attribute on `<mongo-client>`, as the following example shows:
-
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-	xsi:schemaLocation="http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <mongo:mongo-client credentials="user:password@database" />
-
-</beans>
-----
-
-[[mongo.mongo-3.validation]]
-=== Server-side Validation
-
-MongoDB supports https://docs.mongodb.com/manual/core/schema-validation/[Schema Validation] as of version 3.2 with query operators
-and as of version 3.6 JSON-schema based validation.
-
-This chapter will point out the specialties for validation in MongoDB and how to apply JSON schema validation.
-
-[[mongo.mongo-3.validation.json-schema]]
-==== JSON Schema Validation
-
-MongoDB 3.6 allows validation and querying of documents with JSON schema draft 4 (including core specification and validation specification) with some differences. `$jsonSchema` can be used in a document validator (when creating a collection), which enforces that inserted or updated documents are valid against the schema. It can also be used to query for documents with the `find` command or `$match` aggregation stage.
-
-Spring Data MongoDB supports MongoDB's specific JSON schema implementation to define and use schemas. See <<mongo.jsonSchema,JSON Schema>> for further details.
-
-[[mongo.mongo-3.validation.query-expression]]
-==== Query Expression Validation
-
-In addition to the <<mongo.mongo-3.validation.json-schema>>, MongoDB supports (as of version 3.2) validating documents against a given structure described by a query. The structure can be built from `Criteria` objects in the same way as they are used for defining queries. The following example shows how to create and use such a validator:
-
-[source,java]
-----
-Criteria queryExpression = Criteria.where("lastname").ne(null).type(2)
-    .and("age").ne(null).type(16).gt(0).lte(150);
-
-Validator validator = Validator.criteria(queryExpression);
-
-template.createCollection(Person.class, CollectionOptions.empty().validator(validator));
-----
-
-NOTE: The field names used within the query expression are mapped to the domain types property names, taking potential `@Field` annotations into account.
-
-[[mongo.mongo-3.misc]]
-=== Miscellaneous Details
-
-This section covers briefly lists additional things to keep in mind when using the 3.0 driver:
-
-* `IndexOperations.resetIndexCache()` is no longer supported.
-* Any `MapReduceOptions.extraOption` is silently ignored.
-* `WriteResult` no longer holds error information but, instead, throws an `Exception`.
-* `MongoOperations.executeInSession(…)` no longer calls `requestStart` and `requestDone`.
-* Index name generation has become a driver-internal operation. Spring Data MongoDB still uses the 2.x schema to generate names.
-* Some `Exception` messages differ between the generation 2 and 3 servers as well as between the MMap.v1 and WiredTiger storage engines.
diff --git a/src/main/asciidoc/reference/mongo-auditing.adoc b/src/main/asciidoc/reference/mongo-auditing.adoc
deleted file mode 100644
index 90a8e5ce7f..0000000000
--- a/src/main/asciidoc/reference/mongo-auditing.adoc
+++ /dev/null
@@ -1,32 +0,0 @@
-[[mongo.auditing]]
-== General Auditing Configuration for MongoDB
-
-To activate auditing functionality, add the Spring Data Mongo `auditing` namespace element to your configuration, as the following example shows:
-
-.Activating auditing by using XML configuration
-====
-[source,xml]
-----
-<mongo:auditing mapping-context-ref="customMappingContext" auditor-aware-ref="yourAuditorAwareImpl"/>
-----
-====
-
-Since Spring Data MongoDB 1.4, auditing can be enabled by annotating a configuration class with the `@EnableMongoAuditing` annotation, as the followign example shows:
-
-.Activating auditing using JavaConfig
-====
-[source,java]
-----
-@Configuration
-@EnableMongoAuditing
-class Config {
-
-  @Bean
-  public AuditorAware<AuditableUser> myAuditorProvider() {
-      return new AuditorAwareImpl();
-  }
-}
-----
-====
-
-If you expose a bean of type `AuditorAware` to the `ApplicationContext`, the auditing infrastructure picks it up automatically and uses it to determine the current user to be set on domain types. If you have multiple implementations registered in the `ApplicationContext`, you can select the one to be used by explicitly setting the `auditorAwareRef` attribute of `@EnableMongoAuditing`.
diff --git a/src/main/asciidoc/reference/mongo-custom-conversions.adoc b/src/main/asciidoc/reference/mongo-custom-conversions.adoc
deleted file mode 100644
index c823e6a817..0000000000
--- a/src/main/asciidoc/reference/mongo-custom-conversions.adoc
+++ /dev/null
@@ -1,134 +0,0 @@
-[[mongo.custom-converters]]
-== Custom Conversions - Overriding Default Mapping
-
-The most trivial way of influencing the the mapping result is by specifying the desired native MongoDB target type via the
-`@Field` annotation. This allows to work with non MongoDB types like `BigDecimal` in the domain model while persisting
-values in native `org.bson.types.Decimal128` format.
-
-.Explicit target type mapping
-====
-[source,java]
-----
-public class Payment {
-
-  @Id String id; <1>
-
-  @Field(targetType = FieldType.DECIMAL128) <2>
-  BigDecimal value;
-
-  Date date; <3>
-
-}
-----
-[source,java]
-----
-{
-  "_id"   : ObjectId("5ca4a34fa264a01503b36af8"), <1>
-  "value" : NumberDecimal(2.099), <2>
-  "date"   : ISODate("2019-04-03T12:11:01.870Z") <3>
-}
-----
-<1> String _id_ values that represent a valid `ObjectId` are converted automatically. See <<mongo-template.id-handling>>
-for details.
-<2> The desired target type is explicitly defined as `Decimal128` which translates to `NumberDecimal`. Otherwise the
-`BigDecimal` value would have been truned into a `String`.
-<3> `Date` values are handled by the MongoDB driver itself an are stored as `ISODate`.
-====
-
-The snippet above is handy for providing simple type hints. To gain more fine-grained control over the mapping process,
- you can register Spring converters with the `MongoConverter` implementations, such as the `MappingMongoConverter`.
-
-The `MappingMongoConverter` checks to see if any Spring converters can handle a specific class before attempting to map the object itself. To 'hijack' the normal mapping strategies of the `MappingMongoConverter`, perhaps for increased performance or other custom mapping needs, you first need to create an implementation of the Spring `Converter` interface and then register it with the `MappingConverter`.
-
-NOTE: For more information on the Spring type conversion service, see the reference docs https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#validation[here].
-
-[[mongo.custom-converters.writer]]
-=== Saving by Using a Registered Spring Converter
-
-The following example shows an implementation of the `Converter` that converts from a `Person` object to a `org.bson.Document`:
-
-[source,java]
-----
-import org.springframework.core.convert.converter.Converter;
-
-import org.bson.Document;
-
-public class PersonWriteConverter implements Converter<Person, Document> {
-
-  public Document convert(Person source) {
-    Document document = new Document();
-    document.put("_id", source.getId());
-    document.put("name", source.getFirstName());
-    document.put("age", source.getAge());
-    return document;
-  }
-}
-----
-
-[[mongo.custom-converters.reader]]
-=== Reading by Using a Spring Converter
-
-The following example shows an implementation of a `Converter` that converts from a `Document` to a `Person` object:
-
-[source,java]
-----
-public class PersonReadConverter implements Converter<Document, Person> {
-
-  public Person convert(Document source) {
-    Person p = new Person((ObjectId) source.get("_id"), (String) source.get("name"));
-    p.setAge((Integer) source.get("age"));
-    return p;
-  }
-}
-----
-
-[[mongo.custom-converters.xml]]
-=== Registering Spring Converters with the `MongoConverter`
-
-The Mongo Spring namespace provides a convenient way to register Spring `Converter` instances with the `MappingMongoConverter`. The following configuration snippet shows how to manually register converter beans as well as configure the wrapping `MappingMongoConverter` into a `MongoTemplate`:
-
-[source,xml]
-----
-<mongo:db-factory dbname="database"/>
-
-<mongo:mapping-converter>
-  <mongo:custom-converters>
-    <mongo:converter ref="readConverter"/>
-    <mongo:converter>
-      <bean class="org.springframework.data.mongodb.test.PersonWriteConverter"/>
-    </mongo:converter>
-  </mongo:custom-converters>
-</mongo:mapping-converter>
-
-<bean id="readConverter" class="org.springframework.data.mongodb.test.PersonReadConverter"/>
-
-<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-  <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
-  <constructor-arg name="mongoConverter" ref="mappingConverter"/>
-</bean>
-----
-
-You can also use the `base-package` attribute of the `custom-converters` element to enable classpath scanning for all `Converter` and `GenericConverter` implementations below the given package, as the following example shows:
-
-[source,xml]
-----
-<mongo:mapping-converter>
-  <mongo:custom-converters base-package="com.acme.**.converters" />
-</mongo:mapping-converter>
-----
-
-[[mongo.converter-disambiguation]]
-=== Converter Disambiguation
-
-Generally, we inspect the `Converter` implementations for the source and target types they convert from and to. Depending on whether one of those is a type MongoDB can handle natively, we register the converter instance as a reading or a writing converter. The following examples show a writer converter and a read converter (note the difference is in the order of the qualifiers on `Converter`):
-
-[source,java]
-----
-// Write converter as only the target type is one Mongo can handle natively
-class MyConverter implements Converter<Person, String> { … }
-
-// Read converter as only the source type is one Mongo can handle natively
-class MyConverter implements Converter<String, Person> { … }
-----
-
-If you write a `Converter` whose source and target type are native Mongo types, we cannot determine whether we should consider it as a reading or a writing converter. Registering the converter instance as both might lead to unwanted results. For example, a `Converter<String, Long>` is ambiguous, although it probably does not make sense to try to convert all `String` instances into `Long` instances when writing. To let you force the infrastructure to register a converter for only one way, we provide `@ReadingConverter` and `@WritingConverter` annotations to be used in the converter implementation.
diff --git a/src/main/asciidoc/reference/mongo-entity-callbacks.adoc b/src/main/asciidoc/reference/mongo-entity-callbacks.adoc
deleted file mode 100644
index 7576a17347..0000000000
--- a/src/main/asciidoc/reference/mongo-entity-callbacks.adoc
+++ /dev/null
@@ -1,31 +0,0 @@
-[[mongo.entity-callbacks]]
-= Store specific EntityCallbacks
-
-Spring Data MongoDB uses the `EntityCallback` API for its auditing support and reacts on the following callbacks.
-
-.Supported Entity Callbacks
-[%header,cols="4"]
-|===
-| Callback
-| Method
-| Description
-| Order
-
-| Reactive/BeforeConvertCallback
-| `onBeforeConvert(T entity, String collection)`
-| Invoked before a domain object is converted to `org.bson.Document`.
-| `Ordered.LOWEST_PRECEDENCE`
-
-| Reactive/AuditingEntityCallback
-| `onBeforeConvert(Object entity, String collection)`
-| Marks an auditable entity _created_ or _modified_
-| 100
-
-| Reactive/BeforeSaveCallback
-| `onBeforeSave(T entity, org.bson.Document target, String collection)`
-| Invoked before a domain object is saved. +
- Can modify the target, to be persisted, `Document` containing all mapped entity information.
-| `Ordered.LOWEST_PRECEDENCE`
-
-|===
-
diff --git a/src/main/asciidoc/reference/mongo-repositories-aggregation.adoc b/src/main/asciidoc/reference/mongo-repositories-aggregation.adoc
deleted file mode 100644
index feba576ad2..0000000000
--- a/src/main/asciidoc/reference/mongo-repositories-aggregation.adoc
+++ /dev/null
@@ -1,90 +0,0 @@
-[[mongodb.repositories.queries.aggregation]]
-=== Aggregation Repository Methods
-
-The repository layer offers means to interact with <<mongo.aggregation, the aggregation framework>> via annotated repository query methods.
-Similar to the <<mongodb.repositories.queries.json-based, JSON based queries>>, you can define a pipeline using the `org.springframework.data.mongodb.repository.Aggregation` annotation.
-The definition may contain simple placeholders like `?0` as well as https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#expressions[SpEL expressions] `?#{ … }`.
-
-.Aggregating Repository Method
-====
-[source,java]
-----
-public interface PersonRepository extends CrudReppsitory<Person, String> {
-
-
-  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
-  List<PersonAggregate> groupByLastnameAndFirstnames();                            <1>
-
-  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $firstname } } }")
-  List<PersonAggregate> groupByLastnameAndFirstnames(Sort sort);                   <2>
-
-  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $?0 } } }")
-  List<PersonAggregate> groupByLastnameAnd(String property);                       <3>
-
-  @Aggregation("{ $group: { _id : $lastname, names : { $addToSet : $?0 } } }")
-  List<PersonAggregate> groupByLastnameAnd(String property, Pageable page);        <4>
-
-  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
-  SumValue sumAgeUsingValueWrapper();                                              <5>
-
-  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
-  Long sumAge();                                                                   <6>
-
-  @Aggregation("{ $group : { _id : null, total : { $sum : $age } } }")
-  AggregationResults<SumValue> sumAgeRaw();                                        <7>
-
-  @Aggregation("{ '$project': { '_id' : '$lastname' } }")
-  List<String> findAllLastnames();                                                 <8>
-}
-----
-[source,java]
-----
-public class PersonAggregate {
-
-  private @Id String lastname;                                                     <2>
-  private List<String> names;
-
-  public PersonAggregate(String lastname, List<String> names) {
-     // ...
-  }
-
-  // Getter / Setter omitted
-}
-
-public class SumValue {
-
-  private final Long total;                                                        <5> <7>
-
-  public SumValue(Long total) {
-    // ...
-  }
-
-  // Getter omitted
-}
-----
-<1> Aggregation pipeline to group first names by `lastname` in the `Person` collection returning these as `PersonAggregate`.
-<2> If `Sort` argument is present, `$sort` is appended after the declared pipeline stages so that it only affects the order of the final results after having passed all other aggregation stages.
-Therefore, the `Sort` properties are mapped against the methods return type `PersonAggregate` which turns `Sort.by("lastname")` into `{ $sort : { '_id', 1 } }` because `PersonAggregate.lastname` is annotated with `@Id`.
-<3> Replaces `?0` with the given value for `property` for a dynamic aggregation pipeline.
-<4> `$skip`, `$limit` and `$sort` can be passed on via a `Pageable` argument. Same as in <2>, the operators are appended to the pipeline definition.
-<5> Map the result of an aggregation returning a single `Document` to an instance of a desired `SumValue` target type.
-<6> Aggregations resulting in single document holding just an accumulation result like eg. `$sum` can be extracted directly from the result `Document`.
-To gain more control, you might consider `AggregationResult` as method return type as shown in <7>.
-<7> Obtain the raw `AggregationResults` mapped to the generic target wrapper type `SumValue` or `org.bson.Document`.
-<8> Like in <6>, a single value can be directly obtained from multiple result ``Document``s.
-====
-
-TIP: You can use `@Aggregation` also with <<mongo.reactive.repositories, Reactive Repositories>>.
-
-[NOTE]
-====
-Simple-type single-result inspects the returned `Document` and checks for the following:
-
-. Only one entry in the document, return it.
-. Two entries, one is the `_id` value. Return the other.
-. Return for the first value assignable to the return type.
-. Throw an exception if none of the above is applicable.
-====
-
-WARNING: The `Page` return type is not supported for repository methods using `@Aggregation`. However you can use a
-`Pageable` argument to add `$skip`, `$limit` and `$sort` to the pipeline.
diff --git a/src/main/asciidoc/reference/mongo-repositories.adoc b/src/main/asciidoc/reference/mongo-repositories.adoc
deleted file mode 100644
index c6c2341fbb..0000000000
--- a/src/main/asciidoc/reference/mongo-repositories.adoc
+++ /dev/null
@@ -1,616 +0,0 @@
-[[mongo.repositories]]
-= MongoDB Repositories
-
-[[mongo-repo-intro]]
-== Introduction
-
-This chapter points out the specialties for repository support for MongoDB. This chapter builds on the core repository support explained in <<repositories>>. You should have a sound understanding of the basic concepts explained there.
-
-[[mongo-repo-usage]]
-== Usage
-
-To access domain entities stored in a MongoDB, you can use our sophisticated repository support that eases implementation quite significantly. To do so, create an interface for your repository, as the following example shows:
-
-.Sample Person entity
-====
-[source,java]
-----
-public class Person {
-
-  @Id
-  private String id;
-  private String firstname;
-  private String lastname;
-  private Address address;
-
-  // … getters and setters omitted
-}
-----
-====
-
-Note that the domain type shown in the preceding example has a property named `id` of type `ObjectId`. The default serialization mechanism used in `MongoTemplate` (which backs the repository support) regards properties named `id` as the document ID. Currently, we support `String`, `ObjectId`, and `BigInteger` as ID types. Now that we have a domain object, we can define an interface that uses it, as follows:
-
-.Basic repository interface to persist Person entities
-====
-[source]
-----
-public interface PersonRepository extends PagingAndSortingRepository<Person, String> {
-
-  // additional custom query methods go here
-}
-----
-====
-
-Right now this interface serves only to provide type information, but we can add additional methods to it later. To do so, in your Spring configuration, add the following content:
-
-.General MongoDB repository Spring configuration
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans
-    https://www.springframework.org/schema/beans/spring-beans-3.0.xsd
-    http://www.springframework.org/schema/data/mongo
-    https://www.springframework.org/schema/data/mongo/spring-mongo-1.0.xsd">
-
-  <mongo:mongo-client id="mongoClient" />
-
-  <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-    <constructor-arg ref="mongoClient" />
-    <constructor-arg value="databaseName" />
-  </bean>
-
-  <mongo:repositories base-package="com.acme.*.repositories" />
-
-</beans>
-----
-====
-
-This namespace element causes the base packages to be scanned for interfaces that extend `MongoRepository` and create Spring beans for each one found. By default, the repositories get a `MongoTemplate` Spring bean wired that is called `mongoTemplate`, so you only need to configure `mongo-template-ref` explicitly if you deviate from this convention.
-
-If you would rather go with Java-based configuration, use the `@EnableMongoRepositories` annotation. That annotation carries the same attributes as the namespace element. If no base package is configured, the infrastructure scans the package of the annotated configuration class. The following example shows how to use Java configuration for a repository:
-
-.Java configuration for repositories
-====
-[source,java]
-----
-@Configuration
-@EnableMongoRepositories
-class ApplicationConfig extends AbstractMongoConfiguration {
-
-  @Override
-  protected String getDatabaseName() {
-    return "e-store";
-  }
-
-  @Override
-  public MongoClient mongoClient() {
-    return new MongoClient();
-  }
-
-  @Override
-  protected String getMappingBasePackage() {
-    return "com.oreilly.springdata.mongodb"
-  }
-}
-----
-====
-
-Because our domain repository extends `PagingAndSortingRepository`, it provides you with CRUD operations as well as methods for paginated and sorted access to the entities. Working with the repository instance is just a matter of dependency injecting it into a client. Consequently, accessing the second page of `Person` objects at a page size of 10 would resemble the following code:
-
-.Paging access to Person entities
-====
-[source,java]
-----
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class PersonRepositoryTests {
-
-    @Autowired PersonRepository repository;
-
-    @Test
-    public void readsFirstPageCorrectly() {
-
-      Page<Person> persons = repository.findAll(PageRequest.of(0, 10));
-      assertThat(persons.isFirstPage(), is(true));
-    }
-}
-----
-====
-
-The preceding example creates an application context with Spring's unit test support, which performs annotation-based dependency injection into test cases. Inside the test method, we use the repository to query the datastore. We hand the repository a `PageRequest` instance that requests the first page of `Person` objects at a page size of 10.
-
-[[mongodb.repositories.queries]]
-== Query Methods
-
-Most of the data access operations you usually trigger on a repository result in a query being executed against the MongoDB databases. Defining such a query is a matter of declaring a method on the repository interface, as the following example shows:
-
-.PersonRepository with query methods
-====
-[source,java]
-----
-public interface PersonRepository extends PagingAndSortingRepository<Person, String> {
-
-    List<Person> findByLastname(String lastname);                      <1>
-
-    Page<Person> findByFirstname(String firstname, Pageable pageable); <2>
-
-    Person findByShippingAddresses(Address address);                   <3>
-
-    Person findFirstByLastname(String lastname)                        <4>
-
-    Stream<Person> findAllBy();                                        <5>
-}
-----
-<1> The `findByLastname` method shows a query for all people with the given last name. The query is derived by parsing the method name for constraints that can be concatenated with `And` and `Or`. Thus, the method name results in a query expression of `{"lastname" : lastname}`.
-<2> Applies pagination to a query. You can equip your method signature with a `Pageable` parameter and let the method return a `Page` instance and Spring Data automatically pages the query accordingly.
-<3> Shows that you can query based on properties that are not primitive types. Throws `IncorrectResultSizeDataAccessException` if more than one match is found.
-<4> Uses the `First` keyword to restrict the query to only the first result. Unlike <3>, this method does not throw an exception if more than one match is found.
-<5> Uses a Java 8 `Stream` that reads and converts individual elements while iterating the stream.
-====
-
-NOTE: We do not support referring to parameters that are mapped as `DBRef` in the domain class.
-
-The following table shows the keywords that are supported for query methods:
-
-[cols="1,2,3", options="header"]
-.Supported keywords for query methods
-|===
-| Keyword
-| Sample
-| Logical result
-
-| `After`
-| `findByBirthdateAfter(Date date)`
-| `{"birthdate" : {"$gt" : date}}`
-
-| `GreaterThan`
-| `findByAgeGreaterThan(int age)`
-| `{"age" : {"$gt" : age}}`
-
-| `GreaterThanEqual`
-| `findByAgeGreaterThanEqual(int age)`
-| `{"age" : {"$gte" : age}}`
-
-| `Before`
-| `findByBirthdateBefore(Date date)`
-| `{"birthdate" : {"$lt" : date}}`
-
-| `LessThan`
-| `findByAgeLessThan(int age)`
-| `{"age" : {"$lt" : age}}`
-
-| `LessThanEqual`
-| `findByAgeLessThanEqual(int age)`
-| `{"age" : {"$lte" : age}}`
-
-| `Between`
-| `findByAgeBetween(int from, int to)` +
-`findByAgeBetween(Range<Integer> range)`
-| `{"age" : {"$gt" : from, "$lt" : to}}` +
-lower / upper bounds (`$gt` / `$gte` & `$lt` / `$lte`) according to `Range`
-
-| `In`
-| `findByAgeIn(Collection ages)`
-| `{"age" : {"$in" : [ages...]}}`
-
-| `NotIn`
-| `findByAgeNotIn(Collection ages)`
-| `{"age" : {"$nin" : [ages...]}}`
-
-| `IsNotNull`, `NotNull`
-| `findByFirstnameNotNull()`
-| `{"firstname" : {"$ne" : null}}`
-
-| `IsNull`, `Null`
-| `findByFirstnameNull()`
-| `{"firstname" : null}`
-
-| `Like`, `StartingWith`, `EndingWith`
-| `findByFirstnameLike(String name)`
-| `{"firstname" : name} (name as regex)`
-
-| `NotLike`, `IsNotLike`
-| `findByFirstnameNotLike(String name)`
-| `{"firstname" : { "$not" : name }} (name as regex)`
-
-| `Containing` on String
-| `findByFirstnameContaining(String name)`
-| `{"firstname" : name} (name as regex)`
-
-| `NotContaining` on String
-| `findByFirstnameNotContaining(String name)`
-| `{"firstname" : { "$not" : name}} (name as regex)`
-
-| `Containing` on Collection
-| `findByAddressesContaining(Address address)`
-| `{"addresses" : { "$in" : address}}`
-
-| `NotContaining` on Collection
-| `findByAddressesNotContaining(Address address)`
-| `{"addresses" : { "$not" : { "$in" : address}}}`
-
-| `Regex`
-| `findByFirstnameRegex(String firstname)`
-| `{"firstname" : {"$regex" : firstname }}`
-
-| `(No keyword)`
-| `findByFirstname(String name)`
-| `{"firstname" : name}`
-
-| `Not`
-| `findByFirstnameNot(String name)`
-| `{"firstname" : {"$ne" : name}}`
-
-| `Near`
-| `findByLocationNear(Point point)`
-| `{"location" : {"$near" : [x,y]}}`
-
-| `Near`
-| `findByLocationNear(Point point, Distance max)`
-| `{"location" : {"$near" : [x,y], "$maxDistance" : max}}`
-
-| `Near`
-| `findByLocationNear(Point point, Distance min, Distance max)`
-| `{"location" : {"$near" : [x,y], "$minDistance" : min, "$maxDistance" : max}}`
-
-| `Within`
-| `findByLocationWithin(Circle circle)`
-| `{"location" : {"$geoWithin" : {"$center" : [ [x, y], distance]}}}`
-
-| `Within`
-| `findByLocationWithin(Box box)`
-| `{"location" : {"$geoWithin" : {"$box" : [ [x1, y1], x2, y2]}}}`
-
-| `IsTrue`, `True`
-| `findByActiveIsTrue()`
-| `{"active" : true}`
-
-| `IsFalse`,  `False`
-| `findByActiveIsFalse()`
-| `{"active" : false}`
-
-| `Exists`
-| `findByLocationExists(boolean exists)`
-| `{"location" : {"$exists" : exists }}`
-|===
-
-NOTE: If the property criterion compares a document, the order of the fields and exact equality in the document matters.
-
-[[mongodb.repositories.queries.delete]]
-=== Repository Delete Queries
-
-The keywords in the preceding table can be used in conjunction with `delete…By` or `remove…By` to create queries that delete matching documents.
-
-.`Delete…By` Query
-====
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String> {
-
-  List <Person> deleteByLastname(String lastname);
-
-  Long deletePersonByLastname(String lastname);
-}
-----
-====
-
-Using a return type of `List` retrieves and returns all matching documents before actually deleting them. A numeric return type directly removes the matching documents, returning the total number of documents removed.
-
-[[mongodb.repositories.queries.geo-spatial]]
-=== Geo-spatial Repository Queries
-
-As you saw in the preceding table of keywords, a few keywords trigger geo-spatial operations within a MongoDB query. The `Near` keyword allows some further modification, as the next few examples show.
-
-The following example shows how to define a `near` query that finds all persons with a given distance of a given point:
-
-.Advanced `Near` queries
-====
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String>
-
-  // { 'location' : { '$near' : [point.x, point.y], '$maxDistance' : distance}}
-  List<Person> findByLocationNear(Point location, Distance distance);
-}
-----
-====
-
-Adding a `Distance` parameter to the query method allows restricting results to those within the given distance. If the `Distance` was set up containing a `Metric`, we transparently use `$nearSphere` instead of `$code`, as the following example shows:
-
-.Using `Distance` with `Metrics`
-====
-[source,java]
-----
-Point point = new Point(43.7, 48.8);
-Distance distance = new Distance(200, Metrics.KILOMETERS);
-… = repository.findByLocationNear(point, distance);
-// {'location' : {'$nearSphere' : [43.7, 48.8], '$maxDistance' : 0.03135711885774796}}
-----
-====
-
-Using a `Distance` with a `Metric` causes a `$nearSphere` (instead of a plain `$near`) clause to be added. Beyond that, the actual distance gets calculated according to the `Metrics` used.
-
-(Note that `Metric` does not refer to metric units of measure. It could be miles rather than kilometers. Rather, `metric` refers to the concept of a system of measurement, regardless of which system you use.)
-
-NOTE: Using `@GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE)` on the target property forces usage of the `$nearSphere` operator.
-
-==== Geo-near Queries
-
-Spring Data MongoDb supports geo-near queries, as the following example shows:
-
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String>
-
-  // {'geoNear' : 'location', 'near' : [x, y] }
-  GeoResults<Person> findByLocationNear(Point location);
-
-  // No metric: {'geoNear' : 'person', 'near' : [x, y], maxDistance : distance }
-  // Metric: {'geoNear' : 'person', 'near' : [x, y], 'maxDistance' : distance,
-  //          'distanceMultiplier' : metric.multiplier, 'spherical' : true }
-  GeoResults<Person> findByLocationNear(Point location, Distance distance);
-
-  // Metric: {'geoNear' : 'person', 'near' : [x, y], 'minDistance' : min,
-  //          'maxDistance' : max, 'distanceMultiplier' : metric.multiplier,
-  //          'spherical' : true }
-  GeoResults<Person> findByLocationNear(Point location, Distance min, Distance max);
-
-  // {'geoNear' : 'location', 'near' : [x, y] }
-  GeoResults<Person> findByLocationNear(Point location);
-}
-----
-
-[[mongodb.repositories.queries.json-based]]
-=== MongoDB JSON-based Query Methods and Field Restriction
-
-By adding the `org.springframework.data.mongodb.repository.Query` annotation to your repository query methods, you can specify a MongoDB JSON query string to use instead of having the query be derived from the method name, as the following example shows:
-
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String>
-
-  @Query("{ 'firstname' : ?0 }")
-  List<Person> findByThePersonsFirstname(String firstname);
-
-}
-----
-
-The `?0` placeholder lets you substitute the value from the method arguments into the JSON query string.
-
-NOTE: `String` parameter values are escaped during the binding process, which means that it is not possible to add MongoDB specific operators through the argument.
-
-You can also use the filter property to restrict the set of properties that is mapped into the Java object, as the following example shows:
-
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String>
-
-  @Query(value="{ 'firstname' : ?0 }", fields="{ 'firstname' : 1, 'lastname' : 1}")
-  List<Person> findByThePersonsFirstname(String firstname);
-
-}
-----
-
-The query in the preceding example returns only the `firstname`, `lastname` and `Id` properties of the `Person` objects. The `age` property, a `java.lang.Integer`, is not set and its value is therefore null.
-
-[[mongodb.repositories.queries.sort]]
-=== Sorting Query Method results
-
-MongoDB repositories allow various approaches to define sorting order. Let's take a look at the following example:
-
-.Sorting Query Results
-====
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String> {
-
-  List<Person> findByFirstnameSortByAgeDesc(String firstname); <1>
-
-  List<Person> findByFirstname(String firstname, Sort sort);   <2>
-
-  @Query(sort = "{ age : -1 }")
-  List<Person> findByFirstname(String firstname);              <3>
-
-  @Query(sort = "{ age : -1 }")
-  List<Person> findByLastname(String lastname, Sort sort);     <4>
-}
-----
-<1> Static sorting derived from method name. `SortByAgeDesc` results in `{ age : -1 }` for the sort parameter.
-<2> Dynamic sorting using a method argument. `Sort.by(DESC, "age")` creates `{ age : -1 }` for the sort parameter.
-<3> Static sorting via `Query` annotation. Sort parameter applied as stated in the `sort` attribute.
-<4> Default sorting via `Query` annotation combined with dynamic one via a method argument. `Sort.unsorted()`
-results in `{ age : -1 }`. Using `Sort.by(ASC, "age")` overrides the defaults and creates `{ age : 1 }`. `Sort.by
-(ASC, "firstname")` alters the default and results in `{ age : -1, firstname : 1 }`.
-====
-
-[[mongodb.repositories.queries.json-spel]]
-=== JSON-based Queries with SpEL Expressions
-
-Query strings and field definitions can be used together with SpEL expressions to create dynamic queries at runtime.
-SpEL expressions can provide predicate values and can be used to extend predicates with subdocuments.
-
-Expressions expose method arguments through an array that contains all the arguments. The following query uses `[0]`
-to declare the predicate value for `lastname` (which is equivalent to the `?0` parameter binding):
-
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String>
-
-  @Query("{'lastname': ?#{[0]} }")
-  List<Person> findByQueryWithExpression(String param0);
-}
-----
-
-Expressions can be used to invoke functions, evaluate conditionals, and construct values. SpEL expressions
-used in conjunction with JSON reveal a side-effect, because Map-like declarations inside of SpEL read like JSON, as the following example shows:
-
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String>
-
-  @Query("{'id': ?#{ [0] ? {$exists :true} : [1] }}")
-  List<Person> findByQueryWithExpressionAndNestedObject(boolean param0, String param1);
-}
-----
-
-SpEL in query strings can be a powerful way to enhance queries. However, they can also accept a broad range of unwanted arguments.
-You should make sure to sanitize strings before passing them to the query to avoid unwanted changes to your query.
-
-Expression support is extensible through the Query SPI: `org.springframework.data.repository.query.spi.EvaluationContextExtension`.
-The Query SPI can contribute properties and functions and can customize the root object. Extensions are retrieved from the application context
-at the time of SpEL evaluation when the query is built. The following example shows how to use `EvaluationContextExtension`:
-
-[source,java]
-----
-public class SampleEvaluationContextExtension extends EvaluationContextExtensionSupport {
-
-  @Override
-  public String getExtensionId() {
-    return "security";
-  }
-
-  @Override
-  public Map<String, Object> getProperties() {
-    return Collections.singletonMap("principal", SecurityContextHolder.getCurrent().getPrincipal());
-  }
-}
-----
-
-NOTE: Bootstrapping `MongoRepositoryFactory` yourself is not application context-aware and requires further configuration
-to pick up Query SPI extensions.
-
-[[mongodb.repositories.queries.type-safe]]
-=== Type-safe Query Methods
-
-MongoDB repository support integrates with the http://www.querydsl.com/[Querydsl] project, which provides a way to perform type-safe queries. To quote from the project description, "Instead of writing queries as inline strings or externalizing them into XML files they are constructed via a fluent API." It provides the following features:
-
-* Code completion in the IDE (all properties, methods, and operations can be expanded in your favorite Java IDE).
-* Almost no syntactically invalid queries allowed (type-safe on all levels).
-* Domain types and properties can be referenced safely -- no strings involved!
-* Adapts better to refactoring changes in domain types.
-* Incremental query definition is easier.
-
-See the http://www.querydsl.com/static/querydsl/latest/reference/html/[QueryDSL documentation] for how to bootstrap your environment for APT-based code generation using Maven or Ant.
-
-QueryDSL lets you write queries such as the following:
-
-[source,java]
-----
-QPerson person = new QPerson("person");
-List<Person> result = repository.findAll(person.address.zipCode.eq("C0123"));
-
-Page<Person> page = repository.findAll(person.lastname.contains("a"),
-                                       PageRequest.of(0, 2, Direction.ASC, "lastname"));
-----
-
-`QPerson` is a class that is generated by the Java annotation post-processing tool. It is a `Predicate` that lets you write type-safe queries. Notice that there are no strings in the query other than the `C0123` value.
-
-You can use the generated `Predicate` class by using the `QuerydslPredicateExecutor` interface, which the following listing shows:
-
-[source,java]
-----
-public interface QuerydslPredicateExecutor<T> {
-
-  T findOne(Predicate predicate);
-
-  List<T> findAll(Predicate predicate);
-
-  List<T> findAll(Predicate predicate, OrderSpecifier<?>... orders);
-
-  Page<T> findAll(Predicate predicate, Pageable pageable);
-
-  Long count(Predicate predicate);
-}
-----
-
-To use this in your repository implementation, add it to the list of repository interfaces from which your interface inherits, as the following example shows:
-
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String>, QuerydslPredicateExecutor<Person> {
-
-   // additional query methods go here
-}
-----
-
-[[mongodb.repositories.queries.full-text]]
-=== Full-text Search Queries
-
-MongoDB's full-text search feature is store-specific and, therefore, can be found on `MongoRepository` rather than on the more general `CrudRepository`. We need a document with a full-text index (see "`<<mapping-usage-indexes.text-index>>`" to learn how to create a full-text index).
-
-Additional methods on `MongoRepository` take `TextCriteria` as an input parameter. In addition to those explicit methods, it is also possible to add a `TextCriteria`-derived repository method. The criteria are added as an additional `AND` criteria. Once the entity contains a `@TextScore`-annotated property, the document's full-text score can be retrieved. Furthermore, the `@TextScore` annotated also makes it possible to sort by the document's score, as the following example shows:
-
-[source, java]
-----
-@Document
-class FullTextDocument {
-
-  @Id String id;
-  @TextIndexed String title;
-  @TextIndexed String content;
-  @TextScore Float score;
-}
-
-interface FullTextRepository extends Repository<FullTextDocument, String> {
-
-  // Execute a full-text search and define sorting dynamically
-  List<FullTextDocument> findAllBy(TextCriteria criteria, Sort sort);
-
-  // Paginate over a full-text search result
-  Page<FullTextDocument> findAllBy(TextCriteria criteria, Pageable pageable);
-
-  // Combine a derived query with a full-text search
-  List<FullTextDocument> findByTitleOrderByScoreDesc(String title, TextCriteria criteria);
-}
-
-
-Sort sort = Sort.by("score");
-TextCriteria criteria = TextCriteria.forDefaultLanguage().matchingAny("spring", "data");
-List<FullTextDocument> result = repository.findAllBy(criteria, sort);
-
-criteria = TextCriteria.forDefaultLanguage().matching("film");
-Page<FullTextDocument> page = repository.findAllBy(criteria, PageRequest.of(1, 1, sort));
-List<FullTextDocument> result = repository.findByTitleOrderByScoreDesc("mongodb", criteria);
-----
-
-include::../{spring-data-commons-docs}/repository-projections.adoc[leveloffset=+2]
-
-include::./mongo-repositories-aggregation.adoc[]
-
-[[mongodb.repositories.misc.cdi-integration]]
-== CDI Integration
-
-Instances of the repository interfaces are usually created by a container, and Spring is the most natural choice when working with Spring Data. As of version 1.3.0, Spring Data MongoDB ships with a custom CDI extension that lets you use the repository abstraction in CDI environments. The extension is part of the JAR. To activate it, drop the Spring Data MongoDB JAR into your classpath. You can now set up the infrastructure by implementing a CDI Producer for the `MongoTemplate`, as the following example shows:
-
-[source,java]
-----
-class MongoTemplateProducer {
-
-    @Produces
-    @ApplicationScoped
-    public MongoOperations createMongoTemplate() {
-
-        MongoDbFactory factory = new SimpleMongoDbFactory(new MongoClient(), "database");
-        return new MongoTemplate(factory);
-    }
-}
-----
-
-The Spring Data MongoDB CDI extension picks up the `MongoTemplate` available as a CDI bean and creates a proxy for a Spring Data repository whenever a bean of a repository type is requested by the container. Thus, obtaining an instance of a Spring Data repository is a matter of declaring an `@Inject`-ed property, as the following example shows:
-
-[source,java]
-----
-class RepositoryClient {
-
-  @Inject
-  PersonRepository repository;
-
-  public void businessMethod() {
-    List<Person> people = repository.findAll();
-  }
-}
-----
diff --git a/src/main/asciidoc/reference/mongodb.adoc b/src/main/asciidoc/reference/mongodb.adoc
deleted file mode 100644
index 3eb5ec5112..0000000000
--- a/src/main/asciidoc/reference/mongodb.adoc
+++ /dev/null
@@ -1,3393 +0,0 @@
-[[mongo.core]]
-= MongoDB support
-
-The MongoDB support contains a wide range of features:
-
-* Spring configuration support with Java-based `@Configuration` classes or an XML namespace for a Mongo driver instance and replica sets.
-* `MongoTemplate` helper class that increases productivity when performing common Mongo operations. Includes integrated object mapping between documents and POJOs.
-* Exception translation into Spring's portable Data Access Exception hierarchy.
-* Feature-rich Object Mapping integrated with Spring's Conversion Service.
-* Annotation-based mapping metadata that is extensible to support other metadata formats.
-* Persistence and mapping lifecycle events.
-* Java-based Query, Criteria, and Update DSLs.
-* Automatic implementation of Repository interfaces, including support for custom finder methods.
-* QueryDSL integration to support type-safe queries.
-* Cross-store persistence support for JPA Entities with fields transparently persisted and retrieved with MongoDB (deprecated - to be removed without replacement).
-* GeoSpatial integration.
-
-For most tasks, you should use `MongoTemplate` or the Repository support, which both leverage the rich mapping functionality. `MongoTemplate` is the place to look for accessing functionality such as incrementing counters or ad-hoc CRUD operations. `MongoTemplate` also provides callback methods so that it is easy for you to get the low-level API artifacts, such as `com.mongodb.client.MongoDatabase`, to communicate directly with MongoDB. The goal with naming conventions on various API artifacts is to copy those in the base MongoDB Java driver so you can easily map your existing knowledge onto the Spring APIs.
-
-[[mongodb-getting-started]]
-== Getting Started
-
-An easy way to bootstrap setting up a working environment is to create a Spring-based project in https://spring.io/tools/sts[STS].
-
-First, you need to set up a running MongoDB server. Refer to the https://docs.mongodb.org/manual/core/introduction/[MongoDB Quick Start guide] for an explanation on how to startup a MongoDB instance. Once installed, starting MongoDB is typically a matter of running the following command: `${MONGO_HOME}/bin/mongod`
-
-To create a Spring project in STS:
-
-. Go to File -> New -> Spring Template Project -> Simple Spring Utility Project, and press Yes when prompted. Then enter a project and a package name, such as `org.spring.mongodb.example`.
-.Add the following to the pom.xml files `dependencies` element:
-+
-[source,xml,subs="+attributes"]
-----
-<dependencies>
-
-  <!-- other dependency elements omitted -->
-
-  <dependency>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-mongodb</artifactId>
-    <version>{version}</version>
-  </dependency>
-
-</dependencies>
-----
-. Change the version of Spring in the pom.xml to be
-+
-[source,xml,subs="+attributes"]
-----
-<spring.framework.version>{springVersion}</spring.framework.version>
-----
-. Add the following location of the Spring Milestone repository for Maven to your `pom.xml` such that it is at the same level of your `<dependencies/>` element:
-+
-[source,xml]
-----
-<repositories>
-  <repository>
-    <id>spring-milestone</id>
-    <name>Spring Maven MILESTONE Repository</name>
-    <url>https://repo.spring.io/libs-milestone</url>
-  </repository>
-</repositories>
-----
-
-The repository is also https://repo.spring.io/milestone/org/springframework/data/[browseable here].
-
-You may also want to set the logging level to `DEBUG` to see some additional information. To do so, edit the `log4j.properties` file to have the following content:
-
-[source]
-----
-log4j.category.org.springframework.data.mongodb=DEBUG
-log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %40.40c:%4L - %m%n
-----
-
-Then you can create a `Person` class to persist:
-
-[source,java]
-----
-package org.spring.mongodb.example;
-
-public class Person {
-
-  private String id;
-  private String name;
-  private int age;
-
-  public Person(String name, int age) {
-    this.name = name;
-    this.age = age;
-  }
-
-  public String getId() {
-    return id;
-  }
-  public String getName() {
-    return name;
-  }
-  public int getAge() {
-    return age;
-  }
-
-  @Override
-  public String toString() {
-    return "Person [id=" + id + ", name=" + name + ", age=" + age + "]";
-  }
-}
-----
-
-You also need a main application to run:
-
-[source,java]
-----
-package org.spring.mongodb.example;
-
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.query.Query;
-
-import com.mongodb.client.MongoClients;
-
-public class MongoApp {
-
-  private static final Log log = LogFactory.getLog(MongoApp.class);
-
-  public static void main(String[] args) throws Exception {
-
-    MongoOperations mongoOps = new MongoTemplate(MongoClients.create(), "database");
-    mongoOps.insert(new Person("Joe", 34));
-
-    log.info(mongoOps.findOne(new Query(where("name").is("Joe")), Person.class));
-
-    mongoOps.dropCollection("person");
-  }
-}
-----
-
-When you run the main program, the preceding examples produce the following output:
-
-[source]
-----
-10:01:32,062 DEBUG apping.MongoPersistentEntityIndexCreator:  80 - Analyzing class class org.spring.example.Person for index information.
-10:01:32,265 DEBUG ramework.data.mongodb.core.MongoTemplate: 631 - insert Document containing fields: [_class, age, name] in collection: Person
-10:01:32,765 DEBUG ramework.data.mongodb.core.MongoTemplate:1243 - findOne using query: { "name" : "Joe"} in db.collection: database.Person
-10:01:32,953  INFO      org.spring.mongodb.example.MongoApp:  25 - Person [id=4ddbba3c0be56b7e1b210166, name=Joe, age=34]
-10:01:32,984 DEBUG ramework.data.mongodb.core.MongoTemplate: 375 - Dropped collection [database.person]
-----
-
-Even in this simple example, there are few things to notice:
-
-* You can instantiate the central helper class of Spring Mongo, <<mongo-template,`MongoTemplate`>>, by using the standard `com.mongodb.MongoClient` object and the name of the database to use.
-* The mapper works against standard POJO objects without the need for any additional metadata (though you can optionally provide that information. See <<mapping-chapter,here>>.).
-* Conventions are used for handling the `id` field, converting it to be an `ObjectId` when stored in the database.
-* Mapping conventions can use field access. Notice that the `Person` class has only getters.
-* If the constructor argument names match the field names of the stored document, they are used to instantiate the object
-
-[[mongo.examples-repo]]
-== Examples Repository
-
-There is a https://github.com/spring-projects/spring-data-examples[GitHub repository with several examples] that you can download and play around with to get a feel for how the library works.
-
-[[mongodb-connectors]]
-== Connecting to MongoDB with Spring
-
-One of the first tasks when using MongoDB and Spring is to create a `com.mongodb.MongoClient` or `com.mongodb.client.MongoClient` object using the IoC container. There are two main ways to do this, either by using Java-based bean metadata or by using XML-based bean metadata. Both are discussed in the following sections.
-
-NOTE: For those not familiar with how to configure the Spring container using Java-based bean metadata instead of XML-based metadata, see the high-level introduction in the reference docs https://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/new-in-3.0.html#new-java-configuration[here] as well as the detailed documentation https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#beans-java-instantiating-container[here].
-
-[[mongo.mongo-java-config]]
-=== Registering a Mongo Instance by using Java-based Metadata
-
-The following example shows an example of using Java-based bean metadata to register an instance of a `com.mongodb.MongoClient`:
-
-.Registering a `com.mongodb.MongoClient` object using Java-based bean metadata
-====
-[source,java]
-----
-@Configuration
-public class AppConfig {
-
-  /*
-   * Use the standard Mongo driver API to create a com.mongodb.MongoClient instance.
-   */
-   public @Bean MongoClient mongoClient() {
-       return new MongoClient("localhost");
-   }
-}
-----
-====
-
-This approach lets you use the standard `com.mongodb.MongoClient` instance, with the container using Spring's `MongoClientFactoryBean`. As compared to instantiating a `com.mongodb.MongoClient` instance directly, the `FactoryBean` has the added advantage of also providing the container with an `ExceptionTranslator` implementation that translates MongoDB exceptions to exceptions in Spring's portable `DataAccessException` hierarchy for data access classes annotated with the `@Repository` annotation. This hierarchy and the use of `@Repository` is described in https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/data-access.html[Spring's DAO support features].
-
-The following example shows an example of a Java-based bean metadata that supports exception translation on `@Repository` annotated classes:
-
-.Registering a `com.mongodb.MongoClient` object by using Spring's MongoClientFactoryBean and enabling Spring's exception translation support
-====
-[source,java]
-----
-@Configuration
-public class AppConfig {
-
-    /*
-     * Factory bean that creates the com.mongodb.MongoClient instance
-     */
-     public @Bean MongoClientFactoryBean mongo() {
-          MongoClientFactoryBean mongo = new MongoClientFactoryBean();
-          mongo.setHost("localhost");
-          return mongo;
-     }
-}
-----
-====
-
-To access the `com.mongodb.MongoClient` object created by the `MongoClientFactoryBean` in other `@Configuration` classes or your own classes, use a `private @Autowired Mongo mongo;` field.
-
-[[mongo.mongo-xml-config]]
-=== Registering a Mongo Instance by Using XML-based Metadata
-
-While you can use Spring's traditional `<beans/>` XML namespace to register an instance of `com.mongodb.MongoClient` with the container, the XML can be quite verbose, as it is general-purpose. XML namespaces are a better alternative to configuring commonly used objects, such as the Mongo instance. The mongo namespace lets you create a Mongo instance server location, replica-sets, and options.
-
-To use the Mongo namespace elements, you need to reference the Mongo schema, as follows:
-
-.XML schema to configure MongoDB
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xmlns:context="http://www.springframework.org/schema/context"
-          xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-          xsi:schemaLocation=
-          "http://www.springframework.org/schema/context
-          https://www.springframework.org/schema/context/spring-context.xsd
-          http://www.springframework.org/schema/data/mongo https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
-          http://www.springframework.org/schema/beans
-          https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <!-- Default bean name is 'mongo' -->
-    <mongo:mongo-client host="localhost" port="27017"/>
-
-</beans>
-----
-====
-
-The following example shows a more advanced configuration with `MongoClientOptions` (note that these are not recommended values):
-
-.XML schema to configure a com.mongodb.MongoClient object with MongoClientOptions
-====
-[source,xml]
-----
-<beans>
-
-  <mongo:mongo-client host="localhost" port="27017">
-    <mongo:client-options connections-per-host="8"
-                   threads-allowed-to-block-for-connection-multiplier="4"
-                   connect-timeout="1000"
-                   max-wait-time="1500}"
-                   auto-connect-retry="true"
-                   socket-keep-alive="true"
-                   socket-timeout="1500"
-                   slave-ok="true"
-                   write-number="1"
-                   write-timeout="0"
-                   write-fsync="true"/>
-  </mongo:mongo-client>
-
-</beans>
-----
-====
-
-The following example shows a configuration using replica sets:
-
-.XML schema to configure a `com.mongodb.MongoClient` object with Replica Sets
-====
-[source,xml]
-----
-<mongo:mongo-client id="replicaSetMongo" replica-set="127.0.0.1:27017,localhost:27018"/>
-----
-====
-
-[[mongo.mongo-db-factory]]
-=== The MongoDbFactory Interface
-
-While `com.mongodb.MongoClient` is the entry point to the MongoDB driver API, connecting to a specific MongoDB database instance requires additional information, such as the database name and an optional username and password. With that information, you can obtain a `com.mongodb.client.MongoDatabase` object and access all the functionality of a specific MongoDB database instance. Spring provides the `org.springframework.data.mongodb.core.MongoDbFactory` interface, shown in the following listing, to bootstrap connectivity to the database:
-
-[source,java]
-----
-public interface MongoDbFactory {
-
-  MongoDatabase getDb() throws DataAccessException;
-
-  MongoDatabase getDb(String dbName) throws DataAccessException;
-}
-----
-
-The following sections show how you can use the container with either Java-based or XML-based metadata to configure an instance of the `MongoDbFactory` interface. In turn, you can use the `MongoDbFactory` instance to configure `MongoTemplate`.
-
-Instead of using the IoC container to create an instance of MongoTemplate, you can use them in standard Java code, as follows:
-
-[source,java]
-----
-public class MongoApp {
-
-  private static final Log log = LogFactory.getLog(MongoApp.class);
-
-  public static void main(String[] args) throws Exception {
-
-    MongoOperations mongoOps = new MongoTemplate(new SimpleMongoDbFactory(new MongoClient(), "database"));
-
-    mongoOps.insert(new Person("Joe", 34));
-
-    log.info(mongoOps.findOne(new Query(where("name").is("Joe")), Person.class));
-
-    mongoOps.dropCollection("person");
-  }
-}
-----
-
-The code in bold highlights the use of `SimpleMongoDbFactory` and is the only difference between the listing shown in the <<mongodb-getting-started,getting started section>>.
-
-NOTE: Use `SimpleMongoClientDbFactory` when choosing `com.mongodb.client.MongoClient` as the entrypoint of choice.
-
-[[mongo.mongo-db-factory-java]]
-=== Registering a `MongoDbFactory` Instance by Using Java-based Metadata
-
-To register a `MongoDbFactory` instance with the container, you write code much like what was highlighted in the previous code listing. The following listing shows a simple example:
-
-[source,java]
-----
-@Configuration
-public class MongoConfiguration {
-
-  public @Bean MongoDbFactory mongoDbFactory() {
-    return new SimpleMongoDbFactory(new MongoClient(), "database");
-  }
-}
-----
-
-MongoDB Server generation 3 changed the authentication model when connecting to the DB. Therefore, some of the configuration options available for authentication are no longer valid. You should use the `MongoClient`-specific options for setting credentials through `MongoCredential` to provide authentication data, as shown in the following example:
-
-[source,java]
-----
-@Configuration
-public class ApplicationContextEventTestsAppConfig extends AbstractMongoConfiguration {
-
-  @Override
-  public String getDatabaseName() {
-    return "database";
-  }
-
-  @Override
-  @Bean
-  public MongoClient mongoClient() {
-    return new MongoClient(singletonList(new ServerAddress("127.0.0.1", 27017)),
-      singletonList(MongoCredential.createCredential("name", "db", "pwd".toCharArray())));
-  }
-}
-----
-
-In order to use authentication with XML-based configuration, use the `credentials` attribute on the `<mongo-client>` element.
-
-NOTE: Username and password credentials used in XML-based configuration must be URL-encoded when these contain reserved characters, such as `:`, `%`, `@`, or `,`.
-The following example shows encoded credentials:
-`m0ng0@dmin:mo_res:bw6},Qsdxx@admin@database` -> `m0ng0%40dmin:mo_res%3Abw6%7D%2CQsdxx%40admin@database`
-See https://tools.ietf.org/html/rfc3986#section-2.2[section 2.2 of RFC 3986] for further details.
-
-As of MongoDB java driver 3.7.0 there is an alternative entry point to `MongoClient` via the https://search.maven.org/beta/search?q=a:mongodb-driver-sync[mongodb-driver-sync] artifact.
-`com.mongodb.client.MongoClient` is *not* compatible with `com.mongodb.MongoClient` and does not longer support
-the legacy `DBObject` codec. Therefore, it cannot be used with `Querydsl` and requires a different configuration.
-You can use `AbstractMongoClientConfiguration` to leverage the new `MongoClients` builder API.
-
-[source,java]
-----
-@Configuration
-public class MongoClientConfiguration extends AbstractMongoClientConfiguration {
-
-	@Override
-	protected String getDatabaseName() {
-		return "database";
-	}
-
-	@Override
-	public MongoClient mongoClient() {
-		return MongoClients.create("mongodb://localhost:27017/?replicaSet=rs0&w=majority");
-	}
-}
-----
-
-[[mongo.mongo-db-factory-xml]]
-=== Registering a `MongoDbFactory` Instance by Using XML-based Metadata
-
-The `mongo` namespace provides a convenient way to create a `SimpleMongoDbFactory`, as compared to using the `<beans/>` namespace, as shown in the following example:
-
-[source,xml]
-----
-<mongo:db-factory dbname="database">
-----
-
-If you need to configure additional options on the `com.mongodb.MongoClient` instance that is used to create a `SimpleMongoDbFactory`, you can refer to an existing bean by using the `mongo-ref` attribute as shown in the following example. To show another common usage pattern, the following listing shows the use of a property placeholder, which lets you parametrize the configuration and the creation of a `MongoTemplate`:
-
-[source,xml]
-----
-<context:property-placeholder location="classpath:/com/myapp/mongodb/config/mongo.properties"/>
-
-<mongo:mongo-client host="${mongo.host}" port="${mongo.port}">
-  <mongo:client-options
-     connections-per-host="${mongo.connectionsPerHost}"
-     threads-allowed-to-block-for-connection-multiplier="${mongo.threadsAllowedToBlockForConnectionMultiplier}"
-     connect-timeout="${mongo.connectTimeout}"
-     max-wait-time="${mongo.maxWaitTime}"
-     auto-connect-retry="${mongo.autoConnectRetry}"
-     socket-keep-alive="${mongo.socketKeepAlive}"
-     socket-timeout="${mongo.socketTimeout}"
-     slave-ok="${mongo.slaveOk}"
-     write-number="1"
-     write-timeout="0"
-     write-fsync="true"/>
-</mongo:mongo-client>
-
-<mongo:db-factory dbname="database" mongo-ref="mongoClient"/>
-
-<bean id="anotherMongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-  <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
-</bean>
-----
-
-[[mongo-template]]
-== Introduction to `MongoTemplate`
-
-The `MongoTemplate` class, located in the `org.springframework.data.mongodb.core` package, is the central class of Spring's MongoDB support and provides a rich feature set for interacting with the database. The template offers convenience operations to create, update, delete, and query MongoDB documents and provides a mapping between your domain objects and MongoDB documents.
-
-NOTE: Once configured, `MongoTemplate` is thread-safe and can be reused across multiple instances.
-
-The mapping between MongoDB documents and domain classes is done by delegating to an implementation of the `MongoConverter` interface. Spring provides `MappingMongoConverter`, but you can also write your own converter. See "`<<mongo.custom-converters>>`" for more detailed information.
-
-The `MongoTemplate` class implements the interface `MongoOperations`. In as much as possible, the methods on `MongoOperations` are named after methods available on the MongoDB driver `Collection` object, to make the API familiar to existing MongoDB developers who are used to the driver API. For example, you can find methods such as `find`, `findAndModify`, `findAndReplace`, `findOne`, `insert`, `remove`, `save`, `update`, and `updateMulti`. The design goal was to make it as easy as possible to transition between the use of the base MongoDB driver and `MongoOperations`. A major difference between the two APIs is that `MongoOperations` can be passed domain objects instead of `Document`. Also, `MongoOperations` has fluent APIs for `Query`, `Criteria`, and `Update` operations instead of populating a `Document` to specify the parameters for those operations.
-
-NOTE: The preferred way to reference the operations on `MongoTemplate` instance is through its interface, `MongoOperations`.
-
-The default converter implementation used by `MongoTemplate` is `MappingMongoConverter`. While the `MappingMongoConverter` can use additional metadata to specify the mapping of objects to documents, it can also convert objects that contain no additional metadata by using some conventions for the mapping of IDs and collection names. These conventions, as well as the use of mapping annotations, are explained in the "`<<mapping-chapter>>`" chapter.
-
-Another central feature of `MongoTemplate` is translation of exceptions thrown by the MongoDB Java driver into Spring's portable Data Access Exception hierarchy. See "`<<mongo.exception>>`" for more information.
-
-`MongoTemplate` offers many convenience methods to help you easily perform common tasks. However, if you need to directly access the MongoDB driver API, you can use one of several `Execute` callback methods. The execute callbacks gives you a reference to either a `com.mongodb.client.MongoCollection` or a `com.mongodb.client.MongoDatabase` object. See the <<mongo.executioncallback,"`Execution Callbacks`">> section for more information.
-
-The next section contains an example of how to work with the `MongoTemplate` in the context of the Spring container.
-
-[[mongo-template.instantiating]]
-=== Instantiating `MongoTemplate`
-
-You can use Java to create and register an instance of `MongoTemplate`, as the following example shows:
-
-.Registering a `com.mongodb.MongoClient` object and enabling Spring's exception translation support
-====
-[source,java]
-----
-@Configuration
-public class AppConfig {
-
-  public @Bean MongoClient mongoClient() {
-      return new MongoClient("localhost");
-  }
-
-  public @Bean MongoTemplate mongoTemplate() {
-      return new MongoTemplate(mongoClient(), "mydatabase");
-  }
-}
-----
-====
-
-There are several overloaded constructors of `MongoTemplate`:
-
-* `MongoTemplate(MongoClient mongo, String databaseName)`: Takes the `MongoClient` object and the default database name to operate against.
-* `MongoTemplate(MongoDbFactory mongoDbFactory)`: Takes a MongoDbFactory object that encapsulated the `MongoClient` object, database name, and username and password.
-* `MongoTemplate(MongoDbFactory mongoDbFactory, MongoConverter mongoConverter)`: Adds a `MongoConverter` to use for mapping.
-
-You can also configure a MongoTemplate by using Spring's XML <beans/> schema, as the following example shows:
-
-[source,java]
-----
-<mongo:mongo-client host="localhost" port="27017"/>
-
-<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
-  <constructor-arg ref="mongoClient"/>
-  <constructor-arg name="databaseName" value="geospatial"/>
-</bean>
-----
-
-Other optional properties that you might like to set when creating a `MongoTemplate` are the default `WriteResultCheckingPolicy`, `WriteConcern`, and `ReadPreference` properties.
-
-NOTE: The preferred way to reference the operations on `MongoTemplate` instance is through its interface, `MongoOperations`.
-
-[[mongo-template.writeresultchecking]]
-=== `WriteResultChecking` Policy
-
-When in development, it is handy to either log or throw an exception if the `com.mongodb.WriteResult` returned from any MongoDB operation contains an error. It is quite common to forget to do this during development and then end up with an application that looks like it runs successfully when, in fact, the database was not modified according to your expectations. You can set the `WriteResultChecking` property of `MongoTemplate` to one of the following values: `EXCEPTION` or `NONE`, to either throw an `Exception` or do nothing, respectively. The default is to use a `WriteResultChecking` value of `NONE`.
-
-[[mongo-template.writeconcern]]
-=== `WriteConcern`
-
-If it has not yet been specified through the driver at a higher level (such as `com.mongodb.MongoClient`), you can set the `com.mongodb.WriteConcern` property that the `MongoTemplate` uses for write operations. If the `WriteConcern` property is not set, it defaults to the one set in the MongoDB driver's DB or Collection setting.
-
-[[mongo-template.writeconcernresolver]]
-=== `WriteConcernResolver`
-
-For more advanced cases where you want to set different `WriteConcern` values on a per-operation basis (for remove, update, insert, and save operations), a strategy interface called `WriteConcernResolver` can be configured on `MongoTemplate`. Since `MongoTemplate` is used to persist POJOs, the `WriteConcernResolver` lets you create a policy that can map a specific POJO class to a `WriteConcern` value. The following listing shows the  `WriteConcernResolver` interface:
-
-[source,java]
-----
-public interface WriteConcernResolver {
-  WriteConcern resolve(MongoAction action);
-}
-----
-
-You can use the `MongoAction` argument to determine the `WriteConcern` value or use the value of the Template itself as a default. `MongoAction` contains the collection name being written to, the `java.lang.Class` of the POJO, the converted `Document`, the operation (`REMOVE`, `UPDATE`, `INSERT`, `INSERT_LIST`, or `SAVE`), and a few other pieces of contextual information. The following example shows two sets of classes getting different `WriteConcern` settings:
-
-[source]
-----
-private class MyAppWriteConcernResolver implements WriteConcernResolver {
-
-  public WriteConcern resolve(MongoAction action) {
-    if (action.getEntityClass().getSimpleName().contains("Audit")) {
-      return WriteConcern.NONE;
-    } else if (action.getEntityClass().getSimpleName().contains("Metadata")) {
-      return WriteConcern.JOURNAL_SAFE;
-    }
-    return action.getDefaultWriteConcern();
-  }
-}
-----
-
-[[mongo-template.save-update-remove]]
-== Saving, Updating, and Removing Documents
-
-`MongoTemplate` lets you save, update, and delete your domain objects and map those objects to documents stored in MongoDB.
-
-Consider the following class:
-
-[source,java]
-----
-public class Person {
-
-  private String id;
-  private String name;
-  private int age;
-
-  public Person(String name, int age) {
-    this.name = name;
-    this.age = age;
-  }
-
-  public String getId() {
-    return id;
-  }
-  public String getName() {
-    return name;
-  }
-  public int getAge() {
-    return age;
-  }
-
-  @Override
-  public String toString() {
-    return "Person [id=" + id + ", name=" + name + ", age=" + age + "]";
-  }
-
-}
-----
-
-Given the `Person` class in the preceding example, you can save, update and delete the object, as the following example shows:
-
-NOTE: `MongoOperations` is the interface that `MongoTemplate` implements.
-
-[source,java]
-----
-package org.spring.example;
-
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-import static org.springframework.data.mongodb.core.query.Update.update;
-import static org.springframework.data.mongodb.core.query.Query.query;
-
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.data.mongodb.core.MongoOperations;
-import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.SimpleMongoDbFactory;
-
-import com.mongodb.client.MongoClients;
-
-public class MongoApp {
-
-  private static final Log log = LogFactory.getLog(MongoApp.class);
-
-  public static void main(String[] args) {
-
-    MongoOperations mongoOps = new MongoTemplate(new SimpleMongoClientDbFactory(MongoClients.create(), "database"));
-
-    Person p = new Person("Joe", 34);
-
-    // Insert is used to initially store the object into the database.
-    mongoOps.insert(p);
-    log.info("Insert: " + p);
-
-    // Find
-    p = mongoOps.findById(p.getId(), Person.class);
-    log.info("Found: " + p);
-
-    // Update
-    mongoOps.updateFirst(query(where("name").is("Joe")), update("age", 35), Person.class);
-    p = mongoOps.findOne(query(where("name").is("Joe")), Person.class);
-    log.info("Updated: " + p);
-
-    // Delete
-    mongoOps.remove(p);
-
-    // Check that deletion worked
-    List<Person> people =  mongoOps.findAll(Person.class);
-    log.info("Number of people = : " + people.size());
-
-
-    mongoOps.dropCollection(Person.class);
-  }
-}
-----
-
-The preceding example would produce the following log output (including debug messages from `MongoTemplate`):
-
-[source]
-----
-DEBUG apping.MongoPersistentEntityIndexCreator:  80 - Analyzing class class org.spring.example.Person for index information.
-DEBUG work.data.mongodb.core.MongoTemplate: 632 - insert Document containing fields: [_class, age, name] in collection: person
-INFO               org.spring.example.MongoApp:  30 - Insert: Person [id=4ddc6e784ce5b1eba3ceaf5c, name=Joe, age=34]
-DEBUG work.data.mongodb.core.MongoTemplate:1246 - findOne using query: { "_id" : { "$oid" : "4ddc6e784ce5b1eba3ceaf5c"}} in db.collection: database.person
-INFO               org.spring.example.MongoApp:  34 - Found: Person [id=4ddc6e784ce5b1eba3ceaf5c, name=Joe, age=34]
-DEBUG work.data.mongodb.core.MongoTemplate: 778 - calling update using query: { "name" : "Joe"} and update: { "$set" : { "age" : 35}} in collection: person
-DEBUG work.data.mongodb.core.MongoTemplate:1246 - findOne using query: { "name" : "Joe"} in db.collection: database.person
-INFO               org.spring.example.MongoApp:  39 - Updated: Person [id=4ddc6e784ce5b1eba3ceaf5c, name=Joe, age=35]
-DEBUG work.data.mongodb.core.MongoTemplate: 823 - remove using query: { "id" : "4ddc6e784ce5b1eba3ceaf5c"} in collection: person
-INFO               org.spring.example.MongoApp:  46 - Number of people = : 0
-DEBUG work.data.mongodb.core.MongoTemplate: 376 - Dropped collection [database.person]
-----
-
-`MongoConverter` caused implicit conversion between a `String` and an `ObjectId` stored in the database by recognizing (through convention) the `Id` property name.
-
-NOTE: The preceding example is meant to show the use of save, update, and remove operations on `MongoTemplate` and not to show complex mapping functionality.
-
-The query syntax used in the preceding example is explained in more detail in the section "`<<mongo.query>>`".
-
-[[mongo-template.id-handling]]
-=== How the `_id` Field is Handled in the Mapping Layer
-
-MongoDB requires that you have an `_id` field for all documents. If you do not provide one, the driver assigns an `ObjectId` with a generated value. When you use the `MappingMongoConverter`, certain rules govern how properties from the Java class are mapped to this `_id` field:
-
-. A property or field annotated with `@Id` (`org.springframework.data.annotation.Id`) maps to the `_id` field.
-. A property or field without an annotation but named `id` maps to the `_id` field.
-
-The following outlines what type conversion, if any, is done on the property mapped to the `_id` document field when using the `MappingMongoConverter` (the default for `MongoTemplate`).
-
-. If possible, an `id` property or field declared as a `String` in the Java class is converted to and stored as an `ObjectId` by using a Spring `Converter<String, ObjectId>`. Valid conversion rules are delegated to the MongoDB Java driver. If it cannot be converted to an `ObjectId`, then the value is stored as a string in the database.
-. An `id` property or field declared as `BigInteger` in the Java class is converted to and stored as an `ObjectId` by using a Spring `Converter<BigInteger, ObjectId>`.
-
-If no field or property specified in the previous sets of rules is present in the Java class, an implicit `_id` file is generated by the driver but not mapped to a property or field of the Java class.
-
-When querying and updating, `MongoTemplate` uses the converter that corresponds to the preceding rules for saving documents so that field names and types used in your queries can match what is in your domain classes.
-
-Some environments require a customized approach to map `Id` values such as data stored in MongoDB that did not run through the Spring Data mapping layer. Documents can contain `_id` values that can be represented either as `ObjectId` or as `String`.
-Reading documents from the store back to the domain type works just fine. Querying for documents via their `id` can be cumbersome due to the implicit `ObjectId` conversion. Therefore documents cannot be retrieved that way.
-For those cases `@MongoId` provides more control over the actual id mapping attempts.
-
-.`@MongoId` mapping
-====
-[source,java]
-----
-public class PlainStringId {
-  @MongoId String id; <1>
-}
-
-public class PlainObjectId {
-  @MongoId ObjectId id; <2>
-}
-
-public class StringToObjectId {
-  @MongoId(FieldType.OBJECT_ID) String id; <3>
-}
-----
-<1> The id is treated as `String` without further conversion.
-<2> The id is treated as `ObjectId`.
-<3> The id is treated as `ObjectId` if the given `String` is a valid `ObjectId` hex, otherwise as `String`. Corresponds to `@Id` usage.
-====
-
-[[mongo-template.type-mapping]]
-=== Type Mapping
-
-MongoDB collections can contain documents that represent instances of a variety of types. This feature can be useful if you store a hierarchy of classes or have a class with a property of type `Object`. In the latter case, the values held inside that property have to be read in correctly when retrieving the object. Thus, we need a mechanism to store type information alongside the actual document.
-
-To achieve that, the `MappingMongoConverter` uses a `MongoTypeMapper` abstraction with `DefaultMongoTypeMapper` as its main implementation. Its default behavior to store the fully qualified classname under `_class` inside the document. Type hints are written for top-level documents as well as for every value (if it is a complex type and a subtype of the declared property type). The following example (with a JSON representation at the end) shows how the mapping works:
-
-
-.Type mapping
-====
-[source,java]
-----
-public class Sample {
-  Contact value;
-}
-
-public abstract class Contact { … }
-
-public class Person extends Contact { … }
-
-Sample sample = new Sample();
-sample.value = new Person();
-
-mongoTemplate.save(sample);
-
-{
-  "value" : { "_class" : "com.acme.Person" },
-  "_class" : "com.acme.Sample"
-}
-----
-====
-
-Spring Data MongoDB stores the type information as the last field for the actual root class as well as for the nested type (because it is complex and a subtype of `Contact`). So, if you now use `mongoTemplate.findAll(Object.class, "sample")`, you can find out that the document stored is a `Sample` instance. You can also find out that the value property is actually a `Person`.
-
-==== Customizing Type Mapping
-
-If you want to avoid writing the entire Java class name as type information but would rather like to use a key, you can use the `@TypeAlias` annotation on the entity class. If you need to customize the mapping even more, have a look at the `TypeInformationMapper` interface. An instance of that interface can be configured at the `DefaultMongoTypeMapper`, which can, in turn, be configured on `MappingMongoConverter`. The following example shows how to define a type alias for an entity:
-
-.Defining a type alias for an Entity
-====
-[source,java]
-----
-@TypeAlias("pers")
-class Person {
-
-}
-----
-====
-
-Note that the resulting document contains `pers` as the value in the `_class` Field.
-
-==== Configuring Custom Type Mapping
-
-The following example shows how to configure a custom `MongoTypeMapper` in `MappingMongoConverter`:
-
-.Configuring a custom `MongoTypeMapper` with Spring Java Config
-====
-[source,java]
-----
-class CustomMongoTypeMapper extends DefaultMongoTypeMapper {
-  //implement custom type mapping here
-}
-----
-
-
-[source,java]
-----
-@Configuration
-class SampleMongoConfiguration extends AbstractMongoConfiguration {
-
-  @Override
-  protected String getDatabaseName() {
-    return "database";
-  }
-
-  @Override
-  public MongoClient mongoClient() {
-    return new MongoClient();
-  }
-
-  @Bean
-  @Override
-  public MappingMongoConverter mappingMongoConverter() throws Exception {
-    MappingMongoConverter mmc = super.mappingMongoConverter();
-    mmc.setTypeMapper(customTypeMapper());
-    return mmc;
-  }
-
-  @Bean
-  public MongoTypeMapper customTypeMapper() {
-    return new CustomMongoTypeMapper();
-  }
-}
-----
-====
-
-Note that the preceding example extends the `AbstractMongoConfiguration` class and overrides the bean definition of the `MappingMongoConverter` where we configured our custom `MongoTypeMapper`.
-
-The following example shows how to use XML to configure a custom `MongoTypeMapper`:
-
-.Configuring a custom `MongoTypeMapper` with XML
-====
-[source,xml]
-----
-<mongo:mapping-converter type-mapper-ref="customMongoTypeMapper"/>
-
-<bean name="customMongoTypeMapper" class="com.bubu.mongo.CustomMongoTypeMapper"/>
-----
-====
-
-[[mongo-template.save-insert]]
-=== Methods for Saving and Inserting Documents
-
-There are several convenient methods on `MongoTemplate` for saving and inserting your objects. To have more fine-grained control over the conversion process, you can register Spring converters with the `MappingMongoConverter` -- for example  `Converter<Person, Document>` and `Converter<Document, Person>`.
-
-NOTE: The difference between insert and save operations is that a save operation performs an insert if the object is not already present.
-
-The simple case of using the save operation is to save a POJO. In this case, the collection name is determined by name (not fully qualified) of the class. You may also call the save operation with a specific collection name. You can use mapping metadata to override the collection in which to store the object.
-
-When inserting or saving, if the `Id` property is not set, the assumption is that its value will be auto-generated by the database. Consequently, for auto-generation of an `ObjectId` to succeed, the type of the `Id` property or field in your class must be a `String`, an `ObjectId`, or a `BigInteger`.
-
-The following example shows how to save a document and retrieving its contents:
-
-.Inserting and retrieving documents using the MongoTemplate
-====
-[source,java]
-----
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-import static org.springframework.data.mongodb.core.query.Criteria.query;
-…
-
-Person p = new Person("Bob", 33);
-mongoTemplate.insert(p);
-
-Person qp = mongoTemplate.findOne(query(where("age").is(33)), Person.class);
-----
-====
-
-The following insert and save operations are available:
-
-* `void` *save* `(Object objectToSave)`: Save the object to the default collection.
-* `void` *save* `(Object objectToSave, String collectionName)`: Save the object to the specified collection.
-
-A similar set of insert operations is also available:
-
-* `void` *insert* `(Object objectToSave)`: Insert the object to the default collection.
-* `void` *insert* `(Object objectToSave, String collectionName)`: Insert the object to the specified collection.
-
-[[mongo-template.save-insert.collection]]
-==== Into Which Collection Are My Documents Saved?
-
-There are two ways to manage the collection name that is used for the documents. The default collection name that is used is the class name changed to start with a lower-case letter. So a `com.test.Person` class is stored in the `person` collection. You can customize this by providing a different collection name with the `@Document` annotation. You can also override the collection name by providing your own collection name as the last parameter for the selected `MongoTemplate` method calls.
-
-[[mongo-template.save-insert.individual]]
-==== Inserting or Saving Individual Objects
-
-The MongoDB driver supports inserting a collection of documents in a single operation. The following methods in the `MongoOperations` interface support this functionality:
-
-* *insert*: Inserts an object. If there is an existing document with the same `id`, an error is generated.
-* *insertAll*: Takes a `Collection` of objects as the first parameter. This method inspects each object and inserts it into the appropriate collection, based on the rules specified earlier.
-* *save*: Saves the object, overwriting any object that might have the same `id`.
-
-[[mongo-template.save-insert.batch]]
-==== Inserting Several Objects in a Batch
-
-The MongoDB driver supports inserting a collection of documents in one operation. The following methods in the `MongoOperations` interface support this functionality:
-
-* *insert* methods: Take a `Collection` as the first argument. They insert a list of objects in a single batch write to the database.
-
-[[mongodb-template-update]]
-=== Updating Documents in a Collection
-
-For updates, you can update the first document found by using `MongoOperation.updateFirst` or you can update all documents that were found to match the query by using the `MongoOperation.updateMulti` method. The following example shows an update of all `SAVINGS` accounts where we are adding a one-time $50.00 bonus to the balance by using the `$inc` operator:
-
-.Updating documents by using the `MongoTemplate`
-====
-[source,java]
-----
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-import static org.springframework.data.mongodb.core.query.Query;
-import static org.springframework.data.mongodb.core.query.Update;
-
-...
-
-WriteResult wr = mongoTemplate.updateMulti(new Query(where("accounts.accountType").is(Account.Type.SAVINGS)),
-  new Update().inc("accounts.$.balance", 50.00), Account.class);
-----
-====
-
-In addition to the `Query` discussed earlier, we provide the update definition by using an `Update` object. The `Update` class has methods that match the update modifiers available for MongoDB.
-
-Most methods return the `Update` object to provide a fluent style for the API.
-
-[[mongodb-template-update.methods]]
-==== Methods for Executing Updates for Documents
-
-* *updateFirst*: Updates the first document that matches the query document criteria with the updated document.
-* *updateMulti*: Updates all objects that match the query document criteria with the updated document.
-
-WARNING: `updateFirst` does not support ordering. Please use <<mongo-template.find-and-upsert, findAndModify>> to apply `Sort`.
-
-[[mongodb-template-update.update]]
-==== Methods in the `Update` Class
-
-You can use a little "'syntax sugar'" with the `Update` class, as its methods are meant to be chained together. Also, you can kick-start the creation of a new `Update` instance by using `public static Update update(String key, Object value)` and using static imports.
-
-The `Update` class contains the following methods:
-
-* `Update` *addToSet* `(String key, Object value)` Update using the `$addToSet` update modifier
-* `Update` *currentDate* `(String key)` Update using the `$currentDate` update modifier
-* `Update` *currentTimestamp* `(String key)` Update using the `$currentDate` update modifier with `$type` `timestamp`
-* `Update` *inc* `(String key, Number inc)` Update using the `$inc` update modifier
-* `Update` *max* `(String key, Object max)` Update using the `$max` update modifier
-* `Update` *min* `(String key, Object min)` Update using the `$min` update modifier
-* `Update` *multiply* `(String key, Number multiplier)` Update using the `$mul` update modifier
-* `Update` *pop* `(String key, Update.Position pos)` Update using the `$pop` update modifier
-* `Update` *pull* `(String key, Object value)` Update using the `$pull` update modifier
-* `Update` *pullAll* `(String key, Object[] values)` Update using the `$pullAll` update modifier
-* `Update` *push* `(String key, Object value)` Update using the `$push` update modifier
-* `Update` *pushAll* `(String key, Object[] values)` Update using the `$pushAll` update modifier
-* `Update` *rename* `(String oldName, String newName)` Update using the `$rename` update modifier
-* `Update` *set* `(String key, Object value)` Update using the `$set` update modifier
-* `Update` *setOnInsert* `(String key, Object value)` Update using the `$setOnInsert` update modifier
-* `Update` *unset* `(String key)` Update using the `$unset` update modifier
-
-Some update modifiers, such as `$push` and `$addToSet`, allow nesting of additional operators.
-
-[source]
-----
-// { $push : { "category" : { "$each" : [ "spring" , "data" ] } } }
-new Update().push("category").each("spring", "data")
-
-// { $push : { "key" : { "$position" : 0 , "$each" : [ "Arya" , "Arry" , "Weasel" ] } } }
-new Update().push("key").atPosition(Position.FIRST).each(Arrays.asList("Arya", "Arry", "Weasel"));
-
-// { $push : { "key" : { "$slice" : 5 , "$each" : [ "Arya" , "Arry" , "Weasel" ] } } }
-new Update().push("key").slice(5).each(Arrays.asList("Arya", "Arry", "Weasel"));
-
-// { $addToSet : { "values" : { "$each" : [ "spring" , "data" , "mongodb" ] } } }
-new Update().addToSet("values").each("spring", "data", "mongodb");
-----
-
-[[mongo-template.upserts]]
-=== "`Upserting`" Documents in a Collection
-
-Related to performing an `updateFirst` operation, you can also perform an "`upsert`" operation, which will perform an insert if no document is found that matches the query. The document that is inserted is a combination of the query document and the update document. The following example shows how to use the `upsert` method:
-
-[source]
-----
-template.upsert(query(where("ssn").is(1111).and("firstName").is("Joe").and("Fraizer").is("Update")), update("address", addr), Person.class);
-----
-
-WARNING: `upsert` does not support ordering. Please use <<mongo-template.find-and-upsert, findAndModify>> to apply `Sort`.
-
-[[mongo-template.find-and-upsert]]
-=== Finding and Upserting Documents in a Collection
-
-The `findAndModify(…)` method on `MongoCollection` can update a document and return either the old or newly updated document in a single operation. `MongoTemplate` provides four `findAndModify` overloaded methods that take `Query` and `Update` classes and converts from `Document` to your POJOs:
-
-[source,java]
-----
-<T> T findAndModify(Query query, Update update, Class<T> entityClass);
-
-<T> T findAndModify(Query query, Update update, Class<T> entityClass, String collectionName);
-
-<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass);
-
-<T> T findAndModify(Query query, Update update, FindAndModifyOptions options, Class<T> entityClass, String collectionName);
-----
-
-The following example inserts a few `Person` objects into the container and performs a `findAndUpdate` operation:
-
-[source,java]
-----
-mongoTemplate.insert(new Person("Tom", 21));
-mongoTemplate.insert(new Person("Dick", 22));
-mongoTemplate.insert(new Person("Harry", 23));
-
-Query query = new Query(Criteria.where("firstName").is("Harry"));
-Update update = new Update().inc("age", 1);
-Person p = mongoTemplate.findAndModify(query, update, Person.class); // return's old person object
-
-assertThat(p.getFirstName(), is("Harry"));
-assertThat(p.getAge(), is(23));
-p = mongoTemplate.findOne(query, Person.class);
-assertThat(p.getAge(), is(24));
-
-// Now return the newly updated document when updating
-p = template.findAndModify(query, update, new FindAndModifyOptions().returnNew(true), Person.class);
-assertThat(p.getAge(), is(25));
-----
-
-The `FindAndModifyOptions` method lets you set the options of `returnNew`, `upsert`, and `remove`. An example extending from the previous code snippet follows:
-
-[source,java]
-----
-Query query2 = new Query(Criteria.where("firstName").is("Mary"));
-p = mongoTemplate.findAndModify(query2, update, new FindAndModifyOptions().returnNew(true).upsert(true), Person.class);
-assertThat(p.getFirstName(), is("Mary"));
-assertThat(p.getAge(), is(1));
-----
-
-[[mongo-template.aggregation-update]]
-=== Aggregation Pipeline Updates
-
-Update methods exposed by `MongoOperations` and `ReactiveMongoOperations` also accept an <<mongo.aggregation, Aggregation Pipeline>> via `AggregationUpdate`.
-Using `AggregationUpdate` allows leveraging https://docs.mongodb.com/manual/reference/method/db.collection.update/#update-with-aggregation-pipeline[MongoDB 4.2 aggregations] in an update operation.
-Using aggregations in an update allows updating one or more fields by expressing multiple stages and multiple conditions with a single operation.
-
-The update can consist of the following stages:
-
-* `AggregationUpdate.set(...).toValue(...)` -> `$set : { ... }`
-* `AggregationUpdate.unset(...)` -> `$unset : [ ... ]`
-* `AggregationUpdate.replaceWith(...)` -> `$replaceWith : { ... }`
-
-.Update Aggregation
-====
-[source,java]
-----
-AggregationUpdate update = Aggregation.newUpdate()
-    .set("average").toValue(ArithmeticOperators.valueOf("tests").avg())     <1>
-    .set("grade").toValue(ConditionalOperators.switchCases(                 <2>
-        when(valueOf("average").greaterThanEqualToValue(90)).then("A"),
-        when(valueOf("average").greaterThanEqualToValue(80)).then("B"),
-        when(valueOf("average").greaterThanEqualToValue(70)).then("C"),
-        when(valueOf("average").greaterThanEqualToValue(60)).then("D"))
-        .defaultTo("F")
-    );
-
-template.update(Student.class)                                              <3>
-    .apply(update)
-    .all();                                                                 <4>
-----
-[source,javascript]
-----
-db.students.update(                                                         <3>
-   { },
-   [
-     { $set: { average : { $avg: "$tests" } } },                            <1>
-     { $set: { grade: { $switch: {                                          <2>
-                           branches: [
-                               { case: { $gte: [ "$average", 90 ] }, then: "A" },
-                               { case: { $gte: [ "$average", 80 ] }, then: "B" },
-                               { case: { $gte: [ "$average", 70 ] }, then: "C" },
-                               { case: { $gte: [ "$average", 60 ] }, then: "D" }
-                           ],
-                           default: "F"
-     } } } }
-   ],
-   { multi: true }                                                          <4>
-)
-----
-<1> The 1st `$set` stage calculates a new field _average_ based on the average of the _tests_ field.
-<2> The 2nd `$set` stage calculates a new field _grade_ based on the _average_ field calculated by the first aggregation stage.
-<3> The pipeline is executed on the _students_ collection and uses `Student` for the aggregation field mapping.
-<4> Apply the update to all matching documents in the collection.
-====
-
-[[mongo-template.find-and-replace]]
-=== Finding and Replacing Documents
-
-The most straight forward method of replacing an entire `Document` is via its `id` using the `save` method. However this
-might not always be feasible. `findAndReplace` offers an alternative that allows to identify the document to replace via
-a simple query.
-
-.Find and Replace Documents
-====
-[source,java]
-----
-Optional<User> result = template.update(Person.class)      <1>
-    .matching(query(where("firstame").is("Tom")))          <2>
-    .replaceWith(new Person("Dick"))
-    .withOptions(FindAndReplaceOptions.options().upsert()) <3>
-    .as(User.class)                                        <4>
-    .findAndReplace();                                     <5>
-----
-<1> Use the fluent update API with the domain type given for mapping the query and deriving the collection name or just use `MongoOperations#findAndReplace`.
-<2> The actual match query mapped against the given domain type. Provide `sort`, `fields` and `collation` settings via the query.
-<3> Additional optional hook to provide options other than the defaults, like `upsert`.
-<4> An optional projection type used for mapping the operation result. If none given the initial domain type is used.
-<5> Trigger the actual execution. Use `findAndReplaceValue` to obtain the nullable result instead of an `Optional`.
-====
-
-IMPORTANT: Please note that the replacement must not hold an `id` itself as the `id` of the existing `Document` will be
-carried over to the replacement by the store itself. Also keep in mind that `findAndReplace` will only replace the first
-document matching the query criteria depending on a potentially given sort order.
-
-[[mongo-template.delete]]
-=== Methods for Removing Documents
-
-You can use one of five overloaded methods to remove an object from the database:
-
-====
-[source,java]
-----
-template.remove(tywin, "GOT");                                              <1>
-
-template.remove(query(where("lastname").is("lannister")), "GOT");           <2>
-
-template.remove(new Query().limit(3), "GOT");                               <3>
-
-template.findAllAndRemove(query(where("lastname").is("lannister"), "GOT");  <4>
-
-template.findAllAndRemove(new Query().limit(3), "GOT");                     <5>
-----
-<1> Remove a single entity specified by its `_id` from the associated collection.
-<2> Remove all documents that match the criteria of the query from the `GOT` collection.
-<3> Remove the first three documents in the `GOT` collection. Unlike <2>, the documents to remove are identified by their `_id`, executing the given query, applying `sort`, `limit`, and `skip` options first, and then removing all at once in a separate step.
-<4> Remove all documents matching the criteria of the query from the `GOT` collection. Unlike <3>, documents do not get deleted in a batch but one by one.
-<5> Remove the first three documents in the `GOT` collection. Unlike <3>, documents do not get deleted in a batch but one by one.
-====
-
-[[mongo-template.optimistic-locking]]
-=== Optimistic Locking
-
-The `@Version` annotation provides syntax similar to that of JPA in the context of MongoDB and makes sure updates are only applied to documents with a matching version. Therefore, the actual value of the version property is added to the update query in such a way that the update does not have any effect if another operation altered the document in the meantime. In that case, an `OptimisticLockingFailureException` is thrown. The following example shows these features:
-
-====
-[source,java]
-----
-@Document
-class Person {
-
-  @Id String id;
-  String firstname;
-  String lastname;
-  @Version Long version;
-}
-
-Person daenerys = template.insert(new Person("Daenerys"));                            <1>
-
-Person tmp = template.findOne(query(where("id").is(daenerys.getId())), Person.class); <2>
-
-daenerys.setLastname("Targaryen");
-template.save(daenerys);                                                              <3>
-
-template.save(tmp); // throws OptimisticLockingFailureException                       <4>
-----
-<1> Intially insert document. `version` is set to `0`.
-<2> Load the just inserted document. `version` is still `0`.
-<3> Update the document with `version = 0`. Set the `lastname` and bump `version` to `1`.
-<4> Try to update the previously loaded document that still has `version = 0`. The operation fails with an `OptimisticLockingFailureException`, as the current `version` is `1`.
-====
-
-IMPORTANT: Optimistic Locking requires to set the `WriteConcern` to `ACKNOWLEDGED`. Otherwise `OptimisticLockingFailureException` can be silently swallowed.
-
-NOTE: As of Version 2.2 `MongoOperations` also includes the `@Version` property when removing an entity from the database.
-To remove a `Document` without version check use `MongoOperations#remove(Query,...)` instead of `MongoOperations#remove(Object)`.
-
-NOTE: As of Version 2.2 repositories check for the outcome of acknowledged deletes when removing versioned entities.
-An `OptimisticLockingFailureException` is raised if a versioned entity cannot be deleted through `CrudRepository.delete(Object)`. In such case, the version was changed or the object was deleted in the meantime. Use `CrudRepository.deleteById(ID)` to bypass optimistic locking functionality and delete objects regardless of their version.
-
-[[mongo.query]]
-== Querying Documents
-
-You can use the `Query` and `Criteria` classes to express your queries. They have method names that mirror the native MongoDB operator names, such as `lt`, `lte`, `is`, and others. The `Query` and `Criteria` classes follow a fluent API style so that you can chain together multiple method criteria and queries while having easy-to-understand code. To improve readability, static imports let you avoid using the 'new' keyword for creating `Query` and `Criteria` instances. You can also use `BasicQuery` to create `Query` instances from plain JSON Strings, as shown in the following example:
-
-.Creating a Query instance from a plain JSON String
-====
-[source,java]
-----
-BasicQuery query = new BasicQuery("{ age : { $lt : 50 }, accounts.balance : { $gt : 1000.00 }}");
-List<Person> result = mongoTemplate.find(query, Person.class);
-----
-====
-
-Spring MongoDB also supports GeoSpatial queries (see the <<mongo.geospatial,GeoSpatial Queries>> section) and Map-Reduce operations (see the <<mongo.mapreduce,Map-Reduce>> section.).
-
-[[mongodb-template-query]]
-=== Querying Documents in a Collection
-
-Earlier, we saw how to retrieve a single document by using the `findOne` and `findById` methods on `MongoTemplate`. These methods return a single domain object. We can also query for a collection of documents to be returned as a list of domain objects. Assuming that we have a number of `Person` objects with name and age stored as documents in a collection and that each person has an embedded account document with a balance, we can now run a query using the following code:
-
-.Querying for documents using the MongoTemplate
-====
-[source,java]
-----
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-import static org.springframework.data.mongodb.core.query.Query.query;
-
-…
-
-List<Person> result = mongoTemplate.find(query(where("age").lt(50)
-  .and("accounts.balance").gt(1000.00d)), Person.class);
-----
-====
-
-All find methods take a `Query` object as a parameter. This object defines the criteria and options used to perform the query. The criteria are specified by using a `Criteria` object that has a static factory method named `where` to instantiate a new `Criteria` object. We recommend using static imports for `org.springframework.data.mongodb.core.query.Criteria.where` and `Query.query` to make the query more readable.
-
-The query should return a list of `Person` objects that meet the specified criteria. The rest of this section lists the methods of the `Criteria` and `Query` classes that correspond to the operators provided in MongoDB. Most methods return the `Criteria` object, to provide a fluent style for the API.
-
-[[mongodb-template-query.criteria]]
-==== Methods for the Criteria Class
-
-The `Criteria` class provides the following methods, all of which correspond to operators in MongoDB:
-
-* `Criteria` *all* `(Object o)` Creates a criterion using the `$all` operator
-* `Criteria` *and* `(String key)` Adds a chained `Criteria` with the specified `key` to the current `Criteria` and returns the newly created one
-* `Criteria` *andOperator* `(Criteria... criteria)` Creates an and query using the `$and` operator for all of the provided criteria (requires MongoDB 2.0 or later)
-* `Criteria` *elemMatch* `(Criteria c)` Creates a criterion using the `$elemMatch` operator
-* `Criteria` *exists* `(boolean b)` Creates a criterion using the `$exists` operator
-* `Criteria` *gt* `(Object o)` Creates a criterion using the `$gt` operator
-* `Criteria` *gte* `(Object o)` Creates a criterion using the `$gte` operator
-* `Criteria` *in* `(Object... o)` Creates a criterion using the `$in` operator for a varargs argument.
-* `Criteria` *in* `(Collection<?> collection)` Creates a criterion using the `$in` operator using a collection
-* `Criteria` *is* `(Object o)` Creates a criterion using field matching (`{ key:value }`). If the specified value is a document, the order of the fields and exact equality in the document matters.
-* `Criteria` *lt* `(Object o)` Creates a criterion using the `$lt` operator
-* `Criteria` *lte* `(Object o)` Creates a criterion using the `$lte` operator
-* `Criteria` *mod* `(Number value, Number remainder)` Creates a criterion using the `$mod` operator
-* `Criteria` *ne* `(Object o)` Creates a criterion using the `$ne` operator
-* `Criteria` *nin* `(Object... o)` Creates a criterion using the `$nin` operator
-* `Criteria` *norOperator* `(Criteria... criteria)` Creates an nor query using the `$nor` operator for all of the provided criteria
-* `Criteria` *not* `()` Creates a criterion using the `$not` meta operator which affects the clause directly following
-* `Criteria` *orOperator* `(Criteria... criteria)` Creates an or query using the `$or` operator for all of the provided  criteria
-* `Criteria` *regex* `(String re)` Creates a criterion using a `$regex`
-* `Criteria` *size* `(int s)` Creates a criterion using the `$size` operator
-* `Criteria` *type* `(int t)` Creates a criterion using the `$type` operator
-* `Criteria` *matchingDocumentStructure* `(MongoJsonSchema schema)` Creates a criterion using the `$jsonSchema` operator for <<mongo.jsonSchema,JSON schema criteria>>. `$jsonSchema` can only be applied on the top level of a query and not property specific. Use the `properties` attribute of the schema to match against nested fields.
-* `Criteria` *bits()* is the gateway to https://docs.mongodb.com/manual/reference/operator/query-bitwise/[MongoDB bitwise query operators] like `$bitsAllClear`.
-
-
-The Criteria class also provides the following methods for geospatial queries (see the <<mongo.geospatial,GeoSpatial Queries>> section to see them in action):
-
-* `Criteria` *within* `(Circle circle)` Creates a geospatial criterion using `$geoWithin $center` operators.
-* `Criteria` *within* `(Box box)` Creates a geospatial criterion using a `$geoWithin $box` operation.
-* `Criteria` *withinSphere* `(Circle circle)` Creates a geospatial criterion using `$geoWithin $center` operators.
-* `Criteria` *near* `(Point point)` Creates a geospatial criterion using a `$near` operation
-* `Criteria` *nearSphere* `(Point point)` Creates a geospatial criterion using `$nearSphere$center` operations. This is only available for MongoDB 1.7 and higher.
-* `Criteria` *minDistance* `(double minDistance)` Creates a geospatial criterion using the `$minDistance` operation, for use with $near.
-* `Criteria` *maxDistance* `(double maxDistance)` Creates a geospatial criterion using the `$maxDistance` operation, for use with $near.
-
-
-[[mongodb-template-query.query]]
-==== Methods for the Query class
-
-The `Query` class has some additional methods that provide options for the query:
-
-* `Query` *addCriteria* `(Criteria criteria)` used to add additional criteria to the query
-* `Field` *fields* `()` used to define fields to be included in the query results
-* `Query` *limit* `(int limit)` used to limit the size of the returned results to the provided limit (used for paging)
-* `Query` *skip* `(int skip)` used to skip the provided number of documents in the results (used for paging)
-* `Query` *with* `(Sort sort)` used to provide sort definition for the results
-
-[[mongo-template.querying]]
-=== Methods for Querying for Documents
-
-The query methods need to specify the target type `T` that is returned, and they are overloaded with an explicit collection name for queries that should operate on a collection other than the one indicated by the return type. The following query methods let you find one or more documents:
-
-* *findAll*: Query for a list of objects of type `T` from the collection.
-* *findOne*: Map the results of an ad-hoc query on the collection to a single instance of an object of the specified type.
-* *findById*: Return an object of the given ID and target class.
-* *find*: Map the results of an ad-hoc query on the collection to a `List` of the specified type.
-* *findAndRemove*: Map the results of an ad-hoc query on the collection to a single instance of an object of the specified type. The first document that matches the query is returned and removed from the collection in the database.
-
-[[mongo-template.query.distinct]]
-=== Query Distinct Values
-
-MongoDB provides an operation to obtain distinct values for a single field by using a query from the resulting documents.
-Resulting values are not required to have the same data type, nor is the feature limited to simple types.
-For retrieval, the actual result type does matter for the sake of conversion and typing. The following example shows how to query for distinct values:
-
-.Retrieving distinct values
-====
-[source,java]
-----
-template.query(Person.class)  <1>
-  .distinct("lastname")       <2>
-  .all();                     <3>
-----
-<1> Query the `Person` collection.
-<2> Select distinct  values of the `lastname` field. The field name is mapped according to the domain types property declaration, taking potential `@Field` annotations into account.
-<3> Retrieve all distinct values as a `List` of `Object` (due to no explicit result type being specified).
-====
-
-Retrieving distinct values into a `Collection` of `Object` is the most flexible way, as it tries to determine the property value of the domain type and convert results to the desired type or mapping `Document` structures.
-
-Sometimes, when all values of the desired field are fixed to a certain type, it is more convenient to directly obtain a correctly typed `Collection`, as shown in the following example:
-
-.Retrieving strongly typed distinct values
-====
-[source,java]
-----
-template.query(Person.class)  <1>
-  .distinct("lastname")       <2>
-  .as(String.class)           <3>
-  .all();                     <4>
-----
-<1> Query the collection of `Person`.
-<2> Select distinct values of the `lastname` field. The fieldname is mapped according to the domain types property declaration, taking potential `@Field` annotations into account.
-<3> Retrieved values are converted into the desired target type -- in this case, `String`. It is also possible to map the values to a more complex type if the stored field contains a document.
-<4> Retrieve all distinct values as a `List` of `String`. If the type cannot be converted into the desired target type, this method throws a `DataAccessException`.
-====
-
-[[mongo.geospatial]]
-=== GeoSpatial Queries
-
-MongoDB supports GeoSpatial queries through the use of operators such as `$near`, `$within`, `geoWithin`, and `$nearSphere`. Methods specific to geospatial queries are available on the `Criteria` class. There are also a few shape classes (`Box`, `Circle`, and `Point`) that are used in conjunction with geospatial related `Criteria` methods.
-
-NOTE: Using GeoSpatial queries requires attention when used within MongoDB transactions, see <<mongo.transactions.behavior>>.
-
-To understand how to perform GeoSpatial queries, consider the following `Venue` class (taken from the integration tests and relying on the rich `MappingMongoConverter`):
-
-[source,java]
-----
-@Document(collection="newyork")
-public class Venue {
-
-  @Id
-  private String id;
-  private String name;
-  private double[] location;
-
-  @PersistenceConstructor
-  Venue(String name, double[] location) {
-    super();
-    this.name = name;
-    this.location = location;
-  }
-
-  public Venue(String name, double x, double y) {
-    super();
-    this.name = name;
-    this.location = new double[] { x, y };
-  }
-
-  public String getName() {
-    return name;
-  }
-
-  public double[] getLocation() {
-    return location;
-  }
-
-  @Override
-  public String toString() {
-    return "Venue [id=" + id + ", name=" + name + ", location="
-        + Arrays.toString(location) + "]";
-  }
-}
-----
-
-To find locations within a `Circle`, you can use the following query:
-
-[source,java]
-----
-Circle circle = new Circle(-73.99171, 40.738868, 0.01);
-List<Venue> venues =
-    template.find(new Query(Criteria.where("location").within(circle)), Venue.class);
-----
-
-To find venues within a `Circle` using spherical coordinates, you can use the following query:
-
-[source,java]
-----
-Circle circle = new Circle(-73.99171, 40.738868, 0.003712240453784);
-List<Venue> venues =
-    template.find(new Query(Criteria.where("location").withinSphere(circle)), Venue.class);
-----
-
-To find venues within a `Box`, you can use the following query:
-
-[source,java]
-----
-//lower-left then upper-right
-Box box = new Box(new Point(-73.99756, 40.73083), new Point(-73.988135, 40.741404));
-List<Venue> venues =
-    template.find(new Query(Criteria.where("location").within(box)), Venue.class);
-----
-
-To find venues near a `Point`, you can use the following queries:
-
-[source,java]
-----
-Point point = new Point(-73.99171, 40.738868);
-List<Venue> venues =
-    template.find(new Query(Criteria.where("location").near(point).maxDistance(0.01)), Venue.class);
-----
-
-[source,java]
-----
-Point point = new Point(-73.99171, 40.738868);
-List<Venue> venues =
-    template.find(new Query(Criteria.where("location").near(point).minDistance(0.01).maxDistance(100)), Venue.class);
-----
-
-To find venues near a `Point` using spherical coordinates, you can use the following query:
-
-[source,java]
-----
-Point point = new Point(-73.99171, 40.738868);
-List<Venue> venues =
-    template.find(new Query(
-        Criteria.where("location").nearSphere(point).maxDistance(0.003712240453784)),
-        Venue.class);
-----
-
-[[mongo.geo-near]]
-==== Geo-near Queries
-
-[WARNING]
-====
-*Changed in 2.2!* +
-https://docs.mongodb.com/master/release-notes/4.2-compatibility/[MongoDB 4.2] removed support for the
-`geoNear` command which had been previously used to run the `NearQuery`.
-
-Spring Data MongoDB 2.2 `MongoOperations#geoNear` uses the `$geoNear` https://docs.mongodb.com/manual/reference/operator/aggregation/geoNear/[aggregation]
-instead of the `geoNear` command to run a `NearQuery`.
-
-The calculated distance (the `dis` when using a geoNear command) previously returned within a wrapper type now is embedded
-into the resulting document.
-If the given domain type already contains a property with that name, the calculated distance
-is named `calculated-distance` with a potentially random postfix.
-
-Target types may contain a property named after the returned distance to (additionally) read it back directly into the domain type as shown below.
-
-[source,java]
-----
-GeoResults<VenueWithDisField> = template.query(Venue.class) <1>
-    .as(VenueWithDisField.class)                            <2>
-    .near(NearQuery.near(new GeoJsonPoint(-73.99, 40.73), KILOMETERS))
-    .all();
-----
-<1> Domain type used to identify the target collection and potential query mapping.
-<2> Target type containing a `dis` field of type `Number`.
-====
-
-MongoDB supports querying the database for geo locations and calculating the distance from a given origin at the same time. With geo-near queries, you can express queries such as "find all restaurants in the surrounding 10 miles". To let you do so, `MongoOperations` provides `geoNear(…)` methods that take a `NearQuery` as an argument (as well as the already familiar entity type and collection), as shown in the following example:
-
-[source,java]
-----
-Point location = new Point(-73.99171, 40.738868);
-NearQuery query = NearQuery.near(location).maxDistance(new Distance(10, Metrics.MILES));
-
-GeoResults<Restaurant> = operations.geoNear(query, Restaurant.class);
-----
-
-We use the `NearQuery` builder API to set up a query to return all `Restaurant` instances surrounding the given `Point` out to 10 miles. The `Metrics` enum used here actually implements an interface so that other metrics could be plugged into a distance as well. A `Metric` is backed by a multiplier to transform the distance value of the given metric into native distances. The sample shown here would consider the 10 to be miles. Using one of the built-in metrics (miles and kilometers) automatically triggers the spherical flag to be set on the query. If you want to avoid that, pass plain `double` values into `maxDistance(…)`. For more information, see the https://docs.spring.io/spring-data/mongodb/docs/{version}/api/index.html[JavaDoc] of `NearQuery` and `Distance`.
-
-The geo-near operations return a `GeoResults` wrapper object that encapsulates `GeoResult` instances. Wrapping `GeoResults` allows accessing the average distance of all results. A single `GeoResult` object carries the entity found plus its distance from the origin.
-
-[[mongo.geo-json]]
-=== GeoJSON Support
-
-MongoDB supports https://geojson.org/[GeoJSON] and simple (legacy) coordinate pairs for geospatial data. Those formats can both be used for storing as well as querying data. See the https://docs.mongodb.org/manual/core/2dsphere/#geospatial-indexes-store-geojson/[MongoDB manual on GeoJSON support] to learn about requirements and restrictions.
-
-==== GeoJSON Types in Domain Classes
-
-Usage of https://geojson.org/[GeoJSON] types in domain classes is straightforward. The `org.springframework.data.mongodb.core.geo` package contains types such as `GeoJsonPoint`, `GeoJsonPolygon`, and others. These types are extend the existing `org.springframework.data.geo` types. The following example uses a `GeoJsonPoint`:
-
-====
-[source,java]
-----
-public class Store {
-
-	String id;
-
-	/**
-	 * location is stored in GeoJSON format.
-	 * {
-	 *   "type" : "Point",
-	 *   "coordinates" : [ x, y ]
-	 * }
-	 */
-	GeoJsonPoint location;
-}
-----
-====
-
-==== GeoJSON Types in Repository Query Methods
-
-Using GeoJSON types as repository query parameters forces usage of the `$geometry` operator when creating the query, as the following example shows:
-
-====
-[source,java]
-----
-public interface StoreRepository extends CrudRepository<Store, String> {
-
-	List<Store> findByLocationWithin(Polygon polygon);  <1>
-
-}
-
-/*
- * {
- *   "location": {
- *     "$geoWithin": {
- *       "$geometry": {
- *         "type": "Polygon",
- *         "coordinates": [
- *           [
- *             [-73.992514,40.758934],
- *             [-73.961138,40.760348],
- *             [-73.991658,40.730006],
- *             [-73.992514,40.758934]
- *           ]
- *         ]
- *       }
- *     }
- *   }
- * }
- */
-repo.findByLocationWithin(                              <2>
-  new GeoJsonPolygon(
-    new Point(-73.992514, 40.758934),
-    new Point(-73.961138, 40.760348),
-    new Point(-73.991658, 40.730006),
-    new Point(-73.992514, 40.758934)));                 <3>
-
-/*
- * {
- *   "location" : {
- *     "$geoWithin" : {
- *        "$polygon" : [ [-73.992514,40.758934] , [-73.961138,40.760348] , [-73.991658,40.730006] ]
- *     }
- *   }
- * }
- */
-repo.findByLocationWithin(                              <4>
-  new Polygon(
-    new Point(-73.992514, 40.758934),
-    new Point(-73.961138, 40.760348),
-    new Point(-73.991658, 40.730006));
-----
-<1> Repository method definition using the commons type allows calling it with both the GeoJSON and the legacy format.
-<2> Use GeoJSON type to make use of `$geometry` operator.
-<3> Note that GeoJSON polygons need to define a closed ring.
-<4> Use the legacy format `$polygon` operator.
-====
-
-==== Metrics and Distance calculation
-
-Then MongoDB `$geoNear` operator allows usage of a GeoJSON Point or legacy coordinate pairs.
-
-====
-[source,java]
-----
-NearQuery.near(new Point(-73.99171, 40.738868))
-----
-[source,json]
-----
-{
-  "$geoNear": {
-    //...
-    "near": [-73.99171, 40.738868]
-  }
-}
-----
-====
-====
-[source,java]
-----
-NearQuery.near(new GeoJsonPoint(-73.99171, 40.738868))
-----
-[source,json]
-----
-{
-  "$geoNear": {
-    //...
-    "near": { "type": "Point", "coordinates": [-73.99171, 40.738868] }
-  }
-}
-
-----
-====
-
-Though syntactically different the server is fine accepting both no matter what format the target Document within the collection
-is using.
-
-WARNING: There is a huge difference in the distance calculation. Using the legacy format operates
-upon _Radians_ on an Earth like sphere, whereas the GeoJSON format uses _Meters_.
-
-To avoid a serious headache make sure to set the `Metric` to the desired unit of measure which ensures the
-distance to be calculated correctly.
-
-In other words:
-
-====
-Assume you've got 5 Documents like the ones below:
-[source,json]
-----
-{
-    "_id" : ObjectId("5c10f3735d38908db52796a5"),
-    "name" : "Penn Station",
-    "location" : { "type" : "Point", "coordinates" : [  -73.99408, 40.75057 ] }
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796a6"),
-    "name" : "10gen Office",
-    "location" : { "type" : "Point", "coordinates" : [ -73.99171, 40.738868 ] }
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796a9"),
-    "name" : "City Bakery ",
-    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796aa"),
-    "name" : "Splash Bar",
-    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796ab"),
-    "name" : "Momofuku Milk Bar",
-    "location" : { "type" : "Point", "coordinates" : [ -73.985839, 40.731698 ] }
-}
-----
-====
-
-Fetching all Documents within a 400 Meter radius from `[-73.99171, 40.738868]` would look like this using
-GeoJSON:
-
-.GeoNear with GeoJSON
-====
-[source,json]
-----
-{
-    "$geoNear": {
-        "maxDistance": 400, <1>
-        "num": 10,
-        "near": { type: "Point", coordinates: [-73.99171, 40.738868] },
-        "spherical":true, <2>
-        "key": "location",
-        "distanceField": "distance"
-    }
-}
-----
-Returning the following 3 Documents:
-[source,json]
-----
-{
-    "_id" : ObjectId("5c10f3735d38908db52796a6"),
-    "name" : "10gen Office",
-    "location" : { "type" : "Point", "coordinates" : [ -73.99171, 40.738868 ] }
-    "distance" : 0.0 <3>
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796a9"),
-    "name" : "City Bakery ",
-    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
-    "distance" : 69.3582262492474 <3>
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796aa"),
-    "name" : "Splash Bar",
-    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
-    "distance" : 69.3582262492474 <3>
-}
-----
-<1> Maximum distance from center point in _Meters_.
-<2> GeoJSON always operates upon a sphere.
-<3> Distance from center point in _Meters_.
-====
-
-Now, when using legacy coordinate pairs one operates upon _Radians_ as discussed before. So we use `Metrics#KILOMETERS
-when constructing the `$geoNear` command. The `Metric` makes sure the distance multiplier is set correctly.
-
-.GeoNear with Legacy Coordinate Pairs
-====
-[source,json]
-----
-{
-    "$geoNear": {
-        "maxDistance": 0.0000627142377, <1>
-        "distanceMultiplier": 6378.137, <2>
-        "num": 10,
-        "near": [-73.99171, 40.738868],
-        "spherical":true, <3>
-        "key": "location",
-        "distanceField": "distance"
-    }
-}
-----
-Returning the 3 Documents just like the GeoJSON variant:
-[source,json]
-----
-{
-    "_id" : ObjectId("5c10f3735d38908db52796a6"),
-    "name" : "10gen Office",
-    "location" : { "type" : "Point", "coordinates" : [ -73.99171, 40.738868 ] }
-    "distance" : 0.0 <4>
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796a9"),
-    "name" : "City Bakery ",
-    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
-    "distance" : 0.0693586286032982 <4>
-}
-{
-    "_id" : ObjectId("5c10f3735d38908db52796aa"),
-    "name" : "Splash Bar",
-    "location" : { "type" : "Point", "coordinates" : [ -73.992491, 40.738673 ] }
-    "distance" : 0.0693586286032982 <4>
-}
-----
-<1> Maximum distance from center point in _Radians_.
-<2> The distance multiplier so we get _Kilometers_ as resulting distance.
-<3> Make sure we operate on a 2d_sphere index.
-<4> Distance from center point in _Kilometers_ - take it times 1000 to match _Meters_ of the GeoJSON variant.
-====
-
-[[mongo.textsearch]]
-=== Full-text Queries
-
-Since version 2.6 of MongoDB, you can run full-text queries by using the `$text` operator. Methods and operations specific to full-text queries are available in `TextQuery` and `TextCriteria`. When doing full text search, see the https://docs.mongodb.org/manual/reference/operator/query/text/#behavior[MongoDB reference] for its behavior and limitations.
-
-==== Full-text Search
-
-Before you can actually use full-text search, you must set up the search index correctly. See <<mapping-usage-indexes.text-index,Text Index>> for more detail on how to create index structures. The following example shows how to set up a full-text search:
-
-[source,javascript]
-----
-db.foo.createIndex(
-{
-  title : "text",
-  content : "text"
-},
-{
-  weights : {
-              title : 3
-            }
-}
-)
-----
-
-A query searching for `coffee cake`, sorted by relevance according to the `weights`, can be defined and executed as follows:
-
-[source,java]
-----
-Query query = TextQuery.searching(new TextCriteria().matchingAny("coffee", "cake")).sortByScore();
-List<Document> page = template.find(query, Document.class);
-----
-
-You can exclude search terms by prefixing the term with `-` or by using `notMatching`, as shown in the following example (note that the two lines have the same effect and are thus redundant):
-
-[source,java]
-----
-// search for 'coffee' and not 'cake'
-TextQuery.searching(new TextCriteria().matching("coffee").matching("-cake"));
-TextQuery.searching(new TextCriteria().matching("coffee").notMatching("cake"));
-----
-
-`TextCriteria.matching` takes the provided term as is. Therefore, you can define phrases by putting them between double quotation marks (for example, `\"coffee cake\")` or using by `TextCriteria.phrase.` The following example shows both ways of defining a phrase:
-
-[source,java]
-----
-// search for phrase 'coffee cake'
-TextQuery.searching(new TextCriteria().matching("\"coffee cake\""));
-TextQuery.searching(new TextCriteria().phrase("coffee cake"));
-----
-
-You can set flags for `$caseSensitive` and `$diacriticSensitive` by using the corresponding methods on `TextCriteria`. Note that these two optional flags have been introduced in MongoDB 3.2 and are not included in the query unless explicitly set.
-
-[[mongo.collation]]
-=== Collations
-
-Since version 3.4, MongoDB supports collations for collection and index creation and various query operations. Collations define string comparison rules based on the http://userguide.icu-project.org/collation/concepts[ICU collations]. A collation document consists of various properties that are encapsulated in `Collation`, as the following listing shows:
-
-====
-[source,java]
-----
-Collation collation = Collation.of("fr")         <1>
-
-  .strength(ComparisonLevel.secondary()          <2>
-    .includeCase())
-
-  .numericOrderingEnabled()                      <3>
-
-  .alternate(Alternate.shifted().punct())        <4>
-
-  .forwardDiacriticSort()                        <5>
-
-  .normalizationEnabled();                       <6>
-----
-<1> `Collation` requires a locale for creation. This can be either a string representation of the locale, a `Locale` (considering language, country, and variant) or a `CollationLocale`. The locale is mandatory for creation.
-<2> Collation strength defines comparison levels that denote differences between characters. You can configure various options (case-sensitivity, case-ordering, and others), depending on the selected strength.
-<3> Specify whether to compare numeric strings as numbers or as strings.
-<4> Specify whether the collation should consider whitespace and punctuation as base characters for purposes of comparison.
-<5> Specify whether strings with diacritics sort from back of the string, such as with some French dictionary ordering.
-<6> Specify whether to check whether text requires normalization and whether to perform normalization.
-====
-
-Collations can be used to create collections and indexes. If you create a collection that specifies a collation, the
-collation is applied to index creation and queries unless you specify a different collation. A collation is valid for a
-whole operation and cannot be specified on a per-field basis.
-
-Like other metadata, collations can be be derived from the domain type via the `collation` attribute of the `@Document`
-annotation and will be applied directly when executing queries, creating collections or indexes.
-
-NOTE: Annotated collations will not be used when a collection is auto created by MongoDB on first interaction. This would
-require additional store interaction delaying the entire process. Please use `MongoOperations.createCollection` for those cases.
-
-[source,java]
-----
-Collation french = Collation.of("fr");
-Collation german = Collation.of("de");
-
-template.createCollection(Person.class, CollectionOptions.just(collation));
-
-template.indexOps(Person.class).ensureIndex(new Index("name", Direction.ASC).collation(german));
-----
-
-NOTE: MongoDB uses simple binary comparison if no collation is specified (`Collation.simple()`).
-
-Using collations with collection operations is a matter of specifying a `Collation` instance in your query or operation options, as the following two examples show:
-
-.Using collation with `find`
-====
-[source,java]
-----
-Collation collation = Collation.of("de");
-
-Query query = new Query(Criteria.where("firstName").is("Amél")).collation(collation);
-
-List<Person> results = template.find(query, Person.class);
-----
-====
-
-.Using collation with `aggregate`
-====
-[source,java]
-----
-Collation collation = Collation.of("de");
-
-AggregationOptions options = AggregationOptions.builder().collation(collation).build();
-
-Aggregation aggregation = newAggregation(
-  project("tags"),
-  unwind("tags"),
-  group("tags")
-    .count().as("count")
-).withOptions(options);
-
-AggregationResults<TagCount> results = template.aggregate(aggregation, "tags", TagCount.class);
-----
-====
-
-WARNING: Indexes are only used if the collation used for the operation matches the index collation.
-
-include::./mongo-json-schema.adoc[leveloffset=+1]
-
-<<mongo.repositories>> support `Collations` via the `collation` attribute of the `@Query` annotation.
-
-.Collation support for Repositories
-====
-[source,java]
-----
-public interface PersonRepository extends MongoRepository<Person, String> {
-
-  @Query(collation = "en_US")  <1>
-  List<Person> findByFirstname(String firstname);
-
-  @Query(collation = "{ 'locale' : 'en_US' }") <2>
-  List<Person> findPersonByFirstname(String firstname);
-
-  @Query(collation = "?1") <3>
-  List<Person> findByFirstname(String firstname, Object collation);
-
-  @Query(collation = "{ 'locale' : '?1' }") <4>
-  List<Person> findByFirstname(String firstname, String collation);
-
-  List<Person> findByFirstname(String firstname, Collation collation); <5>
-
-  @Query(collation = "{ 'locale' : 'en_US' }")
-  List<Person> findByFirstname(String firstname, @Nullable Collation collation); <6>
-}
-----
-<1> Static collation definition resulting in `{ 'locale' : 'en_US' }`.
-<2> Static collation definition resulting in `{ 'locale' : 'en_US' }`.
-<3> Dynamic collation depending on 2nd method argument. Allowed types include `String` (eg. 'en_US'), `Locacle` (eg. Locacle.US)
-and `Document` (eg. new Document("locale", "en_US"))
-<4> Dynamic collation depending on 2nd method argument.
-<5> Apply the `Collation` method parameter to the query.
-<6> The `Collation` method parameter overrides the default `collation` from `@Query` if not null.
-
-NOTE: In case you enabled the automatic index creation for repository finder methods a potential static collation definition,
-as shown in (1) and (2), will be included when creating the index.
-
-TIP: The most specifc `Collation` outroules potentially defined others. Which means Method argument over query method annotation over doamin type annotation.
-====
-
-[[mongo.jsonSchema]]
-=== JSON Schema
-
-As of version 3.6, MongoDB supports collections that validate documents against a provided https://docs.mongodb.com/manual/core/schema-validation/#json-schema[JSON Schema].
-The schema itself and both validation action and level can be defined when creating the collection, as the following example shows:
-
-.Sample JSON schema
-====
-[source,json]
-----
-{
-  "type": "object",                                                        <1>
-
-  "required": [ "firstname", "lastname" ],                                 <2>
-
-  "properties": {                                                          <3>
-
-    "firstname": {                                                         <4>
-      "type": "string",
-      "enum": [ "luke", "han" ]
-    },
-    "address": {                                                           <5>
-      "type": "object",
-      "properties": {
-        "postCode": { "type": "string", "minLength": 4, "maxLength": 5 }
-      }
-    }
-  }
-}
-----
-<1> JSON schema documents always describe a whole document from its root. A schema is a schema object itself that can contain
-embedded schema objects that describe properties and subdocuments.
-<2> `required` is a property that describes which properties are required in a document. It can be specified optionally, along with other
-schema constraints. See MongoDB's documentation on https://docs.mongodb.com/manual/reference/operator/query/jsonSchema/#available-keywords[available keywords].
-<3> `properties` is related to a schema object that describes an `object` type. It contains property-specific schema constraints.
-<4> `firstname` specifies constraints for the `firsname` field inside the document. Here, it is a string-based `properties` element declaring
- possible field values.
-<5> `address` is a subdocument defining a schema for values in its `postCode` field.
-====
-
-You can provide a schema either by specifying a schema document (that is, by using the `Document` API to parse or build a document object) or by building it with Spring Data's JSON schema utilities in `org.springframework.data.mongodb.core.schema`. `MongoJsonSchema` is the entry point for all JSON schema-related operations. The following example shows how use `MongoJsonSchema.builder()` to create a JSON schema:
-
-.Creating a JSON schema
-====
-[source,java]
-----
-MongoJsonSchema.builder()                                                  <1>
-    .required("firstname", "lastname")                                     <2>
-
-    .properties(
-                string("firstname").possibleValues("luke", "han"),         <3>
-
-                object("address")
-                     .properties(string("postCode").minLength(4).maxLength(5)))
-
-    .build();                                                              <4>
-----
-<1> Obtain a schema builder to configure the schema with a fluent API.
-<2> Configure required properties.
-<3> Configure the String-typed `firstname` field, allowing only `luke` and `han` values. Properties can be typed or untyped. Use a static import of  `JsonSchemaProperty` to make the syntax slightly more compact and to get entry points such as `string(…)`.
-<4> Build the schema object. Use the schema to create either a collection or <<mongodb-template-query.criteria,query documents>>.
-====
-
-There are already some predefined and strongly typed schema objects (`JsonSchemaObject` and `JsonSchemaProperty`) available
-through static methods on the gateway interfaces.
-However, you may need to build custom property validation rules, which can be created through the builder API, as the following example shows:
-
-[source,java]
-----
-// "birthdate" : { "bsonType": "date" }
-JsonSchemaProperty.named("birthdate").ofType(Type.dateType());
-
-// "birthdate" : { "bsonType": "date", "description", "Must be a date" }
-JsonSchemaProperty.named("birthdate").with(JsonSchemaObject.of(Type.dateType()).description("Must be a date"));
-----
-
-`CollectionOptions` provides the entry point to schema support for collections, as the following example shows:
-
-.Create collection with `$jsonSchema`
-====
-[source,java]
-----
-MongoJsonSchema schema = MongoJsonSchema.builder().required("firstname", "lastname").build();
-
-template.createCollection(Person.class, CollectionOptions.empty().schema(schema));
-----
-====
-
-You can use a schema to query any collection for documents that match a given structure defined by a JSON schema, as the following example shows:
-
-.Query for Documents matching a `$jsonSchema`
-====
-[source,java]
-----
-MongoJsonSchema schema = MongoJsonSchema.builder().required("firstname", "lastname").build();
-
-template.find(query(matchingDocumentStructure(schema)), Person.class);
-----
-====
-
-The following table shows the supported JSON schema types:
-
-[cols="3,1,6", options="header"]
-.Supported JSON schema types
-|===
-| Schema Type
-| Java Type
-| Schema Properties
-
-| `untyped`
-| -
-| `description`, generated `description`, `enum`, `allOf`, `anyOf`, `oneOf`, `not`
-
-| `object`
-| `Object`
-| `required`, `additionalProperties`, `properties`, `minProperties`, `maxProperties`, `patternProperties`
-
-| `array`
-| any array except `byte[]`
-| `uniqueItems`, `additionalItems`, `items`, `minItems`, `maxItems`
-
-| `string`
-| `String`
-| `minLength`, `maxLentgth`, `pattern`
-
-| `int`
-| `int`, `Integer`
-| `multipleOf`, `minimum`, `exclusiveMinimum`, `maximum`, `exclusiveMaximum`
-
-| `long`
-| `long`, `Long`
-| `multipleOf`, `minimum`, `exclusiveMinimum`, `maximum`, `exclusiveMaximum`
-
-| `double`
-| `float`, `Float`, `double`, `Double`
-| `multipleOf`, `minimum`, `exclusiveMinimum`, `maximum`, `exclusiveMaximum`
-
-| `decimal`
-| `BigDecimal`
-| `multipleOf`, `minimum`, `exclusiveMinimum`, `maximum`, `exclusiveMaximum`
-
-| `number`
-| `Number`
-| `multipleOf`, `minimum`, `exclusiveMinimum`, `maximum`, `exclusiveMaximum`
-
-| `binData`
-| `byte[]`
-| (none)
-
-| `boolean`
-| `boolean`, `Boolean`
-| (none)
-
-| `null`
-| `null`
-| (none)
-
-| `objectId`
-| `ObjectId`
-| (none)
-
-| `date`
-| `java.util.Date`
-| (none)
-
-| `timestamp`
-| `BsonTimestamp`
-| (none)
-
-| `regex`
-| `java.util.regex.Pattern`
-| (none)
-
-|===
-
-NOTE: `untyped` is a generic type that is inherited by all typed schema types. It provides all `untyped` schema properties to typed schema types.
-
-For more information, see https://docs.mongodb.com/manual/reference/operator/query/jsonSchema/#op._S_jsonSchema[$jsonSchema].
-
-[[mongo.query.fluent-template-api]]
-=== Fluent Template API
-
-The `MongoOperations` interface is one of the central components when it comes to more low-level interaction with MongoDB. It offers a wide range of methods covering needs from collection creation, index creation, and CRUD operations to more advanced functionality, such as Map-Reduce and aggregations.
-You can find multiple overloads for each method. Most of them cover optional or nullable parts of the API.
-
-`FluentMongoOperations` provides a more narrow interface for the common methods of `MongoOperations` and provides a more readable, fluent API.
-The entry points (`insert(…)`, `find(…)`, `update(…)`, and others) follow a natural naming schema based on the operation to be run. Moving on from the entry point, the API is designed to offer only context-dependent methods that lead to a terminating method that invokes the actual `MongoOperations` counterpart -- the `all` method in the case of the following example:
-
-====
-[source,java]
-----
-List<SWCharacter> all = ops.find(SWCharacter.class)
-  .inCollection("star-wars")                        <1>
-  .all();
-----
-<1> Skip this step if `SWCharacter` defines the collection with `@Document` or if you use the class name as the collection name, which is fine.
-====
-
-Sometimes, a collection in MongoDB holds entities of different types, such as a `Jedi` within a collection of `SWCharacters`.
-To use different types for `Query` and return value mapping, you can use `as(Class<?> targetType)` to map results differently, as the following example shows:
-
-====
-[source,java]
-----
-List<Jedi> all = ops.find(SWCharacter.class)    <1>
-  .as(Jedi.class)                               <2>
-  .matching(query(where("jedi").is(true)))
-  .all();
-----
-<1> The query fields are mapped against the `SWCharacter` type.
-<2> Resulting documents are mapped into `Jedi`.
-====
-
-TIP: You can directly apply <<projections>> to result documents by providing the target type via `as(Class<?>)`.
-
-NOTE: Using projections allows `MongoTemplate` to optimize result mapping by limiting the actual response to fields required
-by the projection target type. This applies as long as the `Query` itself does not contain any field restriction and the
-target type is a closed interface or DTO projection.
-
-You can switch between retrieving a single entity and retrieving multiple entities as a `List` or a `Stream` through the terminating methods: `first()`, `one()`, `all()`, or `stream()`.
-
-When writing a geo-spatial query with `near(NearQuery)`, the number of terminating methods is altered to include only the methods that are valid for executing a `geoNear` command in MongoDB (fetching entities as a `GeoResult` within `GeoResults`), as the following example shows:
-
-====
-[source,java]
-----
-GeoResults<Jedi> results = mongoOps.query(SWCharacter.class)
-  .as(Jedi.class)
-  .near(alderaan) // NearQuery.near(-73.9667, 40.78).maxDis…
-  .all();
-----
-====
-
-[[mongo.query.kotlin-support]]
-=== Type-safe Queries for Kotlin
-
-Kotlin embraces domain-specific language creation through its language syntax and its extension system.
-Spring Data MongoDB ships with a Kotlin Extension for `Criteria` using https://kotlinlang.org/docs/reference/reflection.html#property-references[Kotlin property references] to build type-safe queries.
-Queries using this extension are typically benefit from improved readability.
-Most keywords on `Criteria` have a matching Kotlin extension, such as `inValues` and `regex`.
-
-Consider the following example explaining Type-safe Queries:
-
-====
-[source,kotlin]
-----
-import org.springframework.data.mongodb.core.query.*
-
-mongoOperations.find<Book>(
-  Query(Book::title isEqualTo "Moby-Dick")               <1>
-)
-
-mongoOperations.find<Book>(
-  Query(titlePredicate = Book::title exists true)
-)
-
-mongoOperations.find<Book>(
-  Criteria().andOperator(
-    Book::price gt 5,
-    Book::price lt 10
-  )
-)
-
-// Binary operators
-mongoOperations.find<BinaryMessage>(
-  Query(BinaryMessage::payload bits { allClear(0b101) }) <2>
-)
-
-// Nested Properties (i.e. refer to "book.author")
-mongoOperations.find<Book>(
-  Query(Book::author / Author::name regex "^H")          <3>
-)
-----
-<1> `isEqualTo()` is an infix extension function with receiver type `KProperty<T>` that returns `Criteria`.
-<2> For bitwise operators, pass a lambda argument where you call one of the methods of `Criteria.BitwiseCriteriaOperators`.
-<3> To construct nested properties, use the `/` character (overloaded operator `div`).
-====
-
-[[mongo.query.additional-query-options]]
-=== Additional Query Options
-
-MongoDB offers various ways of applying meta information, like a comment or a batch size, to a query. Using the `Query` API
-directly there are several methods for those options.
-
-====
-[source,java]
-----
-Query query = query(where("firstname").is("luke"))
-    .comment("find luke")         <1>
-    .batchSize(100)                                 <2>
-    .slaveOk();                                     <3>
-----
-<1> The comment propagated to the MongoDB profile log.
-<2> The number of documents to return in each response batch.
-<3> Allows querying a replica slave.
-====
-
-On the repository level the `@Meta` annotation provides means to add query options in a declarative way.
-
-====
-[source,java]
-----
-@Meta(comment = "find luke", batchSize = 100, flags = { SLAVE_OK })
-List<Person> findByFirstname(String firstname);
-----
-====
-
-include::../{spring-data-commons-docs}/query-by-example.adoc[leveloffset=+1]
-include::query-by-example.adoc[leveloffset=+1]
-
-[[mongo.mapreduce]]
-== Map-Reduce Operations
-
-You can query MongoDB by using Map-Reduce, which is useful for batch processing, for data aggregation, and for when the query language does not fulfill your needs.
-
-Spring provides integration with MongoDB's Map-Reduce by providing methods on `MongoOperations` to simplify the creation and execution of Map-Reduce operations. It can convert the results of a Map-Reduce operation to a POJO and integrates with Spring's https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#resources[Resource abstraction]. This lets you place your JavaScript files on the file system, classpath, HTTP server, or any other Spring Resource implementation and then reference the JavaScript resources through an easy URI style syntax -- for example, `classpath:reduce.js;`. Externalizing JavaScript code in files is often preferable to embedding them as Java strings in your code. Note that you can still pass JavaScript code as Java strings if you prefer.
-
-[[mongo.mapreduce.example]]
-=== Example Usage
-
-To understand how to perform Map-Reduce operations, we use an example from the book, _MongoDB - The Definitive Guide_ footnote:[Kristina Chodorow. _MongoDB - The Definitive Guide_. O'Reilly Media, 2013]. In this example, we create three documents that have the values [a,b], [b,c], and [c,d], respectively. The values in each document are associated with the key, 'x', as the following example shows (assume these documents are in a collection named `jmr1`):
-
-[source]
-----
-{ "_id" : ObjectId("4e5ff893c0277826074ec533"), "x" : [ "a", "b" ] }
-{ "_id" : ObjectId("4e5ff893c0277826074ec534"), "x" : [ "b", "c" ] }
-{ "_id" : ObjectId("4e5ff893c0277826074ec535"), "x" : [ "c", "d" ] }
-----
-
-The following map function counts the occurrence of each letter in the array for each document:
-
-[source,java]
-----
-function () {
-    for (var i = 0; i < this.x.length; i++) {
-        emit(this.x[i], 1);
-    }
-}
-----
-
-The follwing reduce function sums up the occurrence of each letter across all the documents:
-
-[source,java]
-----
-function (key, values) {
-    var sum = 0;
-    for (var i = 0; i < values.length; i++)
-        sum += values[i];
-    return sum;
-}
-----
-
-Running the preceding functions result in the following collection:
-
-[source]
-----
-{ "_id" : "a", "value" : 1 }
-{ "_id" : "b", "value" : 2 }
-{ "_id" : "c", "value" : 2 }
-{ "_id" : "d", "value" : 1 }
-----
-
-Assuming that the map and reduce functions are located in `map.js` and `reduce.js` and bundled in your jar so they are available on the classpath, you can run a Map-Reduce operation as follows:
-
-[source,java]
-----
-MapReduceResults<ValueObject> results = mongoOperations.mapReduce("jmr1", "classpath:map.js", "classpath:reduce.js", ValueObject.class);
-for (ValueObject valueObject : results) {
-  System.out.println(valueObject);
-}
-----
-
-The preceding exmaple produces the following output:
-
-[source]
-----
-ValueObject [id=a, value=1.0]
-ValueObject [id=b, value=2.0]
-ValueObject [id=c, value=2.0]
-ValueObject [id=d, value=1.0]
-----
-
-The `MapReduceResults` class implements `Iterable` and provides access to the raw output and timing and count statistics. The following listing shows the `ValueObject` class:
-
-[source,java]
-----
-public class ValueObject {
-
-  private String id;
-  private float value;
-
-  public String getId() {
-    return id;
-  }
-
-  public float getValue() {
-    return value;
-  }
-
-  public void setValue(float value) {
-    this.value = value;
-  }
-
-  @Override
-  public String toString() {
-    return "ValueObject [id=" + id + ", value=" + value + "]";
-  }
-}
-----
-
-By default, the output type of `INLINE` is used so that you need not specify an output collection. To specify additional Map-Reduce options, use an overloaded method that takes an additional `MapReduceOptions` argument. The class `MapReduceOptions` has a fluent API, so adding additional options can be done in a compact syntax. The following example sets the output collection to `jmr1_out` (note that setting only the output collection assumes a default output type of `REPLACE`):
-
-[source,java]
-----
-MapReduceResults<ValueObject> results = mongoOperations.mapReduce("jmr1", "classpath:map.js", "classpath:reduce.js",
-                                                                     new MapReduceOptions().outputCollection("jmr1_out"), ValueObject.class);
-----
-
-There is also a static import (`import static org.springframework.data.mongodb.core.mapreduce.MapReduceOptions.options;`) that can be used to make the syntax slightly more compact, as the following example shows:
-
-[source,java]
-----
-MapReduceResults<ValueObject> results = mongoOperations.mapReduce("jmr1", "classpath:map.js", "classpath:reduce.js",
-                                                                     options().outputCollection("jmr1_out"), ValueObject.class);
-----
-
-You can also specify a query to reduce the set of data that is fed into the Map-Reduce operation. The following example removes the document that contains [a,b] from consideration for Map-Reduce operations:
-
-[source,java]
-----
-Query query = new Query(where("x").ne(new String[] { "a", "b" }));
-MapReduceResults<ValueObject> results = mongoOperations.mapReduce(query, "jmr1", "classpath:map.js", "classpath:reduce.js",
-                                                                     options().outputCollection("jmr1_out"), ValueObject.class);
-----
-
-Note that you can specify additional limit and sort values on the query, but you cannot skip values.
-
-[[mongo.server-side-scripts]]
-== Script Operations
-
-[WARNING]
-====
-https://docs.mongodb.com/master/release-notes/4.2-compatibility/[MongoDB 4.2] removed support for the `eval` command used
-by `ScriptOperations`. +
-There is no replacement for the removed functionallity.
-====
-
-MongoDB allows executing JavaScript functions on the server by either directly sending the script or calling a stored one. `ScriptOperations` can be accessed through `MongoTemplate` and provides basic abstraction for `JavaScript` usage. The following example shows how to us the `ScriptOperations` class:
-
-====
-[source,java]
-----
-ScriptOperations scriptOps = template.scriptOps();
-
-ExecutableMongoScript echoScript = new ExecutableMongoScript("function(x) { return x; }");
-scriptOps.execute(echoScript, "directly execute script");     <1>
-
-scriptOps.register(new NamedMongoScript("echo", echoScript)); <2>
-scriptOps.call("echo", "execute script via name");            <3>
-----
-<1> Execute the script directly without storing the function on server side.
-<2> Store the script using 'echo' as its name. The given name identifies the script and allows calling it later.
-<3> Execute the script with name 'echo' using the provided parameters.
-====
-
-[[mongo.group]]
-== Group Operations
-
-As an alternative to using Map-Reduce to perform data aggregation, you can use the https://www.mongodb.org/display/DOCS/Aggregation#Aggregation-Group[`group` operation] which feels similar to using SQL's group by query style, so it may feel more approachable vs. using Map-Reduce. Using the group operations does have some limitations, for example it is not supported in a shared environment and it returns the full result set in a single BSON object, so the result should be small, less than 10,000 keys.
-
-Spring provides integration with MongoDB's group operation by providing methods on MongoOperations to simplify the creation and execution of group operations. It can convert the results of the group operation to a POJO and also integrates with Spring's https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#resources[Resource abstraction] abstraction. This will let you place your JavaScript files on the file system, classpath, http server or any other Spring Resource implementation and then reference the JavaScript resources via an easy URI style syntax, e.g. 'classpath:reduce.js;. Externalizing JavaScript code in files if often preferable to embedding them as Java strings in your code. Note that you can still pass JavaScript code as Java strings if you prefer.
-
-[[mongo.group.example]]
-=== Example Usage
-
-In order to understand how group operations work the following example is used, which is somewhat artificial. For a more realistic example consult the book 'MongoDB - The definitive guide'. A collection named `group_test_collection` created with the following rows.
-
-[source]
-----
-{ "_id" : ObjectId("4ec1d25d41421e2015da64f1"), "x" : 1 }
-{ "_id" : ObjectId("4ec1d25d41421e2015da64f2"), "x" : 1 }
-{ "_id" : ObjectId("4ec1d25d41421e2015da64f3"), "x" : 2 }
-{ "_id" : ObjectId("4ec1d25d41421e2015da64f4"), "x" : 3 }
-{ "_id" : ObjectId("4ec1d25d41421e2015da64f5"), "x" : 3 }
-{ "_id" : ObjectId("4ec1d25d41421e2015da64f6"), "x" : 3 }
-----
-
-We would like to group by the only field in each row, the `x` field and aggregate the number of times each specific value of `x` occurs. To do this we need to create an initial document that contains our count variable and also a reduce function which will increment it each time it is encountered. The Java code to execute the group operation is shown below
-
-[source,java]
-----
-GroupByResults<XObject> results = mongoTemplate.group("group_test_collection",
-                                                      GroupBy.key("x").initialDocument("{ count: 0 }").reduceFunction("function(doc, prev) { prev.count += 1 }"),
-                                                      XObject.class);
-----
-
-The first argument is the name of the collection to run the group operation over, the second is a fluent API that specifies properties of the group operation via a `GroupBy` class. In this example we are using just the `intialDocument` and `reduceFunction` methods. You can also specify a key-function, as well as a finalizer as part of the fluent API. If you have multiple keys to group by, you can pass in a comma separated list of keys.
-
-The raw results of the group operation is a JSON document that looks like this
-
-[source]
-----
-{
-  "retval" : [ { "x" : 1.0 , "count" : 2.0} ,
-               { "x" : 2.0 , "count" : 1.0} ,
-               { "x" : 3.0 , "count" : 3.0} ] ,
-  "count" : 6.0 ,
-  "keys" : 3 ,
-  "ok" : 1.0
-}
-----
-
-The document under the "retval" field is mapped onto the third argument in the group method, in this case XObject which is shown below.
-
-[source,java]
-----
-public class XObject {
-
-  private float x;
-
-  private float count;
-
-
-  public float getX() {
-    return x;
-  }
-
-  public void setX(float x) {
-    this.x = x;
-  }
-
-  public float getCount() {
-    return count;
-  }
-
-  public void setCount(float count) {
-    this.count = count;
-  }
-
-  @Override
-  public String toString() {
-    return "XObject [x=" + x + " count = " + count + "]";
-  }
-}
-----
-
-You can also obtain the raw result as a `Document` by calling the method `getRawResults` on the `GroupByResults` class.
-
-There is an additional method overload of the group method on `MongoOperations` which lets you specify a `Criteria` object for selecting a subset of the rows. An example which uses a `Criteria` object, with some syntax sugar using static imports, as well as referencing a key-function and reduce function javascript files via a Spring Resource string is shown below.
-
-[source]
-----
-import static org.springframework.data.mongodb.core.mapreduce.GroupBy.keyFunction;
-import static org.springframework.data.mongodb.core.query.Criteria.where;
-
-GroupByResults<XObject> results = mongoTemplate.group(where("x").gt(0),
-                                        "group_test_collection",
-                                        keyFunction("classpath:keyFunction.js").initialDocument("{ count: 0 }").reduceFunction("classpath:groupReduce.js"), XObject.class);
-----
-
-[[mongo.aggregation]]
-== Aggregation Framework Support
-
-Spring Data MongoDB provides support for the Aggregation Framework introduced to MongoDB in version 2.2.
-
-For further information, see the full https://docs.mongodb.org/manual/aggregation/[reference documentation] of the aggregation framework and other data aggregation tools for MongoDB.
-
-[[mongo.aggregation.basic-concepts]]
-=== Basic Concepts
-
-The Aggregation Framework support in Spring Data MongoDB is based on the following key abstractions: `Aggregation`, `AggregationOperation`, and `AggregationResults`.
-
-* `Aggregation`
-+
-An `Aggregation` represents a MongoDB `aggregate` operation and holds the description of the aggregation pipeline instructions. Aggregations are created by invoking the appropriate `newAggregation(…)` static factory method of the `Aggregation` class, which takes a list of `AggregateOperation` and an optional input class.
-+
-The actual aggregate operation is executed by the `aggregate` method of the `MongoTemplate`, which takes the desired output class as a parameter.
-+
-* `TypedAggregation`
-+
-A `TypedAggregation`, just like an `Aggregation`, holds the instructions of the aggregation pipeline and a reference to the input type, that is used for mapping domain properties to actual document fields.
-+
-On execution field references get checked against the given input type considering potential `@Field` annotations and raising errors when referencing non existing properties.
-+
-* `AggregationOperation`
-+
-An `AggregationOperation` represents a MongoDB aggregation pipeline operation and describes the processing that should be performed in this aggregation step. Although you could manually create an `AggregationOperation`, we recommend using the static factory methods provided by the `Aggregate` class to construct an `AggregateOperation`.
-+
-* `AggregationResults`
-+
-`AggregationResults` is the container for the result of an aggregate operation. It provides access to the raw aggregation result, in the form of a `Document` to the mapped objects and other information about the aggregation.
-+
-The following listing shows the canonical example for using the Spring Data MongoDB support for the MongoDB Aggregation Framework:
-+
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-Aggregation agg = newAggregation(
-    pipelineOP1(),
-    pipelineOP2(),
-    pipelineOPn()
-);
-
-AggregationResults<OutputType> results = mongoTemplate.aggregate(agg, "INPUT_COLLECTION_NAME", OutputType.class);
-List<OutputType> mappedResult = results.getMappedResults();
-----
-
-Note that, if you provide an input class as the first parameter to the `newAggregation` method, the `MongoTemplate` derives the name of the input collection from this class. Otherwise, if you do not not specify an input class, you must provide the name of the input collection explicitly. If both an input class and an input collection are provided, the latter takes precedence.
-
-[[mongo.aggregation.supported-aggregation-operations]]
-=== Supported Aggregation Operations
-
-The MongoDB Aggregation Framework provides the following types of aggregation operations:
-
-* Pipeline Aggregation Operators
-* Group Aggregation Operators
-* Boolean Aggregation Operators
-* Comparison Aggregation Operators
-* Arithmetic Aggregation Operators
-* String Aggregation Operators
-* Date Aggregation Operators
-* Array Aggregation Operators
-* Conditional Aggregation Operators
-* Lookup Aggregation Operators
-* Convert Aggregation Operators
-* Object Aggregation Operators
-
-At the time of this writing, we provide support for the following Aggregation Operations in Spring Data MongoDB:
-
-.Aggregation Operations currently supported by Spring Data MongoDB
-[cols="2*"]
-|===
-| Pipeline Aggregation Operators
-| `bucket`, `bucketAuto`, `count`, `facet`, `geoNear`, `graphLookup`, `group`, `limit`, `lookup`, `match`, `project`, `replaceRoot`, `skip`, `sort`, `unwind`
-
-| Set Aggregation Operators
-| `setEquals`, `setIntersection`, `setUnion`, `setDifference`, `setIsSubset`, `anyElementTrue`, `allElementsTrue`
-
-| Group Aggregation Operators
-| `addToSet`, `first`, `last`, `max`, `min`, `avg`, `push`, `sum`, `(*count)`, `stdDevPop`, `stdDevSamp`
-
-| Arithmetic Aggregation Operators
-| `abs`, `add` (*via `plus`), `ceil`, `divide`, `exp`, `floor`, `ln`, `log`, `log10`, `mod`, `multiply`, `pow`, `sqrt`, `subtract` (*via `minus`), `trunc`
-
-| String Aggregation Operators
-| `concat`, `substr`, `toLower`, `toUpper`, `stcasecmp`, `indexOfBytes`, `indexOfCP`, `split`, `strLenBytes`, `strLenCP`, `substrCP`, `trim`, `ltrim`, `rtim`
-
-| Comparison Aggregation Operators
-| `eq` (*via: `is`), `gt`, `gte`, `lt`, `lte`, `ne`
-
-| Array Aggregation Operators
-| `arrayElementAt`, `arrayToObject`, `concatArrays`, `filter`, `in`, `indexOfArray`, `isArray`, `range`, `reverseArray`, `reduce`, `size`, `slice`, `zip`
-
-| Literal Operators
-| `literal`
-
-| Date Aggregation Operators
-| `dayOfYear`, `dayOfMonth`, `dayOfWeek`, `year`, `month`, `week`, `hour`, `minute`, `second`, `millisecond`, `dateToString`, `dateFromString`, `dateFromParts`, `dateToParts`, `isoDayOfWeek`, `isoWeek`, `isoWeekYear`
-
-| Variable Operators
-| `map`
-
-| Conditional Aggregation Operators
-| `cond`, `ifNull`, `switch`
-
-| Type Aggregation Operators
-| `type`
-
-| Convert Aggregation Operators
-| `convert`, `toBool`, `toDate`, `toDecimal`, `toDouble`, `toInt`, `toLong`, `toObjectId`, `toString`
-
-| Object Aggregation Operators
-| `objectToArray`, `mergeObjects`
-|===
-
-* The operation is mapped or added by Spring Data MongoDB.
-
-Note that the aggregation operations not listed here are currently not supported by Spring Data MongoDB. Comparison aggregation operators are expressed as `Criteria` expressions.
-
-[[mongo.aggregation.projection]]
-=== Projection Expressions
-
-Projection expressions are used to define the fields that are the outcome of a particular aggregation step. Projection expressions can be defined through the `project` method of the `Aggregation` class, either by passing a list of `String` objects or an aggregation framework `Fields` object. The projection can be extended with additional fields through a fluent API by using the `and(String)` method and aliased by using the `as(String)` method.
-Note that you can also define fields with aliases by using the `Fields.field` static factory method of the aggregation framework, which you can then use to construct a new `Fields` instance. References to projected fields in later aggregation stages are valid only for the field names of included fields or their aliases (including newly defined fields and their aliases). Fields not included in the projection cannot be referenced in later aggregation stages. The following listings show examples of projection expression:
-
-.Projection expression examples
-====
-[source,java]
-----
-// generates {$project: {name: 1, netPrice: 1}}
-project("name", "netPrice")
-
-// generates {$project: {thing1: $thing2}}
-project().and("thing1").as("thing2")
-
-// generates {$project: {a: 1, b: 1, thing2: $thing1}}
-project("a","b").and("thing1").as("thing2")
-----
-====
-
-.Multi-Stage Aggregation using Projection and Sorting
-====
-[source,java]
-----
-// generates {$project: {name: 1, netPrice: 1}}, {$sort: {name: 1}}
-project("name", "netPrice"), sort(ASC, "name")
-
-// generates {$project: {name: $firstname}}, {$sort: {name: 1}}
-project().and("firstname").as("name"), sort(ASC, "name")
-
-// does not work
-project().and("firstname").as("name"), sort(ASC, "firstname")
-----
-====
-
-More examples for project operations can be found in the `AggregationTests` class. Note that further details regarding the projection expressions can be found in the https://docs.mongodb.org/manual/reference/operator/aggregation/project/#pipe._S_project[corresponding section] of the MongoDB Aggregation Framework reference documentation.
-
-[[mongo.aggregation.facet]]
-=== Faceted Classification
-
-As of Version 3.4, MongoDB supports faceted classification by using the Aggregation Framework. A faceted classification uses semantic categories (either general or subject-specific) that are combined to create the full classification entry. Documents flowing through the aggregation pipeline are classified into buckets. A multi-faceted classification enables various aggregations on the same set of input documents, without needing to retrieve the input documents multiple times.
-
-==== Buckets
-
-Bucket operations categorize incoming documents into groups, called buckets, based on a specified expression and bucket boundaries. Bucket operations require a grouping field or a grouping expression. You can define them by using the `bucket()` and `bucketAuto()` methods of the `Aggregate` class. `BucketOperation` and `BucketAutoOperation` can expose accumulations based on aggregation expressions for input documents. You can extend the bucket operation with additional parameters through a fluent API by using the `with…()` methods and the `andOutput(String)` method. You can alias the operation by using the `as(String)` method. Each bucket is represented as a document in the output.
-
-`BucketOperation` takes a defined set of boundaries to group incoming documents into these categories. Boundaries are required to be sorted. The following listing shows some examples of bucket operations:
-
-.Bucket operation examples
-====
-[source,java]
-----
-// generates {$bucket: {groupBy: $price, boundaries: [0, 100, 400]}}
-bucket("price").withBoundaries(0, 100, 400);
-
-// generates {$bucket: {groupBy: $price, default: "Other" boundaries: [0, 100]}}
-bucket("price").withBoundaries(0, 100).withDefault("Other");
-
-// generates {$bucket: {groupBy: $price, boundaries: [0, 100], output: { count: { $sum: 1}}}}
-bucket("price").withBoundaries(0, 100).andOutputCount().as("count");
-
-// generates {$bucket: {groupBy: $price, boundaries: [0, 100], 5, output: { titles: { $push: "$title"}}}
-bucket("price").withBoundaries(0, 100).andOutput("title").push().as("titles");
-----
-====
-
-`BucketAutoOperation` determines boundaries in an attempt to evenly distribute documents into a specified number of buckets. `BucketAutoOperation` optionally takes a granularity value that specifies the https://en.wikipedia.org/wiki/Preferred_number[preferred number] series to use to ensure that the calculated boundary edges end on preferred round numbers or on powers of 10. The following listing shows examples of bucket operations:
-
-.Bucket operation examples
-====
-[source,java]
-----
-// generates {$bucketAuto: {groupBy: $price, buckets: 5}}
-bucketAuto("price", 5)
-
-// generates {$bucketAuto: {groupBy: $price, buckets: 5, granularity: "E24"}}
-bucketAuto("price", 5).withGranularity(Granularities.E24).withDefault("Other");
-
-// generates {$bucketAuto: {groupBy: $price, buckets: 5, output: { titles: { $push: "$title"}}}
-bucketAuto("price", 5).andOutput("title").push().as("titles");
-----
-====
-
-To create output fields in buckets, bucket operations can use `AggregationExpression` through `andOutput()` and <<mongo.aggregation.projection.expressions, SpEL expressions>> through `andOutputExpression()`.
-
-Note that further details regarding bucket expressions can be found in the https://docs.mongodb.org/manual/reference/operator/aggregation/bucket/[`$bucket` section] and
-https://docs.mongodb.org/manual/reference/operator/aggregation/bucketAuto/[`$bucketAuto` section] of the MongoDB Aggregation Framework reference documentation.
-
-==== Multi-faceted Aggregation
-
-Multiple aggregation pipelines can be used to create multi-faceted aggregations that characterize data across multiple dimensions (or facets) within a single aggregation stage. Multi-faceted aggregations provide multiple filters and categorizations to guide data browsing and analysis. A common implementation of faceting is how many online retailers provide ways to narrow down search results by applying filters on product price, manufacturer, size, and other factors.
-
-You can define a `FacetOperation` by using the `facet()` method of the `Aggregation` class. You can customize it with multiple aggregation pipelines by using the `and()` method. Each sub-pipeline has its own field in the output document where its results are stored as an array of documents.
-
-Sub-pipelines can project and filter input documents prior to grouping. Common use cases include extraction of date parts or calculations before categorization. The following listing shows facet operation examples:
-
-.Facet operation examples
-====
-[source,java]
-----
-// generates {$facet: {categorizedByPrice: [ { $match: { price: {$exists : true}}}, { $bucketAuto: {groupBy: $price, buckets: 5}}]}}
-facet(match(Criteria.where("price").exists(true)), bucketAuto("price", 5)).as("categorizedByPrice"))
-
-// generates {$facet: {categorizedByCountry: [ { $match: { country: {$exists : true}}}, { $sortByCount: "$country"}]}}
-facet(match(Criteria.where("country").exists(true)), sortByCount("country")).as("categorizedByCountry"))
-
-// generates {$facet: {categorizedByYear: [
-//     { $project: { title: 1, publicationYear: { $year: "publicationDate"}}},
-//     { $bucketAuto: {groupBy: $price, buckets: 5, output: { titles: {$push:"$title"}}}
-// ]}}
-facet(project("title").and("publicationDate").extractYear().as("publicationYear"),
-      bucketAuto("publicationYear", 5).andOutput("title").push().as("titles"))
-  .as("categorizedByYear"))
-----
-====
-
-Note that further details regarding facet operation can be found in the https://docs.mongodb.org/manual/reference/operator/aggregation/facet/[`$facet` section] of the MongoDB Aggregation Framework reference documentation.
-
-[[mongo.aggregation.sort-by-count]]
-==== Sort By Count
-
-Sort by count operations group incoming documents based on the value of a specified expression, compute the count of documents in each distinct group, and sort the results by count. It offers a handy shortcut to apply sorting when using <<mongo.aggregation.facet>>. Sort by count operations require a grouping field or grouping expression. The following listing shows a sort by count example:
-
-.Sort by count example
-====
-[source,java]
-----
-// generates { $sortByCount: "$country" }
-sortByCount("country");
-----
-====
-
-A sort by count operation is equivalent to the following BSON (Binary JSON):
-
-----
-{ $group: { _id: <expression>, count: { $sum: 1 } } },
-{ $sort: { count: -1 } }
-----
-
-[[mongo.aggregation.projection.expressions]]
-==== Spring Expression Support in Projection Expressions
-
-We support the use of SpEL expressions in projection expressions through the `andExpression` method of the `ProjectionOperation` and `BucketOperation` classes. This feature lets you define the desired expression as a SpEL expression. On query execution, the SpEL expression is translated into a corresponding MongoDB projection expression part. This arrangement makes it much easier to express complex calculations.
-
-===== Complex Calculations with SpEL expressions
-
-Consider the following SpEL expression:
-
-[source,java]
-----
-1 + (q + 1) / (q - 1)
-----
-
-The preceding expression is translated into the following projection expression part:
-
-[source,javascript]
-----
-{ "$add" : [ 1, {
-    "$divide" : [ {
-        "$add":["$q", 1]}, {
-        "$subtract":[ "$q", 1]}
-    ]
-}]}
-----
-
-You can see examples in more context in <<mongo.aggregation.examples.example5>> and <<mongo.aggregation.examples.example6>>. You can find more usage examples for supported SpEL expression constructs in `SpelExpressionTransformerUnitTests`. The following table shows the SpEL transformations supported by Spring Data MongoDB:
-
-.Supported SpEL transformations
-[%header,cols="2"]
-|===
-| SpEL Expression
-| Mongo Expression Part
-| a == b
-| { $eq : [$a, $b] }
-| a != b
-| { $ne : [$a , $b] }
-| a > b
-| { $gt : [$a, $b] }
-| a >= b
-| { $gte : [$a, $b] }
-| a < b
-| { $lt : [$a, $b] }
-| a <= b
-| { $lte : [$a, $b] }
-| a + b
-| { $add : [$a, $b] }
-| a - b
-| { $subtract : [$a, $b] }
-| a * b
-| { $multiply : [$a, $b] }
-| a / b
-| { $divide : [$a, $b] }
-| a^b
-| { $pow : [$a, $b] }
-| a % b
-| { $mod : [$a, $b] }
-| a && b
-| { $and : [$a, $b] }
-| a \|\| b
-| { $or : [$a, $b] }
-| !a
-| { $not : [$a] }
-|===
-
-In addition to the transformations shown in the preceding table, you can use standard SpEL operations such as `new` to (for example) create arrays and reference expressions through their names (followed by the arguments to use in brackets). The following example shows how to create an array in this fashion:
-
-[source,java]
-----
-// { $setEquals : [$a, [5, 8, 13] ] }
-.andExpression("setEquals(a, new int[]{5, 8, 13})");
-----
-
-[[mongo.aggregation.examples]]
-==== Aggregation Framework Examples
-
-The examples in this section demonstrate the usage patterns for the MongoDB Aggregation Framework with Spring Data MongoDB.
-
-[[mongo.aggregation.examples.example1]]
-===== Aggregation Framework Example 1
-
-In this introductory example, we want to aggregate a list of tags to get the occurrence count of a particular tag from a MongoDB collection (called `tags`) sorted by the occurrence count in descending order. This example demonstrates the usage of grouping, sorting, projections (selection), and unwinding (result splitting).
-
-[source,java]
-----
-class TagCount {
- String tag;
- int n;
-}
-----
-
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-Aggregation agg = newAggregation(
-    project("tags"),
-    unwind("tags"),
-    group("tags").count().as("n"),
-    project("n").and("tag").previousOperation(),
-    sort(DESC, "n")
-);
-
-AggregationResults<TagCount> results = mongoTemplate.aggregate(agg, "tags", TagCount.class);
-List<TagCount> tagCount = results.getMappedResults();
-----
-
-The preceding listing uses the following algorithm:
-
-. Create a new aggregation by using the `newAggregation` static factory method, to which we pass a list of aggregation operations. These aggregate operations define the aggregation pipeline of our `Aggregation`.
-. Use the `project` operation to select the `tags` field (which is an array of strings) from the input collection.
-. Use the `unwind` operation to generate a new document for each tag within the `tags` array.
-. Use the `group` operation to define a group for each `tags` value for which we aggregate the occurrence count (by using the `count` aggregation operator and collecting the result in a new field called `n`).
-. Select the `n` field and create an alias for the ID field generated from the previous group operation (hence the call to `previousOperation()`) with a name of `tag`.
-. Use the `sort` operation to sort the resulting list of tags by their occurrence count in descending order.
-. Call the `aggregate` method on `MongoTemplate` to let MongoDB perform the actual aggregation operation, with the created `Aggregation` as an argument.
-
-Note that the input collection is explicitly specified as the `tags` parameter to the `aggregate` Method. If the name of the input collection is not specified explicitly, it is derived from the input class passed as the first parameter to the `newAggreation` method.
-
-[[mongo.aggregation.examples.example2]]
-===== Aggregation Framework Example 2
-
-This example is based on the https://docs.mongodb.org/manual/tutorial/aggregation-examples/#largest-and-smallest-cities-by-state[Largest and Smallest Cities by State] example from the MongoDB Aggregation Framework documentation. We added additional sorting to produce stable results with different MongoDB versions. Here we want to return the smallest and largest cities by population for each state by using the aggregation framework. This example demonstrates grouping, sorting, and projections (selection).
-
-[source,java]
-----
-class ZipInfo {
-   String id;
-   String city;
-   String state;
-   @Field("pop") int population;
-   @Field("loc") double[] location;
-}
-
-class City {
-   String name;
-   int population;
-}
-
-class ZipInfoStats {
-   String id;
-   String state;
-   City biggestCity;
-   City smallestCity;
-}
-----
-
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-TypedAggregation<ZipInfo> aggregation = newAggregation(ZipInfo.class,
-    group("state", "city")
-       .sum("population").as("pop"),
-    sort(ASC, "pop", "state", "city"),
-    group("state")
-       .last("city").as("biggestCity")
-       .last("pop").as("biggestPop")
-       .first("city").as("smallestCity")
-       .first("pop").as("smallestPop"),
-    project()
-       .and("state").previousOperation()
-       .and("biggestCity")
-          .nested(bind("name", "biggestCity").and("population", "biggestPop"))
-       .and("smallestCity")
-          .nested(bind("name", "smallestCity").and("population", "smallestPop")),
-    sort(ASC, "state")
-);
-
-AggregationResults<ZipInfoStats> result = mongoTemplate.aggregate(aggregation, ZipInfoStats.class);
-ZipInfoStats firstZipInfoStats = result.getMappedResults().get(0);
-----
-
-Note that the `ZipInfo` class maps the structure of the given input-collection. The `ZipInfoStats` class defines the structure in the desired output format.
-
-The preceding listings use the following algorithm:
-
-. Use the `group` operation to define a group from the input-collection. The grouping criteria is the combination of the `state` and `city` fields, which forms the ID structure of the group. We aggregate the value of the `population` property from the grouped elements by using the `sum` operator and save the result in the `pop` field.
-. Use the `sort` operation to sort the intermediate-result by the `pop`, `state` and `city` fields, in ascending order, such that the smallest city is at the top and the biggest city is at the bottom of the result. Note that the sorting on `state` and `city` is implicitly performed against the group ID fields (which Spring Data MongoDB handled).
-. Use a `group` operation again to group the intermediate result by `state`. Note that `state` again implicitly references a group ID field. We select the name and the population count of the biggest and smallest city with calls to the `last(…)` and `first(...)` operators, respectively, in the `project` operation.
-. Select the `state` field from the previous `group` operation. Note that `state` again implicitly references a group ID field. Because we do not want an implicitly generated ID to appear, we exclude the ID from the previous operation by using `and(previousOperation()).exclude()`. Because we want to populate the nested `City` structures in our output class, we have to emit appropriate sub-documents by using the nested method.
-. Sort the resulting list of `StateStats` by their state name in ascending order in the `sort` operation.
-
-Note that we derive the name of the input collection from the `ZipInfo` class passed as the first parameter to the `newAggregation` method.
-
-[[mongo.aggregation.examples.example3]]
-===== Aggregation Framework Example 3
-
-This example is based on the https://docs.mongodb.org/manual/tutorial/aggregation-examples/#states-with-populations-over-10-million[States with Populations Over 10 Million] example from the MongoDB Aggregation Framework documentation. We added additional sorting to produce stable results with different MongoDB versions. Here we want to return all states with a population greater than 10 million, using the aggregation framework. This example demonstrates grouping, sorting, and matching (filtering).
-
-[source,java]
-----
-class StateStats {
-   @Id String id;
-   String state;
-   @Field("totalPop") int totalPopulation;
-}
-----
-
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-TypedAggregation<ZipInfo> agg = newAggregation(ZipInfo.class,
-    group("state").sum("population").as("totalPop"),
-    sort(ASC, previousOperation(), "totalPop"),
-    match(where("totalPop").gte(10 * 1000 * 1000))
-);
-
-AggregationResults<StateStats> result = mongoTemplate.aggregate(agg, StateStats.class);
-List<StateStats> stateStatsList = result.getMappedResults();
-----
-
-The preceding listings use the following algorithm:
-
-. Group the input collection by the `state` field and calculate the sum of the `population` field and store the result in the new field `"totalPop"`.
-. Sort the intermediate result by the id-reference of the previous group operation in addition to the `"totalPop"` field in ascending order.
-. Filter the intermediate result by using a `match` operation which accepts a `Criteria` query as an argument.
-
-Note that we derive the name of the input collection from the `ZipInfo` class passed as first parameter to the `newAggregation` method.
-
-[[mongo.aggregation.examples.example4]]
-===== Aggregation Framework Example 4
-
-This example demonstrates the use of simple arithmetic operations in the projection operation.
-
-[source,java]
-----
-class Product {
-    String id;
-    String name;
-    double netPrice;
-    int spaceUnits;
-}
-----
-
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-TypedAggregation<Product> agg = newAggregation(Product.class,
-    project("name", "netPrice")
-        .and("netPrice").plus(1).as("netPricePlus1")
-        .and("netPrice").minus(1).as("netPriceMinus1")
-        .and("netPrice").multiply(1.19).as("grossPrice")
-        .and("netPrice").divide(2).as("netPriceDiv2")
-        .and("spaceUnits").mod(2).as("spaceUnitsMod2")
-);
-
-AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
-List<Document> resultList = result.getMappedResults();
-----
-
-Note that we derive the name of the input collection from the `Product` class passed as first parameter to the `newAggregation` method.
-
-[[mongo.aggregation.examples.example5]]
-===== Aggregation Framework Example 5
-
-This example demonstrates the use of simple arithmetic operations derived from SpEL Expressions in the projection operation.
-
-[source,java]
-----
-class Product {
-    String id;
-    String name;
-    double netPrice;
-    int spaceUnits;
-}
-----
-
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-TypedAggregation<Product> agg = newAggregation(Product.class,
-    project("name", "netPrice")
-        .andExpression("netPrice + 1").as("netPricePlus1")
-        .andExpression("netPrice - 1").as("netPriceMinus1")
-        .andExpression("netPrice / 2").as("netPriceDiv2")
-        .andExpression("netPrice * 1.19").as("grossPrice")
-        .andExpression("spaceUnits % 2").as("spaceUnitsMod2")
-        .andExpression("(netPrice * 0.8  + 1.2) * 1.19").as("grossPriceIncludingDiscountAndCharge")
-
-);
-
-AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
-List<Document> resultList = result.getMappedResults();
-----
-
-[[mongo.aggregation.examples.example6]]
-===== Aggregation Framework Example 6
-
-This example demonstrates the use of complex arithmetic operations derived from SpEL Expressions in the projection operation.
-
-Note: The additional parameters passed to the `addExpression` method can be referenced with indexer expressions according to their position. In this example, we reference the first parameter of the parameters array with `[0]`. When the SpEL expression is transformed into a MongoDB aggregation framework expression, external parameter expressions are replaced with their respective values.
-
-[source,java]
-----
-class Product {
-    String id;
-    String name;
-    double netPrice;
-    int spaceUnits;
-}
-----
-
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-double shippingCosts = 1.2;
-
-TypedAggregation<Product> agg = newAggregation(Product.class,
-    project("name", "netPrice")
-        .andExpression("(netPrice * (1-discountRate)  + [0]) * (1+taxRate)", shippingCosts).as("salesPrice")
-);
-
-AggregationResults<Document> result = mongoTemplate.aggregate(agg, Document.class);
-List<Document> resultList = result.getMappedResults();
-----
-
-Note that we can also refer to other fields of the document within the SpEL expression.
-
-[[mongo.aggregation.examples.example7]]
-===== Aggregation Framework Example 7
-
-This example uses conditional projection. It is derived from the https://docs.mongodb.com/manual/reference/operator/aggregation/cond/[$cond reference documentation].
-
-[source,java]
-----
-public class InventoryItem {
-
-  @Id int id;
-  String item;
-  String description;
-  int qty;
-}
-
-public class InventoryItemProjection {
-
-  @Id int id;
-  String item;
-  String description;
-  int qty;
-  int discount
-}
-----
-
-[source,java]
-----
-import static org.springframework.data.mongodb.core.aggregation.Aggregation.*;
-
-TypedAggregation<InventoryItem> agg = newAggregation(InventoryItem.class,
-  project("item").and("discount")
-    .applyCondition(ConditionalOperator.newBuilder().when(Criteria.where("qty").gte(250))
-      .then(30)
-      .otherwise(20))
-    .and(ifNull("description", "Unspecified")).as("description")
-);
-
-AggregationResults<InventoryItemProjection> result = mongoTemplate.aggregate(agg, "inventory", InventoryItemProjection.class);
-List<InventoryItemProjection> stateStatsList = result.getMappedResults();
-----
-
-This one-step aggregation uses a projection operation with the `inventory` collection. We project the `discount` field by using a conditional operation for all inventory items that have a `qty` greater than or equal to `250`. A second conditional projection is performed for the `description` field. We apply the `Unspecified` description to all items that either do not have a `description` field or items that have a `null` description.
-
-As of MongoDB 3.6, it is possible to exclude fields from the projection by using a conditional expression.
-
-.Conditional aggregation projection
-====
-[source,java]
-----
-TypedAggregation<Book> agg = Aggregation.newAggregation(Book.class,
-  project("title")
-    .and(ConditionalOperators.when(ComparisonOperators.valueOf("author.middle")     <1>
-        .equalToValue(""))                                                          <2>
-        .then("$$REMOVE")                                                           <3>
-        .otherwiseValueOf("author.middle")                                          <4>
-    )
-	.as("author.middle"));
-----
-<1> If the value of the field `author.middle`
-<2> does not contain a value,
-<3> then use https://docs.mongodb.com/manual/reference/aggregation-variables/#variable.REMOVE[``$$REMOVE``] to exclude the field.
-<4> Otherwise, add the field value of `author.middle`.
-====
-
-include::mongo-custom-conversions.adoc[leveloffset=+1]
-
-[[mongo-template.index-and-collections]]
-== Index and Collection Management
-
-`MongoTemplate` provides a few methods for managing indexes and collections. These methods are collected into a helper interface called `IndexOperations`. You can access these operations by calling the `indexOps` method and passing in either the collection name or the `java.lang.Class` of your entity (the collection name is derived from the `.class`, either by name or from annotation metadata).
-
-The following listing shows the `IndexOperations` interface:
-
-[source,java]
-----
-public interface IndexOperations {
-
-  void ensureIndex(IndexDefinition indexDefinition);
-
-  void dropIndex(String name);
-
-  void dropAllIndexes();
-
-  void resetIndexCache();
-
-  List<IndexInfo> getIndexInfo();
-}
-----
-
-[[mongo-template.index-and-collections.index]]
-=== Methods for Creating an Index
-
-You can create an index on a collection to improve query performance by using the MongoTemplate class, as the following example shows:
-
-[source,java]
-----
-mongoTemplate.indexOps(Person.class).ensureIndex(new Index().on("name",Order.ASCENDING));
-----
-
-`ensureIndex` makes sure that an index for the provided IndexDefinition exists for the collection.
-
-You can create standard, geospatial, and text indexes by using the `IndexDefinition`, `GeoSpatialIndex` and `TextIndexDefinition` classes. For example, given the `Venue` class defined in a previous section, you could declare a geospatial query, as the following example shows:
-
-[source,java]
-----
-mongoTemplate.indexOps(Venue.class).ensureIndex(new GeospatialIndex("location"));
-----
-
-NOTE: `Index` and `GeospatialIndex` support configuration of <<mongo.collation,collations>>.
-
-[[mongo-template.index-and-collections.access]]
-=== Accessing Index Information
-
-The `IndexOperations` interface has the `getIndexInfo` method that returns a list of `IndexInfo` objects. This list contains all the indexes defined on the collection. The following example defines an index on the `Person` class that has an `age` property:
-
-[source,java]
-----
-template.indexOps(Person.class).ensureIndex(new Index().on("age", Order.DESCENDING).unique());
-
-List<IndexInfo> indexInfoList = template.indexOps(Person.class).getIndexInfo();
-
-// Contains
-// [IndexInfo [fieldSpec={_id=ASCENDING}, name=_id_, unique=false, sparse=false],
-//  IndexInfo [fieldSpec={age=DESCENDING}, name=age_-1, unique=true, sparse=false]]
-----
-
-[[mongo-template.index-and-collections.collection]]
-=== Methods for Working with a Collection
-
-The following example shows how to create a collection:
-
-.Working with collections by using `MongoTemplate`
-====
-[source,java]
-----
-MongoCollection<Document> collection = null;
-if (!mongoTemplate.getCollectionNames().contains("MyNewCollection")) {
-    collection = mongoTemplate.createCollection("MyNewCollection");
-}
-
-mongoTemplate.dropCollection("MyNewCollection");
-----
-====
-
-* *getCollectionNames*: Returns a set of collection names.
-* *collectionExists*: Checks to see if a collection with a given name exists.
-* *createCollection*: Creates an uncapped collection.
-* *dropCollection*: Drops the collection.
-* *getCollection*: Gets a collection by name, creating it if it does not exist.
-
-NOTE: Collection creation allows customization with `CollectionOptions` and supports <<mongo.collation,collations>>.
-
-[[mongo-template.commands]]
-== Executing Commands
-
-You can get at the MongoDB driver's `MongoDatabase.runCommand( )` method by using the `executeCommand(…)` methods on `MongoTemplate`. These methods also perform exception translation into Spring's `DataAccessException` hierarchy.
-
-[[mongo-template.commands.execution]]
-=== Methods for executing commands
-
-* `Document` *executeCommand* `(Document command)`: Run a MongoDB command.
-* `Document` *executeCommand* `(Document command, ReadPreference readPreference)`: Run a MongoDB command with the given nullable MongoDB `ReadPreference`.
-* `Document` *executeCommand* `(String jsonCommand)`: Execute a MongoDB command expressed as a JSON string.
-
-[[mongodb.mapping-usage.events]]
-== Lifecycle Events
-
-The MongoDB mapping framework includes several `org.springframework.context.ApplicationEvent` events that your application can respond to by registering special beans in the `ApplicationContext`. Being based on Spring's `ApplicationContext` event infrastructure enables other products, such as Spring Integration, to easily receive these events, as they are a well known eventing mechanism in Spring-based applications.
-
-To intercept an object before it goes through the conversion process (which turns your domain object into a `org.bson.Document`), you can register a subclass of `AbstractMongoEventListener` that overrides the `onBeforeConvert` method. When the event is dispatched, your listener is called and passed the domain object before it goes into the converter. The following example shows how to do so:
-
-====
-[source,java]
-----
-public class BeforeConvertListener extends AbstractMongoEventListener<Person> {
-  @Override
-  public void onBeforeConvert(BeforeConvertEvent<Person> event) {
-    ... does some auditing manipulation, set timestamps, whatever ...
-  }
-}
-----
-====
-
-To intercept an object before it goes into the database, you can register a subclass of `org.springframework.data.mongodb.core.mapping.event.AbstractMongoEventListener` that overrides the `onBeforeSave` method. When the event is dispatched, your listener is called and passed the domain object and the converted `com.mongodb.Document`. The following example shows how to do so:
-
-====
-[source,java]
-----
-public class BeforeSaveListener extends AbstractMongoEventListener<Person> {
-  @Override
-  public void onBeforeSave(BeforeSaveEvent<Person> event) {
-    … change values, delete them, whatever …
-  }
-}
-----
-====
-
-Declaring these beans in your Spring ApplicationContext causes them to be invoked whenever the event is dispatched.
-
-The following callback methods are present in `AbstractMappingEventListener`:
-
-* `onBeforeConvert`: Called in `MongoTemplate` `insert`, `insertList`, and `save` operations before the object is converted to a `Document` by a `MongoConverter`.
-* `onBeforeSave`: Called in `MongoTemplate` `insert`, `insertList`, and `save` operations *before* inserting or saving the `Document` in the database.
-* `onAfterSave`: Called in `MongoTemplate` `insert`, `insertList`, and `save` operations *after* inserting or saving the `Document` in the database.
-* `onAfterLoad`: Called in `MongoTemplate` `find`, `findAndRemove`, `findOne`, and `getCollection` methods after the `Document` has been retrieved from the database.
-* `onAfterConvert`: Called in `MongoTemplate` `find`, `findAndRemove`, `findOne`, and `getCollection` methods after the `Document` has been retrieved from the database was converted to a POJO.
-
-NOTE: Lifecycle events are only emitted for root level types. Complex types used as properties within a document root are not subject to event publication unless they are document references annotated with `@DBRef`.
-
-WARNING: Lifecycle events depend on an `ApplicationEventMulticaster`, which in case of the `SimpleApplicationEventMulticaster` can be configured with a `TaskExecutor`, and therefore gives no guarantees when an Event is processed.
-
-include::../{spring-data-commons-docs}/entity-callbacks.adoc[leveloffset=+1]
-include::./mongo-entity-callbacks.adoc[leveloffset=+2]
-
-[[mongo.exception]]
-== Exception Translation
-
-The Spring framework provides exception translation for a wide variety of database and mapping technologies. This has traditionally been for JDBC and JPA. The Spring support for MongoDB extends this feature to the MongoDB Database by providing an implementation of the `org.springframework.dao.support.PersistenceExceptionTranslator` interface.
-
-The motivation behind mapping to Spring's https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/data-access.html#dao-exceptions[consistent data access exception hierarchy] is that you are then able to write portable and descriptive exception handling code without resorting to coding against MongoDB error codes. All of Spring's data access exceptions are inherited from the root `DataAccessException` class so that you can be sure to catch all database related exception within a single try-catch block. Note that not all exceptions thrown by the MongoDB driver inherit from the `MongoException` class. The inner exception and message are preserved so that no information is lost.
-
-Some of the mappings performed by the `MongoExceptionTranslator` are `com.mongodb.Network to DataAccessResourceFailureException` and `MongoException` error codes 1003, 12001, 12010, 12011, and 12012 to `InvalidDataAccessApiUsageException`. Look into the implementation for more details on the mapping.
-
-[[mongo.executioncallback]]
-== Execution Callbacks
-
-One common design feature of all Spring template classes is that all functionality is routed into one of the template's execute callback methods. Doing so helps to ensure that exceptions and any resource management that may be required are performed consistently. While JDBC and JMS need this feature much more than MongoDB does, it still offers a single spot for exception translation and logging to occur. Consequently, using these execute callbacks is the preferred way to access the MongoDB driver's `MongoDatabase` and `MongoCollection` objects to perform uncommon operations that were not exposed as methods on `MongoTemplate`.
-
-The following list describes the execute callback methods.
-
-* `<T> T` *execute* `(Class<?> entityClass, CollectionCallback<T> action)`: Executes the given `CollectionCallback` for the entity collection of the specified class.
-
-* `<T> T` *execute* `(String collectionName, CollectionCallback<T> action)`: Executes the given `CollectionCallback` on the collection of the given name.
-
-* `<T> T` *execute* `(DbCallback<T> action)`: Executes a DbCallback translating any exceptions as necessary. Spring Data MongoDB provides support for the Aggregation Framework introduced to MongoDB in version 2.2.
-
-* `<T> T` *execute* `(String collectionName, DbCallback<T> action)`: Executes a `DbCallback` on the collection of the given name translating any exceptions as necessary.
-
-* `<T> T` *executeInSession* `(DbCallback<T> action)`: Executes the given `DbCallback` within the same connection to the database so as to ensure consistency in a write-heavy environment where you may read the data that you wrote.
-
-The following example uses the `CollectionCallback` to return information about an index:
-
-[source,java]
-----
-boolean hasIndex = template.execute("geolocation", new CollectionCallbackBoolean>() {
-  public Boolean doInCollection(Venue.class, DBCollection collection) throws MongoException, DataAccessException {
-    List<Document> indexes = collection.getIndexInfo();
-    for (Document document : indexes) {
-      if ("location_2d".equals(document.get("name"))) {
-        return true;
-      }
-    }
-    return false;
-  }
-});
-----
-
-[[gridfs]]
-== GridFS Support
-
-MongoDB supports storing binary files inside its filesystem, GridFS. Spring Data MongoDB provides a `GridFsOperations` interface as well as the corresponding implementation, `GridFsTemplate`, to let you interact with the filesystem. You can set up a `GridFsTemplate` instance by handing it a `MongoDbFactory` as well as a `MongoConverter`, as the following example shows:
-
-.JavaConfig setup for a GridFsTemplate
-====
-[source,java]
-----
-class GridFsConfiguration extends AbstractMongoConfiguration {
-
-  // … further configuration omitted
-
-  @Bean
-  public GridFsTemplate gridFsTemplate() {
-    return new GridFsTemplate(mongoDbFactory(), mappingMongoConverter());
-  }
-}
-----
-====
-
-The corresponding XML configuration follows:
-
-.XML configuration for a GridFsTemplate
-====
-[source,xml]
-----
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:mongo="http://www.springframework.org/schema/data/mongo"
-  xsi:schemaLocation="http://www.springframework.org/schema/data/mongo
-                      https://www.springframework.org/schema/data/mongo/spring-mongo.xsd
-                      http://www.springframework.org/schema/beans
-                      https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-  <mongo:db-factory id="mongoDbFactory" dbname="database" />
-  <mongo:mapping-converter id="converter" />
-
-  <bean class="org.springframework.data.mongodb.gridfs.GridFsTemplate">
-    <constructor-arg ref="mongoDbFactory" />
-    <constructor-arg ref="converter" />
-  </bean>
-
-</beans>
-----
-====
-
-The template can now be injected and used to perform storage and retrieval operations, as the following example shows:
-
-.Using GridFsTemplate to store files
-====
-[source,java]
-----
-class GridFsClient {
-
-  @Autowired
-  GridFsOperations operations;
-
-  @Test
-  public void storeFileToGridFs() {
-
-    FileMetadata metadata = new FileMetadata();
-    // populate metadata
-    Resource file = … // lookup File or Resource
-
-    operations.store(file.getInputStream(), "filename.txt", metadata);
-  }
-}
-----
-====
-
-The `store(…)` operations take an `InputStream`, a filename, and (optionally) metadata information about the file to store. The metadata can be an arbitrary object, which will be marshaled by the `MongoConverter` configured with the `GridFsTemplate`. Alternatively, you can also provide a `Document`.
-
-You can read files from the filesystem through either the `find(…)` or the `getResources(…)` methods. Let's have a look at the `find(…)` methods first. You can either find a single file or multiple files that match a `Query`. You can use the `GridFsCriteria` helper class to define queries. It provides static factory methods to encapsulate default metadata fields (such as `whereFilename()` and `whereContentType()`) or a custom one through `whereMetaData()`. The following example shows how to use `GridFsTemplate` to query for files:
-
-.Using GridFsTemplate to query for files
-====
-[source,java]
-----
-class GridFsClient {
-
-  @Autowired
-  GridFsOperations operations;
-
-  @Test
-  public void findFilesInGridFs() {
-    GridFSFindIterable result = operations.find(query(whereFilename().is("filename.txt")))
-  }
-}
-----
-====
-
-NOTE: Currently, MongoDB does not support defining sort criteria when retrieving files from GridFS. For this reason, any sort criteria defined on the `Query` instance handed into the `find(…)` method are disregarded.
-
-The other option to read files from the GridFs is to use the methods introduced by the `ResourcePatternResolver` interface. They allow handing an Ant path into the method and can thus retrieve files matching the given pattern. The following example shows how to use `GridFsTemplate` to read files:
-
-.Using GridFsTemplate to read files
-====
-[source,java]
-----
-class GridFsClient {
-
-  @Autowired
-  GridFsOperations operations;
-
-  @Test
-  public void readFilesFromGridFs() {
-    GridFsResources[] txtFiles = operations.getResources("*.txt");
-  }
-}
-----
-====
-
-`GridFsOperations` extends `ResourcePatternResolver` and lets the `GridFsTemplate` (for example) to be plugged into an `ApplicationContext` to read Spring Config files from MongoDB database.
-
-include::tailable-cursors.adoc[]
-include::change-streams.adoc[]
diff --git a/src/main/asciidoc/reference/query-by-example.adoc b/src/main/asciidoc/reference/query-by-example.adoc
deleted file mode 100644
index 59b8d20021..0000000000
--- a/src/main/asciidoc/reference/query-by-example.adoc
+++ /dev/null
@@ -1,99 +0,0 @@
-[[query-by-example.execution]]
-== Running an Example
-
-The following example shows how to query by example when using a repository (of `Person` objects, in this case):
-
-.Query by Example using a repository
-====
-[source, java]
-----
-public interface PersonRepository extends QueryByExampleExecutor<Person> {
-
-}
-
-public class PersonService {
-
-  @Autowired PersonRepository personRepository;
-
-  public List<Person> findPeople(Person probe) {
-    return personRepository.findAll(Example.of(probe));
-  }
-}
-----
-====
-
-An `Example` containing an untyped `ExampleSpec` uses the Repository type and its collection name. Typed `ExampleSpec` instances use their type as the result type and the collection name from the `Repository` instance.
-
-NOTE: When including `null` values in the `ExampleSpec`, Spring Data Mongo uses embedded document matching instead of dot notation property matching. Doing so forces exact document matching for all property values and the property order in the embedded document.
-
-Spring Data MongoDB provides support for the following matching options:
-
-[cols="1,2", options="header"]
-.`StringMatcher` options
-|===
-| Matching
-| Logical result
-
-| `DEFAULT` (case-sensitive)
-| `{"firstname" : firstname}`
-
-| `DEFAULT` (case-insensitive)
-| `{"firstname" : { $regex: firstname, $options: 'i'}}`
-
-| `EXACT`  (case-sensitive)
-| `{"firstname" : { $regex: /^firstname$/}}`
-
-| `EXACT` (case-insensitive)
-| `{"firstname" : { $regex: /^firstname$/, $options: 'i'}}`
-
-| `STARTING`  (case-sensitive)
-| `{"firstname" : { $regex: /^firstname/}}`
-
-| `STARTING` (case-insensitive)
-| `{"firstname" : { $regex: /^firstname/, $options: 'i'}}`
-
-| `ENDING`  (case-sensitive)
-| `{"firstname" : { $regex: /firstname$/}}`
-
-| `ENDING` (case-insensitive)
-| `{"firstname" : { $regex: /firstname$/, $options: 'i'}}`
-
-| `CONTAINING`  (case-sensitive)
-| `{"firstname" : { $regex: /.\*firstname.*/}}`
-
-| `CONTAINING` (case-insensitive)
-| `{"firstname" : { $regex: /.\*firstname.*/, $options: 'i'}}`
-
-| `REGEX`  (case-sensitive)
-| `{"firstname" : { $regex: /firstname/}}`
-
-| `REGEX` (case-insensitive)
-| `{"firstname" : { $regex: /firstname/, $options: 'i'}}`
-
-|===
-
-[[query-by-example.untyped]]
-== Untyped Example
-
-By default `Example` is strictly typed. This means that the mapped query has an included type match, restricting it to probe assignable types. For example, when sticking with the default type key (`_class`), the query has restrictions such as (`_class : { $in : [ com.acme.Person] }`).
-
-By using the `UntypedExampleMatcher`, it is possible to bypass the default behavior and skip the type restriction. So, as long as field names match, nearly any domain type can be used as the probe for creating the reference, as the following example shows:
-
-.Untyped Example Query
-====
-[source, java]
-----
-
-class JustAnArbitraryClassWithMatchingFieldName {
-  @Field("lastname") String value;
-}
-
-JustAnArbitraryClassWithMatchingFieldNames probe = new JustAnArbitraryClassWithMatchingFieldNames();
-probe.value = "stark";
-
-Example example = Example.of(probe, UntypedExampleMatcher.matching());
-
-Query query = new Query(new Criteria().alike(example));
-List<Person> result = template.find(query, Person.class);
-----
-====
diff --git a/src/main/asciidoc/reference/reactive-mongo-repositories.adoc b/src/main/asciidoc/reference/reactive-mongo-repositories.adoc
deleted file mode 100644
index 8ff6737d6e..0000000000
--- a/src/main/asciidoc/reference/reactive-mongo-repositories.adoc
+++ /dev/null
@@ -1,269 +0,0 @@
-[[mongo.reactive.repositories]]
-= Reactive MongoDB repositories
-
-This chapter describes the specialties for reactive repository support for MongoDB. This chapter builds on the core repository support explained in <<repositories>>. You should have a sound understanding of the basic concepts explained there.
-
-[[mongo.reactive.repositories.libraries]]
-== Reactive Composition Libraries
-
-The reactive space offers various reactive composition libraries. The most common libraries are https://github.com/ReactiveX/RxJava[RxJava] and https://projectreactor.io/[Project Reactor].
-
-Spring Data MongoDB is built on top of the https://mongodb.github.io/mongo-java-driver-reactivestreams/[MongoDB Reactive Streams] driver, to provide maximal interoperability by relying on the https://www.reactive-streams.org/[Reactive Streams] initiative. Static APIs, such as `ReactiveMongoOperations`, are provided by using Project Reactor's `Flux` and `Mono` types. Project Reactor offers various adapters to convert reactive wrapper types  (`Flux` to `Observable` and vice versa), but conversion can easily clutter your code.
-
-Spring Data's Repository abstraction is a dynamic API, mostly defined by you and your requirements as you declare query methods. Reactive MongoDB repositories can be implemented by using either RxJava or Project Reactor wrapper types by extending from one of the following library-specific repository interfaces:
-
-* `ReactiveCrudRepository`
-* `ReactiveSortingRepository`
-* `RxJava2CrudRepository`
-* `RxJava2SortingRepository`
-
-Spring Data converts reactive wrapper types behind the scenes so that you can stick to your favorite composition library.
-
-[[mongo.reactive.repositories.usage]]
-== Usage
-
-To access domain entities stored in a MongoDB database, you can use our sophisticated repository support that eases implementing those quite significantly. To do so, create an interface similar for your repository. Before you can do that, though, you need an entity, such as the entity defined in the following example:
-
-.Sample `Person` entity
-====
-[source,java]
-----
-public class Person {
-
-  @Id
-  private String id;
-  private String firstname;
-  private String lastname;
-  private Address address;
-
-  // … getters and setters omitted
-}
-----
-====
-
-Note that the entity defined in the preceding example has a property named `id` of type `ObjectId`. The default serialization mechanism used in `MongoTemplate` (which backs the repository support) regards properties named `id` as the document ID. Currently, we support `String`, `ObjectId`, and `BigInteger` as id-types. The following example shows how to create an interface that defines queries against the `Person` object from the preceding example:
-
-.Basic repository interface to persist Person entities
-====
-[source]
-----
-public interface ReactivePersonRepository extends ReactiveSortingRepository<Person, String> {
-
-  Flux<Person> findByFirstname(String firstname);                                   <1>
-
-  Flux<Person> findByFirstname(Publisher<String> firstname);                        <2>
-
-  Flux<Person> findByFirstnameOrderByLastname(String firstname, Pageable pageable); <3>
-
-  Mono<Person> findByFirstnameAndLastname(String firstname, String lastname);       <4>
-
-  Mono<Person> findFirstByLastname(String lastname);                                <5>
-}
-----
-<1> The method shows a query for all people with the given `lastname`. The query is derived by parsing the method name for constraints that can be concatenated with `And` and `Or`. Thus, the method name results in a query expression of `{"lastname" : lastname}`.
-<2> The method shows a query for all people with the given `firstname` once the `firstname` is emitted by the given `Publisher`.
-<3> Use `Pageable` to pass offset and sorting parameters to the database.
-<4> Find a single entity for the given criteria. It completes with `IncorrectResultSizeDataAccessException` on non-unique results.
-<5> Unless <4>, the first entity is always emitted even if the query yields more result documents.
-====
-
-For Java configuration, use the `@EnableReactiveMongoRepositories` annotation. The annotation carries the same attributes as the namespace element. If no base package is configured, the infrastructure scans the package of the annotated configuration class.
-
-NOTE: MongoDB uses two different drivers for imperative (synchronous/blocking) and reactive (non-blocking) data access. You must create a connection by using the Reactive Streams driver to provide the required infrastructure for Spring Data's Reactive MongoDB support. Consequently, you must provide a separate configuration for MongoDB's Reactive Streams driver. Note that your application operates on two different connections if you use reactive and blocking Spring Data MongoDB templates and repositories.
-
-The following listing shows how to use Java configuration for a repository:
-
-.Java configuration for repositories
-====
-[source,java]
-----
-@Configuration
-@EnableReactiveMongoRepositories
-class ApplicationConfig extends AbstractReactiveMongoConfiguration {
-
-  @Override
-  protected String getDatabaseName() {
-    return "e-store";
-  }
-
-  @Override
-  public MongoClient reactiveMongoClient() {
-    return MongoClients.create();
-  }
-
-  @Override
-  protected String getMappingBasePackage() {
-    return "com.oreilly.springdata.mongodb"
-  }
-}
-----
-====
-
-Because our domain repository extends `ReactiveSortingRepository`, it provides you with CRUD operations as well as methods for sorted access to the entities. Working with the repository instance is a matter of dependency injecting it into a client, as the following example shows:
-
-.Sorted access to Person entities
-====
-[source,java]
-----
-public class PersonRepositoryTests {
-
-    @Autowired ReactivePersonRepository repository;
-
-    @Test
-    public void sortsElementsCorrectly() {
-      Flux<Person> persons = repository.findAll(Sort.by(new Order(ASC, "lastname")));
-    }
-}
-----
-====
-
-[[mongo.reactive.repositories.features]]
-== Features
-
-Spring Data's Reactive MongoDB support comes with a reduced feature set compared to the blocking <<mongo.repositories,MongoDB Repositories>>.
-
-It supports the following features:
-
-* Query Methods using <<mongodb.repositories.queries,String queries and Query Derivation>>
-* <<mongodb.reactive.repositories.queries.geo-spatial>>
-* <<mongodb.repositories.queries.delete>>
-* <<mongodb.repositories.queries.json-based>>
-* <<mongodb.repositories.queries.full-text>>
-* <<mongodb.reactive.repositories.queries.type-safe>>
-* <<projections>>
-
-[[mongodb.reactive.repositories.queries.geo-spatial]]
-=== Geo-spatial Repository Queries
-
-As you saw earlier in "`<<mongodb.reactive.repositories.queries.geo-spatial>>`", a few keywords trigger geo-spatial operations within a MongoDB query. The `Near` keyword allows some further modification, as the next few examples show.
-
-The following example shows how to define a `near` query that finds all persons with a given distance of a given point:
-
-.Advanced `Near` queries
-====
-[source,java]
-----
-public interface PersonRepository extends ReactiveMongoRepository<Person, String>
-
-  // { 'location' : { '$near' : [point.x, point.y], '$maxDistance' : distance}}
-  Flux<Person> findByLocationNear(Point location, Distance distance);
-}
-----
-====
-
-Adding a `Distance` parameter to the query method allows restricting results to those within the given distance. If the `Distance` was set up containing a `Metric`, we transparently use `$nearSphere` instead of `$code`, as the following example shows:
-
-.Using `Distance` with `Metrics`
-====
-[source,java]
-----
-Point point = new Point(43.7, 48.8);
-Distance distance = new Distance(200, Metrics.KILOMETERS);
-… = repository.findByLocationNear(point, distance);
-// {'location' : {'$nearSphere' : [43.7, 48.8], '$maxDistance' : 0.03135711885774796}}
-----
-====
-
-NOTE: Reactive Geo-spatial repository queries support the domain type and `GeoResult<T>` results within a reactive wrapper type. `GeoPage` and `GeoResults` are not supported as they contradict the deferred result approach with pre-calculating the average distance. Howevery, you can still pass in a `Pageable` argument to page results yourself.
-
-Using a `Distance` with a `Metric` causes a `$nearSphere` (instead of a plain `$near`) clause to be added. Beyond that, the actual distance gets calculated according to the `Metrics` used.
-
-(Note that `Metric` does not refer to metric units of measure. It could be miles rather than kilometers. Rather, `metric` refers to the concept of a system of measurement, regardless of which system you use.)
-
-NOTE: Using `@GeoSpatialIndexed(type = GeoSpatialIndexType.GEO_2DSPHERE)` on the target property forces usage of `$nearSphere` operator.
-
-==== Geo-near Queries
-
-Spring Data MongoDB supports geo-near queries, as the following example shows:
-
-[source,java]
-----
-public interface PersonRepository extends ReactiveMongoRepository<Person, String>
-
-  // {'geoNear' : 'location', 'near' : [x, y] }
-  Flux<GeoResult<Person>> findByLocationNear(Point location);
-
-  // No metric: {'geoNear' : 'person', 'near' : [x, y], maxDistance : distance }
-  // Metric: {'geoNear' : 'person', 'near' : [x, y], 'maxDistance' : distance,
-  //          'distanceMultiplier' : metric.multiplier, 'spherical' : true }
-  Flux<GeoResult<Person>> findByLocationNear(Point location, Distance distance);
-
-  // Metric: {'geoNear' : 'person', 'near' : [x, y], 'minDistance' : min,
-  //          'maxDistance' : max, 'distanceMultiplier' : metric.multiplier,
-  //          'spherical' : true }
-  Flux<GeoResult<Person>> findByLocationNear(Point location, Distance min, Distance max);
-
-  // {'geoNear' : 'location', 'near' : [x, y] }
-  Flux<GeoResult<Person>> findByLocationNear(Point location);
-}
-----
-
-[[mongodb.reactive.repositories.queries.type-safe]]
-=== Type-safe Query Methods
-
-Reactive MongoDB repository support integrates with the http://www.querydsl.com/[Querydsl] project, which provides a way to perform type-safe queries.
-
-[quote, Querydsl Team]
-Instead of writing queries as inline strings or externalizing them into XML files they are constructed via a fluent API.
-
-It provides the following features:
-
-* Code completion in the IDE (all properties, methods, and operations can be expanded in your favorite Java IDE).
-* Almost no syntactically invalid queries allowed (type-safe on all levels).
-* Domain types and properties can be referenced safely -- no strings involved!
-* Adapts better to refactoring changes in domain types.
-* Incremental query definition is easier.
-
-See the http://www.querydsl.com/static/querydsl/latest/reference/html/[Querydsl documentation] for how to bootstrap your environment for APT-based code generation using Maven or Ant.
-
-The Querydsl repository support lets you write and execute queries such as the following:
-
-[source,java]
-----
-QPerson person = QPerson.person;
-
-Flux<Person> result = repository.findAll(person.address.zipCode.eq("C0123"));
-----
-
-`QPerson` is a class that is generated by the Java annotation post-processing tool. It is a `Predicate` that lets you write type-safe queries.
-Note that there are no strings in the query other than the `C0123` value.
-
-You can use the generated `Predicate` class by using the `ReactiveQuerydslPredicateExecutor` interface, which the following listing shows:
-
-.The Gateway to Reactive Querydsl - The ReactiveQuerydslPredicateExecutor
-====
-[source,java]
-----
-public interface ReactiveQuerydslPredicateExecutor<T> {
-
-	Mono<T> findOne(Predicate predicate);
-
-	Flux<T> findAll(Predicate predicate);
-
-	Flux<T> findAll(Predicate predicate, Sort sort);
-
-	Flux<T> findAll(Predicate predicate, OrderSpecifier<?>... orders);
-
-	Flux<T> findAll(OrderSpecifier<?>... orders);
-
-	Mono<Long> count(Predicate predicate);
-
-	Mono<Boolean> exists(Predicate predicate);
-}
-----
-====
-
-To use this in your repository implementation, add it to the list of repository interfaces from which your interface inherits, as the following example shows:
-
-.Reactive Querydsl Respository Declaration
-====
-[source,java]
-----
-public interface PersonRepository extends ReactiveMongoRepository<Person, String>, ReactiveQuerydslPredicateExecutor<Person> {
-
-   // additional query methods go here
-}
-----
-====
-
-NOTE: Please note that joins (DBRef's) are not supported with Reactive MongoDB support.
diff --git a/src/main/asciidoc/reference/reactive-mongodb.adoc b/src/main/asciidoc/reference/reactive-mongodb.adoc
deleted file mode 100644
index 3e999e6e36..0000000000
--- a/src/main/asciidoc/reference/reactive-mongodb.adoc
+++ /dev/null
@@ -1,577 +0,0 @@
-[[mongo.reactive]]
-= Reactive MongoDB support
-
-The reactive MongoDB support contains the following basic set of features:
-
-* Spring configuration support that uses Java-based `@Configuration` classes, a `MongoClient` instance, and replica sets.
-* `ReactiveMongoTemplate`, which is a helper class that increases productivity by using `MongoOperations` in a reactive manner. It includes integrated object mapping between `Document` instances and POJOs.
-* Exception translation into Spring's portable Data Access Exception hierarchy.
-* Feature-rich Object Mapping integrated with Spring's `ConversionService`.
-* Annotation-based mapping metadata that is extensible to support other metadata formats.
-* Persistence and mapping lifecycle events.
-* Java based `Query`, `Criteria`, and `Update` DSLs.
-* Automatic implementation of reactive repository interfaces including support for custom query methods.
-
-For most tasks, you should use `ReactiveMongoTemplate` or the repository support, both of which use the rich mapping functionality. `ReactiveMongoTemplate` is the place to look for accessing functionality such as incrementing counters or ad-hoc CRUD operations. `ReactiveMongoTemplate` also provides callback methods so that you can use the low-level API artifacts (such as `MongoDatabase`) to communicate directly with MongoDB. The goal with naming conventions on various API artifacts is to copy those in the base MongoDB Java driver so that you can map your existing knowledge onto the Spring APIs.
-
-[[mongodb-reactive-getting-started]]
-== Getting Started
-
-Spring MongoDB support requires MongoDB 2.6 or higher and Java SE 8 or higher.
-
-First, you need to set up a running MongoDB server. Refer to the https://docs.mongodb.org/manual/core/introduction/[MongoDB Quick Start guide] for an explanation on how to startup a MongoDB instance. Once installed, starting MongoDB is typically a matter of executing the following command: `${MONGO_HOME}/bin/mongod`
-
-To create a Spring project in STS, go to File -> New -> Spring Template Project -> Simple Spring Utility Project and press Yes when prompted. Then enter a project and a package name, such as org.spring.mongodb.example.
-
-Then add the following to the pom.xml dependencies section.
-
-[source,xml,subs="+attributes"]
-----
-<dependencies>
-
-  <!-- other dependency elements omitted -->
-
-  <dependency>
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-mongodb</artifactId>
-    <version>{version}</version>
-  </dependency>
-
-  <dependency>
-    <groupId>org.mongodb</groupId>
-    <artifactId>mongodb-driver-reactivestreams</artifactId>
-    <version>{mongo-reactivestreams}</version>
-  </dependency>
-
-  <dependency>
-    <groupId>io.projectreactor</groupId>
-    <artifactId>reactor-core</artifactId>
-    <version>{reactor}</version>
-  </dependency>
-
-</dependencies>
-----
-
-NOTE: MongoDB uses two different drivers for blocking and reactive (non-blocking) data access. While blocking operations are provided by default, you can opt-in for reactive usage.
-
-To get started with a working example, create a simple `Person` class to persist, as follows:
-
-[source,java]
-----
-@Document
-public class Person {
-
-  private String id;
-  private String name;
-  private int age;
-
-  public Person(String name, int age) {
-    this.name = name;
-    this.age = age;
-  }
-
-  public String getId() {
-    return id;
-  }
-  public String getName() {
-    return name;
-  }
-  public int getAge() {
-    return age;
-  }
-
-  @Override
-  public String toString() {
-    return "Person [id=" + id + ", name=" + name + ", age=" + age + "]";
-  }
-}
-----
-
-Then create an application to run, as follows:
-
-[source,java]
-----
-public class ReactiveMongoApp {
-
-  private static final Logger log = LoggerFactory.getLogger(ReactiveMongoApp.class);
-
-  public static void main(String[] args) throws Exception {
-
-    CountDownLatch latch = new CountDownLatch(1);
-
-    ReactiveMongoTemplate mongoOps = new ReactiveMongoTemplate(MongoClients.create(), "database");
-
-    mongoOps.insert(new Person("Joe", 34))
-          .flatMap(p -> mongoOps.findOne(new Query(where("name").is("Joe")), Person.class))
-          .doOnNext(person -> log.info(person.toString()))
-          .flatMap(person -> mongoOps.dropCollection("person"))
-          .doOnComplete(latch::countDown)
-          .subscribe();
-
-    latch.await();
-  }
-}
-----
-
-Running the preceding class produces the following output:
-
-[source]
-----
-2016-09-20 14:56:57,373 DEBUG .index.MongoPersistentEntityIndexCreator: 124 - Analyzing class class example.ReactiveMongoApp$Person for index information.
-2016-09-20 14:56:57,452 DEBUG .data.mongodb.core.ReactiveMongoTemplate: 975 - Inserting Document containing fields: [_class, name, age] in collection: person
-2016-09-20 14:56:57,541 DEBUG .data.mongodb.core.ReactiveMongoTemplate:1503 - findOne using query: { "name" : "Joe"} fields: null for class: class example.ReactiveMongoApp$Person in collection: person
-2016-09-20 14:56:57,545 DEBUG .data.mongodb.core.ReactiveMongoTemplate:1979 - findOne using query: { "name" : "Joe"} in db.collection: database.person
-2016-09-20 14:56:57,567  INFO                 example.ReactiveMongoApp:  43 - Person [id=57e1321977ac501c68d73104, name=Joe, age=34]
-2016-09-20 14:56:57,573 DEBUG .data.mongodb.core.ReactiveMongoTemplate: 528 - Dropped collection [person]
-----
-
-Even in this simple example, there are a few things to take notice of:
-
-* You can instantiate the central helper class of Spring Mongo (<<mongo.reactive.template,`ReactiveMongoTemplate`>>) by using the standard `com.mongodb.reactivestreams.client.MongoClient` object and the name of the database to use.
-* The mapper works against standard POJO objects without the need for any additional metadata (though you can optionally provide that information. See <<mapping-chapter,here>>.).
-* Conventions are used for handling the ID field, converting it to be an `ObjectId` when stored in the database.
-* Mapping conventions can use field access. Notice that the `Person` class has only getters.
-* If the constructor argument names match the field names of the stored document, they are used to instantiate the object
-
-There is a https://github.com/spring-projects/spring-data-examples[GitHub repository with several examples] that you can download and play around with to get a feel for how the library works.
-
-[[mongo.reactive.driver]]
-== Connecting to MongoDB with Spring and the Reactive Streams Driver
-
-One of the first tasks when using MongoDB and Spring is to create a `com.mongodb.reactivestreams.client.MongoClient` object by using the IoC container.
-
-[[mongo.reactive.mongo-java-config]]
-=== Registering a MongoClient Instance Using Java-based Metadata
-
-The following example shows how to use Java-based bean metadata to register an instance of a `com.mongodb.reactivestreams.client.MongoClient`:
-
-.Registering a com.mongodb.MongoClient object using Java based bean metadata
-====
-[source,java]
-----
-@Configuration
-public class AppConfig {
-
-  /*
-   * Use the Reactive Streams Mongo Client API to create a com.mongodb.reactivestreams.client.MongoClient instance.
-   */
-   public @Bean MongoClient reactiveMongoClient()  {
-       return MongoClients.create("mongodb://localhost");
-   }
-}
-----
-====
-
-This approach lets you use the standard `com.mongodb.reactivestreams.client.MongoClient` API (which you may already know).
-
-An alternative is to register an instance of `com.mongodb.reactivestreams.client.MongoClient` instance with the container by using Spring's `ReactiveMongoClientFactoryBean`. As compared to instantiating a `com.mongodb.reactivestreams.client.MongoClient` instance directly, the `FactoryBean` approach has the added advantage of also providing the container with an `ExceptionTranslator` implementation that translates MongoDB exceptions to exceptions in Spring's portable `DataAccessException` hierarchy for data access classes annotated with the `@Repository` annotation. This hierarchy and use of `@Repository` is described in https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/data-access.html[Spring's DAO support features].
-
-The following example shows Java-based bean metadata that supports exception translation on `@Repository` annotated classes:
-
-.Registering a com.mongodb.MongoClient object using Spring's MongoClientFactoryBean and enabling Spring's exception translation support
-====
-[source,java]
-----
-@Configuration
-public class AppConfig {
-
-    /*
-     * Factory bean that creates the com.mongodb.reactivestreams.client.MongoClient instance
-     */
-     public @Bean ReactiveMongoClientFactoryBean mongoClient() {
-
-          ReactiveMongoClientFactoryBean clientFactory = new ReactiveMongoClientFactoryBean();
-          clientFactory.setHost("localhost");
-
-          return clientFactory;
-     }
-}
-----
-====
-
-To access the `com.mongodb.reactivestreams.client.MongoClient` object created by the `ReactiveMongoClientFactoryBean` in other `@Configuration` or your own classes, get the `MongoClient` from the context.
-
-
-[[mongo.reactive.mongo-db-factory]]
-=== The ReactiveMongoDatabaseFactory Interface
-
-While `com.mongodb.reactivestreams.client.MongoClient` is the entry point to the reactive MongoDB driver API, connecting to a specific MongoDB database instance requires additional information, such as the database name. With that information, you can obtain a `com.mongodb.reactivestreams.client.MongoDatabase` object and access all the functionality of a specific MongoDB database instance. Spring provides the `org.springframework.data.mongodb.core.ReactiveMongoDatabaseFactory` interface to bootstrap connectivity to the database. The following listing shows the `ReactiveMongoDatabaseFactory` interface:
-
-[source,java]
-----
-public interface ReactiveMongoDatabaseFactory {
-
-  /**
-   * Creates a default {@link MongoDatabase} instance.
-   *
-   * @return
-   * @throws DataAccessException
-   */
-  MongoDatabase getMongoDatabase() throws DataAccessException;
-
-  /**
-   * Creates a {@link MongoDatabase} instance to access the database with the given name.
-   *
-   * @param dbName must not be {@literal null} or empty.
-   * @return
-   * @throws DataAccessException
-   */
-  MongoDatabase getMongoDatabase(String dbName) throws DataAccessException;
-
-  /**
-   * Exposes a shared {@link MongoExceptionTranslator}.
-   *
-   * @return will never be {@literal null}.
-   */
-  PersistenceExceptionTranslator getExceptionTranslator();
-}
-----
-
-The `org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory` class implements the `ReactiveMongoDatabaseFactory` interface and is created with a standard `com.mongodb.reactivestreams.client.MongoClient` instance and the database name.
-
-Instead of using the IoC container to create an instance of `ReactiveMongoTemplate`, you can use them in standard Java code, as follows:
-
-[source,java]
-----
-public class MongoApp {
-
-  private static final Log log = LogFactory.getLog(MongoApp.class);
-
-  public static void main(String[] args) throws Exception {
-
-    ReactiveMongoOperations mongoOps = new ReactiveMongoOperations(new SimpleReactiveMongoDatabaseFactory(MongoClient.create(), "database"));
-
-    mongoOps.insert(new Person("Joe", 34))
-        .flatMap(p -> mongoOps.findOne(new Query(where("name").is("Joe")), Person.class))
-        .doOnNext(person -> log.info(person.toString()))
-        .flatMap(person -> mongoOps.dropCollection("person"))
-        .subscribe();
-  }
-}
-----
-
-The use of `SimpleMongoDbFactory` is the only difference between the listing shown in the <<mongodb-reactive-getting-started,getting started section>>.
-
-[[mongo.reactive.mongo-db-factory-java]]
-=== Registering a ReactiveMongoDatabaseFactory Instance by Using Java-based Metadata
-
-To register a `ReactiveMongoDatabaseFactory` instance with the container, you can write code much like what was highlighted in the previous code listing, as the following example shows:
-
-[source,java]
-----
-@Configuration
-public class MongoConfiguration {
-
-  public @Bean ReactiveMongoDatabaseFactory reactiveMongoDatabaseFactory() {
-    return new SimpleReactiveMongoDatabaseFactory(MongoClients.create(), "database");
-  }
-}
-----
-
-To define the username and password, create a MongoDB connection string and pass it into the factory method, as the next listing shows. The following listing also shows how to use `ReactiveMongoDatabaseFactory` to register an instance of `ReactiveMongoTemplate` with the container:
-
-[source,java]
-----
-@Configuration
-public class MongoConfiguration {
-
-  public @Bean ReactiveMongoDatabaseFactory reactiveMongoDatabaseFactory() {
-    return new SimpleReactiveMongoDatabaseFactory(MongoClients.create("mongodb://joe:secret@localhost"), "database");
-  }
-
-  public @Bean ReactiveMongoTemplate reactiveMongoTemplate() {
-    return new ReactiveMongoTemplate(reactiveMongoDatabaseFactory());
-  }
-}
-----
-
-[[mongo.reactive.template]]
-== Introduction to `ReactiveMongoTemplate`
-
-The `ReactiveMongoTemplate` class, located in the `org.springframework.data.mongodb` package, is the central class of the Spring's Reactive MongoDB support and provides a rich feature set to interact with the database. The template offers convenience operations to create, update, delete, and query for MongoDB documents and provides a mapping between your domain objects and MongoDB documents.
-
-NOTE: Once configured, `ReactiveMongoTemplate` is thread-safe and can be reused across multiple instances.
-
-The mapping between MongoDB documents and domain classes is done by delegating to an implementation of the `MongoConverter` interface. Spring provides a default implementation with `MongoMappingConverter`, but you can also write your own converter. See the <<mongo.custom-converters,section on `MongoConverter` instances>> for more detailed information.
-
-The `ReactiveMongoTemplate` class implements the `ReactiveMongoOperations` interface. As much as possible, the methods on `ReactiveMongoOperations` mirror methods available on the MongoDB driver `Collection` object, to make the API familiar to existing MongoDB developers who are used to the driver API. For example, you can find methods such as `find`, `findAndModify`, `findOne`, `insert`, `remove`, `save`, `update`, and `updateMulti`. The design goal is to make it as easy as possible to transition between the use of the base MongoDB driver and `ReactiveMongoOperations`. A major difference between the two APIs is that `ReactiveMongoOperations` can be passed domain objects instead of `Document`, and there are fluent APIs for `Query`, `Criteria`, and `Update` operations instead of populating a `Document` to specify the parameters for those operations.
-
-NOTE: The preferred way to reference the operations on `ReactiveMongoTemplate` instance is through its `ReactiveMongoOperations` interface.
-
-The default converter implementation used by `ReactiveMongoTemplate` is `MappingMongoConverter`. While the `MappingMongoConverter` can use additional metadata to specify the mapping of objects to documents, it can also convert objects that contain no additional metadata by using some conventions for the mapping of IDs and collection names. These conventions as well as the use of mapping annotations are explained in the <<mapping-chapter,Mapping chapter>>.
-
-Another central feature of `ReactiveMongoTemplate` is exception translation of exceptions thrown in the MongoDB Java driver into Spring's portable Data Access Exception hierarchy. See the section on <<mongo.exception,exception translation>> for more information.
-
-There are many convenience methods on `ReactiveMongoTemplate` to help you easily perform common tasks. However, if you need to access the MongoDB driver API directly to access functionality not explicitly exposed by the MongoTemplate, you can use one of several `execute` callback methods to access underlying driver APIs. The `execute` callbacks give you a reference to either a `com.mongodb.reactivestreams.client.MongoCollection` or a `com.mongodb.reactivestreams.client.MongoDatabase` object. See <<mongo.reactive.executioncallback,Execution Callbacks>> for more information.
-
-[[mongo.reactive.template.instantiating]]
-=== Instantiating ReactiveMongoTemplate
-
-You can use Java to create and register an instance of `ReactiveMongoTemplate`, as follows:
-
-.Registering a `com.mongodb.reactivestreams.client.MongoClient` object and enabling Spring's exception translation support
-====
-[source,java]
-----
-@Configuration
-public class AppConfig {
-
-  public @Bean MongoClient reactiveMongoClient() {
-      return MongoClients.create("mongodb://localhost");
-  }
-
-  public @Bean ReactiveMongoTemplate reactiveMongoTemplate() {
-      return new ReactiveMongoTemplate(reactiveMongoClient(), "mydatabase");
-  }
-}
-----
-====
-
-There are several overloaded constructors of `ReactiveMongoTemplate`, including:
-
-* `ReactiveMongoTemplate(MongoClient mongo, String databaseName)`: Takes the `com.mongodb.MongoClient` object and the default database name to operate against.
-* `ReactiveMongoTemplate(ReactiveMongoDatabaseFactory mongoDatabaseFactory)`: Takes a `ReactiveMongoDatabaseFactory` object that encapsulated the `com.mongodb.reactivestreams.client.MongoClient` object and database name.
-* `ReactiveMongoTemplate(ReactiveMongoDatabaseFactory mongoDatabaseFactory, MongoConverter mongoConverter)`: Adds a `MongoConverter` to use for mapping.
-
-When creating a `ReactiveMongoTemplate`, you might also want to set the following properties:
-
-* `WriteResultCheckingPolicy`
-* `WriteConcern`
-* `ReadPreference`
-
-NOTE: The preferred way to reference the operations on `ReactiveMongoTemplate` instance is through its `ReactiveMongoOperations` interface.
-
-
-[[mongo.reactive.template.writeresultchecking]]
-=== `WriteResultChecking` Policy
-
-When in development, it is handy to either log or throw an `Exception` if the `com.mongodb.WriteResult` returned from any MongoDB operation contains an error. It is quite common to forget to do this during development and then end up with an application that looks like it runs successfully when, in fact, the database was not modified according to your expectations. Set the `MongoTemplate` `WriteResultChecking` property to an enum with the following values, `LOG`, `EXCEPTION`, or `NONE` to either log the error, throw and exception or do nothing. The default is to use a `WriteResultChecking` value of `NONE`.
-
-
-[[mongo.reactive.template.writeconcern]]
-=== `WriteConcern`
-
-If it has not yet been specified through the driver at a higher level (such as `MongoDatabase`), you can set the `com.mongodb.WriteConcern` property that the `ReactiveMongoTemplate` uses for write operations. If ReactiveMongoTemplate's `WriteConcern` property is not set, it defaults to the one set in the MongoDB driver's `MongoDatabase` or `MongoCollection` setting.
-
-
-[[mongo.reactive.template.writeconcernresolver]]
-=== `WriteConcernResolver`
-
-For more advanced cases where you want to set different `WriteConcern` values on a per-operation basis (for remove, update, insert, and save operations), a strategy interface called `WriteConcernResolver` can be configured on `ReactiveMongoTemplate`. Since `ReactiveMongoTemplate` is used to persist POJOs, the `WriteConcernResolver` lets you create a policy that can map a specific POJO class to a `WriteConcern` value. The following listing shows the `WriteConcernResolver` interface:
-
-[source,java]
-----
-public interface WriteConcernResolver {
-  WriteConcern resolve(MongoAction action);
-}
-----
-
-The argument, `MongoAction`, determines the `WriteConcern` value to be used and whether to use the value of the template itself as a default. `MongoAction` contains the collection name being written to, the `java.lang.Class` of the POJO, the converted `DBObject`, the operation as a value from the `MongoActionOperation` enumeration (one of `REMOVE`, `UPDATE`, `INSERT`, `INSERT_LIST`, and `SAVE`), and a few other pieces of contextual information. The following example shows how to create a `WriteConcernResolver`:
-
-[source]
-----
-private class MyAppWriteConcernResolver implements WriteConcernResolver {
-
-  public WriteConcern resolve(MongoAction action) {
-    if (action.getEntityClass().getSimpleName().contains("Audit")) {
-      return WriteConcern.NONE;
-    } else if (action.getEntityClass().getSimpleName().contains("Metadata")) {
-      return WriteConcern.JOURNAL_SAFE;
-    }
-    return action.getDefaultWriteConcern();
-  }
-}
-----
-
-
-[[mongo.reactive.template.save-update-remove]]
-== Saving, Updating, and Removing Documents
-
-`ReactiveMongoTemplate` lets you save, update, and delete your domain objects and map those objects to documents stored in MongoDB.
-
-Consider the following `Person` class:
-
-[source,java]
-----
-public class Person {
-
-  private String id;
-  private String name;
-  private int age;
-
-  public Person(String name, int age) {
-    this.name = name;
-    this.age = age;
-  }
-
-  public String getId() {
-    return id;
-  }
-  public String getName() {
-    return name;
-  }
-  public int getAge() {
-    return age;
-  }
-
-  @Override
-  public String toString() {
-    return "Person [id=" + id + ", name=" + name + ", age=" + age + "]";
-  }
-
-}
-----
-
-The following listing shows how you can save, update, and delete the `Person` object:
-
-[source,java]
-----
-public class ReactiveMongoApp {
-
-  private static final Logger log = LoggerFactory.getLogger(ReactiveMongoApp.class);
-
-  public static void main(String[] args) throws Exception {
-
-    CountDownLatch latch = new CountDownLatch(1);
-
-    ReactiveMongoTemplate mongoOps = new ReactiveMongoTemplate(MongoClients.create(), "database");
-
-    mongoOps.insert(new Person("Joe", 34)).doOnNext(person -> log.info("Insert: " + person))
-      .flatMap(person -> mongoOps.findById(person.getId(), Person.class))
-      .doOnNext(person -> log.info("Found: " + person))
-      .zipWith(person -> mongoOps.updateFirst(query(where("name").is("Joe")), update("age", 35), Person.class))
-      .flatMap(tuple -> mongoOps.remove(tuple.getT1())).flatMap(deleteResult -> mongoOps.findAll(Person.class))
-      .count().doOnSuccess(count -> {
-        log.info("Number of people: " + count);
-        latch.countDown();
-      })
-
-      .subscribe();
-
-    latch.await();
-  }
-}
-----
-
-The preceding example includes implicit conversion between a `String` and `ObjectId` (by using the `MongoConverter`) as stored in the database and recognizing a convention of the property `Id` name.
-
-NOTE: The preceding example is meant to show the use of save, update, and remove operations on `ReactiveMongoTemplate` and not to show complex mapping or chaining functionality.
-
-"`<<mongo.query,Querying Documents>>`" explains the query syntax used in the preceding example in more detail. Additional documentation can be found in <<mongo-template, the blocking `MongoTemplate`>> section.
-
-[[mongo.reactive.executioncallback]]
-== Execution Callbacks
-
-One common design feature of all Spring template classes is that all functionality is routed into one of the templates execute callback methods. This helps ensure that exceptions and any resource management that maybe required are performed consistency. While this was of much greater need in the case of JDBC and JMS than with MongoDB, it still offers a single spot for exception translation and logging to occur. As such, using the execute callback is the preferred way to access the MongoDB driver's `MongoDatabase` and `MongoCollection` objects to perform uncommon operations that were not exposed as methods on `ReactiveMongoTemplate`.
-
-Here is a list of execute callback methods.
-
-* `<T> Flux<T>` *execute* `(Class<?> entityClass, ReactiveCollectionCallback<T> action)`: Executes the given `ReactiveCollectionCallback` for the entity collection of the specified class.
-
-* `<T> Flux<T>` *execute* `(String collectionName, ReactiveCollectionCallback<T> action)`: Executes the given `ReactiveCollectionCallback` on the collection of the given name.
-
-* `<T> Flux<T>` *execute* `(ReactiveDatabaseCallback<T> action)`: Executes a `ReactiveDatabaseCallback` translating any exceptions as necessary.
-
-The following example uses the `ReactiveCollectionCallback` to return information about an index:
-
-[source,java]
-----
-Flux<Boolean> hasIndex = operations.execute("geolocation",
-    collection -> Flux.from(collection.listIndexes(Document.class))
-      .filter(document -> document.get("name").equals("fancy-index-name"))
-      .flatMap(document -> Mono.just(true))
-      .defaultIfEmpty(false));
-----
-
-[[reactive.gridfs]]
-== GridFS Support
-
-MongoDB supports storing binary files inside its filesystem, GridFS.
-Spring Data MongoDB provides a `ReactiveGridFsOperations` interface as well as the corresponding implementation, `ReactiveGridFsTemplate`, to let you interact with the filesystem.
-You can set up a `ReactiveGridFsTemplate` instance by handing it a `ReactiveMongoDatabaseFactory` as well as a `MongoConverter`, as the following example shows:
-
-.JavaConfig setup for a ReactiveGridFsTemplate
-====
-[source,java]
-----
-class GridFsConfiguration extends AbstractReactiveMongoConfiguration {
-
-  // … further configuration omitted
-
-  @Bean
-  public ReactiveGridFsTemplate reactiveGridFsTemplate() {
-    return new ReactiveGridFsTemplate(reactiveMongoDbFactory(), mappingMongoConverter());
-  }
-}
-----
-====
-
-The template can now be injected and used to perform storage and retrieval operations, as the following example shows:
-
-.Using ReactiveGridFsTemplate to store files
-====
-[source,java]
-----
-class ReactiveGridFsClient {
-
-  @Autowired
-  ReactiveGridFsTemplate operations;
-
-  @Test
-  public Mono<ObjectId> storeFileToGridFs() {
-
-    FileMetadata metadata = new FileMetadata();
-    // populate metadata
-    Publisher<DataBuffer> file = … // lookup File or Resource
-
-    return operations.store(file, "filename.txt", metadata);
-  }
-}
-----
-====
-
-The `store(…)` operations take an `Publisher<DataBuffer>`, a filename, and (optionally) metadata information about the file to store. The metadata can be an arbitrary object, which will be marshaled by the `MongoConverter` configured with the `ReactiveGridFsTemplate`. Alternatively, you can also provide a `Document`.
-
-NOTE: MongoDB's driver uses `AsyncInputStream` and `AsyncOutputStream` interfaces to exchange binary streams. Spring Data MongoDB adapts these interfaces to `Publisher<DataBuffer>`. Read more about `DataBuffer` in https://docs.spring.io/spring/docs/{springVersion}/spring-framework-reference/core.html#databuffers[Spring's reference documentation].
-
-You can read files from the filesystem through either the `find(…)` or the `getResources(…)` methods. Let's have a look at the `find(…)` methods first. You can either find a single file or multiple files that match a `Query`. You can use the `GridFsCriteria` helper class to define queries. It provides static factory methods to encapsulate default metadata fields (such as `whereFilename()` and `whereContentType()`) or a custom one through `whereMetaData()`. The following example shows how to use `ReactiveGridFsTemplate` to query for files:
-
-.Using ReactiveGridFsTemplate to query for files
-====
-[source,java]
-----
-class ReactiveGridFsClient {
-
-  @Autowired
-  ReactiveGridFsTemplate operations;
-
-  @Test
-  public Flux<GridFSFile> findFilesInGridFs() {
-    return operations.find(query(whereFilename().is("filename.txt")))
-  }
-}
-----
-====
-
-NOTE: Currently, MongoDB does not support defining sort criteria when retrieving files from GridFS. For this reason, any sort criteria defined on the `Query` instance handed into the `find(…)` method are disregarded.
-
-The other option to read files from the GridFs is to use the methods modeled along the lines of `ResourcePatternResolver`.
-`ReactiveGridFsOperations` uses reactive types to defer execution while `ResourcePatternResolver` uses a synchronous interface.
-These methods allow handing an Ant path into the method and can thus retrieve files matching the given pattern. The following example shows how to use `ReactiveGridFsTemplate` to read files:
-
-.Using ReactiveGridFsTemplate to read files
-====
-[source,java]
-----
-class ReactiveGridFsClient {
-
-  @Autowired
-  ReactiveGridFsOperations operations;
-
-  @Test
-  public void readFilesFromGridFs() {
-     Flux<ReactiveGridFsResource> txtFiles = operations.getResources("*.txt");
-  }
-}
-----
-====
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
deleted file mode 100644
index c4c25e2918..0000000000
--- a/src/main/resources/changelog.txt
+++ /dev/null
@@ -1,2802 +0,0 @@
-Spring Data MongoDB Changelog
-=============================
-
-Changes in version 2.2.1.RELEASE (2019-11-04)
----------------------------------------------
-* DATAMONGO-2399 - Upgrade to mongo-java-driver 3.11.1.
-* DATAMONGO-2394 - nearSphere query wrongly generated with radian parameter instead of meters.
-* DATAMONGO-2393 - Reading large file from ReactiveGridFsTemplate causes a stackoverflow and the code to hang.
-* DATAMONGO-2392 - Reading GridFS files written with old api and custom id fails on ReactiveGridFsTemplate.
-* DATAMONGO-2388 - IndexOperations.getIndexInfo() fails for index that has partialFilterExpression containing DBRef.
-* DATAMONGO-2382 - Release 2.2.1 (Moore SR1).
-
-
-Changes in version 2.1.12.RELEASE (2019-11-04)
-----------------------------------------------
-* DATAMONGO-2388 - IndexOperations.getIndexInfo() fails for index that has partialFilterExpression containing DBRef.
-* DATAMONGO-2381 - Release 2.1.12 (Lovelace SR12).
-
-
-Changes in version 2.2.0.RELEASE (2019-09-30)
----------------------------------------------
-* DATAMONGO-2380 - Remove @ExperimentalCoroutinesApi annotations.
-* DATAMONGO-2379 - Add documentation for Kotlin support.
-* DATAMONGO-2378 - Favor com.mongodb.client.MongoClient (over already deprecated com.mongodb.MongoClient) where possible.
-* DATAMONGO-2377 - Wrong processing of $$value and $$this.
-* DATAMONGO-2374 - Couldn't find PersistentEntity for type class org.bson.Document using query methods.
-* DATAMONGO-2366 - CursorReadingTask calls errorHandler.handleError twice for exception raised while reading from the cursor.
-* DATAMONGO-2361 - Trivial fix in Mapping Annotation Overview chapter of RefDoc.
-* DATAMONGO-2360 - MongoTemplate#count does not use hinted index.
-* DATAMONGO-2334 - Release 2.2 GA (Moore).
-* DATAMONGO-1731 - Improve JavaDoc of MongoOperations update / findAndModify methods.
-
-
-Changes in version 2.1.11.RELEASE (2019-09-30)
-----------------------------------------------
-* DATAMONGO-2377 - Wrong processing of $$value and $$this.
-* DATAMONGO-2374 - Couldn't find PersistentEntity for type class org.bson.Document using query methods.
-* DATAMONGO-2366 - CursorReadingTask calls errorHandler.handleError twice for exception raised while reading from the cursor.
-* DATAMONGO-2361 - Trivial fix in Mapping Annotation Overview chapter of RefDoc.
-* DATAMONGO-2360 - MongoTemplate#count does not use hinted index.
-* DATAMONGO-2354 - protected function expose package-private propertty.
-* DATAMONGO-2352 - Documentation Typo Fix.
-* DATAMONGO-2351 - UnsupportedOperationException is thrown during delete with UNACKNOWLEDGED write concern.
-* DATAMONGO-2349 - ZonedDateTime to/from Date not recognized without @Reading/@WritingConverter.
-* DATAMONGO-2348 - Initial value of @Version annotated fields not described correctly in reference documentation.
-* DATAMONGO-2339 - Id property containing underscore not mapped correctly.
-* DATAMONGO-2338 - Unable to specialise MongoRepositoryFactoryBean due to final method.
-* DATAMONGO-2337 - Add HTTPS entries into spring.schemas.
-* DATAMONGO-2333 - Release 2.1.11 (Lovelace SR11).
-* DATAMONGO-2310 - Improve TypedAggregation vs. untyped aggregation documentation.
-* DATAMONGO-1731 - Improve JavaDoc of MongoOperations update / findAndModify methods.
-
-
-Changes in version 2.2.0.RC3 (2019-09-06)
------------------------------------------
-* DATAMONGO-2358 - Upgrade to Kotlin Coroutines 1.3.0.
-* DATAMONGO-2357 - com.mongodb.client.model.geojson types should be considered as store specific simple ones.
-* DATAMONGO-2356 - Switch to newly introduced usingWhen methods.
-* DATAMONGO-2354 - protected function expose package-private propertty.
-* DATAMONGO-2352 - Documentation Typo Fix.
-* DATAMONGO-2351 - UnsupportedOperationException is thrown during delete with UNACKNOWLEDGED write concern.
-* DATAMONGO-2349 - ZonedDateTime to/from Date not recognized without @Reading/@WritingConverter.
-* DATAMONGO-2348 - Initial value of @Version annotated fields not described correctly in reference documentation.
-* DATAMONGO-2346 - Field annotated with @LastModifiedDate is not persisted in Kotlin data classes.
-* DATAMONGO-2344 - Add SLAVE_OK as a cursor option throws an exception.
-* DATAMONGO-2342 - Upgrade to MongoDB Java Driver 3.11.
-* DATAMONGO-2339 - Id property containing underscore not mapped correctly.
-* DATAMONGO-2338 - Unable to specialise MongoRepositoryFactoryBean due to final method.
-* DATAMONGO-2337 - Add HTTPS entries into spring.schemas.
-* DATAMONGO-2335 - Release 2.2 RC3 (Moore).
-* DATAMONGO-2310 - Improve TypedAggregation vs. untyped aggregation documentation.
-
-
-Changes in version 2.2.0.RC2 (2019-08-05)
------------------------------------------
-* DATAMONGO-2330 - Regression: DefaultBulkOperations ignores defaultWriteConcern.
-* DATAMONGO-2328 - Add missing type converters for native target type conversion.
-* DATAMONGO-2327 - QuerydslAbstractMongodbQuery lacks a toJson method.
-* DATAMONGO-2326 - Upgrade to MongoDB Reactive Streams Driver 1.12.0-rc0.
-* DATAMONGO-2325 - Upgrade to MongoDB Driver 3.11.0-rc0.
-* DATAMONGO-2324 - Adapt to changed API in Commons.
-* DATAMONGO-2323 - .stream() cannot be used with Document.class type.
-* DATAMONGO-2322 - Exceptions from MessageListeners are not caught by change stream container's error handler.
-* DATAMONGO-2321 - Migrate tests to AssertJ.
-* DATAMONGO-2320 - Invalid variable reference in ArrayOperators.Filter.
-* DATAMONGO-2319 - Deprecate Query.withHint(String) and introduce replacement method accepting Document.
-* DATAMONGO-2318 - Revise readme for a consistent structure.
-* DATAMONGO-2316 - TextIndex cannot be created when @Document contains collation specified.
-* DATAMONGO-2315 - ParameterBindingJsonReader cannot bind Date values.
-* DATAMONGO-2314 - Query by Example does not work on nested properties.
-* DATAMONGO-2312 - Add support for projecting new array fields to aggregation.
-* DATAMONGO-2306 - Add support for field level encryption.
-* DATAMONGO-2305 - Upgrade to MongoDB Java Driver 3.11.0-beta4.
-* DATAMONGO-2304 - Fix EntityCallback API documentation inclusion and offset.
-* DATAMONGO-2303 - Release 2.2 RC2 (Moore).
-* DATAMONGO-2296 - MongoTemplate should consistently use getCollectionName(Class).
-* DATAMONGO-2287 - Add Support of In Aggregation with field value search in Array with In.
-* DATAMONGO-2280 - Introduce Jenkins CI.
-* DATAMONGO-2240 - Expose GridFSFile through [Reactive]GridFsResource.
-* DATAMONGO-2200 - Derive fields for aggregation $project stage from a given type.
-* DATAMONGO-2168 - Using className as type hint field name with versioned entities fails with InvalidPersistentPropertyPath in UpdateMapper.
-* DATAMONGO-2089 - Add fluent API for ChangeStreams.
-
-
-Changes in version 2.1.10.RELEASE (2019-08-05)
-----------------------------------------------
-* DATAMONGO-2330 - Regression: DefaultBulkOperations ignores defaultWriteConcern.
-* DATAMONGO-2323 - .stream() cannot be used with Document.class type.
-* DATAMONGO-2322 - Exceptions from MessageListeners are not caught by change stream container's error handler.
-* DATAMONGO-2320 - Invalid variable reference in ArrayOperators.Filter.
-* DATAMONGO-2314 - Query by Example does not work on nested properties.
-* DATAMONGO-2309 - Fix NoHTTP errors.
-* DATAMONGO-2302 - Release 2.1.10 (Lovelace SR10).
-* DATAMONGO-2296 - MongoTemplate should consistently use getCollectionName(Class).
-* DATAMONGO-2280 - Introduce Jenkins CI.
-* DATAMONGO-2168 - Using className as type hint field name with versioned entities fails with InvalidPersistentPropertyPath in UpdateMapper.
-
-
-Changes in version 1.10.23.RELEASE (2019-08-05)
------------------------------------------------
-* DATAMONGO-2280 - Introduce Jenkins CI.
-* DATAMONGO-2272 - Release 1.10.23 (Ingalls SR23).
-
-
-Changes in version 2.2.0.RC1 (2019-06-14)
------------------------------------------
-* DATAMONGO-2295 - Adapt to renamed TransactionSynchronizationManager.forCurrentTransaction().
-* DATAMONGO-2293 - EntityOperations.populateIdIfNecessary nulls entire entity when just the id is null.
-* DATAMONGO-2292 - Create security policy readme.
-* DATAMONGO-2290 - BulkOperation does not trigger lifecycle callbacks for entities.
-* DATAMONGO-2288 - Fix wrong indentation on documentation code sample.
-* DATAMONGO-2282 - Add shortcut to create JsonSchemaProperty for ObjectId.
-* DATAMONGO-2278 - Update Querydsl package names in MongoAnnotationProcessor.
-* DATAMONGO-2275 - NPE when in QueryMapper for MongoJsonSchema when domain type is Document.
-* DATAMONGO-2267 - Property population resolves collection name via SpEL multiple times.
-* DATAMONGO-2261 - Use Entity Callback API for before-save operations.
-* DATAMONGO-2259 - Add MongoDB 4.2 expanded format to 'out' aggregation operation.
-* DATAMONGO-2256 - Release 2.2 RC1 (Moore).
-* DATAMONGO-2252 - getCollection(collectionName) does not create collection when expected (api description mismatch).
-* DATAMONGO-2153 - Add support for aggregations via annotated repository methods.
-* DATAMONGO-2081 - Expose expireAfterSeconds in IndexInfo.
-* DATAMONGO-2067 - Make @CompoundIndex and all similar annotations repeatable.
-* DATAMONGO-1183 - Add support for Hashed Index.
-
-
-Changes in version 2.1.9.RELEASE (2019-06-14)
----------------------------------------------
-* DATAMONGO-2293 - EntityOperations.populateIdIfNecessary nulls entire entity when just the id is null.
-* DATAMONGO-2288 - Fix wrong indentation on documentation code sample.
-* DATAMONGO-2278 - Update Querydsl package names in MongoAnnotationProcessor.
-* DATAMONGO-2275 - NPE when in QueryMapper for MongoJsonSchema when domain type is Document.
-* DATAMONGO-2271 - Release 2.1.9 (Lovelace SR9).
-* DATAMONGO-2267 - Property population resolves collection name via SpEL multiple times.
-* DATAMONGO-2252 - getCollection(collectionName) does not create collection when expected (api description mismatch).
-
-
-Changes in version 1.10.22.RELEASE (2019-05-13)
------------------------------------------------
-* DATAMONGO-2270 - Release 1.10.22 (Ingalls SR22).
-
-
-Changes in version 2.1.8.RELEASE (2019-05-13)
----------------------------------------------
-* DATAMONGO-2269 - Release 2.1.8 (Lovelace SR8).
-
-
-Changes in version 2.2.0.M4 (2019-05-13)
-----------------------------------------
-* DATAMONGO-2268 - Upgrade to MongoDB Java Driver 3.11.0-beta3.
-* DATAMONGO-2265 - Add ReactiveMongoTransactionManager.
-* DATAMONGO-2264 - Assert compatibility with MongoDB 4.2.
-* DATAMONGO-2260 - Release 2.2 M4 (Moore).
-* DATAMONGO-2258 - Add startAfter option to change stream support.
-* DATAMONGO-2257 - Upgrade MongoDB Java driver to 3.11.0-beta2.
-* DATAMONGO-1854 - Add annotation-based Collation support.
-
-
-Changes in version 1.10.21.RELEASE (2019-05-10)
------------------------------------------------
-* DATAMONGO-2244 - Release 1.10.21 (Ingalls SR21).
-
-
-Changes in version 2.1.7.RELEASE (2019-05-10)
----------------------------------------------
-* DATAMONGO-2246 - Release 2.1.7 (Lovelace SR7).
-
-
-Changes in version 2.2.0.M3 (2019-04-11)
-----------------------------------------
-* DATAMONGO-2255 - Add Coroutines Flow extensions.
-* DATAMONGO-2254 - Upgrade MongoDB Java driver to 3.10.2.
-* DATAMONGO-2248 - Remove cross-store module.
-* DATAMONGO-2247 - Add non-nullable variants to Coroutines extensions.
-* DATAMONGO-2241 - Memory leak in ClassGeneratingPropertyAccessorFactory when using MongoDB sessions.
-* DATAMONGO-2230 - Reading files from reactive GridFS hangs after a few chunks.
-* DATAMONGO-2228 - MongodbDocumentSerializer cuts off branches with same Ops in handling Ops.AND.
-* DATAMONGO-2227 - Move off deprecations in Spring Data Commons.
-* DATAMONGO-2225 - Potential bug in MongoExampleMapper.
-* DATAMONGO-2224 - Add trace logging for DBRef resolution.
-* DATAMONGO-2223 - Add missing tests for DBRef resolution in different database.
-* DATAMONGO-2222 - Release 2.2 M3 (Moore).
-* DATAMONGO-2221 - Query on nested id field incorrectly returns no results.
-* DATAMONGO-2218 - Add support for ReplaceOne operation in BulkOperations.
-* DATAMONGO-2112 - Add support for SpEL expression in @Indexed.
-* DATAMONGO-1849 - Generate $jsonSchema out of domain type meta information.
-* DATAMONGO-1783 - Apply Query.skip/limit options to CountOptions.
-
-
-Changes in version 2.1.6.RELEASE (2019-04-01)
----------------------------------------------
-* DATAMONGO-2241 - Memory leak in ClassGeneratingPropertyAccessorFactory when using MongoDB sessions.
-* DATAMONGO-2228 - MongodbDocumentSerializer cuts off branches with same Ops in handling Ops.AND.
-* DATAMONGO-2225 - Potential bug in MongoExampleMapper.
-* DATAMONGO-2224 - Add trace logging for DBRef resolution.
-* DATAMONGO-2223 - Add missing tests for DBRef resolution in different database.
-* DATAMONGO-2221 - Query on nested id field incorrectly returns no results.
-* DATAMONGO-2219 - findAllAndRemove throws MongoWriteException if query has no matches.
-* DATAMONGO-2206 - Migrate Kotlin tests to Mockk.
-* DATAMONGO-2204 - Release 2.1.6 (Lovelace SR6).
-
-
-Changes in version 2.0.14.RELEASE (2019-04-01)
-----------------------------------------------
-* DATAMONGO-2225 - Potential bug in MongoExampleMapper.
-* DATAMONGO-2219 - findAllAndRemove throws MongoWriteException if query has no matches.
-* DATAMONGO-2186 - Release 2.0.14 (Kay SR14).
-
-
-Changes in version 1.10.20.RELEASE (2019-04-01)
------------------------------------------------
-* DATAMONGO-2243 - Release 1.10.20 (Ingalls SR20).
-
-
-Changes in version 1.10.19.RELEASE (2019-04-01)
------------------------------------------------
-* DATAMONGO-2185 - Release 1.10.19 (Ingalls SR19).
-
-
-Changes in version 2.2.0.M2 (2019-03-07)
-----------------------------------------
-* DATAMONGO-2220 - Upgrade to MongoDB Reactive Streams Driver 1.11.0.
-* DATAMONGO-2219 - findAllAndRemove throws MongoWriteException if query has no matches.
-* DATAMONGO-2217 - AggregationTests fails depending on timezone.
-* DATAMONGO-2215 - Add support for array filters to Update.
-* DATAMONGO-2210 - Illegal reflective access for URI properties.
-* DATAMONGO-2209 - Add Kotlin extensions for Coroutines support.
-* DATAMONGO-2208 - Deprecate Kotlin extensions providing a KClass overload.
-* DATAMONGO-2207 - Remove version for managed Kotlin dependencies.
-* DATAMONGO-2206 - Migrate Kotlin tests to Mockk.
-* DATAMONGO-2199 - Fix deprecation warnings in preparation of MongoDB Java Driver 4.0 upgrade.
-* DATAMONGO-2198 - Upgrade to MongoDB Java driver 3.10.
-* DATAMONGO-2196 - Remove does not apply WriteConcern for single document delete operation.
-* DATAMONGO-2195 - @Version should be considered in MongoTemplate#remove.
-* DATAMONGO-2193 - Query on nested id field incorrectly returns no results.
-* DATAMONGO-2189 - AfterSaveEvent contains object to save and not the saved instance.
-* DATAMONGO-2188 - Add configuration option to enable/disable automatic index creation.
-* DATAMONGO-2184 - Introduce Concourse CI.
-* DATAMONGO-2182 - Add Querydsl support for reactive MongoDB repositories.
-* DATAMONGO-2181 - ReactiveMongoRepository.saveAll(…) does not consider collection name for new entities.
-* DATAMONGO-2179 - CreatedDate is null for entities using optimistic locking via version property when saving/inserting in batch.
-* DATAMONGO-2175 - Update copyright years to 2019.
-* DATAMONGO-2174 - InvalidPersistentPropertyPath with @Version.
-* DATAMONGO-2173 - CursorReadingTask.start() doesn't pass exceptions to configured errorHandler.
-* DATAMONGO-2170 - IndexInfo.partialFilterExpression should be null (not an empty String) when undefined.
-* DATAMONGO-2164 - Release 2.2 M2 (Moore).
-* DATAMONGO-2155 - Map field is renamed if the Map associates a value-type with a similar field.
-* DATAMONGO-2105 - Warning about illegal reflective access in JDK11 when using BigDecimal field.
-* DATAMONGO-2077 - Add SpEL support for MongoDB Aggregations introduced in MongoDB 3.6 and 4.0.
-* DATAMONGO-2072 - Add support for derived 'between' queries using Range.
-* DATAMONGO-2054 - Add support for the all positional operator $[] to updates.
-* DATAMONGO-1855 - Reactive GridFS support.
-* DATAMONGO-1593 - JSON Parse error for ObjectId queries.
-* DATAMONGO-1348 - NearQuery uses "legacy coordinate pairs" not GeoJSON points.
-
-
-Changes in version 2.1.5.RELEASE (2019-02-13)
----------------------------------------------
-* DATAMONGO-2196 - Remove does not apply WriteConcern for single document delete operation.
-* DATAMONGO-2193 - Query on nested id field incorrectly returns no results.
-* DATAMONGO-2189 - AfterSaveEvent contains object to save and not the saved instance.
-* DATAMONGO-2187 - Release 2.1.5 (Lovelace SR5).
-
-
-Changes in version 2.1.4.RELEASE (2019-01-10)
----------------------------------------------
-* DATAMONGO-2181 - ReactiveMongoRepository.saveAll(…) does not consider collection name for new entities.
-* DATAMONGO-2179 - CreatedDate is null for entities using optimistic locking via version property when saving/inserting in batch.
-* DATAMONGO-2175 - Update copyright years to 2019.
-* DATAMONGO-2174 - InvalidPersistentPropertyPath with @Version.
-* DATAMONGO-2173 - CursorReadingTask.start() doesn't pass exceptions to configured errorHandler.
-* DATAMONGO-2170 - IndexInfo.partialFilterExpression should be null (not an empty String) when undefined.
-* DATAMONGO-2156 - Remove javax.xml.bind dependency from ExpressionEvaluatingParameterBinder.
-* DATAMONGO-2155 - Map field is renamed if the Map associates a value-type with a similar field.
-* DATAMONGO-2150 - Auditing broken for entities using optimistic locking via version properties in reactive mongo.
-* DATAMONGO-2149 - Target bean of type java.lang.Integer is not of type of the persistent entity.
-* DATAMONGO-2148 - Add logging for MongoTemplate.count(…).
-* DATAMONGO-2145 - Release 2.1.4 (Lovelace SR4).
-
-
-Changes in version 2.0.13.RELEASE (2019-01-10)
-----------------------------------------------
-* DATAMONGO-2175 - Update copyright years to 2019.
-* DATAMONGO-2174 - InvalidPersistentPropertyPath with @Version.
-* DATAMONGO-2170 - IndexInfo.partialFilterExpression should be null (not an empty String) when undefined.
-* DATAMONGO-2156 - Remove javax.xml.bind dependency from ExpressionEvaluatingParameterBinder.
-* DATAMONGO-2149 - Target bean of type java.lang.Integer is not of type of the persistent entity.
-* DATAMONGO-2144 - Release 2.0.13 (Kay SR13).
-
-
-Changes in version 1.10.18.RELEASE (2019-01-10)
------------------------------------------------
-* DATAMONGO-2175 - Update copyright years to 2019.
-* DATAMONGO-2149 - Target bean of type java.lang.Integer is not of type of the persistent entity.
-* DATAMONGO-2143 - Release 1.10.18 (Ingalls SR18).
-
-
-Changes in version 2.2.0.M1 (2018-12-11)
-----------------------------------------
-* DATAMONGO-2161 - Simplify reference documentation setup.
-* DATAMONGO-2160 - Release 2.2 M1 (Moore).
-* DATAMONGO-2156 - Remove javax.xml.bind dependency from ExpressionEvaluatingParameterBinder.
-* DATAMONGO-2150 - Auditing broken for entities using optimistic locking via version properties in reactive mongo.
-* DATAMONGO-2149 - Target bean of type java.lang.Integer is not of type of the persistent entity.
-* DATAMONGO-2148 - Add logging for MongoTemplate.count(…).
-* DATAMONGO-2139 - Auditing broken for entities using optimistic locking via version properties.
-* DATAMONGO-2138 - Type-safe Kotlin query extension.
-* DATAMONGO-2135 - Use List instead of Collection when reading data with MappingMongoConverter.
-* DATAMONGO-2130 - Repository count errors in ClientSession / Transaction.
-* DATAMONGO-2119 - Combining a SpEL expression and a $regex filter triggers a PatternSyntaxException.
-* DATAMONGO-2118 - Fix typo in repositories reference documentation.
-* DATAMONGO-2115 - Ability to resume ChangeStream at a given cluster timestamp given as BsonTimestamp.
-* DATAMONGO-2113 - ChangeStreamTasks incorrectly converts resumeAt Instants into BsonTimestamp.
-* DATAMONGO-2098 - Typo in MappingMongoConverterParser.
-* DATAMONGO-2096 - Aggregation.graphLookup.**.connectFrom(String) does not handle nested field.
-* DATAMONGO-1798 - Introduce @MongoId to customize Id conversion.
-
-
-Changes in version 2.1.3.RELEASE (2018-11-27)
----------------------------------------------
-* DATAMONGO-2139 - Auditing broken for entities using optimistic locking via version properties.
-* DATAMONGO-2135 - Use List instead of Collection when reading data with MappingMongoConverter.
-* DATAMONGO-2130 - Repository count errors in ClientSession / Transaction.
-* DATAMONGO-2121 - Release 2.1.3 (Lovelace SR3).
-* DATAMONGO-2119 - Combining a SpEL expression and a $regex filter triggers a PatternSyntaxException.
-
-
-Changes in version 2.0.12.RELEASE (2018-11-27)
-----------------------------------------------
-* DATAMONGO-2135 - Use List instead of Collection when reading data with MappingMongoConverter.
-* DATAMONGO-2119 - Combining a SpEL expression and a $regex filter triggers a PatternSyntaxException.
-* DATAMONGO-2118 - Fix typo in repositories reference documentation.
-* DATAMONGO-2109 - Release 2.0.12 (Kay SR12).
-* DATAMONGO-2098 - Typo in MappingMongoConverterParser.
-
-
-Changes in version 1.10.17.RELEASE (2018-11-27)
------------------------------------------------
-* DATAMONGO-2135 - Use List instead of Collection when reading data with MappingMongoConverter.
-* DATAMONGO-2118 - Fix typo in repositories reference documentation.
-* DATAMONGO-2110 - Release 1.10.17 (Ingalls SR17).
-
-
-Changes in version 2.1.2.RELEASE (2018-10-29)
----------------------------------------------
-* DATAMONGO-2118 - Fix typo in repositories reference documentation.
-* DATAMONGO-2113 - ChangeStreamTasks incorrectly converts resumeAt Instants into BsonTimestamp.
-* DATAMONGO-2107 - Release 2.1.2 (Lovelace SR2).
-* DATAMONGO-2098 - Typo in MappingMongoConverterParser.
-
-
-Changes in version 1.10.16.RELEASE (2018-10-15)
------------------------------------------------
-* DATAMONGO-2096 - Aggregation.graphLookup.**.connectFrom(String) does not handle nested field.
-* DATAMONGO-2083 - Release 1.10.16 (Ingalls SR16).
-
-
-Changes in version 2.0.11.RELEASE (2018-10-15)
-----------------------------------------------
-* DATAMONGO-2101 - NoSuchMethodException: org.springframework.data.mongodb.core.geo.GeoJsonPoint.<init>().
-* DATAMONGO-2096 - Aggregation.graphLookup.**.connectFrom(String) does not handle nested field.
-* DATAMONGO-2087 - Typo in MongoRepository.
-* DATAMONGO-2086 - Kotlin Fluent API extensions do not allow projections with find queries.
-* DATAMONGO-2084 - Release 2.0.11 (Kay SR11).
-
-
-Changes in version 2.1.1.RELEASE (2018-10-15)
----------------------------------------------
-* DATAMONGO-2096 - Aggregation.graphLookup.**.connectFrom(String) does not handle nested field.
-* DATAMONGO-2094 - Release 2.1.1 (Lovelace SR1).
-
-
-Changes in version 2.1.0.RELEASE (2018-09-21)
----------------------------------------------
-* DATAMONGO-2091 - Upgrade to MongoDB Java Driver 3.8.2 and Reactive Streams Driver 1.9.2.
-* DATAMONGO-2090 - Include documentation about Object Mapping Fundamentals.
-* DATAMONGO-2087 - Typo in MongoRepository.
-* DATAMONGO-2086 - Kotlin Fluent API extensions do not allow projections with find queries.
-* DATAMONGO-2080 - DTO projections with reactive @Tailable query methods fail with IllegalArgumentException: Property must not be null.
-* DATAMONGO-2078 - Update reference documentation on tailable cursors with the sync MongoDB Java driver.
-* DATAMONGO-2076 - Fix property substitution in getting started section of reference docs.
-* DATAMONGO-2075 - Open up MongoTransaction manager to allow transaction commit retry..
-* DATAMONGO-2069 - Required dependency 'mysema-commons-lang'.
-* DATAMONGO-2065 - Make sure that MongoTemplate.doSave(…) calls local populateIdIfNecessary(…) to allow customization.
-* DATAMONGO-2064 - Upgrade to MongoDB Java Driver 3.8.1.
-* DATAMONGO-2061 - Release 2.1 GA (Lovelace).
-
-
-Changes in version 2.0.10.RELEASE (2018-09-10)
-----------------------------------------------
-* DATAMONGO-2076 - Fix property substitution in getting started section of reference docs.
-* DATAMONGO-2055 - Allow position modifier to be negative using push at position on Update.
-* DATAMONGO-2051 - Add support for SCRAM-SHA-256 authentication mechanism to MongoCredentialPropertyEditor.
-* DATAMONGO-2050 - Add support for index selection via key attribute for $geoNear aggregation.
-* DATAMONGO-2049 - Add support for MongoDB 4.0 string aggregation operators.
-* DATAMONGO-2048 - Add support for MongoDB 4.0 type conversion aggregation operators.
-* DATAMONGO-2047 - Update $dateToString and $dateFromString aggregation operators to match MongoDB 4.0 changes.
-* DATAMONGO-2046 - Investigate performance regressions between 2.0 GA and 2.1 RC2.
-* DATAMONGO-2043 - MappingMongoConverter.write(…) does not consider Document a native type and adds _class attribute.
-* DATAMONGO-2034 - Release 2.0.10 (Kay SR10).
-* DATAMONGO-2027 - outputCollection and outputType of MapReduceOptions not work.
-
-
-Changes in version 1.10.15.RELEASE (2018-09-10)
------------------------------------------------
-* DATAMONGO-2076 - Fix property substitution in getting started section of reference docs.
-* DATAMONGO-2057 - Guard MongoDbUtils integration tests against MongoDB 4.0 changes.
-* DATAMONGO-2055 - Allow position modifier to be negative using push at position on Update.
-* DATAMONGO-2051 - Add support for SCRAM-SHA-256 authentication mechanism to MongoCredentialPropertyEditor.
-* DATAMONGO-2050 - Add support for index selection via key attribute for $geoNear aggregation.
-* DATAMONGO-2049 - Add support for MongoDB 4.0 string aggregation operators.
-* DATAMONGO-2048 - Add support for MongoDB 4.0 type conversion aggregation operators.
-* DATAMONGO-2047 - Update $dateToString and $dateFromString aggregation operators to match MongoDB 4.0 changes.
-* DATAMONGO-2043 - MappingMongoConverter.write(…) does not consider Document a native type and adds _class attribute.
-* DATAMONGO-2035 - Release 1.10.15 (Ingalls SR15).
-
-
-Changes in version 2.1.0.RC2 (2018-08-20)
------------------------------------------
-* DATAMONGO-2055 - Allow position modifier to be negative using push at position on Update.
-* DATAMONGO-2053 - Add support for $mergeObjects aggregation operator.
-* DATAMONGO-2052 - Add support for MongoDB 3.6 array aggregation operators.
-* DATAMONGO-2051 - Add support for SCRAM-SHA-256 authentication mechanism to MongoCredentialPropertyEditor.
-* DATAMONGO-2050 - Add support for index selection via key attribute for $geoNear aggregation.
-* DATAMONGO-2049 - Add support for MongoDB 4.0 string aggregation operators.
-* DATAMONGO-2048 - Add support for MongoDB 4.0 type conversion aggregation operators.
-* DATAMONGO-2047 - Update $dateToString and $dateFromString aggregation operators to match MongoDB 4.0 changes.
-* DATAMONGO-2046 - Investigate performance regressions between 2.0 GA and 2.1 RC2.
-* DATAMONGO-2045 - Add transaction specific error codes for exception translation.
-* DATAMONGO-2043 - MappingMongoConverter.write(…) does not consider Document a native type and adds _class attribute.
-* DATAMONGO-2041 - Automatically derive the fields to be read from the expected result type.
-* DATAMONGO-2040 - Update mongodb docs to reflect Duplicates.DROP is no longer supported.
-* DATAMONGO-2033 - Release 2.1 RC2 (Lovelace).
-* DATAMONGO-2027 - outputCollection and outputType of MapReduceOptions not work.
-
-
-Changes in version 1.10.14.RELEASE (2018-07-27)
------------------------------------------------
-* DATAMONGO-2023 - ClassCastException for $sample aggregation operation.
-* DATAMONGO-2021 - Use correct document identifier on GridFsOperations getResource method.
-* DATAMONGO-2016 - MongoCredentialPropertyEditor throws ArrayIndexOutOfBoundsException when password contains a questionmark.
-* DATAMONGO-2006 - Release 1.10.14 (Ingalls SR14).
-
-
-Changes in version 2.0.9.RELEASE (2018-07-26)
----------------------------------------------
-* DATAMONGO-2030 - Reactive repositories don't handle existsByProperty properly.
-* DATAMONGO-2029 - String query methods do not convert List<UUID> and List<byte[]> to their correct representation.
-* DATAMONGO-2016 - MongoCredentialPropertyEditor throws ArrayIndexOutOfBoundsException when password contains a questionmark.
-* DATAMONGO-2011 - Getting exception in MappingMongoConverter while trying to map array of arrays into Object.
-* DATAMONGO-2007 - Release 2.0.9 (Kay SR9).
-
-
-Changes in version 2.1.0.RC1 (2018-07-26)
------------------------------------------
-* DATAMONGO-2030 - Reactive repositories don't handle existsByProperty properly.
-* DATAMONGO-2029 - String query methods do not convert List<UUID> and List<byte[]> to their correct representation.
-* DATAMONGO-2028 - EntityOperations does not apply conversion to Mongo types.
-* DATAMONGO-2026 - Final id field causes UnsupportedOperationException when reading object.
-* DATAMONGO-2021 - Use correct document identifier on GridFsOperations getResource method.
-* DATAMONGO-2016 - MongoCredentialPropertyEditor throws ArrayIndexOutOfBoundsException when password contains a questionmark.
-* DATAMONGO-2012 - Upgrade to MongoDB java driver 3.8 and reactive streams 1.9.
-* DATAMONGO-2011 - Getting exception in MappingMongoConverter while trying to map array of arrays into Object.
-* DATAMONGO-2010 - SpringDataMongodbSerializer does not convert 'in' predicate for nested String id properties mapping to ObjectId.
-* DATAMONGO-2005 - Switch reactive transactions API over to Flux.usingWhen.
-* DATAMONGO-2004 - Lazily resolve DBRefs during constructor creation of the enclosing entity.
-* DATAMONGO-2003 - MongoQueryCreator will not create query correctly when passing Pattern Object with options.
-* DATAMONGO-2002 - Criteria instances using different regex Patterns are considered equal.
-* DATAMONGO-2001 - Count within session should return only the total count of documents visible to the specific session.
-* DATAMONGO-1998 - SpringDataMongodbSerializer cannot convert query on nested id.
-* DATAMONGO-1996 - ChangeStreamEvent Aggregator filter doesn't work for nested fields.
-* DATAMONGO-1993 - Change default fullDocumentLookup in ReactiveMongoTemplate.changeStream.
-* DATAMONGO-1992 - Add support for immutable objects.
-* DATAMONGO-1990 - Adapt build to changes in is-new-handling.
-* DATAMONGO-1988 - String ID not working for embeded objects.
-* DATAMONGO-1987 - Upgarde test infrastructure to MongoDB 4.0-rc0.
-* DATAMONGO-1986 - Aggregation MatchOperation fails to convert query.
-* DATAMONGO-1983 - Reference documentation does not include Transaction and sessions.
-* DATAMONGO-1982 - Release 2.1 RC1 (Lovelace).
-* DATAMONGO-1979 - Adding Support For Sorting in @Query Annotation and Creating an alias for value.
-* DATAMONGO-1919 - Decouple reactive mongo bits from blocking MongoClient.
-* DATAMONGO-1848 - Migrate to Document API-based Querydsl implementation.
-* DATAMONGO-1842 - Optimistic locking allows ReactiveMongoTemplate to modify immutable objects.
-* DATAMONGO-1827 - Allow document replacements via MongoCollection.findOneAndReplace(…).
-* DATAMONGO-1810 - Querydsl predicate using IN operator fails for DBRef.
-* DATAMONGO-1434 - Convert Exceptions into Spring Exception hierarchy when going through Querydsl.
-* DATAMONGO-1311 - Add an option to specify the cursor.batchSize() for repository methods returning streams.
-* DATAMONGO-1185 - Provide lifecycle events when using QueryDSL.
-* DATAMONGO-700 - Events not triggered during Querydsl repository usage.
-* DATAMONGO-595 - Expose new QueryDSL elemMatch feature.
-* DATAMONGO-362 - QueryDSL does not work with DBRef.
-
-
-Changes in version 2.0.8.RELEASE (2018-06-13)
----------------------------------------------
-* DATAMONGO-2003 - MongoQueryCreator will not create query correctly when passing Pattern Object with options.
-* DATAMONGO-2002 - Criteria instances using different regex Patterns are considered equal.
-* DATAMONGO-1998 - SpringDataMongodbSerializer cannot convert query on nested id.
-* DATAMONGO-1988 - String ID not working for embeded objects.
-* DATAMONGO-1986 - Aggregation MatchOperation fails to convert query.
-* DATAMONGO-1980 - Typo in CriteriaExtensions KDoc.
-* DATAMONGO-1978 - Typo in Field.positionKey.
-* DATAMONGO-1974 - Full editing pass on reference documentation.
-* DATAMONGO-1971 - Install MongoDB on TravisCI ourselves.
-* DATAMONGO-1969 - Release 2.0.8 (Kay SR8).
-* DATAMONGO-1466 - Add DbObject to GeoJson Converter.
-
-
-Changes in version 1.10.13.RELEASE (2018-06-13)
------------------------------------------------
-* DATAMONGO-2003 - MongoQueryCreator will not create query correctly when passing Pattern Object with options.
-* DATAMONGO-2002 - Criteria instances using different regex Patterns are considered equal.
-* DATAMONGO-1998 - SpringDataMongodbSerializer cannot convert query on nested id.
-* DATAMONGO-1988 - String ID not working for embeded objects.
-* DATAMONGO-1986 - Aggregation MatchOperation fails to convert query.
-* DATAMONGO-1978 - Typo in Field.positionKey.
-* DATAMONGO-1974 - Full editing pass on reference documentation.
-* DATAMONGO-1967 - Release 1.10.13 (Ingalls SR13).
-* DATAMONGO-1466 - Add DbObject to GeoJson Converter.
-
-
-Changes in version 2.1.0.M3 (2018-05-17)
-----------------------------------------
-* DATAMONGO-1980 - Typo in CriteriaExtensions KDoc.
-* DATAMONGO-1978 - Typo in Field.positionKey.
-* DATAMONGO-1976 - Adapt to SpEL extension API changes in Spring Data Commons.
-* DATAMONGO-1974 - Full editing pass on reference documentation.
-* DATAMONGO-1971 - Install MongoDB on TravisCI ourselves.
-* DATAMONGO-1970 - Add support for transactions (reactive).
-* DATAMONGO-1968 - Add support for configuration using com.mongodb.client.MongoClient.
-* DATAMONGO-1943 - QueryDSL functionality defect while using NOT operator for negate operation.
-* DATAMONGO-1929 - Add fluent API for map/reduce.
-* DATAMONGO-1928 - Index creation through ReactiveMongoTemplate uses blocking methods.
-* DATAMONGO-1927 - Release 2.1 M3 (Lovelace).
-* DATAMONGO-1920 - Add support for transactions (sync).
-* DATAMONGO-1914 - GridFsOperations.getResource(...) returns null.
-* DATAMONGO-1890 - Add support for mapReduce to ReactiveMongoOperations.
-* DATAMONGO-1874 - Making EvaluationContextExtensions visible to SpEL feature in collection name of @Document.
-* DATAMONGO-1808 - Support bitwise query operators.
-* DATAMONGO-1466 - Add DbObject to GeoJson Converter.
-
-
-Changes in version 2.0.7.RELEASE (2018-05-08)
----------------------------------------------
-* DATAMONGO-1943 - QueryDSL functionality defect while using NOT operator for negate operation.
-* DATAMONGO-1918 - Release 2.0.7 (Kay SR7).
-* DATAMONGO-1893 - Exclusions in projection.
-* DATAMONGO-1819 - Discovering the preferred constructor lead to InaccessibleObjectException with Java 9.
-
-
-Changes in version 1.10.12.RELEASE (2018-05-08)
------------------------------------------------
-* DATAMONGO-1917 - Release 1.10.12 (Ingalls SR12).
-* DATAMONGO-1893 - Exclusions in projection.
-
-
-Changes in version 2.1.0.M2 (2018-04-13)
-----------------------------------------
-* DATAMONGO-1923 - Adapt to API changes in Spring Data Commons.
-* DATAMONGO-1916 - Potential ClassCastException in MappingMongoConverter#writeInternal when writing collections.
-* DATAMONGO-1915 - Remove explicit declaration of Jackson library versions.
-* DATAMONGO-1913 - Missing @Nullable annotation in GridFsTemplate.bucket.
-* DATAMONGO-1912 - Unable to retrieve Mongo's generated id when inserting java.util.Map.
-* DATAMONGO-1911 - String-query accepting UUID renders to $uuid.
-* DATAMONGO-1909 - Fix typo in tests.
-* DATAMONGO-1907 - Error in method findOne(Example example) in ReactiveQueryByExampleExecutor when there is no results.
-* DATAMONGO-1906 - Add support for conditional $$REMOVE operator in aggregation $project.
-* DATAMONGO-1904 - MappingMongoConverter fails to properly read nested arrays.
-* DATAMONGO-1903 - Align database name check in SimpleMongoDbFactory with MongoDB limitations.
-* DATAMONGO-1901 - Declare project.root property to make sure JavaDoc generation works.
-* DATAMONGO-1900 - Add section to reference documentation about mapping of enums with interfaces.
-* DATAMONGO-1899 - Export composable repositories via CDI.
-* DATAMONGO-1898 - Verify handling of enums in MappingMongoConverter.
-* DATAMONGO-1896 - In case of inheritance, MongoRepository.saveAll(…) does not insert elements into the aggregate collection.
-* DATAMONGO-1893 - Exclusions in projection.
-* DATAMONGO-1891 - Improve $jsonSchema documentation.
-* DATAMONGO-1881 - Upgrade MongoDB sync & reactive streams Java driver to 3.6.3 and 1.7.1.
-* DATAMONGO-1880 - Add support for Client Sessions.
-* DATAMONGO-1877 - JsonSchemaProperty needs static method date().
-* DATAMONGO-1873 - Add value() alias to @Document(collection= "…").
-* DATAMONGO-1872 - SpEL Expressions in @Document annotations are not re-evaluated for repository query executions.
-* DATAMONGO-1871 - AggregationExpression rendering does not consider nested property aliasing.
-* DATAMONGO-1870 - Skip parameter not working in MongoTemplate#remove(Query, Class).
-* DATAMONGO-1869 - Release 2.1 M2 (Lovelace).
-* DATAMONGO-1866 - Update travis build to use single node replica set.
-* DATAMONGO-1865 - findFirst query method throws IncorrectResultSizeDataAccessException on non-unique result.
-* DATAMONGO-1860 - Mongo count operation called twice in QuerydslMongoPredicateExecutor.findAll(Predicate, Pageable).
-* DATAMONGO-1834 - Add support for aggregation operators $dateFromString, $dateFromParts and $dateToParts.
-* DATAMONGO-1819 - Discovering the preferred constructor lead to InaccessibleObjectException with Java 9.
-* DATAMONGO-1813 - Provide method to create GridFsResource from GridFSFile.
-
-
-Changes in version 2.0.6.RELEASE (2018-04-04)
----------------------------------------------
-* DATAMONGO-1916 - Potential ClassCastException in MappingMongoConverter#writeInternal when writing collections.
-* DATAMONGO-1915 - Remove explicit declaration of Jackson library versions.
-* DATAMONGO-1913 - Missing @Nullable annotation in GridFsTemplate.bucket.
-* DATAMONGO-1911 - String-query accepting UUID renders to $uuid.
-* DATAMONGO-1909 - Fix typo in tests.
-* DATAMONGO-1907 - Error in method findOne(Example example) in ReactiveQueryByExampleExecutor when there is no results.
-* DATAMONGO-1904 - MappingMongoConverter fails to properly read nested arrays.
-* DATAMONGO-1903 - Align database name check in SimpleMongoDbFactory with MongoDB limitations.
-* DATAMONGO-1901 - Declare project.root property to make sure JavaDoc generation works.
-* DATAMONGO-1898 - Verify handling of enums in MappingMongoConverter.
-* DATAMONGO-1896 - In case of inheritance, MongoRepository.saveAll(…) does not insert elements into the aggregate collection.
-* DATAMONGO-1888 - Release 2.0.6 (Kay SR6).
-* DATAMONGO-1834 - Add support for aggregation operators $dateFromString, $dateFromParts and $dateToParts.
-
-
-Changes in version 1.10.11.RELEASE (2018-04-04)
------------------------------------------------
-* DATAMONGO-1915 - Remove explicit declaration of Jackson library versions.
-* DATAMONGO-1909 - Fix typo in tests.
-* DATAMONGO-1903 - Align database name check in SimpleMongoDbFactory with MongoDB limitations.
-* DATAMONGO-1898 - Verify handling of enums in MappingMongoConverter.
-* DATAMONGO-1896 - In case of inheritance, MongoRepository.saveAll(…) does not insert elements into the aggregate collection.
-* DATAMONGO-1871 - AggregationExpression rendering does not consider nested property aliasing.
-* DATAMONGO-1870 - Skip parameter not working in MongoTemplate#remove(Query, Class).
-* DATAMONGO-1860 - Mongo count operation called twice in QuerydslMongoPredicateExecutor.findAll(Predicate, Pageable).
-* DATAMONGO-1858 - Fix line endings.
-* DATAMONGO-1857 - Release 1.10.11 (Ingalls SR11).
-* DATAMONGO-1834 - Add support for aggregation operators $dateFromString, $dateFromParts and $dateToParts.
-
-
-Changes in version 2.0.5.RELEASE (2018-02-28)
----------------------------------------------
-* DATAMONGO-1882 - Release 2.0.5 (Kay SR5).
-
-
-Changes in version 2.0.4.RELEASE (2018-02-19)
----------------------------------------------
-* DATAMONGO-1872 - SpEL Expressions in @Document annotations are not re-evaluated for repository query executions.
-* DATAMONGO-1871 - AggregationExpression rendering does not consider nested property aliasing.
-* DATAMONGO-1870 - Skip parameter not working in MongoTemplate#remove(Query, Class).
-* DATAMONGO-1865 - findFirst query method throws IncorrectResultSizeDataAccessException on non-unique result.
-* DATAMONGO-1860 - Mongo count operation called twice in QuerydslMongoPredicateExecutor.findAll(Predicate, Pageable).
-* DATAMONGO-1859 - Release 2.0.4 (Kay SR4).
-
-
-Changes in version 2.1.0.M1 (2018-02-06)
-----------------------------------------
-* DATAMONGO-1864 - Upgrade to MongoDB Java Driver 3.6.2.
-* DATAMONGO-1858 - Fix line endings.
-* DATAMONGO-1850 - GridFsResource.getContentType() throws NullPointerException on absent metadata.
-* DATAMONGO-1846 - Upgrade to MongoDB Java Driver 3.6.
-* DATAMONGO-1844 - Update copyright years to 2018.
-* DATAMONGO-1843 - Aggregation operator $reduce with ArrayOperators.Reduce produce a wrong Document.
-* DATAMONGO-1835 - Add support for $jsonSchema to Criteria API.
-* DATAMONGO-1831 - Failure to read Scala collection types in MappingMongoConverter.
-* DATAMONGO-1824 - Assert compatibility with MongoDB Server 3.6.
-* DATAMONGO-1823 - AfterConvertEvent is not published when using custom methods in repository interface.
-* DATAMONGO-1822 - Adapt repository readme to changed configuration support.
-* DATAMONGO-1821 - Fix method ambiguity in tests when compiling against MongoDB 3.6.
-* DATAMONGO-1820 - Investigate failing TravisCI build.
-* DATAMONGO-1818 - Reference documentation mentions @TailableCursor instead of @Tailable.
-* DATAMONGO-1817 - Kotlin extensions should return nullable types.
-* DATAMONGO-1815 - Adapt API changes in Property in test cases.
-* DATAMONGO-1814 - Missing documentation on Faceted classification.
-* DATAMONGO-1812 - Temporarily add milestone repository to plugin repositories.
-* DATAMONGO-1811 - Reference Documentation doesn't match with API Documentation 2.X vesrion.
-* DATAMONGO-1809 - Type hint usage broken when using positional parameters with more than one digit.
-* DATAMONGO-1806 - GridFsResource wrong type in javaDoc.
-* DATAMONGO-1805 - Documentation for operations.find uses wrong result type.
-* DATAMONGO-1803 - Add support for MongoDB 3.6 change streams.
-* DATAMONGO-1802 - No converter found capable of converting from type org.bson.types.Binary to type byte[].
-* DATAMONGO-1795 - Remove obsolete Kotlin build configuration.
-* DATAMONGO-1794 - Release 2.1 M1 (Lovelace).
-* DATAMONGO-1761 - Add distinct operation to MongoTemplate.
-* DATAMONGO-1696 - Reference documentation uses JPA Annotations.
-* DATAMONGO-1553 - Add $sortByCount aggregation stage.
-* DATAMONGO-1322 - Add support for validator when creating collection.
-
-
-Changes in version 2.0.3.RELEASE (2018-01-24)
----------------------------------------------
-* DATAMONGO-1858 - Fix line endings.
-* DATAMONGO-1850 - GridFsResource.getContentType() throws NullPointerException on absent metadata.
-* DATAMONGO-1843 - Aggregation operator $reduce with ArrayOperators.Reduce produce a wrong Document.
-* DATAMONGO-1831 - Failure to read Scala collection types in MappingMongoConverter.
-* DATAMONGO-1830 - Release 2.0.3 (Kay SR3).
-* DATAMONGO-1824 - Assert compatibility with MongoDB Server 3.6.
-
-
-Changes in version 1.10.10.RELEASE (2018-01-24)
------------------------------------------------
-* DATAMONGO-1843 - Aggregation operator $reduce with ArrayOperators.Reduce produce a wrong Document.
-* DATAMONGO-1831 - Failure to read Scala collection types in MappingMongoConverter.
-* DATAMONGO-1829 - Release 1.10.10 (Ingalls SR10).
-* DATAMONGO-1824 - Assert compatibility with MongoDB Server 3.6.
-
-
-Changes in version 2.0.2.RELEASE (2017-11-27)
----------------------------------------------
-* DATAMONGO-1823 - AfterConvertEvent is not published when using custom methods in repository interface.
-* DATAMONGO-1821 - Fix method ambiguity in tests when compiling against MongoDB 3.6.
-* DATAMONGO-1820 - Investigate failing TravisCI build.
-* DATAMONGO-1818 - Reference documentation mentions @TailableCursor instead of @Tailable.
-* DATAMONGO-1817 - Kotlin extensions should return nullable types.
-* DATAMONGO-1816 - Release 2.0.2 (Kay SR2).
-
-
-Changes in version 1.10.9.RELEASE (2017-11-27)
-----------------------------------------------
-* DATAMONGO-1809 - Type hint usage broken when using positional parameters with more than one digit.
-* DATAMONGO-1799 - Release 1.10.9 (Ingalls SR9).
-* DATAMONGO-1696 - Reference documentation uses JPA Annotations.
-
-
-Changes in version 2.0.1.RELEASE (2017-10-27)
----------------------------------------------
-* DATAMONGO-1815 - Adapt API changes in Property in test cases.
-* DATAMONGO-1814 - Missing documentation on Faceted classification.
-* DATAMONGO-1811 - Reference Documentation doesn't match with API Documentation 2.X vesrion.
-* DATAMONGO-1809 - Type hint usage broken when using positional parameters with more than one digit.
-* DATAMONGO-1806 - GridFsResource wrong type in javaDoc.
-* DATAMONGO-1805 - Documentation for operations.find uses wrong result type.
-* DATAMONGO-1802 - No converter found capable of converting from type org.bson.types.Binary to type byte[].
-* DATAMONGO-1795 - Remove obsolete Kotlin build configuration.
-* DATAMONGO-1793 - Release 2.0.1 (Kay SR1).
-* DATAMONGO-1696 - Reference documentation uses JPA Annotations.
-
-
-Changes in version 1.10.8.RELEASE (2017-10-11)
-----------------------------------------------
-* DATAMONGO-1784 - Add support for AggregationExpression in GroupOperation.sum.
-* DATAMONGO-1782 - CyclicPropertyReferenceException on index resolution.
-* DATAMONGO-1775 - Release 1.10.8 (Ingalls SR8).
-
-
-Changes in version 2.0.0.RELEASE (2017-10-02)
----------------------------------------------
-* DATAMONGO-1791 - Adapt to changed Spring Framework 5 documentation structure.
-* DATAMONGO-1787 - Add explicit automatic module name for Java 9.
-* DATAMONGO-1786 - Adapt tests to nullability enforcement in repository query methods.
-* DATAMONGO-1785 - Upgrade to OpenWebBeans 2.0.1.
-* DATAMONGO-1784 - Add support for AggregationExpression in GroupOperation.sum.
-* DATAMONGO-1782 - CyclicPropertyReferenceException on index resolution.
-* DATAMONGO-1781 - Update what's new in reference documentation.
-* DATAMONGO-1779 - Query.limit(N) on empty query is not applied.
-* DATAMONGO-1778 - Update.equals(…) fails to recognize an equal Update object.
-* DATAMONGO-1777 - Update.toString(…) does not pretty-print modifiers.
-* DATAMONGO-1776 - Release 2.0 GA (Kay).
-
-
-Changes in version 2.0.0.RC3 (2017-09-11)
------------------------------------------
-* DATAMONGO-1774 - ReactiveMongoOperations#remove(Mono, java.lang.String) ends up in an infinite loop.
-* DATAMONGO-1772 - Type hint not added when updating nested list elements with inheritance.
-* DATAMONGO-1771 - Fix MongoDB setup for travis-ci.
-* DATAMONGO-1770 - Upgrade to mongo-java-driver 3.5.0 and mongodb-driver-reactivestreams 1.6.0.
-* DATAMONGO-1768 - QueryByExample FindOne : probe type.
-* DATAMONGO-1765 - Duplicate elements in DBRefs list not correctly mapped.
-* DATAMONGO-1762 - Introduce nullable annotations for API validation.
-* DATAMONGO-1758 - Remove non existing spring-data-mongodb-log4j from benchmarks profile.
-* DATAMONGO-1757 - Improve exception message if type to read doesn't match declared type on Map value.
-* DATAMONGO-1756 - Aggregation project and arithmetic operation not working with nested fields.
-* DATAMONGO-1754 - Release 2.0 RC3 (Kay).
-* DATAMONGO-1706 - Adapt to deprecated RxJava 1 CRUD repositories.
-* DATAMONGO-1631 - AbstractReactiveMongoConfiguration.mongoDbFactory conflicts with blocking MongoDbFactory.
-
-
-Changes in version 1.10.7.RELEASE (2017-09-11)
-----------------------------------------------
-* DATAMONGO-1772 - Type hint not added when updating nested list elements with inheritance.
-* DATAMONGO-1768 - QueryByExample FindOne : probe type.
-* DATAMONGO-1765 - Duplicate elements in DBRefs list not correctly mapped.
-* DATAMONGO-1756 - Aggregation project and arithmetic operation not working with nested fields.
-* DATAMONGO-1755 - Release 1.10.7 (Ingalls SR7).
-
-
-Changes in version 1.10.6.RELEASE (2017-07-26)
-----------------------------------------------
-* DATAMONGO-1750 - Release 1.10.6 (Ingalls SR6).
-
-
-Changes in version 2.0.0.RC2 (2017-07-25)
------------------------------------------
-* DATAMONGO-1753 - IndexEnsuringQueryCreationListener should skip queries without criteria.
-* DATAMONGO-1752 - Executing repository methods with closed projection fails.
-* DATAMONGO-1751 - Release 2.0 RC2 (Kay).
-
-
-Changes in version 2.0.0.RC1 (2017-07-25)
------------------------------------------
-* DATAMONGO-1748 - Add Kotlin extensions for Criteria API.
-* DATAMONGO-1746 - Inherit Project Reactor version from dependency management.
-* DATAMONGO-1744 - Improve default setup for MappingMongoConverter.
-* DATAMONGO-1739 - Change TerminatingFindOperation.stream() to return a Stream directly.
-* DATAMONGO-1738 - Move to fluent API for repository query execution.
-* DATAMONGO-1735 - Sort and fields objects in Query should not be null.
-* DATAMONGO-1734 - Add count() & exists to fluent API.
-* DATAMONGO-1733 - Allow usage of projection interfaces in FluentMongoOperations.
-* DATAMONGO-1730 - Adapt to API changes in mapping subsystem.
-* DATAMONGO-1729 - Open projection does not fetch all properties.
-* DATAMONGO-1728 - ExecutableFindOperation.find(…).first() fails with NPE.
-* DATAMONGO-1726 - Add terminating findOne/findFirst methods to FluentMongoOperations returning null value instead of Optional.
-* DATAMONGO-1725 - Potential NullPointerException in CloseableIterableCursorAdapter.
-* DATAMONGO-1723 - Fix unit tests after API changes in Spring Data Commons.
-* DATAMONGO-1721 - Fix dependency cycles.
-* DATAMONGO-1720 - Add JMH benchmark module.
-* DATAMONGO-1719 - Add fluent alternative for ReactiveMongoOperations.
-* DATAMONGO-1718 - MongoTemplate.findAndRemoveAll(Query, String) delegates to wrong overload.
-* DATAMONGO-1717 - Release 2.0 RC1 (Kay).
-* DATAMONGO-1715 - Remove spring-data-mongodb-log4j module.
-* DATAMONGO-1713 - MongoCredentialPropertyEditor improperly resolves the credential string.
-* DATAMONGO-1705 - Deprecate cross-store support.
-* DATAMONGO-1703 - Allow referencing views in object graphs containing circular dependencies.
-* DATAMONGO-1702 - Switch repository implementation to use fragments.
-* DATAMONGO-1697 - @Version used by @EnableMongoAuditing does not increase when using collection name in MongoTemplate's updateFirst. Unexpected, not described by reference documentation.
-* DATAMONGO-1682 - Add partial index support to ReactiveIndexOperations.
-* DATAMONGO-1678 - DefaultBulkOperations do not map Query and Update objects properly.
-* DATAMONGO-1646 - Support reactive aggregation streaming.
-* DATAMONGO-1519 - Change MongoTemplate.insertDBObjectList(…) to return List<Object> instead of List<ObjectId>.
-
-
-Changes in version 1.10.5.RELEASE (2017-07-24)
-----------------------------------------------
-* DATAMONGO-1744 - Improve default setup for MappingMongoConverter.
-* DATAMONGO-1729 - Open projection does not fetch all properties.
-* DATAMONGO-1725 - Potential NullPointerException in CloseableIterableCursorAdapter.
-* DATAMONGO-1723 - Fix unit tests after API changes in Spring Data Commons.
-* DATAMONGO-1720 - Add JMH benchmark module.
-* DATAMONGO-1718 - MongoTemplate.findAndRemoveAll(Query, String) delegates to wrong overload.
-* DATAMONGO-1711 - Release 1.10.5 (Ingalls SR5).
-* DATAMONGO-1703 - Allow referencing views in object graphs containing circular dependencies.
-* DATAMONGO-1697 - @Version used by @EnableMongoAuditing does not increase when using collection name in MongoTemplate's updateFirst. Unexpected, not described by reference documentation.
-* DATAMONGO-1678 - DefaultBulkOperations do not map Query and Update objects properly.
-
-
-Changes in version 2.0.0.M4 (2017-06-14)
-----------------------------------------
-* DATAMONGO-1716 - Upgrade to Reactive Streams driver 1.5.0.
-* DATAMONGO-1714 - Deprecate MongoLog4jAppender.
-* DATAMONGO-1712 - Adopt to ReactiveCrudRepository.findById(Publisher) and existsById(Publisher).
-* DATAMONGO-1710 - Adopt to changed AnnotationUtils.getValue(…) and OperatorNode.getRightOperand() behavior.
-* DATAMONGO-1707 - Upgrade to Reactor 3.1 M2.
-* DATAMONGO-1699 - Upgrade travis.yml to use MongoDB 3.4.
-* DATAMONGO-1695 - Make sure GridFsResource.getContentType() reads type from new location within file metadata.
-* DATAMONGO-1693 - Support collation in ReactiveMongoTemplate.createCollection.
-* DATAMONGO-1690 - Adapt to QuerydslPerdicateExecutor API changes.
-* DATAMONGO-1689 - Provide Kotlin extensions for Class based methods in MongoOperations / ReactiveMongoOperations.
-* DATAMONGO-1688 - Release 2.0 M4 (Kay).
-* DATAMONGO-1687 - Creating capped collection with CollectionOptions.empty().capped(…) causes NPE.
-* DATAMONGO-1686 - Upgarde to MongoDB reactive streams driver 1.4.
-* DATAMONGO-1685 - Adapt QueryByExampleExecutor API changes.
-* DATAMONGO-1619 - Use ReactiveQueryByExampleExecutor in ReactiveMongoRepository.
-* DATAMONGO-1563 - Add TemplateWrapper to reduce method overloads on MongoTemplate.
-
-
-Changes in version 1.10.4.RELEASE (2017-06-08)
-----------------------------------------------
-* DATAMONGO-1699 - Upgrade travis.yml to use MongoDB 3.4.
-* DATAMONGO-1672 - Release 1.10.4 (Ingalls SR4).
-* DATAMONGO-1205 - CyclicPropertyReferenceException logged with stack trace.
-
-
-Changes in version 1.9.11.RELEASE (2017-06-07)
-----------------------------------------------
-* DATAMONGO-1671 - Release 1.9.11 (Hopper SR11).
-* DATAMONGO-1205 - CyclicPropertyReferenceException logged with stack trace.
-
-
-Changes in version 2.0.0.M3 (2017-05-09)
-----------------------------------------
-* DATAMONGO-1684 - Adopt documentation to removed JodaTime DateMidnight support.
-* DATAMONGO-1679 - Adapt to API changes in CrudRepository.
-* DATAMONGO-1674 - Adapt to Range API changes.
-* DATAMONGO-1668 - Adopt changed Mono and Flux error handling API.
-* DATAMONGO-1667 - Rename @InfiniteStream to @Tailable.
-* DATAMONGO-1666 - Constructor creation with bulk fetching of DBRefs uses List instead of collection type.
-* DATAMONGO-1665 - Adapt to API changes in Reactor 3.1.
-* DATAMONGO-1664 - Release 2.0 M3 (Kay).
-* DATAMONGO-1662 - Section "Projection Expressions" contains error "Aggregate".
-* DATAMONGO-1660 - Extract CustomConversions into Spring Data Commons.
-* DATAMONGO-1518 - Add support for Collations.
-* DATAMONGO-1325 - Add support for $sample to aggregation.
-* DATAMONGO-1205 - CyclicPropertyReferenceException logged with stack trace.
-
-
-Changes in version 1.9.10.RELEASE (2017-04-19)
-----------------------------------------------
-* DATAMONGO-1670 - Release 1.9.10 (Hopper SR10).
-
-
-Changes in version 1.10.3.RELEASE (2017-04-19)
-----------------------------------------------
-* DATAMONGO-1669 - Release 1.10.3 (Ingalls SR3).
-
-
-Changes in version 1.9.9.RELEASE (2017-04-19)
----------------------------------------------
-* DATAMONGO-1662 - Section "Projection Expressions" contains error "Aggregate".
-* DATAMONGO-1645 - RuntimeException when logging BeforeDeleteEvent and AfterDeleteEvent.
-* DATAMONGO-1639 - BeforeConvertEvent now sees old version values for update of entities.
-* DATAMONGO-1634 - Release 1.9.9 (Hopper SR9).
-* DATAMONGO-1421 - Repository with Enum argument: json can't serialize type.
-
-
-Changes in version 1.10.2.RELEASE (2017-04-19)
-----------------------------------------------
-* DATAMONGO-1666 - Constructor creation with bulk fetching of DBRefs uses List instead of collection type.
-* DATAMONGO-1662 - Section "Projection Expressions" contains error "Aggregate".
-* DATAMONGO-1645 - RuntimeException when logging BeforeDeleteEvent and AfterDeleteEvent.
-* DATAMONGO-1639 - BeforeConvertEvent now sees old version values for update of entities.
-* DATAMONGO-1633 - Release 1.10.2 (Ingalls SR2).
-* DATAMONGO-1620 - Not able to set serverSelectionTimeout on MongoClientOptions using MongoClientOptionsFactoryBean.
-* DATAMONGO-1421 - Repository with Enum argument: json can't serialize type.
-
-
-Changes in version 2.0.0.M2 (2017-04-04)
-----------------------------------------
-* DATAMONGO-1656 - Upgrade to MongoDB Driver 3.4.2 and Reactive Streams Driver 1.3.0.
-* DATAMONGO-1655 - Remove obsolete build profiles.
-* DATAMONGO-1648 - Rename getRepositoryFactoryClassName to getRepositoryFactoryBeanClassName.
-* DATAMONGO-1647 - Use IdentifierAccessor.getRequiredIdentifier() in MongoTemplate.doSaveVersioned(…).
-* DATAMONGO-1645 - RuntimeException when logging BeforeDeleteEvent and AfterDeleteEvent.
-* DATAMONGO-1643 - Add namespace xsd for 2.x.
-* DATAMONGO-1641 - Remove formatting config from the repository.
-* DATAMONGO-1639 - BeforeConvertEvent now sees old version values for update of entities.
-* DATAMONGO-1637 - Add support for aggregation result streaming.
-* DATAMONGO-1620 - Not able to set serverSelectionTimeout on MongoClientOptions using MongoClientOptionsFactoryBean.
-* DATAMONGO-1617 - IDs with non-autogeneratable type cannot be assigned automatically with custom event listeners.
-* DATAMONGO-1610 - Support RxJava 2 repositories.
-* DATAMONGO-1608 - NullPointerException with null argument when using IgnoreCase.
-* DATAMONGO-1607 - Class Cast Exception when retrieve data Point with value equal integer.
-* DATAMONGO-1605 - All SPEL values are converted to String.
-* DATAMONGO-1603 - @Query Annotation Placeholder Issue.
-* DATAMONGO-1602 - Remove references to single-argument assertion methods of Spring.
-* DATAMONGO-1600 - GraphLookupOperationBuilder is not visible.
-* DATAMONGO-1596 - Reference to wrong annotation in cross-store reference documentation.
-* DATAMONGO-1594 - Update "what’s new" section in reference documentation.
-* DATAMONGO-1590 - Entity new detection doesn't consider Persistable.isNew().
-* DATAMONGO-1589 - Update project documentation with the CLA tool integration.
-* DATAMONGO-1588 - Repository will not accept Point subclass in spatial query.
-* DATAMONGO-1587 - Migrate ticket references in test code to Spring Framework style.
-* DATAMONGO-1586 - TypeBasedAggregationOperationContext.getReferenceFor(…) exposes fields with their leaf property name.
-* DATAMONGO-1585 - Aggregation sort references target field of projected and aliased fields.
-* DATAMONGO-1581 - ReactiveMongoRepositoryConfigurationExtension should be public.
-* DATAMONGO-1578 - Add missing @Test annotation to ProjectionOperationUnitTests.
-* DATAMONGO-1577 - Fix Reference and JavaDoc spelling issues.
-* DATAMONGO-1576 - AbstractMongoEventListener methods not called when working with member fields.
-* DATAMONGO-1575 - Treat String replacement values in StringBased queries as such unless they are SpEL expressions.
-* DATAMONGO-1567 - Upgrade to a newer JDK version on TravisCI.
-* DATAMONGO-1566 - Adapt API in RepositoryFactoryBeanSupport implementation.
-* DATAMONGO-1565 - Placeholders in manually defined queries not escaped properly.
-* DATAMONGO-1564 - Split up AggregationExpressions.
-* DATAMONGO-1559 - Migrate reactive tests from TestSubscriber to StepVerifier.
-* DATAMONGO-1558 - Upgrade travis-ci profile to MongoDB 3.4.
-* DATAMONGO-1552 - Add $facet, $bucket and $bucketAuto aggregation stages.
-* DATAMONGO-1551 - Add $graphLookup aggregation stage.
-* DATAMONGO-1550 - Add $replaceRoot aggregation stage.
-* DATAMONGO-1549 - Add $count aggregation stage.
-* DATAMONGO-1548 - Add new MongoDB 3.4 aggregation operators.
-* DATAMONGO-1547 - Register repository factory in spring.factories for multi-store support.
-* DATAMONGO-1546 - Switch to new way of registering custom Jackson modules.
-* DATAMONGO-1542 - Refactor CondOperator and IfNullOperator to children of AggregationExpressions.
-* DATAMONGO-1540 - Add support for $map to aggregation.
-* DATAMONGO-1539 - Add dedicated annotations for manually declared count and delete queries.
-* DATAMONGO-1538 - Add support for $let to aggregation.
-* DATAMONGO-1536 - Add missing aggregation operators.
-* DATAMONGO-1535 - Release 2.0 M2 (Kay).
-
-
-Changes in version 1.9.8.RELEASE (2017-03-02)
----------------------------------------------
-* DATAMONGO-1608 - NullPointerException with null argument when using IgnoreCase.
-* DATAMONGO-1607 - Class Cast Exception when retrieve data Point with value equal integer.
-* DATAMONGO-1605 - All SPEL values are converted to String.
-* DATAMONGO-1603 - @Query Annotation Placeholder Issue.
-* DATAMONGO-1602 - Remove references to single-argument assertion methods of Spring.
-* DATAMONGO-1597 - Release 1.9.8 (Hopper SR8).
-
-
-Changes in version 1.10.1.RELEASE (2017-03-02)
-----------------------------------------------
-* DATAMONGO-1608 - NullPointerException with null argument when using IgnoreCase.
-* DATAMONGO-1607 - Class Cast Exception when retrieve data Point with value equal integer.
-* DATAMONGO-1605 - All SPEL values are converted to String.
-* DATAMONGO-1603 - @Query Annotation Placeholder Issue.
-* DATAMONGO-1602 - Remove references to single-argument assertion methods of Spring.
-* DATAMONGO-1600 - GraphLookupOperationBuilder is not visible.
-* DATAMONGO-1598 - Release 1.10.1 (Ingalls SR1).
-
-
-Changes in version 1.9.7.RELEASE (2017-01-26)
----------------------------------------------
-* DATAMONGO-1596 - Reference to wrong annotation in cross-store reference documentation.
-* DATAMONGO-1590 - Entity new detection doesn't consider Persistable.isNew().
-* DATAMONGO-1588 - Repository will not accept Point subclass in spatial query.
-* DATAMONGO-1586 - TypeBasedAggregationOperationContext.getReferenceFor(…) exposes fields with their leaf property name.
-* DATAMONGO-1585 - Aggregation sort references target field of projected and aliased fields.
-* DATAMONGO-1578 - Add missing @Test annotation to ProjectionOperationUnitTests.
-* DATAMONGO-1577 - Fix Reference and JavaDoc spelling issues.
-* DATAMONGO-1576 - AbstractMongoEventListener methods not called when working with member fields.
-* DATAMONGO-1573 - Release 1.9.7 (Hopper SR7).
-* DATAMONGO-1508 - Documentation lacking for db-factory authentication-dbname.
-
-
-Changes in version 1.10.0.RELEASE (2017-01-26)
-----------------------------------------------
-* DATAMONGO-1596 - Reference to wrong annotation in cross-store reference documentation.
-* DATAMONGO-1594 - Update "what’s new" section in reference documentation.
-* DATAMONGO-1590 - Entity new detection doesn't consider Persistable.isNew().
-* DATAMONGO-1589 - Update project documentation with the CLA tool integration.
-* DATAMONGO-1588 - Repository will not accept Point subclass in spatial query.
-* DATAMONGO-1587 - Migrate ticket references in test code to Spring Framework style.
-* DATAMONGO-1586 - TypeBasedAggregationOperationContext.getReferenceFor(…) exposes fields with their leaf property name.
-* DATAMONGO-1585 - Aggregation sort references target field of projected and aliased fields.
-* DATAMONGO-1578 - Add missing @Test annotation to ProjectionOperationUnitTests.
-* DATAMONGO-1577 - Fix Reference and JavaDoc spelling issues.
-* DATAMONGO-1576 - AbstractMongoEventListener methods not called when working with member fields.
-* DATAMONGO-1575 - Treat String replacement values in StringBased queries as such unless they are SpEL expressions.
-* DATAMONGO-1574 - Release 1.10 GA (Ingalls).
-* DATAMONGO-1508 - Documentation lacking for db-factory authentication-dbname.
-
-
-Changes in version 1.9.6.RELEASE (2016-12-21)
----------------------------------------------
-* DATAMONGO-1565 - Placeholders in manually defined queries not escaped properly.
-* DATAMONGO-1534 - Type hint is missing when using BulkOperations.insert.
-* DATAMONGO-1525 - Reading empty EnumSet fails.
-* DATAMONGO-1522 - Release 1.9.6 (Hopper SR6).
-
-
-Changes in version 1.10.0.RC1 (2016-12-21)
-------------------------------------------
-* DATAMONGO-1567 - Upgrade to a newer JDK version on TravisCI.
-* DATAMONGO-1566 - Adapt API in RepositoryFactoryBeanSupport implementation.
-* DATAMONGO-1565 - Placeholders in manually defined queries not escaped properly.
-* DATAMONGO-1564 - Split up AggregationExpressions.
-* DATAMONGO-1558 - Upgrade travis-ci profile to MongoDB 3.4.
-* DATAMONGO-1552 - Add $facet, $bucket and $bucketAuto aggregation stages.
-* DATAMONGO-1551 - Add $graphLookup aggregation stage.
-* DATAMONGO-1550 - Add $replaceRoot aggregation stage.
-* DATAMONGO-1549 - Add $count aggregation stage.
-* DATAMONGO-1548 - Add new MongoDB 3.4 aggregation operators.
-* DATAMONGO-1547 - Register repository factory in spring.factories for multi-store support.
-* DATAMONGO-1546 - Switch to new way of registering custom Jackson modules.
-* DATAMONGO-1542 - Refactor CondOperator and IfNullOperator to children of AggregationExpressions.
-* DATAMONGO-1540 - Add support for $map to aggregation.
-* DATAMONGO-1539 - Add dedicated annotations for manually declared count and delete queries.
-* DATAMONGO-1538 - Add support for $let to aggregation.
-* DATAMONGO-1536 - Add missing aggregation operators.
-* DATAMONGO-1534 - Type hint is missing when using BulkOperations.insert.
-* DATAMONGO-1533 - Add support for SpEL in GroupOperations (aggregation).
-* DATAMONGO-1530 - Support missing aggregation pipeline operators in expression support.
-* DATAMONGO-1525 - Reading empty EnumSet fails.
-* DATAMONGO-1521 - Aggregation.skip(...) expects int but new SkipOperation(...) supports long.
-* DATAMONGO-1520 - Aggregation.match should accept CriteriaDefinition.
-* DATAMONGO-1514 - SpringDataMongodbQuery should be public.
-* DATAMONGO-1513 - Non-ObjectId identifiers generated by event listeners are not populated if documents are inserted as batch.
-* DATAMONGO-1504 - Assert compatibility with MongoDB 3.4 server and driver.
-* DATAMONGO-1500 - RuntimeException for query methods with fields declaration and Pageable parameters.
-* DATAMONGO-1498 - MongoMappingContext doesn't know about types usually auto-detected (JodaTime, JDK 8 date time types).
-* DATAMONGO-1493 - Typos in reference documentation.
-* DATAMONGO-1492 - Interface AggregationExpression in package org.springframework.data.mongodb.core.aggregation should be public.
-* DATAMONGO-1491 - Add support for $filter to aggregation.
-* DATAMONGO-1490 - Change the XML data type of boolean flags to String.
-* DATAMONGO-1486 - Changes to MappingMongoConverter Result in Class Cast Exception.
-* DATAMONGO-1485 - Querydsl MongodbSerializer does not take registered converters for Enums into account.
-* DATAMONGO-1480 - Add support for noCursorTimeout in Query.
-* DATAMONGO-1479 - MappingMongoConverter.convertToMongoType causes StackOverflowError for parameterized map value types.
-* DATAMONGO-1476 - New stream method only partially makes use of collection name.
-* DATAMONGO-1471 - MappingMongoConverter attempts to set null value on potentially primitive identifier.
-* DATAMONGO-1470 - AbstractMongoConfiguraton should allow multiple base package for @Document scanning.
-* DATAMONGO-1469 - Release 1.10 RC1 (Ingalls).
-* DATAMONGO-1467 - Support partial filter expressions for indexing introduced in MongoDB 3.2.
-* DATAMONGO-1465 - String arguments passed to DefaultScriptOperations.execute() appear quoted in script.
-* DATAMONGO-1454 - Add support for exists projection in repository query derivation.
-* DATAMONGO-1406 - Query mapper does not use @Field field name when querying nested fields in combination with nested keywords.
-* DATAMONGO-1328 - Add support for mongodb 3.2 specific arithmetic operators to aggregation.
-* DATAMONGO-1327 - Add support for $stdDevSamp and $stdDevPop to aggregation ($group stage).
-* DATAMONGO-1299 - Add support for date aggregations.
-* DATAMONGO-1141 - Add support for $push $sort in Update.
-* DATAMONGO-861 - Add support for $cond and $ifNull operators in aggregation operation.
-* DATAMONGO-784 - Add support for $cmp in group or project aggregation.
-
-
-Changes in version 2.0.0.M1 (2016-11-23)
-----------------------------------------
-* DATAMONGO-1527 - Release 2.0 M1 (Kay).
-* DATAMONGO-1509 - Inconsistent type alias placement in list of classes.
-* DATAMONGO-1461 - Upgrade Hibernate/JPA dependencies to match Spring 5 baseline.
-* DATAMONGO-1448 - Set up 2.0 development.
-* DATAMONGO-1444 - Reactive support in Spring Data MongoDB.
-* DATAMONGO-1176 - Use org.bson types instead of com.mongodb.
-* DATAMONGO-563 - Upgrade to MongoDB driver 2.9.2 as it fixes a serious regression introduced in 2.9.0.
-* DATAMONGO-562 - Cannot create entity with OptimisticLocking (@Version) and initial id.
-
-
-Changes in version 1.9.5.RELEASE (2016-11-03)
----------------------------------------------
-* DATAMONGO-1521 - Aggregation.skip(...) expects int but new SkipOperation(...) supports long.
-* DATAMONGO-1514 - SpringDataMongodbQuery should be public.
-* DATAMONGO-1513 - Non-ObjectId identifiers generated by event listeners are not populated if documents are inserted as batch.
-* DATAMONGO-1504 - Assert compatibility with MongoDB 3.4 server and driver.
-* DATAMONGO-1502 - Release 1.9.5 (Hopper SR5).
-* DATAMONGO-1500 - RuntimeException for query methods with fields declaration and Pageable parameters.
-
-
-Changes in version 1.9.4.RELEASE (2016-09-29)
----------------------------------------------
-* DATAMONGO-1498 - MongoMappingContext doesn't know about types usually auto-detected (JodaTime, JDK 8 date time types).
-* DATAMONGO-1497 - MappingMongoConverter's check for whether a value is available for a property should use DbObjectAccessor.
-* DATAMONGO-1495 - Release 1.9.4 (Hopper SR4).
-
-
-Changes in version 1.8.6.RELEASE (2016-09-29)
----------------------------------------------
-* DATAMONGO-1499 - Release 1.8.6 (Gosling SR6).
-* DATAMONGO-1497 - MappingMongoConverter's check for whether a value is available for a property should use DbObjectAccessor.
-
-
-Changes in version 1.8.5.RELEASE (2016-09-20)
----------------------------------------------
-* DATAMONGO-1494 - Release 1.8.5 (Gosling SR5).
-* DATAMONGO-1492 - Interface AggregationExpression in package org.springframework.data.mongodb.core.aggregation should be public.
-* DATAMONGO-1485 - Querydsl MongodbSerializer does not take registered converters for Enums into account.
-* DATAMONGO-1479 - MappingMongoConverter.convertToMongoType causes StackOverflowError for parameterized map value types.
-* DATAMONGO-1471 - MappingMongoConverter attempts to set null value on potentially primitive identifier.
-* DATAMONGO-1465 - String arguments passed to DefaultScriptOperations.execute() appear quoted in script.
-* DATAMONGO-1453 - Parse error into GeoJsonPoint if coordinates are "integers".
-* DATAMONGO-1449 - Replace legacy for loop with foreach in MappingMongoConverter.
-* DATAMONGO-1445 - @Id annotated attribute of type BigInteger does not work with query methods.
-* DATAMONGO-1437 - DefaultDbRefResolver swallows cause of non DataAccessException translatable Exception.
-* DATAMONGO-1425 - NOT_CONTAINS keyword issues CONTAINS query.
-* DATAMONGO-1423 - Nested document update doesn't apply converters on embedded maps.
-* DATAMONGO-1412 - Document mapping rules for Java types to MongoDB representation.
-* DATAMONGO-1406 - Query mapper does not use @Field field name when querying nested fields in combination with nested keywords.
-* DATAMONGO-1401 - GeoJsonPoint error on update.
-
-
-Changes in version 1.9.3.RELEASE (2016-09-20)
----------------------------------------------
-* DATAMONGO-1493 - Typos in reference documentation.
-* DATAMONGO-1492 - Interface AggregationExpression in package org.springframework.data.mongodb.core.aggregation should be public.
-* DATAMONGO-1486 - Changes to MappingMongoConverter Result in Class Cast Exception.
-* DATAMONGO-1485 - Querydsl MongodbSerializer does not take registered converters for Enums into account.
-* DATAMONGO-1479 - MappingMongoConverter.convertToMongoType causes StackOverflowError for parameterized map value types.
-* DATAMONGO-1471 - MappingMongoConverter attempts to set null value on potentially primitive identifier.
-* DATAMONGO-1465 - String arguments passed to DefaultScriptOperations.execute() appear quoted in script.
-* DATAMONGO-1463 - Upgrade to MongoDB Java driver 2.14.3.
-* DATAMONGO-1453 - Parse error into GeoJsonPoint if coordinates are "integers".
-* DATAMONGO-1450 - Release 1.9.3 (Hopper SR3).
-* DATAMONGO-1406 - Query mapper does not use @Field field name when querying nested fields in combination with nested keywords.
-
-
-Changes in version 1.10.0.M1 (2016-07-27)
------------------------------------------
-* DATAMONGO-1464 - Pagination - Optimize out the count query for paging.
-* DATAMONGO-1463 - Upgrade to MongoDB Java driver 2.14.3.
-* DATAMONGO-1462 - Integrate version badge from spring.io.
-* DATAMONGO-1460 - User placeholder property for JSR-303 API.
-* DATAMONGO-1459 - Add support for any-match mode in query-by-example.
-* DATAMONGO-1457 - Add support for $slice in projection stage of aggregation.
-* DATAMONGO-1456 - Add support for $diacriticInsensitivity to text search.
-* DATAMONGO-1455 - Add support for $caseSensitive to text search.
-* DATAMONGO-1453 - Parse error into GeoJsonPoint if coordinates are "integers".
-* DATAMONGO-1449 - Replace legacy for loop with foreach in MappingMongoConverter.
-* DATAMONGO-1437 - DefaultDbRefResolver swallows cause of non DataAccessException translatable Exception.
-* DATAMONGO-1431 - Add overload of MongoOperations.stream(…) to take an explicit collection name.
-* DATAMONGO-1425 - NOT_CONTAINS keyword issues CONTAINS query.
-* DATAMONGO-1424 - Add support for "notLike" keyword in derived queries.
-* DATAMONGO-1423 - Nested document update doesn't apply converters on embedded maps.
-* DATAMONGO-1420 - Update Spring Data MongoDB version in Github readme.
-* DATAMONGO-1419 - Remove deprecations in AbstractMongoEventListener.
-* DATAMONGO-1418 - Add support for $out operand for Aggregation.
-* DATAMONGO-1416 - Standard bootstrap issues warning in converter registration.
-* DATAMONGO-1412 - Document mapping rules for Java types to MongoDB representation.
-* DATAMONGO-1411 - Enable MongoDB build on TravisCI.
-* DATAMONGO-1409 - Release 1.10 M1 (Ingalls).
-* DATAMONGO-1404 - Add support of $max and $min update operations.
-* DATAMONGO-1403 - Add maxExecutionTimeMs alias for @Meta(maxExcecutionTime).
-* DATAMONGO-1399 - Allow adding hole to GeoJson Polygon.
-* DATAMONGO-1394 - References not handled correctly when using QueryDSL.
-* DATAMONGO-1391 - Support Mongo 3.2 syntax for $unwind in aggregation.
-* DATAMONGO-1271 - Provide read lifecycle events when loading DBRefs.
-* DATAMONGO-1194 - Improve DBRef resolution for collections.
-* DATAMONGO-832 - Add support for $slice in Update.push.
-
-
-Changes in version 1.9.2.RELEASE (2016-06-15)
----------------------------------------------
-* DATAMONGO-1449 - Replace legacy for loop with foreach in MappingMongoConverter.
-* DATAMONGO-1437 - DefaultDbRefResolver swallows cause of non DataAccessException translatable Exception.
-* DATAMONGO-1425 - NOT_CONTAINS keyword issues CONTAINS query.
-* DATAMONGO-1423 - Nested document update doesn't apply converters on embedded maps.
-* DATAMONGO-1416 - Standard bootstrap issues warning in converter registration.
-* DATAMONGO-1412 - Document mapping rules for Java types to MongoDB representation.
-* DATAMONGO-1411 - Enable MongoDB build on TravisCI.
-* DATAMONGO-1410 - Release 1.9.2 (Hopper SR2).
-
-
-Changes in version 1.9.1.RELEASE (2016-04-06)
----------------------------------------------
-* DATAMONGO-1408 - Release 1.9.1 (Hopper SR1).
-
-
-Changes in version 1.9.0.RELEASE (2016-04-06)
----------------------------------------------
-* DATAMONGO-1407 - Add pull request template.
-* DATAMONGO-1405 - Release 1.9 GA (Hopper).
-* DATAMONGO-1401 - GeoJsonPoint error on update.
-* DATAMONGO-1398 - Update documentation for Spring Data MongoDB 1.9.
-* DATAMONGO-1396 - Exception when creating geo within Criteria using Aggregation.
-
-
-Changes in version 1.9.0.RC1 (2016-03-18)
------------------------------------------
-* DATAMONGO-1400 - Adapt to rename of Spring Data Commons' Tuple to Pair.
-* DATAMONGO-1397 - MongoTemplate.geoNear() do not log the Query.
-* DATAMONGO-1392 - Release 1.9 RC1 (Hopper).
-* DATAMONGO-1389 - Adapt test case to changes made for improved type prediction infrastructure.
-* DATAMONGO-1387 - BasicQuery.fields().include() doesn't stick, even though Query.fields().include() does.
-* DATAMONGO-1373 - Problem with custom annotations with AliasFor annotated attributes.
-* DATAMONGO-1326 - Add support for $lookup to aggregation.
-* DATAMONGO-1245 - Add support for Query-By-Example.
-
-
-Changes in version 1.8.4.RELEASE (2016-02-23)
----------------------------------------------
-* DATAMONGO-1381 - Release 1.8.4 (Gosling SR4).
-* DATAMONGO-1380 - Improve logging in MongoChangeSetPersister.
-* DATAMONGO-1378 - Update reference documentation: Change Query.sort() to Query.with(Sort sort).
-* DATAMONGO-1377 - Update JavaDoc: Use @EnableMongoRepositories instead of @EnableJpaRepositories.
-* DATAMONGO-1376 - Move away from SimpleTypeInformationMapper.INSTANCE.
-* DATAMONGO-1375 - Fix typo in MongoOperations JavaDoc.
-* DATAMONGO-1361 - geoNear() queries fail when the accompanying query returns no results.
-* DATAMONGO-1360 - Cannot query with JSR310.
-* DATAMONGO-1270 - Update documentation to reflect deprecation of MongoFactoryBean.
-
-
-Changes in version 1.9.0.M1 (2016-02-12)
-----------------------------------------
-* DATAMONGO-1380 - Improve logging in MongoChangeSetPersister.
-* DATAMONGO-1378 - Update reference documentation: Change Query.sort() to Query.with(Sort sort).
-* DATAMONGO-1377 - Update JavaDoc: Use @EnableMongoRepositories instead of @EnableJpaRepositories.
-* DATAMONGO-1376 - Move away from SimpleTypeInformationMapper.INSTANCE.
-* DATAMONGO-1375 - Fix typo in MongoOperations JavaDoc.
-* DATAMONGO-1372 - Add converter for Currency.
-* DATAMONGO-1371 - Add code of conduct.
-* DATAMONGO-1366 - Release 1.9 M1 (Hopper).
-* DATAMONGO-1361 - geoNear() queries fail when the accompanying query returns no results.
-* DATAMONGO-1360 - Cannot query with JSR310.
-* DATAMONGO-1349 - Upgrade to mongo-java-driver 2.14.0.
-* DATAMONGO-1346 - Cannot add two pullAll to an Update.
-* DATAMONGO-1345 - Add support for projections on repository query methods.
-* DATAMONGO-1342 - Potential NullPointerException in MongoQueryCreator.nextAsArray(…).
-* DATAMONGO-1341 - Remove package cycle between core and core.index.
-* DATAMONGO-1337 - General code quality improvements.
-* DATAMONGO-1335 - DBObjectAccessor doesn't write properties correctly if multiple ones are nested.
-* DATAMONGO-1334 - MapResultOptions limit not implemented.
-* DATAMONGO-1324 - StringToObjectIdConverter not properly registered causing drop in performance on identifier conversion.
-* DATAMONGO-1317 - Assert compatibility with MongoDB Java driver 3.2.
-* DATAMONGO-1314 - Fix typo in Exception message.
-* DATAMONGO-1312 - Cannot convert generic sub-document fields.
-* DATAMONGO-1303 - Add build profile for MongoDB 3.1 driver.
-* DATAMONGO-1302 - CustomConversions should allow registration of ConverterFactory.
-* DATAMONGO-1297 - Unique Index on DBRef.
-* DATAMONGO-1293 - MongoDbFactoryParser should allow id attribute in addition to client-uri.
-* DATAMONGO-1291 - Allow @Document to be used as meta-annotation.
-* DATAMONGO-1290 - @Query annotation with byte[] parameter does not work.
-* DATAMONGO-1289 - NullPointerException when saving an object with no "id" field or @Id annotation.
-* DATAMONGO-1288 - Update.inc(String, Number) method fails to work with AtomicInteger.
-* DATAMONGO-1287 - MappingMongoConverter eagerly fetches and converts lazy DbRef to change them afterwards by proxies.
-* DATAMONGO-1276 - MongoTemplate.CloseableIterableCursorAdapter does not null check return values from PersistenceExceptionTranslator.
-* DATAMONGO-1270 - Update documentation to reflect deprecation of MongoFactoryBean.
-* DATAMONGO-1238 - Support for Querydsl 4.
-* DATAMONGO-1204 - ObjectPath equality check breaks due to changes MongoDB V3.
-* DATAMONGO-1163 - Allow @Indexed to be used as meta-annotation.
-* DATAMONGO-934 - Add support for the bulk operations introduced in MongoDB 2.6.
-
-
-Changes in version 1.8.2.RELEASE (2015-12-18)
----------------------------------------------
-* DATAMONGO-1355 - Release 1.8.2 (Gosling).
-* DATAMONGO-1346 - Cannot add two pullAll to an Update.
-* DATAMONGO-1342 - Potential NullPointerException in MongoQueryCreator.nextAsArray(…).
-* DATAMONGO-1337 - General code quality improvements.
-* DATAMONGO-1335 - DBObjectAccessor doesn't write properties correctly if multiple ones are nested.
-* DATAMONGO-1334 - MapResultOptions limit not implemented.
-* DATAMONGO-1324 - StringToObjectIdConverter not properly registered causing drop in performance on identifier conversion.
-* DATAMONGO-1317 - Assert compatibility with MongoDB Java driver 3.2.
-* DATAMONGO-1290 - @Query annotation with byte[] parameter does not work.
-* DATAMONGO-1289 - NullPointerException when saving an object with no "id" field or @Id annotation.
-* DATAMONGO-1287 - MappingMongoConverter eagerly fetches and converts lazy DbRef to change them afterwards by proxies.
-* DATAMONGO-1204 - ObjectPath equality check breaks due to changes MongoDB V3.
-
-
-Changes in version 1.8.1.RELEASE (2015-11-15)
----------------------------------------------
-* DATAMONGO-1316 - Release 1.8.1 (Gosling).
-* DATAMONGO-1312 - Cannot convert generic sub-document fields.
-* DATAMONGO-1302 - CustomConversions should allow registration of ConverterFactory.
-* DATAMONGO-1297 - Unique Index on DBRef.
-* DATAMONGO-1293 - MongoDbFactoryParser should allow id attribute in addition to client-uri.
-* DATAMONGO-1276 - MongoTemplate.CloseableIterableCursorAdapter does not null check return values from PersistenceExceptionTranslator.
-
-
-Changes in version 1.6.4.RELEASE (2015-10-14)
----------------------------------------------
-* DATAMONGO-1304 - Release 1.6.4 (Evans).
-
-
-Changes in version 1.8.0.RELEASE (2015-09-01)
----------------------------------------------
-* DATAMONGO-1282 - Release 1.8 GA (Gosling).
-* DATAMONGO-1280 - Add what's new section to refrence documentation.
-* DATAMONGO-1275 - Reference documentation should mention support for optimistic locking.
-* DATAMONGO-1269 - QueryMapper drops numeric keys in Maps.
-* DATAMONGO-1256 - Provide a collectionName in MongoMappingEvents.
-
-
-Changes in version 1.8.0.RC1 (2015-08-04)
------------------------------------------
-* DATAMONGO-1268 - Release 1.8 RC1 (Gosling).
-* DATAMONGO-1266 - Repository query methods returning a primitive do not detect domain type correctly.
-* DATAMONGO-1260 - Prevent accidental authentication misconfiguration on SimpleMongoDbFactory.
-* DATAMONGO-1257 - mongo:mongo-client namespace does not support usernames with a comma.
-* DATAMONGO-1254 - Group after Project in aggregation uses incorrect field name.
-* DATAMONGO-1251 - update / findAndModify throws NullPointerException.
-* DATAMONGO-1250 - Custom converter implementation not used in updates.
-* DATAMONGO-1244 - StringBasedMongoQuery handles complex expression parameters incorrectly.
-* DATAMONGO-1242 - Update mongo-java-driver to 3.0.2 in mongo3 profile.
-* DATAMONGO-1236 - MongoOperations findAndModify and updateFirst do not include the _class in Map values.
-* DATAMONGO-1234 - Fix typos in JavaDoc.
-* DATAMONGO-1232 - IgnoreCase should escape queries.
-* DATAMONGO-1229 - MongoQueryCreator incorrectly rejects ignoreCase on nested String path.
-* DATAMONGO-1166 - ReadPreference not used for Aggregations.
-* DATAMONGO-1157 - Throw meaningful exception when @DbRef is used with unsupported types.
-* DATAMONGO-1125 - Specify collection that triggers CommandFailureException.
-
-
-Changes in version 1.7.2.RELEASE (2015-07-28)
----------------------------------------------
-* DATAMONGO-1261 - Release 1.7.2 (Fowler).
-* DATAMONGO-1260 - Prevent accidental authentication misconfiguration on SimpleMongoDbFactory.
-* DATAMONGO-1257 - mongo:mongo-client namespace does not support usernames with a comma.
-* DATAMONGO-1254 - Group after Project in aggregation uses incorrect field name.
-* DATAMONGO-1251 - update / findAndModify throws NullPointerException.
-* DATAMONGO-1250 - Custom converter implementation not used in updates.
-
-
-Changes in version 1.5.6.RELEASE (2015-07-01)
----------------------------------------------
-* DATAMONGO-1246 - Release 1.5.6 (Dijkstra).
-* DATAMONGO-1234 - Fix typos in JavaDoc.
-* DATAMONGO-1232 - IgnoreCase should escape queries.
-* DATAMONGO-1229 - MongoQueryCreator incorrectly rejects ignoreCase on nested String path.
-* DATAMONGO-1224 - Assert Spring Framework 4.2 compatibility.
-* DATAMONGO-1221 - Remove relative reference to parent POM to make sure the right Spring version is picked up.
-* DATAMONGO-1207 - MongoTemplate#doInsertAll throws NullPointerException when passed Collection contains a null item.
-* DATAMONGO-1180 - Incorrect exception message creation in PartTreeMongoQuery.
-* DATAMONGO-1166 - ReadPreference not used for Aggregations.
-* DATAMONGO-1155 - Upgrade mongo-next build profiles to Java driver version 2.13.0.
-
-
-Changes in version 1.6.3.RELEASE (2015-07-01)
----------------------------------------------
-* DATAMONGO-1247 - Release 1.6.3 (Evans).
-* DATAMONGO-1242 - Update mongo-java-driver to 3.0.2 in mongo3 profile.
-* DATAMONGO-1234 - Fix typos in JavaDoc.
-* DATAMONGO-1232 - IgnoreCase should escape queries.
-* DATAMONGO-1229 - MongoQueryCreator incorrectly rejects ignoreCase on nested String path.
-* DATAMONGO-1224 - Assert Spring Framework 4.2 compatibility.
-* DATAMONGO-1221 - Remove relative reference to parent POM to make sure the right Spring version is picked up.
-* DATAMONGO-1213 - Include new section on Spring Data and Spring Framework dependencies in reference documentation.
-* DATAMONGO-1210 - Inconsistent property order of _class type hint breaks document equality.
-* DATAMONGO-1207 - MongoTemplate#doInsertAll throws NullPointerException when passed Collection contains a null item.
-* DATAMONGO-1196 - Upgrade build profiles after MongoDB 3.0 Java driver release.
-* DATAMONGO-1180 - Incorrect exception message creation in PartTreeMongoQuery.
-* DATAMONGO-1166 - ReadPreference not used for Aggregations.
-* DATAMONGO-1157 - Throw meaningful exception when @DbRef is used with unsupported types.
-* DATAMONGO-1155 - Upgrade mongo-next build profiles to Java driver version 2.13.0.
-* DATAMONGO-1153 - Fix documentation build.
-* DATAMONGO-1133 - Field aliasing is not honored in Aggregation operations.
-* DATAMONGO-1124 - Switch log level for cyclic reference index warnings from WARN to INFO.
-* DATAMONGO-1081 - Improve documentation on field mapping semantics.
-
-
-Changes in version 1.7.1.RELEASE (2015-06-30)
----------------------------------------------
-* DATAMONGO-1248 - Release 1.7.1 (Fowler).
-* DATAMONGO-1242 - Update mongo-java-driver to 3.0.2 in mongo3 profile.
-* DATAMONGO-1234 - Fix typos in JavaDoc.
-* DATAMONGO-1232 - IgnoreCase should escape queries.
-* DATAMONGO-1229 - MongoQueryCreator incorrectly rejects ignoreCase on nested String path.
-* DATAMONGO-1224 - Assert Spring Framework 4.2 compatibility.
-* DATAMONGO-1221 - Remove relative reference to parent POM to make sure the right Spring version is picked up.
-* DATAMONGO-1216 - Authentication mechanism PLAIN  changes to SCRAM-SHA-1.
-* DATAMONGO-1213 - Include new section on Spring Data and Spring Framework dependencies in reference documentation.
-* DATAMONGO-1210 - Inconsistent property order of _class type hint breaks document equality.
-* DATAMONGO-1208 - MongoTemplate.stream(…) does not consider limit, order, sort etc.
-* DATAMONGO-1207 - MongoTemplate#doInsertAll throws NullPointerException when passed Collection contains a null item.
-* DATAMONGO-1202 - Indexed annotation problems under generics.
-* DATAMONGO-1196 - Upgrade build profiles after MongoDB 3.0 Java driver release.
-* DATAMONGO-1193 - Prevent unnecessary database lookups when resolving DBRefs on 2.x driver.
-* DATAMONGO-1166 - ReadPreference not used for Aggregations.
-* DATAMONGO-1157 - Throw meaningful exception when @DbRef is used with unsupported types.
-
-
-Changes in version 1.8.0.M1 (2015-06-02)
-----------------------------------------
-* DATAMONGO-1228 - Release 1.8 M1 (Gosling).
-* DATAMONGO-1224 - Assert Spring Framework 4.2 compatibility.
-* DATAMONGO-1221 - Remove relative reference to parent POM to make sure the right Spring version is picked up.
-* DATAMONGO-1218 - Deprecate non-MongoClient related configuration options in XML namespace.
-* DATAMONGO-1216 - Authentication mechanism PLAIN  changes to SCRAM-SHA-1.
-* DATAMONGO-1213 - Include new section on Spring Data and Spring Framework dependencies in reference documentation.
-* DATAMONGO-1211 - Adapt API changes in Spring Data Commons to simplify custom repository base class registration.
-* DATAMONGO-1210 - Inconsistent property order of _class type hint breaks document equality.
-* DATAMONGO-1208 - MongoTemplate.stream(…) does not consider limit, order, sort etc.
-* DATAMONGO-1207 - MongoTemplate#doInsertAll throws NullPointerException when passed Collection contains a null item.
-* DATAMONGO-1202 - Indexed annotation problems under generics.
-* DATAMONGO-1196 - Upgrade build profiles after MongoDB 3.0 Java driver release.
-* DATAMONGO-1193 - Prevent unnecessary database lookups when resolving DBRefs on 2.x driver.
-* DATAMONGO-1192 - Switch back to Spring 4.1's CollectionFactory.
-* DATAMONGO-1134 - Add support for $geoIntersects.
-* DATAMONGO-990 - Add support for SpEL expressions in @Query.
-
-
-Changes in version 1.7.0.RELEASE (2015-03-23)
----------------------------------------------
-* DATAMONGO-1189 - Release 1.7 GA.
-* DATAMONGO-1181 - Add Jackson Module for GeoJSON types.
-* DATAMONGO-1180 - Incorrect exception message creation in PartTreeMongoQuery.
-* DATAMONGO-1179 - Update reference documentation.
-* DATAMONGO-1124 - Switch log level for cyclic reference index warnings from WARN to INFO.
-* DATAMONGO-979 - Add support for $size expression in project and group aggregation pipeline.
-
-
-Changes in version 1.7.0.RC1 (2015-03-05)
------------------------------------------
-* DATAMONGO-1173 - Release 1.7 RC1.
-* DATAMONGO-1167 - Add 'findAll' method to QueryDslMongoRepository which accepts a querydsl Predicate and a Sort.
-* DATAMONGO-1165 - Add support for Java 8 Stream as return type in repositories.
-* DATAMONGO-1162 - Adapt test cases to semantic changes in Spring Data Commons AuditingHandler API.
-* DATAMONGO-1158 - Assert compatibility with MongoDB 3.0.
-* DATAMONGO-1154 - Upgrade to MongoDB Java driver 2.13.0.
-* DATAMONGO-1153 - Fix documentation build.
-* DATAMONGO-1148 - Use EclipseLink provided JPA API JAR.
-* DATAMONGO-1147 - Remove manual array copy.
-* DATAMONGO-1146 - Add 'exists' method to QueryDslMongoRepository which accepts a querydsl Predicate.
-* DATAMONGO-1145 - Upgrade MongoDB Java driver to 2.12.5.
-* DATAMONGO-1139 - MongoQueryCreator must not create $nearSphere query for neutral Distance.
-* DATAMONGO-1136 - Use $geoWithin instead of $within for geo queries.
-* DATAMONGO-1135 - Add support for $geometry to support GeoJSON queries.
-* DATAMONGO-1132 - The sample does not match the logical result in the MongoDB repositories section of the documentation.
-* DATAMONGO-1131 - Register converters for ThreeTen back port by default.
-* DATAMONGO-1129 - Upgrade to latest MongoDB Java driver.
-* DATAMONGO-1127 - Add support for geoNear queries with distance information.
-* DATAMONGO-1126 - Repository keyword query findByInId with pageable not returning correctly.
-* DATAMONGO-1123 - geoNear, does not return all matching elements, it returns only a max of 100 documents.
-* DATAMONGO-1121 - "Cycle found" false positive.
-* DATAMONGO-1120 - Pageable queries timeout or return incorrect counts.
-* DATAMONGO-1118 - Custom converters not used for map keys.
-* DATAMONGO-1110 - Add support for $minDistance to NearQuery.
-* DATAMONGO-1082 - Improve JavaDoc and reference documentation on alias usage in aggregation framework support.
-* DATAMONGO-1081 - Improve documentation on field mapping semantics.
-* DATAMONGO-712 - Another round of potential performance improvements.
-* DATAMONGO-479 - Support calling of MongoDB stored javascripts.
-
-
-Changes in version 1.6.2.RELEASE (2015-01-28)
----------------------------------------------
-* DATAMONGO-1148 - Use EclipseLink provided JPA API JAR.
-* DATAMONGO-1147 - Remove manual array copy.
-* DATAMONGO-1145 - Upgrade MongoDB Java driver to 2.12.5.
-* DATAMONGO-1144 - Release 1.6.2.
-* DATAMONGO-1139 - MongoQueryCreator must not create $nearSphere query for neutral Distance.
-* DATAMONGO-1132 - The sample does not match the logical result in the MongoDB repositories section of the documentation.
-* DATAMONGO-1127 - Add support for geoNear queries with distance information.
-* DATAMONGO-1126 - Repository keyword query findByInId with pageable not returning correctly.
-* DATAMONGO-1123 - geoNear, does not return all matching elements, it returns only a max of 100 documents.
-* DATAMONGO-1121 - "Cycle found" false positive.
-* DATAMONGO-1120 - Pageable queries timeout or return incorrect counts.
-* DATAMONGO-1118 - Custom converters not used for map keys.
-* DATAMONGO-1108 - BasicMongoPersistentEntity doesn't need to parse expression on every invocation.
-* DATAMONGO-1096 - RuntimeExceptions during debug query printing in MongoTemplate.
-* DATAMONGO-1094 - Wrong reference to @DocumentField in error message.
-* DATAMONGO-1093 - BasicQuery missing hashCode() and equals(…) methods.
-* DATAMONGO-1087 - Incorrect warning for MongoPersistentEntityIndexResolver$CyclicPropertyReferenceException: Found cycle for field...
-* DATAMONGO-1085 - Sort can not use the metamodel classes generated by QueryDSL.
-* DATAMONGO-1082 - Improve JavaDoc and reference documentation on alias usage in aggregation framework support.
-* DATAMONGO-1078 - @Query annotated repository query fails to map complex Id structure.
-* DATAMONGO-1075 - Correctly evaluate CONTAINS keyword on collection properties.
-* DATAMONGO-1054 - Improve performance  of saving entities by using insert(…) if possible.
-* DATAMONGO-1043 - SpEL Expressions in @Document annotations are not re-evaluated for query executions.
-* DATAMONGO-712 - Another round of potential performance improvements.
-
-
-Changes in version 1.5.5.RELEASE (2015-01-27)
----------------------------------------------
-* DATAMONGO-1148 - Use EclipseLink provided JPA API JAR.
-* DATAMONGO-1147 - Remove manual array copy.
-* DATAMONGO-1143 - Release 1.5.5.
-* DATAMONGO-1139 - MongoQueryCreator must not create $nearSphere query for neutral Distance.
-* DATAMONGO-1123 - geoNear, does not return all matching elements, it returns only a max of 100 documents.
-* DATAMONGO-1121 - "Cycle found" false positive.
-* DATAMONGO-1118 - Custom converters not used for map keys.
-* DATAMONGO-1096 - RuntimeExceptions during debug query printing in MongoTemplate.
-* DATAMONGO-1094 - Wrong reference to @DocumentField in error message.
-* DATAMONGO-1087 - Incorrect warning for MongoPersistentEntityIndexResolver$CyclicPropertyReferenceException: Found cycle for field...
-* DATAMONGO-1078 - @Query annotated repository query fails to map complex Id structure.
-* DATAMONGO-1075 - Correctly evaluate CONTAINS keyword on collection properties.
-* DATAMONGO-1072 - Query placeholders in keys no longer correctly substituted.
-* DATAMONGO-1068 - elemMatch of Class Criteria fails to build special cirteria.
-* DATAMONGO-1063 - IllegalStateException using any().in().
-* DATAMONGO-1062 - Fix failing test in ServerAddressPropertyEditorUnitTests.
-* DATAMONGO-1058 - Using @Field("foo") with @Dbref breaking behavior.
-* DATAMONGO-1045 - Make sure Spring Data MongoDB can build against Spring 4.1.
-* DATAMONGO-1043 - SpEL Expressions in @Document annotations are not re-evaluated for query executions.
-* DATAMONGO-1040 - deleteAll repository query don't use EntityMetadata collection name.
-* DATAMONGO-1039 - Polish implementation for cleaning up after tests.
-* DATAMONGO-712 - Another round of potential performance improvements.
-
-
-Changes in version 1.7.0.M1 (2014-12-01)
-----------------------------------------
-* DATAMONGO-1108 - BasicMongoPersistentEntity doesn't need to parse expression on every invocation.
-* DATAMONGO-1106 - Release 1.7 M1.
-* DATAMONGO-1105 - Add implementation for new QueryDslPredicateExecutor.findAll(OrderSpecifier<?>... orders).
-* DATAMONGO-1102 - Auto-register JSR-310 converters to support JDK 8 date/time types.
-* DATAMONGO-1101 - Add support for $bit to Update.
-* DATAMONGO-1100 - Adapt to new PersistentPropertyAccessor API.
-* DATAMONGO-1097 - Add support for $mul to Update.
-* DATAMONGO-1096 - RuntimeExceptions during debug query printing in MongoTemplate.
-* DATAMONGO-1094 - Wrong reference to @DocumentField in error message.
-* DATAMONGO-1093 - BasicQuery missing hashCode() and equals(…) methods.
-* DATAMONGO-1092 - Ensure compatibility with MongoDB 2.8.0.rc0 and java driver 2.13.0-rc0.
-* DATAMONGO-1087 - Incorrect warning for MongoPersistentEntityIndexResolver$CyclicPropertyReferenceException: Found cycle for field…
-* DATAMONGO-1085 - Sort can not use the metamodel classes generated by QueryDSL.
-* DATAMONGO-1080 - AbstractMongoQuery must not eagerly post-process results.
-* DATAMONGO-1078 - @Query annotated repository query fails to map complex Id structure.
-* DATAMONGO-1077 - Update removes positional operator $ in key when used on DBRef property.
-* DATAMONGO-1076 - Finalizer hit db on lazy dbrefs.
-* DATAMONGO-1075 - Correctly evaluate CONTAINS keyword on collection properties.
-* DATAMONGO-1072 - Query placeholders in keys no longer correctly substituted.
-* DATAMONGO-1070 - Query annotation with $oid leads to a parse error.
-* DATAMONGO-1068 - elemMatch of Class Criteria fails to build special cirteria.
-* DATAMONGO-1063 - IllegalStateException using any().in().
-* DATAMONGO-1062 - Fix failing test in ServerAddressPropertyEditorUnitTests.
-* DATAMONGO-1058 - Using @Field("foo") with @Dbref breaking behavior.
-* DATAMONGO-1057 - AbstractMongoQuery.SlicedExecution#execute() skips every nth element.
-* DATAMONGO-1054 - Improve performance  of saving entities by using insert(…) if possible.
-* DATAMONGO-1053 - In 1.6, any field in a mapped object named "language" will fail to map if it is a type other than String.
-* DATAMONGO-1050 - SimpleMongoRepository.findById(id, class)  don't return ids for nested documents.
-* DATAMONGO-1049 - Reserved field name 'language' causes trouble.
-* DATAMONGO-1043 - SpEL Expressions in @Document annotations are not re-evaluated for query executions.
-* DATAMONGO-943 - Add support for $position to Update $push $each.
-
-
-Changes in version 1.6.1.RELEASE (2014-10-30)
----------------------------------------------
-* DATAMONGO-1080 - AbstractMongoQuery must not eagerly post-process results.
-* DATAMONGO-1079 - Release 1.6.1.
-* DATAMONGO-1077 - Update removes positional operator $ in key when used on DBRef property.
-* DATAMONGO-1076 - Finalizer hit db on lazy dbrefs.
-* DATAMONGO-1072 - Query placeholders in keys no longer correctly substituted.
-* DATAMONGO-1070 - Query annotation with $oid leads to a parse error.
-* DATAMONGO-1068 - elemMatch of Class Criteria fails to build special cirteria.
-* DATAMONGO-1063 - IllegalStateException using any().in().
-* DATAMONGO-1062 - Fix failing test in ServerAddressPropertyEditorUnitTests.
-* DATAMONGO-1058 - Using @Field("foo") with @Dbref breaking behavior.
-* DATAMONGO-1057 - AbstractMongoQuery.SlicedExecution#execute() skips every nth element.
-* DATAMONGO-1053 - In 1.6, any field in a mapped object named "language" will fail to map if it is a type other than String.
-* DATAMONGO-1049 - Reserved field name 'language' causes trouble.
-
-
-Changes in version 1.6.0.RELEASE (2014-09-05)
----------------------------------------------
-* DATAMONGO-1046 - Release 1.6 GA.
-* DATAMONGO-1045 - Make sure Spring Data MongoDB can build against Spring 4.1.
-* DATAMONGO-1040 - deleteAll repository query don't use EntityMetadata collection name.
-* DATAMONGO-1039 - Polish implementation for cleaning up after tests.
-* DATAMONGO-1038 - Assert Mongo instances cleand up properly after test runs.
-* DATAMONGO-1036 - Custom repository implementations are not picked up when using CDI.
-* DATAMONGO-1034 - Improve error message when trying to convert incompatible types.
-* DATAMONGO-1032 - Polish Asciidoctor documentation.
-* DATAMONGO-1030 - Query methods retuning a single entity does not work with projecting types.
-* DATAMONGO-1027 - Collection inherits complex index from embedded class/object.
-* DATAMONGO-1025 - Duplicate index creation on embedded documents.
-
-
-Changes in version 1.5.4.RELEASE (2014-08-27)
----------------------------------------------
-* DATAMONGO-1038 - Assert Mongo instances cleand up properly after test runs.
-* DATAMONGO-1034 - Improve error message when trying to convert incompatible types.
-* DATAMONGO-1033 - Release 1.5.4.
-* DATAMONGO-1030 - Query methods retuning a single entity does not work with projecting types.
-* DATAMONGO-1027 - Collection inherits complex index from embedded class/object.
-* DATAMONGO-1025 - Duplicate index creation on embedded documents.
-* DATAMONGO-1020 - LimitOperator should be a public class.
-* DATAMONGO-1008 - IndexOperations fail, when "2dsphere" index is present.
-
-
-Changes in version 1.6.0.RC1 (2014-08-13)
------------------------------------------
-* DATAMONGO-1024 - Upgrade to Java driver 2.12.3.
-* DATAMONGO-1021 - Release 1.6 RC1.
-* DATAMONGO-1020 - LimitOperator should be a public class.
-* DATAMONGO-1019 - Correct examples in reference documentation.
-* DATAMONGO-1017 - Add support for custom implementations in CDI repositories.
-* DATAMONGO-1016 - Remove deprecations in geospatial area.
-* DATAMONGO-1015 - Move to Asciidoctor for reference documentation.
-* DATAMONGO-1012 - Proxies for lazy DBRefs with field access should have their id values resolved eagerly.
-* DATAMONGO-1009 - Adapt to new multi-store configuration detection.
-* DATAMONGO-1008 - IndexOperations fail, when "2dsphere" index is present.
-* DATAMONGO-1005 - Improve cycle-detection for DbRef's.
-* DATAMONGO-1002 - Update.toString(…) might throw exception.
-* DATAMONGO-1001 - Can't save/update lazy load object.
-* DATAMONGO-999 - Multiple Mongo Instances always have the same MongoOption Reference - MongoOptionsFactoryBean has a static instance of MongoOptions.
-* DATAMONGO-996 - Pagination broken after introduction of the support for top/first.
-* DATAMONGO-995 - Parameter binding in String-based query does not bind all parameters.
-* DATAMONGO-993 - The system variables $$CURRENT and $$ROOT not handled correctly.
-* DATAMONGO-992 - Entity can't be deserialized if @TypeAlias is used.
-* DATAMONGO-991 - Adapt to deprecation removals in Spring Data Commons.
-* DATAMONGO-989 - MatchOperation should accept CriteriaDefinition.
-* DATAMONGO-987 - Problem with lazy loading in @DBRef when getting data using MongoTemplate.
-* DATAMONGO-974 - synthetic field target's name is returned instead of the alias name.
-* DATAMONGO-973 - Add support for deriving full text queries.
-* DATAMONGO-957 - Add support for query modifiers.
-* DATAMONGO-420 - Extra quotes being added to @Query values and fields.
-
-
-Changes in version 1.5.2.RELEASE (2014-07-28)
----------------------------------------------
-* DATAMONGO-1007 - Release 1.5.2.
-* DATAMONGO-1002 - Update.toString(…) might throw exception.
-* DATAMONGO-1001 - Can't save/update lazy load object.
-* DATAMONGO-999 - Multiple Mongo Instances always have the same MongoOption Reference - MongoOptionsFactoryBean has a static instance of MongoOptions.
-* DATAMONGO-995 - Parameter binding in String-based query does not bind all parameters.
-* DATAMONGO-992 - Entity can't be deserialized if @TypeAlias is used.
-* DATAMONGO-989 - MatchOperation should accept CriteriaDefinition.
-* DATAMONGO-987 - Problem with lazy loading in @DBRef when getting data using MongoTemplate.
-* DATAMONGO-983 - Remove links to forum.spring.io.
-* DATAMONGO-982 - Assure compatibility with upcoming MongoDB driver versions.
-* DATAMONGO-978 - deleteBy/removeBy repository methods don't set type information in Before/AfterDeleteEvent.
-* DATAMONGO-972 - References are not handled properly in Querydsl integration.
-* DATAMONGO-969 - String @id field is not mapped to ObjectId when using QueryDSL .id.in(Collection<String>).
-* DATAMONGO-420 - Extra quotes being added to @Query values and fields.
-
-
-Changes in version 1.6.0.M1 (2014-07-10)
-----------------------------------------
-* DATAMONGO-983 - Remove links to forum.spring.io.
-* DATAMONGO-982 - Assure compatibility with upcoming MongoDB driver versions.
-* DATAMONGO-981 - Release 1.6 M1.
-* DATAMONGO-980 - Use meta annotations from spring data commons for @Score.
-* DATAMONGO-978 - deleteBy/removeBy repository methods don't set type information in Before/AfterDeleteEvent.
-* DATAMONGO-977 - Adapt to Spring 4 upgrade.
-* DATAMONGO-976 - Add support for reading $meta projection on textScore into document.
-* DATAMONGO-975 - Add support for date/time operators in aggregation framework.
-* DATAMONGO-973 - Add support for deriving full text queries.
-* DATAMONGO-972 - References are not handled properly in Querydsl integration.
-* DATAMONGO-970 - Id query cannot be created if object to remove is DBObject.
-* DATAMONGO-969 - String @id field is not mapped to ObjectId when using QueryDSL .id.in(Collection<String>).
-* DATAMONGO-968 - Add support for $meta projections and sorting for textScore metadata.
-* DATAMONGO-963 - Compound index with expireAfterSeconds causes repeating error on mongodb server.
-* DATAMONGO-962 - “Cycle found” with Spring Data Mongo 1.5.
-* DATAMONGO-960 - Allow to pass options to the Aggregation Pipeline.
-* DATAMONGO-958 - Move to FieldNamingStrategy SPI in Spring Data Commons.
-* DATAMONGO-954 - Add support for System Variables in Aggregations.
-* DATAMONGO-953 - Update object should have a proper equals/hashcode/toString.
-* DATAMONGO-952 - @Query annotation does not work with only field restrictions.
-* DATAMONGO-950 - Add support for limiting the query result in the query derivation mechanism.
-* DATAMONGO-949 - CyclicPropertyReferenceException in versions 1.5.0 + for MongoDB.
-* DATAMONGO-948 - Assertion error in MongoTemplate.getMappedSortObject.
-* DATAMONGO-944 - Add support $currentDate to Update.
-* DATAMONGO-938 - Exception when creating geo within Criteria using MapReduce.
-* DATAMONGO-937 - Add support for creating text index.
-* DATAMONGO-850 - Add support for text search using $text.
-* DATAMONGO-745 - @Query($in) and Pageable in result Page total = 0.
-
-
-Changes in version 1.4.3.RELEASE (2014-06-18)
----------------------------------------------
-* DATAMONGO-955 - Release 1.4.3.
-* DATAMONGO-953 - Update object should have a proper equals/hashcode/toString.
-* DATAMONGO-952 - @Query annotation does not work with only field restrictions.
-* DATAMONGO-948 - Assertion error in MongoTemplate.getMappedSortObject.
-* DATAMONGO-938 - Exception when creating geo within Criteria using MapReduce.
-* DATAMONGO-924 - Aggregation not working with as() method in project() pipeline operator.
-* DATAMONGO-920 - Fix debug messages for delete events in AbstractMongoEventListener.
-* DATAMONGO-917 - DefaultDbRefResolver throws NPE when bundled into an uberjar.
-* DATAMONGO-914 - Improve resolving of LazyLoading proxies for classes that override equals/hashcode.
-* DATAMONGO-913 - Can't query using lazy DBRef objects.
-* DATAMONGO-912 - Aggregation#project followed by Aggregation#match with custom converter causes IllegalArgumentException.
-* DATAMONGO-898 - MapReduce seems not to work when javascript not being escaped.
-* DATAMONGO-847 - Allow usage of Criteria within Update.
-* DATAMONGO-745 - @Query($in) and Pageable in result Page total = 0.
-* DATAMONGO-647 - Using "OrderBy" in "query by method name" ignores the @Field annotation for field alias.
-
-
-Changes in version 1.5.0.RELEASE (2014-05-20)
----------------------------------------------
-* DATAMONGO-936 - Release 1.5 GA.
-* DATAMONGO-929 - Index key should be the properties dot path when creating index using @Indexed / @CompoundIndex.
-* DATAMONGO-928 - Error when using field-naming-strategy-ref.
-* DATAMONGO-926 - Stack Overflow Error with 1.5.0.RC1 Release.
-* DATAMONGO-925 - MappingMongoConverterParser is incorrectly rejecting field-naming-strategy-ref XML configuration.
-* DATAMONGO-647 - Using "OrderBy" in "query by method name" ignores the @Field annotation for field alias.
-* DATAMONGO-367 - @Indexed field in embedded Object creates new collection.
-
-
-Changes in version 1.5.0.RC1 (2014-05-02)
------------------------------------------
-* DATAMONGO-924 - Aggregation not working with as() method in project() pipeline operator.
-* DATAMONGO-921 - Upgrade to MongoDB Java driver 2.12.1.
-* DATAMONGO-920 - Fix debug messages for delete events in AbstractMongoEventListener.
-* DATAMONGO-919 - Release 1.5 RC1.
-* DATAMONGO-917 - DefaultDbRefResolver throws NPE when bundled into an uberjar.
-* DATAMONGO-914 - Improve resolving of LazyLoading proxies for classes that override equals/hashcode.
-* DATAMONGO-913 - Can't query using lazy DBRef objects.
-* DATAMONGO-912 - Aggregation#project followed by Aggregation#match with custom converter causes IllegalArgumentException.
-* DATAMONGO-910 - Upgrade to latest MongoDB Java driver (2.12).
-* DATAMONGO-909 - @CompoundIndex on inherited entity classes.
-* DATAMONGO-908 - Nested field references in group operations broken.
-* DATAMONGO-907 - Assert compatibility with mongodb 2.6.0.
-* DATAMONGO-905 - Remove obsolete CGLib dependency from cross store module.
-* DATAMONGO-901 - MongoRepositoryConfigurationExtension fails to invoke super method.
-* DATAMONGO-899 - Overhaul automatic index creation.
-* DATAMONGO-898 - MapReduce seems not to work when javascript not being escaped.
-* DATAMONGO-897 - FindAndUpdate broken when using @DbRef and interface as target.
-* DATAMONGO-896 - Assert compatibility with latest MongoDB Java driver.
-* DATAMONGO-895 - Use most specific type for checks against values in DBObjects.
-* DATAMONGO-893 - Mapping Convertor does not remove "_class" property on collection of embedded objects.
-* DATAMONGO-892 - <mongo:mapping-converter> can't be configured as nested bean definition.
-* DATAMONGO-888 - Mapping is not applied to SortObject during queries.
-* DATAMONGO-866 - Add new field naming strategy and make it configurable through XML/Java config.
-* DATAMONGO-847 - Allow usage of Criteria within Update.
-* DATAMONGO-827 - @Indexed and @CompundIndex cannot be created without giving index name.
-
-
-Changes in version 1.4.2.RELEASE (2014-04-15)
----------------------------------------------
-** Fix
-    * [DATAMONGO-880] - Improved handling of persistence of lazy-loaded DBRefs.
-    * [DATAMONGO-884] - Improved handling for Object methods in LazyLoadingInterceptor.
-    * [DATAMONGO-887] - Added unit tests to verify TreeMaps can be converted.
-    * [DATAMONGO-888] - Sorting now considers mapping information.
-    * [DATAMONGO-890] - Fixed Point.toString().
-    * [DATAMONGO-892] - Reject nested MappingMongoConverter declarations in XML.
-    * [DATAMONGO-893] - Converter must not write "_class" information for know types.
-    * [DATAMONGO-897] - Fixed potential NullPointerException in QueryMapper.
-    * [DATAMONGO-908] - Support for nested field references in group operations.
-
-** Improvement
-    * [DATAMONGO-881] - Allow custom conversions to override default conversions.
-
-** Task
-    * [DATAMONGO-895] - Use most specific type for checks against values in DBObjects.
-    * [DATAMONGO-896] - Assert compatibility with latest MongoDB Java driver.
-    * [DATAMONGO-905] - Removed obsolete dependency to CGLib from cross-store support.
-    * [DATAMONGO-907] - Assert compatibility with mongodb 2.6.
-    * [DATAMONGO-911] - Release 1.4.2
-
-Changes in version 1.5.0.M1 (2014-03-31)
-----------------------------------------
-** Fix
-    * [DATAMONGO-471] - Update operation $addToSet does not support adding a list with $each.
-    * [DATAMONGO-773] - Spring Data MongoDB projection search on @DBref fields.
-    * [DATAMONGO-821] - MappingException for $size queries on subcollections containing dbrefs.
-    * [DATAMONGO-829] - NearQuery, when used in conjunction with a Query, it sets num=0, unless Query specifies otherwise.
-    * [DATAMONGO-833] - EnumSet is not handled correctly.
-    * [DATAMONGO-843] - Unable to use @EnableMongoAuditing annotation in Java config.
-    * [DATAMONGO-862] - Update Array Field Using Positional Operator ($) Does Not Work.
-    * [DATAMONGO-863] - QueryMapper.getMappedValue Fails To Handle Arrays Mapped To $in.
-    * [DATAMONGO-868] - findAndModify method does not increment @Version field.
-    * [DATAMONGO-871] - Declarative query method with array return type causes NPE.
-    * [DATAMONGO-877] - AbstractMongoConfiguration.getMappingBasePackage() throws NullPointerException if config class resides in default package.
-    * [DATAMONGO-880] - Error when trying to persist an object containing a DBRef which was lazy loaded.
-    * [DATAMONGO-884] - Potential NullPointerException for lazy DBRefs.
-    * [DATAMONGO-887] - Repository not instantiated when entity contains field of type TreeMap.
-    * [DATAMONGO-890] - Point class toString method is confusing.
-
-** Improvement
-    * [DATAMONGO-809] - Make filename optional in GridFsOperations doc and GridFsTemplate implementation.
-    * [DATAMONGO-858] - Add support for common geospatial structures.
-    * [DATAMONGO-865] - Adjust test dependencies to avoid ClassNotFoundException during test runs.
-    * [DATAMONGO-881] - Cannot override default converters in CustomConversions.
-    * [DATAMONGO-882] - Adapt to removal of obsolete generics in BeanWrapper.
-
-** New Feature
-    * [DATAMONGO-566] - Provide support for removeBy… / deleteBy… methods like for findBy… on repository interfaces.
-    * [DATAMONGO-870] - Add support for sliced query method execution.
-
-** Task
-    * [DATAMONGO-876] - Adapt to changes introduced for property access configuration.
-    * [DATAMONGO-883] - Update auditing configuration to enable auditing annotations on accessors.
-    * [DATAMONGO-859] - Release 1.5 M1.
-
-Changes in version 1.4.1.RELEASE (2014-03-13)
----------------------------------------------
-** Fix
-    * [DATAMONGO-773] - Verify that @DBRef fields can be included in query.
-    * [DATAMONGO-821] - Fixed handling of keyword expressions for DBRefs.
-    * [DATAMONGO-829] - NearQuery should not default 'num' to zero.
-    * [DATAMONGO-833] - Support for EnumSet and EnumMap in MappingMongoConverter.
-    * [DATAMONGO-843] - Back-port of defaulting of the MappingContext for auditing.
-    * [DATAMONGO-862] - Fixed handling of unmapped paths for updates.
-    * [DATAMONGO-863] - UpdateMapper doesn't convert raw DBObjects anymore.
-    * [DATAMONGO-868] - MongoTemplate.findAndModify(…) increases version if not handled manually.
-    * [DATAMONGO-871] - Add support for arrays as query method return types.
-    * [DATAMONGO-877] - Added guard against null-package in AbstractMappingConfiguration.
-
-** Improvement
-    * [DATAMONGO-865] - Adjust test dependencies to avoid ClassNotFoundException during test runs.
-
-Changes in version 1.3.5.RELEASE (2014-03-10)
----------------------------------------------
-** Fix
-    * [DATAMONGO-829] - NearQuery, when used in conjunction with a Query, no longer sets num=0, unless Query specifies otherwise.
-    * [DATAMONGO-871] - Repository queries support array return type.
-
-** Improvement
-    * [DATAMONGO-865] - Avoid ClassNotFoundException during test runs.
-
-Changes in version 1.4.0.RELEASE (2014-02-24)
----------------------------------------------
-
-** Fix
-    * [DATAMONGO-354] - MongoTemplate should support multiple $pushAll in one update.
-    * [DATAMONGO-404] - Removing a DBRef using pull does not work.
-    * [DATAMONGO-410] - Update with pushAll should recognize defined Converter.
-    * [DATAMONGO-812] - $pushAll is deprecated since mongodb 2.4 move to $push $each.
-    * [DATAMONGO-830] - Fix NPE during cache warmup in CustomConversions.
-    * [DATAMONGO-838] - Support for refering to expression based field in group operation.
-    * [DATAMONGO-840] - Support for nested MongoDB field references in SpEL expressions within Projections.
-    * [DATAMONGO-842] - Fix documentation error in GRIDFS section.
-    * [DATAMONGO-852] - Increase version for update should traverse DBObject correctly in order to find version property.
-
-** Improvement
-    * [DATAMONGO-468] - Simplification for updates of DBRef fields with mongoTemplate.
-    * [DATAMONGO-849] - Documentation on github should not reference invalid class.
-
-** Task
-    * [DATAMONGO-848] - Ensure compatibility with Mongo Java driver 2.12.
-    * [DATAMONGO-853] - Update no longer allows null keys.
-    * [DATAMONGO-856] - Update documentation.
-
-Changes in version 1.3.4.RELEASE (2014-02-17)
----------------------------------------------
-** Bug
-    * [DATAMONGO-407] - Collection with generics losing element type after $set update
-    * [DATAMONGO-410] - Update with pushAll doesnt recognize defined Converter
-    * [DATAMONGO-686] - ClassCastException while reusing Query object
-    * [DATAMONGO-805] - Excluding DBRef field in a query causes a MappingException
-    * [DATAMONGO-807] - using findAndModify removes the _class field of encapsulated classes, causing MappingInstantiationException
-    * [DATAMONGO-808] - Spring data mongoDB not working with IPv6 address directly
-    * [DATAMONGO-811] - updateFirst methods do not increment @Version field
-    * [DATAMONGO-816] - Unable to execute query with DocumentCallbackHandler when query contains Criteria with enums.
-    * [DATAMONGO-828] - UpdateFirst throws OptimisticLockingFailureException when updating document that does not exist
-    * [DATAMONGO-830] - NPE during cache warmup in CustomConversions
-    * [DATAMONGO-842] - Documentation error in GRIDFS section
-** Improvement
-    * [DATAMONGO-813] - GridFsTemplate.getResource(location) throws NPE if don't find file
-** Task
-    * [DATAMONGO-824] - Add contribution guidelines
-    * [DATAMONGO-846] - Release 1.3.4
-
-Changes in version 1.4.0.RC1 (2014-01-29)
----------------------------------------------
-
-** Bug
-    * [DATAMONGO-407] - Collection with generics losing element type after $set update
-    * [DATAMONGO-686] - ClassCastException while reusing Query object
-    * [DATAMONGO-726] - References to non existing classes in namespace XSD
-    * [DATAMONGO-804] - EnableMongoRepositories repositoryImplementationPostfix() default is empty String instead of "Impl"
-    * [DATAMONGO-805] - Excluding DBRef field in a query causes a MappingException
-    * [DATAMONGO-806] - Spring Data MongoDB - Aggregation Framework - No property _id found for type com.entity.User
-    * [DATAMONGO-807] - using findAndModify removes the _class field of encapsulated classes, causing MappingInstantiationException
-    * [DATAMONGO-808] - Spring data mongoDB not working with IPv6 address directly
-    * [DATAMONGO-811] - updateFirst methods do not increment @Version field
-    * [DATAMONGO-816] - Unable to execute query with DocumentCallbackHandler when query contains Criteria with enums.
-** Improvement
-    * [DATAMONGO-778] - Create geospatial index of type other than 2d with @GeoSpatialIndexed
-    * [DATAMONGO-785] - Add support for geospatial 2Dsphere and geohaystack index types
-    * [DATAMONGO-787] - Guard against SpEL issue in Spring 3.2.4
-    * [DATAMONGO-799] - Fix failing test in MongoTemplateTests on Mongo 2.5.x
-    * [DATAMONGO-802] - Change AbstractMongoConfiguration.mongoDbFactory() to return MongoDbFactory
-    * [DATAMONGO-813] - GridFsTemplate.getResource(location) throws NPE if don't find file
-    * [DATAMONGO-822] - Add support for eager CDI repository instantiation
-    * [DATAMONGO-823] - Add bucket attribute to <mongo:gridFsTemplate />
-    * [DATAMONGO-837] - Upgrade MongoDB Java driver to 2.11.4
-** Task
-    * [DATAMONGO-790] - Ensure compatibility with Spring Framework 4.0
-    * [DATAMONGO-824] - Add contribution guidelines
-    * [DATAMONGO-826] - Release Spring Data MongoDB 1.4.0.RC1
-    * [DATAMONGO-835] - Code cleanups
-
-Changes in version 1.3.3.RELEASE (2013-12-11)
----------------------------------------------
-** Bug
-    * [DATAMONGO-726] - Fixed classname references in namespace XSDs.
-    * [DATAMONGO-788] - Projection operations do not render synthetic fields properly.
-    * [DATAMONGO-795] - When adding custom converters to the mongo template it is possible to get unpredictable behaviour
-    * [DATAMONGO-804] - Fix default annotation attribute value for repositoryImplementationPostfix().
-    * [DATAMONGO-806] - Fixed invalid rendering of id field references.
-    * [DATAMONGO-768] - Improve documentation of how to use @PersistenceConstructor
-
-** Improvement
-    * [DATAMONGO-791] - Added newAggregation(…) overloads to accept a List.
-    * [DATAMONGO-799] - Fix failing test in MongoTemplateTests on Mongo 2.5.x
-    * [DATAMONGO-800] - Improved AuditingIntegrationTests.
-** Task
-    * [DATAMONGO-810] - Release 1.3.3
-
-Changes in version 1.4.0.M1 (2013-11-19)
----------------------------------------------
-** Bug
-    * [DATAMONGO-534] - The GridFs query execution does not return sorted resources, when the sorting fields are defined in the query definition
-    * [DATAMONGO-630] - Add support of $setOnInsert modifier for upsert
-    * [DATAMONGO-746] - IndexInfo cannot be read for indices created via mongo shell
-    * [DATAMONGO-752] - QueryMapper prevents searching for values that start with a $ [dollarsign]
-    * [DATAMONGO-753] - Add support for nested field references in group operations
-    * [DATAMONGO-758] - Reject excludes other than _id in projection operations
-    * [DATAMONGO-759] - Render group operation without non synthetic fields correctly.
-    * [DATAMONGO-761] - ClassCastException in SpringDataMongodbSerializer.getKeyForPath
-    * [DATAMONGO-768] - Improve documentation of how to use @PersistenceConstructor
-    * [DATAMONGO-788] - Projection operations do not render synthetic fields properly.
-    * [DATAMONGO-789] - Support login via different (e.g. admin) authentication database
-    * [DATAMONGO-795] - When adding custom converters to the mongo template it is possible to get unpredictable behaviour
-** Improvement
-    * [DATAMONGO-757] - Projections should follow mongodb conventions more precisely.
-    * [DATAMONGO-764] - Add support for SSL connections to Mongo
-    * [DATAMONGO-766] - Allow nested field references on properties through e.g. @Field("a.b")
-    * [DATAMONGO-769] - Support arithmetic operators for properties
-    * [DATAMONGO-770] - Repository - findBy<Field>IgnoreCase doesnt work
-    * [DATAMONGO-771] - Saving raw JSON through MongoTemplate.insert(…) fails
-    * [DATAMONGO-774] - Support SpEL expressions to define arithmetical projection operations in the aggregation framework
-    * [DATAMONGO-776] - TypeBasedAggregationOperationContext should use MappingContext.getPersistentPropertyPath(String, Class<?>)
-    * [DATAMONGO-780] - Add support for nested repositories
-    * [DATAMONGO-782] - Typo in reference documentation
-    * [DATAMONGO-785] - Add support for geospatial 2Dsphere and geohaystack index types
-    * [DATAMONGO-787] - Upgrade to Spring 3.2.4
-    * [DATAMONGO-791] - make newAggregation() method to accept list
-    * [DATAMONGO-793] - Adapt to changes in Spring Data Commons triggered by repository initialization changes
-    * [DATAMONGO-800] - AuditingIntegrationTests fail on fast machines
-** New Feature
-    * [DATAMONGO-348] - Lazy Load for DbRef
-    * [DATAMONGO-653] - Support for index operations in GridFsOperations
-    * [DATAMONGO-760] - Add support for custom findAll Queries
-    * [DATAMONGO-792] - Add support to configure Auditing via JavaConfig.
-** Task
-    * [DATAMONGO-777] - Upgrade to Mongo Java Driver in 2.11
-
-Changes in version 1.3.2.RELEASE (2013-10-25)
----------------------------------------------
-** Bug
-    * [DATAMONGO-746] IndexInfo cannot be read for indices created via mongo shell
-    * [DATAMONGO-752] QueryMapper prevents searching for values that start with a $ [dollarsign]
-    * [DATAMONGO-753] Add support for nested field references in group operations
-    * [DATAMONGO-758] Reject excludes other than _id in projection operations
-    * [DATAMONGO-759] Render group operation without non synthetic fields correctly.
-    * [DATAMONGO-761] ClassCastException in SpringDataMongodbSerializer.getKeyForPath
-    * [DATAMONGO-768] Improve documentation of how to use @PersistenceConstructor
-
-** Improvement
-    * [DATAMONGO-757] - Projections should follow mongodb conventions more precisely.
-    * [DATAMONGO-769] - Support arithmetic operators for properties
-    * [DATAMONGO-771] - Saving raw JSON through MongoTemplate.insert(…) fails
-** Task
-    * [DATAMONGO-772] - Release 1.3.2
-
-Changes in version 1.3.1.RELEASE (2013-09-09)
----------------------------------------------
-** Task
-    * [DATAMONGO-751] Upgraded to Spring Data Commons 1.6.1.
-
-Changes in version 1.3.0.RELEASE (2013-09-09)
----------------------------------------------
-** Bug
-    * [DATAMONGO-540] MongoTemplate upsert and findOne handle id queries differently.
-    * [DATAMONGO-445] GeoNear Query Doesn't Work with Pageable.
-    * [DATAMONGO-507] Criteria not() is not working.
-    * [DATAMONGO-602] Querying with $in operator on the id field of type BigInteger returns zero results.
-
-** Improvement
-    * [DATAMONGO-725] Improve configurability and documentation of TypeMapper on MappingMongoConverter.
-    * [DATAMONGO-738] Add methods to MongoTemplate and MongoOperations to allow calling class to pass both the entityClass and the collectionName for the update and upsert methods.
-    * [DATAMONGO-737] Extra MongoSynchronizations cause TransactionSynchronizationManager to throw IllegalStateException on transaction complete.
-    * [DATAMONGO-743] Support returning raw json from a query.
-
-** Task
-    * [DATAMONGO-742] Document CDI integration in reference documentation.
-
-Changes in version 1.3.0.RC1 (2013-08-05)
------------------------------------------
-** Bug
-    * [DATAMONGO-392] - Updating an object does not write type information for objects to be updated
-    * [DATAMONGO-685] - JMX ServerInfo bean may return wrong info
-    * [DATAMONGO-688] - There is no precedence between @Id annotation and field named "id" - both are attempted to be used
-    * [DATAMONGO-693] - MongoFactoryBean should create a mongo instance with host/port if replicaset is null or empty
-    * [DATAMONGO-702] - Spring Data MongoDB projection search, is not properly configured with respective Java Pojo
-    * [DATAMONGO-704] - Remove references to SimpleMongoConverter from JavaDoc.
-    * [DATAMONGO-705] - QueryMapper doesn't handles exists query with DBRef field
-    * [DATAMONGO-706] - QueryMapper does not transform DBRefs in nested keywords correctly
-    * [DATAMONGO-709] - Polymorphic query on documents in same collection
-    * [DATAMONGO-717] - Application context is not properly distributed to persistent entities
-    * [DATAMONGO-721] - Polymorphic attribute type not persisted on update operations
-
-** Improvement
-    * [DATAMONGO-701] - Improve performance of indexed starts-with queries
-    * [DATAMONGO-713] - Typos in readme.md
-
-** New Feature
-    * [DATAMONGO-544] - Support for TTL collection via Indexed annotation
-    * [DATAMONGO-586] - Add support for new Aggregation Framework
-
-** Task
-    * [DATAMONGO-714] - Add latest formatter to project sources
-    * [DATAMONGO-723] - Clean up test cases
-    * [DATAMONGO-728] - Add missing package-info.java files
-    * [DATAMONGO-731] - Adapt refactorings in Spring Data Commons
-    * [DATAMONGO-732] - Release 1.3 RC1
-
-
-Changes in version 1.2.3.GA (2013-07-24)
-----------------------------------------
-** Task
-    * [DATAMONGO-728] - Add missing package-info.java files
-    * [DATAMONGO-729] - Release 1.2.3.
-
-
-Changes in version 1.2.2.GA (2013-07-19)
-----------------------------------------
-** Bug
-    * [DATAMONGO-663] - org.springframework.data.mongodb.core.query.Field needs an equals method
-    * [DATAMONGO-677] - QueryMapper does not handled correctly Map with DBRef value
-    * [DATAMONGO-679] - MongoTemplate.doSave(…) passed a JSON String doesn't save it.
-    * [DATAMONGO-683] - QueryMapper does not handle default _id when no MappingMetadata is present
-    * [DATAMONGO-685] - JMX ServerInfo bean may return wrong info
-    * [DATAMONGO-693] - MongoFactoryBean should create a mongo instance with host/port if replicaset is null or empty
-    * [DATAMONGO-704] - Remove references to SimpleMongoConverter from JavaDoc.
-    * [DATAMONGO-705] - QueryMapper doesn't handles exists query with DBRef field
-    * [DATAMONGO-706] - QueryMapper does not transform DBRefs in nested keywords correctly
-    * [DATAMONGO-717] - Application context is not properly distributed to persistent entities
-
-** Improvement
-    * [DATAMONGO-682] - Remove performance hotspots
-    * [DATAMONGO-701] - Improve performance of indexed starts-with queries
-
-** Task
-    * [DATAMONGO-658] - Minor formatting changes to README.md
-    * [DATAMONGO-678] - Performance improvements in CustomConversions
-    * [DATAMONGO-714] - Add latest formatter to project sources
-    * [DATAMONGO-723] - Clean up test cases
-    * [DATAMONGO-727] - Release 1.2.2
-
-
-Changes in version 1.3.0.M1 (2013-06-04)
-----------------------------------------
-** Bug
-    * [DATAMONGO-571] - Spring Data for MongoDb doesn't save null values when @Version is added to domain class
-    * [DATAMONGO-612] - Fix PDF reference documentation name
-    * [DATAMONGO-613] - Images missing from reference documentation
-    * [DATAMONGO-617] - NullPointerException in MongoTemplate.initializeVersionProperty(…)
-    * [DATAMONGO-620] - MongoTemplate.doSaveVersioned(…) does not consider collection handed into the method
-    * [DATAMONGO-621] - MongoTemplate.initializeVersionProperty(…) does not use ConversionService
-    * [DATAMONGO-622] - An unversioned object should be created using insert(…) instead of save.
-    * [DATAMONGO-629] - Different results when using count and find with the same criteria with 'id' field
-    * [DATAMONGO-638] - MappingContext should not create PersistentEntity instances for native maps
-    * [DATAMONGO-640] - MongoLog4jAppender suffers from potential NullPointerException when closing Mongo instance
-    * [DATAMONGO-641] - MongoLog4jAppender suffers from potential NullPointerException when closing Mongo instance
-    * [DATAMONGO-642] - MongoChangeSetPersister does not use mapped collection name
-    * [DATAMONGO-646] - Can't insert DBObjects through MongoTemplate
-    * [DATAMONGO-648] - ID attributes in namespace shouldn't be XSD IDs
-    * [DATAMONGO-663] - org.springframework.data.mongodb.core.query.Field needs an equals method
-    * [DATAMONGO-669] - Incompatibility with Querydsl 3.1.1
-    * [DATAMONGO-676] - SimpleMongoRepository fails if used with customized collection name
-    * [DATAMONGO-677] - QueryMapper does not handled correctly Map with DBRef value
-    * [DATAMONGO-679] - MongoTemplate.doSave(…) passed a JSON String doesn't save it.
-    * [DATAMONGO-683] - QueryMapper does not handle default _id when no MappingMetadata is present
-
-** Improvement
-    * [DATAMONGO-140] - Add XML namespace element for MongoTemplate
-    * [DATAMONGO-545] - Add before delete and after delete events for AbstractMongoEventListener
-    * [DATAMONGO-554] - Add background attribute to @Indexed and @CompoundIndex
-    * [DATAMONGO-569] - AbstractMongoConfiguration cannot be used on CloudFoundry
-    * [DATAMONGO-594] - cross-store=> Define document name using annotation
-    * [DATAMONGO-631] - Explicitly prevent an Order instance set to ignore case from being piped into a query
-    * [DATAMONGO-632] - Polish namespace XSD to avoid errors in STS
-    * [DATAMONGO-633] - Upgrade to Querydsl 3.0.0
-    * [DATAMONGO-634] - Inherit application scope from basic CDI bean of Spring Data Commons
-    * [DATAMONGO-635] - Fix some Sonar warnings
-    * [DATAMONGO-636] - Add support for countBy projections
-    * [DATAMONGO-637] - Typo in Query.query(…)
-    * [DATAMONGO-651] - WriteResult not available from thrown Exception
-    * [DATAMONGO-652] - Add support for elemMatch and positional operator projections
-    * [DATAMONGO-656] - Potential NullPointerException when debugging in MongoTemplate
-    * [DATAMONGO-657] - Allow to write Map value as DBRef
-    * [DATAMONGO-666] - Fix architecture inconsistency created by MongoDataIntegrityViolationException
-    * [DATAMONGO-680] - SimpleMongoRepository.exists(ID) improvement
-    * [DATAMONGO-681] - Expose MongoTemplate.exists() method
-    * [DATAMONGO-682] - Remove performance hotspots
-
-** New Feature
-    * [DATAMONGO-607] - Add an abbreviating field naming strategy
-    * [DATAMONGO-628] - Add XML namespace elements for MongoTemplate and GridFsTemplate
-
-** Task
-    * [DATAMONGO-597] - Website is severely out-of-date
-    * [DATAMONGO-658] - Minor formatting changes to README.md
-    * [DATAMONGO-667] - Remove deprecations and further deprecate sorting/ordering types
-    * [DATAMONGO-672] - Upgrade to latest Spring Data Build and Commons
-    * [DATAMONGO-678] - Performance improvements in CustomConversions
-    * [DATAMONGO-690] - Release 1.3 M1
-
-Changes in version 1.2.1.GA (2013-04-17)
-----------------------------------------
-** Bug
-    * [DATAMONGO-571] - Spring Data for MongoDb doesn't save null values when @Version is added to domain class
-    * [DATAMONGO-612] - Fix PDF reference documentation name
-    * [DATAMONGO-613] - Images missing from reference documentation
-    * [DATAMONGO-617] - NullPointerException in MongoTemplate.initializeVersionProperty(…)
-    * [DATAMONGO-620] - MongoTemplate.doSaveVersioned(…) does not consider collection handed into the method
-    * [DATAMONGO-621] - MongoTemplate.initializeVersionProperty(…) does not use ConversionService
-    * [DATAMONGO-622] - An unversioned object should be created using insert(…) instead of save.
-    * [DATAMONGO-629] - Different results when using count and find with the same criteria with 'id' field
-    * [DATAMONGO-638] - MappingContext should not create PersistentEntity instances for native maps
-    * [DATAMONGO-640] - MongoLog4jAppender suffers from potential NullPointerException when closing Mongo instance
-    * [DATAMONGO-641] - MongoLog4jAppender suffers from potential NullPointerException when closing Mongo instance
-    * [DATAMONGO-642] - MongoChangeSetPersister does not use mapped collection name
-    * [DATAMONGO-646] - Can't insert DBObjects through MongoTemplate
-    * [DATAMONGO-648] - ID attributes in namespace shouldn't be XSD IDs
-
-** Improvement
-    * [DATAMONGO-594] - cross-store=> Define document name using annotation
-    * [DATAMONGO-632] - Polish namespace XSD to avoid errors in STS
-    * [DATAMONGO-635] - Fix some Sonar warnings
-    * [DATAMONGO-637] - Typo in Query.query(…)
-    * [DATAMONGO-651] - WriteResult not available from thrown Exception
-    * [DATAMONGO-656] - Potential NullPointerException when debugging in MongoTemplate
-
-** Task
-    * [DATAMONGO-597] - Website is severely out-of-date
-    * [DATAMONGO-654] - Release 1.2.1
-
-Changes in version 1.2.0.GA (2013-02-08)
-----------------------------------------
-** Bug
-    * [DATAMONGO-378] - MapReduceResults ClassCastException due to raw results counts as Long
-    * [DATAMONGO-568] - MongoTemplate.find(...)  method causes Nullpointer if query parameter is null
-    * [DATAMONGO-570] - Query methods on @DBRef field with the qualifier isNull throws Exception
-    * [DATAMONGO-583] - Check if you are using for loop with a DBCursor
-    * [DATAMONGO-585] - Exception during authentication in multithreaded access
-    * [DATAMONGO-588] - MongoTemplate.insert does not initialize null versions to zero
-    * [DATAMONGO-592] - Persisting Objects containing Objects with PersistenceConstructor causes MappingInstantiationException
-    * [DATAMONGO-593] - Persisting objects containing primitive arrays with PersistenceConstructor causes MappingInstantiationException
-    * [DATAMONGO-600] - Issues with polymorphism of nested types
-    * [DATAMONGO-601] - CannotGetMongoDbConnectionException should not print password in logfile
-    * [DATAMONGO-603] - Results of geo queries in repository dont't get metrics of supplied distance applied
-
-** Improvement
-    * [DATAMONGO-503] - GridFsTemplate is not setting the file Content-Type
-    * [DATAMONGO-573] - Move to Logback for test logging
-    * [DATAMONGO-580] - Polish BeanDefinitionParsers to avoid warnings in STS
-    * [DATAMONGO-581] - Expose managed PersistentEntity in MongoRepositoryFactoryBean
-    * [DATAMONGO-606] - Register converter for JodaTime types if present on classpath
-
-** New Feature
-    * [DATAMONGO-577] - Add support for auditing
-
-** Task
-    * [DATAMONGO-81] - Create unit tests for exception translation in MongoTemplate
-    * [DATAMONGO-576] - Configure java.util.logging to reduce verbose test logging
-    * [DATAMONGO-590] - Clean up code in MongoTemplate
-    * [DATAMONGO-598] - Upgrade to new build infrastructure
-    * [DATAMONGO-609] - Release 1.2.0
-
-Changes in version 1.1.2.GA (2013-02-08)
-----------------------------------------
-** Bug
-    * [DATAMONGO-562] - Cannot create entity with OptimisticLocking (@Version) and initial id
-    * [DATAMONGO-568] - MongoTemplate.find(...)  method causes Nullpointer if query parameter is null
-    * [DATAMONGO-570] - Query methods on @DBRef field with the qualifier isNull throws Exception
-    * [DATAMONGO-578] - pom version issues in 1.1.x branch
-    * [DATAMONGO-583] - Check if you are using for loop with a DBCursor
-    * [DATAMONGO-585] - Exception during authentication in multithreaded access
-    * [DATAMONGO-588] - MongoTemplate.insert does not initialize null versions to zero
-    * [DATAMONGO-600] - Issues with polymorphism of nested types
-    * [DATAMONGO-601] - CannotGetMongoDbConnectionException should not print password in logfile
-
-** Improvement
-    * [DATAMONGO-573] - Move to Logback for test logging
-    * [DATAMONGO-580] - Polish BeanDefinitionParsers to avoid warnings in STS
-
-** Task
-    * [DATAMONGO-81] - Create unit tests for exception translation in MongoTemplate
-    * [DATAMONGO-563] - Upgrade to MongoDB driver 2.9.2 as it fixes a serious regression introduced in 2.9.0
-    * [DATAMONGO-576] - Configure java.util.logging to reduce verbose test logging
-    * [DATAMONGO-590] - Clean up code in MongoTemplate
-    * [DATAMONGO-608] - Release 1.1.2
-
-Changes in version 1.1.1.GA (2012-10-17)
-----------------------------------------
-** Bug
-    * [DATAMONGO-549] - MongoTemplate.save(…) suffers from potential NullPointException
-    * [DATAMONGO-550] - MongoTemplate.save(BasicDBObject, String) results in NPE (after upgrading to 1.1.0.RELEASE
-    * [DATAMONGO-551] - MongoTemplate.save(String, String) results in NPE (after upgrading to 1.1.0.RELEASE
-
-** Task
-    * [DATAMONGO-559] - Release 1.1.1.RELEASE
-
-
-Changes in version 1.1.0.GA (2012-10-10)
-----------------------------------------
-** Bug
-    * [DATAMONGO-523] - @TypeAlias annotation not used with AbstractMongoConfiguration
-    * [DATAMONGO-527] - Criteria.equals(…) broken for complex criterias
-    * [DATAMONGO-530] - MongoMappingContext.setApplicationContext(…) does not invoke superclass method
-    * [DATAMONGO-531] - StackOverflowError when persisting Groovy beans
-    * [DATAMONGO-532] - Multithreading authentication issue
-    * [DATAMONGO-533] - Default MongoPersistentEntityIndexCreator not registered if ApplicationContext already contains one for different MappingContext
-    * [DATAMONGO-535] - Retrieve of existing Mongo DB from Transaction is not working
-    * [DATAMONGO-539] - Document remove doesn't work when giving collection name as a parameter
-
-** Improvement
-    * [DATAMONGO-279] - Optimistic locking using @Version field
-    * [DATAMONGO-456] - XSD incorrectly states the default value for the mongo-ref attribute of the mongo:db-factory configuration element
-    * [DATAMONGO-457] - broken links "Spring Data MongoDB - Reference Documentation"
-    * [DATAMONGO-526] - Polish README.md
-    * [DATAMONGO-529] - Improve Querydsl setup
-    * [DATAMONGO-538] - Unify usage of Sort APIs in Query API
-
-** New Feature
-    * [DATAMONGO-389] - stable release spring-data-mongodb should work with stable spring spring-data-jpa
-
-** Task
-    * [DATAMONGO-484] - Migrate to latest MongoDB Java driver
-    * [DATAMONGO-528] - Document GridFS support
-    * [DATAMONGO-536] - Fix package cycle introduced by SerializationUtils
-    * [DATAMONGO-541] - Release 1.1 GA
-    * [DATAMONGO-543] - Polish reference documentation
-    * [DATAMONGO-548] - Upgrade to Querydsl 2.8.0
-
-
-Changes in version 1.1.0.RC1 (2012-24-08)
------------------------------------------
-** Bug
-    * [DATAMONGO-493] - Criteria.ne() method converts all value into ObjectId
-    * [DATAMONGO-494] - $or/$nor expressions do not consider entity class mapping
-    * [DATAMONGO-495] - JSON can't serialize Enum when printing Query in DEBUG message
-    * [DATAMONGO-497] - Reading an empty List throws a MappingInstantiationException because it returns an HashSet instead of returning an ArrayList
-    * [DATAMONGO-505] - Conversion of associations doesn't work for collection values
-    * [DATAMONGO-508] - DBRef can accidentally get added as PersistentProperty
-    * [DATAMONGO-517] - QueryMapping incorrectly translates complex keywords
-
-** Improvement
-    * [DATAMONGO-496] - AbstractMongoConfiguration.getMappingBasePackage() could default to config class' package
-    * [DATAMONGO-499] - Namespace XSDs of current release version should refer to repositories XSD in version 1.0
-    * [DATAMONGO-500] - Index creation reacts on events not intended for it
-    * [DATAMONGO-502] - QueryMapper should transparently translate property names to field names
-    * [DATAMONGO-509] - SimpleMongoRepository.exists(…) can be improved.
-    * [DATAMONGO-510] - Criteria should only use BasicDBList internally
-    * [DATAMONGO-511] - QueryMapper should correctly transform associations
-    * [DATAMONGO-516] - Make Spring 3.1.2.RELEASE default Spring dependency version
-
-** Task
-    * [DATAMONGO-513] - Release 1.1 RC1
-
-
-Changes in version 1.0.4.RELEASE MongoDB (2012-08-24)
------------------------------------------------------
-** Bug
-    * [DATAMONGO-493] - Criteria.ne() method converts all value into ObjectId
-    * [DATAMONGO-494] - $or/$nor expressions do not consider entity class mapping
-    * [DATAMONGO-495] - JSON can't serialize Enum when printing Query in DEBUG message
-
-** Improvement
-    * [DATAMONGO-499] - Namespace XSDs of current release version should refer to repositories XSD in version 1.0
-
-** Task
-    * [DATAMONGO-514] - Release 1.0.4.
-
-Changes in version 1.1.0.M2 (2012-24-07)
-----------------------------------------
-** Bug
-    * [DATAMONGO-378] - MapReduceResults ClassCastException due to raw results counts as Long
-    * [DATAMONGO-424] - Declaring a list of DBRef in a domian class results in Null for each DBRef when reading from mongo database
-    * [DATAMONGO-425] - Binding a Date to a manually defined repository query fails
-    * [DATAMONGO-428] - ClassCastException when using outputDatabase option in map-reduce
-    * [DATAMONGO-446] - Pageable query methods returning List are broken
-    * [DATAMONGO-447] - Removal of Documents fails in in debug mode for Documents with complex ids
-    * [DATAMONGO-450] - enabling DEBUG causes RuntimeException
-    * [DATAMONGO-454] - ServerAddressPropertyEditor fails if a hostname is unresolvable
-    * [DATAMONGO-458] - When reading back empty collections unmodifiable instances of Collections.emptyList/Set is returned.
-    * [DATAMONGO-462] - findAll() fails with NPE - discovering the root cause
-    * [DATAMONGO-465] - Mongo inserts document with "_id" as an integer but saves with "_id" as a string.
-    * [DATAMONGO-467] - String @id field is not mapped to ObjectId when using QueryDSL ".id" path
-    * [DATAMONGO-469] - Query creation from method names using AND criteria does not work anymore
-    * [DATAMONGO-474] - Wrong property is used for Id mapping
-    * [DATAMONGO-475] - 'group' operation fails where query references non primitive property
-    * [DATAMONGO-480] - The WriteResultChecking is not used in case of insert or save of documents.
-    * [DATAMONGO-483] - @Indexed(unique=true, name="foo") puts name's value to the 'key' in the MongoDB
-    * [DATAMONGO-489] - ClassCastException when loading Map<String, String[]>
-
-** Improvement
-    * [DATAMONGO-448] - Remove the need for Converters for complex classes that are used as IDs
-    * [DATAMONGO-455] - Document how to use raw queries using BasicQuery
-    * [DATAMONGO-460] - Improve Querydsl implementation internals
-    * [DATAMONGO-466] - QueryMapper shouldn't map id properties of nested classes
-    * [DATAMONGO-470] - Criteria and Query should have proper equals(…) and hashCode() method.
-    * [DATAMONGO-477] - Change upper bound of Google Guava package import to 13
-    * [DATAMONGO-482] - typo in documentation - 2 i's in usiing
-    * [DATAMONGO-486] - Polish namspace implementation
-    * [DATAMONGO-491] - Release 1.1.0.M2
-
-** New Feature
-    * [DATAMONGO-476] - JavaConfig support for Mongo repositories
-
-** Task
-    * [DATAMONGO-451] - Tweak pom.xml to let Sonar build run without Bundlor
-    * [DATAMONGO-490] - Fix minor typos
-
-
-Changes in version 1.0.3.RELEASE (2012-24-07)
----------------------------------------------
-** Bug
-    * [DATAMONGO-467] - String @id field is not mapped to ObjectId when using QueryDSL ".id" path
-    * [DATAMONGO-469] - Query creation from method names using AND criteria does not work anymore
-    * [DATAMONGO-474] - Wrong property is used for Id mapping
-    * [DATAMONGO-475] - 'group' operation fails where query references non primitive property
-    * [DATAMONGO-480] - The WriteResultChecking is not used in case of insert or save of documents.
-    * [DATAMONGO-483] - @Indexed(unique=true, name="foo") puts name's value to the 'key' in the MongoDB
-    * [DATAMONGO-489] - ClassCastException when loading Map<String, String[]>
-
-** Improvement
-    * [DATAMONGO-466] - QueryMapper shouldn't map id properties of nested classes
-    * [DATAMONGO-470] - Criteria and Query should have proper equals(…) and hashCode() method.
-    * [DATAMONGO-482] - typo in documentation - 2 i's in usiing
-
-** Task
-    * [DATAMONGO-492] - Release 1.0.3
-
-
-Changes in version 1.0.2.RELEASE (2012-06-20)
----------------------------------------------
-** Bug
-    * [DATAMONGO-360] - java.lang.ClassCastException when placing GeospatialIndex into IndexOperations and invoking IndexOperations.getIndexInfo()
-    * [DATAMONGO-366] - Chapter 3.2. points to wrong bugtracker
-    * [DATAMONGO-378] - MapReduceResults ClassCastException due to raw results counts as Long
-    * [DATAMONGO-382] - ClassCastException: "com.mongodb.BasicDBObject cannot be cast to com.mongodb.BasicDBList" during find()
-    * [DATAMONGO-411] - Potential ClassCastExceptions in MongoPersistentEntityIndexCreator
-    * [DATAMONGO-412] - getUserCredentials() is called twice in AbstractMongoConfiguration::mongoDbFactory()
-    * [DATAMONGO-413] - Using "Or" in repository query yields a ClassCastException
-    * [DATAMONGO-422] - UUIDToBinaryConverter not compatible with mongo java driver
-    * [DATAMONGO-423] - Criteria.regex should use java.util.Pattern instead of $regex
-    * [DATAMONGO-425] - Binding a Date to a manually defined repository query fails
-    * [DATAMONGO-428] - ClassCastException when using outputDatabase option in map-reduce
-    * [DATAMONGO-429] - using @Query annotation, arrays are translated somewhere between query creation and mongo interpretation
-    * [DATAMONGO-446] - Pageable query methods returning List are broken
-    * [DATAMONGO-447] - Removal of Documents fails in in debug mode for Documents with complex ids
-    * [DATAMONGO-450] - enabling DEBUG causes RuntimeException
-    * [DATAMONGO-454] - ServerAddressPropertyEditor fails if a hostname is unresolvable
-    * [DATAMONGO-461] - MappedConstructor potentially throws NullPointerException
-    * [DATAMONGO-462] - findAll() fails with NPE - discovering the root cause
-
-** Improvement
-    * [DATAMONGO-448] - Remove the need for Converters for complex classes that are used as IDs
-    * [DATAMONGO-455] - Document how to use raw queries using BasicQuery
-
-** Task
-    * [DATAMONGO-463] - Release 1.0.2
-
-
-Changes in version 1.1.0.M1 (2012-05-07)
-----------------------------------------
-
-** Bug
-    * [DATAMONGO-299] - Mongodb Query Does not allow for multiple query conditionals of the same time.
-    * [DATAMONGO-360] - java.lang.ClassCastException when placing GeospatialIndex into IndexOperations and invoking IndexOperations.getIndexInfo()
-    * [DATAMONGO-363] - Criteria.and() cannot be chained when using Criteria.gte and Criteria.lte
-    * [DATAMONGO-364] - Chaining of Criteria when including a GeoSpatial field is inconsistent.
-    * [DATAMONGO-366] - Chapter 3.2. points to wrong bugtracker
-    * [DATAMONGO-368] - Empty values in collections are not supported
-    * [DATAMONGO-369] - Wrong query created when one value is a DBObject
-    * [DATAMONGO-373] - QueryMapper is getting a ClassCasteException When trying to Convert an ArrayList to a BSONList
-    * [DATAMONGO-376] - Fix potential NPE in SpringDataMongodbSerializer
-    * [DATAMONGO-380] - maps with mongo reserved characters for keys generate on save: java.lang.IllegalArgumentException: fields stored in the db can't have . in them
-    * [DATAMONGO-387] - Executing query methods with GeoPage results doesn't work
-    * [DATAMONGO-401] - StringBasedMongoQuery suffers from NullPointerException in case a null parameter gets bound to a parameter placeholder
-    * [DATAMONGO-402] - Inner class not supported
-    * [DATAMONGO-403] - Conflicts between MongoDB and JPA
-    * [DATAMONGO-411] - Potential ClassCastExceptions in MongoPersistentEntityIndexCreator
-    * [DATAMONGO-412] - getUserCredentials() is called twice in AbstractMongoConfiguration::mongoDbFactory()
-    * [DATAMONGO-413] - Using "Or" in repository query yields a ClassCastException
-    * [DATAMONGO-423] - Criteria.regex should use java.util.Pattern instead of $regex
-
-** Defect
-    * [DATAMONGO-429] - using @Query annotation, arrays are translated somewhere between query creation and mongo interpretation
-
-** Improvement
-    * [DATAMONGO-347] - Repositories and DBRef
-    * [DATAMONGO-375] - Polish versions of referenced XSD schemas
-    * [DATAMONGO-379] - Exception when trying to instantiate an entity having a primitive constructor argument and no according document field
-    * [DATAMONGO-390] - Add Converter for UUID
-    * [DATAMONGO-391] - Move to SLF4J for logging
-    * [DATAMONGO-397] - MongoRepositoryFactoryBean should refer to MongoOperations instead of MongoTemplate
-    * [DATAMONGO-441] - Improve MongoDbUtils API
-
-** New Feature
-    * [DATAMONGO-6] - Integration with GridFS features
-    * [DATAMONGO-36] - Validation support to MongoTemplate
-    * [DATAMONGO-356] - Provide CDI integration
-    * [DATAMONGO-418] - Add support for newly introduced StartingWith, EndingWith and Containing keywords
-    * [DATAMONGO-427] - Support After and Before keywords for query creation
-
-** Refactoring
-    * [DATAMONGO-383] - Adapt new entity instantiation API from Spring Data Commons
-    * [DATAMONGO-431] - Adapt changes in CrudRepository
-
-** Task
-    * [DATAMONGO-443] - Upgrade to Querydsl 2.5.0
-    * [DATAMONGO-394] - Upgrade to Querydsl 2.3.2
-    * [DATAMONGO-396] - Release 1.1.0.M1.
-    * [DATAMONGO-432] - Upgrade to Spring Data Commons 1.3.0.RC1
-    * [DATAMONGO-439] - Add performance tests
-
-Changes in version 1.0.1.RELEASE MongoDB (2012-02-11)
------------------------------------------------------
-
-** Bug
-    * [DATAMONGO-363] - Criteria.and() cannot be chained when using Criteria.gte and Criteria.lte
-    * [DATAMONGO-364] - Chaining of Criteria when including a GeoSpatial field is inconsistent.
-    * [DATAMONGO-368] - Empty values in collections are not supported
-    * [DATAMONGO-369] - Wrong query created when one value is a DBObject
-    * [DATAMONGO-376] - Fix potential NPE in SpringDataMongodbSerializer
-    * [DATAMONGO-380] - maps with mongo reserved characters for keys generate on save: java.lang.IllegalArgumentException: fields stored in the db can't have . in them
-    * [DATAMONGO-387] - Executing query methods with GeoPage results doesn't work
-    * [DATAMONGO-401] - StringBasedMongoQuery suffers from NullPointerException in case a null parameter gets bound to a parameter placeholder
-
-** Improvement
-    * [DATAMONGO-375] - Polish versions of referenced XSD schemas
-    * [DATAMONGO-379] - Exception when trying to instantiate an entity having a primitive constructor argument and no according document field
-    * [DATAMONGO-390] - Add Converter for UUID
-    * [DATAMONGO-397] - MongoRepositoryFactoryBean should refer to MongoOperations instead of MongoTemplate
-
-** Task
-    * [DATAMONGO-395] - Release 1.0.1.
-
-
-Changes in version 1.0.0.RELEASE MongoDB (2011-12-22)
------------------------------------------------------
-
-** Bug
-    * [DATAMONGO-260] - MapReduce fails when using with Long as key-type.
-    * [DATAMONGO-319] - WriteConcern not parsed correctly in namespace handlers
-    * [DATAMONGO-336] - MongoDB GeoNear returning  null pointer exception when giving data more precision than test data
-    * [DATAMONGO-343] - ServerAddressPropertyEditor disables default Spring conversion
-    * [DATAMONGO-346] - MongoTemplate.remove(Object arg) not working
-    * [DATAMONGO-349] - remove doesn't work in RC1 for mongo db
-
-** Improvement
-    * [DATAMONGO-139] - Startup behavior should be that MongoTemplate does not eagerly try to connect to MongoDB
-    * [DATAMONGO-296] - Add hook to use MongoConverter for Querydsl argument handling
-    * [DATAMONGO-326] - Enums can't be used in Criteria
-    * [DATAMONGO-341] - Tighten implementation of MongoTemplate's geoNear(...) methods
-
-** Task
-    * [DATAMONGO-81] - Create unit tests for exception translation in MongoTemplate
-    * [DATAMONGO-93] - Create integration tests for authentication
-    * [DATAMONGO-257] - Document TypeMapper abstraction to control how type information is stored and retrieved from documents
-    * [DATAMONGO-330] - Document classpath scanning for Converters
-    * [DATAMONGO-350] - Upgrade to latest Querydsl
-    * [DATAMONGO-355] - Upgrade to Spring 3.0.7
-    * [DATAMONGO-357] - Release 1.0 GA
-
-
-Changes in version 1.0.0.RC1 MongoDB (2011-12-6)
-------------------------------------------------
-
-** Bug
-    * [DATAMONGO-199] - Synchronisation during performance tests
-    * [DATAMONGO-298] - Spring custom converters do not work for subclasses of java.lang.Number
-    * [DATAMONGO-306] - NullPointerException if mongo factory created via URI with out credentials
-    * [DATAMONGO-309] - POJO containing a List of Maps not persisting properly
-    * [DATAMONGO-312] - Cannot retrieve persisted Enum implementing an abstract method
-    * [DATAMONGO-315] - MongoTemplate.findOne(query) methods ignore SortOrder on query
-    * [DATAMONGO-316] - Replica Set configuration via properties file throws ArrayIndexOutOfBoundsException
-    * [DATAMONGO-318] - Distinguishing write errors and writes with zero documents affected
-    * [DATAMONGO-321] - An ID field of type integer is always saved as zero if not set by the user before calling save.  Throw exception to indicate an int field will not be autopopulated.
-    * [DATAMONGO-322] - Throw exception in a save operation if the POJO's ID field is null and field type is not String, BigInteger or ObjectId.
-    * [DATAMONGO-325] - MongoTemplate fails to correctly report a js file not found on classpath while calling mapReduce
-    * [DATAMONGO-328] - Fix the import statement in mongodb manifest
-    * [DATAMONGO-329] - Map value not converted correctly
-    * [DATAMONGO-333] - AbstractMongoEventListener throws NullPointerException if used without generic parameter
-
-** Improvement
-    * [DATAMONGO-26] - Investigate performance of POJO serialization.
-    * [DATAMONGO-174] - Add additional constructor to MongoTemplate that take com.mongodb.Mongo, database name, user credentials and MongoConverter.
-    * [DATAMONGO-208] - Add suppoprt for group() operation on collection in MongoOperations
-    * [DATAMONGO-213] - Provide additional options for setting WriteConcern on a per operation basis
-    * [DATAMONGO-234] - MongoTemplate should support the findAndModify operation to update version fields
-    * [DATAMONGO-292] - Several mongo for different database names
-    * [DATAMONGO-301] - Allow converters to be included through scanning
-    * [DATAMONGO-305] - Remove synchronized(this) from sort() and fields() methods in the Query class
-    * [DATAMONGO-310] - Allow Collections as parameters in @Query
-    * [DATAMONGO-320] - Remove use of slaveOk boolean option in MongoTemplate as it is deprecated.  Replace with ReadPreference
-    * [DATAMONGO-323] - Using @Query and a Sort parameter on the same method should produce sorted results
-    * [DATAMONGO-324] - Support for JSON in mongo template
-    * [DATAMONGO-337] - The "nin" and "all" methods on Criteria should take a collection like the "in" method.
-    * [DATAMONGO-338] - Add query derivation implementations for newly introduced Regex, Exists, True and False keywords
-
-** New Feature
-    * [DATAMONGO-185] - Add hint to Query
-    * [DATAMONGO-251] - Support geting index information on a collection or mapped class.
-    * [DATAMONGO-308] - Add support for upsert methods
-
-** Refactoring
-    * [DATAMONGO-304] - Change package name for Class MongoLog4jAppender
-    * [DATAMONGO-313] - Use MongoOperations interface instead of MongoTemplate class
-
-** Task
-    * [DATAMONGO-195] - Add description of @Field mapping annotation to reference docs
-    * [DATAMONGO-262] - Ensure Cloud Foundry Runtime works with RC1
-    * [DATAMONGO-263] - Ensure Cloud Foundry Examples work with RC1
-    * [DATAMONGO-311] - Update MongoDB driver to v 2.7.x
-    * [DATAMONGO-332] - Update reference documentation to list correct necessary dependencies
-    * [DATAMONGO-334] - Use repository URLs pointing to Artifactory
-    * [DATAMONGO-335] - Create hybrid Spring 3.0.6 / 3.1 build
-
-
-Changes in version 1.0.0.M5 MongoDB (2011-10-24)
-------------------------------------------------
-
-** Bug
-    * [DATAMONGO-259] - Maps inside collections are not written correctly
-    * [DATAMONGO-268] - CustomConversions is too liberal in registering "simple types" (asymmetric conversion)
-    * [DATAMONGO-269] - XML configuration for replica sets is not working
-    * [DATAMONGO-275] - DBRef fields and collections are returning nulls
-    * [DATAMONGO-281] - Improve the <mongo:db-factory> to handle blank username and password when using property placholders like ${mongo.username}
-    * [DATAMONGO-282] - Cannot create a "range" query
-    * [DATAMONGO-284] - Execution of Querydsl query maps id incorrectly
-    * [DATAMONGO-285] - NPE in MappingMongoConverter.writeMapInternal when saving a Map<String,Object> with val instance of Collection
-    * [DATAMONGO-288] - querying same property multiple times produces incorrect query
-    * [DATAMONGO-289] - AbstractMongoEventListener will never call onAfterLoad
-    * [DATAMONGO-294] - List elements nested in Map lose their type when persisted
-
-** Improvement
-    * [DATAMONGO-65] - Allow Spring EL usage in collection name attribute of @Document
-    * [DATAMONGO-183] - Query count() support for pagination
-    * [DATAMONGO-258] - M4 documentation states SD Commons 1.1.0.M1 required but actually needs 1.2.0.M1
-    * [DATAMONGO-261] - Reference documentation for geoNear queries has no stable section id
-    * [DATAMONGO-270] - Approach Sonar results to improve code quality
-    * [DATAMONGO-271] - Remove 'document' from cross-store package names
-    * [DATAMONGO-272] - Namespace configuration file still resides in 'document' package
-    * [DATAMONGO-276] - QueryUtils should be public
-    * [DATAMONGO-280] - Add maxAutoConnectRetryTime for <mongo:db-factory> and  MongoOptionsFactoryBean
-    * [DATAMONGO-283] - $and support
-    * [DATAMONGO-286] - MongoDB Repository no query methods for $lte and $gte
-    * [DATAMONGO-291] - Path expressions in repository methods should honour mapping metadata
-    * [DATAMONGO-293] - Add support for new polygon based within search in Mongo 2.0.
-    * [DATAMONGO-295] - Allow MongoTemplate to be configured using MongoURI
-    * [DATAMONGO-300] - Re-work the Query/Criteria to better support $and, $or and $nor queries
-    * [DATAMONGO-302] - Consistently handle null values given to CrudRepository implementation
-
-** New Feature
-    * [DATAMONGO-230] - MongoTemplate missing method remove(Object object, String collectionName)
-
-** Refactoring
-    * [DATAMONGO-274] - Split up repository package according to the structure in Spring Data JPA
-
-** Task
-    * [DATAMONGO-264] - Ensure Data Document examples work
-    * [DATAMONGO-265] - Create new github repository for mongodb
-    * [DATAMONGO-266] - Create new github repository for CouchDB
-    * [DATAMONGO-297] - Prune project directory
-    * [DATAMONGO-303] - Update to QueryDsl 2.2.4
-
-
-Changes in version 1.0.0.M4 MongoDB (2011-09-01)
-------------------------------------------------
-
-** Bug
-    * [DATADOC-134] - MongoDB: No exception when saving duplicate value to an attribute annotated with @Indexed(unique=true)
-    * [DATADOC-162] - Exception thrown on toString of Point class
-    * [DATADOC-167] - @Document annotation is not inherited
-    * [DATADOC-168] - Registering a custom converter from String to UUID causes all Strings to be converted to UUIDs
-    * [DATADOC-172] - Unable to force property order when saving document
-    * [DATADOC-176] - @DBRef annotation only supports ids of type ObjectId
-    * [DATADOC-177] - Sorting on multiple fields does not maintain order
-    * [DATADOC-181] - MongoFactoryBean does not call Mongo.close() on shutdown
-    * [DATADOC-190] - SimpleMongoRepository.exists(…) returns false for existing entities with non-ObjectId id
-    * [DATADOC-192] - MappingMongoConverter does not read empty Sets correctly
-    * [DATADOC-199] - Synchronisation during performance tests
-    * [DATADOC-207] - MappingMongoConverter fails when reading empty java.util.SortedMaps
-    * [DATADOC-209] - Collections of enums not handled correctly
-    * [DATADOC-210] - spring-data-mongodb requires Java 1.6, should require 1.5
-    * [DATADOC-212] - NPE during MongoTemplate.update() if no ID field is defined (via field name or annotation)
-    * [DATADOC-217] - Set cannot be used as a collection in a Document
-    * [DATADOC-218] - Adding of custom simple types is not easy
-    * [DATADOC-221] - BigDecimal values not read correctly in maps
-    * [DATADOC-224] - MappingMongoConverter does not inspect value type for Object properties
-    * [DATADOC-228] - NullPointerException when persiting Map with null values
-    * [DATADOC-229] - When a parameterized List is used in the PersistentConstructor, conversion fail
-    * [DATADOC-231] - spring-data-mongodb does not work in an OSGi server because of unresolved dependencies
-    * [DATADOC-232] - mongodb allow to $inc many fields in one query, but Updat().inc(firs).inc(last)  do only last inc
-    * [DATADOC-235] - Unable to map unstructured data
-    * [DATADOC-236] - Repository queries do not honour order defined in method name
-    * [DATADOC-237] - @Indexed annotation doesn't honor field name from @Field annotation
-    * [DATADOC-240] - Update with id key is not working
-    * [DATADOC-243] - mongo:mapping-converter schema does not allow db-factory-ref
-    * [DATADOC-246] - Stack overflow when Update.pushAll(push)
-    * [DATADOC-247] - QueryMapper does not handle BigInteger ids correctly
-    * [DATADOC-248] - MongoDB Query and Collection mapping
-    * [DATADOC-249] - ConcurrentModificationException when calling MongoTemplate.updateFirst
-    * [DATADOC-254] - SimpleMongoDbFactory should handle dots in database names correctly
-
-** Improvement
-    * [DATADOC-32] - SimpleMongoConverter could support identifying Spring EL expressions in keys
-    * [DATADOC-63] - Converters to support use of a 'typeId' strategy to determine class to marshall/unmarshal from Mongo
-    * [DATADOC-166] - Check for null if various template CRUD methods
-    * [DATADOC-169] - Registering custom converters for a type requires treating the type as simple in mapping context
-    * [DATADOC-171] - IllegalArgumentException when persisting entity with BigDecimal field
-    * [DATADOC-178] - System.out.println in the in method of Criteria. Line 179.
-    * [DATADOC-188] - Allow means to disable repository infrastructure creating indexes
-    * [DATADOC-189] - Improve extensibility of MongoRepositoryFactoryBean
-    * [DATADOC-215] - Allow configuring WriteConcern via MongoFactoryBean and thus the namespace
-    * [DATADOC-223] - Registering of customSimpleTypes should be available through the mongo namespace of spring-data-mongodb
-    * [DATADOC-225] - BasicMongoPersistentEntity shouldn't reject root entities without an id property
-    * [DATADOC-241] - Allow Map conversion behavior overriding
-    * [DATADOC-255] - Add to MongoOperations and executeCommand with an additional integer options argument
-    * [DATADOC-256] - Update to use MongoDB driver version 2.6.5
-
-** New Feature
-    * [DATADOC-7] - Support for map-reduce operations in MongoTemplate
-    * [DATADOC-64] - Allow defining the collections a query is ran against on finder methods
-    * [DATADOC-68] - Support for geoNear command
-    * [DATADOC-87] - Provide @GeoSpatialIndexed annotation that mirrors GeoSpatialIndex class for use in mapping.
-    * [DATADOC-100] - Provide means to externalize manually defined queries
-    * [DATADOC-202] - Add a 'DocumentCallbackHandler' so that a callback can process each DBObject returned from a query
-    * [DATADOC-216] - Allow configuring a WriteConcern on SimpleMongoDbFactory for DB wide WriteConcern
-    * [DATADOC-226] - Add QuerydslRepositorySupport helper class similar to the one in Spring Data JPA
-
-** Refactoring
-    * [DATADOC-170] - Review listener design
-    * [DATADOC-191] - Remove 'document' from package names
-    * [DATADOC-214] - MongoConverter refactorings
-
-** Task
-    * [DATADOC-91] - Add more TestCases for the basic functionality
-    * [DATADOC-152] - Investigate failing of test for repository.findbyLocationWithinBox
-    * [DATADOC-175] - Review DSM matrix and remove package cycles if found.
-    * [DATADOC-194] - Remove use of Class.forName to support use in an OSGi environment
-    * [DATADOC-206] - Upgrade to Querydsl 2.2.0
-    * [DATADOC-253] - Upgrade to Spring 3.0.6
-
-
-Changes in version 1.0.0.M3 MongoDB (2011-06-02)
-------------------------------------------------
-
-General
-* [DATADOC-92] - Exception translation to catch RuntimeException instead of MongoException
-* [DATADOC-111] - Ensure all MongoTemplate methods execute within the context of a callback method.
-* [DATADOC-120] - Remove MongoReaderWriter
-* [DATADOC-160] - Review MongoOperations and make the parameter ordering more consistent across methods
-
-Core Data Access
-* [DATADOC-80] - Rename addConverters to setCustomConverters in MappingMongoConverter and SimpleMongoConverter
-* [DATADOC-89] - Support setting slaveOk in MongoTemplate per query
-* [DATADOC-108] - Add findById method to MongoTemplate.
-* [DATADOC-112] - Storing a DBRef uses the wrong collection name
-* [DATADOC-116] - Nesting DBRefs doesn't work > 1 layers
-* [DATADOC-117] - Remove the default collection name on the MongoTemplate
-* [DATADOC-118] - Remove MongoTemplate methods that take a Reader/Writer parameter
-* [DATADOC-121] - Deprecate SimpleMongoConverter
-* [DATADOC-124] - Add method to MappingContext to get the collection name used for a specific type
-* [DATADOC-127] - @Document(collection="SOME_COLLECTION_NAME") doesn't take effect
-* [DATADOC-141] - Provide a prepareCollection protected method in MongoTemplate to allow customization of behavior such as slaveOk or writeConcern via a subclass
-* [DATADOC-142] - Change constructors in MongoTemplate that take Mongo object
-* [DATADOC-143] - MappingMongoConverter should be MongoTemplate's default converter
-* [DATADOC-149] - Remove setter for MongoDbFactory from MappingMongoConverter
-* [DATADOC-157] - MongoTemplate updateFirst/updateMulti methods to take java.lang.Class parameter as last in method param list to be consistent with other usage
-* [DATADOC-158] - Change default conventions of java.lang.Class to collection name in MappingMongoConverter to be first letter lower case camel casing.
-
-Configuration
-* [DATADOC-42] - Provide option for configuring replica sets using the Mongo namespace
-* [DATADOC-88] - Create MongoDbFactory to consolidate DB, Server location, and user credentials into one location
-* [DATADOC-119] - Modify XML schema and @Configuration base class to make it easy to register custom Spring converters with the mapper.
-* [DATADOC-133] - Support Property Placeholder as MongoDB Port Number in Application Context Configuration
-* [DATADOC-135] - <mongo:options /> should use - instead of camel case to be consistent with other attribute names
-* [DATADOC-138] - Expose all properties of the MongoOptions class in Mongo namespace
-
-Querying / Updating
-* [DATADOC-43] - Query creator should support Near and Within keyword
-* [DATADOC-96] - Query#or(Query) does not work
-* [DATADOC-102] - Update does not let you $set across multiple fields
-* [DATADOC-106] - Add additional mongo operators to Criteria class
-* [DATADOC-107] - Criteria "in" operator should correctly handle passing in a collection instead of an array.
-* [DATADOC-113] - NotNull/IsNotNull not implemented in MongoQueryCreator
-* [DATADOC-146] - Advanced Regexp Queries
-
-Mapping
-* [DATADOC-95] - Can not save an object that has not had any of its properties set
-* [DATADOC-97] - ID replacement not working correctly when using updateFirst/updateMulti
-* [DATADOC-98] - Collection<Collection> or Object[][] doesn't save correctly
-* [DATADOC-109] - Add MappingContext to MongoConverter interface
-* [DATADOC-110] - Improve implementation of substituteMappedIdIfNecessary
-* [DATADOC-101] - Explicit Converters only registered one way.
-* [DATADOC-114] - UpdateFirst/Multi operations on MongoTemplate not properly using converter to store objects.
-* [DATADOC-122] - Use same default collection name for MappingMongoConverter and SimpleMongoConverter
-* [DATADOC-123] - Use the same id/_id mapping for MappingMongoConverter and SimpleMongoConverter
-* [DATADOC-128] - Support inheritance with Document mappings
-* [DATADOC-130] - Problem with Converters (java.util.Locale)
-* [DATADOC-144] - Add an @Key annotation to allow defining the key a property is stored under
-* [DATADOC-145] - MappingMongoConverter does not convert objects for collections of interfaces
-* [DATADOC-155] - Need to support plain POJOs with non-ObjectId-compatible ID properties
-* [DATADOC-156] - MongoOperations.find(query(where("id").in(ids)) fails where ids aren't ObjectIds
-* [DATADOC-159] - Saving the same Entity multiple times creates multiple entries in the database
-* [DATADOC-161] - MappingMongoConverter now supports nested Maps
-
-Repository
-* [DATADOC-115] - Upgrade to QueryDsl 2.2.0-beta4
-* [DATADOC-137] - Parameter values in MongoDB JSON Query are not being replaced properly
-
-Documentation
-* [DATADOC-99] - Reference documentation shows invalid field spec for @Query usage with repositories
-
-
-Changes in version 1.0.0.M2 MongoDB (2011-04-09)
-------------------------------------------------
-
-General
-* Spring configuration support using Java based @Configuration classes
-
-Core Data Access
-* Persistence and mapping lifecycle events
-* GeoSpatial integration
-* [DATADOC-76] - Add support for findAndRemove to MongoTemplate/MongoOperations
-* [DATADOC-5] - Provide detailed mapping of Mongo errors onto Spring DAO exception
-* [DATADOC-51] - Fixed issue with exceptions thrown when authenticating multiple times for sam eDB instance
-
-Querying
-* [DATADOC-72] - Add support for Mongo's $elemMatch and chained Criteria
-* [DATADOC-77] - Rename "and" method in Query to "addCritera"
-* [DATADOC-67] - Criteria API to support keywords for geo search
-
-Mapping
-* Feature Rich Object Mapping integrated with Spring's Conversion Service
-* Annotation based mapping metadata but extensible to support other metadata formats
-* [DATADOC-60] - Add namespace support to setup a MappingMongoConverter
-* [DATADOC-33] - Introduce annotation to demarcate id field in a domain object
-
-Repository
-* [DATADOC-47, DATACMNS-17] - Adapted new metamodel API
-* [DATADOC-46] - Added support for 'In' and 'NotIn' keyword
-* [DATADOC-49] - Fixed 'And' and 'Or' keywords
-* [DATADOC-41] - Added support for executing QueryDsl predicates
-* [DATADOC-69] - Let repository namespace pickup the default mapping context bean and allow configuration
-* [DATADOC-24] - Allow use of @Query annotation to define queries
-* [DATADOC-34] - Create indexes for columns that are mentioned in query methods
-
-Cross-Store
-* [DATADOC-48] - Cross-store persistance - support for JPA Entities with fields transparently persisted/retrieved using MongoDB
-
-Logging
-* [DATADOC-66] - Log4j log appender
-
-Changes in version 1.0.0.M1 MongoDB (2011-02-14)
-------------------------------------------------
-
-General
-* BeanFactory for basic configuration of Mongo environment
-* Namespace for basic configuration of Mongo environment
-
-Core Data Access
-* Introduce MongoTemplate implementation with methods defined in MongoOperations interface
-* MongoTemplate support for insert, find, save, update, remove
-* MongoTemplate support for basic POJO serialization based on bean properties
-* Allow MongoTemplate methods to use a default collection name
-* Exception translation in MongoTemplate to Spring's DAO exception hierarchy
-* Support for update modifiers to allow for partial document updates
-* Expose WriteConcern settings on MongoTemplate used for any write operations
-* Support in MongoTemplate for enabling either logging or throwing exceptions based on value of WriteResult return value.
-
-Repository
-* Introducing generic repository implementation for MongoDB
-* Automatic implementation of interface query method names on repositories.
-* Namespace support for Mongo repositories
-* Allow usage of pagination and sorting with repositories
-
diff --git a/src/main/resources/notice.txt b/src/main/resources/notice.txt
index 9d24609c69..8742b05aaa 100644
--- a/src/main/resources/notice.txt
+++ b/src/main/resources/notice.txt
@@ -1,4 +1,4 @@
-Spring Data MongoDB 2.2 GA
+Spring Data MongoDB 5.0 M3 (2025.1.0)
 Copyright (c) [2010-2019] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -8,3 +8,4 @@ This product may include a number of subcomponents with
 separate copyright notices and license terms. Your use of the source
 code for the these subcomponents is subject to the terms and
 conditions of the subcomponent's license, as noted in the LICENSE file.
+